diff --git a/.build_exclusions b/.build_exclusions index b8a9d2465a61..226dfd415add 100644 --- a/.build_exclusions +++ b/.build_exclusions @@ -10,10 +10,8 @@ chrome/content/rules/validity-* chrome/content/rules/make-* *.xcf.gz .gitignore -webextension/.gitignore -chrome-resources/update-from-chrome-svn.sh -webextension/chrome-resources/update-from-chrome-svn.sh .eslintrc.json -webextension/.eslintrc.json .eslintignore node_modules +package-lock.json +test diff --git a/.editorconfig b/.editorconfig index e93ea3f1b6c3..3188469e924a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,4 +1,4 @@ -# EditorConfig is awesome: http://EditorConfig.org +# EditorConfig is awesome: https://EditorConfig.org root = true diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index ba89d09a6c9e..e57a0b19e0e8 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -4,37 +4,8 @@ [//]: # (Please help us by following this issue template.) [//]: # (You can delete all blank lines and all lines starting) [//]: # (with the comment marker, such as this one.) -[//]: # -[//]: # (Delete all but one of the following "Type" lines.) -[//]: # (Leave in the line that best describes the issue you are reporting.) -Type: ruleset issue -Type: new ruleset -Type: code issue -Type: feature request Type: other -[//]: # (If you are reporting a ruleset/website problem, include the top-level) -[//]: # (domain below. For example, if you want to report an issue about) -[//]: # ("one.example.com" and "two.example.com", then the line below should) -[//]: # (be:) -[//]: # -[//]: # (Domain: example.com) -[//]: # -[//]: # (Be sure to remove the parenthesis and comment marker. If you are only) -[//]: # (reporting an issue about "one.example.com", then the line below should) -[//]: # (be:) -[//]: # -[//]: # (Domain: one.example.com) -[//]: # -[//]: # (Only include one top-level domain. If you have more than one top-level) -[//]: # (domain to report, such as both "example.com" and "example.org", open a) -[//]: # (new issue for each top-level domain.) -[//]: # -[//]: # (If you are not reporting a ruleset/website problem, you can delete the) -[//]: # ("Domain" line or leave it blank.) - -Domain: - [//]: # (Include any other relevant information below. Thank you again for) [//]: # (helping to improve HTTPS Everywhere.) diff --git a/.github/ISSUE_TEMPLATE/code-issue.md b/.github/ISSUE_TEMPLATE/code-issue.md new file mode 100644 index 000000000000..c62ff8b75aff --- /dev/null +++ b/.github/ISSUE_TEMPLATE/code-issue.md @@ -0,0 +1,16 @@ +--- +name: Code issue report +about: Report an issue about our code +--- + +[//]: # (Thank you for reporting an issue to HTTPS Everywhere.) +[//]: # (We welcome input from users on improving this project.) +[//]: # +[//]: # (Please help us by following this issue template.) +[//]: # (You can delete all blank lines and all lines starting) +[//]: # (with the comment marker, such as this one.) + +Type: code issue + +[//]: # (Include any other relevant information below. Thank you again for) +[//]: # (helping to improve HTTPS Everywhere.) diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md new file mode 100644 index 000000000000..eb831076fd25 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature-request.md @@ -0,0 +1,16 @@ +--- +name: Feature request +about: Request a feature to help us improve HTTPS Everywhere +--- + +[//]: # (Thank you for reporting an issue to HTTPS Everywhere.) +[//]: # (We welcome input from users on improving this project.) +[//]: # +[//]: # (Please help us by following this issue template.) +[//]: # (You can delete all blank lines and all lines starting) +[//]: # (with the comment marker, such as this one.) + +Type: feature request + +[//]: # (Include any other relevant information below. Thank you again for) +[//]: # (helping to improve HTTPS Everywhere.) diff --git a/.github/ISSUE_TEMPLATE/new-ruleset.md b/.github/ISSUE_TEMPLATE/new-ruleset.md new file mode 100644 index 000000000000..59250bbece3f --- /dev/null +++ b/.github/ISSUE_TEMPLATE/new-ruleset.md @@ -0,0 +1,42 @@ +--- +name: New ruleset +about: Request/submit a new ruleset +--- + +[//]: # (Thank you for reporting an issue to HTTPS Everywhere.) +[//]: # (We welcome input from users on improving this project.) +[//]: # +[//]: # (Please help us by following this issue template.) +[//]: # (You can delete all blank lines and all lines starting) +[//]: # (with the comment marker, such as this one.) +[//]: # +[//]: # (Delete all but one of the following "Type" lines.) +[//]: # (Leave in the line that best describes the issue you are reporting.) +[//]: # +[//]: # (If you are submitting a new ruleset, please check the list at) +[//]: # (https://www.eff.org/https-everywhere/atlas/index.html and the open) +[//]: # (issues and pull requests to make sure it doesn't already exist.) + +Type: new ruleset + +[//]: # (If you are reporting a ruleset/website problem, include the top-level) +[//]: # (domain below. For example, if you want to report an issue about) +[//]: # ("one.example.com" and "two.example.com", then the line below should) +[//]: # (be:) +[//]: # +[//]: # (Domain: example.com) +[//]: # +[//]: # (Be sure to remove the parenthesis and comment marker. If you are only) +[//]: # (reporting an issue about "one.example.com", then the line below should) +[//]: # (be:) +[//]: # +[//]: # (Domain: one.example.com) +[//]: # +[//]: # (Only include one top-level domain. If you have more than one top-level) +[//]: # (domain to report, such as both "example.com" and "example.org", open a) +[//]: # (new issue for each top-level domain.) + +Domain: + +[//]: # (Include any other relevant information below. Thank you again for) +[//]: # (helping to improve HTTPS Everywhere.) diff --git a/.github/ISSUE_TEMPLATE/ruleset-issue.md b/.github/ISSUE_TEMPLATE/ruleset-issue.md new file mode 100644 index 000000000000..7b1217b52b42 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/ruleset-issue.md @@ -0,0 +1,22 @@ +--- +name: Ruleset/website issue report +about: Report a issue about a ruleset/website +--- + +[//]: # (Thank you for reporting an issue to HTTPS Everywhere.) +[//]: # (We welcome input from users on improving this project.) +[//]: # +[//]: # (Please help us by following this issue template.) +[//]: # (You can delete all blank lines and all lines starting) +[//]: # (with the comment marker, such as this one.) +[//]: # + +Type: ruleset/website issue + +[//]: # (Uncomment and fill the domain bellow if you belive that yet another) +[//]: # (domain should be added to the existing ruleset.) + +[//]: # Domain: + +[//]: # (Include any other relevant information below. Thank you again for) +[//]: # (helping to improve HTTPS Everywhere.) diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000000..89917ee4ceb8 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,20 @@ +version: 2 +updates: + # Maintain dependencies for npm + - package-ecosystem: "npm" + directory: "/chromium/" + schedule: + interval: "weekly" + day: "monday" + time: "06:00" + assignees: + - "zoracon" + commit-message: + prefix: "npmauto" + labels: + - "dependencies" + pull-request-branch-name: + separator: "-" + reviewers: + - "zoracon" + versioning-strategy: widen diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 000000000000..ef2f1688f71e --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,9 @@ +Fixes #(issue) + +## Type of change + +- [ ] Bug fix (non-breaking change which fixes an issue) +- [ ] New feature (non-breaking change which adds functionality) +- [ ] Refactoring existing code +- [ ] New Ruleset +- [ ] Existing Ruleset diff --git a/.gitignore b/.gitignore index 252f5c330084..104e25eb17f3 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,7 @@ chromium.pem from-preloads/ pkg/ src/chrome/content/rules/default.rulesets -src/chrome/content/rulesets.json +src/chrome/content/rules/default.rulesets.json src/defaults/rulesets.sqlite test_profile/ tokenkeys.py* diff --git a/.gitmodules b/.gitmodules index 049bbbed911c..1919060dd62c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,3 +2,7 @@ path = translations url = https://git.torproject.org/translation.git branch = https_everywhere + +[submodule "lib-wasm"] + path = lib-wasm + url = https://github.com/EFForg/https-everywhere-lib-wasm.git diff --git a/.travis.yml b/.travis.yml index 3fda2a067fb8..f028c3a3915c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,28 +1,29 @@ sudo: required os: linux -dist: trusty +dist: bionic language: python python: 3.6 -group: deprecated-2017Q4 +group: bionic services: - docker + - xvfb matrix: fast_finish: true include: - env: TEST="lint" language: node_js node_js: - - "node" + - "lts/*" - env: TEST="unittests" language: node_js - node_js: node - - "node" + node_js: + - "lts/*" - env: TEST="validations" - env: TEST="fetch" - env: TEST="preloaded" - - addons: - chrome: beta - env: TEST="chrome beta" BROWSER=google-chrome-beta + # - addons: + # chrome: beta + # env: TEST="chrome beta" BROWSER=google-chrome-beta - addons: chrome: stable env: TEST="chrome stable" BROWSER=google-chrome-stable @@ -32,8 +33,5 @@ matrix: - addons: firefox: latest-esr env: TEST="firefox esr" BROWSER=firefox -before_install: - - export DISPLAY=:99.0 - - sh -e /etc/init.d/xvfb start before_script: travis_retry test/setup_travis.sh script: . test/run_travis.sh diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 000000000000..f5636ad09567 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1 @@ +This project is governed by [EFF's Public Projects Code of Conduct](https://www.eff.org/pages/eppcode). diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 85808ff04ebb..3ddaf4439e1d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,41 +1,51 @@ # Table of Contents -* [Welcome!](#welcome) - * [HTTPS Everywhere Source Code Layout](#https-everywhere-source-code-layout) - * [Submitting Changes](#submitting-changes) -* [Contributing Rulesets](#contributing-rulesets) - * [General Info](#general-info) - * [New Rulesets](#new-rulesets) - * [Minimum Requirements for a Ruleset PR](#minimum-requirements-for-a-ruleset-pr) - * [Testing](#testing) - * [Ruleset Style Guide](#ruleset-style-guide) - * [Motivation](#motivation) - * [Indentation & Misc Stylistic Conventions](#indentation--misc-stylistic-conventions) - * [Wildcards in Targets](#wildcards-in-targets) - * [Left-Wildcards](#left-wildcards) - * [Edge-Case: Right-Wildcards](#edge-case-right-wildcards) - * [Complicated Regex in Rules](#complicated-regex-in-rules) - * [Enumerating Subdomains](#enumerating-subdomains) - * [Target Ordering](#target-ordering) - * [Rule Ordering](#rule-ordering) - * [Non-working hosts](#non-working-hosts) - * [Ruleset Names](#ruleset-names) - * [Filenames](#filenames) - * [Cross-referencing Rulesets](#cross-referencing-rulesets) - * [Regex Conventions](#regex-conventions) - * [Snapping Redirects](#snapping-redirects) - * [Example: Ruleset before style guidelines are applied](#example-ruleset-before-style-guidelines-are-applied) - * [Example: Ruleset after style guidelines are applied, with test URLs](#example-ruleset-after-style-guidelines-are-applied-with-test-urls) - * [Removal of Rules](#removal-of-rules) - * [Regular Rules](#regular-rules) - * [HSTS Preloaded Rules](#hsts-preloaded-rules) -* [Contributing Code](#contributing-code) -* [Contributing Documentation](#contributing-documentation) -* [Contributing Translations](#contributing-translations) - -* * * +## General Info -# Welcome! +**On May 31st, 2021 we will end manual additions to the rulesets.** Please see [this explanation on the future of HTTPSE Rulesets.](https://github.com/EFForg/https-everywhere/blob/master/docs/adrs/duckduckgo-smarter-encryption.md) + +We will continue accept requests on rulesets already in our list that are causing significant breakage for users through the summer. However, in autumn, we will begin the plan to ultimately move our crowdsourced rulesets out of the extension in favor of the Smarter Encryption Ruleset. + +- [Table of Contents](#table-of-contents) +- [Welcome](#welcome) + - [HTTPS Everywhere Source Code Layout](#https-everywhere-source-code-layout) + - [Install Dependencies and Test Build](#install-dependencies-and-test-build) + - [Precommit Testing](#precommit-testing) + - [Testing](#testing) + - [Quickly Testing a Ruleset](#quickly-testing-a-ruleset) + - [Coverage](#coverage) + - [Submitting Changes](#submitting-changes) + - [Contributing Rulesets](#contributing-rulesets) + - [General Info](#general-info) + - [New Rulesets](#new-rulesets) + - [Minimum Requirements for a Ruleset PR](#minimum-requirements-for-a-ruleset-pr) + - [Ruleset Style Guide](#ruleset-style-guide) + - [Motivation](#motivation) + - [Indentation & Misc Stylistic Conventions](#indentation--misc-stylistic-conventions) + - [Wildcards in Targets](#wildcards-in-targets) + - [Left-Wildcards](#left-wildcards) + - [Edge-Case: Right-Wildcards](#edge-case-right-wildcards) + - [Complicated Regex in Rules](#complicated-regex-in-rules) + - [Enumerating Subdomains](#enumerating-subdomains) + - [Target Ordering](#target-ordering) + - [Rule Ordering](#rule-ordering) + - [Non-working hosts](#non-working-hosts) + - [Ruleset Names](#ruleset-names) + - [Filenames](#filenames) + - [Cross-referencing Rulesets](#cross-referencing-rulesets) + - [Regex Conventions](#regex-conventions) + - [Snapping Redirects](#snapping-redirects) + - [Example: Ruleset before style guidelines are applied](#example-ruleset-before-style-guidelines-are-applied) + - [Example: Ruleset after style guidelines are applied, with test URLs](#example-ruleset-after-style-guidelines-are-applied-with-test-urls) + - [Removal of Rules](#removal-of-rules) + - [Regular Rules](#regular-rules) + - [HSTS Preloaded Rules](#hsts-preloaded-rules) + - [Contributing Code](#contributing-code) + - [Contributing Documentation](#contributing-documentation) + - [Pull Requests from Deleted Accounts](#pull-requests-from-deleted-accounts) + - [Contributing Translations](#contributing-translations) + +# Welcome Welcome, and thank you for your interest in contributing to HTTPS Everywhere! HTTPS Everywhere depends on the open source community for its continued success, so any contribution is appreciated. @@ -43,12 +53,13 @@ One of the things that makes it easy to contribute to HTTPS Everywhere is that y If you want to have the greatest impact, however, you can help be a ruleset maintainer. Ruleset maintainers are trusted volunteers who examine rulesets contributed by others and work with them to ensure that these rulesets work properly and are styled correctly before they're merged in. While we currently have a couple of extremely dedicated and extremely proficient ruleset maintainers, the backlog of sites to add to HTTPS Everywhere just keeps growing, and they need help! If you would like to volunteer to become one, the best thing to do is to build trust in your work by monitoring the repository, contributing pull requests, and commenting on issues that interest you. Then you can contact us at https-everywhere-rules-owner [at] eff <dot> org expressing your interest in helping out. -If you get stuck we have two publicly-archived mailing lists: the https-everywhere list (https://lists.eff.org/mailman/listinfo/https-everywhere) is for discussing the project as a whole, and the https-everywhere-rulesets list (https://lists.eff.org/mailman/listinfo/https-everywhere-rules) is for discussing the `rulesets` and their contents, including patches and git pull requests. +If you get stuck we have two publicly-archived mailing lists: the [https-everywhere list](https://lists.eff.org/mailman/listinfo/https-everywhere) is for discussing the project as a whole, and the [https-everywhere-rulesets list](https://lists.eff.org/mailman/listinfo/https-everywhere-rules) is for discussing the `rulesets` and their contents, including patches and git pull requests. You can also find more information on about HTTPS Everywhere on our [FAQ](https://www.eff.org/https-everywhere/faq) page. -Thanks again, and we look forward to your contributions! +Also, please remember that this project is governed by [EFF's Public Projects Code of Conduct](https://www.eff.org/pages/eppcode). +Thanks again, and we look forward to your contributions! ## HTTPS Everywhere Source Code Layout @@ -62,37 +73,98 @@ The utilities ([`utils`](utils) top-level path) include scripts that build the e Tests are performed in headless browsers and located in the [`test`](test) top-level path. These are written in Python, and some of the wrappers for these tests are in shell scripts. +Source Tree: + + chromium/ WebExtension source code (for Firefox & Chromium/chrome) + chromium/external External dependencies + chromium/test Unit tests + + rules/ Symbolic link to src/chrome/content/rules + + src/chrome/content/rules Ruleset files live here + + test/ Travis unit test source code live here + + utils/ Various utilities (includes some Travis test source) + +## Install Dependencies and Test Build + +Get the packages you need and install a git hook to run tests before push: + + bash install-dev-dependencies.sh + +Run the ruleset validations and browser tests: + + bash test.sh + +Run the latest code and rulesets in a standalone Firefox profile: + + bash test/firefox.sh --justrun + +Run the latest code and rulesets in a standalone profile for a specific version of Firefox: + + FIREFOX=/path/to/firefox bash test/firefox.sh --justrun + +Run the latest code and rulesets in a standalone Chromium profile: + + bash test/chromium.sh --justrun + +Run the latest code and rulesets in a standalone Tor Browser profile: + + bash test/tor-browser.sh path_to_tor_browser.tar.xz + +Build the Firefox (.xpi) & Chromium (.crx) extensions: + + bash make.sh + +Both of the build commands store their output under pkg/. + +## Precommit Testing + +One can run the available test suites automatically by enabling the precommit +hook provided with: + + ln -s ../../hooks/precommit .git/hooks/pre-commit + +## Testing + +### Quickly Testing a Ruleset + +1. Open a version of the Firefox or Chrome browser without HTTPS Everywhere loaded to the HTTP endpoint + +2. From your working ruleset branch, test with running `bash test/firefox.sh --justrun` or `bash test/chromium.sh --justrun` to open a fresh profile with the extension loaded and click around and compare the look and functionality of both sites. If something fails to load or looks strange, you may be able to debug the problem by opening the network tab of your browser debugging tool. Modify the `ruleset` until you get it in a good state - you'll have to re-run the HTTPS Everywhere-equipped browser upon each change. + +### Coverage + +Please reference [HTTPS Ruleset Checker](https://github.com/EFForg/https-everywhere/blob/master/test/rules/README.md) to properly test rulesets against our tests before sending a pull request. + ## Submitting Changes To submit changes, open a pull request from our [GitHub repository](https://github.com/efforg/https-everywhere). HTTPS Everywhere is maintained by a limited set of staff and volunteers. Please be mindful that we may take a while before we're able to review your contributions. -* * * - -# Contributing Rulesets - -## General Info +## Contributing Rulesets Thanks for your interest in contributing to the HTTPS Everywhere `rulesets`! There's just a few things you should know before jumping in. First some terminology, which will help you understand how exactly `rulesets` are structured and what each one contains: -- `ruleset`: a scope in which `rules`, `targets`, and `tests` are contained. `rulesets` are usually named after the entity which controls the group of `targets` contained in it. There is one `ruleset` per XML file within the `src/chrome/content/rules` directory. -- `target`: a Fully Qualified Domain Name which may include a wildcard specified by `*.` on the left side, which `rules` are applied to. There may be many `targets` within any given `ruleset`. -- `rule`: a specific regular expression rewrite that is applied for all matching `targets` within the same `ruleset`. There may be many `rules` within any given `ruleset`. -- `test`: a URL for which a request is made to ensure that the rewrite is working properly. There may be many `tests` within any given `ruleset`. +* `ruleset`: a scope in which `rules`, `targets`, and `tests` are contained. `rulesets` are usually named after the entity which controls the group of `targets` contained in it. There is one `ruleset` per XML file within the `src/chrome/content/rules` directory. +* `target`: a Fully Qualified Domain Name which may include a wildcard specified by `*.` on the left side, which `rules` are applied to. There may be many `targets` within any given `ruleset`. +* `rule`: a specific regular expression rewrite that is applied for all matching `targets` within the same `ruleset`. There may be many `rules` within any given `ruleset`. +* `test`: a URL for which a request is made to ensure that the rewrite is working properly. There may be many `tests` within any given `ruleset`. ```xml - + - + - + ``` @@ -100,31 +172,27 @@ HTTPS Everywhere includes tens of thousands of `rulesets`. Any one of these sit Some `rulesets` have the attribute `platform="mixedcontent"`. These `rulesets` cause problems in browsers that enable active mixed-content (loading insecure resources in a secure page) blocking. When browsers started enforcing active mixed-content blocking, some HTTPS sites started to break. That's why we introduced this tag - it disables those `rulesets` for browsers blocking active mixed content. It is likely that many of these sites have fixed this historical problem, so we particularly encourage `ruleset` contributors to fix these `rulesets` first: - git grep -i mixedcontent src/chrome/content/rules + git grep -i mixedcontent src/chrome/content/rules -## New Rulesets +### New Rulesets -If you want to create new `rulesets` to submit to us, we expect them to be in the `src/chrome/content/rules` directory. That directory also contains a useful script, `make-trivial-rule`, to create a simple `ruleset` for a specified domain. There is also a script called `utils/trivial-validate.py`, to check all the pending `rulesets` for several common errors and oversights. For example, if you wanted to make a `ruleset` for the `example.com` domain, you could run: -``` +If you want to create new `rulesets` to submit to us, we expect them to be in the `src/chrome/content/rules` directory. That directory also contains a useful script, `make-trivial-rule`, to create a simple `ruleset` for a specified domain. There is also a script in `test/validations/special/run.py`, to check all the pending `rulesets` for several common errors and oversights. For example, if you wanted to make a `ruleset` for the `example.com` domain, you could run: + +```bash cd src/chrome/content/rules bash ./make-trivial-rule example.com ``` + This would create `Example.com.xml`, which you could then take a look at and edit based on your knowledge of any specific URLs at `example.com` that do or don't work in HTTPS. Please have a look at our Ruleset Style Guide below, where you can find useful tips about finding more subdomains. Our goal is to have as many subdomains covered as we can find. -## Minimum Requirements for a Ruleset PR +### Minimum Requirements for a Ruleset PR There are several volunteers to HTTPS Everywhere who have graciously dedicated their time to look at the `ruleset` contributions and work with contributors to ensure quality of the pull requests before merging. It is typical for there to be several back-and-forth communications with these `ruleset` maintainers before a PR is in a good shape to merge. Please be patient and respectful, the maintainers are donating their time for no benefit other than the satisfaction of making the web more secure. They are under no obligation to merge your request, and may reject it if it is impossible to ensure quality. You can identify these volunteers by looking for the "Collaborator" identifier in their comments on HTTPS Everywhere issues and pull requests. -In the back-and-fourth process of getting the `ruleset` in good shape, there may be many commits made. It is this project's convention to squash-and-merge these commits into a single commit before merging into the project. If your commits are cryptographically signed, we may ask you to squash the commits yourself in order to preserve this signature. Otherwise, we may squash them ourselves before merging. +In the back-and-forth process of getting the `ruleset` in good shape, there may be many commits made. It is this project's convention to squash-and-merge these commits into a single commit before merging into the project. If your commits are cryptographically signed, we may ask you to squash the commits yourself in order to preserve this signature. Otherwise, we may squash them ourselves before merging. We prefer small, granular changes to the rulesets. Not only are these easier to test and review, this results in cleaner commits. -## Testing - -A general workflow for testing sites that provide both HTTP and HTTPS follows. Open a version of the browser of your choice without HTTPS Everywhere loaded to the HTTP endpoint, alongside the browser with the latest code and rulesets for HTTPS Everywhere loaded to the HTTPS endpoint (as described in [README.md](README.md).) Click around and compare the look and functionality of both sites. - -If something fails to load or looks strange, you may be able to debug the problem by opening the network tab of your browser debugging tool. Modify the `ruleset` until you get it in a good state - you'll have to re-run the HTTPS Everywhere-equipped browser upon each change. - ## Ruleset Style Guide ### Motivation @@ -170,19 +238,19 @@ In general, avoid using open-ended regex in rules. In certain cases, open-ended Examples: * Rulesets with a lot of domains that we can catch with a simple regex that would be tedious and error-prone to list individually, like [`360.cn.xml`](https://github.com/EFForg/https-everywhere/blob/9698e64a2de7cf37509ab13ba9dcfd5bd4f84a95/src/chrome/content/rules/360.cn.xml#L98-L103) -* CDNs with an arbitrarily large number of subdomains, like https://github.com/EFForg/https-everywhere/pull/7484#issuecomment-262852427 . +* CDNs with an arbitrarily large number of subdomains ([example](https://github.com/EFForg/https-everywhere/pull/7484#issuecomment-262852427)). ### Enumerating Subdomains If you're not sure what subdomains might exist, you can install the `Sublist3r` tool: - git clone https://github.com/aboul3la/Sublist3r.git - cd Sublist3r - sudo pip install -r requirements.txt # or use virtualenv... + git clone https://github.com/aboul3la/Sublist3r.git + cd Sublist3r + sudo pip install -r requirements.txt # or use virtualenv... Then you can to enumerate the list of subdomains: - python sublist3r.py -d example.com -e Baidu,Yahoo,Google,Bing,Ask,Netcraft,Virustotal,SSL + python sublist3r.py -d example.com -e Baidu,Yahoo,Google,Bing,Ask,Netcraft,Virustotal,SSL Alternatively, you can iteratively use Google queries and enumerate the list of results like such: @@ -196,15 +264,15 @@ Alternatively, you can iteratively use Google queries and enumerate the list of In all cases where there is a list of domains, sort them in alphabetical order starting from the top level domain at the right reading left, moving ^ and www to the top of their group. For example: - example.com - www.example.com - a.example.com - www.a.example.com - b.a.example.com - b.example.com - example.net - www.example.net - a.example.net + example.com + www.example.com + a.example.com + www.a.example.com + b.a.example.com + b.example.com + example.net + www.example.net + a.example.net ### Rule Ordering @@ -217,23 +285,23 @@ It is useful to list hosts that do not work in the comments of a `ruleset`. Thi For easy reading, please avoid using UTF characters unless in the rare instances that they are part of the hostname itself. Example: + ```xml ``` @@ -278,17 +346,17 @@ Prefer capturing groups `(www\.)?` over non-capturing `(?:www\.)?`. The non-capt ### Snapping Redirects -Avoid snapping redirects. For instance, if https://foo.fm serves HTTPS correctly, but redirects to https://foo.com, it's tempting to rewrite foo.fm to foo.com, to save users the latency of the redirect. However, such rulesets are less obviously correct and require more scrutiny. And the redirect can go out of date and cause problems. HTTPS Everywhere rulesets should change requests the minimum amount necessary to ensure a secure connection. +Avoid snapping redirects. For instance, if `https://foo.fm` serves HTTPS correctly, but redirects to `https://foo.com`, it's tempting to rewrite `foo.fm` to `foo.com`, to save users the latency of the redirect. However, such rulesets are less obviously correct and require more scrutiny. And the redirect can go out of date and cause problems. HTTPS Everywhere rulesets should change requests the minimum amount necessary to ensure a secure connection. ### Example: Ruleset before style guidelines are applied ```xml - - + + - + ``` @@ -309,8 +377,7 @@ Avoid snapping redirects. For instance, if https://foo.fm serves HTTPS correctly - + ``` @@ -326,60 +393,45 @@ In `utils` we have a tool called `hsts-prune` which removes `targets` from rules > Let `included domain` denote either a `target`, or a parent of a `target`. Let `supported browsers` include the ESR, Dev, and Stable releases of Firefox, and the Stable release of Chromium. If `included domain` is a parent of the `target`, the `included domain` must be present in the HSTS preload list for all `supported browsers` with the relevant flag which denotes inclusion of subdomains set to `true`. If `included domain` is the `target` itself, it must be included the HSTS preload list for all `supported browsers`. Additionally, if the http endpoint of the `target` exists, it must issue a 3XX redirect to the https endpoint for that target. Additionally, the https endpoint for the `target` must deliver a `Strict-Transport-Security` header with the following directives present: > -> - `max-age` >= 10886400 -> - `includeSubDomains` -> - `preload` +> * `max-age` >= 31536000 +> * `includeSubDomains` +> * `preload` > > If all the above conditions are met, a contributor may remove the `target` from the HTTPS Everywhere rulesets. If all targets are removed for a ruleset, the contributor is advised to remove the ruleset file itself. The ruleset `rule` and `test` tags may need to be modified in order to pass the ruleset coverage test. Every new pull request automatically has the `hsts-prune` utility applied to it as part of the continual integration process. If a new PR introduces a `target` which is preloaded, it will fail the CI test suite. See: -- `.travis.yml` -- `test/run_travis.sh` - -* * * +* `.travis.yml` +* `test/run_travis.sh` -# Contributing Code +## Contributing Code In addition to `ruleset` contributions, we also encourage code contributions to HTTPS Everywhere. There are a few considerations to keep in mind when contributing code. Officially supported browsers: -- Firefox Stable -- Firefox ESR -- Chromium Stable +* Firefox Stable +* Firefox ESR +* Chromium Stable -We also informally support Opera browser, but do not have tooling around testing Opera. Firefox ESR is supported because this is what the [Tor Browser](https://www.torproject.org/projects/torbrowser.html.en), which includes HTTPS Everywhere, is built upon. For the test commands, refer to [README.md](README.md). +We also informally support the Opera browser, but do not have tooling around testing Opera. Firefox ESR is supported because this is what the [Tor Browser](https://www.torproject.org/projects/torbrowser.html.en), which includes HTTPS Everywhere, is built upon. For the test commands, refer to [README.md](README.md). -The current extension maintainer is @Hainish. You can tag him for PRs which involve the core codebase. +The current extension maintainer is [@zoracon](https://github.com/zoracon). You can tag them for PRs which involve the core codebase. Several of our utilities and our full test suite is written in Python. Eventually we would like the whole codebase to be standardized as JavaScript. If you are so inclined, it would be helpful to rewrite the tooling and tests into JavaScript while maintaining the functionality. -* * * - -# Contributing Documentation +## Contributing Documentation Standalone documentation should be written in [Markdown](https://en.wikipedia.org/wiki/Markdown) that follows the [Google style guide](https://github.com/google/styleguide/blob/gh-pages/docguide/style.md). If you are updating existing documentation that does not follow the Google style guide, then you should follow the style of the file you are updating. * * * -# Pull Requests from Deleted Accounts +## Pull Requests from Deleted Accounts Sometimes a contributor will [delete their GitHub account](https://help.github.com/articles/deleting-your-user-account/) after submitting a pull request, resulting in the pull request being associated with the [Ghost user (@ghost)](https://github.com/ghost). These @ghost pull requests can cause problems for HTTPS Everywhere maintainers, leaving questions unanswered and closing off the possibility of receiving maintainer feedback to solicit clarification or request changes. We ask that if you want to delete your GitHub account, you either close your HTTPS Everywhere pull requests before you delete your account, or wait to delete your account until we merge your pull requests. Otherwise, maintainers are free to close @ghost pull requests without any comment. -* * * - -# Contributing Translations - -HTTPS Everywhere translations are handled through Transifex. The easiest way to help with translations is to [create a Transifex account](https://www.transifex.com/signup/) if you don't already have one. Then log into your account and click "Explore", then search for "Tor Project", and click on The Tor Project. Then choose the language you plan to translate into, click on the name of that language, and then click "Join team" and "Go" to accept joining the translation team for your language. - -Then, in the Tor Project resources list, find and click the link for the file - - HTTPS Everywhere - https-everywhere.dtd - -and choose "Translate now" to enter the translation interface. - -* * * +## Contributing Translations +We are reviewing our process around translations and currently discussing ways to improve. Translations are still processed under the same entity and those who have an account already, do not need to take action at this time. Thank you for your contributions. diff --git a/LICENSE.txt b/LICENSE.txt index 454ba6460dab..7c7a3bde0e95 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,12 +1,15 @@ HTTPS Everywhere: -Copyright © 2010-2017 Electronic Frontier Foundation and others +Copyright © 2010-2021 Electronic Frontier Foundation and others Licensed GPL v2+ HTTPS Everywhere Rulesets (src/chrome/content/rules): To the extent copyright applies to the rulesets, they can be used according to GPL v2 or later. +The DuckDuckGo Smarter Encryption list, utilized by HTTPS Everywhere at https://www.https-rulesets.org/ddg, is publicly available under the Creative Commons Attribution-NonCommercial-ShareAlike 4.0. International license. +If you'd like to license the list for commercial use, please reach out to: https://help.duckduckgo.com/duckduckgo-help-pages/company/contact-us/ + Issue Format Bot (utils/issue-format-bot/*): Copyright © 2017 AJ Jordan, AGPLv3+ -The build system incorporates code from Python 3.6 +The build system incorporates code from Python 3.6 and Python 3 respectively Copyright © 2001-2018 Python Software Foundation; All Rights Reserved diff --git a/README.md b/README.md index 9e10be63cde6..d3255879024e 100644 --- a/README.md +++ b/README.md @@ -1,69 +1,23 @@ -[HTTPS Everywhere](https://www.eff.org/https-everywhere) [![Build Status](https://travis-ci.org/EFForg/https-everywhere.svg?branch=master)](https://travis-ci.org/EFForg/https-everywhere) +[![Build Status](https://travis-ci.com/EFForg/https-everywhere.svg?branch=master)](https://travis-ci.com/EFForg/https-everywhere) [![Coverage Status](https://coveralls.io/repos/github/EFForg/https-everywhere/badge.svg?branch=master)](https://coveralls.io/github/EFForg/https-everywhere?branch=master) -================ -Getting Started ---------------- +# Update on HTTPS Everywhere +⚠️This project is no longer being maintained or updated. Please uninstall and direct users to the advice below to switch to HTTPS by default natively. -Get the packages you need and install a git hook to run tests before push: +You no longer need HTTPS Everywhere to set HTTPS by default! Major browsers now offer native support for an HTTPS only mode. +Find out how to turn it on [here](https://www.eff.org/https-everywhere/set-https-default-your-browser). - bash install-dev-dependencies.sh +This extension will be sunset by January 2023. -Run the ruleset validations and browser tests: - bash test.sh +# Getting Started With HTTPS Everywhere -Run the latest code and rulesets in a standalone Firefox profile: +HTTPS Everywhere is a Firefox, Chrome, and Opera extension that encrypts your communications with many major websites, making your browsing more secure. Encrypt the web: [Install HTTPS Everywhere today](https://www.eff.org/https-everywhere). - bash test/firefox.sh --justrun +## For Users -Run the latest code and rulesets in a standalone profile for a specific version of Firefox: +Want to install or uninstall HTTPS Everywhere? Have questions? [View this guide](https://www.eff.org/https-everywhere) for installation and here for [FAQs](https://www.eff.org/https-everywhere/faq). - FIREFOX=/path/to/firefox bash test/firefox.sh --justrun +## For Website Owners and Maintainers -Run the latest code and rulesets in a standalone Chromium profile: - - bash test/chromium.sh --justrun - -Run the latest code and rulesets in a standalone Tor Browser profile: - - bash test/tor-browser.sh path_to_tor_browser.tar.xz - -Build the Firefox (.xpi) & Chromium (.crx) extensions: - - bash make.sh - -Both of the build commands store their output under pkg/. - -Precommit Testing ------------------ - -One can run the available test suites automatically by enabling the precommit -hook provided with: - - ln -s ../../hooks/precommit .git/hooks/pre-commit - -Source Tree ------------ - -This is the source tree for HTTPS Everywhere for Firefox and Chrome. - -Important directories you might want to know about - - - chromium/ WebExtension source code (for Firefox & Chromium/chrome) - chromium/external External dependencies - chromium/test Unit tests - - rules/ Symbolic link to src/chrome/content/rules - - src/chrome/content/rules Ruleset files live here - - test/ Travis unit test source code live here - - utils/ Various utilities (includes some Travis test source) - -Hacking on the Source Code --------------------------- - -Please refer to our [contributing](CONTRIBUTING.md) document to contribute to the project. +Want to deploy HTTPS on your site? [View this guide](https://www.eff.org/https-everywhere/deploying-https). diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 000000000000..186e6892ac86 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,17 @@ +# Security Policy + +## Supported Versions + +Use this section to tell people about which versions of your project are +currently being supported with security updates. + +| Browser | Supported | +| --------------- | ------------------ | +| Firefox | :white_check_mark: | +| Firefox Android | :white_check_mark: | +| Chrome | :white_check_mark: | +| Opera | :white_check_mark: | + +## Reporting a Vulnerability + +https://www.eff.org/security diff --git a/browser-dist/README.md b/browser-dist/README.md new file mode 100644 index 000000000000..47385bff828a --- /dev/null +++ b/browser-dist/README.md @@ -0,0 +1,32 @@ +# Browser Distribution Special Cases + +## Edge + +Case: +Edge does not accept CRX files for direct upload to store. + +Work around: `edge.sh` + +## Opera + +Case: +Opera does not accept `default.rulesets` due to strict MIME type restriction + +In order to not disrupt many downstream channels, we are building a separate CRX file for Opera for now. + +Work around: `opera.sh` + +## Build process + +These scripts are normally ran after main build and deployment is finished. The reason being we want a confirmed CRX file upload to Chrome to build the Edge zip and Opera crx distributions on. + +## CRX Verification of Files before Upload + +Install Node Package for CRX Verification via NPM +`[sudo] npm -g i crx3-utils` + +### Verify CRX file + +1. `crx3-info rsa 0 < $crx > public.pem` +2. `crx3-verify rsa 0 public.pem < $crx` +3. `echo "CRX verified"` diff --git a/browser-dist/edge.sh b/browser-dist/edge.sh new file mode 100755 index 000000000000..d8d62cd4a259 --- /dev/null +++ b/browser-dist/edge.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# Written for transparency and reproducibility on Edge upload +# See browser-dist.md for more info + +VERSION=`python3 -c "import json ; print(json.loads(open('../chromium/manifest.json').read())['version'])"` +crx_cws="../pkg/https-everywhere-$VERSION-cws.crx" +crx_eff="../pkg/https-everywhere-$VERSION-eff.crx" + +crx3-info rsa 0 < $crx_cws > public.pem +crx3-verify rsa 0 public.pem < $crx_cws +echo "CRX verified" + +#Build Edge Zip File +echo "Building Edge Zip" +crx3-info < $crx_eff | awk '/^header/ {print $2}' \ + | xargs -I% dd if=$crx_eff iflag=skip_bytes skip=% > https-everywhere-$VERSION-edge.zip + +echo >&2 "Edge zip package has sha256sum: `openssl dgst -sha256 -binary "https-everywhere-$VERSION-edge.zip" | xxd -p`" + +mv https-everywhere-$VERSION-edge.zip ../pkg/https-everywhere-$VERSION-edge.zip + +echo "Created pkg/https-everywhere-$VERSION-edge.zip" + +#Now remove unneeded pem file +rm public.pem \ No newline at end of file diff --git a/browser-dist/opera.sh b/browser-dist/opera.sh new file mode 100755 index 000000000000..261b8ad41b6c --- /dev/null +++ b/browser-dist/opera.sh @@ -0,0 +1,168 @@ +#!/usr/bin/env bash + +# Build an HTTPS Everywhere Opera CRX Distribution +# Written for transparency and reproducibility on Opera upload +# See browser-dist.md for more info + +# To build the current state of the tree: +# +# ./browser-dist-opera.sh +# +# To build a particular tagged release: +# +# ./browser-dist-opera.sh +# +# eg: +# +# ./browser-dist-opera.sh 2017.8.15 +# +# Note that .crx files must be signed; this script makes you a +# "dummy-chromium.pem" private key for you to sign your own local releases, +# but these .crx files won't detect and upgrade to official HTTPS Everywhere +# releases signed by EFF :/. We should find a more elegant arrangement. + +! getopt --test > /dev/null +if [[ ${PIPESTATUS[0]} -ne 4 ]]; then + echo 'I’m sorry, `getopt --test` failed in this environment.' + exit 1 +fi + +OPTIONS=eck: +LONGOPTS=remove-extension-update,remove-update-channels,key: +! PARSED=$(getopt --options=$OPTIONS --longoptions=$LONGOPTS --name "$0" -- "$@") +if [[ ${PIPESTATUS[0]} -ne 0 ]]; then + # e.g. return value is 1 + # then getopt has complained about wrong arguments to stdout + exit 2 +fi + +# read getopt’s output this way to handle the quoting right: +eval set -- "$PARSED" + +REMOVE_EXTENSION_UPDATE=false +REMOVE_UPDATE_CHANNELS=false +KEY=$(pwd)/dummy-chromium.pem +while true; do + case "$1" in + -e|--remove-extension-update) + REMOVE_EXTENSION_UPDATE=true + shift + ;; + -c|--remove-update-channels) + REMOVE_UPDATE_CHANNELS=true + shift + ;; + -k|--key) + KEY="$2" + shift 2 + ;; + --) + shift + break + ;; + *) + echo "Programming error" + exit 3 + ;; + esac +done + +if [ "${KEY:0:1}" != "/" ]; then + echo "Key must be specified as an absolute path." + exit 4 +fi + +cd $(dirname $0) + +if [ -n "$1" ]; then + BRANCH=`git branch | head -n 1 | cut -d \ -f 2-` + SUBDIR=checkout + [ -d $SUBDIR ] || mkdir $SUBDIR + cp -r -f -a .git $SUBDIR + cd $SUBDIR + git reset --hard "$1" + git submodule update --recursive -f +fi + +VERSION=`python3 -c "import json ; print(json.loads(open('../chromium/manifest.json').read())['version'])"` + +echo "Building version" $VERSION + +[ -d pkg ] || mkdir -p ../pkg +[ -e pkg/crx-opera ] && rm -rf ../pkg/crx-opera + +# Clean up obsolete ruleset databases, just in case they still exist. +rm -f src/chrome/content/rules/default.rulesets src/defaults/rulesets.sqlite + +mkdir -p ../pkg/crx-opera/rules +cd ../pkg/crx-opera +cp -a ../../chromium/* ./ +# Turn the Firefox translations into the appropriate Chrome format: +rm -rf _locales/ +mkdir _locales/ +python3 ../../utils/chromium-translations.py ../../translations/ _locales/ +python3 ../../utils/chromium-translations.py ../../src/chrome/locale/ _locales/ +do_not_ship="*.py *.xml" +rm -f $do_not_ship + +mkdir wasm +cp ../../lib-wasm/pkg/*.wasm wasm +cp ../../lib-wasm/pkg/*.js wasm + +cd ../.. + +python3 ./utils/merge-rulesets.py || exit 5 + +cp src/chrome/content/rules/default.rulesets.json pkg/crx-opera/rules/default.rulesets.json + +sed -i -e "s/VERSION/$VERSION/g" pkg/crx-opera/manifest.json + +for x in `cat .build_exclusions`; do + rm -rf pkg/crx-opera/$x +done + +#Create Opera CRX caveat +cd pkg/crx-opera +sed -i 's/rules\/default.rulesets/rules\/default.rulesets.json/g' background-scripts/update.js +cd ../.. + +# Remove the 'applications' manifest key from the crx version of the extension, change the 'author' string to a hash, and add the "update_url" manifest key +# "update_url" needs to be present to avoid problems reported in https://bugs.chromium.org/p/chromium/issues/detail?id=805755 +python3 -c "import json; m=json.loads(open('pkg/crx-opera/manifest.json').read()); m['author']={'email': 'eff.software.projects@gmail.com'}; del m['applications']; open('pkg/crx-opera/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))" + +# If the --remove-update-channels flag is set, remove all out-of-band update channels +if $REMOVE_UPDATE_CHANNELS; then + echo "Flag --remove-update-channels specified. Removing all out-of-band update channels." + echo "require.scopes.update_channels.update_channels = [];" >> pkg/crx-opera/background-scripts/update_channels.js +fi + +if [ -n "$BRANCH" ] ; then + crx_opera="pkg/https-everywhere-$VERSION-opera.crx" +else + crx_opera="pkg/https-everywhere-$VERSION-pre-opera.crx" +fi +if ! [ -f "$KEY" ] ; then + echo "Making a dummy signing key for local build purposes" + openssl genrsa -out /tmp/dummy-chromium.pem 768 + openssl pkcs8 -topk8 -nocrypt -in /tmp/dummy-chromium.pem -out $KEY +fi + +# now pack the crx'es +BROWSER="chromium-browser" +which $BROWSER || BROWSER="chromium" + +$BROWSER --no-message-box --pack-extension="pkg/crx-opera" --pack-extension-key="$KEY" 2> /dev/null + +mv pkg/crx-opera.crx $crx_opera + +echo >&2 "Opera crx package has sha256sum: `openssl dgst -sha256 -binary "$crx_opera" | xxd -p`" +echo >&2 "Total included rules: `find src/chrome/content/rules -name "*.xml" | wc -l`" +echo >&2 "Rules disabled by default: `find src/chrome/content/rules -name "*.xml" | xargs grep -F default_off | wc -l`" + +echo "Created $crx_opera" + +if [ -n "$BRANCH" ]; then + cd .. + cp $SUBDIR/$crx_opera pkg + rm -rf $SUBDIR +fi diff --git a/chromium/.eslintignore b/chromium/.eslintignore index 79f09976bfe8..6f1043967f94 100644 --- a/chromium/.eslintignore +++ b/chromium/.eslintignore @@ -1 +1 @@ -external/* +external/ diff --git a/chromium/.eslintrc.json b/chromium/.eslintrc.json index 2851620f3a87..c696ae27c66e 100644 --- a/chromium/.eslintrc.json +++ b/chromium/.eslintrc.json @@ -5,17 +5,23 @@ "webextensions": true }, "parserOptions": { - "ecmaVersion": 2017, + "ecmaVersion": 2019, "sourceType": "script" }, "rules": { "indent": ["error", 2, {"outerIIFEBody": 0}], "no-unused-vars": "error", "no-undef": "error", - "strict": ["error", "global"] + "strict": ["error", "global"], + "semi": ["error", "always"], + "space-before-blocks": ["error"], + "brace-style": ["error"], + "no-invalid-regexp": "error", + "no-trailing-spaces": "error" }, "globals": { "exports": true, - "require": true + "require": true, + "wasm_bindgen": true } } diff --git a/chromium/.gitignore b/chromium/.gitignore index 7f2b090f975b..94dda0257826 100644 --- a/chromium/.gitignore +++ b/chromium/.gitignore @@ -1 +1,2 @@ +.nyc_output updates.xml diff --git a/chromium/background-scripts/background.js b/chromium/background-scripts/background.js new file mode 100644 index 000000000000..331e6dc22432 --- /dev/null +++ b/chromium/background-scripts/background.js @@ -0,0 +1,976 @@ +"use strict"; + +(function(exports) { + +const rules = require('./rules'), + store = require('./store'), + incognito = require('./incognito'), + util = require('./util'), + update = require('./update'), + { update_channels } = require('./update_channels'), + wasm = require('./wasm'), + ipUtils = require('./ip_utils'), + ssl_codes = require('./ssl_codes'); + +let all_rules = new rules.RuleSets(); +let blooms = []; + +async function initialize() { + await wasm.initialize(); + await store.initialize(); + await store.performMigrations(); + await initializeStoredGlobals(); + await getUpgradeToSecureAvailable(); + await update.initialize(store, initializeAllRules); + await all_rules.loadFromBrowserStorage(store, update.applyStoredRulesets); + await update.applyStoredBlooms(blooms); + await incognito.onIncognitoDestruction(destroy_caches); +} +initialize(); + +async function initializeAllRules() { + const r = new rules.RuleSets(); + await r.loadFromBrowserStorage(store, update.applyStoredRulesets); + Object.assign(all_rules, r); + blooms.length = 0; + await update.applyStoredBlooms(blooms); +} + +/** + * Load preferences. Structure is: + * { + * httpNowhere: Boolean, + * isExtensionEnabled: Boolean + * } + */ +var httpNowhereOn = false; +var isExtensionEnabled = true; +let disabledList = new Set(); +let httpOnceList = new Set(); + +/** + * Check if HTTPS Everywhere should be ON for host + */ +function isExtensionDisabledOnSite(host) { + // make sure the host is not matched in the httpOnceList + if (httpOnceList.has(host)) { + return true; + } + + // make sure the host is not matched in the disabledList + if (disabledList.has(host)) { + return true; + } + + // make sure the host is matched by any wildcard expressions in the disabledList + const experessions = util.getWildcardExpressions(host); + for (const expression of experessions) { + if (disabledList.has(expression)) { + return true; + } + } + + // otherwise return false + return false; +} + +function initializeStoredGlobals() { + return new Promise(resolve => { + store.get({ + httpNowhere: false, + globalEnabled: true, + enableMixedRulesets: false, + disabledList: [] + }, function(item) { + httpNowhereOn = item.httpNowhere; + isExtensionEnabled = item.globalEnabled; + for (let disabledSite of item.disabledList) { + disabledList.add(disabledSite); + } + updateState(); + + rules.settings.enableMixedRulesets = item.enableMixedRulesets; + + resolve(); + }); + }); +} + +/** @type {boolean} */ +let upgradeToSecureAvailable = false; + +function getUpgradeToSecureAvailable() { + if (typeof browser !== 'undefined') { + return browser.runtime.getBrowserInfo().then(function(info) { + let version = info.version.match(/^(\d+)/)[1]; + if (info.name == "Firefox" && version >= 59) { + upgradeToSecureAvailable = true; + } else { + upgradeToSecureAvailable = false; + } + }); + } else { + return new Promise(resolve => { + upgradeToSecureAvailable = false; + resolve(); + }); + } +} + +chrome.storage.onChanged.addListener(async function(changes, areaName) { + if (areaName === 'sync' || areaName === 'local') { + if ('httpNowhere' in changes) { + httpNowhereOn = changes.httpNowhere.newValue; + updateState(); + } + if ('globalEnabled' in changes) { + isExtensionEnabled = changes.globalEnabled.newValue; + updateState(); + } + if ('enableMixedRulesets' in changes) { + // Don't require users to restart the browsers + rules.settings.enableMixedRulesets = changes.enableMixedRulesets.newValue; + initializeAllRules(); + } + if ('debugging_rulesets' in changes) { + initializeAllRules(); + } + } +}); + +if (chrome.tabs) { + chrome.tabs.onActivated.addListener(function() { + updateState(); + }); +} +if (chrome.windows) { + chrome.windows.onFocusChanged.addListener(function() { + updateState(); + }); + + // Grant access to HTTP site only during session, clear once window is closed + chrome.windows.onRemoved.addListener(function() { + chrome.windows.getAll({}, function(windows) { + if(windows.length > 0) { + return; + } else { + httpOnceList.clear(); + } + }); + }); + +} +chrome.webNavigation.onCompleted.addListener(function() { + updateState(); +}); + +/** + * Set the icon color correctly + * active: extension is enabled. + * blocking: extension is in "block all HTTP requests" mode. + * disabled: extension is disabled from the popup menu. + */ + +function updateState () { + if (!chrome.tabs) return; + + let iconState = 'active'; + + if (!isExtensionEnabled) { + iconState = 'disabled'; + } else if (httpNowhereOn) { + iconState = 'blocking'; + } + + chrome.browserAction.setTitle({ + title: 'HTTPS Everywhere' + ((iconState === 'active') ? '' : ' (' + iconState + ')') + }); + + const chromeUrl = 'chrome://'; + + chrome.tabs.query({ active: true, currentWindow: true, status: 'complete' }, function(tabs) { + if (!tabs || tabs.length === 0 || tabs[0].url.startsWith(chromeUrl) ) { + return; + } + + // tabUrl.host instead of hostname should be used to show the "disabled" status properly (#19293) + const tabUrl = new URL(tabs[0].url); + const host = util.getNormalisedHostname(tabUrl.host); + + if (isExtensionDisabledOnSite(host) || iconState == "disabled") { + if ('setIcon' in chrome.browserAction) { + chrome.browserAction.setIcon({ + path: { + 38: 'images/icons/icon-disabled-38.png' + } + }); + } + } else { + if ('setIcon' in chrome.browserAction) { + chrome.browserAction.setIcon({ + path: { + 38: 'images/icons/icon-' + iconState + '-38.png' + } + }); + } + } + }); +} + +/** + * The following allows fennec to interact with the popup ui + * */ +chrome.browserAction.onClicked.addListener(e => { + const url = chrome.runtime.getURL("/pages/popup/index.html?tabId=" + e.id); + chrome.tabs.create({ + url + }); +}); + +/** + * A centralized storage for browsing data within the browser session. + */ +function BrowserSession() { + this.tabs = new Map(); + this.requests = new Map(); + + if (chrome.tabs) { + chrome.tabs.onRemoved.addListener(tabId => { + this.deleteTab(tabId); + }); + } +} + +BrowserSession.prototype = { + putTab: function(tabId, key, value, overwrite) { + if (!this.tabs.has(tabId)) { + this.tabs.set(tabId, {}); + } + + if (!(key in this.tabs.get(tabId)) || overwrite) { + this.tabs.get(tabId)[key] = value; + } + }, + + getTab: function(tabId, key, defaultValue) { + if (this.tabs.has(tabId) && key in this.tabs.get(tabId)) { + return this.tabs.get(tabId)[key]; + } + return defaultValue; + }, + + deleteTab: function(tabId) { + if (this.tabs.has(tabId)) { + this.tabs.delete(tabId); + } + }, + + putTabAppliedRulesets: function(tabId, type, ruleset) { + this.putTab(tabId, "main_frame", false, false); + + // always show main_frame ruleset on the top + if (type == "main_frame") { + this.putTab(tabId, "main_frame", true, true); + this.putTab(tabId, "applied_rulesets", [ruleset,], true); + return ; + } + + // sort by ruleset names alphabetically, case-insensitive + if (this.getTab(tabId, "applied_rulesets", null)) { + let rulesets = this.getTab(tabId, "applied_rulesets", null); + let insertIndex = 0; + + const ruleset_name = ruleset.name.toLowerCase(); + + for (const item of rulesets) { + const item_name = item.name.toLowerCase(); + + if (item_name == ruleset_name) { + return ; + } else if (insertIndex == 0 && this.getTab(tabId, "main_frame", false)) { + insertIndex = 1; + } else if (item_name < ruleset_name) { + insertIndex++; + } + } + rulesets.splice(insertIndex, 0, ruleset); + } else { + this.putTab(tabId, "applied_rulesets", [ruleset,], true); + } + }, + + getTabAppliedRulesets: function(tabId) { + return this.getTab(tabId, "applied_rulesets", null); + }, + + putRequest: function(requestId, key, value) { + if (!this.requests.has(requestId)) { + this.requests.set(requestId, {}); + } + this.requests.get(requestId)[key] = value; + }, + + getRequest: function(requestId, key, defaultValue) { + if (this.requests.has(requestId) && key in this.requests.get(requestId)) { + return this.requests.get(requestId)[key]; + } + return defaultValue; + }, + + deleteRequest: function(requestId) { + if (this.requests.has(requestId)) { + this.requests.delete(requestId); + } + } +}; + +let browserSession = new BrowserSession(); + +var urlBlacklist = new Set(); + +const cancelUrl = chrome.runtime.getURL("/pages/cancel/index.html"); + +function redirectOnCancel(shouldCancel, originURL) { + return shouldCancel ? {redirectUrl: newCancelUrl(originURL)} : {cancel: false}; +} + +const newCancelUrl = originURL => `${cancelUrl}?originURL=${encodeURIComponent(originURL)}`; + +/** + * Called before a HTTP(s) request. Does the heavy lifting + * Cancels the request/redirects it to HTTPS. URL modification happens in here. + * @param details of the handler, see Chrome doc + * */ +function onBeforeRequest(details) { + // If HTTPSe has been disabled by the user, return immediately. + if (!isExtensionEnabled) { + return; + } + + let uri = new URL(details.url); + + // Normalise hosts with tailing dots, e.g. "www.example.com." + uri.hostname = util.getNormalisedHostname(uri.hostname); + + let ip = ipUtils.parseIp(uri.hostname); + + let isLocalIp = false; + + if (ip !== -1) { + isLocalIp = ipUtils.isLocalIp(ip); + } + + if (details.type == "main_frame") { + // Clear the content from previous browser session. + // This needed to be done before this listener returns, + // otherwise, the extension popup might include rulesets + // from previous page. + browserSession.deleteTab(details.tabId); + + // Check if an user has disabled HTTPS Everywhere on this site. We should + // ensure that all subresources are not run through HTTPS Everywhere as well. + browserSession.putTab(details.tabId, 'first_party_host', uri.host, true); + } + + if (isExtensionDisabledOnSite(browserSession.getTab(details.tabId, 'first_party_host', null))) { + return; + } + + // Should the request be canceled? + // true if the URL is a http:// connection to a remote canonical host, and not + // a tor hidden service + const shouldCancel = httpNowhereOn && + (uri.protocol === 'http:' || uri.protocol === 'ftp:') && + uri.hostname.slice(-6) !== '.onion' && + uri.hostname !== 'localhost' && + !uri.hostname.endsWith('.localhost') && + uri.hostname !== '[::1]' && + !isLocalIp; + + // If there is a username / password, put them aside during the ruleset + // analysis process + let using_credentials_in_url = false; + let tmp_user; + let tmp_pass; + if (uri.password || uri.username) { + using_credentials_in_url = true; + tmp_user = uri.username; + tmp_pass = uri.password; + uri.username = ''; + uri.password = ''; + } + + if (details.url != uri.href && !using_credentials_in_url) { + util.log(util.INFO, "Original url " + details.url + + " changed before processing to " + uri.href); + } + if (urlBlacklist.has(uri.href)) { + return redirectOnCancel(shouldCancel, details.url); + } + + if (browserSession.getRequest(details.requestId, "redirect_count", 0) >= 8) { + util.log(util.NOTE, "Redirect counter hit for " + uri.href); + urlBlacklist.add(uri.href); + rules.settings.domainBlacklist.add(uri.hostname); + util.log(util.WARN, "Domain blacklisted " + uri.hostname); + return redirectOnCancel(shouldCancel, details.url); + } + + // whether to use mozilla's upgradeToSecure BlockingResponse if available + let upgradeToSecure = false; + let newuristr = null; + + let potentiallyApplicable = all_rules.potentiallyApplicableRulesets(uri.hostname); + + for (let ruleset of potentiallyApplicable) { + if (details.url.match(ruleset.scope)) { + browserSession.putTabAppliedRulesets(details.tabId, details.type, ruleset); + if (ruleset.active && !newuristr) { + newuristr = ruleset.apply(uri.href); + } + } + } + + if (newuristr == null && blooms.length > 0 && uri.protocol === 'http:') { + for(let bloom of blooms) { + if(bloom.check(uri.hostname)) { + newuristr = uri.href.replace(/^http:/, "https:"); + break; + } + } + } + + // only use upgradeToSecure for trivial rewrites + if (upgradeToSecureAvailable && newuristr) { + // check rewritten URIs against the trivially upgraded URI + const trivialUpgradeUri = uri.href.replace(/^http:/, "https:"); + upgradeToSecure = (newuristr == trivialUpgradeUri); + } + + // re-insert userpass info which was stripped temporarily + if (using_credentials_in_url) { + if (newuristr) { + const uri_with_credentials = new URL(newuristr); + uri_with_credentials.username = tmp_user; + uri_with_credentials.password = tmp_pass; + newuristr = uri_with_credentials.href; + } else { + const url_with_credentials = new URL(uri.href); + url_with_credentials.username = tmp_user; + url_with_credentials.password = tmp_pass; + uri.href = url_with_credentials.href; + } + } + + if (httpNowhereOn) { + // If loading a main frame, try the HTTPS version as an alternative to + // failing. + if (shouldCancel) { + if (!newuristr) { + newuristr = uri.href.replace(/^http:/, "https:"); + browserSession.putRequest(details.requestId, "simple_http_nowhere_redirect", true); + upgradeToSecure = true; + } else { + newuristr = newuristr.replace(/^http:/, "https:"); + } + } + if ( + newuristr && + ( + newuristr.substring(0, 5) === "http:" || + newuristr.substring(0, 4) === "ftp:" + ) + ) { + // Abort early if we're about to redirect to HTTP or FTP in HTTP Nowhere mode + return {redirectUrl: newCancelUrl(newuristr)}; + } + } + + if (upgradeToSecureAvailable && upgradeToSecure) { + util.log(util.INFO, 'onBeforeRequest returning upgradeToSecure: true'); + return {upgradeToSecure: true}; + } else if (newuristr) { + util.log(util.INFO, 'onBeforeRequest returning redirectUrl: ' + newuristr); + return {redirectUrl: newuristr}; + } else { + util.log(util.INFO, 'onBeforeRequest returning shouldCancel: ' + shouldCancel); + return redirectOnCancel(shouldCancel, details.url); + } +} + +/** + * monitor cookie changes. Automatically convert them to secure cookies + * @param changeInfo Cookie changed info, see Chrome doc + * */ +function onCookieChanged(changeInfo) { + if (!changeInfo.removed && !changeInfo.cookie.secure && isExtensionEnabled) { + if (all_rules.shouldSecureCookie(changeInfo.cookie)) { + let cookie = { + name:changeInfo.cookie.name, + value:changeInfo.cookie.value, + path:changeInfo.cookie.path, + httpOnly:changeInfo.cookie.httpOnly, + expirationDate:changeInfo.cookie.expirationDate, + storeId:changeInfo.cookie.storeId, + secure: true + }; + + // Host-only cookies don't set the domain field. + if (!changeInfo.cookie.hostOnly) { + cookie.domain = changeInfo.cookie.domain; + } + + // Chromium cookie sameSite status, see https://tools.ietf.org/html/draft-west-first-party-cookies + if (changeInfo.cookie.sameSite) { + cookie.sameSite = changeInfo.cookie.sameSite; + } + + // Firefox first-party isolation + if (changeInfo.cookie.firstPartyDomain) { + cookie.firstPartyDomain = changeInfo.cookie.firstPartyDomain; + } + + // The cookie API is magical -- we must recreate the URL from the domain and path. + if (changeInfo.cookie.domain[0] == ".") { + cookie.url = "https://www" + changeInfo.cookie.domain + cookie.path; + } else { + cookie.url = "https://" + changeInfo.cookie.domain + cookie.path; + } + // We get repeated events for some cookies because sites change their + // value repeatedly and remove the "secure" flag. + util.log(util.DBUG, + "Securing cookie " + cookie.name + " for " + changeInfo.cookie.domain + ", was secure=" + changeInfo.cookie.secure); + chrome.cookies.set(cookie); + } + } +} + +/** + * handling redirects, breaking loops + * @param details details for the redirect (see chrome doc) + * */ +function onBeforeRedirect(details) { + // Catch redirect loops (ignoring about:blank, etc. caused by other extensions) + let prefix = details.redirectUrl.substring(0, 5); + if (prefix === "http:" || prefix === "https") { + let count = browserSession.getRequest(details.requestId, "redirect_count", 0); + if (count) { + browserSession.putRequest(details.requestId, "redirect_count", count + 1); + util.log(util.DBUG, "Got redirect id " + details.requestId + ": "+count); + } else { + browserSession.putRequest(details.requestId, "redirect_count", 1); + } + } +} + +/** + * handle webrequest.onCompleted, cleanup redirectCounter + * @param details details for the chrome.webRequest (see chrome doc) + */ +function onCompleted(details) { + browserSession.deleteRequest(details.requestId); +} + +/** + * handle webrequest.onErrorOccurred, cleanup redirectCounter + * @param details details for the chrome.webRequest (see chrome doc) + */ +function onErrorOccurred(details) { + if (httpNowhereOn && + details.type == "main_frame" && + browserSession.getRequest(details.requestId, "simple_http_nowhere_redirect", false) && + // Enumerate errors that are likely due to HTTPS misconfigurations + ssl_codes.error_list.some(message => details.error.includes(message)) + ) { + let url = new URL(details.url); + if (url.protocol == "https:") { + url.protocol = "http:"; + } + chrome.tabs.update(details.tabId, {url: newCancelUrl(url.toString())}); + } + + browserSession.deleteRequest(details.requestId); +} + +/** + * handle webrequest.onHeadersReceived, insert upgrade-insecure-requests directive and + * rewrite access-control-allow-origin if presented in HTTP Nowhere mode + * @param details details for the chrome.webRequest (see chrome doc) + */ +function onHeadersReceived(details) { + if (isExtensionEnabled && httpNowhereOn) { + // Do not upgrade the .onion requests in EASE mode, + // See https://github.com/EFForg/https-everywhere/pull/14600#discussion_r168072480 + const uri = new URL(details.url); + const hostname = util.getNormalisedHostname(uri.hostname); + if (hostname.slice(-6) == '.onion') { + return {}; + } + + // Do not upgrade resources if the first-party domain disbled EASE mode + // This is needed for HTTPS sites serve mixed content and is broken + if (isExtensionDisabledOnSite(browserSession.getTab(details.tabId, 'first_party_host', null))) { + return {}; + } + + let responseHeadersChanged = false; + let cspHeaderFound = false; + + for (const idx in details.responseHeaders) { + if (details.responseHeaders[idx].name.match(/Content-Security-Policy/i)) { + // Existing CSP headers found + cspHeaderFound = true; + const value = details.responseHeaders[idx].value; + + // Prepend if no upgrade-insecure-requests directive exists + if (!value.match(/upgrade-insecure-requests/i)) { + details.responseHeaders[idx].value = "upgrade-insecure-requests; " + value; + responseHeadersChanged = true; + } + } + + if (details.responseHeaders[idx].name.match(/Access-Control-Allow-Origin/i)) { + // Existing access-control-allow-origin header found + const value = details.responseHeaders[idx].value; + + // If HTTP protocol is used, change it to HTTPS + if (value.match(/http:/)) { + details.responseHeaders[idx].value = value.replace(/http:/g, "https:"); + responseHeadersChanged = true; + } + } + } + + if (!cspHeaderFound) { + // CSP headers not found + const upgradeInsecureRequests = { + name: 'Content-Security-Policy', + value: 'upgrade-insecure-requests' + }; + details.responseHeaders.push(upgradeInsecureRequests); + responseHeadersChanged = true; + } + + if (responseHeadersChanged) { + return {responseHeaders: details.responseHeaders}; + } + } + return {}; +} + +// Registers the handler for requests +// See: https://github.com/EFForg/https-everywhere/issues/10039 +chrome.webRequest.onBeforeRequest.addListener(onBeforeRequest, {urls: ["*://*/*", "ftp://*/*"]}, ["blocking"]); + +// Try to catch redirect loops on URLs we've redirected to HTTPS. +chrome.webRequest.onBeforeRedirect.addListener(onBeforeRedirect, {urls: ["https://*/*"]}); + +// Cleanup redirectCounter if necessary +chrome.webRequest.onCompleted.addListener(onCompleted, {urls: ["*://*/*"]}); + +// Cleanup redirectCounter if necessary +chrome.webRequest.onErrorOccurred.addListener(onErrorOccurred, {urls: ["*://*/*"]}); + +// Insert upgrade-insecure-requests directive in httpNowhere mode +chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, {urls: ["https://*/*"]}, ["blocking", "responseHeaders"]); + +// Listen for cookies set/updated and secure them if applicable. This function is async/nonblocking. +chrome.cookies.onChanged.addListener(onCookieChanged); + +// This is necessary for communication with the popup in Firefox Private +// Browsing Mode, see https://bugzilla.mozilla.org/show_bug.cgi?id=1329304 +chrome.runtime.onMessage.addListener(function(message, sender, sendResponse) { + + function get_update_channels_generic(update_channels) { + let last_updated_promises = []; + for(let update_channel of update_channels) { + last_updated_promises.push(new Promise(resolve => { + store.local.get({['uc-timestamp: ' + update_channel.name]: 0}, item => { + resolve([update_channel.name, item['uc-timestamp: ' + update_channel.name]]); + }); + })); + } + Promise.all(last_updated_promises).then(results => { + const last_updated = results.reduce((obj, item) => { + obj[item[0]] = item[1]; + return obj; + }, {}); + sendResponse({update_channels, last_updated}); + }); + } + + function storeDisabledList(message) { + + const disabledListArray = Array.from(disabledList); + const httpOnceListArray = Array.from(httpOnceList); + + if (message === 'once') { + store.set({httpOnceList: httpOnceListArray}, () => { + sendResponse(true); + }); + } else { + store.set({disabledList: disabledListArray}, () => { + sendResponse(true); + }); + } + + return true; + } + + const responses = { + get_option: () => { + store.get(message.object, sendResponse); + return true; + }, + set_option: () => { + store.set(message.object, item => { + if (sendResponse) { + sendResponse(item); + } + }); + }, + delete_from_ruleset_cache: () => { + all_rules.ruleCache.delete(message.object); + }, + get_applied_rulesets: () => { + sendResponse(browserSession.getTabAppliedRulesets(message.object)); + return true; + }, + set_ruleset_active_status: () => { + let rulesets = browserSession.getTabAppliedRulesets(message.object.tab_id); + + for (let ruleset of rulesets) { + if (ruleset.name == message.object.name) { + ruleset.active = message.object.active; + if (ruleset.default_state == message.object.active) { + message.object.active = undefined; + } + break; + } + } + + all_rules.setRuleActiveState(message.object.name, message.object.active).then(() => { + sendResponse(true); + }); + + return true; + }, + reset_to_defaults: () => { + // restore the 'default states' of the rulesets + store.set_promise('ruleActiveStates', {}).then(() => { + // clear the caches such that it becomes stateless + destroy_caches(); + // re-activate all rules according to the new states + initializeAllRules(); + // reload tabs when operations completed + chrome.tabs.reload(); + }); + }, + get_user_rules: () => { + store.get_promise(all_rules.USER_RULE_KEY, []).then(userRules => sendResponse(userRules)); + return true; + }, + add_new_rule: () => { + all_rules.addNewRuleAndStore(message.object).then(() => { + sendResponse(true); + }); + return true; + }, + remove_rule: () => { + all_rules.removeRuleAndStore(message.object.ruleset, message.object.src) + .then(() => { + /** + * FIXME: initializeAllRules is needed for calls from the option pages. + * Since message.object is not of type Ruleset, rules.removeUserRule + * is not usable... + */ + if (message.object.src === 'options') { + return initializeAllRules(); + } + }) + .then(() => { + if (sendResponse !== null) { + sendResponse(true); + } + }); + return true; + }, + get_update_channel_timestamps: () => { + update.getUpdateChannelTimestamps().then(timestamps => sendResponse(timestamps)); + return true; + }, + get_pinned_update_channels: () => { + get_update_channels_generic(update_channels); + return true; + }, + get_stored_update_channels: () => { + store.get({update_channels: []}, item => { + get_update_channels_generic(item.update_channels); + }); + return true; + }, + create_update_channel: () => { + + store.get({update_channels: []}, item => { + + const update_channel_names = update_channels.concat(item.update_channels).reduce((obj, item) => { + obj.add(item.name); + return obj; + }, new Set()); + + if(update_channel_names.has(message.object)) { + return sendResponse(false); + } + + item.update_channels.push({ + name: message.object, + jwk: {}, + update_path_prefix: '', + scope: '' + }); + + store.set({update_channels: item.update_channels}, () => { + sendResponse(true); + }); + + }); + return true; + }, + delete_update_channel: () => { + store.get({update_channels: []}, item => { + store.set({update_channels: item.update_channels.filter(update_channel => { + return (update_channel.name != message.object); + })}, () => { + store.local.remove([ + 'uc-timestamp: ' + message.object, + 'uc-stored-timestamp: ' + message.object, + 'rulesets: ' + message.object, + 'bloom: ' + message.object, + 'bloom_bitmap_bits: ' + message.object, + 'bloom_k_num: ' + message.object, + 'bloom_sip_keys_0_0: ' + message.object, + 'bloom_sip_keys_0_1: ' + message.object, + 'bloom_sip_keys_1_0: ' + message.object, + 'bloom_sip_keys_1_1: ' + message.object, + ], () => { + initializeAllRules(); + sendResponse(true); + }); + }); + }); + return true; + }, + update_update_channel: () => { + store.get({update_channels: []}, item => { + let scope_changed = false; + item.update_channels = item.update_channels.map(update_channel => { + if(update_channel.name == message.object.name) { + if(update_channel.scope != message.object.scope) { + scope_changed = true; + } + update_channel = message.object; + } + return update_channel; + }); + + // Ensure that we check for new rulesets from the update channel immediately. + // If the scope has changed, make sure that the rulesets are re-initialized. + update.removeStorageListener(); + store.set({update_channels: item.update_channels}, () => { + update.loadUpdateChannelsKeys().then(() => { + update.resetTimer(); + if(scope_changed) { + initializeAllRules(); + } + sendResponse(true); + }); + update.addStorageListener(); + }); + }); + return true; + }, + get_simple_rules_ending_with: () => { + return sendResponse(all_rules.getSimpleRulesEndingWith(message.object)); + }, + get_last_checked: () => { + store.local.get({'last-checked': false}, item => { + sendResponse(item['last-checked']); + }); + return true; + }, + disable_on_site_once: () => { + httpOnceList.add(message.object); + return storeDisabledList('once'); + }, + disable_on_site: () => { + const host = util.getNormalisedHostname(message.object); + // always validate hostname before adding it to the disabled list + if (util.isValidHostname(host)) { + disabledList.add(host); + return storeDisabledList('disable'); + } + return sendResponse(false); + }, + enable_on_site: () => { + disabledList.delete(util.getNormalisedHostname(message.object)); + return storeDisabledList('enable'); + }, + check_if_site_disabled: () => { + return sendResponse(isExtensionDisabledOnSite(util.getNormalisedHostname(message.object))); + }, + is_firefox: () => { + if(typeof(browser) != "undefined") { + browser.runtime.getBrowserInfo().then(function(info) { + if (info.name == "Firefox") { + sendResponse(true); + } else { + sendResponse(false); + } + }); + } else { + sendResponse(false); + } + return true; + } + }; + if (message.type in responses) { + return responses[message.type](); + } +}); + +/** + * @description Notify users about extension sunsetting in January 2023 and instructions turn on HTTPS natively + * @link https://www.eff.org/deeplinks/2021/09/https-actually-everywhere + */ +chrome.runtime.onInstalled.addListener(async ({reason, temporary}) => { + if (temporary) return; + switch (reason) { + case "install": + case "update": + { + const url = "https://www.eff.org/https-everywhere/set-https-default-your-browser"; + await chrome.tabs.create({ active : false, url: url }); + } + break; + } +}); + +/** + * Clear any cache/ blacklist we have. + */ +function destroy_caches() { + util.log(util.DBUG, "Destroying caches."); + all_rules.cookieHostCache.clear(); + all_rules.ruleCache.clear(); + rules.settings.domainBlacklist.clear(); + urlBlacklist.clear(); + httpOnceList.clear(); +} + +Object.assign(exports, { + all_rules, + blooms, + urlBlacklist +}); + +})(typeof exports == 'undefined' ? require.scopes.background = {} : exports); diff --git a/chromium/bootstrap.js b/chromium/background-scripts/bootstrap.js similarity index 100% rename from chromium/bootstrap.js rename to chromium/background-scripts/bootstrap.js diff --git a/chromium/incognito.js b/chromium/background-scripts/incognito.js similarity index 99% rename from chromium/incognito.js rename to chromium/background-scripts/incognito.js index ca521771a524..7d4bc815c729 100644 --- a/chromium/incognito.js +++ b/chromium/background-scripts/incognito.js @@ -43,7 +43,7 @@ Incognito.prototype = { } } }, -} +}; /** * Check if any incognito window still exists diff --git a/chromium/background-scripts/ip_utils.js b/chromium/background-scripts/ip_utils.js new file mode 100644 index 000000000000..90e0b1a44530 --- /dev/null +++ b/chromium/background-scripts/ip_utils.js @@ -0,0 +1,71 @@ +'use strict'; + +(function (exports) { + +/** + * Parse and convert literal IP address into numerical IP address. + * @param {string} ip + * @returns {number} + */ +const parseIp = ip => { + if (!/^[0-9.]+$/.test(ip)) { + return -1; + } + + /** @type {string[]} */ + const octets = ip.split('.'); + + if (octets.length !== 4) { + return -1; + } + + let ipN = 0; + + for (const octet of octets) { + if (octet === '') { + return -1; + } + + const octetN = parseInt(octet); + + if (octetN < 0 || octetN > 255) { + return -1; + } + + ipN = (ipN << 8) | octetN; + } + + return ipN >>> 0; +}; + +/** + * Check if the numeric IP address is within a certain range. + * @param {number} ip + * @param {number[]} range + * @returns {boolean} + */ +const isIpInRange = (ip, [rangeIp, mask]) => (ip & mask) >>> 0 === rangeIp; + +// A list of local IP address ranges +const localRanges = [ + [/* 0.0.0.0 */ 0x00000000, /* 255.255.255.255 */ 0xffffffff], + [/* 127.0.0.0 */ 0x7f000000, /* 255.0.0.0 */ 0xff000000], + [/* 10.0.0.0 */ 0x0a000000, /* 255.0.0.0 */ 0xff000000], + [/* 172.16.0.0 */ 0xac100000, /* 255.240.0.0 */ 0xfff00000], + [/* 192.168.0.0 */ 0xc0a80000, /* 255.255.0.0 */ 0xffff0000], +]; + +/** + * Check if the numeric IP address is inside the local IP address ranges. + * @param {number} ip + * @returns {boolean} + */ +const isLocalIp = ip => localRanges.some(range => isIpInRange(ip, range)); + +Object.assign(exports, { + parseIp, + isIpInRange, + isLocalIp +}); + +})(typeof exports !== 'undefined' ? exports : require.scopes.ip_utils = {}); diff --git a/chromium/background-scripts/modules/ssl_codes.js b/chromium/background-scripts/modules/ssl_codes.js new file mode 100644 index 000000000000..ed955ec8355a --- /dev/null +++ b/chromium/background-scripts/modules/ssl_codes.js @@ -0,0 +1,48 @@ +"use strict"; + +/** + * @exports error_list + * @type {array} + * @description A list of known SSL config errors to filter through and not try to upgrade the user + * @see + * Chrome SSL errors: https://github.com/chromium/chromium/blob/master/components/domain_reliability/util.cc + * Firefox SSL Errors: https://hg.mozilla.org/releases/mozilla-release/file/tip/security/manager/locales/en-US/chrome/pipnss/nsserrors.properties + */ + +(function (exports) { + +const error_list = [ + "net::ERR_SSL_PROTOCOL_ERROR", + "net::ERR_SSL_VERSION_OR_CIPHER_MISMATCH", + "net::ERR_SSL_UNRECOGNIZED_NAME_ALERT", + "net::ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN", + "net::ERR_CERT_COMMON_NAME_INVALID", + "net::ERR_CERT_DATE_INVALID", + "net::ERR_CERT_AUTHORITY_INVALID", + "net::ERR_CERT_REVOKED", + "net::ERR_CERT_INVALID", + "net::ERR_CONNECTION_CLOSED", + "net::ERR_CONNECTION_RESET", + "net::ERR_CONNECTION_REFUSED", + "net::ERR_CONNECTION_ABORTED", + "net::ERR_CONNECTION_FAILED", + "net::ERR_ABORTED", , + "NS_ERROR_CONNECTION_REFUSED", + "NS_ERROR_NET_ON_TLS_HANDSHAKE_ENDED", + "NS_BINDING_ABORTED", + "SSL received a record that exceeded the maximum permissible length.", + "Peer’s Certificate has expired.", + "Unable to communicate securely with peer: requested domain name does not match the server’s certificate.", + "Peer’s Certificate issuer is not recognized.", + "Peer’s Certificate has been revoked.", + "Peer reports it experienced an internal error.", + "The server uses key pinning (HPKP) but no trusted certificate chain could be constructed that matches the pinset. Key pinning violations cannot be overridden.", + "SSL received a weak ephemeral Diffie-Hellman key in Server Key Exchange handshake message.", + "The certificate was signed using a signature algorithm that is disabled because it is not secure.", + "Cannot communicate securely with peer: no common encryption algorithm(s).", + "SSL peer has no certificate for the requested DNS name." +]; + +Object.assign(exports, { error_list }); + +})(typeof exports !== 'undefined' ? exports : require.scopes.ssl_codes = {}); \ No newline at end of file diff --git a/chromium/background-scripts/rules.js b/chromium/background-scripts/rules.js new file mode 100644 index 000000000000..7f0a5b550637 --- /dev/null +++ b/chromium/background-scripts/rules.js @@ -0,0 +1,802 @@ +"use strict"; + +(function(exports) { + +const util = require('./util'), + wasm = require('./wasm'); + +let settings = { + enableMixedRulesets: false, + domainBlacklist: new Set(), +}; + +// To reduce memory usage for the numerous rules/cookies with trivial rules +const trivial_cookie_rule_c = /.+/; + +/* A map of all scope RegExp objects */ +const scopes = new Map(); + +/** + * Returns the scope object from the map for the given scope string. + * @param {string} scope ruleset scope string + * @returns {RegExp} + */ +function getScope(scope) { + if (!scopes.has(scope)) { + scopes.set(scope, new RegExp(scope)); + } + return scopes.get(scope); +} + +/** + * Constructs a single rule + * @param from + * @param to + * @constructor + */ +function Rule(from, to) { + this.from_c = new RegExp(from); + this.to = to; +} + +// To reduce memory usage for the numerous rules/cookies with trivial rules +const trivial_rule = new Rule("^http:", "https:"); + +/** + * Returns a common trivial rule or constructs a new one. + */ +function getRule(from, to) { + if (from === "^http:" && to === "https:") { + // This is a trivial rule, rewriting http->https with no complex RegExp. + return trivial_rule; + } else { + // This is a non-trivial rule. + return new Rule(from, to); + } +} + +/** + * Generates a CookieRule + * @param host The host regex to compile + * @param cookiename The cookie name Regex to compile + * @constructor + */ +function CookieRule(host, cookiename) { + if (host === '.+') { + // Some cookie rules trivially match any host. + this.host_c = trivial_cookie_rule_c; + } else { + this.host_c = new RegExp(host); + } + + if (cookiename === '.+') { + // About 50% of cookie rules trivially match any name. + this.name_c = trivial_cookie_rule_c; + } else { + this.name_c = new RegExp(cookiename); + } +} + +/** + *A collection of rules + * @param {string} set_name The name of this set + * @param {boolean} default_state activity state + * @param {string} scope ruleset scope string + * @param {string} note Note will be displayed in popup + * @constructor + */ +function RuleSet(set_name, default_state, scope, note) { + this.name = set_name; + this.rules = []; + this.exclusions = null; + this.cookierules = null; + this.active = default_state; + this.default_state = default_state; + this.scope = getScope(scope); + this.note = note; +} + +RuleSet.prototype = { + /** + * Check if a URI can be rewritten and rewrite it + * @param urispec The uri to rewrite + * @returns {*} null or the rewritten uri + */ + apply: function(urispec) { + var returl = null; + // If we're covered by an exclusion, go home + if (this.exclusions !== null && this.exclusions.test(urispec)) { + util.log(util.DBUG, "excluded uri " + urispec); + return null; + } + + // Okay, now find the first rule that triggers + for (let rule of this.rules) { + returl = urispec.replace(rule.from_c, + rule.to); + if (returl != urispec) { + return returl; + } + } + return null; + }, + + /** + * Deep equivalence comparison + * @param ruleset The ruleset to compare with + * @returns true or false, depending on whether it's deeply equivalent + */ + isEquivalentTo: function(ruleset) { + if(this.name != ruleset.name || + this.note != ruleset.note || + this.active != ruleset.active || + this.default_state != ruleset.default_state) { + return false; + } + + try { + var this_exclusions_source = this.exclusions.source; + } catch(e) { + var this_exclusions_source = null; + } + + try { + var ruleset_exclusions_source = ruleset.exclusions.source; + } catch(e) { + var ruleset_exclusions_source = null; + } + + try { + var this_rules_length = this.rules.length; + } catch(e) { + var this_rules_length = 0; + } + + try { + var ruleset_rules_length = ruleset.rules.length; + } catch(e) { + var ruleset_rules_length = 0; + } + + if(this_rules_length != ruleset_rules_length) { + return false; + } + + if (this_exclusions_source != ruleset_exclusions_source) { + return false; + } + + if(this_rules_length > 0) { + for(let x = 0; x < this.rules.length; x++) { + if(this.rules[x].to != ruleset.rules[x].to) { + return false; + } + } + } + + return true; + } + +}; + +/** + * Initialize Rule Sets + * @constructor + */ +function RuleSets() { + // Load rules into structure + this.targets = new Map(); + + // A cache for potentiallyApplicableRulesets + this.ruleCache = new Map(); + + // A cache for cookie hostnames. + this.cookieHostCache = new Map(); + + /** + * A hash of rule name -> active status (true/false). + * @type {Object} + */ + this.ruleActiveStates = {}; + + // The key to retrieve user rules from the storage api + this.USER_RULE_KEY = 'userRules'; + + return this; +} + + +RuleSets.prototype = { + + /** + * Load packaged rulesets, and rulesets in browser storage + * @param store object from store.js + */ + loadFromBrowserStorage: async function(store, applyStoredFunc) { + this.store = store; + this.ruleActiveStates = await this.store.get_promise('ruleActiveStates', {}); + try { + this.wasm_rs = wasm.RuleSets.new(); + } catch(e) { + util.log(util.WARN, 'Falling back to pure JS implementation: ' + e); + } + await applyStoredFunc(this); + await this.loadStoredUserRules(); + await this.addStoredCustomRulesets(); + }, + + /** + * Convert XML to JS and load rulesets + * @param {Document} ruleXml + * @param {string} scope + */ + addFromXml: function(ruleXml, scope) { + const rulesets_xml = ruleXml.getElementsByTagName("ruleset"); + + let rulesets = []; + for (let ruleset_xml of rulesets_xml) { + rulesets.push(this.convertOneXmlToJs(ruleset_xml)); + } + + this.addFromJson(rulesets, scope); + }, + + /** + * @param {*} ruleJson + * @param {string} scope + */ + addFromJson: function(ruleJson, scope) { + if (this.wasm_rs) { + this.wasm_rs.add_all_from_js_array( + ruleJson, + settings.enableMixedRulesets, + this.ruleActiveStates, + scope); + } else { + for (let ruleset of ruleJson) { + try { + this.parseOneJsonRuleset(ruleset, scope); + } catch(e) { + util.log(util.WARN, 'Error processing ruleset:' + e); + } + } + } + }, + + /** + * Parse one JSON format ruleset element + * @param {*} ruletag + * @param {string} scope + */ + parseOneJsonRuleset: function(ruletag, scope) { + var default_state = true; + var note = ""; + var default_off = ruletag["default_off"]; + if (default_off) { + default_state = false; + if (default_off === "user rule") { + default_state = true; + } + note += default_off + "\n"; + } + + // If a ruleset declares a platform, and we don't match it, treat it as + // off-by-default. In practice, this excludes "mixedcontent" rules. + var platform = ruletag["platform"]; + if (platform) { + default_state = false; + if (platform == "mixedcontent" && settings.enableMixedRulesets) { + default_state = true; + } + note += "Platform(s): " + platform + "\n"; + } + + var rule_set = new RuleSet(ruletag["name"], default_state, scope, note.trim()); + + // Read user prefs + if (rule_set.name in this.ruleActiveStates) { + rule_set.active = this.ruleActiveStates[rule_set.name]; + } + + var rules = ruletag["rule"]; + for (let rule of rules) { + if (rule["from"] != null && rule["to"] != null) { + rule_set.rules.push(getRule(rule["from"], rule["to"])); + } + } + + var exclusions = ruletag["exclusion"]; + if (exclusions != null) { + rule_set.exclusions = new RegExp(exclusions.join("|")); + } + + var cookierules = ruletag["securecookie"]; + if (cookierules != null) { + for (let cookierule of cookierules) { + if (cookierule["host"] != null && cookierule["name"] != null) { + if (!rule_set.cookierules) { + rule_set.cookierules = []; + } + rule_set.cookierules.push(new CookieRule(cookierule["host"], cookierule["name"])); + } + } + } + + var targets = ruletag["target"]; + for (let target of targets) { + if (target != null) { + if (!this.targets.has(target)) { + this.targets.set(target, []); + } + this.targets.get(target).push(rule_set); + } + } + }, + + /** + * Load a user rule + * @param params + * @param {string} scope + * @returns {boolean} + */ + addUserRule : function(params, scope) { + util.log(util.INFO, 'adding new user rule for ' + JSON.stringify(params)); + if (this.wasm_rs) { + this.wasm_rs.add_all_from_js_array( + [params], + settings.enableMixedRulesets, + this.ruleActiveStates, + scope); + } else { + this.parseOneJsonRuleset(params, scope); + } + + // clear cache so new rule take effect immediately + for (const target of params.target) { + this.ruleCache.delete(target); + } + + // TODO: maybe promote this rule? + util.log(util.INFO, 'done adding rule'); + return true; + }, + + /** + * Remove a user rule + * @param params + * @returns {boolean} + */ + removeUserRule: function(ruleset, src) { + /** + * FIXME: We have to use ruleset.name here because the ruleset itself + * carries no information on the target it is applying on. This also + * made it impossible for users to set custom ruleset name. + */ + util.log(util.INFO, 'removing user rule for ' + JSON.stringify(ruleset)); + + // Remove any cache from runtime + this.ruleCache.delete(ruleset.name); + + if (src === 'popup') { + + if (this.wasm_rs) { + this.wasm_rs.remove_ruleset(ruleset); + } else { + const tmp = this.targets.get(ruleset.name).filter(r => !r.isEquivalentTo(ruleset)); + this.targets.set(ruleset.name, tmp); + + if (this.targets.get(ruleset.name).length == 0) { + this.targets.delete(ruleset.name); + } + } + } + + if (src === 'options') { + /** + * FIXME: There is nothing we can do if the call comes from the + * option page because isEquivalentTo cannot work reliably. + * Leave the heavy duties to background.js to call initializeAllRules + */ + } + util.log(util.INFO, 'done removing rule'); + return true; + }, + + /** + * Retrieve stored user rules from storage api + **/ + getStoredUserRules: async function() { + return await this.store.get_promise(this.USER_RULE_KEY, []); + }, + + /** + * Load all stored user rules into this RuleSet object + */ + loadStoredUserRules: function() { + return this.getStoredUserRules() + .then(userRules => { + this.addFromJson(userRules, ''); + util.log(util.INFO, `loaded ${userRules.length} stored user rules`); + }); + }, + + /** + * Adds a new user rule + * @param params: params defining the rule + * @param cb: Callback to call after success/fail + * */ + addNewRuleAndStore: async function(params) { + if (this.addUserRule(params, '')) { + // If we successfully added the user rule, save it in the storage + // api so it's automatically applied when the extension is + // reloaded. + let userRules = await this.getStoredUserRules(); + // TODO: there's a race condition here, if this code is ever executed from multiple + // client windows in different event loops. + userRules.push(params); + // TODO: can we exceed the max size for storage? + await this.store.set_promise(this.USER_RULE_KEY, userRules); + } + }, + + /** + * Removes a user rule + * @param ruleset: the ruleset to remove + * */ + removeRuleAndStore: async function(ruleset, src) { + if (this.removeUserRule(ruleset, src)) { + let userRules = await this.getStoredUserRules(); + + if (src === 'popup') { + userRules = userRules.filter(r => + !(r.name === ruleset.name && r.rule[0].to === ruleset.rules[0].to) + ); + } + + if (src === 'options') { + userRules = userRules.filter(r => + !(r.name === ruleset.name && r.rule[0].to === ruleset.rule[0].to) + ); + } + await this.store.set_promise(this.USER_RULE_KEY, userRules); + } + }, + + addStoredCustomRulesets: function() { + return new Promise(resolve => { + this.store.get({ + legacy_custom_rulesets: [], + debugging_rulesets: "" + }, item => { + this.loadCustomRulesets(item.legacy_custom_rulesets); + this.loadCustomRuleset("" + item.debugging_rulesets + ""); + resolve(); + }); + }); + }, + + // Load in the legacy custom rulesets, if any + loadCustomRulesets: function(legacy_custom_rulesets) { + for(let legacy_custom_ruleset of legacy_custom_rulesets) { + this.loadCustomRuleset(legacy_custom_ruleset); + } + }, + + loadCustomRuleset: function(ruleset_string) { + this.addFromXml((new DOMParser()).parseFromString(ruleset_string, 'text/xml'), ''); + }, + + setRuleActiveState: async function(ruleset_name, active) { + if (active == undefined) { + delete this.ruleActiveStates[ruleset_name]; + } else { + this.ruleActiveStates[ruleset_name] = active; + } + await this.store.set_promise('ruleActiveStates', this.ruleActiveStates); + }, + + /** + * Converts an XML ruleset to a JS ruleset for parsing + * @param ruletag The whole tag to parse + */ + convertOneXmlToJs: function(ruletag) { + try { + let ruleset = {}; + + let default_off = ruletag.getAttribute("default_off"); + if (default_off) { + ruleset["default_off"] = default_off; + } + + let platform = ruletag.getAttribute("platform"); + if (platform) { + ruleset["platform"] = platform; + } + + let name = ruletag.getAttribute("name"); + if (name) { + ruleset["name"] = name; + } + + let rules = []; + for (let rule of ruletag.getElementsByTagName("rule")) { + rules.push({ + from: rule.getAttribute("from"), + to: rule.getAttribute("to") + }); + } + if (rules.length > 0) { + ruleset["rule"] = rules; + } + + let exclusions = []; + for (let exclusion of ruletag.getElementsByTagName("exclusion")) { + exclusions.push(exclusion.getAttribute("pattern")); + } + if (exclusions.length > 0) { + ruleset["exclusion"] = exclusions; + } + + let cookierules = []; + for (let cookierule of ruletag.getElementsByTagName("securecookie")) { + cookierules.push({ + host: cookierule.getAttribute("host"), + name: cookierule.getAttribute("name") + }); + } + if (cookierules.length > 0) { + ruleset["securecookie"] = cookierules; + } + + let targets = []; + for (let target of ruletag.getElementsByTagName("target")) { + targets.push(target.getAttribute("host")); + } + if (targets.length > 0) { + ruleset["target"] = targets; + } + + return ruleset; + } catch (e) { + util.log(util.WARN, 'Error converting ruleset to JS:' + e); + return {}; + } + }, + + /** + * Return a list of rulesets that apply to this host + * @param host The host to check + * @returns {*} (empty) list + */ + potentiallyApplicableRulesets: function(host) { + // Have we cached this result? If so, return it! + if (this.ruleCache.has(host)) { + let cached_item = this.ruleCache.get(host); + util.log(util.DBUG, "Ruleset cache hit for " + host + " items:" + cached_item.size); + return cached_item; + } else { + util.log(util.DBUG, "Ruleset cache miss for " + host); + } + + let results; + if (this.wasm_rs) { + let pa = this.wasm_rs.potentially_applicable(host); + results = new Set([...pa].map(ruleset => { + let rs = new RuleSet(ruleset.name, ruleset.default_state, ruleset.scope, ruleset.note); + + if (ruleset.cookierules) { + let cookierules = ruleset.cookierules.map(cookierule => { + return new CookieRule(cookierule.host, cookierule.name); + }); + rs.cookierules = cookierules; + } else { + rs.cookierules = null; + } + + let rules = ruleset.rules.map(rule => { + return getRule(rule.from, rule.to); + }); + rs.rules = rules; + + if (ruleset.exclusions) { + rs.exclusions = new RegExp(ruleset.exclusions); + } else { + rs.exclusions = null; + } + + rs.active = ruleset.active; + + return rs; + })); + } else { + // Let's begin search + results = (this.targets.has(host) ? + new Set([...this.targets.get(host)]) : + new Set()); + + let expressions = util.getWildcardExpressions(host); + for (const expression of expressions) { + results = (this.targets.has(expression) ? + new Set([...results, ...this.targets.get(expression)]) : + results); + } + + // Clean the results list, which may contain duplicates or undefined entries + results.delete(undefined); + + util.log(util.DBUG,"Applicable rules for " + host + ":"); + if (results.size == 0) { + util.log(util.DBUG, " None"); + results = util.nullIterable; + } else { + results.forEach(result => util.log(util.DBUG, " " + result.name)); + } + } + + // Insert results into the ruleset cache + this.ruleCache.set(host, results); + + // Cap the size of the cache. (Limit chosen somewhat arbitrarily) + if (this.ruleCache.size > 1000) { + // Map.prototype.keys() returns keys in insertion order, so this is a FIFO. + this.ruleCache.delete(this.ruleCache.keys().next().value); + } + + return results; + }, + + /** + * Check to see if the Cookie object c meets any of our cookierule criteria for being marked as secure. + * @param cookie The cookie to test + * @returns {*} true or false + */ + shouldSecureCookie: function(cookie) { + let hostname = cookie.domain; + // cookie domain scopes can start with . + while (hostname.charAt(0) == ".") { + hostname = hostname.slice(1); + } + + // Check if the domain might be being served over HTTP. If so, it isn't + // safe to secure a cookie! We can't always know this for sure because + // observing cookie-changed doesn't give us enough context to know the + // full origin URI. + + // First, if there are any redirect loops on this domain, don't secure + // cookies. XXX This is not a very satisfactory heuristic. Sometimes we + // would want to secure the cookie anyway, because the URLs that loop are + // not authenticated or not important. Also by the time the loop has been + // observed and the domain blacklisted, a cookie might already have been + // flagged as secure. + + if (settings.domainBlacklist.has(hostname)) { + util.log(util.INFO, "cookies for " + hostname + "blacklisted"); + return false; + } + + // Second, we need a cookie pass two tests before patching it + // (1) it is safe to secure the cookie, as per safeToSecureCookie() + // (2) it matches with the CookieRule + // + // We kept a cache of the results for (1), if we have a cached result which + // (a) is false, we should not secure the cookie for sure + // (b) is true, we need to perform test (2) + // + // Otherwise, + // (c) We need to perform (1) and (2) in place + + let safe = false; + if (this.cookieHostCache.has(hostname)) { + util.log(util.DBUG, "Cookie host cache hit for " + hostname); + safe = this.cookieHostCache.get(hostname); // true only if it is case (b) + if (!safe) { + return false; // (a) + } + } else { + util.log(util.DBUG, "Cookie host cache miss for " + hostname); + } + + const potentiallyApplicable = this.potentiallyApplicableRulesets(hostname); + for (const ruleset of potentiallyApplicable) { + if (ruleset.cookierules !== null && ruleset.active) { + // safe is false only indicate the lack of a cached result + // we cannot use it to avoid looping here + for (const cookierule of ruleset.cookierules) { + // if safe is true, it is case (b); otherwise it is case (c) + if (cookierule.host_c.test(cookie.domain) && cookierule.name_c.test(cookie.name)) { + return safe || this.safeToSecureCookie(hostname, potentiallyApplicable); + } + } + } + } + return false; + }, + + /** + * Check if it is secure to secure the cookie (=patch the secure flag in). + * @param domain The domain of the cookie + * @param potentiallyApplicable + * @returns {*} true or false + */ + safeToSecureCookie: function(domain, potentiallyApplicable) { + // Make up a random URL on the domain, and see if we would HTTPSify that. + var nonce_path = "/" + Math.random().toString(); + var test_uri = "http://" + domain + nonce_path + nonce_path; + + // Cap the size of the cookie cache (limit chosen somewhat arbitrarily) + if (this.cookieHostCache.size > 250) { + // Map.prototype.keys() returns keys in insertion order, so this is a FIFO. + this.cookieHostCache.delete(this.cookieHostCache.keys().next().value); + } + + util.log(util.INFO, "Testing securecookie applicability with " + test_uri); + for (let ruleset of potentiallyApplicable) { + if (ruleset.active && ruleset.apply(test_uri)) { + util.log(util.INFO, "Cookie domain could be secured."); + this.cookieHostCache.set(domain, true); + return true; + } + } + util.log(util.INFO, "Cookie domain could NOT be secured."); + this.cookieHostCache.set(domain, false); + return false; + }, + + /** + * Get a list of simple rules (active, with no exclusions) for all hosts that + * are in a single ruleset, and end in the specified ending. + * @param ending Target ending to search for + * @returns A list of { host, from_regex, to, scope_regex } + */ + getSimpleRulesEndingWith: function(ending) { + let results; + + if (this.wasm_rs) { + results = this.wasm_rs.get_simple_rules_ending_with(ending); + } else { + results = []; + for(let [host, rulesets] of this.targets) { + if (host.endsWith(ending) && + rulesets.length == 1 && + rulesets[0].active === true && + rulesets[0].exclusions == null + ) { + for (let rule of rulesets[0].rules) { + if (rule.from_c.test("http://" + host + "/")) { + results.push({ host, from_regex: rule.from_c.toString(), to: rule.to, scope_regex: rulesets[0].scope.toString() }); + } + } + } + } + } + return results; + }, + + /** + * Rewrite an URI + * @param urispec The uri to rewrite + * @param host The host of this uri + * @returns {*} the new uri or null + */ + rewriteURI: function(urispec, host) { + var newuri = null; + var potentiallyApplicable = this.potentiallyApplicableRulesets(host); + for (let ruleset of potentiallyApplicable) { + if (ruleset.active && (newuri = ruleset.apply(urispec))) { + return newuri; + } + } + return null; + } +}; + +Object.assign(exports, { + settings, + trivial_rule, + Rule, + RuleSet, + RuleSets, + getRule +}); + +})(typeof exports == 'undefined' ? require.scopes.rules = {} : exports); diff --git a/chromium/background-scripts/store.js b/chromium/background-scripts/store.js new file mode 100644 index 000000000000..e3af7cb8086f --- /dev/null +++ b/chromium/background-scripts/store.js @@ -0,0 +1,143 @@ +"use strict"; + +(function(exports) { + +const rules = require('./rules'); +const util = require("./util"); + +function initialize() { + return new Promise(resolve => { + if (chrome.storage.sync) { + chrome.storage.sync.set({"sync-set-test": true}, () => { + if(chrome.runtime.lastError) { + setStorage(chrome.storage.local); + } else { + setStorage(chrome.storage.sync); + } + resolve(); + }); + } else { + setStorage(chrome.storage.local); + resolve(); + } + }); +} + +/* Storage promise setters and getters */ + +function generic_get_promise(key, default_val, storage) { + return new Promise(res => storage.get({[key]: default_val}, data => res(data[key]))); +} + +function generic_set_promise(key, value, storage) { + return new Promise(res => storage.set({[key]: value}, res)); +} + +function get_promise(key, default_val) { + return generic_get_promise(key, default_val, exports); +} + +function set_promise(key, value) { + return generic_set_promise(key, value, exports); +} + +function local_get_promise(key, default_val) { + return generic_get_promise(key, default_val, chrome.storage.local); +} + +function local_set_promise(key, value) { + return generic_set_promise(key, value, chrome.storage.local); +} + + + +async function performMigrations() { + let migration_version = await get_promise('migration_version', 0); + + try { + if (migration_version === 0) { + let ls = localStorage; + let ruleActiveStates = {}; + + for (let key in ls) { + if (ls.hasOwnProperty(key)) { + if (rules.RuleSets().USER_RULE_KEY === key) { + await set_promise(rules.RuleSets().USER_RULE_KEY, JSON.parse(ls[key])); + } else { + ruleActiveStates[key] = (ls[key] === "true"); + } + } + } + migration_version = 1; + await set_promise('migration_version', migration_version); + await set_promise('ruleActiveStates', ruleActiveStates); + } + + } catch (e) { + // do nothing + } + + if (migration_version <= 1) { + await get_promise(rules.RuleSets().USER_RULE_KEY, []) + .then(userRules => { + userRules = userRules.map(userRule => { + return { + name: userRule.host, + target: [userRule.host], + rule: [{ from: userRule.urlMatcher, to: userRule.redirectTo }], + default_off: "user rule" + }; + }); + return userRules; + }) + .then(userRules => { + return set_promise(rules.RuleSets().USER_RULE_KEY, userRules); + }); + + migration_version = 2; + await set_promise('migration_version', migration_version); + } + + if (migration_version <= 2) { + await get_promise('disabledList', []) + .then(disabledList => { + disabledList = disabledList.map(item => { + return util.getNormalisedHostname(item); + }); + return disabledList; + }) + .then(disabledList => { + return set_promise('disabledList', disabledList); + }); + + migration_version = 3; + await set_promise('migration_version', migration_version); + } +} + +const local = { + get: (...args) => chrome.storage.local.get(...args), + set: (...args) => chrome.storage.local.set(...args), + remove: (...args) => chrome.storage.local.remove(...args), + get_promise: local_get_promise, + set_promise: local_set_promise +}; + +function setStorage(store) { + Object.assign(exports, { + get: store.get.bind(store), + set: store.set.bind(store), + remove: store.remove.bind(store), + get_promise, + set_promise, + local + }); + chrome.runtime.sendMessage("store_initialized"); +} + +Object.assign(exports, { + initialize, + performMigrations +}); + +})(typeof exports == 'undefined' ? require.scopes.store = {} : exports); diff --git a/chromium/background-scripts/update.js b/chromium/background-scripts/update.js new file mode 100644 index 000000000000..a0bc7fdf85e9 --- /dev/null +++ b/chromium/background-scripts/update.js @@ -0,0 +1,480 @@ +/* global pako */ + +"use strict"; + +let combined_update_channels, extension_version; +const { update_channels } = require('./update_channels'); +const wasm = require('./wasm'); + +// Determine if we're in the tests. If so, define some necessary components. +if (typeof window === "undefined") { + var WebCrypto = require("node-webcrypto-ossl"), + crypto = new WebCrypto(), + atob = require("atob"), + btoa = require("btoa"), + pako = require('../external/pako-1.0.5/pako_inflate.min.js'), + { TextDecoder } = require('text-encoding'), + chrome = require("sinon-chrome"), + window = { atob, btoa, chrome, crypto, pako, TextDecoder }, + fs = require('fs'); + + extension_version = JSON.parse(fs.readFileSync('./manifest.json')).version; + + combined_update_channels = update_channels; +} else { + extension_version = chrome.runtime.getManifest().version; +} + +(function(exports) { + +const util = require('./util'); + +let store, + background_callback; + +// how often we should check for new rulesets +const periodicity = 86400; + +const extension_date = new Date(extension_version.split('.').slice(0,3).join('-')); +const extension_timestamp = extension_date.getTime() / 1000; + +let imported_keys; + +// update channels are loaded from `background-scripts/update_channels.js` as well as the storage api +async function loadUpdateChannelsKeys() { + util.log(util.NOTE, 'Loading update channels and importing associated public keys.'); + + const stored_update_channels = await store.get_promise('update_channels', []); + const combined_update_channels_preflight = update_channels.concat(stored_update_channels); + + imported_keys = {}; + combined_update_channels = []; + + for(let update_channel of combined_update_channels_preflight) { + + try{ + imported_keys[update_channel.name] = await window.crypto.subtle.importKey( + "jwk", + update_channel.jwk, + { + name: "RSA-PSS", + hash: {name: "SHA-256"}, + }, + false, + ["verify"] + ); + combined_update_channels.push(update_channel); + util.log(util.NOTE, update_channel.name + ': Update channel key loaded.'); + } catch(err) { + util.log(util.WARN, update_channel.name + ': Could not import key. Aborting.'); + } + } +} + + +// Determine the time until we should check for new rulesets +async function timeToNextCheck() { + const last_checked = await store.local.get_promise('last-checked', false); + if(last_checked) { + const current_timestamp = Date.now() / 1000; + const secs_since_last_checked = current_timestamp - last_checked; + return Math.max(0, periodicity - secs_since_last_checked); + } else { + return 0; + } +} + +// Check for new rulesets immediately +async function resetTimer() { + await store.local.set_promise('last-checked', false); + destroyTimer(); + await createTimer(); +} + +// Check for new updates. If found, return the timestamp. If not, return false +async function checkForNewUpdates(update_channel) { + let timestamp_result = await fetch(update_channel.update_path_prefix + (update_channel.format == "bloom" ? "/latest-bloom-timestamp" : "/latest-rulesets-timestamp")); + if(timestamp_result.status == 200) { + let uc_timestamp = Number(await timestamp_result.text()); + + if((await store.local.get_promise('uc-timestamp: ' + update_channel.name, 0)) < uc_timestamp) { + return uc_timestamp; + } + } + return false; +} + +// Retrieve the timestamp for when an update channel was published +async function getUpdateChannelTimestamps() { + let timestamp_promises = []; + for(let update_channel of combined_update_channels) { + timestamp_promises.push(new Promise(async resolve => { + let timestamp = await store.local.get_promise('uc-stored-timestamp: ' + update_channel.name, 0); + resolve([update_channel, timestamp]); + })); + } + let timestamps = await Promise.all(timestamp_promises); + return timestamps; +} + +// Download and return new rulesets +async function getNewRulesets(rulesets_timestamp, update_channel) { + + store.local.set_promise('uc-timestamp: ' + update_channel.name, rulesets_timestamp); + + let signature_promise = fetch(update_channel.update_path_prefix + "/rulesets-signature." + rulesets_timestamp + ".sha256"); + let rulesets_promise = fetch(update_channel.update_path_prefix + "/default.rulesets." + rulesets_timestamp + ".gz"); + + let responses = await Promise.all([ + signature_promise, + rulesets_promise + ]); + + let resolutions = await Promise.all([ + responses[0].arrayBuffer(), + responses[1].arrayBuffer() + ]); + + return { + signature_array_buffer: resolutions[0], + rulesets_array_buffer: resolutions[1] + }; +} + +// Download and return new bloom +async function getNewBloom(bloom_timestamp, update_channel) { + store.local.set_promise('uc-timestamp: ' + update_channel.name, bloom_timestamp); + + let signature_promise = fetch(update_channel.update_path_prefix + "/bloom-signature." + bloom_timestamp + ".sha256"); + let bloom_metadata_promise = fetch(update_channel.update_path_prefix + "/bloom-metadata." + bloom_timestamp + ".json"); + let bloom_promise = fetch(update_channel.update_path_prefix + "/bloom." + bloom_timestamp + ".bin"); + + let responses = await Promise.all([ + signature_promise, + bloom_metadata_promise, + bloom_promise + ]); + + let resolutions = await Promise.all([ + responses[0].arrayBuffer(), + responses[1].arrayBuffer(), + responses[2].arrayBuffer() + ]); + + return { + signature_array_buffer: resolutions[0], + bloom_metadata_array_buffer: resolutions[1], + bloom_array_buffer: resolutions[2], + }; + +} + +// Returns a promise which verifies that the rulesets have a valid EFF +// signature, and if so, stores them and returns true. +// Otherwise, it throws an exception. +function verifyAndStoreNewRulesets(new_rulesets, rulesets_timestamp, update_channel) { + return new Promise((resolve, reject) => { + window.crypto.subtle.verify( + { + name: "RSA-PSS", + saltLength: 32 + }, + imported_keys[update_channel.name], + new_rulesets.signature_array_buffer, + new_rulesets.rulesets_array_buffer + ).then(async isvalid => { + if(isvalid) { + util.log(util.NOTE, update_channel.name + ': Downloaded ruleset signature checks out. Storing rulesets.'); + + const rulesets_gz = util.ArrayBufferToString(new_rulesets.rulesets_array_buffer); + const rulesets_byte_array = pako.inflate(rulesets_gz); + const rulesets = new TextDecoder("utf-8").decode(rulesets_byte_array); + const rulesets_json = JSON.parse(rulesets); + + if(rulesets_json.timestamp != rulesets_timestamp) { + reject(update_channel.name + ': Downloaded ruleset had an incorrect timestamp. This may be an attempted downgrade attack. Aborting.'); + } else { + await store.local.set_promise('rulesets: ' + update_channel.name, window.btoa(rulesets_gz)); + resolve(true); + } + } else { + reject(update_channel.name + ': Downloaded ruleset signature is invalid. Aborting.'); + } + }).catch(() => { + reject(update_channel.name + ': Downloaded ruleset signature could not be verified. Aborting.'); + }); + }); +} + +// Returns a promise which verifies that the bloom has a valid EFF +// signature, and if so, stores it and returns true. +// Otherwise, it throws an exception. +function verifyAndStoreNewBloom(new_bloom, bloom_timestamp, update_channel) { + return new Promise((resolve, reject) => { + window.crypto.subtle.verify( + { + name: "RSA-PSS", + saltLength: 32 + }, + imported_keys[update_channel.name], + new_bloom.signature_array_buffer, + new_bloom.bloom_metadata_array_buffer + ).then(async isvalid => { + if(isvalid) { + util.log(util.NOTE, update_channel.name + ': Bloom filter metadata signature checks out.'); + + const bloom_metadata = JSON.parse(util.ArrayBufferToString(new_bloom.bloom_metadata_array_buffer)); + const bloom_str = util.ArrayBufferToString(new_bloom.bloom_array_buffer); + + if(bloom_metadata.timestamp != bloom_timestamp) { + reject(update_channel.name + ': Downloaded bloom filter had an incorrect timestamp. This may be an attempted downgrade attack. Aborting.'); + } else if(await sha256sum(new_bloom.bloom_array_buffer) != bloom_metadata.sha256sum) { + reject(update_channel.name + ': sha256sum of the bloom filter is invalid. Aborting.'); + } else { + await store.local.set_promise('bloom: ' + update_channel.name, window.btoa(bloom_str)); + await store.local.set_promise('bloom_bitmap_bits: ' + update_channel.name, bloom_metadata.bitmap_bits); + await store.local.set_promise('bloom_k_num: ' + update_channel.name, bloom_metadata.k_num); + await store.local.set_promise('bloom_sip_keys_0_0: ' + update_channel.name, bloom_metadata.sip_keys[0][0]); + await store.local.set_promise('bloom_sip_keys_0_1: ' + update_channel.name, bloom_metadata.sip_keys[0][1]); + await store.local.set_promise('bloom_sip_keys_1_0: ' + update_channel.name, bloom_metadata.sip_keys[1][0]); + await store.local.set_promise('bloom_sip_keys_1_1: ' + update_channel.name, bloom_metadata.sip_keys[1][1]); + resolve(true); + } + } else { + reject(update_channel.name + ': Downloaded bloom filter metadata signature is invalid. Aborting.'); + } + }).catch(() => { + reject(update_channel.name + ': Downloaded bloom signature could not be verified. Aborting.'); + }); + }); +} + +async function sha256sum(buffer) { + const hashBuffer = await window.crypto.subtle.digest('SHA-256', buffer); + const hashArray = Array.from(new Uint8Array(hashBuffer)); + const hashHex = hashArray.map(b => ('00' + b.toString(16)).slice(-2)).join(''); + return hashHex; +} + +function isNotUndefined(subject) { + return (typeof subject != 'undefined'); +} + +// Apply the rulesets we have stored. +async function applyStoredRulesets(rulesets_obj) { + let rulesets_promises = []; + for(let update_channel of combined_update_channels) { + if(update_channel.format == "rulesets" || !update_channel.format) { + rulesets_promises.push(new Promise(resolve => { + const key = 'rulesets: ' + update_channel.name; + chrome.storage.local.get(key, root => { + if(root[key]) { + util.log(util.NOTE, update_channel.name + ': Applying stored rulesets.'); + + const rulesets_gz = window.atob(root[key]); + const rulesets_byte_array = pako.inflate(rulesets_gz); + const rulesets_string = new TextDecoder("utf-8").decode(rulesets_byte_array); + const rulesets_json = JSON.parse(rulesets_string); + + resolve({json: rulesets_json, scope: update_channel.scope, replaces: update_channel.replaces_default_rulesets}); + } else { + resolve(); + } + }); + })); + } + } + + const rulesets_results = (await Promise.all(rulesets_promises)).filter(isNotUndefined); + + let replaces = false; + for(const rulesets_result of rulesets_results) { + if(rulesets_result.replaces === true) { + replaces = true; + } + rulesets_obj.addFromJson(rulesets_result.json.rulesets, rulesets_result.scope); + } + + if(!replaces) { + rulesets_obj.addFromJson(util.loadExtensionFile('rules/default.rulesets', 'json'), ''); + } +} + +// Apply the blooms we have stored. +async function applyStoredBlooms(bloom_arr) { + let bloom_promises = []; + for(let update_channel of combined_update_channels) { + if(update_channel.format == "bloom") { + bloom_promises.push(new Promise(resolve => { + const key = 'bloom: ' + update_channel.name; + chrome.storage.local.get(key, async root => { + if(root[key]) { + util.log(util.NOTE, update_channel.name + ': Applying stored bloom filter.'); + const bloom = util.StringToArrayBuffer(window.atob(root[key])); + const bloom_bitmap_bits = await store.local.get_promise('bloom_bitmap_bits: ' + update_channel.name, ""); + const bloom_k_num = await store.local.get_promise('bloom_k_num: ' + update_channel.name, ""); + const bloom_sip_keys_0_0 = await store.local.get_promise('bloom_sip_keys_0_0: ' + update_channel.name, ""); + const bloom_sip_keys_0_1 = await store.local.get_promise('bloom_sip_keys_0_1: ' + update_channel.name, ""); + const bloom_sip_keys_1_0 = await store.local.get_promise('bloom_sip_keys_1_0: ' + update_channel.name, ""); + const bloom_sip_keys_1_1 = await store.local.get_promise('bloom_sip_keys_1_1: ' + update_channel.name, ""); + + try{ + resolve(wasm.Bloom.from_existing(bloom, bloom_bitmap_bits, bloom_k_num, [[bloom_sip_keys_0_0, bloom_sip_keys_0_1], [bloom_sip_keys_1_0, bloom_sip_keys_1_1]])); + } catch(_) { + resolve(); + } + } else { + resolve(); + } + }); + })); + } + } + + bloom_arr.length = 0; + const bloom_results = (await Promise.all(bloom_promises)).filter(isNotUndefined); + for(const bloom_result of bloom_results) { + bloom_arr.push(bloom_result); + } +} + + +// basic workflow for periodic checks +async function performCheck() { + util.log(util.NOTE, 'Checking for new updates.'); + + const current_timestamp = Date.now() / 1000; + store.local.set_promise('last-checked', current_timestamp); + + let num_updates = 0; + for(let update_channel of combined_update_channels) { + if(update_channel.format == "bloom") { + let new_bloom_timestamp = await checkForNewUpdates(update_channel); + if(new_bloom_timestamp) { + util.log(util.NOTE, update_channel.name + ': A new bloom filter has been released. Downloading now.'); + let new_bloom = await getNewBloom(new_bloom_timestamp, update_channel); + try{ + await verifyAndStoreNewBloom(new_bloom, new_bloom_timestamp, update_channel); + store.local.set_promise('uc-stored-timestamp: ' + update_channel.name, new_bloom_timestamp); + num_updates++; + } catch(err) { + util.log(util.WARN, update_channel.name + ': ' + err); + } + } + } else { + let new_rulesets_timestamp = await checkForNewUpdates(update_channel); + if(new_rulesets_timestamp) { + + if(update_channel.replaces_default_rulesets && extension_timestamp > new_rulesets_timestamp) { + util.log(util.NOTE, update_channel.name + ': A new ruleset bundle has been released, but it is older than the extension-bundled rulesets it replaces. Skipping.'); + continue; + } + + util.log(util.NOTE, update_channel.name + ': A new ruleset bundle has been released. Downloading now.'); + let new_rulesets = await getNewRulesets(new_rulesets_timestamp, update_channel); + try{ + await verifyAndStoreNewRulesets(new_rulesets, new_rulesets_timestamp, update_channel); + store.local.set_promise('uc-stored-timestamp: ' + update_channel.name, new_rulesets_timestamp); + num_updates++; + } catch(err) { + util.log(util.WARN, update_channel.name + ': ' + err); + } + } + } + } + if(num_updates > 0) { + background_callback(); + } +}; + +async function storageListener(changes, areaName) { + if (areaName === 'sync' || areaName === 'local') { + if ('autoUpdateRulesets' in changes) { + if (changes.autoUpdateRulesets.newValue) { + await createTimer(); + } else { + destroyTimer(); + } + } + } + + if ('update_channels' in changes) { + await loadUpdateChannelsKeys(); + } +}; + +function addStorageListener() { + chrome.storage.onChanged.addListener(storageListener); +} + +function removeStorageListener() { + chrome.storage.onChanged.removeListener(storageListener); +} + +addStorageListener(); + +let initialCheck, + subsequentChecks; + +async function createTimer() { + const time_to_next_check = await timeToNextCheck(); + + initialCheck = setTimeout(() => { + performCheck(); + subsequentChecks = setInterval(performCheck, periodicity * 1000); + }, time_to_next_check * 1000); +} + +function destroyTimer() { + if (initialCheck) { + clearTimeout(initialCheck); + } + if (subsequentChecks) { + clearInterval(subsequentChecks); + } +} + +function clear_replacement_update_channels() { + let keys = []; + for (const update_channel of combined_update_channels) { + if(update_channel.replaces_default_rulesets) { + util.log(util.NOTE, update_channel.name + ': You have a new version of the extension. Clearing any stored rulesets, which replace the new extension-bundled ones.'); + keys.push('uc-timestamp: ' + update_channel.name); + keys.push('uc-stored-timestamp: ' + update_channel.name); + keys.push('rulesets: ' + update_channel.name); + } + } + + return new Promise(resolve => { + chrome.storage.local.remove(keys, resolve); + }); +} + +async function initialize(store_param, cb) { + store = store_param; + background_callback = cb; + + await loadUpdateChannelsKeys(); + + if (await store.local.get_promise('extensionTimestamp', 0) !== extension_timestamp) { + await clear_replacement_update_channels(); + await store.local.set_promise('extensionTimestamp', extension_timestamp); + } + + if (await store.get_promise('autoUpdateRulesets', true)) { + await createTimer(); + } +} + +Object.assign(exports, { + applyStoredRulesets, + applyStoredBlooms, + initialize, + getUpdateChannelTimestamps, + resetTimer, + loadUpdateChannelsKeys, + addStorageListener, + removeStorageListener, +}); + +})(typeof exports == 'undefined' ? require.scopes.update = {} : exports); diff --git a/chromium/background-scripts/update_channels.js b/chromium/background-scripts/update_channels.js new file mode 100644 index 000000000000..80494ef0f2cc --- /dev/null +++ b/chromium/background-scripts/update_channels.js @@ -0,0 +1,44 @@ +/* exported update_channels */ + +'use strict'; + +(function (exports) { + +exports.update_channels = [ + { + name: 'EFF (Full)', + jwk: { + kty: 'RSA', + e: 'AQAB', + n: '1cwvFQu3Kw-Pz8bcEFuV5zx0ZheDsc4Tva7Qv6BL90_sDLqCW79Y543nDkPtNVfFH_89pt2kSPp_IcS5XnYiw6zBQeFuILFw5JpvZt14K0s4' + + 'e025Q9CXfhYKIBKT9PnqihwAacjMa6rQb7RTu7XxVvqxRb3b0vx2CR40LSlYZ8H_KpeaUwq2oz-fyrI6LFTeYvbO3ZuLKeK5xV1a32xeTVMF' + + 'kIj3LxnQalxq-DRHfj7LRRoTnbRDW4uoDc8aVpLFliuO79jUKbobz4slpiWJ4wjKR_O6OK13HbZUiOSxi8Bms-UqBPOyzbMVpmA7lv_zWdaL' + + 'u1IVlVXQyLVbbrqI6llRqfHdcJoEl-eC48AofuB-relQtjTEK_hyBf7sPwrbqAarjRjlyEx6Qy5gTXyxM9attfNAeupYR6jm8LKm6TFpfWky' + + 'DxUmj_f5pJMBWNTomV74f8iQ2M18_KWMUDCOf80tR0t21Q1iCWdvA3K_KJn05tTLyumlwwlQijMqRkYuao-CX9L3DJIaB3VPYPTSIPUr7oi1' + + '6agsuamOyiOtlZiRpEvoNg2ksJMZtwnj5xhBQydkdhMW2ZpHDzcLuZlhJYZL_l3_7wuzRM7vpyA9obP92CpZRFJErGZmFxJC93I4U9-0B0wg' + + '-sbyMKGJ5j1BWTnibCklDXtWzXtuiz18EgE' + }, + update_path_prefix: 'https://www.https-rulesets.org/v1/', + scope: '', + replaces_default_rulesets: true + }, + { + name: 'DuckDuckGo Smarter Encryption', + format: 'bloom', + jwk: { + kty: 'RSA', + e: 'AQAB', + n: '1cwvFQu3Kw-Pz8bcEFuV5zx0ZheDsc4Tva7Qv6BL90_sDLqCW79Y543nDkPtNVfFH_89pt2kSPp_IcS5XnYiw6zBQeFuILFw5JpvZt14K0s4' + + 'e025Q9CXfhYKIBKT9PnqihwAacjMa6rQb7RTu7XxVvqxRb3b0vx2CR40LSlYZ8H_KpeaUwq2oz-fyrI6LFTeYvbO3ZuLKeK5xV1a32xeTVMF' + + 'kIj3LxnQalxq-DRHfj7LRRoTnbRDW4uoDc8aVpLFliuO79jUKbobz4slpiWJ4wjKR_O6OK13HbZUiOSxi8Bms-UqBPOyzbMVpmA7lv_zWdaL' + + 'u1IVlVXQyLVbbrqI6llRqfHdcJoEl-eC48AofuB-relQtjTEK_hyBf7sPwrbqAarjRjlyEx6Qy5gTXyxM9attfNAeupYR6jm8LKm6TFpfWky' + + 'DxUmj_f5pJMBWNTomV74f8iQ2M18_KWMUDCOf80tR0t21Q1iCWdvA3K_KJn05tTLyumlwwlQijMqRkYuao-CX9L3DJIaB3VPYPTSIPUr7oi1' + + '6agsuamOyiOtlZiRpEvoNg2ksJMZtwnj5xhBQydkdhMW2ZpHDzcLuZlhJYZL_l3_7wuzRM7vpyA9obP92CpZRFJErGZmFxJC93I4U9-0B0wg' + + '-sbyMKGJ5j1BWTnibCklDXtWzXtuiz18EgE' + }, + update_path_prefix: 'https://www.https-rulesets.org/ddg/', + scope: '', + } +]; + +})(typeof exports === 'undefined' ? require.scopes.update_channels = {} : exports); diff --git a/chromium/background-scripts/util.js b/chromium/background-scripts/util.js new file mode 100644 index 000000000000..e2b069b8017d --- /dev/null +++ b/chromium/background-scripts/util.js @@ -0,0 +1,183 @@ +"use strict"; + +(function(exports) { + +var VERB = 1; +var DBUG = 2; +var INFO = 3; +var NOTE = 4; +var WARN = 5; +// FYI: Logging everything is /very/ slow. Chrome will log & buffer +// these console logs even when the debug tools are closed. :( + +// TODO: Add an easy UI to change the log level. +// (Developers can just type DEFAULT_LOG_LEVEL=VERB in the console) +var DEFAULT_LOG_LEVEL = NOTE; +console.log("Hey developer! Want to see more verbose logging?"); +console.log("Type this into the console: let util = require('./util'); util.setDefaultLogLevel(util.VERB);"); +console.log("Accepted levels are VERB, DBUG, INFO, NOTE and WARN, default is NOTE"); + +function log(level, str) { + if (level >= DEFAULT_LOG_LEVEL) { + if (level === WARN) { + // Show warning with a little yellow icon in Chrome. + console.warn(str); + } else { + console.log(str); + } + } +} + +function setDefaultLogLevel(level) { + DEFAULT_LOG_LEVEL = level; +} + +function getDefaultLogLevel() { + return DEFAULT_LOG_LEVEL; +} + +/** + * Load a file packaged with the extension + * + * @param url: a relative URL to local file + */ +function loadExtensionFile(url, returnType) { + var xhr = new XMLHttpRequest(); + // Use blocking XHR to ensure everything is loaded by the time + // we return. + xhr.open("GET", chrome.runtime.getURL(url), false); + xhr.send(null); + // Get file contents + if (xhr.readyState !== 4) { + return; + } + if (returnType === 'xml') { + return xhr.responseXML; + } + if (returnType === 'json') { + return JSON.parse(xhr.responseText); + } + return xhr.responseText; +} + +/** + * Remove tailing dots from hostname, e.g. "www.example.com." + * Preserve port numbers if they are used + */ +function getNormalisedHostname(host) { + let [ hostname, port ] = host.split(":"); + while (hostname && hostname[hostname.length - 1] === '.' && hostname !== '.') { + hostname = hostname.slice(0, -1); + } + if (port) { + return `${hostname}:${port}`; + } + return hostname; +} + +// Empty iterable singleton to reduce memory usage +const nullIterable = Object.create(null, { + [Symbol.iterator]: { + value: function* () { + // do nothing + } + }, + + size: { + value: 0 + }, +}); + +/** + * Return true if host is well-formed (RFC 1035) + */ +function isValidHostname(host) { + if (host && host.length > 0 && host.length <= 255 && host.indexOf("..") === -1) { + return true; + } + return false; +} + +/** + * Return a list of wildcard expressions which support + * the host under HTTPS Everywhere's implementation + */ +function getWildcardExpressions(host) { + // Ensure host is well-formed (RFC 1035) + if (!isValidHostname(host)) { + return nullIterable; + } + + // Ensure host does not contain a wildcard itself + if (host.indexOf("*") != -1) { + return nullIterable; + } + + let results = []; + + // Replace www.example.com with www.example.* + // eat away from the right for once and only once + let segmented = host.split("."); + if (segmented.length > 1) { + const tmp = [...segmented.slice(0, segmented.length - 1), "*"].join("."); + results.push(tmp); + } + + // now eat away from the left, with *, so that for x.y.z.google.com we + // check *.y.z.google.com, *.z.google.com and *.google.com + for (let i = 1; i < segmented.length - 1; i++) { + const tmp = ["*", ...segmented.slice(i, segmented.length)].join("."); + results.push(tmp); + } + return results; +} + +/** + * Convert an ArrayBuffer to string + * + * @param array: an ArrayBuffer to convert + */ +function ArrayBufferToString(ab) { + let array = new Uint8Array(ab); + let string = ""; + + for (let byte of array) { + string += String.fromCharCode(byte); + } + + return string; +} + +/** + * Convert a string to an ArrayBuffer + * + * @param string: a string to convert + */ +function StringToArrayBuffer(str) { + var byteArray = new Uint8Array(str.length); + for (var i = 0; i < str.length; i++) { + byteArray[i] = str.charCodeAt(i); + } + return byteArray; +} + + +Object.assign(exports, { + VERB, + DBUG, + INFO, + NOTE, + WARN, + log, + nullIterable, + isValidHostname, + getNormalisedHostname, + getWildcardExpressions, + setDefaultLogLevel, + getDefaultLogLevel, + loadExtensionFile, + ArrayBufferToString, + StringToArrayBuffer +}); + +})(typeof exports == 'undefined' ? require.scopes.util = {} : exports); diff --git a/chromium/background-scripts/wasm.js b/chromium/background-scripts/wasm.js new file mode 100644 index 000000000000..551b1d3ea672 --- /dev/null +++ b/chromium/background-scripts/wasm.js @@ -0,0 +1,27 @@ +"use strict"; + +(function(exports) { + +const util = require('./util'), + { RuleSets, Bloom } = wasm_bindgen; + +async function initialize() { + try { + await wasm_bindgen(chrome.runtime.getURL('wasm/https_everywhere_lib_wasm_bg.wasm')); + } catch(e) { + util.log(util.WARN, 'The wasm library has not loaded correctly: ' + e); + } +} + +function is_enabled() { + return true; +} + +Object.assign(exports, { + initialize, + RuleSets, + Bloom, + is_enabled, +}); + +})(typeof exports == 'undefined' ? require.scopes.wasm = {} : exports); diff --git a/chromium/background.js b/chromium/background.js deleted file mode 100644 index 8d5d650215e7..000000000000 --- a/chromium/background.js +++ /dev/null @@ -1,720 +0,0 @@ -"use strict"; - -(function(exports) { - -const rules = require('./rules'), - store = require('./store'), - incognito = require('./incognito'), - util = require('./util'); - - -let all_rules = new rules.RuleSets(); - -async function initialize() { - await store.initialize(); - await store.performMigrations(); - await initializeStoredGlobals(); - await all_rules.loadFromBrowserStorage(store); - await incognito.onIncognitoDestruction(destroy_caches); -} -initialize(); - -async function initializeAllRules() { - const r = new rules.RuleSets(); - await r.loadFromBrowserStorage(store); - Object.assign(all_rules, r); -} - -/** - * Load preferences. Structure is: - * { - * httpNowhere: Boolean, - * showCounter: Boolean, - * isExtensionEnabled: Boolean - * } - */ -var httpNowhereOn = false; -var showCounter = true; -var isExtensionEnabled = true; - -function initializeStoredGlobals(){ - return new Promise(resolve => { - store.get({ - httpNowhere: false, - showCounter: true, - globalEnabled: true, - enableMixedRulesets: false - }, function(item) { - httpNowhereOn = item.httpNowhere; - showCounter = item.showCounter; - isExtensionEnabled = item.globalEnabled; - updateState(); - - rules.settings.enableMixedRulesets = item.enableMixedRulesets; - - resolve(); - }); - }); -} - -chrome.storage.onChanged.addListener(async function(changes, areaName) { - if (areaName === 'sync' || areaName === 'local') { - if ('httpNowhere' in changes) { - httpNowhereOn = changes.httpNowhere.newValue; - updateState(); - } - if ('showCounter' in changes) { - showCounter = changes.showCounter.newValue; - updateState(); - } - if ('globalEnabled' in changes) { - isExtensionEnabled = changes.globalEnabled.newValue; - updateState(); - } - if ('debugging_rulesets' in changes) { - initializeAllRules(); - } - } -}); - -if (chrome.tabs) { - chrome.tabs.onActivated.addListener(function() { - updateState(); - }); -} -if (chrome.windows) { - chrome.windows.onFocusChanged.addListener(function() { - updateState(); - }); -} -chrome.webNavigation.onCompleted.addListener(function() { - updateState(); -}); - -// Records which tabId's are active in the HTTPS Switch Planner (see -// devtools-panel.js). -var switchPlannerEnabledFor = {}; -// Detailed information recorded when the HTTPS Switch Planner is active. -// Structure is: -// switchPlannerInfo[tabId]["rw"/"nrw"][resource_host][active_content][url]; -// rw / nrw stand for "rewritten" versus "not rewritten" -var switchPlannerInfo = {}; - -/** - * Set the icon color correctly - * active: extension is enabled. - * blocking: extension is in "block all HTTP requests" mode. - * disabled: extension is disabled from the popup menu. - */ - -function updateState () { - if (!chrome.tabs) return; - - let iconState = 'active'; - - if (!isExtensionEnabled) { - iconState = 'disabled'; - } else if (httpNowhereOn) { - iconState = 'blocking'; - } - - if ('setIcon' in chrome.browserAction) { - chrome.browserAction.setIcon({ - path: { - 38: 'icons/icon-' + iconState + '-38.png' - } - }); - } - - chrome.browserAction.setTitle({ - title: 'HTTPS Everywhere' + ((iconState === 'active') ? '' : ' (' + iconState + ')') - }); - - chrome.tabs.query({ active: true, currentWindow: true }, function(tabs) { - if (!tabs || tabs.length === 0) { - return; - } - const tabId = tabs[0].id; - const activeCount = appliedRulesets.getActiveRulesetCount(tabId); - - if ('setBadgeBackgroundColor' in chrome.browserAction) { - chrome.browserAction.setBadgeBackgroundColor({ color: '#666666', tabId }); - } - - const showBadge = activeCount > 0 && isExtensionEnabled && showCounter; - - if ('setBadgeText' in chrome.browserAction) { - chrome.browserAction.setBadgeText({ text: showBadge ? String(activeCount) : '', tabId }); - } - }); -} - -/** - * The following allows fennec to interact with the popup ui - * */ -chrome.browserAction.onClicked.addListener(e => { - const url = chrome.extension.getURL("popup.html?tabId=" + e.id); - chrome.tabs.create({ - url - }); -}); - - - -/** - * Add a listener for removed tabs - */ -function AppliedRulesets() { - this.active_tab_rules = new Map(); - this.active_tab_main_frames = new Map(); - - let that = this; - if (chrome.tabs) { - chrome.tabs.onRemoved.addListener(function(tabId) { - that.removeTab(tabId); - }); - } -} - -AppliedRulesets.prototype = { - addRulesetToTab: function(tabId, type, ruleset) { - if (!this.active_tab_main_frames.has(tabId)) { - this.active_tab_main_frames.set(tabId, false); - } - - // always show main_frame ruleset on the top - if (type == "main_frame") { - this.active_tab_main_frames.set(tabId, true); - this.active_tab_rules.set(tabId, [ruleset,]); - return ; - } - - if (this.active_tab_rules.has(tabId)) { - let rulesets = this.active_tab_rules.get(tabId); - let insertIndex = 0; - - const ruleset_name = ruleset.name.toLowerCase(); - - for (const item of rulesets) { - const item_name = item.name.toLowerCase(); - - if (item_name == ruleset_name) { - return ; - } else if (insertIndex == 0 && this.active_tab_main_frames.get(tabId)) { - insertIndex = 1; - } else if (item_name < ruleset_name) { - insertIndex++; - } - } - rulesets.splice(insertIndex, 0, ruleset); - } else { - this.active_tab_rules.set(tabId, [ruleset,]); - } - }, - - getRulesets: function(tabId) { - if (this.active_tab_rules.has(tabId)) { - return this.active_tab_rules.get(tabId); - } else { - return null; - } - }, - - removeTab: function(tabId) { - this.active_tab_rules.delete(tabId); - this.active_tab_main_frames.delete(tabId); - }, - - getActiveRulesetCount: function (tabId) { - let activeCount = 0; - - const rulesets = this.getRulesets(tabId); - if (rulesets) { - for (const ruleset of rulesets) { - if (ruleset.active) { - activeCount++; - } - } - } - return activeCount; - } -}; - -var appliedRulesets = new AppliedRulesets(); - -var urlBlacklist = new Set(); - -// redirect counter workaround -// TODO: Remove this code if they ever give us a real counter -var redirectCounter = new Map(); - -/** - * Called before a HTTP(s) request. Does the heavy lifting - * Cancels the request/redirects it to HTTPS. URL modification happens in here. - * @param details of the handler, see Chrome doc - * */ -function onBeforeRequest(details) { - // If HTTPSe has been disabled by the user, return immediately. - if (!isExtensionEnabled) { - return; - } - - let uri = new URL(details.url); - - // Normalise hosts with tailing dots, e.g. "www.example.com." - let canonical_host = uri.hostname; - while (canonical_host.charAt(canonical_host.length - 1) == ".") { - canonical_host = canonical_host.slice(0, -1); - uri.hostname = canonical_host; - } - - // Should the request be canceled? - const shouldCancel = httpNowhereOn && - uri.protocol === 'http:' && - uri.hostname.slice(-6) !== '.onion' && - uri.hostname !== 'localhost' && - !/^127(\.[0-9]{1,3}){3}$/.test(canonical_host) && - !/^0\.0\.0\.0$/.test(canonical_host) && - uri.hostname !== '[::1]'; - - // If there is a username / password, put them aside during the ruleset - // analysis process - let using_credentials_in_url = false; - let tmp_user; - let tmp_pass; - if (uri.password || uri.username) { - using_credentials_in_url = true; - tmp_user = uri.username; - tmp_pass = uri.password; - uri.username = ''; - uri.password = ''; - } - - var canonical_url = uri.href; - if (details.url != canonical_url && !using_credentials_in_url) { - util.log(util.INFO, "Original url " + details.url + - " changed before processing to " + canonical_url); - } - if (urlBlacklist.has(canonical_url)) { - return {cancel: shouldCancel}; - } - - if (details.type == "main_frame") { - appliedRulesets.removeTab(details.tabId); - } - - var potentiallyApplicable = all_rules.potentiallyApplicableRulesets(canonical_host); - - if (redirectCounter.get(details.requestId) >= 8) { - util.log(util.NOTE, "Redirect counter hit for " + canonical_url); - urlBlacklist.add(canonical_url); - rules.settings.domainBlacklist.add(canonical_host); - util.log(util.WARN, "Domain blacklisted " + canonical_host); - return {cancel: shouldCancel}; - } - - var newuristr = null; - - for (let ruleset of potentiallyApplicable) { - appliedRulesets.addRulesetToTab(details.tabId, details.type, ruleset); - if (ruleset.active && !newuristr) { - newuristr = ruleset.apply(canonical_url); - } - } - - // re-insert userpass info which was stripped temporarily - if (using_credentials_in_url) { - if (newuristr) { - const uri_with_credentials = new URL(newuristr); - uri_with_credentials.username = tmp_user; - uri_with_credentials.password = tmp_pass; - newuristr = uri_with_credentials.href; - } else { - const canonical_url_with_credentials = new URL(canonical_url); - canonical_url_with_credentials.username = tmp_user; - canonical_url_with_credentials.password = tmp_pass; - canonical_url = canonical_url_with_credentials.href; - } - } - - // In Switch Planner Mode, record any non-rewriteable - // HTTP URIs by parent hostname, along with the resource type. - if (switchPlannerEnabledFor[details.tabId] && uri.protocol !== "https:") { - writeToSwitchPlanner(details.type, - details.tabId, - canonical_host, - details.url, - newuristr); - } - - if (httpNowhereOn) { - // If loading a main frame, try the HTTPS version as an alternative to - // failing. - if (shouldCancel) { - if (!newuristr) { - return {redirectUrl: canonical_url.replace(/^http:/, "https:")}; - } else { - return {redirectUrl: newuristr.replace(/^http:/, "https:")}; - } - } - if (newuristr && newuristr.substring(0, 5) === "http:") { - // Abort early if we're about to redirect to HTTP in HTTP Nowhere mode - return {cancel: true}; - } - } - - if (newuristr) { - return {redirectUrl: newuristr}; - } else { - return {cancel: shouldCancel}; - } -} - - -// Map of which values for the `type' enum denote active vs passive content. -// https://developer.chrome.com/extensions/webRequest.html#event-onBeforeRequest -const mixedContentTypes = { - object: 1, other: 1, script: 1, stylesheet: 1, sub_frame: 1, xmlhttprequest: 1, - image: 0, main_frame: 0 -}; - -/** - * Record a non-HTTPS URL loaded by a given hostname in the Switch Planner, for - * use in determining which resources need to be ported to HTTPS. - * (Reminder: Switch planner is the pro-tool enabled by switching into debug-mode) - * - * @param type: type of the resource (see activeTypes and passiveTypes arrays) - * @param tab_id: The id of the tab - * @param resource_host: The host of the original url - * @param resource_url: the original url - * @param rewritten_url: The url rewritten to - * */ -function writeToSwitchPlanner(type, tab_id, resource_host, resource_url, rewritten_url) { - let rw = rewritten_url ? "rw" : "nrw"; - - let active_content = 1; - if (mixedContentTypes.hasOwnProperty(type)) { - active_content = mixedContentTypes[type]; - } else { - util.log(util.WARN, "Unknown type from onBeforeRequest details: `" + type + "', assuming active"); - } - - if (!switchPlannerInfo[tab_id]) { - switchPlannerInfo[tab_id] = {}; - switchPlannerInfo[tab_id]["rw"] = {}; - switchPlannerInfo[tab_id]["nrw"] = {}; - } - if (!switchPlannerInfo[tab_id][rw][resource_host]) - switchPlannerInfo[tab_id][rw][resource_host] = {}; - if (!switchPlannerInfo[tab_id][rw][resource_host][active_content]) - switchPlannerInfo[tab_id][rw][resource_host][active_content] = {}; - - switchPlannerInfo[tab_id][rw][resource_host][active_content][resource_url] = 1; -} - -/** - * Return the number of properties in an object. For associative maps, this is - * their size. - * @param obj: object to calc the size for - * */ -function objSize(obj) { - if (typeof obj == 'undefined') return 0; - var size = 0, key; - for (key in obj) { - if (obj.hasOwnProperty(key)) size++; - } - return size; -} - -/** - * Make an array of asset hosts by score so we can sort them, - * presenting the most important ones first. - * */ -function sortSwitchPlanner(tab_id, rewritten) { - var asset_host_list = []; - if (typeof switchPlannerInfo[tab_id] === 'undefined' || - typeof switchPlannerInfo[tab_id][rewritten] === 'undefined') { - return []; - } - var tabInfo = switchPlannerInfo[tab_id][rewritten]; - for (var asset_host in tabInfo) { - var ah = tabInfo[asset_host]; - var activeCount = objSize(ah[1]); - var passiveCount = objSize(ah[0]); - var score = activeCount * 100 + passiveCount; - asset_host_list.push([score, activeCount, passiveCount, asset_host]); - } - asset_host_list.sort(function(a,b){return a[0]-b[0];}); - return asset_host_list; -} - -/** - * monitor cookie changes. Automatically convert them to secure cookies - * @param changeInfo Cookie changed info, see Chrome doc - * */ -function onCookieChanged(changeInfo) { - if (!changeInfo.removed && !changeInfo.cookie.secure && isExtensionEnabled) { - if (all_rules.shouldSecureCookie(changeInfo.cookie)) { - var cookie = {name:changeInfo.cookie.name, - value:changeInfo.cookie.value, - path:changeInfo.cookie.path, - httpOnly:changeInfo.cookie.httpOnly, - expirationDate:changeInfo.cookie.expirationDate, - storeId:changeInfo.cookie.storeId, - secure: true}; - - // Host-only cookies don't set the domain field. - if (!changeInfo.cookie.hostOnly) { - cookie.domain = changeInfo.cookie.domain; - } - - // The cookie API is magical -- we must recreate the URL from the domain and path. - if (changeInfo.cookie.domain[0] == ".") { - cookie.url = "https://www" + changeInfo.cookie.domain + cookie.path; - } else { - cookie.url = "https://" + changeInfo.cookie.domain + cookie.path; - } - // We get repeated events for some cookies because sites change their - // value repeatedly and remove the "secure" flag. - util.log(util.DBUG, - "Securing cookie " + cookie.name + " for " + changeInfo.cookie.domain + ", was secure=" + changeInfo.cookie.secure); - chrome.cookies.set(cookie); - } - } -} - -/** - * handling redirects, breaking loops - * @param details details for the redirect (see chrome doc) - * */ -function onBeforeRedirect(details) { - // Catch redirect loops (ignoring about:blank, etc. caused by other extensions) - let prefix = details.redirectUrl.substring(0, 5); - if (prefix === "http:" || prefix === "https") { - let count = redirectCounter.get(details.requestId); - if (count) { - redirectCounter.set(details.requestId, count + 1); - util.log(util.DBUG, "Got redirect id "+details.requestId+ - ": "+count); - } else { - redirectCounter.set(details.requestId, 1); - } - } -} - -/** - * handle webrequest.onCompleted, cleanup redirectCounter - * @param details details for the chrome.webRequest (see chrome doc) - */ -function onCompleted(details) { - if (redirectCounter.has(details.requestId)) { - redirectCounter.delete(details.requestId); - } -} - -/** - * handle webrequest.onErrorOccurred, cleanup redirectCounter - * @param details details for the chrome.webRequest (see chrome doc) - */ -function onErrorOccurred(details) { - if (redirectCounter.has(details.requestId)) { - redirectCounter.delete(details.requestId); - } -} - -/** - * handle webrequest.onHeadersReceived, insert upgrade-insecure-requests directive - * @param details details for the chrome.webRequest (see chrome doc) - */ -function onHeadersReceived(details) { - if (isExtensionEnabled && httpNowhereOn) { - // Do not upgrade the .onion requests in HTTP Nowhere Mode, - // See https://github.com/EFForg/https-everywhere/pull/14600#discussion_r168072480 - const uri = new URL(details.url); - if (uri.hostname.slice(-6) == '.onion') { - return {}; - } - - for (const idx in details.responseHeaders) { - if (details.responseHeaders[idx].name.match(/Content-Security-Policy/i)) { - // Existing CSP headers found - const value = details.responseHeaders[idx].value; - - // Prepend if no upgrade-insecure-requests directive exists - if (!value.match(/upgrade-insecure-requests/i)) { - details.responseHeaders[idx].value = "upgrade-insecure-requests; " + value; - return {responseHeaders: details.responseHeaders}; - } - return {}; - } - } - - // CSP headers not found - const upgradeInsecureRequests = { - name: 'Content-Security-Policy', - value: 'upgrade-insecure-requests' - } - details.responseHeaders.push(upgradeInsecureRequests); - return {responseHeaders: details.responseHeaders}; - } - return {}; -} - -// Registers the handler for requests -// See: https://github.com/EFForg/https-everywhere/issues/10039 -chrome.webRequest.onBeforeRequest.addListener(onBeforeRequest, {urls: ["*://*/*"]}, ["blocking"]); - -// Try to catch redirect loops on URLs we've redirected to HTTPS. -chrome.webRequest.onBeforeRedirect.addListener(onBeforeRedirect, {urls: ["https://*/*"]}); - -// Cleanup redirectCounter if neccessary -chrome.webRequest.onCompleted.addListener(onCompleted, {urls: ["*://*/*"]}); - -// Cleanup redirectCounter if neccessary -chrome.webRequest.onErrorOccurred.addListener(onErrorOccurred, {urls: ["*://*/*"]}) - -// Insert upgrade-insecure-requests directive in httpNowhere mode -chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, {urls: ["https://*/*"]}, ["blocking", "responseHeaders"]); - -// Listen for cookies set/updated and secure them if applicable. This function is async/nonblocking. -chrome.cookies.onChanged.addListener(onCookieChanged); - - -/** - * disable switch Planner - * @param tabId the Tab to disable for - */ -function disableSwitchPlannerFor(tabId) { - delete switchPlannerEnabledFor[tabId]; - // Clear stored URL info. - delete switchPlannerInfo[tabId]; -} - -/** - * Enable switch planner for specific tab - * @param tabId the tab to enable it for - */ -function enableSwitchPlannerFor(tabId) { - switchPlannerEnabledFor[tabId] = true; -} - -// Listen for connection from the DevTools panel so we can set up communication. -chrome.runtime.onConnect.addListener(function (port) { - if (port.name == "devtools-page") { - chrome.runtime.onMessage.addListener(function(message, sender, sendResponse){ - var tabId = message.tabId; - - var disableOnCloseCallback = function() { - util.log(util.DBUG, "Devtools window for tab " + tabId + " closed, clearing data."); - disableSwitchPlannerFor(tabId); - }; - - if (message.type === "enable") { - enableSwitchPlannerFor(tabId); - port.onDisconnect.addListener(disableOnCloseCallback); - } else if (message.type === "disable") { - disableSwitchPlannerFor(tabId); - } else if (message.type === "getHosts") { - sendResponse({ - nrw: sortSwitchPlanner(tabId, "nrw"), - rw: sortSwitchPlanner(tabId, "rw") - }); - } - }); - } -}); - -// This is necessary for communication with the popup in Firefox Private -// Browsing Mode, see https://bugzilla.mozilla.org/show_bug.cgi?id=1329304 -chrome.runtime.onMessage.addListener(function(message, sender, sendResponse){ - if (message.type == "get_option") { - store.get(message.object, sendResponse); - return true; - } else if (message.type == "set_option") { - store.set(message.object, item => { - if (sendResponse) { - sendResponse(item); - } - }); - } else if (message.type == "delete_from_ruleset_cache") { - all_rules.ruleCache.delete(message.object); - } else if (message.type == "get_active_rulesets") { - sendResponse(appliedRulesets.getRulesets(message.object)); - } else if (message.type == "set_ruleset_active_status") { - let rulesets = appliedRulesets.getRulesets(message.object.tab_id); - - for (let ruleset of rulesets) { - if (ruleset.name == message.object.name) { - ruleset.active = message.object.active; - if (ruleset.default_state == message.object.active) { - message.object.active = undefined; - } - break; - } - } - - all_rules.setRuleActiveState(message.object.name, message.object.active).then(() => { - sendResponse(true); - }); - return true; - } else if (message.type == "add_new_rule") { - all_rules.addNewRuleAndStore(message.object).then(() => { - sendResponse(true); - }); - return true; - } else if (message.type == "remove_rule") { - all_rules.removeRuleAndStore(message.object); - } else if (message.type == "import_settings") { - // This is used when importing settings from the options ui - import_settings(message.object).then(() => { - sendResponse(true); - }); - } -}); - -/** - * Import extension settings (custom rulesets, ruleset toggles, globals) from an object - * @param settings the settings object - */ -async function import_settings(settings) { - if (settings && settings.changed) { - let ruleActiveStates = {}; - // Load all the ruleset toggles into memory and store - for (const ruleset_name in settings.rule_toggle) { - ruleActiveStates[ruleset_name] = (settings.rule_toggle[ruleset_name] == "true"); - } - - // Save settings - await new Promise(resolve => { - store.set({ - legacy_custom_rulesets: settings.custom_rulesets, - httpNowhere: settings.prefs.http_nowhere_enabled, - showCounter: settings.prefs.show_counter, - globalEnabled: settings.prefs.global_enabled, - ruleActiveStates - }, resolve); - }); - - initializeAllRules(); - } -} - -/** - * Clear any cache/ blacklist we have. - */ -function destroy_caches() { - util.log(util.DBUG, "Destroying caches."); - all_rules.cookieHostCache.clear(); - all_rules.ruleCache.clear(); - rules.settings.domainBlacklist.clear(); - urlBlacklist.clear(); -} - -Object.assign(exports, { - all_rules, - urlBlacklist, - sortSwitchPlanner, - switchPlannerInfo -}); - -})(typeof exports == 'undefined' ? require.scopes.background = {} : exports); diff --git a/chromium/debugging-rulesets.html b/chromium/debugging-rulesets.html deleted file mode 100644 index 9585c3320e62..000000000000 --- a/chromium/debugging-rulesets.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - -
Debugging Rulesets
-
- Enter ruleset XML below and click save when ready. These rulesets will be immediately activated upon saving, and will persist across restarts.
- Warning: This should only be used for debugging rulesets. This feature is not guaranteed to work reliably for regular usage.
- Note: Due to a bug in Chromium, it may be necessary to close the options ui before saving. -
-
There are unsaved changes! Be sure to save them for them to take effect.
- - -
Saved!
- - - - diff --git a/chromium/debugging-rulesets.js b/chromium/debugging-rulesets.js deleted file mode 100644 index be6c8b56fd22..000000000000 --- a/chromium/debugging-rulesets.js +++ /dev/null @@ -1,44 +0,0 @@ -/* global sendMessage, CodeMirror */ - -"use strict"; - -const savedTextElement = document.getElementById("saved-text"); -const unsavedTextElement = document.getElementById("unsaved-text"); -const savedTitle = "Debugging Rulesets"; -const unsavedTitle = "* Debugging Rulesets"; - -document.title = savedTitle; - -const cm = CodeMirror.fromTextArea( - document.getElementById("codemirror-textarea"), - { - mode: "xml", - theme: "default main saved" - } -); - -let valueHasChanged = false; -sendMessage("get_option", { debugging_rulesets: "" }, item => { - cm.setValue(item.debugging_rulesets); - cm.on("change", cm => { - if (!(valueHasChanged)) { - valueHasChanged = true; - document.title = unsavedTitle; - cm.setOption("theme", "default main unsaved"); - unsavedTextElement.style.visibility = "visible"; - } - }); -}); - -document.getElementById("save-button").addEventListener("click", e => { - e.preventDefault(); - sendMessage("set_option", { debugging_rulesets: cm.getValue() }, () => { - savedTextElement.style.display = "block"; - setTimeout(() => { savedTextElement.style.display = "none" }, 1000); - - valueHasChanged = false; - document.title = savedTitle; - cm.setOption("theme", "default main saved"); - unsavedTextElement.style.visibility = "hidden"; - }); -}); diff --git a/chromium/devtools-panel.html b/chromium/devtools-panel.html deleted file mode 100644 index 041cc1890c4d..000000000000 --- a/chromium/devtools-panel.html +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - -
- - -
-
-

Switch Planner mode helps prepare for your site's switch to HTTPS by generating a report of external HTTP - resources that might not yet be available on HTTPS.

-

After enabling, navigate around your site and try to exercise all functionality in order to get a - comprehensive list of external resources.

-

For each group of resources listed as "Unrewritten," find out whether they are available on HTTPS. If so: - add a rule to HTTPS Everywhere! If not: try to make them available over HTTPS or use a different resource or - provider. Otherwise your site will generate Mixed - Content (passive or active) errors when you turn on HTTPS.

-

For most accurate results, disable ad blockers before using. Closing this panel will deactivate Switch - Planner mode and clear stored data.

-
- -
- - - diff --git a/chromium/devtools-panel.js b/chromium/devtools-panel.js deleted file mode 100644 index 7def9b0eea1b..000000000000 --- a/chromium/devtools-panel.js +++ /dev/null @@ -1,131 +0,0 @@ -"use strict"; - -function e(id) { - return document.getElementById(id); -} - -/** - * Send message to main extension for HTML to display - * @param type: enable/disable - */ -function sendMessage(type) { - chrome.runtime.sendMessage({ - type: type, - tabId: chrome.devtools.inspectedWindow.tabId, - }); -} - -/** - * Turn on the Switch Planner recording mode, and hide the long description. - */ -function enableSwitchPlanner() { - sendMessage("enable"); - e("SwitchPlannerDescription").style.display = "none"; - e("SwitchPlannerDetails").style.display = "block"; - // Hack: Fetch and display summary information from background page - // once per second. - setInterval(display, 1000); - chrome.devtools.inspectedWindow.reload(); -} - -/** - * Disable the switch planner and reload, so any state is forgotten and - * the long description is restored. - */ -function disableSwitchPlanner() { - sendMessage("disable"); - document.location.reload(); -} - -/** - * Fetch summary HTML of the planner results from the background page for - * display in the devtools panel. - */ -function display() { - chrome.runtime.sendMessage({ - type: "getHosts", - tabId: chrome.devtools.inspectedWindow.tabId, - }, function(response) { - var switch_planner_details = e("SwitchPlannerDetails"); - while (switch_planner_details.firstChild) { - switch_planner_details.removeChild(switch_planner_details.firstChild); - } - - var nrw_text_div = document.createElement("div"); - nrw_text_div.innerText = "Unrewritten HTTP resources loaded from this tab (enable HTTPS on these domains and add them to HTTPS Everywhere):" - var nrw_div = switchPlannerSmallHtmlSection(response.nrw); - var rw_text_div = document.createElement("div"); - rw_text_div.style.marginTop = "20px"; - rw_text_div.innerText = "Resources rewritten successfully from this tab (update these in your source code):" - var rw_div = switchPlannerSmallHtmlSection(response.rw); - - switch_planner_details.appendChild(nrw_text_div); - switch_planner_details.appendChild(nrw_div); - switch_planner_details.appendChild(rw_text_div); - switch_planner_details.appendChild(rw_div); - - e("SwitchPlannerResults").style.display = "block"; - }); -} - -/** -* Format the switch planner output for presentation to a user. -* */ -function switchPlannerSmallHtmlSection(asset_host_list) { - var wrapper_div = document.createElement("div"); - if (asset_host_list.length == 0) { - wrapper_div.style.fontWeight = "bold"; - wrapper_div.innerText = "none"; - return wrapper_div; - } - - for (var i = asset_host_list.length - 1; i >= 0; i--) { - var host = asset_host_list[i][3]; - var activeCount = asset_host_list[i][1]; - var passiveCount = asset_host_list[i][2]; - - var div = document.createElement("div"); - var b = document.createElement("b"); - b.innerText = host; - div.appendChild(b); - - var text_arr = []; - if (activeCount > 0) { - text_arr.push(activeCount + " active"); - } - if (passiveCount > 0) { - text_arr.push(passiveCount + " passive"); - } - div.appendChild(document.createTextNode(": " + text_arr.join(', '))); - - wrapper_div.appendChild(div); - } - return wrapper_div; -} - -window.onload = function() { - // Open a connection to the background page. Right now this is only used - // by the background page so it knows when the devtools pane has closed. - // We don't receive messages from the background page currently, though that - // may be a future improvement. Sending messages to the background page doesn't - // require an existing connection. - chrome.runtime.connect({ name: "devtools-page" }); - - var checkbox = e("SwitchPlannerCheckbox"); - checkbox.addEventListener("change", function() { - if (checkbox.checked) { - enableSwitchPlanner(); - } else { - disableSwitchPlanner(); - } - }); - - e("SwitchPlannerDetailsLink").addEventListener("click", function() { - window.open("switch-planner.html?tab=" + chrome.devtools.inspectedWindow.tabId); - }); - // Since this is rendered in a devtools console, we have to make clicks on the - // link open a new window. - e("MixedContentLink").addEventListener("click", function(e) { - window.open(e.target.href); - }); -}; diff --git a/chromium/devtools.html b/chromium/devtools.html deleted file mode 100644 index a2a218bbda71..000000000000 --- a/chromium/devtools.html +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/chromium/devtools.js b/chromium/devtools.js deleted file mode 100644 index 14a3d67d1b6c..000000000000 --- a/chromium/devtools.js +++ /dev/null @@ -1,7 +0,0 @@ -"use strict"; - -chrome.devtools.panels.create("HTTPS Everywhere", - "icons/icon-active-38.png", - "devtools-panel.html", - function() { } -); diff --git a/chromium/external/README.md b/chromium/external/README.md index 138cb46cc0ad..031cf55c1721 100644 --- a/chromium/external/README.md +++ b/chromium/external/README.md @@ -4,7 +4,7 @@ This directory contains files that are external dependencies for HTTPS Everywher ## CodeMirror 5.31.0 -``` +```bash $ npm install uglify-js@3.1.9 $ npm install uglifycss@0.0.27 $ curl -o codemirror.zip https://codemirror.net/codemirror-5.31.0.zip @@ -40,3 +40,13 @@ uglifycss \ --output codemirror-5.31.0.min.css \ codemirror-5.31.0/lib/codemirror.css ``` + +## Pako 1.0.5 + +`$ npm install pako@1.0.5` + +### pako_inflate.min.js + +```bash + +$ cp node_modules/pako/dist/pako_inflate.js pako-1.0.5/pako_inflate.min.js diff --git a/chromium/external/pako-1.0.5/pako_inflate.min.js b/chromium/external/pako-1.0.5/pako_inflate.min.js new file mode 100644 index 000000000000..fdd03f31a5be --- /dev/null +++ b/chromium/external/pako-1.0.5/pako_inflate.min.js @@ -0,0 +1,3290 @@ +/* pako 1.0.5 nodeca/pako */(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.pako = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o= 252 ? 6 : q >= 248 ? 5 : q >= 240 ? 4 : q >= 224 ? 3 : q >= 192 ? 2 : 1); +} +_utf8len[254] = _utf8len[254] = 1; // Invalid sequence start + + +// convert string to array (typed, when possible) +exports.string2buf = function (str) { + var buf, c, c2, m_pos, i, str_len = str.length, buf_len = 0; + + // count binary size + for (m_pos = 0; m_pos < str_len; m_pos++) { + c = str.charCodeAt(m_pos); + if ((c & 0xfc00) === 0xd800 && (m_pos + 1 < str_len)) { + c2 = str.charCodeAt(m_pos + 1); + if ((c2 & 0xfc00) === 0xdc00) { + c = 0x10000 + ((c - 0xd800) << 10) + (c2 - 0xdc00); + m_pos++; + } + } + buf_len += c < 0x80 ? 1 : c < 0x800 ? 2 : c < 0x10000 ? 3 : 4; + } + + // allocate buffer + buf = new utils.Buf8(buf_len); + + // convert + for (i = 0, m_pos = 0; i < buf_len; m_pos++) { + c = str.charCodeAt(m_pos); + if ((c & 0xfc00) === 0xd800 && (m_pos + 1 < str_len)) { + c2 = str.charCodeAt(m_pos + 1); + if ((c2 & 0xfc00) === 0xdc00) { + c = 0x10000 + ((c - 0xd800) << 10) + (c2 - 0xdc00); + m_pos++; + } + } + if (c < 0x80) { + /* one byte */ + buf[i++] = c; + } else if (c < 0x800) { + /* two bytes */ + buf[i++] = 0xC0 | (c >>> 6); + buf[i++] = 0x80 | (c & 0x3f); + } else if (c < 0x10000) { + /* three bytes */ + buf[i++] = 0xE0 | (c >>> 12); + buf[i++] = 0x80 | (c >>> 6 & 0x3f); + buf[i++] = 0x80 | (c & 0x3f); + } else { + /* four bytes */ + buf[i++] = 0xf0 | (c >>> 18); + buf[i++] = 0x80 | (c >>> 12 & 0x3f); + buf[i++] = 0x80 | (c >>> 6 & 0x3f); + buf[i++] = 0x80 | (c & 0x3f); + } + } + + return buf; +}; + +// Helper (used in 2 places) +function buf2binstring(buf, len) { + // use fallback for big arrays to avoid stack overflow + if (len < 65537) { + if ((buf.subarray && STR_APPLY_UIA_OK) || (!buf.subarray && STR_APPLY_OK)) { + return String.fromCharCode.apply(null, utils.shrinkBuf(buf, len)); + } + } + + var result = ''; + for (var i = 0; i < len; i++) { + result += String.fromCharCode(buf[i]); + } + return result; +} + + +// Convert byte array to binary string +exports.buf2binstring = function (buf) { + return buf2binstring(buf, buf.length); +}; + + +// Convert binary string (typed, when possible) +exports.binstring2buf = function (str) { + var buf = new utils.Buf8(str.length); + for (var i = 0, len = buf.length; i < len; i++) { + buf[i] = str.charCodeAt(i); + } + return buf; +}; + + +// convert array to string +exports.buf2string = function (buf, max) { + var i, out, c, c_len; + var len = max || buf.length; + + // Reserve max possible length (2 words per char) + // NB: by unknown reasons, Array is significantly faster for + // String.fromCharCode.apply than Uint16Array. + var utf16buf = new Array(len * 2); + + for (out = 0, i = 0; i < len;) { + c = buf[i++]; + // quick process ascii + if (c < 0x80) { utf16buf[out++] = c; continue; } + + c_len = _utf8len[c]; + // skip 5 & 6 byte codes + if (c_len > 4) { utf16buf[out++] = 0xfffd; i += c_len - 1; continue; } + + // apply mask on first byte + c &= c_len === 2 ? 0x1f : c_len === 3 ? 0x0f : 0x07; + // join the rest + while (c_len > 1 && i < len) { + c = (c << 6) | (buf[i++] & 0x3f); + c_len--; + } + + // terminated by end of string? + if (c_len > 1) { utf16buf[out++] = 0xfffd; continue; } + + if (c < 0x10000) { + utf16buf[out++] = c; + } else { + c -= 0x10000; + utf16buf[out++] = 0xd800 | ((c >> 10) & 0x3ff); + utf16buf[out++] = 0xdc00 | (c & 0x3ff); + } + } + + return buf2binstring(utf16buf, out); +}; + + +// Calculate max possible position in utf8 buffer, +// that will not break sequence. If that's not possible +// - (very small limits) return max size as is. +// +// buf[] - utf8 bytes array +// max - length limit (mandatory); +exports.utf8border = function (buf, max) { + var pos; + + max = max || buf.length; + if (max > buf.length) { max = buf.length; } + + // go back from last position, until start of sequence found + pos = max - 1; + while (pos >= 0 && (buf[pos] & 0xC0) === 0x80) { pos--; } + + // Fuckup - very small and broken sequence, + // return max, because we should return something anyway. + if (pos < 0) { return max; } + + // If we came to start of buffer - that means vuffer is too small, + // return max too. + if (pos === 0) { return max; } + + return (pos + _utf8len[buf[pos]] > max) ? pos : max; +}; + +},{"./common":1}],3:[function(require,module,exports){ +'use strict'; + +// Note: adler32 takes 12% for level 0 and 2% for level 6. +// It doesn't worth to make additional optimizationa as in original. +// Small size is preferable. + +// (C) 1995-2013 Jean-loup Gailly and Mark Adler +// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin +// +// This software is provided 'as-is', without any express or implied +// warranty. In no event will the authors be held liable for any damages +// arising from the use of this software. +// +// Permission is granted to anyone to use this software for any purpose, +// including commercial applications, and to alter it and redistribute it +// freely, subject to the following restrictions: +// +// 1. The origin of this software must not be misrepresented; you must not +// claim that you wrote the original software. If you use this software +// in a product, an acknowledgment in the product documentation would be +// appreciated but is not required. +// 2. Altered source versions must be plainly marked as such, and must not be +// misrepresented as being the original software. +// 3. This notice may not be removed or altered from any source distribution. + +function adler32(adler, buf, len, pos) { + var s1 = (adler & 0xffff) |0, + s2 = ((adler >>> 16) & 0xffff) |0, + n = 0; + + while (len !== 0) { + // Set limit ~ twice less than 5552, to keep + // s2 in 31-bits, because we force signed ints. + // in other case %= will fail. + n = len > 2000 ? 2000 : len; + len -= n; + + do { + s1 = (s1 + buf[pos++]) |0; + s2 = (s2 + s1) |0; + } while (--n); + + s1 %= 65521; + s2 %= 65521; + } + + return (s1 | (s2 << 16)) |0; +} + + +module.exports = adler32; + +},{}],4:[function(require,module,exports){ +'use strict'; + +// (C) 1995-2013 Jean-loup Gailly and Mark Adler +// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin +// +// This software is provided 'as-is', without any express or implied +// warranty. In no event will the authors be held liable for any damages +// arising from the use of this software. +// +// Permission is granted to anyone to use this software for any purpose, +// including commercial applications, and to alter it and redistribute it +// freely, subject to the following restrictions: +// +// 1. The origin of this software must not be misrepresented; you must not +// claim that you wrote the original software. If you use this software +// in a product, an acknowledgment in the product documentation would be +// appreciated but is not required. +// 2. Altered source versions must be plainly marked as such, and must not be +// misrepresented as being the original software. +// 3. This notice may not be removed or altered from any source distribution. + +module.exports = { + + /* Allowed flush values; see deflate() and inflate() below for details */ + Z_NO_FLUSH: 0, + Z_PARTIAL_FLUSH: 1, + Z_SYNC_FLUSH: 2, + Z_FULL_FLUSH: 3, + Z_FINISH: 4, + Z_BLOCK: 5, + Z_TREES: 6, + + /* Return codes for the compression/decompression functions. Negative values + * are errors, positive values are used for special but normal events. + */ + Z_OK: 0, + Z_STREAM_END: 1, + Z_NEED_DICT: 2, + Z_ERRNO: -1, + Z_STREAM_ERROR: -2, + Z_DATA_ERROR: -3, + //Z_MEM_ERROR: -4, + Z_BUF_ERROR: -5, + //Z_VERSION_ERROR: -6, + + /* compression levels */ + Z_NO_COMPRESSION: 0, + Z_BEST_SPEED: 1, + Z_BEST_COMPRESSION: 9, + Z_DEFAULT_COMPRESSION: -1, + + + Z_FILTERED: 1, + Z_HUFFMAN_ONLY: 2, + Z_RLE: 3, + Z_FIXED: 4, + Z_DEFAULT_STRATEGY: 0, + + /* Possible values of the data_type field (though see inflate()) */ + Z_BINARY: 0, + Z_TEXT: 1, + //Z_ASCII: 1, // = Z_TEXT (deprecated) + Z_UNKNOWN: 2, + + /* The deflate compression method */ + Z_DEFLATED: 8 + //Z_NULL: null // Use -1 or null inline, depending on var type +}; + +},{}],5:[function(require,module,exports){ +'use strict'; + +// Note: we can't get significant speed boost here. +// So write code to minimize size - no pregenerated tables +// and array tools dependencies. + +// (C) 1995-2013 Jean-loup Gailly and Mark Adler +// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin +// +// This software is provided 'as-is', without any express or implied +// warranty. In no event will the authors be held liable for any damages +// arising from the use of this software. +// +// Permission is granted to anyone to use this software for any purpose, +// including commercial applications, and to alter it and redistribute it +// freely, subject to the following restrictions: +// +// 1. The origin of this software must not be misrepresented; you must not +// claim that you wrote the original software. If you use this software +// in a product, an acknowledgment in the product documentation would be +// appreciated but is not required. +// 2. Altered source versions must be plainly marked as such, and must not be +// misrepresented as being the original software. +// 3. This notice may not be removed or altered from any source distribution. + +// Use ordinary array, since untyped makes no boost here +function makeTable() { + var c, table = []; + + for (var n = 0; n < 256; n++) { + c = n; + for (var k = 0; k < 8; k++) { + c = ((c & 1) ? (0xEDB88320 ^ (c >>> 1)) : (c >>> 1)); + } + table[n] = c; + } + + return table; +} + +// Create table on load. Just 255 signed longs. Not a problem. +var crcTable = makeTable(); + + +function crc32(crc, buf, len, pos) { + var t = crcTable, + end = pos + len; + + crc ^= -1; + + for (var i = pos; i < end; i++) { + crc = (crc >>> 8) ^ t[(crc ^ buf[i]) & 0xFF]; + } + + return (crc ^ (-1)); // >>> 0; +} + + +module.exports = crc32; + +},{}],6:[function(require,module,exports){ +'use strict'; + +// (C) 1995-2013 Jean-loup Gailly and Mark Adler +// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin +// +// This software is provided 'as-is', without any express or implied +// warranty. In no event will the authors be held liable for any damages +// arising from the use of this software. +// +// Permission is granted to anyone to use this software for any purpose, +// including commercial applications, and to alter it and redistribute it +// freely, subject to the following restrictions: +// +// 1. The origin of this software must not be misrepresented; you must not +// claim that you wrote the original software. If you use this software +// in a product, an acknowledgment in the product documentation would be +// appreciated but is not required. +// 2. Altered source versions must be plainly marked as such, and must not be +// misrepresented as being the original software. +// 3. This notice may not be removed or altered from any source distribution. + +function GZheader() { + /* true if compressed data believed to be text */ + this.text = 0; + /* modification time */ + this.time = 0; + /* extra flags (not used when writing a gzip file) */ + this.xflags = 0; + /* operating system */ + this.os = 0; + /* pointer to extra field or Z_NULL if none */ + this.extra = null; + /* extra field length (valid if extra != Z_NULL) */ + this.extra_len = 0; // Actually, we don't need it in JS, + // but leave for few code modifications + + // + // Setup limits is not necessary because in js we should not preallocate memory + // for inflate use constant limit in 65536 bytes + // + + /* space at extra (only when reading header) */ + // this.extra_max = 0; + /* pointer to zero-terminated file name or Z_NULL */ + this.name = ''; + /* space at name (only when reading header) */ + // this.name_max = 0; + /* pointer to zero-terminated comment or Z_NULL */ + this.comment = ''; + /* space at comment (only when reading header) */ + // this.comm_max = 0; + /* true if there was or will be a header crc */ + this.hcrc = 0; + /* true when done reading gzip header (not used when writing a gzip file) */ + this.done = false; +} + +module.exports = GZheader; + +},{}],7:[function(require,module,exports){ +'use strict'; + +// (C) 1995-2013 Jean-loup Gailly and Mark Adler +// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin +// +// This software is provided 'as-is', without any express or implied +// warranty. In no event will the authors be held liable for any damages +// arising from the use of this software. +// +// Permission is granted to anyone to use this software for any purpose, +// including commercial applications, and to alter it and redistribute it +// freely, subject to the following restrictions: +// +// 1. The origin of this software must not be misrepresented; you must not +// claim that you wrote the original software. If you use this software +// in a product, an acknowledgment in the product documentation would be +// appreciated but is not required. +// 2. Altered source versions must be plainly marked as such, and must not be +// misrepresented as being the original software. +// 3. This notice may not be removed or altered from any source distribution. + +// See state defs from inflate.js +var BAD = 30; /* got a data error -- remain here until reset */ +var TYPE = 12; /* i: waiting for type bits, including last-flag bit */ + +/* + Decode literal, length, and distance codes and write out the resulting + literal and match bytes until either not enough input or output is + available, an end-of-block is encountered, or a data error is encountered. + When large enough input and output buffers are supplied to inflate(), for + example, a 16K input buffer and a 64K output buffer, more than 95% of the + inflate execution time is spent in this routine. + + Entry assumptions: + + state.mode === LEN + strm.avail_in >= 6 + strm.avail_out >= 258 + start >= strm.avail_out + state.bits < 8 + + On return, state.mode is one of: + + LEN -- ran out of enough output space or enough available input + TYPE -- reached end of block code, inflate() to interpret next block + BAD -- error in block data + + Notes: + + - The maximum input bits used by a length/distance pair is 15 bits for the + length code, 5 bits for the length extra, 15 bits for the distance code, + and 13 bits for the distance extra. This totals 48 bits, or six bytes. + Therefore if strm.avail_in >= 6, then there is enough input to avoid + checking for available input while decoding. + + - The maximum bytes that a single length/distance pair can output is 258 + bytes, which is the maximum length that can be coded. inflate_fast() + requires strm.avail_out >= 258 for each loop to avoid checking for + output space. + */ +module.exports = function inflate_fast(strm, start) { + var state; + var _in; /* local strm.input */ + var last; /* have enough input while in < last */ + var _out; /* local strm.output */ + var beg; /* inflate()'s initial strm.output */ + var end; /* while out < end, enough space available */ +//#ifdef INFLATE_STRICT + var dmax; /* maximum distance from zlib header */ +//#endif + var wsize; /* window size or zero if not using window */ + var whave; /* valid bytes in the window */ + var wnext; /* window write index */ + // Use `s_window` instead `window`, avoid conflict with instrumentation tools + var s_window; /* allocated sliding window, if wsize != 0 */ + var hold; /* local strm.hold */ + var bits; /* local strm.bits */ + var lcode; /* local strm.lencode */ + var dcode; /* local strm.distcode */ + var lmask; /* mask for first level of length codes */ + var dmask; /* mask for first level of distance codes */ + var here; /* retrieved table entry */ + var op; /* code bits, operation, extra bits, or */ + /* window position, window bytes to copy */ + var len; /* match length, unused bytes */ + var dist; /* match distance */ + var from; /* where to copy match from */ + var from_source; + + + var input, output; // JS specific, because we have no pointers + + /* copy state to local variables */ + state = strm.state; + //here = state.here; + _in = strm.next_in; + input = strm.input; + last = _in + (strm.avail_in - 5); + _out = strm.next_out; + output = strm.output; + beg = _out - (start - strm.avail_out); + end = _out + (strm.avail_out - 257); +//#ifdef INFLATE_STRICT + dmax = state.dmax; +//#endif + wsize = state.wsize; + whave = state.whave; + wnext = state.wnext; + s_window = state.window; + hold = state.hold; + bits = state.bits; + lcode = state.lencode; + dcode = state.distcode; + lmask = (1 << state.lenbits) - 1; + dmask = (1 << state.distbits) - 1; + + + /* decode literals and length/distances until end-of-block or not enough + input data or output space */ + + top: + do { + if (bits < 15) { + hold += input[_in++] << bits; + bits += 8; + hold += input[_in++] << bits; + bits += 8; + } + + here = lcode[hold & lmask]; + + dolen: + for (;;) { // Goto emulation + op = here >>> 24/*here.bits*/; + hold >>>= op; + bits -= op; + op = (here >>> 16) & 0xff/*here.op*/; + if (op === 0) { /* literal */ + //Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? + // "inflate: literal '%c'\n" : + // "inflate: literal 0x%02x\n", here.val)); + output[_out++] = here & 0xffff/*here.val*/; + } + else if (op & 16) { /* length base */ + len = here & 0xffff/*here.val*/; + op &= 15; /* number of extra bits */ + if (op) { + if (bits < op) { + hold += input[_in++] << bits; + bits += 8; + } + len += hold & ((1 << op) - 1); + hold >>>= op; + bits -= op; + } + //Tracevv((stderr, "inflate: length %u\n", len)); + if (bits < 15) { + hold += input[_in++] << bits; + bits += 8; + hold += input[_in++] << bits; + bits += 8; + } + here = dcode[hold & dmask]; + + dodist: + for (;;) { // goto emulation + op = here >>> 24/*here.bits*/; + hold >>>= op; + bits -= op; + op = (here >>> 16) & 0xff/*here.op*/; + + if (op & 16) { /* distance base */ + dist = here & 0xffff/*here.val*/; + op &= 15; /* number of extra bits */ + if (bits < op) { + hold += input[_in++] << bits; + bits += 8; + if (bits < op) { + hold += input[_in++] << bits; + bits += 8; + } + } + dist += hold & ((1 << op) - 1); +//#ifdef INFLATE_STRICT + if (dist > dmax) { + strm.msg = 'invalid distance too far back'; + state.mode = BAD; + break top; + } +//#endif + hold >>>= op; + bits -= op; + //Tracevv((stderr, "inflate: distance %u\n", dist)); + op = _out - beg; /* max distance in output */ + if (dist > op) { /* see if copy from window */ + op = dist - op; /* distance back in window */ + if (op > whave) { + if (state.sane) { + strm.msg = 'invalid distance too far back'; + state.mode = BAD; + break top; + } + +// (!) This block is disabled in zlib defailts, +// don't enable it for binary compatibility +//#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR +// if (len <= op - whave) { +// do { +// output[_out++] = 0; +// } while (--len); +// continue top; +// } +// len -= op - whave; +// do { +// output[_out++] = 0; +// } while (--op > whave); +// if (op === 0) { +// from = _out - dist; +// do { +// output[_out++] = output[from++]; +// } while (--len); +// continue top; +// } +//#endif + } + from = 0; // window index + from_source = s_window; + if (wnext === 0) { /* very common case */ + from += wsize - op; + if (op < len) { /* some from window */ + len -= op; + do { + output[_out++] = s_window[from++]; + } while (--op); + from = _out - dist; /* rest from output */ + from_source = output; + } + } + else if (wnext < op) { /* wrap around window */ + from += wsize + wnext - op; + op -= wnext; + if (op < len) { /* some from end of window */ + len -= op; + do { + output[_out++] = s_window[from++]; + } while (--op); + from = 0; + if (wnext < len) { /* some from start of window */ + op = wnext; + len -= op; + do { + output[_out++] = s_window[from++]; + } while (--op); + from = _out - dist; /* rest from output */ + from_source = output; + } + } + } + else { /* contiguous in window */ + from += wnext - op; + if (op < len) { /* some from window */ + len -= op; + do { + output[_out++] = s_window[from++]; + } while (--op); + from = _out - dist; /* rest from output */ + from_source = output; + } + } + while (len > 2) { + output[_out++] = from_source[from++]; + output[_out++] = from_source[from++]; + output[_out++] = from_source[from++]; + len -= 3; + } + if (len) { + output[_out++] = from_source[from++]; + if (len > 1) { + output[_out++] = from_source[from++]; + } + } + } + else { + from = _out - dist; /* copy direct from output */ + do { /* minimum length is three */ + output[_out++] = output[from++]; + output[_out++] = output[from++]; + output[_out++] = output[from++]; + len -= 3; + } while (len > 2); + if (len) { + output[_out++] = output[from++]; + if (len > 1) { + output[_out++] = output[from++]; + } + } + } + } + else if ((op & 64) === 0) { /* 2nd level distance code */ + here = dcode[(here & 0xffff)/*here.val*/ + (hold & ((1 << op) - 1))]; + continue dodist; + } + else { + strm.msg = 'invalid distance code'; + state.mode = BAD; + break top; + } + + break; // need to emulate goto via "continue" + } + } + else if ((op & 64) === 0) { /* 2nd level length code */ + here = lcode[(here & 0xffff)/*here.val*/ + (hold & ((1 << op) - 1))]; + continue dolen; + } + else if (op & 32) { /* end-of-block */ + //Tracevv((stderr, "inflate: end of block\n")); + state.mode = TYPE; + break top; + } + else { + strm.msg = 'invalid literal/length code'; + state.mode = BAD; + break top; + } + + break; // need to emulate goto via "continue" + } + } while (_in < last && _out < end); + + /* return unused bytes (on entry, bits < 8, so in won't go too far back) */ + len = bits >> 3; + _in -= len; + bits -= len << 3; + hold &= (1 << bits) - 1; + + /* update state and return */ + strm.next_in = _in; + strm.next_out = _out; + strm.avail_in = (_in < last ? 5 + (last - _in) : 5 - (_in - last)); + strm.avail_out = (_out < end ? 257 + (end - _out) : 257 - (_out - end)); + state.hold = hold; + state.bits = bits; + return; +}; + +},{}],8:[function(require,module,exports){ +'use strict'; + +// (C) 1995-2013 Jean-loup Gailly and Mark Adler +// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin +// +// This software is provided 'as-is', without any express or implied +// warranty. In no event will the authors be held liable for any damages +// arising from the use of this software. +// +// Permission is granted to anyone to use this software for any purpose, +// including commercial applications, and to alter it and redistribute it +// freely, subject to the following restrictions: +// +// 1. The origin of this software must not be misrepresented; you must not +// claim that you wrote the original software. If you use this software +// in a product, an acknowledgment in the product documentation would be +// appreciated but is not required. +// 2. Altered source versions must be plainly marked as such, and must not be +// misrepresented as being the original software. +// 3. This notice may not be removed or altered from any source distribution. + +var utils = require('../utils/common'); +var adler32 = require('./adler32'); +var crc32 = require('./crc32'); +var inflate_fast = require('./inffast'); +var inflate_table = require('./inftrees'); + +var CODES = 0; +var LENS = 1; +var DISTS = 2; + +/* Public constants ==========================================================*/ +/* ===========================================================================*/ + + +/* Allowed flush values; see deflate() and inflate() below for details */ +//var Z_NO_FLUSH = 0; +//var Z_PARTIAL_FLUSH = 1; +//var Z_SYNC_FLUSH = 2; +//var Z_FULL_FLUSH = 3; +var Z_FINISH = 4; +var Z_BLOCK = 5; +var Z_TREES = 6; + + +/* Return codes for the compression/decompression functions. Negative values + * are errors, positive values are used for special but normal events. + */ +var Z_OK = 0; +var Z_STREAM_END = 1; +var Z_NEED_DICT = 2; +//var Z_ERRNO = -1; +var Z_STREAM_ERROR = -2; +var Z_DATA_ERROR = -3; +var Z_MEM_ERROR = -4; +var Z_BUF_ERROR = -5; +//var Z_VERSION_ERROR = -6; + +/* The deflate compression method */ +var Z_DEFLATED = 8; + + +/* STATES ====================================================================*/ +/* ===========================================================================*/ + + +var HEAD = 1; /* i: waiting for magic header */ +var FLAGS = 2; /* i: waiting for method and flags (gzip) */ +var TIME = 3; /* i: waiting for modification time (gzip) */ +var OS = 4; /* i: waiting for extra flags and operating system (gzip) */ +var EXLEN = 5; /* i: waiting for extra length (gzip) */ +var EXTRA = 6; /* i: waiting for extra bytes (gzip) */ +var NAME = 7; /* i: waiting for end of file name (gzip) */ +var COMMENT = 8; /* i: waiting for end of comment (gzip) */ +var HCRC = 9; /* i: waiting for header crc (gzip) */ +var DICTID = 10; /* i: waiting for dictionary check value */ +var DICT = 11; /* waiting for inflateSetDictionary() call */ +var TYPE = 12; /* i: waiting for type bits, including last-flag bit */ +var TYPEDO = 13; /* i: same, but skip check to exit inflate on new block */ +var STORED = 14; /* i: waiting for stored size (length and complement) */ +var COPY_ = 15; /* i/o: same as COPY below, but only first time in */ +var COPY = 16; /* i/o: waiting for input or output to copy stored block */ +var TABLE = 17; /* i: waiting for dynamic block table lengths */ +var LENLENS = 18; /* i: waiting for code length code lengths */ +var CODELENS = 19; /* i: waiting for length/lit and distance code lengths */ +var LEN_ = 20; /* i: same as LEN below, but only first time in */ +var LEN = 21; /* i: waiting for length/lit/eob code */ +var LENEXT = 22; /* i: waiting for length extra bits */ +var DIST = 23; /* i: waiting for distance code */ +var DISTEXT = 24; /* i: waiting for distance extra bits */ +var MATCH = 25; /* o: waiting for output space to copy string */ +var LIT = 26; /* o: waiting for output space to write literal */ +var CHECK = 27; /* i: waiting for 32-bit check value */ +var LENGTH = 28; /* i: waiting for 32-bit length (gzip) */ +var DONE = 29; /* finished check, done -- remain here until reset */ +var BAD = 30; /* got a data error -- remain here until reset */ +var MEM = 31; /* got an inflate() memory error -- remain here until reset */ +var SYNC = 32; /* looking for synchronization bytes to restart inflate() */ + +/* ===========================================================================*/ + + + +var ENOUGH_LENS = 852; +var ENOUGH_DISTS = 592; +//var ENOUGH = (ENOUGH_LENS+ENOUGH_DISTS); + +var MAX_WBITS = 15; +/* 32K LZ77 window */ +var DEF_WBITS = MAX_WBITS; + + +function zswap32(q) { + return (((q >>> 24) & 0xff) + + ((q >>> 8) & 0xff00) + + ((q & 0xff00) << 8) + + ((q & 0xff) << 24)); +} + + +function InflateState() { + this.mode = 0; /* current inflate mode */ + this.last = false; /* true if processing last block */ + this.wrap = 0; /* bit 0 true for zlib, bit 1 true for gzip */ + this.havedict = false; /* true if dictionary provided */ + this.flags = 0; /* gzip header method and flags (0 if zlib) */ + this.dmax = 0; /* zlib header max distance (INFLATE_STRICT) */ + this.check = 0; /* protected copy of check value */ + this.total = 0; /* protected copy of output count */ + // TODO: may be {} + this.head = null; /* where to save gzip header information */ + + /* sliding window */ + this.wbits = 0; /* log base 2 of requested window size */ + this.wsize = 0; /* window size or zero if not using window */ + this.whave = 0; /* valid bytes in the window */ + this.wnext = 0; /* window write index */ + this.window = null; /* allocated sliding window, if needed */ + + /* bit accumulator */ + this.hold = 0; /* input bit accumulator */ + this.bits = 0; /* number of bits in "in" */ + + /* for string and stored block copying */ + this.length = 0; /* literal or length of data to copy */ + this.offset = 0; /* distance back to copy string from */ + + /* for table and code decoding */ + this.extra = 0; /* extra bits needed */ + + /* fixed and dynamic code tables */ + this.lencode = null; /* starting table for length/literal codes */ + this.distcode = null; /* starting table for distance codes */ + this.lenbits = 0; /* index bits for lencode */ + this.distbits = 0; /* index bits for distcode */ + + /* dynamic table building */ + this.ncode = 0; /* number of code length code lengths */ + this.nlen = 0; /* number of length code lengths */ + this.ndist = 0; /* number of distance code lengths */ + this.have = 0; /* number of code lengths in lens[] */ + this.next = null; /* next available space in codes[] */ + + this.lens = new utils.Buf16(320); /* temporary storage for code lengths */ + this.work = new utils.Buf16(288); /* work area for code table building */ + + /* + because we don't have pointers in js, we use lencode and distcode directly + as buffers so we don't need codes + */ + //this.codes = new utils.Buf32(ENOUGH); /* space for code tables */ + this.lendyn = null; /* dynamic table for length/literal codes (JS specific) */ + this.distdyn = null; /* dynamic table for distance codes (JS specific) */ + this.sane = 0; /* if false, allow invalid distance too far */ + this.back = 0; /* bits back of last unprocessed length/lit */ + this.was = 0; /* initial length of match */ +} + +function inflateResetKeep(strm) { + var state; + + if (!strm || !strm.state) { return Z_STREAM_ERROR; } + state = strm.state; + strm.total_in = strm.total_out = state.total = 0; + strm.msg = ''; /*Z_NULL*/ + if (state.wrap) { /* to support ill-conceived Java test suite */ + strm.adler = state.wrap & 1; + } + state.mode = HEAD; + state.last = 0; + state.havedict = 0; + state.dmax = 32768; + state.head = null/*Z_NULL*/; + state.hold = 0; + state.bits = 0; + //state.lencode = state.distcode = state.next = state.codes; + state.lencode = state.lendyn = new utils.Buf32(ENOUGH_LENS); + state.distcode = state.distdyn = new utils.Buf32(ENOUGH_DISTS); + + state.sane = 1; + state.back = -1; + //Tracev((stderr, "inflate: reset\n")); + return Z_OK; +} + +function inflateReset(strm) { + var state; + + if (!strm || !strm.state) { return Z_STREAM_ERROR; } + state = strm.state; + state.wsize = 0; + state.whave = 0; + state.wnext = 0; + return inflateResetKeep(strm); + +} + +function inflateReset2(strm, windowBits) { + var wrap; + var state; + + /* get the state */ + if (!strm || !strm.state) { return Z_STREAM_ERROR; } + state = strm.state; + + /* extract wrap request from windowBits parameter */ + if (windowBits < 0) { + wrap = 0; + windowBits = -windowBits; + } + else { + wrap = (windowBits >> 4) + 1; + if (windowBits < 48) { + windowBits &= 15; + } + } + + /* set number of window bits, free window if different */ + if (windowBits && (windowBits < 8 || windowBits > 15)) { + return Z_STREAM_ERROR; + } + if (state.window !== null && state.wbits !== windowBits) { + state.window = null; + } + + /* update state and reset the rest of it */ + state.wrap = wrap; + state.wbits = windowBits; + return inflateReset(strm); +} + +function inflateInit2(strm, windowBits) { + var ret; + var state; + + if (!strm) { return Z_STREAM_ERROR; } + //strm.msg = Z_NULL; /* in case we return an error */ + + state = new InflateState(); + + //if (state === Z_NULL) return Z_MEM_ERROR; + //Tracev((stderr, "inflate: allocated\n")); + strm.state = state; + state.window = null/*Z_NULL*/; + ret = inflateReset2(strm, windowBits); + if (ret !== Z_OK) { + strm.state = null/*Z_NULL*/; + } + return ret; +} + +function inflateInit(strm) { + return inflateInit2(strm, DEF_WBITS); +} + + +/* + Return state with length and distance decoding tables and index sizes set to + fixed code decoding. Normally this returns fixed tables from inffixed.h. + If BUILDFIXED is defined, then instead this routine builds the tables the + first time it's called, and returns those tables the first time and + thereafter. This reduces the size of the code by about 2K bytes, in + exchange for a little execution time. However, BUILDFIXED should not be + used for threaded applications, since the rewriting of the tables and virgin + may not be thread-safe. + */ +var virgin = true; + +var lenfix, distfix; // We have no pointers in JS, so keep tables separate + +function fixedtables(state) { + /* build fixed huffman tables if first call (may not be thread safe) */ + if (virgin) { + var sym; + + lenfix = new utils.Buf32(512); + distfix = new utils.Buf32(32); + + /* literal/length table */ + sym = 0; + while (sym < 144) { state.lens[sym++] = 8; } + while (sym < 256) { state.lens[sym++] = 9; } + while (sym < 280) { state.lens[sym++] = 7; } + while (sym < 288) { state.lens[sym++] = 8; } + + inflate_table(LENS, state.lens, 0, 288, lenfix, 0, state.work, { bits: 9 }); + + /* distance table */ + sym = 0; + while (sym < 32) { state.lens[sym++] = 5; } + + inflate_table(DISTS, state.lens, 0, 32, distfix, 0, state.work, { bits: 5 }); + + /* do this just once */ + virgin = false; + } + + state.lencode = lenfix; + state.lenbits = 9; + state.distcode = distfix; + state.distbits = 5; +} + + +/* + Update the window with the last wsize (normally 32K) bytes written before + returning. If window does not exist yet, create it. This is only called + when a window is already in use, or when output has been written during this + inflate call, but the end of the deflate stream has not been reached yet. + It is also called to create a window for dictionary data when a dictionary + is loaded. + + Providing output buffers larger than 32K to inflate() should provide a speed + advantage, since only the last 32K of output is copied to the sliding window + upon return from inflate(), and since all distances after the first 32K of + output will fall in the output data, making match copies simpler and faster. + The advantage may be dependent on the size of the processor's data caches. + */ +function updatewindow(strm, src, end, copy) { + var dist; + var state = strm.state; + + /* if it hasn't been done already, allocate space for the window */ + if (state.window === null) { + state.wsize = 1 << state.wbits; + state.wnext = 0; + state.whave = 0; + + state.window = new utils.Buf8(state.wsize); + } + + /* copy state->wsize or less output bytes into the circular window */ + if (copy >= state.wsize) { + utils.arraySet(state.window, src, end - state.wsize, state.wsize, 0); + state.wnext = 0; + state.whave = state.wsize; + } + else { + dist = state.wsize - state.wnext; + if (dist > copy) { + dist = copy; + } + //zmemcpy(state->window + state->wnext, end - copy, dist); + utils.arraySet(state.window, src, end - copy, dist, state.wnext); + copy -= dist; + if (copy) { + //zmemcpy(state->window, end - copy, copy); + utils.arraySet(state.window, src, end - copy, copy, 0); + state.wnext = copy; + state.whave = state.wsize; + } + else { + state.wnext += dist; + if (state.wnext === state.wsize) { state.wnext = 0; } + if (state.whave < state.wsize) { state.whave += dist; } + } + } + return 0; +} + +function inflate(strm, flush) { + var state; + var input, output; // input/output buffers + var next; /* next input INDEX */ + var put; /* next output INDEX */ + var have, left; /* available input and output */ + var hold; /* bit buffer */ + var bits; /* bits in bit buffer */ + var _in, _out; /* save starting available input and output */ + var copy; /* number of stored or match bytes to copy */ + var from; /* where to copy match bytes from */ + var from_source; + var here = 0; /* current decoding table entry */ + var here_bits, here_op, here_val; // paked "here" denormalized (JS specific) + //var last; /* parent table entry */ + var last_bits, last_op, last_val; // paked "last" denormalized (JS specific) + var len; /* length to copy for repeats, bits to drop */ + var ret; /* return code */ + var hbuf = new utils.Buf8(4); /* buffer for gzip header crc calculation */ + var opts; + + var n; // temporary var for NEED_BITS + + var order = /* permutation of code lengths */ + [ 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 ]; + + + if (!strm || !strm.state || !strm.output || + (!strm.input && strm.avail_in !== 0)) { + return Z_STREAM_ERROR; + } + + state = strm.state; + if (state.mode === TYPE) { state.mode = TYPEDO; } /* skip check */ + + + //--- LOAD() --- + put = strm.next_out; + output = strm.output; + left = strm.avail_out; + next = strm.next_in; + input = strm.input; + have = strm.avail_in; + hold = state.hold; + bits = state.bits; + //--- + + _in = have; + _out = left; + ret = Z_OK; + + inf_leave: // goto emulation + for (;;) { + switch (state.mode) { + case HEAD: + if (state.wrap === 0) { + state.mode = TYPEDO; + break; + } + //=== NEEDBITS(16); + while (bits < 16) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + if ((state.wrap & 2) && hold === 0x8b1f) { /* gzip header */ + state.check = 0/*crc32(0L, Z_NULL, 0)*/; + //=== CRC2(state.check, hold); + hbuf[0] = hold & 0xff; + hbuf[1] = (hold >>> 8) & 0xff; + state.check = crc32(state.check, hbuf, 2, 0); + //===// + + //=== INITBITS(); + hold = 0; + bits = 0; + //===// + state.mode = FLAGS; + break; + } + state.flags = 0; /* expect zlib header */ + if (state.head) { + state.head.done = false; + } + if (!(state.wrap & 1) || /* check if zlib header allowed */ + (((hold & 0xff)/*BITS(8)*/ << 8) + (hold >> 8)) % 31) { + strm.msg = 'incorrect header check'; + state.mode = BAD; + break; + } + if ((hold & 0x0f)/*BITS(4)*/ !== Z_DEFLATED) { + strm.msg = 'unknown compression method'; + state.mode = BAD; + break; + } + //--- DROPBITS(4) ---// + hold >>>= 4; + bits -= 4; + //---// + len = (hold & 0x0f)/*BITS(4)*/ + 8; + if (state.wbits === 0) { + state.wbits = len; + } + else if (len > state.wbits) { + strm.msg = 'invalid window size'; + state.mode = BAD; + break; + } + state.dmax = 1 << len; + //Tracev((stderr, "inflate: zlib header ok\n")); + strm.adler = state.check = 1/*adler32(0L, Z_NULL, 0)*/; + state.mode = hold & 0x200 ? DICTID : TYPE; + //=== INITBITS(); + hold = 0; + bits = 0; + //===// + break; + case FLAGS: + //=== NEEDBITS(16); */ + while (bits < 16) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + state.flags = hold; + if ((state.flags & 0xff) !== Z_DEFLATED) { + strm.msg = 'unknown compression method'; + state.mode = BAD; + break; + } + if (state.flags & 0xe000) { + strm.msg = 'unknown header flags set'; + state.mode = BAD; + break; + } + if (state.head) { + state.head.text = ((hold >> 8) & 1); + } + if (state.flags & 0x0200) { + //=== CRC2(state.check, hold); + hbuf[0] = hold & 0xff; + hbuf[1] = (hold >>> 8) & 0xff; + state.check = crc32(state.check, hbuf, 2, 0); + //===// + } + //=== INITBITS(); + hold = 0; + bits = 0; + //===// + state.mode = TIME; + /* falls through */ + case TIME: + //=== NEEDBITS(32); */ + while (bits < 32) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + if (state.head) { + state.head.time = hold; + } + if (state.flags & 0x0200) { + //=== CRC4(state.check, hold) + hbuf[0] = hold & 0xff; + hbuf[1] = (hold >>> 8) & 0xff; + hbuf[2] = (hold >>> 16) & 0xff; + hbuf[3] = (hold >>> 24) & 0xff; + state.check = crc32(state.check, hbuf, 4, 0); + //=== + } + //=== INITBITS(); + hold = 0; + bits = 0; + //===// + state.mode = OS; + /* falls through */ + case OS: + //=== NEEDBITS(16); */ + while (bits < 16) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + if (state.head) { + state.head.xflags = (hold & 0xff); + state.head.os = (hold >> 8); + } + if (state.flags & 0x0200) { + //=== CRC2(state.check, hold); + hbuf[0] = hold & 0xff; + hbuf[1] = (hold >>> 8) & 0xff; + state.check = crc32(state.check, hbuf, 2, 0); + //===// + } + //=== INITBITS(); + hold = 0; + bits = 0; + //===// + state.mode = EXLEN; + /* falls through */ + case EXLEN: + if (state.flags & 0x0400) { + //=== NEEDBITS(16); */ + while (bits < 16) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + state.length = hold; + if (state.head) { + state.head.extra_len = hold; + } + if (state.flags & 0x0200) { + //=== CRC2(state.check, hold); + hbuf[0] = hold & 0xff; + hbuf[1] = (hold >>> 8) & 0xff; + state.check = crc32(state.check, hbuf, 2, 0); + //===// + } + //=== INITBITS(); + hold = 0; + bits = 0; + //===// + } + else if (state.head) { + state.head.extra = null/*Z_NULL*/; + } + state.mode = EXTRA; + /* falls through */ + case EXTRA: + if (state.flags & 0x0400) { + copy = state.length; + if (copy > have) { copy = have; } + if (copy) { + if (state.head) { + len = state.head.extra_len - state.length; + if (!state.head.extra) { + // Use untyped array for more conveniend processing later + state.head.extra = new Array(state.head.extra_len); + } + utils.arraySet( + state.head.extra, + input, + next, + // extra field is limited to 65536 bytes + // - no need for additional size check + copy, + /*len + copy > state.head.extra_max - len ? state.head.extra_max : copy,*/ + len + ); + //zmemcpy(state.head.extra + len, next, + // len + copy > state.head.extra_max ? + // state.head.extra_max - len : copy); + } + if (state.flags & 0x0200) { + state.check = crc32(state.check, input, copy, next); + } + have -= copy; + next += copy; + state.length -= copy; + } + if (state.length) { break inf_leave; } + } + state.length = 0; + state.mode = NAME; + /* falls through */ + case NAME: + if (state.flags & 0x0800) { + if (have === 0) { break inf_leave; } + copy = 0; + do { + // TODO: 2 or 1 bytes? + len = input[next + copy++]; + /* use constant limit because in js we should not preallocate memory */ + if (state.head && len && + (state.length < 65536 /*state.head.name_max*/)) { + state.head.name += String.fromCharCode(len); + } + } while (len && copy < have); + + if (state.flags & 0x0200) { + state.check = crc32(state.check, input, copy, next); + } + have -= copy; + next += copy; + if (len) { break inf_leave; } + } + else if (state.head) { + state.head.name = null; + } + state.length = 0; + state.mode = COMMENT; + /* falls through */ + case COMMENT: + if (state.flags & 0x1000) { + if (have === 0) { break inf_leave; } + copy = 0; + do { + len = input[next + copy++]; + /* use constant limit because in js we should not preallocate memory */ + if (state.head && len && + (state.length < 65536 /*state.head.comm_max*/)) { + state.head.comment += String.fromCharCode(len); + } + } while (len && copy < have); + if (state.flags & 0x0200) { + state.check = crc32(state.check, input, copy, next); + } + have -= copy; + next += copy; + if (len) { break inf_leave; } + } + else if (state.head) { + state.head.comment = null; + } + state.mode = HCRC; + /* falls through */ + case HCRC: + if (state.flags & 0x0200) { + //=== NEEDBITS(16); */ + while (bits < 16) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + if (hold !== (state.check & 0xffff)) { + strm.msg = 'header crc mismatch'; + state.mode = BAD; + break; + } + //=== INITBITS(); + hold = 0; + bits = 0; + //===// + } + if (state.head) { + state.head.hcrc = ((state.flags >> 9) & 1); + state.head.done = true; + } + strm.adler = state.check = 0; + state.mode = TYPE; + break; + case DICTID: + //=== NEEDBITS(32); */ + while (bits < 32) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + strm.adler = state.check = zswap32(hold); + //=== INITBITS(); + hold = 0; + bits = 0; + //===// + state.mode = DICT; + /* falls through */ + case DICT: + if (state.havedict === 0) { + //--- RESTORE() --- + strm.next_out = put; + strm.avail_out = left; + strm.next_in = next; + strm.avail_in = have; + state.hold = hold; + state.bits = bits; + //--- + return Z_NEED_DICT; + } + strm.adler = state.check = 1/*adler32(0L, Z_NULL, 0)*/; + state.mode = TYPE; + /* falls through */ + case TYPE: + if (flush === Z_BLOCK || flush === Z_TREES) { break inf_leave; } + /* falls through */ + case TYPEDO: + if (state.last) { + //--- BYTEBITS() ---// + hold >>>= bits & 7; + bits -= bits & 7; + //---// + state.mode = CHECK; + break; + } + //=== NEEDBITS(3); */ + while (bits < 3) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + state.last = (hold & 0x01)/*BITS(1)*/; + //--- DROPBITS(1) ---// + hold >>>= 1; + bits -= 1; + //---// + + switch ((hold & 0x03)/*BITS(2)*/) { + case 0: /* stored block */ + //Tracev((stderr, "inflate: stored block%s\n", + // state.last ? " (last)" : "")); + state.mode = STORED; + break; + case 1: /* fixed block */ + fixedtables(state); + //Tracev((stderr, "inflate: fixed codes block%s\n", + // state.last ? " (last)" : "")); + state.mode = LEN_; /* decode codes */ + if (flush === Z_TREES) { + //--- DROPBITS(2) ---// + hold >>>= 2; + bits -= 2; + //---// + break inf_leave; + } + break; + case 2: /* dynamic block */ + //Tracev((stderr, "inflate: dynamic codes block%s\n", + // state.last ? " (last)" : "")); + state.mode = TABLE; + break; + case 3: + strm.msg = 'invalid block type'; + state.mode = BAD; + } + //--- DROPBITS(2) ---// + hold >>>= 2; + bits -= 2; + //---// + break; + case STORED: + //--- BYTEBITS() ---// /* go to byte boundary */ + hold >>>= bits & 7; + bits -= bits & 7; + //---// + //=== NEEDBITS(32); */ + while (bits < 32) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + if ((hold & 0xffff) !== ((hold >>> 16) ^ 0xffff)) { + strm.msg = 'invalid stored block lengths'; + state.mode = BAD; + break; + } + state.length = hold & 0xffff; + //Tracev((stderr, "inflate: stored length %u\n", + // state.length)); + //=== INITBITS(); + hold = 0; + bits = 0; + //===// + state.mode = COPY_; + if (flush === Z_TREES) { break inf_leave; } + /* falls through */ + case COPY_: + state.mode = COPY; + /* falls through */ + case COPY: + copy = state.length; + if (copy) { + if (copy > have) { copy = have; } + if (copy > left) { copy = left; } + if (copy === 0) { break inf_leave; } + //--- zmemcpy(put, next, copy); --- + utils.arraySet(output, input, next, copy, put); + //---// + have -= copy; + next += copy; + left -= copy; + put += copy; + state.length -= copy; + break; + } + //Tracev((stderr, "inflate: stored end\n")); + state.mode = TYPE; + break; + case TABLE: + //=== NEEDBITS(14); */ + while (bits < 14) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + state.nlen = (hold & 0x1f)/*BITS(5)*/ + 257; + //--- DROPBITS(5) ---// + hold >>>= 5; + bits -= 5; + //---// + state.ndist = (hold & 0x1f)/*BITS(5)*/ + 1; + //--- DROPBITS(5) ---// + hold >>>= 5; + bits -= 5; + //---// + state.ncode = (hold & 0x0f)/*BITS(4)*/ + 4; + //--- DROPBITS(4) ---// + hold >>>= 4; + bits -= 4; + //---// +//#ifndef PKZIP_BUG_WORKAROUND + if (state.nlen > 286 || state.ndist > 30) { + strm.msg = 'too many length or distance symbols'; + state.mode = BAD; + break; + } +//#endif + //Tracev((stderr, "inflate: table sizes ok\n")); + state.have = 0; + state.mode = LENLENS; + /* falls through */ + case LENLENS: + while (state.have < state.ncode) { + //=== NEEDBITS(3); + while (bits < 3) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + state.lens[order[state.have++]] = (hold & 0x07);//BITS(3); + //--- DROPBITS(3) ---// + hold >>>= 3; + bits -= 3; + //---// + } + while (state.have < 19) { + state.lens[order[state.have++]] = 0; + } + // We have separate tables & no pointers. 2 commented lines below not needed. + //state.next = state.codes; + //state.lencode = state.next; + // Switch to use dynamic table + state.lencode = state.lendyn; + state.lenbits = 7; + + opts = { bits: state.lenbits }; + ret = inflate_table(CODES, state.lens, 0, 19, state.lencode, 0, state.work, opts); + state.lenbits = opts.bits; + + if (ret) { + strm.msg = 'invalid code lengths set'; + state.mode = BAD; + break; + } + //Tracev((stderr, "inflate: code lengths ok\n")); + state.have = 0; + state.mode = CODELENS; + /* falls through */ + case CODELENS: + while (state.have < state.nlen + state.ndist) { + for (;;) { + here = state.lencode[hold & ((1 << state.lenbits) - 1)];/*BITS(state.lenbits)*/ + here_bits = here >>> 24; + here_op = (here >>> 16) & 0xff; + here_val = here & 0xffff; + + if ((here_bits) <= bits) { break; } + //--- PULLBYTE() ---// + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + //---// + } + if (here_val < 16) { + //--- DROPBITS(here.bits) ---// + hold >>>= here_bits; + bits -= here_bits; + //---// + state.lens[state.have++] = here_val; + } + else { + if (here_val === 16) { + //=== NEEDBITS(here.bits + 2); + n = here_bits + 2; + while (bits < n) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + //--- DROPBITS(here.bits) ---// + hold >>>= here_bits; + bits -= here_bits; + //---// + if (state.have === 0) { + strm.msg = 'invalid bit length repeat'; + state.mode = BAD; + break; + } + len = state.lens[state.have - 1]; + copy = 3 + (hold & 0x03);//BITS(2); + //--- DROPBITS(2) ---// + hold >>>= 2; + bits -= 2; + //---// + } + else if (here_val === 17) { + //=== NEEDBITS(here.bits + 3); + n = here_bits + 3; + while (bits < n) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + //--- DROPBITS(here.bits) ---// + hold >>>= here_bits; + bits -= here_bits; + //---// + len = 0; + copy = 3 + (hold & 0x07);//BITS(3); + //--- DROPBITS(3) ---// + hold >>>= 3; + bits -= 3; + //---// + } + else { + //=== NEEDBITS(here.bits + 7); + n = here_bits + 7; + while (bits < n) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + //--- DROPBITS(here.bits) ---// + hold >>>= here_bits; + bits -= here_bits; + //---// + len = 0; + copy = 11 + (hold & 0x7f);//BITS(7); + //--- DROPBITS(7) ---// + hold >>>= 7; + bits -= 7; + //---// + } + if (state.have + copy > state.nlen + state.ndist) { + strm.msg = 'invalid bit length repeat'; + state.mode = BAD; + break; + } + while (copy--) { + state.lens[state.have++] = len; + } + } + } + + /* handle error breaks in while */ + if (state.mode === BAD) { break; } + + /* check for end-of-block code (better have one) */ + if (state.lens[256] === 0) { + strm.msg = 'invalid code -- missing end-of-block'; + state.mode = BAD; + break; + } + + /* build code tables -- note: do not change the lenbits or distbits + values here (9 and 6) without reading the comments in inftrees.h + concerning the ENOUGH constants, which depend on those values */ + state.lenbits = 9; + + opts = { bits: state.lenbits }; + ret = inflate_table(LENS, state.lens, 0, state.nlen, state.lencode, 0, state.work, opts); + // We have separate tables & no pointers. 2 commented lines below not needed. + // state.next_index = opts.table_index; + state.lenbits = opts.bits; + // state.lencode = state.next; + + if (ret) { + strm.msg = 'invalid literal/lengths set'; + state.mode = BAD; + break; + } + + state.distbits = 6; + //state.distcode.copy(state.codes); + // Switch to use dynamic table + state.distcode = state.distdyn; + opts = { bits: state.distbits }; + ret = inflate_table(DISTS, state.lens, state.nlen, state.ndist, state.distcode, 0, state.work, opts); + // We have separate tables & no pointers. 2 commented lines below not needed. + // state.next_index = opts.table_index; + state.distbits = opts.bits; + // state.distcode = state.next; + + if (ret) { + strm.msg = 'invalid distances set'; + state.mode = BAD; + break; + } + //Tracev((stderr, 'inflate: codes ok\n')); + state.mode = LEN_; + if (flush === Z_TREES) { break inf_leave; } + /* falls through */ + case LEN_: + state.mode = LEN; + /* falls through */ + case LEN: + if (have >= 6 && left >= 258) { + //--- RESTORE() --- + strm.next_out = put; + strm.avail_out = left; + strm.next_in = next; + strm.avail_in = have; + state.hold = hold; + state.bits = bits; + //--- + inflate_fast(strm, _out); + //--- LOAD() --- + put = strm.next_out; + output = strm.output; + left = strm.avail_out; + next = strm.next_in; + input = strm.input; + have = strm.avail_in; + hold = state.hold; + bits = state.bits; + //--- + + if (state.mode === TYPE) { + state.back = -1; + } + break; + } + state.back = 0; + for (;;) { + here = state.lencode[hold & ((1 << state.lenbits) - 1)]; /*BITS(state.lenbits)*/ + here_bits = here >>> 24; + here_op = (here >>> 16) & 0xff; + here_val = here & 0xffff; + + if (here_bits <= bits) { break; } + //--- PULLBYTE() ---// + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + //---// + } + if (here_op && (here_op & 0xf0) === 0) { + last_bits = here_bits; + last_op = here_op; + last_val = here_val; + for (;;) { + here = state.lencode[last_val + + ((hold & ((1 << (last_bits + last_op)) - 1))/*BITS(last.bits + last.op)*/ >> last_bits)]; + here_bits = here >>> 24; + here_op = (here >>> 16) & 0xff; + here_val = here & 0xffff; + + if ((last_bits + here_bits) <= bits) { break; } + //--- PULLBYTE() ---// + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + //---// + } + //--- DROPBITS(last.bits) ---// + hold >>>= last_bits; + bits -= last_bits; + //---// + state.back += last_bits; + } + //--- DROPBITS(here.bits) ---// + hold >>>= here_bits; + bits -= here_bits; + //---// + state.back += here_bits; + state.length = here_val; + if (here_op === 0) { + //Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? + // "inflate: literal '%c'\n" : + // "inflate: literal 0x%02x\n", here.val)); + state.mode = LIT; + break; + } + if (here_op & 32) { + //Tracevv((stderr, "inflate: end of block\n")); + state.back = -1; + state.mode = TYPE; + break; + } + if (here_op & 64) { + strm.msg = 'invalid literal/length code'; + state.mode = BAD; + break; + } + state.extra = here_op & 15; + state.mode = LENEXT; + /* falls through */ + case LENEXT: + if (state.extra) { + //=== NEEDBITS(state.extra); + n = state.extra; + while (bits < n) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + state.length += hold & ((1 << state.extra) - 1)/*BITS(state.extra)*/; + //--- DROPBITS(state.extra) ---// + hold >>>= state.extra; + bits -= state.extra; + //---// + state.back += state.extra; + } + //Tracevv((stderr, "inflate: length %u\n", state.length)); + state.was = state.length; + state.mode = DIST; + /* falls through */ + case DIST: + for (;;) { + here = state.distcode[hold & ((1 << state.distbits) - 1)];/*BITS(state.distbits)*/ + here_bits = here >>> 24; + here_op = (here >>> 16) & 0xff; + here_val = here & 0xffff; + + if ((here_bits) <= bits) { break; } + //--- PULLBYTE() ---// + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + //---// + } + if ((here_op & 0xf0) === 0) { + last_bits = here_bits; + last_op = here_op; + last_val = here_val; + for (;;) { + here = state.distcode[last_val + + ((hold & ((1 << (last_bits + last_op)) - 1))/*BITS(last.bits + last.op)*/ >> last_bits)]; + here_bits = here >>> 24; + here_op = (here >>> 16) & 0xff; + here_val = here & 0xffff; + + if ((last_bits + here_bits) <= bits) { break; } + //--- PULLBYTE() ---// + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + //---// + } + //--- DROPBITS(last.bits) ---// + hold >>>= last_bits; + bits -= last_bits; + //---// + state.back += last_bits; + } + //--- DROPBITS(here.bits) ---// + hold >>>= here_bits; + bits -= here_bits; + //---// + state.back += here_bits; + if (here_op & 64) { + strm.msg = 'invalid distance code'; + state.mode = BAD; + break; + } + state.offset = here_val; + state.extra = (here_op) & 15; + state.mode = DISTEXT; + /* falls through */ + case DISTEXT: + if (state.extra) { + //=== NEEDBITS(state.extra); + n = state.extra; + while (bits < n) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + state.offset += hold & ((1 << state.extra) - 1)/*BITS(state.extra)*/; + //--- DROPBITS(state.extra) ---// + hold >>>= state.extra; + bits -= state.extra; + //---// + state.back += state.extra; + } +//#ifdef INFLATE_STRICT + if (state.offset > state.dmax) { + strm.msg = 'invalid distance too far back'; + state.mode = BAD; + break; + } +//#endif + //Tracevv((stderr, "inflate: distance %u\n", state.offset)); + state.mode = MATCH; + /* falls through */ + case MATCH: + if (left === 0) { break inf_leave; } + copy = _out - left; + if (state.offset > copy) { /* copy from window */ + copy = state.offset - copy; + if (copy > state.whave) { + if (state.sane) { + strm.msg = 'invalid distance too far back'; + state.mode = BAD; + break; + } +// (!) This block is disabled in zlib defailts, +// don't enable it for binary compatibility +//#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR +// Trace((stderr, "inflate.c too far\n")); +// copy -= state.whave; +// if (copy > state.length) { copy = state.length; } +// if (copy > left) { copy = left; } +// left -= copy; +// state.length -= copy; +// do { +// output[put++] = 0; +// } while (--copy); +// if (state.length === 0) { state.mode = LEN; } +// break; +//#endif + } + if (copy > state.wnext) { + copy -= state.wnext; + from = state.wsize - copy; + } + else { + from = state.wnext - copy; + } + if (copy > state.length) { copy = state.length; } + from_source = state.window; + } + else { /* copy from output */ + from_source = output; + from = put - state.offset; + copy = state.length; + } + if (copy > left) { copy = left; } + left -= copy; + state.length -= copy; + do { + output[put++] = from_source[from++]; + } while (--copy); + if (state.length === 0) { state.mode = LEN; } + break; + case LIT: + if (left === 0) { break inf_leave; } + output[put++] = state.length; + left--; + state.mode = LEN; + break; + case CHECK: + if (state.wrap) { + //=== NEEDBITS(32); + while (bits < 32) { + if (have === 0) { break inf_leave; } + have--; + // Use '|' insdead of '+' to make sure that result is signed + hold |= input[next++] << bits; + bits += 8; + } + //===// + _out -= left; + strm.total_out += _out; + state.total += _out; + if (_out) { + strm.adler = state.check = + /*UPDATE(state.check, put - _out, _out);*/ + (state.flags ? crc32(state.check, output, _out, put - _out) : adler32(state.check, output, _out, put - _out)); + + } + _out = left; + // NB: crc32 stored as signed 32-bit int, zswap32 returns signed too + if ((state.flags ? hold : zswap32(hold)) !== state.check) { + strm.msg = 'incorrect data check'; + state.mode = BAD; + break; + } + //=== INITBITS(); + hold = 0; + bits = 0; + //===// + //Tracev((stderr, "inflate: check matches trailer\n")); + } + state.mode = LENGTH; + /* falls through */ + case LENGTH: + if (state.wrap && state.flags) { + //=== NEEDBITS(32); + while (bits < 32) { + if (have === 0) { break inf_leave; } + have--; + hold += input[next++] << bits; + bits += 8; + } + //===// + if (hold !== (state.total & 0xffffffff)) { + strm.msg = 'incorrect length check'; + state.mode = BAD; + break; + } + //=== INITBITS(); + hold = 0; + bits = 0; + //===// + //Tracev((stderr, "inflate: length matches trailer\n")); + } + state.mode = DONE; + /* falls through */ + case DONE: + ret = Z_STREAM_END; + break inf_leave; + case BAD: + ret = Z_DATA_ERROR; + break inf_leave; + case MEM: + return Z_MEM_ERROR; + case SYNC: + /* falls through */ + default: + return Z_STREAM_ERROR; + } + } + + // inf_leave <- here is real place for "goto inf_leave", emulated via "break inf_leave" + + /* + Return from inflate(), updating the total counts and the check value. + If there was no progress during the inflate() call, return a buffer + error. Call updatewindow() to create and/or update the window state. + Note: a memory error from inflate() is non-recoverable. + */ + + //--- RESTORE() --- + strm.next_out = put; + strm.avail_out = left; + strm.next_in = next; + strm.avail_in = have; + state.hold = hold; + state.bits = bits; + //--- + + if (state.wsize || (_out !== strm.avail_out && state.mode < BAD && + (state.mode < CHECK || flush !== Z_FINISH))) { + if (updatewindow(strm, strm.output, strm.next_out, _out - strm.avail_out)) { + state.mode = MEM; + return Z_MEM_ERROR; + } + } + _in -= strm.avail_in; + _out -= strm.avail_out; + strm.total_in += _in; + strm.total_out += _out; + state.total += _out; + if (state.wrap && _out) { + strm.adler = state.check = /*UPDATE(state.check, strm.next_out - _out, _out);*/ + (state.flags ? crc32(state.check, output, _out, strm.next_out - _out) : adler32(state.check, output, _out, strm.next_out - _out)); + } + strm.data_type = state.bits + (state.last ? 64 : 0) + + (state.mode === TYPE ? 128 : 0) + + (state.mode === LEN_ || state.mode === COPY_ ? 256 : 0); + if (((_in === 0 && _out === 0) || flush === Z_FINISH) && ret === Z_OK) { + ret = Z_BUF_ERROR; + } + return ret; +} + +function inflateEnd(strm) { + + if (!strm || !strm.state /*|| strm->zfree == (free_func)0*/) { + return Z_STREAM_ERROR; + } + + var state = strm.state; + if (state.window) { + state.window = null; + } + strm.state = null; + return Z_OK; +} + +function inflateGetHeader(strm, head) { + var state; + + /* check state */ + if (!strm || !strm.state) { return Z_STREAM_ERROR; } + state = strm.state; + if ((state.wrap & 2) === 0) { return Z_STREAM_ERROR; } + + /* save header structure */ + state.head = head; + head.done = false; + return Z_OK; +} + +function inflateSetDictionary(strm, dictionary) { + var dictLength = dictionary.length; + + var state; + var dictid; + var ret; + + /* check state */ + if (!strm /* == Z_NULL */ || !strm.state /* == Z_NULL */) { return Z_STREAM_ERROR; } + state = strm.state; + + if (state.wrap !== 0 && state.mode !== DICT) { + return Z_STREAM_ERROR; + } + + /* check for correct dictionary identifier */ + if (state.mode === DICT) { + dictid = 1; /* adler32(0, null, 0)*/ + /* dictid = adler32(dictid, dictionary, dictLength); */ + dictid = adler32(dictid, dictionary, dictLength, 0); + if (dictid !== state.check) { + return Z_DATA_ERROR; + } + } + /* copy dictionary to window using updatewindow(), which will amend the + existing dictionary if appropriate */ + ret = updatewindow(strm, dictionary, dictLength, dictLength); + if (ret) { + state.mode = MEM; + return Z_MEM_ERROR; + } + state.havedict = 1; + // Tracev((stderr, "inflate: dictionary set\n")); + return Z_OK; +} + +exports.inflateReset = inflateReset; +exports.inflateReset2 = inflateReset2; +exports.inflateResetKeep = inflateResetKeep; +exports.inflateInit = inflateInit; +exports.inflateInit2 = inflateInit2; +exports.inflate = inflate; +exports.inflateEnd = inflateEnd; +exports.inflateGetHeader = inflateGetHeader; +exports.inflateSetDictionary = inflateSetDictionary; +exports.inflateInfo = 'pako inflate (from Nodeca project)'; + +/* Not implemented +exports.inflateCopy = inflateCopy; +exports.inflateGetDictionary = inflateGetDictionary; +exports.inflateMark = inflateMark; +exports.inflatePrime = inflatePrime; +exports.inflateSync = inflateSync; +exports.inflateSyncPoint = inflateSyncPoint; +exports.inflateUndermine = inflateUndermine; +*/ + +},{"../utils/common":1,"./adler32":3,"./crc32":5,"./inffast":7,"./inftrees":9}],9:[function(require,module,exports){ +'use strict'; + +// (C) 1995-2013 Jean-loup Gailly and Mark Adler +// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin +// +// This software is provided 'as-is', without any express or implied +// warranty. In no event will the authors be held liable for any damages +// arising from the use of this software. +// +// Permission is granted to anyone to use this software for any purpose, +// including commercial applications, and to alter it and redistribute it +// freely, subject to the following restrictions: +// +// 1. The origin of this software must not be misrepresented; you must not +// claim that you wrote the original software. If you use this software +// in a product, an acknowledgment in the product documentation would be +// appreciated but is not required. +// 2. Altered source versions must be plainly marked as such, and must not be +// misrepresented as being the original software. +// 3. This notice may not be removed or altered from any source distribution. + +var utils = require('../utils/common'); + +var MAXBITS = 15; +var ENOUGH_LENS = 852; +var ENOUGH_DISTS = 592; +//var ENOUGH = (ENOUGH_LENS+ENOUGH_DISTS); + +var CODES = 0; +var LENS = 1; +var DISTS = 2; + +var lbase = [ /* Length codes 257..285 base */ + 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, + 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0 +]; + +var lext = [ /* Length codes 257..285 extra */ + 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, + 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78 +]; + +var dbase = [ /* Distance codes 0..29 base */ + 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, + 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, + 8193, 12289, 16385, 24577, 0, 0 +]; + +var dext = [ /* Distance codes 0..29 extra */ + 16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, + 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, + 28, 28, 29, 29, 64, 64 +]; + +module.exports = function inflate_table(type, lens, lens_index, codes, table, table_index, work, opts) +{ + var bits = opts.bits; + //here = opts.here; /* table entry for duplication */ + + var len = 0; /* a code's length in bits */ + var sym = 0; /* index of code symbols */ + var min = 0, max = 0; /* minimum and maximum code lengths */ + var root = 0; /* number of index bits for root table */ + var curr = 0; /* number of index bits for current table */ + var drop = 0; /* code bits to drop for sub-table */ + var left = 0; /* number of prefix codes available */ + var used = 0; /* code entries in table used */ + var huff = 0; /* Huffman code */ + var incr; /* for incrementing code, index */ + var fill; /* index for replicating entries */ + var low; /* low bits for current root entry */ + var mask; /* mask for low root bits */ + var next; /* next available space in table */ + var base = null; /* base value table to use */ + var base_index = 0; +// var shoextra; /* extra bits table to use */ + var end; /* use base and extra for symbol > end */ + var count = new utils.Buf16(MAXBITS + 1); //[MAXBITS+1]; /* number of codes of each length */ + var offs = new utils.Buf16(MAXBITS + 1); //[MAXBITS+1]; /* offsets in table for each length */ + var extra = null; + var extra_index = 0; + + var here_bits, here_op, here_val; + + /* + Process a set of code lengths to create a canonical Huffman code. The + code lengths are lens[0..codes-1]. Each length corresponds to the + symbols 0..codes-1. The Huffman code is generated by first sorting the + symbols by length from short to long, and retaining the symbol order + for codes with equal lengths. Then the code starts with all zero bits + for the first code of the shortest length, and the codes are integer + increments for the same length, and zeros are appended as the length + increases. For the deflate format, these bits are stored backwards + from their more natural integer increment ordering, and so when the + decoding tables are built in the large loop below, the integer codes + are incremented backwards. + + This routine assumes, but does not check, that all of the entries in + lens[] are in the range 0..MAXBITS. The caller must assure this. + 1..MAXBITS is interpreted as that code length. zero means that that + symbol does not occur in this code. + + The codes are sorted by computing a count of codes for each length, + creating from that a table of starting indices for each length in the + sorted table, and then entering the symbols in order in the sorted + table. The sorted table is work[], with that space being provided by + the caller. + + The length counts are used for other purposes as well, i.e. finding + the minimum and maximum length codes, determining if there are any + codes at all, checking for a valid set of lengths, and looking ahead + at length counts to determine sub-table sizes when building the + decoding tables. + */ + + /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */ + for (len = 0; len <= MAXBITS; len++) { + count[len] = 0; + } + for (sym = 0; sym < codes; sym++) { + count[lens[lens_index + sym]]++; + } + + /* bound code lengths, force root to be within code lengths */ + root = bits; + for (max = MAXBITS; max >= 1; max--) { + if (count[max] !== 0) { break; } + } + if (root > max) { + root = max; + } + if (max === 0) { /* no symbols to code at all */ + //table.op[opts.table_index] = 64; //here.op = (var char)64; /* invalid code marker */ + //table.bits[opts.table_index] = 1; //here.bits = (var char)1; + //table.val[opts.table_index++] = 0; //here.val = (var short)0; + table[table_index++] = (1 << 24) | (64 << 16) | 0; + + + //table.op[opts.table_index] = 64; + //table.bits[opts.table_index] = 1; + //table.val[opts.table_index++] = 0; + table[table_index++] = (1 << 24) | (64 << 16) | 0; + + opts.bits = 1; + return 0; /* no symbols, but wait for decoding to report error */ + } + for (min = 1; min < max; min++) { + if (count[min] !== 0) { break; } + } + if (root < min) { + root = min; + } + + /* check for an over-subscribed or incomplete set of lengths */ + left = 1; + for (len = 1; len <= MAXBITS; len++) { + left <<= 1; + left -= count[len]; + if (left < 0) { + return -1; + } /* over-subscribed */ + } + if (left > 0 && (type === CODES || max !== 1)) { + return -1; /* incomplete set */ + } + + /* generate offsets into symbol table for each length for sorting */ + offs[1] = 0; + for (len = 1; len < MAXBITS; len++) { + offs[len + 1] = offs[len] + count[len]; + } + + /* sort symbols by length, by symbol order within each length */ + for (sym = 0; sym < codes; sym++) { + if (lens[lens_index + sym] !== 0) { + work[offs[lens[lens_index + sym]]++] = sym; + } + } + + /* + Create and fill in decoding tables. In this loop, the table being + filled is at next and has curr index bits. The code being used is huff + with length len. That code is converted to an index by dropping drop + bits off of the bottom. For codes where len is less than drop + curr, + those top drop + curr - len bits are incremented through all values to + fill the table with replicated entries. + + root is the number of index bits for the root table. When len exceeds + root, sub-tables are created pointed to by the root entry with an index + of the low root bits of huff. This is saved in low to check for when a + new sub-table should be started. drop is zero when the root table is + being filled, and drop is root when sub-tables are being filled. + + When a new sub-table is needed, it is necessary to look ahead in the + code lengths to determine what size sub-table is needed. The length + counts are used for this, and so count[] is decremented as codes are + entered in the tables. + + used keeps track of how many table entries have been allocated from the + provided *table space. It is checked for LENS and DIST tables against + the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in + the initial root table size constants. See the comments in inftrees.h + for more information. + + sym increments through all symbols, and the loop terminates when + all codes of length max, i.e. all codes, have been processed. This + routine permits incomplete codes, so another loop after this one fills + in the rest of the decoding tables with invalid code markers. + */ + + /* set up for code type */ + // poor man optimization - use if-else instead of switch, + // to avoid deopts in old v8 + if (type === CODES) { + base = extra = work; /* dummy value--not used */ + end = 19; + + } else if (type === LENS) { + base = lbase; + base_index -= 257; + extra = lext; + extra_index -= 257; + end = 256; + + } else { /* DISTS */ + base = dbase; + extra = dext; + end = -1; + } + + /* initialize opts for loop */ + huff = 0; /* starting code */ + sym = 0; /* starting code symbol */ + len = min; /* starting code length */ + next = table_index; /* current table to fill in */ + curr = root; /* current table index bits */ + drop = 0; /* current bits to drop from code for index */ + low = -1; /* trigger new sub-table when len > root */ + used = 1 << root; /* use root table entries */ + mask = used - 1; /* mask for comparing low */ + + /* check available table space */ + if ((type === LENS && used > ENOUGH_LENS) || + (type === DISTS && used > ENOUGH_DISTS)) { + return 1; + } + + /* process all codes and make table entries */ + for (;;) { + /* create table entry */ + here_bits = len - drop; + if (work[sym] < end) { + here_op = 0; + here_val = work[sym]; + } + else if (work[sym] > end) { + here_op = extra[extra_index + work[sym]]; + here_val = base[base_index + work[sym]]; + } + else { + here_op = 32 + 64; /* end of block */ + here_val = 0; + } + + /* replicate for those indices with low len bits equal to huff */ + incr = 1 << (len - drop); + fill = 1 << curr; + min = fill; /* save offset to next table */ + do { + fill -= incr; + table[next + (huff >> drop) + fill] = (here_bits << 24) | (here_op << 16) | here_val |0; + } while (fill !== 0); + + /* backwards increment the len-bit code huff */ + incr = 1 << (len - 1); + while (huff & incr) { + incr >>= 1; + } + if (incr !== 0) { + huff &= incr - 1; + huff += incr; + } else { + huff = 0; + } + + /* go to next symbol, update count, len */ + sym++; + if (--count[len] === 0) { + if (len === max) { break; } + len = lens[lens_index + work[sym]]; + } + + /* create new sub-table if needed */ + if (len > root && (huff & mask) !== low) { + /* if first time, transition to sub-tables */ + if (drop === 0) { + drop = root; + } + + /* increment past last table */ + next += min; /* here min is 1 << curr */ + + /* determine length of next table */ + curr = len - drop; + left = 1 << curr; + while (curr + drop < max) { + left -= count[curr + drop]; + if (left <= 0) { break; } + curr++; + left <<= 1; + } + + /* check for enough space */ + used += 1 << curr; + if ((type === LENS && used > ENOUGH_LENS) || + (type === DISTS && used > ENOUGH_DISTS)) { + return 1; + } + + /* point entry in root table to sub-table */ + low = huff & mask; + /*table.op[low] = curr; + table.bits[low] = root; + table.val[low] = next - opts.table_index;*/ + table[low] = (root << 24) | (curr << 16) | (next - table_index) |0; + } + } + + /* fill in remaining table entry if code is incomplete (guaranteed to have + at most one remaining entry, since if the code is incomplete, the + maximum code length that was allowed to get this far is one bit) */ + if (huff !== 0) { + //table.op[next + huff] = 64; /* invalid code marker */ + //table.bits[next + huff] = len - drop; + //table.val[next + huff] = 0; + table[next + huff] = ((len - drop) << 24) | (64 << 16) |0; + } + + /* set return parameters */ + //opts.table_index += used; + opts.bits = root; + return 0; +}; + +},{"../utils/common":1}],10:[function(require,module,exports){ +'use strict'; + +// (C) 1995-2013 Jean-loup Gailly and Mark Adler +// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin +// +// This software is provided 'as-is', without any express or implied +// warranty. In no event will the authors be held liable for any damages +// arising from the use of this software. +// +// Permission is granted to anyone to use this software for any purpose, +// including commercial applications, and to alter it and redistribute it +// freely, subject to the following restrictions: +// +// 1. The origin of this software must not be misrepresented; you must not +// claim that you wrote the original software. If you use this software +// in a product, an acknowledgment in the product documentation would be +// appreciated but is not required. +// 2. Altered source versions must be plainly marked as such, and must not be +// misrepresented as being the original software. +// 3. This notice may not be removed or altered from any source distribution. + +module.exports = { + 2: 'need dictionary', /* Z_NEED_DICT 2 */ + 1: 'stream end', /* Z_STREAM_END 1 */ + 0: '', /* Z_OK 0 */ + '-1': 'file error', /* Z_ERRNO (-1) */ + '-2': 'stream error', /* Z_STREAM_ERROR (-2) */ + '-3': 'data error', /* Z_DATA_ERROR (-3) */ + '-4': 'insufficient memory', /* Z_MEM_ERROR (-4) */ + '-5': 'buffer error', /* Z_BUF_ERROR (-5) */ + '-6': 'incompatible version' /* Z_VERSION_ERROR (-6) */ +}; + +},{}],11:[function(require,module,exports){ +'use strict'; + +// (C) 1995-2013 Jean-loup Gailly and Mark Adler +// (C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin +// +// This software is provided 'as-is', without any express or implied +// warranty. In no event will the authors be held liable for any damages +// arising from the use of this software. +// +// Permission is granted to anyone to use this software for any purpose, +// including commercial applications, and to alter it and redistribute it +// freely, subject to the following restrictions: +// +// 1. The origin of this software must not be misrepresented; you must not +// claim that you wrote the original software. If you use this software +// in a product, an acknowledgment in the product documentation would be +// appreciated but is not required. +// 2. Altered source versions must be plainly marked as such, and must not be +// misrepresented as being the original software. +// 3. This notice may not be removed or altered from any source distribution. + +function ZStream() { + /* next input byte */ + this.input = null; // JS specific, because we have no pointers + this.next_in = 0; + /* number of bytes available at input */ + this.avail_in = 0; + /* total number of input bytes read so far */ + this.total_in = 0; + /* next output byte should be put there */ + this.output = null; // JS specific, because we have no pointers + this.next_out = 0; + /* remaining free space at output */ + this.avail_out = 0; + /* total number of bytes output so far */ + this.total_out = 0; + /* last error message, NULL if no error */ + this.msg = ''/*Z_NULL*/; + /* not visible by applications */ + this.state = null; + /* best guess about the data type: binary or text */ + this.data_type = 2/*Z_UNKNOWN*/; + /* adler32 value of the uncompressed data */ + this.adler = 0; +} + +module.exports = ZStream; + +},{}],"/lib/inflate.js":[function(require,module,exports){ +'use strict'; + + +var zlib_inflate = require('./zlib/inflate'); +var utils = require('./utils/common'); +var strings = require('./utils/strings'); +var c = require('./zlib/constants'); +var msg = require('./zlib/messages'); +var ZStream = require('./zlib/zstream'); +var GZheader = require('./zlib/gzheader'); + +var toString = Object.prototype.toString; + +/** + * class Inflate + * + * Generic JS-style wrapper for zlib calls. If you don't need + * streaming behaviour - use more simple functions: [[inflate]] + * and [[inflateRaw]]. + **/ + +/* internal + * inflate.chunks -> Array + * + * Chunks of output data, if [[Inflate#onData]] not overriden. + **/ + +/** + * Inflate.result -> Uint8Array|Array|String + * + * Uncompressed result, generated by default [[Inflate#onData]] + * and [[Inflate#onEnd]] handlers. Filled after you push last chunk + * (call [[Inflate#push]] with `Z_FINISH` / `true` param) or if you + * push a chunk with explicit flush (call [[Inflate#push]] with + * `Z_SYNC_FLUSH` param). + **/ + +/** + * Inflate.err -> Number + * + * Error code after inflate finished. 0 (Z_OK) on success. + * Should be checked if broken data possible. + **/ + +/** + * Inflate.msg -> String + * + * Error message, if [[Inflate.err]] != 0 + **/ + + +/** + * new Inflate(options) + * - options (Object): zlib inflate options. + * + * Creates new inflator instance with specified params. Throws exception + * on bad params. Supported options: + * + * - `windowBits` + * - `dictionary` + * + * [http://zlib.net/manual.html#Advanced](http://zlib.net/manual.html#Advanced) + * for more information on these. + * + * Additional options, for internal needs: + * + * - `chunkSize` - size of generated data chunks (16K by default) + * - `raw` (Boolean) - do raw inflate + * - `to` (String) - if equal to 'string', then result will be converted + * from utf8 to utf16 (javascript) string. When string output requested, + * chunk length can differ from `chunkSize`, depending on content. + * + * By default, when no options set, autodetect deflate/gzip data format via + * wrapper header. + * + * ##### Example: + * + * ```javascript + * var pako = require('pako') + * , chunk1 = Uint8Array([1,2,3,4,5,6,7,8,9]) + * , chunk2 = Uint8Array([10,11,12,13,14,15,16,17,18,19]); + * + * var inflate = new pako.Inflate({ level: 3}); + * + * inflate.push(chunk1, false); + * inflate.push(chunk2, true); // true -> last chunk + * + * if (inflate.err) { throw new Error(inflate.err); } + * + * console.log(inflate.result); + * ``` + **/ +function Inflate(options) { + if (!(this instanceof Inflate)) return new Inflate(options); + + this.options = utils.assign({ + chunkSize: 16384, + windowBits: 0, + to: '' + }, options || {}); + + var opt = this.options; + + // Force window size for `raw` data, if not set directly, + // because we have no header for autodetect. + if (opt.raw && (opt.windowBits >= 0) && (opt.windowBits < 16)) { + opt.windowBits = -opt.windowBits; + if (opt.windowBits === 0) { opt.windowBits = -15; } + } + + // If `windowBits` not defined (and mode not raw) - set autodetect flag for gzip/deflate + if ((opt.windowBits >= 0) && (opt.windowBits < 16) && + !(options && options.windowBits)) { + opt.windowBits += 32; + } + + // Gzip header has no info about windows size, we can do autodetect only + // for deflate. So, if window size not set, force it to max when gzip possible + if ((opt.windowBits > 15) && (opt.windowBits < 48)) { + // bit 3 (16) -> gzipped data + // bit 4 (32) -> autodetect gzip/deflate + if ((opt.windowBits & 15) === 0) { + opt.windowBits |= 15; + } + } + + this.err = 0; // error code, if happens (0 = Z_OK) + this.msg = ''; // error message + this.ended = false; // used to avoid multiple onEnd() calls + this.chunks = []; // chunks of compressed data + + this.strm = new ZStream(); + this.strm.avail_out = 0; + + var status = zlib_inflate.inflateInit2( + this.strm, + opt.windowBits + ); + + if (status !== c.Z_OK) { + throw new Error(msg[status]); + } + + this.header = new GZheader(); + + zlib_inflate.inflateGetHeader(this.strm, this.header); +} + +/** + * Inflate#push(data[, mode]) -> Boolean + * - data (Uint8Array|Array|ArrayBuffer|String): input data + * - mode (Number|Boolean): 0..6 for corresponding Z_NO_FLUSH..Z_TREE modes. + * See constants. Skipped or `false` means Z_NO_FLUSH, `true` meansh Z_FINISH. + * + * Sends input data to inflate pipe, generating [[Inflate#onData]] calls with + * new output chunks. Returns `true` on success. The last data block must have + * mode Z_FINISH (or `true`). That will flush internal pending buffers and call + * [[Inflate#onEnd]]. For interim explicit flushes (without ending the stream) you + * can use mode Z_SYNC_FLUSH, keeping the decompression context. + * + * On fail call [[Inflate#onEnd]] with error code and return false. + * + * We strongly recommend to use `Uint8Array` on input for best speed (output + * format is detected automatically). Also, don't skip last param and always + * use the same type in your code (boolean or number). That will improve JS speed. + * + * For regular `Array`-s make sure all elements are [0..255]. + * + * ##### Example + * + * ```javascript + * push(chunk, false); // push one of data chunks + * ... + * push(chunk, true); // push last chunk + * ``` + **/ +Inflate.prototype.push = function (data, mode) { + var strm = this.strm; + var chunkSize = this.options.chunkSize; + var dictionary = this.options.dictionary; + var status, _mode; + var next_out_utf8, tail, utf8str; + var dict; + + // Flag to properly process Z_BUF_ERROR on testing inflate call + // when we check that all output data was flushed. + var allowBufError = false; + + if (this.ended) { return false; } + _mode = (mode === ~~mode) ? mode : ((mode === true) ? c.Z_FINISH : c.Z_NO_FLUSH); + + // Convert data if needed + if (typeof data === 'string') { + // Only binary strings can be decompressed on practice + strm.input = strings.binstring2buf(data); + } else if (toString.call(data) === '[object ArrayBuffer]') { + strm.input = new Uint8Array(data); + } else { + strm.input = data; + } + + strm.next_in = 0; + strm.avail_in = strm.input.length; + + do { + if (strm.avail_out === 0) { + strm.output = new utils.Buf8(chunkSize); + strm.next_out = 0; + strm.avail_out = chunkSize; + } + + status = zlib_inflate.inflate(strm, c.Z_NO_FLUSH); /* no bad return value */ + + if (status === c.Z_NEED_DICT && dictionary) { + // Convert data if needed + if (typeof dictionary === 'string') { + dict = strings.string2buf(dictionary); + } else if (toString.call(dictionary) === '[object ArrayBuffer]') { + dict = new Uint8Array(dictionary); + } else { + dict = dictionary; + } + + status = zlib_inflate.inflateSetDictionary(this.strm, dict); + + } + + if (status === c.Z_BUF_ERROR && allowBufError === true) { + status = c.Z_OK; + allowBufError = false; + } + + if (status !== c.Z_STREAM_END && status !== c.Z_OK) { + this.onEnd(status); + this.ended = true; + return false; + } + + if (strm.next_out) { + if (strm.avail_out === 0 || status === c.Z_STREAM_END || (strm.avail_in === 0 && (_mode === c.Z_FINISH || _mode === c.Z_SYNC_FLUSH))) { + + if (this.options.to === 'string') { + + next_out_utf8 = strings.utf8border(strm.output, strm.next_out); + + tail = strm.next_out - next_out_utf8; + utf8str = strings.buf2string(strm.output, next_out_utf8); + + // move tail + strm.next_out = tail; + strm.avail_out = chunkSize - tail; + if (tail) { utils.arraySet(strm.output, strm.output, next_out_utf8, tail, 0); } + + this.onData(utf8str); + + } else { + this.onData(utils.shrinkBuf(strm.output, strm.next_out)); + } + } + } + + // When no more input data, we should check that internal inflate buffers + // are flushed. The only way to do it when avail_out = 0 - run one more + // inflate pass. But if output data not exists, inflate return Z_BUF_ERROR. + // Here we set flag to process this error properly. + // + // NOTE. Deflate does not return error in this case and does not needs such + // logic. + if (strm.avail_in === 0 && strm.avail_out === 0) { + allowBufError = true; + } + + } while ((strm.avail_in > 0 || strm.avail_out === 0) && status !== c.Z_STREAM_END); + + if (status === c.Z_STREAM_END) { + _mode = c.Z_FINISH; + } + + // Finalize on the last chunk. + if (_mode === c.Z_FINISH) { + status = zlib_inflate.inflateEnd(this.strm); + this.onEnd(status); + this.ended = true; + return status === c.Z_OK; + } + + // callback interim results if Z_SYNC_FLUSH. + if (_mode === c.Z_SYNC_FLUSH) { + this.onEnd(c.Z_OK); + strm.avail_out = 0; + return true; + } + + return true; +}; + + +/** + * Inflate#onData(chunk) -> Void + * - chunk (Uint8Array|Array|String): ouput data. Type of array depends + * on js engine support. When string output requested, each chunk + * will be string. + * + * By default, stores data blocks in `chunks[]` property and glue + * those in `onEnd`. Override this handler, if you need another behaviour. + **/ +Inflate.prototype.onData = function (chunk) { + this.chunks.push(chunk); +}; + + +/** + * Inflate#onEnd(status) -> Void + * - status (Number): inflate status. 0 (Z_OK) on success, + * other if not. + * + * Called either after you tell inflate that the input stream is + * complete (Z_FINISH) or should be flushed (Z_SYNC_FLUSH) + * or if an error happened. By default - join collected chunks, + * free memory and fill `results` / `err` properties. + **/ +Inflate.prototype.onEnd = function (status) { + // On success - join + if (status === c.Z_OK) { + if (this.options.to === 'string') { + // Glue & convert here, until we teach pako to send + // utf8 alligned strings to onData + this.result = this.chunks.join(''); + } else { + this.result = utils.flattenChunks(this.chunks); + } + } + this.chunks = []; + this.err = status; + this.msg = this.strm.msg; +}; + + +/** + * inflate(data[, options]) -> Uint8Array|Array|String + * - data (Uint8Array|Array|String): input data to decompress. + * - options (Object): zlib inflate options. + * + * Decompress `data` with inflate/ungzip and `options`. Autodetect + * format via wrapper header by default. That's why we don't provide + * separate `ungzip` method. + * + * Supported options are: + * + * - windowBits + * + * [http://zlib.net/manual.html#Advanced](http://zlib.net/manual.html#Advanced) + * for more information. + * + * Sugar (options): + * + * - `raw` (Boolean) - say that we work with raw stream, if you don't wish to specify + * negative windowBits implicitly. + * - `to` (String) - if equal to 'string', then result will be converted + * from utf8 to utf16 (javascript) string. When string output requested, + * chunk length can differ from `chunkSize`, depending on content. + * + * + * ##### Example: + * + * ```javascript + * var pako = require('pako') + * , input = pako.deflate([1,2,3,4,5,6,7,8,9]) + * , output; + * + * try { + * output = pako.inflate(input); + * } catch (err) + * console.log(err); + * } + * ``` + **/ +function inflate(input, options) { + var inflator = new Inflate(options); + + inflator.push(input, true); + + // That will never happens, if you don't cheat with options :) + if (inflator.err) { throw inflator.msg || msg[inflator.err]; } + + return inflator.result; +} + + +/** + * inflateRaw(data[, options]) -> Uint8Array|Array|String + * - data (Uint8Array|Array|String): input data to decompress. + * - options (Object): zlib inflate options. + * + * The same as [[inflate]], but creates raw data, without wrapper + * (header and adler32 crc). + **/ +function inflateRaw(input, options) { + options = options || {}; + options.raw = true; + return inflate(input, options); +} + + +/** + * ungzip(data[, options]) -> Uint8Array|Array|String + * - data (Uint8Array|Array|String): input data to decompress. + * - options (Object): zlib inflate options. + * + * Just shortcut to [[inflate]], because it autodetects format + * by header.content. Done for convenience. + **/ + + +exports.Inflate = Inflate; +exports.inflate = inflate; +exports.inflateRaw = inflateRaw; +exports.ungzip = inflate; + +},{"./utils/common":1,"./utils/strings":2,"./zlib/constants":4,"./zlib/gzheader":6,"./zlib/inflate":8,"./zlib/messages":10,"./zlib/zstream":11}]},{},[])("/lib/inflate.js") +}); \ No newline at end of file diff --git a/chromium/icons/icon-active-128.png b/chromium/icons/icon-active-128.png deleted file mode 120000 index bfc9f4b018ee..000000000000 --- a/chromium/icons/icon-active-128.png +++ /dev/null @@ -1 +0,0 @@ -../../common/icons/icon-active-128.png \ No newline at end of file diff --git a/chromium/icons/icon-active-38.png b/chromium/icons/icon-active-38.png deleted file mode 120000 index 49c692e81d54..000000000000 --- a/chromium/icons/icon-active-38.png +++ /dev/null @@ -1 +0,0 @@ -../../common/icons/icon-active-38.png \ No newline at end of file diff --git a/chromium/icons/icon-active-48.png b/chromium/icons/icon-active-48.png deleted file mode 120000 index 90a5ddd5dce2..000000000000 --- a/chromium/icons/icon-active-48.png +++ /dev/null @@ -1 +0,0 @@ -../../common/icons/icon-active-48.png \ No newline at end of file diff --git a/chromium/icons/icon-blocking-38.png b/chromium/icons/icon-blocking-38.png deleted file mode 120000 index 93790eaeeca3..000000000000 --- a/chromium/icons/icon-blocking-38.png +++ /dev/null @@ -1 +0,0 @@ -../../common/icons/icon-blocking-38.png \ No newline at end of file diff --git a/chromium/icons/icon-disabled-38.png b/chromium/icons/icon-disabled-38.png deleted file mode 120000 index 93d63819569b..000000000000 --- a/chromium/icons/icon-disabled-38.png +++ /dev/null @@ -1 +0,0 @@ -../../common/icons/icon-disabled-38.png \ No newline at end of file diff --git a/chromium/images/HTTPS-Everywhere-Logo.png b/chromium/images/HTTPS-Everywhere-Logo.png new file mode 100644 index 000000000000..d1ebd640731b Binary files /dev/null and b/chromium/images/HTTPS-Everywhere-Logo.png differ diff --git a/chromium/images/banner-red.svg b/chromium/images/banner-red.svg new file mode 100644 index 000000000000..5e1e54b9f800 --- /dev/null +++ b/chromium/images/banner-red.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/chromium/images/eff-logo-monogram-red.png b/chromium/images/eff-logo-monogram-red.png new file mode 100644 index 000000000000..2b91daab5203 Binary files /dev/null and b/chromium/images/eff-logo-monogram-red.png differ diff --git a/common/icons/icon-active-128.png b/chromium/images/icons/icon-active-128.png similarity index 100% rename from common/icons/icon-active-128.png rename to chromium/images/icons/icon-active-128.png diff --git a/common/icons/icon-active-38.png b/chromium/images/icons/icon-active-38.png similarity index 100% rename from common/icons/icon-active-38.png rename to chromium/images/icons/icon-active-38.png diff --git a/common/icons/icon-active-48.png b/chromium/images/icons/icon-active-48.png similarity index 100% rename from common/icons/icon-active-48.png rename to chromium/images/icons/icon-active-48.png diff --git a/common/icons/icon-blocking-38.png b/chromium/images/icons/icon-blocking-38.png similarity index 100% rename from common/icons/icon-blocking-38.png rename to chromium/images/icons/icon-blocking-38.png diff --git a/common/icons/icon-disabled-38.png b/chromium/images/icons/icon-disabled-38.png similarity index 100% rename from common/icons/icon-disabled-38.png rename to chromium/images/icons/icon-disabled-38.png diff --git a/chromium/images/onboarding/httpseverywhere-logo.png b/chromium/images/onboarding/httpseverywhere-logo.png new file mode 100644 index 000000000000..30aebc3ee763 Binary files /dev/null and b/chromium/images/onboarding/httpseverywhere-logo.png differ diff --git a/chromium/remove.png b/chromium/images/remove.png similarity index 100% rename from chromium/remove.png rename to chromium/images/remove.png diff --git a/chromium/manifest.json b/chromium/manifest.json index 192f44523bb3..5a1ee704713e 100644 --- a/chromium/manifest.json +++ b/chromium/manifest.json @@ -8,35 +8,43 @@ "author": "extension-devs@eff.org", "background": { "scripts": [ - "bootstrap.js", - "util.js", - "rules.js", - "store.js", - "incognito.js", - "background.js" + "background-scripts/bootstrap.js", + "background-scripts/util.js", + "wasm/https_everywhere_lib_wasm.js", + "background-scripts/wasm.js", + "background-scripts/update_channels.js", + "background-scripts/update.js", + "background-scripts/rules.js", + "background-scripts/store.js", + "external/pako-1.0.5/pako_inflate.min.js", + "background-scripts/incognito.js", + "background-scripts/ip_utils.js", + "background-scripts/modules/ssl_codes.js", + "background-scripts/background.js" ] }, "browser_action": { "default_icon": { - "38": "icons/icon-active-38.png" + "38": "images/icons/icon-active-38.png" }, - "default_popup": "popup.html", + "default_popup": "pages/popup/index.html", "default_title": "__MSG_about_ext_name__" }, + "content_security_policy": "script-src 'self' 'wasm-eval'; object-src 'self'", "default_locale": "en", "description": "__MSG_about_ext_description__", - "devtools_page": "devtools.html", "homepage_url": "https://www.eff.org/https-everywhere", "icons": { - "128": "icons/icon-active-128.png", - "48": "icons/icon-active-48.png" + "128": "images/icons/icon-active-128.png", + "48": "images/icons/icon-active-48.png" }, - "incognito": "spanning", + "incognito": "split", "manifest_version": 2, "minimum_chrome_version": "55", "name": "__MSG_about_ext_name__", "options_ui": { - "page": "options.html" + "open_in_tab": true, + "page": "pages/options/index.html" }, "permissions": [ "webNavigation", @@ -45,7 +53,11 @@ "tabs", "cookies", "storage", - "*://*/*" + "*://*/*", + "ftp://*/*" ], - "version": "2018.1.29" + "version": "2022.5.24", + "web_accessible_resources": [ + "/pages/cancel/index.html" + ] } \ No newline at end of file diff --git a/chromium/options.css b/chromium/options.css deleted file mode 100644 index 0787d3f21c10..000000000000 --- a/chromium/options.css +++ /dev/null @@ -1,21 +0,0 @@ -#counter-wrapper{ - margin: 10px 0 20px 0; -} - -.section-header{ - margin-bottom: 10px; -} - -.section-header-span{ - border-bottom: 1px solid #ccc; - font-size: 15px; -} - -#import{ - margin-bottom: 10px; - float: right; -} - -#import-confirmed{ - display: none; -} diff --git a/chromium/options.html b/chromium/options.html deleted file mode 100644 index 50b246f5872c..000000000000 --- a/chromium/options.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - -
-
- - -
- -
- -
-
-
- -
- -
- - - - - - diff --git a/chromium/options.js b/chromium/options.js deleted file mode 100644 index c5105f71b5dd..000000000000 --- a/chromium/options.js +++ /dev/null @@ -1,48 +0,0 @@ -/* global sendMessage */ - -"use strict"; - -document.addEventListener("DOMContentLoaded", () => { - - let json_data; - let import_button = document.querySelector("#import"); - - function import_json(e) { - e.preventDefault(); - - let settings = JSON.parse(json_data); - sendMessage("import_settings", settings, () => { - document.querySelector("#import-confirmed").style.display = "block"; - document.querySelector("form").style.display = "none"; - }); - } - - document.querySelector("#import-settings").addEventListener("change", () => { - const file = event.target.files[0]; - const reader = new FileReader(); - reader.addEventListener("load", event => { - json_data = event.target.result; - import_button.disabled = false; - }); - - reader.readAsText(file); - }); - - document.querySelector("form").addEventListener("submit", import_json); - - const showCounter = document.getElementById("showCounter"); - - sendMessage("get_option", { showCounter: true }, item => { - showCounter.checked = item.showCounter; - showCounter.addEventListener("change", () => { - sendMessage("set_option", { showCounter: showCounter.checked }); - }); - }); - - document.onkeydown = function(evt) { - evt = evt || window.event; - if (evt.ctrlKey && evt.keyCode == 90) { - window.open("debugging-rulesets.html"); - } - }; -}); diff --git a/chromium/package-lock.json b/chromium/package-lock.json new file mode 100644 index 000000000000..0886adcdb32c --- /dev/null +++ b/chromium/package-lock.json @@ -0,0 +1,2909 @@ +{ + "name": "https-everywhere", + "version": "1.0.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "@babel/code-frame": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", + "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", + "dev": true, + "requires": { + "@babel/highlight": "^7.10.4" + } + }, + "@babel/core": { + "version": "7.11.1", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.11.1.tgz", + "integrity": "sha512-XqF7F6FWQdKGGWAzGELL+aCO1p+lRY5Tj5/tbT3St1G8NaH70jhhDIKknIZaDans0OQBG5wRAldROLHSt44BgQ==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.11.0", + "@babel/helper-module-transforms": "^7.11.0", + "@babel/helpers": "^7.10.4", + "@babel/parser": "^7.11.1", + "@babel/template": "^7.10.4", + "@babel/traverse": "^7.11.0", + "@babel/types": "^7.11.0", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.2", + "lodash": "^4.17.19", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } + } + }, + "@babel/generator": { + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.0.tgz", + "integrity": "sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==", + "dev": true, + "requires": { + "@babel/types": "^7.11.0", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + } + }, + "@babel/helper-function-name": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz", + "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==", + "dev": true, + "requires": { + "@babel/helper-get-function-arity": "^7.10.4", + "@babel/template": "^7.10.4", + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz", + "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==", + "dev": true, + "requires": { + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-member-expression-to-functions": { + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz", + "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==", + "dev": true, + "requires": { + "@babel/types": "^7.11.0" + } + }, + "@babel/helper-module-imports": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz", + "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==", + "dev": true, + "requires": { + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-module-transforms": { + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz", + "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==", + "dev": true, + "requires": { + "@babel/helper-module-imports": "^7.10.4", + "@babel/helper-replace-supers": "^7.10.4", + "@babel/helper-simple-access": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.11.0", + "@babel/template": "^7.10.4", + "@babel/types": "^7.11.0", + "lodash": "^4.17.19" + } + }, + "@babel/helper-optimise-call-expression": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz", + "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==", + "dev": true, + "requires": { + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-replace-supers": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz", + "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==", + "dev": true, + "requires": { + "@babel/helper-member-expression-to-functions": "^7.10.4", + "@babel/helper-optimise-call-expression": "^7.10.4", + "@babel/traverse": "^7.10.4", + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-simple-access": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz", + "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==", + "dev": true, + "requires": { + "@babel/template": "^7.10.4", + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz", + "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==", + "dev": true, + "requires": { + "@babel/types": "^7.11.0" + } + }, + "@babel/helper-validator-identifier": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", + "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", + "dev": true + }, + "@babel/helpers": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz", + "integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==", + "dev": true, + "requires": { + "@babel/template": "^7.10.4", + "@babel/traverse": "^7.10.4", + "@babel/types": "^7.10.4" + } + }, + "@babel/highlight": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", + "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.11.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.3.tgz", + "integrity": "sha512-REo8xv7+sDxkKvoxEywIdsNFiZLybwdI7hcT5uEPyQrSMB4YQ973BfC9OOrD/81MaIjh6UxdulIQXkjmiH3PcA==", + "dev": true + }, + "@babel/runtime": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz", + "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==", + "dev": true, + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "@babel/template": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz", + "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/parser": "^7.10.4", + "@babel/types": "^7.10.4" + } + }, + "@babel/traverse": { + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz", + "integrity": "sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.11.0", + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.11.0", + "@babel/parser": "^7.11.0", + "@babel/types": "^7.11.0", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.19" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + } + } + }, + "@babel/types": { + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz", + "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + }, + "@codemirror/autocomplete": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.0.2.tgz", + "integrity": "sha512-9PDjnllmXan/7Uax87KGORbxerDJ/cu10SB+n4Jz0zXMEvIh3+TGgZxhIvDOtaQ4jDBQEM7kHYW4vLdQB0DGZQ==", + "dev": true, + "requires": { + "@codemirror/language": "^6.0.0", + "@codemirror/state": "^6.0.0", + "@codemirror/view": "^6.0.0", + "@lezer/common": "^1.0.0" + } + }, + "@codemirror/commands": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.0.1.tgz", + "integrity": "sha512-iNHDByicYqQjs0Wo1MKGfqNbMYMyhS9WV6EwMVwsHXImlFemgEUC+c5X22bXKBStN3qnwg4fArNZM+gkv22baQ==", + "dev": true, + "requires": { + "@codemirror/language": "^6.0.0", + "@codemirror/state": "^6.0.0", + "@codemirror/view": "^6.0.0", + "@lezer/common": "^1.0.0" + } + }, + "@codemirror/language": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.2.0.tgz", + "integrity": "sha512-tabB0Ef/BflwoEmTB4a//WZ9P90UQyne9qWB9YFsmeS4bnEqSys7UpGk/da1URMXhyfuzWCwp+AQNMhvu8SfnA==", + "dev": true, + "requires": { + "@codemirror/state": "^6.0.0", + "@codemirror/view": "^6.0.0", + "@lezer/common": "^1.0.0", + "@lezer/highlight": "^1.0.0", + "@lezer/lr": "^1.0.0", + "style-mod": "^4.0.0" + } + }, + "@codemirror/lint": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.0.0.tgz", + "integrity": "sha512-nUUXcJW1Xp54kNs+a1ToPLK8MadO0rMTnJB8Zk4Z8gBdrN0kqV7uvUraU/T2yqg+grDNR38Vmy/MrhQN/RgwiA==", + "dev": true, + "requires": { + "@codemirror/state": "^6.0.0", + "@codemirror/view": "^6.0.0", + "crelt": "^1.0.5" + } + }, + "@codemirror/search": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.0.0.tgz", + "integrity": "sha512-rL0rd3AhI0TAsaJPUaEwC63KHLO7KL0Z/dYozXj6E7L3wNHRyx7RfE0/j5HsIf912EE5n2PCb4Vg0rGYmDv4UQ==", + "dev": true, + "requires": { + "@codemirror/state": "^6.0.0", + "@codemirror/view": "^6.0.0", + "crelt": "^1.0.5" + } + }, + "@codemirror/state": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.1.0.tgz", + "integrity": "sha512-qbUr94DZTe6/V1VS7LDLz11rM/1t/nJxR1El4I6UaxDEdc0aZZvq6JCLJWiRmUf95NRAnDH6fhXn+PWp9wGCIg==", + "dev": true + }, + "@codemirror/view": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.0.2.tgz", + "integrity": "sha512-mnVT/q1JvKPjpmjXJNeCi/xHyaJ3abGJsumIVpdQ1nE1MXAyHf7GHWt8QpWMUvDiqF0j+inkhVR2OviTdFFX7Q==", + "dev": true, + "requires": { + "@codemirror/state": "^6.0.0", + "style-mod": "^4.0.0", + "w3c-keyname": "^2.2.4" + } + }, + "@istanbuljs/load-nyc-config": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", + "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", + "dev": true, + "requires": { + "camelcase": "^5.3.1", + "find-up": "^4.1.0", + "get-package-type": "^0.1.0", + "js-yaml": "^3.13.1", + "resolve-from": "^5.0.0" + }, + "dependencies": { + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + } + } + }, + "@istanbuljs/schema": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz", + "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==", + "dev": true + }, + "@lezer/common": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.0.0.tgz", + "integrity": "sha512-ohydQe+Hb+w4oMDvXzs8uuJd2NoA3D8YDcLiuDsLqH+yflDTPEpgCsWI3/6rH5C3BAedtH1/R51dxENldQceEA==", + "dev": true + }, + "@lezer/highlight": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.0.0.tgz", + "integrity": "sha512-nsCnNtim90UKsB5YxoX65v3GEIw3iCHw9RM2DtdgkiqAbKh9pCdvi8AWNwkYf10Lu6fxNhXPpkpHbW6mihhvJA==", + "dev": true, + "requires": { + "@lezer/common": "^1.0.0" + } + }, + "@lezer/lr": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.1.0.tgz", + "integrity": "sha512-Iad04uVwk1PvSnj25mqj7zEEIRAsasbsTRmVzI0AUTs/+1Dz1//iYAaoLr7A+Xa7bZDfql5MKTxZmSlkYZD3Dg==", + "dev": true, + "requires": { + "@lezer/common": "^1.0.0" + } + }, + "@sinonjs/commons": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz", + "integrity": "sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==", + "dev": true, + "requires": { + "type-detect": "4.0.8" + } + }, + "@sinonjs/fake-timers": { + "version": "9.1.2", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz", + "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==", + "dev": true, + "requires": { + "@sinonjs/commons": "^1.7.0" + } + }, + "@sinonjs/samsam": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-6.1.1.tgz", + "integrity": "sha512-cZ7rKJTLiE7u7Wi/v9Hc2fs3Ucc3jrWeMgPHbbTCeVAB2S0wOBbYlkJVeNSL04i7fdhT8wIbDq1zhC/PXTD2SA==", + "dev": true, + "requires": { + "@sinonjs/commons": "^1.6.0", + "lodash.get": "^4.4.2", + "type-detect": "^4.0.8" + } + }, + "@sinonjs/text-encoding": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz", + "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==", + "dev": true + }, + "@types/color-name": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", + "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==", + "dev": true + }, + "@ungap/promise-all-settled": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", + "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", + "dev": true + }, + "aggregate-error": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz", + "integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==", + "dev": true, + "requires": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + } + }, + "ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "ansi-colors": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "dev": true + }, + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true + }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "anymatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "dev": true, + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, + "append-transform": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz", + "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==", + "dev": true, + "requires": { + "default-require-extensions": "^3.0.0" + } + }, + "archy": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", + "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=", + "dev": true + }, + "argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "requires": { + "sprintf-js": "~1.0.2" + } + }, + "array-from": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz", + "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=", + "dev": true + }, + "asn1": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", + "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "dev": true, + "requires": { + "safer-buffer": "~2.1.0" + } + }, + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true + }, + "assertion-error": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", + "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", + "dev": true + }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", + "dev": true + }, + "atob": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", + "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", + "dev": true + }, + "aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", + "dev": true + }, + "aws4": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", + "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", + "dev": true + }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true + }, + "bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "dev": true, + "requires": { + "tweetnacl": "^0.14.3" + } + }, + "binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "dev": true + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "requires": { + "fill-range": "^7.0.1" + } + }, + "browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", + "dev": true + }, + "btoa": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz", + "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==", + "dev": true + }, + "caching-transform": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz", + "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==", + "dev": true, + "requires": { + "hasha": "^5.0.0", + "make-dir": "^3.0.0", + "package-hash": "^4.0.0", + "write-file-atomic": "^3.0.0" + } + }, + "camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true + }, + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", + "dev": true + }, + "chai": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz", + "integrity": "sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==", + "dev": true, + "requires": { + "assertion-error": "^1.1.0", + "check-error": "^1.0.2", + "deep-eql": "^3.0.1", + "get-func-name": "^2.0.0", + "loupe": "^2.3.1", + "pathval": "^1.1.1", + "type-detect": "^4.0.5" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "dependencies": { + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, + "check-error": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", + "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", + "dev": true + }, + "chokidar": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "dev": true, + "requires": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "fsevents": "~2.3.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + } + }, + "clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "dev": true + }, + "cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "codemirror": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz", + "integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==", + "dev": true, + "requires": { + "@codemirror/autocomplete": "^6.0.0", + "@codemirror/commands": "^6.0.0", + "@codemirror/language": "^6.0.0", + "@codemirror/lint": "^6.0.0", + "@codemirror/search": "^6.0.0", + "@codemirror/state": "^6.0.0", + "@codemirror/view": "^6.0.0" + } + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true + }, + "combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, + "requires": { + "delayed-stream": "~1.0.0" + } + }, + "commondir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + }, + "convert-source-map": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", + "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.1" + } + }, + "core-js": { + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.8.1.tgz", + "integrity": "sha512-9Id2xHY1W7m8hCl8NkhQn5CufmF/WuR30BTRewvCXc1aZd3kMECwNZ69ndLbekKfakw9Rf2Xyc+QR6E7Gg+obg==", + "dev": true + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "dev": true + }, + "coveralls": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.1.1.tgz", + "integrity": "sha512-+dxnG2NHncSD1NrqbSM3dn/lE57O6Qf/koe9+I7c+wzkqRmEvcp0kgJdxKInzYzkICKkFMZsX3Vct3++tsF9ww==", + "dev": true, + "requires": { + "js-yaml": "^3.13.1", + "lcov-parse": "^1.0.0", + "log-driver": "^1.2.7", + "minimist": "^1.2.5", + "request": "^2.88.2" + } + }, + "crelt": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.5.tgz", + "integrity": "sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA==", + "dev": true + }, + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "dev": true, + "requires": { + "assert-plus": "^1.0.0" + } + }, + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "dev": true + }, + "deep-eql": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", + "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", + "dev": true, + "requires": { + "type-detect": "^4.0.0" + } + }, + "default-require-extensions": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.0.tgz", + "integrity": "sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg==", + "dev": true, + "requires": { + "strip-bom": "^4.0.0" + } + }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", + "dev": true + }, + "diff": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", + "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", + "dev": true + }, + "ecc-jsbn": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "dev": true, + "requires": { + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" + } + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "es6-error": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", + "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", + "dev": true + }, + "escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true + }, + "esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true + }, + "extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", + "dev": true + }, + "extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", + "dev": true + }, + "fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + }, + "fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, + "fetch-mock": { + "version": "9.11.0", + "resolved": "https://registry.npmjs.org/fetch-mock/-/fetch-mock-9.11.0.tgz", + "integrity": "sha512-PG1XUv+x7iag5p/iNHD4/jdpxL9FtVSqRMUQhPab4hVDt80T1MH5ehzVrL2IdXO9Q2iBggArFvPqjUbHFuI58Q==", + "dev": true, + "requires": { + "@babel/core": "^7.0.0", + "@babel/runtime": "^7.0.0", + "core-js": "^3.0.0", + "debug": "^4.1.1", + "glob-to-regexp": "^0.4.0", + "is-subset": "^0.1.1", + "lodash.isequal": "^4.5.0", + "path-to-regexp": "^2.2.1", + "querystring": "^0.2.0", + "whatwg-url": "^6.5.0" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "find-cache-dir": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", + "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", + "dev": true, + "requires": { + "commondir": "^1.0.1", + "make-dir": "^3.0.2", + "pkg-dir": "^4.1.0" + } + }, + "find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "requires": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + } + }, + "flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "dev": true + }, + "foreground-child": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", + "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==", + "dev": true, + "requires": { + "cross-spawn": "^7.0.0", + "signal-exit": "^3.0.2" + } + }, + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", + "dev": true + }, + "form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "dev": true, + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + } + }, + "fromentries": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.2.1.tgz", + "integrity": "sha512-Xu2Qh8yqYuDhQGOhD5iJGninErSfI9A3FrriD3tjUgV5VbJFeH8vfgZ9HnC6jWN80QDVNQK5vmxRAmEAp7Mevw==", + "dev": true + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, + "fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, + "optional": true + }, + "gensync": { + "version": "1.0.0-beta.1", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz", + "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==", + "dev": true + }, + "get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true + }, + "get-func-name": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", + "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", + "dev": true + }, + "get-package-type": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", + "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", + "dev": true + }, + "getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "dev": true, + "requires": { + "assert-plus": "^1.0.0" + } + }, + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + }, + "glob-to-regexp": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", + "dev": true + }, + "globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "dev": true + }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, + "har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", + "dev": true + }, + "har-validator": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", + "dev": true, + "requires": { + "ajv": "^6.12.3", + "har-schema": "^2.0.0" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "hasha": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.0.tgz", + "integrity": "sha512-2W+jKdQbAdSIrggA8Q35Br8qKadTrqCTC8+XZvBWepKDK6m9XkX6Iz1a2yh2KP01kzAR/dpuMeUnocoLYDcskw==", + "dev": true, + "requires": { + "is-stream": "^2.0.0", + "type-fest": "^0.8.0" + } + }, + "he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true + }, + "html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true + }, + "http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "dev": true, + "requires": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + } + }, + "imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", + "dev": true + }, + "indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "dev": true + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true + }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "requires": { + "binary-extensions": "^2.0.0" + } + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "requires": { + "is-extglob": "^2.1.1" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, + "is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "dev": true + }, + "is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", + "dev": true + }, + "is-subset": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz", + "integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=", + "dev": true + }, + "is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", + "dev": true + }, + "is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "dev": true + }, + "is-windows": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", + "dev": true + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "dev": true + }, + "isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", + "dev": true + }, + "istanbul-lib-coverage": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", + "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==", + "dev": true + }, + "istanbul-lib-hook": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz", + "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==", + "dev": true, + "requires": { + "append-transform": "^2.0.0" + } + }, + "istanbul-lib-instrument": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz", + "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==", + "dev": true, + "requires": { + "@babel/core": "^7.7.5", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.0.0", + "semver": "^6.3.0" + } + }, + "istanbul-lib-processinfo": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.2.tgz", + "integrity": "sha512-kOwpa7z9hme+IBPZMzQ5vdQj8srYgAtaRqeI48NGmAQ+/5yKiHLV0QbYqQpxsdEF0+w14SoB8YbnHKcXE2KnYw==", + "dev": true, + "requires": { + "archy": "^1.0.0", + "cross-spawn": "^7.0.0", + "istanbul-lib-coverage": "^3.0.0-alpha.1", + "make-dir": "^3.0.0", + "p-map": "^3.0.0", + "rimraf": "^3.0.0", + "uuid": "^3.3.3" + }, + "dependencies": { + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "dev": true + } + } + }, + "istanbul-lib-report": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", + "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", + "dev": true, + "requires": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^3.0.0", + "supports-color": "^7.1.0" + } + }, + "istanbul-lib-source-maps": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz", + "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==", + "dev": true, + "requires": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, + "istanbul-reports": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz", + "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==", + "dev": true, + "requires": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + } + }, + "js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, + "js-yaml": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", + "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", + "dev": true, + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, + "jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", + "dev": true + }, + "jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true + }, + "json-schema": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", + "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", + "dev": true + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", + "dev": true + }, + "json5": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", + "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, + "jsprim": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", + "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", + "dev": true, + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.4.0", + "verror": "1.10.0" + } + }, + "just-extend": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.1.0.tgz", + "integrity": "sha512-ApcjaOdVTJ7y4r08xI5wIqpvwS48Q0PBG4DJROcEkH1f8MdAiNFyFxz3xoL0LWAVwjrwPYZdVHHxhRHcx/uGLA==", + "dev": true + }, + "lcov-parse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-1.0.0.tgz", + "integrity": "sha1-6w1GtUER68VhrLTECO+TY73I9+A=", + "dev": true + }, + "locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "requires": { + "p-locate": "^5.0.0" + } + }, + "lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "dev": true + }, + "lodash.flattendeep": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", + "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=", + "dev": true + }, + "lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", + "dev": true + }, + "lodash.isequal": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", + "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", + "dev": true + }, + "lodash.sortby": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", + "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", + "dev": true + }, + "log-driver": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz", + "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==", + "dev": true + }, + "log-symbols": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", + "dev": true, + "requires": { + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + } + } + }, + "lolex": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-4.2.0.tgz", + "integrity": "sha512-gKO5uExCXvSm6zbF562EvM+rd1kQDnB9AZBbiQVzf1ZmdDpxUSvpnAaVOP83N/31mRK8Ml8/VE8DMvsAZQ+7wg==", + "dev": true + }, + "loupe": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.1.tgz", + "integrity": "sha512-EN1D3jyVmaX4tnajVlfbREU4axL647hLec1h/PXAb8CPDMJiYitcWF2UeLVNttRqaIqQs4x+mRvXf+d+TlDrCA==", + "dev": true, + "requires": { + "get-func-name": "^2.0.0" + } + }, + "make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dev": true, + "requires": { + "semver": "^6.0.0" + } + }, + "mime-db": { + "version": "1.48.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz", + "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==", + "dev": true + }, + "mime-types": { + "version": "2.1.31", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz", + "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==", + "dev": true, + "requires": { + "mime-db": "1.48.0" + } + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "minimist": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", + "dev": true + }, + "mkdirp": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, + "mocha": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.0.0.tgz", + "integrity": "sha512-0Wl+elVUD43Y0BqPZBzZt8Tnkw9CMUdNYnUsTfOM1vuhJVZL+kiesFYsqwBkEEuEixaiPe5ZQdqDgX2jddhmoA==", + "dev": true, + "requires": { + "@ungap/promise-all-settled": "1.1.2", + "ansi-colors": "4.1.1", + "browser-stdout": "1.3.1", + "chokidar": "3.5.3", + "debug": "4.3.4", + "diff": "5.0.0", + "escape-string-regexp": "4.0.0", + "find-up": "5.0.0", + "glob": "7.2.0", + "he": "1.2.0", + "js-yaml": "4.1.0", + "log-symbols": "4.1.0", + "minimatch": "5.0.1", + "ms": "2.1.3", + "nanoid": "3.3.3", + "serialize-javascript": "6.0.0", + "strip-json-comments": "3.1.1", + "supports-color": "8.1.1", + "workerpool": "6.2.1", + "yargs": "16.2.0", + "yargs-parser": "20.2.4", + "yargs-unparser": "2.0.0" + }, + "dependencies": { + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "requires": { + "ms": "2.1.2" + }, + "dependencies": { + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } + } + }, + "escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true + }, + "glob": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "dependencies": { + "minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "requires": { + "brace-expansion": "^1.1.7" + } + } + } + }, + "js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "requires": { + "argparse": "^2.0.1" + } + }, + "minimatch": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz", + "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==", + "dev": true, + "requires": { + "brace-expansion": "^2.0.1" + }, + "dependencies": { + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0" + } + } + } + }, + "ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true + }, + "supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "nan": { + "version": "2.16.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz", + "integrity": "sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==", + "dev": true + }, + "nanoid": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz", + "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==", + "dev": true + }, + "nise": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.1.tgz", + "integrity": "sha512-yr5kW2THW1AkxVmCnKEh4nbYkJdB3I7LUkiUgOvEkOp414mc2UMaHMA7pjq1nYowhdoJZGwEKGaQVbxfpWj10A==", + "dev": true, + "requires": { + "@sinonjs/commons": "^1.8.3", + "@sinonjs/fake-timers": ">=5", + "@sinonjs/text-encoding": "^0.7.1", + "just-extend": "^4.0.2", + "path-to-regexp": "^1.7.0" + }, + "dependencies": { + "@sinonjs/commons": { + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz", + "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==", + "dev": true, + "requires": { + "type-detect": "4.0.8" + } + }, + "path-to-regexp": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", + "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==", + "dev": true, + "requires": { + "isarray": "0.0.1" + } + } + } + }, + "node-preload": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz", + "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==", + "dev": true, + "requires": { + "process-on-spawn": "^1.0.0" + } + }, + "node-webcrypto-ossl": { + "version": "1.0.49", + "resolved": "https://registry.npmjs.org/node-webcrypto-ossl/-/node-webcrypto-ossl-1.0.49.tgz", + "integrity": "sha512-Zs73PeTWoUXUFicvAaxZC6ZyVCuq1Eg/Q4rYqiWyBY4eWIbZPFiRIi/KRM0A9GVKBPRNraaXsVmRAC83jEQ6nw==", + "dev": true, + "requires": { + "mkdirp": "^0.5.5", + "nan": "^2.14.0", + "tslib": "^1.11.1", + "webcrypto-core": "^0.1.27" + } + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true + }, + "nyc": { + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz", + "integrity": "sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==", + "dev": true, + "requires": { + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "caching-transform": "^4.0.0", + "convert-source-map": "^1.7.0", + "decamelize": "^1.2.0", + "find-cache-dir": "^3.2.0", + "find-up": "^4.1.0", + "foreground-child": "^2.0.0", + "get-package-type": "^0.1.0", + "glob": "^7.1.6", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-hook": "^3.0.0", + "istanbul-lib-instrument": "^4.0.0", + "istanbul-lib-processinfo": "^2.0.2", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.0.2", + "make-dir": "^3.0.0", + "node-preload": "^0.2.1", + "p-map": "^3.0.0", + "process-on-spawn": "^1.0.0", + "resolve-from": "^5.0.0", + "rimraf": "^3.0.0", + "signal-exit": "^3.0.2", + "spawn-wrap": "^2.0.0", + "test-exclude": "^6.0.0", + "yargs": "^15.0.2" + }, + "dependencies": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "dev": true, + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.0" + } + }, + "wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, + "y18n": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz", + "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==", + "dev": true + }, + "yargs": { + "version": "15.4.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", + "dev": true, + "requires": { + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.2" + } + }, + "yargs-parser": { + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", + "dev": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + } + } + }, + "oauth-sign": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", + "dev": true + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "requires": { + "wrappy": "1" + } + }, + "p-limit": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", + "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", + "dev": true, + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "requires": { + "p-limit": "^3.0.2" + }, + "dependencies": { + "p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "requires": { + "yocto-queue": "^0.1.0" + } + } + } + }, + "p-map": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz", + "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==", + "dev": true, + "requires": { + "aggregate-error": "^3.0.0" + } + }, + "p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true + }, + "package-hash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz", + "integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.15", + "hasha": "^5.0.0", + "lodash.flattendeep": "^4.4.0", + "release-zalgo": "^1.0.0" + } + }, + "pako": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pako/-/pako-2.0.4.tgz", + "integrity": "sha512-v8tweI900AUkZN6heMU/4Uy4cXRc2AYNRggVmTR+dEncawDJgCdLMximOVA2p4qO57WMynangsfGRb5WD6L1Bg==", + "dev": true + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true + }, + "path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true + }, + "path-to-regexp": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.4.0.tgz", + "integrity": "sha512-G6zHoVqC6GGTQkZwF4lkuEyMbVOjoBKAEybQUypI1WTkqinCOrq2x6U2+phkJ1XsEMTy4LjtwPI7HW+NVrRR2w==", + "dev": true + }, + "pathval": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", + "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", + "dev": true + }, + "performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", + "dev": true + }, + "picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true + }, + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "requires": { + "find-up": "^4.0.0" + }, + "dependencies": { + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + } + } + }, + "process-on-spawn": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz", + "integrity": "sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==", + "dev": true, + "requires": { + "fromentries": "^1.2.0" + } + }, + "psl": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", + "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", + "dev": true + }, + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "dev": true + }, + "qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", + "dev": true + }, + "querystring": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", + "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", + "dev": true + }, + "randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, + "requires": { + "safe-buffer": "^5.1.0" + } + }, + "readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "requires": { + "picomatch": "^2.2.1" + } + }, + "regenerator-runtime": { + "version": "0.13.7", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz", + "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==", + "dev": true + }, + "release-zalgo": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz", + "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=", + "dev": true, + "requires": { + "es6-error": "^4.0.1" + } + }, + "request": { + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", + "dev": true, + "requires": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.5.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" + } + }, + "require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", + "dev": true + }, + "require-main-filename": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "dev": true + }, + "resolve": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } + }, + "resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true + }, + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + }, + "serialize-javascript": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", + "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "dev": true, + "requires": { + "randombytes": "^2.1.0" + } + }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", + "dev": true + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true + }, + "signal-exit": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", + "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==", + "dev": true + }, + "sinon": { + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-14.0.0.tgz", + "integrity": "sha512-ugA6BFmE+WrJdh0owRZHToLd32Uw3Lxq6E6LtNRU+xTVBefx632h03Q7apXWRsRdZAJ41LB8aUfn2+O4jsDNMw==", + "dev": true, + "requires": { + "@sinonjs/commons": "^1.8.3", + "@sinonjs/fake-timers": "^9.1.2", + "@sinonjs/samsam": "^6.1.1", + "diff": "^5.0.0", + "nise": "^5.1.1", + "supports-color": "^7.2.0" + }, + "dependencies": { + "@sinonjs/commons": { + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz", + "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==", + "dev": true, + "requires": { + "type-detect": "4.0.8" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "sinon-chrome": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/sinon-chrome/-/sinon-chrome-3.0.1.tgz", + "integrity": "sha512-NTEFhyuiWEMnRmIqldUiA2DhKn2EqnZxyEk5Ez5rBXj+Nl54aJ0MEmF4wjltrxecxd8zlNLxyE0HyLabev9JsQ==", + "dev": true, + "requires": { + "lodash": "^4.16.3", + "sinon": "^7.2.3", + "urijs": "^1.18.2" + }, + "dependencies": { + "@sinonjs/formatio": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.2.2.tgz", + "integrity": "sha512-B8SEsgd8gArBLMD6zpRw3juQ2FVSsmdd7qlevyDqzS9WTCtvF55/gAL+h6gue8ZvPYcdiPdvueM/qm//9XzyTQ==", + "dev": true, + "requires": { + "@sinonjs/commons": "^1", + "@sinonjs/samsam": "^3.1.0" + } + }, + "@sinonjs/samsam": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.3.3.tgz", + "integrity": "sha512-bKCMKZvWIjYD0BLGnNrxVuw4dkWCYsLqFOUWw8VgKF/+5Y+mE7LfHWPIYoDXowH+3a9LsWDMo0uAP8YDosPvHQ==", + "dev": true, + "requires": { + "@sinonjs/commons": "^1.3.0", + "array-from": "^2.1.1", + "lodash": "^4.17.15" + } + }, + "diff": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", + "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", + "dev": true + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "nise": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/nise/-/nise-1.5.3.tgz", + "integrity": "sha512-Ymbac/94xeIrMf59REBPOv0thr+CJVFMhrlAkW/gjCIE58BGQdCj0x7KRCb3yz+Ga2Rz3E9XXSvUyyxqqhjQAQ==", + "dev": true, + "requires": { + "@sinonjs/formatio": "^3.2.1", + "@sinonjs/text-encoding": "^0.7.1", + "just-extend": "^4.0.2", + "lolex": "^5.0.1", + "path-to-regexp": "^1.7.0" + }, + "dependencies": { + "lolex": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-5.1.2.tgz", + "integrity": "sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==", + "dev": true, + "requires": { + "@sinonjs/commons": "^1.7.0" + } + } + } + }, + "path-to-regexp": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", + "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==", + "dev": true, + "requires": { + "isarray": "0.0.1" + } + }, + "sinon": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-7.5.0.tgz", + "integrity": "sha512-AoD0oJWerp0/rY9czP/D6hDTTUYGpObhZjMpd7Cl/A6+j0xBE+ayL/ldfggkBXUs0IkvIiM1ljM8+WkOc5k78Q==", + "dev": true, + "requires": { + "@sinonjs/commons": "^1.4.0", + "@sinonjs/formatio": "^3.2.1", + "@sinonjs/samsam": "^3.3.3", + "diff": "^3.5.0", + "lolex": "^4.2.0", + "nise": "^1.5.2", + "supports-color": "^5.5.0" + } + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + }, + "spawn-wrap": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz", + "integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==", + "dev": true, + "requires": { + "foreground-child": "^2.0.0", + "is-windows": "^1.0.2", + "make-dir": "^3.0.0", + "rimraf": "^3.0.0", + "signal-exit": "^3.0.2", + "which": "^2.0.1" + } + }, + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true + }, + "sshpk": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", + "dev": true, + "requires": { + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" + } + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.1" + } + }, + "strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "dev": true + }, + "strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true + }, + "style-mod": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.0.0.tgz", + "integrity": "sha512-OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "test-exclude": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "dev": true, + "requires": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + } + }, + "text-encoding": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.7.0.tgz", + "integrity": "sha512-oJQ3f1hrOnbRLOcwKz0Liq2IcrvDeZRHXhd9RgLrsT+DjWY/nty1Hi7v3dtkaEYbPYe0mUoOfzRrMwfXXwgPUA==", + "dev": true + }, + "to-fast-properties": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", + "dev": true + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "requires": { + "is-number": "^7.0.0" + } + }, + "tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "dev": true, + "requires": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + }, + "tr46": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", + "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=", + "dev": true, + "requires": { + "punycode": "^2.1.0" + } + }, + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", + "dev": true + }, + "tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "dev": true, + "requires": { + "safe-buffer": "^5.0.1" + } + }, + "tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", + "dev": true + }, + "type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true + }, + "type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true + }, + "typedarray-to-buffer": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", + "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "dev": true, + "requires": { + "is-typedarray": "^1.0.0" + } + }, + "uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "requires": { + "punycode": "^2.1.0" + } + }, + "urijs": { + "version": "1.19.11", + "resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.11.tgz", + "integrity": "sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ==", + "dev": true + }, + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "dev": true + }, + "verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "dev": true, + "requires": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } + }, + "w3c-keyname": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.4.tgz", + "integrity": "sha512-tOhfEwEzFLJzf6d1ZPkYfGj+FWhIpBux9ppoP3rlclw3Z0BZv3N7b7030Z1kYth+6rDuAsXUFr+d0VE6Ed1ikw==", + "dev": true + }, + "webcrypto-core": { + "version": "0.1.27", + "resolved": "https://registry.npmjs.org/webcrypto-core/-/webcrypto-core-0.1.27.tgz", + "integrity": "sha512-r0MSFxvqaIjoqIKerm80P9+7n1dWBG88PYnshJk57J4uZuXlqNX8yQixrEIe3CGqrJ7xwfGM2SQGR4AlJYr02g==", + "dev": true, + "requires": { + "tslib": "^1.7.1" + } + }, + "webidl-conversions": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", + "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==", + "dev": true + }, + "whatwg-url": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz", + "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==", + "dev": true, + "requires": { + "lodash.sortby": "^4.7.0", + "tr46": "^1.0.1", + "webidl-conversions": "^4.0.2" + } + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + }, + "which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "dev": true + }, + "workerpool": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz", + "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==", + "dev": true + }, + "wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + } + } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + }, + "write-file-atomic": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "dev": true, + "requires": { + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" + } + }, + "y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true + }, + "yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "requires": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + } + }, + "yargs-parser": { + "version": "20.2.4", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", + "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", + "dev": true + }, + "yargs-unparser": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", + "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", + "dev": true, + "requires": { + "camelcase": "^6.0.0", + "decamelize": "^4.0.0", + "flat": "^5.0.2", + "is-plain-obj": "^2.1.0" + }, + "dependencies": { + "camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true + }, + "decamelize": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", + "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", + "dev": true + } + } + }, + "yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true + } + } +} diff --git a/chromium/package.json b/chromium/package.json index ba50bed95a3b..8918b2b89a60 100644 --- a/chromium/package.json +++ b/chromium/package.json @@ -3,18 +3,32 @@ "version": "1.0.0", "description": "", "main": "utils.js", - "dependencies": {}, "devDependencies": { - "chai": "^4.1.2", - "coveralls": "^3.0.0", - "mocha": "^4.0.0", - "nyc": "^11.2.1" + "atob": "^2.0.3", + "btoa": "^1.1.2", + "chai": "^4.2.0", + "coveralls": "^3.1.0", + "codemirror": "~6.0.1", + "fetch-mock": "^9.10.7", + "mocha": "^10.0.0", + "nan": "^2.14.1", + "node-webcrypto-ossl": "^1.0.49", + "nyc": "^15.1.0", + "pako": "~2.0.2", + "sinon": "^14.0.0", + "sinon-chrome": "^3.0.1", + "text-encoding": "^0.7.0" }, "scripts": { "test": "mocha", "cover": "nyc --reporter=html --reporter=text mocha", "report": "nyc report --reporter=text-lcov | coveralls" }, + "nyc": { + "exclude": [ + "external" + ] + }, "keywords": [], "author": "", "license": "GPL-2.0+" diff --git a/chromium/pages/base.css b/chromium/pages/base.css new file mode 100644 index 000000000000..92adbf8a2dd6 --- /dev/null +++ b/chromium/pages/base.css @@ -0,0 +1,46 @@ +:root { + --https-blue: #0a84ff; + --darker-blue: #0060df; + --text-main: #000; + --text-secondary: #464646; + --light-grey: #ececec; + --space: 5px; + --font: 'Lucida Grande', 'Segoe UI', Tahoma, 'DejaVu Sans', Arial, sans-serif; + --code-font: 'VeraMono'; +} + +/*-------------------------------------------------------------- +# Layout +--------------------------------------------------------------*/ +.grid { + display: grid; + grid-template-columns: 1fr 1fr 1fr; + row-gap: 16px; +} + +/*-------------------------------------------------------------- +# Typography +--------------------------------------------------------------*/ +.font { + font-family: var(--font); +} + +/*-------------------------------------------------------------- +# Elements +--------------------------------------------------------------*/ +.button { + border: var(--https-blue) solid 1px; + color: var(--text-main); + display: block; + font-size: 12px; + font-weight: bold; + margin: var(--space) auto; + padding: 10px; + text-align: center; + text-decoration: none; +} + +.button:hover { + background-color: var(--darker-blue); + color: #fff; +} diff --git a/chromium/pages/cancel/index.html b/chromium/pages/cancel/index.html new file mode 100644 index 000000000000..ec2518437350 --- /dev/null +++ b/chromium/pages/cancel/index.html @@ -0,0 +1,32 @@ + + + + + + + + ⚠ HTTPS Everywhere ⚠ + + + + + + +
+ +
+ 

+        
+      

+
+      

+        
+        
+      

+    
+    
+    
+  
+
diff --git a/chromium/pages/cancel/style.css b/chromium/pages/cancel/style.css
new file mode 100644
index 000000000000..aeba151a0749
--- /dev/null
+++ b/chromium/pages/cancel/style.css
@@ -0,0 +1,130 @@
+@import "../main.css";
+
+body {
+  display: grid;
+  grid-template-columns: 1fr 1fr 1fr;
+  margin: 2% auto;
+  font-size: 12pt;
+  font-family: sans-serif;
+  line-height: 150%;
+  row-gap: 16px;
+}
+
+/*---------
+# GRID LAYOUT
+---------*/
+.banner {
+  grid-column: 2;
+  grid-row: 1;
+}
+.explainer {
+  grid-column: 2;
+  grid-row: 2;
+}
+.copy_block {
+  grid-column: 2;
+  grid-row: 3;
+}
+.button_options {
+  grid-column: 2;
+  grid-row: 4;
+}
+
+h1 {
+  display: block;
+}
+
+h1 img {
+  width: 100%;
+  height: auto;
+}
+
+#url-paragraph {
+  display: inline-flex;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.ease_button {
+  background-color: #ec1e1e;
+  border: 1px solid #ec1e1e;
+  border-radius: 4px;
+  color: #fff;
+  cursor: pointer;
+  padding: 0.5em 1em;
+  float: none;
+  font-size: 12pt;
+  font-weight: normal;
+  margin: 8px 0;
+  line-height: 150%;
+}
+
+button:last-child {
+  margin: 0;
+}
+
+#url-value{
+ float: left;
+ font-weight: bold;
+ margin: 2% 2% 0 0;
+}
+#copy-url, #open-url-button{
+  background-color: var(--light-grey) !important;
+  border: 1px solid var(--text-secondary) !important;
+}
+#copy-url {
+  color: var(--text-secondary) !important;
+  font-size: 14px;
+}
+#open-url-button {
+  color: #666666 !important;
+}
+#copy-url:hover, #open-url-button:hover {
+  background-color: var(--text-secondary) !important;
+  border: 1px solid var(--text-secondary) !important;
+  color: var(--light-grey) !important;
+}
+
+@media screen and (max-width: 800px) {
+  body {
+    grid-template-columns: 1fr;
+    margin: 5%;
+  }
+  .banner {
+    grid-row: 1;
+  }
+  .explainer {
+    grid-row: 2;
+  }
+  .copy_block {
+    grid-row: 3;
+  }
+  .button_options {
+    grid-row: 4;
+  }
+  .ease_button {
+    width: 100%;
+    margin: 8px 0;
+  }
+}
+
+@media (prefers-color-scheme: dark) {
+  body {
+    background-color: #202023;
+    color: #f9f9fa;
+  }
+
+  a {
+    color: #45a1ff;
+  }
+
+  .ease_button {
+    color: #202023;
+  }
+
+  .ease_button:hover {
+    background-color: #202023;
+    border-color: #ec1e1e;
+  }
+}
diff --git a/chromium/pages/cancel/ux.js b/chromium/pages/cancel/ux.js
new file mode 100644
index 000000000000..d13dfdfb711a
--- /dev/null
+++ b/chromium/pages/cancel/ux.js
@@ -0,0 +1,124 @@
+/* global sendMessage */
+
+"use strict";
+
+let observer;
+document.addEventListener("DOMContentLoaded", () => {
+  const explainer = document.querySelector("[data-i18n=cancel_he_blocking_explainer]");
+  observer = new MutationObserver(() => {
+    replaceLink(explainer);
+  });
+  if (explainer.innerText.length > 0) {
+    replaceLink(explainer);
+  } else {
+    observer.observe(explainer, {childList: true});
+  }
+  displayURL();
+});
+
+function replaceLink(explainer) {
+  observer.disconnect();
+  const linkText = chrome.i18n.getMessage("cancel_he_blocking_network");
+  const link = document.createElement("a");
+  link.classList.add("wikilink");
+  link.href = "https://en.wikipedia.org/wiki/Downgrade_attack";
+  link.innerText = linkText;
+  explainer.innerHTML = explainer.innerHTML.replace(linkText, link.outerHTML);
+
+  /*
+    In response to translation of i18n string "cancel_he_blocking_network".
+    Within context of the paragraph and as a standalone string can be interpreted differently
+    langauge to language.
+
+    So if link fails to swap in replace, this conditional is triggered
+  */
+  if (document.getElementsByClassName("wikilink").length === 0) {
+    link.innerText = linkText;
+    explainer.after(link);
+  }
+
+}
+
+function displayURL() {
+  const searchParams = new URLSearchParams(window.location.search);
+  const originURL = searchParams.get('originURL');
+  const originURLLink = document.getElementById('url-value');
+  const openURLButton = document.getElementById('open-url-button');
+  const openHttpOnce = document.getElementById('http-once-button');
+  const copyButton = document.getElementById('copy-url');
+  const url = new URL(originURL);
+
+  originURLLink.innerText = originURL;
+  originURLLink.href = originURL;
+
+  openURLButton.addEventListener("click", function() {
+    sendMessage("disable_on_site", url.host, () => {
+      window.location = originURL;
+    });
+
+    return false;
+  });
+
+  // Copy URL Feature on EASE
+
+  function copyLinkAlternate() {
+    let isSuccessful = false;
+
+    const sel = window.getSelection();
+
+    try {
+      sel.removeAllRanges();
+
+      const range = document.createRange();
+      range.selectNode(originURLLink);
+
+      sel.addRange(range);
+
+      isSuccessful = document.execCommand("copy");
+
+      sel.removeAllRanges();
+
+      return isSuccessful;
+    } catch (err) {
+      console.error(err);
+
+      sel.removeAllRanges();
+
+      return false;
+    }
+  }
+
+  async function copyLink() {
+    try {
+      await navigator.clipboard.writeText(originURL);
+      return true;
+    } catch (err) {
+      return copyLinkAlternate();
+    }
+  }
+
+  let restoreTimeout = null;
+
+  copyButton.addEventListener("click", async () => {
+    if (await copyLink()) {
+      copyButton.innerText = chrome.i18n.getMessage("cancel_copied_url");
+
+      if (restoreTimeout !== null) {
+        clearTimeout(restoreTimeout);
+      }
+
+      restoreTimeout = setTimeout(() => {
+        copyButton.innerText = chrome.i18n.getMessage("cancel_copy_url");
+        restoreTimeout = null;
+      }, 1500);
+    }
+  });
+
+  openHttpOnce.addEventListener("click", function() {
+    sendMessage("disable_on_site_once", url.host, () => {
+      window.location = originURL;
+    });
+
+    return false;
+  });
+}
diff --git a/chromium/pages/debugging-rulesets/index.html b/chromium/pages/debugging-rulesets/index.html
new file mode 100644
index 000000000000..d3e91227f4c3
--- /dev/null
+++ b/chromium/pages/debugging-rulesets/index.html
@@ -0,0 +1,25 @@
+
+
+  
+    
+    
+    
+    
+    
+    
+  
+  
+    
Debugging Rulesets

+    

+      Enter ruleset XML below and click save when ready.  These rulesets will be immediately activated upon saving, and will persist across restarts.

+      Warning: This should only be used for debugging rulesets.  This feature is not guaranteed to work reliably for regular usage.

+      Note: Due to a bug in Chromium, it may be necessary to close the options ui before saving.
+    

+    
There are unsaved changes!  Be sure to save them for them to take effect.

+    
+    
+    
Saved!

+    
+    
+  
+
diff --git a/chromium/debugging-rulesets.css b/chromium/pages/debugging-rulesets/style.css
similarity index 100%
rename from chromium/debugging-rulesets.css
rename to chromium/pages/debugging-rulesets/style.css
diff --git a/chromium/pages/debugging-rulesets/ux.js b/chromium/pages/debugging-rulesets/ux.js
new file mode 100644
index 000000000000..0df93d8dd080
--- /dev/null
+++ b/chromium/pages/debugging-rulesets/ux.js
@@ -0,0 +1,46 @@
+/* global sendMessage, CodeMirror */
+
+"use strict";
+
+const savedTextElement = document.getElementById("saved-text");
+const unsavedTextElement = document.getElementById("unsaved-text");
+const savedTitle = "Debugging Rulesets";
+const unsavedTitle = "* Debugging Rulesets";
+
+document.title = savedTitle;
+
+const cm = CodeMirror.fromTextArea(
+  document.getElementById("codemirror-textarea"),
+  {
+    mode: "xml",
+    theme: "default main saved"
+  }
+);
+
+let valueHasChanged = false;
+sendMessage("get_option", { debugging_rulesets: "" }, item => {
+  cm.setValue(item.debugging_rulesets);
+  cm.on("change", cm => {
+    if (!(valueHasChanged)) {
+      valueHasChanged = true;
+      document.title = unsavedTitle;
+      cm.setOption("theme", "default main unsaved");
+      unsavedTextElement.style.visibility = "visible";
+    }
+  });
+});
+
+document.getElementById("save-button").addEventListener("click", e => {
+  e.preventDefault();
+  sendMessage("set_option", { debugging_rulesets: cm.getValue() }, () => {
+    savedTextElement.style.display = "block";
+    setTimeout(() => {
+      savedTextElement.style.display = "none";
+    }, 1000);
+
+    valueHasChanged = false;
+    document.title = savedTitle;
+    cm.setOption("theme", "default main saved");
+    unsavedTextElement.style.visibility = "hidden";
+  });
+});
diff --git a/chromium/pages/main.css b/chromium/pages/main.css
new file mode 100644
index 000000000000..2772c46141e7
--- /dev/null
+++ b/chromium/pages/main.css
@@ -0,0 +1,21 @@
+/*--------------------------------------------------------------
+>>> TABLE OF CONTENTS:
+----------------------------------------------------------------
+# Base
+  - Layout
+	- Typography
+	- Elements
+	- Links
+# Utilities
+	- Accessibility
+
+--------------------------------------------------------------*/
+
+/*--------------------------------------------------------------
+# Base
+--------------------------------------------------------------*/
+@import "base.css";
+
+/* Utilities - TBA
+--------------------------------------------- */
+
diff --git a/chromium/pages/options/index.html b/chromium/pages/options/index.html
new file mode 100644
index 000000000000..b6bdc337cfb3
--- /dev/null
+++ b/chromium/pages/options/index.html
@@ -0,0 +1,65 @@
+
+
+  
+    
+    
+    
+    
+  
+  
+    

+      
+      
+      
+    

+    

+      

+        
+        
+      

+      

+        

+      

+      

+        

+        

+          
+          
+        

+        

+      

+    

+
+    

+      

+        
+        
+      

+      

+        
+        
+      

+    

+
+    

+      

+        
+        
+      

+      

+      

+      

+      

+      

+        
+        
+      

+    

+
+    
+
+    
+    
+    
+  
+
diff --git a/chromium/pages/options/style.css b/chromium/pages/options/style.css
new file mode 100644
index 000000000000..032a7bad7a44
--- /dev/null
+++ b/chromium/pages/options/style.css
@@ -0,0 +1,264 @@
+@import "../main.css";
+
+body{
+  display: grid;
+  grid-template-columns: 1fr 1fr 1fr;
+}
+
+/*---------
+# GRID LAYOUT
+---------*/
+.header-wrapper, .section-wrapper {
+  margin: auto;
+}
+.header-wrapper {
+  display: inline-flex;
+  grid-column: 2;
+  grid-row: 1;
+}
+.section-wrapper {
+  grid-column: 2;
+  grid-row: 2;
+}
+#add-disabled-site-wrapper {
+  float: left;
+}
+#add-update-channel-wrapper {
+  display: inline-block;
+}
+
+.settings-wrapper{
+  margin: 10px 0 0 0;
+}
+
+.settings-wrapper#update-wrapper{
+  margin-bottom: 20px;
+}
+
+.settings-wrapper#show-devtools-tab-wrapper{
+  margin-bottom: 20px;
+}
+
+/** User rules Option**/
+.user-rules-wrapper-header {
+  font-weight: bold;
+  padding-left: 5px;
+}
+.user-rules-list-item:last-of-type {
+  border-bottom: none;
+}
+.user-rules-list-item {
+  border-bottom: 1px solid #ccc;
+  display: inline-flex;
+  margin-left: 5%;
+  width: 80%;
+}
+.user-rules-list-item p {
+  width: 100%;
+}
+
+/** Disabled Sites Option**/
+#add-disabled-site-invalid-host {
+  font-weight: bold;
+  color: red;
+  display: none;
+}
+.disabled-rules-wrapper-header {
+  font-weight: bold;
+  padding-left: 5px;
+}
+img.remove{
+  cursor: pointer;
+  float: right;
+  height: 15px;
+  margin-top: -34px;
+  width: 15px;
+}
+.disabled-rule-list-item:last-of-type {
+  border-bottom: none;
+}
+.disabled-rule-list-item {
+  border-bottom: 1px solid #ccc;
+  clear: both;
+}
+.disabled-rule-list-item p {
+  width: 80%;
+  word-wrap: anywhere;
+}
+
+.section-header{
+  margin-bottom: 10px;
+}
+
+#import{
+  margin-bottom: 10px;
+  float: right;
+}
+
+#import-confirmed{
+  display: none;
+}
+
+.section-header-span{
+  cursor: pointer;
+  padding: 8px;
+  margin-left: 0 !important;
+  margin-right: var(--space) !important;
+  display: inline-block;
+}
+
+.section-header-span.active{
+  background-color: var(--darker-blue);
+  color: #FFF;
+}
+.section-header-span.inactive{
+  background-color: var(--light-grey);
+}
+.section-header-span.inactive:hover {
+  background-color: var(--darker-blue);
+}
+
+.update-channel{
+  border: 1px solid grey;
+  border-radius: 20px;
+  margin-top: 30px;
+  margin-bottom: 30px;
+  padding: 6px;
+}
+
+.update-channel-name{
+  font-weight: bold;
+  font-size: 14px;
+  margin: 10px;
+}
+
+.update-channel-column-left {
+  width: 89px;
+  float: left;
+  font-size: 13px;
+  text-align: right;
+  margin-right: 10px;
+  min-height: 1px;
+}
+
+.update-channel-column-right {
+  float: left;
+  width: 380px;
+}
+
+textarea.update-channel-jwk {
+  width: 367px;
+  height: 250px;
+  resize: vertical;
+}
+
+input.update-channel-path-prefix, input.update-channel-scope {
+  width: 367px;
+}
+
+div.update-channel-row-scope {
+  margin-top: 3px;
+}
+
+.update-channel-column-right button {
+  float: right;
+  margin: 10px;
+  border-radius: 7px;
+}
+
+button#add-update-channel, button#add-disabled-site {
+  float: right;
+  height: 30px;
+  margin: 0px 10px 10px 10px;
+  padding: 6px;
+}
+
+input#update-channel-name, input#disabled-site {
+  float: right;
+}
+
+.clearer{
+  clear: both;
+}
+
+.update-channel-last-updated {
+  float: right;
+  font-weight: lighter;
+  font-size: 10px;
+}
+
+div#update-channels-error, div#update-channels-warning {
+  margin-top: 20px;
+  font-weight: bold;
+  padding: 10px;
+  border-radius: 10px;
+}
+
+div#update-channels-error {
+  background-color: #CC3333;
+  display: none;
+  color: white;
+}
+
+div#update-channels-warning {
+  background-color: #FFCC00;
+  font-color: black;
+}
+
+#update-channels-error-text{
+  display: inline-block;
+  width: 460px;
+}
+
+img#update-channels-error-hide {
+  float: right;
+}
+
+div#update-channels-last-checked {
+  margin-top: 10px;
+  float: right;
+  font-weight: bold;
+  font-size: 10px;
+}
+
+#update-channels-list {
+  display: inline-block;
+}
+
+@keyframes flash {
+  from {
+    background: #fc0;
+  }
+  to {
+    background: transparent;
+  }
+}
+
+#secretArea {
+  border-radius: 5px;
+  padding: 5px;
+}
+
+.hidden {
+  display: none
+}
+
+.flash {
+  animation: flash 1s ease-out;
+}
+
+@media (prefers-color-scheme: dark) {
+  body {
+    background-color: #202023;
+    color: #f9f9fa;
+  }
+
+  .section-header-span, div#update-channels-warning {
+    color: #000;
+  }
+
+  textarea, input[type=text] {
+    background-color: #202023;
+    color: #f9f9fa;
+  }
+}
diff --git a/chromium/pages/options/ux.js b/chromium/pages/options/ux.js
new file mode 100644
index 000000000000..07d94dc9928d
--- /dev/null
+++ b/chromium/pages/options/ux.js
@@ -0,0 +1,422 @@
+/* global sendMessage */
+/* global getOption_ */
+/* global e */
+/* global show, hide */
+
+"use strict";
+
+document.addEventListener("DOMContentLoaded", () => {
+  const secretArea = document.getElementById('secretArea');
+
+  const onKeyDownHandler = evt => {
+    if (evt.ctrlKey && evt.key === 'z') {
+      secretArea.classList.remove('hidden');
+      secretArea.classList.add('flash');
+
+      sendMessage('set_option', { developerMode: true });
+
+      document.removeEventListener('keydown', onKeyDownHandler);
+
+      evt.preventDefault();
+    }
+  };
+
+  sendMessage('get_option', { developerMode: false }, item => {
+    if (item.developerMode) {
+      secretArea.classList.remove('hidden');
+    } else {
+      document.addEventListener('keydown', onKeyDownHandler);
+    }
+  });
+
+  const autoUpdateRulesets = document.getElementById("autoUpdateRulesets");
+  const enableMixedRulesets = document.getElementById("enableMixedRulesets");
+  const showDevtoolsTab = document.getElementById("showDevtoolsTab");
+
+  const defaultOptions = {
+    autoUpdateRulesets: true,
+    enableMixedRulesets: false,
+    showDevtoolsTab: true
+  };
+
+  sendMessage("get_option", defaultOptions, item => {
+    autoUpdateRulesets.checked = item.autoUpdateRulesets;
+    enableMixedRulesets.checked = item.enableMixedRulesets;
+    showDevtoolsTab.checked = item.showDevtoolsTab;
+
+    autoUpdateRulesets.addEventListener("change", () => {
+      sendMessage("set_option", { autoUpdateRulesets: autoUpdateRulesets.checked });
+    });
+
+    enableMixedRulesets.addEventListener("change", () => {
+      sendMessage("set_option", { enableMixedRulesets: enableMixedRulesets.checked });
+    });
+
+    showDevtoolsTab.addEventListener("change", () => {
+      sendMessage("set_option", { showDevtoolsTab: showDevtoolsTab.checked });
+    });
+  });
+
+  function onlyShowSection(sectionId) {
+    document.querySelectorAll('.section-wrapper').forEach(sw => {
+      sw.style.display = "none";
+    });
+    document.getElementById(sectionId).style.display = "block";
+  }
+  onlyShowSection('general-settings-wrapper');
+
+  document.querySelectorAll('.section-header-span').forEach(shs => {
+    shs.addEventListener("click", () => {
+      document.querySelectorAll('.section-header-span').forEach(shs => {
+        shs.classList.remove("active");
+        shs.classList.add("inactive");
+      });
+      shs.classList.remove("inactive");
+      shs.classList.add("active");
+      onlyShowSection(shs.dataset.show);
+    });
+  });
+
+  function create_update_channel_element(update_channel, last_updated, locked) {
+    let ruleset_version_string;
+
+    if(last_updated) {
+      const ruleset_date = new Date(last_updated * 1000);
+      ruleset_version_string = ruleset_date.getUTCFullYear() + "." + (ruleset_date.getUTCMonth() + 1) + "." + ruleset_date.getUTCDate();
+    } else {
+      ruleset_version_string = "n/a";
+    }
+
+    const update_channel_div = document.createElement('div');
+    update_channel_div.className = "update-channel";
+
+    const update_channel_name = document.createElement('div');
+    update_channel_name.className = "update-channel-name";
+    update_channel_name.innerText = update_channel.name;
+    update_channel_div.appendChild(update_channel_name);
+    const update_channel_last_updated = document.createElement('div');
+    update_channel_last_updated.className = "update-channel-last-updated";
+    update_channel_last_updated.innerText = chrome.i18n.getMessage("options_storedRulesetsVersion") + ruleset_version_string;
+    update_channel_name.appendChild(update_channel_last_updated);
+
+    const update_channel_row_format = document.createElement('div');
+    update_channel_row_format.className = "update-channel-row-format";
+    update_channel_div.appendChild(update_channel_row_format);
+    const update_channel_format_column_left = document.createElement('div');
+    update_channel_format_column_left.className = "update-channel-column-left";
+    update_channel_format_column_left.innerText = "Format:";
+    update_channel_row_format.appendChild(update_channel_format_column_left);
+    const update_channel_format_column_right = document.createElement('div');
+    update_channel_format_column_right.className = "update-channel-column-right";
+    update_channel_row_format.appendChild(update_channel_format_column_right);
+    const update_channel_format = document.createElement('select');
+    update_channel_format.className = "update-channel-format";
+    update_channel_format.setAttribute("data-name", update_channel.name);
+    update_channel_format.disabled = locked;
+    update_channel_format_column_right.appendChild(update_channel_format);
+    const update_channel_format_option_ruleset = document.createElement('option');
+    update_channel_format_option_ruleset.value = "ruleset";
+    update_channel_format_option_ruleset.innerText = "ruleset";
+    update_channel_format_option_ruleset.defaultSelected = true;
+    update_channel_format_option_ruleset.selected = (update_channel.format == "ruleset");
+    update_channel_format.appendChild(update_channel_format_option_ruleset);
+    const update_channel_format_option_bloom = document.createElement('option');
+    update_channel_format_option_bloom.value = "bloom";
+    update_channel_format_option_bloom.innerText = "bloom";
+    update_channel_format_option_bloom.selected = (update_channel.format == "bloom");
+    update_channel_format.appendChild(update_channel_format_option_bloom);
+
+    const update_channel_row_jwk = document.createElement('div');
+    update_channel_row_jwk.className = "update-channel-row-jwk";
+    update_channel_div.appendChild(update_channel_row_jwk);
+    const update_channel_jwk_column_left = document.createElement('div');
+    update_channel_jwk_column_left.className = "update-channel-column-left";
+    update_channel_jwk_column_left.innerText = "JWK:";
+    update_channel_row_jwk.appendChild(update_channel_jwk_column_left);
+    const update_channel_jwk_column_right = document.createElement('div');
+    update_channel_jwk_column_right.className = "update-channel-column-right";
+    update_channel_row_jwk.appendChild(update_channel_jwk_column_right);
+    const update_channel_jwk = document.createElement('textarea');
+    update_channel_jwk.className = "update-channel-jwk";
+    update_channel_jwk.setAttribute("data-name", update_channel.name);
+    update_channel_jwk.disabled = locked;
+    update_channel_jwk.innerText = JSON.stringify(update_channel.jwk);
+    update_channel_jwk_column_right.appendChild(update_channel_jwk);
+
+    const update_channel_row_path_prefix = document.createElement('div');
+    update_channel_row_path_prefix.className = "update-channel-row-path-prefix";
+    update_channel_div.appendChild(update_channel_row_path_prefix);
+    const update_channel_path_prefix_column_left = document.createElement('div');
+    update_channel_path_prefix_column_left.className = "update-channel-column-left";
+    update_channel_path_prefix_column_left.innerText = "Path Prefix:";
+    update_channel_row_path_prefix.appendChild(update_channel_path_prefix_column_left);
+    const update_channel_path_prefix_column_right = document.createElement('div');
+    update_channel_path_prefix_column_right.className = "update-channel-column-right";
+    update_channel_row_path_prefix.appendChild(update_channel_path_prefix_column_right);
+    const update_channel_path_prefix = document.createElement('input');
+    update_channel_path_prefix.setAttribute("type", "text");
+    update_channel_path_prefix.className = "update-channel-path-prefix";
+    update_channel_path_prefix.setAttribute("data-name", update_channel.name);
+    update_channel_path_prefix.disabled = locked;
+    update_channel_path_prefix.value = update_channel.update_path_prefix;
+    update_channel_path_prefix_column_right.appendChild(update_channel_path_prefix);
+
+    let clearer = document.createElement('div');
+    clearer.className = "clearer";
+    update_channel_div.appendChild(clearer);
+
+    const update_channel_row_scope = document.createElement('div');
+    if(update_channel.format == "bloom") {
+      update_channel_row_scope.style.display = "none";
+    }
+    update_channel_row_scope.className = "update-channel-row-scope";
+    update_channel_div.appendChild(update_channel_row_scope);
+    const update_channel_scope_column_left = document.createElement('div');
+    update_channel_scope_column_left.className = "update-channel-column-left";
+    update_channel_scope_column_left.innerText = "Scope:";
+    update_channel_row_scope.appendChild(update_channel_scope_column_left);
+    const update_channel_scope_column_right = document.createElement('div');
+    update_channel_scope_column_right.className = "update-channel-column-right";
+    update_channel_row_scope.appendChild(update_channel_scope_column_right);
+    const update_channel_scope = document.createElement('input');
+    update_channel_scope.setAttribute("type", "text");
+    update_channel_scope.className = "update-channel-scope";
+    update_channel_scope.setAttribute("data-name", update_channel.name);
+    update_channel_scope.disabled = locked;
+    update_channel_scope.value = update_channel.scope;
+    update_channel_scope_column_right.appendChild(update_channel_scope);
+
+    const update_channel_row_controls = document.createElement('div');
+    update_channel_row_controls.className = "update-channel-row-controls";
+    update_channel_div.appendChild(update_channel_row_controls);
+    const update_channel_controls_column_left = document.createElement('div');
+    update_channel_controls_column_left.className = "update-channel-column-left";
+    update_channel_controls_column_left.innerText = " ";
+    update_channel_row_controls.appendChild(update_channel_controls_column_left);
+    const update_channel_controls_column_right = document.createElement('div');
+    update_channel_controls_column_right.className = "update-channel-column-right";
+    update_channel_row_controls.appendChild(update_channel_controls_column_right);
+    const update_channel_update = document.createElement('button');
+    update_channel_update.className = "update-channel-update";
+    update_channel_update.setAttribute("data-name", update_channel.name);
+    update_channel_update.disabled = locked;
+    update_channel_update.innerText = chrome.i18n.getMessage("options_update");
+    update_channel_controls_column_right.appendChild(update_channel_update);
+    const update_channel_delete = document.createElement('button');
+    update_channel_delete.className = "update-channel-update";
+    update_channel_delete.setAttribute("data-name", update_channel.name);
+    update_channel_delete.disabled = locked;
+    update_channel_delete.innerText = chrome.i18n.getMessage("options_delete");
+    update_channel_controls_column_right.appendChild(update_channel_delete);
+
+    clearer = document.createElement('div');
+    clearer.className = "clearer";
+    update_channel_div.appendChild(clearer);
+
+    update_channel_format.addEventListener("change", () => {
+      if(update_channel_format.value == "bloom") {
+        update_channel_row_scope.style.display = "none";
+      } else {
+        update_channel_row_scope.style.display = "block";
+      }
+    });
+    update_channel_delete.addEventListener("click", () => {
+      sendMessage("delete_update_channel", update_channel.name, () => {
+        render_update_channels();
+      });
+    });
+
+    update_channel_update.addEventListener("click", () => {
+      sendMessage("update_update_channel", {
+        name: update_channel.name,
+        format: update_channel_format.value,
+        jwk: JSON.parse(update_channel_jwk.value),
+        update_path_prefix: update_channel_path_prefix.value,
+        scope: update_channel_scope.value
+      }, () => {
+        render_update_channels();
+      });
+    });
+
+    return update_channel_div;
+  }
+
+  function render_update_channels() {
+    const update_channels_list = document.getElementById("update-channels-list");
+    while(update_channels_list.firstChild) {
+      update_channels_list.removeChild(update_channels_list.firstChild);
+    }
+
+    sendMessage("get_pinned_update_channels", null, item => {
+      for(const update_channel of item.update_channels) {
+        update_channels_list.appendChild(
+          create_update_channel_element(
+            update_channel,
+            item.last_updated[update_channel.name],
+            true,
+          )
+        );
+
+      }
+    });
+
+    sendMessage("get_stored_update_channels", null, item => {
+      for(const update_channel of item.update_channels) {
+        update_channels_list.appendChild(
+          create_update_channel_element(
+            update_channel,
+            item.last_updated[update_channel.name],
+            update_channel.locked === true,
+          )
+        );
+      }
+    });
+  }
+  render_update_channels();
+
+  const add_update_channel = document.getElementById("add-update-channel");
+  const update_channel_name_div = document.getElementById("update-channel-name");
+  const update_channels_error_text = document.getElementById("update-channels-error-text");
+  const update_channels_error = document.getElementById("update-channels-error");
+  update_channel_name_div.setAttribute("placeholder", chrome.i18n.getMessage("options_enterUpdateChannelName"));
+
+  function displayError(text) {
+    update_channels_error_text.innerText = text;
+    update_channels_error.style.display = "block";
+    window.scrollTo(0,0);
+  }
+
+  // Get a list of user Rules
+  sendMessage("get_user_rules", null, userRules => {
+    let user_rules_parent = e("user-rules-wrapper");
+
+    if ( 0 === userRules.length) {
+      hide(user_rules_parent);
+      return ;
+    }
+
+    // img element "remove button"
+    let templateRemove = document.createElement("img");
+    templateRemove.src = chrome.runtime.getURL("images/remove.png");
+    templateRemove.className = "remove";
+
+    for (const userRule of userRules) {
+      let user_rule_host = document.createElement("div");
+      let user_rule_name = document.createElement("p");
+      let remove = templateRemove.cloneNode(true);
+
+      user_rule_host.className = "user-rules-list-item";
+      user_rule_name.className = "user-rules-list-item-single";
+      user_rule_name.innerText = userRule.name;
+      user_rule_host.appendChild(user_rule_name);
+      user_rules_parent.appendChild(user_rule_host);
+      user_rule_host.appendChild(remove);
+
+      remove.addEventListener("click", () => {
+        // assume the removal is successful and hide ui element
+        hide( user_rule_host );
+        // remove the user rule
+        sendMessage("remove_rule", { ruleset: userRule, src: 'options' });
+      });
+    }
+  });
+
+  // HTTPS Everywhere Sites Disabled section in General Settings module
+  getOption_("disabledList", [], function(item) {
+    let rule_host_parent = e("disabled-rules-wrapper");
+
+    // img element "remove button"
+    let templateRemove = document.createElement("img");
+    templateRemove.src = chrome.runtime.getURL("images/remove.png");
+    templateRemove.className = "remove";
+
+    if( item ) {
+      for (const key of item.disabledList) {
+        let rule_host = document.createElement("div");
+        let remove = templateRemove.cloneNode(true);
+        let rule_host_site_name = document.createElement("p");
+
+        rule_host.className = "disabled-rule-list-item";
+        rule_host_site_name.className = "disabled-rule-list-item_single";
+        rule_host_site_name.innerText = key;
+        rule_host.appendChild( rule_host_site_name);
+        rule_host_parent.appendChild(rule_host);
+        rule_host.appendChild(remove);
+
+        remove.addEventListener("click", () => {
+          hide( rule_host );
+          sendMessage("enable_on_site", key);
+        });
+      }
+    }
+  });
+
+  const add_disabled_site = document.getElementById("add-disabled-site");
+  const disabled_site_input = document.getElementById("disabled-site");
+  const add_disabled_site_invalid_host = document.getElementById('add-disabled-site-invalid-host');
+  disabled_site_input.setAttribute("placeholder", chrome.i18n.getMessage("options_enterDisabledSite"));
+  function isValidHost(host) {
+    try {
+      new URL(`http://${host}/`);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  add_disabled_site.addEventListener("click", function() {
+    const host = disabled_site_input.value;
+
+    if (isValidHost(host)) {
+      hide(add_disabled_site_invalid_host);
+      sendMessage("disable_on_site", disabled_site_input.value, okay => {
+        if (okay) {
+          chrome.tabs.reload();
+        }
+      });
+    } else {
+      show(add_disabled_site_invalid_host);
+    }
+  });
+
+  add_update_channel.addEventListener("click", () => {
+    const update_channel_name = update_channel_name_div.value;
+    if(update_channel_name.trim() == "") {
+      displayError("Error: The update channel name is blank.  Please enter another name.");
+    } else {
+      update_channel_name_div.value = "";
+      sendMessage("create_update_channel", update_channel_name, result => {
+        if(result == true) {
+          render_update_channels();
+        } else {
+          displayError("Error: There already exists an update channel with this name.");
+        }
+      });
+    }
+  });
+
+  const update_channels_error_hide = document.getElementById("update-channels-error-hide");
+  update_channels_error_hide.addEventListener("click", () => {
+    update_channels_error.style.display = "none";
+  });
+
+  const update_channels_last_checked = document.getElementById("update-channels-last-checked");
+  sendMessage("get_last_checked", null, last_checked => {
+    let last_checked_string;
+    if(last_checked) {
+      const last_checked_date = new Date(last_checked * 1000);
+      const options = {
+        year: '2-digit',
+        month: '2-digit',
+        day: '2-digit',
+        hour: '2-digit',
+        minute: '2-digit',
+        timeZoneName: 'short'
+      };
+      const customDateTime = new Intl.DateTimeFormat('default', options).format;
+      last_checked_string = customDateTime(last_checked_date);
+    } else {
+      last_checked_string = chrome.i18n.getMessage("options_updatesLastCheckedNever");
+    }
+    update_channels_last_checked.innerText = chrome.i18n.getMessage("options_updatesLastChecked") + last_checked_string;
+  });
+});
diff --git a/chromium/pages/popup/index.html b/chromium/pages/popup/index.html
new file mode 100644
index 000000000000..d9441f2d3e9d
--- /dev/null
+++ b/chromium/pages/popup/index.html
@@ -0,0 +1,105 @@
+
+
+  
+    
+    
+    
+
+    
+    
+    
+    
+  
+  
+    

+      

+        HTTPS Everywhere logo
+      

+
+      
+        Version: 
+        

+        
+      
+    

+
+    
+
+    
+
+    

+      

+        

+        

+      

+      

+          
+          
+      

+      

+        
+        
+      

+      

+        

+
+        

+          
+          
+        

+
+        

+          

+          
+          

+        

+
+        

+          

+          

+        

+      

+    

+
+    

+      
+    

+
+    

+      
+      
+      
+    

+
+  
+
diff --git a/chromium/pages/popup/style.css b/chromium/pages/popup/style.css
new file mode 100644
index 000000000000..304f2f8bf23f
--- /dev/null
+++ b/chromium/pages/popup/style.css
@@ -0,0 +1,313 @@
+@import "../main.css";
+
+body {
+  color: var(--text-secondary);
+  font-family: 'Lucida Grande', 'Segoe UI', Tahoma, 'DejaVu Sans', Arial, sans-serif;
+  margin: 0;
+  max-width: 400px;
+  min-width: 360px;
+}
+
+header {
+  background-color: var(--light-grey);
+  color: var(--text-main);
+  display: flex;
+  padding: var(--space);
+}
+
+header h1 {
+  font-size: 2em;
+}
+
+header .logo-container {
+  margin: var(--space);
+  width: 85%;
+}
+
+header .logo-container img {
+  width: 100%;
+}
+
+header small {
+  color: #000;
+  display: block;
+  font-size: .70em;
+  font-weight: bold;
+  margin: 1%;
+  width: 100%;
+}
+
+h1 {
+  font-size: 16px;
+  margin: var(--space) auto
+}
+
+h2 {
+  clear: both;
+  font-size: 12px;
+  font-weight: normal;
+  margin: 0;
+}
+
+h3 {
+  font-size: 16px;
+}
+
+h1,
+h2 {
+  color: var(--text-main);
+}
+
+footer {
+  display: inline-flex;
+  margin: var(--space);
+}
+
+footer a.button {
+  margin: var(--space);
+}
+
+/* Elements */
+.settings_block {
+  padding: 5px 1em 20px 1em;
+  border-bottom: var(--light-grey) solid 1px;
+}
+
+.see_more__prompt {
+  color: var(--text-main);
+  cursor: pointer;
+  font-size: 12px;
+  float: right;
+  margin: 5px 0;
+  padding: 10px 0;
+}
+
+.see_more__arrow {
+  border: solid var(--darker-blue);
+  border-width: 0 3px 3px 0;
+  float: right;
+  margin-left: 10px;
+  margin-top: 3px;
+  padding: 3px;
+}
+
+.see_more__content.show p {
+  font-size: 12px;
+  margin: 10px 0;
+}
+
+.down {
+  transform: rotate(45deg);
+}
+
+.up {
+  transform: rotate(-135deg);
+}
+
+input[type=checkbox] {
+  opacity: 0;
+}
+
+label {
+  background: grey;
+  border-radius: 25px;
+  color: var(--text-main);
+  cursor: pointer;
+  display: block;
+  float: right;
+  font-weight: bold;
+  height: 30px;
+  position: relative;
+  text-indent: -400px;
+  width: 50px;
+}
+
+label:after {
+  background: #fff;
+  border-radius: 90px;
+  content: '';
+  height: 20px;
+  left: 5px;
+  position: absolute;
+  top: 5px;
+  transition: 0.3s; /* Acts on transform below */
+  width: 20px;
+}
+input:checked+label {
+  background: var(--https-blue);
+}
+/* position  when checked*/
+input:checked+label:after {
+  left: calc(100% - 5px);
+  transform: translateX(-100%);
+}
+
+.label_nontoggle {
+  background: none;
+  border-radius: 0;
+  color: var(--text-main);
+  display: block;
+  font-weight: normal;
+  height: inherit;
+  position: relative;
+  text-indent: 0;
+  width: auto;
+}
+
+.label_nontoggle:after {
+  background: none;
+  border-radius: 0;
+  content: none;
+  height: auto;
+  left: initial;
+  position: relative;
+  top: initial;
+  transition: none;
+  width: auto;
+}
+
+/* Specific rules */
+.rule.checkbox {
+  clear: both;
+  margin: 5% auto;
+}
+
+.rule.checkbox .remove {
+  float: left;
+}
+
+.rule.checkbox label {
+  font-size: 12px;
+  font-weight: normal;
+  height: 25px;
+  text-indent: -285px;
+  width: 40px;
+}
+.rule.checkbox label:after {
+  border-radius: 20px;
+  height: 15px;
+  width: 15px;
+}
+
+#disable-on-this-site {
+  clear: both;
+}
+
+#disableButton {
+  display: block;
+}
+
+#HttpNowhere h1,
+#disableButton h1 {
+  float: left;
+}
+
+#RuleManagement {
+  padding: 5px 1em 10px 1em;
+}
+
+#settingsForThisSite h1 {
+  float: left;
+}
+
+#addRuleSection label,
+#addRuleSection button {
+  font-size: 14px;
+  width: 100%;
+}
+
+#addRuleSection input {
+  background: #fff;
+  border: 1px solid #000;
+  float: right;
+  margin: 5px auto;
+  padding: 5px;
+  width: 95%;
+}
+
+#new-rule-advanced,
+#new-rule-regular-text {
+  margin-top: 40px;
+}
+
+#HttpNowhere {
+  display: block;
+  padding: 5px 1em;
+}
+
+#StableRules h3 {
+  float: left;
+  margin: 10px;
+}
+#StableRules h2 {
+  margin-left: 10px;
+}
+#StableRules #RuleManagement--counter {
+  background: var(--darker-blue);
+  border-radius: 20px;
+  color: #fff;
+  display: block;
+  float: left;
+  font-size: 12px;
+  font-weight: bold;
+  height: 15px;
+  margin-top: 8px;
+  padding: 5px;
+  text-align: center;
+  width: 15px;
+}
+
+/* Event based */
+.see_more--clarified {
+  font-size: 12px;
+}
+
+/* Hide rules & options if the extension is off. */
+.disabled #RuleManagement,
+.disabled #HttpNowhere {
+  display: none;
+}
+
+/* By default the "Add a rule" link is hidden. It's shown on HTTPS sites only. */
+#addRuleSection {
+  display: none;
+}
+
+#rulesets-versions {
+  display: block;
+  clear: both;
+}
+
+.rulesets-version {
+  display: block;
+}
+
+#resetButton {
+  display: inline-flex;
+  margin: 10px;
+  width: 95%;
+}
+#reset-to-defaults {
+  width: 100%;
+}
+
+/* Initially hide section (until rules get added). */
+section.rules {
+  display: none;
+}
+
+/* For "see more" content */
+.hide {
+  height: 0;
+  opacity: 0;
+  overflow: hidden;
+  transition: 0s;
+  visibility: hidden;
+}
+
+.show {
+  clear: both;
+  opacity: 1;
+  transition: visibility 0s linear 0s, opacity 300ms;
+  visibility: visible;
+}
diff --git a/chromium/pages/popup/ux.js b/chromium/pages/popup/ux.js
new file mode 100644
index 000000000000..f38f22535b82
--- /dev/null
+++ b/chromium/pages/popup/ux.js
@@ -0,0 +1,417 @@
+/* global e */
+/* global hide */
+/* global show */
+/* global sendMessage */
+/* global getOption_ */
+/* global setOption_ */
+
+"use strict";
+
+/**
+ * Handles rule (de)activation in the popup
+ */
+function toggleRuleLine(event) {
+  getTab(activeTab => {
+    const set_ruleset = {
+      active: event.target.checked,
+      name: event.target.parentNode.innerText,
+      tab_id: activeTab.id,
+    };
+
+    sendMessage("set_ruleset_active_status", set_ruleset, () => {
+      // purge the name from the cache so that this unchecking is persistent.
+      sendMessage("delete_from_ruleset_cache", set_ruleset.name, () => {
+        // Now reload the selected tab of the current window.
+        chrome.tabs.reload(set_ruleset.tab_id);
+      });
+    });
+  });
+}
+
+/**
+ * @param {object} event
+ * @description Toggles content for user to view rules and explanations for different modes
+ */
+function toggleSeeMore(event) {
+  let target = event.target;
+  let content;
+
+  if (target !== this) {
+    content = document.querySelector('.see_more__content');
+  } else {
+    content = target.parentNode.querySelector('.see_more__content');
+  }
+
+  let arrow  = target.parentNode.querySelector('.see_more__arrow');
+  let text = target.parentNode.querySelector('.see_more__text');
+
+  if(arrow.classList.contains('down')) {
+    arrow.classList.replace('down', 'up');
+    text.innerText = chrome.i18n.getMessage("menu_seeLess");
+  } else if (arrow.classList.contains('up')) {
+    arrow.classList.replace('up', 'down');
+    text.innerText = chrome.i18n.getMessage("menu_seeMore");
+  }
+
+  if (content.classList.contains('hide')) {
+    content.classList.replace('hide', 'show');
+  } else if (content.classList.contains('show')) {
+    content.classList.replace('show', 'hide');
+  }
+}
+
+/**
+ * Creates rule lines (including checkbox and icon) for the popup
+ * @param rulesets
+ * @param list_div
+ * @param {string} ruleType
+ * @returns {*}
+ */
+function appendRulesToListDiv(rulesets, list_div, ruleType) {
+  if (rulesets && rulesets.length) {
+    // template parent block for each ruleset
+    let templateLine = document.createElement("div");
+    templateLine.className = "rule checkbox";
+
+    // label "container"
+    let templateLabel = document.createElement("label");
+
+    // checkbox
+    let templateCheckbox = document.createElement("input");
+    templateCheckbox.type = "checkbox";
+
+    // label text
+    let templateLabelText = document.createElement("span");
+
+    // img "remove" button
+    let templateRemove = document.createElement("img");
+    templateRemove.src = chrome.runtime.getURL("images/remove.png");
+    templateRemove.className = "remove";
+
+    templateLine.appendChild(templateCheckbox);
+    templateLabel.appendChild(templateLabelText);
+    templateLine.appendChild(templateLabel);
+
+    let increment = 0;
+
+    for (const ruleset of rulesets) {
+      increment++;
+      let line = templateLine.cloneNode(true);
+      let checkbox = line.querySelector("input[type=checkbox]");
+      let label = line.querySelector("label");
+      let text = line.querySelector("span");
+
+      // For each "id" attribute in each checkbox input and "for" attribute in label
+      checkbox.setAttribute("id", `${ruleType}_ruleset_${increment}`);
+      label.setAttribute("for", `${ruleType}_ruleset_${increment}`);
+
+      checkbox.checked = ruleset.active;
+      text.innerText = ruleset.name;
+
+      // Add listener to capture the toggle event
+      line.addEventListener("click", toggleRuleLine);
+
+      if (ruleset.note && ruleset.note.length) {
+        line.title = ruleset.note;
+
+        if (ruleset.note === "user rule") {
+          let remove = templateRemove.cloneNode(true);
+          line.appendChild(remove);
+
+          remove.addEventListener("click", () => {
+            sendMessage("remove_rule", { ruleset, src: 'popup' }, () => {
+              list_div.removeChild(line);
+            });
+          });
+        }
+      }
+      list_div.appendChild(line);
+    }
+    show(list_div);
+  }
+}
+
+function showHttpNowhereUI() {
+  // Set up checkbox for HTTP nowhere mode
+  getOption_('httpNowhere', false, function(item) {
+    if (item.httpNowhere) {
+      e('http-nowhere-checkbox').checked = true;
+      e('HttpNowhere__header').innerText = chrome.i18n.getMessage("menu_encryptAllSitesEligibleOn");
+      e('HttpNowhere__explained').innerText = chrome.i18n.getMessage("menu_httpNoWhereExplainedBlocked");
+    } else {
+      e('HttpNowhere__header').innerText = chrome.i18n.getMessage("menu_encryptAllSitesEligibleOff");
+      e('HttpNowhere__explained').innerText = chrome.i18n.getMessage("menu_httpNoWhereExplainedAllowed");
+    }
+    e('HttpNowhere').style.visibility = "visible";
+  });
+};
+
+// Change the UI to reflect extension enabled/disabled
+function updateEnabledDisabledUI() {
+  getOption_('globalEnabled', true, function(item) {
+    e('onoffswitch').checked = item.globalEnabled;
+    e('disableButton').style.visibility = "visible";
+    // Hide or show the rules sections
+    if (item.globalEnabled) {
+      document.body.className = "";
+      e('onoffswitch_label').innerText = chrome.i18n.getMessage("menu_globalEnable");
+      showHttpNowhereUI();
+    } else {
+      document.body.className = "disabled";
+      e('onoffswitch_label').innerText = chrome.i18n.getMessage("menu_globalDisable");
+    }
+  });
+}
+
+// Toggle extension enabled/disabled status
+function toggleEnabledDisabled() {
+  let extension_toggle_effect = function() {
+    updateEnabledDisabledUI();
+    // The extension state changed, give some time for toggle animation and reload tab
+    setTimeout(function() {
+      chrome.tabs.reload();
+      window.close();
+    }, 1500);
+  };
+
+  getOption_('globalEnabled', true, function(item) {
+    setOption_('globalEnabled', !item.globalEnabled, extension_toggle_effect);
+  });
+}
+
+/**
+ * @description Create the list of rules for a specific tab
+ * @param activeTab
+ */
+function listRules(activeTab) {
+  sendMessage("get_applied_rulesets", activeTab.id, function(rulesets) {
+    if (rulesets) {
+      // show the number of potentially applicable rulesets
+      let counter = rulesets.length;
+      let counterElement = document.querySelector("#RuleManagement--counter");
+      counterElement.innerText = counter;
+
+      const stableRules = rulesets.filter(ruleset => ruleset.default_state);
+      const unstableRules = rulesets.filter(ruleset => !ruleset.default_state);
+
+      appendRulesToListDiv(stableRules, e("StableRules"), 'stable');
+      appendRulesToListDiv(unstableRules, e("UnstableRules"), 'unstable');
+    }
+
+    // Only show the "Add a rule" section if we're on an HTTPS page
+    if (/^https:/.test(activeTab.url)) {
+      show(e("addRuleSection"));
+    }
+  });
+}
+
+/**
+ * Fill in content into the popup on load
+ */
+document.addEventListener("DOMContentLoaded", function () {
+  getTab(tab => {
+    const url = new URL(tab.url);
+    sendMessage("check_if_site_disabled", url.host, disabled => {
+      if(!disabled) {
+        listRules(tab);
+      }
+      showEnableOrDisable(url, disabled);
+    });
+  });
+
+  // Set up the enabled/disabled switch & hide/show rules
+  updateEnabledDisabledUI();
+  e('onoffswitch').addEventListener('click', toggleEnabledDisabled);
+  e('http-nowhere-checkbox').addEventListener('click', toggleHttpNowhere, false);
+  e('RuleManagement__see_more--prompt').addEventListener('click', toggleSeeMore);
+
+  e('reset-to-defaults').addEventListener('click', () => {
+    sendMessage("is_firefox", null, is_firefox => {
+      if (is_firefox) {
+        sendMessage("reset_to_defaults", null, () => {
+          window.close();
+        });
+      } else {
+        if (confirm(chrome.i18n.getMessage("prefs_reset_defaults_message"))) {
+          sendMessage("reset_to_defaults", null, () => {
+            window.close();
+          });
+        }
+      }
+    });
+  });
+
+  // Print the extension's current version.
+  var the_manifest = chrome.runtime.getManifest();
+  var version_info = e('current-version');
+  version_info.innerText = the_manifest.version;
+
+  let rulesets_versions = e('rulesets-versions');
+
+  rulesets_versions.addSpan = function(update_channel_name, ruleset_version_string) {
+    let timestamp_span = document.createElement("span");
+    timestamp_span.className = "rulesets-version";
+    timestamp_span.innerText = `${chrome.i18n.getMessage("about_rulesets_version")} ${update_channel_name}: ${ruleset_version_string}`;
+    this.appendChild(timestamp_span);
+  };
+
+  sendMessage("get_update_channel_timestamps", null, timestamps => {
+    let replaces = timestamps.some(([update_channel, timestamp]) =>
+      update_channel.replaces_default_rulesets && timestamp > 0
+    );
+    if(!replaces) {
+      rulesets_versions.addSpan("EFF (Full, Bundled)", the_manifest.version);
+    }
+    for(let [update_channel, timestamp] of timestamps) {
+      if(timestamp > 0) {
+        let ruleset_date = new Date(timestamp * 1000);
+        let ruleset_version_string = ruleset_date.getUTCFullYear() + "." + (ruleset_date.getUTCMonth() + 1) + "." + ruleset_date.getUTCDate();
+
+        rulesets_versions.addSpan(update_channel.name, ruleset_version_string);
+      }
+    }
+  });
+  e("aboutTitle").title = chrome.i18n.getMessage("about_title");
+  e("add-rule-link").addEventListener("click", addManualRule);
+  e("disable-on-this-site").addEventListener("click", disableOnSite);
+  e("enable-on-this-site").addEventListener("click", enableOnSite);
+});
+
+var escapeForRegex = function( value ) {
+  return value.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&");
+};
+
+function showEnableOrDisable(url, disabled) {
+  if (["http:", "https:", "ftp:"].indexOf(url.protocol) != -1) {
+    const disableLink = e("disable-on-this-site");
+    const enableLink = e("enable-on-this-site");
+    const addRuleSection = e("addRuleSection");
+    const resetToDefaults = e('reset-to-defaults');
+    if (disabled) {
+      show(enableLink);
+      hide(disableLink);
+      hide(addRuleSection);
+      hide(resetToDefaults);
+    } else {
+      show(disableLink);
+      hide(enableLink);
+    }
+  } else {
+    const disableEnableSection = e("disableEnableSection");
+    hide(disableEnableSection);
+  }
+}
+
+/**
+ * Handles the manual addition of rules
+ */
+function addManualRule() {
+  getTab(function(tab) {
+    hide(e("add-rule-link"));
+    show(e("add-new-rule-div"));
+
+    const url = new URL(tab.url);
+
+    e("new-rule-host").value = url.host;
+
+    const escapedHost = escapeForRegex(url.host);
+
+    e("new-rule-regex").value = `^http://${escapedHost}/`;
+    e("new-rule-redirect").value = `https://${url.host}/`;
+    e("new-rule-name").value = "Manual rule for " + url.host;
+
+    e("add-new-rule-button").addEventListener("click", function() {
+      const params = {
+        /**
+         * FIXME: the current implementation forbide users setting custom
+         * ruleset names...
+         */
+        name: e("new-rule-host").value,
+        target : [e("new-rule-host").value],
+        rule: [{ to: e("new-rule-redirect").value, from: e("new-rule-regex").value }],
+        default_off: "user rule"
+      };
+      sendMessage("add_new_rule", params, function() {
+        location.reload();
+      });
+    });
+
+    e("cancel-new-rule").addEventListener("click", function() {
+      show(e("add-rule-link"));
+      hide(e("add-new-rule-div"));
+    });
+
+    e("new-rule-show-advanced-link").addEventListener("click", function() {
+      show(e("new-rule-advanced"));
+      hide(e("new-rule-regular-text"));
+    });
+
+    e("new-rule-hide-advanced-link").addEventListener("click", function() {
+      hide(e("new-rule-advanced"));
+      show(e("new-rule-regular-text"));
+    });
+  });
+}
+
+/**
+ * Disable HTTPS Everywhere on a particular FQDN
+ */
+function disableOnSite() {
+  getTab(function(tab) {
+    const url = new URL(tab.url);
+    sendMessage("disable_on_site", url.host);
+    chrome.tabs.reload(tab.id);
+    window.close();
+  });
+}
+
+function enableOnSite() {
+  getTab(function(tab) {
+    const url = new URL(tab.url);
+    sendMessage("enable_on_site", url.host);
+    chrome.tabs.reload(tab.id);
+    window.close();
+  });
+}
+
+/**
+ * @description Turns EASE Mode on and off
+ */
+function toggleHttpNowhere() {
+  getTab(tab => {
+    getOption_('httpNowhere', false, item => {
+      const enabled = !item.httpNowhere;
+      setOption_('httpNowhere', enabled, () => {
+        if (enabled) {
+          chrome.tabs.reload(tab.id);
+          e('HttpNowhere__header').innerText = chrome.i18n.getMessage("menu_encryptAllSitesEligibleOn");
+          e('HttpNowhere__explained').innerText = chrome.i18n.getMessage("menu_httpNoWhereExplainedBlocked");
+        } else {
+          e('HttpNowhere__header').innerText = chrome.i18n.getMessage("menu_encryptAllSitesEligibleOff");
+          e('HttpNowhere__explained').innerText = chrome.i18n.getMessage("menu_httpNoWhereExplainedAllowed");
+        }
+      });
+    });
+  });
+}
+
+function getTab(callback) {
+  let url = new URL(window.location.href);
+  if (url.searchParams.has('tabId')) {
+    let parentId = Number(url.searchParams.get('tabId'));
+    return chrome.tabs.get(parentId, callback);
+  }
+  chrome.tabs.query({active: true, lastFocusedWindow: true}, tabs => callback(tabs[0]));
+}
+
+// This code fixes a Chromium-specific bug that causes links in extension popup
+// to open in regular tab even if the popup is opened in incognito mode.
+
+document.addEventListener('click', e => {
+  const { target } = e;
+
+  if (target.matches('a[target="_blank"]')) {
+    chrome.tabs.create({ url: target.href });
+    e.preventDefault();
+  }
+});
diff --git a/chromium/translation.js b/chromium/pages/translation.js
similarity index 86%
rename from chromium/translation.js
rename to chromium/pages/translation.js
index 5cdbd9925264..c6c3163ab9a6 100644
--- a/chromium/translation.js
+++ b/chromium/pages/translation.js
@@ -3,6 +3,6 @@
 document.addEventListener("DOMContentLoaded", () => {
   // Auto-translate all elements with data-i18n attributes
   for (const element of document.querySelectorAll("[data-i18n]")) {
-    element.innerText = chrome.i18n.getMessage(element.getAttribute("data-i18n"));
+    element.innerText = chrome.i18n.getMessage(element.getAttribute("data-i18n")).replace(/"/g,"\"");
   }
 });
diff --git a/chromium/pages/util.js b/chromium/pages/util.js
new file mode 100644
index 000000000000..4e5aea4f9acd
--- /dev/null
+++ b/chromium/pages/util.js
@@ -0,0 +1,46 @@
+/* exported e */
+/* exported hide */
+/* exported show */
+/* exported sendMessage */
+/* exported getOption_ */
+/* exported setOption_ */
+
+"use strict";
+
+/**
+ * Element helper functions
+ */
+function e(id) {
+  return document.getElementById(id);
+}
+
+function hide(elem) {
+  elem.style.display = "none";
+}
+
+function show(elem) {
+  elem.style.display = "block";
+}
+
+function sendMessage(type, object, callback) {
+  chrome.runtime.sendMessage({ type, object }, callback);
+}
+
+/**
+* Get an option from global settings
+* @param {string} opt
+* @param {mixed} defaultOpt
+* @param {object} callback
+* @returns mixed
+*/
+function getOption_(opt, defaultOpt, callback) {
+  let details = {};
+  details[opt] = defaultOpt;
+  sendMessage("get_option", details, callback);
+}
+
+function setOption_(opt, value, callback) {
+  var details = {};
+  details[opt] = value;
+  sendMessage("set_option", details, callback);
+}
diff --git a/chromium/popup.css b/chromium/popup.css
deleted file mode 100644
index 1a520badf730..000000000000
--- a/chromium/popup.css
+++ /dev/null
@@ -1,127 +0,0 @@
-html {
-  background-color: #fff
-}
-
-body {
-  cursor: default;
-  margin-left: 1em;
-  margin-right: 1em;
-  margin-top: 0;
-  margin-bottom: 0;
-  min-width: 20em;
-  font-family: 'Lucida Grande', 'Segoe UI', Tahoma, 'DejaVu Sans', Arial, sans-serif;
-  font-size: 75%;
-  color: #303942;
-}
-
-p {
-  line-height: 1.8em;
-}
-
-h1, h2, h3 {
-  user-select: none;
-  font-weight: normal;
-  line-height: 1;
-}
-
-h1 {
-  font-size: 1.5em;
-}
-
-h2 {
-  font-size: 1.3em;
-  margin-bottom: 0.4em;
-}
-
-h3 {
-  color: black;
-  font-size: 1.2em;
-  margin-bottom: 0.8em;
-}
-
-a {
-  color: #15c;
-  text-decoration: underline;
-}
-
-a:active {
-  color: #052577;
-}
-
-/* Don't wrap text for important stuff. */
-h1, h2, h3, .rule {
-  white-space: nowrap;
-}
-
-/* Hide rules & options if the extension is off. */
-.disabled #RuleManagement,.disabled #HttpNowhere {
-  display: none;
-}
-
-/* Initially hide section (until rules get added). */
-section.rules {
-  display: none;
-}
-
-.rule {
-  height: 25px;
-}
-
-.rule label {
-  padding: 0;
-  max-width: 93%;
-  overflow: hidden;
-}
-
-/* Underline rules that have notes. */
-.rule [title] {
-  border-bottom: 1px dotted;
-  cursor: help;
-}
-
-input[type='checkbox'] {
-  vertical-align: middle;
-}
-
-.rule input[type='checkbox'] {
-  margin: 0;
-}
-
-.rule span {
-  margin-left: 0.6em;
-}
-
-.rule img.remove {
-  float: right;
-}
-
-header {
-  border-bottom: 1px solid #eee;
-}
-
-header > h1 {
-  margin: 0;
-  padding: 21px 0 13px;
-}
-
-section {
-  padding-left: 18px;
-  padding-top: 9px;
-  padding-bottom: 9px;
-}
-
-section > h3 {
-  margin-left: -18px;
-}
-
-footer {
-  border-top: 1px solid #eee;
-  margin-top: 8px;
-  padding-top: 8px;
-  padding-bottom: 8px;
-}
-
-/* By default the "Add a rule" link is hidden. It's shown on HTTPS sites only. */
-#add-rule-link {
-  display: none;
-}
diff --git a/chromium/popup.html b/chromium/popup.html
deleted file mode 100644
index e650c0404e6b..000000000000
--- a/chromium/popup.html
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-  
-    
-    
-
-    
-    
-    
-    
-  
-  
-    

-      

-    

-
-    
-
-    
-
-    

-      

-        
-        
-      

-
-      

-        

-        

-      

-
-      

-        

-        

-      

-    

-
-    

-      

-      

-      

-      

-      
-      
(Version: )

-    

-
-  
-
diff --git a/chromium/popup.js b/chromium/popup.js
deleted file mode 100644
index 45cf9aec6866..000000000000
--- a/chromium/popup.js
+++ /dev/null
@@ -1,257 +0,0 @@
-/* global sendMessage */
-
-"use strict";
-
-var stableRules = null;
-var unstableRules = null;
-
-function e(id) {
-  return document.getElementById(id);
-}
-
-/**
- * Handles rule (de)activation in the popup
- * @param checkbox checkbox being clicked
- * @param ruleset the ruleset tied tot he checkbox
- */
-function toggleRuleLine(checkbox, ruleset, tab_id) {
-  var ruleset_active = checkbox.checked;
-  var set_ruleset = {
-    active: ruleset_active,
-    name: ruleset.name,
-    tab_id: tab_id
-  };
-
-  sendMessage("set_ruleset_active_status", set_ruleset, function(){
-
-    if (ruleset_active == ruleset.default_state) {
-      // purge the name from the cache so that this unchecking is persistent.
-      sendMessage("delete_from_ruleset_cache", ruleset.name);
-    }
-
-    // Now reload the selected tab of the current window.
-    chrome.tabs.reload();
-  });
-}
-
-/**
- * Creates a rule line (including checkbox and icon) for the popup
- * @param ruleset the ruleset to build the line for
- * @returns {*}
- */
-function appendRuleLineToListDiv(ruleset, list_div, tab_id) {
-
-  // parent block for line
-  var line = document.createElement("div");
-  line.className = "rule checkbox";
-
-  // label "container"
-  var label = document.createElement("label");
-
-  // checkbox
-  var checkbox = document.createElement("input");
-  checkbox.type = "checkbox";
-  checkbox.checked = ruleset.active;
-  checkbox.onchange = function() {
-    toggleRuleLine(checkbox, ruleset, tab_id);
-  };
-  label.appendChild(checkbox);
-
-  // label text
-  var text = document.createElement("span");
-  text.innerText = ruleset.name;
-  if (ruleset.note.length) {
-    text.title = ruleset.note;
-  }
-
-  if(ruleset.note == "user rule") {
-    var remove = document.createElement("img");
-    remove.src = chrome.extension.getURL("remove.png");
-    remove.className = "remove";
-    line.appendChild(remove);
-
-    remove.addEventListener("click", function(){
-      sendMessage("remove_rule", ruleset);
-      list_div.removeChild(line);
-    });
-  }
-
-  label.appendChild(text);
-
-  line.appendChild(label);
-
-  list_div.appendChild(line);
-}
-
-function showHttpNowhereUI() {
-  // Set up checkbox for HTTP nowhere mode
-  getOption_('httpNowhere', false, function(item) {
-    if (item.httpNowhere) {
-      e('http-nowhere-checkbox').checked = true;
-    }
-    e('HttpNowhere').style.visibility = "visible";
-  });
-};
-
-// Change the UI to reflect extension enabled/disabled
-function updateEnabledDisabledUI() {
-  getOption_('globalEnabled', true, function(item) {
-    document.getElementById('onoffswitch').checked = item.globalEnabled;
-    e('disableButton').style.visibility = "visible";
-    // Hide or show the rules sections
-    if (item.globalEnabled) {
-      document.body.className = ""
-      showHttpNowhereUI()
-    } else {
-      document.body.className = "disabled"
-    }
-  });
-}
-
-// Toggle extension enabled/disabled status
-function toggleEnabledDisabled() {
-  var extension_toggle_effect = function(){
-    updateEnabledDisabledUI();
-    // The extension state changed, so reload this tab.
-    chrome.tabs.reload();
-    window.close();
-  }
-
-  getOption_('globalEnabled', true, function(item) {
-    setOption_('globalEnabled', !item.globalEnabled, extension_toggle_effect);
-  });
-
-}
-
-/**
- * Create the list of rules for a specific tab
- * @param tabArray
- */
-function gotTab(activeTab) {
-  sendMessage("get_active_rulesets", activeTab.id, function(rulesets) {
-    if (rulesets) {
-      for (const ruleset of rulesets) {
-        let listDiv = stableRules;
-
-        if (!ruleset.default_state) {
-          listDiv = unstableRules;
-        }
-        appendRuleLineToListDiv(ruleset, listDiv, activeTab.id);
-        listDiv.style.display = 'block';
-      }
-    }
-
-    // Only show the "Add a rule" link if we're on an HTTPS page
-    if (/^https:/.test(activeTab.url)) {
-      show(e("add-rule-link"));
-    }
-  });
-}
-
-/**
- * Fill in content into the popup on load
- */
-document.addEventListener("DOMContentLoaded", function () {
-  stableRules = document.getElementById("StableRules");
-  unstableRules = document.getElementById("UnstableRules");
-  getTab(gotTab);
-
-  // Set up the enabled/disabled switch & hide/show rules
-  updateEnabledDisabledUI();
-  document.getElementById('onoffswitch').addEventListener('click', toggleEnabledDisabled);
-  e('http-nowhere-checkbox').addEventListener('click', toggleHttpNowhere, false);
-
-  // Print the extension's current version.
-  var the_manifest = chrome.runtime.getManifest();
-  var version_info = document.getElementById('current-version');
-  version_info.innerText = the_manifest.version;
-
-  e("aboutTitle").title = chrome.i18n.getMessage("about_title");
-  e("add-rule-link").addEventListener("click", addManualRule);
-});
-
-
-var escapeForRegex = function( value ) {
-  return value.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&");
-};
-
-function hide(elem) {
-  elem.style.display = "none";
-}
-
-function show(elem) {
-  elem.style.display = "block";
-}
-
-/**
- * Handles the manual addition of rules
- */
-function addManualRule() {
-  getTab(function(tab) {
-    hide(e("add-rule-link"));
-    show(e("add-new-rule-div"));
-
-    const url = new URL(tab.url);
-
-    e("new-rule-host").value = url.host;
-
-    const escapedHost = escapeForRegex(url.host);
-
-    e("new-rule-regex").value = `^http://${escapedHost}/`;
-    e("new-rule-redirect").value = `https://${url.host}/`;
-    e("new-rule-name").value = "Manual rule for " + url.host;
-
-    e("add-new-rule-button").addEventListener("click", function() {
-      const params = {
-        host : e("new-rule-host").value,
-        redirectTo : e("new-rule-redirect").value,
-        urlMatcher : e("new-rule-regex").value
-      };
-      sendMessage("add_new_rule", params, function() {
-        location.reload();
-      });
-    });
-
-    e("cancel-new-rule").addEventListener("click", function() {
-      show(e("add-rule-link"));
-      hide(e("add-new-rule-div"));
-    });
-
-    e("new-rule-show-advanced-link").addEventListener("click", function() {
-      show(e("new-rule-advanced"));
-      hide(e("new-rule-regular-text"));
-    });
-
-    e("new-rule-hide-advanced-link").addEventListener("click", function() {
-      hide(e("new-rule-advanced"));
-      show(e("new-rule-regular-text"));
-    });
-  });
-}
-
-function toggleHttpNowhere() {
-  getOption_('httpNowhere', false, function(item) {
-    setOption_('httpNowhere', !item.httpNowhere);
-  });
-}
-
-function getOption_(opt, defaultOpt, callback) {
-  var details = {};
-  details[opt] = defaultOpt;
-  sendMessage("get_option", details, callback);
-}
-
-function setOption_(opt, value, callback) {
-  var details = {};
-  details[opt] = value;
-  sendMessage("set_option", details, callback);
-}
-
-function getTab(callback) {
-  let url = new URL(window.location.href);
-  if (url.searchParams.has('tabId')) {
-    let parentId = Number(url.searchParams.get('tabId'));
-    return chrome.tabs.get(parentId, callback);
-  }
-  chrome.tabs.query({active: true, lastFocusedWindow: true}, tabs => callback(tabs[0]));
-}
diff --git a/chromium/rules.js b/chromium/rules.js
deleted file mode 100644
index 6efb12a96c4a..000000000000
--- a/chromium/rules.js
+++ /dev/null
@@ -1,707 +0,0 @@
-"use strict";
-
-(function(exports) {
-
-const util = require('./util');
-
-let settings = {
-  enableMixedRulesets: false,
-  domainBlacklist: new Set(),
-};
-
-// To reduce memory usage for the numerous rules/cookies with trivial rules
-const trivial_rule_from_c = /^http:/;
-const trivial_rule_to = 'https:';
-const trivial_cookie_rule_c = /.+/;
-
-// Empty iterable singleton to reduce memory usage
-const nullIterable = Object.create(null, {
-  [Symbol.iterator]: {
-    value: function* () {
-      // do nothing
-    }
-  },
-
-  size: {
-    value: 0
-  },
-});
-
-/**
- * A single rule
- * @param from
- * @param to
- * @constructor
- */
-function Rule(from, to) {
-  if (from === "^http:" && to === "https:") {
-    // This is a trivial rule, rewriting http->https with no complex RegExp.
-    this.to = trivial_rule_to;
-    this.from_c = trivial_rule_from_c;
-  } else {
-    // This is a non-trivial rule.
-    this.to = to;
-    this.from_c = new RegExp(from);
-  }
-}
-
-/**
- * Regex-Compile a pattern
- * @param pattern The pattern to compile
- * @constructor
- */
-function Exclusion(pattern) {
-  this.pattern_c = new RegExp(pattern);
-}
-
-/**
- * Generates a CookieRule
- * @param host The host regex to compile
- * @param cookiename The cookie name Regex to compile
- * @constructor
- */
-function CookieRule(host, cookiename) {
-  if (host === '.+') {
-    // Some cookie rules trivially match any host.
-    this.host_c = trivial_cookie_rule_c;
-  } else {
-    this.host_c = new RegExp(host);
-  }
-
-  if (cookiename === '.+') {
-    // About 50% of cookie rules trivially match any name.
-    this.name_c = trivial_cookie_rule_c;
-  } else {
-    this.name_c = new RegExp(cookiename);
-  }
-}
-
-/**
- *A collection of rules
- * @param set_name The name of this set
- * @param default_state activity state
- * @param note Note will be displayed in popup
- * @constructor
- */
-function RuleSet(set_name, default_state, note) {
-  this.name = set_name;
-  this.rules = [];
-  this.exclusions = null;
-  this.cookierules = null;
-  this.active = default_state;
-  this.default_state = default_state;
-  this.note = note;
-}
-
-RuleSet.prototype = {
-  /**
-   * Check if a URI can be rewritten and rewrite it
-   * @param urispec The uri to rewrite
-   * @returns {*} null or the rewritten uri
-   */
-  apply: function(urispec) {
-    var returl = null;
-    // If we're covered by an exclusion, go home
-    if (this.exclusions !== null) {
-      for (let exclusion of this.exclusions) {
-        if (exclusion.pattern_c.test(urispec)) {
-          util.log(util.DBUG, "excluded uri " + urispec);
-          return null;
-        }
-      }
-    }
-
-    // Okay, now find the first rule that triggers
-    for (let rule of this.rules) {
-      returl = urispec.replace(rule.from_c,
-        rule.to);
-      if (returl != urispec) {
-        return returl;
-      }
-    }
-    return null;
-  },
-
-  /**
-   * Deep equivalence comparison
-   * @param ruleset The ruleset to compare with
-   * @returns true or false, depending on whether it's deeply equivalent
-   */
-  isEquivalentTo: function(ruleset) {
-    if(this.name != ruleset.name ||
-       this.note != ruleset.note ||
-       this.state != ruleset.state ||
-       this.default_state != ruleset.default_state) {
-      return false;
-    }
-
-    try {
-      var this_exclusions_length = this.exclusions.length;
-    } catch(e) {
-      var this_exclusions_length = 0;
-    }
-
-    try {
-      var ruleset_exclusions_length = ruleset.exclusions.length;
-    } catch(e) {
-      var ruleset_exclusions_length = 0;
-    }
-
-    try {
-      var this_rules_length = this.rules.length;
-    } catch(e) {
-      var this_rules_length = 0;
-    }
-
-    try {
-      var ruleset_rules_length = ruleset.rules.length;
-    } catch(e) {
-      var ruleset_rules_length = 0;
-    }
-
-    if(this_exclusions_length != ruleset_exclusions_length ||
-       this_rules_length != ruleset_rules_length) {
-      return false;
-    }
-    if(this_exclusions_length > 0) {
-      for(let x = 0; x < this.exclusions.length; x++){
-        if(this.exclusions[x].pattern_c != ruleset.exclusions[x].pattern_c) {
-          return false;
-        }
-      }
-    }
-    if(this_rules_length > 0) {
-      for(let x = 0; x < this.rules.length; x++){
-        if(this.rules[x].to != ruleset.rules[x].to) {
-          return false;
-        }
-      }
-    }
-    return true;
-  }
-
-};
-
-/**
- * Initialize Rule Sets
- * @param ruleActiveStates default state for rules
- * @constructor
- */
-function RuleSets() {
-  // Load rules into structure
-  this.targets = new Map();
-
-  // A cache for potentiallyApplicableRulesets
-  this.ruleCache = new Map();
-
-  // A cache for cookie hostnames.
-  this.cookieHostCache = new Map();
-
-  // A hash of rule name -> active status (true/false).
-  this.ruleActiveStates = {};
-
-  // The key to retrieve user rules from the storage api
-  this.USER_RULE_KEY = 'userRules';
-
-  return this;
-}
-
-
-RuleSets.prototype = {
-
-  /**
-   * Load packaged rulesets, and rulesets in browser storage
-   * @param store object from store.js
-   */
-  loadFromBrowserStorage: async function(store) {
-    this.store = store;
-    this.ruleActiveStates = await this.store.get_promise('ruleActiveStates', {});
-    this.addFromJson(util.loadExtensionFile('rules/default.rulesets', 'json'));
-    this.loadStoredUserRules();
-    await this.addStoredCustomRulesets();
-  },
-
-  /**
-   * Iterate through data XML and load rulesets
-   */
-  addFromXml: function(ruleXml) {
-    var sets = ruleXml.getElementsByTagName("ruleset");
-    for (let s of sets) {
-      try {
-        this.parseOneXmlRuleset(s);
-      } catch (e) {
-        util.log(util.WARN, 'Error processing ruleset:' + e);
-      }
-    }
-  },
-
-  addFromJson: function(ruleJson) {
-    for (let ruleset of ruleJson) {
-      try {
-        this.parseOneJsonRuleset(ruleset);
-      } catch(e) {
-        util.log(util.WARN, 'Error processing ruleset:' + e);
-      }
-    }
-  },
-
-  parseOneJsonRuleset: function(ruletag) {
-    var default_state = true;
-    var note = "";
-    var default_off = ruletag["default_off"];
-    if (default_off) {
-      default_state = false;
-      note += default_off + "\n";
-    }
-
-    // If a ruleset declares a platform, and we don't match it, treat it as
-    // off-by-default. In practice, this excludes "mixedcontent" & "cacert" rules.
-    var platform = ruletag["platform"]
-    if (platform) {
-      default_state = false;
-      if (platform == "mixedcontent" && settings.enableMixedRulesets) {
-        default_state = true;
-      }
-      note += "Platform(s): " + platform + "\n";
-    }
-
-    var rule_set = new RuleSet(ruletag["name"], default_state, note.trim());
-
-    // Read user prefs
-    if (rule_set.name in this.ruleActiveStates) {
-      rule_set.active = this.ruleActiveStates[rule_set.name];
-    }
-
-    var rules = ruletag["rule"];
-    for (let rule of rules) {
-      if (rule["from"] != null && rule["to"] != null) {
-        rule_set.rules.push(new Rule(rule["from"], rule["to"]));
-      }
-    }
-
-    var exclusions = ruletag["exclusion"];
-    if (exclusions != null) {
-      for (let exclusion of exclusions) {
-        if (exclusion != null) {
-          if (!rule_set.exclusions) {
-            rule_set.exclusions = [];
-          }
-          rule_set.exclusions.push(new Exclusion(exclusion));
-        }
-      }
-    }
-
-    var cookierules = ruletag["securecookie"];
-    if (cookierules != null) {
-      for (let cookierule of cookierules) {
-        if (cookierule["host"] != null && cookierule["name"] != null) {
-          if (!rule_set.cookierules) {
-            rule_set.cookierules = [];
-          }
-          rule_set.cookierules.push(new CookieRule(cookierule["host"], cookierule["name"]));
-        }
-      }
-    }
-
-    var targets = ruletag["target"];
-    for (let target of targets) {
-      if (target != null) {
-        if (!this.targets.has(target)) {
-          this.targets.set(target, []);
-        }
-        this.targets.get(target).push(rule_set);
-      }
-    }
-  },
-
-  /**
-   * Load a user rule
-   * @param params
-   * @returns {boolean}
-   */
-  addUserRule : function(params) {
-    util.log(util.INFO, 'adding new user rule for ' + JSON.stringify(params));
-    var new_rule_set = new RuleSet(params.host, true, "user rule");
-    var new_rule = new Rule(params.urlMatcher, params.redirectTo);
-    new_rule_set.rules.push(new_rule);
-    if (!this.targets.has(params.host)) {
-      this.targets.set(params.host, []);
-    }
-    this.ruleCache.delete(params.host);
-    // TODO: maybe promote this rule?
-    this.targets.get(params.host).push(new_rule_set);
-    if (new_rule_set.name in this.ruleActiveStates) {
-      new_rule_set.active = this.ruleActiveStates[new_rule_set.name];
-    }
-    util.log(util.INFO, 'done adding rule');
-    return true;
-  },
-
-  /**
-   * Remove a user rule
-   * @param params
-   * @returns {boolean}
-   */
-  removeUserRule: function(ruleset) {
-    util.log(util.INFO, 'removing user rule for ' + JSON.stringify(ruleset));
-    this.ruleCache.delete(ruleset.name);
-
-
-    var tmp = this.targets.get(ruleset.name).filter(r =>
-      !(r.isEquivalentTo(ruleset))
-    );
-    this.targets.set(ruleset.name, tmp);
-
-    if (this.targets.get(ruleset.name).length == 0) {
-      this.targets.delete(ruleset.name);
-    }
-
-    util.log(util.INFO, 'done removing rule');
-    return true;
-  },
-
-  /**
-  * Retrieve stored user rules from storage api
-  **/
-  getStoredUserRules: async function() {
-    return await this.store.get_promise(this.USER_RULE_KEY, []);
-  },
-
-  /**
-  * Load all stored user rules into this RuleSet object
-  */
-  loadStoredUserRules: async function() {
-    const user_rules = await this.getStoredUserRules();
-    for (let user_rule of user_rules) {
-      this.addUserRule(user_rule);
-    }
-    util.log(util.INFO, 'loaded ' + user_rules.length + ' stored user rules');
-  },
-
-  /**
-  * Adds a new user rule
-  * @param params: params defining the rule
-  * @param cb: Callback to call after success/fail
-  * */
-  addNewRuleAndStore: async function(params) {
-    if (this.addUserRule(params)) {
-      // If we successfully added the user rule, save it in the storage
-      // api so it's automatically applied when the extension is
-      // reloaded.
-      let userRules = await this.getStoredUserRules();
-      // TODO: there's a race condition here, if this code is ever executed from multiple
-      // client windows in different event loops.
-      userRules.push(params);
-      // TODO: can we exceed the max size for storage?
-      await this.store.set_promise(this.USER_RULE_KEY, userRules);
-    }
-  },
-
-  /**
-  * Removes a user rule
-  * @param ruleset: the ruleset to remove
-  * */
-  removeRuleAndStore: async function(ruleset) {
-    if (this.removeUserRule(ruleset)) {
-      // If we successfully removed the user rule, remove it in local storage too
-      let userRules = await this.getStoredUserRules();
-      userRules = userRules.filter(r =>
-        !(r.host == ruleset.name &&
-          r.redirectTo == ruleset.rules[0].to)
-      );
-      await this.store.set_promise(this.USER_RULE_KEY, userRules);
-    }
-  },
-
-  addStoredCustomRulesets: function(){
-    return new Promise(resolve => {
-      this.store.get({
-        legacy_custom_rulesets: [],
-        debugging_rulesets: ""
-      }, item => {
-        this.loadCustomRulesets(item.legacy_custom_rulesets);
-        this.loadCustomRuleset("" + item.debugging_rulesets + "");
-        resolve();
-      });
-    });
-  },
-
-  // Load in the legacy custom rulesets, if any
-  loadCustomRulesets: function(legacy_custom_rulesets){
-    for(let legacy_custom_ruleset of legacy_custom_rulesets){
-      this.loadCustomRuleset(legacy_custom_ruleset);
-    }
-  },
-
-  loadCustomRuleset: function(ruleset_string){
-    this.addFromXml((new DOMParser()).parseFromString(ruleset_string, 'text/xml'));
-  },
-
-  setRuleActiveState: async function(ruleset_name, active){
-    if (active == undefined) {
-      delete this.ruleActiveStates[ruleset_name];
-    } else {
-      this.ruleActiveStates[ruleset_name] = active;
-    }
-    await this.store.set_promise('ruleActiveStates', this.ruleActiveStates);
-  },
-
-  /**
-   * Does the loading of a ruleset.
-   * @param ruletag The whole  tag to parse
-   */
-  parseOneXmlRuleset: function(ruletag) {
-    var default_state = true;
-    var note = "";
-    var default_off = ruletag.getAttribute("default_off");
-    if (default_off) {
-      default_state = false;
-      note += default_off + "\n";
-    }
-
-    // If a ruleset declares a platform, and we don't match it, treat it as
-    // off-by-default. In practice, this excludes "mixedcontent" & "cacert" rules.
-    var platform = ruletag.getAttribute("platform");
-    if (platform) {
-      default_state = false;
-      if (platform == "mixedcontent" && settings.enableMixedRulesets) {
-        default_state = true;
-      }
-      note += "Platform(s): " + platform + "\n";
-    }
-
-    var rule_set = new RuleSet(ruletag.getAttribute("name"),
-      default_state,
-      note.trim());
-
-    // Read user prefs
-    if (rule_set.name in this.ruleActiveStates) {
-      rule_set.active = (this.ruleActiveStates[rule_set.name] == "true");
-    }
-
-    var rules = ruletag.getElementsByTagName("rule");
-    for (let rule of rules) {
-      rule_set.rules.push(new Rule(rule.getAttribute("from"),
-        rule.getAttribute("to")));
-    }
-
-    var exclusions = ruletag.getElementsByTagName("exclusion");
-    if (exclusions.length > 0) {
-      rule_set.exclusions = [];
-      for (let exclusion of exclusions) {
-        rule_set.exclusions.push(
-          new Exclusion(exclusion.getAttribute("pattern")));
-      }
-    }
-
-    var cookierules = ruletag.getElementsByTagName("securecookie");
-    if (cookierules.length > 0) {
-      rule_set.cookierules = [];
-      for (let cookierule of cookierules) {
-        rule_set.cookierules.push(
-          new CookieRule(cookierule.getAttribute("host"),
-            cookierule.getAttribute("name")));
-      }
-    }
-
-    var targets = ruletag.getElementsByTagName("target");
-    for (let target of targets) {
-      var host = target.getAttribute("host");
-      if (!this.targets.has(host)) {
-        this.targets.set(host, []);
-      }
-      this.targets.get(host).push(rule_set);
-    }
-  },
-
-  /**
-   * Return a list of rulesets that apply to this host
-   * @param host The host to check
-   * @returns {*} (empty) list
-   */
-  potentiallyApplicableRulesets: function(host) {
-    // Have we cached this result? If so, return it!
-    if (this.ruleCache.has(host)) {
-      let cached_item = this.ruleCache.get(host);
-      util.log(util.DBUG, "Ruleset cache hit for " + host + " items:" + cached_item.size);
-      return cached_item;
-    } else {
-      util.log(util.DBUG, "Ruleset cache miss for " + host);
-    }
-
-    // Let's begin search
-    // Copy the host targsts so we don't modify them.
-    let results = (this.targets.has(host) ?
-      new Set([...this.targets.get(host)]) :
-      new Set());
-
-    // Ensure host is well-formed (RFC 1035)
-    if (host.length <= 0 || host.length > 255 || host.indexOf("..") != -1) {
-      util.log(util.WARN, "Malformed host passed to potentiallyApplicableRulesets: " + host);
-      return nullIterable;
-    }
-
-    // Replace each portion of the domain with a * in turn
-    let segmented = host.split(".");
-    for (let i = 0; i < segmented.length; i++) {
-      let tmp = segmented[i];
-      segmented[i] = "*";
-
-      results = (this.targets.has(segmented.join(".")) ?
-        new Set([...results, ...this.targets.get(segmented.join("."))]) :
-        results);
-
-      segmented[i] = tmp;
-    }
-
-    // now eat away from the left, with *, so that for x.y.z.google.com we
-    // check *.z.google.com and *.google.com (we did *.y.z.google.com above)
-    for (let i = 2; i <= segmented.length - 2; i++) {
-      let t = "*." + segmented.slice(i, segmented.length).join(".");
-
-      results = (this.targets.has(t) ?
-        new Set([...results, ...this.targets.get(t)]) :
-        results);
-    }
-
-    // Clean the results list, which may contain duplicates or undefined entries
-    results.delete(undefined);
-
-    util.log(util.DBUG,"Applicable rules for " + host + ":");
-    if (results.size == 0) {
-      util.log(util.DBUG, "  None");
-      results = nullIterable;
-    } else {
-      results.forEach(result => util.log(util.DBUG, "  " + result.name));
-    }
-
-    // Insert results into the ruleset cache
-    this.ruleCache.set(host, results);
-
-    // Cap the size of the cache. (Limit chosen somewhat arbitrarily)
-    if (this.ruleCache.size > 1000) {
-      // Map.prototype.keys() returns keys in insertion order, so this is a FIFO.
-      this.ruleCache.delete(this.ruleCache.keys().next().value);
-    }
-
-    return results;
-  },
-
-  /**
-   * Check to see if the Cookie object c meets any of our cookierule criteria for being marked as secure.
-   * @param cookie The cookie to test
-   * @returns {*} ruleset or null
-   */
-  shouldSecureCookie: function(cookie) {
-    var hostname = cookie.domain;
-    // cookie domain scopes can start with .
-    while (hostname.charAt(0) == ".") {
-      hostname = hostname.slice(1);
-    }
-
-    if (!this.safeToSecureCookie(hostname)) {
-      return null;
-    }
-
-    var potentiallyApplicable = this.potentiallyApplicableRulesets(hostname);
-    for (let ruleset of potentiallyApplicable) {
-      if (ruleset.cookierules !== null && ruleset.active) {
-        for (let cookierules of ruleset.cookierules) {
-          var cr = cookierules;
-          if (cr.host_c.test(cookie.domain) && cr.name_c.test(cookie.name)) {
-            return ruleset;
-          }
-        }
-      }
-    }
-    return null;
-  },
-
-  /**
-   * Check if it is secure to secure the cookie (=patch the secure flag in).
-   * @param domain The domain of the cookie
-   * @returns {*} true or false
-   */
-  safeToSecureCookie: function(domain) {
-    // Check if the domain might be being served over HTTP.  If so, it isn't
-    // safe to secure a cookie!  We can't always know this for sure because
-    // observing cookie-changed doesn't give us enough context to know the
-    // full origin URI.
-
-    // First, if there are any redirect loops on this domain, don't secure
-    // cookies.  XXX This is not a very satisfactory heuristic.  Sometimes we
-    // would want to secure the cookie anyway, because the URLs that loop are
-    // not authenticated or not important.  Also by the time the loop has been
-    // observed and the domain blacklisted, a cookie might already have been
-    // flagged as secure.
-
-    if (settings.domainBlacklist.has(domain)) {
-      util.log(util.INFO, "cookies for " + domain + "blacklisted");
-      return false;
-    }
-    var cached_item = this.cookieHostCache.get(domain);
-    if (cached_item !== undefined) {
-      util.log(util.DBUG, "Cookie host cache hit for " + domain);
-      return cached_item;
-    }
-    util.log(util.DBUG, "Cookie host cache miss for " + domain);
-
-    // If we passed that test, make up a random URL on the domain, and see if
-    // we would HTTPSify that.
-
-    var nonce_path = "/" + Math.random().toString();
-    var test_uri = "http://" + domain + nonce_path + nonce_path;
-
-    // Cap the size of the cookie cache (limit chosen somewhat arbitrarily)
-    if (this.cookieHostCache.size > 250) {
-      // Map.prototype.keys() returns keys in insertion order, so this is a FIFO.
-      this.cookieHostCache.delete(this.cookieHostCache.keys().next().value);
-    }
-
-    util.log(util.INFO, "Testing securecookie applicability with " + test_uri);
-    var potentiallyApplicable = this.potentiallyApplicableRulesets(domain);
-    for (let ruleset of potentiallyApplicable) {
-      if (!ruleset.active) {
-        continue;
-      }
-      if (ruleset.apply(test_uri)) {
-        util.log(util.INFO, "Cookie domain could be secured.");
-        this.cookieHostCache.set(domain, true);
-        return true;
-      }
-    }
-    util.log(util.INFO, "Cookie domain could NOT be secured.");
-    this.cookieHostCache.set(domain, false);
-    return false;
-  },
-
-  /**
-   * Rewrite an URI
-   * @param urispec The uri to rewrite
-   * @param host The host of this uri
-   * @returns {*} the new uri or null
-   */
-  rewriteURI: function(urispec, host) {
-    var newuri = null;
-    var potentiallyApplicable = this.potentiallyApplicableRulesets(host);
-    for (let ruleset of potentiallyApplicable) {
-      if (ruleset.active && (newuri = ruleset.apply(urispec))) {
-        return newuri;
-      }
-    }
-    return null;
-  }
-};
-
-Object.assign(exports, {
-  nullIterable,
-  settings,
-  trivial_rule_to,
-  trivial_rule_from_c,
-  Exclusion,
-  Rule,
-  RuleSet,
-  RuleSets
-});
-
-})(typeof exports == 'undefined' ? require.scopes.rules = {} : exports);
diff --git a/chromium/send-message.js b/chromium/send-message.js
deleted file mode 100644
index da8adf5763c0..000000000000
--- a/chromium/send-message.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/* exported sendMessage */
-
-"use strict";
-
-function sendMessage(type, object, callback) {
-  chrome.runtime.sendMessage({ type, object }, callback);
-}
diff --git a/chromium/store.js b/chromium/store.js
deleted file mode 100644
index 12341da705f2..000000000000
--- a/chromium/store.js
+++ /dev/null
@@ -1,73 +0,0 @@
-"use strict";
-
-(function(exports) {
-
-const rules = require('./rules');
-
-function initialize() {
-  return new Promise(resolve => {
-    if (chrome.storage.sync) {
-      chrome.storage.sync.set({"sync-set-test": true}, () => {
-        if(chrome.runtime.lastError){
-          setStorage(chrome.storage.local);
-        } else {
-          setStorage(chrome.storage.sync);
-        }
-        resolve();
-      });
-    } else {
-      setStorage(chrome.storage.local);
-      resolve();
-    }
-  });
-}
-
-function get_promise(key, default_val) {
-  return new Promise(res => exports.get({[key]: default_val}, data => res(data[key])));
-}
-
-function set_promise(key, value) {
-  return new Promise(res => exports.set({[key]: value}, res));
-}
-
-async function performMigrations() {
-  const migration_version = await get_promise('migration_version', 0);
-
-  if (migration_version < 1) {
-
-    let ls;
-    try {
-      ls = localStorage;
-    } catch(e) {}
-
-    let ruleActiveStates = {};
-    for (const key in ls) {
-      if (ls.hasOwnProperty(key)) {
-        if (key == rules.RuleSets().USER_RULE_KEY){
-          await set_promise(rules.RuleSets().USER_RULE_KEY, JSON.parse(ls[key]));
-        } else {
-          ruleActiveStates[key] = (ls[key] == "true");
-        }
-      }
-    }
-    await set_promise('ruleActiveStates', ruleActiveStates);
-  }
-
-  await set_promise('migration_version', 1);
-}
-
-function setStorage(store) {
-  Object.assign(exports, {
-    get: store.get,
-    set: store.set,
-    get_promise,
-    set_promise
-  });
-}
-
-Object.assign(exports, {
-  initialize,
-  performMigrations
-});
-
-})(typeof exports == 'undefined' ? require.scopes.store = {} : exports);
diff --git a/chromium/switch-planner.html b/chromium/switch-planner.html
deleted file mode 100644
index b0d034a43afb..000000000000
--- a/chromium/switch-planner.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-  
-    
-    
-  
-  
-    

-    
-  
-
diff --git a/chromium/switch-planner.js b/chromium/switch-planner.js
deleted file mode 100644
index 1562f8f1445e..000000000000
--- a/chromium/switch-planner.js
+++ /dev/null
@@ -1,88 +0,0 @@
-"use strict";
-
-document.addEventListener("DOMContentLoaded", () => {
-  const background = chrome.extension.getBackgroundPage().require('./background');
-  var tab = document.location.search.match(/tab=([^&]*)/)[1];
-  var content = document.getElementById("content");
-
-  var nrw_text_div = document.createElement("div");
-  nrw_text_div.innerText = "Unrewritten HTTP resources loaded from this tab (enable HTTPS on these domains and add them to HTTPS Everywhere):"
-  var nrw_div = switchPlannerDetailsHtmlSection(
-    background.sortSwitchPlanner(tab, "nrw"),
-    background.switchPlannerInfo[tab]["nrw"]
-  );
-  var rw_text_div = document.createElement("div");
-  rw_text_div.style.marginTop = "20px";
-  rw_text_div.innerText = "Resources rewritten successfully from this tab (update these in your source code):"
-  var rw_div = switchPlannerDetailsHtmlSection(
-    background.sortSwitchPlanner(tab, "rw"),
-    background.switchPlannerInfo[tab]["rw"]
-  );
-
-  content.appendChild(nrw_text_div);
-  content.appendChild(nrw_div);
-  content.appendChild(rw_text_div);
-  content.appendChild(rw_div);
-});
-
-/**
- * Generate the detailed html fot the switch planner, by section
- * */
-function switchPlannerDetailsHtmlSection(asset_host_list, link_keys) {
-  var wrapper_div = document.createElement("div");
-  if (asset_host_list.length == 0) {
-    wrapper_div.style.fontWeight = "bold";
-    wrapper_div.innerText = "none";
-    return wrapper_div;
-  }
-
-  for (var i = asset_host_list.length - 1; i >= 0; i--) {
-    var host = asset_host_list[i][3];
-    var activeCount = asset_host_list[i][1];
-    var passiveCount = asset_host_list[i][2];
-
-    var div = document.createElement("div");
-    div.style.marginTop = "20px";
-    var b = document.createElement("b");
-    b.innerText = host;
-    div.appendChild(b);
-
-    if (activeCount > 0) {
-      var active_div = document.createElement("div");
-      active_div.appendChild(document.createTextNode(activeCount + " active"));
-      for (const link of linksFromKeys(link_keys[host][1])) {
-        active_div.appendChild(link);
-      }
-      div.appendChild(active_div);
-    }
-    if (passiveCount > 0) {
-      var passive_div = document.createElement("div");
-      passive_div.appendChild(document.createTextNode(passiveCount + " passive"));
-      for (const link of linksFromKeys(link_keys[host][0])) {
-        passive_div.appendChild(link);
-      }
-      div.appendChild(passive_div);
-    }
-    wrapper_div.appendChild(div);
-  }
-  return wrapper_div;
-}
-
-/**
- * Generate a HTML link from urls in map
- * map: the map containing the urls
- * */
-function linksFromKeys(map) {
-  if (typeof map == 'undefined') return "";
-  var links = [];
-  for (var key in map) {
-    if (map.hasOwnProperty(key)) {
-      var link = document.createElement("a");
-      link.style.display = "block";
-      link.href = key;
-      link.innerText = key;
-      links.push(link);
-    }
-  }
-  return links;
-}
diff --git a/chromium/test/example.rulesets.gz b/chromium/test/example.rulesets.gz
new file mode 100644
index 000000000000..401811763ff8
Binary files /dev/null and b/chromium/test/example.rulesets.gz differ
diff --git a/chromium/test/incognito_test.js b/chromium/test/incognito_test.js
index 40055154475d..64cbe5ab8aa5 100644
--- a/chromium/test/incognito_test.js
+++ b/chromium/test/incognito_test.js
@@ -1,8 +1,8 @@
-'use strict'
+'use strict';
 
 const expect = require('chai').expect,
   tu = require('./testing_utils'),
-  incognito = require('../incognito');
+  incognito = require('../background-scripts/incognito');
 
 describe('incognito.js', function() {
   beforeEach(function() {
@@ -19,11 +19,11 @@ describe('incognito.js', function() {
       this.callbackCalled = false;
       this.callback = () => this.callbackCalled = true;
       this.instance = incognito.onIncognitoDestruction(this.callback);
-    })
+    });
 
     it('no incognito session by default', function() {
       expect(incognito.state.incognito_session_exists).to.be.false;
-    })
+    });
 
     it('with no incognito, callback not called', async function() {
       incognito.state.incognito_session_exists = false;
@@ -54,6 +54,6 @@ describe('incognito.js', function() {
     it('detects when an incognito window is created', function() {
       this.instance.detect_incognito_creation({incognito: true});
       expect(incognito.state.incognito_session_exists, 'constant changed').to.be.true;
-    })
+    });
   });
 });
diff --git a/chromium/test/ip_utils_test.js b/chromium/test/ip_utils_test.js
new file mode 100644
index 000000000000..6301872ae646
--- /dev/null
+++ b/chromium/test/ip_utils_test.js
@@ -0,0 +1,92 @@
+'use strict';
+
+const { parseIp, isIpInRange, isLocalIp } = require('../background-scripts/ip_utils');
+
+const assert = require('chai').assert;
+
+describe('ip_utils.js', () => {
+  describe('parseIp', () => {
+    it('rejects an empty string', () => {
+      assert(parseIp('') === -1);
+    });
+
+    it('rejects a string consisting entirely of dots', () => {
+      assert(parseIp('.') === -1);
+      assert(parseIp('..') === -1);
+      assert(parseIp('...') === -1);
+      assert(parseIp('....') === -1);
+    });
+
+    it('rejects a string consisting only of digits', () => {
+      assert(parseIp('1') === -1);
+    });
+
+    it('rejects a string not consisting of four parts separated by dots', () => {
+      assert(parseIp('1.1') === -1);
+      assert(parseIp('1.1.1') === -1);
+      assert(parseIp('1.1.1.1.1') === -1);
+    });
+
+    it('rejects a well-formed IP address followed by one or multiple trailing dots', () => {
+      assert(parseIp('1.1.1.1.') === -1);
+      assert(parseIp('1.1.1.1..') === -1);
+      assert(parseIp('1.1.1.1...') === -1);
+    });
+
+    it('rejects an IP address-like string with omitted parts', () => {
+      assert(parseIp('.1.1.1') === -1);
+      assert(parseIp('1..1.1') === -1);
+      assert(parseIp('1.1..1') === -1);
+      assert(parseIp('1.1.1.') === -1);
+    });
+
+    it('rejects an IP address-like string with invalid parts', () => {
+      assert(parseIp('192.168.1.256') === -1);
+      assert(parseIp('192.168.256.1') === -1);
+      assert(parseIp('192.256.1.1') === -1);
+      assert(parseIp('256.168.1.1') === -1);
+      assert(parseIp('256.168.1.-1') === -1);
+    });
+
+    it('correctly parses well-formed IP addresses', () => {
+      assert(parseIp('192.168.0.1') === 0xc0a80001);
+      assert(parseIp('127.0.0.1') === 0x7f000001);
+      assert(parseIp('1.1.1.1') === 0x01010101);
+      assert(parseIp('8.8.8.8') === 0x08080808);
+    });
+  });
+
+  describe('isIpInRange', () => {
+    it('correctly detects if IP is in range', () => {
+      assert(isIpInRange(0xabadcafe, [0x00000000, 0x00000000]));
+      assert(isIpInRange(0x7f000001, [0x7f000000, 0xff000000]));
+      assert(isIpInRange(0xc0a80001, [0xc0a80000, 0xffff0000]));
+      assert(isIpInRange(0xc0a80101, [0xc0a80100, 0xffffff00]));
+      assert(isIpInRange(0xdeadbeef, [0xdeadbeef, 0xffffffff]));
+    });
+
+    it('correctly detects if IP is outside of range', () => {
+      assert(!isIpInRange(0xaaaaaaaa, [0xdeadbeef, 0xffffffff]));
+      assert(!isIpInRange(0xaaaaaaaa, [0x7f000000, 0xff000000]));
+      assert(!isIpInRange(0xaaaaaaaa, [0xc0a80000, 0xffff0000]));
+    });
+  });
+
+  describe('isLocalIp', () => {
+    it('correctly detects if IP is a private network or loopback address', () => {
+      assert(isLocalIp(0x00000000));
+      assert(isLocalIp(0x7fabcdef));
+      assert(isLocalIp(0x0aabcdef));
+      assert(isLocalIp(0xc0a8abcd));
+      assert(isLocalIp(0xac1abcde));
+    });
+
+    it('correctly detects if IP is not a private network or loopback address', () => {
+      assert(!isLocalIp(0x00abcdef));
+      assert(!isLocalIp(0x01010101));
+      assert(!isLocalIp(0x01000001));
+      assert(!isLocalIp(0x08080808));
+      assert(!isLocalIp(0x08080404));
+    });
+  });
+});
diff --git a/chromium/test/rules_test.js b/chromium/test/rules_test.js
index eaa78890d96d..ae31ad0060ba 100644
--- a/chromium/test/rules_test.js
+++ b/chromium/test/rules_test.js
@@ -1,41 +1,36 @@
-'use strict'
+'use strict';
+
+const text_encoding = require('text-encoding');
+global.TextDecoder = text_encoding.TextDecoder;
+global.TextEncoder = text_encoding.TextEncoder;
+global.self = global;
+require("../../lib-wasm/pkg/https_everywhere_lib_wasm.js");
 
 const assert = require('chai').assert,
-  rules = require('../rules');
+  rules = require('../background-scripts/rules');
 
-const Exclusion = rules.Exclusion,
-  Rule = rules.Rule,
+const Rule = rules.Rule,
   RuleSet = rules.RuleSet,
-  RuleSets = rules.RuleSets;
+  RuleSets = rules.RuleSets,
+  getRule = rules.getRule;
 
 
 describe('rules.js', function() {
   let test_str = 'test';
 
-  describe('nullIterable', function() {
-    it('is iterable zero times and is size 0', function() {
-      let count = 0;
-      for (let _ of rules.nullIterable) { // eslint-disable-line no-unused-vars
-        count += 1;
-      }
-      assert.strictEqual(count, 0);
-      assert.strictEqual(rules.nullIterable.size,  0);
-      assert.isEmpty(rules.nullIterable);
-    });
-  });
-
-  describe('Exclusion', function() {
-    it('constructs', function() {
-      let exclusion = new Exclusion(test_str);
-      assert.isTrue(exclusion.pattern_c.test(test_str), true);
-    });
-  });
-
   describe('Rule', function() {
     it('constructs trivial rule', function() {
       let rule = new Rule('^http:', 'https:');
-      assert.equal(rule.to, rules.trivial_rule_to);
-      assert.equal(rule.from_c, rules.trivial_rule_from_c);
+      assert.equal(rule.to, rules.trivial_rule.to);
+      assert.deepEqual(rule.from_c, rules.trivial_rule.from_c);
+    });
+  });
+
+  describe('getRule', function() {
+    it('returns trivial rule object', function() {
+      let trivial = rules.trivial_rule;
+      let rule = getRule('^http:', 'https:');
+      assert.equal(rule, trivial);
     });
   });
 
@@ -46,7 +41,7 @@ describe('rules.js', function() {
 
     describe('#apply', function() {
       it('excludes excluded uris', function() {
-        this.ruleset.exclusions = [new Exclusion(test_str)];
+        this.ruleset.exclusions = new RegExp(test_str);
         assert.isNull(this.ruleset.apply(test_str));
       });
 
@@ -73,8 +68,8 @@ describe('rules.js', function() {
       it('not equivalent with different exclusions', function() {
         let rs_a = new RuleSet(...inputs),
           rs_b = new RuleSet(...inputs);
-        rs_a.exclusions = [new Exclusion('foo')];
-        rs_b.exclusions = [new Exclusion('bar')];
+        rs_a.exclusions = new RegExp('foo');
+        rs_b.exclusions = new RegExp('bar');
 
         assert.isFalse(rs_a.isEquivalentTo(rs_b));
       });
@@ -93,7 +88,7 @@ describe('rules.js', function() {
         assert.isTrue(rs.isEquivalentTo(rs));
       });
     });
-  })
+  });
 
   describe('RuleSets', function() {
     let rules_json = [{
@@ -102,7 +97,8 @@ describe('rules.js', function() {
         to: "https:",
         from: "^http:"
       }],
-      target: ["freerangekitten.com", "www.freerangekitten.com"]
+      target: ["freerangekitten.com", "www.freerangekitten.com"],
+      exclusion: ["foo", "bar"]
     }];
 
     beforeEach(function() {
@@ -112,9 +108,14 @@ describe('rules.js', function() {
     describe('#addFromJson', function() {
       it('can add a rule', function() {
         this.rsets.addFromJson(rules_json);
-
         assert.isTrue(this.rsets.targets.has('freerangekitten.com'));
       });
+
+      it('parses exclusions', function() {
+        this.rsets.addFromJson(rules_json);
+        let rs = [...this.rsets.targets.get('freerangekitten.com')][0];
+        assert.strictEqual(rs.exclusions.source, "foo|bar");
+      });
     });
 
     describe('#rewriteURI', function() {
@@ -124,12 +125,21 @@ describe('rules.js', function() {
 
         let newuri = this.rsets.rewriteURI('http://' + host + '/', host);
 
-        assert.strictEqual(newuri, 'https://' + host + '/', 'protocol changed to https')
-      })
+        assert.strictEqual(newuri, 'https://' + host + '/', 'protocol changed to https');
+      });
 
       it('does not rewrite unknown hosts', function() {
         assert.isNull(this.rsets.rewriteURI('http://unknown.com/', 'unknown.com'));
-      })
+      });
+
+      it('does not rewrite excluded URLs', function() {
+        this.rsets.addFromJson(rules_json);
+        assert.isNull(this.rsets.rewriteURI('http://freerangekitten.com/foo', 'freerangekitten.com'));
+        assert.isNull(this.rsets.rewriteURI('http://www.freerangekitten.com/bar', 'freerangekitten.com'));
+
+        let newuri = this.rsets.rewriteURI('http://freerangekitten.com/baz', 'freerangekitten.com');
+        assert.strictEqual(newuri, 'https://freerangekitten.com/baz', 'protocol changed to https');
+      });
     });
 
     describe('#potentiallyApplicableRulesets', function() {
@@ -187,17 +197,25 @@ describe('rules.js', function() {
           assert.deepEqual(res3, new Set(value), 'wildcard matches sub domains');
         });
 
-        it('matches middle wildcards', function() {
-          let target = 'sub.*.' + host;
+        it('matches right wildcards', function() {
+          const target = host + '.*';
           this.rsets.targets.set(target, value);
 
-          let res1 = this.rsets.potentiallyApplicableRulesets('sub.star.' + host);
+          const res1 = this.rsets.potentiallyApplicableRulesets(host + '.tld');
           assert.deepEqual(res1, new Set(value), 'default case');
 
-          let res2 = this.rsets.potentiallyApplicableRulesets('sub.foo.bar.' + host);
-          assert.isEmpty(res2, new Set(value), 'only matches one label');
+          const res2 = this.rsets.potentiallyApplicableRulesets(host + '.tld.com');
+          assert.isEmpty(res2, 'wildcard matches second level domains');
+        });
+
+        it('ignore middle wildcards', function() {
+          const target = 'www.*.' + host;
+          this.rsets.targets.set(target, value);
+
+          const res1 = this.rsets.potentiallyApplicableRulesets('www.cdn.' + host);
+          assert.isEmpty(res1, 'middle wildcards are matched');
         });
       });
     });
   });
-})
+});
diff --git a/chromium/test/testing_utils.js b/chromium/test/testing_utils.js
index eddfadb9ee3f..66657aa8fb93 100644
--- a/chromium/test/testing_utils.js
+++ b/chromium/test/testing_utils.js
@@ -1,9 +1,9 @@
-'use strict'
+'use strict';
 
 function Mock() {
   let out = function() {
     out.calledWith = Array.from(arguments);
-  }
+  };
   return out;
 }
 
diff --git a/chromium/test/update_test.js b/chromium/test/update_test.js
new file mode 100644
index 000000000000..33d96412168e
--- /dev/null
+++ b/chromium/test/update_test.js
@@ -0,0 +1,71 @@
+'use strict';
+
+const assert = require('chai').assert,
+  update = require('../background-scripts/update'),
+  chrome = require("sinon-chrome"),
+  util = require('../background-scripts/util'),
+  atob = require("atob"),
+  TextDecoder = require('text-encoding').TextDecoder,
+  sinon = require('sinon');
+
+const fs = require('fs'),
+  { update_channels } = require('../background-scripts/update_channels'),
+  pako = require('../external/pako-1.0.5/pako_inflate.min.js');
+
+util.setDefaultLogLevel(util.WARN);
+
+describe('update.js', function() {
+  const example_rulesets_gz = fs.readFileSync(__dirname + '/example.rulesets.gz');
+
+  describe('applyStoredRulesets', function() {
+    beforeEach(() => {
+      chrome.flush();
+      if(util.loadExtensionFile.restore) {
+        util.loadExtensionFile.restore();
+      }
+    });
+
+    it('applies compressed rulesets from chrome.storage', function(done) {
+      let apply_promises = [];
+
+      for(let update_channel of update_channels) {
+        const key = 'rulesets: ' + update_channel.name;
+        chrome.storage.local.get.withArgs(key).yields({[key]: example_rulesets_gz});
+      }
+
+      update.applyStoredRulesets({addFromJson: response => {
+        apply_promises.push(new Promise(resolve => {
+          assert.isArray(response);
+          assert.equal(response[0].name, "Example.com");
+          resolve();
+        }));
+
+
+        Promise.all(apply_promises).then(() => done());
+
+      }});
+
+    });
+
+    it('applies rulesets from local extension file', function(done) {
+      for(let update_channel of update_channels) {
+        const key = 'rulesets: ' + update_channel.name;
+        chrome.storage.local.get.withArgs(key).yields({});
+      }
+
+      const example_rulesets_byte_array = pako.inflate(atob(example_rulesets_gz));
+      const example_rulesets = new TextDecoder("utf-8").decode(example_rulesets_byte_array);
+      const example_rulesets_json = JSON.parse(example_rulesets);
+
+      sinon.stub(util, "loadExtensionFile").returns(example_rulesets_json.rulesets);
+
+      update.applyStoredRulesets({addFromJson: response => {
+        assert.isArray(response);
+        assert.equal(response[0].name, "Example.com");
+        done();
+      }});
+    });
+
+  });
+
+});
diff --git a/chromium/test/util_test.js b/chromium/test/util_test.js
new file mode 100644
index 000000000000..af43df7440d1
--- /dev/null
+++ b/chromium/test/util_test.js
@@ -0,0 +1,105 @@
+'use strict';
+
+const assert = require('chai').assert,
+  util = require('../background-scripts/util');
+
+
+describe('util.js', function() {
+  describe('nullIterable', function() {
+    it('is iterable zero times and is size 0', function() {
+      let count = 0;
+      for (let _ of util.nullIterable) { // eslint-disable-line no-unused-vars
+        count += 1;
+      }
+      assert.strictEqual(count, 0);
+      assert.strictEqual(util.nullIterable.size,  0);
+      assert.isEmpty(util.nullIterable);
+    });
+  });
+
+  describe('isValidHostname', function() {
+    it('return true for common hosts', function() {
+      assert.strictEqual(util.isValidHostname('example.com'). true);
+      assert.strictEqual(util.isValidHostname('www.example.com'). true);
+      assert.strictEqual(util.isValidHostname('www.subdomain.example.com'). true);
+    });
+
+    it('return true for wildcard hosts', function() {
+      assert.strictEqual(util.isValidHostname('example.*'). true);
+      assert.strictEqual(util.isValidHostname('example.com.*'). true);
+      assert.strictEqual(util.isValidHostname('*.example.com'). true);
+      assert.strictEqual(util.isValidHostname('*.subdomain.example.com'). true);
+    });
+
+    it('return false for ill-formed hosts', function() {
+      // construct a lengthy hostname which host.length > 255
+      let prefix = "e1234567890.";
+      let lengthyHostname = "example.com";
+
+      for (let i = 0; i < 100; ++i) {
+        lengthyHostname = (prefix + lengthyHostname);
+      }
+
+      assert.strictEqual(util.isValidHostname(null), false);
+      assert.strictEqual(util.isValidHostname(''), false);
+      assert.strictEqual(util.isValidHostname(lengthyHostname), false);
+      assert.strictEqual(util.isValidHostname('example..com'), false);
+      assert.strictEqual(util.isValidHostname('www.example..com'), false);
+    });
+  });
+
+  describe('getNormalisedHostname', function() {
+    it('preserve port numbers', function() {
+      assert.strictEqual(util.getNormalisedHostname('example.com'), 'example.com');
+      assert.strictEqual(util.getNormalisedHostname('example.com:8080'), 'example.com:8080');
+    });
+
+    it('removes tailing dots and preserve port numbers', function() {
+      assert.strictEqual(util.getNormalisedHostname('example.com.'), 'example.com');
+      assert.strictEqual(util.getNormalisedHostname('example.com.:8080'), 'example.com:8080');
+      assert.strictEqual(util.getNormalisedHostname('example.com..'), 'example.com');
+      assert.strictEqual(util.getNormalisedHostname('example.com..:8080'), 'example.com:8080');
+    });
+
+    it('preserves a single dot', function() {
+      assert.strictEqual(util.getNormalisedHostname('.'), '.');
+    });
+  });
+
+  describe('getWildcardExpressions', function() {
+    it('return empty result for ill-formed hosts', function() {
+      assert.strictEqual(util.getWildcardExpressions(null).size, 0);
+      assert.strictEqual(util.getWildcardExpressions('').size, 0);
+      assert.strictEqual(util.getWildcardExpressions('example.com..').size, 0);
+    });
+
+    it('return empty result for wildcard hosts', function() {
+      assert.strictEqual(util.getWildcardExpressions('example.*').size, 0);
+      assert.strictEqual(util.getWildcardExpressions('example.com.*').size, 0);
+      assert.strictEqual(util.getWildcardExpressions('*.example.com').size, 0);
+      assert.strictEqual(util.getWildcardExpressions('*.subdomain.example.com').size, 0);
+    });
+
+    it('return list of supported wildcard expression', function() {
+      const params = {
+        'example.com': [
+          'example.*'
+        ],
+        'www.example.com': [
+          'www.example.*',
+          '*.example.com'
+        ],
+        'x.y.z.google.com': [
+          'x.y.z.google.*',
+          '*.y.z.google.com',
+          '*.z.google.com',
+          '*.google.com',
+        ]
+      };
+
+      for (const host in params) {
+        assert.deepEqual(util.getWildcardExpressions(host), params[host]);
+      }
+    });
+  });
+});
diff --git a/chromium/updates-master.xml b/chromium/updates-master.xml
deleted file mode 100644
index da7b7a5ffbfc..000000000000
--- a/chromium/updates-master.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-  
-    
-  
-
diff --git a/chromium/util.js b/chromium/util.js
deleted file mode 100644
index 30ef70b69bfa..000000000000
--- a/chromium/util.js
+++ /dev/null
@@ -1,65 +0,0 @@
-"use strict";
-
-(function(exports) {
-
-var VERB = 1;
-var DBUG = 2;
-var INFO = 3;
-var NOTE = 4;
-var WARN = 5;
-// FYI: Logging everything is /very/ slow. Chrome will log & buffer
-// these console logs even when the debug tools are closed. :(
-
-// TODO: Add an easy UI to change the log level.
-// (Developers can just type DEFAULT_LOG_LEVEL=VERB in the console)
-var DEFAULT_LOG_LEVEL = NOTE;
-console.log("Hey developer! Want to see more verbose logging?");
-console.log("Type this into the console: DEFAULT_LOG_LEVEL=VERB");
-console.log("Accepted levels are VERB, DBUG, INFO, NOTE and WARN, default is NOTE");
-
-function log(level, str) {
-  if (level >= DEFAULT_LOG_LEVEL) {
-    if (level === WARN) {
-      // Show warning with a little yellow icon in Chrome.
-      console.warn(str);
-    } else {
-      console.log(str);
-    }
-  }
-}
-
-/**
- * Load a file packaged with the extension
- *
- * @param url: a relative URL to local file
- */
-function loadExtensionFile(url, returnType) {
-  var xhr = new XMLHttpRequest();
-  // Use blocking XHR to ensure everything is loaded by the time
-  // we return.
-  xhr.open("GET", chrome.extension.getURL(url), false);
-  xhr.send(null);
-  // Get file contents
-  if (xhr.readyState !== 4) {
-    return;
-  }
-  if (returnType === 'xml') {
-    return xhr.responseXML;
-  }
-  if (returnType === 'json') {
-    return JSON.parse(xhr.responseText);
-  }
-  return xhr.responseText;
-}
-
-Object.assign(exports, {
-  VERB,
-  DBUG,
-  INFO,
-  NOTE,
-  WARN,
-  log,
-  loadExtensionFile
-});
-
-})(typeof exports == 'undefined' ? require.scopes.util = {} : exports);
diff --git a/common/https-everywhere-banner.png b/common/https-everywhere-banner.png
deleted file mode 100644
index 980c1eee3e47..000000000000
Binary files a/common/https-everywhere-banner.png and /dev/null differ
diff --git a/common/icons/icon-active-16.png b/common/icons/icon-active-16.png
deleted file mode 100644
index 1c2df37087e6..000000000000
Binary files a/common/icons/icon-active-16.png and /dev/null differ
diff --git a/common/icons/icon-active-24.png b/common/icons/icon-active-24.png
deleted file mode 100644
index cfaa83bd0e28..000000000000
Binary files a/common/icons/icon-active-24.png and /dev/null differ
diff --git a/common/icons/icon-blocking-128.png b/common/icons/icon-blocking-128.png
deleted file mode 100644
index 55a7fde1aa7f..000000000000
Binary files a/common/icons/icon-blocking-128.png and /dev/null differ
diff --git a/common/icons/icon-blocking-16.png b/common/icons/icon-blocking-16.png
deleted file mode 100644
index a9feab777af1..000000000000
Binary files a/common/icons/icon-blocking-16.png and /dev/null differ
diff --git a/common/icons/icon-blocking-24.png b/common/icons/icon-blocking-24.png
deleted file mode 100644
index 0fc12fb496f0..000000000000
Binary files a/common/icons/icon-blocking-24.png and /dev/null differ
diff --git a/common/icons/icon-blocking-48.png b/common/icons/icon-blocking-48.png
deleted file mode 100644
index ff13d72255ba..000000000000
Binary files a/common/icons/icon-blocking-48.png and /dev/null differ
diff --git a/common/icons/icon-disabled-128.png b/common/icons/icon-disabled-128.png
deleted file mode 100644
index 543b428ee391..000000000000
Binary files a/common/icons/icon-disabled-128.png and /dev/null differ
diff --git a/common/icons/icon-disabled-16.png b/common/icons/icon-disabled-16.png
deleted file mode 100644
index 505f2cf8028c..000000000000
Binary files a/common/icons/icon-disabled-16.png and /dev/null differ
diff --git a/common/icons/icon-disabled-24.png b/common/icons/icon-disabled-24.png
deleted file mode 100644
index a887e380b16b..000000000000
Binary files a/common/icons/icon-disabled-24.png and /dev/null differ
diff --git a/common/icons/icon-disabled-48.png b/common/icons/icon-disabled-48.png
deleted file mode 100644
index 2f47a2036f43..000000000000
Binary files a/common/icons/icon-disabled-48.png and /dev/null differ
diff --git a/docs/adrs/bloom-filter-rule-signing.md b/docs/adrs/bloom-filter-rule-signing.md
new file mode 100644
index 000000000000..09b0fda6f2aa
--- /dev/null
+++ b/docs/adrs/bloom-filter-rule-signing.md
@@ -0,0 +1,28 @@
+# Bloom Filters and Async Rust for Ruleset Signing
+
+* Status: Deployed
+* Deciders: EFF (@zoracon and @hainish)
+* Deploy Date: 2021-03-03
+
+## Context and Problem Statement
+
+With larger ruleset lists to be signed on the DuckDuckGo Update channel, a better way to digest and form ruleset files were needed.
+
+## Decision Drivers
+
+* Bloom filters are able to ingest greater data sets at less memory expense
+* Rust is already incorporated in HTTPS Everywhere and is a memory safe language
+
+## Decision Outcome
+
+Created an async Rust script that ingests DuckDuckGo's Smarter Encryption list, compares to the Majestic Million list, and forms a bloom file and associated metadata.
+
+### Consequences and Concerns
+
+An accepted false positive is declared when the filter is generated.
+
+[Comment](https://github.com/EFForg/https-everywhere/pull/19910#issuecomment-771102775)
+
+## Links for Further Context
+* [Bloom Filter Script](https://github.com/EFForg/generate-smarter-encryption-bloom-filter)
+
diff --git a/docs/adrs/duckduckgo-smarter-encryption.md b/docs/adrs/duckduckgo-smarter-encryption.md
new file mode 100644
index 000000000000..a9c49824c9ae
--- /dev/null
+++ b/docs/adrs/duckduckgo-smarter-encryption.md
@@ -0,0 +1,33 @@
+# Incorporating DuckDuckGo Smarter Encryption
+
+* Status: Pending
+* Deciders: EFF (@zoracon and @hainish) and DuckDuckGo
+* Deploy Date: 2021-04-15
+
+## Context and Problem Statement
+
+With the increased HTTPS traffic, the current model of listed sites that support HTTPS is no longer a maintenance task that makes sense to uphold.
+
+## Decision Drivers
+
+* Firefox has an HTTPS-Only option
+* Browsers and websites are moving away from issues that created need for more granular ruleset maintenance.
+    * Mixed content is now blocked in major browsers
+    * Different domains for secure connection are now an older habit (i.e. secure.google.com)
+    * TLS 1.0, 1.1 deprecation 
+* Chrome’s Manifest V3 will force the extensions to have a ruleset cap. Instead of competing with other extensions like DuckDuckGo,  if the user prefers to use HTTPS Everywhere or DuckDuckGo's privacy essentials, we will provide the same coverage.
+* DuckDuckGo’s Smarter Encryption covers more domains than our current, more manual model.
+
+## Decision Outcome
+
+We chose to add the DuckDuckGo Smarter Encryption update channel, because it no longer is beneficial to diverse efforts with others with similar goals in this space.
+
+### Consequences and Concerns
+
+* We have many downstream partners supported and unofficial that rely on our current rulesets. This transition gives them time to make the needed decisions on their before we completely switch over to using DuckDuckGo's Smarter Encryption, and sunset our current rulesets in HTTPS Everywhere
+* …
+
+## Links for Further Context
+
+* https://spreadprivacy.com/duckduckgo-smarter-encryption/
+* https://www.eff.org/deeplinks/2020/11/10-years-https-everywhere
\ No newline at end of file
diff --git a/docs/en_US/development.md b/docs/en_US/development.md
index d6e068582ee3..b6041f652a98 100644
--- a/docs/en_US/development.md
+++ b/docs/en_US/development.md
@@ -42,9 +42,9 @@ HTTP to HTTPS. You can read more about how to write these rules
 If you want to create new rules to submit to us, we expect them to be in the
 src/chrome/content/rules directory. That directory also contains a useful
 script, make-trivial-rule, to create a simple rule for a specified domain.
-There is also a script called trivial-validate.py, to check all the pending
-rules for several common errors and oversights. For example, if you wanted to
-make a rule for the example.com domain, you could run
+There is also a script in test/validations/special/run.py, to check all the
+pending rules for several common errors and oversights. For example, if you
+wanted to make a rule for the example.com domain, you could run
 
     bash ./make-trivial-rule example.com
 
@@ -93,7 +93,8 @@ workflow down.
 
 First, tell git your name:
 
-    git config --global user.name "Your Name"   git config --global user.email "you@example.com"
+    git config --global user.name "Your Name"
+    git config --global user.email "you@example.com"
 
 Then, get a copy of the 'origin' repository:
 
diff --git a/docs/en_US/faq.md b/docs/en_US/faq.md
index e9e993b1222b..1a805b5bcf53 100644
--- a/docs/en_US/faq.md
+++ b/docs/en_US/faq.md
@@ -12,9 +12,9 @@ here](https://www.eff.org/https-everywhere/development).
     network?](#why-is-https-everywhere-preventing-me-from-joining-this-hotelschoolother-wireless-network)
 *   [Will there be a version of HTTPS Everywhere for IE, Safari, or some other
     browser?](#will-there-be-a-version-of-https-everywhere-for-ie-safari-or-some-other-browser)
-*   [Why use a whitelist of sites that support HTTPS? Why can't you try to use
+*   [Why use a allowlist of sites that support HTTPS? Why can't you try to use
     HTTPS for every last site, and only fall back to HTTP if it isn't
-    available?](#why-use-a-whitelist-of-sites-that-support-https-why-cant-you-try-to-use-https-for-every-last-site-and-only-fall-back-to-http-if-it-isnt-available)
+    available?](#why-use-a-allowlist-of-sites-that-support-https-why-cant-you-try-to-use-https-for-every-last-site-and-only-fall-back-to-http-if-it-isnt-available)
 *   [How do I get rid of/move the HTTPS Everywhere button in the
     toolbar?](#how-do-i-get-rid-ofmove-the-https-everywhere-button-in-the-toolbar)
 *   [When does HTTPS Everywhere protect me? When does it not protect
@@ -79,7 +79,7 @@ perform secure request rewriting in these browsers, feel free to let us know at
 https-everywhere at EFF.org (but note that modifying document.location or
 window.location in JavaScript is not secure).
 
-### [Why use a whitelist of sites that support HTTPS? Why can't you try to use HTTPS for every last site, and only fall back to HTTP if it isn't available?](#why-use-a-whitelist-of-sites-that-support-https-why-cant-you-try-to-use-https-for-every-last-site-and-only-fall-back-to-http-if-it-isnt-available)
+### [Why use a allowlist of sites that support HTTPS? Why can't you try to use HTTPS for every last site, and only fall back to HTTP if it isn't available?](#why-use-a-allowlist-of-sites-that-support-https-why-cant-you-try-to-use-https-for-every-last-site-and-only-fall-back-to-http-if-it-isnt-available)
 
 There are several problems with the idea of trying to automatically detect
 HTTPS on every site. There is no guarantee that sites are going to give the
diff --git a/docs/en_US/https-everywhere-popup-updated.png b/docs/en_US/https-everywhere-popup-updated.png
new file mode 100644
index 000000000000..02023090383a
Binary files /dev/null and b/docs/en_US/https-everywhere-popup-updated.png differ
diff --git a/docs/en_US/https-everywhere-popup.png b/docs/en_US/https-everywhere-popup.png
new file mode 100644
index 000000000000..373cba228739
Binary files /dev/null and b/docs/en_US/https-everywhere-popup.png differ
diff --git a/docs/en_US/https-updates.png b/docs/en_US/https-updates.png
new file mode 100644
index 000000000000..61b79a28a0b5
Binary files /dev/null and b/docs/en_US/https-updates.png differ
diff --git a/docs/en_US/my-lan.png b/docs/en_US/my-lan.png
new file mode 100644
index 000000000000..4442b022754f
Binary files /dev/null and b/docs/en_US/my-lan.png differ
diff --git a/docs/en_US/options.png b/docs/en_US/options.png
new file mode 100644
index 000000000000..77b8e5d5dce4
Binary files /dev/null and b/docs/en_US/options.png differ
diff --git a/docs/en_US/ruleset-update-channels.md b/docs/en_US/ruleset-update-channels.md
new file mode 100644
index 000000000000..24828ac0129d
--- /dev/null
+++ b/docs/en_US/ruleset-update-channels.md
@@ -0,0 +1,180 @@
+* [Ruleset Update Channels](#ruleset-update-channels)
+  * [Update Channel Format & Logic](#update-channel-format--logic)
+  * [Publishing Custom Update Channels](#publishing-custom-update-channels)
+    * [1. Creating an RSA key and generating a `jwk` object from it](#1-creating-an-rsa-key-and-generating-a-jwk-object-from-it)
+    * [2. Signing rulesets with this key](#2-signing-rulesets-with-this-key)
+      * [Setup](#setup)
+      * [Signing](#signing)
+    * [3. Publishing those rulesets somewhere](#3-publishing-those-rulesets-somewhere)
+    * [4. Getting users to use your update channel](#4-getting-users-to-use-your-update-channel)
+  * [Adding and Deleting Update Channels](#adding-and-deleting-update-channels)
+
+# Ruleset Update Channels
+
+Whenever you download HTTPS Everywhere, it comes with a long list of *rulesets* that are maintained by the community.  These rulesets tell HTTPS Everywhere when and how to redirect requests to the secure version of a site.  HTTPS Everywhere includes tens of thousands of these rulesets, which are public and ever-changing as we expand and improve coverage.  They are delivered to you with each new version of the extension, along with all the code that makes up the extension itself.  Between and in addition to extension updates, code within the extension fetches regular updates to the rulesets.  This ensures that you get more up-to-date coverage for sites that offer HTTPS, and you'll encounter fewer sites that break due to bugs in our list of supported sites.
+
+![](https-updates.png)
+
+We deliver these rulesets via what we call an *update channel*.  Currently, HTTPS Everywhere is delivered with a single update channel, named `EFF (Full)`.  You can see this channel when you click on the HTTPS Everywhere icon and look at the bottom of the popup:
+
+![](https-everywhere-popup.png)
+
+First, the extension version is shown (in this case 2018.8.22), and then the version of the rulesets for a given update channel is shown (in this case 2018.8.30).
+
+## Update Channel Format & Logic
+
+Update channels can be found in [`chromium/background-scripts/update_channels.js`](https://github.com/EFForg/https-everywhere/blob/master/chromium/background-scripts/update_channels.js), and consist of:
+
+1. A `name` string, which identifies it and will be displayed in the extension popup
+2. A `jwk` object, which defines the RSA public key to use when verifying downloaded rulesets
+3. A `update_path_prefix` string, which tells the extension where to look for new rulesets
+4. A `scope` string, which is used to construct a JavaScript `RegExp` object
+5. A `replaces_default_rulesets` boolean, which tells the extension whether to overwrite the rulesets bundled with the extension
+
+Every 24 hours, the extension checks the URL contained in `update_path_prefix` appended with `/latest-rulesets-timestamp` (in the case of `EFF (Full)`, `https://www.https-rulesets.org/v1//latest-rulesets-timestamp`).  If it discovers the timestamp has updated since the last time it fetched the rulesets, it will download a new ruleset, following the format `update_path_prefix` appended with `default.rulesets.XXXXXXXXXX.gz`, where `XXXXXXXXXX` is the timestamp discovered in the previous request.  At the same time, a corresponding signature for that file is downloaded, `update_path_prefix` appended with `rulesets-signature.XXXXXXXXXX.sha256`, again with the timestamp replacing the `XXXXXXXXXX`.
+
+It then attempts to verify the rulesets, which are signed with the private RSA key corresponding to the public key in the update channel's `jwk` object.  If the signature verifies, the rulesets are stored and applied to the running instance of the extension.  If it can not be verified, the rulesets are discarded and the last known good state is used.
+
+Once the rulesets are stored, they will be allowed to operate on URLs only within the `scope` of the update channel, as found above.  URLs must match the regular expression in this string in order to be redirected.  This string will be used as the first and only argument when constructing a JavaScript `RegExp` object.  If you wanted to define an update channel that only operated on URLs with the `www` subdomain, you could do so by entering the string `^https?://www\\.`, for example:
+
+```javascript
+> re = new RegExp('^https?://www\\.');
+/^https?:\/\/www\./
+> "http://www.example.com/".match(re);
+[ 'http://www.',
+  index: 0,
+  input: 'http://www.example.com/',
+  groups: undefined ]
+> "http://example.com/".match(re);
+null
+```
+
+## Publishing Custom Update Channels
+
+In addition to the rulesets contained in the EFF update channel, you may want to publish your own.  There are a few instances where this may be useful:
+
+1. You are on a corporate LAN and would rather not divulge the internal DNS records for various services by submitting rulesets to the public list
+2. You are an organization that verifies `onion` services, and would like to create vanity URLs for the `onion` services that you've verified (this will make [usability of onion URLs](https://blog.torproject.org/cooking-onions-names-your-onions) much better)
+3. You would like to implement tracker blocking within HTTPS Everywhere by forwarding a list of hosts to an unroutable address
+
+There may be additional use cases not enumerated here.  For this to be effective, an organization has to publish their own custom update channel.  This involves a few steps:
+
+1. Creating an RSA key and generating a `jwk` object from it
+2. Signing rulesets with this key
+3. Publishing those rulesets somewhere
+4. Getting users to use your update channel
+
+We will go through each of these in sequence, but first, you'll want to consider if you want your signing process airgapped or not.  Airgapped signing has the advantage of making it hard for malware to exfiltrate key material and thus forge a signed ruleset update, but it will also make it slightly more difficult to sign.  If you decide on an airgapped signing process, you may want to copy the script [`utils/sign-rulesets/async-airgap.sh`](https://github.com/EFForg/https-everywhere/blob/master/utils/sign-rulesets/async-airgap.sh) to the airgap *before* cutting off networking for the last time.  You may also want to install the `python-qr` code on this machine to easily copy the RSA public key to your development environment, once generated, as well as `qrencode` and `eog` for ease in the signing process.
+
+### 1. Creating an RSA key and generating a `jwk` object from it
+
+To create an RSA key, issue the following command (either on your development machine if you are not using an airgapped process, or the airgap if you are):
+
+    openssl genrsa -out key.pem 4092
+
+Your RSA keypair will now be stored in the file `key.pem`.  To generate a corresping public key, issue this command:
+
+    openssl rsa -in key.pem -outform PEM -pubout -out public.pem
+
+Your public key is now stored in `public.pem`.  If you are using an airgap, copy this public key (with whatever method is safest in your setup, perhaps with the `qr` command) to your development environment.
+
+At this point, you will need to generate a `jwk` object from the public key.  This can be done with the `pem-jwk` node package.  You'll have to download node.js and npm, or just issue this command in docker:
+
+    sudo docker run -it -v $(pwd):/opt --workdir /opt node bash
+
+And you will be booted into a node environment.  Next, run
+
+    npm install -g pem-jwk
+
+This will install the `pem-jwk` package globally.  You can now run
+
+    cat public.pem | pem-jwk
+
+And you should see a `jwk` object displayed.  Take note of this, you will need it later.
+
+### 2. Signing rulesets with this key
+
+#### Setup
+
+On your development machine, clone or download the HTTPS Everywhere repository.  Since it's quite large, it will suffice to do a shallow clone:
+
+    git clone --depth=1 https://github.com/EFForg/https-everywhere.git
+
+or
+
+    curl -sLO https://github.com/EFForg/https-everywhere/archive/master.zip; unzip master.zip; mv https-everywhere-master https-everywhere
+
+Next,
+
+    cd https-everywhere
+    rm rules/*.xml
+
+This will remove all the rulesets bundled with the extension itself.  All the rulesets you want to sign for your update channel must be in the `rules` directory before moving to the next step.  Generate an example ruleset or use your own ruleset:
+
+    cd rules
+    ./make-trivial-rule example.com
+    cd ..
+
+#### Signing
+
+You will need python 3.6 on your system or available via docker for the next step.
+
+    sudo docker run -it -v $(pwd):/opt --workdir /opt python:3.6 bash
+
+Next, run
+
+    python3 utils/merge-rulesets.py
+
+You should see the following output:
+
+```shell
+ * Parsing XML ruleset and constructing JSON library...
+ * Writing JSON library to src/chrome/content/rules/default.rulesets
+ * Everything is okay.
+```
+
+This prepares the file you are about to sign.  If your do not have an airgap, run the following command:
+
+    utils/sign-rulesets/standalone.sh /path/to/key.pem /some/output/path
+
+If you have an airgapped setup, run the following command on your development machine:
+
+    utils/sign-rulesets/async-request.sh /path/to/public.pem /some/output/path
+
+This will display a hash for signing, as well as a metahash.  On your airgap machine, run the `async-airgap.sh` script that you had previously copied to it:
+
+    ./async-airgap.sh /path/to/key.pem SHA256_HASH
+
+typing the hash carefully.  Check the metahash to make sure it is the same as what was displayed on your development machine.  This will output base64-encoded data as well as a QR code representing that data that you can scan, and send that data to your development machine.  Once you have that data from the QR code pasted into the development machine prompt, press Ctrl-D and you should have output indicating that your rulesets have been signed successfully.
+
+### 3. Publishing those rulesets somewhere
+
+Once you've signed the rulesets successfully, choose a public URL to make these rulesets accessible.  You may want to use a CDN if you expect a lot of traffic on this endpoint.  Your rulesets as well as their signatures are stored in `/some/output/path` you chose above, you need only to upload them to an endpoint your users can access.
+
+### 4. Getting users to use your update channel
+
+Once you've established an update channel by publishing your rulesets, you'll want to let your users know how to use them.  From step 1 above, you have a `jwk` object.  You may want to also only allow modification of certain URLs, using the `scope` field.  The `update_path_prefix` field will simply be the public URL that you chose in step 3.
+
+If your users are using a custom build of HTTPS Everywhere (such as in a corporate LAN environment), you can modify [`chromium/background-scripts/update_channels.js`](https://github.com/EFForg/https-everywhere/blob/master/chromium/background-scripts/update_channels.js) to include a new update channel in the same format as the EFF update channel.
+
+In most cases, your users will just be using a standard HTTPS Everywhere build.  In this case, they will have to add your update channel using the UX, as explained below.
+
+## Adding and Deleting Update Channels
+
+In addition to being defined in `update_channels.js`, users can add additional update channels via the extension options.
+
+In Firefox, enter `about:addons` into the URL bar, then click on `Extensions` on the left navbar, then click `Preferences` next to the HTTPS Everywhere extension.
+
+In Chrome, right-click on the HTTPS Everywhere icon and click `Options`.
+
+You will now see the HTTPS Everywhere options page.  Click `Update Channels`.
+
+You will now see a list of update channels, with `EFF (Full)` being the first.  Below, you can add a new update channel.  Once you hit `Update`, the channel will download a new ruleset release (if available) from the channel.
+
+![](options.png)
+
+If a new ruleset update is available, after a few seconds you should now see the new ruleset version in the bottom of the extension popup:
+
+![](my-lan.png)
+
+You can also delete rulesets from the extension options.  Under `Update Channels`, just click `Delete` for the channel you want to delete.  This will immediately remove the rulesets from this update channel.
diff --git a/docs/en_US/rulesets.md b/docs/en_US/rulesets.md
index cf607772cf8a..f9f71f020f34 100644
--- a/docs/en_US/rulesets.md
+++ b/docs/en_US/rulesets.md
@@ -3,14 +3,14 @@
 This page describes how to write rulesets for [HTTPS
 Everywhere](https://eff.org/https-everywhere), a browser extension that
 switches sites over from HTTP to HTTPS automatically. HTTPS Everywhere comes
-with [thousands](http://www.eff.org/https-everywhere/atlas/) of rulesets that
+with [thousands](https://atlas.eff.org/index.html) of rulesets that
 tell HTTPS Everywhere which sites it should switch to HTTPS and how. If there
 is a site that offers HTTPS and is not handled by the extension, this guide
 will explain how to add that site.
 
 #### [Rulesets](#rulesets)
 
-A `ruleset` is an [XML](http://www.xml.com/pub/a/98/10/guide0.html?page=2) file
+A `ruleset` is an [XML](https://www.xml.com/pub/a/98/10/guide0.html?page=2) file
 describing behavior for a site or group of sites. A ruleset contains one or
 more `rules`. For example, here is
 [`RabbitMQ.xml`](https://github.com/efforg/https-everywhere/blob/master/src/chrome/content/rules/RabbitMQ.xml),
@@ -18,11 +18,11 @@ from the addon distribution:
 
 ```xml
 
-        
-        
+	
+	
 
-        
+	
 
 ```
 
@@ -37,7 +37,7 @@ match that host name.
 
 HTTPS Everywhere then tries each rule in those rulesets against the full URL.
 If the [Regular
-Expression](http://www.regular-expressions.info/quickstart.html), or regexp, in
+Expression](https://www.regular-expressions.info/quickstart.html), or regexp, in
 one of those rules matches, HTTPS Everywhere [rewrites the
 URL](#rules-and-regular-expressions) according the `to` attribute of the rule.
 
@@ -58,16 +58,16 @@ separate target.
 #### [Rules and Regular Expressions](#rules-and-regular-expressions)
 
 The `rule` tags do the actual rewriting work. The `from` attribute of each rule
-is a [regular expression](http://www.regular-expressions.info/quickstart.html)
+is a [regular expression](https://www.regular-expressions.info/quickstart.html)
 matched against a full URL. You can use rules to rewrite URLs in simple or
 complicated ways. Here's a simplified (and now obsolete) example for Wikipedia:
 
 ```xml
 
-  
+	
 
-  
+	
 
 ```
 
@@ -84,9 +84,9 @@ between rulesets is unspecified. Only the first rule or exception matching a
 given URL is applied.
 
 Rules are evaluated using [Javascript regular
-expressions](http://www.regular-expressions.info/javascript.html), which are
+expressions](https://www.regular-expressions.info/javascript.html), which are
 similar but not identical to [Perl-style regular
-expressions.](http://www.regular-expressions.info/pcre.html) Note that if your
+expressions.](https://www.regular-expressions.info/pcre.html) Note that if your
 rules include ampersands (&), they need to be appropriately XML-encoded:
 replace each occurrence of **&** with **&#x26;**.
 
@@ -97,7 +97,7 @@ the rule should **not** be applied. The Stack Exchange rule contains an
 exclusion for the OpenID login path, which breaks logins if it is rewritten:
 
 ```xml
-
+
 ```
 
 Exclusions are always evaluated before rules in a given ruleset. Matching any
@@ -118,7 +118,7 @@ less cumbersome.
 #### [Secure Cookies](#secure-cookies)
 
 Many HTTPS websites fail to correctly set the [secure
-flag](https://secure.wikimedia.org/wikipedia/en/wiki/HTTP_cookie#Secure_and_HttpOnly)
+flag](https://en.wikipedia.org/wiki/HTTP_cookie#Secure_and_HttpOnly)
 on authentication and/or tracking cookies. HTTPS Everywhere provides a facility
 for turning this flag on. For instance:
 
@@ -189,8 +189,8 @@ element, with a value explaining why the rule is off.
 
 ```xml
 
-   
-   
+	
+	
  
 ```
 
@@ -200,13 +200,9 @@ file.
 #### [Mixed Content Blocking (MCB)](#mixed-content-blocking-mcb)
 
 Some rulesets may trigger active mixed content (i.e. scripts loaded over HTTP
-instead of HTTPS). This type of mixed content is blocked in both
-[Chrome](https://trac.torproject.org/projects/tor/ticket/6975) and Firefox,
+instead of HTTPS). This type of mixed content is blocked in most major browsers,
 before HTTPS Everywhere has a chance to rewrite the URLs to an HTTPS version.
-This generally breaks the site. However, the Tor Browser doesn't block
-mixed content, in order to allow HTTPS Everywhere to try and rewrite the URLs
-to an HTTPS version.
-
-To enable a rule only on platforms that allow mixed content (currently only the
-Tor Browser), you can add a `platform="mixedcontent"` attribute to the ruleset
-element.
+This generally breaks the site. Depending on their configuration and threat
+model, some users might however decide to enable these rulesets via a global
+option in HTTPS Everywhere. To that effect, such rulesets are identified with 
+the specific `platform="mixedcontent"` attribute to the ruleset element.
diff --git a/docs/es/faq.md b/docs/es/faq.md
index c3074a1dd629..bdd7547fc376 100644
--- a/docs/es/faq.md
+++ b/docs/es/faq.md
@@ -12,10 +12,10 @@ recursos [enumerados aquí](https://www.eff.org/https-everywhere/development).
     inalámbrica?](#why-is-https-everywhere-preventing-me-from-joining-this-hotelschoolother-wireless-network)
 *   [¿Habrá una versión de HTTPS Everywhere para IE, Safari o algún otro
     navegador?](#will-there-be-a-version-of-https-everywhere-for-ie-safari-or-some-other-browser)
-*   [¿Por qué utilizar una lista blanca de sitios que admiten HTTPS? ¿Por qué
+*   [¿Por qué utilizar una lista de sitios aprobados que admiten HTTPS? ¿Por qué
     no pueden intentar utilizar HTTPS para cada sitio, y sólo volver a HTTP si
     no está
-    disponible?](#why-use-a-whitelist-of-sites-that-support-https-why-cant-you-try-to-use-https-for-every-last-site-and-only-fall-back-to-http-if-it-isnt-available)
+    disponible?](#why-use-a-allowlist-of-sites-that-support-https-why-cant-you-try-to-use-https-for-every-last-site-and-only-fall-back-to-http-if-it-isnt-available)
 *   [¿Cómo puedo eliminar o mover el botón HTTPS Everywhere de la barra de
     herramientas?](#how-do-i-get-rid-ofmove-the-https-everywhere-button-in-the-toolbar)
 *   [¿Cuándo me protege HTTPS Everywhere? ¿Cuándo no me
@@ -82,7 +82,7 @@ estos navegadores, no dude en hacérnoslo saber en https-everywhere en EFF.org
 (pero tenga en cuenta que modificar document.location o window.location en
 JavaScript no es seguro).
 
-### [¿Por qué utilizar una lista blanca de sitios que admiten HTTPS? ¿Por qué no pueden intentar utilizar HTTPS para cada sitio, y sólo volver a HTTP si no está disponible?](#why-use-a-whitelist-of-sites-that-support-https-why-cant-you-try-to-use-https-for-every-last-site-and-only-fall-back-to-http-if-it-isnt-available)
+### [¿Por qué utilizar una lista de sitios aprobados que admiten HTTPS? ¿Por qué no pueden intentar utilizar HTTPS para cada sitio, y sólo volver a HTTP si no está disponible?](#why-use-a-allowlist-of-sites-that-support-https-why-cant-you-try-to-use-https-for-every-last-site-and-only-fall-back-to-http-if-it-isnt-available)
 
 Hay varios problemas con la idea de tratar de detectar automáticamente HTTPS en
 cada sitio. No hay ninguna garantía de que los sitios van a dar la misma
diff --git a/dummy-chromium.pem b/dummy-chromium.pem
index 00a62898fc11..b6bb2a5ed409 100644
--- a/dummy-chromium.pem
+++ b/dummy-chromium.pem
@@ -1,27 +1,13 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEAt4ew59KRXh6f9/sk4gbt5LqO5+yOGwEw6kwZxZl66BdZZyg5
-lFIt7je6s/OmEPpq4pHZ7cROfckYnOacFHYng68ZvYY2/0l7iBY1CjKMwe9TFoYv
-uqG6dCC2h4sbzikTO2dvarxptnSVm5Zbuw6mQTmCRKUzcey/njPq49nu0RcKvm+c
-NVRZCLofKHrioQcVt+9ig9I390Z9sF7l1uNy7IVdRw4B8KMJT22ghEGusYmFioHR
-jzVpTSetxcEfznJVzZWLfKqU45CY+ggDy2MhNVRFvTlFkENJoOtKRj/Xp6/0FqY4
-FqhglMdQI6cmhQibmQdzv9Q39P3lGRU3AEVJawIDAQABAoIBADEk75UUCIMIdlOD
-95tiuZ8O6adm66KFjiCfIiOMdqHhZro9xjVWUCBC4ga/zo8rTyW+YnnNoCsEh0e0
-ZMUB4pDbeWwLnXx8o8yMDcXeRVzFBh247tzt46ym+dmPwXFSBGlayDXvn+sQiuMv
-vv527MP4b06MYhs2hxUI1/QNbmqkaZNlJVaXlVjdNGjbdsEy8rVQIxdKkEG0qVKN
-4wH7aVmRTAYDJedDc+8eePviCYfthr1/1qX7Wj/sY+rKQFoxwTRhTs2hRwV0U0Wl
-1Gmk2Gz07l1M2mY+cImowOPYZT1jwiFSwoOczJNEmupH/F1VLomH12bkcb2l2lwi
-Ne1JubECgYEA5zYUfdm1/5SBnAmONcReos6w3CjzxlD7dcaFx1XIaGSfGU+H7MO7
-tdQfMVsAq+6SoO+DRBDS3Dn/2/imFxQ+2dYpuJvbQOzNKLqLU9M7LF8kBJFxP35C
-8GVhe6l+c8Csl4nK/bllzLsxtCatzL+cs7TNCvZUeQD6G86PoM1zH8MCgYEAyzTu
-y0UgG67a+MFcVdngRwcFIX06YeQSxAEkRFULaa/Yh6KEwaeYhTPv8rGIPJLAS8T7
-5UVJ4T3yVCPQBZ0Y11tLvh7onRTeEKevihBEDSSIsf020mYwgX5F3TD6JlwjVIpV
-k96AtDRcd27Y5eznCu94QyPbjUQbegWHNH9LfTkCgYBvIHwK3PfvpmYBJEqYpxBB
-OgyhVIGOQOALhGZKH33aRvp9BM+0yYLP6usvIqkY+eq5tUSnE1r1hF7oUAMsNova
-0WduFmL0OpyExdwvZuga9INwOqNuu/Xaay/GavmfEu0hTJYnCtPV6ecCylBgh3v+
-l5ixeyGwovqTIN3BkN2TVwKBgDighJcCqWLthDnj8G5AK/6/Fw/xDM7wtsYGJ2wf
-YvHNvgJ2KJaqtJcSFSDFlliC8LFssGGAwIjTMW9/F14pHB4PY/kUNfBoO0Xa5NEN
-nVkoQCuRi7BwJ74+SQvNtTfxXysU7aoqTCVrngTuT+Uq8muatiHHoUwpmZqUZcwc
-WRYJAoGACI3XKiDqhbVoDOvyTkDP1Fo651OH6z/6XTBEYB4ICoY7O2kL4BUwnUkh
-uzDVkAi5XrztUKZPE/HISTgq09umkrw4taFAXs3cBbLSns0C32SggNZGUCSfFScx
-hys49ypF5iddhaMBD5WtUMhrWTc1rUUQGaOlQ10xmAy1yCA2VK0=
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIB5gIBADANBgkqhkiG9w0BAQEFAASCAdAwggHMAgEAAmEA3BZGOZsEWGEc82Yz
+Ddrey4Vp8dV4AQZPu2tM32Z6ZEx2538G3bWu5g0OPzX8Oqvzqr8ZRIvxcBbL3kgZ
+5wnhjVRTlWy0jxZDHCvVsATzhbhAt505zljHaRS1PrCYfV/nAgMBAAECYCQpRMCS
+R9R9oFQdpqXQIGswMIgbmuwQLWmN58ONAu8X4TGIHYiwIVyLKJwaMqcxOTn753Us
+7vFbGwoMnO3Krzh1Xn9z6uKnB7dDotgc9ZIQ5Ja8ExjJhl5iBMSWePYWAQIxAPRo
+yZ+JdWu+/y+/F6KsiCDx8EmdV8Dd09BogXH31S2VtSUEfZd/UDUPgbRgo+c9dwIx
+AOaGNJyJbHY4UCxC2hRBRZGNlic8SaFKEQAtN28gMWMDMgAh0ik8YtrPffBed+bN
+EQIxAOwTAx0MItTt6YLu6x9/0wUva89PIWHzYhKdvtqcbdbYEd4tljntCUYXMktO
+RUKoRQIxAL/3PHKqoc6kwGbLWO2LGVLHNCYCN1J/6j5aaRI6HcZVD9s6TteV+MA8
+D6UOFgz18QIxAJKXHDXXF+LXGsOwRMcp8nqg9Ri9daWW74JWyozFRqIsRhnhDhw9
+8f4cUAPw7BquBw==
+-----END PRIVATE KEY-----
diff --git a/hooks/precommit b/hooks/precommit
index 0f2873b9ca42..04c65b738ac5 100755
--- a/hooks/precommit
+++ b/hooks/precommit
@@ -39,7 +39,7 @@ if [ "$CHANGED_RULESETS" ]; then
             continue
         fi
 
-        ./utils/trivial-validate.py --quiet $FILE
+        python3 test/validations/special/run.py --quiet $FILE
         RESULT=$?
 
         if [ $RESULT -ne 0 ]; then
diff --git a/install-dev-dependencies.sh b/install-dev-dependencies.sh
index 98b45d9b799a..9259d02b8676 100755
--- a/install-dev-dependencies.sh
+++ b/install-dev-dependencies.sh
@@ -9,7 +9,7 @@ if [ "$1" != "--no-prompt" ]; then
   echo "may alter your system, installing requirements both within the package"
   echo "management system and also external binaries."
   echo
-  echo -n "Are you sure you want to continue? [Y/n]: "
+  echo -n "Are you sure you want to continue? [y/N]: "
   read CONTINUE
   CONTINUE=`echo $CONTINUE | xargs | head -c 1 | awk '{print tolower($0)}'`
   if [ "$CONTINUE" != "y" ]; then
@@ -22,48 +22,57 @@ if [ $UID != 0 ]; then
   SUDO_SHIM=sudo
 fi
 
-if type apt-get >/dev/null ; then
+if [ "`uname -m`" == "x86_64" ]; then
+  ARCH=64
+else
+  ARCH=32
+fi
+
+# debian based installation
+if type apt-get>/dev/null 2>&1;  then
   $SUDO_SHIM apt-get update
   $SUDO_SHIM apt-get install -y lsb-release
   BROWSERS="firefox chromium-browser"
   CHROMEDRIVER="chromium-chromedriver"
   if [[ "$(lsb_release -is)" == "Debian" ]]; then
-    # Iceweasel is the rebranded Firefox that Debian ships, and Chromium
-    # takes the name of 'chromium' instead of 'chromium-browser' in
+    # Chromium takes the name of 'chromium' instead of 'chromium-browser' in
     # Debian 7 (wheezy) and later.
-    BROWSERS="iceweasel chromium"
-    CHROMEDRIVER="chromedriver"
+    BROWSERS="firefox-esr chromium"
+    CHROMEDRIVER="chromium-driver"
   fi
   $SUDO_SHIM apt-get install -y libxml2-dev libxml2-utils libxslt1-dev \
-    python3.6-dev $BROWSERS zip sqlite3 python3-pip libcurl4-openssl-dev xvfb \
+    python3-dev $BROWSERS zip sqlite3 python3-pip libcurl4-openssl-dev xvfb \
+    nodejs \
+    npm \
     libssl-dev git curl $CHROMEDRIVER
-  if ! type geckodriver >/dev/null; then
-    curl -LO "https://github.com/mozilla/geckodriver/releases/download/v0.17.0/geckodriver-v0.17.0-linux64.tar.gz"
-    tar -zxvf "geckodriver-v0.17.0-linux64.tar.gz"
-    rm -f "geckodriver-v0.17.0-linux64.tar.gz"
+  if ! type geckodriver >/dev/null 2>&1;  then
+    curl -LO "https://github.com/mozilla/geckodriver/releases/download/v0.24.0/geckodriver-v0.24.0-linux$ARCH.tar.gz"
+    tar -zxvf "geckodriver-v0.24.0-linux$ARCH.tar.gz"
+    rm -f "geckodriver-v0.24.0-linux$ARCH.tar.gz"
     $SUDO_SHIM mv geckodriver /usr/bin/geckodriver
     $SUDO_SHIM chown root /usr/bin/geckodriver
     $SUDO_SHIM chmod 755 /usr/bin/geckodriver
   fi
-  if [ ! -f /usr/lib/chromium/chromedriver ] && [ -f `which chromedriver` ]; then
-    ln -s `which chromedriver` /usr/lib/chromium/chromedriver
+  if [ ! -f /usr/lib/chromium-browser/chromedriver ] && [ -f `which chromedriver` ]; then
+    $SUDO_SHIM ln -s `which chromedriver` /usr/lib/chromium-browser/chromedriver
   fi
-elif type brew >/dev/null ; then
+
+# macOS installation
+elif type brew >/dev/null 2>&1; then
   brew list python &>/dev/null || brew install python
-  brew install libxml2 gnu-sed chromedriver
+  brew cask install chromedriver
+  brew install libxml2 gnu-sed
+  brew install node
   if ! echo $PATH | grep -ql /usr/local/bin ; then
     echo '/usr/local/bin not found in $PATH, please add it.'
   fi
-elif type dnf >/dev/null ; then
+
+# distros that use rpm (Fedora, Suse, CentOS) installation
+elif type dnf >/dev/null 2>&1; then
   $SUDO_SHIM dnf install -y firefox gcc git libcurl-devel libxml2-devel \
-    libxslt-devel python-devel redhat-rpm-config xorg-x11-server-Xvfb which \
-    findutils procps openssl openssl-devel chromium GConf2 rsync
+    libxslt-devel python3-devel redhat-rpm-config xorg-x11-server-Xvfb which \
+    findutils procps openssl openssl-devel chromium GConf2
   if ! type chromedriver >/dev/null; then
-    if [ "`uname -m`" == "x86_64" ]; then
-      ARCH=64
-    else
-      ARCH=32
-    fi
     curl -O "https://chromedriver.storage.googleapis.com/2.23/chromedriver_linux$ARCH.zip"
     unzip "chromedriver_linux$ARCH.zip"
     rm -f "chromedriver_linux$ARCH.zip"
@@ -71,20 +80,31 @@ elif type dnf >/dev/null ; then
     $SUDO_SHIM chown root /usr/bin/chromedriver
     $SUDO_SHIM chmod 755 /usr/bin/chromedriver
   fi
-  if ! type geckodriver >/dev/null; then
-    curl -LO "https://github.com/mozilla/geckodriver/releases/download/v0.17.0/geckodriver-v0.17.0-macos.tar.gz"
-    tar -zxvf "geckodriver-v0.17.0-macos.tar.gz"
-    rm -f "geckodriver-v0.17.0-macos.tar.gz"
+  if ! type geckodriver >/dev/null 2>&1;  then
+    curl -LO "https://github.com/mozilla/geckodriver/releases/download/v0.24.0/geckodriver-v0.24.0-macos.tar.gz"
+    tar -zxvf "geckodriver-v0.24.0-macos.tar.gz"
+    rm -f "geckodriver-v0.24.0-macos.tar.gz"
     $SUDO_SHIM mv geckodriver /usr/bin/geckodriver
     $SUDO_SHIM chown root /usr/bin/geckodriver
     $SUDO_SHIM chmod 755 /usr/bin/geckodriver
   fi
+
   # This is needed for Firefox on some systems. See here for more information:
   # https://github.com/EFForg/https-everywhere/pull/5584#issuecomment-238655443
   if [ ! -f /var/lib/dbus/machine-id ]; then
     $SUDO_SHIM sh -c 'dbus-uuidgen > /var/lib/dbus/machine-id'
   fi
   export PYCURL_SSL_LIBRARY=openssl
+
+  #Node
+  curl -sL https://rpm.nodesource.com/setup_12.x | $SUDO_SHIM bash -
+  $SUDO_SHIM yum install -y nodejs
+  $SUDO_SHIM yum install gcc-c++ make
+else
+    echo \
+    "Your distro isn't supported by this script yet!"\
+    "Please install dependencies manually."
+    exit
 fi
 
 # Get the addon SDK submodule and rule checker
@@ -92,7 +112,7 @@ git submodule init
 git submodule update
 
 # Install Python packages
-pip3 install --user --no-allow-insecure --no-allow-external -r requirements.txt
+pip3 install --user -r requirements.txt
 cd test/rules
 pip3 install --user -r requirements.txt
 cd -
@@ -100,5 +120,8 @@ cd test/chromium
 pip3 install --user -r requirements.txt
 cd -
 
+# Install Node Package for CRX Verification
+$SUDO_SHIM npm -g i crx3-utils
+
 # Install git hook to run tests before pushing.
 ln -sf ../../test.sh .git/hooks/pre-push
diff --git a/lib-wasm b/lib-wasm
new file mode 160000
index 000000000000..dfad18667846
--- /dev/null
+++ b/lib-wasm
@@ -0,0 +1 @@
+Subproject commit dfad186678467a3f78e0d6a61400ed2f9c5d663d
diff --git a/make.sh b/make.sh
index fbb4e062542b..415b80090c4a 100755
--- a/make.sh
+++ b/make.sh
@@ -19,9 +19,63 @@
 # but these .crx files won't detect and upgrade to official HTTPS Everywhere
 # releases signed by EFF :/.  We should find a more elegant arrangement.
 
+! getopt --test > /dev/null
+if [[ ${PIPESTATUS[0]} -ne 4 ]]; then
+  echo 'I’m sorry, `getopt --test` failed in this environment.'
+  exit 1
+fi
+
+OPTIONS=eck:
+LONGOPTS=remove-extension-update,remove-update-channels,key:
+! PARSED=$(getopt --options=$OPTIONS --longoptions=$LONGOPTS --name "$0" -- "$@")
+if [[ ${PIPESTATUS[0]} -ne 0 ]]; then
+  # e.g. return value is 1
+  #  then getopt has complained about wrong arguments to stdout
+  exit 2
+fi
+
+# read getopt’s output this way to handle the quoting right:
+eval set -- "$PARSED"
+
+REMOVE_EXTENSION_UPDATE=false
+REMOVE_UPDATE_CHANNELS=false
+KEY=$(pwd)/dummy-chromium.pem
+while true; do
+  case "$1" in
+    -e|--remove-extension-update)
+      REMOVE_EXTENSION_UPDATE=true
+      shift
+      ;;
+    -c|--remove-update-channels)
+      REMOVE_UPDATE_CHANNELS=true
+      shift
+      ;;
+    -k|--key)
+      KEY="$2"
+      shift 2
+      ;;
+    --)
+      shift
+      break
+      ;;
+    *)
+      echo "Programming error"
+      exit 3
+      ;;
+  esac
+done
+
+if [ "${KEY:0:1}" != "/" ]; then
+  echo "Key must be specified as an absolute path."
+  exit 4
+fi
+
+
+
+
 cd $(dirname $0)
 
-if [ -n "$1" -a "$1" != "--remove-update-channel" ]; then
+if [ -n "$1" ]; then
   BRANCH=`git branch | head -n 1 | cut -d \  -f 2-`
   SUBDIR=checkout
   [ -d $SUBDIR ] || mkdir $SUBDIR
@@ -31,116 +85,111 @@ if [ -n "$1" -a "$1" != "--remove-update-channel" ]; then
   git submodule update --recursive -f
 fi
 
-VERSION=`python3.6 -c "import json ; print(json.loads(open('chromium/manifest.json').read())['version'])"`
+VERSION=`python3 -c "import json ; print(json.loads(open('chromium/manifest.json').read())['version'])"`
 
 echo "Building version" $VERSION
 
 [ -d pkg ] || mkdir -p pkg
-[ -e pkg/crx ] && rm -rf pkg/crx
+[ -e pkg/crx-cws ] && rm -rf pkg/crx-cws
+[ -e pkg/crx-eff ] && rm -rf pkg/crx-eff
 [ -e pkg/xpi-amo ] && rm -rf pkg/xpi-amo
 [ -e pkg/xpi-eff ] && rm -rf pkg/xpi-eff
 
 # Clean up obsolete ruleset databases, just in case they still exist.
 rm -f src/chrome/content/rules/default.rulesets src/defaults/rulesets.sqlite
 
-sed -e "s/VERSION/$VERSION/g" chromium/updates-master.xml > chromium/updates.xml
-
-mkdir -p pkg/crx/rules
-cd pkg/crx
-rsync -aL ../../chromium/ ./
+mkdir -p pkg/crx-cws/rules
+cd pkg/crx-cws
+cp -a ../../chromium/* ./
 # Turn the Firefox translations into the appropriate Chrome format:
 rm -rf _locales/
 mkdir _locales/
-python3.6 ../../utils/chromium-translations.py ../../translations/ _locales/
-python3.6 ../../utils/chromium-translations.py ../../src/chrome/locale/ _locales/
+python3 ../../utils/chromium-translations.py ../../translations/ _locales/
+python3 ../../utils/chromium-translations.py ../../src/chrome/locale/ _locales/
 do_not_ship="*.py *.xml"
 rm -f $do_not_ship
+
+mkdir wasm
+cp ../../lib-wasm/pkg/*.wasm wasm
+cp ../../lib-wasm/pkg/*.js wasm
+
 cd ../..
 
-python3.6 ./utils/merge-rulesets.py || exit 1
+python3 ./utils/merge-rulesets.py || exit 5
+
+cp src/chrome/content/rules/default.rulesets pkg/crx-cws/rules/default.rulesets
 
-cp src/chrome/content/rules/default.rulesets pkg/crx/rules/default.rulesets
+sed -i -e "s/VERSION/$VERSION/g" pkg/crx-cws/manifest.json
 
-sed -i -e "s/VERSION/$VERSION/g" pkg/crx/manifest.json
+for x in `cat .build_exclusions`; do
+  rm -rf pkg/crx-cws/$x
+done
 
-cp -a pkg/crx pkg/xpi-amo
-cp -a pkg/crx pkg/xpi-eff
+cp -a pkg/crx-cws pkg/crx-eff
+cp -a pkg/crx-cws pkg/xpi-amo
+cp -a pkg/crx-cws pkg/xpi-eff
 cp -a src/META-INF pkg/xpi-amo
 cp -a src/META-INF pkg/xpi-eff
 
+
 # Remove the 'applications' manifest key from the crx version of the extension, change the 'author' string to a hash, and add the "update_url" manifest key
 # "update_url" needs to be present to avoid problems reported in https://bugs.chromium.org/p/chromium/issues/detail?id=805755
-python3.6 -c "import json; m=json.loads(open('pkg/crx/manifest.json').read()); m['author']={'email': 'eff.software.projects@gmail.com'}; del m['applications']; m['update_url'] = 'https://clients2.google.com/service/update2/crx'; open('pkg/crx/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))"
+python3 -c "import json; m=json.loads(open('pkg/crx-cws/manifest.json').read()); m['author']={'email': 'eff.software.projects@gmail.com'}; del m['applications']; m['update_url'] = 'https://clients2.google.com/service/update2/crx'; open('pkg/crx-cws/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))"
+python3 -c "import json; m=json.loads(open('pkg/crx-eff/manifest.json').read()); m['author']={'email': 'eff.software.projects@gmail.com'}; del m['applications']; open('pkg/crx-eff/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))"
 # Remove the 'update_url' manifest key from the xpi version of the extension delivered to AMO
-python3.6 -c "import json; m=json.loads(open('pkg/xpi-amo/manifest.json').read()); del m['applications']['gecko']['update_url']; m['applications']['gecko']['id'] = 'https-everywhere@eff.org'; open('pkg/xpi-amo/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))"
+python3 -c "import json; m=json.loads(open('pkg/xpi-amo/manifest.json').read()); del m['applications']['gecko']['update_url']; m['applications']['gecko']['id'] = 'https-everywhere@eff.org'; open('pkg/xpi-amo/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))"
+
+# Remove the incognito key in AMO packages: #16394
+python3 -c "import json; m=json.loads(open('pkg/xpi-amo/manifest.json').read()); del m['incognito']; open('pkg/xpi-amo/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))"
+python3 -c "import json; m=json.loads(open('pkg/xpi-eff/manifest.json').read()); del m['incognito']; open('pkg/xpi-eff/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))"
+
+# If the --remove-extension-update flag is set, ensure the extension is unable to update
+if $REMOVE_EXTENSION_UPDATE; then
+  echo "Flag --remove-extension-update specified.  Removing the XPI extensions' ability to update."
+  python3 -c "import json; m=json.loads(open('pkg/xpi-amo/manifest.json').read()); m['applications']['gecko']['update_url'] = 'https://127.0.0.1'; open('pkg/xpi-amo/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))"
+  python3 -c "import json; m=json.loads(open('pkg/xpi-eff/manifest.json').read()); m['applications']['gecko']['update_url'] = 'https://127.0.0.1'; open('pkg/xpi-eff/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))"
+fi
 
-# If the --remove-update-channel flag is set, ensure the extension is unable to update
-if [ "$1" == "--remove-update-channel" -o "$2" == "--remove-update-channel" ]; then
-  echo "Flag --remove-update-channel specified.  Removing the XPI extensions' ability to update."
-  python3.6 -c "import json; m=json.loads(open('pkg/xpi-amo/manifest.json').read()); m['applications']['gecko']['update_url'] = 'data:text/plain,'; open('pkg/xpi-amo/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))"
-  python3.6 -c "import json; m=json.loads(open('pkg/xpi-eff/manifest.json').read()); m['applications']['gecko']['update_url'] = 'data:text/plain,'; open('pkg/xpi-eff/manifest.json','w').write(json.dumps(m,indent=4,sort_keys=True))"
+# If the --remove-update-channels flag is set, remove all out-of-band update channels
+if $REMOVE_UPDATE_CHANNELS; then
+  echo "Flag --remove-update-channels specified.  Removing all out-of-band update channels."
+  echo "require.scopes.update_channels.update_channels = [];" >> pkg/crx-cws/background-scripts/update_channels.js
+  echo "require.scopes.update_channels.update_channels = [];" >> pkg/crx-eff/background-scripts/update_channels.js
+  echo "require.scopes.update_channels.update_channels = [];" >> pkg/xpi-amo/background-scripts/update_channels.js
+  echo "require.scopes.update_channels.update_channels = [];" >> pkg/xpi-eff/background-scripts/update_channels.js
 fi
 
 if [ -n "$BRANCH" ] ; then
-  crx="pkg/https-everywhere-$VERSION.crx"
+  crx_cws="pkg/https-everywhere-$VERSION-cws.crx"
+  crx_eff="pkg/https-everywhere-$VERSION-eff.crx"
   xpi_amo="pkg/https-everywhere-$VERSION-amo.xpi"
   xpi_eff="pkg/https-everywhere-$VERSION-eff.xpi"
-  key=../dummy-chromium.pem
+
 else
-  crx="pkg/https-everywhere-$VERSION~pre.crx"
+  crx_cws="pkg/https-everywhere-$VERSION~pre-cws.crx"
+  crx_eff="pkg/https-everywhere-$VERSION~pre-eff.crx"
   xpi_amo="pkg/https-everywhere-$VERSION~pre-amo.xpi"
   xpi_eff="pkg/https-everywhere-$VERSION~pre-eff.xpi"
-  key=dummy-chromium.pem
 fi
-if ! [ -f "$key" ] ; then
+if ! [ -f "$KEY" ] ; then
   echo "Making a dummy signing key for local build purposes"
-  openssl genrsa 2048 > "$key"
+  openssl genrsa -out /tmp/dummy-chromium.pem 768
+  openssl pkcs8 -topk8 -nocrypt -in /tmp/dummy-chromium.pem -out $KEY
 fi
 
 
-## Based on https://code.google.com/chrome/extensions/crx.html
-
-dir=pkg/crx
-name=pkg/crx
-pub="$name.pub"
-sig="$name.sig"
-zip="$name.zip"
-trap 'rm -f "$pub" "$sig" "$zip"' EXIT
-
-# zip up the crx dir
-cwd=$(pwd -P)
-(cd "$dir" && ../../utils/create_zip.py -n "$cwd/$zip" -x "../../.build_exclusions" .)
-echo >&2 "CWS crx package has sha1sum: `sha1sum "$cwd/$zip"`"
-
-# signature
-openssl sha1 -sha1 -binary -sign "$key" < "$zip" > "$sig"
-
-# public key
-openssl rsa -pubout -outform DER < "$key" > "$pub" 2>/dev/null
+# now pack the crx'es
+BROWSER="chromium-browser"
+which $BROWSER || BROWSER="chromium"
 
-byte_swap () {
-  # Take "abcdefgh" and return it as "ghefcdab"
-  echo "${1:6:2}${1:4:2}${1:2:2}${1:0:2}"
-}
-
-crmagic_hex="4372 3234" # Cr24
-version_hex="0200 0000" # 2
-pub_len_hex=$(byte_swap $(printf '%08x\n' $(ls -l "$pub" | awk '{print $5}')))
-sig_len_hex=$(byte_swap $(printf '%08x\n' $(ls -l "$sig" | awk '{print $5}')))
-
-# Case-insensitive matching is a GNU extension unavailable when using BSD sed.
-if [[ "$(sed --version 2>&1)" =~ "GNU" ]]; then
-  sed="sed"
-elif [[ "$(gsed --version 2>&1)" =~ "GNU" ]]; then
-  sed="gsed"
-fi
-
-(
-  echo "$crmagic_hex $version_hex $pub_len_hex $sig_len_hex" | $sed -e 's/\s//g' -e 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf
-  cat "$pub" "$sig" "$zip"
-) > "$crx"
+$BROWSER --no-message-box --pack-extension="pkg/crx-cws" --pack-extension-key="$KEY" 2> /dev/null
+$BROWSER --no-message-box --pack-extension="pkg/crx-eff" --pack-extension-key="$KEY" 2> /dev/null
 
+mv pkg/crx-cws.crx $crx_cws
+mv pkg/crx-eff.crx $crx_eff
 
+echo >&2 "CWS crx package has sha256sum: `openssl dgst -sha256 -binary "$crx_cws" | xxd -p`"
+echo >&2 "EFF crx package has sha256sum: `openssl dgst -sha256 -binary "$crx_eff" | xxd -p`"
 
 # now zip up the xpi AMO dir
 name=pkg/xpi-amo
@@ -149,12 +198,10 @@ zip="$name.zip"
 
 cwd=$(pwd -P)
 (cd "$dir" && ../../utils/create_zip.py -n "$cwd/$zip" -x "../../.build_exclusions" .)
-echo >&2 "AMO xpi package has sha1sum: `sha1sum "$cwd/$zip"`"
+echo >&2 "AMO xpi package has sha256sum: `openssl dgst -sha256 -binary "$cwd/$zip" | xxd -p`"
 
 cp $zip $xpi_amo
 
-
-
 # now zip up the xpi EFF dir
 name=pkg/xpi-eff
 dir=pkg/xpi-eff
@@ -162,12 +209,10 @@ zip="$name.zip"
 
 cwd=$(pwd -P)
 (cd "$dir" && ../../utils/create_zip.py -n "$cwd/$zip" -x "../../.build_exclusions" .)
-echo >&2 "EFF xpi package has sha1sum: `sha1sum "$cwd/$zip"`"
+echo >&2 "EFF xpi package has sha256sum: `openssl dgst -sha256 -binary "$cwd/$zip" | xxd -p`"
 
 cp $zip $xpi_eff
 
-
-
 bash utils/android-push.sh "$xpi_eff"
 
 echo >&2 "Total included rules: `find src/chrome/content/rules -name "*.xml" | wc -l`"
@@ -177,11 +222,13 @@ echo >&2 "Rules disabled by default: `find src/chrome/content/rules -name "*.xml
 # see test/selenium/shim.py
 echo "Created $xpi_amo"
 echo "Created $xpi_eff"
-echo "Created $crx"
+echo "Created $crx_cws"
+echo "Created $crx_eff"
 
 if [ -n "$BRANCH" ]; then
   cd ..
-  cp $SUBDIR/$crx pkg
+  cp $SUBDIR/$crx_cws pkg
+  cp $SUBDIR/$crx_eff pkg
   cp $SUBDIR/$xpi_amo pkg
   cp $SUBDIR/$xpi_eff pkg
   rm -rf $SUBDIR
diff --git a/rewriter/package.json b/rewriter/package.json
deleted file mode 100644
index 154cf45a3426..000000000000
--- a/rewriter/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "https-everywhere-rewriter",
-  "version": "1.0.0",
-  "dependencies": {
-    "event-stream": "3.0.20",
-    "readdirp": "0.3.2",
-    "urijs": "^1.18.1",
-    "xmldom": "0.1.17"
-  }
-}
diff --git a/src/Changelog b/src/Changelog
index ccbe2ce9ca18..db2f228f30d0 100644
--- a/src/Changelog
+++ b/src/Changelog
@@ -1,3 +1,181 @@
+2022.5.24
+* Improved EASE mode prompt
+* Add background tab on install or update to educate users on HTTPS only mode features in their browsers
+* Updated dependencies
+
+2021.7.13
+* Amend Incognito Key for Chrome and Firefox #20092
+* Fix unexpected arithmetic operations on strings #20043
+* Remove Top Alexa Labeller #20083
+* Update deprecated log function #20101
+* Patch Chrome Test Failure #20102
+
+2021.4.15
+* Add DuckDuckGo Smarter Encryption update channel
+* Bloom filter for rulesets
+* Firefox Fenix option page updates for Android users
+* Move to Python 3 from Python 3.6
+* Fix undefined type access
+* Fix empty default types
+
+2021.1.27
+* EASE Mode UI Changes
+* NPM Dependency updates
+* Geckodriver pull update
+* Chromedriver pull update
+* Integrate CSS Grid for Options Page and EASE UI
+* Put Options in new tab
+
+2020.11.17
+* Copy URL in EASE interstitial
+* Dependapot NPM updates
+* CRX distribution scripts for transparency for Edge and Opera
+* Port inclusion on allowlist for EASE
+* UI change to reflect a global setting
+
+2020.8.13
+* Fix port based whitelsiting issue #19291
+* Update documentation
+* Update dependencies (NPM and Chromedriver)
+* Minor code fixes in JS
+
+2020.5.19
+* Reverting Onboarding page for the time being
+* Patch for whitelisting rules and EASE mode issue
+* Double rule load patch in update channels
+* Fix minor JS and UX issues
+
+2020.3.16
+* EASE HTTP Once CSS fix
+* Allow users to whitelist hosts from the option page
+* EASE mode fixes for locale issue
+* Fetch Test Prep, TLS 1.2 update
+* Fetch Test Prep, Updated check rules script
+* Fix options page appearance on Firefox when dark mode is on
+* Dark mode adjustments
+
+2019.11.7
+* EASE HTTP Once Exception
+* Add Private network IPs to exclusion for HTTPSE
+* Revert icons back to previous state
+* Optimizations to url handling and hsts prune
+
+2019.6.27
+  * Making stylistic changes for mobile friendliness in Fennec
+  * Inclusion and use of the lib-wasm submodule, lowering memory overhead
+  * Refactor secure cookie logic
+  * Code cleanup
+  * Bundled ruleset updates
+
+2019.6.4
+  * Fix bug where link HTML is replaced in cancel page, instead of text
+  * Bundled ruleset updates
+
+2019.5.13
+  * UI nd functionality patches for stable rules
+  * Translations string fixes
+  * Minor npm updates for HSTS pruning
+
+2019.5.6
+  * UI tweaks for spacing and font sizes
+  * Fix reload bug
+  * Patch for offline release channel
+
+2019.5.2
+  * UI changes in extension menu (#17854)
+  * EASE interstitial UI tweaks (#17347)
+  * Remove support for wildcard in the middle (#12319)
+  * Update default timestamp for deterministic builds (#17623)
+  * Refactor and enhance trivialize-cookie-rules.js (#17438)
+  * Run HSTS-prune and fix impacted rulesets (#17338)
+  * Update HSTS preload max age (#17564)
+  * Fix DeprecationWarning in HTTPS Everywhere Checker (#17596 )
+  * Fix Chromium local store exception (#17557)
+  * Remove middle wildcard support in rules.js (#17715)
+
+
+2019.1.31
+   * Change "Block all unencrypted requests" language to "Encrypt all sites eligible"
+   * EASE mode patches for interstitial page and reload to trigger for EASE mode
+   * ES Lint clean up
+   * Disable test for Chrome (will work in patch while disabled)
+   * Deprecate I.P.s in rulesets (Special case for DNS I.P.s)
+
+2019.1.7
+  * Change "Block all unencrypted requests" language to "Encrypt all sites eligible"
+  * Amend check_rules.py fetch test to disable rules only if all rules are problematic,
+    and comment rules out if other rules are functional in the set
+  * HSTS Prune and updates
+  * Bundled ruleset updates
+
+2018.10.31
+  * Add additional error code for 'Block all unencrypted requests' interstitial
+    page.
+  * Fix race condition when adding update channel
+  * Add UX to remove user rules in options page
+  * Bundled ruleset updates
+
+2018.9.19
+  * Ensure the 'Block all unencrypted requests' interstitial page catches more
+    HTTPS misconfigurations (#16418)
+  * Allow users to disable HTTPS Everywhere on specific sites.  Add additional
+    UX controls in the options page for this. (#10041)
+  * Adding 'scope' to update channels, which defines regex limiting the URLs
+    an update channel is allowed to operate on (#16430)
+  * Bundled ruleset updates
+
+2018.8.22
+  * Adding a warning to pages which 'Block all unencrypted requests' is unable
+    to upgrade
+  * Adding a UX that enables users to add, delete, and edit update channels
+  * Reduces memory overhead by optimizing exclusion regex
+  * Block insecure FTP connections when 'Block all unencrypted requests'
+    is checked. This triggers a permissions dialogue in Firefox 57+, see
+    https://github.com/EFForg/https-everywhere/issues/16377#issuecomment-415492846
+    for more info.
+  * Bundled ruleset updates
+
+2018.6.21
+  * Fix: URLs with a hostname of '.' cause endless loop to be triggered
+  * Bundled ruleset updates
+
+2018.6.13
+  * Improve popup page performance and slightly reduce memory usage
+  * Measure and slightly improve memory usage for rulesets
+  * Fix CORS issues in Firefox. This bug was previously breaking embedded
+    videos or css on many websites. Chrome browser was not affected by this
+    bug
+  * Add "Reset to Defaults" option to reset the default ruleset states
+  * Add "Show Devtools tab" option to hide CDT tab
+  * Bundled ruleset updates
+
+2018.4.11
+  * Reduce out-of-band ruleset update TTL from 48 to 24 hours
+  * Bundled ruleset updates
+
+2018.4.3
+  * Applies the out-of-band ruleset updates, sourced from
+    https://www.https-rulesets.org/.  Clients perform a periodic check for new
+    rulesets to download, which are verified with the Web Crypto API using a
+    pinned key, then applied.
+  * Ruleset updates
+
+2018.3.13
+  * The unused `cacert` platform was removed from rulesets for simplicity
+  * Organizing the add-on files into a clean directory structure
+  * Ruleset updates
+
+2018.2.26
+  * Many/most mixed content blocking issues are solved when enabling the
+    "Block all unencrypted requests" option thanks to the injection of the
+    upgrade-insecure-requests header. This means this option can be more
+    easily used for daily browsing with less site breakage.
+  * Rulesets are alphabetically sorted in HTTPS Everywhere popup, with the
+    first-party site (if covered) at the top.
+  * Fixes an obscure Android bug where rulesets don't appear in popup for the
+    first window that is opened after restart.
+  * Many ruleset bugs have been solved (some dating 3 years back!)
+
 2018.1.29
   * Ruleset updates
 
@@ -445,10 +623,10 @@ chrome-2014.1.3
  * Pseudorelease, just for Tor Browser Bundle usage
  * Tiny ruleset tweaks (XKCD is back)!
  * Create an about:config setting that overrules mixedcontent ruleset disablement
- 
+
 3.4.3                                        (2013-12-03)
  * Fixes: Cloudfront / Amazon MP3 player, Cornell/Arxiv, FlickR,
-          AmazonAWS/spiegel.tv 
+          AmazonAWS/spiegel.tv
  * Disable broken: Barns and Noble, Behance, Boards.ie, Elsevier, Kohls,
    OpenDNS, Spin.de, Svenskakyrkan
  * Deprecate the ContentPolicy API, fixing a crash bug
@@ -521,10 +699,10 @@ chrome-2014.1.3
     the stable branch, and changed many stable rules
 
 chrome-2013.8.17
-  * Urgent bugfix release for 
+  * Urgent bugfix release for
     https://trac.torproject.org/projects/tor/ticket/9507
     - release from the stable / 3.0 branch, not master
-    - don't ship the development ruleset library, it's not ready for prime 
+    - don't ship the development ruleset library, it's not ready for prime
       time yet
     - avoid performance hits from repeatedly re-testing rulesets
     - other possible weirdness
@@ -594,7 +772,7 @@ chrome-2013-8.16
   * Includes all fixes from 3.3
 
 3.3
-  * This major release fixed the following mixed content blocker (MCB) 
+  * This major release fixed the following mixed content blocker (MCB)
     related bugs in time for Firefox 23:
     https://trac.torproject.org/projects/tor/ticket/9196
     https://trac.torproject.org/projects/tor/ticket/8774
@@ -644,14 +822,14 @@ chrome-2012.6.4
   * Fix broken ruleset dialog in Firefox 22+
     https://trac.torproject.org/projects/tor/ticket/8997
   * The toolbar button changes to indicate active rulesets:
-    https://trac.torproject.org/projects/tor/ticket/4886 
+    https://trac.torproject.org/projects/tor/ticket/4886
   * Ship 31 new rulesets
   * New translations: Japanese and Sinhala
   * Updated translations: Hungarian, Lithuanian, Slovenian
   * Ruleset fixes from 3.2.2:
     https://www.eff.org/r.5bSj
   * Observatory cert whitelist update
-  
+
 3.2.2                                         (2013-05-22)
   * Quick turn-around release to unbreak support.apple.com
   * Fixes for a number of other ruleset bugs:
@@ -735,7 +913,7 @@ chrome-2012.3.7
     https://trac.torproject.org/projects/tor/ticket/8199
     https://trac.torproject.org/projects/tor/ticket/8198
   * Disable broken:
-    American Public Media (for real this time), Asymmetric Publications, 
+    American Public Media (for real this time), Asymmetric Publications,
     Salsa Labs, Vimeo
     https://trac.torproject.org/projects/tor/ticket/7650
     https://trac.torproject.org/projects/tor/ticket/8280
@@ -751,7 +929,7 @@ chrome-2013.1.18
   * Fix the implementation of safeToSecureCookie
     - Get https://trac.torproject.org/projects/tor/ticket/7491 right(er)
     - Fix https://trac.torproject.org/projects/tor/ticket/7855
-  * Fix a ruleset processing bug, which would prevent  
+  * Fix a ruleset processing bug, which would prevent 
     from matching x.y.z.com
   * Ship all ruleset fixes from 3.1.2 and 3.1.3
     - Except Etsy, where we're trying to fix rather than disable the ruleset
@@ -762,7 +940,7 @@ chrome-2013.1.18
 
 3.1.3                                         (2013-1-18)
   * Internet Freedom Day stable bugfix release
-  * Fixes: CloudFront/Spotify, AmazonAWS (Amazon MP3s and product images), Libav, 
+  * Fixes: CloudFront/Spotify, AmazonAWS (Amazon MP3s and product images), Libav,
            Google Maps, UserEcho
     https://trac.torproject.org/projects/tor/ticket/7931
     https://trac.torproject.org/projects/tor/ticket/7888
@@ -804,7 +982,7 @@ chrome-2012.12.17
   * Additionally disable: Automattic
 
 4.0development.4			     (2012-12-17)
-  * Fix nasty bug that prevented Firefox downloads from Mozilla's CDN 
+  * Fix nasty bug that prevented Firefox downloads from Mozilla's CDN
     https://trac.torproject.org/projects/tor/ticket/7717
   * Fix download from qt-project.org
   * Ship 72 new rulesets
@@ -862,8 +1040,8 @@ chrome-2012.10.31
   * Work around a nasty bug that was affecting some high-volume Live Youtube streams
     (but not other live YouTube streams)
     https://trac.torproject.org/projects/tor/ticket/7127
-  * Other Fixes: 
-    AdaCore, Akamai/MTV3 Katsomo, Akamai/HP, Atlassian, Bahn.de, MySQL, NPR, PBS, 
+  * Other Fixes:
+    AdaCore, Akamai/MTV3 Katsomo, Akamai/HP, Atlassian, Bahn.de, MySQL, NPR, PBS,
     Phronoix Media/Openbenchmarking, SSRN, Spoki
     https://trac.torproject.org/projects/tor/ticket/7219
     https://trac.torproject.org/projects/tor/ticket/7180
@@ -879,12 +1057,12 @@ chrome-2012.10.31
     https://trac.torproject.org/projects/tor/ticket/7114
     https://trac.torproject.org/projects/tor/ticket/7138
     https://trac.torproject.org/projects/tor/ticket/7107
-  
+
 3.0.3                                       (2012-10-29)
   * Work around a nasty bug that was affecting some high-volume Live Youtube streams
     (but not other live YouTube streams)
     https://trac.torproject.org/projects/tor/ticket/7127
-  * Other Fixes: 
+  * Other Fixes:
     AdaCore, Akamai/MTV3 Katsomo, Akamai/HP, Atlassian, Bahn.de, DemocracyNow, MySQL, NuGet,
     PBS, Phronoix Media/Openbenchmarking, SSRN, Spoki
     https://trac.torproject.org/projects/tor/ticket/7219
@@ -925,7 +1103,7 @@ chrome-2012.10.31
 
 chrome-2012.10.18
   * The "even more perfect" chromium alpha
-  * Fixes from the last two Firefox releases: 
+  * Fixes from the last two Firefox releases:
     Microsoft (Bing login button), ZeniMax, Ubuntuone, TrueCrypt, Springer,
     Optical Society, IMDB, Facebook, EzineArticles, Broadband Reports, Apache,
     Akamai (exclude Zynga content to prevent breakage of some Zynga games),
@@ -949,8 +1127,8 @@ chrome-2012.10.18
     hundreds of others
 
 3.0.1 and 4.0development.1:
-  * Fixes: adition.com, Akamai/SVTplay.se, Bahn.de, European Southern Observatory, 
-    IEEE, Indeed, Java, Librivox, Pinterest, New York Times, Springer, Vimeo, 
+  * Fixes: adition.com, Akamai/SVTplay.se, Bahn.de, European Southern Observatory,
+    IEEE, Indeed, Java, Librivox, Pinterest, New York Times, Springer, Vimeo,
     Shannon Health, O'Reilly Media
     https://trac.torproject.org/projects/tor/ticket/7080
     https://mail1.eff.org/pipermail/https-everywhere/2012-October/001583.html
@@ -975,7 +1153,7 @@ chrome-2012.10.9
 3.0                                         (2012-10-04)
   * Since version 2.x:
     * 1,455 new active rulesets
-    * UI improvements: 
+    * UI improvements:
       - right-click to view ruleset source in the config window
       - translate some untranslated menus
       - better icons in a few places (breaking/redirecting rules,
@@ -989,7 +1167,7 @@ chrome-2012.10.9
   * Relative to 3.0development.8:
     * Only promote the Decentralized SSL Observatory to 5% of non-Tor users
     * Update the SSL Observatory whitelist of common cert chains
-    * Fixes, mostly in the CDN/media playback department: 
+    * Fixes, mostly in the CDN/media playback department:
              Akamai/CNN, GO.com/ABC, AWS/Amazon Zeitgeist MP3 player,
              AWS/Spiegel.tv, Technology Review, Cloudfront/Tunein,
              Akamai/Discovery Channel, Beyond Security, OCaml, Gentoo,
@@ -1025,14 +1203,14 @@ chrome-2012.9.21
     https://trac.torproject.org/projects/tor/ticket/6848
   * Replace jsURI with URI.js, fixing a number of bugs in the Chrome port
     - https://trac.torproject.org/projects/tor/ticket/6197
-    - Also breakage on other random pages like 
+    - Also breakage on other random pages like
       http://venturebeat.com/2012/09/13/how-do-not-track-could-destroy-the-internet-as-you-know-it/
   * Fixes: AOL, Antispam.de, BBC, BitTorrent, Facebook, Gearhog, LinkPlus
     Catalog, Microsoft, Mother Jones, Mozilla, Office.co.uk, OpenDNS,
     PassThePopcorn, Piriform, WhatCD, uTorrent
   * Disable broken: Paper.li, SVT.se, Soton.ac.uk
   * Reenable: Referly
-    
+
 chrome-2012.9.10
   * The "just add eleven" chromium alpha
   * Time to test the updating mechanism from direct -> Chrome Web Store
@@ -1120,7 +1298,7 @@ chrome-2012.8.15
            Jottit
   * Disable broken: Project Syndicate, Alton Towers, Network for Good
     https://trac.torproject.org/projects/tor/ticket/6222
-  * The Decentralized SSL Observatory client now saves up some certificates if 
+  * The Decentralized SSL Observatory client now saves up some certificates if
     the network blocks or MITMs attempts to submit them.
 
 chrome-2012.6.21
@@ -1136,8 +1314,8 @@ chrome-2012.6.21
     https://trac.torproject.org/projects/tor/ticket/5893
   * Ship 217 new rulesets (frozen; new rulesets now have to wait until 4.0
     development)
-  * Fixes: numerous, including: Boxee, CiteULike, MozillaMessaging, 
-           Yandex, Demonoid, Pirate Party, Gentoo, NYTimes, Microsoft, 
+  * Fixes: numerous, including: Boxee, CiteULike, MozillaMessaging,
+           Yandex, Demonoid, Pirate Party, Gentoo, NYTimes, Microsoft,
            Wikipedia, Lenovo, MyWOT
     https://trac.torproject.org/projects/tor/ticket/5912
     https://trac.torproject.org/projects/tor/ticket/6091
@@ -1148,12 +1326,12 @@ chrome-2012.6.21
     https://mail1.eff.org/pipermail/https-everywhere-rules/2012-June/001190.html
     https://mail1.eff.org/pipermail/https-everywhere-rules/2012-May/001186.html
     https://mail1.eff.org/pipermail/https-everywhere/2012-May/001433.html
-  * Disable broken: MarketWatch, Disqus, Magento, Lavasoft, 
+  * Disable broken: MarketWatch, Disqus, Magento, Lavasoft,
                     Typepad/Say Media, Thomas Cook, Thomson Reuters clients,
                     Science Daily, BinRev, Ikea, Interpol
     https://trac.torproject.org/projects/tor/ticket/5899
     https://trac.torproject.org/projects/tor/ticket/5496
-  
+
 chrome-2012.6.18
   * The Divisible By Six Chromium Beta Release
   * Ship 444 new Rulesets
@@ -1192,11 +1370,11 @@ chrome-2012.5.1
     Everywhere protection for cookies on some domains.
     https://trac.torproject.org/projects/tor/ticket/5676
     https://trac.torproject.org/projects/tor/ticket/2199
-  * More efficient ruleset storage shrinks the .crx download by a factor of 
+  * More efficient ruleset storage shrinks the .crx download by a factor of
     about 4 (thanks fauxfaux)
     https://trac.torproject.org/projects/tor/ticket/5275
   * Disable buggy rulesets: IBM, Scribd, Wunderground, ReadWriteWeb,
-    Pastebin.ca 
+    Pastebin.ca
     https://trac.torproject.org/projects/tor/ticket/5344
     https://trac.torproject.org/projects/tor/ticket/5435
     https://trac.torproject.org/projects/tor/ticket/5630
@@ -1210,7 +1388,7 @@ chrome-2012.5.1
 
 
 3.0development.2                            (2012-04-26)
-  * License change: the tree now includes some code from Convergence, which 
+  * License change: the tree now includes some code from Convergence, which
                     is GPL v3+.  Other code remains licensable as GPLv2+
   * Ship 696 new rulesets (!!!), thanks to a lot of amazing work by Negres
   * Fix a downgrade attack that might allow attackers to deny HTTPS
@@ -1237,9 +1415,9 @@ chrome-2012.5.1
   * Separate Observatory option to control self-signed cert submission
   * Numerous other ruleset enhancements, fixes, and probably exciting new bugs
     in Negres's ruleset changes
-   
+
 3.0development.1                            (2012-03-14)
-  * By default, use https://google.co.cctld instead of 
+  * By default, use https://google.co.cctld instead of
     encrypted.google.com
     https://trac.torproject.org/projects/tor/ticket/5152
   * Add an optional ruleset to use https://www.google.com
@@ -1259,7 +1437,7 @@ chrome-2012.3.14
   * Add an optional ruleset to search on https://www.google.com
     instead of encrypted.google.com
   * Switch non-US google searches to country sites by default
-  * Better chrome context UI 
+  * Better chrome context UI
 
 2.2.3                                     (2012-09-25)
   * Workaround for breakage in Amazon Look Inside the Book (via Cloudfront)
@@ -1268,7 +1446,7 @@ chrome-2012.3.14
   * Other fixes: PassThePopcorn, WhatCD, Antispam.de, RFCeditor,
                  Weatherspark / GoogleMaps
   * Disable broken: SVT.se
-    
+
 2.2.1                                     (2012-08-17)
   * Fix a configuration-parsing bug in 2.2 that would
     ignore default_off rules if this was a first install
@@ -1304,7 +1482,7 @@ chrome-2012.3.14
 2.0.5                                       (2012-05-16)
   * Rebuild 2.0.4 without a bug in the release scripts that prevented all the
     rulesets from being absent
-  
+
 2.0.4                                       (2012-05-16)
   * Fix for compatibility with some other Firefox extensions:
     https://trac.torproject.org/projects/tor/ticket/5682
@@ -1367,7 +1545,7 @@ chrome-2012.2.27
   * Split Google Translate out of the Google APIs rule, and turn it off by
     default on Chrome only:
     Fixes https://trac.torproject.org/projects/tor/ticket/5196
-  * Ship 19 new rulesets since last Chromium release 
+  * Ship 19 new rulesets since last Chromium release
 
 chrome-2012.2.9
   * make  rulesets elements work in the Chrome version
@@ -1403,9 +1581,9 @@ chrome-2012.02.06{,.01}
   * Ship 126 new rulesets
   * Fixes: Wikipedia, Identi.ca, Verizon, CCC.de, UserScripts, Yandex,
            Hidemyass, Mozilla, Pogo, Google, Google Images, Google Video,
-           The Pirate Bay, AK Vorrat, JBoss 
+           The Pirate Bay, AK Vorrat, JBoss
   * Improvements: EFF, Flickr, RedHat, Diaspora, PrivatePaste, KDE,
-                  Portugese Govt 
+                  Portugese Govt
   * Disable broken: NSF.gov, WHO.int, Economist
   * New experimental Yahoo! ruleset (off by default)
   * New translations: Spanish, Nederlands
@@ -1420,8 +1598,8 @@ chrome-2012.02.06{,.01}
   * Fixes: Java.com, Yandex, Wordpress, Wikipedia, Bahn.de, UNSW, Apache,
            DuckDuckGo, Google Images
   * Improvements: Debian, Tumblr, Apple, Facebook, VeriSign, Google Services,
-                  Flickr, Youtu.be 
-  * Disable broken: Target, OpenUniversity, TV.com, Radio Shack, 
+                  Flickr, Youtu.be
+  * Disable broken: Target, OpenUniversity, TV.com, Radio Shack,
                     Yahoo Mail :( :(,
                     Google Cache coverage in Google Services :( :( :(
 
@@ -1465,7 +1643,7 @@ chrome-2012.02.06{,.01}
     (currently opt-in, with a popup prompt if you have Tor Button installed)
   * Ship 164 new rulesets
   * Enable Google Maps by default
-  * Pending translations: Arabic, Dutch, German, Portugese, Latvian, Russian, 
+  * Pending translations: Arabic, Dutch, German, Portugese, Latvian, Russian,
                           Swedish
   * Fixes: OpenDNS, WordPress, Flickr
   * Expansions & Improvements: Google Services, Twitter, Gowalla, Apple, Bit.ly
@@ -1518,9 +1696,9 @@ chrome-2012.02.06{,.01}
 
 1.0.2                                        (2011-09-20)
   * Major improvements to the Wikipedia ruleset
-  * Disable broken/buggy rulesets: DeviantArt, eHow, About.me, Bandcamp, 
+  * Disable broken/buggy rulesets: DeviantArt, eHow, About.me, Bandcamp,
     StudiVZ, Securityfocus, BankofAmerica :( :( :(
-  * Small fixes: OpenDNS, WordPress, links in the "About" page 
+  * Small fixes: OpenDNS, WordPress, links in the "About" page
   * Declare incompatibility with Firefox 7 & 8 until Mozilla fixes this:
     https://bugzilla.mozilla.org/show_bug.cgi?id=677643
 
@@ -1564,7 +1742,7 @@ chrome-2012.02.06{,.01}
     https://trac.torproject.org/projects/tor/ticket/2199
   * By default, move context menu from toolbar to addons bar
   * Ship 22 new rulesets
-  * Add support for Google Plus, Accounts and AdWdords 
+  * Add support for Google Plus, Accounts and AdWdords
   * Improvements to Microsoft, Twitter and Gitorious
 
 1.0.0development.1:                          (2011-06-27)
@@ -1572,7 +1750,7 @@ chrome-2012.02.06{,.01}
     applicable to the current page (we can now stabilise the dev branch!)
   * Ship 42 new rulesets
   * Support for Google Image Search (except the very first landing page :/)
-  * Fixes: Netflix, Plone 
+  * Fixes: Netflix, Plone
   * Improvements: Google APIs, Google Services, Mediawiki
   * Disable broken rules: OKCupid, Surveymonkey
   * Declare compatibility with recent Seamonkey releases
@@ -1580,29 +1758,29 @@ chrome-2012.02.06{,.01}
 0.9.9.development.6:
   * Optimistically declare compatibility with Firefoxes up to v 7.*
   * Ship 193 new rulesets
-  * Fixes & Improvements: Wikipedia, AmazonAWS, Google Images, Microsoft, 
-    Mozilla, Netflix, Google User Content, Twitter, Gitorious, AdBlock Plus, 
+  * Fixes & Improvements: Wikipedia, AmazonAWS, Google Images, Microsoft,
+    Mozilla, Netflix, Google User Content, Twitter, Gitorious, AdBlock Plus,
     Youtube, he.net, Bitcoin
-  * Remove broken rules: Match.com 
+  * Remove broken rules: Match.com
 
 0.9.9.development.5:
   * Compatible with Firefox 4.0.1+
   * New ruleset management UI (thanks to katmagic and Stefan Tomanek)
   * Ship 136 new rulesets
-  * Fixes: reCAPTCHA, Google Images, Gentoo, Gitorious 
-  * Improvements: Bit.ly, Yahoo, Nokia 
-  * Disable: WashingtonPost :(, Doubleclick, OpenSSL.org (!) 
-  
+  * Fixes: reCAPTCHA, Google Images, Gentoo, Gitorious
+  * Improvements: Bit.ly, Yahoo, Nokia
+  * Disable: WashingtonPost :(, Doubleclick, OpenSSL.org (!)
+
 0.9.9.development.4:
   * Ship 117 new rulesets
-  * Fixes: MySQL, GroupOn, country-specific Google news sites, 
+  * Fixes: MySQL, GroupOn, country-specific Google news sites,
   * Improvements: mail.com, WordPress
   * Leave WashingtonPost ruleset on in the hope that it gets fixed soon :/
   * Disable broken rules: HTC, I2P ...
 
 0.9.9.development.3:
 
-  * In the settings dialogue, offer "Reset defaults" instead of "Enable all" 
+  * In the settings dialogue, offer "Reset defaults" instead of "Enable all"
   * Merge fixes from NoScript that avoid some torbutton bugs
   * Ship 56 new rulesets
   * Numerous tweaks + fixes, including NYTimes and AddThis
@@ -1610,10 +1788,10 @@ chrome-2012.02.06{,.01}
 0.9.9.development.2:
 
   * Prevent the preferences window from swallowing the screen on OS X / Windows
-  * Stop the StartCom rule from breaking StartCom OCSP/CRLs (which can't be HTTPS) 
+  * Stop the StartCom rule from breaking StartCom OCSP/CRLs (which can't be HTTPS)
   * Attempt to do the same for for CAcert
   * Fixes to: Reddit, Drupal.org
-  * Disable some problematic rulesets: Cisco, Opera 
+  * Disable some problematic rulesets: Cisco, Opera
   * Enable: Reddit
   * Ship another 62 rulesets
 
@@ -1661,7 +1839,7 @@ chrome-2012.02.06{,.01}
   * Support global installation for OS distributions (thanks dm0)
 
 0.9.2:
-  * Fix a bug in our redirection loop detection that was causing trouble with 
+  * Fix a bug in our redirection loop detection that was causing trouble with
     some parts of NYTimes, Facebook, and other sites
     (closes: https://trac.torproject.org/projects/tor/ticket/2217)
 
@@ -1674,7 +1852,7 @@ chrome-2012.02.06{,.01}
     improvements!
   * Split the stricter parts of the Facebook rule into a "Facebook+" rule.
     It's what's required to protect Facebook from Firesheep and similar cookie
-    theft attacks, but it may break apps, because apps.facebook.com currently 
+    theft attacks, but it may break apps, because apps.facebook.com currently
     has the wrong cert.
   * Allow rulesets to specify that the secure flag should be set on some
     cookies even if the site operator failed to do so
@@ -1713,7 +1891,7 @@ chrome-2012.02.06{,.01}
       https://trac.torproject.org/projects/tor/ticket/1672
       https://trac.torproject.org/projects/tor/ticket/1673
     The patch breaks toolbar search suggestions.  And who knows what else?
-  * Don't send some country homepages to https://www.google.com/webhp?hl= ; 
+  * Don't send some country homepages to https://www.google.com/webhp?hl= ;
     use https://encrypted.google.com instead
   * Cleanup and refactor the URI replacement and rewriting code.  Should
     hopefully fix https://trac.torproject.org/projects/tor/ticket/1649
diff --git a/src/META-INF/cose.manifest b/src/META-INF/cose.manifest
new file mode 100644
index 000000000000..045ba86369fd
--- /dev/null
+++ b/src/META-INF/cose.manifest
@@ -0,0 +1,732 @@
+Manifest-Version: 1.0
+
+Name: manifest.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: X0hd0tplhCo2R8s3OE27fLAZFD8=
+SHA256-Digest: iKk69TG3OJJNjjAJPTe72S+qXa4k/xL8yKmPzAGmaxg=
+
+Name: package.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: HQyF0Be9Z+C72YzyWk6LqTSCxkU=
+SHA256-Digest: 1v7I/u/oNho1Z8rtRLepk7VY9i0r8EktoXSvvy92SsE=
+
+Name: _locales/ace/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ofcr0jXThFpy+75hHp2/Q7a13Iw=
+SHA256-Digest: fzhILeKwf6EXocFvocLJMDTVFY7948hKtI6L6UG8GFU=
+
+Name: _locales/ach/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ofcr0jXThFpy+75hHp2/Q7a13Iw=
+SHA256-Digest: fzhILeKwf6EXocFvocLJMDTVFY7948hKtI6L6UG8GFU=
+
+Name: _locales/af/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: iOMFMT97+EoNCW6DRomntg8GSHk=
+SHA256-Digest: cw+OPqn11qIyL1P5cFnPmxrYTVKQ0oPX10+1KjXtNoc=
+
+Name: _locales/af_ZA/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ofcr0jXThFpy+75hHp2/Q7a13Iw=
+SHA256-Digest: fzhILeKwf6EXocFvocLJMDTVFY7948hKtI6L6UG8GFU=
+
+Name: _locales/ar/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: pxQQhQSkkjd9EAlMdZmvk+qmXhg=
+SHA256-Digest: MORqa6PigyGRYrjsjuUVk80TAKErKzIZy9G5UnPV20U=
+
+Name: _locales/ar_EG/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ofcr0jXThFpy+75hHp2/Q7a13Iw=
+SHA256-Digest: fzhILeKwf6EXocFvocLJMDTVFY7948hKtI6L6UG8GFU=
+
+Name: _locales/ast/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: VdPNPPiC8Ro2JsmoBFkdW3TAy2c=
+SHA256-Digest: 4zrpaArMxcBnUHIyLdenD/CDBXFXDgnSki4HzzEB0J8=
+
+Name: _locales/az/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 3+BLldWYu7TK8cGkwWGVp8z0EUk=
+SHA256-Digest: hfU635JcDvcEJzmbg2zkxSrfMEe0SVNvq8U9wj1SvNg=
+
+Name: _locales/be/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: /7FQnv3lG2OqZFTdc3/fmuOznX8=
+SHA256-Digest: OrCo5OOtp9o91snpAQUrgUG1KbmJ7ScDZ3tncnnV2po=
+
+Name: _locales/bg/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: uvPzsM24ej+LdWMNASNfYE1+tBs=
+SHA256-Digest: Z0AMZvlkzgDfeSMbZQ+AdhZryI8kmsdpYpvOz8lM9TI=
+
+Name: _locales/bn/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: dVoXHkj2UXzj4ctLQ7g2+cQu/o8=
+SHA256-Digest: hTaM5b35bOJhTSV38ajtBg58bV5TdC47xttlYiZM/aU=
+
+Name: _locales/br/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ZW6ty00kj6yNkgcEnnvyQjjgrWg=
+SHA256-Digest: sTBK8ujpW+kR/M9mXe2ShZUChO9Ytu7gKVYQkaOwrZU=
+
+Name: _locales/bs/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: Vg2wDGtsbEZthKbRz9yUjj7Q8YA=
+SHA256-Digest: vQgF2n0ktL3LZ1rqMaiZvCxRRt41I6PLvVHRJYvHb8o=
+
+Name: _locales/ca/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: /COeM2de5nZc7h2xYUdMcQqMeJw=
+SHA256-Digest: otyh6c/nvuTuTZfmLv2FfYlbI6fkf9ibQ4zZYWll2Bk=
+
+Name: _locales/cmn/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ofcr0jXThFpy+75hHp2/Q7a13Iw=
+SHA256-Digest: fzhILeKwf6EXocFvocLJMDTVFY7948hKtI6L6UG8GFU=
+
+Name: _locales/cs/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: PSPcBF4f2cciaztX/tDK489gG6w=
+SHA256-Digest: nhqVZbEdeQLOEfTuC4WQZqq4nVX6TLgsumEei+NDJjo=
+
+Name: _locales/cy/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: A9MVuoq+YeTB4AJ7qXIW2t/2reU=
+SHA256-Digest: MMpP51GLMadXFrMHt8O5C2q5x9ipotM+rbjBCSAIa0k=
+
+Name: _locales/da/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 6EA7b3gcz67OK5/NhNpqiv8JsRw=
+SHA256-Digest: XvGrh0Pr/cIN0+h7dYRhsWrE2sbpvCGejLUk5g2cb+M=
+
+Name: _locales/de/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 5DxSzfj3HAO19N93skW8074DacU=
+SHA256-Digest: 6RRsp8DV8g7u3majB5LXV/HNNz9wltPP3/drftJO+t0=
+
+Name: _locales/el/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: cDgo3bT3QsyvgW6sNV1v7VhD+c0=
+SHA256-Digest: oBZLruNBa+ryEI2AaAM1IuFsmVxF73+deXjq7P6lunM=
+
+Name: _locales/en/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ofcr0jXThFpy+75hHp2/Q7a13Iw=
+SHA256-Digest: fzhILeKwf6EXocFvocLJMDTVFY7948hKtI6L6UG8GFU=
+
+Name: _locales/en_GB/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ofcr0jXThFpy+75hHp2/Q7a13Iw=
+SHA256-Digest: fzhILeKwf6EXocFvocLJMDTVFY7948hKtI6L6UG8GFU=
+
+Name: _locales/en_US/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ofcr0jXThFpy+75hHp2/Q7a13Iw=
+SHA256-Digest: fzhILeKwf6EXocFvocLJMDTVFY7948hKtI6L6UG8GFU=
+
+Name: _locales/eo/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: cTvPwrTLEg/CLQ7vP936VGhWMBA=
+SHA256-Digest: 6Tb3+j9lXyFMz+bKnJ+MnaIRIAaOIgFGgGFeLUWIHB0=
+
+Name: _locales/es/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: wdTXKRaKo3+lt2F/WAfhHECWQ0Q=
+SHA256-Digest: 6LOKxRvSfOFCftbixNJLi3ILtnXblwVUdYoxy0KkUKE=
+
+Name: _locales/es_AR/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: jNe5tt2sg9FYb/CklhOA/EfCNso=
+SHA256-Digest: ejlUkVhdh38l0SQqB2iuiCGTJgg/HnUZ6YB1BIowEUI=
+
+Name: _locales/es_MX/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 8r5iYER0e+Z9xsXkisoWpgiV6wY=
+SHA256-Digest: nNkWHeZ9eKPmXKJTHyKHmuqMNO9w7KdMoCpNtykVJSo=
+
+Name: _locales/et/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: RuKFi2LDlh1aZ/sgjAQHk9Dr0aU=
+SHA256-Digest: kEGCDq7xq97+kttCcjDTrhV+IRBdvTdokVw5x4MjUrg=
+
+Name: _locales/eu/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: CfUVBO8uVqaEVg2rfNiEzhOOIxs=
+SHA256-Digest: U4RrQUCTj9jzxLMjadoUZlclwDWv7StaWVTd+VfnN2I=
+
+Name: _locales/fa/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: Zi0T7F3MTegvevGxycGERaO+y+k=
+SHA256-Digest: FppLjcJVwKmgWnEVG8DUj/OfX/mPJaRmMHYdzdQ4Qk4=
+
+Name: _locales/fi/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: Ijd1g6JcPeStcajdi2p49GxtL/s=
+SHA256-Digest: XtP/3kb3g9EEZXkGRsQh5oEGWm5XdCCVHsY4eBWi2Lo=
+
+Name: _locales/fr/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 4Kl28lQ4AxcFKuI1qPanfKBIO1I=
+SHA256-Digest: JR6Ytgifw1eNfP5eEY9DW2+NyBy5t5m8jcfG1eElpos=
+
+Name: _locales/fr_FR/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: /siGONOTKZIcZRCh3Gjklyi6FpA=
+SHA256-Digest: JOAxkWbsFpRl+/JTJ9Ii5P0ixY1UOkuZHRAjMb86eWI=
+
+Name: _locales/fy/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: qYt2G1hP0Cs203jLvxdBLgv4MGQ=
+SHA256-Digest: cNu7cS359ufs/B5EXOMBJIvVbfB8V9sQpFxorgrRxxg=
+
+Name: _locales/ga/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: oNZb00MUZHcEuMm1CKosXijaWgw=
+SHA256-Digest: knCNuU+/o1k+pt0GMADpt3nuzqz17npT4Olsoj8EL7o=
+
+Name: _locales/gd/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ofcr0jXThFpy+75hHp2/Q7a13Iw=
+SHA256-Digest: fzhILeKwf6EXocFvocLJMDTVFY7948hKtI6L6UG8GFU=
+
+Name: _locales/gl/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: WBkm2qWTCShjdj+kFKqzxnZIoFg=
+SHA256-Digest: Y3K9ZWg9+2pL1r34SJhQYu26Viki5wqVlJmLmVfhQdo=
+
+Name: _locales/gu/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: cxaffBOuU3Z+D/AJ6TQAXNFki3M=
+SHA256-Digest: pTrp2BlrTKilZg+sRGpeuYQVSrInYg7QtVBMrLANj4Q=
+
+Name: _locales/he/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: zshsgYzIwWg+jtvY4ingp8vw64c=
+SHA256-Digest: BxJrAMOZ4VuFbXDVimpAN0xMEQBNZZkrmFWnTAXibks=
+
+Name: _locales/hi/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: QRpvL2rosEDoTdx6BxxGGJpSVmo=
+SHA256-Digest: liYeP2q1gkXphKzxxJNsqTh7+T1gzKsee+6vReQMdhs=
+
+Name: _locales/hr/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: x/3lhb7z7CVqZZdn3midgSjn5tY=
+SHA256-Digest: HHx+VP0HB42dWTZ38cR004DWeQpFRgaF5TULrZkatwI=
+
+Name: _locales/hu/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 4eKsxvmbG58FfD5yjfm4b3cr+g4=
+SHA256-Digest: i9dh17H4Ruxjb3oxA4GPRJvRPecXQf3U+qaBlGj2qps=
+
+Name: _locales/hy/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: QzXAZ5katx2Ye+1QFyFHLcMJROM=
+SHA256-Digest: HSYKniubHesccfXGMZYre5wJva2MRztMYAhMHMA2+Z4=
+
+Name: _locales/ia/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: Mm0o9mYuk3kCk5WbKuPCFU7zpqo=
+SHA256-Digest: 6ORLVTr02qalRUcK63Ir1GXjw/p+v6nrK9/zI66QL6o=
+
+Name: _locales/id/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 9QctIupOryS8eWp04EJHAWNYj7c=
+SHA256-Digest: NfVmJxGSWj5onjEn4//gX5P8n3QnqBXXP5Z9Lf+578M=
+
+Name: _locales/is/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: /P9T+vTThdd7i1pmGcYD6nOkY44=
+SHA256-Digest: L1OQmFHZBhJHVvNqOh3610u1MS+SLQd9NHvYu2FkRVE=
+
+Name: _locales/it/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: QfqJFvpr/CghH/0gsO9h+sYKy1Y=
+SHA256-Digest: vtdELbvnbICfJVOrxFLjaJq656uK7EK2pTcecgf4dNc=
+
+Name: _locales/ja/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 7zImT7HvkvCQpdObYY520peFtDs=
+SHA256-Digest: mjSxBaiB+SkXyspN3wi6aodH4rYgcp6da2exdiEcGU4=
+
+Name: _locales/ka/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: fHsD070Q4aHyxYhCNfQIYT3MKS0=
+SHA256-Digest: yeIbx8SP8Wa4kvXo6Lzx9wrRj1LynhWFd2nbPUqZEsk=
+
+Name: _locales/kab/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ofcr0jXThFpy+75hHp2/Q7a13Iw=
+SHA256-Digest: fzhILeKwf6EXocFvocLJMDTVFY7948hKtI6L6UG8GFU=
+
+Name: _locales/kk/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 8Sdjq0KMj4ANwq94weNnUQYtI+s=
+SHA256-Digest: bTKB9CkWNhqawbJDhs1/GX4/z4j0Vg4cx31zKw44f5Y=
+
+Name: _locales/km/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: w5qIgDP+885pZJMl8FyA2yGUt1A=
+SHA256-Digest: sjEA2JwKdlS1D1hQxKQedb9DYCwOSDhyxusv/cUTkvE=
+
+Name: _locales/kn/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: MdvnoS3SrWGvRWSyvuRqoWvRiWc=
+SHA256-Digest: TaiiWa/PbBrRxhqRBYvFWtGmyyy/ovdu/yhHq/w9jk4=
+
+Name: _locales/ko/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: GqRtNAUwxrLDluWtx2LqjXzg+50=
+SHA256-Digest: McBNqK4HaGAS0dEAMzOD8lrwecj6CFapkKhRgZpR2qU=
+
+Name: _locales/lt/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: cBHtxCIgs0M0vuawqYXF7qBAPZo=
+SHA256-Digest: RvNH3JOZbIBt6KKPOdP91hxzpQQLbYxJxWeg36ncftU=
+
+Name: _locales/lv/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ljoDEg01zL32eJF/+OECLuPZkoY=
+SHA256-Digest: +pRZCbp3zfzTbM0UqTpiJd23dSymtKZxiZlqD9zNZEw=
+
+Name: _locales/mk/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: dHL1X/r5TNAy5AXujh48jmaBZMY=
+SHA256-Digest: Fs8OnAZZqmqEZHAoYINC1qjLdniDuxjboibfVPvcxek=
+
+Name: _locales/ml/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: yjvR4hUOwBfI4/NLchJglHMznUY=
+SHA256-Digest: /LzzQ1QQeGqOJGuwyf7hF1ynGzYojAJy8SjnfpqP8nU=
+
+Name: _locales/mr/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: VqbEpeDWqRRSDXueR7OXzV5Zi0c=
+SHA256-Digest: DXWyMnlhjkPGEZgaBzsqFEU88IvmcrerTATrEqY+fqY=
+
+Name: _locales/ms_MY/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: pNrnIUMZ1KSdavj7IpvgaXtMW1Y=
+SHA256-Digest: WjOfy4w9K1h+lN9Ld1JdzPwXrpU3TYqIpcQLVhzSsKM=
+
+Name: _locales/my/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: kPgWIxR2rynJkEykmF/T0clmLcU=
+SHA256-Digest: pVtnX3UxISFA90i1ivkuL01oGhoah2AqzAJosnkZMCw=
+
+Name: _locales/nb/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: xCCz+aU59J3pUBQrTu8Sookw3Xc=
+SHA256-Digest: aHFiDv13/G909I851CrVRUPMSAyxLABNIT5TkFPWolw=
+
+Name: _locales/ne/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ofcr0jXThFpy+75hHp2/Q7a13Iw=
+SHA256-Digest: fzhILeKwf6EXocFvocLJMDTVFY7948hKtI6L6UG8GFU=
+
+Name: _locales/nl/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: uHnFt32GmeGIWlUhV2oc0YwDBoQ=
+SHA256-Digest: EPKDxQlVhuigsi6at+OnLBBaPbqbNuYdbHu3nEx6Lv8=
+
+Name: _locales/nl_BE/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: vpN/Tt8RJNjNrjzQhvaCLnu818Y=
+SHA256-Digest: UMIycHh4OpfT6XEX5IkOJbBhBEmykK3QzilVLqxXbas=
+
+Name: _locales/nn/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: /uRXmVZ2hcY4LDKBmhSwYPb+v9A=
+SHA256-Digest: /VRfKB4L2T8XMwAUR9UCXed+uPckbOsicnTGYCRT62U=
+
+Name: _locales/oc/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: LEIoVVmbjin2D0Bj5PimJENOmCQ=
+SHA256-Digest: smQMMM7KSF/9lT0ryK07dEWxGtf3tYjF58E/kOIlNKY=
+
+Name: _locales/or/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: Ps0uvWBAvc6crMC3f7ztPoWLYHI=
+SHA256-Digest: sX3swrX1p95cHWLBMrKDJ8mCOM/k+g3kR6+vKtjUlIY=
+
+Name: _locales/pa/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: +P2o0dGSh7jJUtVjUFU70dqtxiI=
+SHA256-Digest: sHFd6kvNEbfWPpbLyIutoZkkEm0A9yWhjdbsXZ5YH5s=
+
+Name: _locales/pl/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: w97eXym45Cju4UUq2hDgfYZEivM=
+SHA256-Digest: 8dpWSVyqOkrMcQs4Ub98uEHMtAkwdtuag9kfv31TnwY=
+
+Name: _locales/pt_BR/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: B9dLWSgVB9XeiQqqE9ceVH+KFqw=
+SHA256-Digest: bkAA6J0bp9u83YD/Cea1ggdTUpXBl47Pb/RAgW/QO9c=
+
+Name: _locales/pt_PT/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: MFTtI6bvZgIBNjfsrsEes5SZWWM=
+SHA256-Digest: 6Oe7CSTsLlbxPCEcuVYO5tqvl3/TLquitxYnh40167c=
+
+Name: _locales/ro/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: iZA4eB6bVN8w8JNfUaLiB04ZeEU=
+SHA256-Digest: esk4A/1PXdU5yjo/Y/f3zS1fzrVQUIhGPFyAS1eSw+k=
+
+Name: _locales/ro_RO/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: iCzvlQJKPogorBRk1ZaRc1PHSzk=
+SHA256-Digest: f6sPhnOcfaNWIONa4Ow+YtnAM3GXnWIG1WXDRHOtves=
+
+Name: _locales/ru/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 7icD6gFZZYuaRFlZHpM3v4S4rbw=
+SHA256-Digest: PsIJMB4ploNqnBAmnqfFHDXH+zFdu4P6BNZMnIwT0ok=
+
+Name: _locales/si/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: KM47GTd9GQqAik45v3TwGKzhUqI=
+SHA256-Digest: 3PvBqbX4qA1rQB4l+mrxTb6mwA7ssWzrxjn1VJn5peA=
+
+Name: _locales/si_LK/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: /XRTG3mjOsamcRjwWbYUqmyS+jw=
+SHA256-Digest: XbC317Ovdr7RhMsUfhfXDV1yDh+4pz86mQMG1PFGLdY=
+
+Name: _locales/sk/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 8g2uM/IilbLetxLlpS1+hm+gb2w=
+SHA256-Digest: bnqVDCFodbSbseUbLOrdCwprRMxbpCYHMvVbz/3KP/o=
+
+Name: _locales/sl/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: MdQaZFkibS04O78qFlB6kmwhF9c=
+SHA256-Digest: 9pLwtRZfEy2la4LfIgkbDR/M+nNotJAA5wzEgT+AfyI=
+
+Name: _locales/sl_SI/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: wFhFU0upAYqmmQI/nRnGEnqP30Y=
+SHA256-Digest: qx/D6APKUhcKmNWwCHD/baIjzMFQNTR4/Rt6LvOTQ4Q=
+
+Name: _locales/son/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ofcr0jXThFpy+75hHp2/Q7a13Iw=
+SHA256-Digest: fzhILeKwf6EXocFvocLJMDTVFY7948hKtI6L6UG8GFU=
+
+Name: _locales/sq/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 87nTmcsWpoEAsJTN4/ZFf+01I8A=
+SHA256-Digest: POGPrXKN5GuJ59k227ozXns25ogQdzOOgA3azEA1f94=
+
+Name: _locales/sr/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: zJI0kCSZIB/4rfhaGxg0aUGrbtQ=
+SHA256-Digest: tfKdrL6vsCYxRU/QeEvAZC58y6qDuEKkhNi17r1e/8o=
+
+Name: _locales/sv/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: UI6tx0CmaOkUsjASOmQvxNRkX+c=
+SHA256-Digest: WnBcBaT7T7yKHUvac2bn2q5alrsbfEiLOQUXPIQLurQ=
+
+Name: _locales/sw/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: JSf0a8gCwILGBI0T4d/FfWfIGDc=
+SHA256-Digest: Z+oQpHb/T+I2XZ+JVJZW1KMeAP6yK/x9Quts8n64AlQ=
+
+Name: _locales/ta/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: CW5Q8ok59gE/ZC8A4uPqW4cIfhI=
+SHA256-Digest: vOG/RBohVZklUTu6y6cjUWg5RyNIbwaB33kUr5Ko2PI=
+
+Name: _locales/te/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: N/QOkBiJYvqsksR5+NWuHA0/fxk=
+SHA256-Digest: jZC8UbVBsT2RvDZ1uebHtr76/oRaNdlmxLKWLnDaI3A=
+
+Name: _locales/templates/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ofcr0jXThFpy+75hHp2/Q7a13Iw=
+SHA256-Digest: fzhILeKwf6EXocFvocLJMDTVFY7948hKtI6L6UG8GFU=
+
+Name: _locales/th/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: QaLDEcDBj6HdEh+eAhQ02DWS81c=
+SHA256-Digest: ucjQxKDoCEwzTat3hNNjtMRJ/u85+QK47Rw93C4J8Sk=
+
+Name: _locales/tr/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: MDXJjWJjdDGjeYfHHa2+LsPj2tM=
+SHA256-Digest: vdziBTOIPyWhvyfApPrN8jZMww3lePVgo4zDkwcv9og=
+
+Name: _locales/uk/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: TargN1mxonMdbvos0GBcCxU0+dI=
+SHA256-Digest: 6ZRhyVruPhNEb5UPYCrb/EFcy6ArHSNqxBy4KNEhq/c=
+
+Name: _locales/ur/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: kUEeTx9OeiESvvWjprUjqluEhZk=
+SHA256-Digest: ADAHAHlOUIGXLO2Aj5/it+lavjH4WkbjLV43yI6CO4s=
+
+Name: _locales/uz/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: bmGV4U+3LA14ZwC5RcRdN5RB+tk=
+SHA256-Digest: SPoiBWn8W+vyUJHKfocitJ5y6RjXedgta0HxflAFB9Y=
+
+Name: _locales/vi/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: GMY5uzc6vq9pP9hqFNGlOgVYZ8k=
+SHA256-Digest: OidbjDj9CBSxmM5oW3RagDo6ZNvA+5P9CGN8C0cbgms=
+
+Name: _locales/zh-Hant/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: NXT6rNViMHWrKSlecajyj80CeIg=
+SHA256-Digest: 3zXYNMBhIcIsuhQRzfIAFhV3GdeGZXgyc+h5bFXMZtk=
+
+Name: _locales/zh/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: Vu5rZrqGhcESvjluy4x3EcMPi4o=
+SHA256-Digest: karIDiNHSaijMuQkVkG71+StamzOq9ZeGiQhzwJjTAw=
+
+Name: _locales/zh_CN/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: HWK9jni02GGBk/XOVpL/R1rs0NI=
+SHA256-Digest: Hl+NW/IGzS73WJhUVgY9cPJvMyb0ZomG7k64dzoJ1wc=
+
+Name: _locales/zh_HK/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: oZ9Ht83pERBafXR1h2mucibzUUo=
+SHA256-Digest: Vq5s6nfmwfxvTVQlmjFCHCYlzvJanl+4I8J2h8F0hjs=
+
+Name: _locales/zh_TW/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: yfJJJg+Uan6mqiwEm4W0l5tT+nU=
+SHA256-Digest: Xj6MJjfhW3liYqF0UIY6flSaOxnNyr4Urgu2gffF99I=
+
+Name: background-scripts/background.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: GMCKwYZnhsRm4ExhG1q6wY+DQno=
+SHA256-Digest: D4ogTIq+ze3hPGkcxzkc2jFho2hACQn3iYc2oaw4egE=
+
+Name: background-scripts/bootstrap.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: TSwjfTzojZXN1Iul+mBttRl/MAg=
+SHA256-Digest: WcKbJ0zQK8948MJzbMTTCf807jEGH7Bj8k7CuWCx0aM=
+
+Name: background-scripts/incognito.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: JXSvrJhaxqSgUtXqlm0r21VqSlo=
+SHA256-Digest: AnGJOJ4CKWmdFZaWNzvm7NWZjbzCKkdawPc8RZCH4d0=
+
+Name: background-scripts/ip_utils.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 8RyxTy1FNW0wvKPs+DqKNNZYvV0=
+SHA256-Digest: F9Ij1ZyfnpmmCM0W3+WXfaBO/rnUAFZtXc2N305Qod8=
+
+Name: background-scripts/rules.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 2dd1eq7Y16RvpmADSFGYSFdRvNc=
+SHA256-Digest: 9Qw9Xoky6/2DvBn5nza/xBXbjaWkEBI9hPaaqAdQDqU=
+
+Name: background-scripts/store.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: IdAI+nj6uuahTeT28Xx1QJwLveM=
+SHA256-Digest: lyCBwe6g79MMTtU1xyGBiIJidhqUsW/9YUXX158t6z8=
+
+Name: background-scripts/update.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: Z/kkBlC2HeS/G5zlAbeiFwLpgIQ=
+SHA256-Digest: R1y7pQHEB8w7mNOn0zxEL20mys/8sOZxy5238BzhNoI=
+
+Name: background-scripts/update_channels.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: kA9YO0yjVOE6vw2mpWPePkWyt/I=
+SHA256-Digest: L966QoT5hiVg5mzQq9dACJ5o8OVsROxhNRd+LebsAQQ=
+
+Name: background-scripts/util.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: pjJWekzg0QW6/0qYNf1pISXO14s=
+SHA256-Digest: 1Cykm0yxo5EZs0+fZWtUPzHa38B6ZalDAOojqu5awgo=
+
+Name: background-scripts/wasm.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 7pQTqvYA4el8WRX7FjQNUUcMUwg=
+SHA256-Digest: TMk4CQYN4lxkG/ZBq+wp4erwwo8knS0H5HHBCa7LW08=
+
+Name: background-scripts/modules/ssl_codes.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: t5DE+asvCaL1VaVhVXbJDQXQaHw=
+SHA256-Digest: hGKfRGrQWsXH8+9OfHcHM4I45d6DIIxClYqMSH1oBCA=
+
+Name: external/README.md
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: DgCQOA7tYbKkLcJ92flagYsm0nI=
+SHA256-Digest: So9vbyA/ExcM/wEms+bwz/YVVa2ayDCNnJ5sYJk40tk=
+
+Name: external/codemirror/codemirror-5.31.0.min.css
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 6L9PQ9XeTmwE+7WJ29O7oelFX7Y=
+SHA256-Digest: fIaQYYF933S7mhBn4vqsgaawzXI4iELVCrvv83rZ5ic=
+
+Name: external/codemirror/codemirror-5.31.0.min.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: iJyQEWjgaJ3IVz2bsX+RSnjLzGw=
+SHA256-Digest: yTU67I79B7rqtdoOdsJHDDK/92GDEeGj4+93U41HPgE=
+
+Name: external/codemirror/codemirror-5.31.0.xml.min.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: DMaXXHyF/jzGu8wJN2a1yHxkNHU=
+SHA256-Digest: d+N19fPYNZkqDuOxqLM8MHSxTiGDF/j5WLdynJ2D8/k=
+
+Name: external/pako-1.0.5/pako_inflate.min.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: V7Fd/JcXF6Ar68Oa5X3/rO7giNs=
+SHA256-Digest: h8L84MNiYQCe/szpOr1i5Cge5x/8EsvaaTlcdG9vOnE=
+
+Name: images/HTTPS-Everywhere-Logo.png
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: E0ESMX+oJaAutg08/RPfpc3Ix5E=
+SHA256-Digest: PKyVOZS7bg8UVeQDG3npTYLKtnB5FgmmdfoW/NC02bQ=
+
+Name: images/banner-red.svg
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ZnApE5t/iqGaVc0fdm7I0Rpvdsk=
+SHA256-Digest: obGxFfdgfzgg0jj59ThEpLQwowcJCioxsVS/+X7Mtvg=
+
+Name: images/eff-logo-monogram-red.png
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 5sbYS58Ze3MdPgDNas/ZnFn128Q=
+SHA256-Digest: aPdsjK4CCl3M8HBgqCLA5vu5n+w9cCs75gs0j5x/0Ak=
+
+Name: images/remove.png
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: Pn9f97i3AIFlAMf420qZNzvA7DY=
+SHA256-Digest: 7TrWr2ZkK0faWgDYUz9WtV3voVjEwqjLq0ROGvkU6y0=
+
+Name: images/icons/icon-active-128.png
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: p71skXMtghXylXMvFLnYW/jPos0=
+SHA256-Digest: 1DbMnWBmqaIRzzkUyRpdRzxz8z1HtUGq6RzRKcINuEA=
+
+Name: images/icons/icon-active-38.png
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: EleX4C/tgOj+W71fueie7ZoXAAY=
+SHA256-Digest: YgkTENwvpAo6Bb9WsTrUr+CfKY+gsQfq6uPoGdMw6kI=
+
+Name: images/icons/icon-active-48.png
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: VVqz4q4/4awX6PXZhnQmGFkAiqc=
+SHA256-Digest: pfkIfbdzORmTjUTLb2SsmaLv4oafijkSttiU3lUcKmM=
+
+Name: images/icons/icon-blocking-38.png
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: IebllmIP/cUmB0piMroSEA7HnHc=
+SHA256-Digest: 9oP7jvbkH3KM4VG+kAnItkvsT00o9/KKHvhexTJHCD4=
+
+Name: images/icons/icon-disabled-38.png
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: PJqzR54BFgNofExLbYn8DMEyvzE=
+SHA256-Digest: 2PzhLQJedFJa+ZOnE/j8r+XELaoYAn5ptQCSyNbmDcE=
+
+Name: images/onboarding/httpseverywhere-logo.png
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: XYvqYHk+Ebepsvq4U3bo9rYMqQI=
+SHA256-Digest: 292a2wZxJ/ltXI+/9OdCzMX2YZnJDWMYUoVOOnU+sUs=
+
+Name: pages/base.css
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: Yk+MDy/I88Qd0VMzEBIbf0fBo0s=
+SHA256-Digest: D7uZfk1BrCzx3HFnEBtdaN0E6rC6pErEZAd1X85xgCo=
+
+Name: pages/main.css
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: UN8/2mEQ6JZ7MTJiWQN8f77AgP8=
+SHA256-Digest: QhiZj5JKVR1gPvtg6EaZxI735GiFeZglzuSkTJpZvpE=
+
+Name: pages/translation.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: QMAZVa3usW8vcXwN2WP4lvIQQxQ=
+SHA256-Digest: +qWz2YZH5C1UqzTixYwsS3185+wd+q8Dhlm5czDI54w=
+
+Name: pages/util.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: XzUESMiqZDZv/WRcv+j8f/R/7uw=
+SHA256-Digest: tSZjbu7zilv5pujsEyp/+6HCfr7iu+KfoXNiftpAKAY=
+
+Name: pages/cancel/index.html
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: h94rEtsYrj+TsIBk2x+UqRhOHDM=
+SHA256-Digest: Fgv98mLYPbIiOUi3HAw4YktUVkkt+7clLW2IgxTD9us=
+
+Name: pages/cancel/style.css
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 0L/xbmBq8hCu58P61j4htTOA4Wk=
+SHA256-Digest: ejF/rMWvajSbZFxp0hRT6SzhobQ3aILcf5pN1BTOGEE=
+
+Name: pages/cancel/ux.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: UtFAiW+HLmKUFMV/v2hPR5haiAI=
+SHA256-Digest: i3Vc/dqv2XS12us9g1J5f6iMIZC0gI36g5N/FEKX1pw=
+
+Name: pages/debugging-rulesets/index.html
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: DuBJ5S+QY5nztsCAqOuTgKmu4no=
+SHA256-Digest: J4l9PsxyBqZKSYfqo5Zp80vXBJ7mqRVKNS2KoVU9F5o=
+
+Name: pages/debugging-rulesets/style.css
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 1DuOcKAihj5zxJ0CIgam4iq8YXc=
+SHA256-Digest: 9H1UQpqT3UDDSt2ao6Zgr4iT5o/iQ62HolhTDqNHHCE=
+
+Name: pages/debugging-rulesets/ux.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: IyqmSEBIenfSG4Mk++ciVOvpQvI=
+SHA256-Digest: OVzkDGtCe3pg65opGnboDfrFsqFsLJxa5CQxBPA9gi0=
+
+Name: pages/options/index.html
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: cXwoesX+lTfZgizRwhLvV5iFNDQ=
+SHA256-Digest: OzLgxg/tYfU/fSAIHLxBZ/++9W6FgznEEGHflPJ9aq8=
+
+Name: pages/options/style.css
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: m7GC//67J6ErvL9Wp1FvAUMLk/8=
+SHA256-Digest: O5CikoWfyy2E2v3es6BJGltQ+OKfeD/uIYp9xsrqsF4=
+
+Name: pages/options/ux.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: bUAAi8jBxAk5YiNWqSyiXxkSPs4=
+SHA256-Digest: WzJSEmMXT7Qi7rKftAFtuD6oRK0bfaLtzqCvtgwJ+/c=
+
+Name: pages/popup/index.html
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 5vBn8FGlSOjp7z4UozcN+hnm3iI=
+SHA256-Digest: JoShZlQiKjzRj2JxRHXHW4Df2LsKWf568UU/oKVePpQ=
+
+Name: pages/popup/style.css
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: aPvKt4RXG/BofewRf4CE4mBg1lg=
+SHA256-Digest: H6iKtXGZJ/o2chDo+KZtB8VNYdaadxE8+143tDhl3/U=
+
+Name: pages/popup/ux.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 68pu62q/sp5slQO9MUxCOv+ofU0=
+SHA256-Digest: 6VKXwWx0rQ6KoTh0OQ4KpscxkgcW433VAazICjc3bCM=
+
+Name: rules/default.rulesets
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: hqWsDDcf2fp+r/dTBZqGw2eaqb0=
+SHA256-Digest: hnQbXIa2D+1lFh6i13HSkXQyYa/TxpKrPlx3QzgnnX0=
+
+Name: wasm/https_everywhere_lib_wasm.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ELfS13+0aPyRX67301qNv6fm3pk=
+SHA256-Digest: 519ILW7r7LqFtGI6M22GuXDA6xYikE6EngbvlT9//Lw=
+
+Name: wasm/https_everywhere_lib_wasm_bg.wasm
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: SBxLOV763w4ke4LOL1574PW9hCs=
+SHA256-Digest: 7JqJ7u/5t5yGxh8p2+YCmgl+LeoRWQRlDJY9cLxWqA4=
+
diff --git a/src/META-INF/cose.sig b/src/META-INF/cose.sig
new file mode 100644
index 000000000000..c124769c1e40
Binary files /dev/null and b/src/META-INF/cose.sig differ
diff --git a/src/META-INF/manifest.mf b/src/META-INF/manifest.mf
index a84e08a980fa..35f49ce809b8 100644
--- a/src/META-INF/manifest.mf
+++ b/src/META-INF/manifest.mf
@@ -1,1097 +1,742 @@
 Manifest-Version: 1.0
 
-Name: background.js
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: R27Ir4kxKIWgy9yBlLC2AA==
-SHA1-Digest: vZ94ALa52F6K7950Ry52JH2pXDE=
-
-Name: bootstrap.js
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: ok9QgnJcXieW5vLC9QQSGg==
-SHA1-Digest: TSwjfTzojZXN1Iul+mBttRl/MAg=
-
-Name: debugging-rulesets.css
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: 7tbZ/OfcfYqsnf6SrMDpHQ==
-SHA1-Digest: 1DuOcKAihj5zxJ0CIgam4iq8YXc=
-
-Name: debugging-rulesets.html
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: e2fRv5wtB6j4V0IwF/L8QQ==
-SHA1-Digest: DbsISLZPulbhk24S2YOyuV6Ir/w=
-
-Name: debugging-rulesets.js
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: wuMY38n8KZtxNpk5vT14ow==
-SHA1-Digest: hAn8WW97FT95OOQeyLV3oSoRSR4=
-
-Name: devtools-panel.html
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: yergqhQQNsUBK/TdQBvoIw==
-SHA1-Digest: KywHu0c7ciaB3C+NJTXLvuP8qFk=
-
-Name: devtools-panel.js
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: dmtNDWjK4ZW0L1/o/pcIPg==
-SHA1-Digest: 0Gc3DNnrhQyuNw3PAzs5vyBLKe8=
-
-Name: devtools.html
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: JcFlBK5Guvj2M+Np47Zmug==
-SHA1-Digest: CagZezrtuMaQCpFAG2OrveNDft4=
-
-Name: devtools.js
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: AgX9Q6psEzOt8EtiwMQTuQ==
-SHA1-Digest: Fl6NxILtwB7QYjbQNEOKjmbw2wE=
-
-Name: incognito.js
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: b3/mBZXgt58910tFDiwDlg==
-SHA1-Digest: yb8hDRKxyRv4VfPLW3qXO+PxkWA=
-
 Name: manifest.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: x1WcixBsIHN3Sq/RlNCskg==
-SHA1-Digest: fdOnj00W9u1OvMQPUak86yufIxQ=
-
-Name: options.css
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: W9az+c4bBqgkDTR5/BdmBQ==
-SHA1-Digest: aivtHPV2fwRoONj3ApSO16JKAWA=
-
-Name: options.html
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: UvYJlcytju64gXeEibdoIw==
-SHA1-Digest: 0T85eg7SEPtKN6AoXaxZmyC33fM=
-
-Name: options.js
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: SHm9taYXr3uDrJQFluJ8uw==
-SHA1-Digest: rWahHaf4o7GFYiuuRkj5sDcZZEs=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: X0hd0tplhCo2R8s3OE27fLAZFD8=
+SHA256-Digest: iKk69TG3OJJNjjAJPTe72S+qXa4k/xL8yKmPzAGmaxg=
 
 Name: package.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: BkjiQ855jU5esOxdhPsIyg==
-SHA1-Digest: KnghD9Y8ZIw4rji19UNOZS8SI08=
-
-Name: popup.css
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: Tm5iH1K+/kaJk3kNQT9xkQ==
-SHA1-Digest: azlA1n+vJnigl7qrFPlFoOB1tII=
-
-Name: popup.html
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: xOGR+mYxFDRs+CkHCXDwRw==
-SHA1-Digest: IwxDUDsW/rcGQUfYLbrSUtsSiFI=
-
-Name: popup.js
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: rpqnrEmp2w9brb4o1gBhCw==
-SHA1-Digest: nGqFLZ4y51lfdMabaxOP2ySKYQc=
-
-Name: remove.png
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: 5cEC/96nu9+3tZZEOPpaqQ==
-SHA1-Digest: Pn9f97i3AIFlAMf420qZNzvA7DY=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: HQyF0Be9Z+C72YzyWk6LqTSCxkU=
+SHA256-Digest: 1v7I/u/oNho1Z8rtRLepk7VY9i0r8EktoXSvvy92SsE=
 
-Name: rules.js
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: Bz0MnQxembuTb+wRqu89tQ==
-SHA1-Digest: N7QeKrLGibRCy43GTd2Sp/wIy5c=
-
-Name: send-message.js
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OLqYbvChNYvDXmNu1RVcSQ==
-SHA1-Digest: c3gJM8jessaip1UCKp2TPtpqHBw=
-
-Name: store.js
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: O+V64B536X/uN4ONVAjY0w==
-SHA1-Digest: 7q+6fjf8/g/O5RFwIcTjZ3tOiII=
-
-Name: switch-planner.html
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: KZJe5eadStVgaUICHMqi2A==
-SHA1-Digest: xQV2GfikcWoI5bzxM/2EKGOYI6U=
-
-Name: switch-planner.js
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: He/vvbKah80s2V2cGjsQrw==
-SHA1-Digest: nl+yUph4RTjiLYLH/olpDH3C2tM=
-
-Name: translation.js
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: xdJRwoXZx9T+bfLw78i8Cg==
-SHA1-Digest: Ipy5U9Bbkmc/EN3beorvHm8lnhw=
-
-Name: util.js
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: RLM/9ouqt70TkNRA4A/dKA==
-SHA1-Digest: lLZr1VxIu65mjm+SB1F7f9dhSdE=
+Name: _locales/ace/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ofcr0jXThFpy+75hHp2/Q7a13Iw=
+SHA256-Digest: fzhILeKwf6EXocFvocLJMDTVFY7948hKtI6L6UG8GFU=
 
 Name: _locales/ach/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
-
-Name: _locales/ady/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ofcr0jXThFpy+75hHp2/Q7a13Iw=
+SHA256-Digest: fzhILeKwf6EXocFvocLJMDTVFY7948hKtI6L6UG8GFU=
 
 Name: _locales/af/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: DRbkAVx8Gj3oeRXZNwS3Jg==
-SHA1-Digest: iTHCvsgSqP9ipTpDucVit0R3PrI=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: iOMFMT97+EoNCW6DRomntg8GSHk=
+SHA256-Digest: cw+OPqn11qIyL1P5cFnPmxrYTVKQ0oPX10+1KjXtNoc=
 
 Name: _locales/af_ZA/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: C3rsjMopt60Go5RGI7QV5Q==
-SHA1-Digest: kKaZft5WxOVuvHK6ax/f4IUV1lw=
-
-Name: _locales/ak/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
-
-Name: _locales/am/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: o/drBPHjjR//E5b94CS8MQ==
-SHA1-Digest: YQpJPI9SY0Q+GhGWrwhsnKSIqxw=
-
-Name: _locales/am_ET/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: jc5+c7ZSijXJ6G9lDHntsA==
-SHA1-Digest: O/N2Bx4h2BvY0k1U6sR5WpA1uIE=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ofcr0jXThFpy+75hHp2/Q7a13Iw=
+SHA256-Digest: fzhILeKwf6EXocFvocLJMDTVFY7948hKtI6L6UG8GFU=
 
 Name: _locales/ar/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: 4p3fquiAsZdNSt6PNhY6vQ==
-SHA1-Digest: cyX8HCqoF5nf38HRZ3Fc5X/eTZs=
-
-Name: _locales/ar_AA/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: DARP7ysqdZQvIQQkbs0eIA==
-SHA1-Digest: rTEnTfMTGuI9wp3Nzya2YToC9dQ=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: pxQQhQSkkjd9EAlMdZmvk+qmXhg=
+SHA256-Digest: MORqa6PigyGRYrjsjuUVk80TAKErKzIZy9G5UnPV20U=
 
-Name: _locales/arn/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Name: _locales/ar_EG/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ofcr0jXThFpy+75hHp2/Q7a13Iw=
+SHA256-Digest: fzhILeKwf6EXocFvocLJMDTVFY7948hKtI6L6UG8GFU=
 
 Name: _locales/ast/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: y3rto/Fr5Zy0VwMDQLCv0w==
-SHA1-Digest: GeT6fNKPjLnGuE5zzX1f0b7RgtA=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: VdPNPPiC8Ro2JsmoBFkdW3TAy2c=
+SHA256-Digest: 4zrpaArMxcBnUHIyLdenD/CDBXFXDgnSki4HzzEB0J8=
 
 Name: _locales/az/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: Rr3423WvKcSeBhR5mYHLWg==
-SHA1-Digest: fAUF+znZxwwdJEVRgZsQimkaKuk=
-
-Name: _locales/ba/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
-
-Name: _locales/bal/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: WBu/Z9IdheTqYg7PN8qJ6w==
-SHA1-Digest: KLIySoU+8v3AyFfVTOUp/80nKIM=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 3+BLldWYu7TK8cGkwWGVp8z0EUk=
+SHA256-Digest: hfU635JcDvcEJzmbg2zkxSrfMEe0SVNvq8U9wj1SvNg=
 
 Name: _locales/be/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: BG56IqbbUeKJg9Mo4XeMfA==
-SHA1-Digest: vCUFlC290mGBZw+KLHofklaQ8uY=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: /7FQnv3lG2OqZFTdc3/fmuOznX8=
+SHA256-Digest: OrCo5OOtp9o91snpAQUrgUG1KbmJ7ScDZ3tncnnV2po=
 
 Name: _locales/bg/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: 5M63Iwlw98OqkI99sKfjqQ==
-SHA1-Digest: 3lFzCC7DoI+U4wnMzj3/3XuBHuc=
-
-Name: _locales/bg_BG/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: C3rsjMopt60Go5RGI7QV5Q==
-SHA1-Digest: kKaZft5WxOVuvHK6ax/f4IUV1lw=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: uvPzsM24ej+LdWMNASNfYE1+tBs=
+SHA256-Digest: Z0AMZvlkzgDfeSMbZQ+AdhZryI8kmsdpYpvOz8lM9TI=
 
 Name: _locales/bn/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: qmBLnnEoDavEelOkIbq8NA==
-SHA1-Digest: rtf2CDbvsyDkEvYqtJks3dj9O4s=
-
-Name: _locales/bn_BD/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: +Fxhg2HKov6iOLFwCpVRAQ==
-SHA1-Digest: sZwa5KjWChdMIqg8JstDXMJ4a2o=
-
-Name: _locales/bn_IN/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
-
-Name: _locales/bo/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: dVoXHkj2UXzj4ctLQ7g2+cQu/o8=
+SHA256-Digest: hTaM5b35bOJhTSV38ajtBg58bV5TdC47xttlYiZM/aU=
 
 Name: _locales/br/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: TtmZdpt2wgS/gM5VguCa5Q==
-SHA1-Digest: 3be8pASueWuMkqbGpWrNsKgGOnE=
-
-Name: _locales/brx/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ZW6ty00kj6yNkgcEnnvyQjjgrWg=
+SHA256-Digest: sTBK8ujpW+kR/M9mXe2ShZUChO9Ytu7gKVYQkaOwrZU=
 
 Name: _locales/bs/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: bY0RHTln+zmaJHs3y6vy8Q==
-SHA1-Digest: IunKatiMDIq1R8ExPVu3O2vdqvk=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: Vg2wDGtsbEZthKbRz9yUjj7Q8YA=
+SHA256-Digest: vQgF2n0ktL3LZ1rqMaiZvCxRRt41I6PLvVHRJYvHb8o=
 
 Name: _locales/ca/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: lUqlkznSO7atQrHXUwtMgA==
-SHA1-Digest: tpGAgpc1SFNY/AhWzX8G301zEmM=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: /COeM2de5nZc7h2xYUdMcQqMeJw=
+SHA256-Digest: otyh6c/nvuTuTZfmLv2FfYlbI6fkf9ibQ4zZYWll2Bk=
 
-Name: _locales/ca_ES/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: xg1eQj0qTl0n/MtyCIAzVA==
-SHA1-Digest: 00AuDH7V+k8mRjeImQ9OU4zdMI8=
-
-Name: _locales/ceb/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
-
-Name: _locales/co/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: WBu/Z9IdheTqYg7PN8qJ6w==
-SHA1-Digest: KLIySoU+8v3AyFfVTOUp/80nKIM=
+Name: _locales/cmn/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ofcr0jXThFpy+75hHp2/Q7a13Iw=
+SHA256-Digest: fzhILeKwf6EXocFvocLJMDTVFY7948hKtI6L6UG8GFU=
 
 Name: _locales/cs/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: CnHU5Pd1xSvemH6jnYPKUg==
-SHA1-Digest: sCqGMSAjIL6aPxymvuHhuNv+HEw=
-
-Name: _locales/cs_CZ/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: DARP7ysqdZQvIQQkbs0eIA==
-SHA1-Digest: rTEnTfMTGuI9wp3Nzya2YToC9dQ=
-
-Name: _locales/csb/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
-
-Name: _locales/cv/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: PSPcBF4f2cciaztX/tDK489gG6w=
+SHA256-Digest: nhqVZbEdeQLOEfTuC4WQZqq4nVX6TLgsumEei+NDJjo=
 
 Name: _locales/cy/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: zM6yUS3o+LBsTNRyNSl/nA==
-SHA1-Digest: /wAVqNc7XeDhtdJp1WlU4H8z4R4=
-
-Name: _locales/cy_GB/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: DARP7ysqdZQvIQQkbs0eIA==
-SHA1-Digest: rTEnTfMTGuI9wp3Nzya2YToC9dQ=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: A9MVuoq+YeTB4AJ7qXIW2t/2reU=
+SHA256-Digest: MMpP51GLMadXFrMHt8O5C2q5x9ipotM+rbjBCSAIa0k=
 
 Name: _locales/da/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: HJ6ZF5oQS6u6qaaQBROZGQ==
-SHA1-Digest: c7CjAoWGcLcHDQKhTbde3uALlcU=
-
-Name: _locales/da_DK/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: DARP7ysqdZQvIQQkbs0eIA==
-SHA1-Digest: rTEnTfMTGuI9wp3Nzya2YToC9dQ=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 6EA7b3gcz67OK5/NhNpqiv8JsRw=
+SHA256-Digest: XvGrh0Pr/cIN0+h7dYRhsWrE2sbpvCGejLUk5g2cb+M=
 
 Name: _locales/de/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: tgZ/4eZ2RkcZeoMxFpJWEA==
-SHA1-Digest: C6YGHTiDg7UUe0ePlLKU6rQ7biw=
-
-Name: _locales/dz/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 5DxSzfj3HAO19N93skW8074DacU=
+SHA256-Digest: 6RRsp8DV8g7u3majB5LXV/HNNz9wltPP3/drftJO+t0=
 
 Name: _locales/el/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: DLO6pF7MhiGXGTUH6uiUMQ==
-SHA1-Digest: QMgrT02LFDoLBybZGuBbNLl4p1E=
-
-Name: _locales/el_GR/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: C3rsjMopt60Go5RGI7QV5Q==
-SHA1-Digest: kKaZft5WxOVuvHK6ax/f4IUV1lw=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: cDgo3bT3QsyvgW6sNV1v7VhD+c0=
+SHA256-Digest: oBZLruNBa+ryEI2AaAM1IuFsmVxF73+deXjq7P6lunM=
 
 Name: _locales/en/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ofcr0jXThFpy+75hHp2/Q7a13Iw=
+SHA256-Digest: fzhILeKwf6EXocFvocLJMDTVFY7948hKtI6L6UG8GFU=
 
 Name: _locales/en_GB/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ofcr0jXThFpy+75hHp2/Q7a13Iw=
+SHA256-Digest: fzhILeKwf6EXocFvocLJMDTVFY7948hKtI6L6UG8GFU=
+
+Name: _locales/en_US/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ofcr0jXThFpy+75hHp2/Q7a13Iw=
+SHA256-Digest: fzhILeKwf6EXocFvocLJMDTVFY7948hKtI6L6UG8GFU=
 
 Name: _locales/eo/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: MR6vUO9Fr6VVB6FGTUUF3Q==
-SHA1-Digest: A4hQgcI4uWwHv71HjeiJSi5xurI=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: cTvPwrTLEg/CLQ7vP936VGhWMBA=
+SHA256-Digest: 6Tb3+j9lXyFMz+bKnJ+MnaIRIAaOIgFGgGFeLUWIHB0=
 
 Name: _locales/es/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: TP7LwQDo02Y6AKOfmaNWQA==
-SHA1-Digest: oOcr98qUOknShf286kzOScvedhc=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: wdTXKRaKo3+lt2F/WAfhHECWQ0Q=
+SHA256-Digest: 6LOKxRvSfOFCftbixNJLi3ILtnXblwVUdYoxy0KkUKE=
 
 Name: _locales/es_AR/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: i8hDlH0K/U5QxcB7u+zfeA==
-SHA1-Digest: /lcSR/DYoCmjHG0QtAHimzmOIZE=
-
-Name: _locales/es_CL/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: QWya5iwFXT8B1XvyZQBbKg==
-SHA1-Digest: AZkLdHhP7k6OXaclzlTH22sivxs=
-
-Name: _locales/es_CO/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: Id7wiaUdcX0F2Sjhjlba7g==
-SHA1-Digest: qK6x6goz6XYybj708m5wPP5YL34=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: jNe5tt2sg9FYb/CklhOA/EfCNso=
+SHA256-Digest: ejlUkVhdh38l0SQqB2iuiCGTJgg/HnUZ6YB1BIowEUI=
 
 Name: _locales/es_MX/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: u+un2pERqRGF2Ll4TdBVCg==
-SHA1-Digest: WBrI/uE/wY9lOTCGrOWvCKdXf0s=
-
-Name: _locales/es_NI/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: C3rsjMopt60Go5RGI7QV5Q==
-SHA1-Digest: kKaZft5WxOVuvHK6ax/f4IUV1lw=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 8r5iYER0e+Z9xsXkisoWpgiV6wY=
+SHA256-Digest: nNkWHeZ9eKPmXKJTHyKHmuqMNO9w7KdMoCpNtykVJSo=
 
 Name: _locales/et/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: Nq7rhtZMoHbY5JAd1hARJA==
-SHA1-Digest: HGBqRBX/8OMtz7WXl3YrP0Wa5Lw=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: RuKFi2LDlh1aZ/sgjAQHk9Dr0aU=
+SHA256-Digest: kEGCDq7xq97+kttCcjDTrhV+IRBdvTdokVw5x4MjUrg=
 
 Name: _locales/eu/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: D4sn87pJGYS+q52hI5MdJg==
-SHA1-Digest: uC+G76C2cs5K7uXewnBTgov1Zho=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: CfUVBO8uVqaEVg2rfNiEzhOOIxs=
+SHA256-Digest: U4RrQUCTj9jzxLMjadoUZlclwDWv7StaWVTd+VfnN2I=
 
 Name: _locales/fa/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: 2zwAgyaECJXMUvRff4elPA==
-SHA1-Digest: 6u2PI/NBrBHbJjO/ms5IswtoFxc=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: Zi0T7F3MTegvevGxycGERaO+y+k=
+SHA256-Digest: FppLjcJVwKmgWnEVG8DUj/OfX/mPJaRmMHYdzdQ4Qk4=
 
 Name: _locales/fi/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: xNbF3R+kEAcDoPFBDfbgPw==
-SHA1-Digest: Bh0JPIUBNRgO0GFrt/o1/2fIXKA=
-
-Name: _locales/fil/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: mVMTkZsPu3fS5tP8GNUU8Q==
-SHA1-Digest: K8BT5etTl+iZf57/4x8gnSBfyKw=
-
-Name: _locales/fo/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: TX5sq1YAWC2+8y2ghMEYDw==
-SHA1-Digest: P2B+mVgwBTMU4enJ1P7y+mrAvTc=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: Ijd1g6JcPeStcajdi2p49GxtL/s=
+SHA256-Digest: XtP/3kb3g9EEZXkGRsQh5oEGWm5XdCCVHsY4eBWi2Lo=
 
 Name: _locales/fr/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: 8UE1N6cjR1dtXhmsZupScQ==
-SHA1-Digest: oHFxQhW6JfZu06Ws34nVZF/3oPw=
-
-Name: _locales/fr_CA/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: yuJHET6210PgBqtl0bcX/g==
-SHA1-Digest: MwxMft6YzNpXi1HpZyLk3aTtLUM=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 4Kl28lQ4AxcFKuI1qPanfKBIO1I=
+SHA256-Digest: JR6Ytgifw1eNfP5eEY9DW2+NyBy5t5m8jcfG1eElpos=
 
-Name: _locales/fur/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Name: _locales/fr_FR/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: /siGONOTKZIcZRCh3Gjklyi6FpA=
+SHA256-Digest: JOAxkWbsFpRl+/JTJ9Ii5P0ixY1UOkuZHRAjMb86eWI=
 
 Name: _locales/fy/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: 0HHLQ4vO3bSFV48wzYvTqQ==
-SHA1-Digest: AGs588E92Gni3uIBneq+C34eVGU=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: qYt2G1hP0Cs203jLvxdBLgv4MGQ=
+SHA256-Digest: cNu7cS359ufs/B5EXOMBJIvVbfB8V9sQpFxorgrRxxg=
 
 Name: _locales/ga/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: C/z8EGP5uQDW9oaacxkRTg==
-SHA1-Digest: eQvEB9Xhk8XtqLKzxSr08AtLteA=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: oNZb00MUZHcEuMm1CKosXijaWgw=
+SHA256-Digest: knCNuU+/o1k+pt0GMADpt3nuzqz17npT4Olsoj8EL7o=
 
 Name: _locales/gd/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ofcr0jXThFpy+75hHp2/Q7a13Iw=
+SHA256-Digest: fzhILeKwf6EXocFvocLJMDTVFY7948hKtI6L6UG8GFU=
 
 Name: _locales/gl/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: 154o38YQOMC6B1c1IaKDiQ==
-SHA1-Digest: moUaisv4vuHp1KfLFD/nEN9oi8U=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: WBkm2qWTCShjdj+kFKqzxnZIoFg=
+SHA256-Digest: Y3K9ZWg9+2pL1r34SJhQYu26Viki5wqVlJmLmVfhQdo=
 
 Name: _locales/gu/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: PuGvgHNuAxl7IeGsEUnVuw==
-SHA1-Digest: 5ZVlhPHAoLpUNOccVeKYCGB9hI0=
-
-Name: _locales/gu_IN/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: eKvJNhbDUGYAtBw48jCB8w==
-SHA1-Digest: oJWDRND8u+W3g3lHtIeu4eWNSrI=
-
-Name: _locales/gun/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
-
-Name: _locales/ha/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: cxaffBOuU3Z+D/AJ6TQAXNFki3M=
+SHA256-Digest: pTrp2BlrTKilZg+sRGpeuYQVSrInYg7QtVBMrLANj4Q=
 
 Name: _locales/he/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: NTOHUD7r99WJfexqovtZag==
-SHA1-Digest: rviNcNcf1vxGW8Mly+QAbE3B82U=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: zshsgYzIwWg+jtvY4ingp8vw64c=
+SHA256-Digest: BxJrAMOZ4VuFbXDVimpAN0xMEQBNZZkrmFWnTAXibks=
 
 Name: _locales/hi/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: jGoeudpwuZTMz1mY5vChrg==
-SHA1-Digest: mTlAA8ggJM9SMuUVA70fC555Gg0=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: QRpvL2rosEDoTdx6BxxGGJpSVmo=
+SHA256-Digest: liYeP2q1gkXphKzxxJNsqTh7+T1gzKsee+6vReQMdhs=
 
 Name: _locales/hr/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: 4tLPvGdXG8e6seOf0EBOBg==
-SHA1-Digest: 0iQ1pKEsZmbw92IzCYAVNjE+S7M=
-
-Name: _locales/hr_HR/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: WQE7FFzzeHy42j7rt7q1oQ==
-SHA1-Digest: VhVMMJQm9fafW0yHHwLA/l4LQLc=
-
-Name: _locales/ht/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: x/3lhb7z7CVqZZdn3midgSjn5tY=
+SHA256-Digest: HHx+VP0HB42dWTZ38cR004DWeQpFRgaF5TULrZkatwI=
 
 Name: _locales/hu/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: s/Tbsyll/JcjI0LF8bVNdA==
-SHA1-Digest: xSr0fnT9J6WtfLcvDbqcLyhM7ig=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 4eKsxvmbG58FfD5yjfm4b3cr+g4=
+SHA256-Digest: i9dh17H4Ruxjb3oxA4GPRJvRPecXQf3U+qaBlGj2qps=
 
 Name: _locales/hy/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: g8Rw1lIpA5prQbGb6RxRog==
-SHA1-Digest: 9PJv5Ot0X9QYZqj9pa0hxaWCvGs=
-
-Name: _locales/hy_AM/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: WBu/Z9IdheTqYg7PN8qJ6w==
-SHA1-Digest: KLIySoU+8v3AyFfVTOUp/80nKIM=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: QzXAZ5katx2Ye+1QFyFHLcMJROM=
+SHA256-Digest: HSYKniubHesccfXGMZYre5wJva2MRztMYAhMHMA2+Z4=
 
 Name: _locales/ia/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: Rvl6xzKS0/2m/DcmkZLiZA==
-SHA1-Digest: tbIv/BmQ2jBDQ3NTCrOKbzqxvBo=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: Mm0o9mYuk3kCk5WbKuPCFU7zpqo=
+SHA256-Digest: 6ORLVTr02qalRUcK63Ir1GXjw/p+v6nrK9/zI66QL6o=
 
 Name: _locales/id/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: 7dLZyCol2VchgVjHAT+Law==
-SHA1-Digest: Ltj91tOYYRH+0vvnGtDucHgCbNQ=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 9QctIupOryS8eWp04EJHAWNYj7c=
+SHA256-Digest: NfVmJxGSWj5onjEn4//gX5P8n3QnqBXXP5Z9Lf+578M=
 
 Name: _locales/is/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: UhSsbk1anjN7v+dqvxDHmA==
-SHA1-Digest: RcgwoP9G1AV/RfwqZUcTls3UC7w=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: /P9T+vTThdd7i1pmGcYD6nOkY44=
+SHA256-Digest: L1OQmFHZBhJHVvNqOh3610u1MS+SLQd9NHvYu2FkRVE=
 
 Name: _locales/it/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: iAxmBKMo22L5ehrw1SZ58g==
-SHA1-Digest: /ucFdyJtKzS3Xq2k5gNhcUpXA3g=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: QfqJFvpr/CghH/0gsO9h+sYKy1Y=
+SHA256-Digest: vtdELbvnbICfJVOrxFLjaJq656uK7EK2pTcecgf4dNc=
 
 Name: _locales/ja/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: YZIviaHbnOQsu6g9RDffvw==
-SHA1-Digest: a+rOJPet+WMVb4A9HNoWANjMlF4=
-
-Name: _locales/jbo/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: WBu/Z9IdheTqYg7PN8qJ6w==
-SHA1-Digest: KLIySoU+8v3AyFfVTOUp/80nKIM=
-
-Name: _locales/jv/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 7zImT7HvkvCQpdObYY520peFtDs=
+SHA256-Digest: mjSxBaiB+SkXyspN3wi6aodH4rYgcp6da2exdiEcGU4=
 
 Name: _locales/ka/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: 5uLcHOfFiVvvp9VD1zzRXw==
-SHA1-Digest: HZL9ljlY2zYj2wvx+v+yOzedI0o=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: fHsD070Q4aHyxYhCNfQIYT3MKS0=
+SHA256-Digest: yeIbx8SP8Wa4kvXo6Lzx9wrRj1LynhWFd2nbPUqZEsk=
+
+Name: _locales/kab/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ofcr0jXThFpy+75hHp2/Q7a13Iw=
+SHA256-Digest: fzhILeKwf6EXocFvocLJMDTVFY7948hKtI6L6UG8GFU=
 
 Name: _locales/kk/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: uflCz901UdkYCT2AeGrFPw==
-SHA1-Digest: DenWUH1joMtOLAzqdoPDF3ba9jc=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 8Sdjq0KMj4ANwq94weNnUQYtI+s=
+SHA256-Digest: bTKB9CkWNhqawbJDhs1/GX4/z4j0Vg4cx31zKw44f5Y=
 
 Name: _locales/km/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: FA6fez7nHccUQFmqkBhzEQ==
-SHA1-Digest: D+TBW7Yz3OLhLM1STmUu57O1WUU=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: w5qIgDP+885pZJMl8FyA2yGUt1A=
+SHA256-Digest: sjEA2JwKdlS1D1hQxKQedb9DYCwOSDhyxusv/cUTkvE=
 
 Name: _locales/kn/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: gt8csChP1x5gskzYIQmS1Q==
-SHA1-Digest: PSfEYTC3ayXPng16di5bapumDNM=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: MdvnoS3SrWGvRWSyvuRqoWvRiWc=
+SHA256-Digest: TaiiWa/PbBrRxhqRBYvFWtGmyyy/ovdu/yhHq/w9jk4=
 
 Name: _locales/ko/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: MMN1Sf1gC0de5moD/0g6eA==
-SHA1-Digest: 4im/aJrO3cVrNBFFkanJozswPTc=
-
-Name: _locales/ko_KR/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: JcGzScF7MFhcmzwgxeP9wg==
-SHA1-Digest: YONseXbEHvYAG94Cb29XzU+bIuM=
-
-Name: _locales/ku/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
-
-Name: _locales/ku_IQ/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: UyKZwau2LAH6fKOQ7GNDfA==
-SHA1-Digest: fkhg2lHbVO9CIWThWxs+hL2xsfQ=
-
-Name: _locales/kw/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
-
-Name: _locales/ky/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: 1+5VFH+EipBmDx7zwKhinQ==
-SHA1-Digest: E54eUkttC8lG6fsqMqMPIcvdBVg=
-
-Name: _locales/la/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: AtKntqi6Ku7LtdpzsKBCmQ==
-SHA1-Digest: k1HEnKL1qMj0hAK/OUOq/2gdgFU=
-
-Name: _locales/lb/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: eSg/KUtsCGzyT3L6K3BLPg==
-SHA1-Digest: 54HMWmM+nWqIjgIc9yYdHkxMQP4=
-
-Name: _locales/lg/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
-
-Name: _locales/ln/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
-
-Name: _locales/lo/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: Rvi7CvhoPCXF7O4T3z5Pwg==
-SHA1-Digest: xe0gTHbQApklgy+N55AtBHlKYPg=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: GqRtNAUwxrLDluWtx2LqjXzg+50=
+SHA256-Digest: McBNqK4HaGAS0dEAMzOD8lrwecj6CFapkKhRgZpR2qU=
 
 Name: _locales/lt/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: e7z6iwFKoKfs4PTuke/3wQ==
-SHA1-Digest: OxawAJIP1gqKX87GeVrMkUWKwtE=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: cBHtxCIgs0M0vuawqYXF7qBAPZo=
+SHA256-Digest: RvNH3JOZbIBt6KKPOdP91hxzpQQLbYxJxWeg36ncftU=
 
 Name: _locales/lv/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: lxv3HBEJ6JIujDtuNM1ZZw==
-SHA1-Digest: NGWrKHZBEm3i/fZVqgDnb9unysc=
-
-Name: _locales/mg/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
-
-Name: _locales/mi/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ljoDEg01zL32eJF/+OECLuPZkoY=
+SHA256-Digest: +pRZCbp3zfzTbM0UqTpiJd23dSymtKZxiZlqD9zNZEw=
 
 Name: _locales/mk/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: WUeQgMtao5r1+qpsgWYTsA==
-SHA1-Digest: bt5rIy3qge0nCZSf1dUaXHhgUEE=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: dHL1X/r5TNAy5AXujh48jmaBZMY=
+SHA256-Digest: Fs8OnAZZqmqEZHAoYINC1qjLdniDuxjboibfVPvcxek=
 
 Name: _locales/ml/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: nno8lLTvVAxdRkmZZrqI2g==
-SHA1-Digest: Mb0dyQwuP/iYtJpleqMeFm++Lq0=
-
-Name: _locales/mn/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OWnkYxWWcP6cqXUSAkMn2A==
-SHA1-Digest: +rDEViK6Lh8R1rv/se5Mt+enymo=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: yjvR4hUOwBfI4/NLchJglHMznUY=
+SHA256-Digest: /LzzQ1QQeGqOJGuwyf7hF1ynGzYojAJy8SjnfpqP8nU=
 
 Name: _locales/mr/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: +uYGj0MelzDYqCCg8YwM1A==
-SHA1-Digest: 37w/UXj+uGLW52Zf1ph95hQREfs=
-
-Name: _locales/ms/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: nncMdJtLDd94XtqIXeKqZA==
-SHA1-Digest: CvaJH1jojZgUrS5YxQ0OH+6Y7og=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: VqbEpeDWqRRSDXueR7OXzV5Zi0c=
+SHA256-Digest: DXWyMnlhjkPGEZgaBzsqFEU88IvmcrerTATrEqY+fqY=
 
 Name: _locales/ms_MY/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: X0lBU66orvc5FyhGKayUNg==
-SHA1-Digest: VJCkmb4b+kc1ytFN9lzwt6/0iEg=
-
-Name: _locales/mt/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: pNrnIUMZ1KSdavj7IpvgaXtMW1Y=
+SHA256-Digest: WjOfy4w9K1h+lN9Ld1JdzPwXrpU3TYqIpcQLVhzSsKM=
 
 Name: _locales/my/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: 2prdCNfY+hEtD+5RhYujGA==
-SHA1-Digest: Sylysr0dDR6/M5Zr19xTQNwT7p4=
-
-Name: _locales/nah/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
-
-Name: _locales/nap/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: kPgWIxR2rynJkEykmF/T0clmLcU=
+SHA256-Digest: pVtnX3UxISFA90i1ivkuL01oGhoah2AqzAJosnkZMCw=
 
 Name: _locales/nb/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: 2sgYMN3RYenYEeX4MuiFmw==
-SHA1-Digest: x/RHxcSRpCtuYrLXYHHyP04gTlI=
-
-Name: _locales/nds/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: xCCz+aU59J3pUBQrTu8Sookw3Xc=
+SHA256-Digest: aHFiDv13/G909I851CrVRUPMSAyxLABNIT5TkFPWolw=
 
 Name: _locales/ne/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ofcr0jXThFpy+75hHp2/Q7a13Iw=
+SHA256-Digest: fzhILeKwf6EXocFvocLJMDTVFY7948hKtI6L6UG8GFU=
 
 Name: _locales/nl/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: z9cyNlm21U6wSLRso+9dcQ==
-SHA1-Digest: Dn91Pch4bdG+/+zVTHPJ1kumatc=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: uHnFt32GmeGIWlUhV2oc0YwDBoQ=
+SHA256-Digest: EPKDxQlVhuigsi6at+OnLBBaPbqbNuYdbHu3nEx6Lv8=
 
 Name: _locales/nl_BE/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: ZvYi/D5sDFM6XOxOivhWXQ==
-SHA1-Digest: HCxNv37H86EufsLLBB4QkCRrCSU=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: vpN/Tt8RJNjNrjzQhvaCLnu818Y=
+SHA256-Digest: UMIycHh4OpfT6XEX5IkOJbBhBEmykK3QzilVLqxXbas=
 
 Name: _locales/nn/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: AHZBRxPK0rk6aBnS+F8BpQ==
-SHA1-Digest: gg7ksA7dUBo9fUK/6bYlCUNv/Qg=
-
-Name: _locales/nso/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: /uRXmVZ2hcY4LDKBmhSwYPb+v9A=
+SHA256-Digest: /VRfKB4L2T8XMwAUR9UCXed+uPckbOsicnTGYCRT62U=
 
 Name: _locales/oc/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
-
-Name: _locales/om/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: LEIoVVmbjin2D0Bj5PimJENOmCQ=
+SHA256-Digest: smQMMM7KSF/9lT0ryK07dEWxGtf3tYjF58E/kOIlNKY=
 
 Name: _locales/or/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: Ps0uvWBAvc6crMC3f7ztPoWLYHI=
+SHA256-Digest: sX3swrX1p95cHWLBMrKDJ8mCOM/k+g3kR6+vKtjUlIY=
 
 Name: _locales/pa/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: P1CkBUYvUODvT4mJHQjOrw==
-SHA1-Digest: 3MNWT2czX9PNWuz6cPJJLcPjBzQ=
-
-Name: _locales/pap/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: +P2o0dGSh7jJUtVjUFU70dqtxiI=
+SHA256-Digest: sHFd6kvNEbfWPpbLyIutoZkkEm0A9yWhjdbsXZ5YH5s=
 
 Name: _locales/pl/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: LNN/7DXRmFpownmSWu5ZKQ==
-SHA1-Digest: DqX2eDLPa/+Z39dg9XVB55Vx69E=
-
-Name: _locales/pl_PL/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: 3MaorGP93lUpZgCyNy7evQ==
-SHA1-Digest: ZqhyMN29VqIF5zQbqf6rC5JIGko=
-
-Name: _locales/pms/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
-
-Name: _locales/ps/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
-
-Name: _locales/pt/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: q4Qkjz193c+U4faYXjfn6Q==
-SHA1-Digest: erJicYlskKpHSxYIqN13CYIQ0yQ=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: w97eXym45Cju4UUq2hDgfYZEivM=
+SHA256-Digest: 8dpWSVyqOkrMcQs4Ub98uEHMtAkwdtuag9kfv31TnwY=
 
 Name: _locales/pt_BR/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: L+yLbmSSC9GHxb4lJxfX7A==
-SHA1-Digest: vJhTPFjHLs7UGMoT/P1LXzyDlTQ=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: B9dLWSgVB9XeiQqqE9ceVH+KFqw=
+SHA256-Digest: bkAA6J0bp9u83YD/Cea1ggdTUpXBl47Pb/RAgW/QO9c=
+
+Name: _locales/pt_PT/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: MFTtI6bvZgIBNjfsrsEes5SZWWM=
+SHA256-Digest: 6Oe7CSTsLlbxPCEcuVYO5tqvl3/TLquitxYnh40167c=
 
 Name: _locales/ro/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: 88+3ifHcBeiSAn8XR3VIfw==
-SHA1-Digest: Lvc7H7Vo+0QZ5Ib0Vp6d1BZJbT0=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: iZA4eB6bVN8w8JNfUaLiB04ZeEU=
+SHA256-Digest: esk4A/1PXdU5yjo/Y/f3zS1fzrVQUIhGPFyAS1eSw+k=
+
+Name: _locales/ro_RO/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: iCzvlQJKPogorBRk1ZaRc1PHSzk=
+SHA256-Digest: f6sPhnOcfaNWIONa4Ow+YtnAM3GXnWIG1WXDRHOtves=
 
 Name: _locales/ru/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: m7VKc2CM3Kf0UC/KY1+R6Q==
-SHA1-Digest: lyfGzvXNOrRs60v3/2BMujSfnUw=
-
-Name: _locales/ru@petr1708/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: fN60maP+k2/9vJym7kPO3Q==
-SHA1-Digest: rc1EUt8UO/hNYJF4lB46djCm2JY=
-
-Name: _locales/sa/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: WBu/Z9IdheTqYg7PN8qJ6w==
-SHA1-Digest: KLIySoU+8v3AyFfVTOUp/80nKIM=
-
-Name: _locales/scn/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
-
-Name: _locales/sco/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 7icD6gFZZYuaRFlZHpM3v4S4rbw=
+SHA256-Digest: PsIJMB4ploNqnBAmnqfFHDXH+zFdu4P6BNZMnIwT0ok=
 
 Name: _locales/si/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: WBu/Z9IdheTqYg7PN8qJ6w==
-SHA1-Digest: KLIySoU+8v3AyFfVTOUp/80nKIM=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: KM47GTd9GQqAik45v3TwGKzhUqI=
+SHA256-Digest: 3PvBqbX4qA1rQB4l+mrxTb6mwA7ssWzrxjn1VJn5peA=
 
 Name: _locales/si_LK/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: k5PFzPJYlGvxdMtumgpsVw==
-SHA1-Digest: mppNy8lcRVJICOx5T6r4LCx8/n0=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: /XRTG3mjOsamcRjwWbYUqmyS+jw=
+SHA256-Digest: XbC317Ovdr7RhMsUfhfXDV1yDh+4pz86mQMG1PFGLdY=
 
 Name: _locales/sk/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: Uida8b6VsY/UN9bxQrr8eA==
-SHA1-Digest: 4tKZ7d7Xbf+td78bu23DbaT/gNM=
-
-Name: _locales/sk_SK/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: qGDOhoGPZhutL3QI9aI2RA==
-SHA1-Digest: igCMeOXHyl0ACX45zxmCpG+rekM=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 8g2uM/IilbLetxLlpS1+hm+gb2w=
+SHA256-Digest: bnqVDCFodbSbseUbLOrdCwprRMxbpCYHMvVbz/3KP/o=
 
 Name: _locales/sl/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: w+iSkW90O6JUqNUzEskkYQ==
-SHA1-Digest: rrNBbiXy2d/RFwYqpnNG3yhKQsE=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: MdQaZFkibS04O78qFlB6kmwhF9c=
+SHA256-Digest: 9pLwtRZfEy2la4LfIgkbDR/M+nNotJAA5wzEgT+AfyI=
 
 Name: _locales/sl_SI/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: mkn4yzvZhUs/wR2jEBJdMQ==
-SHA1-Digest: 7tnSyLCD7xHYNezUExRY4yrMkPE=
-
-Name: _locales/sn/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
-
-Name: _locales/so/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: wFhFU0upAYqmmQI/nRnGEnqP30Y=
+SHA256-Digest: qx/D6APKUhcKmNWwCHD/baIjzMFQNTR4/Rt6LvOTQ4Q=
 
 Name: _locales/son/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ofcr0jXThFpy+75hHp2/Q7a13Iw=
+SHA256-Digest: fzhILeKwf6EXocFvocLJMDTVFY7948hKtI6L6UG8GFU=
 
 Name: _locales/sq/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: vsI7qD7EOj/vMfvuM4dVaQ==
-SHA1-Digest: +p9DOBL0N3uveBZYits5BNI10m8=
-
-Name: _locales/sq_AL/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: DARP7ysqdZQvIQQkbs0eIA==
-SHA1-Digest: rTEnTfMTGuI9wp3Nzya2YToC9dQ=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 87nTmcsWpoEAsJTN4/ZFf+01I8A=
+SHA256-Digest: POGPrXKN5GuJ59k227ozXns25ogQdzOOgA3azEA1f94=
 
 Name: _locales/sr/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: Gx67FlT55lApI7RxyleZlA==
-SHA1-Digest: nK0vaw3TpIPigmGgRzTgM6d+nis=
-
-Name: _locales/sr@latin/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: bY0RHTln+zmaJHs3y6vy8Q==
-SHA1-Digest: IunKatiMDIq1R8ExPVu3O2vdqvk=
-
-Name: _locales/st/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
-
-Name: _locales/su/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: zJI0kCSZIB/4rfhaGxg0aUGrbtQ=
+SHA256-Digest: tfKdrL6vsCYxRU/QeEvAZC58y6qDuEKkhNi17r1e/8o=
 
 Name: _locales/sv/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: G8sDIND8G5pgmDsLOddtOw==
-SHA1-Digest: 9/ZvfXAMpvEZvrZNNAxnRxJrZcc=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: UI6tx0CmaOkUsjASOmQvxNRkX+c=
+SHA256-Digest: WnBcBaT7T7yKHUvac2bn2q5alrsbfEiLOQUXPIQLurQ=
 
 Name: _locales/sw/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
-
-Name: _locales/szl/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: JSf0a8gCwILGBI0T4d/FfWfIGDc=
+SHA256-Digest: Z+oQpHb/T+I2XZ+JVJZW1KMeAP6yK/x9Quts8n64AlQ=
 
 Name: _locales/ta/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: 8txHJO2eiftfXVPSXb/V1w==
-SHA1-Digest: Cf7BpBNQv4U06LOoBnwgdAP4JGQ=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: CW5Q8ok59gE/ZC8A4uPqW4cIfhI=
+SHA256-Digest: vOG/RBohVZklUTu6y6cjUWg5RyNIbwaB33kUr5Ko2PI=
 
 Name: _locales/te/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: PtZJS+4G+0xPOk//MbkNsQ==
-SHA1-Digest: Of/avbdR7Ck3XOdpXd1TTMtw0Uk=
-
-Name: _locales/te_IN/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: N/QOkBiJYvqsksR5+NWuHA0/fxk=
+SHA256-Digest: jZC8UbVBsT2RvDZ1uebHtr76/oRaNdlmxLKWLnDaI3A=
 
 Name: _locales/templates/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
-
-Name: _locales/tg/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ofcr0jXThFpy+75hHp2/Q7a13Iw=
+SHA256-Digest: fzhILeKwf6EXocFvocLJMDTVFY7948hKtI6L6UG8GFU=
 
 Name: _locales/th/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: nhEbvFcAMGm6E2fcO6/ubw==
-SHA1-Digest: RI1UzNi090sWDc5w4PK9wfW3iSg=
-
-Name: _locales/ti/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
-
-Name: _locales/tk/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
-
-Name: _locales/tl_PH/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: lhpAKx7UadONNJc9NjJqVw==
-SHA1-Digest: Q5SYWHUziW+WZDR4WC/L2DRtt1g=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: QaLDEcDBj6HdEh+eAhQ02DWS81c=
+SHA256-Digest: ucjQxKDoCEwzTat3hNNjtMRJ/u85+QK47Rw93C4J8Sk=
 
 Name: _locales/tr/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: kiqFJzz9PB9a5dz4R4zvKA==
-SHA1-Digest: zG/LHIsCwmh5ENFm68ML06R/LHE=
-
-Name: _locales/tzm/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
-
-Name: _locales/ug@Arab/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: nUTLhDgeo+A5lSge0FINLQ==
-SHA1-Digest: ybbDEdtgm/U1A3Iy4WovuH/e+aw=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: MDXJjWJjdDGjeYfHHa2+LsPj2tM=
+SHA256-Digest: vdziBTOIPyWhvyfApPrN8jZMww3lePVgo4zDkwcv9og=
 
 Name: _locales/uk/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: lpVodIOAsObNznAKGiiJ2A==
-SHA1-Digest: LvFYOJErxgVOLc9zysn7DtrM/ok=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: TargN1mxonMdbvos0GBcCxU0+dI=
+SHA256-Digest: 6ZRhyVruPhNEb5UPYCrb/EFcy6ArHSNqxBy4KNEhq/c=
 
 Name: _locales/ur/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: wZrkCHi9S2xKERECoDJBQg==
-SHA1-Digest: SWl+NUhtUH71zGkllKiUHcW9UMI=
-
-Name: _locales/ur_PK/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: 8kavljYriOUqXxgaRJgm3g==
-SHA1-Digest: gDAaMGHf0inPLa0O8mkDU4CAPy8=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: kUEeTx9OeiESvvWjprUjqluEhZk=
+SHA256-Digest: ADAHAHlOUIGXLO2Aj5/it+lavjH4WkbjLV43yI6CO4s=
 
 Name: _locales/uz/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: oPI13APazNDZkJAOCvHIaA==
-SHA1-Digest: y2LtEtm1BLttxgsIVgt7mmK06ow=
-
-Name: _locales/ve/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: bmGV4U+3LA14ZwC5RcRdN5RB+tk=
+SHA256-Digest: SPoiBWn8W+vyUJHKfocitJ5y6RjXedgta0HxflAFB9Y=
 
 Name: _locales/vi/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: M/USAY8DSPzQZvCmzfXMzw==
-SHA1-Digest: KCiArHd3qHtxwWQRbNpa5outcpM=
-
-Name: _locales/wa/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
-
-Name: _locales/wo/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: GMY5uzc6vq9pP9hqFNGlOgVYZ8k=
+SHA256-Digest: OidbjDj9CBSxmM5oW3RagDo6ZNvA+5P9CGN8C0cbgms=
 
-Name: _locales/yo/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: 64O/rshBUXPeaQOqX9sJUg==
-SHA1-Digest: OaF+IFszompPxiSDf2XvJ0DNU9c=
+Name: _locales/zh-Hant/messages.json
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: NXT6rNViMHWrKSlecajyj80CeIg=
+SHA256-Digest: 3zXYNMBhIcIsuhQRzfIAFhV3GdeGZXgyc+h5bFXMZtk=
 
 Name: _locales/zh/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: C3rsjMopt60Go5RGI7QV5Q==
-SHA1-Digest: kKaZft5WxOVuvHK6ax/f4IUV1lw=
-
-Name: _locales/zh-CN/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: LakdBy+4Q9jIQeKbsxV7Qw==
-SHA1-Digest: 5wUQ124LnkjFpdGnsex3fAJnf/0=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: Vu5rZrqGhcESvjluy4x3EcMPi4o=
+SHA256-Digest: karIDiNHSaijMuQkVkG71+StamzOq9ZeGiQhzwJjTAw=
 
 Name: _locales/zh_CN/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: NFw1qyTQ31rjaP7MvbcC1A==
-SHA1-Digest: 5zrsnhAlcZmVxnXfKbljG7VIN30=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: HWK9jni02GGBk/XOVpL/R1rs0NI=
+SHA256-Digest: Hl+NW/IGzS73WJhUVgY9cPJvMyb0ZomG7k64dzoJ1wc=
 
 Name: _locales/zh_HK/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: 4UxKVpKgVW1lWA8Ar2wmYg==
-SHA1-Digest: UsgWmWANv7RSL5ubk9SFg7kUvwU=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: oZ9Ht83pERBafXR1h2mucibzUUo=
+SHA256-Digest: Vq5s6nfmwfxvTVQlmjFCHCYlzvJanl+4I8J2h8F0hjs=
 
 Name: _locales/zh_TW/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: frIXkXkah+8b/VRiPzv/9g==
-SHA1-Digest: Ott9FKJ3g9lVTAJNJZt2dZPqEpw=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: yfJJJg+Uan6mqiwEm4W0l5tT+nU=
+SHA256-Digest: Xj6MJjfhW3liYqF0UIY6flSaOxnNyr4Urgu2gffF99I=
+
+Name: background-scripts/background.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: GMCKwYZnhsRm4ExhG1q6wY+DQno=
+SHA256-Digest: D4ogTIq+ze3hPGkcxzkc2jFho2hACQn3iYc2oaw4egE=
 
-Name: _locales/zu/messages.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: OUCnp/dRaYyMziaOw/sZCw==
-SHA1-Digest: FKkHf7MdEjsTJrCiUZ3ee9Lw12k=
+Name: background-scripts/bootstrap.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: TSwjfTzojZXN1Iul+mBttRl/MAg=
+SHA256-Digest: WcKbJ0zQK8948MJzbMTTCf807jEGH7Bj8k7CuWCx0aM=
+
+Name: background-scripts/incognito.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: JXSvrJhaxqSgUtXqlm0r21VqSlo=
+SHA256-Digest: AnGJOJ4CKWmdFZaWNzvm7NWZjbzCKkdawPc8RZCH4d0=
+
+Name: background-scripts/ip_utils.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 8RyxTy1FNW0wvKPs+DqKNNZYvV0=
+SHA256-Digest: F9Ij1ZyfnpmmCM0W3+WXfaBO/rnUAFZtXc2N305Qod8=
+
+Name: background-scripts/rules.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 2dd1eq7Y16RvpmADSFGYSFdRvNc=
+SHA256-Digest: 9Qw9Xoky6/2DvBn5nza/xBXbjaWkEBI9hPaaqAdQDqU=
+
+Name: background-scripts/store.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: IdAI+nj6uuahTeT28Xx1QJwLveM=
+SHA256-Digest: lyCBwe6g79MMTtU1xyGBiIJidhqUsW/9YUXX158t6z8=
+
+Name: background-scripts/update.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: Z/kkBlC2HeS/G5zlAbeiFwLpgIQ=
+SHA256-Digest: R1y7pQHEB8w7mNOn0zxEL20mys/8sOZxy5238BzhNoI=
+
+Name: background-scripts/update_channels.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: kA9YO0yjVOE6vw2mpWPePkWyt/I=
+SHA256-Digest: L966QoT5hiVg5mzQq9dACJ5o8OVsROxhNRd+LebsAQQ=
+
+Name: background-scripts/util.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: pjJWekzg0QW6/0qYNf1pISXO14s=
+SHA256-Digest: 1Cykm0yxo5EZs0+fZWtUPzHa38B6ZalDAOojqu5awgo=
+
+Name: background-scripts/wasm.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 7pQTqvYA4el8WRX7FjQNUUcMUwg=
+SHA256-Digest: TMk4CQYN4lxkG/ZBq+wp4erwwo8knS0H5HHBCa7LW08=
+
+Name: background-scripts/modules/ssl_codes.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: t5DE+asvCaL1VaVhVXbJDQXQaHw=
+SHA256-Digest: hGKfRGrQWsXH8+9OfHcHM4I45d6DIIxClYqMSH1oBCA=
 
 Name: external/README.md
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: CKdrNV9QhxaLsjGCmqVzfQ==
-SHA1-Digest: KBB0g+uXnnkRmVes2lODgKrmQjE=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: DgCQOA7tYbKkLcJ92flagYsm0nI=
+SHA256-Digest: So9vbyA/ExcM/wEms+bwz/YVVa2ayDCNnJ5sYJk40tk=
 
 Name: external/codemirror/codemirror-5.31.0.min.css
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: vgSVAyZSaYT0xZds7kCcbw==
+Digest-Algorithms: SHA1 SHA256
 SHA1-Digest: 6L9PQ9XeTmwE+7WJ29O7oelFX7Y=
+SHA256-Digest: fIaQYYF933S7mhBn4vqsgaawzXI4iELVCrvv83rZ5ic=
 
 Name: external/codemirror/codemirror-5.31.0.min.js
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: iTfS1rRHdmm6Fb4m/8oczQ==
+Digest-Algorithms: SHA1 SHA256
 SHA1-Digest: iJyQEWjgaJ3IVz2bsX+RSnjLzGw=
+SHA256-Digest: yTU67I79B7rqtdoOdsJHDDK/92GDEeGj4+93U41HPgE=
 
 Name: external/codemirror/codemirror-5.31.0.xml.min.js
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: Xsyfc05ZXPUFnI3I/8EfGw==
+Digest-Algorithms: SHA1 SHA256
 SHA1-Digest: DMaXXHyF/jzGu8wJN2a1yHxkNHU=
+SHA256-Digest: d+N19fPYNZkqDuOxqLM8MHSxTiGDF/j5WLdynJ2D8/k=
+
+Name: external/pako-1.0.5/pako_inflate.min.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: V7Fd/JcXF6Ar68Oa5X3/rO7giNs=
+SHA256-Digest: h8L84MNiYQCe/szpOr1i5Cge5x/8EsvaaTlcdG9vOnE=
+
+Name: images/HTTPS-Everywhere-Logo.png
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: E0ESMX+oJaAutg08/RPfpc3Ix5E=
+SHA256-Digest: PKyVOZS7bg8UVeQDG3npTYLKtnB5FgmmdfoW/NC02bQ=
+
+Name: images/banner-red.svg
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ZnApE5t/iqGaVc0fdm7I0Rpvdsk=
+SHA256-Digest: obGxFfdgfzgg0jj59ThEpLQwowcJCioxsVS/+X7Mtvg=
+
+Name: images/eff-logo-monogram-red.png
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 5sbYS58Ze3MdPgDNas/ZnFn128Q=
+SHA256-Digest: aPdsjK4CCl3M8HBgqCLA5vu5n+w9cCs75gs0j5x/0Ak=
+
+Name: images/remove.png
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: Pn9f97i3AIFlAMf420qZNzvA7DY=
+SHA256-Digest: 7TrWr2ZkK0faWgDYUz9WtV3voVjEwqjLq0ROGvkU6y0=
 
-Name: icons/icon-active-128.png
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: lIl6t/HENidgZJkkLmHO8w==
+Name: images/icons/icon-active-128.png
+Digest-Algorithms: SHA1 SHA256
 SHA1-Digest: p71skXMtghXylXMvFLnYW/jPos0=
+SHA256-Digest: 1DbMnWBmqaIRzzkUyRpdRzxz8z1HtUGq6RzRKcINuEA=
 
-Name: icons/icon-active-38.png
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: AOpKNhC5hOWlgXEIWgONbw==
+Name: images/icons/icon-active-38.png
+Digest-Algorithms: SHA1 SHA256
 SHA1-Digest: EleX4C/tgOj+W71fueie7ZoXAAY=
+SHA256-Digest: YgkTENwvpAo6Bb9WsTrUr+CfKY+gsQfq6uPoGdMw6kI=
 
-Name: icons/icon-active-48.png
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: HnL4MsWBAIFEbOdSxgbs3Q==
+Name: images/icons/icon-active-48.png
+Digest-Algorithms: SHA1 SHA256
 SHA1-Digest: VVqz4q4/4awX6PXZhnQmGFkAiqc=
+SHA256-Digest: pfkIfbdzORmTjUTLb2SsmaLv4oafijkSttiU3lUcKmM=
 
-Name: icons/icon-blocking-38.png
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: 1lt5NoNjnQyk9V8eu7AUIg==
+Name: images/icons/icon-blocking-38.png
+Digest-Algorithms: SHA1 SHA256
 SHA1-Digest: IebllmIP/cUmB0piMroSEA7HnHc=
+SHA256-Digest: 9oP7jvbkH3KM4VG+kAnItkvsT00o9/KKHvhexTJHCD4=
 
-Name: icons/icon-disabled-38.png
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: zqGLqPGDGsV629Ubs5TxxQ==
+Name: images/icons/icon-disabled-38.png
+Digest-Algorithms: SHA1 SHA256
 SHA1-Digest: PJqzR54BFgNofExLbYn8DMEyvzE=
+SHA256-Digest: 2PzhLQJedFJa+ZOnE/j8r+XELaoYAn5ptQCSyNbmDcE=
+
+Name: images/onboarding/httpseverywhere-logo.png
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: XYvqYHk+Ebepsvq4U3bo9rYMqQI=
+SHA256-Digest: 292a2wZxJ/ltXI+/9OdCzMX2YZnJDWMYUoVOOnU+sUs=
+
+Name: pages/base.css
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: Yk+MDy/I88Qd0VMzEBIbf0fBo0s=
+SHA256-Digest: D7uZfk1BrCzx3HFnEBtdaN0E6rC6pErEZAd1X85xgCo=
+
+Name: pages/main.css
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: UN8/2mEQ6JZ7MTJiWQN8f77AgP8=
+SHA256-Digest: QhiZj5JKVR1gPvtg6EaZxI735GiFeZglzuSkTJpZvpE=
+
+Name: pages/translation.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: QMAZVa3usW8vcXwN2WP4lvIQQxQ=
+SHA256-Digest: +qWz2YZH5C1UqzTixYwsS3185+wd+q8Dhlm5czDI54w=
+
+Name: pages/util.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: XzUESMiqZDZv/WRcv+j8f/R/7uw=
+SHA256-Digest: tSZjbu7zilv5pujsEyp/+6HCfr7iu+KfoXNiftpAKAY=
+
+Name: pages/cancel/index.html
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: h94rEtsYrj+TsIBk2x+UqRhOHDM=
+SHA256-Digest: Fgv98mLYPbIiOUi3HAw4YktUVkkt+7clLW2IgxTD9us=
+
+Name: pages/cancel/style.css
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 0L/xbmBq8hCu58P61j4htTOA4Wk=
+SHA256-Digest: ejF/rMWvajSbZFxp0hRT6SzhobQ3aILcf5pN1BTOGEE=
+
+Name: pages/cancel/ux.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: UtFAiW+HLmKUFMV/v2hPR5haiAI=
+SHA256-Digest: i3Vc/dqv2XS12us9g1J5f6iMIZC0gI36g5N/FEKX1pw=
+
+Name: pages/debugging-rulesets/index.html
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: DuBJ5S+QY5nztsCAqOuTgKmu4no=
+SHA256-Digest: J4l9PsxyBqZKSYfqo5Zp80vXBJ7mqRVKNS2KoVU9F5o=
+
+Name: pages/debugging-rulesets/style.css
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 1DuOcKAihj5zxJ0CIgam4iq8YXc=
+SHA256-Digest: 9H1UQpqT3UDDSt2ao6Zgr4iT5o/iQ62HolhTDqNHHCE=
+
+Name: pages/debugging-rulesets/ux.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: IyqmSEBIenfSG4Mk++ciVOvpQvI=
+SHA256-Digest: OVzkDGtCe3pg65opGnboDfrFsqFsLJxa5CQxBPA9gi0=
+
+Name: pages/options/index.html
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: cXwoesX+lTfZgizRwhLvV5iFNDQ=
+SHA256-Digest: OzLgxg/tYfU/fSAIHLxBZ/++9W6FgznEEGHflPJ9aq8=
+
+Name: pages/options/style.css
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: m7GC//67J6ErvL9Wp1FvAUMLk/8=
+SHA256-Digest: O5CikoWfyy2E2v3es6BJGltQ+OKfeD/uIYp9xsrqsF4=
+
+Name: pages/options/ux.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: bUAAi8jBxAk5YiNWqSyiXxkSPs4=
+SHA256-Digest: WzJSEmMXT7Qi7rKftAFtuD6oRK0bfaLtzqCvtgwJ+/c=
+
+Name: pages/popup/index.html
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 5vBn8FGlSOjp7z4UozcN+hnm3iI=
+SHA256-Digest: JoShZlQiKjzRj2JxRHXHW4Df2LsKWf568UU/oKVePpQ=
+
+Name: pages/popup/style.css
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: aPvKt4RXG/BofewRf4CE4mBg1lg=
+SHA256-Digest: H6iKtXGZJ/o2chDo+KZtB8VNYdaadxE8+143tDhl3/U=
+
+Name: pages/popup/ux.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: 68pu62q/sp5slQO9MUxCOv+ofU0=
+SHA256-Digest: 6VKXwWx0rQ6KoTh0OQ4KpscxkgcW433VAazICjc3bCM=
 
 Name: rules/default.rulesets
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: uj5vcK9EAmxborR/8AmDaQ==
-SHA1-Digest: Ev3cJfs0OeM4H66W2s+4UrJWCOk=
-
-Name: test/.eslintrc
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: ydcCXYl7/gOKEtRxJSnZ5A==
-SHA1-Digest: wLRJfzSdmljdfcjwP26+YP0OSVQ=
-
-Name: test/incognito_test.js
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: 6AVGd7MUvxXblymlNW6hng==
-SHA1-Digest: pmHkVXhLtyblXVzO8v3EKJ8bkgs=
-
-Name: test/rules_test.js
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: ux6RgryafPNhAESMvoqrig==
-SHA1-Digest: k4W+ahj/KVbhzhQv1q89z0PLaJk=
-
-Name: test/testing_utils.js
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: p/F0TA3dHMLPTLoorEfGPg==
-SHA1-Digest: lKM3ccWICGdNKYDsgBgKCJWvJM4=
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: hqWsDDcf2fp+r/dTBZqGw2eaqb0=
+SHA256-Digest: hnQbXIa2D+1lFh6i13HSkXQyYa/TxpKrPlx3QzgnnX0=
+
+Name: wasm/https_everywhere_lib_wasm.js
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: ELfS13+0aPyRX67301qNv6fm3pk=
+SHA256-Digest: 519ILW7r7LqFtGI6M22GuXDA6xYikE6EngbvlT9//Lw=
+
+Name: wasm/https_everywhere_lib_wasm_bg.wasm
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: SBxLOV763w4ke4LOL1574PW9hCs=
+SHA256-Digest: 7JqJ7u/5t5yGxh8p2+YCmgl+LeoRWQRlDJY9cLxWqA4=
+
+Name: META-INF/cose.manifest
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: +bvUG+miP05322u9llsWujjkaHA=
+SHA256-Digest: 0Rlv88HrG62MD20B3q/kRBPi9i8RxxgbxR5fKNHkV+Q=
+
+Name: META-INF/cose.sig
+Digest-Algorithms: SHA1 SHA256
+SHA1-Digest: AusKfF2Hd6KpGJFyy+AgY3k6fvA=
+SHA256-Digest: fk2cPQJETV0QGzKdhH6cQytV8e2iU8Y7jIZoDBzOT7U=
 
diff --git a/src/META-INF/mozilla.rsa b/src/META-INF/mozilla.rsa
index f8a7877264f4..d9e0388cc60c 100644
Binary files a/src/META-INF/mozilla.rsa and b/src/META-INF/mozilla.rsa differ
diff --git a/src/META-INF/mozilla.sf b/src/META-INF/mozilla.sf
index 7297b92e48d4..98f503350eae 100644
--- a/src/META-INF/mozilla.sf
+++ b/src/META-INF/mozilla.sf
@@ -1,4 +1,4 @@
 Signature-Version: 1.0
-MD5-Digest-Manifest: 9HCE0INabhFIhGXJQSt2iw==
-SHA1-Digest-Manifest: mEoqjIgdGVffhoedGtfYkqVYKTM=
+SHA1-Digest-Manifest: L31wgRQGJBOG3iJjSeLF4dXsod8=
+SHA256-Digest-Manifest: S3HRAq2xWZ+ssLk+lltuxaJGsOPVGY0M8JJuWG6J2us=
 
diff --git a/src/chrome/content/rules/01.org.xml b/src/chrome/content/rules/01.org.xml
deleted file mode 100644
index da5efd8bd69b..000000000000
--- a/src/chrome/content/rules/01.org.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/02ch.su.xml b/src/chrome/content/rules/02ch.su.xml
new file mode 100644
index 000000000000..21b3eb364444
--- /dev/null
+++ b/src/chrome/content/rules/02ch.su.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/0bin.net.xml b/src/chrome/content/rules/0bin.net.xml
index 9958af696a90..59783a130616 100644
--- a/src/chrome/content/rules/0bin.net.xml
+++ b/src/chrome/content/rules/0bin.net.xml
@@ -10,7 +10,7 @@
 
     
-    
+
     
 
diff --git a/src/chrome/content/rules/0chan.one.xml b/src/chrome/content/rules/0chan.one.xml
new file mode 100644
index 000000000000..a5d94e8e6c65
--- /dev/null
+++ b/src/chrome/content/rules/0chan.one.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/0x41.no.xml b/src/chrome/content/rules/0x41.no.xml
deleted file mode 100644
index d8fe24fb9df8..000000000000
--- a/src/chrome/content/rules/0x41.no.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/0x539.se.xml b/src/chrome/content/rules/0x539.se.xml
deleted file mode 100644
index f897ea8fdb41..000000000000
--- a/src/chrome/content/rules/0x539.se.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/1-800courier.com.xml b/src/chrome/content/rules/1-800courier.com.xml
new file mode 100644
index 000000000000..fb31b46e5001
--- /dev/null
+++ b/src/chrome/content/rules/1-800courier.com.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/1.0.0.1.xml b/src/chrome/content/rules/1.0.0.1.xml
new file mode 100644
index 000000000000..1d46eeb11c6b
--- /dev/null
+++ b/src/chrome/content/rules/1.0.0.1.xml
@@ -0,0 +1,12 @@
+
+
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/1.1.1.1.xml b/src/chrome/content/rules/1.1.1.1.xml
new file mode 100644
index 000000000000..c6249f83c425
--- /dev/null
+++ b/src/chrome/content/rules/1.1.1.1.xml
@@ -0,0 +1,12 @@
+
+
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/100-Gute-Gruende.de.xml b/src/chrome/content/rules/100-Gute-Gruende.de.xml
deleted file mode 100644
index 649a0d65945a..000000000000
--- a/src/chrome/content/rules/100-Gute-Gruende.de.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-  
-  
-
-	
-
diff --git a/src/chrome/content/rules/100R.org.xml b/src/chrome/content/rules/100R.org.xml
index c683f925df4f..f79f105d178d 100644
--- a/src/chrome/content/rules/100R.org.xml
+++ b/src/chrome/content/rules/100R.org.xml
@@ -24,7 +24,7 @@ Fetch error: http://cf9.100r.org/ => https://cf9.100r.org/: (51, "SSL: no altern
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/101domain.com-falsemixed.xml b/src/chrome/content/rules/101domain.com-falsemixed.xml
deleted file mode 100644
index 240046213d09..000000000000
--- a/src/chrome/content/rules/101domain.com-falsemixed.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/101domain.com.xml b/src/chrome/content/rules/101domain.com.xml
index dbb50871c567..8fbcddd6549c 100644
--- a/src/chrome/content/rules/101domain.com.xml
+++ b/src/chrome/content/rules/101domain.com.xml
@@ -1,100 +1,16 @@
-
 
-
-
-	
+
 	
+	
 	
 	
 	
-	
-	
-	
-
-	
-	
-
-		
-		
-
-			
-			
-			
-
-			
-			
-
-			
-			
-			
-			
-
-			
-			
-			
-
-
-	
-	
-
-		
-		
 
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/101weiqi.xml b/src/chrome/content/rules/101weiqi.xml
index 6674bf3c3010..5cad4e7cf343 100644
--- a/src/chrome/content/rules/101weiqi.xml
+++ b/src/chrome/content/rules/101weiqi.xml
@@ -3,7 +3,7 @@
 		demo.101weiqi.com
 -->
 
-	
 	
 	
-	
+	
 
 
 	
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/112-akersloot.nl.xml b/src/chrome/content/rules/112-akersloot.nl.xml
index b0d56cad7d1c..6d7bb589b737 100644
--- a/src/chrome/content/rules/112-akersloot.nl.xml
+++ b/src/chrome/content/rules/112-akersloot.nl.xml
@@ -1,7 +1,7 @@
-
-	
-	
-
-	
-
\ No newline at end of file
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/112-uitgeest.nl.xml b/src/chrome/content/rules/112-uitgeest.nl.xml
index ea0e3e19e2d3..17ba4c4f4589 100644
--- a/src/chrome/content/rules/112-uitgeest.nl.xml
+++ b/src/chrome/content/rules/112-uitgeest.nl.xml
@@ -1,7 +1,7 @@
-
-	
-	
-
-	
-
\ No newline at end of file
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/1177.se.xml b/src/chrome/content/rules/1177.se.xml
index 88c8687566e3..bd41f6d2564f 100644
--- a/src/chrome/content/rules/1177.se.xml
+++ b/src/chrome/content/rules/1177.se.xml
@@ -1,13 +1,60 @@
-
-
-
-	
-	
-
-
-	
 
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
diff --git a/src/chrome/content/rules/11footballclub.xml b/src/chrome/content/rules/11footballclub.xml
index 4f3399fb0064..44ad5fddb611 100644
--- a/src/chrome/content/rules/11footballclub.xml
+++ b/src/chrome/content/rules/11footballclub.xml
@@ -6,7 +6,7 @@ Fetch error: http://cdn.11footballclub.com/ => https://cdn.11footballclub.com/:
 Fetch error: http://www.11footballclub.com/ => https://www.11footballclub.com/: (35, 'Unknown SSL protocol error in connection to www.11footballclub.com:443 ')
 
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://www.11footballclub.com/ => https://www.11footballclub.com/:
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/123-reg.xml b/src/chrome/content/rules/123-reg.xml
index 456b258e034c..d29487376f73 100644
--- a/src/chrome/content/rules/123-reg.xml
+++ b/src/chrome/content/rules/123-reg.xml
@@ -8,8 +8,9 @@ Non-2xx HTTP code: http://ssllin1.123-secure.com/ (200) => https://ssllin1.123-s
 
 	
 	
-	
-
+    
+    
+    
 
 	
 
@@ -23,19 +24,13 @@ Non-2xx HTTP code: http://ssllin1.123-secure.com/ (200) => https://ssllin1.123-s
 				-->
 	
+    
 
-	
-	
-
-	
+  -->
 
+  
 
diff --git a/src/chrome/content/rules/123domain.eu.xml b/src/chrome/content/rules/123domain.eu.xml
new file mode 100644
index 000000000000..4334bee0ec97
--- /dev/null
+++ b/src/chrome/content/rules/123domain.eu.xml
@@ -0,0 +1,34 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/126.com.xml b/src/chrome/content/rules/126.com.xml
index 2f6a976019ad..da0c9639946c 100644
--- a/src/chrome/content/rules/126.com.xml
+++ b/src/chrome/content/rules/126.com.xml
@@ -1,12 +1,6 @@
 
 
 	
@@ -15,7 +9,12 @@
 	
 	
 	
+	
 	
+	
+	
+
+	
 
 	
 
diff --git a/src/chrome/content/rules/126.net.xml b/src/chrome/content/rules/126.net.xml
index f5d87e78d2f9..b2a22113a66e 100644
--- a/src/chrome/content/rules/126.net.xml
+++ b/src/chrome/content/rules/126.net.xml
@@ -1,65 +1,59 @@
 
 
+	
+		
 	
 		
 	
 		
 	
+	
+	
 	
 		
 	
 	
 	
 	
-		
+		
 	
 	
 	
-	
-		
+	
+		
+		
+		
 	
 		
 	
+	
 	
 		
 	
 
-	
-	
-		
-		
-		
-		
-		
-		
-
-	
-	
-		
-		
-		
-		
-		
-
-	
-		
+	
+	
+	
+		
 
 	
 
diff --git a/src/chrome/content/rules/1431am.org.xml b/src/chrome/content/rules/1431am.org.xml
index 48015c7154c2..c047e970c5ff 100644
--- a/src/chrome/content/rules/1431am.org.xml
+++ b/src/chrome/content/rules/1431am.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://1431am.org/ => https://1431am.org/: (60, 'SSL certificate pr
 Fetch error: http://www.1431am.org/ => https://www.1431am.org/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/148apps.com.xml b/src/chrome/content/rules/148apps.com.xml
deleted file mode 100644
index b44873843429..000000000000
--- a/src/chrome/content/rules/148apps.com.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
diff --git a/src/chrome/content/rules/163.com-mixedcontent.xml b/src/chrome/content/rules/163.com-mixedcontent.xml
new file mode 100644
index 000000000000..891b9b795035
--- /dev/null
+++ b/src/chrome/content/rules/163.com-mixedcontent.xml
@@ -0,0 +1,9 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/163.com-problematic.xml b/src/chrome/content/rules/163.com-problematic.xml
deleted file mode 100644
index b7a9ecc40e71..000000000000
--- a/src/chrome/content/rules/163.com-problematic.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-		
-
-		
-
-		
-		
-		
-
-	
-		
-
-		
-
-		
-
-		
-
-		
-
diff --git a/src/chrome/content/rules/163.com.xml b/src/chrome/content/rules/163.com.xml
index 50c9f2d32431..872e04b916a6 100644
--- a/src/chrome/content/rules/163.com.xml
+++ b/src/chrome/content/rules/163.com.xml
@@ -1,89 +1,70 @@
 
 
 	
+	
+	
 	
-	
+	
 	
-	
+	
+	
+	
 	
 	
 	
 	
 	
+	
+	
 	
 		
-	
-		
+	
 	
 		
 		
@@ -106,45 +87,48 @@
 		
 		
 		
-		
 		
+	
 	
 	
 	
 		
 	
-	
+	
 	
 	
 	
 		
 	
 	
+	
 	
+	
 	
 	
+	
 	
 	
 		
 	
-	
-	
 	
+	
+	
 	
 	
 	
 	
-	
-	
 
 	
+	
+
 	
-		
-		
-		
-		
 		
+		
+		
 		
 
+	
+
 	
 
diff --git a/src/chrome/content/rules/168qiquan.com.xml b/src/chrome/content/rules/168qiquan.com.xml
deleted file mode 100644
index 0beadaa22210..000000000000
--- a/src/chrome/content/rules/168qiquan.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/16chan.nl.xml b/src/chrome/content/rules/16chan.nl.xml
deleted file mode 100644
index 4a3751944861..000000000000
--- a/src/chrome/content/rules/16chan.nl.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/179.ru.xml b/src/chrome/content/rules/179.ru.xml
new file mode 100644
index 000000000000..14bd29d6180d
--- /dev/null
+++ b/src/chrome/content/rules/179.ru.xml
@@ -0,0 +1,35 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/17track.net.xml b/src/chrome/content/rules/17track.net.xml
index 45e481b582d3..f5c0c2e364f8 100644
--- a/src/chrome/content/rules/17track.net.xml
+++ b/src/chrome/content/rules/17track.net.xml
@@ -1,6 +1,8 @@
-
-  
-  
+
+	
+	
 
-  
+	
+
+	
 
diff --git a/src/chrome/content/rules/1Cart.xml b/src/chrome/content/rules/1Cart.xml
deleted file mode 100644
index cf4cc25f186d..000000000000
--- a/src/chrome/content/rules/1Cart.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-	
-	
-	
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/1PipFix.xml b/src/chrome/content/rules/1PipFix.xml
index b88e35caa893..0c91ce8616af 100644
--- a/src/chrome/content/rules/1PipFix.xml
+++ b/src/chrome/content/rules/1PipFix.xml
@@ -5,7 +5,7 @@ Fetch error: http://1pipfix.com/ => https://1pipfix.com/: (28, 'Connection timed
 Fetch error: http://www.1pipfix.com/ => https://www.1pipfix.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.1pipfix.com/ => https://www.1pipfix.com/: (28, 'Connecti
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/1ShoppingCart.com.xml b/src/chrome/content/rules/1ShoppingCart.com.xml
index e6a5a7768990..9d7f2ed5f8c1 100644
--- a/src/chrome/content/rules/1ShoppingCart.com.xml
+++ b/src/chrome/content/rules/1ShoppingCart.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://1shoppingcart.com/ => https://1shoppingcart.com/: Too many r
 	For other Web.com Group coverage, see Web.com.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/1X.xml b/src/chrome/content/rules/1X.xml
index d140fde2d896..cfa766f3292b 100644
--- a/src/chrome/content/rules/1X.xml
+++ b/src/chrome/content/rules/1X.xml
@@ -12,7 +12,7 @@ Fetch error: http://owa.1x.com/ => https://owa.1x.com/: (60, 'SSL certificate pr
 	² Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/1_Deg.org.xml b/src/chrome/content/rules/1_Deg.org.xml
index e97d2348dfcc..ae7de6e4a9c3 100644
--- a/src/chrome/content/rules/1_Deg.org.xml
+++ b/src/chrome/content/rules/1_Deg.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://1deg.org/ => https://1deg.org/: (28, 'Connection timed out after 20000 milliseconds')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/1and1-Internet.xml b/src/chrome/content/rules/1and1-Internet.xml
index f6da61397807..5f6f32a58dcc 100644
--- a/src/chrome/content/rules/1and1-Internet.xml
+++ b/src/chrome/content/rules/1and1-Internet.xml
@@ -32,7 +32,7 @@ Fetch error: http://webdesk.1and1.com/ => https://webdesk.1and1.com/: (7, 'Faile
 	ᵐ Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/1and1.ca.xml b/src/chrome/content/rules/1and1.ca.xml
index 16a78c99baa4..5d0f43291d06 100644
--- a/src/chrome/content/rules/1and1.ca.xml
+++ b/src/chrome/content/rules/1and1.ca.xml
@@ -18,7 +18,7 @@ Fetch error: http://www.forum.1and1.ca/ => https://www.forum.1and1.ca/: (6, 'Cou
 	ᵐ Mismatched
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/1anh.com.xml b/src/chrome/content/rules/1anh.com.xml
index f494bb3b1621..3246ba264fcc 100644
--- a/src/chrome/content/rules/1anh.com.xml
+++ b/src/chrome/content/rules/1anh.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://1anh.com/ => https://1anh.com/: (28, 'Connection timed out a
 Fetch error: http://www.1anh.com/ => https://www.1anh.com/: (28, 'Connection timed out after 20000 milliseconds')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/1c-bitrix.ru.xml b/src/chrome/content/rules/1c-bitrix.ru.xml
index 160be81021a2..4903e992bcbb 100644
--- a/src/chrome/content/rules/1c-bitrix.ru.xml
+++ b/src/chrome/content/rules/1c-bitrix.ru.xml
@@ -13,7 +13,14 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
@@ -22,7 +29,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/1d4.us.xml b/src/chrome/content/rules/1d4.us.xml
index a8a4fd07b215..0494998650df 100644
--- a/src/chrome/content/rules/1d4.us.xml
+++ b/src/chrome/content/rules/1d4.us.xml
@@ -6,7 +6,7 @@ Fetch error: http://1d4.us/ => https://1d4.us/: (28, 'Operation timed out after
 	STS header includes includeSubdomains
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/1fichier.xml b/src/chrome/content/rules/1fichier.xml
index 69fec7acf0ab..8d3fe557b874 100644
--- a/src/chrome/content/rules/1fichier.xml
+++ b/src/chrome/content/rules/1fichier.xml
@@ -4,12 +4,12 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://st-1.1fichier.com/ => https://st-1.1fichier.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 	All non-1fichier.com URLs are mirrors of https://1fichier.com/ .
-	
+
 	Mismatch:
 	- dfichiers.com
 -->
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/1freehosting.com.xml b/src/chrome/content/rules/1freehosting.com.xml
new file mode 100644
index 000000000000..d894b26dc5e1
--- /dev/null
+++ b/src/chrome/content/rules/1freehosting.com.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/1nsk.ru-problematic.xml b/src/chrome/content/rules/1nsk.ru-problematic.xml
index a6975dde1b4e..20f974c0c941 100644
--- a/src/chrome/content/rules/1nsk.ru-problematic.xml
+++ b/src/chrome/content/rules/1nsk.ru-problematic.xml
@@ -5,7 +5,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -14,7 +15,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/1nsk.ru.xml b/src/chrome/content/rules/1nsk.ru.xml
index 237142e6d4ac..3a86e6c1e5c3 100644
--- a/src/chrome/content/rules/1nsk.ru.xml
+++ b/src/chrome/content/rules/1nsk.ru.xml
@@ -15,7 +15,7 @@ Fetch error: http://live.1nsk.ru/ => https://live.1nsk.ru/: (28, 'Connection tim
 	* Works; expired 2012-02-28, self-signed
 
 -->
-
+
 
 	
 
@@ -25,4 +25,4 @@ Fetch error: http://live.1nsk.ru/ => https://live.1nsk.ru/: (28, 'Connection tim
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/1over1.net.xml b/src/chrome/content/rules/1over1.net.xml
new file mode 100644
index 000000000000..77c1e327632e
--- /dev/null
+++ b/src/chrome/content/rules/1over1.net.xml
@@ -0,0 +1,13 @@
+
+	
+	
+
+	
+	
+		
+		
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/1s_and_0s.nl.xml b/src/chrome/content/rules/1s_and_0s.nl.xml
deleted file mode 100644
index 476230097062..000000000000
--- a/src/chrome/content/rules/1s_and_0s.nl.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/1stWarning.com.xml b/src/chrome/content/rules/1stWarning.com.xml
index 7abb6d742a42..1fc53a466043 100644
--- a/src/chrome/content/rules/1stWarning.com.xml
+++ b/src/chrome/content/rules/1stWarning.com.xml
@@ -8,7 +8,7 @@
 	
 
 
-	
+	
 
 
 	
+
 	
 	
+
+	
+
 	
 
diff --git a/src/chrome/content/rules/1xbet.com.xml b/src/chrome/content/rules/1xbet.com.xml
deleted file mode 100644
index 14e8cf5768f3..000000000000
--- a/src/chrome/content/rules/1xbet.com.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/2020mobile.es.xml b/src/chrome/content/rules/2020mobile.es.xml
index c256ffde06f0..7ae5c8dd31c6 100644
--- a/src/chrome/content/rules/2020mobile.es.xml
+++ b/src/chrome/content/rules/2020mobile.es.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.2020mobile.es/ => https://www.2020mobile.es/: (35, 'error:140770FC:SSL routines:SSL23_GET_SERVER_HELLO:unknown protocol')
 Fetch error: http://2020mobile.es/ => https://www.2020mobile.es/: (35, 'error:140770FC:SSL routines:SSL23_GET_SERVER_HELLO:unknown protocol')
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/20min.ch-mixedcontent.xml b/src/chrome/content/rules/20min.ch-mixedcontent.xml
deleted file mode 100644
index 1a73adb858b7..000000000000
--- a/src/chrome/content/rules/20min.ch-mixedcontent.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-	
-	
-
-	
-	
-	
-
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/20min.ch.xml b/src/chrome/content/rules/20min.ch.xml
index b42393283f49..0a0c49462bc4 100644
--- a/src/chrome/content/rules/20min.ch.xml
+++ b/src/chrome/content/rules/20min.ch.xml
@@ -1,51 +1,24 @@
 
 
+	
 	
 	
+	
 	
 	
 	
 
-	
-	
-
-	
-	
-	
-	
-
-	
-	
-	
-	
+	
 
-	
+	
 
diff --git a/src/chrome/content/rules/20minutes.fr.xml b/src/chrome/content/rules/20minutes.fr.xml
index 989d7f9f7379..8c6a79b02988 100644
--- a/src/chrome/content/rules/20minutes.fr.xml
+++ b/src/chrome/content/rules/20minutes.fr.xml
@@ -42,7 +42,7 @@
 	
 
-	
 
 
diff --git a/src/chrome/content/rules/20minuti.ch.xml b/src/chrome/content/rules/20minuti.ch.xml
index 561bce8b1020..4323316e18ca 100644
--- a/src/chrome/content/rules/20minuti.ch.xml
+++ b/src/chrome/content/rules/20minuti.ch.xml
@@ -1,21 +1,13 @@
 
-
+
+	
 	
 	
 	
 
+	
+
 	
 
diff --git a/src/chrome/content/rules/21.co.xml b/src/chrome/content/rules/21.co.xml
index aba675c3c6c3..6d75d4d28de6 100644
--- a/src/chrome/content/rules/21.co.xml
+++ b/src/chrome/content/rules/21.co.xml
@@ -7,7 +7,7 @@ Non-2xx HTTP code: http://slack.21.co/ (200) => https://slack.21.co/ (526)
 		4xx client error:
 			 - files.21.co
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/22Fevrier2019.org.xml b/src/chrome/content/rules/22Fevrier2019.org.xml
new file mode 100644
index 000000000000..64371073a2d3
--- /dev/null
+++ b/src/chrome/content/rules/22Fevrier2019.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/23Systems.xml b/src/chrome/content/rules/23Systems.xml
index b517473c8f75..cefde1351ed3 100644
--- a/src/chrome/content/rules/23Systems.xml
+++ b/src/chrome/content/rules/23Systems.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/24-7_Customer.xml b/src/chrome/content/rules/24-7_Customer.xml
deleted file mode 100644
index 2e06b6e38ba1..000000000000
--- a/src/chrome/content/rules/24-7_Customer.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/247exchange.com.xml b/src/chrome/content/rules/247exchange.com.xml
deleted file mode 100644
index c5ddd861c198..000000000000
--- a/src/chrome/content/rules/247exchange.com.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/247filmz.xml b/src/chrome/content/rules/247filmz.xml
index 73a1481ae283..3817a6e5ddf1 100644
--- a/src/chrome/content/rules/247filmz.xml
+++ b/src/chrome/content/rules/247filmz.xml
@@ -5,7 +5,7 @@ Fetch error: http://247filmz.com/ => https://247filmz.com/: (51, "SSL: no altern
 Fetch error: http://www.247filmz.com/ => https://www.247filmz.com/: (6, 'Could not resolve host: www.247filmz.com')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.247filmz.com/ => https://www.247filmz.com/: (6, 'Could n
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/24img.com.xml b/src/chrome/content/rules/24img.com.xml
index 46cd2753f689..1f5092abe2a8 100644
--- a/src/chrome/content/rules/24img.com.xml
+++ b/src/chrome/content/rules/24img.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://search.24img.com/ => https://search.24img.com/: (6, 'Could n
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/24pay.me.xml b/src/chrome/content/rules/24pay.me.xml
deleted file mode 100644
index 74125c2721b1..000000000000
--- a/src/chrome/content/rules/24pay.me.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/24paybank.com.xml b/src/chrome/content/rules/24paybank.com.xml
index 73940e4967bf..b75ac446040c 100644
--- a/src/chrome/content/rules/24paybank.com.xml
+++ b/src/chrome/content/rules/24paybank.com.xml
@@ -11,7 +11,7 @@ support2.24paybank.com ¹
 
 ¹ mismatch
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/254a.com.xml b/src/chrome/content/rules/254a.com.xml
deleted file mode 100644
index 7696aec103b9..000000000000
--- a/src/chrome/content/rules/254a.com.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/256stuff.com.xml b/src/chrome/content/rules/256stuff.com.xml
new file mode 100644
index 000000000000..519d69ef2797
--- /dev/null
+++ b/src/chrome/content/rules/256stuff.com.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/25thandclement.com.xml b/src/chrome/content/rules/25thandclement.com.xml
new file mode 100644
index 000000000000..dacc742d9b1f
--- /dev/null
+++ b/src/chrome/content/rules/25thandclement.com.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/2Dialog.com.xml b/src/chrome/content/rules/2Dialog.com.xml
index 28f1e62ac87d..04ca950d87fa 100644
--- a/src/chrome/content/rules/2Dialog.com.xml
+++ b/src/chrome/content/rules/2Dialog.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.2dialog.com/ => http://www.2dialog.com/: Redirect for 'h
 	Some pages redirect to http.../$
 
 -->
-
+
 
 	
 	
@@ -19,4 +19,4 @@ Fetch error: http://www.2dialog.com/ => http://www.2dialog.com/: Redirect for 'h
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/2GIS.ru.xml b/src/chrome/content/rules/2GIS.ru.xml
index c73c2d5c62c2..2c34c624788a 100644
--- a/src/chrome/content/rules/2GIS.ru.xml
+++ b/src/chrome/content/rules/2GIS.ru.xml
@@ -20,7 +20,8 @@
 
 
 	
-	
+	
+	
 
 
 	 https://www.2ksports.com/: (35, 'error:
 	For other 2K Games coverage, see 2K_Games.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/2_Ton.com.au.xml b/src/chrome/content/rules/2_Ton.com.au.xml
index ac431509e373..a16e58dff5d8 100644
--- a/src/chrome/content/rules/2_Ton.com.au.xml
+++ b/src/chrome/content/rules/2_Ton.com.au.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.2ton.com.au/ => https://www.2ton.com.au/: (51, "SSL: no alternative certificate subject name matches target host name 'www.2ton.com.au'")
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/2ch.cm.xml b/src/chrome/content/rules/2ch.cm.xml
index 72f890382316..bf553e49f91a 100644
--- a/src/chrome/content/rules/2ch.cm.xml
+++ b/src/chrome/content/rules/2ch.cm.xml
@@ -5,7 +5,7 @@ Fetch error: http://2ch.cm/ => https://2ch.cm/: (51, "SSL: no alternative certif
 Fetch error: http://www.2ch.cm/ => https://www.2ch.cm/: (51, "SSL: no alternative certificate subject name matches target host name 'www.2ch.cm'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/2ch.net.xml b/src/chrome/content/rules/2ch.net.xml
index c1b9e92d5ee1..ded17a2a59a9 100644
--- a/src/chrome/content/rules/2ch.net.xml
+++ b/src/chrome/content/rules/2ch.net.xml
@@ -12,7 +12,7 @@
 		- Images on (www.)?, (board_name) from www.2ch.net ˢ
 
 		- Ads / bugs, on:
-		
+
 			- (www.)? from img.bbchat.tv ᵈ
 			- www2 from vsc.send.microad.jp ᵈ
 
diff --git a/src/chrome/content/rules/2dehands.be.xml b/src/chrome/content/rules/2dehands.be.xml
index 365ac33c18de..273dccf81d7c 100644
--- a/src/chrome/content/rules/2dehands.be.xml
+++ b/src/chrome/content/rules/2dehands.be.xml
@@ -14,7 +14,7 @@
 		- img.xp	(r)
 		- www.xp2	(r)
 		- img.xp2	(r)
-	
+
 	e: expired certificate
 	h: http redirect
 	i: invalid certificate chain
diff --git a/src/chrome/content/rules/2ememain.be.xml b/src/chrome/content/rules/2ememain.be.xml
index 7a7ae0c1dea7..32ecae7faa52 100644
--- a/src/chrome/content/rules/2ememain.be.xml
+++ b/src/chrome/content/rules/2ememain.be.xml
@@ -14,7 +14,7 @@
 		- img.xp	(r)
 		- www.xp2	(r)
 		- img.xp2	(r)
-	
+
 	e: expired certificate
 	h: http redirect
 	i: invalid certificate chain
diff --git a/src/chrome/content/rules/2o7.net.xml b/src/chrome/content/rules/2o7.net.xml
index 9bc4ee728478..a6aa5fa241d6 100644
--- a/src/chrome/content/rules/2o7.net.xml
+++ b/src/chrome/content/rules/2o7.net.xml
@@ -1,24 +1,25 @@
 
 
 
-	
-
+	
+	
+		
+		
+		
 
-	
+	
+		
+	
+		
+		
+		
 
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/2x.com.xml b/src/chrome/content/rules/2x.com.xml
deleted file mode 100644
index aec295bcdcff..000000000000
--- a/src/chrome/content/rules/2x.com.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-	
-	
-	
-
diff --git a/src/chrome/content/rules/3.cn.xml b/src/chrome/content/rules/3.cn.xml
index 59ccf96b006d..a006043699dd 100644
--- a/src/chrome/content/rules/3.cn.xml
+++ b/src/chrome/content/rules/3.cn.xml
@@ -10,9 +10,8 @@
 	
 		
 	
-		
 	
-		
+		
 	
 		
 	
diff --git a/src/chrome/content/rules/32Red_Online_Casino.xml b/src/chrome/content/rules/32Red_Online_Casino.xml
index 0ab17c90568b..4ec359e75102 100644
--- a/src/chrome/content/rules/32Red_Online_Casino.xml
+++ b/src/chrome/content/rules/32Red_Online_Casino.xml
@@ -17,7 +17,12 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
 
 
 	
@@ -26,7 +31,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/33Across.xml b/src/chrome/content/rules/33Across.xml
index e960828ed6e4..ec1abf8e4b5b 100644
--- a/src/chrome/content/rules/33Across.xml
+++ b/src/chrome/content/rules/33Across.xml
@@ -32,7 +32,7 @@
 		
 
 
-	
+	
 
 
 	
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/33option.com.xml b/src/chrome/content/rules/33option.com.xml
index 9fa061429b67..d530e92b1f33 100644
--- a/src/chrome/content/rules/33option.com.xml
+++ b/src/chrome/content/rules/33option.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://33option.com/ => https://33option.com/: (60, 'SSL certificat
 Fetch error: http://www.33option.com/ => https://www.33option.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/350.org.xml b/src/chrome/content/rules/350.org.xml
deleted file mode 100644
index 4ddbb90df781..000000000000
--- a/src/chrome/content/rules/350.org.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/350zEvolution.com.xml b/src/chrome/content/rules/350zEvolution.com.xml
index 94f864bb33b2..19d1aff7c7a4 100644
--- a/src/chrome/content/rules/350zEvolution.com.xml
+++ b/src/chrome/content/rules/350zEvolution.com.xml
@@ -8,7 +8,7 @@
 	
 
 
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/360Cities.xml b/src/chrome/content/rules/360Cities.xml
index 9930cd0bb0d7..a61a0136ff17 100644
--- a/src/chrome/content/rules/360Cities.xml
+++ b/src/chrome/content/rules/360Cities.xml
@@ -1,25 +1,15 @@
-
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
 
 
-	
-
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/360_Safe.com.xml b/src/chrome/content/rules/360_Safe.com.xml
index 7edda2f6b815..a528dec3cfc0 100644
--- a/src/chrome/content/rules/360_Safe.com.xml
+++ b/src/chrome/content/rules/360_Safe.com.xml
@@ -1,32 +1,15 @@
 
-
+
 
 	
 	
 
+	
 
-	
-
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/365_Tickets_Global.com.xml b/src/chrome/content/rules/365_Tickets_Global.com.xml
deleted file mode 100644
index b1a765efb859..000000000000
--- a/src/chrome/content/rules/365_Tickets_Global.com.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/36Kr.xml b/src/chrome/content/rules/36Kr.xml
index 929ab9dd7f29..34018363174f 100644
--- a/src/chrome/content/rules/36Kr.xml
+++ b/src/chrome/content/rules/36Kr.xml
@@ -4,7 +4,7 @@
 		events.36kr.com
 		qiye.36kr.com
 		research.36kr.com
-		
+
 		krspace.cn
 -->
 
@@ -18,7 +18,7 @@
 	
 	
 	
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/38.de.xml b/src/chrome/content/rules/38.de.xml
index 7fb95349b831..3428213ee900 100644
--- a/src/chrome/content/rules/38.de.xml
+++ b/src/chrome/content/rules/38.de.xml
@@ -8,7 +8,7 @@
 	STS header includes includeSubdomains
 
 -->
-
+
 
 	
@@ -19,7 +19,7 @@
 	
 
 		
-	
+
 
 	
 
diff --git a/src/chrome/content/rules/38degrees.xml b/src/chrome/content/rules/38degrees.xml
index 49bc208c5724..a707cc835528 100644
--- a/src/chrome/content/rules/38degrees.xml
+++ b/src/chrome/content/rules/38degrees.xml
@@ -12,7 +12,7 @@
 					-->
 	
 
-    
+    
 
 	
diff --git a/src/chrome/content/rules/3Blue1Brown.com.xml b/src/chrome/content/rules/3Blue1Brown.com.xml
new file mode 100644
index 000000000000..3e1f7e72e86a
--- /dev/null
+++ b/src/chrome/content/rules/3Blue1Brown.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/3DCenter.org.xml b/src/chrome/content/rules/3DCenter.org.xml
index d7f9b5fb33c0..57b83cf6b455 100644
--- a/src/chrome/content/rules/3DCenter.org.xml
+++ b/src/chrome/content/rules/3DCenter.org.xml
@@ -21,6 +21,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/3DStats.xml b/src/chrome/content/rules/3DStats.xml
deleted file mode 100644
index bffa312923ca..000000000000
--- a/src/chrome/content/rules/3DStats.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-
-		
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/3D_Robotics.com.xml b/src/chrome/content/rules/3D_Robotics.com.xml
index ff41d350ef67..6b4c6a76482a 100644
--- a/src/chrome/content/rules/3D_Robotics.com.xml
+++ b/src/chrome/content/rules/3D_Robotics.com.xml
@@ -18,7 +18,7 @@ Fetch error: http://www.store.3drobotics.com/ => https://www.store.3drobotics.co
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/3D_Vision_Live.com.xml b/src/chrome/content/rules/3D_Vision_Live.com.xml
deleted file mode 100644
index fa6301b5df9a..000000000000
--- a/src/chrome/content/rules/3D_Vision_Live.com.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-
-	
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/3bbwifi.com.xml b/src/chrome/content/rules/3bbwifi.com.xml
index 3d8dcac15c04..1fb8eaca8f1a 100644
--- a/src/chrome/content/rules/3bbwifi.com.xml
+++ b/src/chrome/content/rules/3bbwifi.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://3bbwifi.com/ => https://www.3bbwifi.com/: (60, 'SSL certific
 Fetch error: http://www.3bbwifi.com/ => https://www.3bbwifi.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/3conline.com.xml b/src/chrome/content/rules/3conline.com.xml
index 1b153bbcbfe0..44e78147d47d 100644
--- a/src/chrome/content/rules/3conline.com.xml
+++ b/src/chrome/content/rules/3conline.com.xml
@@ -11,8 +11,8 @@ Fetch error: http://js.3conline.com/ => https://js.3conline.com/: (28, 'Connecti
 		- www
 -->
 
-
-  
+
+
 	
 	
 	
diff --git a/src/chrome/content/rules/3ders.org.xml b/src/chrome/content/rules/3ders.org.xml
new file mode 100644
index 000000000000..812016c74e73
--- /dev/null
+++ b/src/chrome/content/rules/3ders.org.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/3sat.xml b/src/chrome/content/rules/3sat.xml
index 8104f510c603..bccbd1b00f2c 100644
--- a/src/chrome/content/rules/3sat.xml
+++ b/src/chrome/content/rules/3sat.xml
@@ -1,15 +1,35 @@
 
-
+
+
 	
 	
-	
+	
+	
 	
+	
 	
+	
+	
+	
+	
+	
+	
 	
+	
+	
+	
+
+	
+
+	
 
-	
 
diff --git a/src/chrome/content/rules/3suisses.de.xml b/src/chrome/content/rules/3suisses.de.xml
deleted file mode 100644
index d05d3bd2c0aa..000000000000
--- a/src/chrome/content/rules/3suisses.de.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-  
-  
-
-  
-
diff --git a/src/chrome/content/rules/3taps.xml b/src/chrome/content/rules/3taps.xml
index 2fe2cd365ee3..6ebb54a8ff55 100644
--- a/src/chrome/content/rules/3taps.xml
+++ b/src/chrome/content/rules/3taps.xml
@@ -6,7 +6,7 @@ Fetch error: http://developer.3taps.com/ => https://developer.3taps.com/: (51, "
 Fetch error: http://www.3taps.com/ => https://www.3taps.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://www.3taps.com/ => https://www.3taps.com/: (60, 'SSL certific
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/3v1n0.net.xml b/src/chrome/content/rules/3v1n0.net.xml
index 048322d452b8..d3718ff44dab 100644
--- a/src/chrome/content/rules/3v1n0.net.xml
+++ b/src/chrome/content/rules/3v1n0.net.xml
@@ -2,7 +2,7 @@
 	Mixed content:
 
 		- css, on:
-		
+
 			- blog from fonts.googleapis.com ˢ
 			- www from tumblelog.3v1n0.net ˢ
 			- www from www.3v1n0.net ˢ
diff --git a/src/chrome/content/rules/42Floors.com.xml b/src/chrome/content/rules/42Floors.com.xml
index 8bd4015b8c86..9f821890956b 100644
--- a/src/chrome/content/rules/42Floors.com.xml
+++ b/src/chrome/content/rules/42Floors.com.xml
@@ -27,7 +27,7 @@ Fetch error: http://images.42floors.com/ => https://images.42floors.com/: (6, 'C
 	² Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/435_by_MJC.com.xml b/src/chrome/content/rules/435_by_MJC.com.xml
index 44241c7cbe39..b12646d38f12 100644
--- a/src/chrome/content/rules/435_by_MJC.com.xml
+++ b/src/chrome/content/rules/435_by_MJC.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.435bymjc.com/ => https://www.435bymjc.com/: (60, 'SSL ce
 		- www.435bymjc.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/43rumors.com.xml b/src/chrome/content/rules/43rumors.com.xml
new file mode 100644
index 000000000000..00522c9de72e
--- /dev/null
+++ b/src/chrome/content/rules/43rumors.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/451-Group.xml b/src/chrome/content/rules/451-Group.xml
index 0a67f11cf648..1e5017b81d8c 100644
--- a/src/chrome/content/rules/451-Group.xml
+++ b/src/chrome/content/rules/451-Group.xml
@@ -3,7 +3,7 @@
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/4D.com.xml b/src/chrome/content/rules/4D.com.xml
index e65eac2f5652..9cea66d66c22 100644
--- a/src/chrome/content/rules/4D.com.xml
+++ b/src/chrome/content/rules/4D.com.xml
@@ -6,13 +6,12 @@
 -->
 
 
-	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/4DO.xml b/src/chrome/content/rules/4DO.xml
index 58e8c75870a5..fd1f5c59b2ce 100644
--- a/src/chrome/content/rules/4DO.xml
+++ b/src/chrome/content/rules/4DO.xml
@@ -2,7 +2,9 @@
 
 	
 	
-	
+	
+	
+	
 
 
 	
@@ -12,7 +14,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/4Tulemar.xml b/src/chrome/content/rules/4Tulemar.xml
deleted file mode 100644
index 28c9eeec7977..000000000000
--- a/src/chrome/content/rules/4Tulemar.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/4chan.xml b/src/chrome/content/rules/4chan.xml
index 4410d888cb8c..2fb4acd8e0f2 100644
--- a/src/chrome/content/rules/4chan.xml
+++ b/src/chrome/content/rules/4chan.xml
@@ -33,6 +33,7 @@
 
 	
 	
+	
 
 	
 
diff --git a/src/chrome/content/rules/4gamer.net.xml b/src/chrome/content/rules/4gamer.net.xml
index 9fb642a3ff72..03483c12eb68 100644
--- a/src/chrome/content/rules/4gamer.net.xml
+++ b/src/chrome/content/rules/4gamer.net.xml
@@ -16,4 +16,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/4sevens.xml b/src/chrome/content/rules/4sevens.xml
index 21c867d3f559..7828e2b4d682 100644
--- a/src/chrome/content/rules/4sevens.xml
+++ b/src/chrome/content/rules/4sevens.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.4sevens.com/ => https://www.4sevens.com/: (60, 'SSL certificate problem: certificate has expired')
 Fetch error: http://4sevens.com/ => https://www.4sevens.com/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/5000etherhomepage.com.xml b/src/chrome/content/rules/5000etherhomepage.com.xml
deleted file mode 100644
index fec2675dd568..000000000000
--- a/src/chrome/content/rules/5000etherhomepage.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/500px.org.xml b/src/chrome/content/rules/500px.org.xml
index 2dc25d4c7780..7b8fc39a8167 100644
--- a/src/chrome/content/rules/500px.org.xml
+++ b/src/chrome/content/rules/500px.org.xml
@@ -1,27 +1,34 @@
 
 
 
-	
 	
+		
+	
+	
+		
+	
 	
+		
 	
+		
 	
 
 		
-		
+		
 
 
 	 https://static.51fanli.net/: (60, 'SSL certificate problem: unable to get local issuer certificate')
+
 	For other Fanli coverage, see Fanli.com.xml.
 
-	Mismatch:
-		imagefile.51fanli.com
+  Expired Certificate:
+    imagefile.51fanli.net
 -->
 
 
 	
-	
 	
 	
 	
@@ -20,15 +24,10 @@
 	
 	
 	
-	
+	
 	
 	
 
-	
-	
-		
-
 	
 
 	
diff --git a/src/chrome/content/rules/55ch.org.xml b/src/chrome/content/rules/55ch.org.xml
index acf1b118b4c9..d1bb32bf6765 100644
--- a/src/chrome/content/rules/55ch.org.xml
+++ b/src/chrome/content/rules/55ch.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://55ch.org/ => https://55ch.org/: (35, 'error:14077410:SSL rou
 Fetch error: http://www.55ch.org/ => https://www.55ch.org/: (7, 'Failed to connect to www.55ch.org port 443: Connection refused')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/58.com.xml b/src/chrome/content/rules/58.com.xml
index 52415b55abff..c3b56b8d1a20 100644
--- a/src/chrome/content/rules/58.com.xml
+++ b/src/chrome/content/rules/58.com.xml
@@ -14,6 +14,7 @@
 		pic2.58.com		( https://pic2.58.com/m58/app58/m_static/home.html )
 		api.wireless.58.com
 		api.wap.58.com
+    flash.bangbang.58.com
 
 	Redirects to 404 error page:
 		^58.com
@@ -23,14 +24,15 @@
 		jing.58.com
 		verifycode.58.com
 		(city).58.com	( bj.58.com and so on. )
+
+  502
+    tracklog.58.com
 -->
 
 
 	
 	
 		
-	
-		
 	
 		
 	
@@ -42,8 +44,6 @@
 	
 	
 	
-	
-		
 	
 	
 		
diff --git a/src/chrome/content/rules/5NINES.xml b/src/chrome/content/rules/5NINES.xml
index bb3c63d81f73..3c9f0edad71e 100644
--- a/src/chrome/content/rules/5NINES.xml
+++ b/src/chrome/content/rules/5NINES.xml
@@ -9,7 +9,7 @@ Fetch error: http://portal.5ninesdata.com/ => https://portal.5ninesdata.com/: (2
 		- (www.)enjoy5nines.com		(ditto)
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/5ch.xml b/src/chrome/content/rules/5ch.xml
new file mode 100644
index 000000000000..dc7c80a0d85c
--- /dev/null
+++ b/src/chrome/content/rules/5ch.xml
@@ -0,0 +1,44 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/5min.com.xml b/src/chrome/content/rules/5min.com.xml
index d699dc1478b8..b7fcc5b390e4 100644
--- a/src/chrome/content/rules/5min.com.xml
+++ b/src/chrome/content/rules/5min.com.xml
@@ -61,7 +61,7 @@ Fetch error: http://pthumbnails.5min.com/ => https://thumbnails.5min.com/: (60,
 	* Akamai
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/5vpn.net.xml b/src/chrome/content/rules/5vpn.net.xml
deleted file mode 100644
index 1c49aefd7f78..000000000000
--- a/src/chrome/content/rules/5vpn.net.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/66option.com.xml b/src/chrome/content/rules/66option.com.xml
deleted file mode 100644
index 92a8a84c3999..000000000000
--- a/src/chrome/content/rules/66option.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/680news.com.xml b/src/chrome/content/rules/680news.com.xml
new file mode 100644
index 000000000000..a678585d2d54
--- /dev/null
+++ b/src/chrome/content/rules/680news.com.xml
@@ -0,0 +1,21 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/6PM.com.xml b/src/chrome/content/rules/6PM.com.xml
deleted file mode 100644
index aecbef4ad1cb..000000000000
--- a/src/chrome/content/rules/6PM.com.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/6Scan_Security.com.xml b/src/chrome/content/rules/6Scan_Security.com.xml
deleted file mode 100644
index f3cd6c21a7c9..000000000000
--- a/src/chrome/content/rules/6Scan_Security.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/6april.org.xml b/src/chrome/content/rules/6april.org.xml
deleted file mode 100644
index 439bac3ae5b2..000000000000
--- a/src/chrome/content/rules/6april.org.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/6to4.ru.xml b/src/chrome/content/rules/6to4.ru.xml
deleted file mode 100644
index 60f957bf7f8c..000000000000
--- a/src/chrome/content/rules/6to4.ru.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/6xq.net.xml b/src/chrome/content/rules/6xq.net.xml
index eeb062a71207..41c0554a742a 100644
--- a/src/chrome/content/rules/6xq.net.xml
+++ b/src/chrome/content/rules/6xq.net.xml
@@ -3,12 +3,12 @@
 		SSL peer certificate was not OK:
 			 - ns.6xq.net
 
+    Connection refused:
+      - luna.6xq.net
+
 -->
 
 	
-	
-	
-		
 
 	
 
diff --git a/src/chrome/content/rules/7-Eleven.com.xml b/src/chrome/content/rules/7-Eleven.com.xml
index 97428923c846..cbbdbba3b91b 100644
--- a/src/chrome/content/rules/7-Eleven.com.xml
+++ b/src/chrome/content/rules/7-Eleven.com.xml
@@ -1,84 +1,22 @@
-
 
-
-
-	
-	
-	
+
 	
-
-	
-	
 	
 	
 	
 
-		
-		
-
-
-	
-	
-
-
-	
-
-	
-	
-
-		
-		
-
-	
-	
-
-		
-		
-
-	
-
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/7-Zip.org.xml b/src/chrome/content/rules/7-Zip.org.xml
new file mode 100644
index 000000000000..de74249a118c
--- /dev/null
+++ b/src/chrome/content/rules/7-Zip.org.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/7Headlines.com.xml b/src/chrome/content/rules/7Headlines.com.xml
deleted file mode 100644
index e0830a2a803e..000000000000
--- a/src/chrome/content/rules/7Headlines.com.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-	
-	
-
-		
-
-	
-
-
diff --git a/src/chrome/content/rules/7_Elements.co.uk.xml b/src/chrome/content/rules/7_Elements.co.uk.xml
index 0a416d1689cb..682ff45af2dd 100644
--- a/src/chrome/content/rules/7_Elements.co.uk.xml
+++ b/src/chrome/content/rules/7_Elements.co.uk.xml
@@ -9,7 +9,7 @@ Non-2xx HTTP code: http://7elements.co.uk/ (200) => https://7elements.co.uk/ (40
 		- www.7elements.co.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/7search.com.xml b/src/chrome/content/rules/7search.com.xml
deleted file mode 100644
index d4617af617d3..000000000000
--- a/src/chrome/content/rules/7search.com.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/7terminals.com.xml b/src/chrome/content/rules/7terminals.com.xml
deleted file mode 100644
index d98f7fffbb5f..000000000000
--- a/src/chrome/content/rules/7terminals.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/80s_Purple.com.xml b/src/chrome/content/rules/80s_Purple.com.xml
index df30f27eb2f9..0c6bb197559e 100644
--- a/src/chrome/content/rules/80s_Purple.com.xml
+++ b/src/chrome/content/rules/80s_Purple.com.xml
@@ -32,7 +32,9 @@ Fetch error: http://80spurple.com/ => https://80spurple.com/: (28, 'Operation ti
 
 
 	
-	
+	
+	
+	
 
 
 	
@@ -41,4 +43,4 @@ Fetch error: http://80spurple.com/ => https://80spurple.com/: (28, 'Operation ti
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/888173.net-falsemixed.xml b/src/chrome/content/rules/888173.net-falsemixed.xml
index 6dce3aa9573b..fffe526cc5bd 100644
--- a/src/chrome/content/rules/888173.net-falsemixed.xml
+++ b/src/chrome/content/rules/888173.net-falsemixed.xml
@@ -4,13 +4,10 @@
 -->
 
 
-	
+	
 
 
-	
 
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/888VoIP.com.xml b/src/chrome/content/rules/888VoIP.com.xml
index 95c888019d7b..b0824b616e25 100644
--- a/src/chrome/content/rules/888VoIP.com.xml
+++ b/src/chrome/content/rules/888VoIP.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://888voip.com/ => https://888voip.com/: Too many redirects whi
 Fetch error: http://www.888voip.com/ => https://www.888voip.com/: Too many redirects while fetching 'https://www.888voip.com/'
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/8R.com.xml b/src/chrome/content/rules/8R.com.xml
deleted file mode 100644
index 7b9f46785808..000000000000
--- a/src/chrome/content/rules/8R.com.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/8chan.co.xml b/src/chrome/content/rules/8chan.co.xml
deleted file mode 100644
index 1f702f7fc3e7..000000000000
--- a/src/chrome/content/rules/8chan.co.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-  
-  
-  
-
-  
-  
-  
-
diff --git a/src/chrome/content/rules/8tracks.xml b/src/chrome/content/rules/8tracks.xml
index f3ece9cbf230..308b6769ec64 100644
--- a/src/chrome/content/rules/8tracks.xml
+++ b/src/chrome/content/rules/8tracks.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.8tracks.com/ => https://www.8tracks.com/: (7, 'Failed to
 			- imgix.8tracks.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/911.gov.xml b/src/chrome/content/rules/911.gov.xml
deleted file mode 100644
index efafecf6c827..000000000000
--- a/src/chrome/content/rules/911.gov.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/95516.com.xml b/src/chrome/content/rules/95516.com.xml
index 3c967fbb85ec..0fa0e5c1d607 100644
--- a/src/chrome/content/rules/95516.com.xml
+++ b/src/chrome/content/rules/95516.com.xml
@@ -26,7 +26,7 @@ Fetch error: http://nmg.95516.com/ => https://nmg.95516.com/: (60, 'SSL certific
 	502
 		- 62.95516.com
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/9anime.to.xml b/src/chrome/content/rules/9anime.to.xml
new file mode 100644
index 000000000000..a364c0bf83f6
--- /dev/null
+++ b/src/chrome/content/rules/9anime.to.xml
@@ -0,0 +1,19 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/9gag.com.xml b/src/chrome/content/rules/9gag.com.xml
index 386d33da0a88..44b89bcf123f 100644
--- a/src/chrome/content/rules/9gag.com.xml
+++ b/src/chrome/content/rules/9gag.com.xml
@@ -1,50 +1,4 @@
-
 
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-		
-	
-
-	
-	
-
-
 	
 	
 		
diff --git a/src/chrome/content/rules/9p.io.xml b/src/chrome/content/rules/9p.io.xml
new file mode 100644
index 000000000000..e6ccff92c248
--- /dev/null
+++ b/src/chrome/content/rules/9p.io.xml
@@ -0,0 +1,5 @@
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/9tv.co.il.xml b/src/chrome/content/rules/9tv.co.il.xml
index f334837fd545..001299cad4cd 100644
--- a/src/chrome/content/rules/9tv.co.il.xml
+++ b/src/chrome/content/rules/9tv.co.il.xml
@@ -19,7 +19,7 @@ vek.9tv.co.il mixed content
 ¹ mismatch
 ³ timed out
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/A14_Electronics.com.xml b/src/chrome/content/rules/A14_Electronics.com.xml
index d239b200e61b..d4328c44642b 100644
--- a/src/chrome/content/rules/A14_Electronics.com.xml
+++ b/src/chrome/content/rules/A14_Electronics.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://a14electronics.com/ => https://a14electronics.com/: (51, "SSL: no alternative certificate subject name matches target host name 'a14electronics.com'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/A1A_Fast_Cash.xml b/src/chrome/content/rules/A1A_Fast_Cash.xml
deleted file mode 100644
index 98ebd020e18f..000000000000
--- a/src/chrome/content/rules/A1A_Fast_Cash.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/A4apphack-mismatches.xml b/src/chrome/content/rules/A4apphack-mismatches.xml
index d92baf46dd23..08202c62838a 100644
--- a/src/chrome/content/rules/A4apphack-mismatches.xml
+++ b/src/chrome/content/rules/A4apphack-mismatches.xml
@@ -2,7 +2,8 @@
 
 	
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/A4uexpo.com.xml b/src/chrome/content/rules/A4uexpo.com.xml
index 2b47c2710bfa..6c81d0a6a1dd 100644
--- a/src/chrome/content/rules/A4uexpo.com.xml
+++ b/src/chrome/content/rules/A4uexpo.com.xml
@@ -30,7 +30,7 @@
 
 
 	
-	
+	
 
 
 	
@@ -39,4 +39,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/A8.net.xml b/src/chrome/content/rules/A8.net.xml
index 82f31db724dc..578190266b39 100644
--- a/src/chrome/content/rules/A8.net.xml
+++ b/src/chrome/content/rules/A8.net.xml
@@ -17,7 +17,6 @@
 	
 
-		
 
 	
diff --git a/src/chrome/content/rules/AA.net.uk.xml b/src/chrome/content/rules/AA.net.uk.xml
index e5f41de6e9b6..8cea07fb1174 100644
--- a/src/chrome/content/rules/AA.net.uk.xml
+++ b/src/chrome/content/rules/AA.net.uk.xml
@@ -29,13 +29,15 @@
 -->
 
 
-	
+	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AA.xml b/src/chrome/content/rules/AA.xml
deleted file mode 100644
index 9bbb1405868f..000000000000
--- a/src/chrome/content/rules/AA.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-	
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/AAAS.org.xml b/src/chrome/content/rules/AAAS.org.xml
index 51bc7f18003d..3954f329da01 100644
--- a/src/chrome/content/rules/AAAS.org.xml
+++ b/src/chrome/content/rules/AAAS.org.xml
@@ -18,7 +18,7 @@
 		- promo (different content)
 		- secureapps (cert chain)
 		- zserver (tls error)
-	
+
 	There are a further 50+ subdomains that do not support HTTPS.
 
 -->
diff --git a/src/chrome/content/rules/AABEST.com.xml b/src/chrome/content/rules/AABEST.com.xml
new file mode 100644
index 000000000000..9d4ce04c3565
--- /dev/null
+++ b/src/chrome/content/rules/AABEST.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/AACQA.gov.au.xml b/src/chrome/content/rules/AACQA.gov.au.xml
index 74724e317a7b..36b23acc4ff0 100644
--- a/src/chrome/content/rules/AACQA.gov.au.xml
+++ b/src/chrome/content/rules/AACQA.gov.au.xml
@@ -23,6 +23,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/AARP.org.xml b/src/chrome/content/rules/AARP.org.xml
index 315415537e10..9064a50f6b58 100644
--- a/src/chrome/content/rules/AARP.org.xml
+++ b/src/chrome/content/rules/AARP.org.xml
@@ -64,7 +64,7 @@ Fetch error: http://action.aarp.org/ => https://action.aarp.org/: Too many redir
 	² Not secured by us <= expired
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/AAS.org.xml b/src/chrome/content/rules/AAS.org.xml
index 9dd34e0c832b..f8c3550abe99 100644
--- a/src/chrome/content/rules/AAS.org.xml
+++ b/src/chrome/content/rules/AAS.org.xml
@@ -43,7 +43,7 @@ Fetch error: http://apj.aas.org/ => https://iopscience.iop.org/0004-637X: (28, '
 		- members.aas.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/AASTOCKS.com.xml b/src/chrome/content/rules/AASTOCKS.com.xml
new file mode 100644
index 000000000000..3772da297842
--- /dev/null
+++ b/src/chrome/content/rules/AASTOCKS.com.xml
@@ -0,0 +1,152 @@
+
+
+	
+	
+
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+	
+	
+
+	
+	
+	
+	
+
+	
+	
+	
+	
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ABC-Online.xml b/src/chrome/content/rules/ABC-Online.xml
index 7937c585203a..16ca8477add4 100644
--- a/src/chrome/content/rules/ABC-Online.xml
+++ b/src/chrome/content/rules/ABC-Online.xml
@@ -3,48 +3,21 @@
 
 		- ABC-Music-Publishing.xml
 
-
-	CDN buckets:
-
-		- d1ros97qkrwjf5.cloudfront.net
-		- d3mfbaa198drag.cloudfront.net
-		- cp44823.edgefcs.net
-
-
-	Nonfunctional:
-
-		- about.abc.net.au ¹
-		- mpegmedia.abc.net.au ²
-		- origin.abc.net.au ³		(redirects to www via http)
-		- (www.)abc.net.au ²
-		- www2b.abc.net.au ³
-		- (www.)abccommercial.com.au ³
-		- (www.)abccontentsales.com.au ³
-		- (www.)abcdigmusic.net.au
-		- (www.)radioaustralianews.net.au ³
-		- (www.)triplejunearthed.com ³
-
-	¹ 503, akamai
-	² 504, akamai
-	³ Dropped
-
+	Non-functional hosts in *.abc.net.au
+		Timeout:
+		- shop.abc.net.au
 -->
 
 
-	
-	
-	
-
+	
+	
+	
+	
 
-	
-	
-
-
-	
+	
+	
+	
 
-	
-	
+	
 
 
diff --git a/src/chrome/content/rules/ABCNews.com.xml b/src/chrome/content/rules/ABCNews.com.xml
new file mode 100644
index 000000000000..2175b87535a2
--- /dev/null
+++ b/src/chrome/content/rules/ABCNews.com.xml
@@ -0,0 +1,28 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ABCNews.go.com.xml b/src/chrome/content/rules/ABCNews.go.com.xml
new file mode 100644
index 000000000000..e59f4b268340
--- /dev/null
+++ b/src/chrome/content/rules/ABCNews.go.com.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ABC_News-falsemixed.xml b/src/chrome/content/rules/ABC_News-falsemixed.xml
deleted file mode 100644
index a0556f6807b6..000000000000
--- a/src/chrome/content/rules/ABC_News-falsemixed.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/ABC_News.xml b/src/chrome/content/rules/ABC_News.xml
deleted file mode 100644
index 54e916a19a73..000000000000
--- a/src/chrome/content/rules/ABC_News.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-	
-
-		
-		
-
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-			
-
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/ABI_Research.xml b/src/chrome/content/rules/ABI_Research.xml
index 1e9ca7c95e38..f226f9389f78 100644
--- a/src/chrome/content/rules/ABI_Research.xml
+++ b/src/chrome/content/rules/ABI_Research.xml
@@ -1,7 +1,6 @@
 
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/ACCAN.xml b/src/chrome/content/rules/ACCAN.xml
index e87354c60c01..2e4e08a95249 100644
--- a/src/chrome/content/rules/ACCAN.xml
+++ b/src/chrome/content/rules/ACCAN.xml
@@ -3,4 +3,4 @@
 	
 
   
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ACLS.org.xml b/src/chrome/content/rules/ACLS.org.xml
index abe586ff4d7c..e602a9e41b4f 100644
--- a/src/chrome/content/rules/ACLS.org.xml
+++ b/src/chrome/content/rules/ACLS.org.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.acls.org/ => https://www.acls.org/: (60, 'SSL certificat
 		- ^	(dropped)
 
 -->
-
+
 
 	
 	
@@ -29,4 +29,4 @@ Fetch error: http://www.acls.org/ => https://www.acls.org/: (60, 'SSL certificat
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ACLU-of-Southern-California.xml b/src/chrome/content/rules/ACLU-of-Southern-California.xml
deleted file mode 100644
index ba90fc9d6428..000000000000
--- a/src/chrome/content/rules/ACLU-of-Southern-California.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/ACLU-of-Texas.xml b/src/chrome/content/rules/ACLU-of-Texas.xml
index e28a61ac6fe2..b28775ab5f0e 100644
--- a/src/chrome/content/rules/ACLU-of-Texas.xml
+++ b/src/chrome/content/rules/ACLU-of-Texas.xml
@@ -1,6 +1,6 @@
 
 	
-		
+	
 	
 
 	
diff --git a/src/chrome/content/rules/ACLU.xml b/src/chrome/content/rules/ACLU.xml
index 7e1fe34a75d2..e2421d90b3e1 100644
--- a/src/chrome/content/rules/ACLU.xml
+++ b/src/chrome/content/rules/ACLU.xml
@@ -1,4 +1,15 @@
+
 
+	
+	
 	
 	
 	
-	
+	
 	
 	
 	
 	
-	
-	
-	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/ACPICA.org.xml b/src/chrome/content/rules/ACPICA.org.xml
deleted file mode 100644
index 66006b4e169c..000000000000
--- a/src/chrome/content/rules/ACPICA.org.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-
-	
-	
-
-
-	
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/ACTION_Kooperative.xml b/src/chrome/content/rules/ACTION_Kooperative.xml
index 70d821917f14..e51c28a9f031 100644
--- a/src/chrome/content/rules/ACTION_Kooperative.xml
+++ b/src/chrome/content/rules/ACTION_Kooperative.xml
@@ -6,7 +6,7 @@ Fetch error: http://mail.action.at/ => https://mail.action.at/: (60, 'SSL certif
 Disabled by https-everywhere-checker because:
 Fetch error: http://mail.action.at/ => https://mail.action.at/: (51, "SSL: no alternative certificate subject name matches target host name 'mail.action.at'")
 -->
-
+
 
 	
 
@@ -16,4 +16,4 @@ Fetch error: http://mail.action.at/ => https://mail.action.at/: (51, "SSL: no al
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AD4mat.xml b/src/chrome/content/rules/AD4mat.xml
index bdbb22d4d9da..3d7b38983c89 100644
--- a/src/chrome/content/rules/AD4mat.xml
+++ b/src/chrome/content/rules/AD4mat.xml
@@ -19,7 +19,7 @@
 
 	Cert mismatch:
 		- gd.ad4mat.de
-		
+
 	TimeOut:
 		- ch.ad4mat.info
 		- it.ad4mat.info
@@ -35,5 +35,5 @@
 
 	
- 
+
 
diff --git a/src/chrome/content/rules/ADCocktail.xml b/src/chrome/content/rules/ADCocktail.xml
index 5c395f07d98d..3a87a35d1df9 100644
--- a/src/chrome/content/rules/ADCocktail.xml
+++ b/src/chrome/content/rules/ADCocktail.xml
@@ -17,4 +17,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ADD-Assoc-Southern-Region.xml b/src/chrome/content/rules/ADD-Assoc-Southern-Region.xml
index 4d3531a765a7..67386ac06618 100644
--- a/src/chrome/content/rules/ADD-Assoc-Southern-Region.xml
+++ b/src/chrome/content/rules/ADD-Assoc-Southern-Region.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://adda-sr.org/ => https://www.adda-sr.org/: (7, 'Failed to connect to www.adda-sr.org port 443: Connection refused')
 Fetch error: http://www.adda-sr.org/ => https://www.adda-sr.org/: (7, 'Failed to connect to www.adda-sr.org port 443: Connection refused')
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/ADP_Retirement_Services.xml b/src/chrome/content/rules/ADP_Retirement_Services.xml
index 2dce6fb2c363..f4057bb2a8ae 100644
--- a/src/chrome/content/rules/ADP_Retirement_Services.xml
+++ b/src/chrome/content/rules/ADP_Retirement_Services.xml
@@ -10,7 +10,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://mykplan.com/ => https://mykplan.com/: (51, "SSL: no alternative certificate subject name matches target host name 'mykplan.com'")
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/ADP_VirtualEdge.xml b/src/chrome/content/rules/ADP_VirtualEdge.xml
deleted file mode 100644
index 70e64cca26c9..000000000000
--- a/src/chrome/content/rules/ADP_VirtualEdge.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/ADUM.fr.xml b/src/chrome/content/rules/ADUM.fr.xml
index 40e70e7cf5c2..6ed9d5088156 100644
--- a/src/chrome/content/rules/ADUM.fr.xml
+++ b/src/chrome/content/rules/ADUM.fr.xml
@@ -1,15 +1,12 @@
 
-
-
+
 	
-		
 	
-		
 
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/ADindex.xml b/src/chrome/content/rules/ADindex.xml
index 29812a0fc204..c95baa934c84 100644
--- a/src/chrome/content/rules/ADindex.xml
+++ b/src/chrome/content/rules/ADindex.xml
@@ -4,9 +4,9 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AEGEE-Enschede.nl.xml b/src/chrome/content/rules/AEGEE-Enschede.nl.xml
index b4983e5dfd3b..825ca0631e98 100644
--- a/src/chrome/content/rules/AEGEE-Enschede.nl.xml
+++ b/src/chrome/content/rules/AEGEE-Enschede.nl.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AEMI.xml b/src/chrome/content/rules/AEMI.xml
deleted file mode 100644
index 6d2a928f107a..000000000000
--- a/src/chrome/content/rules/AEMI.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-	
-
-	
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/AFS.xml b/src/chrome/content/rules/AFS.xml
index 44cbe3f863d3..d232e543e238 100644
--- a/src/chrome/content/rules/AFS.xml
+++ b/src/chrome/content/rules/AFS.xml
@@ -37,7 +37,7 @@
 
 -->
 
-	
+
 	
 	
 	
@@ -82,7 +82,7 @@
 	
 	
 	
-	
+
 	
 	
 	
@@ -198,7 +198,7 @@
 	
 	
 	
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/AI-Radio.org.xml b/src/chrome/content/rules/AI-Radio.org.xml
index 8504d98a9e7a..4d89e37f28e0 100644
--- a/src/chrome/content/rules/AI-Radio.org.xml
+++ b/src/chrome/content/rules/AI-Radio.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://ai-radio.org/ => https://ai-radio.org/: (60, 'SSL certificat
 Fetch error: http://www.ai-radio.org/ => https://www.ai-radio.org/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/AIA-Surety.xml b/src/chrome/content/rules/AIA-Surety.xml
index b9d4af0056bf..54da7900484e 100644
--- a/src/chrome/content/rules/AIA-Surety.xml
+++ b/src/chrome/content/rules/AIA-Surety.xml
@@ -1,18 +1,15 @@
 
 
 	
-	
+	
+	
 	
 	
 
 
-	
+	
 
 
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/AIM.com.xml b/src/chrome/content/rules/AIM.com.xml
deleted file mode 100644
index 5ba924f8d68d..000000000000
--- a/src/chrome/content/rules/AIM.com.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/AIP.org.xml b/src/chrome/content/rules/AIP.org.xml
index fa0dbc82a2eb..ae751b49dc66 100644
--- a/src/chrome/content/rules/AIP.org.xml
+++ b/src/chrome/content/rules/AIP.org.xml
@@ -8,7 +8,7 @@ Fetch error: http://scitation.aip.org/images/aip/aip_logo_transparent.gif => htt
 	^aip.org: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/AJC.com.xml b/src/chrome/content/rules/AJC.com.xml
index 7329529c63e8..e45f20f82011 100644
--- a/src/chrome/content/rules/AJC.com.xml
+++ b/src/chrome/content/rules/AJC.com.xml
@@ -12,24 +12,5 @@
 	
 	
 
-	
-	
 	
 
diff --git a/src/chrome/content/rules/AK-Vorrat.de.xml b/src/chrome/content/rules/AK-Vorrat.de.xml
index 87e6a3d93407..325f0ef16767 100644
--- a/src/chrome/content/rules/AK-Vorrat.de.xml
+++ b/src/chrome/content/rules/AK-Vorrat.de.xml
@@ -15,7 +15,7 @@
 		tuebingen.vorratsdatenspeicherung.de
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/AKG.com.xml b/src/chrome/content/rules/AKG.com.xml
new file mode 100644
index 000000000000..587ccf16dfaa
--- /dev/null
+++ b/src/chrome/content/rules/AKG.com.xml
@@ -0,0 +1,44 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ALA.org.xml b/src/chrome/content/rules/ALA.org.xml
index cb74822769a1..7b84840c9a11 100644
--- a/src/chrome/content/rules/ALA.org.xml
+++ b/src/chrome/content/rules/ALA.org.xml
@@ -46,7 +46,7 @@ Fetch error: http://joblist.ala.org/ => https://joblist.ala.org/: (51, "SSL: no
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/ALDI.xml b/src/chrome/content/rules/ALDI.xml
index 0636cc71db2c..a3aec17cc9a1 100644
--- a/src/chrome/content/rules/ALDI.xml
+++ b/src/chrome/content/rules/ALDI.xml
@@ -29,7 +29,7 @@ Refused:
 	- transparenz.aldi-nord.de
 	- *aldi.com
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/ALDImobile.com.au.xml b/src/chrome/content/rules/ALDImobile.com.au.xml
index eef8402717fc..c604db0486e0 100644
--- a/src/chrome/content/rules/ALDImobile.com.au.xml
+++ b/src/chrome/content/rules/ALDImobile.com.au.xml
@@ -4,6 +4,6 @@
 
   	
 
-	
 
diff --git a/src/chrome/content/rules/ALPriorityUSA.com.xml b/src/chrome/content/rules/ALPriorityUSA.com.xml
new file mode 100644
index 000000000000..ed7d1ab4dd60
--- /dev/null
+++ b/src/chrome/content/rules/ALPriorityUSA.com.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ALTS.Trade.xml b/src/chrome/content/rules/ALTS.Trade.xml
index 6869bbeae7e4..08a6a2821c74 100644
--- a/src/chrome/content/rules/ALTS.Trade.xml
+++ b/src/chrome/content/rules/ALTS.Trade.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.alts.trade/ => https://alts.trade/: (7, 'Failed to conne
 		- .alts.trade
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/ALT_Linux.org-problematic.xml b/src/chrome/content/rules/ALT_Linux.org-problematic.xml
index 3a55b9ee54d6..3d1d070c9f4d 100644
--- a/src/chrome/content/rules/ALT_Linux.org-problematic.xml
+++ b/src/chrome/content/rules/ALT_Linux.org-problematic.xml
@@ -5,7 +5,7 @@
 	Server sends includeSubdomains in HSTS header.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/AMC.xml b/src/chrome/content/rules/AMC.xml
index 059e60ce487c..afe918873fd2 100644
--- a/src/chrome/content/rules/AMC.xml
+++ b/src/chrome/content/rules/AMC.xml
@@ -20,19 +20,19 @@ Fetch error: http://media.amctv.com/ => https://media.amctv.com/: (7, 'Failed to
 	Mixed content:
 
 		- css, on:
-		
+
 			- www from $self ˢ
 			- www from fast.fonts.net ˢ
 
 		- Images, on:
-		
+
 			- www from $self ˢ
 			- www from images.amcnetworks.com ˢ
 
 	ˢ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/AMPR.org.xml b/src/chrome/content/rules/AMPR.org.xml
new file mode 100644
index 000000000000..b9a54fd51861
--- /dev/null
+++ b/src/chrome/content/rules/AMPR.org.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/AMS.org.xml b/src/chrome/content/rules/AMS.org.xml
index 8fefacd38a19..ced1f5703c86 100644
--- a/src/chrome/content/rules/AMS.org.xml
+++ b/src/chrome/content/rules/AMS.org.xml
@@ -59,9 +59,9 @@
 		
 
 	
-	
 
-	
 
diff --git a/src/chrome/content/rules/ANB.xml b/src/chrome/content/rules/ANB.xml
index 5cc26a93f6bc..dd067ee6eabe 100644
--- a/src/chrome/content/rules/ANB.xml
+++ b/src/chrome/content/rules/ANB.xml
@@ -4,10 +4,12 @@ Fetch error: http://anb.com.sa/ => https://www.anb.com.sa/: (60, 'SSL certificat
 -->
 
   
-  
+  
+  
+  
+  
 
   
-  
+  
 
diff --git a/src/chrome/content/rules/ANU.edu.au.xml b/src/chrome/content/rules/ANU.edu.au.xml
new file mode 100644
index 000000000000..09e701064628
--- /dev/null
+++ b/src/chrome/content/rules/ANU.edu.au.xml
@@ -0,0 +1,1159 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ANZ.co.nz.xml b/src/chrome/content/rules/ANZ.co.nz.xml
index 6c424d4c7621..0a3e376e9563 100644
--- a/src/chrome/content/rules/ANZ.co.nz.xml
+++ b/src/chrome/content/rules/ANZ.co.nz.xml
@@ -1,18 +1,27 @@
 
 
 
@@ -74,19 +91,10 @@
 	
 	
 	
-	
-	
-	
-	
 	
 	
 	
-	
-	
-	
-	
 	
-	
 	
 	
 	
@@ -98,13 +106,11 @@
 	
 	
 	
-	
 	
 	
 	
 	
 	
-	
 	
 	
 	
@@ -113,28 +119,22 @@
 	
 	
 	
-	
 	
 	
 	
-	
-	
 	
 	
 	
 	
 	
 	
-	
-	
 	
 	
 	
-	
 	
 	
 
-  	
+	
 
 	
diff --git a/src/chrome/content/rules/ANZ.com.au.xml b/src/chrome/content/rules/ANZ.com.au.xml
new file mode 100644
index 000000000000..8a9742b66fa1
--- /dev/null
+++ b/src/chrome/content/rules/ANZ.com.au.xml
@@ -0,0 +1,47 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
\ No newline at end of file
diff --git a/src/chrome/content/rules/ANZ.com.xml b/src/chrome/content/rules/ANZ.com.xml
index d87acd091b24..ad4891717d8f 100644
--- a/src/chrome/content/rules/ANZ.com.xml
+++ b/src/chrome/content/rules/ANZ.com.xml
@@ -1,6 +1,7 @@
 
 
 
 	
-	
-
-
-	
-
-	
+	
+	
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/AOK.de.xml b/src/chrome/content/rules/AOK.de.xml
index 3caa416f009a..dea5416056ec 100644
--- a/src/chrome/content/rules/AOK.de.xml
+++ b/src/chrome/content/rules/AOK.de.xml
@@ -27,7 +27,7 @@ Fetch error: http://www.familie.san.aok.de/ => https://familie.san.aok.de/: (7,
 Fetch error: http://familie.san.aok.de/ => https://familie.san.aok.de/: (7, 'Failed to connect to familie.san.aok.de port 443: Connection refused')
 
 -->
-
+
 
 
 
diff --git a/src/chrome/content/rules/AOL-Advertising.xml b/src/chrome/content/rules/AOL-Advertising.xml
index e76f45a3e3f4..a0c12c0322ac 100644
--- a/src/chrome/content/rules/AOL-Advertising.xml
+++ b/src/chrome/content/rules/AOL-Advertising.xml
@@ -14,7 +14,7 @@ Fetch error: http://px.at.atwola.com/ => https://px.at.atwola.com/: (6, 'Could n
 		- an.tacoda.net.edgesuite.net
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/AOL-mismatches.xml b/src/chrome/content/rules/AOL-mismatches.xml
index 41a0ffe83d65..02684029af22 100644
--- a/src/chrome/content/rules/AOL-mismatches.xml
+++ b/src/chrome/content/rules/AOL-mismatches.xml
@@ -6,41 +6,15 @@
 
 -->
 
-
-	
-	
-	
-	
-	
 	
 	
 
-
-	
-
-
-	
-	
-
-	
-
 	
 
-	
-
+	
 
diff --git a/src/chrome/content/rules/AOL.co.uk.xml b/src/chrome/content/rules/AOL.co.uk.xml
index 6d5ffe8e6cd4..72b211311c22 100644
--- a/src/chrome/content/rules/AOL.co.uk.xml
+++ b/src/chrome/content/rules/AOL.co.uk.xml
@@ -62,7 +62,7 @@ Fetch error: http://rs.aol.co.uk/ => https://rs.aol.co.uk/: (60, 'SSL certificat
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/AOL.xml b/src/chrome/content/rules/AOL.xml
index 0620b1e54870..739e8f0a35bf 100644
--- a/src/chrome/content/rules/AOL.xml
+++ b/src/chrome/content/rules/AOL.xml
@@ -1,4 +1,23 @@
+
 
 	
 	
-	
+	
 	
 	
 	
-	
+	
 	
 	
-	
+	
 	
 	
-	
+	
 	
-	
+	
 	
-	
+	
 
 	
-	
+	
 	
-	
+	
 	
 	
 	
@@ -187,22 +203,20 @@
 	
 	
 	
-	
-	
-	
+	
+	
+	
 	
 	
-	
+	
 	
 	
 	
-	
-
-		
+	
 
 	
-	
+	
 	
 
 		
-
-
-	
-	
-	
-	
-
-		
-		
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/AOL_On_Network.com.xml b/src/chrome/content/rules/AOL_On_Network.com.xml
index 175785bdd705..d35b503ef5f8 100644
--- a/src/chrome/content/rules/AOL_On_Network.com.xml
+++ b/src/chrome/content/rules/AOL_On_Network.com.xml
@@ -32,7 +32,7 @@ Fetch error: http://support.aolonnetwork.com/ => https://support.aolonnetwork.co
 		- console.aolonnetwork.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/AOL_Platforms.com.xml b/src/chrome/content/rules/AOL_Platforms.com.xml
deleted file mode 100644
index 3de627446daa..000000000000
--- a/src/chrome/content/rules/AOL_Platforms.com.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/AOMedia.org.xml b/src/chrome/content/rules/AOMedia.org.xml
new file mode 100644
index 000000000000..e9dec1c79c7f
--- /dev/null
+++ b/src/chrome/content/rules/AOMedia.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/AP.org.xml b/src/chrome/content/rules/AP.org.xml
new file mode 100644
index 000000000000..124ee57b9b02
--- /dev/null
+++ b/src/chrome/content/rules/AP.org.xml
@@ -0,0 +1,51 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/API_Analytics.com.xml b/src/chrome/content/rules/API_Analytics.com.xml
deleted file mode 100644
index a4c390aaae06..000000000000
--- a/src/chrome/content/rules/API_Analytics.com.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/APM.com.xml b/src/chrome/content/rules/APM.com.xml
index 0016fa2aa5db..b91da56916a9 100644
--- a/src/chrome/content/rules/APM.com.xml
+++ b/src/chrome/content/rules/APM.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://myapm.apm.com/ => https://myapm.apm.com/: (60, 'SSL certific
 		- www
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/APNews.com.xml b/src/chrome/content/rules/APNews.com.xml
index 567fb55c1bda..909f9f0f78bc 100644
--- a/src/chrome/content/rules/APNews.com.xml
+++ b/src/chrome/content/rules/APNews.com.xml
@@ -14,7 +14,7 @@
 	
 	
 	
-	
+
 	
 
 	
diff --git a/src/chrome/content/rules/APO_Box.com.xml b/src/chrome/content/rules/APO_Box.com.xml
index f6e521dcbd78..01e66c0fa42c 100644
--- a/src/chrome/content/rules/APO_Box.com.xml
+++ b/src/chrome/content/rules/APO_Box.com.xml
@@ -1,7 +1,8 @@
 
 
 	
-	
+	
+	
 
 
 	
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/ARICR.org.xml b/src/chrome/content/rules/ARICR.org.xml
new file mode 100644
index 000000000000..693dadf7679a
--- /dev/null
+++ b/src/chrome/content/rules/ARICR.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ARIN.net.xml b/src/chrome/content/rules/ARIN.net.xml
index 0010a4f9f563..5934255c677c 100644
--- a/src/chrome/content/rules/ARIN.net.xml
+++ b/src/chrome/content/rules/ARIN.net.xml
@@ -29,7 +29,7 @@ Fetch error: http://updown-pilot.arin.net/ => https://updown-pilot.arin.net/: (6
 		- www
 
 -->
-
+
 
 	
 	
@@ -42,4 +42,4 @@ Fetch error: http://updown-pilot.arin.net/ => https://updown-pilot.arin.net/: (6
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ARIVA.DE.xml b/src/chrome/content/rules/ARIVA.DE.xml
new file mode 100644
index 000000000000..d1156e80a907
--- /dev/null
+++ b/src/chrome/content/rules/ARIVA.DE.xml
@@ -0,0 +1,65 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/ARM.com-problematic.xml b/src/chrome/content/rules/ARM.com-problematic.xml
deleted file mode 100644
index a606fae0edd2..000000000000
--- a/src/chrome/content/rules/ARM.com-problematic.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/ARM.com.xml b/src/chrome/content/rules/ARM.com.xml
new file mode 100644
index 000000000000..371168934f88
--- /dev/null
+++ b/src/chrome/content/rules/ARM.com.xml
@@ -0,0 +1,56 @@
+
+
+	
+	
+
+	
+
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+
+	
+
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ARM.xml b/src/chrome/content/rules/ARM.xml
deleted file mode 100644
index d3ffb96f1b3d..000000000000
--- a/src/chrome/content/rules/ARM.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/ARMservers.com.xml b/src/chrome/content/rules/ARMservers.com.xml
deleted file mode 100644
index 683c92911fd7..000000000000
--- a/src/chrome/content/rules/ARMservers.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/ARPNetworks.com.xml b/src/chrome/content/rules/ARPNetworks.com.xml
index 6ff42bc00eb2..ecf8995b7457 100644
--- a/src/chrome/content/rules/ARPNetworks.com.xml
+++ b/src/chrome/content/rules/ARPNetworks.com.xml
@@ -5,10 +5,12 @@
 
 
 	
-	
+	
+	
+	
 
 
-	
+	
 
 
 	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ASADA.xml b/src/chrome/content/rules/ASADA.xml
index d3450d1e856e..1c625d72e705 100644
--- a/src/chrome/content/rules/ASADA.xml
+++ b/src/chrome/content/rules/ASADA.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ASDA.xml b/src/chrome/content/rules/ASDA.xml
index 4d531d2ee6f6..ca73bd774aae 100644
--- a/src/chrome/content/rules/ASDA.xml
+++ b/src/chrome/content/rules/ASDA.xml
@@ -88,7 +88,7 @@ Fetch error: http://omniture.groceries.asda.com/ => https://groceries.asda.com.d
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/ASIC.xml b/src/chrome/content/rules/ASIC.xml
index e7bbe57158f2..fe299f2a8b59 100644
--- a/src/chrome/content/rules/ASIC.xml
+++ b/src/chrome/content/rules/ASIC.xml
@@ -1,10 +1,12 @@
 
 	
-	
+	
+	
+	
 
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ASP.NET.xml b/src/chrome/content/rules/ASP.NET.xml
deleted file mode 100644
index 4e3a0a6b135a..000000000000
--- a/src/chrome/content/rules/ASP.NET.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/ATG_Web_Commerce.xml b/src/chrome/content/rules/ATG_Web_Commerce.xml
deleted file mode 100644
index 33785eda8b9d..000000000000
--- a/src/chrome/content/rules/ATG_Web_Commerce.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/ATNAME.xml b/src/chrome/content/rules/ATNAME.xml
index 911b89d66ad6..d80fdf6158dc 100644
--- a/src/chrome/content/rules/ATNAME.xml
+++ b/src/chrome/content/rules/ATNAME.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ATV.hu.xml b/src/chrome/content/rules/ATV.hu.xml
index 24c69c72a0d9..8b3c127c4237 100644
--- a/src/chrome/content/rules/ATV.hu.xml
+++ b/src/chrome/content/rules/ATV.hu.xml
@@ -8,7 +8,7 @@ Fetch error: http://static.atv.hu/ => https://static.atv.hu/: (6, 'Could not res
 	 - www.atv.hu cert mismatch
 	 - atv.hu cert mismatch
 -->
-
+
 	
 
 	
diff --git a/src/chrome/content/rules/AT_Internet_Solutions.xml b/src/chrome/content/rules/AT_Internet_Solutions.xml
index 443a3af45731..60022d59104f 100644
--- a/src/chrome/content/rules/AT_Internet_Solutions.xml
+++ b/src/chrome/content/rules/AT_Internet_Solutions.xml
@@ -7,7 +7,7 @@
 		- ^
 		- helpcenter.atinternet-solutions.com
 		- ulsecure.atinternet-solutions.com
-	
+
 
 	Connection refused:
 		- appschina.atinternet-solutions.com
@@ -22,7 +22,7 @@
 		- nx-prodfix-005-internal.atinternet-solutions.com
 		- nx005.atinternet-solutions.com
 		- nx005-internal.atinternet-solutions.com
-		- nxpreprod005.atinternet-solutions.com 
+		- nxpreprod005.atinternet-solutions.com
 
 	Timeout:
 		- apipreprod-020.atinternet-solutions.com
@@ -108,4 +108,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ATandT.xml b/src/chrome/content/rules/ATandT.xml
index 21766f684284..bb476a5ed9fa 100644
--- a/src/chrome/content/rules/ATandT.xml
+++ b/src/chrome/content/rules/ATandT.xml
@@ -1,86 +1,63 @@
 
-
 
+
+	
 	
-	
-	
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+
+	
+	
+	
 
 	
 
 
-	
-
-	
-
-	
-	
-
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/ATbar.xml b/src/chrome/content/rules/ATbar.xml
index 6be6115abe70..51ca62f66252 100644
--- a/src/chrome/content/rules/ATbar.xml
+++ b/src/chrome/content/rules/ATbar.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ATech.io.xml b/src/chrome/content/rules/ATech.io.xml
index 46bf104d75d2..9f29f133e3f2 100644
--- a/src/chrome/content/rules/ATech.io.xml
+++ b/src/chrome/content/rules/ATech.io.xml
@@ -14,7 +14,7 @@ Fetch error: http://cacti.atech.io/ => https://cacti.atech.io/: (7, 'Failed to c
 		- cacti.atech.io
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/ATrpms.net.xml b/src/chrome/content/rules/ATrpms.net.xml
index 1c3c3dfdb60c..c6bd2b7c73b9 100644
--- a/src/chrome/content/rules/ATrpms.net.xml
+++ b/src/chrome/content/rules/ATrpms.net.xml
@@ -17,4 +17,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AVHT.org.xml b/src/chrome/content/rules/AVHT.org.xml
new file mode 100644
index 000000000000..ad292896c51d
--- /dev/null
+++ b/src/chrome/content/rules/AVHT.org.xml
@@ -0,0 +1,8 @@
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/AVON.cz.xml b/src/chrome/content/rules/AVON.cz.xml
index 7248005852d8..c749753d5a7f 100644
--- a/src/chrome/content/rules/AVON.cz.xml
+++ b/src/chrome/content/rules/AVON.cz.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://avon.cz/ => https://avon.cz/: (51, "SSL: no alternative certificate subject name matches target host name 'avon.cz'")
 
 -->
-
+
     
     
 
diff --git a/src/chrome/content/rules/AWcloud.net.xml b/src/chrome/content/rules/AWcloud.net.xml
deleted file mode 100644
index 630ce2aa0bcc..000000000000
--- a/src/chrome/content/rules/AWcloud.net.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/AWeber-Communications.xml b/src/chrome/content/rules/AWeber-Communications.xml
deleted file mode 100644
index e117fa020ceb..000000000000
--- a/src/chrome/content/rules/AWeber-Communications.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/AWeber-static.com.xml b/src/chrome/content/rules/AWeber-static.com.xml
new file mode 100644
index 000000000000..43eb18005f54
--- /dev/null
+++ b/src/chrome/content/rules/AWeber-static.com.xml
@@ -0,0 +1,24 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/AWeber.com.xml b/src/chrome/content/rules/AWeber.com.xml
new file mode 100644
index 000000000000..a187687b922b
--- /dev/null
+++ b/src/chrome/content/rules/AWeber.com.xml
@@ -0,0 +1,31 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/AWeber.xml b/src/chrome/content/rules/AWeber.xml
deleted file mode 100644
index 8478203e9735..000000000000
--- a/src/chrome/content/rules/AWeber.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-
-
-
-	
-	
-		
-		
-	
-
-
-	
-	
-
-
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/A_1000_Words.com.xml b/src/chrome/content/rules/A_1000_Words.com.xml
index c64bf0bd04a0..0490eb9e8771 100644
--- a/src/chrome/content/rules/A_1000_Words.com.xml
+++ b/src/chrome/content/rules/A_1000_Words.com.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/A_Plus_Flint_River_Ranch.xml b/src/chrome/content/rules/A_Plus_Flint_River_Ranch.xml
index fddaa17a1db5..db50637f447e 100644
--- a/src/chrome/content/rules/A_Plus_Flint_River_Ranch.xml
+++ b/src/chrome/content/rules/A_Plus_Flint_River_Ranch.xml
@@ -8,7 +8,7 @@ Fetch error: http://aplus-flint-river-ranch.com/ => https://aplus-flint-river-ra
 		- cats		(mismatched, CN: www.aplus-flint-river-ranch.com)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Aalto.fi.xml b/src/chrome/content/rules/Aalto.fi.xml
index 5d592af57897..3079280ca18c 100644
--- a/src/chrome/content/rules/Aalto.fi.xml
+++ b/src/chrome/content/rules/Aalto.fi.xml
@@ -58,7 +58,7 @@ Fetch error: http://artcoordination.aalto.fi/fi/midcom-serveattachmentguid-1e4ef
 		- wwwcms.aalto.fi
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Aan.sh.xml b/src/chrome/content/rules/Aan.sh.xml
index 8abe6fa3f966..820fa6fd6e59 100644
--- a/src/chrome/content/rules/Aan.sh.xml
+++ b/src/chrome/content/rules/Aan.sh.xml
@@ -5,7 +5,7 @@ Fetch error: http://aan.sh/ => https://aan.sh/: (7, 'Failed to connect to aan.sh
 Fetch error: http://www.aan.sh/ => https://www.aan.sh/: (7, 'Failed to connect to www.aan.sh port 443: Connection refused')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Aaron_Brothers.xml b/src/chrome/content/rules/Aaron_Brothers.xml
deleted file mode 100644
index 56d1af295657..000000000000
--- a/src/chrome/content/rules/Aaron_Brothers.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Aart_de_Vos.xml b/src/chrome/content/rules/Aart_de_Vos.xml
index 91a13e18f553..dc531fc231df 100644
--- a/src/chrome/content/rules/Aart_de_Vos.xml
+++ b/src/chrome/content/rules/Aart_de_Vos.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Aastatus.net.xml b/src/chrome/content/rules/Aastatus.net.xml
index 3b94914fdebb..77f13140b139 100644
--- a/src/chrome/content/rules/Aastatus.net.xml
+++ b/src/chrome/content/rules/Aastatus.net.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.aastatus.net/ => https://www.aastatus.net/: (51, "SSL: no alternative certificate subject name matches target host name 'www.aastatus.net'")
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Aaulan.dk.xml b/src/chrome/content/rules/Aaulan.dk.xml
index 59cfc8c8a525..2de79afa8acf 100644
--- a/src/chrome/content/rules/Aaulan.dk.xml
+++ b/src/chrome/content/rules/Aaulan.dk.xml
@@ -5,7 +5,7 @@ Fetch error: http://aaulan.dk/ => https://aaulan.dk/: (60, 'SSL certificate prob
 Fetch error: http://www.aaulan.dk/ => https://www.aaulan.dk/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Abbo-Shop.xml b/src/chrome/content/rules/Abbo-Shop.xml
index 8fbe86392055..6d8d2a42c721 100644
--- a/src/chrome/content/rules/Abbo-Shop.xml
+++ b/src/chrome/content/rules/Abbo-Shop.xml
@@ -1,8 +1,8 @@
-
+
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Abbott-Laboratories.xml b/src/chrome/content/rules/Abbott-Laboratories.xml
deleted file mode 100644
index 23326278e364..000000000000
--- a/src/chrome/content/rules/Abbott-Laboratories.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Abdullah-ocalan.com.xml b/src/chrome/content/rules/Abdullah-ocalan.com.xml
index 9a7caa9afac2..5372de4ca429 100644
--- a/src/chrome/content/rules/Abdullah-ocalan.com.xml
+++ b/src/chrome/content/rules/Abdullah-ocalan.com.xml
@@ -1,6 +1,8 @@
-
+
 	
 	
 
+	
+
 	
 
diff --git a/src/chrome/content/rules/Abendblatt.de.xml b/src/chrome/content/rules/Abendblatt.de.xml
new file mode 100644
index 000000000000..fda906bc67ab
--- /dev/null
+++ b/src/chrome/content/rules/Abendblatt.de.xml
@@ -0,0 +1,118 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/AbenteuerLand.at.xml b/src/chrome/content/rules/AbenteuerLand.at.xml
deleted file mode 100644
index 23f02597436f..000000000000
--- a/src/chrome/content/rules/AbenteuerLand.at.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Abercrombie.xml b/src/chrome/content/rules/Abercrombie.xml
new file mode 100644
index 000000000000..da02ae8d2122
--- /dev/null
+++ b/src/chrome/content/rules/Abercrombie.xml
@@ -0,0 +1,71 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Aberystwyth-University.xml b/src/chrome/content/rules/Aberystwyth-University.xml
index 799f78f8e267..3b7655256b07 100644
--- a/src/chrome/content/rules/Aberystwyth-University.xml
+++ b/src/chrome/content/rules/Aberystwyth-University.xml
@@ -1,55 +1,45 @@
 
-
+
 	
 	
-	
 	
 	
+	
 	
 	
-	
 	
 	
 	
+	
 	
+	
 	
 	
 	
 	
 	
-	
+	
 	
 	
 
@@ -58,9 +48,6 @@
 	
 	
 
-	
-
-	
 
diff --git a/src/chrome/content/rules/Abftracker.com.xml b/src/chrome/content/rules/Abftracker.com.xml
deleted file mode 100644
index 8cc868f63e66..000000000000
--- a/src/chrome/content/rules/Abftracker.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Abila.com.xml b/src/chrome/content/rules/Abila.com.xml
deleted file mode 100644
index e3f5072c08ff..000000000000
--- a/src/chrome/content/rules/Abila.com.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/AbleGamers.xml b/src/chrome/content/rules/AbleGamers.xml
index 6b1c62f0b323..464b44862dde 100644
--- a/src/chrome/content/rules/AbleGamers.xml
+++ b/src/chrome/content/rules/AbleGamers.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/About-Ads.xml b/src/chrome/content/rules/About-Ads.xml
index 9c7c82664f41..902bbd009933 100644
--- a/src/chrome/content/rules/About-Ads.xml
+++ b/src/chrome/content/rules/About-Ads.xml
@@ -9,7 +9,7 @@ Fetch error: http://staging.aboutads.info/ => https://staging.aboutads.info/: To
 	Mixed JS:
 		- www.aboutads.info/choices/
 -->
-
+
 	
 	
 		
diff --git a/src/chrome/content/rules/AboutMe.xml b/src/chrome/content/rules/AboutMe.xml
index f288dd455f62..0b2988db1893 100644
--- a/src/chrome/content/rules/AboutMe.xml
+++ b/src/chrome/content/rules/AboutMe.xml
@@ -8,7 +8,7 @@
 	
 
 
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/AboutUs-problematic.xml b/src/chrome/content/rules/AboutUs-problematic.xml
deleted file mode 100644
index 2e9c94c6cfa4..000000000000
--- a/src/chrome/content/rules/AboutUs-problematic.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/AboutUs.xml b/src/chrome/content/rules/AboutUs.xml
index f0330357bb5e..372ed71a5363 100644
--- a/src/chrome/content/rules/AboutUs.xml
+++ b/src/chrome/content/rules/AboutUs.xml
@@ -1,34 +1,14 @@
 
-
-
-	
+
+	
+	
 
+	
+	
 
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/About_the_Data.com.xml b/src/chrome/content/rules/About_the_Data.com.xml
index deb4e41f4b17..62584df2c4f0 100644
--- a/src/chrome/content/rules/About_the_Data.com.xml
+++ b/src/chrome/content/rules/About_the_Data.com.xml
@@ -1,9 +1,4 @@
 
 
 
diff --git a/src/chrome/content/rules/Above.com.xml b/src/chrome/content/rules/Above.com.xml
index 025be1b24742..354a771ec68e 100644
--- a/src/chrome/content/rules/Above.com.xml
+++ b/src/chrome/content/rules/Above.com.xml
@@ -28,4 +28,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Absolute.xml b/src/chrome/content/rules/Absolute.xml
deleted file mode 100644
index 8d95a1fa08f8..000000000000
--- a/src/chrome/content/rules/Absolute.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Abuse.ch.xml b/src/chrome/content/rules/Abuse.ch.xml
deleted file mode 100644
index 8be728043325..000000000000
--- a/src/chrome/content/rules/Abuse.ch.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/AbuseIPDB.com.xml b/src/chrome/content/rules/AbuseIPDB.com.xml
index 9afb214beada..bfcd782a5949 100644
--- a/src/chrome/content/rules/AbuseIPDB.com.xml
+++ b/src/chrome/content/rules/AbuseIPDB.com.xml
@@ -2,8 +2,6 @@
 	
 	
 
-	
-	
 	
 	
 
diff --git a/src/chrome/content/rules/Abusix.com.xml b/src/chrome/content/rules/Abusix.com.xml
index a82478109e15..60cbc4866d73 100644
--- a/src/chrome/content/rules/Abusix.com.xml
+++ b/src/chrome/content/rules/Abusix.com.xml
@@ -12,7 +12,7 @@
 		- feed03 ᵐ
 		- feed04 ᵐ
 		- feed05 ᵐ
-		- globalreport 
+		- globalreport
 		- inject-feeds ᵐ
 		- leakdb ᵐ
 		- shot01 ᵐ
diff --git a/src/chrome/content/rules/Abysmal.nl.xml b/src/chrome/content/rules/Abysmal.nl.xml
index aef9c68b5a1f..62465e5e0e58 100644
--- a/src/chrome/content/rules/Abysmal.nl.xml
+++ b/src/chrome/content/rules/Abysmal.nl.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.abysmal.nl/ => https://www.abysmal.nl/: (35, 'error:14077410:SSL routines:SSL23_GET_SERVER_HELLO:sslv3 alert handshake failure')
 
 -->
-
+
 
 	
 	
@@ -15,4 +15,4 @@ Fetch error: http://www.abysmal.nl/ => https://www.abysmal.nl/: (35, 'error:1407
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Academia-Press.xml b/src/chrome/content/rules/Academia-Press.xml
deleted file mode 100644
index 013f20daf94e..000000000000
--- a/src/chrome/content/rules/Academia-Press.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-	
-	
-	
-	
-	
-
-
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Academia.edu.xml b/src/chrome/content/rules/Academia.edu.xml
index c8fb5f4d2b71..37c13aac554f 100644
--- a/src/chrome/content/rules/Academia.edu.xml
+++ b/src/chrome/content/rules/Academia.edu.xml
@@ -26,13 +26,13 @@
 
 	
 	
-	
+
 	
 	
 	
 	
 	
-	
+
 	
 	
 
diff --git a/src/chrome/content/rules/AcademiaPress.be.xml b/src/chrome/content/rules/AcademiaPress.be.xml
new file mode 100644
index 000000000000..9bd0c85ba466
--- /dev/null
+++ b/src/chrome/content/rules/AcademiaPress.be.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Accelerate.lgbt.xml b/src/chrome/content/rules/Accelerate.lgbt.xml
new file mode 100644
index 000000000000..7ac1f58cad3d
--- /dev/null
+++ b/src/chrome/content/rules/Accelerate.lgbt.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Accellion.xml b/src/chrome/content/rules/Accellion.xml
index 9477a3ba03bf..d0f38cd4a9be 100644
--- a/src/chrome/content/rules/Accellion.xml
+++ b/src/chrome/content/rules/Accellion.xml
@@ -1,12 +1,20 @@
-
-
+
 	
 	
-	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
-	
+	
 
 	
-
 
diff --git a/src/chrome/content/rules/Accenture.com.xml b/src/chrome/content/rules/Accenture.com.xml
deleted file mode 100644
index 70b18d14a9d7..000000000000
--- a/src/chrome/content/rules/Accenture.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-
-
-
-
diff --git a/src/chrome/content/rules/Acceptiva.com.xml b/src/chrome/content/rules/Acceptiva.com.xml
index c376a8752b9f..96ee52cefaec 100644
--- a/src/chrome/content/rules/Acceptiva.com.xml
+++ b/src/chrome/content/rules/Acceptiva.com.xml
@@ -11,4 +11,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AccessGuardian.com.xml b/src/chrome/content/rules/AccessGuardian.com.xml
index f799e41495c1..1a0e29ea383a 100644
--- a/src/chrome/content/rules/AccessGuardian.com.xml
+++ b/src/chrome/content/rules/AccessGuardian.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://accessguardian.com/ => https://accessguardian.com/: (60, 'SS
 Fetch error: http://www.accessguardian.com/ => https://www.accessguardian.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.accessguardian.com/ => https://www.accessguardian.com/:
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AccessPrivacy.ca.xml b/src/chrome/content/rules/AccessPrivacy.ca.xml
index 055f830e0d19..afeec9a9206a 100644
--- a/src/chrome/content/rules/AccessPrivacy.ca.xml
+++ b/src/chrome/content/rules/AccessPrivacy.ca.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.accessprivacy.ca/ => https://www.accessprivacy.ca/: (7,
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Access_Office_Products.xml b/src/chrome/content/rules/Access_Office_Products.xml
index c04bafe7e0fb..a93d1f8764af 100644
--- a/src/chrome/content/rules/Access_Office_Products.xml
+++ b/src/chrome/content/rules/Access_Office_Products.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.accessofficeproducts.com/ => https://www.accessofficepro
 Disabled by https-everywhere-checker because:
 Fetch error: http://accessofficeproducts.com/ => https://accessofficeproducts.com/: (51, "SSL: no alternative certificate subject name matches target host name 'accessofficeproducts.com'")
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://accessofficeproducts.com/ => https://accessofficeproducts.co
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Accessible-Information-Management.xml b/src/chrome/content/rules/Accessible-Information-Management.xml
index 567937c8dcea..eb8d7a7757d7 100644
--- a/src/chrome/content/rules/Accessible-Information-Management.xml
+++ b/src/chrome/content/rules/Accessible-Information-Management.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://gunadiframework.com/ => https://gunadiframework.com/: (51, "SSL: no alternative certificate subject name matches target host name 'gunadiframework.com'")
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Accessorize.xml b/src/chrome/content/rules/Accessorize.xml
index 7a31aa88c0d6..07fa31358141 100644
--- a/src/chrome/content/rules/Accessorize.xml
+++ b/src/chrome/content/rules/Accessorize.xml
@@ -6,4 +6,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Accesstrade.net.xml b/src/chrome/content/rules/Accesstrade.net.xml
index 9a10d7039e80..4d588eeee07f 100644
--- a/src/chrome/content/rules/Accesstrade.net.xml
+++ b/src/chrome/content/rules/Accesstrade.net.xml
@@ -20,4 +20,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Accordance_Bible.com.xml b/src/chrome/content/rules/Accordance_Bible.com.xml
index 9984d1345f1d..9ef0d4d36c32 100644
--- a/src/chrome/content/rules/Accordance_Bible.com.xml
+++ b/src/chrome/content/rules/Accordance_Bible.com.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
-
+
 
 	
diff --git a/src/chrome/content/rules/Accuvant.com.xml b/src/chrome/content/rules/Accuvant.com.xml
index 48287f5a8369..2dc0ffe85993 100644
--- a/src/chrome/content/rules/Accuvant.com.xml
+++ b/src/chrome/content/rules/Accuvant.com.xml
@@ -28,22 +28,21 @@ Fetch error: http://accuvant.com/ => https://accuvant.com/: (60, 'SSL certificat
 	* Secured by us
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Ace-analyzer.com.xml b/src/chrome/content/rules/Ace-analyzer.com.xml
deleted file mode 100644
index e3c652490c8e..000000000000
--- a/src/chrome/content/rules/Ace-analyzer.com.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Ace-book.net.xml b/src/chrome/content/rules/Ace-book.net.xml
new file mode 100644
index 000000000000..c9710e2f8e45
--- /dev/null
+++ b/src/chrome/content/rules/Ace-book.net.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Acenet.xml b/src/chrome/content/rules/Acenet.xml
index 2ec33485a484..f1a2fdac6e1e 100644
--- a/src/chrome/content/rules/Acenet.xml
+++ b/src/chrome/content/rules/Acenet.xml
@@ -9,10 +9,8 @@
 	
 	
 	
-
-	
 	
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Acer.com.xml b/src/chrome/content/rules/Acer.com.xml
new file mode 100644
index 000000000000..246b2a8a0da3
--- /dev/null
+++ b/src/chrome/content/rules/Acer.com.xml
@@ -0,0 +1,20 @@
+
+
+  
+    
+  
+    
+  
+    
+	
+
diff --git a/src/chrome/content/rules/Acessoseguro.net.xml b/src/chrome/content/rules/Acessoseguro.net.xml
index 3398fa15b23c..07c48354c49b 100644
--- a/src/chrome/content/rules/Acessoseguro.net.xml
+++ b/src/chrome/content/rules/Acessoseguro.net.xml
@@ -3,10 +3,10 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Acoustics.org.xml b/src/chrome/content/rules/Acoustics.org.xml
index f25e2ce81048..2f9af077e828 100644
--- a/src/chrome/content/rules/Acoustics.org.xml
+++ b/src/chrome/content/rules/Acoustics.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://acoustics.org/ => https://acoustics.org/: (60, 'SSL certific
 Fetch error: http://www.acoustics.org/ => https://www.acoustics.org/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
@@ -13,4 +13,4 @@ Fetch error: http://www.acoustics.org/ => https://www.acoustics.org/: (60, 'SSL
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Acquia.xml b/src/chrome/content/rules/Acquia.xml
index d07ee161ea4a..20de2c9376cd 100644
--- a/src/chrome/content/rules/Acquia.xml
+++ b/src/chrome/content/rules/Acquia.xml
@@ -9,7 +9,7 @@
 		- notifications ᵐ
 		- usability ᵐ
 		- u ᵐ
-	
+
 	ᵐ Mismatched
 
 -->
diff --git a/src/chrome/content/rules/Acrobat.com.xml b/src/chrome/content/rules/Acrobat.com.xml
index 04d0a56a7f7e..3bd4770b165a 100644
--- a/src/chrome/content/rules/Acrobat.com.xml
+++ b/src/chrome/content/rules/Acrobat.com.xml
@@ -19,7 +19,7 @@ Fetch error: http://admin.na5.acrobat.com/ => https://admin.na5.acrobat.com/: (2
 		- ak-www.stage.acrobat.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Acronis.com.xml b/src/chrome/content/rules/Acronis.com.xml
deleted file mode 100644
index 86671336dc90..000000000000
--- a/src/chrome/content/rules/Acronis.com.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-	
-	
-		
-		
-		
-		
-
-
-	
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/AcrylicDepot.com.xml b/src/chrome/content/rules/AcrylicDepot.com.xml
new file mode 100644
index 000000000000..aa0bc6f62785
--- /dev/null
+++ b/src/chrome/content/rules/AcrylicDepot.com.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Act-On-Software.xml b/src/chrome/content/rules/Act-On-Software.xml
index 339d7dd40421..bffcb2062cd8 100644
--- a/src/chrome/content/rules/Act-On-Software.xml
+++ b/src/chrome/content/rules/Act-On-Software.xml
@@ -21,11 +21,11 @@
 
 			- ACTON		(www)
 			- wpNNNN	(*)
-				- Set by 
+				- Set by
 				actonsoftware.com/acton/attachment/NNNN/
 				e.g. acton/attachment/1205/f-0005/0/-/-/-/-/file.pdf
 					-->
-	
+	
 
 
 	
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/ActBlue.com.xml b/src/chrome/content/rules/ActBlue.com.xml
new file mode 100644
index 000000000000..0b9446c2861e
--- /dev/null
+++ b/src/chrome/content/rules/ActBlue.com.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/ActBlue.xml b/src/chrome/content/rules/ActBlue.xml
deleted file mode 100644
index 19c71ac83e85..000000000000
--- a/src/chrome/content/rules/ActBlue.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Actel.com.xml b/src/chrome/content/rules/Actel.com.xml
deleted file mode 100644
index 882a059027be..000000000000
--- a/src/chrome/content/rules/Actel.com.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-  
-  
-
-	
-
-
diff --git a/src/chrome/content/rules/Actionable_Intelligence.xml b/src/chrome/content/rules/Actionable_Intelligence.xml
index 70b9538d7e01..d242c7bc6520 100644
--- a/src/chrome/content/rules/Actionable_Intelligence.xml
+++ b/src/chrome/content/rules/Actionable_Intelligence.xml
@@ -13,4 +13,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Activatejavascript.xml b/src/chrome/content/rules/Activatejavascript.xml
index a453fd7ddf83..c6155cec7682 100644
--- a/src/chrome/content/rules/Activatejavascript.xml
+++ b/src/chrome/content/rules/Activatejavascript.xml
@@ -7,7 +7,7 @@
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Active-Events.xml b/src/chrome/content/rules/Active-Events.xml
index 29ddffa86999..6e5f2c231547 100644
--- a/src/chrome/content/rules/Active-Events.xml
+++ b/src/chrome/content/rules/Active-Events.xml
@@ -8,10 +8,7 @@
 		
-		
-
-
-	
+		
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Active.com.xml b/src/chrome/content/rules/Active.com.xml
index d4bb84132700..5a40bf7e127b 100644
--- a/src/chrome/content/rules/Active.com.xml
+++ b/src/chrome/content/rules/Active.com.xml
@@ -47,7 +47,17 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
-		 
+		
 
 
 	 https://www.activestatic.net/: (56,
 	For other Active Network coverage, see Active_Network.com.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Actix.rs.xml b/src/chrome/content/rules/Actix.rs.xml
new file mode 100644
index 000000000000..7cd85ecbb21a
--- /dev/null
+++ b/src/chrome/content/rules/Actix.rs.xml
@@ -0,0 +1,10 @@
+
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Acunetix.com.xml b/src/chrome/content/rules/Acunetix.com.xml
deleted file mode 100644
index c953afbf236b..000000000000
--- a/src/chrome/content/rules/Acunetix.com.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Ad-Juster.xml b/src/chrome/content/rules/Ad-Juster.xml
index 4a7a86da1fa5..ec6fdc1d720a 100644
--- a/src/chrome/content/rules/Ad-Juster.xml
+++ b/src/chrome/content/rules/Ad-Juster.xml
@@ -1,7 +1,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Ad4Game.xml b/src/chrome/content/rules/Ad4Game.xml
index d1e329d32092..42dce51db9ec 100644
--- a/src/chrome/content/rules/Ad4Game.xml
+++ b/src/chrome/content/rules/Ad4Game.xml
@@ -3,11 +3,11 @@
 -->
 
 
-	
+	
+	
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Ad6media.xml b/src/chrome/content/rules/Ad6media.xml
index b0dba4b46f3c..4f03b4d47b63 100644
--- a/src/chrome/content/rules/Ad6media.xml
+++ b/src/chrome/content/rules/Ad6media.xml
@@ -21,4 +21,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AdAlliance.io.xml b/src/chrome/content/rules/AdAlliance.io.xml
new file mode 100644
index 000000000000..29362840df0f
--- /dev/null
+++ b/src/chrome/content/rules/AdAlliance.io.xml
@@ -0,0 +1,42 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/AdAstraArms.com.xml b/src/chrome/content/rules/AdAstraArms.com.xml
new file mode 100644
index 000000000000..2efbc4cbfc5c
--- /dev/null
+++ b/src/chrome/content/rules/AdAstraArms.com.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/AdBit.co.xml b/src/chrome/content/rules/AdBit.co.xml
index 61bf2ed9420b..249841f7e4af 100644
--- a/src/chrome/content/rules/AdBit.co.xml
+++ b/src/chrome/content/rules/AdBit.co.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.adbit.co/ => https://www.adbit.co/: (35, 'error:14077438
 		- .adbit.co
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/AdBlock.xml b/src/chrome/content/rules/AdBlock.xml
index 3c88a1532c20..4512ae67c147 100644
--- a/src/chrome/content/rules/AdBlock.xml
+++ b/src/chrome/content/rules/AdBlock.xml
@@ -24,6 +24,6 @@
 	
 	
 
-	
 
diff --git a/src/chrome/content/rules/AdButler.xml b/src/chrome/content/rules/AdButler.xml
index c50843a43200..a526d4b40786 100644
--- a/src/chrome/content/rules/AdButler.xml
+++ b/src/chrome/content/rules/AdButler.xml
@@ -10,7 +10,7 @@
 
 
 	
-	
+	
 	
 	
 
@@ -27,4 +27,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AdExcite.xml b/src/chrome/content/rules/AdExcite.xml
deleted file mode 100644
index da9a1bc9c8b7..000000000000
--- a/src/chrome/content/rules/AdExcite.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/AdExtent.com-problematic.xml b/src/chrome/content/rules/AdExtent.com-problematic.xml
deleted file mode 100644
index 509e193bd1a9..000000000000
--- a/src/chrome/content/rules/AdExtent.com-problematic.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-		
-		
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/AdExtent.com.xml b/src/chrome/content/rules/AdExtent.com.xml
deleted file mode 100644
index a595d1bc222b..000000000000
--- a/src/chrome/content/rules/AdExtent.com.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
-	
-		
-		
-
-
-	
-	
-
-
-	
-
-	
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/AdJug.com.xml b/src/chrome/content/rules/AdJug.com.xml
index 93636f016650..51bb403ee722 100644
--- a/src/chrome/content/rules/AdJug.com.xml
+++ b/src/chrome/content/rules/AdJug.com.xml
@@ -38,7 +38,7 @@ Fetch error: http://adjug.com/ => https://www.adjug.com/: (51, "SSL: no alternat
 		- .adjug.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/AdMaster.com.cn.xml b/src/chrome/content/rules/AdMaster.com.cn.xml
index dfd91ff59c4d..9afed6cadf82 100644
--- a/src/chrome/content/rules/AdMaster.com.cn.xml
+++ b/src/chrome/content/rules/AdMaster.com.cn.xml
@@ -45,7 +45,7 @@ Fetch error: http://e.admaster.com.cn/ => https://e.admaster.com.cn/: (6, 'Could
 	² Unsecurable <= 404
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/AdReactor.xml b/src/chrome/content/rules/AdReactor.xml
index 03946c86a1cc..3af548a8db56 100644
--- a/src/chrome/content/rules/AdReactor.xml
+++ b/src/chrome/content/rules/AdReactor.xml
@@ -11,4 +11,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AdRiver.xml b/src/chrome/content/rules/AdRiver.xml
index cf2f68abc191..a8494955e79f 100644
--- a/src/chrome/content/rules/AdRiver.xml
+++ b/src/chrome/content/rules/AdRiver.xml
@@ -35,7 +35,7 @@ Fetch error: http://masterh3.adriver.ru/ => https://masterh3.adriver.ru/: (28, '
 	* Secured by us
 
 -->
-
+
 
 	
 	
@@ -58,10 +58,10 @@ Fetch error: http://masterh3.adriver.ru/ => https://masterh3.adriver.ru/: (28, '
 			
 			
 			
-		
+
 	
 	
-	
+
 		
 
 
diff --git a/src/chrome/content/rules/AdRoll-problematic.xml b/src/chrome/content/rules/AdRoll-problematic.xml
deleted file mode 100644
index 2213f49e7bb0..000000000000
--- a/src/chrome/content/rules/AdRoll-problematic.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/AdRoll.xml b/src/chrome/content/rules/AdRoll.xml
index 304749f34913..d2a405a3bb36 100644
--- a/src/chrome/content/rules/AdRoll.xml
+++ b/src/chrome/content/rules/AdRoll.xml
@@ -1,106 +1,26 @@
 
 
-
-	
-	
-	
-	
-
-	
 	
-	
+	
+	
+	
 	
+	
+	
+	
 
-		
-
-			
-			
-			
-
-			
-			
-			
-
-
-	
-	
-	
-
-	
-
-
-	
-
-	
-
-	
-
-	
+	
 
+	
+	
+	
 
diff --git a/src/chrome/content/rules/AdSafe.xml b/src/chrome/content/rules/AdSafe.xml
index 3c3ca983bd78..5f6615119361 100644
--- a/src/chrome/content/rules/AdSafe.xml
+++ b/src/chrome/content/rules/AdSafe.xml
@@ -16,7 +16,7 @@ Fetch error: http://www.adsafecontrol.com/ => https://www.adsafecontrol.com/: (6
 	* Shows default page
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/AdSonar.com.xml b/src/chrome/content/rules/AdSonar.com.xml
index 7a218bbbfafe..340db42a9b1d 100644
--- a/src/chrome/content/rules/AdSonar.com.xml
+++ b/src/chrome/content/rules/AdSonar.com.xml
@@ -26,7 +26,7 @@ Fetch error: http://js.adsonar.com/ => https://secure-js.adsonar.com/: (6, 'Coul
 		- .adsonar.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/AdSpirit.xml b/src/chrome/content/rules/AdSpirit.xml
index 0376c15e3ee0..0fc912afffa3 100644
--- a/src/chrome/content/rules/AdSpirit.xml
+++ b/src/chrome/content/rules/AdSpirit.xml
@@ -8,7 +8,7 @@ Fetch error: http://cdn6.adspirit.de/banner/1x1.gif => https://cdn6.adspirit.de/
 	www.adspirit.de: Shows default page
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/AdXpansion.com.xml b/src/chrome/content/rules/AdXpansion.com.xml
deleted file mode 100644
index 9dc1f2c62942..000000000000
--- a/src/chrome/content/rules/AdXpansion.com.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Ada.lt.xml b/src/chrome/content/rules/Ada.lt.xml
index d2b9faa2a09c..8a8fde71195c 100644
--- a/src/chrome/content/rules/Ada.lt.xml
+++ b/src/chrome/content/rules/Ada.lt.xml
@@ -18,4 +18,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AdaCore.xml b/src/chrome/content/rules/AdaCore.xml
index c73074b3f6d5..6f6872000ffc 100644
--- a/src/chrome/content/rules/AdaCore.xml
+++ b/src/chrome/content/rules/AdaCore.xml
@@ -1,20 +1,9 @@
-
-
+
 	
 	
 	
 
+	
 
-	
-
-
-	
 	
-
 
diff --git a/src/chrome/content/rules/Adallom.com.xml b/src/chrome/content/rules/Adallom.com.xml
deleted file mode 100644
index 5a79a52f03f5..000000000000
--- a/src/chrome/content/rules/Adallom.com.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Adam-Barth.xml b/src/chrome/content/rules/Adam-Barth.xml
new file mode 100644
index 000000000000..771fe0bce9db
--- /dev/null
+++ b/src/chrome/content/rules/Adam-Barth.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+	
+
\ No newline at end of file
diff --git a/src/chrome/content/rules/Adap.TV.xml b/src/chrome/content/rules/Adap.TV.xml
index 7f4640041d2a..6883a9e781b0 100644
--- a/src/chrome/content/rules/Adap.TV.xml
+++ b/src/chrome/content/rules/Adap.TV.xml
@@ -33,7 +33,7 @@ Fetch error: http://www.adap.tv/ => https://adap.tv/: (7, 'Failed to connect to
 		- sync
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Adaptec.com.xml b/src/chrome/content/rules/Adaptec.com.xml
index 2b1c40cf0368..be63b4b6bfb0 100644
--- a/src/chrome/content/rules/Adaptec.com.xml
+++ b/src/chrome/content/rules/Adaptec.com.xml
@@ -31,7 +31,7 @@ Fetch error: http://www.adaptec.com/ => https://www.adaptec.com/: (60, 'SSL cert
 	** Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Adapteva.com.xml b/src/chrome/content/rules/Adapteva.com.xml
index e71375e8c7d9..db5fa193ef43 100644
--- a/src/chrome/content/rules/Adapteva.com.xml
+++ b/src/chrome/content/rules/Adapteva.com.xml
@@ -20,7 +20,7 @@ Non-2xx HTTP code: http://shop.adapteva.com/ (200) => https://adapteva.myshopify
 		- (www.)	(http reply)
 
 -->
-
+
 
 	
 
@@ -28,4 +28,4 @@ Non-2xx HTTP code: http://shop.adapteva.com/ (200) => https://adapteva.myshopify
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Adaptive_Computing.xml b/src/chrome/content/rules/Adaptive_Computing.xml
index 545a66af6eb0..5ca61de18444 100644
--- a/src/chrome/content/rules/Adaptive_Computing.xml
+++ b/src/chrome/content/rules/Adaptive_Computing.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://adaptivecomputing.com/ => https://adaptivecomputing.com/: (51, "SSL: no alternative certificate subject name matches target host name 'adaptivecomputing.com'")
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/AdblockPlus.xml b/src/chrome/content/rules/AdblockPlus.xml
index 9329b5a4ec94..95fa5dbaeb53 100644
--- a/src/chrome/content/rules/AdblockPlus.xml
+++ b/src/chrome/content/rules/AdblockPlus.xml
@@ -22,7 +22,7 @@
 	
 
 
-	
+	
 
 
 	
 
 
-	
+	
+	
+	
 
 
 	
+		to="https://cdn.adbooth.net/" />
 
 	
@@ -46,4 +48,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Adbrite.xml b/src/chrome/content/rules/Adbrite.xml
index 5968cb048a17..4a94f2e0502c 100644
--- a/src/chrome/content/rules/Adbrite.xml
+++ b/src/chrome/content/rules/Adbrite.xml
@@ -21,7 +21,7 @@ Fetch error: http://files.adbrite.com/ => https://www.adbrite.com/: (6, 'Could n
 		- press		(times out)
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Adbusters.org.xml b/src/chrome/content/rules/Adbusters.org.xml
index d281720e042c..40d6bf8d1868 100644
--- a/src/chrome/content/rules/Adbusters.org.xml
+++ b/src/chrome/content/rules/Adbusters.org.xml
@@ -1,6 +1,22 @@
+
 
-  
-  
 
-  
+	
+	
+	
+
+	
+
+	
+
 
diff --git a/src/chrome/content/rules/Adbuyer.com.xml b/src/chrome/content/rules/Adbuyer.com.xml
index 6c31793ca145..114c008d637b 100644
--- a/src/chrome/content/rules/Adbuyer.com.xml
+++ b/src/chrome/content/rules/Adbuyer.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://adbuyer.com/ => https://app.mbuy.com/: (7, 'Failed to connec
 		- pixel
 
 -->
-
+
 
 	
 	
@@ -30,4 +30,4 @@ Fetch error: http://adbuyer.com/ => https://app.mbuy.com/: (7, 'Failed to connec
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Add2Net.xml b/src/chrome/content/rules/Add2Net.xml
index 10c557441582..ef58c038d0cb 100644
--- a/src/chrome/content/rules/Add2Net.xml
+++ b/src/chrome/content/rules/Add2Net.xml
@@ -20,7 +20,7 @@ Fetch error: http://lunarpages.co.uk/ => https://lunarpages.co.uk/: (51, "SSL: n
 Fetch error: http://www.lunarpages.co.uk/ => https://www.lunarpages.co.uk/: (51, "SSL: no alternative certificate subject name matches target host name 'www.lunarpages.co.uk'")
 Fetch error: http://tremendesk.com/ => https://tremendesk.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 -->
-
+
 
 	
 	
@@ -29,13 +29,16 @@ Fetch error: http://tremendesk.com/ => https://tremendesk.com/: (60, 'SSL certif
 	
 	
 	
-	
+	
+	
+	
+	
 	
 	
 	
 	
 	
-	
+	
 
 
 	
@@ -43,8 +46,6 @@ Fetch error: http://tremendesk.com/ => https://tremendesk.com/: (60, 'SSL certif
 	
 
 
-	
 
 	
@@ -52,13 +53,8 @@ Fetch error: http://tremendesk.com/ => https://tremendesk.com/: (60, 'SSL certif
 	
 
-	
 
-	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/AddBooks.se.xml b/src/chrome/content/rules/AddBooks.se.xml
index e4d809dd1790..ea854f18f989 100644
--- a/src/chrome/content/rules/AddBooks.se.xml
+++ b/src/chrome/content/rules/AddBooks.se.xml
@@ -5,7 +5,7 @@ Fetch error: http://www.addbooks.se/ => https://www.addbooks.se/: (7, 'Failed to
 Fetch error: http://addbooks.se/ => https://addbooks.se/: (7, 'Failed to connect to addbooks.se port 443: Connection timed out')
 
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/AddThis.xml b/src/chrome/content/rules/AddThis.xml
index ed2dbf4adb11..dd6824d7e14a 100644
--- a/src/chrome/content/rules/AddThis.xml
+++ b/src/chrome/content/rules/AddThis.xml
@@ -1,148 +1,49 @@
 
-
 
+
 	
+	
 	
 	
 	
 	
+		
 	
 	
+		
 	
-	
 	
 	
+		
 	
 	
 	
 	
 	
 	
-	
 	
 	
-	
-
-		
-
-		
 
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-		
-		
-		
-
-		
-		
-
-
-	
+	
 	
-	
-
-	
+	
+	
 	
 
-
-	
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/Addictech.xml b/src/chrome/content/rules/Addictech.xml
index 985281314bb9..67028c8534df 100644
--- a/src/chrome/content/rules/Addictech.xml
+++ b/src/chrome/content/rules/Addictech.xml
@@ -12,7 +12,7 @@ Fetch error: http://addictech.com/ => https://www.addictech.com/: Too many redir
 Fetch error: http://www.addictech.com/ => https://www.addictech.com/: Too many redirects while fetching 'https://www.addictech.com/'
 
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/Addiction_Help.xml b/src/chrome/content/rules/Addiction_Help.xml
deleted file mode 100644
index d9a892c0ced5..000000000000
--- a/src/chrome/content/rules/Addiction_Help.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Addison.com.hk.xml b/src/chrome/content/rules/Addison.com.hk.xml
index eaef1f403b0a..62f539ea5d31 100644
--- a/src/chrome/content/rules/Addison.com.hk.xml
+++ b/src/chrome/content/rules/Addison.com.hk.xml
@@ -13,4 +13,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Addison_Lee.xml b/src/chrome/content/rules/Addison_Lee.xml
index 0d06186aa923..3247931c3464 100644
--- a/src/chrome/content/rules/Addison_Lee.xml
+++ b/src/chrome/content/rules/Addison_Lee.xml
@@ -8,7 +8,7 @@ Fetch error: http://addisonlee.com/ => https://www.addisonlee.com/: Too many red
     
     
 
-    
+    
 
     
diff --git a/src/chrome/content/rules/Adecco_Way_to_Work.xml b/src/chrome/content/rules/Adecco_Way_to_Work.xml
index c2355d5a67f1..ac26b427ff3f 100644
--- a/src/chrome/content/rules/Adecco_Way_to_Work.xml
+++ b/src/chrome/content/rules/Adecco_Way_to_Work.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Adelaide.edu.au.xml b/src/chrome/content/rules/Adelaide.edu.au.xml
index 3f535bc6d8ab..f6fa37c480a0 100644
--- a/src/chrome/content/rules/Adelaide.edu.au.xml
+++ b/src/chrome/content/rules/Adelaide.edu.au.xml
@@ -61,7 +61,20 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 		
 
 
@@ -81,7 +94,6 @@
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Adestra.xml b/src/chrome/content/rules/Adestra.xml
index b122dfd4589f..a15672e8c1ce 100644
--- a/src/chrome/content/rules/Adestra.xml
+++ b/src/chrome/content/rules/Adestra.xml
@@ -13,6 +13,6 @@
 	
 
 	
-	
+
 
 
diff --git a/src/chrome/content/rules/Adidas.ca.xml b/src/chrome/content/rules/Adidas.ca.xml
new file mode 100644
index 000000000000..d6453c5936b9
--- /dev/null
+++ b/src/chrome/content/rules/Adidas.ca.xml
@@ -0,0 +1,30 @@
+
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/Adify.xml b/src/chrome/content/rules/Adify.xml
deleted file mode 100644
index f213eedc7c29..000000000000
--- a/src/chrome/content/rules/Adify.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Adigital.xml b/src/chrome/content/rules/Adigital.xml
deleted file mode 100644
index dea7df7d907d..000000000000
--- a/src/chrome/content/rules/Adigital.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Adility.xml b/src/chrome/content/rules/Adility.xml
index a308ee5d1673..40791d17a9e7 100644
--- a/src/chrome/content/rules/Adility.xml
+++ b/src/chrome/content/rules/Adility.xml
@@ -1,4 +1,8 @@
+
 
+	
 	
 	
 
diff --git a/src/chrome/content/rules/Adingo.jp.xml b/src/chrome/content/rules/Adingo.jp.xml
index 3215070795e5..e93cfd003ebd 100644
--- a/src/chrome/content/rules/Adingo.jp.xml
+++ b/src/chrome/content/rules/Adingo.jp.xml
@@ -65,6 +65,6 @@
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Adition.com.xml b/src/chrome/content/rules/Adition.com.xml
index 3d53af19aa70..42ec73fdd760 100644
--- a/src/chrome/content/rules/Adition.com.xml
+++ b/src/chrome/content/rules/Adition.com.xml
@@ -21,7 +21,7 @@
 		
 		
 		
-	
+
 
 	
diff --git a/src/chrome/content/rules/Adjust-net.jp.xml b/src/chrome/content/rules/Adjust-net.jp.xml
index be954687fd6a..356059fdcddd 100644
--- a/src/chrome/content/rules/Adjust-net.jp.xml
+++ b/src/chrome/content/rules/Adjust-net.jp.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Adk2.xml b/src/chrome/content/rules/Adk2.xml
index 73d62b51d56e..39f07a335ba6 100644
--- a/src/chrome/content/rules/Adk2.xml
+++ b/src/chrome/content/rules/Adk2.xml
@@ -21,21 +21,22 @@ Fetch error: http://adk2.com/ => https://adk2.com/: (60, 'SSL certificate proble
 		- cpmrocket
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
 	
-	
+
 
 
diff --git a/src/chrome/content/rules/Adknowledge.xml b/src/chrome/content/rules/Adknowledge.xml
deleted file mode 100644
index 9be2220727b4..000000000000
--- a/src/chrome/content/rules/Adknowledge.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Adkontekst.pl-problematic.xml b/src/chrome/content/rules/Adkontekst.pl-problematic.xml
index be8f2346bd44..8afc6c47a2cf 100644
--- a/src/chrome/content/rules/Adkontekst.pl-problematic.xml
+++ b/src/chrome/content/rules/Adkontekst.pl-problematic.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Adkontekst.pl.xml b/src/chrome/content/rules/Adkontekst.pl.xml
index d0350a9df57e..318e2fa31449 100644
--- a/src/chrome/content/rules/Adkontekst.pl.xml
+++ b/src/chrome/content/rules/Adkontekst.pl.xml
@@ -15,13 +15,14 @@
 -->
 
 
-	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Adlegend.com.xml b/src/chrome/content/rules/Adlegend.com.xml
deleted file mode 100644
index d482ed40f637..000000000000
--- a/src/chrome/content/rules/Adlegend.com.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Adlibris.xml b/src/chrome/content/rules/Adlibris.xml
index db702e9ecba5..2b19535d6273 100644
--- a/src/chrome/content/rules/Adlibris.xml
+++ b/src/chrome/content/rules/Adlibris.xml
@@ -1,19 +1,19 @@
-
 
-
-  
-  
-  
-  
+
+	
+	
+
+	
+	
+
+	
 
-  
+	
+	
 
diff --git a/src/chrome/content/rules/Adlink.net.xml b/src/chrome/content/rules/Adlink.net.xml
index 377948a93bba..d1815a714d57 100644
--- a/src/chrome/content/rules/Adlink.net.xml
+++ b/src/chrome/content/rules/Adlink.net.xml
@@ -4,11 +4,11 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://js.adlink.net/ => https://js.adlink.net/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Admatic.xml b/src/chrome/content/rules/Admatic.xml
index f64e8fade0f1..0aeb33cee2c9 100644
--- a/src/chrome/content/rules/Admatic.xml
+++ b/src/chrome/content/rules/Admatic.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Admeta-Aktiebolag.xml b/src/chrome/content/rules/Admeta-Aktiebolag.xml
deleted file mode 100644
index add0d8fc3194..000000000000
--- a/src/chrome/content/rules/Admeta-Aktiebolag.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-	
-	
-
-		
-		
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Admiringlight.com.xml b/src/chrome/content/rules/Admiringlight.com.xml
new file mode 100644
index 000000000000..95bc1bf54f26
--- /dev/null
+++ b/src/chrome/content/rules/Admiringlight.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Admized.xml b/src/chrome/content/rules/Admized.xml
deleted file mode 100644
index b57305cfc4b2..000000000000
--- a/src/chrome/content/rules/Admized.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/src/chrome/content/rules/Adnxs.com.xml b/src/chrome/content/rules/Adnxs.com.xml
index 304eadc75140..ea7ce78279e5 100644
--- a/src/chrome/content/rules/Adnxs.com.xml
+++ b/src/chrome/content/rules/Adnxs.com.xml
@@ -1,58 +1,31 @@
 
-
 
-	
-
-		
-
-			
-			
-			
-			
-
-		
-		
-		
-		
-		
-		
-		
-
-
-	
+
+	
+	
+		
+		
+		
+	
+	
+	
+		
+		
+		
+
+	
 	
 	
-
 	
 
-
-	
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/Adobe-Digital-Marketing.xml b/src/chrome/content/rules/Adobe-Digital-Marketing.xml
index 7fb1cb7578ec..d70e6009560d 100644
--- a/src/chrome/content/rules/Adobe-Digital-Marketing.xml
+++ b/src/chrome/content/rules/Adobe-Digital-Marketing.xml
@@ -16,7 +16,7 @@
 	
 	
 
-	
+	
 
 
 	
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Adobe.xml b/src/chrome/content/rules/Adobe.xml
index c57d872511d0..da5652c11f21 100644
--- a/src/chrome/content/rules/Adobe.xml
+++ b/src/chrome/content/rules/Adobe.xml
@@ -1,6 +1,11 @@
+
 
 	
 	
-	
+	
 	
-	
-	
-	
 	
 	
 
@@ -248,26 +242,6 @@
 			
 			
 
-		
-		
-		
-		
-
-		
-
-			
-			
-			
-
-			
-			
-
-
 	
 	
@@ -297,14 +271,6 @@
 		
 		
 
-	
-	
-
-		
-
 	
@@ -314,18 +280,6 @@
 		
 		
 
-	
-
-	
-
-	
-
-	
-
 	
 
@@ -337,13 +291,6 @@
 		
 		
 
-	
-	
-
-		
-
 	
 
diff --git a/src/chrome/content/rules/Adobe_Connect.xml b/src/chrome/content/rules/Adobe_Connect.xml
index 481de2ff8d6d..8afd17c66962 100644
--- a/src/chrome/content/rules/Adobe_Connect.xml
+++ b/src/chrome/content/rules/Adobe_Connect.xml
@@ -20,7 +20,7 @@ Fetch error: http://adobeconnect.com/ => https://adobeconnect.com/: (28, 'Connec
 		- na\d+cps
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Adobe_forms_central.com.xml b/src/chrome/content/rules/Adobe_forms_central.com.xml
deleted file mode 100644
index 319b925aab08..000000000000
--- a/src/chrome/content/rules/Adobe_forms_central.com.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Adobetag.com.xml b/src/chrome/content/rules/Adobetag.com.xml
index 914a897b4ec8..bb0abcb694d6 100644
--- a/src/chrome/content/rules/Adobetag.com.xml
+++ b/src/chrome/content/rules/Adobetag.com.xml
@@ -31,4 +31,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Adometry.xml b/src/chrome/content/rules/Adometry.xml
deleted file mode 100644
index 697de136b1d0..000000000000
--- a/src/chrome/content/rules/Adometry.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/AdoredTV.com.xml b/src/chrome/content/rules/AdoredTV.com.xml
new file mode 100644
index 000000000000..a829d406b468
--- /dev/null
+++ b/src/chrome/content/rules/AdoredTV.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Adoyacademy.se.xml b/src/chrome/content/rules/Adoyacademy.se.xml
deleted file mode 100644
index 119e5eea1232..000000000000
--- a/src/chrome/content/rules/Adoyacademy.se.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-  
-  
-  
-  
-
-
diff --git a/src/chrome/content/rules/Adpay.com.xml b/src/chrome/content/rules/Adpay.com.xml
index a8d4a8880e4e..36dbd2bd577b 100644
--- a/src/chrome/content/rules/Adpay.com.xml
+++ b/src/chrome/content/rules/Adpay.com.xml
@@ -12,16 +12,14 @@
 -->
 
 
-	
+	
+	
 		
 		
 		
 
 
-	
 
+	
 
-	
-
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Adperium.com.xml b/src/chrome/content/rules/Adperium.com.xml
index a739c720a076..6d66e3f7135f 100644
--- a/src/chrome/content/rules/Adperium.com.xml
+++ b/src/chrome/content/rules/Adperium.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://appnexus.adperium.com/ => https://appnexus.adperium.com/: (6, 'Could not resolve host: appnexus.adperium.com')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Adscale.xml b/src/chrome/content/rules/Adscale.xml
index dd957366981f..ec1f8dc91b1a 100644
--- a/src/chrome/content/rules/Adscale.xml
+++ b/src/chrome/content/rules/Adscale.xml
@@ -21,10 +21,13 @@ Fetch error: http://adscale.de/ => https://www.adscale.de/: (60, 'SSL certificat
 		- rh
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
 
 
 	
@@ -36,7 +39,6 @@ Fetch error: http://adscale.de/ => https://www.adscale.de/: (60, 'SSL certificat
 
 	
-	
 
+	
 
diff --git a/src/chrome/content/rules/Adscend-Media.xml b/src/chrome/content/rules/Adscend-Media.xml
index 7a2cd30fd643..e0d23776a714 100644
--- a/src/chrome/content/rules/Adscend-Media.xml
+++ b/src/chrome/content/rules/Adscend-Media.xml
@@ -1,12 +1,11 @@
-
-
+
+
 	
 	
 
-
-	
-
+	
 
 	
-
 
diff --git a/src/chrome/content/rules/Adseekmedia.xml b/src/chrome/content/rules/Adseekmedia.xml
deleted file mode 100644
index ab70ab2eb1f8..000000000000
--- a/src/chrome/content/rules/Adseekmedia.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Adserver01.de.xml b/src/chrome/content/rules/Adserver01.de.xml
index 79a6da6ac119..0744fd78532c 100644
--- a/src/chrome/content/rules/Adserver01.de.xml
+++ b/src/chrome/content/rules/Adserver01.de.xml
@@ -1,12 +1,11 @@
 
 
-	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Adsimilis.xml b/src/chrome/content/rules/Adsimilis.xml
deleted file mode 100644
index 63f95ca3872c..000000000000
--- a/src/chrome/content/rules/Adsimilis.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Adspdbl.com.xml b/src/chrome/content/rules/Adspdbl.com.xml
index 5b35b381bbc4..f5cde3f06f21 100644
--- a/src/chrome/content/rules/Adspdbl.com.xml
+++ b/src/chrome/content/rules/Adspdbl.com.xml
@@ -17,7 +17,6 @@
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Adsrvmedia.com.xml b/src/chrome/content/rules/Adsrvmedia.com.xml
index 5286c60a5bc5..19f4aaf615bd 100644
--- a/src/chrome/content/rules/Adsrvmedia.com.xml
+++ b/src/chrome/content/rules/Adsrvmedia.com.xml
@@ -18,7 +18,8 @@
 -->
 
 
-	
+	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Adsrvr.org.xml b/src/chrome/content/rules/Adsrvr.org.xml
index 13a17edab86f..9db8704f7f00 100644
--- a/src/chrome/content/rules/Adsrvr.org.xml
+++ b/src/chrome/content/rules/Adsrvr.org.xml
@@ -7,7 +7,7 @@
 		- .adsrvr.org
 
 	ᶜ See https://owasp.org/index.php/SecureFlag
-	
+
 	Cert mismatch:
 		- euw.fb
 		- sin.fb
diff --git a/src/chrome/content/rules/Adsurve.com.xml b/src/chrome/content/rules/Adsurve.com.xml
deleted file mode 100644
index ea16cbccd881..000000000000
--- a/src/chrome/content/rules/Adsurve.com.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Adtarget.me.xml b/src/chrome/content/rules/Adtarget.me.xml
index 999bc394b0ef..235e839d2f97 100644
--- a/src/chrome/content/rules/Adtarget.me.xml
+++ b/src/chrome/content/rules/Adtarget.me.xml
@@ -15,7 +15,8 @@
 -->
 
 
-	
+	
+	
 
 
 	 https://adserver-sb-fra.adtech.de/: (51, "SSL: no alternative certificate subject name matches target host name 'adserver-sb-fra.adtech.de'")
-
 	For other AOL coverage, see AOL.xml.
 
-
 	Banner network.
 
-
 	CDN buckets:
-
 		- aka-cdn-ns.adtech.de.edgesuite.net
 
-
-	Problematic domains:
-
-		- aka-cdn-ns.adtech.de		(works, akamai)
-		- ad.dc2.adtech.de		(works; mismatched, CN: *.adtech.de)
-
-
-	Fully covered subdomains:
-
-		- adserver
-		- adserverams
-		- adserver-sb-fra
-		- aka-cdn
-		- aka-cdn-ns	(→ aka-cdn)
-		- ad.dc2	(→ adserver)
-		- secserv
-		- ums
-
+	Invalid certificate:
+		- ad.dc2.adtech.de, equivalent to adserver.adtech.de
 
 	Insecure cookies are set for these domains:
-
 		- .adtech.de
-
 -->
-
 
-	
+
 	
 	
-	
 	
-	
-	
-
-	
 	
 	
+	
+	
 
-
-	
+	
 	
-
 	
 
-
-	
-
 	
 
-	
-
+	
 
diff --git a/src/chrome/content/rules/Adtechus.com.xml b/src/chrome/content/rules/Adtechus.com.xml
index bf5f5362e38a..d318acc62427 100644
--- a/src/chrome/content/rules/Adtechus.com.xml
+++ b/src/chrome/content/rules/Adtechus.com.xml
@@ -49,7 +49,7 @@
 
 
 	
-	
+	
 
 
 	
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Adult-Ad-World.xml b/src/chrome/content/rules/Adult-Ad-World.xml
deleted file mode 100644
index 1738093d92a2..000000000000
--- a/src/chrome/content/rules/Adult-Ad-World.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/AdultShopping.com.xml b/src/chrome/content/rules/AdultShopping.com.xml
index 84a51028d025..075bdc16a374 100644
--- a/src/chrome/content/rules/AdultShopping.com.xml
+++ b/src/chrome/content/rules/AdultShopping.com.xml
@@ -1,80 +1,15 @@
-
 
-
-
-	
+
 	
-	
-	
-	
-	
 	
 
-	
-	
-
-
-	
-	
-
-	
-	
-
-
-	
-	
-
-		
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/AdultSwim.com.xml b/src/chrome/content/rules/AdultSwim.com.xml
new file mode 100644
index 000000000000..bfd793e8fd7c
--- /dev/null
+++ b/src/chrome/content/rules/AdultSwim.com.xml
@@ -0,0 +1,24 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Advance_Digital.xml b/src/chrome/content/rules/Advance_Digital.xml
deleted file mode 100644
index d2bcec506d38..000000000000
--- a/src/chrome/content/rules/Advance_Digital.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Advantage-Business-Media.xml b/src/chrome/content/rules/Advantage-Business-Media.xml
deleted file mode 100644
index a04585026f44..000000000000
--- a/src/chrome/content/rules/Advantage-Business-Media.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Advantage.xml b/src/chrome/content/rules/Advantage.xml
index 7221c0659ee7..2a93df353216 100644
--- a/src/chrome/content/rules/Advantage.xml
+++ b/src/chrome/content/rules/Advantage.xml
@@ -14,24 +14,22 @@ Fetch error: http://discountclick.com/ => https://www.advantageseoservices.com/:
 		- (www.)discontclick.com	(cert mismatch)
 
 -->
-
+
 
 	
 	
 	
-	
+	
+	
 
 
 	
 
 
-	
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Advel.xml b/src/chrome/content/rules/Advel.xml
index 8de956c7ac72..2984c17f36e3 100644
--- a/src/chrome/content/rules/Advel.xml
+++ b/src/chrome/content/rules/Advel.xml
@@ -1,9 +1,9 @@
 
 
 	
-	
+	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Advent.com.xml b/src/chrome/content/rules/Advent.com.xml
index 8b4886c84bda..3d4ef8e22143 100644
--- a/src/chrome/content/rules/Advent.com.xml
+++ b/src/chrome/content/rules/Advent.com.xml
@@ -28,7 +28,7 @@ Fetch error: http://start.advent.com/ => https://start.advent.com/: (6, 'Could n
 		- www.advent.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/AdventOfCode.com.xml b/src/chrome/content/rules/AdventOfCode.com.xml
index a58096b2c7cd..e14b1a7fbf76 100644
--- a/src/chrome/content/rules/AdventOfCode.com.xml
+++ b/src/chrome/content/rules/AdventOfCode.com.xml
@@ -4,5 +4,5 @@
 	
 
 	
-	
+
 
diff --git a/src/chrome/content/rules/Advert_Stream.xml b/src/chrome/content/rules/Advert_Stream.xml
deleted file mode 100644
index fe0a5f5975b3..000000000000
--- a/src/chrome/content/rules/Advert_Stream.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Advertise.com.xml b/src/chrome/content/rules/Advertise.com.xml
index f8f6c33b81b0..2b713f21eff6 100644
--- a/src/chrome/content/rules/Advertise.com.xml
+++ b/src/chrome/content/rules/Advertise.com.xml
@@ -7,7 +7,8 @@
 -->
 
 
-	
+	
+	
 
 
 	
@@ -16,7 +17,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Advertisers-OpenX.com.xml b/src/chrome/content/rules/Advertisers-OpenX.com.xml
index ef907f7d7776..0b63c95498d3 100644
--- a/src/chrome/content/rules/Advertisers-OpenX.com.xml
+++ b/src/chrome/content/rules/Advertisers-OpenX.com.xml
@@ -14,7 +14,7 @@ Fetch error: http://d3.advertisers-openx.com/ => https://d3.advertisers-openx.co
 	Web bugs.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Advertising.com.xml b/src/chrome/content/rules/Advertising.com.xml
index a67a3a6389db..437a2074dd10 100644
--- a/src/chrome/content/rules/Advertising.com.xml
+++ b/src/chrome/content/rules/Advertising.com.xml
@@ -1,80 +1,215 @@
 
 
 
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
-	
+	
+	
+	
+	
+	
 	
-
-	
-	
-	
-	
-	
+	
 	
+	
+	
+	
 
-		
-		
-
-
-	
-	
-	
-
-	
-
+	
 
 	
diff --git a/src/chrome/content/rules/Adverts.ie.xml b/src/chrome/content/rules/Adverts.ie.xml
index 391be57d3609..5bec2e2f5bd8 100644
--- a/src/chrome/content/rules/Adverts.ie.xml
+++ b/src/chrome/content/rules/Adverts.ie.xml
@@ -17,4 +17,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Advg.jp.xml b/src/chrome/content/rules/Advg.jp.xml
index ee96ed6738f7..0ff409cd1a0c 100644
--- a/src/chrome/content/rules/Advg.jp.xml
+++ b/src/chrome/content/rules/Advg.jp.xml
@@ -5,4 +5,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Adview.pl.xml b/src/chrome/content/rules/Adview.pl.xml
index cc4272be12af..660d5c914d17 100644
--- a/src/chrome/content/rules/Adview.pl.xml
+++ b/src/chrome/content/rules/Adview.pl.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.adview.pl/ => https://adview.pl/: (60, 'SSL certificate
 		- .adview.pl
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Adviva.net.xml b/src/chrome/content/rules/Adviva.net.xml
deleted file mode 100644
index 1d8ab0b928ce..000000000000
--- a/src/chrome/content/rules/Adviva.net.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/AdvocateAndDemocrat.com.xml b/src/chrome/content/rules/AdvocateAndDemocrat.com.xml
new file mode 100644
index 000000000000..30b5bc1c6e5b
--- /dev/null
+++ b/src/chrome/content/rules/AdvocateAndDemocrat.com.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Advocates_for_Youth.xml b/src/chrome/content/rules/Advocates_for_Youth.xml
index 439493f63f50..3d701b2342f4 100644
--- a/src/chrome/content/rules/Advocates_for_Youth.xml
+++ b/src/chrome/content/rules/Advocates_for_Youth.xml
@@ -11,13 +11,13 @@
 -->
 
 
-	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Advolution.de.xml b/src/chrome/content/rules/Advolution.de.xml
index dba1eb1d64fa..c38fbc1de739 100644
--- a/src/chrome/content/rules/Advolution.de.xml
+++ b/src/chrome/content/rules/Advolution.de.xml
@@ -1,12 +1,9 @@
 
 
-	
+	
 
 
-	
 
+	
 
-	
-
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AdyAdvantage.com.xml b/src/chrome/content/rules/AdyAdvantage.com.xml
new file mode 100644
index 000000000000..52129882ef84
--- /dev/null
+++ b/src/chrome/content/rules/AdyAdvantage.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ady_Advantage.com-falsemixed.xml b/src/chrome/content/rules/Ady_Advantage.com-falsemixed.xml
deleted file mode 100644
index 9437f7cd0f4e..000000000000
--- a/src/chrome/content/rules/Ady_Advantage.com-falsemixed.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Ady_Advantage.com.xml b/src/chrome/content/rules/Ady_Advantage.com.xml
deleted file mode 100644
index ce135dba7d5d..000000000000
--- a/src/chrome/content/rules/Ady_Advantage.com.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-		
-		
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Adyen.com.xml b/src/chrome/content/rules/Adyen.com.xml
new file mode 100644
index 000000000000..b40eae7232db
--- /dev/null
+++ b/src/chrome/content/rules/Adyen.com.xml
@@ -0,0 +1,36 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Adzerk.net.xml b/src/chrome/content/rules/Adzerk.net.xml
index 69b92f187ccb..c7c3c20e23aa 100644
--- a/src/chrome/content/rules/Adzerk.net.xml
+++ b/src/chrome/content/rules/Adzerk.net.xml
@@ -31,7 +31,7 @@ Fetch error: http://secure.adzerk.net/ => https://secure.adzerk.net/: (51, "SSL:
 		- .adzerk.net
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Adzip.co.xml b/src/chrome/content/rules/Adzip.co.xml
index 80f481fa1763..99275da119eb 100644
--- a/src/chrome/content/rules/Adzip.co.xml
+++ b/src/chrome/content/rules/Adzip.co.xml
@@ -5,4 +5,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Aea.se.xml b/src/chrome/content/rules/Aea.se.xml
index 8eca222a74bd..22055f6433ea 100644
--- a/src/chrome/content/rules/Aea.se.xml
+++ b/src/chrome/content/rules/Aea.se.xml
@@ -1,6 +1,9 @@
-
-  
-  
-  
-
+
+	
+	
+	
+	
+	
 
+	
+
diff --git a/src/chrome/content/rules/Aereo.com-problematic.xml b/src/chrome/content/rules/Aereo.com-problematic.xml
index 039db40f0dfd..348c2934f05c 100644
--- a/src/chrome/content/rules/Aereo.com-problematic.xml
+++ b/src/chrome/content/rules/Aereo.com-problematic.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Aereo.com.xml b/src/chrome/content/rules/Aereo.com.xml
index 8eb8239a9e30..c7b9a7ea9376 100644
--- a/src/chrome/content/rules/Aereo.com.xml
+++ b/src/chrome/content/rules/Aereo.com.xml
@@ -27,10 +27,11 @@ Fetch error: http://aereo.com/ => https://aereo.com/: (6, 'Could not resolve hos
 		- blog		(works; expired 2013-04-08; mismatched, CN: *.bamboom.com)
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
@@ -42,4 +43,4 @@ Fetch error: http://aereo.com/ => https://aereo.com/: (6, 'Could not resolve hos
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Aeriagames.xml b/src/chrome/content/rules/Aeriagames.xml
index 64bd2e13e3c9..c6b659c61b25 100644
--- a/src/chrome/content/rules/Aeriagames.xml
+++ b/src/chrome/content/rules/Aeriagames.xml
@@ -1,37 +1,16 @@
 
 
-
-
-	
-
-
-
-	
-
-	
-	
-
+	
+	
+	
+		
+	
+		
+	
 
diff --git a/src/chrome/content/rules/AeroFS.xml b/src/chrome/content/rules/AeroFS.xml
index e1d43464e20e..d21d9aa81eff 100644
--- a/src/chrome/content/rules/AeroFS.xml
+++ b/src/chrome/content/rules/AeroFS.xml
@@ -19,7 +19,7 @@ Fetch error: http://my.aerofs.com/ => https://my.aerofs.com/: (6, 'Could not res
 		- support
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Aeroports_de_Montreal.xml b/src/chrome/content/rules/Aeroports_de_Montreal.xml
index 0489908a43bd..2853d7f13962 100644
--- a/src/chrome/content/rules/Aeroports_de_Montreal.xml
+++ b/src/chrome/content/rules/Aeroports_de_Montreal.xml
@@ -1,17 +1,26 @@
-
 
-
+
     
-    
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
 
-    
-    
+	
 
diff --git a/src/chrome/content/rules/Aeryon_Labs.xml b/src/chrome/content/rules/Aeryon_Labs.xml
index 5da41b0c1baf..f6f76a1bb172 100644
--- a/src/chrome/content/rules/Aeryon_Labs.xml
+++ b/src/chrome/content/rules/Aeryon_Labs.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AetherFlyff.com.xml b/src/chrome/content/rules/AetherFlyff.com.xml
index 599e02308748..dc48c306c40b 100644
--- a/src/chrome/content/rules/AetherFlyff.com.xml
+++ b/src/chrome/content/rules/AetherFlyff.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://basilisk.aetherflyff.com/ => https://basilisk.aetherflyff.co
 Fetch error: http://www.aetherflyff.com/ => https://www.aetherflyff.com/: (28, 'Operation timed out after 30002 milliseconds with 0 bytes received')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/AffUtd.com.xml b/src/chrome/content/rules/AffUtd.com.xml
index c26dc9c20d2e..a86bcebbcec9 100644
--- a/src/chrome/content/rules/AffUtd.com.xml
+++ b/src/chrome/content/rules/AffUtd.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://www.affutd.com/ => https://www.affutd.com/: (60, 'SSL certif
 	For other William Hill coverage, see William-Hill.xml.
 
 -->
-
+
 
 	
 	
@@ -26,4 +26,4 @@ Fetch error: http://www.affutd.com/ => https://www.affutd.com/: (60, 'SSL certif
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Affili.net.xml b/src/chrome/content/rules/Affili.net.xml
index 0184b85bf2d9..959b1ed8ba3a 100644
--- a/src/chrome/content/rules/Affili.net.xml
+++ b/src/chrome/content/rules/Affili.net.xml
@@ -26,4 +26,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Afiestas.org.xml b/src/chrome/content/rules/Afiestas.org.xml
index d9f87acf1c47..78b027e9adb2 100644
--- a/src/chrome/content/rules/Afiestas.org.xml
+++ b/src/chrome/content/rules/Afiestas.org.xml
@@ -18,7 +18,7 @@ Fetch error: http://www.afiestas.org/ => https://www.afiestas.org/: (51, "SSL: n
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Afilias.xml b/src/chrome/content/rules/Afilias.xml
index dd38688c3e94..98f2daf97011 100644
--- a/src/chrome/content/rules/Afilias.xml
+++ b/src/chrome/content/rules/Afilias.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/African-Network-Information-Center.xml b/src/chrome/content/rules/African-Network-Information-Center.xml
index 414cdf0627a7..0ecb53440062 100644
--- a/src/chrome/content/rules/African-Network-Information-Center.xml
+++ b/src/chrome/content/rules/African-Network-Information-Center.xml
@@ -1,14 +1,10 @@
-
-
+
 	
-	
-	
-
-
-	
-
+	
+	
+	
 
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/African_Grey_Parrot_Centre.xml b/src/chrome/content/rules/African_Grey_Parrot_Centre.xml
index 5a19ce2c7a2b..8d66ca630d65 100644
--- a/src/chrome/content/rules/African_Grey_Parrot_Centre.xml
+++ b/src/chrome/content/rules/African_Grey_Parrot_Centre.xml
@@ -5,7 +5,7 @@ Fetch error: http://africangreyparrotcentre.co.uk/ => https://africangreyparrotc
 Fetch error: http://www.africangreyparrotcentre.co.uk/ => https://www.africangreyparrotcentre.co.uk/: (60, 'SSL certificate problem: self signed certificate')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.africangreyparrotcentre.co.uk/ => https://www.africangre
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Aftenbladet.no.xml b/src/chrome/content/rules/Aftenbladet.no.xml
new file mode 100644
index 000000000000..a164f7587fa4
--- /dev/null
+++ b/src/chrome/content/rules/Aftenbladet.no.xml
@@ -0,0 +1,95 @@
+
+
+
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Aftenposten.no-falsemixed.xml b/src/chrome/content/rules/Aftenposten.no-falsemixed.xml
deleted file mode 100644
index fee082feb8e3..000000000000
--- a/src/chrome/content/rules/Aftenposten.no-falsemixed.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-        
-        
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Aftenposten.xml b/src/chrome/content/rules/Aftenposten.xml
index d9ade956cfd3..4c75de46f2f9 100644
--- a/src/chrome/content/rules/Aftenposten.xml
+++ b/src/chrome/content/rules/Aftenposten.xml
@@ -1,123 +1,28 @@
 
 
-
-        
-        
-		
-		
-		
-		
-		
-		
-	
-
-
-	
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-	
-
-	
-	
-
-	
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+
+	
 
diff --git a/src/chrome/content/rules/Afterdawn.com.xml b/src/chrome/content/rules/Afterdawn.com.xml
new file mode 100644
index 000000000000..d3080c2c1b62
--- /dev/null
+++ b/src/chrome/content/rules/Afterdawn.com.xml
@@ -0,0 +1,30 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Afterpay.co.nz.xml b/src/chrome/content/rules/Afterpay.co.nz.xml
new file mode 100644
index 000000000000..92a38fa1bd1b
--- /dev/null
+++ b/src/chrome/content/rules/Afterpay.co.nz.xml
@@ -0,0 +1,13 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Afterpay.com.au.xml b/src/chrome/content/rules/Afterpay.com.au.xml
new file mode 100644
index 000000000000..8ae9dfead234
--- /dev/null
+++ b/src/chrome/content/rules/Afterpay.com.au.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Afton_Trial_Run.xml b/src/chrome/content/rules/Afton_Trial_Run.xml
index 2f55ae5d34a2..3759c1aca8e9 100644
--- a/src/chrome/content/rules/Afton_Trial_Run.xml
+++ b/src/chrome/content/rules/Afton_Trial_Run.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Aftonbladet.xml b/src/chrome/content/rules/Aftonbladet.xml
index ad9e5822c6e5..f8e087d298a6 100644
--- a/src/chrome/content/rules/Aftonbladet.xml
+++ b/src/chrome/content/rules/Aftonbladet.xml
@@ -1,89 +1,51 @@
 
+
 
 
-	
+	
+
+	
+	
 	
-	
 	
 	
-	
-
-	
-	
-	
-
-		
-		
-		
-		
-
-			
-			
-			
-			
+	
+	
+	
 
-			
-			
+	
 
-
-	
-	
+	
 
 	
 
-
-	
-
 	
 
-	
-
+	
+	
 
diff --git a/src/chrome/content/rules/Afx.ms.xml b/src/chrome/content/rules/Afx.ms.xml
index bb451b67e995..70567b73952c 100644
--- a/src/chrome/content/rules/Afx.ms.xml
+++ b/src/chrome/content/rules/Afx.ms.xml
@@ -18,7 +18,7 @@ Fetch error: http://bay176.afx.ms/ => https://bay176.afx.ms/: (6, 'Could not res
 			- dub12[0-4]
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Agari.xml b/src/chrome/content/rules/Agari.xml
index 11b55e8fdc25..595a69a75de4 100644
--- a/src/chrome/content/rules/Agari.xml
+++ b/src/chrome/content/rules/Agari.xml
@@ -9,7 +9,9 @@ Fetch error: http://agari.com/ => https://agari.com/: (51, "SSL: no alternative
 
 
 	
-	
+	
+	
+	
 
 
 	
@@ -21,4 +23,4 @@ Fetch error: http://agari.com/ => https://agari.com/: (51, "SSL: no alternative
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Agariomods.com.xml b/src/chrome/content/rules/Agariomods.com.xml
index 2b577edaaadb..61c2d24bed25 100644
--- a/src/chrome/content/rules/Agariomods.com.xml
+++ b/src/chrome/content/rules/Agariomods.com.xml
@@ -12,8 +12,8 @@
 
 	
 	
-	
+
 	
 
-	
+
diff --git a/src/chrome/content/rules/Age_of_Mine.com.xml b/src/chrome/content/rules/Age_of_Mine.com.xml
index 5377d6022863..35675863aff4 100644
--- a/src/chrome/content/rules/Age_of_Mine.com.xml
+++ b/src/chrome/content/rules/Age_of_Mine.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://ageofmine.com/ => https://ageofmine.com/: (28, 'Operation ti
 Fetch error: http://www.ageofmine.com/ => https://www.ageofmine.com/: (28, 'Operation timed out after 30001 milliseconds with 0 bytes received')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Agentbot.net.xml b/src/chrome/content/rules/Agentbot.net.xml
index 875ed735452e..9990239dcb3f 100644
--- a/src/chrome/content/rules/Agentbot.net.xml
+++ b/src/chrome/content/rules/Agentbot.net.xml
@@ -4,7 +4,7 @@
 
 	Cert mismatch:
 		- ^ & www
-		
+
 	Chain issues:
 		- activity.agentbot.net
 		- dev-activity.agentbot.net
diff --git a/src/chrome/content/rules/Aggregate_Knowledge.xml b/src/chrome/content/rules/Aggregate_Knowledge.xml
index de3e77980a4f..da849e397d43 100644
--- a/src/chrome/content/rules/Aggregate_Knowledge.xml
+++ b/src/chrome/content/rules/Aggregate_Knowledge.xml
@@ -43,7 +43,7 @@ Fetch error: http://www-stage.aggregateknowledge.com/ => https://www.aggregatekn
 		- .aggregateknowledge.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Agmk.net.xml b/src/chrome/content/rules/Agmk.net.xml
index 1b8c552ef104..a5c6ec2bda09 100644
--- a/src/chrome/content/rules/Agmk.net.xml
+++ b/src/chrome/content/rules/Agmk.net.xml
@@ -5,7 +5,7 @@
 	
 
 
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Agra-net.com.xml b/src/chrome/content/rules/Agra-net.com.xml
index c8c46619d84d..3d5e540231dd 100644
--- a/src/chrome/content/rules/Agra-net.com.xml
+++ b/src/chrome/content/rules/Agra-net.com.xml
@@ -34,7 +34,7 @@ Fetch error: http://store.agra-net.com/ => https://store.agra-net.com/: (60, 'SS
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Agri_Supply.com.xml b/src/chrome/content/rules/Agri_Supply.com.xml
index 29f9dcda10a1..2e192d4aa95c 100644
--- a/src/chrome/content/rules/Agri_Supply.com.xml
+++ b/src/chrome/content/rules/Agri_Supply.com.xml
@@ -13,4 +13,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ahm.com.au.xml b/src/chrome/content/rules/Ahm.com.au.xml
index b31cc56cb49f..89a28b119520 100644
--- a/src/chrome/content/rules/Ahm.com.au.xml
+++ b/src/chrome/content/rules/Ahm.com.au.xml
@@ -1,7 +1,9 @@
 
 
 	
-	
+	
+	
+	
 		
@@ -19,7 +21,6 @@
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/AhnLab.com.xml b/src/chrome/content/rules/AhnLab.com.xml
new file mode 100644
index 000000000000..e56f5778b17a
--- /dev/null
+++ b/src/chrome/content/rules/AhnLab.com.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Ahnlab.com.xml b/src/chrome/content/rules/Ahnlab.com.xml
deleted file mode 100644
index 7425a2d3bf09..000000000000
--- a/src/chrome/content/rules/Ahnlab.com.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-	
-	
-	
-
-
diff --git a/src/chrome/content/rules/Aidsmap.com.xml b/src/chrome/content/rules/Aidsmap.com.xml
index 254c7337816c..da604b40392f 100644
--- a/src/chrome/content/rules/Aidsmap.com.xml
+++ b/src/chrome/content/rules/Aidsmap.com.xml
@@ -16,7 +16,7 @@ Fetch error: http://aidsmap.com/ => https://www.aidsmap.com/: (35, 'Unknown SSL
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Aim4Media.com.xml b/src/chrome/content/rules/Aim4Media.com.xml
index 2609b1db5b78..486bd32e7021 100644
--- a/src/chrome/content/rules/Aim4Media.com.xml
+++ b/src/chrome/content/rules/Aim4Media.com.xml
@@ -21,7 +21,7 @@ Non-2xx HTTP code: http://ad.aim4media.com/ (200) => https://ad.yieldmanager.com
 		- ad	(→ ad.yieldmanager.com)
 
 -->
-
+
 
 	
 
@@ -29,4 +29,4 @@ Non-2xx HTTP code: http://ad.aim4media.com/ (200) => https://ad.yieldmanager.com
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Air-Canada-Pilots-Association.xml b/src/chrome/content/rules/Air-Canada-Pilots-Association.xml
index 7ecddf72df7f..b5b059396517 100644
--- a/src/chrome/content/rules/Air-Canada-Pilots-Association.xml
+++ b/src/chrome/content/rules/Air-Canada-Pilots-Association.xml
@@ -7,7 +7,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://secure.acpa.ca/ => https://secure.acpa.ca/: (51, "SSL: no alternative certificate subject name matches target host name 'www.acpa.ca'")	secure.... homepage redirects to www
 	other pages redirect to http://secure...
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/AirAsia.xml b/src/chrome/content/rules/AirAsia.xml
index 57d7d3b9c435..856919e9833b 100644
--- a/src/chrome/content/rules/AirAsia.xml
+++ b/src/chrome/content/rules/AirAsia.xml
@@ -47,6 +47,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/AirMalta.com.xml b/src/chrome/content/rules/AirMalta.com.xml
new file mode 100644
index 000000000000..694d10608882
--- /dev/null
+++ b/src/chrome/content/rules/AirMalta.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/AirMap.xml b/src/chrome/content/rules/AirMap.xml
index 5b65c66e8f41..6f55a6ea0555 100644
--- a/src/chrome/content/rules/AirMap.xml
+++ b/src/chrome/content/rules/AirMap.xml
@@ -21,9 +21,9 @@
 	
 	
 	
-	
+
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Airbnb.xml b/src/chrome/content/rules/Airbnb.xml
deleted file mode 100644
index 0d2d80e31adb..000000000000
--- a/src/chrome/content/rules/Airbnb.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-	
-	
-	
-
-	
-	
-	
-
-	
-	
-	
-
-	
-	
-	
-
-	
-	
-	
-
-	
-	
-	
-
-	
-	
-	
-
-	
-	
-	
-
-	
-	
-	
-
-	
-	
-	
-
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-
-	
-	
-	
-
-	
-	
-	
-
-	
-	
-	
-
-	
-	
-	
-
-	
-	
-	
-
-	
-	
-
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/AirportBanking.com.xml b/src/chrome/content/rules/AirportBanking.com.xml
new file mode 100644
index 000000000000..d44beaf6d458
--- /dev/null
+++ b/src/chrome/content/rules/AirportBanking.com.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/AirshipVentures.xml b/src/chrome/content/rules/AirshipVentures.xml
index 1212beb92121..e809b2642ab9 100644
--- a/src/chrome/content/rules/AirshipVentures.xml
+++ b/src/chrome/content/rules/AirshipVentures.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.airshipventures.com/ => https://www.airshipventures.com/: (35, 'Unknown SSL protocol error in connection to www.airshipventures.com:443 ')
 Fetch error: http://airshipventures.com/ => https://www.airshipventures.com/: (35, 'Unknown SSL protocol error in connection to www.airshipventures.com:443 ')
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/AirsoftGI.com.xml b/src/chrome/content/rules/AirsoftGI.com.xml
index c2d78c634a1f..c25e69f6a97f 100644
--- a/src/chrome/content/rules/AirsoftGI.com.xml
+++ b/src/chrome/content/rules/AirsoftGI.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://airsoftgi.com/ => https://airsoftgi.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
 	
@@ -15,4 +15,4 @@ Fetch error: http://airsoftgi.com/ => https://airsoftgi.com/: (60, 'SSL certific
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Airtricity.xml b/src/chrome/content/rules/Airtricity.xml
deleted file mode 100644
index 21476f802f4f..000000000000
--- a/src/chrome/content/rules/Airtricity.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-  
-  
-
-  
-  
-
diff --git a/src/chrome/content/rules/AkademikerForsakring.se.xml b/src/chrome/content/rules/AkademikerForsakring.se.xml
index 86c59deba309..44c71a7899f7 100644
--- a/src/chrome/content/rules/AkademikerForsakring.se.xml
+++ b/src/chrome/content/rules/AkademikerForsakring.se.xml
@@ -1,12 +1,16 @@
 
-
+
 	
 	
-	
-	
-	
+	
+	
+
+	
+	
 
diff --git a/src/chrome/content/rules/AkademiskaHus.se.xml b/src/chrome/content/rules/AkademiskaHus.se.xml
index 7fb3b3a8ce50..b3f86bb825e9 100644
--- a/src/chrome/content/rules/AkademiskaHus.se.xml
+++ b/src/chrome/content/rules/AkademiskaHus.se.xml
@@ -1,18 +1,50 @@
 
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Akamai.com.xml b/src/chrome/content/rules/Akamai.com.xml
index b9a65e9a09e3..5c32e8a73c4f 100644
--- a/src/chrome/content/rules/Akamai.com.xml
+++ b/src/chrome/content/rules/Akamai.com.xml
@@ -39,7 +39,7 @@ Non-2xx HTTP code: http://community-uat.akamai.com/ (200) => https://community-u
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Akinator.com.xml b/src/chrome/content/rules/Akinator.com.xml
new file mode 100644
index 000000000000..8cc12b09da6e
--- /dev/null
+++ b/src/chrome/content/rules/Akinator.com.xml
@@ -0,0 +1,23 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Akira.org.xml b/src/chrome/content/rules/Akira.org.xml
index 7eda290b0bbf..beccce20b3e9 100644
--- a/src/chrome/content/rules/Akira.org.xml
+++ b/src/chrome/content/rules/Akira.org.xml
@@ -10,4 +10,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AkolaProject.org.xml b/src/chrome/content/rules/AkolaProject.org.xml
new file mode 100644
index 000000000000..598490da46a0
--- /dev/null
+++ b/src/chrome/content/rules/AkolaProject.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Akola_Project.org.xml b/src/chrome/content/rules/Akola_Project.org.xml
deleted file mode 100644
index bad6e3cac49f..000000000000
--- a/src/chrome/content/rules/Akola_Project.org.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-		
-		
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Aktion-Deutschland-Hilft.de.xml b/src/chrome/content/rules/Aktion-Deutschland-Hilft.de.xml
index f88ac9358693..bafdae6b040a 100644
--- a/src/chrome/content/rules/Aktion-Deutschland-Hilft.de.xml
+++ b/src/chrome/content/rules/Aktion-Deutschland-Hilft.de.xml
@@ -18,7 +18,8 @@
 
 
 	
-	
+	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Aktivix.org.xml b/src/chrome/content/rules/Aktivix.org.xml
index 447a9bb58f30..1e6691e18525 100644
--- a/src/chrome/content/rules/Aktivix.org.xml
+++ b/src/chrome/content/rules/Aktivix.org.xml
@@ -17,7 +17,7 @@ Fetch error: http://lists.aktivix.org/ => https://lists.aktivix.org/: (60, 'SSL
 		- owncloud.aktivix.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Al-Madina.com.xml b/src/chrome/content/rules/Al-Madina.com.xml
new file mode 100644
index 000000000000..af1d93dbd0de
--- /dev/null
+++ b/src/chrome/content/rules/Al-Madina.com.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Al-Sabeel.net.xml b/src/chrome/content/rules/Al-Sabeel.net.xml
new file mode 100644
index 000000000000..b511470fcbe2
--- /dev/null
+++ b/src/chrome/content/rules/Al-Sabeel.net.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Al-akhbar.xml b/src/chrome/content/rules/Al-akhbar.xml
index d2e515b00f83..c01ccb8b97b4 100644
--- a/src/chrome/content/rules/Al-akhbar.xml
+++ b/src/chrome/content/rules/Al-akhbar.xml
@@ -10,4 +10,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AlAdhan.com.xml b/src/chrome/content/rules/AlAdhan.com.xml
new file mode 100644
index 000000000000..5f96beb6e597
--- /dev/null
+++ b/src/chrome/content/rules/AlAdhan.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/AlDiwan.net.xml b/src/chrome/content/rules/AlDiwan.net.xml
new file mode 100644
index 000000000000..65dce1f20310
--- /dev/null
+++ b/src/chrome/content/rules/AlDiwan.net.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/AlFaseeh.com.xml b/src/chrome/content/rules/AlFaseeh.com.xml
new file mode 100644
index 000000000000..2c7dc33e4e68
--- /dev/null
+++ b/src/chrome/content/rules/AlFaseeh.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/AlFeker.net.xml b/src/chrome/content/rules/AlFeker.net.xml
new file mode 100644
index 000000000000..cf79081b2a4d
--- /dev/null
+++ b/src/chrome/content/rules/AlFeker.net.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/AlMohawer.com.xml b/src/chrome/content/rules/AlMohawer.com.xml
new file mode 100644
index 000000000000..790e7e07fe72
--- /dev/null
+++ b/src/chrome/content/rules/AlMohawer.com.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/AlMostaneer.com.xml b/src/chrome/content/rules/AlMostaneer.com.xml
new file mode 100644
index 000000000000..2c0c75128951
--- /dev/null
+++ b/src/chrome/content/rules/AlMostaneer.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/AlNawawiForty.com.xml b/src/chrome/content/rules/AlNawawiForty.com.xml
new file mode 100644
index 000000000000..c823a98f7c14
--- /dev/null
+++ b/src/chrome/content/rules/AlNawawiForty.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/AlRadNet.com.xml b/src/chrome/content/rules/AlRadNet.com.xml
new file mode 100644
index 000000000000..b9bcd58142a7
--- /dev/null
+++ b/src/chrome/content/rules/AlRadNet.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/AlRo7.net.xml b/src/chrome/content/rules/AlRo7.net.xml
new file mode 100644
index 000000000000..d2e7ca8be1fe
--- /dev/null
+++ b/src/chrome/content/rules/AlRo7.net.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/AlTadabbur.com.xml b/src/chrome/content/rules/AlTadabbur.com.xml
new file mode 100644
index 000000000000..0bde512e4832
--- /dev/null
+++ b/src/chrome/content/rules/AlTadabbur.com.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/AlTafsir.com.xml b/src/chrome/content/rules/AlTafsir.com.xml
new file mode 100644
index 000000000000..d2750d0ec9af
--- /dev/null
+++ b/src/chrome/content/rules/AlTafsir.com.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Alaalam.org.xml b/src/chrome/content/rules/Alaalam.org.xml
new file mode 100644
index 000000000000..439cefbfa32b
--- /dev/null
+++ b/src/chrome/content/rules/Alaalam.org.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Alamy.xml b/src/chrome/content/rules/Alamy.xml
index 7f1facf2a53a..a290d54f6c44 100644
--- a/src/chrome/content/rules/Alamy.xml
+++ b/src/chrome/content/rules/Alamy.xml
@@ -10,4 +10,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AlanWalker.com.xml b/src/chrome/content/rules/AlanWalker.com.xml
new file mode 100644
index 000000000000..0636587eabfb
--- /dev/null
+++ b/src/chrome/content/rules/AlanWalker.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Alaska.edu.xml b/src/chrome/content/rules/Alaska.edu.xml
new file mode 100644
index 000000000000..3e003ecab6d0
--- /dev/null
+++ b/src/chrome/content/rules/Alaska.edu.xml
@@ -0,0 +1,49 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/AlaskaAirlines.xml b/src/chrome/content/rules/AlaskaAirlines.xml
index 15a7fca3a90d..dbff470f12ba 100644
--- a/src/chrome/content/rules/AlaskaAirlines.xml
+++ b/src/chrome/content/rules/AlaskaAirlines.xml
@@ -1,9 +1,10 @@
-
-  
-  
+
+	
+	
+	
+	
 
-  
-  
+	
+
+	
 
\ No newline at end of file
diff --git a/src/chrome/content/rules/Albennet.com.xml b/src/chrome/content/rules/Albennet.com.xml
index 0d7a854f6f25..bb0834b7ed27 100644
--- a/src/chrome/content/rules/Albennet.com.xml
+++ b/src/chrome/content/rules/Albennet.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://alb.albennet.com/ => https://alb.albennet.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Albinoloverats.xml b/src/chrome/content/rules/Albinoloverats.xml
index 3126e0d6b4bd..ca071298fdbe 100644
--- a/src/chrome/content/rules/Albinoloverats.xml
+++ b/src/chrome/content/rules/Albinoloverats.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Alcuda.xml b/src/chrome/content/rules/Alcuda.xml
index d38fa48a42c4..6cb2a7514e55 100644
--- a/src/chrome/content/rules/Alcuda.xml
+++ b/src/chrome/content/rules/Alcuda.xml
@@ -6,7 +6,7 @@ Fetch error: http://wl.easydategroup.com/ => http://wl.easydategroup.com/: (6, '
 Fetch error: http://cdn.wl.easydategroup.com/ => http://cdn.wl.easydategroup.com/: (6, 'Could not resolve host: cdn.wl.easydategroup.com')
 
 -->
-
+
 
 	
 	
@@ -16,7 +16,8 @@ Fetch error: http://cdn.wl.easydategroup.com/ => http://cdn.wl.easydategroup.com
 	
 	
 	
-	
+	
+	
 	
 	
 
diff --git a/src/chrome/content/rules/Alecomm.com.xml b/src/chrome/content/rules/Alecomm.com.xml
index 8f744103ab92..cb5f72f18c84 100644
--- a/src/chrome/content/rules/Alecomm.com.xml
+++ b/src/chrome/content/rules/Alecomm.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://alecomm.com/ => https://alecomm.com/: (51, "SSL: no alternat
 Fetch error: http://www.alecomm.com/ => https://www.alecomm.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.alecomm.com'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Alert_Investor_Relations.xml b/src/chrome/content/rules/Alert_Investor_Relations.xml
index 57d286602391..eccd7d47c4f3 100644
--- a/src/chrome/content/rules/Alert_Investor_Relations.xml
+++ b/src/chrome/content/rules/Alert_Investor_Relations.xml
@@ -19,4 +19,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Alfabank.ru.xml b/src/chrome/content/rules/Alfabank.ru.xml
index d88fa15fe769..4acb042f447c 100644
--- a/src/chrome/content/rules/Alfabank.ru.xml
+++ b/src/chrome/content/rules/Alfabank.ru.xml
@@ -24,7 +24,7 @@ alfabank.kz protocol error
 www.alfabank.kz protocol error
 alfaportal.kz mismatch
 www.alfaportal.kz mismatch -->
-
+
 	
 	
 	
@@ -49,12 +49,12 @@ www.alfaportal.kz mismatch -->
 	
 	
 	
-	
+
 	
 
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Alfresco.com.xml b/src/chrome/content/rules/Alfresco.com.xml
index 027b4e447409..82af7d04cfb6 100644
--- a/src/chrome/content/rules/Alfresco.com.xml
+++ b/src/chrome/content/rules/Alfresco.com.xml
@@ -18,7 +18,7 @@ Fetch error: http://wiki.alfresco.com/ => https://wiki.alfresco.com/: (60, 'SSL
 	Wrong content:
 		- dev
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Algonquin-College.xml b/src/chrome/content/rules/Algonquin-College.xml
index f7b1bd69ad2b..826c255c904e 100644
--- a/src/chrome/content/rules/Algonquin-College.xml
+++ b/src/chrome/content/rules/Algonquin-College.xml
@@ -4,15 +4,15 @@
 	
 
 	
-		
+	
 	
 	
 	
-		
+	
 
 	
 
 	
-		
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/AliCDN.com.xml b/src/chrome/content/rules/AliCDN.com.xml
index fcc18ad15477..543ab6b7bd3d 100644
--- a/src/chrome/content/rules/AliCDN.com.xml
+++ b/src/chrome/content/rules/AliCDN.com.xml
@@ -29,10 +29,10 @@
 
 	¹ Mismatched
 	² Akamai / mismatched
-	
+
 	Time out:
 		- im
-	
+
 	Check encoding error:
 		- static-src
 
@@ -99,7 +99,7 @@
 	
 	
 
-			
+		
 		
 		
 		
diff --git a/src/chrome/content/rules/AliExpress.com.xml b/src/chrome/content/rules/AliExpress.com.xml
index 9ea762a11afe..14cd496bd84d 100644
--- a/src/chrome/content/rules/AliExpress.com.xml
+++ b/src/chrome/content/rules/AliExpress.com.xml
@@ -8,44 +8,29 @@
 
 		- bbs.seller ¹
 		- escrow
+		- m.fulfillment ²
 
 	¹ Dropped
+	² Invalid certificate
 
 
 	Problematic hosts in *aliexpress.com:
 
+		- $self ˣ
+		- www ˣ
 		- activities ˣ
-		- gw.api ˣ
-		- brands ᵐ
-		- s.click ᵐ
-		- collections ˣ
 		- daxue ˣ
-		- es ᵐ ˣ
 		- fulfillment ˣ
-		- fuwu ˣ
-		- gaga ˣ
-		- group ˣ
-		- he ᵐ
-		- hz ˣ
-		- id ˣ
-		- ja ᵐ
-		- m ᵐ
-		- mai ˣ
 		- open ˣ
-		- page ˣ
-		- pt ᵐ
-		- ru ᵐ ˣ
-		- sale ᵐ ˣ
 		- seller ˣ
-		- superdeals ˣ
 
-	ᵐ Mismatched
-	ˣ Mixed css, see https://www.paulirish.com/2010/the-protocol-relative-url/
+	ˣ Active mixed content, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 
 	Insecure cookies are set for these domains and hosts: ᶜ
 
 		- .aliexpress.com
+		- www.aliexpress.com
 		- best.aliexpress.com
 		- coupon.aliexpress.com
 		- group.aliexpress.com
@@ -53,7 +38,6 @@
 		- promotion.aliexpress.com
 		- shoppingcart.aliexpress.com
 		- university.aliexpress.com
-		- www.aliexpress.com
 		- (locale_vhost).aliexpress.com
 
 	ᶜ See https://owasp.org/index.php/SecureFlag
@@ -65,77 +49,118 @@
 
 		- css, on:
 
-			- activities, collections, daxue, es, fuwu, gaga, group, hz, id, it, mai, open, page, pl, superdeals, th from style.aliunicorn.com ˢ
+			- www from style.aliunicorn.com
+			- activities, daxue, open, th from style.aliunicorn.com ˢ
 			- fulfillment from style.alibaba.com ˢ
-			- gw.api from style.c.aliimg.com ˢ
-			- mai img.alibaba.com ˢ
+			- seller from style.alibaba.com
 			- sale from i0\d.i.aliimg.com ˢ
 
+		- js, on:
+
+			- seller from style.alibaba.com
+			- www, seller from style.aliexpress.com
+			- www, open from style.aliunicorn.com
+
 		- Images, on:
 
-			- activities, gw.api, ar, de, es, group, he, id, ja, ko, mai, nl, pl, pt, ru, tr, vi from img.alibaba.com ˢ
-			- activities, fulfillment, gaga, seller from i0\d.i.aliimg.com ˢ
+			- activities, open from img.alibaba.com ˢ
+			- activities, fulfillment, seller from i0\d.i.aliimg.com ˢ
 			- activities from style.aliunicorn.com ˢ
-			- ar, best, brands, de, coupon, group, hz, it, ja, ko, nl, page, pl, ru, sale, th, tr, vi from g0\d.a.alicdn.com ˢ
 			- fulfillment, hz from img.alibaba.com ˢ
+			- open from gtms01.alicdn.com
 			- university from gtms04.alicdn.com ˢ
 
-		- Bug on activities, collections, coupon, daxue, de, es, fr, fulfillment, fuwu, gaga, group, he, id, it, ja, ko, mai, nl, open, page, pl, pt, ru, seller, superdeals, th, tr, trade, university, vi from dmtracking2.alibaba.com ˢ
+		- Bug on activities, daxue, fulfillment, open, seller from dmtracking2.alibaba.com ˢ
 
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
 
 
-	
-	
+	
+	
 	
 	
-	
 	
+	
 	
-	
+	
+	
+	
 	
 	
 	
 	
+	
+	
+	
+	
 	
+	
 	
-	
-	
+	
+	
+	
+	
 	
 	
-	
+	
+	
+	
 	
+	
+	
+	
 	
+	
 	
-	
+	
+	
 	
 	
+	
 	
-	
+	
 	
 	
+	
+	
 	
+	
 	
+	
 	
-	
+	
+	
+	
 	
+	
 	
+	
 	
 	
 	
 	
+	
 	
 	
 	
 
 		
-		
+		
+		
 		
+		
 		
-		
+		
+
+		
+		
+		
+		
+		
 
 
 	
 	
 	
 	
@@ -176,7 +184,6 @@
 	
 	
 	
-	
 	
 	
 	
@@ -209,7 +216,7 @@
 	
 	
 	
-	
+	
 	
 	
 	
@@ -254,6 +261,11 @@
 	
 	
 
+		
+		
+
+
 	
 	
diff --git a/src/chrome/content/rules/AliceDSL.xml b/src/chrome/content/rules/AliceDSL.xml
index a68a9429ac81..40da09b5cc2d 100644
--- a/src/chrome/content/rules/AliceDSL.xml
+++ b/src/chrome/content/rules/AliceDSL.xml
@@ -10,11 +10,11 @@ Fetch error: http://alice.de/ => https://www.alice-dsl.de/: (7, 'Failed to conne
 Fetch error: http://alice-dsl.de/ => https://www.alice-dsl.de/: (7, 'Failed to connect to www.alice-dsl.de port 443: No route to host')
 Fetch error: http://www.alice-dsl.de/ => https://www.alice-dsl.de/: (7, 'Failed to connect to www.alice-dsl.de port 443: No route to host')
 -->
-
+
   
-  
+  
   
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/Alien.net.au.xml b/src/chrome/content/rules/Alien.net.au.xml
index 0cf53e089fe9..58106913b7c5 100644
--- a/src/chrome/content/rules/Alien.net.au.xml
+++ b/src/chrome/content/rules/Alien.net.au.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://alien.net.au/ => https://alien.net.au/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/AlienVault.xml b/src/chrome/content/rules/AlienVault.xml
index 7e3f083eff45..b88087028d5e 100644
--- a/src/chrome/content/rules/AlienVault.xml
+++ b/src/chrome/content/rules/AlienVault.xml
@@ -8,7 +8,11 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 
 
 	
@@ -19,12 +23,11 @@
 	
 
-	
 
 	
 	
 
+	
 
diff --git a/src/chrome/content/rules/AliorBank.pl.xml b/src/chrome/content/rules/AliorBank.pl.xml
new file mode 100644
index 000000000000..57ea761623e4
--- /dev/null
+++ b/src/chrome/content/rules/AliorBank.pl.xml
@@ -0,0 +1,161 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Alipay.com.xml b/src/chrome/content/rules/Alipay.com.xml
index 786472178c1d..979e930055c0 100644
--- a/src/chrome/content/rules/Alipay.com.xml
+++ b/src/chrome/content/rules/Alipay.com.xml
@@ -72,7 +72,7 @@
 	
 	
 	
-	
+
 	
 	
 	
@@ -87,9 +87,9 @@
 
 	
 
-	
 
-	
 
diff --git a/src/chrome/content/rules/Alivenotdead.com.xml b/src/chrome/content/rules/Alivenotdead.com.xml
deleted file mode 100644
index 8e937788db2b..000000000000
--- a/src/chrome/content/rules/Alivenotdead.com.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Alkalm.net.xml b/src/chrome/content/rules/Alkalm.net.xml
new file mode 100644
index 000000000000..72a0bb92d79f
--- /dev/null
+++ b/src/chrome/content/rules/Alkalm.net.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Alkasir.com.xml b/src/chrome/content/rules/Alkasir.com.xml
deleted file mode 100644
index 41dfc050ea68..000000000000
--- a/src/chrome/content/rules/Alkasir.com.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/All-Above-Offers.xml b/src/chrome/content/rules/All-Above-Offers.xml
deleted file mode 100644
index 746e1f12a499..000000000000
--- a/src/chrome/content/rules/All-Above-Offers.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/AllCoin.com.xml b/src/chrome/content/rules/AllCoin.com.xml
deleted file mode 100644
index 72c9a4f5a835..000000000000
--- a/src/chrome/content/rules/AllCoin.com.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/AllJoyn.org.xml b/src/chrome/content/rules/AllJoyn.org.xml
deleted file mode 100644
index 86733a04f216..000000000000
--- a/src/chrome/content/rules/AllJoyn.org.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/AllMyChanges.com.xml b/src/chrome/content/rules/AllMyChanges.com.xml
index 2cd1e05ca833..21100ffd993f 100644
--- a/src/chrome/content/rules/AllMyChanges.com.xml
+++ b/src/chrome/content/rules/AllMyChanges.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://www.allmychanges.com/ => https://www.allmychanges.com/: (51,
 		- allmychanges.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/AllPlayers.com.xml b/src/chrome/content/rules/AllPlayers.com.xml
deleted file mode 100644
index 5c9d039552b5..000000000000
--- a/src/chrome/content/rules/AllPlayers.com.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/AllSeen_Alliance.org.xml b/src/chrome/content/rules/AllSeen_Alliance.org.xml
deleted file mode 100644
index 89ae54e106a8..000000000000
--- a/src/chrome/content/rules/AllSeen_Alliance.org.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/AllShare_Play.xml b/src/chrome/content/rules/AllShare_Play.xml
index 1679a0ba72d3..193c1acc5ffc 100644
--- a/src/chrome/content/rules/AllShare_Play.xml
+++ b/src/chrome/content/rules/AllShare_Play.xml
@@ -10,12 +10,12 @@ Fetch error: http://www.allshareplay.com/ => https://www.allshareplay.com/: (6,
 Fetch error: http://fwk.allshareplay.com/ => https://fwk.allshareplay.com/: (6, 'Could not resolve host: fwk.allshareplay.com')
 
 	For other Samsung coverage, see Samsung.com.xml.
-	
+
 	Mismatch:
 		sw.*
 -->
 
-
+
 
 	
 	
@@ -25,14 +25,14 @@ Fetch error: http://fwk.allshareplay.com/ => https://fwk.allshareplay.com/: (6,
 	
 	
 		
-	
+
 	
 	
 		
-		
+
 	
 		
 		
-		
+
 
diff --git a/src/chrome/content/rules/AllUnmanaged.com.xml b/src/chrome/content/rules/AllUnmanaged.com.xml
deleted file mode 100644
index a901d29e86cd..000000000000
--- a/src/chrome/content/rules/AllUnmanaged.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/AllYouCanArcade.com.xml b/src/chrome/content/rules/AllYouCanArcade.com.xml
new file mode 100644
index 000000000000..4b4c24163c68
--- /dev/null
+++ b/src/chrome/content/rules/AllYouCanArcade.com.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/All_American_Trains.xml b/src/chrome/content/rules/All_American_Trains.xml
index 6419977a9fba..2179f7a92418 100644
--- a/src/chrome/content/rules/All_American_Trains.xml
+++ b/src/chrome/content/rules/All_American_Trains.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/All_Day_Calm.xml b/src/chrome/content/rules/All_Day_Calm.xml
index 34296d2837e0..17d0694564c7 100644
--- a/src/chrome/content/rules/All_Day_Calm.xml
+++ b/src/chrome/content/rules/All_Day_Calm.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/All_Star_Tire.xml b/src/chrome/content/rules/All_Star_Tire.xml
index 1d6af8a7d0b0..33d5f1aa6efd 100644
--- a/src/chrome/content/rules/All_Star_Tire.xml
+++ b/src/chrome/content/rules/All_Star_Tire.xml
@@ -4,9 +4,9 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/All_You_Can_Arcade.com.xml b/src/chrome/content/rules/All_You_Can_Arcade.com.xml
deleted file mode 100644
index 46e6f35628a4..000000000000
--- a/src/chrome/content/rules/All_You_Can_Arcade.com.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Allegro.pl.xml b/src/chrome/content/rules/Allegro.pl.xml
new file mode 100644
index 000000000000..e81b36ab94f3
--- /dev/null
+++ b/src/chrome/content/rules/Allegro.pl.xml
@@ -0,0 +1,19 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Allegro.xml b/src/chrome/content/rules/Allegro.xml
deleted file mode 100644
index fc4bec30e895..000000000000
--- a/src/chrome/content/rules/Allegro.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-  
-  
-
-  
-
diff --git a/src/chrome/content/rules/Allegrolokalnie.pl.xml b/src/chrome/content/rules/Allegrolokalnie.pl.xml
new file mode 100644
index 000000000000..3d11e088ead2
--- /dev/null
+++ b/src/chrome/content/rules/Allegrolokalnie.pl.xml
@@ -0,0 +1,6 @@
+
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/AllemandFacile.com.xml b/src/chrome/content/rules/AllemandFacile.com.xml
new file mode 100644
index 000000000000..3ddc1d4ba0f4
--- /dev/null
+++ b/src/chrome/content/rules/AllemandFacile.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/AllianceBernstein.xml b/src/chrome/content/rules/AllianceBernstein.xml
index 766b02454801..fd833ee4a394 100644
--- a/src/chrome/content/rules/AllianceBernstein.xml
+++ b/src/chrome/content/rules/AllianceBernstein.xml
@@ -1,7 +1,6 @@
 
+	
+	
+	
 
 
 	
-
+
 
-	
 	
+	
+	
+	
+	
 	
-	
+	
+	
+	
+	
+	
+	
+	
 	
+	
+	
 	
-	
-
-	
-	
-
-
-	
-	
-	
+	
 
 	
 
-
-	
-	
-
-		
-
 	
 
diff --git a/src/chrome/content/rules/Allmyvideos.net.xml b/src/chrome/content/rules/Allmyvideos.net.xml
index 7ff122908264..fb8e5d937412 100644
--- a/src/chrome/content/rules/Allmyvideos.net.xml
+++ b/src/chrome/content/rules/Allmyvideos.net.xml
@@ -26,7 +26,7 @@ Fetch error: http://www.allmyvideos.net/ => https://www.allmyvideos.net/: (60, '
 	* Unsecurable
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Allo-Grenouille.fr.xml b/src/chrome/content/rules/Allo-Grenouille.fr.xml
deleted file mode 100644
index 421b06cf1397..000000000000
--- a/src/chrome/content/rules/Allo-Grenouille.fr.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Alloscomp.com.xml b/src/chrome/content/rules/Alloscomp.com.xml
index ca94a9ea8150..bae6d3fe9301 100644
--- a/src/chrome/content/rules/Alloscomp.com.xml
+++ b/src/chrome/content/rules/Alloscomp.com.xml
@@ -13,6 +13,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/Alloy_Digital.xml b/src/chrome/content/rules/Alloy_Digital.xml
index 1a9ccca765a8..cd29b05b85fa 100644
--- a/src/chrome/content/rules/Alloy_Digital.xml
+++ b/src/chrome/content/rules/Alloy_Digital.xml
@@ -56,7 +56,7 @@ Fetch error: http://cdn.thegrindstone.com/ => https://d176o63igdzvgd.cloudfront.
 		- (www.)thegrindstone.com	(ditto)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Allpoetry.xml b/src/chrome/content/rules/Allpoetry.xml
index ace8d38835a7..e2365c5f8a8b 100644
--- a/src/chrome/content/rules/Allpoetry.xml
+++ b/src/chrome/content/rules/Allpoetry.xml
@@ -11,7 +11,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Alltop.com.xml b/src/chrome/content/rules/Alltop.com.xml
index 71c914d19d26..4e7a0795b8fb 100644
--- a/src/chrome/content/rules/Alltop.com.xml
+++ b/src/chrome/content/rules/Alltop.com.xml
@@ -1,5 +1,5 @@
 
 
diff --git a/src/chrome/content/rules/Alluremedia.com.xml b/src/chrome/content/rules/Alluremedia.com.xml
new file mode 100644
index 000000000000..5550b054d859
--- /dev/null
+++ b/src/chrome/content/rules/Alluremedia.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Alluremedia.xml b/src/chrome/content/rules/Alluremedia.xml
deleted file mode 100644
index 0ae96dc834f6..000000000000
--- a/src/chrome/content/rules/Alluremedia.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Ally_Financial-problematic.xml b/src/chrome/content/rules/Ally_Financial-problematic.xml
index 44f485e62932..09145d05960e 100644
--- a/src/chrome/content/rules/Ally_Financial-problematic.xml
+++ b/src/chrome/content/rules/Ally_Financial-problematic.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ally_Financial.xml b/src/chrome/content/rules/Ally_Financial.xml
index d5f74ba59749..a2b4583967db 100644
--- a/src/chrome/content/rules/Ally_Financial.xml
+++ b/src/chrome/content/rules/Ally_Financial.xml
@@ -39,10 +39,16 @@ Fetch error: http://www.smartauction.biz/ => https://www.smartauction.biz/: (60,
 		- www.smartauction.biz
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
 	
 	
 	
@@ -51,13 +57,10 @@ Fetch error: http://www.smartauction.biz/ => https://www.smartauction.biz/: (60,
 	
 
 
-	
 
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Alonetone.xml b/src/chrome/content/rules/Alonetone.xml
deleted file mode 100644
index 93380b81420e..000000000000
--- a/src/chrome/content/rules/Alonetone.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/AlphaSSL.xml b/src/chrome/content/rules/AlphaSSL.xml
index addb81cc6f5f..3ee86fc959d0 100644
--- a/src/chrome/content/rules/AlphaSSL.xml
+++ b/src/chrome/content/rules/AlphaSSL.xml
@@ -7,4 +7,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AlpineLinux.org.xml b/src/chrome/content/rules/AlpineLinux.org.xml
new file mode 100644
index 000000000000..6efe18dcc27a
--- /dev/null
+++ b/src/chrome/content/rules/AlpineLinux.org.xml
@@ -0,0 +1,75 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+	
+	
+
+	
+
+
+	
+
+
diff --git a/src/chrome/content/rules/Alpine_Linux.org.xml b/src/chrome/content/rules/Alpine_Linux.org.xml
deleted file mode 100644
index 1bc612db3dc9..000000000000
--- a/src/chrome/content/rules/Alpine_Linux.org.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/AlreadyHosting.com.xml b/src/chrome/content/rules/AlreadyHosting.com.xml
deleted file mode 100644
index 53cde3c5f3df..000000000000
--- a/src/chrome/content/rules/AlreadyHosting.com.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Alta_Ski_Area.xml b/src/chrome/content/rules/Alta_Ski_Area.xml
index 8c55c4159912..47b62b6a5800 100644
--- a/src/chrome/content/rules/Alta_Ski_Area.xml
+++ b/src/chrome/content/rules/Alta_Ski_Area.xml
@@ -5,7 +5,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -14,7 +15,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Alteeve.ca.xml b/src/chrome/content/rules/Alteeve.ca.xml
index eb35077727c0..85b03c80aa80 100644
--- a/src/chrome/content/rules/Alteeve.ca.xml
+++ b/src/chrome/content/rules/Alteeve.ca.xml
@@ -1,16 +1,13 @@
 
-
 
+
 	
-
+	
 
 	
 
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/AlterNet.xml b/src/chrome/content/rules/AlterNet.xml
index 3fd2e07525b4..84211c400a64 100644
--- a/src/chrome/content/rules/AlterNet.xml
+++ b/src/chrome/content/rules/AlterNet.xml
@@ -6,7 +6,7 @@
 		files.alternet.org
 			
 			
-			(but website sometimes links to https even though it is 
+			(but website sometimes links to https even though it is
 			 broken.)
 
 -->
diff --git a/src/chrome/content/rules/Altera.com.xml b/src/chrome/content/rules/Altera.com.xml
index 93ce705a8d89..b5b2dd1f2d99 100644
--- a/src/chrome/content/rules/Altera.com.xml
+++ b/src/chrome/content/rules/Altera.com.xml
@@ -21,4 +21,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AlternC.xml b/src/chrome/content/rules/AlternC.xml
index 6b59638a5cbe..a175519cdfbc 100644
--- a/src/chrome/content/rules/AlternC.xml
+++ b/src/chrome/content/rules/AlternC.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.alternc.org/ => https://www.alternc.org/: (51, "SSL: no
 		- mail.demo	(redirects to demo)
 
 -->
-
+
 
 	
 	
@@ -21,4 +21,4 @@ Fetch error: http://www.alternc.org/ => https://www.alternc.org/: (51, "SSL: no
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Alternate.xml b/src/chrome/content/rules/Alternate.xml
index 6ad5acad8767..f7c5e734db9c 100644
--- a/src/chrome/content/rules/Alternate.xml
+++ b/src/chrome/content/rules/Alternate.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://alternate-b2b.nl/ => https://alternate-b2b.nl/: (51, "SSL: no alternative certificate subject name matches target host name 'alternate-b2b.nl'")
 
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/Altex.ro.xml b/src/chrome/content/rules/Altex.ro.xml
index 46b9bc00cd10..67d134f2417d 100644
--- a/src/chrome/content/rules/Altex.ro.xml
+++ b/src/chrome/content/rules/Altex.ro.xml
@@ -27,14 +27,14 @@ Fetch error: http://cdn.altex.ro/ => https://d2qpxedcu5ji30.cloudfront.net/: (28
 		- css on www from cdn.altex.ro *
 
 		- Images, on:
-		
+
 			- www from admin.altex.ro
 			- www from cdn.altex.ro *
 
 	* Secured by us
 
 -->
-
+
 
 	
@@ -55,10 +55,6 @@ Fetch error: http://cdn.altex.ro/ => https://d2qpxedcu5ji30.cloudfront.net/: (28
 	
 
 
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Altimate_Wellness.xml b/src/chrome/content/rules/Altimate_Wellness.xml
deleted file mode 100644
index 58c6deceae99..000000000000
--- a/src/chrome/content/rules/Altimate_Wellness.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Alukah.net.xml b/src/chrome/content/rules/Alukah.net.xml
new file mode 100644
index 000000000000..c73a54768dd7
--- /dev/null
+++ b/src/chrome/content/rules/Alukah.net.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/AlumFX.com.xml b/src/chrome/content/rules/AlumFX.com.xml
index c2471499a39a..b9f387ef5022 100644
--- a/src/chrome/content/rules/AlumFX.com.xml
+++ b/src/chrome/content/rules/AlumFX.com.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Alumniconnections.com.xml b/src/chrome/content/rules/Alumniconnections.com.xml
index a009642addaf..298ef27607e0 100644
--- a/src/chrome/content/rules/Alumniconnections.com.xml
+++ b/src/chrome/content/rules/Alumniconnections.com.xml
@@ -6,16 +6,16 @@ Fetch error: http://alumniconnections.com/ => https://alumniconnections.com/: (2
 	For other iModules coverage, see IModules.xml.
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Alzheimers_Association.xml b/src/chrome/content/rules/Alzheimers_Association.xml
index d9715a97cf44..610b46b226f8 100644
--- a/src/chrome/content/rules/Alzheimers_Association.xml
+++ b/src/chrome/content/rules/Alzheimers_Association.xml
@@ -26,7 +26,9 @@
 
 
 	
-	
+	
+	
+	
 		
 		
 
@@ -43,7 +45,6 @@
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Alzheimers_Society.xml b/src/chrome/content/rules/Alzheimers_Society.xml
index c34e6275b427..9b1d6368d7a1 100644
--- a/src/chrome/content/rules/Alzheimers_Society.xml
+++ b/src/chrome/content/rules/Alzheimers_Society.xml
@@ -13,7 +13,8 @@ Fetch error: http://alzheimers.org.uk/ => https://www.alzheimers.org.uk/: (60, '
 
 
 	
-	
+	
+	
 
 
 	
@@ -25,4 +26,4 @@ Fetch error: http://alzheimers.org.uk/ => https://www.alzheimers.org.uk/: (60, '
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AmEx_Travel.com.xml b/src/chrome/content/rules/AmEx_Travel.com.xml
deleted file mode 100644
index 47c016f34371..000000000000
--- a/src/chrome/content/rules/AmEx_Travel.com.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/AmExserve-static.com.xml b/src/chrome/content/rules/AmExserve-static.com.xml
deleted file mode 100644
index bf155552c691..000000000000
--- a/src/chrome/content/rules/AmExserve-static.com.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/AmamiyaSora.jp.xml b/src/chrome/content/rules/AmamiyaSora.jp.xml
new file mode 100644
index 000000000000..53cf18a4c833
--- /dev/null
+++ b/src/chrome/content/rules/AmamiyaSora.jp.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Amazingweb.xml b/src/chrome/content/rules/Amazingweb.xml
index cbc6ca75d183..21d95feeb956 100644
--- a/src/chrome/content/rules/Amazingweb.xml
+++ b/src/chrome/content/rules/Amazingweb.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Amazon-Adsystem.com.xml b/src/chrome/content/rules/Amazon-Adsystem.com.xml
index 593c23039293..af4b57af2f8f 100644
--- a/src/chrome/content/rules/Amazon-Adsystem.com.xml
+++ b/src/chrome/content/rules/Amazon-Adsystem.com.xml
@@ -33,16 +33,26 @@
 				-->
 	
 	
+	
+	
+	
 	
 	
+	
+	
 	
 	
+	
 	
+	
+	
 	
 	
 	
+	
 	
 	
+	
 	
 
 	
 
-
 	
 	
 	
@@ -80,7 +72,6 @@
 	
 	
 	
-	
 	
 	
 	
@@ -88,41 +79,34 @@
 	
 	
 	
-	
+	
 	
 	
 	
 	
 	
 	
-	
+	
 	
 	
-	
+	
 	
 	
 		
 	
-	
+	
 	
 
-	
-	
-
-	
-	
+	
 
 	
-
 		
 
 	
-
 		
+		
 
 	
-
 
diff --git a/src/chrome/content/rules/AmazonAWS.com.xml b/src/chrome/content/rules/AmazonAWS.com.xml
index 4c99904199fc..00b8a2e63ffd 100644
--- a/src/chrome/content/rules/AmazonAWS.com.xml
+++ b/src/chrome/content/rules/AmazonAWS.com.xml
@@ -4,196 +4,25 @@
 	Nonfunctional domains:
 
 		- cloudfront-labs.amazonaws.com		(refused)
-
+    - any s3.amazonaws.com (V1) will be nonfunctional after Sept 30, 2020
 
 	Problematic domains:
 
 		- (.+.)s3-website-eu-west-1.amazonaws.com
 		- (.+.)s3-website-us-east-1.amazonaws.com
-
-
 -->
 
 
-	
-		
-		
-		
-		
-		
-		
-
-		
-		
-		
-		
-		
-		
-		
-		
-		
-			
-		
-		
-			
-			
-
-		
-		
-			
-			
-
-	
-	
-	
-
-	
-	
-	
-
-	
-
-	
-
-		
-		
-		
-		
-
-	
-	
-	
-
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-
-	
-
-	
-
-	
-		
-
-	
-
-		
-		
-
-	
-
-		
-		
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
+  
+    
+    
+    
+    
+    
+    
+    
+    
+
+  	
 
 
diff --git a/src/chrome/content/rules/Amazon_blogs.com.xml b/src/chrome/content/rules/Amazon_blogs.com.xml
index 8b31d82e8764..80eb8c263540 100644
--- a/src/chrome/content/rules/Amazon_blogs.com.xml
+++ b/src/chrome/content/rules/Amazon_blogs.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://cdn.amazonblogs.com/ => https://cdn.amazonblogs.com/: (6, 'C
 	For other Amazon coverage, see Amazon.xml.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Amber_Swann_Publishing.xml b/src/chrome/content/rules/Amber_Swann_Publishing.xml
index cc5e6cae47fb..23d2f294dd77 100644
--- a/src/chrome/content/rules/Amber_Swann_Publishing.xml
+++ b/src/chrome/content/rules/Amber_Swann_Publishing.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Amblin.io.xml b/src/chrome/content/rules/Amblin.io.xml
deleted file mode 100644
index 56828152ba01..000000000000
--- a/src/chrome/content/rules/Amblin.io.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Ambotis.ru.xml b/src/chrome/content/rules/Ambotis.ru.xml
new file mode 100644
index 000000000000..c6d60d748a0b
--- /dev/null
+++ b/src/chrome/content/rules/Ambotis.ru.xml
@@ -0,0 +1,24 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Amd.co.at.xml b/src/chrome/content/rules/Amd.co.at.xml
index 49d752ea6ed7..aece83e43a0d 100644
--- a/src/chrome/content/rules/Amd.co.at.xml
+++ b/src/chrome/content/rules/Amd.co.at.xml
@@ -23,7 +23,9 @@
 
 
 	
-	
+	
+	
+	
 		
diff --git a/src/chrome/content/rules/Amd.com.xml b/src/chrome/content/rules/Amd.com.xml
index 4f2a5a41eb41..ac9e36d10c28 100644
--- a/src/chrome/content/rules/Amd.com.xml
+++ b/src/chrome/content/rules/Amd.com.xml
@@ -1,4 +1,16 @@
+
 
 
-	
-	
-		
-		
-		
-		
-	
+	
+	
+	
 	
 	
-	
-	
-	
-	
+	
+	
+	
+	
 
-	
 	
 
diff --git a/src/chrome/content/rules/AmeriMark.com.xml b/src/chrome/content/rules/AmeriMark.com.xml
new file mode 100644
index 000000000000..c5456889a8bd
--- /dev/null
+++ b/src/chrome/content/rules/AmeriMark.com.xml
@@ -0,0 +1,17 @@
+
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/American-Association-of-Neurological-Surgeons.xml b/src/chrome/content/rules/American-Association-of-Neurological-Surgeons.xml
index f8e8e6963041..1f2d2fafc8f8 100644
--- a/src/chrome/content/rules/American-Association-of-Neurological-Surgeons.xml
+++ b/src/chrome/content/rules/American-Association-of-Neurological-Surgeons.xml
@@ -13,13 +13,13 @@ Fetch error: http://aans.org/ => https://aans.org/: (60, 'SSL certificate proble
 		- www.aansneurosurgeon.org
 
 -->
-
+
 
 	
 	
 
 
-	
+	
 
 
 	
-
+
 
 	
diff --git a/src/chrome/content/rules/American-Epilepsy-Society.xml b/src/chrome/content/rules/American-Epilepsy-Society.xml
index 22fa49614cd2..f558455d4528 100644
--- a/src/chrome/content/rules/American-Epilepsy-Society.xml
+++ b/src/chrome/content/rules/American-Epilepsy-Society.xml
@@ -1,5 +1,5 @@
 
 
-
 	
-	
-
-
-	
-	
-
-	
-	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+		
+		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
+	
 
diff --git a/src/chrome/content/rules/AmericanDreamCoalition.org.xml b/src/chrome/content/rules/AmericanDreamCoalition.org.xml
new file mode 100644
index 000000000000..3f8c03b20820
--- /dev/null
+++ b/src/chrome/content/rules/AmericanDreamCoalition.org.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/AmericanExpress.xml b/src/chrome/content/rules/AmericanExpress.xml
index 30e54755ceab..a364ee38fde3 100644
--- a/src/chrome/content/rules/AmericanExpress.xml
+++ b/src/chrome/content/rules/AmericanExpress.xml
@@ -1,11 +1,18 @@
+
 
 	
-	
+	
 	
 	
-	
-	
-	
-	
+	
+	
+	
+	
 	
 
 	
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/American_Academy_of_Neurology.xml b/src/chrome/content/rules/American_Academy_of_Neurology.xml
index ad82357b50e3..441e4d1f0c85 100644
--- a/src/chrome/content/rules/American_Academy_of_Neurology.xml
+++ b/src/chrome/content/rules/American_Academy_of_Neurology.xml
@@ -10,7 +10,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/American_Airlines.xml b/src/chrome/content/rules/American_Airlines.xml
new file mode 100644
index 000000000000..1f1cd6ec799c
--- /dev/null
+++ b/src/chrome/content/rules/American_Airlines.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/American_Center_for_Law_and_Justice.xml b/src/chrome/content/rules/American_Center_for_Law_and_Justice.xml
index b46e9f582d67..ac6cced5dee7 100644
--- a/src/chrome/content/rules/American_Center_for_Law_and_Justice.xml
+++ b/src/chrome/content/rules/American_Center_for_Law_and_Justice.xml
@@ -30,7 +30,10 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
@@ -49,4 +52,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/American_College_of_Radiology.xml b/src/chrome/content/rules/American_College_of_Radiology.xml
index 9b9d92fb7f1a..e89500dde543 100644
--- a/src/chrome/content/rules/American_College_of_Radiology.xml
+++ b/src/chrome/content/rules/American_College_of_Radiology.xml
@@ -18,7 +18,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/American_Freedom.com.xml b/src/chrome/content/rules/American_Freedom.com.xml
index b5b4e296ec31..0741d469897a 100644
--- a/src/chrome/content/rules/American_Freedom.com.xml
+++ b/src/chrome/content/rules/American_Freedom.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.americanfreedom.com/ => https://www.americanfreedom.com/
 	Center for American Freedom
 
 -->
-
+
 
 	
 	
@@ -21,4 +21,4 @@ Fetch error: http://www.americanfreedom.com/ => https://www.americanfreedom.com/
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/American_Scientist.org.xml b/src/chrome/content/rules/American_Scientist.org.xml
deleted file mode 100644
index f6ed23eba410..000000000000
--- a/src/chrome/content/rules/American_Scientist.org.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/American_Society_of_Media_Photographers.xml b/src/chrome/content/rules/American_Society_of_Media_Photographers.xml
index a3f4066d3ee3..1e663d5d3672 100644
--- a/src/chrome/content/rules/American_Society_of_Media_Photographers.xml
+++ b/src/chrome/content/rules/American_Society_of_Media_Photographers.xml
@@ -4,16 +4,17 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.admin.asmp.org/ => https://www.admin.asmp.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.admin.asmp.org'")
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/AmericanaExchange.xml b/src/chrome/content/rules/AmericanaExchange.xml
index c4376c015ca4..38d7ec1dfaf6 100644
--- a/src/chrome/content/rules/AmericanaExchange.xml
+++ b/src/chrome/content/rules/AmericanaExchange.xml
@@ -8,9 +8,9 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://americanaexchange.com/ => https://www.americanaexchange.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.americanaexchange.com'")
 Fetch error: http://www.americanaexchange.com/ => https://www.americanaexchange.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.americanaexchange.com'")
 -->
-
+
   
   
 
   
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Americans_United.xml b/src/chrome/content/rules/Americans_United.xml
index d5a8a31e645d..1f1fa8469cc1 100644
--- a/src/chrome/content/rules/Americans_United.xml
+++ b/src/chrome/content/rules/Americans_United.xml
@@ -12,4 +12,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Amiami.jp.xml b/src/chrome/content/rules/Amiami.jp.xml
index f9aa176f6e1a..0d0a47f766bc 100644
--- a/src/chrome/content/rules/Amiami.jp.xml
+++ b/src/chrome/content/rules/Amiami.jp.xml
@@ -3,7 +3,7 @@
 		Invalid Certificate:
 			- media.amiami.jp
 			- news.amiami.jp
-		
+
 		Timeout:
 			- www.amiami.jp
 			- product.amiami.jp
@@ -12,11 +12,11 @@
 
 	
 	
-	
+
 	
 	
-	
+
 	
-	
 
diff --git a/src/chrome/content/rules/Amica.com.xml b/src/chrome/content/rules/Amica.com.xml
index dd0efef63df0..b6b1e448212f 100644
--- a/src/chrome/content/rules/Amica.com.xml
+++ b/src/chrome/content/rules/Amica.com.xml
@@ -1,19 +1,16 @@
 
 
 	
-	
 	
 	
 
-	
-	
-	
-	
-
 	
 
diff --git a/src/chrome/content/rules/Amigaroms.com.xml b/src/chrome/content/rules/Amigaroms.com.xml
new file mode 100644
index 000000000000..ceed92b0a1d5
--- /dev/null
+++ b/src/chrome/content/rules/Amigaroms.com.xml
@@ -0,0 +1,19 @@
+
+
+    
+    
+    
+    
+    
+
+    
+
+    
+
diff --git a/src/chrome/content/rules/Amnesty-International.xml b/src/chrome/content/rules/Amnesty-International.xml
index 6ca33f2077e3..9d3c2c872599 100644
--- a/src/chrome/content/rules/Amnesty-International.xml
+++ b/src/chrome/content/rules/Amnesty-International.xml
@@ -12,7 +12,6 @@ Fetch error: http://livewire.amnesty.org/ => https://livewire.amnesty.org/: (6,
 		- Amnesty.fi.xml
 		- Amnesty.fr.xml
 		- Amnesty.gr.xml
-		- Amnesty.ie.xml
 		- Amnesty.it.xml
 		- Amnesty.or.jp.xml
 		- Amnesty.org.nz.xml
@@ -48,7 +47,7 @@ Fetch error: http://livewire.amnesty.org/ => https://livewire.amnesty.org/: (6,
 		- .www.amnesty.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Amnesty.fr.xml b/src/chrome/content/rules/Amnesty.fr.xml
index 98c2716c7f80..668233ca513e 100644
--- a/src/chrome/content/rules/Amnesty.fr.xml
+++ b/src/chrome/content/rules/Amnesty.fr.xml
@@ -63,7 +63,7 @@
 
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Amnesty.ie.xml b/src/chrome/content/rules/Amnesty.ie.xml
deleted file mode 100644
index 9684d884d41c..000000000000
--- a/src/chrome/content/rules/Amnesty.ie.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Amnesty.org.nz.xml b/src/chrome/content/rules/Amnesty.org.nz.xml
index 98f3f8a60b52..0bfd92a3135d 100644
--- a/src/chrome/content/rules/Amnesty.org.nz.xml
+++ b/src/chrome/content/rules/Amnesty.org.nz.xml
@@ -9,7 +9,7 @@ Fetch error: http://supporterservices.amnesty.org.nz/ => https://supporterservic
 	^amnesty.org.nz: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Amoena.xml b/src/chrome/content/rules/Amoena.xml
index 027d3f19d162..faae90f41507 100644
--- a/src/chrome/content/rules/Amoena.xml
+++ b/src/chrome/content/rules/Amoena.xml
@@ -9,7 +9,7 @@ Fetch error: http://amoena.us/ => https://www.amoena.us/: (60, 'SSL certificate
 Fetch error: http://www.amoena.us/ => https://www.amoena.us/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Anadolu.edu.tr.xml b/src/chrome/content/rules/Anadolu.edu.tr.xml
index 6c15b274c6e9..83490d7c6764 100644
--- a/src/chrome/content/rules/Anadolu.edu.tr.xml
+++ b/src/chrome/content/rules/Anadolu.edu.tr.xml
@@ -103,7 +103,7 @@ Fetch error: http://ogrenci.anadolu.edu.tr/ => https://ogrenci.anadolu.edu.tr/:
 		* www.yillik.eogrenme.anadolu.edu.tr
 		* yemekhane.anadolu.edu.tr
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Analyst_One.com.xml b/src/chrome/content/rules/Analyst_One.com.xml
index 261d946e450d..57b326891877 100644
--- a/src/chrome/content/rules/Analyst_One.com.xml
+++ b/src/chrome/content/rules/Analyst_One.com.xml
@@ -20,7 +20,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/AnandTech.com.xml b/src/chrome/content/rules/AnandTech.com.xml
index 5359c9a0da43..1fb6b84cbcac 100644
--- a/src/chrome/content/rules/AnandTech.com.xml
+++ b/src/chrome/content/rules/AnandTech.com.xml
@@ -2,7 +2,10 @@
 	
 	
 	
+	
+		
 	
+	
 
 	
 
diff --git a/src/chrome/content/rules/AnarchistNews.xml b/src/chrome/content/rules/AnarchistNews.xml
deleted file mode 100644
index 9b26185db760..000000000000
--- a/src/chrome/content/rules/AnarchistNews.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	
-	
-	
-	
-		 
-	
-
-	
-
diff --git a/src/chrome/content/rules/Anarplex.net.xml b/src/chrome/content/rules/Anarplex.net.xml
index a99344423c0a..a73840117628 100644
--- a/src/chrome/content/rules/Anarplex.net.xml
+++ b/src/chrome/content/rules/Anarplex.net.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.anarplex.net/ => https://www.anarplex.net/: (51, "SSL: no alternative certificate subject name matches target host name 'www.anarplex.net'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Anaxago.com.xml b/src/chrome/content/rules/Anaxago.com.xml
index cb0ac50d547c..66597066d3a4 100644
--- a/src/chrome/content/rules/Anaxago.com.xml
+++ b/src/chrome/content/rules/Anaxago.com.xml
@@ -1,9 +1,9 @@
-
-	
-	
-	
-	
-		
-
-	
-
+
+	
+	
+	
+	
+		
+
+	
+
diff --git a/src/chrome/content/rules/Ancestry.xml b/src/chrome/content/rules/Ancestry.xml
index 9ad6b8c44a19..3ece664ed963 100644
--- a/src/chrome/content/rules/Ancestry.xml
+++ b/src/chrome/content/rules/Ancestry.xml
@@ -32,7 +32,7 @@ Fetch error: http://help.ancestry.com/ => https://help.ancestry.com/: (60, 'SSL
 		- c.mfccreative.com		(causes CORS issues)
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Andor.com.xml b/src/chrome/content/rules/Andor.com.xml
index fc70573b4786..c3c48f542dec 100644
--- a/src/chrome/content/rules/Andor.com.xml
+++ b/src/chrome/content/rules/Andor.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://andor.com/ => https://andor.com/: (51, "SSL: no alternative
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Android.xml b/src/chrome/content/rules/Android.xml
index e529e464c404..50ab3683302e 100644
--- a/src/chrome/content/rules/Android.xml
+++ b/src/chrome/content/rules/Android.xml
@@ -1,33 +1,24 @@
 
 
 
 	
-	
-
-	
-	
-	
-	
+	
+	
+	
+	
+	
+	
+	
 
-
-	
-
-
-	
+	
 
 	
 
+	
+
 
diff --git a/src/chrome/content/rules/Androidfilehost.com.xml b/src/chrome/content/rules/Androidfilehost.com.xml
index b824a10a1a9b..3127462c9211 100644
--- a/src/chrome/content/rules/Androidfilehost.com.xml
+++ b/src/chrome/content/rules/Androidfilehost.com.xml
@@ -25,4 +25,4 @@
 		to="https:" />
 
 
- 
+
diff --git a/src/chrome/content/rules/Androidpit.xml b/src/chrome/content/rules/Androidpit.xml
index 13f26d4d95c7..9933e7954b0e 100644
--- a/src/chrome/content/rules/Androidpit.xml
+++ b/src/chrome/content/rules/Androidpit.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.fs02.androidpit.info/ => https://www.fs02.androidpit.inf
 	    - androidpit.de
 	        - jobs    -> wrong domain
 -->
-
+
     
     
     
diff --git a/src/chrome/content/rules/Andy_Tyson.com.xml b/src/chrome/content/rules/Andy_Tyson.com.xml
index b5b579d9f728..4b1eab07f804 100644
--- a/src/chrome/content/rules/Andy_Tyson.com.xml
+++ b/src/chrome/content/rules/Andy_Tyson.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://andytyson.com/ => https://andytyson.com/: (28, 'Connection t
 Fetch error: http://www.andytyson.com/ => https://www.andytyson.com/: (28, 'Connection timed out after 20000 milliseconds')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Andyet.com.xml b/src/chrome/content/rules/Andyet.com.xml
index 8efb702a721f..3a5c7a5fe29f 100644
--- a/src/chrome/content/rules/Andyet.com.xml
+++ b/src/chrome/content/rules/Andyet.com.xml
@@ -29,7 +29,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Anglomedia.net.xml b/src/chrome/content/rules/Anglomedia.net.xml
index f0fdc816ebe3..35db8d97f31e 100644
--- a/src/chrome/content/rules/Anglomedia.net.xml
+++ b/src/chrome/content/rules/Anglomedia.net.xml
@@ -18,7 +18,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -30,4 +31,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Angus.gov.uk.xml b/src/chrome/content/rules/Angus.gov.uk.xml
index 5b42da6c2c9b..ce331aaced45 100644
--- a/src/chrome/content/rules/Angus.gov.uk.xml
+++ b/src/chrome/content/rules/Angus.gov.uk.xml
@@ -7,7 +7,7 @@
 	Nonfunctional hosts in *angus.gov.uk:
 
 		- www.fosteringandadoption *
-		
+
 	* 200 blank page
 
 
diff --git a/src/chrome/content/rules/AniRena.xml b/src/chrome/content/rules/AniRena.xml
index 818e70211c69..936f0af96c15 100644
--- a/src/chrome/content/rules/AniRena.xml
+++ b/src/chrome/content/rules/AniRena.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Anidex.moe.xml b/src/chrome/content/rules/Anidex.moe.xml
deleted file mode 100644
index 7beefa6b2b8f..000000000000
--- a/src/chrome/content/rules/Anidex.moe.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Animeanime.jp.xml b/src/chrome/content/rules/Animeanime.jp.xml
new file mode 100644
index 000000000000..838bea458d07
--- /dev/null
+++ b/src/chrome/content/rules/Animeanime.jp.xml
@@ -0,0 +1,24 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Animenfo.com.xml b/src/chrome/content/rules/Animenfo.com.xml
deleted file mode 100644
index 5ad8852c7fc0..000000000000
--- a/src/chrome/content/rules/Animenfo.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-  
-  
-
-  
-  
-  
-
diff --git a/src/chrome/content/rules/Aniview.com.xml b/src/chrome/content/rules/Aniview.com.xml
new file mode 100644
index 000000000000..fbeefbb988f2
--- /dev/null
+++ b/src/chrome/content/rules/Aniview.com.xml
@@ -0,0 +1,46 @@
+
+
+
+
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Ann_Summers.xml b/src/chrome/content/rules/Ann_Summers.xml
index 0990ac93668e..fd0cf260c717 100644
--- a/src/chrome/content/rules/Ann_Summers.xml
+++ b/src/chrome/content/rules/Ann_Summers.xml
@@ -23,7 +23,7 @@ Fetch error: http://www.annsummers.com/webapp/wcs/stores/servlet/OrderItemDispla
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/AnnualCreditReport.com.xml b/src/chrome/content/rules/AnnualCreditReport.com.xml
index f37319d888fe..89b216f27660 100644
--- a/src/chrome/content/rules/AnnualCreditReport.com.xml
+++ b/src/chrome/content/rules/AnnualCreditReport.com.xml
@@ -8,7 +8,7 @@
 					-->
 	
 
-	
+	
 
 
 	 https://www.anon-ib.com/: (7, 'Failed to
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Anon.click.xml b/src/chrome/content/rules/Anon.click.xml
deleted file mode 100644
index 3e38c0661e9c..000000000000
--- a/src/chrome/content/rules/Anon.click.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/AnonFiles.com.xml b/src/chrome/content/rules/AnonFiles.com.xml
index 00d6b6909143..2287284cfdbc 100644
--- a/src/chrome/content/rules/AnonFiles.com.xml
+++ b/src/chrome/content/rules/AnonFiles.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://cdn.anonfiles.com/ => https://cdn.anonfiles.com/: (7, 'Faile
 Fetch error: http://www.anonfiles.com/ => https://www.anonfiles.com/: (7, 'Failed to connect to www.anonfiles.com port 443: Connection refused')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Anonabox.com.xml b/src/chrome/content/rules/Anonabox.com.xml
index 17d310f8cd3e..70c1b9cec79d 100644
--- a/src/chrome/content/rules/Anonabox.com.xml
+++ b/src/chrome/content/rules/Anonabox.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://anonabox.com/ => https://anonabox.com/: (51, "SSL: no altern
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/AnonySurfer.com.xml b/src/chrome/content/rules/AnonySurfer.com.xml
index 34dbfe80b88a..d7fd8c4220e9 100644
--- a/src/chrome/content/rules/AnonySurfer.com.xml
+++ b/src/chrome/content/rules/AnonySurfer.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://anonysurfer.com/ => https://anonysurfer.com/: (28, 'Connecti
 Fetch error: http://www.anonysurfer.com/ => https://www.anonysurfer.com/: (28, 'Connection timed out after 20008 milliseconds')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Anonymix.io.xml b/src/chrome/content/rules/Anonymix.io.xml
new file mode 100644
index 000000000000..13b9463306d9
--- /dev/null
+++ b/src/chrome/content/rules/Anonymix.io.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Anonymizer.xml b/src/chrome/content/rules/Anonymizer.xml
index 36d723ea3d0b..b10c09fd3fff 100644
--- a/src/chrome/content/rules/Anonymizer.xml
+++ b/src/chrome/content/rules/Anonymizer.xml
@@ -7,4 +7,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AnonymoX.xml b/src/chrome/content/rules/AnonymoX.xml
index 28daf1358892..256ee683ee74 100644
--- a/src/chrome/content/rules/AnonymoX.xml
+++ b/src/chrome/content/rules/AnonymoX.xml
@@ -4,9 +4,9 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ansible_works.com.xml b/src/chrome/content/rules/Ansible_works.com.xml
index 3a2eb1bc6f25..ed96914dbfc0 100644
--- a/src/chrome/content/rules/Ansible_works.com.xml
+++ b/src/chrome/content/rules/Ansible_works.com.xml
@@ -20,7 +20,7 @@ Fetch error: http://www.ansibleworks.com/ => https://www.ansibleworks.com/: (28,
 		- www.galaxy.ansibleworks.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/AntennaPod.org.xml b/src/chrome/content/rules/AntennaPod.org.xml
new file mode 100644
index 000000000000..b2946d2b85d6
--- /dev/null
+++ b/src/chrome/content/rules/AntennaPod.org.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Antergos.com.xml b/src/chrome/content/rules/Antergos.com.xml
deleted file mode 100644
index 75086ceb0bd0..000000000000
--- a/src/chrome/content/rules/Antergos.com.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Antevenio.xml b/src/chrome/content/rules/Antevenio.xml
index b7f1b69b4086..17967c42fdeb 100644
--- a/src/chrome/content/rules/Antevenio.xml
+++ b/src/chrome/content/rules/Antevenio.xml
@@ -10,7 +10,7 @@ Fetch error: http://reachandrich.antevenio.com/ => https://reachandrich.anteveni
 		- (www.)	(times out)
 
 -->
-
+
 
 	
 
@@ -20,4 +20,4 @@ Fetch error: http://reachandrich.antevenio.com/ => https://reachandrich.anteveni
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Anti-Phishing_Working_Group.xml b/src/chrome/content/rules/Anti-Phishing_Working_Group.xml
index c77f9a76d81c..b4f966153fcc 100644
--- a/src/chrome/content/rules/Anti-Phishing_Working_Group.xml
+++ b/src/chrome/content/rules/Anti-Phishing_Working_Group.xml
@@ -38,7 +38,11 @@
 	
 	
 	
-	
+	
+	
+	
+	
+	
 
 
 	
@@ -47,7 +51,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/AntiPornGroup.com.xml b/src/chrome/content/rules/AntiPornGroup.com.xml
new file mode 100644
index 000000000000..3183cf5ed2de
--- /dev/null
+++ b/src/chrome/content/rules/AntiPornGroup.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/AntiqueAppliances.com.xml b/src/chrome/content/rules/AntiqueAppliances.com.xml
new file mode 100644
index 000000000000..b68e9887f85a
--- /dev/null
+++ b/src/chrome/content/rules/AntiqueAppliances.com.xml
@@ -0,0 +1,12 @@
+
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/AntiqueMotorcycle.org.xml b/src/chrome/content/rules/AntiqueMotorcycle.org.xml
new file mode 100644
index 000000000000..d2cf1717e2ca
--- /dev/null
+++ b/src/chrome/content/rules/AntiqueMotorcycle.org.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Antispam.de.xml b/src/chrome/content/rules/Antispam.de.xml
index 1c7940a0378a..083f9c593301 100644
--- a/src/chrome/content/rules/Antispam.de.xml
+++ b/src/chrome/content/rules/Antispam.de.xml
@@ -1,8 +1,8 @@
 
 
 	
-	  
-  
+	
+
 
 	
 
diff --git a/src/chrome/content/rules/AnubisNetworks.com.xml b/src/chrome/content/rules/AnubisNetworks.com.xml
index 147131f5428d..02eca874e1d3 100644
--- a/src/chrome/content/rules/AnubisNetworks.com.xml
+++ b/src/chrome/content/rules/AnubisNetworks.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://support.anubisnetworks.com/ => https://support.anubisnetwork
 	² Akamai/mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Anybalance.com.xml b/src/chrome/content/rules/Anybalance.com.xml
index 9c2687facea6..13d531c1de66 100644
--- a/src/chrome/content/rules/Anybalance.com.xml
+++ b/src/chrome/content/rules/Anybalance.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://anybalance.com/ => https://anybalance.com/: (6, 'Could not r
 Fetch error: http://www.anybalance.com/ => https://www.anybalance.com/: (6, 'Could not resolve host: www.anybalance.com')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Anybots.com.xml b/src/chrome/content/rules/Anybots.com.xml
deleted file mode 100644
index 7507d481ee41..000000000000
--- a/src/chrome/content/rules/Anybots.com.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Anyfi.net.xml b/src/chrome/content/rules/Anyfi.net.xml
index d57ddb388626..a754615da935 100644
--- a/src/chrome/content/rules/Anyfi.net.xml
+++ b/src/chrome/content/rules/Anyfi.net.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://anyfi.net/ => https://anyfi.net/: Cycle detected - URL already encountered: https://anyfi.net/
 Fetch error: http://www.anyfi.net/ => https://anyfi.net/: Cycle detected - URL already encountered: https://anyfi.net/
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Anyoption.com.xml b/src/chrome/content/rules/Anyoption.com.xml
deleted file mode 100644
index 3bd5805864e0..000000000000
--- a/src/chrome/content/rules/Anyoption.com.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Anyproz.xml b/src/chrome/content/rules/Anyproz.xml
index e9e80a1c86a3..9943abbfd250 100644
--- a/src/chrome/content/rules/Anyproz.xml
+++ b/src/chrome/content/rules/Anyproz.xml
@@ -5,7 +5,7 @@ Fetch error: http://anonyproz.com/ => https://anonyproz.com/: (7, 'Failed to con
 Fetch error: http://www.anonyproz.com/ => https://www.anonyproz.com/: (7, 'Failed to connect to www.anonyproz.com port 443: Connection refused')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/AoSABook.org.xml b/src/chrome/content/rules/AoSABook.org.xml
new file mode 100644
index 000000000000..015e522f3591
--- /dev/null
+++ b/src/chrome/content/rules/AoSABook.org.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Apa.at.xml b/src/chrome/content/rules/Apa.at.xml
index 8935f656d38b..3a02e3c82565 100644
--- a/src/chrome/content/rules/Apa.at.xml
+++ b/src/chrome/content/rules/Apa.at.xml
@@ -48,7 +48,7 @@
 	Self-signed cert:
 		- offline.apa.at
 		- apapwd.tst01.apa.at
-		
+
 	Timeout:
 		- apasffr02.sf.apa.at
 		- vrm.sf.apa.at
diff --git a/src/chrome/content/rules/Apache.org-falsemixed.xml b/src/chrome/content/rules/Apache.org-falsemixed.xml
index 99473ea1c00a..fe1f8028b36d 100644
--- a/src/chrome/content/rules/Apache.org-falsemixed.xml
+++ b/src/chrome/content/rules/Apache.org-falsemixed.xml
@@ -6,16 +6,11 @@
 
 	
 	
-	
 	
-	
-	
-	
 	
 	
 	
 
-
 	
 
 
diff --git a/src/chrome/content/rules/Apache.xml b/src/chrome/content/rules/Apache.xml
index 4ef0d5795c38..0b2dcbface6c 100644
--- a/src/chrome/content/rules/Apache.xml
+++ b/src/chrome/content/rules/Apache.xml
@@ -23,8 +23,6 @@
 		- activemq ˣ
 		- aries ˣ
 		- geronimo ˣ
-		- helix ˣ
-		- lucy ˣ
 		- mail-archives (incomplete cert chain)
 		- santuario ˣ
 		- tuscany ˣ
@@ -39,8 +37,6 @@
 		- activemq ˣ
 		- aries ˣ
 		- geronimo ˣ
-		- helix ˣ
-		- lucy ˣ
 		- santuario ˣ
 		- tuscany ˣ
 
@@ -59,12 +55,12 @@
 			- airavata
 			- allura
 			- ambari
-			- analysis
 			- ant
 			- any23
 			- apr
 			- archiva
 			- archive
+			- attic
 			- avro
 			- axis
 			- bigtop
@@ -113,6 +109,7 @@
 			- hama
 			- hbase
 			- hc
+			- helix
 			- hive
 			- httpd
 			- incubator
@@ -120,6 +117,7 @@
 			- tez.incubator
 			- isis
 			- issues
+			- jackrabbit
 			- jakarta
 			- james
 			- jclouds
@@ -136,6 +134,7 @@
 			- logging
 			- lucene
 			- lucenenet
+			- lucy
 			- mahout
 			- manifoldcf
 			- marmotta
@@ -229,8 +228,6 @@
 			- aries from $self ¹
 			- creadur, drill, kafka, marmotta, synapse, trafficserver, www from fonts.googleapis.com ¹
 			- geronimo from $self ¹
-			- helix from netdna.bootstrapcdn.com ¹
-			- lucy from $self ¹
 			- santuario from cxf ¹
 			- sis and xmlgraphics from www ¹
 			- tuscany from $self ¹
@@ -250,7 +247,6 @@
 			- geronimo from $self ¹
 			- karaf from $self ¹
 			- knox from $self ¹
-			- lucy from $self ¹
 			- mahout from $self ¹
 			- openoffice from www.openoffice.org ¹
 			- santuario from activemq ¹
@@ -302,21 +298,18 @@
 		
 		
 		
-		
 		
 		
 		
-		
+		
 
 			
 			
 			
 			
-			
-			
 			
 			
 
@@ -325,10 +318,9 @@
 			
 			
 			
-			
-			
 			
 			
+			
 
 		
 		
@@ -337,7 +329,6 @@
 		
 		
 		
-		
 		
 		
 		
@@ -506,7 +497,7 @@
 
 	
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Apester.com.xml b/src/chrome/content/rules/Apester.com.xml
new file mode 100644
index 000000000000..d49f83310fc0
--- /dev/null
+++ b/src/chrome/content/rules/Apester.com.xml
@@ -0,0 +1,55 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Aphyr.com.xml b/src/chrome/content/rules/Aphyr.com.xml
index 695edf707dcf..5fa4094536be 100644
--- a/src/chrome/content/rules/Aphyr.com.xml
+++ b/src/chrome/content/rules/Aphyr.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.aphyr.com/ => https://www.aphyr.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.aphyr.com'")
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Apica.xml b/src/chrome/content/rules/Apica.xml
index d8fc31aad8b4..159d61d07308 100644
--- a/src/chrome/content/rules/Apica.xml
+++ b/src/chrome/content/rules/Apica.xml
@@ -5,7 +5,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -14,7 +15,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Apigee.xml b/src/chrome/content/rules/Apigee.xml
index 36c66d020984..2f758949c84c 100644
--- a/src/chrome/content/rules/Apigee.xml
+++ b/src/chrome/content/rules/Apigee.xml
@@ -19,4 +19,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Apkmirror.com.xml b/src/chrome/content/rules/Apkmirror.com.xml
index 2b8391090307..28f86fa12a1f 100644
--- a/src/chrome/content/rules/Apkmirror.com.xml
+++ b/src/chrome/content/rules/Apkmirror.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://apkmirror.com/ => https://apkmirror.com/: Too many redirects
 
 
 -->
-
+
     
     
 
diff --git a/src/chrome/content/rules/Apna_India.xml b/src/chrome/content/rules/Apna_India.xml
index c0427165dead..d3d57c8356b8 100644
--- a/src/chrome/content/rules/Apna_India.xml
+++ b/src/chrome/content/rules/Apna_India.xml
@@ -5,7 +5,7 @@ Fetch error: http://media.apnaindia.com/ => https://media.apnaindia.com/: (6, 'C
 Fetch error: http://yellowpages.apnaindia.com/ => https://yellowpages.apnaindia.com/: (28, 'Operation timed out after 30001 milliseconds with 0 bytes received')
 
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://yellowpages.apnaindia.com/ => https://yellowpages.apnaindia.
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Apoteket.se.xml b/src/chrome/content/rules/Apoteket.se.xml
index 012cf1418de0..6ab789419d63 100644
--- a/src/chrome/content/rules/Apoteket.se.xml
+++ b/src/chrome/content/rules/Apoteket.se.xml
@@ -1,8 +1,13 @@
-
 
 	
 	
-	
-	
-
+	
+	
+	
+	
+	
+	
+	
 
+	
+
diff --git a/src/chrome/content/rules/AppDynamics.xml b/src/chrome/content/rules/AppDynamics.xml
index 3a970037ba2b..dc40414529cf 100644
--- a/src/chrome/content/rules/AppDynamics.xml
+++ b/src/chrome/content/rules/AppDynamics.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AppGratis.xml b/src/chrome/content/rules/AppGratis.xml
index 3ec98bf1546a..839954ceafcb 100644
--- a/src/chrome/content/rules/AppGratis.xml
+++ b/src/chrome/content/rules/AppGratis.xml
@@ -5,7 +5,7 @@ Fetch error: http://appgratis.com/ => https://appgratis.com/: (7, 'Failed to con
 Fetch error: http://www.appgratis.com/ => https://www.appgratis.com/: (7, 'Failed to connect to www.appgratis.com port 443: Connection refused')
 
 -->
-
+
 
 	
 	
@@ -13,4 +13,4 @@ Fetch error: http://www.appgratis.com/ => https://www.appgratis.com/: (7, 'Faile
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AppNexus.xml b/src/chrome/content/rules/AppNexus.xml
index 0707e9ac90d6..fe25f07a7795 100644
--- a/src/chrome/content/rules/AppNexus.xml
+++ b/src/chrome/content/rules/AppNexus.xml
@@ -35,7 +35,7 @@ Fetch error: http://ux-eco.corp.appnexus.com/ => https://ux-eco.corp.appnexus.co
 		- Bug on www from instansive.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/AppVault.xml b/src/chrome/content/rules/AppVault.xml
index 3d17037f86cd..fbe5f7795f67 100644
--- a/src/chrome/content/rules/AppVault.xml
+++ b/src/chrome/content/rules/AppVault.xml
@@ -14,7 +14,7 @@
 	
 	
 	
-	
+	
 
 
 	
@@ -23,7 +23,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Appcelerator.xml b/src/chrome/content/rules/Appcelerator.xml
index f730ef2db072..0dfee058a341 100644
--- a/src/chrome/content/rules/Appcelerator.xml
+++ b/src/chrome/content/rules/Appcelerator.xml
@@ -59,7 +59,7 @@ Fetch error: http://thinkmobile.appcelerator.com/ => https://thinkmobile.appcele
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Appie_Hein.com.xml b/src/chrome/content/rules/Appie_Hein.com.xml
index 94716f5375c9..66bc7f77ce9e 100644
--- a/src/chrome/content/rules/Appie_Hein.com.xml
+++ b/src/chrome/content/rules/Appie_Hein.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.appiehein.com/ => https://www.appiehein.com/: (60, 'SSL
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Appinn.xml b/src/chrome/content/rules/Appinn.xml
deleted file mode 100644
index f75ec423d100..000000000000
--- a/src/chrome/content/rules/Appinn.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-	
-	
-	
-		
-	
-		
-		
-
-	
-	
-		
-	
-		
-	
-		
-		
-		
-
-	
-	
-	
-	
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Apple.com.xml b/src/chrome/content/rules/Apple.com.xml
index b95b13a97065..a4ed3ecb4602 100644
--- a/src/chrome/content/rules/Apple.com.xml
+++ b/src/chrome/content/rules/Apple.com.xml
@@ -5,7 +5,6 @@
 		- Apple_CDN_buckets.xml
 		- Appsto.re.xml
 		- CDN-Apple.com.xml
-		- iCloud.com.xml
 		- iTunes.com.xml
 		- iWork.com.xml
 		- ME.com.xml
@@ -32,12 +31,18 @@
 		- a\d+.phobos.apple.com.edgesuite.net
 
 	Nonfunctional hosts in *apple.com:
+		- daw  (timeout)
+		- onetoone  (timeout)
 		- deimos3	(403/404, akamai)
 		- init.ess	(503, akamai)
+		- genius-upload.itunes.apple.com (403/404)
 		- userprofile.itunes *
 		- rss.lists	(shows lists; mismatched, CN: lists.apple.com)
 		- rss.itunes (redirects to HTTP for Travis)
 		- mynews *
+		- reseller (timeout)
+		- ssl (timeout)
+		- supportprofile (timeout)
 		- uptodate  (timeout)
 	* Refused
 
@@ -54,14 +59,17 @@
 		- signin.info *
 		- www.info *
 		- www0.info *
+		- c.itunes ³
 		- dzc.itunes		(data differ)
 		- ping.itunes *
-		- prod.lists ³
-		- www.lists		(mismatched, CN: lists.apple.com)
+		- lists (cert-chain)
+		- prod.lists (cert-chain)
+		- www.lists (cert-chain)
 		- mypage        (incomplete cert chain)
 		- a1.phobos *
 		- a1721.phobos *
 		- a1980.phobos *
+		- reportingitsc2 (cert-chain)
 		- service.ess		(self-signed cert in chain)
 		- service[12].ess	(self-signed cert in chain)
 		- static-mynews *
@@ -69,7 +77,7 @@
 		- support		(Blocks Tor users)
 		- wsidecar	( The certificate expired on 2017/03/10 23:59 )
 	* Akamai
-	³ Mismatched, CN: lists.apple.com
+	³ Mismatched
 
 	At least some pages redirect to http:
 		- www
@@ -108,17 +116,12 @@
 	
 	
 	
-	
-	
-	
-	
 	
 	
 	
 	
 	
 	
-	
 	
 	
 	
@@ -142,7 +145,6 @@
 	
 	
 	
-	
 	
 	
 	
@@ -151,7 +153,6 @@
 	
 	
 	
-	
 	
 	
 	
@@ -195,25 +196,17 @@
 	
 	
 	
-	
 	
 	
-	
 	
-	
 	
 	
-	
 	
 	
 	
 	
-	
-	
-	
 	
 	
-	
 	
 	
 	
@@ -221,7 +214,6 @@
 	
 	
 	
-	
 	
 	
 	
@@ -231,28 +223,17 @@
 
 
 	
-	
-	
-
-	
-	
-	
-
 	
 	
 
-	
-	
 
 	
 	
 		
 		
+		
 
 	
 
diff --git a/src/chrome/content/rules/Apple_Parts_Store.xml b/src/chrome/content/rules/Apple_Parts_Store.xml
index 2d1e91ce5fe0..94131f1d5cec 100644
--- a/src/chrome/content/rules/Apple_Parts_Store.xml
+++ b/src/chrome/content/rules/Apple_Parts_Store.xml
@@ -12,12 +12,12 @@ Fetch error: http://re-pear.com/ => https://www.re-pear.com/: (51, "SSL: no alte
 		- re-pear.com			(mismatched, CN: www.applepartsstore.com)
 
 -->
-
+
 
 	
-	
+	
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Applebees.xml b/src/chrome/content/rules/Applebees.xml
index 1ff60919a850..fbcd687b6ee3 100644
--- a/src/chrome/content/rules/Applebees.xml
+++ b/src/chrome/content/rules/Applebees.xml
@@ -4,4 +4,4 @@
   
 
   
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Appledaily.com.hk.xml b/src/chrome/content/rules/Appledaily.com.hk.xml
new file mode 100644
index 000000000000..dec72cc6dccb
--- /dev/null
+++ b/src/chrome/content/rules/Appledaily.com.hk.xml
@@ -0,0 +1,30 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Appledaily.com.tw.xml b/src/chrome/content/rules/Appledaily.com.tw.xml
new file mode 100644
index 000000000000..ceab129c6f0f
--- /dev/null
+++ b/src/chrome/content/rules/Appledaily.com.tw.xml
@@ -0,0 +1,32 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Appledaily.com.xml b/src/chrome/content/rules/Appledaily.com.xml
new file mode 100644
index 000000000000..d6d45219b59a
--- /dev/null
+++ b/src/chrome/content/rules/Appledaily.com.xml
@@ -0,0 +1,90 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Appledaily.xml b/src/chrome/content/rules/Appledaily.xml
deleted file mode 100644
index 35785ed50528..000000000000
--- a/src/chrome/content/rules/Appledaily.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-	
-	
-
-	
-	
-
-	
-	
-
-	
-	
-
-	
-	
-
-	
-	
-
-	
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/AppliedPrivacy.net.xml b/src/chrome/content/rules/AppliedPrivacy.net.xml
new file mode 100644
index 000000000000..9a1cb71a8c86
--- /dev/null
+++ b/src/chrome/content/rules/AppliedPrivacy.net.xml
@@ -0,0 +1,25 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Apply2Jobs.com.xml b/src/chrome/content/rules/Apply2Jobs.com.xml
index 66887e1a9893..baa4b660120b 100644
--- a/src/chrome/content/rules/Apply2Jobs.com.xml
+++ b/src/chrome/content/rules/Apply2Jobs.com.xml
@@ -14,13 +14,13 @@
 
 
 	
-	
+	
+	
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/ApplyYourself.xml b/src/chrome/content/rules/ApplyYourself.xml
index 84d3e1ee108f..d63f8421e242 100644
--- a/src/chrome/content/rules/ApplyYourself.xml
+++ b/src/chrome/content/rules/ApplyYourself.xml
@@ -8,4 +8,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Appolicious.com.xml b/src/chrome/content/rules/Appolicious.com.xml
index bcf686b1eb1a..f4e75cb40df1 100644
--- a/src/chrome/content/rules/Appolicious.com.xml
+++ b/src/chrome/content/rules/Appolicious.com.xml
@@ -1,6 +1,6 @@
 
-
+
 
 	
diff --git a/src/chrome/content/rules/Appsecute.xml b/src/chrome/content/rules/Appsecute.xml
index c6f90b276b67..78ed3ce9cbfb 100644
--- a/src/chrome/content/rules/Appsecute.xml
+++ b/src/chrome/content/rules/Appsecute.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.appsecute.com/ => https://www.appsecute.com/: (51, "SSL:
 Disabled by https-everywhere-checker because:
 Fetch error: http://appsecute.com/ => https://appsecute.com/: (6, 'Could not resolve host: appsecute.com')
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://appsecute.com/ => https://appsecute.com/: (6, 'Could not res
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Appsites.com.xml b/src/chrome/content/rules/Appsites.com.xml
deleted file mode 100644
index c6d269d417c2..000000000000
--- a/src/chrome/content/rules/Appsites.com.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Apress.com.xml b/src/chrome/content/rules/Apress.com.xml
index c6ee4068d4c7..82131de5555f 100644
--- a/src/chrome/content/rules/Apress.com.xml
+++ b/src/chrome/content/rules/Apress.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://apress.com/ => https://apress.com/: (51, "SSL: no alternativ
 		- Images from springeruploads.com
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Aqicn.org.xml b/src/chrome/content/rules/Aqicn.org.xml
new file mode 100644
index 000000000000..7b7c96f1f400
--- /dev/null
+++ b/src/chrome/content/rules/Aqicn.org.xml
@@ -0,0 +1,53 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/AquaGear.xml b/src/chrome/content/rules/AquaGear.xml
index 6d93c00bc74b..b1cb11727531 100644
--- a/src/chrome/content/rules/AquaGear.xml
+++ b/src/chrome/content/rules/AquaGear.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Non-2xx HTTP code: http://img1.aquagear.com/ (200) => https://img1.aquagear.com/ (403)
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Aquafina.com.xml b/src/chrome/content/rules/Aquafina.com.xml
new file mode 100644
index 000000000000..3cf55acabe99
--- /dev/null
+++ b/src/chrome/content/rules/Aquafina.com.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Aquapel.ca.xml b/src/chrome/content/rules/Aquapel.ca.xml
new file mode 100644
index 000000000000..98d2fc44e013
--- /dev/null
+++ b/src/chrome/content/rules/Aquapel.ca.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Aquent.xml b/src/chrome/content/rules/Aquent.xml
index e4af3128df30..8fe1201e0480 100644
--- a/src/chrome/content/rules/Aquent.xml
+++ b/src/chrome/content/rules/Aquent.xml
@@ -2,7 +2,7 @@
 
 	
 	
-	
+	
 	
 	
 
diff --git a/src/chrome/content/rules/AquilaClothing.co.uk.xml b/src/chrome/content/rules/AquilaClothing.co.uk.xml
index 7a4b2c86158f..2d2950aeff1a 100644
--- a/src/chrome/content/rules/AquilaClothing.co.uk.xml
+++ b/src/chrome/content/rules/AquilaClothing.co.uk.xml
@@ -5,7 +5,7 @@ Fetch error: http://aquilaclothing.co.uk/ => https://aquilaclothing.co.uk/: (51,
 Fetch error: http://www.aquilaclothing.co.uk/ => https://www.aquilaclothing.co.uk/: (51, "SSL: no alternative certificate subject name matches target host name 'www.aquilaclothing.co.uk'")
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Aquiss.xml b/src/chrome/content/rules/Aquiss.xml
index 4502e1b6d64f..6fd7ca2bd6e8 100644
--- a/src/chrome/content/rules/Aquiss.xml
+++ b/src/chrome/content/rules/Aquiss.xml
@@ -17,13 +17,13 @@
 -->
 
 
-	
+	
+	
 		
 
 
 	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/ArXiv2Bibtex.org.xml b/src/chrome/content/rules/ArXiv2Bibtex.org.xml
new file mode 100644
index 000000000000..af9c00c305b3
--- /dev/null
+++ b/src/chrome/content/rules/ArXiv2Bibtex.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Arachnys.xml b/src/chrome/content/rules/Arachnys.xml
index c5ee7af0e4d4..0b4af44ba339 100644
--- a/src/chrome/content/rules/Arachnys.xml
+++ b/src/chrome/content/rules/Arachnys.xml
@@ -10,4 +10,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Aral_Balkan.com.xml b/src/chrome/content/rules/Aral_Balkan.com.xml
index 6bf6c6c5f082..b112eadbfc3a 100644
--- a/src/chrome/content/rules/Aral_Balkan.com.xml
+++ b/src/chrome/content/rules/Aral_Balkan.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://aralbalkan.com/ => https://aralbalkan.com/: (60, 'SSL certif
 Fetch error: http://www.aralbalkan.com/ => https://www.aralbalkan.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Arbor-Netscout.xml b/src/chrome/content/rules/Arbor-Netscout.xml
new file mode 100644
index 000000000000..6c1cc51b444b
--- /dev/null
+++ b/src/chrome/content/rules/Arbor-Netscout.xml
@@ -0,0 +1,89 @@
+
+
+
+
+	
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+		
+
+	
+
+	
+	
+
+		
+	
+		
+	
+	
+		
+
+	
+
+
diff --git a/src/chrome/content/rules/Arbor-Networks.xml b/src/chrome/content/rules/Arbor-Networks.xml
deleted file mode 100644
index 03cfac0c816c..000000000000
--- a/src/chrome/content/rules/Arbor-Networks.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-
-
-	
-
-	
-	
-	
-	
-	
-
-	
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-	
-
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-
-
diff --git a/src/chrome/content/rules/ArcGIS.xml b/src/chrome/content/rules/ArcGIS.xml
index 40349178efef..697a9af1a586 100644
--- a/src/chrome/content/rules/ArcGIS.xml
+++ b/src/chrome/content/rules/ArcGIS.xml
@@ -192,12 +192,12 @@
 	
 
 		
-		
+
 		
 		
 		
 		
-		
+
 		
 		
 		
diff --git a/src/chrome/content/rules/ArcGIS_online.com.xml b/src/chrome/content/rules/ArcGIS_online.com.xml
index 452be96525de..6c84c1a40f02 100644
--- a/src/chrome/content/rules/ArcGIS_online.com.xml
+++ b/src/chrome/content/rules/ArcGIS_online.com.xml
@@ -10,7 +10,7 @@
 	- seattle-imagery1.arcgisonline.com
 	- seattle-imagery2.arcgisonline.com
 	- seattle-imagery5.arcgisonline.com
-	
+
 	Cert mismatch:
 		- arcgisonline.com
 		- qaext.arcgisonline.com
@@ -38,7 +38,7 @@
 		- mesa1-services.arcgisonline.com
 		- mesa2-services.arcgisonline.com
 		- mobilesampleserver.arcgisonline.com
-		- premiumtasks.arcgisonline.com		
+		- premiumtasks.arcgisonline.com
 		- sampleserver1a.arcgisonline.com
 		- sampleserver1b.arcgisonline.com
 		- sampleserver1c.arcgisonline.com
diff --git a/src/chrome/content/rules/ArchBang.org.xml b/src/chrome/content/rules/ArchBang.org.xml
index 28e6d56caedf..0867a90b3847 100644
--- a/src/chrome/content/rules/ArchBang.org.xml
+++ b/src/chrome/content/rules/ArchBang.org.xml
@@ -5,7 +5,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
-
+
   
   
 
diff --git a/src/chrome/content/rules/Architects_Journal.xml b/src/chrome/content/rules/Architects_Journal.xml
index f4c182fa4f36..9457230ff947 100644
--- a/src/chrome/content/rules/Architects_Journal.xml
+++ b/src/chrome/content/rules/Architects_Journal.xml
@@ -24,4 +24,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Archive.is.xml b/src/chrome/content/rules/Archive.is.xml
index 49559d942c57..0164e2e4d9ea 100644
--- a/src/chrome/content/rules/Archive.is.xml
+++ b/src/chrome/content/rules/Archive.is.xml
@@ -1,26 +1,22 @@
-
-
+
 
 	
-	
 	
+	
 	
 	
 	
 	
+	
 	
-	
 	
-
-	
+	
+	
+	
+	
+	
+	
+	
 
 	
 
diff --git a/src/chrome/content/rules/ArchiveTeam.org.xml b/src/chrome/content/rules/ArchiveTeam.org.xml
new file mode 100644
index 000000000000..af07d07549fc
--- /dev/null
+++ b/src/chrome/content/rules/ArchiveTeam.org.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+	
+	
+	
+
+    
+
diff --git a/src/chrome/content/rules/Archives-ouvertes.fr.xml b/src/chrome/content/rules/Archives-ouvertes.fr.xml
index a8ca0eb3dc51..788e0dcb41c7 100644
--- a/src/chrome/content/rules/Archives-ouvertes.fr.xml
+++ b/src/chrome/content/rules/Archives-ouvertes.fr.xml
@@ -15,7 +15,7 @@
 		
 		
 		
-	
+
 		
 		
 		
diff --git a/src/chrome/content/rules/Archomedia.xml b/src/chrome/content/rules/Archomedia.xml
index eb6df3686c75..bbc6bbcfa095 100644
--- a/src/chrome/content/rules/Archomedia.xml
+++ b/src/chrome/content/rules/Archomedia.xml
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ArcorCentralLogin.xml b/src/chrome/content/rules/ArcorCentralLogin.xml
deleted file mode 100644
index bd1bdf29900a..000000000000
--- a/src/chrome/content/rules/ArcorCentralLogin.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-  
-  
-  
-  
-
diff --git a/src/chrome/content/rules/Ardour.xml b/src/chrome/content/rules/Ardour.xml
index ba78e387a93b..3d8c1d8bc3e4 100644
--- a/src/chrome/content/rules/Ardour.xml
+++ b/src/chrome/content/rules/Ardour.xml
@@ -15,13 +15,14 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Arduino.cc.xml b/src/chrome/content/rules/Arduino.cc.xml
index 2ded1b7e0ee0..04b838c8d70f 100644
--- a/src/chrome/content/rules/Arduino.cc.xml
+++ b/src/chrome/content/rules/Arduino.cc.xml
@@ -2,13 +2,13 @@
 	Nonfunctional subdomains:
         - www.id (wrong cert)
         - casajasmina.arduino.cc (refused)
-    
+
     Latest test: 11.11.2017
 -->
 
 	
 	
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/AreWeFluentYet.com.xml b/src/chrome/content/rules/AreWeFluentYet.com.xml
new file mode 100644
index 000000000000..6e2582d8e5b0
--- /dev/null
+++ b/src/chrome/content/rules/AreWeFluentYet.com.xml
@@ -0,0 +1,7 @@
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/AreWeLearningYet.com.xml b/src/chrome/content/rules/AreWeLearningYet.com.xml
new file mode 100644
index 000000000000..3f953934d6a9
--- /dev/null
+++ b/src/chrome/content/rules/AreWeLearningYet.com.xml
@@ -0,0 +1,9 @@
+
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/AreWeWebYet.org.xml b/src/chrome/content/rules/AreWeWebYet.org.xml
new file mode 100644
index 000000000000..acfcc5c1d295
--- /dev/null
+++ b/src/chrome/content/rules/AreWeWebYet.org.xml
@@ -0,0 +1,9 @@
+ 
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Are_We_Slim_Yet.com.xml b/src/chrome/content/rules/Are_We_Slim_Yet.com.xml
deleted file mode 100644
index e571b86c6fb3..000000000000
--- a/src/chrome/content/rules/Are_We_Slim_Yet.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/ArenaofValor.com.xml b/src/chrome/content/rules/ArenaofValor.com.xml
new file mode 100644
index 000000000000..268f423cdabd
--- /dev/null
+++ b/src/chrome/content/rules/ArenaofValor.com.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+	
+		
+
+	
+
diff --git a/src/chrome/content/rules/Argonne-National-Laboratory.xml b/src/chrome/content/rules/Argonne-National-Laboratory.xml
index 3f002a283e46..d1fb50e87ac9 100644
--- a/src/chrome/content/rules/Argonne-National-Laboratory.xml
+++ b/src/chrome/content/rules/Argonne-National-Laboratory.xml
@@ -13,7 +13,14 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Argus.ch.xml b/src/chrome/content/rules/Argus.ch.xml
deleted file mode 100644
index 164f743306f4..000000000000
--- a/src/chrome/content/rules/Argus.ch.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Argus_Leader.xml b/src/chrome/content/rules/Argus_Leader.xml
index 34757ef7b1b5..762def4bb052 100644
--- a/src/chrome/content/rules/Argus_Leader.xml
+++ b/src/chrome/content/rules/Argus_Leader.xml
@@ -1,25 +1,34 @@
 
-
+		Mixed content blocking (MCB) triggered:
+		- realestate.argusleader.com
 
+-->
+
 	
-	
-
-
-	
-
-
-	
-
+	
+	
+	
+	
+	
+	
+		
+		
+	
+		
+	
+
+	
+
+	
 
diff --git a/src/chrome/content/rules/Ariejan.net.xml b/src/chrome/content/rules/Ariejan.net.xml
index ebf4f1cd8720..a60146f89914 100644
--- a/src/chrome/content/rules/Ariejan.net.xml
+++ b/src/chrome/content/rules/Ariejan.net.xml
@@ -1,7 +1,8 @@
 
 
 	
-	
+	
+	
 
 	
 	
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Arizona-State-University.xml b/src/chrome/content/rules/Arizona-State-University.xml
index 4b15905c3e4f..4dd12471e347 100644
--- a/src/chrome/content/rules/Arizona-State-University.xml
+++ b/src/chrome/content/rules/Arizona-State-University.xml
@@ -228,7 +228,7 @@ Fetch error: http://www.geodacenter.org/ => https://www.geodacenter.org/: (28, '
 		- libguides		(→ libguides.com, $ redirects to http)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Arkena.com.xml b/src/chrome/content/rules/Arkena.com.xml
deleted file mode 100644
index 95b85fdb19b2..000000000000
--- a/src/chrome/content/rules/Arkena.com.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Armorgames.com.xml b/src/chrome/content/rules/Armorgames.com.xml
new file mode 100644
index 000000000000..31c29f0cf79f
--- /dev/null
+++ b/src/chrome/content/rules/Armorgames.com.xml
@@ -0,0 +1,15 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ArmoryBids.com.xml b/src/chrome/content/rules/ArmoryBids.com.xml
index abe5c3315f84..d48934c5499f 100644
--- a/src/chrome/content/rules/ArmoryBids.com.xml
+++ b/src/chrome/content/rules/ArmoryBids.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://armorybids.com/ => https://armorybids.com/: (28, 'Connection
 Fetch error: http://www.armorybids.com/ => https://www.armorybids.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Armscontrolcenter.org.xml b/src/chrome/content/rules/Armscontrolcenter.org.xml
new file mode 100644
index 000000000000..e5bdd7f303b6
--- /dev/null
+++ b/src/chrome/content/rules/Armscontrolcenter.org.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Arozus.xml b/src/chrome/content/rules/Arozus.xml
index 167b74462a05..9a93b06f1d5f 100644
--- a/src/chrome/content/rules/Arozus.xml
+++ b/src/chrome/content/rules/Arozus.xml
@@ -18,4 +18,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Arpxs.com.xml b/src/chrome/content/rules/Arpxs.com.xml
index 5eb8c2199a66..80cd7ad62433 100644
--- a/src/chrome/content/rules/Arpxs.com.xml
+++ b/src/chrome/content/rules/Arpxs.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.arpxs.com/ => https://www.arpxs.com/: (51, "SSL: no alte
 		- www.arpxs.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Arquetype.org.xml b/src/chrome/content/rules/Arquetype.org.xml
index 91ef0e599252..7c1f010168e4 100644
--- a/src/chrome/content/rules/Arquetype.org.xml
+++ b/src/chrome/content/rules/Arquetype.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://arquetype.org/ => https://arquetype.org/: (60, 'SSL certific
 Fetch error: http://www.arquetype.org/ => https://www.arquetype.org/: (60, 'SSL certificate problem: self signed certificate')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Array.is.xml b/src/chrome/content/rules/Array.is.xml
deleted file mode 100644
index 464b33a52718..000000000000
--- a/src/chrome/content/rules/Array.is.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Ars-Technica.xml b/src/chrome/content/rules/Ars-Technica.xml
deleted file mode 100644
index 6c0caa9d7deb..000000000000
--- a/src/chrome/content/rules/Ars-Technica.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-		
-
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/ArsTechnica.co.uk.xml b/src/chrome/content/rules/ArsTechnica.co.uk.xml
new file mode 100644
index 000000000000..17ca26df542c
--- /dev/null
+++ b/src/chrome/content/rules/ArsTechnica.co.uk.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ArsTechnica.com.xml b/src/chrome/content/rules/ArsTechnica.com.xml
new file mode 100644
index 000000000000..a72caf50bdf8
--- /dev/null
+++ b/src/chrome/content/rules/ArsTechnica.com.xml
@@ -0,0 +1,58 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+		
+	
+	
+	
+	
+		
+		
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ArsTechnica.net.xml b/src/chrome/content/rules/ArsTechnica.net.xml
new file mode 100644
index 000000000000..534e88851bbc
--- /dev/null
+++ b/src/chrome/content/rules/ArsTechnica.net.xml
@@ -0,0 +1,14 @@
+
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Art-Practical.xml b/src/chrome/content/rules/Art-Practical.xml
index b1be04756d7a..2e67f621baad 100644
--- a/src/chrome/content/rules/Art-Practical.xml
+++ b/src/chrome/content/rules/Art-Practical.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Non-2xx HTTP code: http://artpractical.com/ (200) => https://artpractical.com/ (404)
 Non-2xx HTTP code: http://www.artpractical.com/ (200) => https://artpractical.com/ (404)
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Art.com.xml b/src/chrome/content/rules/Art.com.xml
index 25f62ff0cc3a..0729abdf7b8c 100644
--- a/src/chrome/content/rules/Art.com.xml
+++ b/src/chrome/content/rules/Art.com.xml
@@ -30,7 +30,7 @@ Fetch error: http://art.com/ => https://art.com/: (28, 'Connection timed out aft
 		- Ads on eu from cache1.artprintimages.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Art2pO.com.xml b/src/chrome/content/rules/Art2pO.com.xml
deleted file mode 100644
index b24e633f3e8b..000000000000
--- a/src/chrome/content/rules/Art2pO.com.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/ArtChristina.xml b/src/chrome/content/rules/ArtChristina.xml
index 01b1af1fd359..64374c8bab9a 100644
--- a/src/chrome/content/rules/ArtChristina.xml
+++ b/src/chrome/content/rules/ArtChristina.xml
@@ -12,4 +12,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ArtOfProblemSolving.com.xml b/src/chrome/content/rules/ArtOfProblemSolving.com.xml
new file mode 100644
index 000000000000..6b86a84a7bf5
--- /dev/null
+++ b/src/chrome/content/rules/ArtOfProblemSolving.com.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ArtSkills.xml b/src/chrome/content/rules/ArtSkills.xml
index ad06bbe293b9..9edc1f563479 100644
--- a/src/chrome/content/rules/ArtSkills.xml
+++ b/src/chrome/content/rules/ArtSkills.xml
@@ -10,4 +10,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Art_Schools.com.xml b/src/chrome/content/rules/Art_Schools.com.xml
deleted file mode 100644
index 37668fc0b735..000000000000
--- a/src/chrome/content/rules/Art_Schools.com.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Artday.xml b/src/chrome/content/rules/Artday.xml
index 767c07c626b6..eb23b557f4aa 100644
--- a/src/chrome/content/rules/Artday.xml
+++ b/src/chrome/content/rules/Artday.xml
@@ -8,10 +8,11 @@ Fetch error: http://artday.co.kr/ => https://auction.artday.co.kr/: (51, "SSL: n
 		- (www.)	(expired 2013-04-06)
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
@@ -22,4 +23,4 @@ Fetch error: http://artday.co.kr/ => https://auction.artday.co.kr/: (51, "SSL: n
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Artemis.net.xml b/src/chrome/content/rules/Artemis.net.xml
index af0729c5e3ae..a968b8766660 100644
--- a/src/chrome/content/rules/Artemis.net.xml
+++ b/src/chrome/content/rules/Artemis.net.xml
@@ -5,18 +5,17 @@ Fetch error: http://artemis.net/ => https://artemis.net/: (60, 'SSL certificate
 Fetch error: http://artemisinternet.com/ => https://artemisinternet.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
-	
 	
-	
+	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Artfiles_New_Media.xml b/src/chrome/content/rules/Artfiles_New_Media.xml
index aecaefc8fdfd..f6eb946257c6 100644
--- a/src/chrome/content/rules/Artfiles_New_Media.xml
+++ b/src/chrome/content/rules/Artfiles_New_Media.xml
@@ -25,7 +25,11 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 
 
 	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Arvixe.xml b/src/chrome/content/rules/Arvixe.xml
index 0b73bb383fa5..ecc88514923e 100644
--- a/src/chrome/content/rules/Arvixe.xml
+++ b/src/chrome/content/rules/Arvixe.xml
@@ -27,16 +27,19 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 
 
-	
+	
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/AsSeenOnTV.com.xml b/src/chrome/content/rules/AsSeenOnTV.com.xml
deleted file mode 100644
index 759d6abc29d8..000000000000
--- a/src/chrome/content/rules/AsSeenOnTV.com.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-		
-		
-		
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Asahi_Shimbun.xml b/src/chrome/content/rules/Asahi_Shimbun.xml
index 14ecdc199fe1..36e9405eea6b 100644
--- a/src/chrome/content/rules/Asahi_Shimbun.xml
+++ b/src/chrome/content/rules/Asahi_Shimbun.xml
@@ -19,14 +19,13 @@
 -->
 
 
-	
+	
 		
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Asana.xml b/src/chrome/content/rules/Asana.xml
deleted file mode 100644
index 57d33c729ccf..000000000000
--- a/src/chrome/content/rules/Asana.xml
+++ /dev/null
@@ -1,413 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/AsbestosSafetyandEradicationAgency.xml b/src/chrome/content/rules/AsbestosSafetyandEradicationAgency.xml
index b566f98d3e06..c0ee57d6bcd6 100644
--- a/src/chrome/content/rules/AsbestosSafetyandEradicationAgency.xml
+++ b/src/chrome/content/rules/AsbestosSafetyandEradicationAgency.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Asbury_Park_Press.xml b/src/chrome/content/rules/Asbury_Park_Press.xml
index 488b54b7c24f..f7810f173e6b 100644
--- a/src/chrome/content/rules/Asbury_Park_Press.xml
+++ b/src/chrome/content/rules/Asbury_Park_Press.xml
@@ -16,7 +16,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/AscenderFonts.com.xml b/src/chrome/content/rules/AscenderFonts.com.xml
deleted file mode 100644
index 8f73dca7f09f..000000000000
--- a/src/chrome/content/rules/AscenderFonts.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Asciinema.org.xml b/src/chrome/content/rules/Asciinema.org.xml
index 0dfa90379a9d..8963103c2c8c 100644
--- a/src/chrome/content/rules/Asciinema.org.xml
+++ b/src/chrome/content/rules/Asciinema.org.xml
@@ -1,26 +1,12 @@
-
-
-
+
 
 	
 	
 	
+	
 	
 
-	
-	
-
-	
-
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Asecus.xml b/src/chrome/content/rules/Asecus.xml
deleted file mode 100644
index 3a8bf86a27ce..000000000000
--- a/src/chrome/content/rules/Asecus.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Asfar.org.uk.xml b/src/chrome/content/rules/Asfar.org.uk.xml
new file mode 100644
index 000000000000..2c68e672cfc6
--- /dev/null
+++ b/src/chrome/content/rules/Asfar.org.uk.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ashampoo.com.xml b/src/chrome/content/rules/Ashampoo.com.xml
index 52224695bebb..12220fee99ee 100644
--- a/src/chrome/content/rules/Ashampoo.com.xml
+++ b/src/chrome/content/rules/Ashampoo.com.xml
@@ -41,7 +41,7 @@ Fetch error: http://vpn.ashampoo.com/ => https://vpn.ashampoo.com/: (60, 'SSL ce
 		- awstats.ashampoo.com
 
 -->
-
+
 
 	
@@ -68,7 +68,7 @@ Fetch error: http://vpn.ashampoo.com/ => https://vpn.ashampoo.com/: (60, 'SSL ce
 	
 	
 
-	
+	
 
 
 	
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Ashland_Fiber.net.xml b/src/chrome/content/rules/Ashland_Fiber.net.xml
index 1507f79c5ce5..a81b5d57e2dd 100644
--- a/src/chrome/content/rules/Ashland_Fiber.net.xml
+++ b/src/chrome/content/rules/Ashland_Fiber.net.xml
@@ -14,4 +14,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ashlands.net.xml b/src/chrome/content/rules/Ashlands.net.xml
new file mode 100644
index 000000000000..ff48105866b5
--- /dev/null
+++ b/src/chrome/content/rules/Ashlands.net.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Ashley_Madison.com-falsemixed.xml b/src/chrome/content/rules/Ashley_Madison.com-falsemixed.xml
deleted file mode 100644
index a21665406acd..000000000000
--- a/src/chrome/content/rules/Ashley_Madison.com-falsemixed.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Ashleymadison.com.xml b/src/chrome/content/rules/Ashleymadison.com.xml
deleted file mode 100644
index f7f5cc883699..000000000000
--- a/src/chrome/content/rules/Ashleymadison.com.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-		
-		
-		
-		
-
-			
-			
-			
-			
-
-			
-			
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Asia-Pacific-Network-Information-Centre.xml b/src/chrome/content/rules/Asia-Pacific-Network-Information-Centre.xml
index b34f4a671426..07d985905f5b 100644
--- a/src/chrome/content/rules/Asia-Pacific-Network-Information-Centre.xml
+++ b/src/chrome/content/rules/Asia-Pacific-Network-Information-Centre.xml
@@ -1,16 +1,23 @@
 
-
+
 
 	
 	
+	
+	
 	
+	
+	
+	
+	
+	
 	
+	
+	
 	
 	
 
diff --git a/src/chrome/content/rules/Asianfanfics.xml b/src/chrome/content/rules/Asianfanfics.xml
index baa21b9abdf6..168ccb046a27 100644
--- a/src/chrome/content/rules/Asianfanfics.xml
+++ b/src/chrome/content/rules/Asianfanfics.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AskAMathematician.com.xml b/src/chrome/content/rules/AskAMathematician.com.xml
new file mode 100644
index 000000000000..8aeb6675a2e3
--- /dev/null
+++ b/src/chrome/content/rules/AskAMathematician.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Asknet.xml b/src/chrome/content/rules/Asknet.xml
index 8026c7914c43..ff2803a54417 100644
--- a/src/chrome/content/rules/Asknet.xml
+++ b/src/chrome/content/rules/Asknet.xml
@@ -17,4 +17,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Asnetworks.com.xml b/src/chrome/content/rules/Asnetworks.com.xml
index dbe835824328..d8978019bc66 100644
--- a/src/chrome/content/rules/Asnetworks.com.xml
+++ b/src/chrome/content/rules/Asnetworks.com.xml
@@ -10,4 +10,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Aspen.com.xml b/src/chrome/content/rules/Aspen.com.xml
index 289edf686db0..2532f62e44d7 100644
--- a/src/chrome/content/rules/Aspen.com.xml
+++ b/src/chrome/content/rules/Aspen.com.xml
@@ -17,7 +17,7 @@
 
 
 	
-	
+	
 		
@@ -32,4 +32,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Asrock.com.xml b/src/chrome/content/rules/Asrock.com.xml
new file mode 100644
index 000000000000..c35bb6ed1c65
--- /dev/null
+++ b/src/chrome/content/rules/Asrock.com.xml
@@ -0,0 +1,22 @@
+
+
+	
+	
+	
+	
+		
+
+	
+
diff --git a/src/chrome/content/rules/Assakina.com.xml b/src/chrome/content/rules/Assakina.com.xml
index 9753e2c7a1fd..03b9a19cea84 100644
--- a/src/chrome/content/rules/Assakina.com.xml
+++ b/src/chrome/content/rules/Assakina.com.xml
@@ -1,7 +1,7 @@
 
 
 	
diff --git a/src/chrome/content/rules/Assayassured.co.uk.xml b/src/chrome/content/rules/Assayassured.co.uk.xml
index 8dcb85884857..349ba68cd7bc 100644
--- a/src/chrome/content/rules/Assayassured.co.uk.xml
+++ b/src/chrome/content/rules/Assayassured.co.uk.xml
@@ -15,4 +15,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Asseenonresponsetv.com.xml b/src/chrome/content/rules/Asseenonresponsetv.com.xml
index 19896bab65e0..91340f2fcc55 100644
--- a/src/chrome/content/rules/Asseenonresponsetv.com.xml
+++ b/src/chrome/content/rules/Asseenonresponsetv.com.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://asseenonresponsetv.com/ => https://asseenonresponsetv.com/: (60, 'SSL certificate problem: self signed certificate')
 Fetch error: http://www.asseenonresponsetv.com/ => https://www.asseenonresponsetv.com/: (60, 'SSL certificate problem: self signed certificate')
 -->
-
+
 
 	
 	
@@ -19,4 +19,4 @@ Fetch error: http://www.asseenonresponsetv.com/ => https://www.asseenonresponset
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Assembla-mismatches.xml b/src/chrome/content/rules/Assembla-mismatches.xml
index 20e05107abd4..3cad6154ceb9 100644
--- a/src/chrome/content/rules/Assembla-mismatches.xml
+++ b/src/chrome/content/rules/Assembla-mismatches.xml
@@ -13,4 +13,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Assembla.xml b/src/chrome/content/rules/Assembla.xml
index 5b52bfd02e6c..7cc616c5e30f 100644
--- a/src/chrome/content/rules/Assembla.xml
+++ b/src/chrome/content/rules/Assembla.xml
@@ -36,7 +36,7 @@
 	
 
 
-	
+	
 
 
 	
 
 	
-	
+	
+	
 
 
 	
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Associated_Press.xml b/src/chrome/content/rules/Associated_Press.xml
deleted file mode 100644
index b14a881fba04..000000000000
--- a/src/chrome/content/rules/Associated_Press.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Associatedcontent.com.xml b/src/chrome/content/rules/Associatedcontent.com.xml
index 0761449dbf7d..3483bb1cee84 100644
--- a/src/chrome/content/rules/Associatedcontent.com.xml
+++ b/src/chrome/content/rules/Associatedcontent.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://associatedcontent.com/ => https://www.associatedcontent.com/
 
 Disabled by https-everywhere-checker because:
 Fetch error: http://associatedcontent.com/ => https://www.associatedcontent.com/: (28, 'Connection timed out after 10000 milliseconds') uses data from i.acdn.us that doesnt allow https. -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Association-for-Progressive-Communications.xml b/src/chrome/content/rules/Association-for-Progressive-Communications.xml
index 6163207f3912..093d909c938a 100644
--- a/src/chrome/content/rules/Association-for-Progressive-Communications.xml
+++ b/src/chrome/content/rules/Association-for-Progressive-Communications.xml
@@ -37,7 +37,7 @@ Fetch error: http://lists.apc.org/ => https://lists.apc.org/: (60, 'SSL certific
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Association_for_Learning_Technology.xml b/src/chrome/content/rules/Association_for_Learning_Technology.xml
index 63c8b9677ee9..259f4383f41a 100644
--- a/src/chrome/content/rules/Association_for_Learning_Technology.xml
+++ b/src/chrome/content/rules/Association_for_Learning_Technology.xml
@@ -17,4 +17,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Association_of_National_Advertisers.xml b/src/chrome/content/rules/Association_of_National_Advertisers.xml
index 574acd6169d0..55a5f59aec0c 100644
--- a/src/chrome/content/rules/Association_of_National_Advertisers.xml
+++ b/src/chrome/content/rules/Association_of_National_Advertisers.xml
@@ -1,7 +1,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Asterisk.xml b/src/chrome/content/rules/Asterisk.xml
index 674af4ee8c0a..8aeed593f280 100644
--- a/src/chrome/content/rules/Asterisk.xml
+++ b/src/chrome/content/rules/Asterisk.xml
@@ -1,61 +1,45 @@
-
 
-
+
 
 	
-	
-		
-		
-
-
-	
-
-
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
 
 
diff --git a/src/chrome/content/rules/Asterisk_Exchange.xml b/src/chrome/content/rules/Asterisk_Exchange.xml
index c60957f43c8a..2b23f46a4ccb 100644
--- a/src/chrome/content/rules/Asterisk_Exchange.xml
+++ b/src/chrome/content/rules/Asterisk_Exchange.xml
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Astra.io.xml b/src/chrome/content/rules/Astra.io.xml
index e958b1979107..a92f89f290dc 100644
--- a/src/chrome/content/rules/Astra.io.xml
+++ b/src/chrome/content/rules/Astra.io.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.astra.io/ => https://astra.io/: (28, 'Connection timed o
 	www: cert only matches ^astra.io
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Astrocentro.com.xml b/src/chrome/content/rules/Astrocentro.com.xml
deleted file mode 100644
index 0a26998b895e..000000000000
--- a/src/chrome/content/rules/Astrocentro.com.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Aswirlgirl.com.xml b/src/chrome/content/rules/Aswirlgirl.com.xml
index 5a29093b47ff..3defd68fe0a7 100644
--- a/src/chrome/content/rules/Aswirlgirl.com.xml
+++ b/src/chrome/content/rules/Aswirlgirl.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://aswirlgirl.com/ => http://aswirlgirl.com/: (6, 'Could not re
 Fetch error: http://www.aswirlgirl.com/ => http://www.aswirlgirl.com/: (6, 'Could not resolve host: www.aswirlgirl.com')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/AtariAge.xml b/src/chrome/content/rules/AtariAge.xml
index 60068d3d072a..cdac056d5633 100644
--- a/src/chrome/content/rules/AtariAge.xml
+++ b/src/chrome/content/rules/AtariAge.xml
@@ -1,9 +1,9 @@
 
 
 	
-	
+	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Atb-online.ru.xml b/src/chrome/content/rules/Atb-online.ru.xml
deleted file mode 100644
index 054cabd199f1..000000000000
--- a/src/chrome/content/rules/Atb-online.ru.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Atgsvcs.com.xml b/src/chrome/content/rules/Atgsvcs.com.xml
index e188ba716e26..fd0f48e5a7fa 100644
--- a/src/chrome/content/rules/Atgsvcs.com.xml
+++ b/src/chrome/content/rules/Atgsvcs.com.xml
@@ -10,4 +10,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Atipso.com.xml b/src/chrome/content/rules/Atipso.com.xml
index 6e18593f2e5b..19820a123a00 100644
--- a/src/chrome/content/rules/Atipso.com.xml
+++ b/src/chrome/content/rules/Atipso.com.xml
@@ -15,13 +15,15 @@ Fetch error: http://atipso.com/ => https://atipso.com/: (60, 'SSL certificate pr
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Atlantic-Media.xml b/src/chrome/content/rules/Atlantic-Media.xml
index e821c64008ee..e5a9c42f1d86 100644
--- a/src/chrome/content/rules/Atlantic-Media.xml
+++ b/src/chrome/content/rules/Atlantic-Media.xml
@@ -42,12 +42,14 @@ Fetch error: http://admin.theatlanticwire.com/ => https://admin.theatlanticwire.
 	¹ Refused
 
 -->
-
+
 
 	
-	
+	
+	
 	
-	
+	
+	
 	
 
 
@@ -62,13 +64,10 @@ Fetch error: http://admin.theatlanticwire.com/ => https://admin.theatlanticwire.
 	
 
-	
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Atlantic.net.xml b/src/chrome/content/rules/Atlantic.net.xml
index c3b13f3344db..71f77f519431 100644
--- a/src/chrome/content/rules/Atlantic.net.xml
+++ b/src/chrome/content/rules/Atlantic.net.xml
@@ -26,7 +26,7 @@
 					-->
 	
 
-	
+	
 
 
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Atmail.xml b/src/chrome/content/rules/Atmail.xml
index cbe949335214..06c968fade88 100644
--- a/src/chrome/content/rules/Atmail.xml
+++ b/src/chrome/content/rules/Atmail.xml
@@ -3,7 +3,7 @@
 	
 	
 	
-	
+
 
 
 	
diff --git a/src/chrome/content/rules/Atomic_Object.com.xml b/src/chrome/content/rules/Atomic_Object.com.xml
index 2b4fd692f2e2..d5f0e363a229 100644
--- a/src/chrome/content/rules/Atomic_Object.com.xml
+++ b/src/chrome/content/rules/Atomic_Object.com.xml
@@ -16,7 +16,7 @@ Fetch error: http://craft-staging.atomicobject.com/ => https://craft-staging.ato
 		- www.atomicobject.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Atomz.xml b/src/chrome/content/rules/Atomz.xml
index 9148c84c7643..5d9e98e538b9 100644
--- a/src/chrome/content/rules/Atomz.xml
+++ b/src/chrome/content/rules/Atomz.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.atomz.com/ => https://www.atomz.com/: (6, 'Could not res
 Disabled by https-everywhere-checker because:
 Fetch error: http://atomz.com/ => https://atomz.com/: (56, 'Recv failure: Connection reset by peer')
 -->
-
+
 
 	
 	
@@ -17,4 +17,4 @@ Fetch error: http://atomz.com/ => https://atomz.com/: (56, 'Recv failure: Connec
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Atos.net.xml b/src/chrome/content/rules/Atos.net.xml
index 2ff911a63dd9..1a1aced4f4c3 100644
--- a/src/chrome/content/rules/Atos.net.xml
+++ b/src/chrome/content/rules/Atos.net.xml
@@ -51,13 +51,53 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Atrativa.com.br.xml b/src/chrome/content/rules/Atrativa.com.br.xml
index 65f1471cf0a3..91d49abfd57a 100644
--- a/src/chrome/content/rules/Atrativa.com.br.xml
+++ b/src/chrome/content/rules/Atrativa.com.br.xml
@@ -14,7 +14,8 @@
 
 
 	
-	
+	
+	
 		
diff --git a/src/chrome/content/rules/Atstuff.xml b/src/chrome/content/rules/Atstuff.xml
index 03fc752f14ec..8e1587876454 100644
--- a/src/chrome/content/rules/Atstuff.xml
+++ b/src/chrome/content/rules/Atstuff.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Attachmate-Group.xml b/src/chrome/content/rules/Attachmate-Group.xml
index a810ead96715..0b7ecbf1ca6c 100644
--- a/src/chrome/content/rules/Attachmate-Group.xml
+++ b/src/chrome/content/rules/Attachmate-Group.xml
@@ -25,7 +25,7 @@ Fetch error: http://login.attachmategroup.com/ => https://login.attachmategroup.
 		- login.attachmategroup.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Attachmate.xml b/src/chrome/content/rules/Attachmate.xml
index 5ec19e1ce0f8..8b3cba99abdb 100644
--- a/src/chrome/content/rules/Attachmate.xml
+++ b/src/chrome/content/rules/Attachmate.xml
@@ -12,7 +12,7 @@ Fetch error: http://download.attachmate.com/ => https://download.attachmate.com/
 		- support	(no https)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/AtticTV.com.xml b/src/chrome/content/rules/AtticTV.com.xml
index f7e75c088339..b5a8cc2a36b7 100644
--- a/src/chrome/content/rules/AtticTV.com.xml
+++ b/src/chrome/content/rules/AtticTV.com.xml
@@ -5,7 +5,6 @@ Fetch error: http://attictv.com/ => https://attictv.com/: (6, 'Could not resolve
 
 	Other AtticTV rulesets:
 
-		- Kpopstage.co.xml
 
 
 	Insecure cookies are set for these domains:
@@ -20,7 +19,7 @@ Fetch error: http://attictv.com/ => https://attictv.com/: (6, 'Could not resolve
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Attorney-GeneralsDepartment.xml b/src/chrome/content/rules/Attorney-GeneralsDepartment.xml
index 4dcec3c73367..612eb607331a 100644
--- a/src/chrome/content/rules/Attorney-GeneralsDepartment.xml
+++ b/src/chrome/content/rules/Attorney-GeneralsDepartment.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AttorneySteveLee.com.xml b/src/chrome/content/rules/AttorneySteveLee.com.xml
new file mode 100644
index 000000000000..62054057e9fe
--- /dev/null
+++ b/src/chrome/content/rules/AttorneySteveLee.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Attracta.xml b/src/chrome/content/rules/Attracta.xml
index 3ad4bf703916..deca3d32a15e 100644
--- a/src/chrome/content/rules/Attracta.xml
+++ b/src/chrome/content/rules/Attracta.xml
@@ -16,7 +16,7 @@
 	
 
 
-	
+	
 
 
 	
 
 	
diff --git a/src/chrome/content/rules/Attyyar.net.xml b/src/chrome/content/rules/Attyyar.net.xml
deleted file mode 100644
index e80416bef7ec..000000000000
--- a/src/chrome/content/rules/Attyyar.net.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Atypon.xml b/src/chrome/content/rules/Atypon.xml
index 0b98a3660aee..0aeef440af08 100644
--- a/src/chrome/content/rules/Atypon.xml
+++ b/src/chrome/content/rules/Atypon.xml
@@ -3,9 +3,9 @@
 	
 	
 	
-	
 
-	
+
+	
 
 	
 
diff --git a/src/chrome/content/rules/Au.dk.xml b/src/chrome/content/rules/Au.dk.xml
new file mode 100644
index 000000000000..6aae6f3a67e5
--- /dev/null
+++ b/src/chrome/content/rules/Au.dk.xml
@@ -0,0 +1,875 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+		
+
+	
+
diff --git a/src/chrome/content/rules/Audemars_Piguet.com.xml b/src/chrome/content/rules/Audemars_Piguet.com.xml
index 666e1f1adbc2..d5ccc4e0ea69 100644
--- a/src/chrome/content/rules/Audemars_Piguet.com.xml
+++ b/src/chrome/content/rules/Audemars_Piguet.com.xml
@@ -14,7 +14,7 @@
 
 
 	
-	
+	
 
 
 	
@@ -23,4 +23,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Audible.de.xml b/src/chrome/content/rules/Audible.de.xml
index 28becf5bc50f..727b62d3cdf6 100644
--- a/src/chrome/content/rules/Audible.de.xml
+++ b/src/chrome/content/rules/Audible.de.xml
@@ -4,9 +4,9 @@ Fetch error: http://audible.de/ => https://www.audible.de/: Cycle detected - URL
 -->
 
   
-  
+  
 
-  
+  
 
   
   
diff --git a/src/chrome/content/rules/Audicon.net.xml b/src/chrome/content/rules/Audicon.net.xml
index b39898842fbc..acf6350f3e00 100644
--- a/src/chrome/content/rules/Audicon.net.xml
+++ b/src/chrome/content/rules/Audicon.net.xml
@@ -5,7 +5,7 @@ Fetch error: http://audicon.net/ => https://audicon.net/: (60, 'SSL certificate
 Fetch error: http://www.audicon.net/ => https://www.audicon.net/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Audience-Ad-Network.xml b/src/chrome/content/rules/Audience-Ad-Network.xml
index 0c3f021d5532..c12f922c5e5b 100644
--- a/src/chrome/content/rules/Audience-Ad-Network.xml
+++ b/src/chrome/content/rules/Audience-Ad-Network.xml
@@ -6,7 +6,7 @@ Fetch error: http://manage.audienceadnetwork.com/ => https://manage.audienceadne
 Disabled by https-everywhere-checker because:
 Fetch error: http://manage.audienceadnetwork.com/ => https://manage.audienceadnetwork.com/: (28, 'Resolving timed out after 10520 milliseconds')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/AudienceScience.xml b/src/chrome/content/rules/AudienceScience.xml
index 35e4639ef970..b7d3d4791d23 100644
--- a/src/chrome/content/rules/AudienceScience.xml
+++ b/src/chrome/content/rules/AudienceScience.xml
@@ -2,13 +2,13 @@
 	Other AudienceScience rulesets:
 
 		- Audience_Targeting.xml
-		- RevSci.net.xml
 
 
 	Nonfunctional subdomains:
 
 		- (www.) ¹
 		- login ²
+    - gateway
 
 	¹ Shows default page
 	² Reset
@@ -35,27 +35,13 @@
 -->
 
 
-	
-	
-
-	
+	
 	
 
-
-	
+	
 	
-	
-
-	
-
 
 	
 
-	
-
 
diff --git a/src/chrome/content/rules/Audience_Amplify.com.xml b/src/chrome/content/rules/Audience_Amplify.com.xml
deleted file mode 100644
index 0f2d64c66b1f..000000000000
--- a/src/chrome/content/rules/Audience_Amplify.com.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Audiko.net.xml b/src/chrome/content/rules/Audiko.net.xml
new file mode 100644
index 000000000000..a14de8891dd6
--- /dev/null
+++ b/src/chrome/content/rules/Audiko.net.xml
@@ -0,0 +1,21 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Audiko.xml b/src/chrome/content/rules/Audiko.xml
deleted file mode 100644
index f6cab4e01ef2..000000000000
--- a/src/chrome/content/rules/Audiko.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/AudioBooks.com.xml b/src/chrome/content/rules/AudioBooks.com.xml
new file mode 100644
index 000000000000..c67ce833bc4c
--- /dev/null
+++ b/src/chrome/content/rules/AudioBooks.com.xml
@@ -0,0 +1,19 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+		
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/AudioGO.xml b/src/chrome/content/rules/AudioGO.xml
index 58171793fd63..e6948037f8c8 100644
--- a/src/chrome/content/rules/AudioGO.xml
+++ b/src/chrome/content/rules/AudioGO.xml
@@ -8,10 +8,10 @@ Fetch error: http://audiogo.com/ => https://www.audiogo.com/: (7, 'Failed to con
 	!www: times out
 
 -->
-
+
 
 	
-	
+	
 
 
 	
@@ -20,4 +20,4 @@ Fetch error: http://audiogo.com/ => https://www.audiogo.com/: (7, 'Failed to con
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Audioboo.fm.xml b/src/chrome/content/rules/Audioboo.fm.xml
index 89e63c68fcd1..816e19c9a41f 100644
--- a/src/chrome/content/rules/Audioboo.fm.xml
+++ b/src/chrome/content/rules/Audioboo.fm.xml
@@ -6,7 +6,7 @@ Non-2xx HTTP code: http://www.audioboo.fm/ (200) => https://www.audioboo.fm/ (50
 	support: zendesk
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Audioz.download.xml b/src/chrome/content/rules/Audioz.download.xml
new file mode 100644
index 000000000000..e8be1627f9f6
--- /dev/null
+++ b/src/chrome/content/rules/Audioz.download.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/AuditShark.com.xml b/src/chrome/content/rules/AuditShark.com.xml
deleted file mode 100644
index 46555295cc53..000000000000
--- a/src/chrome/content/rules/AuditShark.com.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Audubon.org.xml b/src/chrome/content/rules/Audubon.org.xml
index fa6207c12715..a5bf35870586 100644
--- a/src/chrome/content/rules/Audubon.org.xml
+++ b/src/chrome/content/rules/Audubon.org.xml
@@ -8,7 +8,7 @@ Fetch error: http://audubon.org/ => https://www.audubon.org/: Too many redirects
 	^audubon.org: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/August.com.xml b/src/chrome/content/rules/August.com.xml
new file mode 100644
index 000000000000..f4f8b47ae608
--- /dev/null
+++ b/src/chrome/content/rules/August.com.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Aulani.jobs.xml b/src/chrome/content/rules/Aulani.jobs.xml
deleted file mode 100644
index eddb76f44cad..000000000000
--- a/src/chrome/content/rules/Aulani.jobs.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Aurous.me.xml b/src/chrome/content/rules/Aurous.me.xml
index 913b56cd268d..5c97c42e7e98 100644
--- a/src/chrome/content/rules/Aurous.me.xml
+++ b/src/chrome/content/rules/Aurous.me.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.aurous.me/ => https://www.aurous.me/: (60, 'SSL certific
 	* Tumblr
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/AusPost.com.au.xml b/src/chrome/content/rules/AusPost.com.au.xml
index daee049514a9..c92e997ade17 100644
--- a/src/chrome/content/rules/AusPost.com.au.xml
+++ b/src/chrome/content/rules/AusPost.com.au.xml
@@ -116,7 +116,7 @@
 		- o	(hostname mismatch, CN: *.d2.sc.omtrdc.net)
 		- soap.online	(invalid certificate chain)
 		- platinum	(hostname mismatch, CN: *.startrack.com.au)
-		- poslite	³		
+		- poslite	³
 		- preview	(hostname mismatch, CN: auspost.com.au)
 		- promotion	⁴
 		- pstamps	¹
diff --git a/src/chrome/content/rules/Austiners.com.xml b/src/chrome/content/rules/Austiners.com.xml
index 94fefd581055..04e80e664edd 100644
--- a/src/chrome/content/rules/Austiners.com.xml
+++ b/src/chrome/content/rules/Austiners.com.xml
@@ -11,7 +11,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Austrade.xml b/src/chrome/content/rules/Austrade.xml
index 221957431cc3..7a23dd7f65c8 100644
--- a/src/chrome/content/rules/Austrade.xml
+++ b/src/chrome/content/rules/Austrade.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Australia.gov.au.xml b/src/chrome/content/rules/Australia.gov.au.xml
new file mode 100644
index 000000000000..049c0ebf869d
--- /dev/null
+++ b/src/chrome/content/rules/Australia.gov.au.xml
@@ -0,0 +1,12 @@
+
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/AustralianAntarcticDataCentre.xml b/src/chrome/content/rules/AustralianAntarcticDataCentre.xml
deleted file mode 100644
index 3b8800d951ea..000000000000
--- a/src/chrome/content/rules/AustralianAntarcticDataCentre.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-	
-
-	
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/AustralianBusinessRegister.xml b/src/chrome/content/rules/AustralianBusinessRegister.xml
index fd3c6e53c760..966ccc85c409 100644
--- a/src/chrome/content/rules/AustralianBusinessRegister.xml
+++ b/src/chrome/content/rules/AustralianBusinessRegister.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AustralianClinicalTrials.xml b/src/chrome/content/rules/AustralianClinicalTrials.xml
deleted file mode 100644
index cb493d826ace..000000000000
--- a/src/chrome/content/rules/AustralianClinicalTrials.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-	
-
-	
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/AustralianCompetitionandConsumerCommission.xml b/src/chrome/content/rules/AustralianCompetitionandConsumerCommission.xml
index dd1dff812036..28d4d0680667 100644
--- a/src/chrome/content/rules/AustralianCompetitionandConsumerCommission.xml
+++ b/src/chrome/content/rules/AustralianCompetitionandConsumerCommission.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AustralianCrimeCommission.xml b/src/chrome/content/rules/AustralianCrimeCommission.xml
index a543ad0d176d..bc34242e2c89 100644
--- a/src/chrome/content/rules/AustralianCrimeCommission.xml
+++ b/src/chrome/content/rules/AustralianCrimeCommission.xml
@@ -4,10 +4,10 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://crimecommission.gov.au/ => https://www.crimecommission.gov.au/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AustralianDataArchive.xml b/src/chrome/content/rules/AustralianDataArchive.xml
index e7fa005ecf19..3f43302d2d4e 100644
--- a/src/chrome/content/rules/AustralianDataArchive.xml
+++ b/src/chrome/content/rules/AustralianDataArchive.xml
@@ -4,10 +4,10 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://ada.edu.au/ => https://www.ada.edu.au/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AustralianEarlyDevelopmentCensus.xml b/src/chrome/content/rules/AustralianEarlyDevelopmentCensus.xml
index 9b48596a8059..3a6dce2317b5 100644
--- a/src/chrome/content/rules/AustralianEarlyDevelopmentCensus.xml
+++ b/src/chrome/content/rules/AustralianEarlyDevelopmentCensus.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AustralianEmergencyManagement.xml b/src/chrome/content/rules/AustralianEmergencyManagement.xml
index 6ab02da4bf4f..be1929048bbe 100644
--- a/src/chrome/content/rules/AustralianEmergencyManagement.xml
+++ b/src/chrome/content/rules/AustralianEmergencyManagement.xml
@@ -5,15 +5,15 @@ Fetch error: http://em.gov.au/ => https://www.em.gov.au/: (6, 'Could not resolve
 Fetch error: http://emknowledge.gov.au/ => https://www.emknowledge.gov.au/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 	
-	
+	
 	
-	
+	
 
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AustralianEnergyRegulator.xml b/src/chrome/content/rules/AustralianEnergyRegulator.xml
index b2b69dc68357..01fef7193478 100644
--- a/src/chrome/content/rules/AustralianEnergyRegulator.xml
+++ b/src/chrome/content/rules/AustralianEnergyRegulator.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AustralianExportAwards.xml b/src/chrome/content/rules/AustralianExportAwards.xml
index 234780c38988..74b237ad513f 100644
--- a/src/chrome/content/rules/AustralianExportAwards.xml
+++ b/src/chrome/content/rules/AustralianExportAwards.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AustralianFinancialSecurityAuthority.xml b/src/chrome/content/rules/AustralianFinancialSecurityAuthority.xml
index aa2ba26d5225..7c0bb0bec9be 100644
--- a/src/chrome/content/rules/AustralianFinancialSecurityAuthority.xml
+++ b/src/chrome/content/rules/AustralianFinancialSecurityAuthority.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AustralianGovernmentBoards.xml b/src/chrome/content/rules/AustralianGovernmentBoards.xml
deleted file mode 100644
index ffa1342bd60a..000000000000
--- a/src/chrome/content/rules/AustralianGovernmentBoards.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-	
-
-	
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/AustralianHealthPractitionerRegulationAgency.xml b/src/chrome/content/rules/AustralianHealthPractitionerRegulationAgency.xml
index fd936cd08ebf..aaef95c946c7 100644
--- a/src/chrome/content/rules/AustralianHealthPractitionerRegulationAgency.xml
+++ b/src/chrome/content/rules/AustralianHealthPractitionerRegulationAgency.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AustralianHumanRightsCommission.xml b/src/chrome/content/rules/AustralianHumanRightsCommission.xml
index 0cd2d4c66fad..c62ad65e3571 100644
--- a/src/chrome/content/rules/AustralianHumanRightsCommission.xml
+++ b/src/chrome/content/rules/AustralianHumanRightsCommission.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AustralianLawReformCommission.xml b/src/chrome/content/rules/AustralianLawReformCommission.xml
index f637d43cc97e..7a4c14cb0fed 100644
--- a/src/chrome/content/rules/AustralianLawReformCommission.xml
+++ b/src/chrome/content/rules/AustralianLawReformCommission.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AustralianMaritimeSafetyAuthority.xml b/src/chrome/content/rules/AustralianMaritimeSafetyAuthority.xml
index 12020d1f234a..729e5506c4ab 100644
--- a/src/chrome/content/rules/AustralianMaritimeSafetyAuthority.xml
+++ b/src/chrome/content/rules/AustralianMaritimeSafetyAuthority.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AustralianPassportOffice.xml b/src/chrome/content/rules/AustralianPassportOffice.xml
index 422e41915eac..f59ffc8b34f6 100644
--- a/src/chrome/content/rules/AustralianPassportOffice.xml
+++ b/src/chrome/content/rules/AustralianPassportOffice.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AustralianPlantsBotanyandHorticulture.xml b/src/chrome/content/rules/AustralianPlantsBotanyandHorticulture.xml
index b09de81c4536..b445a7dfa21b 100644
--- a/src/chrome/content/rules/AustralianPlantsBotanyandHorticulture.xml
+++ b/src/chrome/content/rules/AustralianPlantsBotanyandHorticulture.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AustralianStrategicPolicyInstitute.xml b/src/chrome/content/rules/AustralianStrategicPolicyInstitute.xml
index b614f398f555..0fb2791cc2ba 100644
--- a/src/chrome/content/rules/AustralianStrategicPolicyInstitute.xml
+++ b/src/chrome/content/rules/AustralianStrategicPolicyInstitute.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AustralianTaxationOffice.xml b/src/chrome/content/rules/AustralianTaxationOffice.xml
index 5fd8123f6039..d44689601825 100644
--- a/src/chrome/content/rules/AustralianTaxationOffice.xml
+++ b/src/chrome/content/rules/AustralianTaxationOffice.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AustralianTransportSafetyBureau.xml b/src/chrome/content/rules/AustralianTransportSafetyBureau.xml
index 80ea89331971..1482f7ca80b5 100644
--- a/src/chrome/content/rules/AustralianTransportSafetyBureau.xml
+++ b/src/chrome/content/rules/AustralianTransportSafetyBureau.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AustralianWarMemorial.xml b/src/chrome/content/rules/AustralianWarMemorial.xml
index f6990a552373..4ac8f296a517 100644
--- a/src/chrome/content/rules/AustralianWarMemorial.xml
+++ b/src/chrome/content/rules/AustralianWarMemorial.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/AustrianAirlines.xml b/src/chrome/content/rules/AustrianAirlines.xml
index b70daaa56c8f..3ece0489150a 100644
--- a/src/chrome/content/rules/AustrianAirlines.xml
+++ b/src/chrome/content/rules/AustrianAirlines.xml
@@ -3,4 +3,4 @@
   
 
   
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Authbox.io.xml b/src/chrome/content/rules/Authbox.io.xml
index 430443652f6a..e7a13bff87ce 100644
--- a/src/chrome/content/rules/Authbox.io.xml
+++ b/src/chrome/content/rules/Authbox.io.xml
@@ -18,7 +18,7 @@ Fetch error: http://www.authbox.io/ => https://www.authbox.io/: (51, "SSL: no al
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Authorize.com.xml b/src/chrome/content/rules/Authorize.com.xml
new file mode 100644
index 000000000000..032289f48bcd
--- /dev/null
+++ b/src/chrome/content/rules/Authorize.com.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Authorize.net.xml b/src/chrome/content/rules/Authorize.net.xml
index f246b2b0183b..a2392bd45850 100644
--- a/src/chrome/content/rules/Authorize.net.xml
+++ b/src/chrome/content/rules/Authorize.net.xml
@@ -1,48 +1,44 @@
 
-
-
+
 	
-	
-	
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 	
 
-	
-
-	
-	
-	
-
+	
 
diff --git a/src/chrome/content/rules/Autistic_Self-Advocacy_Network.xml b/src/chrome/content/rules/Autistic_Self-Advocacy_Network.xml
index 467edc622522..4c285248db56 100644
--- a/src/chrome/content/rules/Autistic_Self-Advocacy_Network.xml
+++ b/src/chrome/content/rules/Autistic_Self-Advocacy_Network.xml
@@ -13,4 +13,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Auto.ro.xml b/src/chrome/content/rules/Auto.ro.xml
index 44f98c095f11..b6bbaf86f01c 100644
--- a/src/chrome/content/rules/Auto.ro.xml
+++ b/src/chrome/content/rules/Auto.ro.xml
@@ -57,7 +57,7 @@
 	³ Not secured by us <= mismatched
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/AutoBuzz.my.xml b/src/chrome/content/rules/AutoBuzz.my.xml
new file mode 100644
index 000000000000..711544fb107e
--- /dev/null
+++ b/src/chrome/content/rules/AutoBuzz.my.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/AutoHits.vn.xml b/src/chrome/content/rules/AutoHits.vn.xml
index f278feaf826a..40c69208ee47 100644
--- a/src/chrome/content/rules/AutoHits.vn.xml
+++ b/src/chrome/content/rules/AutoHits.vn.xml
@@ -11,7 +11,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/AutoIt-CDN.com.xml b/src/chrome/content/rules/AutoIt-CDN.com.xml
index 27e4df87692c..2c68f717dce5 100644
--- a/src/chrome/content/rules/AutoIt-CDN.com.xml
+++ b/src/chrome/content/rules/AutoIt-CDN.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://static1.autoit-cdn.com/ => https://static1.autoit-cdn.com/:
 	For other AutoIt coverage, see AutoIt_script.com.xml.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/AutoTrader.com.xml b/src/chrome/content/rules/AutoTrader.com.xml
index 620dcc1f23d5..76e7786a6d69 100644
--- a/src/chrome/content/rules/AutoTrader.com.xml
+++ b/src/chrome/content/rules/AutoTrader.com.xml
@@ -5,26 +5,17 @@ Fetch error: http://autotraderstatic.com/ => https://www.autotraderstatic.com/:
 
 
 	
-	
-	
+	
+	
+	
 	
-	
-
+	
 
 	
 
-
 	
 
-	
-	
-
-	
-	
+  
 
 
diff --git a/src/chrome/content/rules/Auto_Ad_Manager.com.xml b/src/chrome/content/rules/Auto_Ad_Manager.com.xml
index 2bf67d911470..4ea7cf7a0681 100644
--- a/src/chrome/content/rules/Auto_Ad_Manager.com.xml
+++ b/src/chrome/content/rules/Auto_Ad_Manager.com.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Auto_Blog.com.xml b/src/chrome/content/rules/Auto_Blog.com.xml
index 7a364c12c4fd..3a981c340ab2 100644
--- a/src/chrome/content/rules/Auto_Blog.com.xml
+++ b/src/chrome/content/rules/Auto_Blog.com.xml
@@ -29,7 +29,7 @@ Fetch error: http://autoblog.com/ => https://www.autoblog.com/: Too many redirec
 			- www.blogsmithmedia.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Auto_Rims_and_Accessories.xml b/src/chrome/content/rules/Auto_Rims_and_Accessories.xml
deleted file mode 100644
index 69c53e8dabd0..000000000000
--- a/src/chrome/content/rules/Auto_Rims_and_Accessories.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/AutomaticChickenCoopDoor.com.xml b/src/chrome/content/rules/AutomaticChickenCoopDoor.com.xml
new file mode 100644
index 000000000000..c603bf53fc60
--- /dev/null
+++ b/src/chrome/content/rules/AutomaticChickenCoopDoor.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Automatic_Data_Processing.xml b/src/chrome/content/rules/Automatic_Data_Processing.xml
index dc303a27c38f..f0f8a0ac883b 100644
--- a/src/chrome/content/rules/Automatic_Data_Processing.xml
+++ b/src/chrome/content/rules/Automatic_Data_Processing.xml
@@ -1,3 +1,4 @@
+
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Autopilot_HQ.com.xml b/src/chrome/content/rules/Autopilot_HQ.com.xml
index 8f3f5a92cd70..dd716c55af4e 100644
--- a/src/chrome/content/rules/Autopilot_HQ.com.xml
+++ b/src/chrome/content/rules/Autopilot_HQ.com.xml
@@ -22,7 +22,7 @@
 	Mixed content:
 
 		- css on developers from $self ᵐ
-		- Images on developers from $self ᵐ 
+		- Images on developers from $self ᵐ
 
 	ᵐ Not secured by us <= mismatched
 
diff --git a/src/chrome/content/rules/AvaHost.xml b/src/chrome/content/rules/AvaHost.xml
index 5cd6a9d2622a..2baf205e3d3e 100644
--- a/src/chrome/content/rules/AvaHost.xml
+++ b/src/chrome/content/rules/AvaHost.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.secure.avahost.net/ => https://www.secure.avahost.net/:
 		- (www.)	(shows an old revision; mismatched, CN: www.avadomains.com)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Avahi.org.xml b/src/chrome/content/rules/Avahi.org.xml
new file mode 100644
index 000000000000..62d24f66e946
--- /dev/null
+++ b/src/chrome/content/rules/Avahi.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avangard.ru.xml b/src/chrome/content/rules/Avangard.ru.xml
index 79936269def6..e94aaeb216ae 100644
--- a/src/chrome/content/rules/Avangard.ru.xml
+++ b/src/chrome/content/rules/Avangard.ru.xml
@@ -4,7 +4,7 @@ corporate. timed out-->
 
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Avangate.xml b/src/chrome/content/rules/Avangate.xml
index 8382509edc74..d12e71bc8864 100644
--- a/src/chrome/content/rules/Avangate.xml
+++ b/src/chrome/content/rules/Avangate.xml
@@ -5,7 +5,12 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
 	
 
 
diff --git a/src/chrome/content/rules/Avanis.fr.xml b/src/chrome/content/rules/Avanis.fr.xml
deleted file mode 100644
index 549b2c2dba5d..000000000000
--- a/src/chrome/content/rules/Avanis.fr.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-	
-	
-
-		
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Avantar.com.xml b/src/chrome/content/rules/Avantar.com.xml
index 4a8d990576b3..85cfdb2ff2ae 100644
--- a/src/chrome/content/rules/Avantar.com.xml
+++ b/src/chrome/content/rules/Avantar.com.xml
@@ -2,7 +2,7 @@
 	NB: Server sends no certificate chain, see https://whatsmychaincert.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Avast.com.xml b/src/chrome/content/rules/Avast.com.xml
index fa6201027482..fdba321d76de 100644
--- a/src/chrome/content/rules/Avast.com.xml
+++ b/src/chrome/content/rules/Avast.com.xml
@@ -54,6 +54,6 @@
 
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Avaya.xml b/src/chrome/content/rules/Avaya.xml
index 30506ae23ef1..d92beec7172f 100644
--- a/src/chrome/content/rules/Avaya.xml
+++ b/src/chrome/content/rules/Avaya.xml
@@ -1,7 +1,12 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Avectra.com.xml b/src/chrome/content/rules/Avectra.com.xml
deleted file mode 100644
index 10a38b3e2b5f..000000000000
--- a/src/chrome/content/rules/Avectra.com.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Avenatti.com.xml b/src/chrome/content/rules/Avenatti.com.xml
new file mode 100644
index 000000000000..65c0443a5e24
--- /dev/null
+++ b/src/chrome/content/rules/Avenatti.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avidemux.org.xml b/src/chrome/content/rules/Avidemux.org.xml
new file mode 100644
index 000000000000..e560d791960c
--- /dev/null
+++ b/src/chrome/content/rules/Avidemux.org.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avinc.com.xml b/src/chrome/content/rules/Avinc.com.xml
index 3d44a7d726d5..bb2a6e55ebbd 100644
--- a/src/chrome/content/rules/Avinc.com.xml
+++ b/src/chrome/content/rules/Avinc.com.xml
@@ -28,7 +28,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
@@ -40,4 +42,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Avios.com.xml b/src/chrome/content/rules/Avios.com.xml
new file mode 100644
index 000000000000..f992a6552330
--- /dev/null
+++ b/src/chrome/content/rules/Avios.com.xml
@@ -0,0 +1,54 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avira.xml b/src/chrome/content/rules/Avira.xml
index 1be1504c7caa..6c60d9c7c131 100644
--- a/src/chrome/content/rules/Avira.xml
+++ b/src/chrome/content/rules/Avira.xml
@@ -13,7 +13,7 @@ Fetch error: http://www.myaccount.avira.com/ => https://myaccount.avira.com/: (6
 		- www.avira.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Avis-Japan.com.xml b/src/chrome/content/rules/Avis-Japan.com.xml
new file mode 100644
index 000000000000..21ea07d9f108
--- /dev/null
+++ b/src/chrome/content/rules/Avis-Japan.com.xml
@@ -0,0 +1,29 @@
+
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis-Tahiti.com.xml b/src/chrome/content/rules/Avis-Tahiti.com.xml
new file mode 100644
index 000000000000..074b455e4d9d
--- /dev/null
+++ b/src/chrome/content/rules/Avis-Tahiti.com.xml
@@ -0,0 +1,28 @@
+
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis-Taiwan.com.xml b/src/chrome/content/rules/Avis-Taiwan.com.xml
new file mode 100644
index 000000000000..914b7f5a677b
--- /dev/null
+++ b/src/chrome/content/rules/Avis-Taiwan.com.xml
@@ -0,0 +1,26 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis-sxm.com.xml b/src/chrome/content/rules/Avis-sxm.com.xml
new file mode 100644
index 000000000000..a8354563b6e2
--- /dev/null
+++ b/src/chrome/content/rules/Avis-sxm.com.xml
@@ -0,0 +1,13 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.at.xml b/src/chrome/content/rules/Avis.at.xml
new file mode 100644
index 000000000000..840ce8b9b35d
--- /dev/null
+++ b/src/chrome/content/rules/Avis.at.xml
@@ -0,0 +1,30 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.be.xml b/src/chrome/content/rules/Avis.be.xml
new file mode 100644
index 000000000000..9b7c0aebecbf
--- /dev/null
+++ b/src/chrome/content/rules/Avis.be.xml
@@ -0,0 +1,30 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.ca.xml b/src/chrome/content/rules/Avis.ca.xml
new file mode 100644
index 000000000000..0c5b96cc0b81
--- /dev/null
+++ b/src/chrome/content/rules/Avis.ca.xml
@@ -0,0 +1,26 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.ch.xml b/src/chrome/content/rules/Avis.ch.xml
new file mode 100644
index 000000000000..508f2ce03707
--- /dev/null
+++ b/src/chrome/content/rules/Avis.ch.xml
@@ -0,0 +1,30 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.cl.xml b/src/chrome/content/rules/Avis.cl.xml
new file mode 100644
index 000000000000..3e49399b99fb
--- /dev/null
+++ b/src/chrome/content/rules/Avis.cl.xml
@@ -0,0 +1,29 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.co.il.xml b/src/chrome/content/rules/Avis.co.il.xml
new file mode 100644
index 000000000000..7be09fce7f20
--- /dev/null
+++ b/src/chrome/content/rules/Avis.co.il.xml
@@ -0,0 +1,40 @@
+
+
+
+	
+	
+	
+		
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.co.nz.xml b/src/chrome/content/rules/Avis.co.nz.xml
new file mode 100644
index 000000000000..98046691f32d
--- /dev/null
+++ b/src/chrome/content/rules/Avis.co.nz.xml
@@ -0,0 +1,31 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.co.uk.xml b/src/chrome/content/rules/Avis.co.uk.xml
new file mode 100644
index 000000000000..a3b39ae12100
--- /dev/null
+++ b/src/chrome/content/rules/Avis.co.uk.xml
@@ -0,0 +1,33 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.co.za.xml b/src/chrome/content/rules/Avis.co.za.xml
new file mode 100644
index 000000000000..7176222d3456
--- /dev/null
+++ b/src/chrome/content/rules/Avis.co.za.xml
@@ -0,0 +1,45 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.com.ar.xml b/src/chrome/content/rules/Avis.com.ar.xml
new file mode 100644
index 000000000000..b304e9a7afba
--- /dev/null
+++ b/src/chrome/content/rules/Avis.com.ar.xml
@@ -0,0 +1,27 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.com.au.xml b/src/chrome/content/rules/Avis.com.au.xml
new file mode 100644
index 000000000000..1200a1f13821
--- /dev/null
+++ b/src/chrome/content/rules/Avis.com.au.xml
@@ -0,0 +1,32 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.com.co.xml b/src/chrome/content/rules/Avis.com.co.xml
new file mode 100644
index 000000000000..63368b91f641
--- /dev/null
+++ b/src/chrome/content/rules/Avis.com.co.xml
@@ -0,0 +1,28 @@
+
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.com.do.xml b/src/chrome/content/rules/Avis.com.do.xml
new file mode 100644
index 000000000000..444f11877a3f
--- /dev/null
+++ b/src/chrome/content/rules/Avis.com.do.xml
@@ -0,0 +1,13 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.com.ec.xml b/src/chrome/content/rules/Avis.com.ec.xml
new file mode 100644
index 000000000000..f2ad477bd6b3
--- /dev/null
+++ b/src/chrome/content/rules/Avis.com.ec.xml
@@ -0,0 +1,31 @@
+
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.com.hk.xml b/src/chrome/content/rules/Avis.com.hk.xml
new file mode 100644
index 000000000000..695eeea935c8
--- /dev/null
+++ b/src/chrome/content/rules/Avis.com.hk.xml
@@ -0,0 +1,13 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.com.hr.xml b/src/chrome/content/rules/Avis.com.hr.xml
new file mode 100644
index 000000000000..a1d993d3ff4a
--- /dev/null
+++ b/src/chrome/content/rules/Avis.com.hr.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.com.jm.xml b/src/chrome/content/rules/Avis.com.jm.xml
new file mode 100644
index 000000000000..083192681bba
--- /dev/null
+++ b/src/chrome/content/rules/Avis.com.jm.xml
@@ -0,0 +1,26 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.com.lb.xml b/src/chrome/content/rules/Avis.com.lb.xml
new file mode 100644
index 000000000000..7f1f49b8dc65
--- /dev/null
+++ b/src/chrome/content/rules/Avis.com.lb.xml
@@ -0,0 +1,28 @@
+
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.com.pa.xml b/src/chrome/content/rules/Avis.com.pa.xml
new file mode 100644
index 000000000000..6939be0b148b
--- /dev/null
+++ b/src/chrome/content/rules/Avis.com.pa.xml
@@ -0,0 +1,25 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.com.ph.xml b/src/chrome/content/rules/Avis.com.ph.xml
new file mode 100644
index 000000000000..ceb2cc893755
--- /dev/null
+++ b/src/chrome/content/rules/Avis.com.ph.xml
@@ -0,0 +1,13 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.com.pt.xml b/src/chrome/content/rules/Avis.com.pt.xml
new file mode 100644
index 000000000000..4a8edb590bdb
--- /dev/null
+++ b/src/chrome/content/rules/Avis.com.pt.xml
@@ -0,0 +1,28 @@
+
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.com.sa.xml b/src/chrome/content/rules/Avis.com.sa.xml
new file mode 100644
index 000000000000..00815ad2a694
--- /dev/null
+++ b/src/chrome/content/rules/Avis.com.sa.xml
@@ -0,0 +1,29 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.com.sg.xml b/src/chrome/content/rules/Avis.com.sg.xml
new file mode 100644
index 000000000000..7d740302f30b
--- /dev/null
+++ b/src/chrome/content/rules/Avis.com.sg.xml
@@ -0,0 +1,26 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.com.tr.xml b/src/chrome/content/rules/Avis.com.tr.xml
new file mode 100644
index 000000000000..8eeeb9dd233a
--- /dev/null
+++ b/src/chrome/content/rules/Avis.com.tr.xml
@@ -0,0 +1,31 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.com.ua.xml b/src/chrome/content/rules/Avis.com.ua.xml
new file mode 100644
index 000000000000..a37bfa60a7cc
--- /dev/null
+++ b/src/chrome/content/rules/Avis.com.ua.xml
@@ -0,0 +1,29 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.com.xml b/src/chrome/content/rules/Avis.com.xml
index 7b78496e0319..0454e445a305 100644
--- a/src/chrome/content/rules/Avis.com.xml
+++ b/src/chrome/content/rules/Avis.com.xml
@@ -1,25 +1,92 @@
+
 
 
 
 	
 	
+	
+	
+	
+	
+	
 
+	
 
-	
-
-
-	
-
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Avis.de.xml b/src/chrome/content/rules/Avis.de.xml
new file mode 100644
index 000000000000..1d5502e467bc
--- /dev/null
+++ b/src/chrome/content/rules/Avis.de.xml
@@ -0,0 +1,34 @@
+
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.dk.xml b/src/chrome/content/rules/Avis.dk.xml
new file mode 100644
index 000000000000..e07b3aa07514
--- /dev/null
+++ b/src/chrome/content/rules/Avis.dk.xml
@@ -0,0 +1,30 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.es.xml b/src/chrome/content/rules/Avis.es.xml
new file mode 100644
index 000000000000..8714e85ab3de
--- /dev/null
+++ b/src/chrome/content/rules/Avis.es.xml
@@ -0,0 +1,31 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.fi.xml b/src/chrome/content/rules/Avis.fi.xml
new file mode 100644
index 000000000000..bd619082e070
--- /dev/null
+++ b/src/chrome/content/rules/Avis.fi.xml
@@ -0,0 +1,29 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.fr.xml b/src/chrome/content/rules/Avis.fr.xml
new file mode 100644
index 000000000000..89cc0f7fcfb6
--- /dev/null
+++ b/src/chrome/content/rules/Avis.fr.xml
@@ -0,0 +1,32 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.ie.xml b/src/chrome/content/rules/Avis.ie.xml
new file mode 100644
index 000000000000..9539c40dcd93
--- /dev/null
+++ b/src/chrome/content/rules/Avis.ie.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.ma.xml b/src/chrome/content/rules/Avis.ma.xml
new file mode 100644
index 000000000000..a886f67d54a2
--- /dev/null
+++ b/src/chrome/content/rules/Avis.ma.xml
@@ -0,0 +1,29 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.nl.xml b/src/chrome/content/rules/Avis.nl.xml
new file mode 100644
index 000000000000..0d544a5ba471
--- /dev/null
+++ b/src/chrome/content/rules/Avis.nl.xml
@@ -0,0 +1,30 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.no.xml b/src/chrome/content/rules/Avis.no.xml
new file mode 100644
index 000000000000..4cb72488de98
--- /dev/null
+++ b/src/chrome/content/rules/Avis.no.xml
@@ -0,0 +1,30 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.pl.xml b/src/chrome/content/rules/Avis.pl.xml
new file mode 100644
index 000000000000..b84895c8789c
--- /dev/null
+++ b/src/chrome/content/rules/Avis.pl.xml
@@ -0,0 +1,31 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.se.xml b/src/chrome/content/rules/Avis.se.xml
new file mode 100644
index 000000000000..6b579c03a4d3
--- /dev/null
+++ b/src/chrome/content/rules/Avis.se.xml
@@ -0,0 +1,30 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avis.tc.xml b/src/chrome/content/rules/Avis.tc.xml
new file mode 100644
index 000000000000..f03b79d6d66b
--- /dev/null
+++ b/src/chrome/content/rules/Avis.tc.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avisautonoleggio.it.xml b/src/chrome/content/rules/Avisautonoleggio.it.xml
new file mode 100644
index 000000000000..1286f1602759
--- /dev/null
+++ b/src/chrome/content/rules/Avisautonoleggio.it.xml
@@ -0,0 +1,30 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avisservices.com.xml b/src/chrome/content/rules/Avisservices.com.xml
deleted file mode 100644
index fba745b9d2ba..000000000000
--- a/src/chrome/content/rules/Avisservices.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Avissuriname.com.xml b/src/chrome/content/rules/Avissuriname.com.xml
new file mode 100644
index 000000000000..dd39b84a9f3d
--- /dev/null
+++ b/src/chrome/content/rules/Avissuriname.com.xml
@@ -0,0 +1,13 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Avonmaquiagem.com.br.xml b/src/chrome/content/rules/Avonmaquiagem.com.br.xml
index fd07e4f772d6..67f92980e11a 100644
--- a/src/chrome/content/rules/Avonmaquiagem.com.br.xml
+++ b/src/chrome/content/rules/Avonmaquiagem.com.br.xml
@@ -6,7 +6,7 @@ Fetch error: http://static5.avonmaquiagem.com.br/ => https://static5.avonmaquiag
 Fetch error: http://www.avonmaquiagem.com.br/ => https://www.avonmaquiagem.com.br/: (28, 'Connection timed out after 20005 milliseconds')
 
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://www.avonmaquiagem.com.br/ => https://www.avonmaquiagem.com.b
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Awe.sm.xml b/src/chrome/content/rules/Awe.sm.xml
index dee8318eaa94..6d1b6334b6a8 100644
--- a/src/chrome/content/rules/Awe.sm.xml
+++ b/src/chrome/content/rules/Awe.sm.xml
@@ -34,7 +34,7 @@ Fetch error: http://widgets.awe.sm/ => https://totally.awe.sm/: (28, 'Connection
 		- .awe.sm
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/AwesomeStuffToBuy.com.xml b/src/chrome/content/rules/AwesomeStuffToBuy.com.xml
new file mode 100644
index 000000000000..373e8f617993
--- /dev/null
+++ b/src/chrome/content/rules/AwesomeStuffToBuy.com.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Awio-Web-Services-mismatches.xml b/src/chrome/content/rules/Awio-Web-Services-mismatches.xml
index 5805599854ce..4b24b26087d8 100644
--- a/src/chrome/content/rules/Awio-Web-Services-mismatches.xml
+++ b/src/chrome/content/rules/Awio-Web-Services-mismatches.xml
@@ -4,7 +4,7 @@
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Awio-Web-Services.xml b/src/chrome/content/rules/Awio-Web-Services.xml
index e2964d9280fe..20ff96b3ca6c 100644
--- a/src/chrome/content/rules/Awio-Web-Services.xml
+++ b/src/chrome/content/rules/Awio-Web-Services.xml
@@ -14,24 +14,21 @@ Fetch error: http://app.dialshield.com/ => https://app.dialshield.com/: (51, "SS
 		- Improvely.com.xml
 
 -->
-
+
 
 	
 	
-	
+	
 	
-	
+	
 
 	
 	
 
-	
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/AwkwardZombie.com.xml b/src/chrome/content/rules/AwkwardZombie.com.xml
new file mode 100644
index 000000000000..d9fe0312c68b
--- /dev/null
+++ b/src/chrome/content/rules/AwkwardZombie.com.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Axamba.xml b/src/chrome/content/rules/Axamba.xml
index f79e84b61681..1d5f53955da4 100644
--- a/src/chrome/content/rules/Axamba.xml
+++ b/src/chrome/content/rules/Axamba.xml
@@ -6,7 +6,7 @@ Fetch error: http://my.webtapestry.net/ => https://my.webtapestry.net/: (28, 'Co
 Disabled by https-everywhere-checker because:
 Fetch error: http://my.webtapestry.net/ => https://my.webtapestry.net/: (28, 'Connection timed out after 10000 milliseconds')
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Axboe.xml b/src/chrome/content/rules/Axboe.xml
index 74bb61df6e83..db1a932a719d 100644
--- a/src/chrome/content/rules/Axboe.xml
+++ b/src/chrome/content/rules/Axboe.xml
@@ -10,7 +10,7 @@ Fetch error: http://webmail.axboe.dk/ => https://webmail.axboe.dk/: (60, 'SSL ce
 		(www.)	(cert valid for !www; shows webmail)
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Axel_Simon.net.xml b/src/chrome/content/rules/Axel_Simon.net.xml
deleted file mode 100644
index 6a44aaf6251f..000000000000
--- a/src/chrome/content/rules/Axel_Simon.net.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Axelname.ru.xml b/src/chrome/content/rules/Axelname.ru.xml
deleted file mode 100644
index 6bfa08899d5a..000000000000
--- a/src/chrome/content/rules/Axelname.ru.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Axeso5.com-falsemixed.xml b/src/chrome/content/rules/Axeso5.com-falsemixed.xml
deleted file mode 100644
index 6ad8f618b40f..000000000000
--- a/src/chrome/content/rules/Axeso5.com-falsemixed.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Axeso5.com.xml b/src/chrome/content/rules/Axeso5.com.xml
index 40b42a7018cb..6df71c1ac54a 100644
--- a/src/chrome/content/rules/Axeso5.com.xml
+++ b/src/chrome/content/rules/Axeso5.com.xml
@@ -1,94 +1,40 @@
 
 
-
-	
+	
+	
+	
+	
 	
-	
-	
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-	
-
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
 
diff --git a/src/chrome/content/rules/AxisBank.co.in.xml b/src/chrome/content/rules/AxisBank.co.in.xml
new file mode 100644
index 000000000000..82207855f389
--- /dev/null
+++ b/src/chrome/content/rules/AxisBank.co.in.xml
@@ -0,0 +1,26 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/AxisBank.com.xml b/src/chrome/content/rules/AxisBank.com.xml
new file mode 100644
index 000000000000..65fe4528a914
--- /dev/null
+++ b/src/chrome/content/rules/AxisBank.com.xml
@@ -0,0 +1,22 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Axis_Bank.xml b/src/chrome/content/rules/Axis_Bank.xml
deleted file mode 100644
index b4311d228ac2..000000000000
--- a/src/chrome/content/rules/Axis_Bank.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Axosoft.com.xml b/src/chrome/content/rules/Axosoft.com.xml
index e54a5ccf4984..67327acdad16 100644
--- a/src/chrome/content/rules/Axosoft.com.xml
+++ b/src/chrome/content/rules/Axosoft.com.xml
@@ -5,12 +5,12 @@ Fetch error: http://iloyal.axosoft.com/ => https://iloyal.axosoft.com/: (6, 'Cou
 
 	Other Axosoft rulesets:
 		- Pure_Chat.com.xml
-	
+
 	Mismatched:
 		- promos.axosoft.com
 		- blog.axosoft.com
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Azahera.net.xml b/src/chrome/content/rules/Azahera.net.xml
new file mode 100644
index 000000000000..49941d84fb78
--- /dev/null
+++ b/src/chrome/content/rules/Azahera.net.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Azcentral.com.xml b/src/chrome/content/rules/Azcentral.com.xml
index 7cb26e4d7290..44a8c30cc144 100644
--- a/src/chrome/content/rules/Azcentral.com.xml
+++ b/src/chrome/content/rules/Azcentral.com.xml
@@ -28,10 +28,12 @@ Fetch error: http://azcentral.com/ => https://azcentral.com/: (51, "SSL: no alte
 		- l		(→ ^)
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Azet.sk.xml b/src/chrome/content/rules/Azet.sk.xml
index e206455740e7..c98a2f260332 100644
--- a/src/chrome/content/rules/Azet.sk.xml
+++ b/src/chrome/content/rules/Azet.sk.xml
@@ -1,6 +1,5 @@
 
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/B2bmediaportal.com.xml b/src/chrome/content/rules/B2bmediaportal.com.xml
index 86e331890b51..0339e5d69aac 100644
--- a/src/chrome/content/rules/B2bmediaportal.com.xml
+++ b/src/chrome/content/rules/B2bmediaportal.com.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/B7oth.com.xml b/src/chrome/content/rules/B7oth.com.xml
deleted file mode 100644
index 69b53141d529..000000000000
--- a/src/chrome/content/rules/B7oth.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/BA.xml b/src/chrome/content/rules/BA.xml
deleted file mode 100644
index 9318463e151e..000000000000
--- a/src/chrome/content/rules/BA.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/BAG-Jugendschutz.de.xml b/src/chrome/content/rules/BAG-Jugendschutz.de.xml
new file mode 100644
index 000000000000..2bc52d046475
--- /dev/null
+++ b/src/chrome/content/rules/BAG-Jugendschutz.de.xml
@@ -0,0 +1,12 @@
+
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/BAGKJS.de.xml b/src/chrome/content/rules/BAGKJS.de.xml
new file mode 100644
index 000000000000..2f60cdcfb247
--- /dev/null
+++ b/src/chrome/content/rules/BAGKJS.de.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/BALPA.org.xml b/src/chrome/content/rules/BALPA.org.xml
new file mode 100644
index 000000000000..88097d0d968b
--- /dev/null
+++ b/src/chrome/content/rules/BALPA.org.xml
@@ -0,0 +1,27 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+    
+
+
diff --git a/src/chrome/content/rules/BAM.de.xml b/src/chrome/content/rules/BAM.de.xml
new file mode 100644
index 000000000000..c0a2604a2677
--- /dev/null
+++ b/src/chrome/content/rules/BAM.de.xml
@@ -0,0 +1,91 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/BASt.de.xml b/src/chrome/content/rules/BASt.de.xml
new file mode 100644
index 000000000000..57cc26ba916e
--- /dev/null
+++ b/src/chrome/content/rules/BASt.de.xml
@@ -0,0 +1,31 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/BATS_Exchange.xml b/src/chrome/content/rules/BATS_Exchange.xml
index b134998e4318..27602522e593 100644
--- a/src/chrome/content/rules/BATS_Exchange.xml
+++ b/src/chrome/content/rules/BATS_Exchange.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/BAW.de.xml b/src/chrome/content/rules/BAW.de.xml
new file mode 100644
index 000000000000..420b697b305a
--- /dev/null
+++ b/src/chrome/content/rules/BAW.de.xml
@@ -0,0 +1,51 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/BBC-mismatches.xml b/src/chrome/content/rules/BBC-mismatches.xml
deleted file mode 100644
index 010f07d06e4a..000000000000
--- a/src/chrome/content/rules/BBC-mismatches.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/BBC.co.uk.xml b/src/chrome/content/rules/BBC.co.uk.xml
new file mode 100644
index 000000000000..4dd798d0876c
--- /dev/null
+++ b/src/chrome/content/rules/BBC.co.uk.xml
@@ -0,0 +1,42 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/BBC.com-falsemixed.xml b/src/chrome/content/rules/BBC.com-falsemixed.xml
deleted file mode 100644
index b5e42ac81f9c..000000000000
--- a/src/chrome/content/rules/BBC.com-falsemixed.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-		
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/BBC.com.xml b/src/chrome/content/rules/BBC.com.xml
index 4283d01ce89f..e43d47971ce5 100644
--- a/src/chrome/content/rules/BBC.com.xml
+++ b/src/chrome/content/rules/BBC.com.xml
@@ -1,44 +1,47 @@
 
 
-
-	
+	
+	
+	
+	
+		
+		
+		
+	
+		
+		
+		
+	
+	
+	
+	
+	
+	
 	
+	
+	
+	
+	
 
-	
-	
-
-
-	
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/BBC.xml b/src/chrome/content/rules/BBC.xml
deleted file mode 100644
index 3d7fe6dbeeec..000000000000
--- a/src/chrome/content/rules/BBC.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-		
-		
-		
-		
-
-		
-		
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-
-		
-		
-
-			
-			
-
-
-	
-	
-	
-	
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/BBacon.org.xml b/src/chrome/content/rules/BBacon.org.xml
new file mode 100644
index 000000000000..d06ac5637e64
--- /dev/null
+++ b/src/chrome/content/rules/BBacon.org.xml
@@ -0,0 +1,17 @@
+
+
+
+	
+		
+	
+		
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/BCGolf.com-mismatches.xml b/src/chrome/content/rules/BCGolf.com-mismatches.xml
index 46f3e2f352f0..6cf169b2ce6e 100644
--- a/src/chrome/content/rules/BCGolf.com-mismatches.xml
+++ b/src/chrome/content/rules/BCGolf.com-mismatches.xml
@@ -5,7 +5,7 @@
 		
 		
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/BCGolf.com.xml b/src/chrome/content/rules/BCGolf.com.xml
deleted file mode 100644
index 2d90b9e579f5..000000000000
--- a/src/chrome/content/rules/BCGolf.com.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/BECU.xml b/src/chrome/content/rules/BECU.xml
index 60b8e5b1e81d..14bfd3d98750 100644
--- a/src/chrome/content/rules/BECU.xml
+++ b/src/chrome/content/rules/BECU.xml
@@ -10,7 +10,7 @@ Fetch error: http://accessassistant.becu.org/ => https://accessassistant.becu.or
 	Mismatched:
 		- locatorsearch
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/BEL.fi.xml b/src/chrome/content/rules/BEL.fi.xml
index 55f982fb61b9..0d0e58ef77cd 100644
--- a/src/chrome/content/rules/BEL.fi.xml
+++ b/src/chrome/content/rules/BEL.fi.xml
@@ -14,7 +14,7 @@ Fetch error: http://bacchus.bel.fi/ => https://bacchus.bel.fi/: (7, 'Failed to c
 		Invalid certificates:
 			 - asp.bel.fi
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/BEM.info.xml b/src/chrome/content/rules/BEM.info.xml
index d30687fe00fb..6270529e398a 100644
--- a/src/chrome/content/rules/BEM.info.xml
+++ b/src/chrome/content/rules/BEM.info.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.bem.info/ => https://www.bem.info/: (60, 'SSL certificat
 		- ru
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/BEV.bund.de.xml b/src/chrome/content/rules/BEV.bund.de.xml
new file mode 100644
index 000000000000..67b082839834
--- /dev/null
+++ b/src/chrome/content/rules/BEV.bund.de.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/BE_One_Spark.com.xml b/src/chrome/content/rules/BE_One_Spark.com.xml
deleted file mode 100644
index 551194320e18..000000000000
--- a/src/chrome/content/rules/BE_One_Spark.com.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-	
-	
-		
-		
-		
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/BGPView.io.xml b/src/chrome/content/rules/BGPView.io.xml
new file mode 100644
index 000000000000..e9523ac129e0
--- /dev/null
+++ b/src/chrome/content/rules/BGPView.io.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/BGPmon.net.xml b/src/chrome/content/rules/BGPmon.net.xml
index d6bf914cb4eb..0f907c11f87d 100644
--- a/src/chrome/content/rules/BGPmon.net.xml
+++ b/src/chrome/content/rules/BGPmon.net.xml
@@ -10,9 +10,11 @@
 -->
 
 	
-	
+	
+	
 	
-	
+	
+	
 
 	
 	
@@ -20,8 +22,7 @@
     
 
-	
-	
+	
+	
 
diff --git a/src/chrome/content/rules/BGR.com.xml b/src/chrome/content/rules/BGR.com.xml
index 789515e081ac..8f18b235d500 100644
--- a/src/chrome/content/rules/BGR.com.xml
+++ b/src/chrome/content/rules/BGR.com.xml
@@ -1,32 +1,56 @@
-
 
-
 
-	
+
 	
-	
 	
-
-	
+	
+	
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+		
+		
 
+	
 
-	
+	
 
-	
+	
+		
 
+	
 
diff --git a/src/chrome/content/rules/BGR.de.xml b/src/chrome/content/rules/BGR.de.xml
new file mode 100644
index 000000000000..3e6d8c43cb9f
--- /dev/null
+++ b/src/chrome/content/rules/BGR.de.xml
@@ -0,0 +1,49 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/BGamed.de.xml b/src/chrome/content/rules/BGamed.de.xml
index 45a2030cf5e4..757afc378e07 100644
--- a/src/chrome/content/rules/BGamed.de.xml
+++ b/src/chrome/content/rules/BGamed.de.xml
@@ -31,4 +31,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/BHosted.nl.xml b/src/chrome/content/rules/BHosted.nl.xml
deleted file mode 100644
index e8873a7b5084..000000000000
--- a/src/chrome/content/rules/BHosted.nl.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/BHosting.ru.xml b/src/chrome/content/rules/BHosting.ru.xml
index adce66231989..bd89e807a2f0 100644
--- a/src/chrome/content/rules/BHosting.ru.xml
+++ b/src/chrome/content/rules/BHosting.ru.xml
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/BIBB.de.xml b/src/chrome/content/rules/BIBB.de.xml
new file mode 100644
index 000000000000..610f3fe84a6a
--- /dev/null
+++ b/src/chrome/content/rules/BIBB.de.xml
@@ -0,0 +1,47 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/BIGO.xml b/src/chrome/content/rules/BIGO.xml
index e0ab742a58c0..131d44ae7772 100644
--- a/src/chrome/content/rules/BIGO.xml
+++ b/src/chrome/content/rules/BIGO.xml
@@ -3,6 +3,5 @@
 
 
 
-
 
 
diff --git a/src/chrome/content/rules/BIKT.xml b/src/chrome/content/rules/BIKT.xml
index 767e2af346df..d2b012d72c80 100644
--- a/src/chrome/content/rules/BIKT.xml
+++ b/src/chrome/content/rules/BIKT.xml
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/BIO-International-Convention.xml b/src/chrome/content/rules/BIO-International-Convention.xml
index 797473da1183..c9161b68a769 100644
--- a/src/chrome/content/rules/BIO-International-Convention.xml
+++ b/src/chrome/content/rules/BIO-International-Convention.xml
@@ -37,7 +37,7 @@ Fetch error: http://bio.org/ => https://bio.org/: (51, "SSL: no alternative cert
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/BKA.de.xml b/src/chrome/content/rules/BKA.de.xml
new file mode 100644
index 000000000000..b4756a5adbee
--- /dev/null
+++ b/src/chrome/content/rules/BKA.de.xml
@@ -0,0 +1,18 @@
+
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/BKGE.de.xml b/src/chrome/content/rules/BKGE.de.xml
new file mode 100644
index 000000000000..45f43dec68a6
--- /dev/null
+++ b/src/chrome/content/rules/BKGE.de.xml
@@ -0,0 +1,14 @@
+
+
+	
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/BLOX.xml b/src/chrome/content/rules/BLOX.xml
index d72aeaa4426b..5d9c40708aca 100644
--- a/src/chrome/content/rules/BLOX.xml
+++ b/src/chrome/content/rules/BLOX.xml
@@ -6,4 +6,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/BMAS.de.xml b/src/chrome/content/rules/BMAS.de.xml
new file mode 100644
index 000000000000..7eba2e0490d2
--- /dev/null
+++ b/src/chrome/content/rules/BMAS.de.xml
@@ -0,0 +1,35 @@
+
+
+	
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/BMC.com.xml b/src/chrome/content/rules/BMC.com.xml
index 36ab335cafdf..5e4e952716c4 100644
--- a/src/chrome/content/rules/BMC.com.xml
+++ b/src/chrome/content/rules/BMC.com.xml
@@ -24,7 +24,11 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 		
 		
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/BME.hu.xml b/src/chrome/content/rules/BME.hu.xml
deleted file mode 100644
index b76b3955637e..000000000000
--- a/src/chrome/content/rules/BME.hu.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	 
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	 
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	 
-	
-	
-	
-	
-		
-	
-	
-	
-	
-	 
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-
-	
-	
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/BME.hu_incomplete.xml b/src/chrome/content/rules/BME.hu_incomplete.xml
deleted file mode 100644
index ffba1d993f6d..000000000000
--- a/src/chrome/content/rules/BME.hu_incomplete.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-	
-	
-	 
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/BMFSFJ.de.xml b/src/chrome/content/rules/BMFSFJ.de.xml
new file mode 100644
index 000000000000..7b6821af518b
--- /dev/null
+++ b/src/chrome/content/rules/BMFSFJ.de.xml
@@ -0,0 +1,23 @@
+
+
+	
+
+	
+	
+	
+	
+
+	
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/BMU.de.xml b/src/chrome/content/rules/BMU.de.xml
new file mode 100644
index 000000000000..b963dfe41770
--- /dev/null
+++ b/src/chrome/content/rules/BMU.de.xml
@@ -0,0 +1,25 @@
+
+
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/BMWi.de.xml b/src/chrome/content/rules/BMWi.de.xml
new file mode 100644
index 000000000000..077ba79fef27
--- /dev/null
+++ b/src/chrome/content/rules/BMWi.de.xml
@@ -0,0 +1,40 @@
+
+
+	
+
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/BMZ.de.xml b/src/chrome/content/rules/BMZ.de.xml
new file mode 100644
index 000000000000..286da2935230
--- /dev/null
+++ b/src/chrome/content/rules/BMZ.de.xml
@@ -0,0 +1,29 @@
+
+
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/BM_Pharmacy.xml b/src/chrome/content/rules/BM_Pharmacy.xml
deleted file mode 100644
index bccc90f74299..000000000000
--- a/src/chrome/content/rules/BM_Pharmacy.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/BNN.de.xml b/src/chrome/content/rules/BNN.de.xml
new file mode 100644
index 000000000000..a8bd9f58a263
--- /dev/null
+++ b/src/chrome/content/rules/BNN.de.xml
@@ -0,0 +1,54 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/BOALT.xml b/src/chrome/content/rules/BOALT.xml
index d44b8e1c3229..405104a67010 100644
--- a/src/chrome/content/rules/BOALT.xml
+++ b/src/chrome/content/rules/BOALT.xml
@@ -7,17 +7,16 @@
 
 
 	
-	
+	
 	
 
 
 	
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/BR.xml b/src/chrome/content/rules/BR.xml
index 8dec414b0ef5..55250ca304ad 100644
--- a/src/chrome/content/rules/BR.xml
+++ b/src/chrome/content/rules/BR.xml
@@ -1,9 +1,30 @@
+
+
 
 
 	
+	
+	
 	
+	
+	
+	
+	
+	
+	
+	
+	
 	
-	
+	
+	
+	
+	
+
+	
 	
 	
 	
@@ -12,13 +33,7 @@
 
 	
-	
-	
-	
-	
-	
-	
-	
+
 	
 
diff --git a/src/chrome/content/rules/BRChan.xml b/src/chrome/content/rules/BRChan.xml
index 68558eefcf0a..f11a7a49580e 100644
--- a/src/chrome/content/rules/BRChan.xml
+++ b/src/chrome/content/rules/BRChan.xml
@@ -1,7 +1,7 @@
-
-	
-	
-
-	
-
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/BSD.lv.xml b/src/chrome/content/rules/BSD.lv.xml
new file mode 100644
index 000000000000..92897f4c0dcf
--- /dev/null
+++ b/src/chrome/content/rules/BSD.lv.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/BSD_Consulting.co.jp.xml b/src/chrome/content/rules/BSD_Consulting.co.jp.xml
index e566f7df510b..dacfe2e9f0b1 100644
--- a/src/chrome/content/rules/BSD_Consulting.co.jp.xml
+++ b/src/chrome/content/rules/BSD_Consulting.co.jp.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.bsdconsulting.co.jp/ => https://www.bsdconsulting.co.jp/
 	^bsdconsulting.co.jp doesn't exist.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/BSH.de.xml b/src/chrome/content/rules/BSH.de.xml
new file mode 100644
index 000000000000..efef9a2a61e6
--- /dev/null
+++ b/src/chrome/content/rules/BSH.de.xml
@@ -0,0 +1,24 @@
+
+
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/BSWA.xml b/src/chrome/content/rules/BSWA.xml
deleted file mode 100644
index 5de49a3d58f7..000000000000
--- a/src/chrome/content/rules/BSWA.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-    
-    
-
-    
-
-    
-
diff --git a/src/chrome/content/rules/BSidesSLC.org.xml b/src/chrome/content/rules/BSidesSLC.org.xml
index 601444195f3d..b04a8c899c4f 100644
--- a/src/chrome/content/rules/BSidesSLC.org.xml
+++ b/src/chrome/content/rules/BSidesSLC.org.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.bsidesslc.org/ => https://www.bsidesslc.org/: (60, 'SSL
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/BT.xml b/src/chrome/content/rules/BT.xml
index b6b413f22b80..4221d0d43668 100644
--- a/src/chrome/content/rules/BT.xml
+++ b/src/chrome/content/rules/BT.xml
@@ -87,7 +87,7 @@ Fetch error: http://www.redcare.bt.com/ => https://www.redcare.com/: (7, 'Failed
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/BTC100.com.xml b/src/chrome/content/rules/BTC100.com.xml
index b2376df499dd..505742cae28c 100644
--- a/src/chrome/content/rules/BTC100.com.xml
+++ b/src/chrome/content/rules/BTC100.com.xml
@@ -2,7 +2,7 @@
 	NB: Server sends no certificate chain, see https://whatsmychaincert.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/BTCChina.com.xml b/src/chrome/content/rules/BTCChina.com.xml
deleted file mode 100644
index 3bd710fd3fa3..000000000000
--- a/src/chrome/content/rules/BTCChina.com.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/BTCGreece.com.xml b/src/chrome/content/rules/BTCGreece.com.xml
index b9e5c0878d1a..4c31f0f6a476 100644
--- a/src/chrome/content/rules/BTCGreece.com.xml
+++ b/src/chrome/content/rules/BTCGreece.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.btcgreece.com/ => https://www.btcgreece.com/: (35, 'erro
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/BTCJam.com.xml b/src/chrome/content/rules/BTCJam.com.xml
index b5ece67779c6..283e9e2e36ad 100644
--- a/src/chrome/content/rules/BTCJam.com.xml
+++ b/src/chrome/content/rules/BTCJam.com.xml
@@ -1,42 +1,15 @@
 
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
+
+	
 
 	
diff --git a/src/chrome/content/rules/BTCKan.com.xml b/src/chrome/content/rules/BTCKan.com.xml
index 98d3472b65f7..f78c07d01b59 100644
--- a/src/chrome/content/rules/BTCKan.com.xml
+++ b/src/chrome/content/rules/BTCKan.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://btckan.com/ => https://btckan.com/: (51, "SSL: no alternativ
 Fetch error: http://www.btckan.com/ => https://www.btckan.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.btckan.com'")
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/BTCZone.xml b/src/chrome/content/rules/BTCZone.xml
deleted file mode 100644
index 79230a54b6f5..000000000000
--- a/src/chrome/content/rules/BTCZone.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/BTC_Gear.com.xml b/src/chrome/content/rules/BTC_Gear.com.xml
index 48182cc70f55..cbd23ae20bc3 100644
--- a/src/chrome/content/rules/BTC_Gear.com.xml
+++ b/src/chrome/content/rules/BTC_Gear.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://btcgear.com/ => https://btcgear.com/: (60, 'SSL certificate
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/BTC_Media.org.xml b/src/chrome/content/rules/BTC_Media.org.xml
index 69c63982ed2f..700428b81f4c 100644
--- a/src/chrome/content/rules/BTC_Media.org.xml
+++ b/src/chrome/content/rules/BTC_Media.org.xml
@@ -1,7 +1,6 @@
 
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/BTGuard.com.xml b/src/chrome/content/rules/BTGuard.com.xml
index f96e67c6f780..ba8d8d97a234 100644
--- a/src/chrome/content/rules/BTGuard.com.xml
+++ b/src/chrome/content/rules/BTGuard.com.xml
@@ -1,9 +1,11 @@
 
 
 	
-	
+	
+	
+	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/BTToronto.ca.xml b/src/chrome/content/rules/BTToronto.ca.xml
new file mode 100644
index 000000000000..7a670dd3831e
--- /dev/null
+++ b/src/chrome/content/rules/BTToronto.ca.xml
@@ -0,0 +1,18 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/BT_Wi-fi.xml b/src/chrome/content/rules/BT_Wi-fi.xml
index a31bbc2806b2..4628bd7abdc2 100644
--- a/src/chrome/content/rules/BT_Wi-fi.xml
+++ b/src/chrome/content/rules/BT_Wi-fi.xml
@@ -1,32 +1,17 @@
 
-
+
+	
+	
+	
+	
 
+	
 	
 	
-	
-	
-
-
-	
-	
-
 
-	
+	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/BTunnel.xml b/src/chrome/content/rules/BTunnel.xml
index 5f3e945dd5ef..d51f36d1cd3d 100644
--- a/src/chrome/content/rules/BTunnel.xml
+++ b/src/chrome/content/rules/BTunnel.xml
@@ -5,11 +5,11 @@ Fetch error: http://btunnel.com/ => https://btunnel.com/: (51, "SSL: no alternat
 Fetch error: http://www.btunnel.com/ => https://btunnel.com/: (51, "SSL: no alternative certificate subject name matches target host name 'btunnel.com'")
 
 -->
-
+
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/BU.edu.xml b/src/chrome/content/rules/BU.edu.xml
index 4fb1e473e5b3..9e5460d1a755 100644
--- a/src/chrome/content/rules/BU.edu.xml
+++ b/src/chrome/content/rules/BU.edu.xml
@@ -18,10 +18,16 @@
 		sphweb.bumc.bu.edu (revoked)
 		bumc.bu.edu
 		g2pc1.bu.edu
+		onlinemsw.bu.edu
+
+	Broken cert chain:
+		medlib.bu.edu
 
 	Time out:
 		mark.bu.edu
 
+	Securing the cookies on this domain can cause issues with proxy access to academic publications (#17838).
+
 -->
 
 
@@ -34,13 +40,7 @@
 	
 	
 	
-	
-		
-		
-		
-	
 	
-	
 	
 	
 	
@@ -48,8 +48,6 @@
 	
 	
 
-	
-
 	
 
diff --git a/src/chrome/content/rules/BUNTE.de.xml b/src/chrome/content/rules/BUNTE.de.xml
new file mode 100644
index 000000000000..9fb55ac5d417
--- /dev/null
+++ b/src/chrome/content/rules/BUNTE.de.xml
@@ -0,0 +1,41 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/BVG.de.xml b/src/chrome/content/rules/BVG.de.xml
index 283b9d440f91..1e4f42a59c02 100644
--- a/src/chrome/content/rules/BVG.de.xml
+++ b/src/chrome/content/rules/BVG.de.xml
@@ -9,7 +9,7 @@ Fetch error: http://track.bvg.de/ => https://track.bvg.de/: (60, 'SSL certificat
 		- owa.bvg.de (not working)
 		- unternehmen.prelive.bvg.de (cert mismatch)
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/BVI_Photo_Video.com.xml b/src/chrome/content/rules/BVI_Photo_Video.com.xml
deleted file mode 100644
index aebead1e0c86..000000000000
--- a/src/chrome/content/rules/BVI_Photo_Video.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/BX.in.th.xml b/src/chrome/content/rules/BX.in.th.xml
deleted file mode 100644
index 6fe180799718..000000000000
--- a/src/chrome/content/rules/BX.in.th.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-
-		
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/BYU.edu.xml b/src/chrome/content/rules/BYU.edu.xml
index d29a6bdabde2..981ab818610e 100644
--- a/src/chrome/content/rules/BYU.edu.xml
+++ b/src/chrome/content/rules/BYU.edu.xml
@@ -21,7 +21,6 @@
 			 - dvagalleries.byu.edu
 
 		SSL peer certificate was not OK:
-			 - aims.byu.edu
 			 - asiane.byu.edu
 			 - cal.byu.edu
 			 - english.byu.edu
@@ -41,16 +40,22 @@
 
 		Peer certificate cannot be authenticated with given CA certificates:
 			 - afrotc.byu.edu
-			 - art.byu.edu
-			 - designdept.byu.edu
+			 - unicomm.byu.edu
+				
 
 		Incomplete certificate chain error:
 			 - www.law.byu.edu
 			 - studentratings.byu.edu
+			 - education.byu.edu
+			 - ece.byu.edu
+			 - www.ece.byu.edu
+			 - ee.byu.edu
+			 - www.ee.byu.edu
 
 		Status code mismatch:
 			 - econ.byu.edu
 			 - mpc.byu.edu
+			 - geography.byu.edu
 
 		Different content:
 			 - core.byu.edu
@@ -69,11 +74,13 @@
 
 	
 	
+	
 	
 	
 	
 	
 	
+	
 	
 	
 	
@@ -92,10 +99,12 @@
 	
 	
 	
-	
+	
+	
+	
+	
+	
 	
-	
-	
 	
 	
 	
@@ -106,7 +115,6 @@
 	
 	
 	
-	
 	
 	
 	
@@ -155,8 +163,6 @@
 	
 	
 	
-	
-		
 	
 	
 	
diff --git a/src/chrome/content/rules/BZ-Berlin.de.xml b/src/chrome/content/rules/BZ-Berlin.de.xml
new file mode 100644
index 000000000000..b3977294059f
--- /dev/null
+++ b/src/chrome/content/rules/BZ-Berlin.de.xml
@@ -0,0 +1,38 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/B_E_Smith.xml b/src/chrome/content/rules/B_E_Smith.xml
index 00e4b211b821..d44cbcad48aa 100644
--- a/src/chrome/content/rules/B_E_Smith.xml
+++ b/src/chrome/content/rules/B_E_Smith.xml
@@ -9,16 +9,19 @@ Fetch error: http://besmith.com/ => https://besmith.com/: (51, "SSL: no alternat
 
 
 	
-	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
 
 	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/BabyDiscuss.com.xml b/src/chrome/content/rules/BabyDiscuss.com.xml
new file mode 100644
index 000000000000..32324ea17ccd
--- /dev/null
+++ b/src/chrome/content/rules/BabyDiscuss.com.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/BabyMed.com.xml b/src/chrome/content/rules/BabyMed.com.xml
index 2992eda07e1c..0fc8fd74f9c6 100644
--- a/src/chrome/content/rules/BabyMed.com.xml
+++ b/src/chrome/content/rules/BabyMed.com.xml
@@ -16,4 +16,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Backcountry.com.xml b/src/chrome/content/rules/Backcountry.com.xml
index c1b4b8443785..cbb98722788a 100644
--- a/src/chrome/content/rules/Backcountry.com.xml
+++ b/src/chrome/content/rules/Backcountry.com.xml
@@ -12,7 +12,12 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Backloggery.com.xml b/src/chrome/content/rules/Backloggery.com.xml
index e320c2f38a49..5733417218c5 100644
--- a/src/chrome/content/rules/Backloggery.com.xml
+++ b/src/chrome/content/rules/Backloggery.com.xml
@@ -2,6 +2,6 @@
 	
 	
 
-	
 
diff --git a/src/chrome/content/rules/Backupify.xml b/src/chrome/content/rules/Backupify.xml
index 5ce659b9453c..56ad1b99d241 100644
--- a/src/chrome/content/rules/Backupify.xml
+++ b/src/chrome/content/rules/Backupify.xml
@@ -2,7 +2,7 @@
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/BadgeKit.org.xml b/src/chrome/content/rules/BadgeKit.org.xml
index cd86e2e42e66..efa0ad0f4504 100644
--- a/src/chrome/content/rules/BadgeKit.org.xml
+++ b/src/chrome/content/rules/BadgeKit.org.xml
@@ -24,7 +24,7 @@ Fetch error: http://api.badgekit.org/ => https://api.badgekit.org/: (6, 'Could n
 		- badgekit.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Badgeville.com-problematic.xml b/src/chrome/content/rules/Badgeville.com-problematic.xml
index 872794e1d0b5..db0830936ff2 100644
--- a/src/chrome/content/rules/Badgeville.com-problematic.xml
+++ b/src/chrome/content/rules/Badgeville.com-problematic.xml
@@ -5,7 +5,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -14,4 +15,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Badgeville.com.xml b/src/chrome/content/rules/Badgeville.com.xml
deleted file mode 100644
index df866bf76984..000000000000
--- a/src/chrome/content/rules/Badgeville.com.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Bagatoo.se.xml b/src/chrome/content/rules/Bagatoo.se.xml
index 47d3572e6bce..01cb8fcde661 100644
--- a/src/chrome/content/rules/Bagatoo.se.xml
+++ b/src/chrome/content/rules/Bagatoo.se.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.bagatoo.se/ => https://www.bagatoo.se/: Cycle detected - URL already encountered: https://bagatoo.se/
 Fetch error: http://bagatoo.se/ => https://bagatoo.se/: Cycle detected - URL already encountered: https://bagatoo.se/
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/Bagnet.org.xml b/src/chrome/content/rules/Bagnet.org.xml
index a52286c78873..25dbd83dfbfd 100644
--- a/src/chrome/content/rules/Bagnet.org.xml
+++ b/src/chrome/content/rules/Bagnet.org.xml
@@ -11,7 +11,7 @@ Fetch error: http://bagnet.org/ => https://bagnet.org/: (7, 'Failed to connect t
 	* Shows www
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Bahiaoui.net.xml b/src/chrome/content/rules/Bahiaoui.net.xml
new file mode 100644
index 000000000000..3f462e285d7f
--- /dev/null
+++ b/src/chrome/content/rules/Bahiaoui.net.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Bahn.de.xml b/src/chrome/content/rules/Bahn.de.xml
index 67a037dc85b4..e705dbafbb14 100644
--- a/src/chrome/content/rules/Bahn.de.xml
+++ b/src/chrome/content/rules/Bahn.de.xml
@@ -16,9 +16,9 @@
 	
 
 	
-	
+
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Bahnhof.se.xml b/src/chrome/content/rules/Bahnhof.se.xml
new file mode 100644
index 000000000000..d762a5e6c983
--- /dev/null
+++ b/src/chrome/content/rules/Bahnhof.se.xml
@@ -0,0 +1,25 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Baidu.xml b/src/chrome/content/rules/Baidu.xml
index fd50fcd99fe7..d0900b9850d7 100644
--- a/src/chrome/content/rules/Baidu.xml
+++ b/src/chrome/content/rules/Baidu.xml
@@ -4,184 +4,126 @@
 		- bcebos.com.xml
 		- Bdimg.com.xml
 		- bdstatic.com.xml
-		- duapp.com.xml
 		- Hao123.com.xml
 
-	Nonfunctional hosts in *baidu.com:
-		- adm *
-		- antivirus ᵃ
-		- forum.antivirus ᵃ
-		- apistore *
-		- bbs.apistore *
-		- appsearchcdn *
-		- xuxuhong.baijia *
-		- zhengshangcanyue.baijia *
-		- ticket.bce *
-		- dl.browser *
-		- dl2.browser *
-		- en.browser ᶠ
-		- cleaner ᵃ
-		- dida *
-		- duokoo *
-		- e *
-		- echarts *
-		- eiv *
-		- fanyi *
-		- finance *
-		- gate		405
-		- global *
-		- help *
-		- hi *
-		- tb.himg *
-		- [a-h].hiphotos *
-		- home *
-		- index *
-		- is *
-		- italk *
-		- iwan
-		- jingyan *
-		- jp *
-		- lbsyun *
-		- bbs.lbsyun *
-		- libs *
-		- licai *
-		- r.m *
-		- map *
-		- mo *
-		- mp3 *
-		- music *
-		- news *
-		- shehui.news *
-		- op *
-		- ours *
-		- pcappstore *
-		- pos *
-		- cm.pos *
-		- wn.pos *
-		- qianbao *
-		- qingting ᶠ
-		- r *
-		- research ᵇ
-		- rj *
-		- share *
-		- bdimg.share *
-		- shouji *
-		- m.site ᶠ
-		- siteapp *
-		- m.siteapp *
-		- sparksecurity ᶠ
-		- su **
-		- t[012] *
-		- talent *
-		- static.tieba *
-		- top *
-		- tousu *
-		- translate *
-		- trends *
-		- tvg		(Shows default page)
-		- tvgame	(Shows tvg)
-		- usa ᵇ
-		- utility *
-		- wanba *
-		- wangmeng *
-		- wapmap *
-		- wubi *
-		- xteam *
-		- xueshu	(405)
-		- yingxiao *
-		- static.youhua **
-		- yunjiasu *
-		- yuqing *
-	ᵃ Shows another domain
-	ᵇ Shows default page
-	* Times out
-	ᶠ Handshake fails
-	** Internal error
+	500:
+		adscdn.baidu.com
+		pay.baidu.com
 
-	Problematic hosts:
-		- bdl ²
-		- bs ᵉ
-		- hm ¹
-		- financestatic ²
-		- ir ²
-		- msh ²
-		- musicdata ²
-		- pcfaster ᵉ ¹ ᵘ
-		- trends ᵉ
-		- list.video ²
-		- www.video ²
-		- zoo ²
-	* Dropped
-	ᵉ Expired
-	¹ Insecure renegotiation
-	² Mismatched
-	³ Server sends no certificate chain, see https://whatsmychaincert.com
-	ᵘ Untrusted root
+	Equal to https hosts:
+		financestatic.baidu.com	=>	8.baidu.com
+		tb.himg.baidu.com		=>	himg.baidu.com
+		*.hiphotos.baidu.com	=>	hiphotos.baidu.com
+		static.tieba.baidu.com	=>	tieba.baidu.com
 
-	Some pages redirect to http
-		- v *
-		- (www.)?video *
-		- list.video *
+		dq.tieba.com			=>	tieba.baidu.com
 
-	Insecure cookies are set for these domains and hosts: ᶜ
-		- baidu.com
-		- .baidu.com
-		- 8.baidu.com
-		- cas.baidu.com
-		- ce.baidu.com
-		- .m.baidu.com
-		- m1.baidu.com
-		- m5.baidu.com
-		- m7.baidu.com
-		- open2.baidu.com
-		- openapi.baidu.com
-		- pda.baidu.com
-		- www.baidu.com
-		- .www.baidu.com
-		- .yun.baidu.com
-		- zhanzhang.baidu.com
-		- zhitongche.baidu.com
-		- zoo.baidu.com
-	ᶜ See https://owasp.org/index.php/SecureFlag
+	Handshake fails:
+		en.browser.baidu.com
+		m.site.baidu.com
+		sparksecurity.baidu.com
+		baishi.baidu.com
 
-	MCB:
-		adscdn.baidu.com
-		baishi.baidu.com	( break username and so on on the right-top of page. )
-		downpack.baidu.com	http://downpack.baidu.com/doctorthumb_AndroidPhone_1012469d.apk
+	MCB：
+		share.baidu.com
+		shouji.baidu.com
+		top.baidu.com
 
 	Redirect to http:
-		pay.baidu.com
-		tieba.baidu.com	( some pages. )
-		v,video	( part of them, like v.baidu.com/$ )
-		zns.baidu.com	https://znsv.baidu.com/customer_search/api/js?sid=8725453834531596266
+		ir.baidu.com
+		musicdata.baidu.com
+		research.baidu.com
+		tieba.baidu.com			some pages
+		usa.baidu.com
+		v.baidu.com				https on v.baidu.com/$ but redirect to http on other pages
+		www.video.baidu.com
+		list.video.baidu.com
+
+	Shows another domain:
+		downpack.baidu.com		http://downpack.baidu.com/doctorthumb_AndroidPhone_1012469d.apk
+
+	Timeout:
+		adm.baidu.com
+		apistore.baidu.com
+		bbs.apistore.baidu.com
+		appsearchcdn.baidu.com
+		xuxuhong.baijia.baidu.com
+		zhengshangcanyue.baijia.baidu.com
+		ticket.bce.baidu.com
+		bdl.baidu.com
+		datax.baidu.com			https://travis-ci.org/github/EFForg/https-everywhere/jobs/577122408#L678
+		dl.browser.baidu.com
+		dl2.browser.baidu.com
+		dida.baidu.com
+		duokoo.baidu.com
+		e.baidu.com
+		echarts.baidu.com
+		eiv.baidu.com
+		finance.baidu.com
+		global.baidu.com
+		italk.baidu.com
+		jp.baidu.com
+		lbsyun.baidu.com
+		bbs.lbsyun.baidu.com
+		libs.baidu.com
+		licai.baidu.com
+		r.m.baidu.com
+		mo.baidu.com
+		mp3.baidu.com
+		music.baidu.com
+		shehui.news.baidu.com
+		op.baidu.com
+		ours.baidu.com
+		pcappstore.baidu.com
+		pos.baidu.com
+		cm.pos.baidu.com
+		wn.pos.baidu.com
+		qianbao.baidu.com
+		r.baidu.com
+		rj.baidu.com
+		bdimg.share.baidu.com
+		siteapp.baidu.com
+		m.siteapp.baidu.com
+		t[012].baidu.com
+		talent.baidu.com
+		utility.baidu.com
+		wanba.baidu.com
+		wangmeng.baidu.com
+		wapmap.baidu.com
+		wubi.baidu.com
+		xteam.baidu.com
+		yunjiasu.baidu.com
+		yuqing.baidu.com
 
 	Timeout on Tor and travis:
-		8.baidu.com
-		haoma.baidu.com
+		bce.baidu.com			https://travis-ci.org/github/EFForg/https-everywhere/jobs/681011123#L429
+		cloud.baidu.com			https://travis-ci.org/github/EFForg/https-everywhere/jobs/443982887#L662
+		flight.baidu.com		https://travis-ci.org/github/EFForg/https-everywhere/jobs/681011123#L430
+		mbd.baidu.com			https://travis-ci.org/github/EFForg/https-everywhere/jobs/681011123#L432
+		c.pcs.baidu.com			https://travis-ci.org/github/EFForg/https-everywhere/jobs/446459580#L707
 		shoujiweishi.baidu.com
-		ss0.baidu.com
+		ss0.baidu.com			https://travis-ci.org/github/EFForg/https-everywhere/jobs/685629313#L430
+		translate.baidu.com		https://travis-ci.org/github/EFForg/https-everywhere/jobs/681011123#L434
 -->
 
 	
 	
 	
-	
-	
+	
 	
 	
-	
-	
+	
 	
-	
 	
 	
-	
 	
-	
 	
 	
-	
+	
+		
+	
 	
+	
 	
 	
 	
@@ -191,12 +133,20 @@
 	
 	
 	
-	
+	
+	
+	
+	
+	
 	
 		
+	
 	
 	
 		
+	
+	
+	
 	
 	
 	
@@ -211,38 +161,40 @@
 	
 	
 	
+	
 	
 	
+	
 	
-	
 	
 	
 	
-	
 	
 	
 	
-	
+	
 	
+	
+		
 	
-	
-	
+	
+	
+	
 	
 	
 	
 	
 	
+	
+	
 	
 	
 	
 	
+	
 
 	
 
-	
-	
-
 	
 	
@@ -254,8 +206,10 @@
 		
 		
 
-	
-		
+	
+	
+		
 
 	
 	
 		
 		
-	
+
+	
+	
+
+	
 	
-		
+		
 		
 		
 		
+		
 		
-		
-		
+		
+	
+		
+		
+	
+		
+		
+		
+		
+
+	
+	
+		
+
+	
+	
+
+	
+	
+		
+		
+		
+		
+		
+	
+		
+		
+		
+
+	
+	
+		
 
+	
 	
-		
+		
 		
 		
 		
+		
+		
 		
 		
 		
diff --git a/src/chrome/content/rules/Balboa.io.xml b/src/chrome/content/rules/Balboa.io.xml
deleted file mode 100644
index aed7ec2adbe7..000000000000
--- a/src/chrome/content/rules/Balboa.io.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Baldershage.se.xml b/src/chrome/content/rules/Baldershage.se.xml
index 6d6ef74eb7f4..fbeec94c6c3f 100644
--- a/src/chrome/content/rules/Baldershage.se.xml
+++ b/src/chrome/content/rules/Baldershage.se.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Non-2xx HTTP code: http://baldershage.se/ (200) => https://baldershage.se/ (404)
 
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/Balkan_Leaks.xml b/src/chrome/content/rules/Balkan_Leaks.xml
index ba3b4c2c53ed..22641a042587 100644
--- a/src/chrome/content/rules/Balkan_Leaks.xml
+++ b/src/chrome/content/rules/Balkan_Leaks.xml
@@ -7,7 +7,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://balkanleaks.eu/ => https://balkanleaks.eu/: (60, 'SSL certificate problem: certificate has expired')
 Fetch error: http://www.balkanleaks.eu/ => https://www.balkanleaks.eu/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://www.balkanleaks.eu/ => https://www.balkanleaks.eu/: (60, 'SS
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ballot_Measure_Domains.xml b/src/chrome/content/rules/Ballot_Measure_Domains.xml
index 731700872af9..771ac1f395d3 100644
--- a/src/chrome/content/rules/Ballot_Measure_Domains.xml
+++ b/src/chrome/content/rules/Ballot_Measure_Domains.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://ballotmeasuredomains.com/ => https://ballotmeasuredomains.com/: (28, 'Connection timed out after 10001 milliseconds')
 Fetch error: http://www.ballotmeasuredomains.com/ => https://www.ballotmeasuredomains.com/: (28, 'Connection timed out after 10000 milliseconds')
 -->
-
+
 
 	
 	
@@ -19,4 +19,4 @@ Fetch error: http://www.ballotmeasuredomains.com/ => https://www.ballotmeasuredo
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ballou.xml b/src/chrome/content/rules/Ballou.xml
index f6496b4a6393..c90c652c6eeb 100644
--- a/src/chrome/content/rules/Ballou.xml
+++ b/src/chrome/content/rules/Ballou.xml
@@ -32,16 +32,23 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
 
 	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Banca-Intesa-Beograd.xml b/src/chrome/content/rules/Banca-Intesa-Beograd.xml
new file mode 100644
index 000000000000..a85a38261dcd
--- /dev/null
+++ b/src/chrome/content/rules/Banca-Intesa-Beograd.xml
@@ -0,0 +1,17 @@
+
+
+
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Bandcamp.xml b/src/chrome/content/rules/Bandcamp.xml
index 3f0d4172b67d..862f031afe0b 100644
--- a/src/chrome/content/rules/Bandcamp.xml
+++ b/src/chrome/content/rules/Bandcamp.xml
@@ -32,4 +32,4 @@
 	
 
- 
+
diff --git a/src/chrome/content/rules/Bandinelli.net.xml b/src/chrome/content/rules/Bandinelli.net.xml
index 6e91f2cb6cc0..a2d0c963da6e 100644
--- a/src/chrome/content/rules/Bandinelli.net.xml
+++ b/src/chrome/content/rules/Bandinelli.net.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.bandinelli.net/ => https://www.bandinelli.net/: (51, "SS
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Bandisoft.xml b/src/chrome/content/rules/Bandisoft.xml
index 38cfdd91c563..685303b4fb7b 100644
--- a/src/chrome/content/rules/Bandisoft.xml
+++ b/src/chrome/content/rules/Bandisoft.xml
@@ -7,7 +7,7 @@ Fetch error: http://bandisoft-dl.bandicam.cn/ => https://bandisoft-dl.bandicam.c
 	- blog.
 -->
 
-
+
 
 	
 	
@@ -15,10 +15,10 @@ Fetch error: http://bandisoft-dl.bandicam.cn/ => https://bandisoft-dl.bandicam.c
 	
 	
 	
-	
+
 	
 	
-	
+
 	
 
 	
diff --git a/src/chrome/content/rules/Banggood.com.xml b/src/chrome/content/rules/Banggood.com.xml
new file mode 100644
index 000000000000..ec6abe9ebe2e
--- /dev/null
+++ b/src/chrome/content/rules/Banggood.com.xml
@@ -0,0 +1,58 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Bangor-University.xml b/src/chrome/content/rules/Bangor-University.xml
index 85bfc6d25ad9..3669157bff32 100644
--- a/src/chrome/content/rules/Bangor-University.xml
+++ b/src/chrome/content/rules/Bangor-University.xml
@@ -21,6 +21,13 @@
 			- repository
 			- studyskills		(cert: www.bangor.ac.uk; shows www's data)
 
+    Connection Refused
+      - bangorportal.bangor
+      - forum
+      - inside
+      - intranet
+      - webmail
+
 		- (www.)edeandravenscroft.co.uk	(ssl_error_rx_record_too_long)
 		- (www.)www.pontio.co.uk	(cert: www.bangor.ac.uk; shows that domain's data)
 
@@ -32,21 +39,19 @@
 
 
 	
-	
-
-
-		
-		
+	
+	
 
+  
+  
 
 	
-	
-
-	
+	
+    
 
+  
 
diff --git a/src/chrome/content/rules/BangorDailyNews.com.xml b/src/chrome/content/rules/BangorDailyNews.com.xml
new file mode 100644
index 000000000000..96ff6aa7f047
--- /dev/null
+++ b/src/chrome/content/rules/BangorDailyNews.com.xml
@@ -0,0 +1,16 @@
+
+
+
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Bangor_Daily_News.xml b/src/chrome/content/rules/Bangor_Daily_News.xml
deleted file mode 100644
index 17082bdb81f4..000000000000
--- a/src/chrome/content/rules/Bangor_Daily_News.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Bank_of_America.com.xml b/src/chrome/content/rules/Bank_of_America.com.xml
index 994b18b3b67f..914681f038f9 100644
--- a/src/chrome/content/rules/Bank_of_America.com.xml
+++ b/src/chrome/content/rules/Bank_of_America.com.xml
@@ -27,7 +27,7 @@
 		Secure connection redirects to plaintext:
 			 - about.bankofamerica.com
 			 - promo.bankofamerica.com
-		
+
 		Mixed content blocking (MCB) tiggered:
 			 - homeloanhelp.bankofamerica.com
 -->
diff --git a/src/chrome/content/rules/Bank_of_Taipei.com.tw.xml b/src/chrome/content/rules/Bank_of_Taipei.com.tw.xml
deleted file mode 100644
index f62d633d46f1..000000000000
--- a/src/chrome/content/rules/Bank_of_Taipei.com.tw.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Banki.ru.xml b/src/chrome/content/rules/Banki.ru.xml
index f6f9c623edd3..bd2a624d4cd3 100644
--- a/src/chrome/content/rules/Banki.ru.xml
+++ b/src/chrome/content/rules/Banki.ru.xml
@@ -9,6 +9,6 @@
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Banking.co.at.xml b/src/chrome/content/rules/Banking.co.at.xml
index b63d1a428766..2afc4a94e0f4 100644
--- a/src/chrome/content/rules/Banking.co.at.xml
+++ b/src/chrome/content/rules/Banking.co.at.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://banking.co.at/ => https://banking.co.at/: (6, 'Could not resolve host: banking.co.at')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Bankinter.com.xml b/src/chrome/content/rules/Bankinter.com.xml
index 9db20e9c5315..232fe9039c40 100644
--- a/src/chrome/content/rules/Bankinter.com.xml
+++ b/src/chrome/content/rules/Bankinter.com.xml
@@ -20,7 +20,7 @@ Fetch error: http://www.gneis.bankinter.com/ => https://www.gneis.bankinter.com/
 		* validator.bankinter.com
 		* www.masterclassoceanosazules.bankinter.com
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Bankrate.com.xml b/src/chrome/content/rules/Bankrate.com.xml
index 68df8ebc30c5..fc76ebec1bff 100644
--- a/src/chrome/content/rules/Bankrate.com.xml
+++ b/src/chrome/content/rules/Bankrate.com.xml
@@ -8,12 +8,12 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://bankrate.com/ => https://origin.bankrate.com/: Cycle detected - URL already encountered: https://origin.bankrate.com/
 Fetch error: http://www.bankrate.com/ => https://origin.bankrate.com/: Cycle detected - URL already encountered: https://origin.bankrate.com/
 -->
-
+
 
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Bankuralsib.ru.xml b/src/chrome/content/rules/Bankuralsib.ru.xml
deleted file mode 100644
index c1b53a08ec62..000000000000
--- a/src/chrome/content/rules/Bankuralsib.ru.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/BannerSnack.com.xml b/src/chrome/content/rules/BannerSnack.com.xml
index 4e46d03d7a17..6d6738b83d49 100644
--- a/src/chrome/content/rules/BannerSnack.com.xml
+++ b/src/chrome/content/rules/BannerSnack.com.xml
@@ -1,39 +1,16 @@
 
 
-
 	
-	
-
-
-	
-
-
-	
+	
 
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/Banque_CIC.xml b/src/chrome/content/rules/Banque_CIC.xml
index 58ca7983e121..94954d0bdbfe 100644
--- a/src/chrome/content/rules/Banque_CIC.xml
+++ b/src/chrome/content/rules/Banque_CIC.xml
@@ -2,7 +2,7 @@
     
     
 
-    
+    
 
     
diff --git a/src/chrome/content/rules/Banque_CIC_Suisse.xml b/src/chrome/content/rules/Banque_CIC_Suisse.xml
index f61d75132532..184729d33b3b 100644
--- a/src/chrome/content/rules/Banque_CIC_Suisse.xml
+++ b/src/chrome/content/rules/Banque_CIC_Suisse.xml
@@ -3,7 +3,7 @@
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Banque_Cantonale_du_Valais.xml b/src/chrome/content/rules/Banque_Cantonale_du_Valais.xml
index e7a11bcfb99e..316a6f7355b5 100644
--- a/src/chrome/content/rules/Banque_Cantonale_du_Valais.xml
+++ b/src/chrome/content/rules/Banque_Cantonale_du_Valais.xml
@@ -1,17 +1,35 @@
+
 
-    
-    
-    
-    
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
+	
+	
+	
 
-    
+	
 
-    
-    
-    
-    
+	
+	
+	
+	
 
diff --git a/src/chrome/content/rules/Banu.com.xml b/src/chrome/content/rules/Banu.com.xml
index db6442d41674..a5bac6d35b91 100644
--- a/src/chrome/content/rules/Banu.com.xml
+++ b/src/chrome/content/rules/Banu.com.xml
@@ -29,13 +29,17 @@ Fetch error: http://banu.com/ => https://banu.com/: (28, 'Connection timed out a
 
 
 	
-	
+	
+	
+	
+	
+	
+	
 
 
-	
+	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Barclays.co.uk.xml b/src/chrome/content/rules/Barclays.co.uk.xml
new file mode 100644
index 000000000000..57b08001092a
--- /dev/null
+++ b/src/chrome/content/rules/Barclays.co.uk.xml
@@ -0,0 +1,28 @@
+
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Barclays.xml b/src/chrome/content/rules/Barclays.xml
deleted file mode 100644
index a6e624ab81ea..000000000000
--- a/src/chrome/content/rules/Barclays.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-
-	
-  
-  
-	
-	
-	
-  
-
-	
-	
-
-
-	
-	
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Barclays_Corporate.com.xml b/src/chrome/content/rules/Barclays_Corporate.com.xml
index dd5331a110b2..c9fe2507f277 100644
--- a/src/chrome/content/rules/Barclays_Corporate.com.xml
+++ b/src/chrome/content/rules/Barclays_Corporate.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://barclayscorporate.com/ => https://www.barclayscorporate.com/
 	^barclayscorporate.com: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Bardwil_Home.xml b/src/chrome/content/rules/Bardwil_Home.xml
index e32cc541530f..823682dfa93b 100644
--- a/src/chrome/content/rules/Bardwil_Home.xml
+++ b/src/chrome/content/rules/Bardwil_Home.xml
@@ -13,4 +13,4 @@ Fetch error: http://bardwilhome.com/ => http://bardwilhome.com/: Redirect for 'h
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/BareMetal.xml b/src/chrome/content/rules/BareMetal.xml
index daaad5d39282..62f6015ad4d4 100644
--- a/src/chrome/content/rules/BareMetal.xml
+++ b/src/chrome/content/rules/BareMetal.xml
@@ -7,13 +7,13 @@
 
 
 	
-	
+	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Bareos.xml b/src/chrome/content/rules/Bareos.xml
index a6da4469fbba..860751ca7d75 100644
--- a/src/chrome/content/rules/Bareos.xml
+++ b/src/chrome/content/rules/Bareos.xml
@@ -13,4 +13,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Barfi.ch.xml b/src/chrome/content/rules/Barfi.ch.xml
deleted file mode 100644
index f4d9df135174..000000000000
--- a/src/chrome/content/rules/Barfi.ch.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/BarkerJr.net.xml b/src/chrome/content/rules/BarkerJr.net.xml
index 7e5afee95d3b..6c821a722b8f 100644
--- a/src/chrome/content/rules/BarkerJr.net.xml
+++ b/src/chrome/content/rules/BarkerJr.net.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.barkerjr.net/ => https://www.barkerjr.net/: (51, "SSL: n
 	^barkerjr.net doesn't exist.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Barnard_College.xml b/src/chrome/content/rules/Barnard_College.xml
index 6b4222a56a1b..e4b60229897c 100644
--- a/src/chrome/content/rules/Barnard_College.xml
+++ b/src/chrome/content/rules/Barnard_College.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Barnebys.com.xml b/src/chrome/content/rules/Barnebys.com.xml
index 0dc18495bcdc..639cd4ec5683 100644
--- a/src/chrome/content/rules/Barnebys.com.xml
+++ b/src/chrome/content/rules/Barnebys.com.xml
@@ -29,10 +29,6 @@
 	
 
 
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Barnes-Jewish_Hospital.xml b/src/chrome/content/rules/Barnes-Jewish_Hospital.xml
index 2f5af3078bdc..703a50375aab 100644
--- a/src/chrome/content/rules/Barnes-Jewish_Hospital.xml
+++ b/src/chrome/content/rules/Barnes-Jewish_Hospital.xml
@@ -13,7 +13,7 @@ Fetch error: http://www.barnesjewish.org/ => http://www.barnesjewish.org/: (60,
 	Some pages redirect to http
 
 -->
-
+
 
 	
 	
@@ -22,4 +22,4 @@ Fetch error: http://www.barnesjewish.org/ => http://www.barnesjewish.org/: (60,
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Barnskospecialisten.se.xml b/src/chrome/content/rules/Barnskospecialisten.se.xml
index b97d32ff8a2a..0f2e10206440 100644
--- a/src/chrome/content/rules/Barnskospecialisten.se.xml
+++ b/src/chrome/content/rules/Barnskospecialisten.se.xml
@@ -1,6 +1,8 @@
-
-  
-  
-  
-
+
+	
+	
+
+	
 
+	
+
diff --git a/src/chrome/content/rules/Bart.gov.xml b/src/chrome/content/rules/Bart.gov.xml
index 860bcc94e82d..44ee0adb265e 100644
--- a/src/chrome/content/rules/Bart.gov.xml
+++ b/src/chrome/content/rules/Bart.gov.xml
@@ -10,7 +10,7 @@ Fetch error: http://ws8.bart.gov/ => https://ws8.bart.gov/: (35, 'Unknown SSL pr
 	- ws15.bart.gov		(incomplete certificate chain)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Barter.vg.xml b/src/chrome/content/rules/Barter.vg.xml
deleted file mode 100644
index a3b291d7262f..000000000000
--- a/src/chrome/content/rules/Barter.vg.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Bash.im.xml b/src/chrome/content/rules/Bash.im.xml
new file mode 100644
index 000000000000..5f5057be0c64
--- /dev/null
+++ b/src/chrome/content/rules/Bash.im.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Bashy.io.xml b/src/chrome/content/rules/Bashy.io.xml
new file mode 100644
index 000000000000..bece358e6aeb
--- /dev/null
+++ b/src/chrome/content/rules/Bashy.io.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Bathnes.gov.uk.xml b/src/chrome/content/rules/Bathnes.gov.uk.xml
index f99c28f2d983..3249601d1884 100644
--- a/src/chrome/content/rules/Bathnes.gov.uk.xml
+++ b/src/chrome/content/rules/Bathnes.gov.uk.xml
@@ -23,7 +23,7 @@ Fetch error: http://capita.bathnes.gov.uk/ => https://capita.bathnes.gov.uk/: (2
 
 		- ess ᶜ
 		- mss ᶜ
-	
+
 	ᶜ Server sends no certificate chain, see https://whatsmychaincert.com
 
 
@@ -48,7 +48,7 @@ Fetch error: http://capita.bathnes.gov.uk/ => https://capita.bathnes.gov.uk/: (2
 		- secure.bathnes.gov.uk
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Batman_Arkham_Knight.com.xml b/src/chrome/content/rules/Batman_Arkham_Knight.com.xml
deleted file mode 100644
index bfd051db2bac..000000000000
--- a/src/chrome/content/rules/Batman_Arkham_Knight.com.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Batmanarkhamorigins.com.xml b/src/chrome/content/rules/Batmanarkhamorigins.com.xml
index e08b1ea30550..f1a2e2ccfc6c 100644
--- a/src/chrome/content/rules/Batmanarkhamorigins.com.xml
+++ b/src/chrome/content/rules/Batmanarkhamorigins.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://batmanarkhamorigins.com/ => https://www.batmanarkhamorigins.
 Fetch error: http://www.batmanarkhamorigins.com/ => https://www.batmanarkhamorigins.com/: (7, 'Failed to connect to www.batmanarkhamorigins.com port 443: Connection timed out')
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Battelle.xml b/src/chrome/content/rules/Battelle.xml
index 4c1e739ce55f..cab7d92b5931 100644
--- a/src/chrome/content/rules/Battelle.xml
+++ b/src/chrome/content/rules/Battelle.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Battle.net.xml b/src/chrome/content/rules/Battle.net.xml
index 3887420710f5..94dd383e5439 100644
--- a/src/chrome/content/rules/Battle.net.xml
+++ b/src/chrome/content/rules/Battle.net.xml
@@ -32,17 +32,23 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
 		
 
 
 	
 
 
-	
 
 	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Battle_Creek_Enquirer.xml b/src/chrome/content/rules/Battle_Creek_Enquirer.xml
index 49e68ef900e5..f2dc1483b1a1 100644
--- a/src/chrome/content/rules/Battle_Creek_Enquirer.xml
+++ b/src/chrome/content/rules/Battle_Creek_Enquirer.xml
@@ -11,7 +11,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Bauhaus-University_Weimar.xml b/src/chrome/content/rules/Bauhaus-University_Weimar.xml
index a3bcd1933c26..2086bed02b0e 100644
--- a/src/chrome/content/rules/Bauhaus-University_Weimar.xml
+++ b/src/chrome/content/rules/Bauhaus-University_Weimar.xml
@@ -9,13 +9,13 @@
 -->
 
 
-	
+	
+	
 
 
-	
+	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Baxter_Bulletin.xml b/src/chrome/content/rules/Baxter_Bulletin.xml
index 77d37b13cdf2..4df02e1268ca 100644
--- a/src/chrome/content/rules/Baxter_Bulletin.xml
+++ b/src/chrome/content/rules/Baxter_Bulletin.xml
@@ -11,7 +11,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/BayFiles.xml b/src/chrome/content/rules/BayFiles.xml
index 67c23658a8fa..76a3eb40ceb8 100644
--- a/src/chrome/content/rules/BayFiles.xml
+++ b/src/chrome/content/rules/BayFiles.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.bayfiles.com/ => https://bayfiles.net/: (28, 'Resolving
 Fetch error: http://bayfiles.net/ => https://bayfiles.net/: (28, 'Resolving timed out after 10519 milliseconds')
 Fetch error: http://www.bayfiles.net/ => https://www.bayfiles.net/: (28, 'Resolving timed out after 10518 milliseconds')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/BayLeaks.com.xml b/src/chrome/content/rules/BayLeaks.com.xml
index ee23fb961973..359699fc42df 100644
--- a/src/chrome/content/rules/BayLeaks.com.xml
+++ b/src/chrome/content/rules/BayLeaks.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://bayleaks.com/ => https://bayleaks.com/: (7, 'Failed to conne
 Fetch error: http://www.bayleaks.com/ => https://www.bayleaks.com/: (7, 'Failed to connect to www.bayleaks.com port 443: Connection refused')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/BayLibre.com.xml b/src/chrome/content/rules/BayLibre.com.xml
index f663ac5daa50..2e319d073463 100644
--- a/src/chrome/content/rules/BayLibre.com.xml
+++ b/src/chrome/content/rules/BayLibre.com.xml
@@ -16,7 +16,7 @@ Fetch error: http://www.baylibre.com/ => https://www.baylibre.com/: (51, "SSL: n
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Bay_Area_Amusements.xml b/src/chrome/content/rules/Bay_Area_Amusements.xml
index 564ed48965fc..421835b5fa07 100644
--- a/src/chrome/content/rules/Bay_Area_Amusements.xml
+++ b/src/chrome/content/rules/Bay_Area_Amusements.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Bay_Citizen.org.xml b/src/chrome/content/rules/Bay_Citizen.org.xml
index 63f079beb1b6..81df65ff5900 100644
--- a/src/chrome/content/rules/Bay_Citizen.org.xml
+++ b/src/chrome/content/rules/Bay_Citizen.org.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.baycitizen.org/ => https://www.baycitizen.org/: (60, 'SS
 	^: dropped
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Baylor.edu.xml b/src/chrome/content/rules/Baylor.edu.xml
index fcbffe394796..d018a88d9bf3 100644
--- a/src/chrome/content/rules/Baylor.edu.xml
+++ b/src/chrome/content/rules/Baylor.edu.xml
@@ -23,7 +23,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
-
+
 
 	
diff --git a/src/chrome/content/rules/Baztab.net.xml b/src/chrome/content/rules/Baztab.net.xml
index c7bdbfd4d14a..57b7435d312c 100644
--- a/src/chrome/content/rules/Baztab.net.xml
+++ b/src/chrome/content/rules/Baztab.net.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.baztab.net/ => https://www.baztab.net/: (28, 'Connection
 Disabled by https-everywhere-checker because:
 Fetch error: http://baztab.net/ => https://baztab.net/: (6, 'Could not resolve host: baztab.net')
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://baztab.net/ => https://baztab.net/: (6, 'Could not resolve h
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/BazzApp.xml b/src/chrome/content/rules/BazzApp.xml
deleted file mode 100644
index a4180d252782..000000000000
--- a/src/chrome/content/rules/BazzApp.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Bbelements.com.xml b/src/chrome/content/rules/Bbelements.com.xml
index 5a7463fb6962..e4f617c6d363 100644
--- a/src/chrome/content/rules/Bbelements.com.xml
+++ b/src/chrome/content/rules/Bbelements.com.xml
@@ -26,7 +26,7 @@ Fetch error: http://go.pol.bbelements.com/ => https://go.pol.bbelements.com/: (6
 		- . . .
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Bbva.es.xml b/src/chrome/content/rules/Bbva.es.xml
index 9ee4a77b678b..b9628cac0d00 100644
--- a/src/chrome/content/rules/Bbva.es.xml
+++ b/src/chrome/content/rules/Bbva.es.xml
@@ -1,7 +1,7 @@
 
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Bdimg.com.xml b/src/chrome/content/rules/Bdimg.com.xml
index 7d2216dfb712..85f45b300c59 100644
--- a/src/chrome/content/rules/Bdimg.com.xml
+++ b/src/chrome/content/rules/Bdimg.com.xml
@@ -1,16 +1,12 @@
 
+	
+	
+		
 
 	
 
diff --git a/src/chrome/content/rules/BeNaughty.com.xml b/src/chrome/content/rules/BeNaughty.com.xml
index be595263b9a3..340e5a6bc049 100644
--- a/src/chrome/content/rules/BeNaughty.com.xml
+++ b/src/chrome/content/rules/BeNaughty.com.xml
@@ -17,17 +17,18 @@
 
 
 	
-	
+	
+	
+	
 		
 
 
-	
+	
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/BeSTGRID.org.xml b/src/chrome/content/rules/BeSTGRID.org.xml
deleted file mode 100644
index eb980b5f5cc6..000000000000
--- a/src/chrome/content/rules/BeSTGRID.org.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Be_Diff.com.br.xml b/src/chrome/content/rules/Be_Diff.com.br.xml
index 95bff8c9560b..a5e7ad6ea25e 100644
--- a/src/chrome/content/rules/Be_Diff.com.br.xml
+++ b/src/chrome/content/rules/Be_Diff.com.br.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://bediff.com.br/ => https://bediff.com.br/: (28, 'Operation timed out after 30001 milliseconds with 0 bytes received')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Be_Mobile.ua.xml b/src/chrome/content/rules/Be_Mobile.ua.xml
index 550726c2f1be..a5fd47f3c218 100644
--- a/src/chrome/content/rules/Be_Mobile.ua.xml
+++ b/src/chrome/content/rules/Be_Mobile.ua.xml
@@ -18,7 +18,7 @@
 	² Unsecurable <= refused
 
 -->
-
+
 
 	
 	
@@ -29,7 +29,7 @@
 					-->
 	
 
-	
+	
 
 
 	 https://beaconinitiative.com/: (28, 'Operation timed out after 15001 milliseconds with 0 bytes received')
 
 -->
-
+
 
 	
 	
@@ -22,4 +22,4 @@ Fetch error: http://beaconinitiative.com/ => https://beaconinitiative.com/: (28,
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Beagle_Street.xml b/src/chrome/content/rules/Beagle_Street.xml
index 21298a4cbbc5..aafe17d7706c 100644
--- a/src/chrome/content/rules/Beagle_Street.xml
+++ b/src/chrome/content/rules/Beagle_Street.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/BeamYourScreen.xml b/src/chrome/content/rules/BeamYourScreen.xml
index 159e581790ce..549bb206faa5 100644
--- a/src/chrome/content/rules/BeamYourScreen.xml
+++ b/src/chrome/content/rules/BeamYourScreen.xml
@@ -8,7 +8,7 @@ Fetch error: http://www.beamyourscreen.de/ => https://www.beamyourscreen.de/: (6
 Disabled by https-everywhere-checker because:
 Fetch error: http://beamyourscreen.de/ => https://beamyourscreen.de/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
 
 	
 	
@@ -17,4 +17,4 @@ Fetch error: http://beamyourscreen.de/ => https://beamyourscreen.de/: (60, 'SSL
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Beanstock_Media.xml b/src/chrome/content/rules/Beanstock_Media.xml
deleted file mode 100644
index 51f3109edbbe..000000000000
--- a/src/chrome/content/rules/Beanstock_Media.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Bear.im.xml b/src/chrome/content/rules/Bear.im.xml
index f3ad70e6f753..b2774407b8ed 100644
--- a/src/chrome/content/rules/Bear.im.xml
+++ b/src/chrome/content/rules/Bear.im.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.bear.im/ => https://www.bear.im/: (51, "SSL: no alternative certificate subject name matches target host name 'www.bear.im'")
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Beardoholic.com.xml b/src/chrome/content/rules/Beardoholic.com.xml
new file mode 100644
index 000000000000..7b2b13d1e40a
--- /dev/null
+++ b/src/chrome/content/rules/Beardoholic.com.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Beatport.com.xml b/src/chrome/content/rules/Beatport.com.xml
new file mode 100644
index 000000000000..261682620471
--- /dev/null
+++ b/src/chrome/content/rules/Beatport.com.xml
@@ -0,0 +1,25 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Beatport.xml b/src/chrome/content/rules/Beatport.xml
deleted file mode 100644
index 24fd2e358ef8..000000000000
--- a/src/chrome/content/rules/Beatport.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Beatsmedia.xml b/src/chrome/content/rules/Beatsmedia.xml
index ac8498ed0282..329c40c1ffd8 100644
--- a/src/chrome/content/rules/Beatsmedia.xml
+++ b/src/chrome/content/rules/Beatsmedia.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://beatsmedia.com/ => https://beatsmedia.com/: (35, 'error:140770FC:SSL routines:SSL23_GET_SERVER_HELLO:unknown protocol')
 Fetch error: http://www.beatsmedia.com/ => https://www.beatsmedia.com/: (35, 'error:140770FC:SSL routines:SSL23_GET_SERVER_HELLO:unknown protocol')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/BeautifulDecay.com.xml b/src/chrome/content/rules/BeautifulDecay.com.xml
index 7ad09f7586f7..b15551033e1e 100644
--- a/src/chrome/content/rules/BeautifulDecay.com.xml
+++ b/src/chrome/content/rules/BeautifulDecay.com.xml
@@ -25,7 +25,7 @@ Fetch error: http://www.beautifuldecay.com/ => https://www.beautifuldecay.com/:
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Beaverbrooks.co.uk.xml b/src/chrome/content/rules/Beaverbrooks.co.uk.xml
index 0ffad8b56e83..eee5b8af8fcd 100644
--- a/src/chrome/content/rules/Beaverbrooks.co.uk.xml
+++ b/src/chrome/content/rules/Beaverbrooks.co.uk.xml
@@ -39,7 +39,8 @@
 
 
 	
-	
+	
+	
 		
@@ -58,4 +59,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Bebo.com.xml b/src/chrome/content/rules/Bebo.com.xml
deleted file mode 100644
index 7b6f83a1aca0..000000000000
--- a/src/chrome/content/rules/Bebo.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-  
-  
-
-  
-
diff --git a/src/chrome/content/rules/Beck_PC.ch.xml b/src/chrome/content/rules/Beck_PC.ch.xml
index e3e9217f5cdd..75780e1d8fd1 100644
--- a/src/chrome/content/rules/Beck_PC.ch.xml
+++ b/src/chrome/content/rules/Beck_PC.ch.xml
@@ -12,7 +12,7 @@
 		- .pcp.ch
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/BedfordshirePolice.xml b/src/chrome/content/rules/BedfordshirePolice.xml
new file mode 100644
index 000000000000..03df4f67e3fc
--- /dev/null
+++ b/src/chrome/content/rules/BedfordshirePolice.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Beeg.com.xml b/src/chrome/content/rules/Beeg.com.xml
index f255651f762c..a585125301d4 100644
--- a/src/chrome/content/rules/Beeg.com.xml
+++ b/src/chrome/content/rules/Beeg.com.xml
@@ -30,4 +30,4 @@
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Beeimg.com.xml b/src/chrome/content/rules/Beeimg.com.xml
new file mode 100644
index 000000000000..14744273885b
--- /dev/null
+++ b/src/chrome/content/rules/Beeimg.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/BeenVerified.xml b/src/chrome/content/rules/BeenVerified.xml
index d81c499e9c52..fe0aaab60233 100644
--- a/src/chrome/content/rules/BeenVerified.xml
+++ b/src/chrome/content/rules/BeenVerified.xml
@@ -22,7 +22,12 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
 		
 
 
diff --git a/src/chrome/content/rules/Beender.co.xml b/src/chrome/content/rules/Beender.co.xml
deleted file mode 100644
index eb7b11f71d77..000000000000
--- a/src/chrome/content/rules/Beender.co.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Beetailer.com.xml b/src/chrome/content/rules/Beetailer.com.xml
index 75c5dfcfee39..da91d95b17f4 100644
--- a/src/chrome/content/rules/Beetailer.com.xml
+++ b/src/chrome/content/rules/Beetailer.com.xml
@@ -27,16 +27,16 @@
 
 
 	
-	
+	
+	
 
 
 	
 
 
-	
 
 	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Beginner_Triathlete.xml b/src/chrome/content/rules/Beginner_Triathlete.xml
index e4c9a9483950..123f27a0f9e1 100644
--- a/src/chrome/content/rules/Beginner_Triathlete.xml
+++ b/src/chrome/content/rules/Beginner_Triathlete.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.beginnertriathlete.com/ => https://www.beginnertriathlet
 		- ox	(shows www; mismatched, CN: ox.beginnertriathlete.com)
 
 -->
-
+
 
 	
 	
@@ -23,4 +23,4 @@ Fetch error: http://www.beginnertriathlete.com/ => https://www.beginnertriathlet
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Begun.xml b/src/chrome/content/rules/Begun.xml
index 73ec74f5e3ef..6b032a5aae06 100644
--- a/src/chrome/content/rules/Begun.xml
+++ b/src/chrome/content/rules/Begun.xml
@@ -7,7 +7,7 @@
 		- my2
 		- smart
 
-		- 
+		-
 	Insecure cookies are set for these domains and hosts:
 
 		- .begun.ru
diff --git a/src/chrome/content/rules/Behance.xml b/src/chrome/content/rules/Behance.xml
index 0407e36af328..783a70149053 100644
--- a/src/chrome/content/rules/Behance.xml
+++ b/src/chrome/content/rules/Behance.xml
@@ -10,7 +10,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
-
+
 
 	
 	
@@ -17,4 +17,4 @@ Fetch error: http://behr.com/ => https://behr.com/: Cycle detected - URL already
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Beleza_na_Web.xml b/src/chrome/content/rules/Beleza_na_Web.xml
index ed2791d8c7fc..92f78d8150c2 100644
--- a/src/chrome/content/rules/Beleza_na_Web.xml
+++ b/src/chrome/content/rules/Beleza_na_Web.xml
@@ -24,7 +24,7 @@ Fetch error: http://belezanaweb.net.br/ => http://belezanaweb.net.br/: (28, 'Con
 		- static[123]	(→ d33827d8ipi614.cloudfront.net)
 
 -->
-
+
 
 	
 	
@@ -41,4 +41,4 @@ Fetch error: http://belezanaweb.net.br/ => http://belezanaweb.net.br/: (28, 'Con
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Belkin.xml b/src/chrome/content/rules/Belkin.xml
index 5cab829f6d3b..c96e25c0c7b6 100644
--- a/src/chrome/content/rules/Belkin.xml
+++ b/src/chrome/content/rules/Belkin.xml
@@ -12,4 +12,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/BellSouth.xml b/src/chrome/content/rules/BellSouth.xml
index 7c23f6ed60a6..83555f14993c 100644
--- a/src/chrome/content/rules/BellSouth.xml
+++ b/src/chrome/content/rules/BellSouth.xml
@@ -13,10 +13,11 @@ Fetch error: http://bellsouth.com/ => https://www.bellsouth.com/: (35, 'Unknown
 		- $	(cert only matches www)
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
@@ -25,7 +26,6 @@ Fetch error: http://bellsouth.com/ => https://www.bellsouth.com/: (35, 'Unknown
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Bellazon.com.xml b/src/chrome/content/rules/Bellazon.com.xml
new file mode 100644
index 000000000000..84073043243e
--- /dev/null
+++ b/src/chrome/content/rules/Bellazon.com.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Bellingham_School_District.xml b/src/chrome/content/rules/Bellingham_School_District.xml
index 4076758cb475..a05a7338f053 100644
--- a/src/chrome/content/rules/Bellingham_School_District.xml
+++ b/src/chrome/content/rules/Bellingham_School_District.xml
@@ -11,10 +11,9 @@
 
 
 	
-	
+	
+	
 
+  
 
-	
-
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Belpino.se.xml b/src/chrome/content/rules/Belpino.se.xml
index 40496d3a05c2..d327a58002f7 100644
--- a/src/chrome/content/rules/Belpino.se.xml
+++ b/src/chrome/content/rules/Belpino.se.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.belpino.se/ => https://www.belpino.se/: (28, 'Connection timed out after 10001 milliseconds')
 Fetch error: http://belpino.se/ => https://belpino.se/: (28, 'Connection timed out after 10001 milliseconds')
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/Beltelecom.by.xml b/src/chrome/content/rules/Beltelecom.by.xml
deleted file mode 100644
index cd135181e149..000000000000
--- a/src/chrome/content/rules/Beltelecom.by.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/BendigoBank.xml b/src/chrome/content/rules/BendigoBank.xml
index 506df7fc09da..22e5612aaae3 100644
--- a/src/chrome/content/rules/BendigoBank.xml
+++ b/src/chrome/content/rules/BendigoBank.xml
@@ -1,9 +1,11 @@
 
   
-  
+  
+  
+  
+  
 
   
-  
-
\ No newline at end of file
+  
+
diff --git a/src/chrome/content/rules/Benefit.nl.xml b/src/chrome/content/rules/Benefit.nl.xml
deleted file mode 100644
index b8dcdbf6a643..000000000000
--- a/src/chrome/content/rules/Benefit.nl.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Benefitsweb.com.xml b/src/chrome/content/rules/Benefitsweb.com.xml
index 898ea4c86191..73f219507472 100644
--- a/src/chrome/content/rules/Benefitsweb.com.xml
+++ b/src/chrome/content/rules/Benefitsweb.com.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Benetech.xml b/src/chrome/content/rules/Benetech.xml
index 193ad7b5e048..47caa49bb050 100644
--- a/src/chrome/content/rules/Benetech.xml
+++ b/src/chrome/content/rules/Benetech.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Bennetts.xml b/src/chrome/content/rules/Bennetts.xml
index 3287cd3969d2..dff421e9471d 100644
--- a/src/chrome/content/rules/Bennetts.xml
+++ b/src/chrome/content/rules/Bennetts.xml
@@ -8,7 +8,9 @@ Fetch error: http://bennetts.co.uk/ => http://bennetts.co.uk/: Redirect for 'htt
 
 
 	
-	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Bentley_University.xml b/src/chrome/content/rules/Bentley_University.xml
deleted file mode 100644
index 750280c83777..000000000000
--- a/src/chrome/content/rules/Bentley_University.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-		
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Bepo.fr.xml b/src/chrome/content/rules/Bepo.fr.xml
new file mode 100644
index 000000000000..67e684149450
--- /dev/null
+++ b/src/chrome/content/rules/Bepo.fr.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Berkshire-Hathaway.xml b/src/chrome/content/rules/Berkshire-Hathaway.xml
index 820df0a4405a..1b481905b1a9 100644
--- a/src/chrome/content/rules/Berkshire-Hathaway.xml
+++ b/src/chrome/content/rules/Berkshire-Hathaway.xml
@@ -5,12 +5,12 @@
 
 	
 	
-	
+
 	
 	
 	
-	
-	
+
+
 	
 	
 	
diff --git a/src/chrome/content/rules/BerliOS.de.xml b/src/chrome/content/rules/BerliOS.de.xml
deleted file mode 100644
index 93fa998a181f..000000000000
--- a/src/chrome/content/rules/BerliOS.de.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Berlin-Airport.de.xml b/src/chrome/content/rules/Berlin-Airport.de.xml
index 4217f7c4c25f..603087b8f476 100644
--- a/src/chrome/content/rules/Berlin-Airport.de.xml
+++ b/src/chrome/content/rules/Berlin-Airport.de.xml
@@ -6,7 +6,7 @@ Fetch error: http://berlin-airport.de/ => https://www.berlin-airport.de/: Too ma
 Disabled by https-everywhere-checker because:
 Fetch error: http://berlin-airport.de/ => https://www.berlin-airport.de/: Redirect for 'http://www.berlin-airport.de/' missing Location
 -->
-
+
     
     
 
diff --git a/src/chrome/content/rules/Berliner-Zeitung.de.xml b/src/chrome/content/rules/Berliner-Zeitung.de.xml
new file mode 100644
index 000000000000..59f939d1a6fb
--- /dev/null
+++ b/src/chrome/content/rules/Berliner-Zeitung.de.xml
@@ -0,0 +1,65 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Bernal_Bucks.xml b/src/chrome/content/rules/Bernal_Bucks.xml
index 927073997ce9..5f5de36af62a 100644
--- a/src/chrome/content/rules/Bernal_Bucks.xml
+++ b/src/chrome/content/rules/Bernal_Bucks.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Bernard_Hodes_Group.xml b/src/chrome/content/rules/Bernard_Hodes_Group.xml
index f4cb33dafacc..e0cd0428f86e 100644
--- a/src/chrome/content/rules/Bernard_Hodes_Group.xml
+++ b/src/chrome/content/rules/Bernard_Hodes_Group.xml
@@ -10,7 +10,7 @@ Fetch error: http://jobmatcher.hodesiq.com/ => https://jobmatcher.hodesiq.com/:
 		- (www.)hodes.co.uk	(times out)
 
 -->
-
+
 
 	
 	
@@ -25,4 +25,4 @@ Fetch error: http://jobmatcher.hodesiq.com/ => https://jobmatcher.hodesiq.com/:
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Best-Buy.xml b/src/chrome/content/rules/Best-Buy.xml
index 9ffeaec925d8..bbd9ad2e1f42 100644
--- a/src/chrome/content/rules/Best-Buy.xml
+++ b/src/chrome/content/rules/Best-Buy.xml
@@ -14,7 +14,9 @@
 
 
 	
-	
+	
+	
+	
 		
@@ -24,15 +26,12 @@
 	
 
 
-	
 
-	
 
 	
 	
 
+	
 
diff --git a/src/chrome/content/rules/BestOfferBuy.com.xml b/src/chrome/content/rules/BestOfferBuy.com.xml
index 312085a31cec..d9591d70383c 100644
--- a/src/chrome/content/rules/BestOfferBuy.com.xml
+++ b/src/chrome/content/rules/BestOfferBuy.com.xml
@@ -8,10 +8,10 @@ Fetch error: http://bestofferbuy.com/ => https://www.bestofferbuy.com/: (60, 'SS
 	^: cert only matches www
 
 -->
-
+
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Bestcovery.com.xml b/src/chrome/content/rules/Bestcovery.com.xml
index 86429e59259d..1cbea82868ba 100644
--- a/src/chrome/content/rules/Bestcovery.com.xml
+++ b/src/chrome/content/rules/Bestcovery.com.xml
@@ -34,7 +34,14 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Beta-and-Cie.xml b/src/chrome/content/rules/Beta-and-Cie.xml
index 9280add583f8..f33e76113cbd 100644
--- a/src/chrome/content/rules/Beta-and-Cie.xml
+++ b/src/chrome/content/rules/Beta-and-Cie.xml
@@ -19,7 +19,7 @@ Fetch error: http://cdn.betacie.net/ => https://cdn.betacie.net/: (51, "SSL: no
 		cdn.betacie.com		(cert: betaci.net)
 		img.tweetimg.se		(CDNetworks)
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Betanews.xml b/src/chrome/content/rules/Betanews.xml
deleted file mode 100644
index 37316dfdb7d4..000000000000
--- a/src/chrome/content/rules/Betanews.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Bethsoft.com.xml b/src/chrome/content/rules/Bethsoft.com.xml
index 2246b8124152..6e236423d315 100644
--- a/src/chrome/content/rules/Bethsoft.com.xml
+++ b/src/chrome/content/rules/Bethsoft.com.xml
@@ -15,7 +15,7 @@
 			- forums from static.zenimax.com *
 
 
-	* Secured by us 
+	* Secured by us
 
 	Mixed content (secured in Bethsoft.com-falsemixed.xml):
 		adam.bethsoft.com
@@ -66,7 +66,7 @@
 	
 	
 	
-		
+
 	
 
 	
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/BetterCGI.com.xml b/src/chrome/content/rules/BetterCGI.com.xml
deleted file mode 100644
index 52b0305c5c0f..000000000000
--- a/src/chrome/content/rules/BetterCGI.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/BetterFap.com.xml b/src/chrome/content/rules/BetterFap.com.xml
index d3c67f820d28..5437885e63a4 100644
--- a/src/chrome/content/rules/BetterFap.com.xml
+++ b/src/chrome/content/rules/BetterFap.com.xml
@@ -13,4 +13,4 @@
 		
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Better_Sales.se.xml b/src/chrome/content/rules/Better_Sales.se.xml
index 16bf8c5007df..d5886925f570 100644
--- a/src/chrome/content/rules/Better_Sales.se.xml
+++ b/src/chrome/content/rules/Better_Sales.se.xml
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Bettershopping.eu.xml b/src/chrome/content/rules/Bettershopping.eu.xml
deleted file mode 100644
index 3420031d5684..000000000000
--- a/src/chrome/content/rules/Bettershopping.eu.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-  
-  
-
-  
-
diff --git a/src/chrome/content/rules/Betts.xml b/src/chrome/content/rules/Betts.xml
index 119d463f9cae..81b2f4dbaf8c 100644
--- a/src/chrome/content/rules/Betts.xml
+++ b/src/chrome/content/rules/Betts.xml
@@ -5,10 +5,10 @@ Fetch error: http://betts.com.au/ => https://betts.com.au/: (51, "SSL: no altern
 Fetch error: http://www.betts.com.au/ => https://www.betts.com.au/: Too many redirects while fetching 'https://www.betts.com.au/'
 
 -->
-
+
 	
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Beuc.net.xml b/src/chrome/content/rules/Beuc.net.xml
new file mode 100644
index 000000000000..e032046751ca
--- /dev/null
+++ b/src/chrome/content/rules/Beuc.net.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Bezeq_International.xml b/src/chrome/content/rules/Bezeq_International.xml
index d0d2d62deeee..0e16cc2ff1dd 100644
--- a/src/chrome/content/rules/Bezeq_International.xml
+++ b/src/chrome/content/rules/Bezeq_International.xml
@@ -28,7 +28,7 @@ Fetch error: http://newchat.bezeqint.net/ => https://newchat.bezeqint.net/: (6,
 		- www.bezeqint.net
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Bezos_Expeditions.xml b/src/chrome/content/rules/Bezos_Expeditions.xml
index a16cd35bf19a..36e8653e1070 100644
--- a/src/chrome/content/rules/Bezos_Expeditions.xml
+++ b/src/chrome/content/rules/Bezos_Expeditions.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.bezosexpeditions.com/ => https://www.bezosexpeditions.co
 	!www doesn't work.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/BfArM.de.xml b/src/chrome/content/rules/BfArM.de.xml
new file mode 100644
index 000000000000..523bdc31f52c
--- /dev/null
+++ b/src/chrome/content/rules/BfArM.de.xml
@@ -0,0 +1,31 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/BfDI.bund.de.xml b/src/chrome/content/rules/BfDI.bund.de.xml
new file mode 100644
index 000000000000..deb4d88c8376
--- /dev/null
+++ b/src/chrome/content/rules/BfDI.bund.de.xml
@@ -0,0 +1,18 @@
+
+
+	
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/BfR.bund.de.xml b/src/chrome/content/rules/BfR.bund.de.xml
new file mode 100644
index 000000000000..044f1e3d5b18
--- /dev/null
+++ b/src/chrome/content/rules/BfR.bund.de.xml
@@ -0,0 +1,41 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Bgm.tv.xml b/src/chrome/content/rules/Bgm.tv.xml
index 33b567f3ff18..d8fbef93bdfb 100644
--- a/src/chrome/content/rules/Bgm.tv.xml
+++ b/src/chrome/content/rules/Bgm.tv.xml
@@ -1,9 +1,18 @@
+
 
+	
+	
 	
 	
 	
 	
 	
+	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Bhiab.se.xml b/src/chrome/content/rules/Bhiab.se.xml
deleted file mode 100644
index 0bb997c9db93..000000000000
--- a/src/chrome/content/rules/Bhiab.se.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-  
-  
-  
-
-
diff --git a/src/chrome/content/rules/BiB.bund.de.xml b/src/chrome/content/rules/BiB.bund.de.xml
new file mode 100644
index 000000000000..c423e07fb595
--- /dev/null
+++ b/src/chrome/content/rules/BiB.bund.de.xml
@@ -0,0 +1,14 @@
+
+
+	
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Biapy.fr.xml b/src/chrome/content/rules/Biapy.fr.xml
index 2d7ffc46e806..6f5221dcb2aa 100644
--- a/src/chrome/content/rules/Biapy.fr.xml
+++ b/src/chrome/content/rules/Biapy.fr.xml
@@ -23,7 +23,7 @@ Fetch error: http://biapy.fr/ => https://biapy.fr/: (51, "SSL: no alternative ce
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Bibbitec.xml b/src/chrome/content/rules/Bibbitec.xml
index a4e218c417bf..51d5339982a3 100644
--- a/src/chrome/content/rules/Bibbitec.xml
+++ b/src/chrome/content/rules/Bibbitec.xml
@@ -5,7 +5,7 @@ Fetch error: http://bibbitec.com/ => https://bibbitec.com/: (28, 'Connection tim
 Fetch error: http://www.bibbitec.com/ => https://www.bibbitec.com/: (28, 'Connection timed out after 20008 milliseconds')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.bibbitec.com/ => https://www.bibbitec.com/: (28, 'Connec
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Bible.com.xml b/src/chrome/content/rules/Bible.com.xml
new file mode 100644
index 000000000000..e1dd6575262d
--- /dev/null
+++ b/src/chrome/content/rules/Bible.com.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/BibleSociety.co.za.xml b/src/chrome/content/rules/BibleSociety.co.za.xml
new file mode 100644
index 000000000000..25276761b305
--- /dev/null
+++ b/src/chrome/content/rules/BibleSociety.co.za.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/BidBubble.com.xml b/src/chrome/content/rules/BidBubble.com.xml
index 9503fead44f3..5faa856fc4f9 100644
--- a/src/chrome/content/rules/BidBubble.com.xml
+++ b/src/chrome/content/rules/BidBubble.com.xml
@@ -23,7 +23,7 @@ Fetch error: http://bidbubble.com/ => https://bidbubble.com/: (51, "SSL: no alte
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Biddeal.xml b/src/chrome/content/rules/Biddeal.xml
index 0292a12f9eef..1fa27895b08a 100644
--- a/src/chrome/content/rules/Biddeal.xml
+++ b/src/chrome/content/rules/Biddeal.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.biddeal.com/ => https://www.biddeal.com/: (60, 'SSL cert
 	^biddeal.com redirects to notset.com over http
 
 -->
-
+
 
 	
 
@@ -16,4 +16,4 @@ Fetch error: http://www.biddeal.com/ => https://www.biddeal.com/: (60, 'SSL cert
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Bidtellect.com.xml b/src/chrome/content/rules/Bidtellect.com.xml
index bff4c36b7124..0f2bfef1570a 100644
--- a/src/chrome/content/rules/Bidtellect.com.xml
+++ b/src/chrome/content/rules/Bidtellect.com.xml
@@ -23,7 +23,7 @@ Fetch error: http://bidtellect.com/ => https://bidtellect.com/: (7, 'Failed to c
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Big-Cartel.xml b/src/chrome/content/rules/Big-Cartel.xml
deleted file mode 100644
index c6ca64b0e7a1..000000000000
--- a/src/chrome/content/rules/Big-Cartel.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Big-Change.xml b/src/chrome/content/rules/Big-Change.xml
index b505d4268526..c12aaf230b52 100644
--- a/src/chrome/content/rules/Big-Change.xml
+++ b/src/chrome/content/rules/Big-Change.xml
@@ -3,7 +3,7 @@
 	
 	
 	
-	
+
 
 
 	
diff --git a/src/chrome/content/rules/BigCartel.com.xml b/src/chrome/content/rules/BigCartel.com.xml
new file mode 100644
index 000000000000..b017f64dfd67
--- /dev/null
+++ b/src/chrome/content/rules/BigCartel.com.xml
@@ -0,0 +1,21 @@
+
+
+	
+	
+	
+		
+		
+		
+	
+		
+			
+	
+		
+		
+		
+		
+
+	
+
+
diff --git a/src/chrome/content/rules/BigHugeLabs.xml b/src/chrome/content/rules/BigHugeLabs.xml
index 7dad49cd1a0e..4dc9a38d6488 100644
--- a/src/chrome/content/rules/BigHugeLabs.xml
+++ b/src/chrome/content/rules/BigHugeLabs.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/BigV.io.xml b/src/chrome/content/rules/BigV.io.xml
index 5881b0fc762c..23957a698444 100644
--- a/src/chrome/content/rules/BigV.io.xml
+++ b/src/chrome/content/rules/BigV.io.xml
@@ -6,7 +6,7 @@ Fetch error: http://manager.bigv.io/ => https://manager.bigv.io/: (7, 'Failed to
 	For other Bytemark Hosting coverage, see Bytemark.co.uk.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Big_Brother_Watch.xml b/src/chrome/content/rules/Big_Brother_Watch.xml
index 8d674f0c7bb2..3d3e6abdac7a 100644
--- a/src/chrome/content/rules/Big_Brother_Watch.xml
+++ b/src/chrome/content/rules/Big_Brother_Watch.xml
@@ -12,7 +12,7 @@
 
 
 	
-	
+	
 
 
 	
-
+
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Bigjocker.com.xml b/src/chrome/content/rules/Bigjocker.com.xml
index 9efeaed5e6d1..715a2bed9ff9 100644
--- a/src/chrome/content/rules/Bigjocker.com.xml
+++ b/src/chrome/content/rules/Bigjocker.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://bigjocker.com/ => https://bigjocker.com/: (35, 'error:140770
 Fetch error: http://www.bigjocker.com/ => https://www.bigjocker.com/: (35, 'error:140770FC:SSL routines:SSL23_GET_SERVER_HELLO:unknown protocol')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Bigmir.net-falsemixed.xml b/src/chrome/content/rules/Bigmir.net-falsemixed.xml
index cbff8e65f734..306449b5b62e 100644
--- a/src/chrome/content/rules/Bigmir.net-falsemixed.xml
+++ b/src/chrome/content/rules/Bigmir.net-falsemixed.xml
@@ -22,13 +22,23 @@
 -->
 
 
-	
-
-
-	
-
-
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
 
 
diff --git a/src/chrome/content/rules/Bigmirnet.xml b/src/chrome/content/rules/Bigmirnet.xml
index 2929e459dc76..b48b34056a53 100644
--- a/src/chrome/content/rules/Bigmirnet.xml
+++ b/src/chrome/content/rules/Bigmirnet.xml
@@ -109,7 +109,7 @@ Fetch error: http://s.bigmir.net/ => https://s.bigmir.net/: (7, 'Failed to conne
 	⁵ Unsecurable <= reset
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Bigstock.xml b/src/chrome/content/rules/Bigstock.xml
index a452615061f6..21b9a0e2400f 100644
--- a/src/chrome/content/rules/Bigstock.xml
+++ b/src/chrome/content/rules/Bigstock.xml
@@ -21,7 +21,7 @@
 		static6.bigstockphoto.com
 			
 		static7.bigstockphoto.com
-				
+			
 		static8.bigstockphoto.com
 			
 		static9.bigstockphoto.com
diff --git a/src/chrome/content/rules/Biicode.com.xml b/src/chrome/content/rules/Biicode.com.xml
index e6bebb3e5f49..9be480f5df34 100644
--- a/src/chrome/content/rules/Biicode.com.xml
+++ b/src/chrome/content/rules/Biicode.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.biicode.com/ => https://www.biicode.com/: (28, 'Connecti
 	^: Refused
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Bikeji.com.xml b/src/chrome/content/rules/Bikeji.com.xml
index 8d4e13eb2ef6..0a6dd5888c84 100644
--- a/src/chrome/content/rules/Bikeji.com.xml
+++ b/src/chrome/content/rules/Bikeji.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://bikeji.com/ => https://bikeji.com/: (7, 'Failed to connect t
 Fetch error: http://www.bikeji.com/ => https://www.bikeji.com/: (7, 'Failed to connect to www.bikeji.com port 443: Connection refused')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/BilBasen.dk.xml b/src/chrome/content/rules/BilBasen.dk.xml
new file mode 100644
index 000000000000..fc6797075152
--- /dev/null
+++ b/src/chrome/content/rules/BilBasen.dk.xml
@@ -0,0 +1,38 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Bild.de.xml b/src/chrome/content/rules/Bild.de.xml
index ab8291313f16..b7bda52e1627 100644
--- a/src/chrome/content/rules/Bild.de.xml
+++ b/src/chrome/content/rules/Bild.de.xml
@@ -69,6 +69,6 @@
 		to="https://www.fagms.net/" />
 
 	
-		
+
 
 
diff --git a/src/chrome/content/rules/Bilio.com.xml b/src/chrome/content/rules/Bilio.com.xml
index fd733381a6cf..50ba4e76e01a 100644
--- a/src/chrome/content/rules/Bilio.com.xml
+++ b/src/chrome/content/rules/Bilio.com.xml
@@ -18,7 +18,7 @@ Fetch error: http://bilio.com/ => https://www.bilio.com/: (60, 'SSL certificate
 	* Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Bill.ovh.xml b/src/chrome/content/rules/Bill.ovh.xml
deleted file mode 100644
index 0b34d759ac9a..000000000000
--- a/src/chrome/content/rules/Bill.ovh.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/BillDesk.com.xml b/src/chrome/content/rules/BillDesk.com.xml
index a27d865f35fa..22ffe96d6325 100644
--- a/src/chrome/content/rules/BillDesk.com.xml
+++ b/src/chrome/content/rules/BillDesk.com.xml
@@ -1,7 +1,7 @@
 
-
+
 
 	
diff --git a/src/chrome/content/rules/Bill_Maher.com.xml b/src/chrome/content/rules/Bill_Maher.com.xml
index b0a141447571..e5487a76b01d 100644
--- a/src/chrome/content/rules/Bill_Maher.com.xml
+++ b/src/chrome/content/rules/Bill_Maher.com.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://billmaher.com/ => https://billmaher.com/: (28, 'Connection timed out after 10001 milliseconds')
 Fetch error: http://www.billmaher.com/ => https://www.billmaher.com/: (28, 'Connection timed out after 10000 milliseconds')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Billboard.com.xml b/src/chrome/content/rules/Billboard.com.xml
index a8070adec7de..f9ad19da02bd 100644
--- a/src/chrome/content/rules/Billboard.com.xml
+++ b/src/chrome/content/rules/Billboard.com.xml
@@ -10,7 +10,7 @@
 		mobileapi.billboard.com
 		pro.billboard.com
 		qa.billboard.com
-	
+
 	Invalid certificate:
 		features.billboard.com
 		link.billboard.com
@@ -19,10 +19,10 @@
 
 	Time out:
 		m.billboard.com
-	
+
 	Refused:
 		mobile.billboard.com
-	
+
 	Different content http/https:
 		realtime.billboard.com
 
diff --git a/src/chrome/content/rules/BilletNet.dk.xml b/src/chrome/content/rules/BilletNet.dk.xml
deleted file mode 100644
index d9cd0a86e98a..000000000000
--- a/src/chrome/content/rules/BilletNet.dk.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Billetten.dk.xml b/src/chrome/content/rules/Billetten.dk.xml
index 269e052a05dd..e1cabc84e461 100644
--- a/src/chrome/content/rules/Billetten.dk.xml
+++ b/src/chrome/content/rules/Billetten.dk.xml
@@ -3,6 +3,6 @@
 	
 
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Billiger.de.xml b/src/chrome/content/rules/Billiger.de.xml
index a16fff5eb79d..68cd498dc1e6 100644
--- a/src/chrome/content/rules/Billiger.de.xml
+++ b/src/chrome/content/rules/Billiger.de.xml
@@ -10,7 +10,8 @@
 
 
 	
-	
+	
+	
 
 
 	
-
+
 
 	
diff --git a/src/chrome/content/rules/Billiongraves.com.xml b/src/chrome/content/rules/Billiongraves.com.xml
index 63ccf624eaff..dc270578f085 100644
--- a/src/chrome/content/rules/Billiongraves.com.xml
+++ b/src/chrome/content/rules/Billiongraves.com.xml
@@ -18,7 +18,6 @@
 	
 	
 
-	
 	
 	
 	
diff --git a/src/chrome/content/rules/Billund.dk.xml b/src/chrome/content/rules/Billund.dk.xml
index 74f2b30ee37e..bf30e1b7b23f 100644
--- a/src/chrome/content/rules/Billund.dk.xml
+++ b/src/chrome/content/rules/Billund.dk.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.billund.dk/ => https://www.billund.dk/: Too many redirec
 
 -->
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Bin-Store.com.xml b/src/chrome/content/rules/Bin-Store.com.xml
index 77bc43b2edc4..1e8b6b63949d 100644
--- a/src/chrome/content/rules/Bin-Store.com.xml
+++ b/src/chrome/content/rules/Bin-Store.com.xml
@@ -1,13 +1,13 @@
 
 
 	
-	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/BinBayyah.net.xml b/src/chrome/content/rules/BinBayyah.net.xml
new file mode 100644
index 000000000000..a22481f46643
--- /dev/null
+++ b/src/chrome/content/rules/BinBayyah.net.xml
@@ -0,0 +1,23 @@
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/BinSearch.xml b/src/chrome/content/rules/BinSearch.xml
index c676647a68b2..faebb1f13b9f 100644
--- a/src/chrome/content/rules/BinSearch.xml
+++ b/src/chrome/content/rules/BinSearch.xml
@@ -15,7 +15,7 @@
 	
 
-	
 
 
diff --git a/src/chrome/content/rules/BinaryTurf.xml b/src/chrome/content/rules/BinaryTurf.xml
index 5545beac7cc8..53983aaf3f4e 100644
--- a/src/chrome/content/rules/BinaryTurf.xml
+++ b/src/chrome/content/rules/BinaryTurf.xml
@@ -12,7 +12,7 @@
 					-->
 	
 
-  
+  
 
 	
diff --git a/src/chrome/content/rules/BioMedCentral.com.xml b/src/chrome/content/rules/BioMedCentral.com.xml
index 472a631d9164..db711003f364 100644
--- a/src/chrome/content/rules/BioMedCentral.com.xml
+++ b/src/chrome/content/rules/BioMedCentral.com.xml
@@ -361,7 +361,7 @@
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/BioOne.org.xml b/src/chrome/content/rules/BioOne.org.xml
new file mode 100644
index 000000000000..54127ae6302f
--- /dev/null
+++ b/src/chrome/content/rules/BioOne.org.xml
@@ -0,0 +1,34 @@
+
+
+
+	
+	
+
+	
+	
+
+	
+
+		
+		
+		
+		
+		
+		
+
+
diff --git a/src/chrome/content/rules/BioWare.xml b/src/chrome/content/rules/BioWare.xml
index 62154dd2e0f4..851b20d84a81 100644
--- a/src/chrome/content/rules/BioWare.xml
+++ b/src/chrome/content/rules/BioWare.xml
@@ -1,48 +1,21 @@
-
 
-
 
-	
+
 	
 	
-	
-
+	
 
 	
 
-
-
-	
-
-	
-	
-
-	
-	
-
+	
 
diff --git a/src/chrome/content/rules/BioXFEL.org.xml b/src/chrome/content/rules/BioXFEL.org.xml
deleted file mode 100644
index e05297db728a..000000000000
--- a/src/chrome/content/rules/BioXFEL.org.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Biocubafarma.cu.xml b/src/chrome/content/rules/Biocubafarma.cu.xml
new file mode 100644
index 000000000000..de11abe32f62
--- /dev/null
+++ b/src/chrome/content/rules/Biocubafarma.cu.xml
@@ -0,0 +1,28 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Biofitt.com.xml b/src/chrome/content/rules/Biofitt.com.xml
index 0bd94db63c5a..1c9b860029e8 100644
--- a/src/chrome/content/rules/Biofitt.com.xml
+++ b/src/chrome/content/rules/Biofitt.com.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Biologo.ru.xml b/src/chrome/content/rules/Biologo.ru.xml
new file mode 100644
index 000000000000..4f196d02d838
--- /dev/null
+++ b/src/chrome/content/rules/Biologo.ru.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Bip.IO.xml b/src/chrome/content/rules/Bip.IO.xml
deleted file mode 100644
index 943876795606..000000000000
--- a/src/chrome/content/rules/Bip.IO.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Biqle.ru.xml b/src/chrome/content/rules/Biqle.ru.xml
deleted file mode 100644
index 0954b89930c8..000000000000
--- a/src/chrome/content/rules/Biqle.ru.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Bircko.com.xml b/src/chrome/content/rules/Bircko.com.xml
index 2354924d1ce0..624052de544b 100644
--- a/src/chrome/content/rules/Bircko.com.xml
+++ b/src/chrome/content/rules/Bircko.com.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/BirdLife.org.xml b/src/chrome/content/rules/BirdLife.org.xml
index 5f82076296bc..a354c9ef0033 100644
--- a/src/chrome/content/rules/BirdLife.org.xml
+++ b/src/chrome/content/rules/BirdLife.org.xml
@@ -1,6 +1,6 @@
 
+
+
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/BitCalm.com.xml b/src/chrome/content/rules/BitCalm.com.xml
index a1b524390a61..fe85ff0b297f 100644
--- a/src/chrome/content/rules/BitCalm.com.xml
+++ b/src/chrome/content/rules/BitCalm.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.bitcalm.com/ => https://www.bitcalm.com/: (6, 'Could not
 		- bitcalm.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/BitFlyer.jp.xml b/src/chrome/content/rules/BitFlyer.jp.xml
index 82d79b822920..03f284643032 100644
--- a/src/chrome/content/rules/BitFlyer.jp.xml
+++ b/src/chrome/content/rules/BitFlyer.jp.xml
@@ -42,7 +42,7 @@
 	
 	
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/BitHubLab.org.xml b/src/chrome/content/rules/BitHubLab.org.xml
new file mode 100644
index 000000000000..f3e7a4ee389c
--- /dev/null
+++ b/src/chrome/content/rules/BitHubLab.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/BitInstant.xml b/src/chrome/content/rules/BitInstant.xml
index 61388104b016..e40cb78a4d72 100644
--- a/src/chrome/content/rules/BitInstant.xml
+++ b/src/chrome/content/rules/BitInstant.xml
@@ -11,7 +11,7 @@ Fetch error: http://bitinstant.com/ => https://bitinstant.com/: (6, 'Could not r
 		- blog		(some [most?] pages redirect to http)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/BitKeeper.org.xml b/src/chrome/content/rules/BitKeeper.org.xml
new file mode 100644
index 000000000000..c78a08e7106d
--- /dev/null
+++ b/src/chrome/content/rules/BitKeeper.org.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/BitMarket.pl.xml b/src/chrome/content/rules/BitMarket.pl.xml
deleted file mode 100644
index 7bbced346e41..000000000000
--- a/src/chrome/content/rules/BitMarket.pl.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/BitMissile.xml b/src/chrome/content/rules/BitMissile.xml
index 66a8d1d0f5ef..5476c2f99f64 100644
--- a/src/chrome/content/rules/BitMissile.xml
+++ b/src/chrome/content/rules/BitMissile.xml
@@ -10,7 +10,7 @@ Fetch error: http://live.bitmissile.com/ => https://live.bitmissile.com/: (6, 'C
 	For problematic rules, see BitMissile-mismatches.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/BitNZ.com.xml b/src/chrome/content/rules/BitNZ.com.xml
index c415a2fca7ea..6c4a46d7cdb4 100644
--- a/src/chrome/content/rules/BitNZ.com.xml
+++ b/src/chrome/content/rules/BitNZ.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.bitnz.com/ => https://www.bitnz.com/: (28, 'Connection t
 		- www.bitnz.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/BitQuick.xml b/src/chrome/content/rules/BitQuick.xml
index 7b640d33490d..aa385cdfddfd 100644
--- a/src/chrome/content/rules/BitQuick.xml
+++ b/src/chrome/content/rules/BitQuick.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.bitquick.tw/ => https://www.bitquick.tw/: (6, 'Could not
 		- www.bitquick.co
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/BitRock-mismatches.xml b/src/chrome/content/rules/BitRock-mismatches.xml
index 73e6fb335e02..9bd00128ced7 100644
--- a/src/chrome/content/rules/BitRock-mismatches.xml
+++ b/src/chrome/content/rules/BitRock-mismatches.xml
@@ -1,7 +1,8 @@
 
 
 	
-	
+	
+	
 
 	
diff --git a/src/chrome/content/rules/BitRock.xml b/src/chrome/content/rules/BitRock.xml
index fdfbdbe2081d..766585176f87 100644
--- a/src/chrome/content/rules/BitRock.xml
+++ b/src/chrome/content/rules/BitRock.xml
@@ -6,17 +6,17 @@ Fetch error: http://bitnamihosting.com/ => https://bitnamihosting.com/: (51, "SS
 Disabled by https-everywhere-checker because:
 Fetch error: http://bitnamihosting.com/ => https://bitnamihosting.com/: (51, "SSL: no alternative certificate subject name matches target host name 'bitnamihosting.com'")
 -->
-
+
 
 	
-	
+	
+	
 
 	
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/BitVC.com.xml b/src/chrome/content/rules/BitVC.com.xml
index 73f4996520e7..f4302e66d237 100644
--- a/src/chrome/content/rules/BitVC.com.xml
+++ b/src/chrome/content/rules/BitVC.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://bitvc.com/ => https://bitvc.com/: (7, 'Failed to connect to
 		- .www.bitvc.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/BitYes.com.xml b/src/chrome/content/rules/BitYes.com.xml
index cc408ebc0ea8..cdcf1996eb10 100644
--- a/src/chrome/content/rules/BitYes.com.xml
+++ b/src/chrome/content/rules/BitYes.com.xml
@@ -16,7 +16,7 @@ Fetch error: http://www.bityes.com/ => https://www.bityes.com/: (60, 'SSL certif
 		- .bityes.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Bitbucket-mismatches.xml b/src/chrome/content/rules/Bitbucket-mismatches.xml
deleted file mode 100644
index 8b8e360dbfb1..000000000000
--- a/src/chrome/content/rules/Bitbucket-mismatches.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Bitbucket.xml b/src/chrome/content/rules/Bitbucket.xml
deleted file mode 100644
index 2cc8a4c86b92..000000000000
--- a/src/chrome/content/rules/Bitbucket.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-	
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Bitch_Magazine.org.xml b/src/chrome/content/rules/Bitch_Magazine.org.xml
index 1b427ea582f4..6a549cd4514d 100644
--- a/src/chrome/content/rules/Bitch_Magazine.org.xml
+++ b/src/chrome/content/rules/Bitch_Magazine.org.xml
@@ -29,7 +29,7 @@ Fetch error: http://www.bitchmagazine.org/ => https://bitchmagazine.org/: (51, "
 	² Unsecurable <= 522
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Bitcoin-Contact.org.xml b/src/chrome/content/rules/Bitcoin-Contact.org.xml
index 02bce55ae1d0..698e7eb87d59 100644
--- a/src/chrome/content/rules/Bitcoin-Contact.org.xml
+++ b/src/chrome/content/rules/Bitcoin-Contact.org.xml
@@ -8,7 +8,7 @@ Fetch error: http://mail.bitcoin-contact.org/ => https://mail.bitcoin-contact.or
 	Mixed Content Blocking (MCB) tiggered:
 		- bitcoin-contact.org
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Bitcoin-VPS.xml b/src/chrome/content/rules/Bitcoin-VPS.xml
deleted file mode 100644
index 9aea597511a5..000000000000
--- a/src/chrome/content/rules/Bitcoin-VPS.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Bitcoin-Wiki.xml b/src/chrome/content/rules/Bitcoin-Wiki.xml
index 0014ca218204..1ca523c430a2 100644
--- a/src/chrome/content/rules/Bitcoin-Wiki.xml
+++ b/src/chrome/content/rules/Bitcoin-Wiki.xml
@@ -28,7 +28,7 @@ Fetch error: http://www.bitcoin.in/ => https://www.bitcoin.in/: (28, 'Connection
 			- en
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Bitcoin-laundry.com.xml b/src/chrome/content/rules/Bitcoin-laundry.com.xml
new file mode 100644
index 000000000000..0bafe950fcba
--- /dev/null
+++ b/src/chrome/content/rules/Bitcoin-laundry.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Bitcoin.Co.th.xml b/src/chrome/content/rules/Bitcoin.Co.th.xml
deleted file mode 100644
index 91f310b088ed..000000000000
--- a/src/chrome/content/rules/Bitcoin.Co.th.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Bitcoin.pl.xml b/src/chrome/content/rules/Bitcoin.pl.xml
index 178339ff7cac..508a8f797590 100644
--- a/src/chrome/content/rules/Bitcoin.pl.xml
+++ b/src/chrome/content/rules/Bitcoin.pl.xml
@@ -18,7 +18,7 @@ Fetch error: http://www.bitcoin.pl/ => https://www.bitcoin.pl/: (60, 'SSL certif
 		- .forum.bitcoin.pl
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/BitcoinPool.xml b/src/chrome/content/rules/BitcoinPool.xml
index 79031ce013da..ef9517ff3c48 100644
--- a/src/chrome/content/rules/BitcoinPool.xml
+++ b/src/chrome/content/rules/BitcoinPool.xml
@@ -10,7 +10,7 @@
 	
 
 
-	
+	
 
 
 	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/BitcoinXT.software.xml b/src/chrome/content/rules/BitcoinXT.software.xml
deleted file mode 100644
index d398bdb48be0..000000000000
--- a/src/chrome/content/rules/BitcoinXT.software.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Bitcoin_Foundation.org.xml b/src/chrome/content/rules/Bitcoin_Foundation.org.xml
deleted file mode 100644
index 4ca532d52abb..000000000000
--- a/src/chrome/content/rules/Bitcoin_Foundation.org.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Bitcoin_Plus.xml b/src/chrome/content/rules/Bitcoin_Plus.xml
index 4217714f229b..80530b644c18 100644
--- a/src/chrome/content/rules/Bitcoin_Plus.xml
+++ b/src/chrome/content/rules/Bitcoin_Plus.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Bitcoinmixer.org.xml b/src/chrome/content/rules/Bitcoinmixer.org.xml
new file mode 100644
index 000000000000..1fe7096eeb9a
--- /dev/null
+++ b/src/chrome/content/rules/Bitcoinmixer.org.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/BitcointoYou.com.xml b/src/chrome/content/rules/BitcointoYou.com.xml
index 2fc96378959a..e5002c9de766 100644
--- a/src/chrome/content/rules/BitcointoYou.com.xml
+++ b/src/chrome/content/rules/BitcointoYou.com.xml
@@ -19,7 +19,7 @@
 	
 	
 
-	
+	
 
 
 	 https://www.bitcurex.com/: (28, 'Operat
 		- pln
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Bitdeli.com.xml b/src/chrome/content/rules/Bitdeli.com.xml
index 9bbff56da9b9..f819289f7429 100644
--- a/src/chrome/content/rules/Bitdeli.com.xml
+++ b/src/chrome/content/rules/Bitdeli.com.xml
@@ -4,16 +4,14 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://bitdeli.com/ => https://bitdeli.com/: (28, 'Connection timed out after 20000 milliseconds')
 
 -->
-
+
 
 	
-	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Bite.lt.xml b/src/chrome/content/rules/Bite.lt.xml
index 53c9a153f4b5..b4bf910e6dbd 100644
--- a/src/chrome/content/rules/Bite.lt.xml
+++ b/src/chrome/content/rules/Bite.lt.xml
@@ -4,7 +4,7 @@
 		- sms.bite.lt *
 		- soap.bite.lt **
 		- wap.bite.lt **
-	
+
 	* mismatched cert
 	** connection times out/is refused/fails on HTTPS
 -->
@@ -14,7 +14,7 @@
 	
 	
 	
-		
+
 	
 
diff --git a/src/chrome/content/rules/Biteasy.com.xml b/src/chrome/content/rules/Biteasy.com.xml
deleted file mode 100644
index b36cd0f3ea8c..000000000000
--- a/src/chrome/content/rules/Biteasy.com.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Bitfun.co.xml b/src/chrome/content/rules/Bitfun.co.xml
new file mode 100644
index 000000000000..6e460b78dc7b
--- /dev/null
+++ b/src/chrome/content/rules/Bitfun.co.xml
@@ -0,0 +1,5 @@
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/Bitinvest.com.br.xml b/src/chrome/content/rules/Bitinvest.com.br.xml
index b5e04c3dac8d..02d8585514a7 100644
--- a/src/chrome/content/rules/Bitinvest.com.br.xml
+++ b/src/chrome/content/rules/Bitinvest.com.br.xml
@@ -20,7 +20,7 @@ Fetch error: http://developers.bitinvest.com.br/ => https://developers.bitinvest
 		- www.bitinvest.com.br
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Bitlove.xml b/src/chrome/content/rules/Bitlove.xml
deleted file mode 100644
index e1aac9e740b1..000000000000
--- a/src/chrome/content/rules/Bitlove.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Bitly.xml b/src/chrome/content/rules/Bitly.xml
index c00b06f72731..7cd903a6e927 100644
--- a/src/chrome/content/rules/Bitly.xml
+++ b/src/chrome/content/rules/Bitly.xml
@@ -6,21 +6,22 @@
 		- Bitly_branded_short_domains.xml
 
 
-	Insecure cookies are set for these domains:
-
-		- .bit.ly
+	Non-functional hosts:
+		Certificate misatched:
+		- pix.bit.ly
+		- www.bit.ly
 
 -->
 
 	
-	
 	
-
-	
-	
+	
 
 	
 
+	
+
 	
 
 
diff --git a/src/chrome/content/rules/Bitly_branded_short_domains.xml b/src/chrome/content/rules/Bitly_branded_short_domains.xml
index 86b4b9b8c0ca..93fd0c95e97d 100644
--- a/src/chrome/content/rules/Bitly_branded_short_domains.xml
+++ b/src/chrome/content/rules/Bitly_branded_short_domains.xml
@@ -94,7 +94,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -2272,7 +2271,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -2827,7 +2825,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -7500,7 +7497,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -10516,7 +10512,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -10861,7 +10856,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -10944,7 +10938,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -10968,7 +10961,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -11116,7 +11108,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -11149,7 +11140,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -11268,7 +11258,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -11640,7 +11629,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -11904,7 +11892,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -12093,7 +12080,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -13737,7 +13723,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -15717,7 +15702,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -16536,7 +16520,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -16547,7 +16530,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -16571,7 +16553,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -16646,7 +16627,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -17824,7 +17804,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -18061,7 +18040,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -18118,7 +18096,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -18363,7 +18340,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -19471,7 +19447,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -21060,7 +21035,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -21957,7 +21931,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -22438,7 +22411,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -22637,10 +22609,8 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
-	
 	
 	
 	
@@ -22681,7 +22651,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -24752,7 +24721,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -26261,7 +26229,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -26278,7 +26245,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -26392,7 +26358,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -26460,7 +26425,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -26510,7 +26474,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -26664,7 +26627,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -26725,7 +26687,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -26733,11 +26694,9 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
-	
 	
 	
 	
@@ -27697,7 +27656,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -28455,7 +28413,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -29653,7 +29610,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -31838,7 +31794,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -32341,7 +32296,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -34161,7 +34115,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
@@ -34228,7 +34181,6 @@ This file generated by Bitly on Fri, 10 Nov 2017 17:24:38 UTC
 	
 	
 	
-	
 	
 	
 	
diff --git a/src/chrome/content/rules/Bitmain.com.xml b/src/chrome/content/rules/Bitmain.com.xml
index 8b9c978cd3c0..e76e4dd6a761 100644
--- a/src/chrome/content/rules/Bitmain.com.xml
+++ b/src/chrome/content/rules/Bitmain.com.xml
@@ -16,7 +16,7 @@ Fetch error: http://support.bitmain.com/ => https://support.bitmain.com/: (51, "
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Bitmain_Tech.com.xml b/src/chrome/content/rules/Bitmain_Tech.com.xml
deleted file mode 100644
index 54350af9239e..000000000000
--- a/src/chrome/content/rules/Bitmain_Tech.com.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Bitmask.net.xml b/src/chrome/content/rules/Bitmask.net.xml
index 1121525a369b..78941f8cf638 100644
--- a/src/chrome/content/rules/Bitmask.net.xml
+++ b/src/chrome/content/rules/Bitmask.net.xml
@@ -12,7 +12,7 @@ Fetch error: http://api.demo.bitmask.net/ => https://api.demo.bitmask.net/: (51,
     - unstable.bitmask.net
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Bitmazk.com.xml b/src/chrome/content/rules/Bitmazk.com.xml
index 39185d6cd7f9..2c248befb944 100644
--- a/src/chrome/content/rules/Bitmazk.com.xml
+++ b/src/chrome/content/rules/Bitmazk.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.bitmazk.com/ => https://www.bitmazk.com/: (60, 'SSL cert
 		- bitmazk.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Bitso.com.xml b/src/chrome/content/rules/Bitso.com.xml
deleted file mode 100644
index 700eeb4f74f3..000000000000
--- a/src/chrome/content/rules/Bitso.com.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Bittiraha.fi.xml b/src/chrome/content/rules/Bittiraha.fi.xml
deleted file mode 100644
index bc1ef5a9e707..000000000000
--- a/src/chrome/content/rules/Bittiraha.fi.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Bittorrent.org.xml b/src/chrome/content/rules/Bittorrent.org.xml
index e350307f0643..13145517680f 100644
--- a/src/chrome/content/rules/Bittorrent.org.xml
+++ b/src/chrome/content/rules/Bittorrent.org.xml
@@ -1,8 +1,13 @@
-
-
+
+
 	
 	
 
-	
-
+	 
+	
 
diff --git a/src/chrome/content/rules/Bivol.xml b/src/chrome/content/rules/Bivol.xml
index 09d62751076b..66e5dadd822a 100644
--- a/src/chrome/content/rules/Bivol.xml
+++ b/src/chrome/content/rules/Bivol.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Bizrate.com.xml b/src/chrome/content/rules/Bizrate.com.xml
index da2265554d8c..db40f8fb3277 100644
--- a/src/chrome/content/rules/Bizrate.com.xml
+++ b/src/chrome/content/rules/Bizrate.com.xml
@@ -41,7 +41,7 @@ Fetch error: http://adverising.bizrate.com/ => https://adverising.bizrate.com/:
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Bizshark.xml b/src/chrome/content/rules/Bizshark.xml
index 2dce79096b6e..e277290d1557 100644
--- a/src/chrome/content/rules/Bizshark.xml
+++ b/src/chrome/content/rules/Bizshark.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/BlackDiamondEquipment.com.xml b/src/chrome/content/rules/BlackDiamondEquipment.com.xml
new file mode 100644
index 000000000000..ac7cf5f1a2af
--- /dev/null
+++ b/src/chrome/content/rules/BlackDiamondEquipment.com.xml
@@ -0,0 +1,43 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+		
+
+	
+
diff --git a/src/chrome/content/rules/BlackMesh.com.xml b/src/chrome/content/rules/BlackMesh.com.xml
index dad273505f8b..7bd92c2b5f12 100644
--- a/src/chrome/content/rules/BlackMesh.com.xml
+++ b/src/chrome/content/rules/BlackMesh.com.xml
@@ -13,7 +13,11 @@ Fetch error: http://blackmesh.com/ => https://www.blackmesh.com/: Cycle detected
 
 
 	
-	
+	
+	
+	
+	
+	
 
 
 	
@@ -31,7 +35,6 @@ Fetch error: http://blackmesh.com/ => https://www.blackmesh.com/: Cycle detected
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/BlackPearl_PDM.com.xml b/src/chrome/content/rules/BlackPearl_PDM.com.xml
index d3ae2900049d..2770c479d183 100644
--- a/src/chrome/content/rules/BlackPearl_PDM.com.xml
+++ b/src/chrome/content/rules/BlackPearl_PDM.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://blackpearlpdm.com/ => https://blackpearlpdm.com/: (28, 'Conn
 Fetch error: http://www.blackpearlpdm.com/ => https://www.blackpearlpdm.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.blackpearlpdm.com'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/BlackTonic.com.xml b/src/chrome/content/rules/BlackTonic.com.xml
index cf8a21421cdb..3e514861764d 100644
--- a/src/chrome/content/rules/BlackTonic.com.xml
+++ b/src/chrome/content/rules/BlackTonic.com.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/BlackVPN.xml b/src/chrome/content/rules/BlackVPN.xml
index 0762523a7888..6996f826d9cd 100644
--- a/src/chrome/content/rules/BlackVPN.xml
+++ b/src/chrome/content/rules/BlackVPN.xml
@@ -9,7 +9,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/BlackZNC.net.xml b/src/chrome/content/rules/BlackZNC.net.xml
deleted file mode 100644
index 2d60b4d7cc15..000000000000
--- a/src/chrome/content/rules/BlackZNC.net.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Black_Duck_Software.com.xml b/src/chrome/content/rules/Black_Duck_Software.com.xml
index 6add39a855fb..5042051d7a4d 100644
--- a/src/chrome/content/rules/Black_Duck_Software.com.xml
+++ b/src/chrome/content/rules/Black_Duck_Software.com.xml
@@ -28,7 +28,10 @@
 
 
 	
-	
+	
+	
+	
+	
 		
@@ -38,8 +41,7 @@
 	
 
-	
 
+	
 
 
diff --git a/src/chrome/content/rules/Black_Lotus.xml b/src/chrome/content/rules/Black_Lotus.xml
index 48fbaecaa523..6bda209dad67 100644
--- a/src/chrome/content/rules/Black_Lotus.xml
+++ b/src/chrome/content/rules/Black_Lotus.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.blacklotus.net/ => https://www.blacklotus.net/: (51, "SSL: no alternative certificate subject name matches target host name 'www.blacklotus.net'")
 
 -->
-
+
 
 	
 	
@@ -12,4 +12,4 @@ Fetch error: http://www.blacklotus.net/ => https://www.blacklotus.net/: (51, "SS
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Blackberry.xml b/src/chrome/content/rules/Blackberry.xml
index 389ce08ec7b1..efc3f7c39a65 100644
--- a/src/chrome/content/rules/Blackberry.xml
+++ b/src/chrome/content/rules/Blackberry.xml
@@ -62,7 +62,7 @@ Fetch error: http://developerforums.blackberry.com/ => https://supportforums.bla
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Blackboard.xml b/src/chrome/content/rules/Blackboard.xml
index b5a99f143af6..23e1fc4589d2 100644
--- a/src/chrome/content/rules/Blackboard.xml
+++ b/src/chrome/content/rules/Blackboard.xml
@@ -1,12 +1,17 @@
+
 
 	
-	
+	
 	
 	
 
-	
-	
-
-
 	
 
-
 	
 
diff --git a/src/chrome/content/rules/Blackfire.io.xml b/src/chrome/content/rules/Blackfire.io.xml
deleted file mode 100644
index 340414362763..000000000000
--- a/src/chrome/content/rules/Blackfire.io.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-    
-    
-
-    
-
-    
-
diff --git a/src/chrome/content/rules/Blackfoot.co.uk.xml b/src/chrome/content/rules/Blackfoot.co.uk.xml
index b941f6aca160..57a4e5857e1b 100644
--- a/src/chrome/content/rules/Blackfoot.co.uk.xml
+++ b/src/chrome/content/rules/Blackfoot.co.uk.xml
@@ -6,7 +6,6 @@ Fetch error: http://www.blackfoot.co.uk/ => https://www.blackfoot.co.uk/: (60, '
 
 	Other Blackfoot Hosting rulesets:
 
-		- Secureuk.net.xml
 
 
 	Mixed content:
@@ -18,7 +17,7 @@ Fetch error: http://www.blackfoot.co.uk/ => https://www.blackfoot.co.uk/: (60, '
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Blacknight-Internet-Solutions.xml b/src/chrome/content/rules/Blacknight-Internet-Solutions.xml
index 3dde00808879..5f73c7d30f7e 100644
--- a/src/chrome/content/rules/Blacknight-Internet-Solutions.xml
+++ b/src/chrome/content/rules/Blacknight-Internet-Solutions.xml
@@ -18,13 +18,15 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
 
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/BlamBot.com.xml b/src/chrome/content/rules/BlamBot.com.xml
new file mode 100644
index 000000000000..03661dae382a
--- /dev/null
+++ b/src/chrome/content/rules/BlamBot.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Blau.de.xml b/src/chrome/content/rules/Blau.de.xml
index 7995042786fc..5f56623f8a3d 100644
--- a/src/chrome/content/rules/Blau.de.xml
+++ b/src/chrome/content/rules/Blau.de.xml
@@ -16,7 +16,7 @@
 	
 
 
-	
+	
 
 
 	
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Blazing-Thyme.xml b/src/chrome/content/rules/Blazing-Thyme.xml
index af0c238b7e7b..fdb40ef5e240 100644
--- a/src/chrome/content/rules/Blazing-Thyme.xml
+++ b/src/chrome/content/rules/Blazing-Thyme.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.blazingthyme.com/ => https://www.blazingthyme.com/: (28,
 	shop.blazingthyme.com is handled in Nexternal-clients.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Blazonco.com.xml b/src/chrome/content/rules/Blazonco.com.xml
index 759a818f6c27..0b38a88e72bb 100644
--- a/src/chrome/content/rules/Blazonco.com.xml
+++ b/src/chrome/content/rules/Blazonco.com.xml
@@ -14,10 +14,10 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Blekko.xml b/src/chrome/content/rules/Blekko.xml
deleted file mode 100644
index 4b1689bdb7dd..000000000000
--- a/src/chrome/content/rules/Blekko.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Blic.rs.xml b/src/chrome/content/rules/Blic.rs.xml
new file mode 100644
index 000000000000..1799e621ae7b
--- /dev/null
+++ b/src/chrome/content/rules/Blic.rs.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Blinkeye.ch.xml b/src/chrome/content/rules/Blinkeye.ch.xml
index de46131a52b7..c7f17794f8ef 100644
--- a/src/chrome/content/rules/Blinkeye.ch.xml
+++ b/src/chrome/content/rules/Blinkeye.ch.xml
@@ -1,9 +1,9 @@
 
 
 	
-	
+	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Blip.xml b/src/chrome/content/rules/Blip.xml
deleted file mode 100644
index f5b8f40caebc..000000000000
--- a/src/chrome/content/rules/Blip.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
-
-  
-	
-	
-	
-	
-  
-
-
-  
-	
-
-		
-		
-
-		
-		
-
-
-	
-	
-
-  
-
-
-	
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/BlockExplorer.nu.xml b/src/chrome/content/rules/BlockExplorer.nu.xml
index a2744a303d1d..49d45b5cbd06 100644
--- a/src/chrome/content/rules/BlockExplorer.nu.xml
+++ b/src/chrome/content/rules/BlockExplorer.nu.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.blockexplorer.nu/ => https://www.blockexplorer.nu/: (7,
 		- .blockexplorer.nu
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Blocket.se.xml b/src/chrome/content/rules/Blocket.se.xml
index 9a57fab7e825..adcccb1be143 100644
--- a/src/chrome/content/rules/Blocket.se.xml
+++ b/src/chrome/content/rules/Blocket.se.xml
@@ -2,7 +2,6 @@
 	Other Blocket rulesets:
 
 		- Blocket.com.xml
-		- Blockets_Annonswebb.se.xml
 
 
 	^blocket.se:	Mismatched
diff --git a/src/chrome/content/rules/Blockets_Annonswebb.se.xml b/src/chrome/content/rules/Blockets_Annonswebb.se.xml
deleted file mode 100644
index b0872ad49fbd..000000000000
--- a/src/chrome/content/rules/Blockets_Annonswebb.se.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Blockr.io.xml b/src/chrome/content/rules/Blockr.io.xml
deleted file mode 100644
index 18a8ad985c8a..000000000000
--- a/src/chrome/content/rules/Blockr.io.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-  
-  
-
-		
-		
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Blog.ir.xml b/src/chrome/content/rules/Blog.ir.xml
new file mode 100644
index 000000000000..432cbde07919
--- /dev/null
+++ b/src/chrome/content/rules/Blog.ir.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+	
+		
+		
+		
+
+	
+
diff --git a/src/chrome/content/rules/BlogCatalog.xml b/src/chrome/content/rules/BlogCatalog.xml
index da3c2958d459..cbe5aba34462 100644
--- a/src/chrome/content/rules/BlogCatalog.xml
+++ b/src/chrome/content/rules/BlogCatalog.xml
@@ -9,18 +9,18 @@ Fetch error: http://blogcatalog.com/ => https://blogcatalog.com/: Cycle detected
 
 
 	
-	
+	
+	
 
 
 	
 
 
-	
 
 	
 	
 
+	
 
diff --git a/src/chrome/content/rules/BlogGeek.me.xml b/src/chrome/content/rules/BlogGeek.me.xml
index 43c2a2e6675b..d35dcd134060 100644
--- a/src/chrome/content/rules/BlogGeek.me.xml
+++ b/src/chrome/content/rules/BlogGeek.me.xml
@@ -8,7 +8,7 @@ Fetch error: http://www.bloggeek.me/ => https://www.bloggeek.me/: Too many redir
 		- .bloggeek.me
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/BloggingTheology.com.xml b/src/chrome/content/rules/BloggingTheology.com.xml
new file mode 100644
index 000000000000..e491a9931138
--- /dev/null
+++ b/src/chrome/content/rules/BloggingTheology.com.xml
@@ -0,0 +1,11 @@
+
+	
+	
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Blogmint.com.xml b/src/chrome/content/rules/Blogmint.com.xml
deleted file mode 100644
index f00aaf81d5c9..000000000000
--- a/src/chrome/content/rules/Blogmint.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Blogo.xml b/src/chrome/content/rules/Blogo.xml
index b2ebe0480784..5205e2d6e4d1 100644
--- a/src/chrome/content/rules/Blogo.xml
+++ b/src/chrome/content/rules/Blogo.xml
@@ -1,49 +1,14 @@
 
 
+	
 
-	
-
-
-	
-	
-
-
-	
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/Blogto.com.xml b/src/chrome/content/rules/Blogto.com.xml
new file mode 100644
index 000000000000..60ffc27d42ae
--- /dev/null
+++ b/src/chrome/content/rules/Blogto.com.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Blogtrottr.com.xml b/src/chrome/content/rules/Blogtrottr.com.xml
index 0930af15a08d..3e155627af26 100644
--- a/src/chrome/content/rules/Blogtrottr.com.xml
+++ b/src/chrome/content/rules/Blogtrottr.com.xml
@@ -1,13 +1,30 @@
 
 
 
 	
 	
+	
+	
+	
+	
+	
+	
+	
+	
 	
+	
 	
+	
+
+	
+		
 
 	
 
diff --git a/src/chrome/content/rules/Bloo.ie.xml b/src/chrome/content/rules/Bloo.ie.xml
index 5e44ba455b17..be19a08ee096 100644
--- a/src/chrome/content/rules/Bloo.ie.xml
+++ b/src/chrome/content/rules/Bloo.ie.xml
@@ -11,10 +11,12 @@ Fetch error: http://bloo.ie/ => https://bloo.ie/: (6, 'Could not resolve host: b
 		- .bloo.ie
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
 	
-
+
 
 	
-	
+	
+	
+	
 
 
 	
@@ -20,7 +22,6 @@ Fetch error: http://bloodhoundgang.com/ => https://www.bloodhoundgang.com/: (51,
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Bloomberg.com-problematic.xml b/src/chrome/content/rules/Bloomberg.com-problematic.xml
deleted file mode 100644
index a79fb324d726..000000000000
--- a/src/chrome/content/rules/Bloomberg.com-problematic.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Bloomberg.net.xml b/src/chrome/content/rules/Bloomberg.net.xml
index bd1e05672e39..cbb013d42764 100644
--- a/src/chrome/content/rules/Bloomberg.net.xml
+++ b/src/chrome/content/rules/Bloomberg.net.xml
@@ -17,7 +17,7 @@ Fetch error: http://nybba2csg.bloomberg.net/ => https://nybba2csg.bloomberg.net/
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Bloomberg.xml b/src/chrome/content/rules/Bloomberg.xml
index e024e46e11d0..89d96b878b43 100644
--- a/src/chrome/content/rules/Bloomberg.xml
+++ b/src/chrome/content/rules/Bloomberg.xml
@@ -1,127 +1,49 @@
 
 
-
 	
+	
+	
+	
+	
+	
+	
+	
 	
+	
+	
+	
+	
+	
+	
 	
+	
+	
+	
 	
-	
+	
+	
 	
-	
-
-		
-		
-		
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-
-		
-		
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-
+	
 
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/Bloomberg_Sports.com.xml b/src/chrome/content/rules/Bloomberg_Sports.com.xml
index a064c124bc45..0852b7ecfed6 100644
--- a/src/chrome/content/rules/Bloomberg_Sports.com.xml
+++ b/src/chrome/content/rules/Bloomberg_Sports.com.xml
@@ -9,10 +9,10 @@ Fetch error: http://bloombergsports.com/ => https://www.bloombergsports.com/: (7
 	^: self-signed
 
 -->
-
+
 
 	
-	
+	
 
 
 	
-
+
 
 	
diff --git a/src/chrome/content/rules/Blue-Movie.xml b/src/chrome/content/rules/Blue-Movie.xml
index f87a8e6193f7..fceb671de9a0 100644
--- a/src/chrome/content/rules/Blue-Movie.xml
+++ b/src/chrome/content/rules/Blue-Movie.xml
@@ -12,7 +12,7 @@ Fetch error: http://bluemovie.eu/ => https://www.bluemovie.eu/: (60, 'SSL certif
 	^bluemovie.eu: Cert only matches www
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/BlueCava.com.xml b/src/chrome/content/rules/BlueCava.com.xml
new file mode 100644
index 000000000000..e6f2cc504fe0
--- /dev/null
+++ b/src/chrome/content/rules/BlueCava.com.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/BlueCava.xml b/src/chrome/content/rules/BlueCava.xml
deleted file mode 100644
index 166f84b4a703..000000000000
--- a/src/chrome/content/rules/BlueCava.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
-	
-	
-	
-
-
-	
-	
-	
-
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/BlueCoat.xml b/src/chrome/content/rules/BlueCoat.xml
index 88c893a9364c..ea8a9b9ae327 100644
--- a/src/chrome/content/rules/BlueCoat.xml
+++ b/src/chrome/content/rules/BlueCoat.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://bluecoat.com/ => https://bluecoat.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/BlueKrypt.be.xml b/src/chrome/content/rules/BlueKrypt.be.xml
new file mode 100644
index 000000000000..9b7098ebf81d
--- /dev/null
+++ b/src/chrome/content/rules/BlueKrypt.be.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+
+
+	
+	
+
+
diff --git a/src/chrome/content/rules/BlueKrypt.com.xml b/src/chrome/content/rules/BlueKrypt.com.xml
deleted file mode 100644
index b22fafc69c46..000000000000
--- a/src/chrome/content/rules/BlueKrypt.com.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/BluePoint.com.ph.xml b/src/chrome/content/rules/BluePoint.com.ph.xml
deleted file mode 100644
index d4c2568147be..000000000000
--- a/src/chrome/content/rules/BluePoint.com.ph.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/BlueSnap.com.xml b/src/chrome/content/rules/BlueSnap.com.xml
index c729bac8e7ed..2aeb49c0556a 100644
--- a/src/chrome/content/rules/BlueSnap.com.xml
+++ b/src/chrome/content/rules/BlueSnap.com.xml
@@ -1,7 +1,6 @@
 
-
+
 
 	
diff --git a/src/chrome/content/rules/Blue_Man_Ticketing.xml b/src/chrome/content/rules/Blue_Man_Ticketing.xml
deleted file mode 100644
index 692b500e3c81..000000000000
--- a/src/chrome/content/rules/Blue_Man_Ticketing.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Bluechip.xml b/src/chrome/content/rules/Bluechip.xml
index 2ffeac368350..8d373a80f659 100644
--- a/src/chrome/content/rules/Bluechip.xml
+++ b/src/chrome/content/rules/Bluechip.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.bluechip.hu/ => https://www.bluechip.hu/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Bluefly.xml b/src/chrome/content/rules/Bluefly.xml
deleted file mode 100644
index 6b0dbd12a55b..000000000000
--- a/src/chrome/content/rules/Bluefly.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Bluehost.xml b/src/chrome/content/rules/Bluehost.xml
index 7f5c7336b766..a9ffc8dcbf32 100644
--- a/src/chrome/content/rules/Bluehost.xml
+++ b/src/chrome/content/rules/Bluehost.xml
@@ -48,7 +48,7 @@
 
 	
-		
+
 	
 
diff --git a/src/chrome/content/rules/Bluehosting.pl.xml b/src/chrome/content/rules/Bluehosting.pl.xml
index ee153569fd6b..1e16c52787fe 100644
--- a/src/chrome/content/rules/Bluehosting.pl.xml
+++ b/src/chrome/content/rules/Bluehosting.pl.xml
@@ -16,4 +16,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Bluerazor.com.xml b/src/chrome/content/rules/Bluerazor.com.xml
new file mode 100644
index 000000000000..bd2aff26b1a3
--- /dev/null
+++ b/src/chrome/content/rules/Bluerazor.com.xml
@@ -0,0 +1,10 @@
+
+
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/Bluetooth.org.xml b/src/chrome/content/rules/Bluetooth.org.xml
deleted file mode 100644
index cf35bf35ba8c..000000000000
--- a/src/chrome/content/rules/Bluetooth.org.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Bluewin-HostCenter.xml b/src/chrome/content/rules/Bluewin-HostCenter.xml
index 6d444cd0f629..b353c0c919c9 100644
--- a/src/chrome/content/rules/Bluewin-HostCenter.xml
+++ b/src/chrome/content/rules/Bluewin-HostCenter.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.hostcenter.com/ => https://www.hostcenter.com/: (60, 'SS
 	For other Swisscom coverage, see Swisscom.ch.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Bluewin.ch.xml b/src/chrome/content/rules/Bluewin.ch.xml
index 073e9ae60a4e..389aac5be0b1 100644
--- a/src/chrome/content/rules/Bluewin.ch.xml
+++ b/src/chrome/content/rules/Bluewin.ch.xml
@@ -31,7 +31,7 @@ Fetch error: http://xtrazone.sso.bluewin.ch/ => https://xtrazone.sso.bluewin.ch/
 			- rich
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Blumenthals.xml b/src/chrome/content/rules/Blumenthals.xml
index 3a395003dc1f..7aeee3c6fc7e 100644
--- a/src/chrome/content/rules/Blumenthals.xml
+++ b/src/chrome/content/rules/Blumenthals.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Blutmagie.de.xml b/src/chrome/content/rules/Blutmagie.de.xml
index 9c30cdf46b58..4386dc9318a4 100644
--- a/src/chrome/content/rules/Blutmagie.de.xml
+++ b/src/chrome/content/rules/Blutmagie.de.xml
@@ -32,4 +32,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Bmmetrix.com.xml b/src/chrome/content/rules/Bmmetrix.com.xml
index 96835a1ed8c6..99af0437230a 100644
--- a/src/chrome/content/rules/Bmmetrix.com.xml
+++ b/src/chrome/content/rules/Bmmetrix.com.xml
@@ -30,16 +30,17 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Bnc4free.com-falsemixed.xml b/src/chrome/content/rules/Bnc4free.com-falsemixed.xml
index 75dc4f1a2fa0..9ae1604b1a26 100644
--- a/src/chrome/content/rules/Bnc4free.com-falsemixed.xml
+++ b/src/chrome/content/rules/Bnc4free.com-falsemixed.xml
@@ -6,7 +6,7 @@ Fetch error: http://wiki.bnc4free.com/ => https://wiki.bnc4free.com/: (28, 'Conn
 	For rules not causing false/broken MCB, see Bnc4free.com.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Bnc4free.com.xml b/src/chrome/content/rules/Bnc4free.com.xml
index 9134795df713..e099b88c5e77 100644
--- a/src/chrome/content/rules/Bnc4free.com.xml
+++ b/src/chrome/content/rules/Bnc4free.com.xml
@@ -24,7 +24,7 @@ Fetch error: http://www.bnc4free.com/ => https://www.bnc4free.com/: (35, 'error:
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Bnotk.de.xml b/src/chrome/content/rules/Bnotk.de.xml
new file mode 100644
index 000000000000..dce03bf7acb5
--- /dev/null
+++ b/src/chrome/content/rules/Bnotk.de.xml
@@ -0,0 +1,86 @@
+
+
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/BoCA.gov.tw.xml b/src/chrome/content/rules/BoCA.gov.tw.xml
index f8beb5799076..00b5a782c6a2 100644
--- a/src/chrome/content/rules/BoCA.gov.tw.xml
+++ b/src/chrome/content/rules/BoCA.gov.tw.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.boca.gov.tw/ => https://www.boca.gov.tw/: (60, 'SSL cert
 	^: Mismatched
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Boards.ie.xml b/src/chrome/content/rules/Boards.ie.xml
deleted file mode 100644
index 84539d079998..000000000000
--- a/src/chrome/content/rules/Boards.ie.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Boathouse_Crew_Shop.xml b/src/chrome/content/rules/Boathouse_Crew_Shop.xml
index 35300acfe9c5..2e66c63ea8ce 100644
--- a/src/chrome/content/rules/Boathouse_Crew_Shop.xml
+++ b/src/chrome/content/rules/Boathouse_Crew_Shop.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.boathousecrewshop.com/ => https://www.boathousecrewshop.
 	Mixed images from photobucket
 
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://www.boathousecrewshop.com/ => https://www.boathousecrewshop.
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Boba_Family.xml b/src/chrome/content/rules/Boba_Family.xml
index e84670487587..b0ffced0e93d 100644
--- a/src/chrome/content/rules/Boba_Family.xml
+++ b/src/chrome/content/rules/Boba_Family.xml
@@ -8,16 +8,16 @@ Fetch error: http://www.bobafamily.com/ => https://www.bobafamily.com/: (28, 'Co
 Disabled by https-everywhere-checker because:
 Fetch error: http://bobafamily.com/ => https://bobafamily.com/: (51, "SSL: no alternative certificate subject name matches target host name 'bobafamily.com'")
 -->
-
+
 
 	
 	
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Bobcares.com.xml b/src/chrome/content/rules/Bobcares.com.xml
index 879b822b9d47..d88c1b0d42d0 100644
--- a/src/chrome/content/rules/Bobcares.com.xml
+++ b/src/chrome/content/rules/Bobcares.com.xml
@@ -18,7 +18,7 @@ Fetch error: http://portal.bobcares.com/ => https://portal.bobcares.com/: (6, 'C
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Bodum.xml b/src/chrome/content/rules/Bodum.xml
index 3f2378c5d646..175f2d1d0cd0 100644
--- a/src/chrome/content/rules/Bodum.xml
+++ b/src/chrome/content/rules/Bodum.xml
@@ -2,7 +2,7 @@
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/BodyBuilding.com.xml b/src/chrome/content/rules/BodyBuilding.com.xml
deleted file mode 100644
index ab03f8fe6061..000000000000
--- a/src/chrome/content/rules/BodyBuilding.com.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-	
-	
-		
-
-
-	
-
-
-	
-
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Boell.de.xml b/src/chrome/content/rules/Boell.de.xml
index 77bf5af7feec..7e1935a51ae8 100644
--- a/src/chrome/content/rules/Boell.de.xml
+++ b/src/chrome/content/rules/Boell.de.xml
@@ -32,7 +32,7 @@ themen.boell.de different content
 ³ timed out
 ⁴ self signed
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Boing-Boing.xml b/src/chrome/content/rules/Boing-Boing.xml
deleted file mode 100644
index 69bc2745e50b..000000000000
--- a/src/chrome/content/rules/Boing-Boing.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-
-	
-	
-
-		
-		
-		
-
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Boingo.xml b/src/chrome/content/rules/Boingo.xml
index 778c5e063950..5cd0a4d2867a 100644
--- a/src/chrome/content/rules/Boingo.xml
+++ b/src/chrome/content/rules/Boingo.xml
@@ -7,7 +7,7 @@ Fetch error: http://boingohotspot.net/ => http://boingohotspot.net/: (28, 'Conne
 Disabled by https-everywhere-checker because:
 Fetch error: http://boingo.com/ => https://www.boingo.com/: (7, 'Failed to connect to www.boingo.com port 443: Connection timed out')
 -->
-
+
     
     
     
diff --git a/src/chrome/content/rules/Boiron.ca.xml b/src/chrome/content/rules/Boiron.ca.xml
new file mode 100644
index 000000000000..ef7aa524bf53
--- /dev/null
+++ b/src/chrome/content/rules/Boiron.ca.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Bokborgen.se.xml b/src/chrome/content/rules/Bokborgen.se.xml
index 50e226164924..3fcb4a29990c 100644
--- a/src/chrome/content/rules/Bokborgen.se.xml
+++ b/src/chrome/content/rules/Bokborgen.se.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.bokborgen.se/ => https://bokborgen.se/: (51, "SSL: no alternative certificate subject name matches target host name 'bokborgen.se'")
 Fetch error: http://bokborgen.se/ => https://bokborgen.se/: (51, "SSL: no alternative certificate subject name matches target host name 'bokborgen.se'")
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/Bokelskere.no.xml b/src/chrome/content/rules/Bokelskere.no.xml
new file mode 100644
index 000000000000..0da59c9759f9
--- /dev/null
+++ b/src/chrome/content/rules/Bokelskere.no.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Bokelskere.xml b/src/chrome/content/rules/Bokelskere.xml
deleted file mode 100644
index 807f4d6d163c..000000000000
--- a/src/chrome/content/rules/Bokelskere.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-  
-  
-
-  
-
diff --git a/src/chrome/content/rules/BolehVPN.net.xml b/src/chrome/content/rules/BolehVPN.net.xml
index 047468f0b985..3982f5e38e45 100644
--- a/src/chrome/content/rules/BolehVPN.net.xml
+++ b/src/chrome/content/rules/BolehVPN.net.xml
@@ -18,7 +18,7 @@ Fetch error: http://portal.bolehvpn.net/ => https://portal.bolehvpn.net/: (7, 'F
 		- www.bolehvpn.net
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Boligportal.dk-mixedcontent.xml b/src/chrome/content/rules/Boligportal.dk-mixedcontent.xml
deleted file mode 100644
index 50b233de929d..000000000000
--- a/src/chrome/content/rules/Boligportal.dk-mixedcontent.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Boligportal.dk.xml b/src/chrome/content/rules/Boligportal.dk.xml
index 34252c701e2e..4bae2351c183 100644
--- a/src/chrome/content/rules/Boligportal.dk.xml
+++ b/src/chrome/content/rules/Boligportal.dk.xml
@@ -5,14 +5,14 @@
 
 	¹: Bad cert
 
-	Mixed content issues on pages that load JS via
-	Leaflet (such as individual apartment info
-	pages). These are dealt with in the ruleset in
-	Boligportal.dk-mixedcontent.xml.
-
 -->
 
 
+	
+	
+
+	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Bolos_Computer_Museum.xml b/src/chrome/content/rules/Bolos_Computer_Museum.xml
index 9493f8ae72f9..6bec6c199890 100644
--- a/src/chrome/content/rules/Bolos_Computer_Museum.xml
+++ b/src/chrome/content/rules/Bolos_Computer_Museum.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Bonadza.com.xml b/src/chrome/content/rules/Bonadza.com.xml
deleted file mode 100644
index 77465851b621..000000000000
--- a/src/chrome/content/rules/Bonadza.com.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-		
-
-		
-		
-		
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Bonneville_Power_Administration.xml b/src/chrome/content/rules/Bonneville_Power_Administration.xml
deleted file mode 100644
index 8a6258415e2f..000000000000
--- a/src/chrome/content/rules/Bonneville_Power_Administration.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/BookerAndDax.com.xml b/src/chrome/content/rules/BookerAndDax.com.xml
new file mode 100644
index 000000000000..6a2f72755dae
--- /dev/null
+++ b/src/chrome/content/rules/BookerAndDax.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Bookie.io.xml b/src/chrome/content/rules/Bookie.io.xml
index b461982bddda..c35577ade54e 100644
--- a/src/chrome/content/rules/Bookie.io.xml
+++ b/src/chrome/content/rules/Bookie.io.xml
@@ -6,7 +6,7 @@ Fetch error: http://bookie.io/ => https://bookie.io/: (28, 'Connection timed out
 	www.bookie.io doesn't exist.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Booklog.jp.xml b/src/chrome/content/rules/Booklog.jp.xml
index dfafed92d23c..42178938218b 100644
--- a/src/chrome/content/rules/Booklog.jp.xml
+++ b/src/chrome/content/rules/Booklog.jp.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://booklog.jp/ => https://www.booklog.jp/: (51, "SSL: no alternative certificate subject name matches target host name 'www.booklog.jp'")
 Fetch error: http://www.booklog.jp/ => https://www.booklog.jp/: (51, "SSL: no alternative certificate subject name matches target host name 'www.booklog.jp'")
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Booklooker.de.xml b/src/chrome/content/rules/Booklooker.de.xml
index d099131bd574..e55cf210b7b6 100644
--- a/src/chrome/content/rules/Booklooker.de.xml
+++ b/src/chrome/content/rules/Booklooker.de.xml
@@ -1,9 +1,20 @@
-
-  
-  
+
+
+	
+	
+	
+	
+	
+	
+	
+	
 
-  
-  
+	
 
diff --git a/src/chrome/content/rules/Bookworm.xml b/src/chrome/content/rules/Bookworm.xml
deleted file mode 100644
index 0716099a5795..000000000000
--- a/src/chrome/content/rules/Bookworm.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-  
-
-  
-
-  
-
-
diff --git a/src/chrome/content/rules/Boomerang.com.xml b/src/chrome/content/rules/Boomerang.com.xml
new file mode 100644
index 000000000000..880fb0f7e3af
--- /dev/null
+++ b/src/chrome/content/rules/Boomerang.com.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Boomerang.xml b/src/chrome/content/rules/Boomerang.xml
deleted file mode 100644
index 6844092b2f15..000000000000
--- a/src/chrome/content/rules/Boomerang.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/BoordatWork.com.xml b/src/chrome/content/rules/BoordatWork.com.xml
index 039a24b8751b..49fbce4371e7 100644
--- a/src/chrome/content/rules/BoordatWork.com.xml
+++ b/src/chrome/content/rules/BoordatWork.com.xml
@@ -1,7 +1,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Boost.org.xml b/src/chrome/content/rules/Boost.org.xml
new file mode 100644
index 000000000000..aa67e78050ec
--- /dev/null
+++ b/src/chrome/content/rules/Boost.org.xml
@@ -0,0 +1,21 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Boost.xml b/src/chrome/content/rules/Boost.xml
deleted file mode 100644
index 232701940001..000000000000
--- a/src/chrome/content/rules/Boost.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Boost_by_Benz.com.xml b/src/chrome/content/rules/Boost_by_Benz.com.xml
index 748fe9fe7cb8..18f2e62c36fd 100644
--- a/src/chrome/content/rules/Boost_by_Benz.com.xml
+++ b/src/chrome/content/rules/Boost_by_Benz.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://www.boostbybenz.com/ => https://www.boostbybenz.com/: (60, '
 		- stage.boostbybenz.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/BootCDN.xml b/src/chrome/content/rules/BootCDN.xml
index ee6c550f1d80..1d902dc8a43f 100644
--- a/src/chrome/content/rules/BootCDN.xml
+++ b/src/chrome/content/rules/BootCDN.xml
@@ -19,7 +19,7 @@
 			w3schools.bootcss.com
 			wenda.bootcss.com
 			www.bootcss.com
-		  
+
 		*bootcss.com
 			blog.bootcss.cn
 			www.bootcss.cn
@@ -29,7 +29,7 @@
 
 	
 		
-	
+
 	
 	
 		
diff --git a/src/chrome/content/rules/Boots.com.xml b/src/chrome/content/rules/Boots.com.xml
index 76317898d4e4..a97e108c2dee 100644
--- a/src/chrome/content/rules/Boots.com.xml
+++ b/src/chrome/content/rules/Boots.com.xml
@@ -50,9 +50,13 @@
 
 
 	
-	
+	
+	
+	
+	
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Boots.no.xml b/src/chrome/content/rules/Boots.no.xml
index 1a4925b997da..65da5bec0a85 100644
--- a/src/chrome/content/rules/Boots.no.xml
+++ b/src/chrome/content/rules/Boots.no.xml
@@ -10,7 +10,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Boots_Thai.com.xml b/src/chrome/content/rules/Boots_Thai.com.xml
index d5e519cadd53..b18238a1e192 100644
--- a/src/chrome/content/rules/Boots_Thai.com.xml
+++ b/src/chrome/content/rules/Boots_Thai.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.bootsthai.com/ => https://www.bootsthai.com/: (60, 'SSL
 	^bootsthai.com times out over both http and https.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Boounce.xml b/src/chrome/content/rules/Boounce.xml
index 638737b6f240..30e575be4c5b 100644
--- a/src/chrome/content/rules/Boounce.xml
+++ b/src/chrome/content/rules/Boounce.xml
@@ -8,7 +8,7 @@ Fetch error: http://www.boounce.com/ => https://www.boounce.com/: (7, 'Failed to
 Automatically by https-everywhere-checker because:
 Fetch error: http://boounce.com/ => https://boounce.com/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
 
 	
 	
@@ -20,4 +20,4 @@ Fetch error: http://boounce.com/ => https://boounce.com/: (60, 'SSL certificate
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Booz_Allen.com.xml b/src/chrome/content/rules/Booz_Allen.com.xml
index 08a97cb59ba0..8ddaddb7b4fd 100644
--- a/src/chrome/content/rules/Booz_Allen.com.xml
+++ b/src/chrome/content/rules/Booz_Allen.com.xml
@@ -23,7 +23,8 @@
 
 
 	
-	
+	
+	
 
 
 	
 
 
-	
-	
-
-
-	
-
+	
+	
+	
+	
 
-	
+	
+	
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/BosslandGmbH.xml b/src/chrome/content/rules/BosslandGmbH.xml
index 3a49e2867c4a..d795e721b63b 100644
--- a/src/chrome/content/rules/BosslandGmbH.xml
+++ b/src/chrome/content/rules/BosslandGmbH.xml
@@ -17,4 +17,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/BotBot.me.xml b/src/chrome/content/rules/BotBot.me.xml
index da4863a648d1..39853c457bfe 100644
--- a/src/chrome/content/rules/BotBot.me.xml
+++ b/src/chrome/content/rules/BotBot.me.xml
@@ -8,7 +8,7 @@ Fetch error: http://www.botbot.me/ => https://www.botbot.me/: (51, "SSL: no alte
 		- botbot.me
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Boum.org.xml b/src/chrome/content/rules/Boum.org.xml
index 3f8ee88a1f54..f5c016ff469c 100644
--- a/src/chrome/content/rules/Boum.org.xml
+++ b/src/chrome/content/rules/Boum.org.xml
@@ -50,13 +50,13 @@
 	
 	
 
-	
 
 	
 
-	
 
 
diff --git a/src/chrome/content/rules/Bounce.io.xml b/src/chrome/content/rules/Bounce.io.xml
index 3ef1092679c0..f693fe5a1212 100644
--- a/src/chrome/content/rules/Bounce.io.xml
+++ b/src/chrome/content/rules/Bounce.io.xml
@@ -4,10 +4,10 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://bounce.io/ => https://bounce.io/: (7, 'Failed to connect to bounce.io port 443: Connection refused')
 
 -->
-
+
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Bourgeois.me.xml b/src/chrome/content/rules/Bourgeois.me.xml
index 0c73a1984364..330b22a712e6 100644
--- a/src/chrome/content/rules/Bourgeois.me.xml
+++ b/src/chrome/content/rules/Bourgeois.me.xml
@@ -11,7 +11,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://bourgeois.me/ => https://bourgeois.me/: (51, "SSL: no alternative certificate subject name matches target host name 'bourgeois.me'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Bournemouth.gov.uk.xml b/src/chrome/content/rules/Bournemouth.gov.uk.xml
index 6d729796c07d..cf3ec34c845b 100644
--- a/src/chrome/content/rules/Bournemouth.gov.uk.xml
+++ b/src/chrome/content/rules/Bournemouth.gov.uk.xml
@@ -44,7 +44,7 @@ Fetch error: http://bournemouth.gov.uk/ => https://www.bournemouth.gov.uk/: (28,
 	ˢ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/BoxOffice.xml b/src/chrome/content/rules/BoxOffice.xml
index 95a048d5157c..c5f630f6b0d9 100644
--- a/src/chrome/content/rules/BoxOffice.xml
+++ b/src/chrome/content/rules/BoxOffice.xml
@@ -16,4 +16,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/BoxeeTV.xml b/src/chrome/content/rules/BoxeeTV.xml
index f25c664b3004..7cb0b7b3a288 100644
--- a/src/chrome/content/rules/BoxeeTV.xml
+++ b/src/chrome/content/rules/BoxeeTV.xml
@@ -11,10 +11,13 @@ Fetch error: http://boxee.tv/ => https://boxee.tv/: (7, 'Failed to connect to ww
 		- my	(refused)
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Boxwood_Technology.xml b/src/chrome/content/rules/Boxwood_Technology.xml
index 43562cf6e6d6..2517e0621d8a 100644
--- a/src/chrome/content/rules/Boxwood_Technology.xml
+++ b/src/chrome/content/rules/Boxwood_Technology.xml
@@ -7,16 +7,16 @@ Fetch error: http://www.boxwoodtech.com/ => https://www.boxwoodtech.com/: (28, '
 Disabled by https-everywhere-checker because:
 Fetch error: http://boxwoodtech.com/ => https://boxwoodtech.com/: Cycle detected - URL already encountered: https://www.boxwoodtech.com/
 -->
-
+
 
 	
 	
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/BradleyF.id.au.xml b/src/chrome/content/rules/BradleyF.id.au.xml
deleted file mode 100644
index 52726c94579d..000000000000
--- a/src/chrome/content/rules/BradleyF.id.au.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Braincert.org.xml b/src/chrome/content/rules/Braincert.org.xml
index 5cd3eea8640a..03d6f8f97da9 100644
--- a/src/chrome/content/rules/Braincert.org.xml
+++ b/src/chrome/content/rules/Braincert.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://braincert.org/ => https://braincert.org/: (51, "SSL: no alternative certificate subject name matches target host name 'braincert.org'")
 
 -->
-
+
 
 	
 	
@@ -15,4 +15,4 @@ Fetch error: http://braincert.org/ => https://braincert.org/: (51, "SSL: no alte
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Brainshark.xml b/src/chrome/content/rules/Brainshark.xml
index 0f34fe5e3be1..692916e0e229 100644
--- a/src/chrome/content/rules/Brainshark.xml
+++ b/src/chrome/content/rules/Brainshark.xml
@@ -11,7 +11,7 @@
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Brainsonic.xml b/src/chrome/content/rules/Brainsonic.xml
index 111dba8067ab..61d2a973d32e 100644
--- a/src/chrome/content/rules/Brainsonic.xml
+++ b/src/chrome/content/rules/Brainsonic.xml
@@ -19,7 +19,10 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Brak.de.xml b/src/chrome/content/rules/Brak.de.xml
new file mode 100644
index 000000000000..431aa1b9c1d0
--- /dev/null
+++ b/src/chrome/content/rules/Brak.de.xml
@@ -0,0 +1,21 @@
+
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Branch.xml b/src/chrome/content/rules/Branch.xml
index d90e0d961ed9..398c77a3ddab 100644
--- a/src/chrome/content/rules/Branch.xml
+++ b/src/chrome/content/rules/Branch.xml
@@ -17,10 +17,12 @@ Fetch error: http://branch.com/ => https://secure.branch.com/: (6, 'Could not re
 		- www		(mismatched, CN: *.herokuapp.com)
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Brand-server.com.xml b/src/chrome/content/rules/Brand-server.com.xml
deleted file mode 100644
index c26ff8f35be3..000000000000
--- a/src/chrome/content/rules/Brand-server.com.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Brand_Embassy.xml b/src/chrome/content/rules/Brand_Embassy.xml
index 736c611d8a6b..ed8d0cc28cd6 100644
--- a/src/chrome/content/rules/Brand_Embassy.xml
+++ b/src/chrome/content/rules/Brand_Embassy.xml
@@ -7,13 +7,12 @@
 -->
 
 
-	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Brand_New_Booty.xml b/src/chrome/content/rules/Brand_New_Booty.xml
deleted file mode 100644
index c14e38931140..000000000000
--- a/src/chrome/content/rules/Brand_New_Booty.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Brandfolder.com.xml b/src/chrome/content/rules/Brandfolder.com.xml
deleted file mode 100644
index 7bdbf7de02c9..000000000000
--- a/src/chrome/content/rules/Brandfolder.com.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Brandify.xml b/src/chrome/content/rules/Brandify.xml
index 435331c36a2f..cc1f20c17488 100644
--- a/src/chrome/content/rules/Brandify.xml
+++ b/src/chrome/content/rules/Brandify.xml
@@ -10,11 +10,11 @@ Fetch error: http://secure.brandify.com.au/ => https://secure.brandify.com.au/:
 		- (www.)	(shows secure; mismatched, CN: secure.brandify.com.au)
 
 -->
-
+
 
 	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Branson_Zipline.xml b/src/chrome/content/rules/Branson_Zipline.xml
deleted file mode 100644
index e74b61b05f20..000000000000
--- a/src/chrome/content/rules/Branson_Zipline.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-	
-	
-		
-	
-
-
-	
-
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Brasil_24-7.xml b/src/chrome/content/rules/Brasil_24-7.xml
index cb13ac5d66f1..6542fa49e187 100644
--- a/src/chrome/content/rules/Brasil_24-7.xml
+++ b/src/chrome/content/rules/Brasil_24-7.xml
@@ -10,4 +10,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Brave-Media.xml b/src/chrome/content/rules/Brave-Media.xml
index 6903623bf423..52826d03657c 100644
--- a/src/chrome/content/rules/Brave-Media.xml
+++ b/src/chrome/content/rules/Brave-Media.xml
@@ -1,5 +1,5 @@
 
 	
-	
+	
+	
+	
+	
 	
 	
 	
diff --git a/src/chrome/content/rules/Braveinfo.net.xml b/src/chrome/content/rules/Braveinfo.net.xml
deleted file mode 100644
index e1c5fdd3238c..000000000000
--- a/src/chrome/content/rules/Braveinfo.net.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Bravenet_Media.xml b/src/chrome/content/rules/Bravenet_Media.xml
index b59f078471e5..91b53cb2f65f 100644
--- a/src/chrome/content/rules/Bravenet_Media.xml
+++ b/src/chrome/content/rules/Bravenet_Media.xml
@@ -21,7 +21,7 @@ Fetch error: http://redvase.bravenet.com/ => https://redvase.bravenet.com/: (60,
 		- www.bravenetmedia.com
 
 -->
-
+
 
 	
 
@@ -31,4 +31,4 @@ Fetch error: http://redvase.bravenet.com/ => https://redvase.bravenet.com/: (60,
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/BreNet.xml b/src/chrome/content/rules/BreNet.xml
index cef72cb82e3c..d759d4b08ba8 100644
--- a/src/chrome/content/rules/BreNet.xml
+++ b/src/chrome/content/rules/BreNet.xml
@@ -12,17 +12,16 @@ Fetch error: http://brenet.de/ => https://brenet.de/: (60, 'SSL certificate prob
 
 
 	
-	
+	
 	
 
 
-	
+	
 
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Break.com.xml b/src/chrome/content/rules/Break.com.xml
deleted file mode 100644
index debc43a54cd9..000000000000
--- a/src/chrome/content/rules/Break.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Breakfast-Quay.xml b/src/chrome/content/rules/Breakfast-Quay.xml
index b94cdb75b465..4c456f740242 100644
--- a/src/chrome/content/rules/Breakfast-Quay.xml
+++ b/src/chrome/content/rules/Breakfast-Quay.xml
@@ -6,7 +6,7 @@ Fetch error: http://code.breakfastquay.com/ => https://code.breakfastquay.com/:
 Disabled by https-everywhere-checker because:
 Fetch error: http://code.breakfastquay.com/ => https://code.breakfastquay.com/: (7, 'Failed to connect to code.breakfastquay.com port 443: Connection refused')
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/BreakoutBand.com.xml b/src/chrome/content/rules/BreakoutBand.com.xml
index 45bd94b8e513..b9348f7e89a3 100644
--- a/src/chrome/content/rules/BreakoutBand.com.xml
+++ b/src/chrome/content/rules/BreakoutBand.com.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://breakoutband.com/ => https://breakoutband.com/: (28, 'Connection timed out after 10001 milliseconds')
 Fetch error: http://www.breakoutband.com/ => https://www.breakoutband.com/: (28, 'Connection timed out after 10000 milliseconds')
 -->
-
+
 
 	
 	
@@ -19,4 +19,4 @@ Fetch error: http://www.breakoutband.com/ => https://www.breakoutband.com/: (28,
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Breathe.com.xml b/src/chrome/content/rules/Breathe.com.xml
new file mode 100644
index 000000000000..4af2d490c7a0
--- /dev/null
+++ b/src/chrome/content/rules/Breathe.com.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Bremer-Bank.xml b/src/chrome/content/rules/Bremer-Bank.xml
index 0e90418dbe86..ab4efc51ed03 100644
--- a/src/chrome/content/rules/Bremer-Bank.xml
+++ b/src/chrome/content/rules/Bremer-Bank.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://rdc.bremer.com/ => https://rdc.bremer.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Brennan_Novak.com.xml b/src/chrome/content/rules/Brennan_Novak.com.xml
deleted file mode 100644
index 9ebd04e29eee..000000000000
--- a/src/chrome/content/rules/Brennan_Novak.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Brent.gov.uk.xml b/src/chrome/content/rules/Brent.gov.uk.xml
index af6a6f2f528b..8201a7e5b342 100644
--- a/src/chrome/content/rules/Brent.gov.uk.xml
+++ b/src/chrome/content/rules/Brent.gov.uk.xml
@@ -10,7 +10,7 @@
 		- server2 ᵃ
 
 	ᵃ Shows another domain
-	ᵈ Dropped	
+	ᵈ Dropped
 
 
 	Problematic hosts in *brent.gov.uk:
diff --git a/src/chrome/content/rules/Bridges-Foundation.org.xml b/src/chrome/content/rules/Bridges-Foundation.org.xml
new file mode 100644
index 000000000000..ae42a7bfb7fa
--- /dev/null
+++ b/src/chrome/content/rules/Bridges-Foundation.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Bridgew.edu.xml b/src/chrome/content/rules/Bridgew.edu.xml
new file mode 100644
index 000000000000..0574af58acf3
--- /dev/null
+++ b/src/chrome/content/rules/Bridgew.edu.xml
@@ -0,0 +1,45 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Bridgeways.com.xml b/src/chrome/content/rules/Bridgeways.com.xml
index 5a91dbedb67e..45849b05e456 100644
--- a/src/chrome/content/rules/Bridgeways.com.xml
+++ b/src/chrome/content/rules/Bridgeways.com.xml
@@ -11,7 +11,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://bridgeways.com/ => https://bridgeways.com/: (7, 'Failed to connect to bridgeways.com port 443: Connection timed out')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/BrieHost.com.xml b/src/chrome/content/rules/BrieHost.com.xml
deleted file mode 100644
index 0bb021801fbb..000000000000
--- a/src/chrome/content/rules/BrieHost.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/BrightRoll.xml b/src/chrome/content/rules/BrightRoll.xml
deleted file mode 100644
index 1597ecdf0495..000000000000
--- a/src/chrome/content/rules/BrightRoll.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/BrightTALK.com.xml b/src/chrome/content/rules/BrightTALK.com.xml
index 57336ca21320..5584b9739f79 100644
--- a/src/chrome/content/rules/BrightTALK.com.xml
+++ b/src/chrome/content/rules/BrightTALK.com.xml
@@ -1,15 +1,5 @@
 
 
-
+
 
 	
 	
 	
+	
 	
 	
 
-	
-	
-
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-
-
 	
 	
 
 
-	
-	
-
-			
-			
-			
-			
-			
-			
-
-	
-
-
 	
 
diff --git a/src/chrome/content/rules/BrightTag-problematic.xml b/src/chrome/content/rules/BrightTag-problematic.xml
index f33b8b8b068d..d1b6063a2c5b 100644
--- a/src/chrome/content/rules/BrightTag-problematic.xml
+++ b/src/chrome/content/rules/BrightTag-problematic.xml
@@ -15,4 +15,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/BrightTag.xml b/src/chrome/content/rules/BrightTag.xml
index fa46b31461c1..062d69a51438 100644
--- a/src/chrome/content/rules/BrightTag.xml
+++ b/src/chrome/content/rules/BrightTag.xml
@@ -5,7 +5,6 @@
 	Other BrightTag rulesets:
 
 		- BTstatic.com.xml
-		- SiteTagger.co.uk.xml
 
 
 	CDN buckets:
diff --git a/src/chrome/content/rules/Bright_Hub.com.xml b/src/chrome/content/rules/Bright_Hub.com.xml
index 66209875a326..75807a4e0660 100644
--- a/src/chrome/content/rules/Bright_Hub.com.xml
+++ b/src/chrome/content/rules/Bright_Hub.com.xml
@@ -34,7 +34,7 @@ Fetch error: http://s.brighthub.com/ => https://s.brighthub.com/: (51, "SSL: no
 	* Works, akamai
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Bright_Kids_NYC.xml b/src/chrome/content/rules/Bright_Kids_NYC.xml
index 84041795e2c3..a941d57e499d 100644
--- a/src/chrome/content/rules/Bright_Kids_NYC.xml
+++ b/src/chrome/content/rules/Bright_Kids_NYC.xml
@@ -8,10 +8,10 @@ Fetch error: http://brightkidsnyc.com/ => https://www.brightkidsnyc.com/: (7, 'F
 		- ^	(expired 2012-04-18)
 
 -->
-
+
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Brighton.xml b/src/chrome/content/rules/Brighton.xml
index 9d8a28477746..6c0f6907c76c 100644
--- a/src/chrome/content/rules/Brighton.xml
+++ b/src/chrome/content/rules/Brighton.xml
@@ -7,7 +7,7 @@
 	
 	
 	
-	
+	
 
 
 	
@@ -19,4 +19,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Bring_the_Gig.xml b/src/chrome/content/rules/Bring_the_Gig.xml
index a2a39a1b654c..1fda8fcad4c3 100644
--- a/src/chrome/content/rules/Bring_the_Gig.xml
+++ b/src/chrome/content/rules/Bring_the_Gig.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Brinkster.com.xml b/src/chrome/content/rules/Brinkster.com.xml
index 18cf85c4bb65..ece5514e42ee 100644
--- a/src/chrome/content/rules/Brinkster.com.xml
+++ b/src/chrome/content/rules/Brinkster.com.xml
@@ -10,13 +10,15 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Britannica.com.xml b/src/chrome/content/rules/Britannica.com.xml
index 98d1b4204293..40f0bfa3d098 100644
--- a/src/chrome/content/rules/Britannica.com.xml
+++ b/src/chrome/content/rules/Britannica.com.xml
@@ -41,7 +41,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
@@ -51,7 +53,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Britcoin.co.uk.xml b/src/chrome/content/rules/Britcoin.co.uk.xml
index 61b96d9383d0..281c1deecca5 100644
--- a/src/chrome/content/rules/Britcoin.co.uk.xml
+++ b/src/chrome/content/rules/Britcoin.co.uk.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://britcoin.co.uk/ => https://www.britcoin.co.uk/: (51, "SSL: no alternative certificate subject name matches target host name 'www.britcoin.co.uk'")
 Fetch error: http://www.britcoin.co.uk/ => https://www.britcoin.co.uk/: (51, "SSL: no alternative certificate subject name matches target host name 'www.britcoin.co.uk'")
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/BriteObjects.xml b/src/chrome/content/rules/BriteObjects.xml
index 80753507c5c3..bc6562ff399c 100644
--- a/src/chrome/content/rules/BriteObjects.xml
+++ b/src/chrome/content/rules/BriteObjects.xml
@@ -23,4 +23,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/British-Airways.xml b/src/chrome/content/rules/British-Airways.xml
new file mode 100644
index 000000000000..4d80e816977f
--- /dev/null
+++ b/src/chrome/content/rules/British-Airways.xml
@@ -0,0 +1,75 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+
+	
+	
+	
+	
+
+	
+
+
+	
+
diff --git a/src/chrome/content/rules/British_Airline_Pilots_Association.xml b/src/chrome/content/rules/British_Airline_Pilots_Association.xml
deleted file mode 100644
index 702009cb81ad..000000000000
--- a/src/chrome/content/rules/British_Airline_Pilots_Association.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-    
-    
-
-    
-    
-
diff --git a/src/chrome/content/rules/British_National_Formulary.xml b/src/chrome/content/rules/British_National_Formulary.xml
index f846d958796a..152982b6fd45 100644
--- a/src/chrome/content/rules/British_National_Formulary.xml
+++ b/src/chrome/content/rules/British_National_Formulary.xml
@@ -16,4 +16,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/British_Red_Cross.xml b/src/chrome/content/rules/British_Red_Cross.xml
index 47a8090eacbe..cc19ff1c27cc 100644
--- a/src/chrome/content/rules/British_Red_Cross.xml
+++ b/src/chrome/content/rules/British_Red_Cross.xml
@@ -28,7 +28,12 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
 		
 
 
@@ -41,7 +46,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Britishindiancurries.com.xml b/src/chrome/content/rules/Britishindiancurries.com.xml
deleted file mode 100644
index 7d41104726df..000000000000
--- a/src/chrome/content/rules/Britishindiancurries.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Britishindiancurries.de.xml b/src/chrome/content/rules/Britishindiancurries.de.xml
deleted file mode 100644
index f867e770462d..000000000000
--- a/src/chrome/content/rules/Britishindiancurries.de.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Brixwork.com.xml b/src/chrome/content/rules/Brixwork.com.xml
index 6680ea03b567..8f75080ba5ff 100644
--- a/src/chrome/content/rules/Brixwork.com.xml
+++ b/src/chrome/content/rules/Brixwork.com.xml
@@ -32,4 +32,4 @@ Fetch error: http://www.brixwork.com/ => https://www.brixwork.com/: Cycle detect
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Broad-Institute.xml b/src/chrome/content/rules/Broad-Institute.xml
index c8a3e480fd6e..f188fbe70755 100644
--- a/src/chrome/content/rules/Broad-Institute.xml
+++ b/src/chrome/content/rules/Broad-Institute.xml
@@ -2,7 +2,7 @@
 
 	
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Broadband-Forum.org.xml b/src/chrome/content/rules/Broadband-Forum.org.xml
index af3515c30794..1a28b4da80bb 100644
--- a/src/chrome/content/rules/Broadband-Forum.org.xml
+++ b/src/chrome/content/rules/Broadband-Forum.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://broadband-forum.org/ => https://broadband-forum.org/: (51, "SSL: no alternative certificate subject name matches target host name 'broadband-forum.org'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Broadband_Convergent.xml b/src/chrome/content/rules/Broadband_Convergent.xml
index ba155a7d294f..1ede5484572a 100644
--- a/src/chrome/content/rules/Broadband_Convergent.xml
+++ b/src/chrome/content/rules/Broadband_Convergent.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Broadband_Map.gov.xml b/src/chrome/content/rules/Broadband_Map.gov.xml
deleted file mode 100644
index 3c4e38d036cb..000000000000
--- a/src/chrome/content/rules/Broadband_Map.gov.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Broadbandchoices.co.uk.xml b/src/chrome/content/rules/Broadbandchoices.co.uk.xml
deleted file mode 100644
index 0bd9b027d9ab..000000000000
--- a/src/chrome/content/rules/Broadbandchoices.co.uk.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/BroadcastJobs.co.uk.xml b/src/chrome/content/rules/BroadcastJobs.co.uk.xml
index 6e7ae71fd4f9..8f416a4cdb6c 100644
--- a/src/chrome/content/rules/BroadcastJobs.co.uk.xml
+++ b/src/chrome/content/rules/BroadcastJobs.co.uk.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Broadcasthe.net.xml b/src/chrome/content/rules/Broadcasthe.net.xml
index cce686ad2d7e..71d1d85f43cf 100644
--- a/src/chrome/content/rules/Broadcasthe.net.xml
+++ b/src/chrome/content/rules/Broadcasthe.net.xml
@@ -1,23 +1,12 @@
-
-
-
+
 	
-		
-		
-		
-		
-		
-	
-		
-		
+	
+	
+	
+	
+	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Broadcom.xml b/src/chrome/content/rules/Broadcom.xml
index be81ead0acc2..21b191f4d79c 100644
--- a/src/chrome/content/rules/Broadcom.xml
+++ b/src/chrome/content/rules/Broadcom.xml
@@ -36,7 +36,7 @@ Fetch error: http://jobs.broadcom.com/ => https://jobs.broadcom.com/: (28, 'Conn
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Broadcom_Foundation.org.xml b/src/chrome/content/rules/Broadcom_Foundation.org.xml
index c63e72303640..a318fbcbe57f 100644
--- a/src/chrome/content/rules/Broadcom_Foundation.org.xml
+++ b/src/chrome/content/rules/Broadcom_Foundation.org.xml
@@ -24,7 +24,7 @@ Fetch error: http://www.broadcomfoundation.org/ => https://www.broadcomfoundatio
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Brockman.xml b/src/chrome/content/rules/Brockman.xml
index ca0d118146ac..d86d484a27b1 100644
--- a/src/chrome/content/rules/Brockman.xml
+++ b/src/chrome/content/rules/Brockman.xml
@@ -11,4 +11,4 @@
 	
 
 
-	
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Bromley.gov.uk.xml b/src/chrome/content/rules/Bromley.gov.uk.xml
index ccdff4eaad70..97c0fe18a234 100644
--- a/src/chrome/content/rules/Bromley.gov.uk.xml
+++ b/src/chrome/content/rules/Bromley.gov.uk.xml
@@ -10,7 +10,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -19,7 +20,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Bronto_Software.xml b/src/chrome/content/rules/Bronto_Software.xml
index 7d5febd75b48..5eea94b0e242 100644
--- a/src/chrome/content/rules/Bronto_Software.xml
+++ b/src/chrome/content/rules/Bronto_Software.xml
@@ -60,4 +60,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Bronxzoo.com.xml b/src/chrome/content/rules/Bronxzoo.com.xml
new file mode 100644
index 000000000000..de53f05903b4
--- /dev/null
+++ b/src/chrome/content/rules/Bronxzoo.com.xml
@@ -0,0 +1,17 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Brookings_Institution.xml b/src/chrome/content/rules/Brookings_Institution.xml
index a86346cdcb39..050c6e9113f4 100644
--- a/src/chrome/content/rules/Brookings_Institution.xml
+++ b/src/chrome/content/rules/Brookings_Institution.xml
@@ -19,4 +19,4 @@
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Brookline_College.edu.xml b/src/chrome/content/rules/Brookline_College.edu.xml
index ceb52b7d0d74..235b867ba652 100644
--- a/src/chrome/content/rules/Brookline_College.edu.xml
+++ b/src/chrome/content/rules/Brookline_College.edu.xml
@@ -12,10 +12,14 @@ Non-2xx HTTP code: http://brooklinecollege.edu/ (200) => https://brooklinecolleg
 	* Secured by us
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
+	
 
 
 	
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Brookside_Capital.xml b/src/chrome/content/rules/Brookside_Capital.xml
index 0a0366961dc6..fb4575e5324f 100644
--- a/src/chrome/content/rules/Brookside_Capital.xml
+++ b/src/chrome/content/rules/Brookside_Capital.xml
@@ -6,15 +6,15 @@ Fetch error: http://brooksidefund.com/ => https://brooksidefund.com/: (51, "SSL:
 Disabled by https-everywhere-checker because:
 Fetch error: http://brooksidefund.com/ => https://brooksidefund.com/: (51, "SSL: no alternative certificate subject name matches target host name 'brooksidefund.com'")
 -->
-
+
 
 	
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/BroomeCC.xml b/src/chrome/content/rules/BroomeCC.xml
index 8f93e9270848..526887bc4a7c 100644
--- a/src/chrome/content/rules/BroomeCC.xml
+++ b/src/chrome/content/rules/BroomeCC.xml
@@ -41,7 +41,7 @@ Fetch error: http://bccserve.sunybroome.edu/ => https://bccserve.sunybroome.edu/
 	¹ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Brown-Paper-Tickets.xml b/src/chrome/content/rules/Brown-Paper-Tickets.xml
index 6f0a66cb4106..8b717d9ba611 100644
--- a/src/chrome/content/rules/Brown-Paper-Tickets.xml
+++ b/src/chrome/content/rules/Brown-Paper-Tickets.xml
@@ -15,7 +15,7 @@ Fetch error: http://brownpapertickets.com/ => https://www.brownpapertickets.com/
 		
 		
 
-  
   
 
diff --git a/src/chrome/content/rules/BrowseAloud.com.xml b/src/chrome/content/rules/BrowseAloud.com.xml
index 4038a270b0f8..59ffba778978 100644
--- a/src/chrome/content/rules/BrowseAloud.com.xml
+++ b/src/chrome/content/rules/BrowseAloud.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://browsealoud.com/ => https://browsealoud.com/: (28, 'Connection timed out after 20000 milliseconds')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/BrowserLeaks.xml b/src/chrome/content/rules/BrowserLeaks.xml
deleted file mode 100644
index b9b0abbc194d..000000000000
--- a/src/chrome/content/rules/BrowserLeaks.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/BrowserShots.xml b/src/chrome/content/rules/BrowserShots.xml
index a3d155b58aaa..0810431b50dd 100644
--- a/src/chrome/content/rules/BrowserShots.xml
+++ b/src/chrome/content/rules/BrowserShots.xml
@@ -8,11 +8,11 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://browsershots.org/ => https://browsershots.org/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 Fetch error: http://www.browsershots.org/ => https://browsershots.org/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 -->
-
+
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/Browser_Hacker.com.xml b/src/chrome/content/rules/Browser_Hacker.com.xml
index d4cc029a9df2..c15fdec063ee 100644
--- a/src/chrome/content/rules/Browser_Hacker.com.xml
+++ b/src/chrome/content/rules/Browser_Hacker.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.browserhacker.com/ => https://browserhacker.com/: (6, 'C
 	www.browserhacker.com: Refused
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Browserprint.info.xml b/src/chrome/content/rules/Browserprint.info.xml
index 29eafe1dc572..3f4d1f0158d4 100644
--- a/src/chrome/content/rules/Browserprint.info.xml
+++ b/src/chrome/content/rules/Browserprint.info.xml
@@ -39,7 +39,7 @@
 	
 	
 	
-	 
+	
 
 	
 
diff --git a/src/chrome/content/rules/Browsersafetymark.io.xml b/src/chrome/content/rules/Browsersafetymark.io.xml
index 6e0d52762c82..65d0f8466b9a 100644
--- a/src/chrome/content/rules/Browsersafetymark.io.xml
+++ b/src/chrome/content/rules/Browsersafetymark.io.xml
@@ -6,7 +6,7 @@ Fetch error: http://fpd3a.browsersafetymark.io/ => https://fpd3a.browsersafetyma
 Fetch error: http://fp3a.websafetymark.io/ => https://fp3a.websafetymark.io/: (6, 'Could not resolve host: fp3a.websafetymark.io')
 Fetch error: http://fpd3a.websafetymark.io/ => https://fpd3a.websafetymark.io/: (6, 'Could not resolve host: fpd3a.websafetymark.io')
  This is for a site testing for installation of HTTPS Everywhere -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/BtcTrade.com.xml b/src/chrome/content/rules/BtcTrade.com.xml
deleted file mode 100644
index e3ac4fe3c067..000000000000
--- a/src/chrome/content/rules/BtcTrade.com.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Bter.com.xml b/src/chrome/content/rules/Bter.com.xml
deleted file mode 100644
index 34750b1bc7e9..000000000000
--- a/src/chrome/content/rules/Bter.com.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/BuKoF.de.xml b/src/chrome/content/rules/BuKoF.de.xml
new file mode 100644
index 000000000000..c57c90375b96
--- /dev/null
+++ b/src/chrome/content/rules/BuKoF.de.xml
@@ -0,0 +1,13 @@
+
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Bucket_Explorer.com.xml b/src/chrome/content/rules/Bucket_Explorer.com.xml
deleted file mode 100644
index b84ac2c0294f..000000000000
--- a/src/chrome/content/rules/Bucket_Explorer.com.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Bucknell_University.xml b/src/chrome/content/rules/Bucknell_University.xml
index b5f833d3c8e8..6884c2f5f8a7 100644
--- a/src/chrome/content/rules/Bucknell_University.xml
+++ b/src/chrome/content/rules/Bucknell_University.xml
@@ -1,4 +1,13 @@
+
 
 
 	
 	
 	
 	
-	
-	
-	
+	
+	
+	
 	
 	
 	
@@ -52,19 +64,16 @@
 	
 	
 	
-	
+	
 	
 	
 	
-	
+	
 	
 	
 		
 	
 
-	
-
-	
 
diff --git a/src/chrome/content/rules/Bucyrus_Telegraph_Forum.xml b/src/chrome/content/rules/Bucyrus_Telegraph_Forum.xml
index 2786818e3689..2644b6bd87cd 100644
--- a/src/chrome/content/rules/Bucyrus_Telegraph_Forum.xml
+++ b/src/chrome/content/rules/Bucyrus_Telegraph_Forum.xml
@@ -11,7 +11,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Budget-Belize.com.xml b/src/chrome/content/rules/Budget-Belize.com.xml
new file mode 100644
index 000000000000..b092f2635387
--- /dev/null
+++ b/src/chrome/content/rules/Budget-Belize.com.xml
@@ -0,0 +1,28 @@
+
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget-Jamaica.com.xml b/src/chrome/content/rules/Budget-Jamaica.com.xml
new file mode 100644
index 000000000000..ba66f4147a5d
--- /dev/null
+++ b/src/chrome/content/rules/Budget-Jamaica.com.xml
@@ -0,0 +1,27 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget-Martinique.com.xml b/src/chrome/content/rules/Budget-Martinique.com.xml
new file mode 100644
index 000000000000..3dca00bda958
--- /dev/null
+++ b/src/chrome/content/rules/Budget-Martinique.com.xml
@@ -0,0 +1,13 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget-Panama.com.xml b/src/chrome/content/rules/Budget-Panama.com.xml
new file mode 100644
index 000000000000..8fd15fd1969d
--- /dev/null
+++ b/src/chrome/content/rules/Budget-Panama.com.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget-Peru.com.xml b/src/chrome/content/rules/Budget-Peru.com.xml
new file mode 100644
index 000000000000..3f9f80837e5d
--- /dev/null
+++ b/src/chrome/content/rules/Budget-Peru.com.xml
@@ -0,0 +1,25 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget.ba.xml b/src/chrome/content/rules/Budget.ba.xml
new file mode 100644
index 000000000000..6f227df14f2c
--- /dev/null
+++ b/src/chrome/content/rules/Budget.ba.xml
@@ -0,0 +1,18 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget.ca.xml b/src/chrome/content/rules/Budget.ca.xml
new file mode 100644
index 000000000000..7ec74e56e09a
--- /dev/null
+++ b/src/chrome/content/rules/Budget.ca.xml
@@ -0,0 +1,27 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget.co.cr.xml b/src/chrome/content/rules/Budget.co.cr.xml
new file mode 100644
index 000000000000..3141869ce20a
--- /dev/null
+++ b/src/chrome/content/rules/Budget.co.cr.xml
@@ -0,0 +1,26 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget.co.nz.xml b/src/chrome/content/rules/Budget.co.nz.xml
new file mode 100644
index 000000000000..dabbaabd4fb4
--- /dev/null
+++ b/src/chrome/content/rules/Budget.co.nz.xml
@@ -0,0 +1,42 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget.co.uk.xml b/src/chrome/content/rules/Budget.co.uk.xml
new file mode 100644
index 000000000000..187fc0d49867
--- /dev/null
+++ b/src/chrome/content/rules/Budget.co.uk.xml
@@ -0,0 +1,36 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget.co.za.xml b/src/chrome/content/rules/Budget.co.za.xml
new file mode 100644
index 000000000000..dfb87ab1eb8c
--- /dev/null
+++ b/src/chrome/content/rules/Budget.co.za.xml
@@ -0,0 +1,36 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget.com.ar.xml b/src/chrome/content/rules/Budget.com.ar.xml
new file mode 100644
index 000000000000..0c543d7e4dbe
--- /dev/null
+++ b/src/chrome/content/rules/Budget.com.ar.xml
@@ -0,0 +1,26 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget.com.au.xml b/src/chrome/content/rules/Budget.com.au.xml
new file mode 100644
index 000000000000..65b4a655ee4c
--- /dev/null
+++ b/src/chrome/content/rules/Budget.com.au.xml
@@ -0,0 +1,42 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget.com.do.xml b/src/chrome/content/rules/Budget.com.do.xml
new file mode 100644
index 000000000000..f0692f5cec13
--- /dev/null
+++ b/src/chrome/content/rules/Budget.com.do.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget.com.fj.xml b/src/chrome/content/rules/Budget.com.fj.xml
new file mode 100644
index 000000000000..f01f1784f897
--- /dev/null
+++ b/src/chrome/content/rules/Budget.com.fj.xml
@@ -0,0 +1,12 @@
+
+
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget.com.gt.xml b/src/chrome/content/rules/Budget.com.gt.xml
new file mode 100644
index 000000000000..c628cd5d63e8
--- /dev/null
+++ b/src/chrome/content/rules/Budget.com.gt.xml
@@ -0,0 +1,13 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget.com.mx.xml b/src/chrome/content/rules/Budget.com.mx.xml
new file mode 100644
index 000000000000..1bf8a86b65cd
--- /dev/null
+++ b/src/chrome/content/rules/Budget.com.mx.xml
@@ -0,0 +1,30 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget.com.pt.xml b/src/chrome/content/rules/Budget.com.pt.xml
new file mode 100644
index 000000000000..12119a6af9a4
--- /dev/null
+++ b/src/chrome/content/rules/Budget.com.pt.xml
@@ -0,0 +1,29 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget.com.sv.xml b/src/chrome/content/rules/Budget.com.sv.xml
new file mode 100644
index 000000000000..2aab9b8b4ea3
--- /dev/null
+++ b/src/chrome/content/rules/Budget.com.sv.xml
@@ -0,0 +1,13 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget.com.tr.xml b/src/chrome/content/rules/Budget.com.tr.xml
new file mode 100644
index 000000000000..cfd8a637f915
--- /dev/null
+++ b/src/chrome/content/rules/Budget.com.tr.xml
@@ -0,0 +1,28 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget.com.xml b/src/chrome/content/rules/Budget.com.xml
new file mode 100644
index 000000000000..a62039ce27e7
--- /dev/null
+++ b/src/chrome/content/rules/Budget.com.xml
@@ -0,0 +1,108 @@
+
+
+
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget.de.xml b/src/chrome/content/rules/Budget.de.xml
new file mode 100644
index 000000000000..e5907220ab4a
--- /dev/null
+++ b/src/chrome/content/rules/Budget.de.xml
@@ -0,0 +1,34 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget.dk.xml b/src/chrome/content/rules/Budget.dk.xml
new file mode 100644
index 000000000000..c4b83f87ee2d
--- /dev/null
+++ b/src/chrome/content/rules/Budget.dk.xml
@@ -0,0 +1,34 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget.ee.xml b/src/chrome/content/rules/Budget.ee.xml
new file mode 100644
index 000000000000..3d16d7135576
--- /dev/null
+++ b/src/chrome/content/rules/Budget.ee.xml
@@ -0,0 +1,30 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget.es.xml b/src/chrome/content/rules/Budget.es.xml
new file mode 100644
index 000000000000..b6780410dd66
--- /dev/null
+++ b/src/chrome/content/rules/Budget.es.xml
@@ -0,0 +1,34 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget.fr.xml b/src/chrome/content/rules/Budget.fr.xml
new file mode 100644
index 000000000000..913b26604694
--- /dev/null
+++ b/src/chrome/content/rules/Budget.fr.xml
@@ -0,0 +1,34 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget.ie.xml b/src/chrome/content/rules/Budget.ie.xml
new file mode 100644
index 000000000000..b65aaa5d5b59
--- /dev/null
+++ b/src/chrome/content/rules/Budget.ie.xml
@@ -0,0 +1,30 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget.lu.xml b/src/chrome/content/rules/Budget.lu.xml
new file mode 100644
index 000000000000..5f1c27399a32
--- /dev/null
+++ b/src/chrome/content/rules/Budget.lu.xml
@@ -0,0 +1,30 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget.lv.xml b/src/chrome/content/rules/Budget.lv.xml
new file mode 100644
index 000000000000..b8d5387f3f15
--- /dev/null
+++ b/src/chrome/content/rules/Budget.lv.xml
@@ -0,0 +1,29 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget.ma.xml b/src/chrome/content/rules/Budget.ma.xml
new file mode 100644
index 000000000000..5a9afa97629d
--- /dev/null
+++ b/src/chrome/content/rules/Budget.ma.xml
@@ -0,0 +1,29 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget.nl.xml b/src/chrome/content/rules/Budget.nl.xml
new file mode 100644
index 000000000000..81c3f25596c7
--- /dev/null
+++ b/src/chrome/content/rules/Budget.nl.xml
@@ -0,0 +1,29 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget.no.xml b/src/chrome/content/rules/Budget.no.xml
new file mode 100644
index 000000000000..5dff156c23d7
--- /dev/null
+++ b/src/chrome/content/rules/Budget.no.xml
@@ -0,0 +1,34 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budget.se.xml b/src/chrome/content/rules/Budget.se.xml
new file mode 100644
index 000000000000..96caaaac0586
--- /dev/null
+++ b/src/chrome/content/rules/Budget.se.xml
@@ -0,0 +1,34 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budgetautonoleggio.it.xml b/src/chrome/content/rules/Budgetautonoleggio.it.xml
new file mode 100644
index 000000000000..82d0504509b6
--- /dev/null
+++ b/src/chrome/content/rules/Budgetautonoleggio.it.xml
@@ -0,0 +1,34 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Budgetkredit.ch.xml b/src/chrome/content/rules/Budgetkredit.ch.xml
index eff82b024944..a20f18491cd0 100644
--- a/src/chrome/content/rules/Budgetkredit.ch.xml
+++ b/src/chrome/content/rules/Budgetkredit.ch.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Buds_Gun_Shop.xml b/src/chrome/content/rules/Buds_Gun_Shop.xml
index c83601b353af..601c8932670f 100644
--- a/src/chrome/content/rules/Buds_Gun_Shop.xml
+++ b/src/chrome/content/rules/Buds_Gun_Shop.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Bues.ch.xml b/src/chrome/content/rules/Bues.ch.xml
new file mode 100644
index 000000000000..d5a1699703fa
--- /dev/null
+++ b/src/chrome/content/rules/Bues.ch.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Buffer.xml b/src/chrome/content/rules/Buffer.xml
index 50b9b71240a5..0259fd1f8d8d 100644
--- a/src/chrome/content/rules/Buffer.xml
+++ b/src/chrome/content/rules/Buffer.xml
@@ -34,7 +34,7 @@ Fetch error: http://static.bufferapp.com/ => https://static.bufferapp.com/: (60,
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/BugMeNot.com.xml b/src/chrome/content/rules/BugMeNot.com.xml
index 71d285036e38..f272eb3af87f 100644
--- a/src/chrome/content/rules/BugMeNot.com.xml
+++ b/src/chrome/content/rules/BugMeNot.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://bugmenot.com/ => https://bugmenot.com/: Cycle detected - URL
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Bukalapak.com.xml b/src/chrome/content/rules/Bukalapak.com.xml
new file mode 100644
index 000000000000..0a2db4683370
--- /dev/null
+++ b/src/chrome/content/rules/Bukalapak.com.xml
@@ -0,0 +1,16 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Bulbman.xml b/src/chrome/content/rules/Bulbman.xml
index ebbf454a7674..8e804f2b9763 100644
--- a/src/chrome/content/rules/Bulbman.xml
+++ b/src/chrome/content/rules/Bulbman.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://bulbman.com/ => https://www.bulbman.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.bulbman.com'")
 Fetch error: http://www.bulbman.com/ => https://www.bulbman.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.bulbman.com'")
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/BulkSMS.xml b/src/chrome/content/rules/BulkSMS.xml
deleted file mode 100644
index edc58edf6176..000000000000
--- a/src/chrome/content/rules/BulkSMS.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-  
-  
-
-  
-
-  
-
diff --git a/src/chrome/content/rules/BulletProof_Meteor.com.xml b/src/chrome/content/rules/BulletProof_Meteor.com.xml
index a5b7cef202c9..6e250da9f462 100644
--- a/src/chrome/content/rules/BulletProof_Meteor.com.xml
+++ b/src/chrome/content/rules/BulletProof_Meteor.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://bulletproofmeteor.com/ => https://bulletproofmeteor.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Bulletin_Messenger.net.xml b/src/chrome/content/rules/Bulletin_Messenger.net.xml
index 9df2a95961f6..1a2cd37a1321 100644
--- a/src/chrome/content/rules/Bulletin_Messenger.net.xml
+++ b/src/chrome/content/rules/Bulletin_Messenger.net.xml
@@ -17,7 +17,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -27,7 +28,6 @@
 		to="https://www.bulletinmessenger.net/" />
 
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Bum.org.xml b/src/chrome/content/rules/Bum.org.xml
new file mode 100644
index 000000000000..e70075f6d724
--- /dev/null
+++ b/src/chrome/content/rules/Bum.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Bunchball.com.xml b/src/chrome/content/rules/Bunchball.com.xml
index f36e40b86f72..0c6aefc7099b 100644
--- a/src/chrome/content/rules/Bunchball.com.xml
+++ b/src/chrome/content/rules/Bunchball.com.xml
@@ -28,7 +28,7 @@ Fetch error: http://go.bunchball.com/ => https://www.bunchball.com/: (51, "SSL:
 		- (www.)?
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Bunchball.xml b/src/chrome/content/rules/Bunchball.xml
index 70daaffc94d5..020cb068ab5f 100644
--- a/src/chrome/content/rules/Bunchball.xml
+++ b/src/chrome/content/rules/Bunchball.xml
@@ -13,7 +13,7 @@ Fetch error: http://www.bunchball.net/ => https://www.bunchball.net/: (51, "SSL:
 		- assets
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/BundanonTrust.xml b/src/chrome/content/rules/BundanonTrust.xml
index 16802703367f..fef34efa7170 100644
--- a/src/chrome/content/rules/BundanonTrust.xml
+++ b/src/chrome/content/rules/BundanonTrust.xml
@@ -10,10 +10,10 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://bundanon.com.au/ => https://www.bundanon.com.au/: (52, 'Empty reply from server')
 
 -->
-
+
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Bundesanzeiger.de.xml b/src/chrome/content/rules/Bundesanzeiger.de.xml
new file mode 100644
index 000000000000..ce4fbde4663e
--- /dev/null
+++ b/src/chrome/content/rules/Bundesanzeiger.de.xml
@@ -0,0 +1,20 @@
+
+
+
+	
+	
+	
+	
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Bundesarbeitsgericht.de.xml b/src/chrome/content/rules/Bundesarbeitsgericht.de.xml
new file mode 100644
index 000000000000..20a65e45f353
--- /dev/null
+++ b/src/chrome/content/rules/Bundesarbeitsgericht.de.xml
@@ -0,0 +1,12 @@
+
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Bundesarchiv.de.xml b/src/chrome/content/rules/Bundesarchiv.de.xml
new file mode 100644
index 000000000000..a3768b8571c7
--- /dev/null
+++ b/src/chrome/content/rules/Bundesarchiv.de.xml
@@ -0,0 +1,25 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Bundesbank.de.xml b/src/chrome/content/rules/Bundesbank.de.xml
new file mode 100644
index 000000000000..76ace03b8b0b
--- /dev/null
+++ b/src/chrome/content/rules/Bundesbank.de.xml
@@ -0,0 +1,54 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Bundesdruckerei.de.xml b/src/chrome/content/rules/Bundesdruckerei.de.xml
new file mode 100644
index 000000000000..0be449dd881b
--- /dev/null
+++ b/src/chrome/content/rules/Bundesdruckerei.de.xml
@@ -0,0 +1,37 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Bundesfinanzhof.de.xml b/src/chrome/content/rules/Bundesfinanzhof.de.xml
new file mode 100644
index 000000000000..9eadf3d96a13
--- /dev/null
+++ b/src/chrome/content/rules/Bundesfinanzhof.de.xml
@@ -0,0 +1,17 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Bundesfinanzministerium.de.xml b/src/chrome/content/rules/Bundesfinanzministerium.de.xml
new file mode 100644
index 000000000000..76c095b9e1fb
--- /dev/null
+++ b/src/chrome/content/rules/Bundesfinanzministerium.de.xml
@@ -0,0 +1,20 @@
+
+
+	
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Bundesgerichtshof.de.xml b/src/chrome/content/rules/Bundesgerichtshof.de.xml
new file mode 100644
index 000000000000..a15999165b2b
--- /dev/null
+++ b/src/chrome/content/rules/Bundesgerichtshof.de.xml
@@ -0,0 +1,17 @@
+
+
+	
+
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Bundesgesundheitsministerium.de.xml b/src/chrome/content/rules/Bundesgesundheitsministerium.de.xml
new file mode 100644
index 000000000000..52c94e007e7a
--- /dev/null
+++ b/src/chrome/content/rules/Bundesgesundheitsministerium.de.xml
@@ -0,0 +1,22 @@
+
+
+	
+
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Bundesimmobilien.de.xml b/src/chrome/content/rules/Bundesimmobilien.de.xml
new file mode 100644
index 000000000000..6dacedacdd57
--- /dev/null
+++ b/src/chrome/content/rules/Bundesimmobilien.de.xml
@@ -0,0 +1,54 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Bundeskartellamt.de.xml b/src/chrome/content/rules/Bundeskartellamt.de.xml
new file mode 100644
index 000000000000..51e675fd0d1c
--- /dev/null
+++ b/src/chrome/content/rules/Bundeskartellamt.de.xml
@@ -0,0 +1,20 @@
+
+
+	
+
+	
+	
+	
+
+	
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Bundespatentgericht.de.xml b/src/chrome/content/rules/Bundespatentgericht.de.xml
new file mode 100644
index 000000000000..0f6b391d14ba
--- /dev/null
+++ b/src/chrome/content/rules/Bundespatentgericht.de.xml
@@ -0,0 +1,11 @@
+
+	
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Bundespraesident.de.xml b/src/chrome/content/rules/Bundespraesident.de.xml
new file mode 100644
index 000000000000..b6d6e1398d0c
--- /dev/null
+++ b/src/chrome/content/rules/Bundespraesident.de.xml
@@ -0,0 +1,11 @@
+
+	
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Bundesrechnungshof.de.xml b/src/chrome/content/rules/Bundesrechnungshof.de.xml
new file mode 100644
index 000000000000..751532bb72d7
--- /dev/null
+++ b/src/chrome/content/rules/Bundesrechnungshof.de.xml
@@ -0,0 +1,12 @@
+
+
+
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Bundesverband_IT-Mittelstand.xml b/src/chrome/content/rules/Bundesverband_IT-Mittelstand.xml
index 21daecdbfc7b..285531be87ba 100644
--- a/src/chrome/content/rules/Bundesverband_IT-Mittelstand.xml
+++ b/src/chrome/content/rules/Bundesverband_IT-Mittelstand.xml
@@ -12,4 +12,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/BureauofInfrastructureTransportandRegionalEconomics.xml b/src/chrome/content/rules/BureauofInfrastructureTransportandRegionalEconomics.xml
index f0265866ac2e..3b5ab12aeced 100644
--- a/src/chrome/content/rules/BureauofInfrastructureTransportandRegionalEconomics.xml
+++ b/src/chrome/content/rules/BureauofInfrastructureTransportandRegionalEconomics.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Burlington_Free_Press.xml b/src/chrome/content/rules/Burlington_Free_Press.xml
index 8d117a6f8c0b..8527d2686733 100644
--- a/src/chrome/content/rules/Burlington_Free_Press.xml
+++ b/src/chrome/content/rules/Burlington_Free_Press.xml
@@ -11,7 +11,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Burnley.gov.uk.xml b/src/chrome/content/rules/Burnley.gov.uk.xml
index 7c95d31b8760..73afc9cbd839 100644
--- a/src/chrome/content/rules/Burnley.gov.uk.xml
+++ b/src/chrome/content/rules/Burnley.gov.uk.xml
@@ -23,7 +23,7 @@
 		- css on (www.)? from www.burnley.gov.uk ˢ
 
 		- Images, on:
-		
+
 			- (www.)? from l.yimg.com ˢ
 			- (www.)? from www.burnley.gov.uk ˢ
 
diff --git a/src/chrome/content/rules/BurstNET.xml b/src/chrome/content/rules/BurstNET.xml
index 853638bcb040..a21b3a1b207d 100644
--- a/src/chrome/content/rules/BurstNET.xml
+++ b/src/chrome/content/rules/BurstNET.xml
@@ -19,7 +19,7 @@ Fetch error: http://burstnet.eu/ => https://burstnet.eu/: (28, 'Connection timed
 		- forums.burst.net	(times out)
 
 -->
-
+
 
 	
 	
@@ -35,4 +35,4 @@ Fetch error: http://burstnet.eu/ => https://burstnet.eu/: (28, 'Connection timed
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Burst_Media.xml b/src/chrome/content/rules/Burst_Media.xml
index 6f5de65a3940..60036aa8f2e8 100644
--- a/src/chrome/content/rules/Burst_Media.xml
+++ b/src/chrome/content/rules/Burst_Media.xml
@@ -12,12 +12,12 @@ Fetch error: http://www.burstmedia.co.uk/ => https://www.burstmedia.co.uk/: (7,
 	!www: cert only matches www
 
 -->
-
+
 
 	
 	
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Burstnet.com.xml b/src/chrome/content/rules/Burstnet.com.xml
index 74ee0d232043..d892552d087c 100644
--- a/src/chrome/content/rules/Burstnet.com.xml
+++ b/src/chrome/content/rules/Burstnet.com.xml
@@ -7,15 +7,12 @@
 -->
 
 
-	
+	
 
 
 	
-	
 
+	
 
-	
-
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Burt.xml b/src/chrome/content/rules/Burt.xml
deleted file mode 100644
index 790315c409be..000000000000
--- a/src/chrome/content/rules/Burt.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Burt_hub.com.xml b/src/chrome/content/rules/Burt_hub.com.xml
index 53461105cd64..117162309e85 100644
--- a/src/chrome/content/rules/Burt_hub.com.xml
+++ b/src/chrome/content/rules/Burt_hub.com.xml
@@ -8,7 +8,6 @@ Fetch error: http://help.burthub.com/ => https://help.burthub.com/: Too many red
 
 	Other Burt rulesets:
 
-		- Burt.xml
 		- Burt.io.xml
 
 
@@ -29,7 +28,7 @@ Fetch error: http://help.burthub.com/ => https://help.burthub.com/: Too many red
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/BusinessAU.xml b/src/chrome/content/rules/BusinessAU.xml
deleted file mode 100644
index 945727aebb3b..000000000000
--- a/src/chrome/content/rules/BusinessAU.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	
-	
-
-	
-
-	
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/BusinessWeek.com.xml b/src/chrome/content/rules/BusinessWeek.com.xml
deleted file mode 100644
index e8f3d05076f0..000000000000
--- a/src/chrome/content/rules/BusinessWeek.com.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Business_2_Community.xml b/src/chrome/content/rules/Business_2_Community.xml
index b3484d6c6e8d..7a83717f88fd 100644
--- a/src/chrome/content/rules/Business_2_Community.xml
+++ b/src/chrome/content/rules/Business_2_Community.xml
@@ -20,4 +20,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Business_Catalyst.com-problematic.xml b/src/chrome/content/rules/Business_Catalyst.com-problematic.xml
index 283eb5328f08..1c2d9f559afc 100644
--- a/src/chrome/content/rules/Business_Catalyst.com-problematic.xml
+++ b/src/chrome/content/rules/Business_Catalyst.com-problematic.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Business_Link.gov.uk.xml b/src/chrome/content/rules/Business_Link.gov.uk.xml
index ac962d295b42..2015fa7021bf 100644
--- a/src/chrome/content/rules/Business_Link.gov.uk.xml
+++ b/src/chrome/content/rules/Business_Link.gov.uk.xml
@@ -17,6 +17,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/Butterfly_Labs.com.xml b/src/chrome/content/rules/Butterfly_Labs.com.xml
deleted file mode 100644
index 12e0f137e406..000000000000
--- a/src/chrome/content/rules/Butterfly_Labs.com.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/ButtonNoses.com.xml b/src/chrome/content/rules/ButtonNoses.com.xml
new file mode 100644
index 000000000000..f7938d96b242
--- /dev/null
+++ b/src/chrome/content/rules/ButtonNoses.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/BuyBoard.xml b/src/chrome/content/rules/BuyBoard.xml
index 20cb2b31f743..fa2ae7233ed7 100644
--- a/src/chrome/content/rules/BuyBoard.xml
+++ b/src/chrome/content/rules/BuyBoard.xml
@@ -10,7 +10,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://buyboard.com/ => https://buyboard.com/: (51, "SSL: no alternative certificate subject name matches target host name 'buyboard.com'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/BuyMeACoffee.com.xml b/src/chrome/content/rules/BuyMeACoffee.com.xml
new file mode 100644
index 000000000000..f52c8f76e53e
--- /dev/null
+++ b/src/chrome/content/rules/BuyMeACoffee.com.xml
@@ -0,0 +1,12 @@
+
+	
+	
+	
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/BuySellAds.xml b/src/chrome/content/rules/BuySellAds.xml
index 7546f86bdf24..bebc5a58518a 100644
--- a/src/chrome/content/rules/BuySellAds.xml
+++ b/src/chrome/content/rules/BuySellAds.xml
@@ -12,7 +12,8 @@
 
 
 	
-	
+	
+	
 
 
 	
-
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Buzzdoes.com.xml b/src/chrome/content/rules/Buzzdoes.com.xml
index 77432afb0eb9..32cc8133e893 100644
--- a/src/chrome/content/rules/Buzzdoes.com.xml
+++ b/src/chrome/content/rules/Buzzdoes.com.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://buzzdoes.com/ => https://buzzdoes.com/: (28, 'Connection timed out after 10000 milliseconds')
 Fetch error: http://www.buzzdoes.com/ => https://www.buzzdoes.com/: (28, 'Connection timed out after 10000 milliseconds')
 -->
-
+
 
 	
 	
@@ -19,4 +19,4 @@ Fetch error: http://www.buzzdoes.com/ => https://www.buzzdoes.com/: (28, 'Connec
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Buzzhosting.org.xml b/src/chrome/content/rules/Buzzhosting.org.xml
deleted file mode 100644
index 4322b43720d4..000000000000
--- a/src/chrome/content/rules/Buzzhosting.org.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Buzzurl.xml b/src/chrome/content/rules/Buzzurl.xml
index 938cf0df6ee7..5dadee748733 100644
--- a/src/chrome/content/rules/Buzzurl.xml
+++ b/src/chrome/content/rules/Buzzurl.xml
@@ -22,10 +22,11 @@ Fetch error: http://buzzurl.jp.eimg.jp/ => https://buzzurl.jp/: (28, 'Connection
 		- buzzurl.jp.eimg.jp	(cert: jpssl.cdngc.net; 403)
 
 -->
-
+
 
 	
-	
+	
+	
 	
 
 
diff --git a/src/chrome/content/rules/ByCraft.cz.xml b/src/chrome/content/rules/ByCraft.cz.xml
deleted file mode 100644
index 411becbefbae..000000000000
--- a/src/chrome/content/rules/ByCraft.cz.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-    
-    
-
-    
-
diff --git a/src/chrome/content/rules/By_David_Wittig.com.xml b/src/chrome/content/rules/By_David_Wittig.com.xml
deleted file mode 100644
index ccadcd688e26..000000000000
--- a/src/chrome/content/rules/By_David_Wittig.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Byte.nl.xml b/src/chrome/content/rules/Byte.nl.xml
deleted file mode 100644
index f0b5811ac28f..000000000000
--- a/src/chrome/content/rules/Byte.nl.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Bytemark.co.uk.xml b/src/chrome/content/rules/Bytemark.co.uk.xml
index 6439a4fce563..aaca5111d37f 100644
--- a/src/chrome/content/rules/Bytemark.co.uk.xml
+++ b/src/chrome/content/rules/Bytemark.co.uk.xml
@@ -21,7 +21,7 @@ Fetch error: http://status.bytemark.co.uk/ => https://status.bytemark.co.uk/: (6
 		- status.bytemark.co.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Bytenoc.nl.xml b/src/chrome/content/rules/Bytenoc.nl.xml
deleted file mode 100644
index a7ec817a93bc..000000000000
--- a/src/chrome/content/rules/Bytenoc.nl.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/C-Base.org.xml b/src/chrome/content/rules/C-Base.org.xml
index 501fee44cc16..69f41c205fab 100644
--- a/src/chrome/content/rules/C-Base.org.xml
+++ b/src/chrome/content/rules/C-Base.org.xml
@@ -1,5 +1,5 @@
 
-
-
-	
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/C-and-a.com.xml b/src/chrome/content/rules/C-and-a.com.xml
index c89bc5296131..96838ba83ed9 100644
--- a/src/chrome/content/rules/C-and-a.com.xml
+++ b/src/chrome/content/rules/C-and-a.com.xml
@@ -16,7 +16,8 @@
 
 
 	
-		
+	
+	
 
 
 	
@@ -25,7 +26,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/C3noc.net.xml b/src/chrome/content/rules/C3noc.net.xml
index 81d7425b684c..f38658efb4b8 100644
--- a/src/chrome/content/rules/C3noc.net.xml
+++ b/src/chrome/content/rules/C3noc.net.xml
@@ -6,7 +6,7 @@ Fetch error: http://vpn.c3noc.net/ => https://vpn.c3noc.net/: (7, 'Failed to con
 Fetch error: http://www.c3noc.net/ => https://www.c3noc.net/: (51, "SSL: no alternative certificate subject name matches target host name 'www.c3noc.net'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/C3tag.com.xml b/src/chrome/content/rules/C3tag.com.xml
index e65ead701b1b..5afc01f63fca 100644
--- a/src/chrome/content/rules/C3tag.com.xml
+++ b/src/chrome/content/rules/C3tag.com.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/C4tw.net.xml b/src/chrome/content/rules/C4tw.net.xml
index f68f1acf32e9..fea286c84602 100644
--- a/src/chrome/content/rules/C4tw.net.xml
+++ b/src/chrome/content/rules/C4tw.net.xml
@@ -28,7 +28,7 @@ Fetch error: http://c4tw.net/ => https://c4tw.net/: (7, 'Failed to connect to c4
 	www doesn't exist.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/CA-PCA.fr.xml b/src/chrome/content/rules/CA-PCA.fr.xml
index def55e72b9ea..e95a6d0a4cb9 100644
--- a/src/chrome/content/rules/CA-PCA.fr.xml
+++ b/src/chrome/content/rules/CA-PCA.fr.xml
@@ -11,7 +11,7 @@
 	
 	
 
-	
 
 	
 
-	
 	
-	
 
-	
-
-	
-	
-
-	
-	
+	
 
diff --git a/src/chrome/content/rules/CA-Technologies.xml b/src/chrome/content/rules/CA-Technologies.xml
deleted file mode 100644
index 087021add5ab..000000000000
--- a/src/chrome/content/rules/CA-Technologies.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-
-    
-
-
diff --git a/src/chrome/content/rules/CA-mpr.jp.xml b/src/chrome/content/rules/CA-mpr.jp.xml
deleted file mode 100644
index 542dc5ef16b8..000000000000
--- a/src/chrome/content/rules/CA-mpr.jp.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/CA.com.xml b/src/chrome/content/rules/CA.com.xml
index 3d507c0cdb17..e68cdb1891ac 100644
--- a/src/chrome/content/rules/CA.com.xml
+++ b/src/chrome/content/rules/CA.com.xml
@@ -55,7 +55,7 @@ Non-2xx HTTP code: http://trials.ca.com/us/~/media/trials/images/icons/google-pl
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/CAD-Comic.com.xml b/src/chrome/content/rules/CAD-Comic.com.xml
new file mode 100644
index 000000000000..0b7a262fd374
--- /dev/null
+++ b/src/chrome/content/rules/CAD-Comic.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/CAGW.org.xml b/src/chrome/content/rules/CAGW.org.xml
deleted file mode 100644
index 7e469095b0e5..000000000000
--- a/src/chrome/content/rules/CAGW.org.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/CAREpackage.xml b/src/chrome/content/rules/CAREpackage.xml
index 0075fcc9197b..9266787ef623 100644
--- a/src/chrome/content/rules/CAREpackage.xml
+++ b/src/chrome/content/rules/CAREpackage.xml
@@ -8,7 +8,7 @@
 
 
 	
-	
+	
 
 
 	
-
+
 
 	
 	
 	
 
 
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/CAcert.xml b/src/chrome/content/rules/CAcert.xml
index 5a6f4ded2efc..e285b31b1471 100644
--- a/src/chrome/content/rules/CAcert.xml
+++ b/src/chrome/content/rules/CAcert.xml
@@ -14,7 +14,7 @@ Fetch error: http://cacert.com/ => https://cacert.com/: (60, 'SSL certificate pr
 Fetch error: http://www.cacert.com/ => https://www.cacert.com/: (60, 'SSL certificate problem: self signed certificate in certificate chain')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/CBC_Blueprint.xml b/src/chrome/content/rules/CBC_Blueprint.xml
index c9ce8d2ac5d7..ec7ca4f8b2b7 100644
--- a/src/chrome/content/rules/CBC_Blueprint.xml
+++ b/src/chrome/content/rules/CBC_Blueprint.xml
@@ -16,4 +16,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CBS-Sports-Network.xml b/src/chrome/content/rules/CBS-Sports-Network.xml
index 715b80a90c76..76eb453b122c 100644
--- a/src/chrome/content/rules/CBS-Sports-Network.xml
+++ b/src/chrome/content/rules/CBS-Sports-Network.xml
@@ -1,24 +1,16 @@
 
-
-
-	
+
 	
-	
-	
-
-
-	
-
+	
+	
 
-	
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/CBS.xml b/src/chrome/content/rules/CBS.xml
index b2bec01e1f9a..2c7d66721edd 100644
--- a/src/chrome/content/rules/CBS.xml
+++ b/src/chrome/content/rules/CBS.xml
@@ -1,165 +1,40 @@
 
-
-
+
 	
-	
-		
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-	
+	
+	
+	
 
+	
 
diff --git a/src/chrome/content/rules/CBSInteractive.com.au.xml b/src/chrome/content/rules/CBSInteractive.com.au.xml
new file mode 100644
index 000000000000..1695d7934d62
--- /dev/null
+++ b/src/chrome/content/rules/CBSInteractive.com.au.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/CBSInteractive.com.xml b/src/chrome/content/rules/CBSInteractive.com.xml
new file mode 100644
index 000000000000..88578b70df06
--- /dev/null
+++ b/src/chrome/content/rules/CBSInteractive.com.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/CBSNews.com.xml b/src/chrome/content/rules/CBSNews.com.xml
new file mode 100644
index 000000000000..63ff075f774e
--- /dev/null
+++ b/src/chrome/content/rules/CBSNews.com.xml
@@ -0,0 +1,140 @@
+
+
+
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/CBSNews.xml b/src/chrome/content/rules/CBSNews.xml
deleted file mode 100644
index f7a0bfb5c7e7..000000000000
--- a/src/chrome/content/rules/CBSNews.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/CBSStatic.com.xml b/src/chrome/content/rules/CBSStatic.com.xml
new file mode 100644
index 000000000000..24f0d4c7ef5f
--- /dev/null
+++ b/src/chrome/content/rules/CBSStatic.com.xml
@@ -0,0 +1,46 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/CBS_Local.xml b/src/chrome/content/rules/CBS_Local.xml
index 6ce9e5814fc8..77078c99266a 100644
--- a/src/chrome/content/rules/CBS_Local.xml
+++ b/src/chrome/content/rules/CBS_Local.xml
@@ -8,4 +8,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CBS_Store.xml b/src/chrome/content/rules/CBS_Store.xml
index 128fe098cf98..47682e35419d 100644
--- a/src/chrome/content/rules/CBS_Store.xml
+++ b/src/chrome/content/rules/CBS_Store.xml
@@ -1,30 +1,20 @@
 
 
-
 	
-	
-
+	
+	
 
 	
 
+	
 
-	
-
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/CBSi.com.au.xml b/src/chrome/content/rules/CBSi.com.au.xml
new file mode 100644
index 000000000000..50131f982dfb
--- /dev/null
+++ b/src/chrome/content/rules/CBSi.com.au.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/CBSimg.net.xml b/src/chrome/content/rules/CBSimg.net.xml
new file mode 100644
index 000000000000..cf02e018f2dc
--- /dev/null
+++ b/src/chrome/content/rules/CBSimg.net.xml
@@ -0,0 +1,16 @@
+
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/CC.com.xml b/src/chrome/content/rules/CC.com.xml
index 96209cd59fb5..dfd61d4cd092 100644
--- a/src/chrome/content/rules/CC.com.xml
+++ b/src/chrome/content/rules/CC.com.xml
@@ -1,38 +1,27 @@
-
 
+	
+	
 
-	
-
-
-	
-	
-
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/CCAvenue.xml b/src/chrome/content/rules/CCAvenue.xml
index 93a84605d2ed..1c03fb989ab6 100644
--- a/src/chrome/content/rules/CCAvenue.xml
+++ b/src/chrome/content/rules/CCAvenue.xml
@@ -7,7 +7,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
@@ -16,7 +18,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/CCC-Mannheim.de.xml b/src/chrome/content/rules/CCC-Mannheim.de.xml
index 0ef28f4e85cf..df79bcdbc7b3 100644
--- a/src/chrome/content/rules/CCC-Mannheim.de.xml
+++ b/src/chrome/content/rules/CCC-Mannheim.de.xml
@@ -5,7 +5,7 @@ Fetch error: http://ccc-mannheim.de/ => https://ccc-mannheim.de/: (60, 'SSL cert
 Fetch error: http://www.ccc-mannheim.de/ => https://www.ccc-mannheim.de/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/CCH.xml b/src/chrome/content/rules/CCH.xml
index 132f67adb1d8..d645cbeec84b 100644
--- a/src/chrome/content/rules/CCH.xml
+++ b/src/chrome/content/rules/CCH.xml
@@ -14,16 +14,20 @@
 
 
 	
-	
+	
+	
+	
 	
-	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
 
 	
@@ -34,7 +38,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/CCS.xml b/src/chrome/content/rules/CCS.xml
index bd66eff8834a..4ea156425079 100644
--- a/src/chrome/content/rules/CCS.xml
+++ b/src/chrome/content/rules/CCS.xml
@@ -29,7 +29,7 @@ Fetch error: http://m.ccs.com/ => https://m.ccs.com/: (6, 'Could not resolve hos
 		- .shop.ccs.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/CCleaner.com.xml b/src/chrome/content/rules/CCleaner.com.xml
new file mode 100644
index 000000000000..395ee2f8ec60
--- /dev/null
+++ b/src/chrome/content/rules/CCleaner.com.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/CDG_Commerce.com.xml b/src/chrome/content/rules/CDG_Commerce.com.xml
index 44e712d585a0..8ec818d0638a 100644
--- a/src/chrome/content/rules/CDG_Commerce.com.xml
+++ b/src/chrome/content/rules/CDG_Commerce.com.xml
@@ -19,7 +19,7 @@ Fetch error: http://www.cdgcommerce.com/ => https://www.cdgcommerce.com/: Too ma
 		- www.cdgcommerce.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/CDIC-SADC.xml b/src/chrome/content/rules/CDIC-SADC.xml
new file mode 100644
index 000000000000..9abea24610b5
--- /dev/null
+++ b/src/chrome/content/rules/CDIC-SADC.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/CDJapan.xml b/src/chrome/content/rules/CDJapan.xml
new file mode 100644
index 000000000000..84aa64c0324d
--- /dev/null
+++ b/src/chrome/content/rules/CDJapan.xml
@@ -0,0 +1,13 @@
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/CDN-Redfin.com.xml b/src/chrome/content/rules/CDN-Redfin.com.xml
index 286353f30631..a63dfb7e6b9e 100644
--- a/src/chrome/content/rules/CDN-Redfin.com.xml
+++ b/src/chrome/content/rules/CDN-Redfin.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://ssl.cdn-redfin.com/ => https://ssl.cdn-redfin.com/: Too many
 	For other Redfin coverage, see Redfin.com.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/CDN77.com-problematic.xml b/src/chrome/content/rules/CDN77.com-problematic.xml
index 977c70028447..5911243153e4 100644
--- a/src/chrome/content/rules/CDN77.com-problematic.xml
+++ b/src/chrome/content/rules/CDN77.com-problematic.xml
@@ -10,4 +10,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CDN77.com.xml b/src/chrome/content/rules/CDN77.com.xml
index 0f9c969ff967..502862993bbe 100644
--- a/src/chrome/content/rules/CDN77.com.xml
+++ b/src/chrome/content/rules/CDN77.com.xml
@@ -28,4 +28,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CDN_Instagram.com.xml b/src/chrome/content/rules/CDN_Instagram.com.xml
index f0cbce4219c2..60caf822b68f 100644
--- a/src/chrome/content/rules/CDN_Instagram.com.xml
+++ b/src/chrome/content/rules/CDN_Instagram.com.xml
@@ -1,5 +1,5 @@
 
 
@@ -7,9 +7,9 @@
 	
 	
 	
+	
+	
 
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/CDON.COM.xml b/src/chrome/content/rules/CDON.COM.xml
index 78507104e1ba..9f0592921660 100644
--- a/src/chrome/content/rules/CDON.COM.xml
+++ b/src/chrome/content/rules/CDON.COM.xml
@@ -1,5 +1,5 @@
 
 
diff --git a/src/chrome/content/rules/CDTFA.ca.gov.xml b/src/chrome/content/rules/CDTFA.ca.gov.xml
new file mode 100644
index 000000000000..fa04da8ef7f9
--- /dev/null
+++ b/src/chrome/content/rules/CDTFA.ca.gov.xml
@@ -0,0 +1,25 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/CD_Universe.xml b/src/chrome/content/rules/CD_Universe.xml
index d9d58496f4ea..5332ea605ec7 100644
--- a/src/chrome/content/rules/CD_Universe.xml
+++ b/src/chrome/content/rules/CD_Universe.xml
@@ -26,7 +26,8 @@
 
 
 	
-	
+	
+	
 		
@@ -37,7 +38,8 @@
 					-->
 		
 		
-	
+	
+	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/CERIT.cz.xml b/src/chrome/content/rules/CERIT.cz.xml
index b67d6df9f103..e318d3bf53b7 100644
--- a/src/chrome/content/rules/CERIT.cz.xml
+++ b/src/chrome/content/rules/CERIT.cz.xml
@@ -14,7 +14,7 @@ Fetch error: http://prototyp.cerit.cz/ => https://prototyp.cerit.cz/: (51, "SSL:
 		- www.cerit.cz
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/CERT-Bund.xml b/src/chrome/content/rules/CERT-Bund.xml
index 3c9688056b9a..064927e344b9 100644
--- a/src/chrome/content/rules/CERT-Bund.xml
+++ b/src/chrome/content/rules/CERT-Bund.xml
@@ -2,7 +2,7 @@
     
     
 
-    
+    
 
     
diff --git a/src/chrome/content/rules/CERT-Polska.xml b/src/chrome/content/rules/CERT-Polska.xml
index 53955452f404..08d5affd843b 100644
--- a/src/chrome/content/rules/CERT-Polska.xml
+++ b/src/chrome/content/rules/CERT-Polska.xml
@@ -30,10 +30,10 @@
 	
 	
 	
-	
 
 
-	
+
+	
 
 
 	
diff --git a/src/chrome/content/rules/CERT-UK.xml b/src/chrome/content/rules/CERT-UK.xml
deleted file mode 100644
index cba3ac4f672c..000000000000
--- a/src/chrome/content/rules/CERT-UK.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-    
-    
-
-    
-
-    
-    
-
diff --git a/src/chrome/content/rules/CERT-Verbund.xml b/src/chrome/content/rules/CERT-Verbund.xml
index 119f431260ec..b183e1beb61c 100644
--- a/src/chrome/content/rules/CERT-Verbund.xml
+++ b/src/chrome/content/rules/CERT-Verbund.xml
@@ -8,7 +8,7 @@
 
 		
 
-    
+    
 
 	
diff --git a/src/chrome/content/rules/CERT.at.xml b/src/chrome/content/rules/CERT.at.xml
index 9c2c8960f123..867d20a3b3a7 100644
--- a/src/chrome/content/rules/CERT.at.xml
+++ b/src/chrome/content/rules/CERT.at.xml
@@ -2,7 +2,7 @@
     
     
 
-    
+    
 
     
diff --git a/src/chrome/content/rules/CERT.xml b/src/chrome/content/rules/CERT.xml
index 4a494e5d7c1b..a28078c5b365 100644
--- a/src/chrome/content/rules/CERT.xml
+++ b/src/chrome/content/rules/CERT.xml
@@ -8,7 +8,7 @@
 	
 
 
-	
+	
 
 
 	
-
-    
-
-    
-
diff --git a/src/chrome/content/rules/CETIC.be.xml b/src/chrome/content/rules/CETIC.be.xml
index 2da5486bc2b6..8dda7eec1739 100644
--- a/src/chrome/content/rules/CETIC.be.xml
+++ b/src/chrome/content/rules/CETIC.be.xml
@@ -44,13 +44,18 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/CEntrance.xml b/src/chrome/content/rules/CEntrance.xml
index d316346cee47..cf0f747a97f5 100644
--- a/src/chrome/content/rules/CEntrance.xml
+++ b/src/chrome/content/rules/CEntrance.xml
@@ -36,10 +36,10 @@
 			- store/cart.php?target=profile
 			- store/images/
 			- store/skins/
-								
+
 	
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CEtrk.com.xml b/src/chrome/content/rules/CEtrk.com.xml
deleted file mode 100644
index 3b0be18647c2..000000000000
--- a/src/chrome/content/rules/CEtrk.com.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/CFINotebook.net.xml b/src/chrome/content/rules/CFINotebook.net.xml
new file mode 100644
index 000000000000..19ae3a67c1e2
--- /dev/null
+++ b/src/chrome/content/rules/CFINotebook.net.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/CFWGroup.ca.xml b/src/chrome/content/rules/CFWGroup.ca.xml
new file mode 100644
index 000000000000..8e2119009047
--- /dev/null
+++ b/src/chrome/content/rules/CFWGroup.ca.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/CHDK.xml b/src/chrome/content/rules/CHDK.xml
index 3a26aa1718b1..07725303b75e 100644
--- a/src/chrome/content/rules/CHDK.xml
+++ b/src/chrome/content/rules/CHDK.xml
@@ -4,7 +4,7 @@
 		- Someserver.xml
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/CHIP.de.xml b/src/chrome/content/rules/CHIP.de.xml
new file mode 100644
index 000000000000..87615ab0cde0
--- /dev/null
+++ b/src/chrome/content/rules/CHIP.de.xml
@@ -0,0 +1,117 @@
+
+
+
+	
+	
+		
+		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/CIMB-Cambodia.xml b/src/chrome/content/rules/CIMB-Cambodia.xml
index 27df51233446..8368ea43a064 100644
--- a/src/chrome/content/rules/CIMB-Cambodia.xml
+++ b/src/chrome/content/rules/CIMB-Cambodia.xml
@@ -15,7 +15,7 @@
 
 	
 
-	
 
 
diff --git a/src/chrome/content/rules/CIMB-Indonesia.xml b/src/chrome/content/rules/CIMB-Indonesia.xml
index 56be440c9ee5..15eb665204fc 100644
--- a/src/chrome/content/rules/CIMB-Indonesia.xml
+++ b/src/chrome/content/rules/CIMB-Indonesia.xml
@@ -36,7 +36,7 @@
 
 	
 
-	
 
 
diff --git a/src/chrome/content/rules/CIMB-Malaysia.xml b/src/chrome/content/rules/CIMB-Malaysia.xml
deleted file mode 100644
index 8b922b151500..000000000000
--- a/src/chrome/content/rules/CIMB-Malaysia.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-		
-	
-		
-	
-		
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/CIMB-Singapore.xml b/src/chrome/content/rules/CIMB-Singapore.xml
index bac63fa63ccf..d8c81e7f1089 100644
--- a/src/chrome/content/rules/CIMB-Singapore.xml
+++ b/src/chrome/content/rules/CIMB-Singapore.xml
@@ -1,4 +1,9 @@
+
 
-		
-		
+	
+		
+		
 
 	
 	
 
 	
 	
-	
+	
 	
 
 	
 
-	
 
diff --git a/src/chrome/content/rules/CIMB-Thailand.xml b/src/chrome/content/rules/CIMB-Thailand.xml
index 31e1223304b3..f2b16ba9e7bf 100644
--- a/src/chrome/content/rules/CIMB-Thailand.xml
+++ b/src/chrome/content/rules/CIMB-Thailand.xml
@@ -1,52 +1,37 @@
-
 
-
+
 
-	
 	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
 
-	
-	
+	
+	
 
-	
+	
+	
+	
+	
+	
+	
 
-	
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/CIMB.com.xml b/src/chrome/content/rules/CIMB.com.xml
new file mode 100644
index 000000000000..4b4c2f578078
--- /dev/null
+++ b/src/chrome/content/rules/CIMB.com.xml
@@ -0,0 +1,167 @@
+
+
+
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/CIMBBank.com.my.xml b/src/chrome/content/rules/CIMBBank.com.my.xml
new file mode 100644
index 000000000000..0332c0753a72
--- /dev/null
+++ b/src/chrome/content/rules/CIMBBank.com.my.xml
@@ -0,0 +1,58 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/CIMBClicks.com.my.xml b/src/chrome/content/rules/CIMBClicks.com.my.xml
new file mode 100644
index 000000000000..4d67999b9540
--- /dev/null
+++ b/src/chrome/content/rules/CIMBClicks.com.my.xml
@@ -0,0 +1,43 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/CIMBIslamic.com.xml b/src/chrome/content/rules/CIMBIslamic.com.xml
index c02346469c82..cff7e12ba8ba 100644
--- a/src/chrome/content/rules/CIMBIslamic.com.xml
+++ b/src/chrome/content/rules/CIMBIslamic.com.xml
@@ -6,7 +6,7 @@
 
 		- cb	(m)
 		- www.wip	(m)
-		
+
 	e: expired certificate
 	h: http redirect
 	i: invalid certificate chain
diff --git a/src/chrome/content/rules/CIMBPreferred.com.xml b/src/chrome/content/rules/CIMBPreferred.com.xml
new file mode 100644
index 000000000000..e77609c5781c
--- /dev/null
+++ b/src/chrome/content/rules/CIMBPreferred.com.xml
@@ -0,0 +1,13 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/CIMBSecurities.com.xml b/src/chrome/content/rules/CIMBSecurities.com.xml
deleted file mode 100644
index f93bb2dad412..000000000000
--- a/src/chrome/content/rules/CIMBSecurities.com.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/CIO.com.xml b/src/chrome/content/rules/CIO.com.xml
index 11540a0aa8ea..8c46c7fd2aa1 100644
--- a/src/chrome/content/rules/CIO.com.xml
+++ b/src/chrome/content/rules/CIO.com.xml
@@ -34,7 +34,8 @@
 -->
 
 
-	
+	
+	
 
 
 	 https://www.cirt.net/: (51, "SSL: no alternative certificate subject name matches target host name 'www.cirt.net'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/CIR_Online.org.xml b/src/chrome/content/rules/CIR_Online.org.xml
index e12ab8bb3741..9f1bc8c204e9 100644
--- a/src/chrome/content/rules/CIR_Online.org.xml
+++ b/src/chrome/content/rules/CIR_Online.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://beta.cironline.org/ => https://beta.cironline.org/: (28, 'Co
 Fetch error: http://www.cironline.org/ => https://www.cironline.org/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
@@ -18,7 +18,7 @@ Fetch error: http://www.cironline.org/ => https://www.cironline.org/: (60, 'SSL
 			Exceptions:
 					-->
 		
-	
+
 
 
 	
diff --git a/src/chrome/content/rules/CISOfy.com.xml b/src/chrome/content/rules/CISOfy.com.xml
deleted file mode 100644
index 9e9299111d14..000000000000
--- a/src/chrome/content/rules/CISOfy.com.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-	
-
-
-	
-	
-
-
-	
-	
-
-		
-
-	
-
-
-
diff --git a/src/chrome/content/rules/CJ2.nl.xml b/src/chrome/content/rules/CJ2.nl.xml
index 6e8aa227764f..c28f8f585a1d 100644
--- a/src/chrome/content/rules/CJ2.nl.xml
+++ b/src/chrome/content/rules/CJ2.nl.xml
@@ -14,7 +14,7 @@ Fetch error: http://admin.cj2.nl/ => https://admin.cj2.nl/: (28, 'Connection tim
 		- www.cj2.nl
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/CKSource.com.xml b/src/chrome/content/rules/CKSource.com.xml
index 1e0dd092c171..7a6b777f43ce 100644
--- a/src/chrome/content/rules/CKSource.com.xml
+++ b/src/chrome/content/rules/CKSource.com.xml
@@ -53,10 +53,6 @@
 	
 	
 
-
-	
-
 	
 
diff --git a/src/chrome/content/rules/CLIC-study.xml b/src/chrome/content/rules/CLIC-study.xml
index b1e7a9d2c5a2..8c8a78a5b181 100644
--- a/src/chrome/content/rules/CLIC-study.xml
+++ b/src/chrome/content/rules/CLIC-study.xml
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CLP.com.hk.xml b/src/chrome/content/rules/CLP.com.hk.xml
index 97d2554230b7..9703b426565f 100644
--- a/src/chrome/content/rules/CLP.com.hk.xml
+++ b/src/chrome/content/rules/CLP.com.hk.xml
@@ -62,9 +62,9 @@
 
 	
 
-	
 
-	
 
diff --git a/src/chrome/content/rules/CLTglobal.com.xml b/src/chrome/content/rules/CLTglobal.com.xml
index 14823fe1459c..24245a5a0e28 100644
--- a/src/chrome/content/rules/CLTglobal.com.xml
+++ b/src/chrome/content/rules/CLTglobal.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://cltglobal.com/ => https://cltglobal.com/: (60, 'SSL certific
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/CMAS_Center.org.xml b/src/chrome/content/rules/CMAS_Center.org.xml
index 2319c4be5f79..6fe889abd753 100644
--- a/src/chrome/content/rules/CMAS_Center.org.xml
+++ b/src/chrome/content/rules/CMAS_Center.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://cmascenter.org/ => https://cmascenter.org/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/CMBChina.com.xml b/src/chrome/content/rules/CMBChina.com.xml
index e0ebf0d85790..3babf7e97276 100644
--- a/src/chrome/content/rules/CMBChina.com.xml
+++ b/src/chrome/content/rules/CMBChina.com.xml
@@ -1,4 +1,19 @@
+
+
+
 
 	
 		
-	
-		
+	
 	
 		
 	
@@ -57,6 +70,7 @@
 	
 	
 	
+	
 	
 		
 	
@@ -68,8 +82,7 @@
 		
 	
 	
-	
-		
+	
 	
 	
 	
@@ -80,33 +93,17 @@
 	
 	
 	
-	
 
 	
-	
-	
-		
-
-		
-		
-		
-
-	
-	
-	
-		
+	
 
-		
-		
-		
-		
+	
 
 	
 	
 		
 		
 
-		
 		
 		
 		
diff --git a/src/chrome/content/rules/CMP.xml b/src/chrome/content/rules/CMP.xml
index 5c9499d18e06..5bc935c38593 100644
--- a/src/chrome/content/rules/CMP.xml
+++ b/src/chrome/content/rules/CMP.xml
@@ -13,7 +13,7 @@ Non-2xx HTTP code: http://cookies.cmpnet.com/ (200) => https://i.cmpnet.com/ (40
 	* Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/CMPXCHG8B.xml b/src/chrome/content/rules/CMPXCHG8B.xml
deleted file mode 100644
index 9fc1d3b1a9d0..000000000000
--- a/src/chrome/content/rules/CMPXCHG8B.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-	
-	
-
-	
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/CMSWire.xml b/src/chrome/content/rules/CMSWire.xml
index a2a529540551..9bbc9b250737 100644
--- a/src/chrome/content/rules/CMSWire.xml
+++ b/src/chrome/content/rules/CMSWire.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.cmswire.com/ => https://www.cmswire.com/: Too many redir
 Fetch error: http://cmswire.com/ => https://www.cmswire.com/: Too many redirects while fetching 'https://www.cmswire.com/'
 
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/CM_Dev.com.xml b/src/chrome/content/rules/CM_Dev.com.xml
index c17f8363c30e..f1c443a8db6c 100644
--- a/src/chrome/content/rules/CM_Dev.com.xml
+++ b/src/chrome/content/rules/CM_Dev.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://cmdev.com/ => https://cmdev.com/: (60, 'SSL certificate prob
 Fetch error: http://www.cmdev.com/ => https://www.cmdev.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/CNDP.fr.xml b/src/chrome/content/rules/CNDP.fr.xml
deleted file mode 100644
index 1eb2036904b6..000000000000
--- a/src/chrome/content/rules/CNDP.fr.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/CNES.fr.xml b/src/chrome/content/rules/CNES.fr.xml
index 43df695dd1c3..357d05b123fe 100644
--- a/src/chrome/content/rules/CNES.fr.xml
+++ b/src/chrome/content/rules/CNES.fr.xml
@@ -5,14 +5,14 @@
 	Nonfunctional hosts in *cnes.fr:
 
 		- videotheque *
-		
+
 	* Shows another domain
 
 
 	Problematic hosts in *cnes.fr:
 
 		- cosparhq *
-		
+
 	* Server sends no certificate chain, see https://whatsmychaincert.com
 
 
diff --git a/src/chrome/content/rules/CNET.com.au.xml b/src/chrome/content/rules/CNET.com.au.xml
new file mode 100644
index 000000000000..2f805e550c94
--- /dev/null
+++ b/src/chrome/content/rules/CNET.com.au.xml
@@ -0,0 +1,15 @@
+
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/CNET.com.xml b/src/chrome/content/rules/CNET.com.xml
new file mode 100644
index 000000000000..cc35a3a7126f
--- /dev/null
+++ b/src/chrome/content/rules/CNET.com.xml
@@ -0,0 +1,47 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/CNETFrance.fr.xml b/src/chrome/content/rules/CNETFrance.fr.xml
new file mode 100644
index 000000000000..160cdf213f7c
--- /dev/null
+++ b/src/chrome/content/rules/CNETFrance.fr.xml
@@ -0,0 +1,9 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/CNN.com.xml b/src/chrome/content/rules/CNN.com.xml
index 57e0582289d5..7b7834153bbf 100644
--- a/src/chrome/content/rules/CNN.com.xml
+++ b/src/chrome/content/rules/CNN.com.xml
@@ -1,61 +1,43 @@
 
+
 
 	
 	
 	
 	
-	
-	
-	
+	
+		
+		
+		
 	
 		
 		
@@ -64,8 +46,34 @@
 		
 		
 		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
 	
+	
+
+	
+	
+		
+
+	
 
 	
 
diff --git a/src/chrome/content/rules/CNNIC.net.cn.xml b/src/chrome/content/rules/CNNIC.net.cn.xml
new file mode 100644
index 000000000000..fed35d2f7565
--- /dev/null
+++ b/src/chrome/content/rules/CNNIC.net.cn.xml
@@ -0,0 +1,20 @@
+
+
+
+	
+	
+	
+
+	
+	
+		
+
+	
+
diff --git a/src/chrome/content/rules/COZmedics.com.au.xml b/src/chrome/content/rules/COZmedics.com.au.xml
index 3cc75e759ee3..682fcb05dd8f 100644
--- a/src/chrome/content/rules/COZmedics.com.au.xml
+++ b/src/chrome/content/rules/COZmedics.com.au.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://cozmedics.com.au/ => https://cozmedics.com.au/: (7, 'Failed to connect to cozmedics.com.au port 443: Connection refused')
 Fetch error: http://www.cozmedics.com.au/ => https://www.cozmedics.com.au/: Cycle detected - URL already encountered: https://www.cozmedics.com.au/
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/CPAN.org.xml b/src/chrome/content/rules/CPAN.org.xml
new file mode 100644
index 000000000000..b15c180911d3
--- /dev/null
+++ b/src/chrome/content/rules/CPAN.org.xml
@@ -0,0 +1,22 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/CPM_Rocket.com.xml b/src/chrome/content/rules/CPM_Rocket.com.xml
index 31bb797a6b90..a84ed3b7a4c5 100644
--- a/src/chrome/content/rules/CPM_Rocket.com.xml
+++ b/src/chrome/content/rules/CPM_Rocket.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://adk2cdn.cpmrocket.com/ => https://d38cp5x90nxyo0.cloudfront.
 		- (www.)	(dropped)
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/CPS-Datensysteme.de.xml b/src/chrome/content/rules/CPS-Datensysteme.de.xml
new file mode 100644
index 000000000000..6b24e0266c33
--- /dev/null
+++ b/src/chrome/content/rules/CPS-Datensysteme.de.xml
@@ -0,0 +1,25 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/CPSC.xml b/src/chrome/content/rules/CPSC.xml
deleted file mode 100644
index aa60f75c2d6c..000000000000
--- a/src/chrome/content/rules/CPSC.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/CPanel.com.xml b/src/chrome/content/rules/CPanel.com.xml
index 710efa6f3f26..c4323defd8bd 100644
--- a/src/chrome/content/rules/CPanel.com.xml
+++ b/src/chrome/content/rules/CPanel.com.xml
@@ -2,7 +2,7 @@
 	Nonfunctional hosts in *cpanel.com:
 
 		- conference15 *
-		
+
 	* Shows default page
 
 
diff --git a/src/chrome/content/rules/CPanel.guru.xml b/src/chrome/content/rules/CPanel.guru.xml
index f54c1810d957..9bd2525c766b 100644
--- a/src/chrome/content/rules/CPanel.guru.xml
+++ b/src/chrome/content/rules/CPanel.guru.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.cpanel.guru/ => https://www.cpanel.guru/: (60, 'SSL cert
 Disabled by https-everywhere-checker because:
 Non-2xx HTTP code: http://cpanel.guru/ (200) => https://cpanel.guru/ (401)
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/CPanel.xml b/src/chrome/content/rules/CPanel.xml
index 9db45a2ea4c8..cee3ce1409fd 100644
--- a/src/chrome/content/rules/CPanel.xml
+++ b/src/chrome/content/rules/CPanel.xml
@@ -43,7 +43,7 @@ Fetch error: http://podcast.cpanel.net/ => https://podcast.cpanel.net/: (6, 'Cou
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/CPlusPlus.com.xml b/src/chrome/content/rules/CPlusPlus.com.xml
new file mode 100644
index 000000000000..155ae21e6d82
--- /dev/null
+++ b/src/chrome/content/rules/CPlusPlus.com.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/CQ_Roll_Call.xml b/src/chrome/content/rules/CQ_Roll_Call.xml
index a27fb5c59af7..2fc04f1495de 100644
--- a/src/chrome/content/rules/CQ_Roll_Call.xml
+++ b/src/chrome/content/rules/CQ_Roll_Call.xml
@@ -5,10 +5,10 @@
 
 	Expired hosts in *cqrollcall.com:
 
-		- ae 
+		- ae
 		- connectivity
 		- insightnews
-	
+
 	Mismatched hosts in *cqrollcall.com:
 
 		- info
diff --git a/src/chrome/content/rules/CREW.xml b/src/chrome/content/rules/CREW.xml
index 863f3f79fdc5..65879020972c 100644
--- a/src/chrome/content/rules/CREW.xml
+++ b/src/chrome/content/rules/CREW.xml
@@ -8,7 +8,7 @@ Fetch error: http://www.secure.citizensforethics.org/ => https://www.secure.citi
 		- (www.)	(shows secure; mismatched, CN: secure.citizensforethics.org)
 
 -->
-
+
 
 	
 	
@@ -19,4 +19,4 @@ Fetch error: http://www.secure.citizensforethics.org/ => https://www.secure.citi
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CRN.xml b/src/chrome/content/rules/CRN.xml
index d35b17cbae7f..9967504a1a2f 100644
--- a/src/chrome/content/rules/CRN.xml
+++ b/src/chrome/content/rules/CRN.xml
@@ -10,10 +10,12 @@ Fetch error: http://crn.verticalsearchworks.com/ => https://ad-secure.firstlight
 	For other UBM coverage, see UBM-mismatches.xml.
 
 -->
-
+
 
 	
-	
+	
+	
+	
 	
@@ -28,10 +30,9 @@ Fetch error: http://crn.verticalsearchworks.com/ => https://ad-secure.firstlight
 	
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/CS-Cart.xml b/src/chrome/content/rules/CS-Cart.xml
index f6757ad786c5..8ace56b79c06 100644
--- a/src/chrome/content/rules/CS-Cart.xml
+++ b/src/chrome/content/rules/CS-Cart.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CSBA_Academy.com.xml b/src/chrome/content/rules/CSBA_Academy.com.xml
index d260b0229954..803ef3a2e61d 100644
--- a/src/chrome/content/rules/CSBA_Academy.com.xml
+++ b/src/chrome/content/rules/CSBA_Academy.com.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.csbaacademy.com/ => http://www.csbaacademy.com/: (6, 'Co
 	* Unsecurable
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/CSC.com.xml b/src/chrome/content/rules/CSC.com.xml
new file mode 100644
index 000000000000..6f32d7e7e8e7
--- /dev/null
+++ b/src/chrome/content/rules/CSC.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/CSC.xml b/src/chrome/content/rules/CSC.xml
deleted file mode 100644
index b8e8b0a8a300..000000000000
--- a/src/chrome/content/rules/CSC.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-	
-	
-		
-
-
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/CSCtrustedsecure.com.xml b/src/chrome/content/rules/CSCtrustedsecure.com.xml
deleted file mode 100644
index 8a17108f67df..000000000000
--- a/src/chrome/content/rules/CSCtrustedsecure.com.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/CSDb.dk.xml b/src/chrome/content/rules/CSDb.dk.xml
index 6fe5f8471003..ab3614d083e8 100644
--- a/src/chrome/content/rules/CSDb.dk.xml
+++ b/src/chrome/content/rules/CSDb.dk.xml
@@ -12,7 +12,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/CSGOItems.pro.xml b/src/chrome/content/rules/CSGOItems.pro.xml
deleted file mode 100644
index 2c1259e45bc1..000000000000
--- a/src/chrome/content/rules/CSGOItems.pro.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/CSGOStash.com.xml b/src/chrome/content/rules/CSGOStash.com.xml
deleted file mode 100644
index e6fb6e67fd25..000000000000
--- a/src/chrome/content/rules/CSGOStash.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/CSIAC.org.xml b/src/chrome/content/rules/CSIAC.org.xml
index 53cf8da08518..427d78e504d4 100644
--- a/src/chrome/content/rules/CSIAC.org.xml
+++ b/src/chrome/content/rules/CSIAC.org.xml
@@ -15,7 +15,7 @@ Fetch error: http://store.csiac.org/ => https://store.csiac.org/: (51, "SSL: no
 		- .csiac.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/CSIS.dk.xml b/src/chrome/content/rules/CSIS.dk.xml
deleted file mode 100644
index 2e6d6dd109e5..000000000000
--- a/src/chrome/content/rules/CSIS.dk.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
-
diff --git a/src/chrome/content/rules/CSIS.org.xml b/src/chrome/content/rules/CSIS.org.xml
index 56c01379c53d..e01bd31da838 100644
--- a/src/chrome/content/rules/CSIS.org.xml
+++ b/src/chrome/content/rules/CSIS.org.xml
@@ -8,7 +8,8 @@
 
 
 	
-	
+	
+	
 
 
 	 https://www.cspforum.eu/: (60, 'SSL certific
 	^: plaintext reply
 
 -->
-
+
 
 	
-	
+	
 
 
 	
-
-
-	
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/CSdata1.com.xml b/src/chrome/content/rules/CSdata1.com.xml
deleted file mode 100644
index 46def7930925..000000000000
--- a/src/chrome/content/rules/CSdata1.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/CT.gov.xml b/src/chrome/content/rules/CT.gov.xml
index 8731c469e20e..6fb57c32ddb6 100644
--- a/src/chrome/content/rules/CT.gov.xml
+++ b/src/chrome/content/rules/CT.gov.xml
@@ -56,7 +56,7 @@ Non-2xx HTTP code: http://www.ct.gov/ (200) => https://www.ct.egov.com/ (404)
 	ˢ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/CTEP-EBP.com.xml b/src/chrome/content/rules/CTEP-EBP.com.xml
deleted file mode 100644
index 00d1c86fd18d..000000000000
--- a/src/chrome/content/rules/CTEP-EBP.com.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-		
-
-	
-
-
diff --git a/src/chrome/content/rules/CTERA-Networks.xml b/src/chrome/content/rules/CTERA-Networks.xml
index 616b8fefd795..4d2d055c48cd 100644
--- a/src/chrome/content/rules/CTERA-Networks.xml
+++ b/src/chrome/content/rules/CTERA-Networks.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://ctera.com/ => https://ctera.com/: (51, "SSL: no alternative certificate subject name matches target host name 'ctera.com'")
 Fetch error: http://www.ctera.com/ => https://www.ctera.com/: Cycle detected - URL already encountered: https://www.ctera.com/
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/CTFtime.com.xml b/src/chrome/content/rules/CTFtime.com.xml
index a699b6c7e8cd..6c747fa8ca76 100644
--- a/src/chrome/content/rules/CTFtime.com.xml
+++ b/src/chrome/content/rules/CTFtime.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.ctftime.org/ => https://www.ctftime.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.ctftime.org'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/CTS_Wholesale_Sunglasses.xml b/src/chrome/content/rules/CTS_Wholesale_Sunglasses.xml
index d648607a4b7e..14fd5e5b3d78 100644
--- a/src/chrome/content/rules/CTS_Wholesale_Sunglasses.xml
+++ b/src/chrome/content/rules/CTS_Wholesale_Sunglasses.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CUFP.org.xml b/src/chrome/content/rules/CUFP.org.xml
index 4a4537845e26..8e2ad00ab401 100644
--- a/src/chrome/content/rules/CUFP.org.xml
+++ b/src/chrome/content/rules/CUFP.org.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/CUHK.xml b/src/chrome/content/rules/CUHK.xml
index de21bcb7a6ec..be04462cc49f 100644
--- a/src/chrome/content/rules/CUHK.xml
+++ b/src/chrome/content/rules/CUHK.xml
@@ -1,17 +1,11 @@
 
 
-
+
 
 	
-	
 
-	
 	
+	
+	
 	
 	
-	
 	
 	
 	
-	
 	
 	
 	
 	
+	
 	
 	
 	
-	
 	
 	
-	
 	
-	
 	
 	
 	
-	
 	
 	
 	
 	
 	
-	
 	
-	
 	
 	
 	
-	
 	
-	
 	
-	
 	
 	
 	
 	
 	
 	
-	
-	
-	
 	
 	
 	
-	
 	
-	
 	
 	
-	
 	
 	
 	
-	
 	
 	
 	
-	
 
 	
 		
-		
+
 		
 		
 		
 		
 		
 		
-		
+
 	
 
diff --git a/src/chrome/content/rules/CVIMellesGriot.com.xml b/src/chrome/content/rules/CVIMellesGriot.com.xml
index e0b3e1d9cf05..6ecc64ff553e 100644
--- a/src/chrome/content/rules/CVIMellesGriot.com.xml
+++ b/src/chrome/content/rules/CVIMellesGriot.com.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.cvimellesgriot.com/ => https://www.cvimellesgriot.com/: (28, 'Connection timed out after 10001 milliseconds')
 Fetch error: http://cvimellesgriot.com/ => https://www.cvimellesgriot.com/: (28, 'Connection timed out after 10001 milliseconds')
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/CWSPOD_Music.xml b/src/chrome/content/rules/CWSPOD_Music.xml
index 2238b4f65cc7..cb958ad2dac4 100644
--- a/src/chrome/content/rules/CWSPOD_Music.xml
+++ b/src/chrome/content/rules/CWSPOD_Music.xml
@@ -7,7 +7,7 @@ Non-2xx HTTP code: http://www.cwspodmusic.com/ (200) => https://www.cwspodmusic.
 Disabled by https-everywhere-checker because:
 Fetch error: http://cwspodmusic.com/ => https://cwspodmusic.com/: Cycle detected - URL already encountered: http://cwspodmusic.com/
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://cwspodmusic.com/ => https://cwspodmusic.com/: Cycle detected
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CXense.com.xml b/src/chrome/content/rules/CXense.com.xml
index 6cf4db7c8d96..e4a93b3b0f5b 100644
--- a/src/chrome/content/rules/CXense.com.xml
+++ b/src/chrome/content/rules/CXense.com.xml
@@ -2,7 +2,6 @@
 	Other Cxense rulesets:
 
 		- Emediate.dk.xml
-		- Emediate.eu.xml
 		- Emediate.se.xml
 
 
diff --git a/src/chrome/content/rules/Cabal_WS.xml b/src/chrome/content/rules/Cabal_WS.xml
index 2cb89bec45fc..b80511473dfa 100644
--- a/src/chrome/content/rules/Cabal_WS.xml
+++ b/src/chrome/content/rules/Cabal_WS.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Cabinet_Office.xml b/src/chrome/content/rules/Cabinet_Office.xml
index de703c9ca42c..14af1ee5f442 100644
--- a/src/chrome/content/rules/Cabinet_Office.xml
+++ b/src/chrome/content/rules/Cabinet_Office.xml
@@ -49,7 +49,7 @@ Fetch error: http://umbr3.cabinetoffice.gov.uk/ => https://umbr3.cabinetoffice.g
 		- umbr3.cabinetoffice.gov.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Cable6.net.xml b/src/chrome/content/rules/Cable6.net.xml
index c43a2432f441..0b4ff59bb89d 100644
--- a/src/chrome/content/rules/Cable6.net.xml
+++ b/src/chrome/content/rules/Cable6.net.xml
@@ -12,7 +12,7 @@
 		- Bug from piwik.cable6.net
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/CableForum.co.uk.xml b/src/chrome/content/rules/CableForum.co.uk.xml
deleted file mode 100644
index b7316aa3cac8..000000000000
--- a/src/chrome/content/rules/CableForum.co.uk.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-	
-	
-                
-                
-
-	
-
diff --git a/src/chrome/content/rules/Cables.com.xml b/src/chrome/content/rules/Cables.com.xml
index 575be739e78d..e6d9f20da75f 100644
--- a/src/chrome/content/rules/Cables.com.xml
+++ b/src/chrome/content/rules/Cables.com.xml
@@ -7,7 +7,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Cablesurf.de.xml b/src/chrome/content/rules/Cablesurf.de.xml
deleted file mode 100644
index 77dc719ca9f2..000000000000
--- a/src/chrome/content/rules/Cablesurf.de.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-    
-    
-    
-    
-
-    
-
-    
-
diff --git a/src/chrome/content/rules/CaceTech.xml b/src/chrome/content/rules/CaceTech.xml
deleted file mode 100644
index 14693724c7c3..000000000000
--- a/src/chrome/content/rules/CaceTech.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-  
-  
-
-
-	
-	
-
-	
-
-
-  
-
diff --git a/src/chrome/content/rules/CacheBrowser.info.xml b/src/chrome/content/rules/CacheBrowser.info.xml
deleted file mode 100644
index e02b2a371b20..000000000000
--- a/src/chrome/content/rules/CacheBrowser.info.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Cactus_Complete_Commerce.xml b/src/chrome/content/rules/Cactus_Complete_Commerce.xml
index 274d334d7e4a..91956692ad77 100644
--- a/src/chrome/content/rules/Cactus_Complete_Commerce.xml
+++ b/src/chrome/content/rules/Cactus_Complete_Commerce.xml
@@ -11,7 +11,7 @@ Fetch error: http://app.cactuscompletecommerce.com/ => https://app.cactuscomplet
 		- (www.)	(replies with http)
 
 -->
-
+
 
 	
 
@@ -21,4 +21,4 @@ Fetch error: http://app.cactuscompletecommerce.com/ => https://app.cactuscomplet
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CadSoft.xml b/src/chrome/content/rules/CadSoft.xml
deleted file mode 100644
index 72846c435f65..000000000000
--- a/src/chrome/content/rules/CadSoft.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-	
-	
-	
-	
-
-
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Cadence.gq.xml b/src/chrome/content/rules/Cadence.gq.xml
new file mode 100644
index 000000000000..ba292b48e16f
--- /dev/null
+++ b/src/chrome/content/rules/Cadence.gq.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Cadence.moe.xml b/src/chrome/content/rules/Cadence.moe.xml
new file mode 100644
index 000000000000..e71e6ed1d501
--- /dev/null
+++ b/src/chrome/content/rules/Cadence.moe.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/CafePharma.com.xml b/src/chrome/content/rules/CafePharma.com.xml
new file mode 100644
index 000000000000..c073f578a2a5
--- /dev/null
+++ b/src/chrome/content/rules/CafePharma.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/CafePlus.com.tr.xml b/src/chrome/content/rules/CafePlus.com.tr.xml
new file mode 100644
index 000000000000..d5e0507058a1
--- /dev/null
+++ b/src/chrome/content/rules/CafePlus.com.tr.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/CafePress.xml b/src/chrome/content/rules/CafePress.xml
deleted file mode 100644
index cba8b17015ea..000000000000
--- a/src/chrome/content/rules/CafePress.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
-	
-
-	
-	
-
-	
-	
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Cafegate.com.xml b/src/chrome/content/rules/Cafegate.com.xml
index d0eff2ad14d7..df5b22e5e30b 100644
--- a/src/chrome/content/rules/Cafegate.com.xml
+++ b/src/chrome/content/rules/Cafegate.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.cafegate.com/ => https://www.cafegate.com/: (60, 'SSL ce
 Disabled by https-everywhere-checker because:
 Fetch error: http://cafegate.com/ => https://cafegate.com/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://cafegate.com/ => https://cafegate.com/: (60, 'SSL certificat
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Cafemakers.xml b/src/chrome/content/rules/Cafemakers.xml
index ebb06d7fdb05..ae4ed89828bf 100644
--- a/src/chrome/content/rules/Cafemakers.xml
+++ b/src/chrome/content/rules/Cafemakers.xml
@@ -5,7 +5,7 @@ Fetch error: http://cafemakers.com/ => https://cafemakers.com/: (35, 'Unknown SS
 Fetch error: http://www.cafemakers.com/ => https://www.cafemakers.com/: (35, 'Unknown SSL protocol error in connection to www.cafemakers.com:443 ')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.cafemakers.com/ => https://www.cafemakers.com/: (35, 'Un
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Caimao.com.xml b/src/chrome/content/rules/Caimao.com.xml
deleted file mode 100644
index c79291b8fa5c..000000000000
--- a/src/chrome/content/rules/Caimao.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/CainTV.xml b/src/chrome/content/rules/CainTV.xml
index a8c28df84f12..420ca8d1752a 100644
--- a/src/chrome/content/rules/CainTV.xml
+++ b/src/chrome/content/rules/CainTV.xml
@@ -13,4 +13,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Cal.net.xml b/src/chrome/content/rules/Cal.net.xml
deleted file mode 100644
index 6219fcc419a1..000000000000
--- a/src/chrome/content/rules/Cal.net.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/CalChamber.com.xml b/src/chrome/content/rules/CalChamber.com.xml
index be14a5fa7b1b..aea463025197 100644
--- a/src/chrome/content/rules/CalChamber.com.xml
+++ b/src/chrome/content/rules/CalChamber.com.xml
@@ -3,14 +3,14 @@
         email.calchamber.com
         links.email.calchamber.com
         www.store.calchamber.com
-  	
+
   	No working URL known:
   		images.calchamber.com
-  		
+
     Time out:
         chat.calchamber.com
-  
---> 
+
+-->
 
 
 
diff --git a/src/chrome/content/rules/Calacademy.org.xml b/src/chrome/content/rules/Calacademy.org.xml
index 663d6512a57e..f41bb5e33004 100644
--- a/src/chrome/content/rules/Calacademy.org.xml
+++ b/src/chrome/content/rules/Calacademy.org.xml
@@ -48,7 +48,7 @@ Fetch error: http://sso.calacademy.org/ => https://sso.calacademy.org/: (35, 'Un
 	s: self-signed certificate
 	t: timeout on https
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Calazan.com.xml b/src/chrome/content/rules/Calazan.com.xml
index 17a00c8fedaa..0c2585fb10da 100644
--- a/src/chrome/content/rules/Calazan.com.xml
+++ b/src/chrome/content/rules/Calazan.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://calazan.com/ => https://calazan.com/: (51, "SSL: no alternative certificate subject name matches target host name 'calazan.com'")
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Calderdale.gov.uk.xml b/src/chrome/content/rules/Calderdale.gov.uk.xml
index 2cd55aa7ab2c..4b6deaf2727f 100644
--- a/src/chrome/content/rules/Calderdale.gov.uk.xml
+++ b/src/chrome/content/rules/Calderdale.gov.uk.xml
@@ -38,7 +38,7 @@
 	Mixed content:
 
 		- css, on:
-		
+
 			- (www.)? from www.calderdale.gov.uk ˢ
 			- (www.)? from cdnjs.cloudflare.com ˢ
 
diff --git a/src/chrome/content/rules/Calend.ru.xml b/src/chrome/content/rules/Calend.ru.xml
new file mode 100644
index 000000000000..13c0efbc05d9
--- /dev/null
+++ b/src/chrome/content/rules/Calend.ru.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/CalendarWiz.xml b/src/chrome/content/rules/CalendarWiz.xml
index bfb49f0c154e..a863151c8331 100644
--- a/src/chrome/content/rules/CalendarWiz.xml
+++ b/src/chrome/content/rules/CalendarWiz.xml
@@ -6,4 +6,4 @@
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Calendario.cc.xml b/src/chrome/content/rules/Calendario.cc.xml
deleted file mode 100644
index ffa86965fc4f..000000000000
--- a/src/chrome/content/rules/Calendario.cc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Calendars.com.xml b/src/chrome/content/rules/Calendars.com.xml
index 25b5b73a0e89..28b9474c9bdc 100644
--- a/src/chrome/content/rules/Calendars.com.xml
+++ b/src/chrome/content/rules/Calendars.com.xml
@@ -7,12 +7,12 @@
 
  
  
- 
+
  
     
     
     
- 
+
  
  
     
@@ -20,9 +20,9 @@
     
     
     
- 
-  
- 
+
+ 
+
  
     
     
@@ -33,5 +33,5 @@
  
  
-  
+
 
diff --git a/src/chrome/content/rules/Calguns_Foundation.org.xml b/src/chrome/content/rules/Calguns_Foundation.org.xml
index 26ee7e4a81ea..2fcda55bc3ec 100644
--- a/src/chrome/content/rules/Calguns_Foundation.org.xml
+++ b/src/chrome/content/rules/Calguns_Foundation.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://calgunsfoundation.org/ => https://calgunsfoundation.org/: (6
 Fetch error: http://store.calgunsfoundation.org/ => https://store.calgunsfoundation.org/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
 	
@@ -17,4 +17,4 @@ Fetch error: http://store.calgunsfoundation.org/ => https://store.calgunsfoundat
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/California-Department-of-Motor-Vehicles.xml b/src/chrome/content/rules/California-Department-of-Motor-Vehicles.xml
deleted file mode 100644
index c9f9c0da4f47..000000000000
--- a/src/chrome/content/rules/California-Department-of-Motor-Vehicles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/California-Franchise-Tax-Board.xml b/src/chrome/content/rules/California-Franchise-Tax-Board.xml
index 5e8849a2bd97..e17144319e7a 100644
--- a/src/chrome/content/rules/California-Franchise-Tax-Board.xml
+++ b/src/chrome/content/rules/California-Franchise-Tax-Board.xml
@@ -6,10 +6,8 @@
 
 	
 
-	
-	
 	
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/California-STD-HIV-Training.xml b/src/chrome/content/rules/California-STD-HIV-Training.xml
deleted file mode 100644
index eebf6e6b1bd1..000000000000
--- a/src/chrome/content/rules/California-STD-HIV-Training.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/California-State-University.xml b/src/chrome/content/rules/California-State-University.xml
index 2d53c9247778..d9cae69d594b 100644
--- a/src/chrome/content/rules/California-State-University.xml
+++ b/src/chrome/content/rules/California-State-University.xml
@@ -1,12 +1,48 @@
-
+
-	
+                Mixed content blocking (MCB) triggered:
+                - careers.csulb.edu
+                - web.csulb.edu
+-->
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
 
+        
 
diff --git a/src/chrome/content/rules/California_Department_of_Justice.xml b/src/chrome/content/rules/California_Department_of_Justice.xml
index 5dc44a05718f..60f23583efa4 100644
--- a/src/chrome/content/rules/California_Department_of_Justice.xml
+++ b/src/chrome/content/rules/California_Department_of_Justice.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/California_Legislative_Information.xml b/src/chrome/content/rules/California_Legislative_Information.xml
index e24363761eff..09ec42093e5c 100644
--- a/src/chrome/content/rules/California_Legislative_Information.xml
+++ b/src/chrome/content/rules/California_Legislative_Information.xml
@@ -11,4 +11,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/California_Polytechnic_State_University.xml b/src/chrome/content/rules/California_Polytechnic_State_University.xml
index 2b9a4696ecb7..54616006acaa 100644
--- a/src/chrome/content/rules/California_Polytechnic_State_University.xml
+++ b/src/chrome/content/rules/California_Polytechnic_State_University.xml
@@ -120,7 +120,7 @@ Fetch error: http://xerxes.calpoly.edu/ => https://xerxes.calpoly.edu/: (6, 'Cou
 			- servicedesk from www.calpoly.edu
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/California_Polytechnic_State_University_Ponoma.xml b/src/chrome/content/rules/California_Polytechnic_State_University_Ponoma.xml
deleted file mode 100644
index da6da63e2ffd..000000000000
--- a/src/chrome/content/rules/California_Polytechnic_State_University_Ponoma.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/California_United_Bank.xml b/src/chrome/content/rules/California_United_Bank.xml
index 25ff0c61ea75..63903a6a3793 100644
--- a/src/chrome/content/rules/California_United_Bank.xml
+++ b/src/chrome/content/rules/California_United_Bank.xml
@@ -8,26 +8,25 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://pcboc.com/ => https://pcboc.com/: (51, "SSL: no alternative certificate subject name matches target host name 'pcboc.com'")
 	Problematic domains:
 
-		- www.pcboc.com		(mismatched, CN: 
+		- www.pcboc.com		(mismatched, CN:
 
 -->
-
+
 
 	
-	
+	
 	
-	
+	
 	
-	
+	
 
 
 	
 
 
-	
 
 	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Caltech.edu.xml b/src/chrome/content/rules/Caltech.edu.xml
new file mode 100644
index 000000000000..72c0b28b5c27
--- /dev/null
+++ b/src/chrome/content/rules/Caltech.edu.xml
@@ -0,0 +1,149 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+
+	
+	
+	
+
+	
+	
+	
+	
+
+	
+
+	
+	
+
+	
+	
+
+		
+
+	
+	
+
+		
+
+	
+
+
diff --git a/src/chrome/content/rules/Caltech.xml b/src/chrome/content/rules/Caltech.xml
deleted file mode 100644
index b161369ca0de..000000000000
--- a/src/chrome/content/rules/Caltech.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-
-
-
-
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-
-	
-	
-	
-	
-
-	
-
-	
-	
-	
-
-	
-	
-	
-	
-	
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-
-	
-	
-
-		
-
-	
-	
-
-	
-
-	
-	
-
-		
-
-	
-
-	
-	
-
-		
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Calvin_College.xml b/src/chrome/content/rules/Calvin_College.xml
index da67ee9ebd29..fdd09c10c424 100644
--- a/src/chrome/content/rules/Calvin_College.xml
+++ b/src/chrome/content/rules/Calvin_College.xml
@@ -8,4 +8,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Cambridge-Journals.xml b/src/chrome/content/rules/Cambridge-Journals.xml
deleted file mode 100644
index 4ce0d627cdf6..000000000000
--- a/src/chrome/content/rules/Cambridge-Journals.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Cambridge-University-Press.xml b/src/chrome/content/rules/Cambridge-University-Press.xml
index d767e08b2e25..637e28ef76d3 100644
--- a/src/chrome/content/rules/Cambridge-University-Press.xml
+++ b/src/chrome/content/rules/Cambridge-University-Press.xml
@@ -1,101 +1,33 @@
 
-
-
+
 	
-	
-		
-		
-		
-		
-		
-		
-		
-
-
-	
-
-
-	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
 
-	
-	
-
+	
 
diff --git a/src/chrome/content/rules/Cambridgeincolour.com.xml b/src/chrome/content/rules/Cambridgeincolour.com.xml
new file mode 100644
index 000000000000..046ce63bc2f5
--- /dev/null
+++ b/src/chrome/content/rules/Cambridgeincolour.com.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Camden.gov.uk.xml b/src/chrome/content/rules/Camden.gov.uk.xml
index 73a866421f6a..1f9204be4c21 100644
--- a/src/chrome/content/rules/Camden.gov.uk.xml
+++ b/src/chrome/content/rules/Camden.gov.uk.xml
@@ -64,7 +64,7 @@
 			- www3 from $self ˢ
 
 		- Images, on:
-		
+
 			- news from ^camden.gov.uk ˢ
 			- www3 from $self ˢ
 
diff --git a/src/chrome/content/rules/CamelCamelCamel.com.xml b/src/chrome/content/rules/CamelCamelCamel.com.xml
new file mode 100644
index 000000000000..fa58d3a13151
--- /dev/null
+++ b/src/chrome/content/rules/CamelCamelCamel.com.xml
@@ -0,0 +1,40 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/CamelHost.net.xml b/src/chrome/content/rules/CamelHost.net.xml
index eedbb462fd62..c655cd9b774d 100644
--- a/src/chrome/content/rules/CamelHost.net.xml
+++ b/src/chrome/content/rules/CamelHost.net.xml
@@ -8,11 +8,11 @@ Fetch error: http://billing.camelhost.net/ => https://billing.camelhost.net/: (5
 		- (www.)	(refused)
 
 -->
-
+
 
 	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Camelcamelcamel.xml b/src/chrome/content/rules/Camelcamelcamel.xml
deleted file mode 100644
index 69bbba9b00eb..000000000000
--- a/src/chrome/content/rules/Camelcamelcamel.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Cameralabs.com.xml b/src/chrome/content/rules/Cameralabs.com.xml
new file mode 100644
index 000000000000..597c575edd38
--- /dev/null
+++ b/src/chrome/content/rules/Cameralabs.com.xml
@@ -0,0 +1,9 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Camp_Staff_USA.xml b/src/chrome/content/rules/Camp_Staff_USA.xml
index 58392ac2babf..e86851af9fea 100644
--- a/src/chrome/content/rules/Camp_Staff_USA.xml
+++ b/src/chrome/content/rules/Camp_Staff_USA.xml
@@ -7,9 +7,9 @@
 
 
 	
-	
+	
 	
-	
+	
 
 
 	
@@ -19,7 +19,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Campaigner.xml b/src/chrome/content/rules/Campaigner.xml
index a6cfc41a74e1..2899ee446ba0 100644
--- a/src/chrome/content/rules/Campaigner.xml
+++ b/src/chrome/content/rules/Campaigner.xml
@@ -41,7 +41,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
@@ -50,7 +52,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/CampaignerCRM.com.xml b/src/chrome/content/rules/CampaignerCRM.com.xml
index 920542eaf2d8..24b78e0b5d0a 100644
--- a/src/chrome/content/rules/CampaignerCRM.com.xml
+++ b/src/chrome/content/rules/CampaignerCRM.com.xml
@@ -31,10 +31,12 @@ Fetch error: http://campaignercrm.com/ => https://www.campaignercrm.com/: (60, '
 	² Unsecurable
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
 	
@@ -43,7 +45,6 @@ Fetch error: http://campaignercrm.com/ => https://www.campaignercrm.com/: (60, '
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Campina.xml b/src/chrome/content/rules/Campina.xml
index 463ac51526e6..f1f229669bdd 100644
--- a/src/chrome/content/rules/Campina.xml
+++ b/src/chrome/content/rules/Campina.xml
@@ -33,7 +33,7 @@ Fetch error: http://www.mycampina.com/ => https://www.mycampina.com/: (51, "SSL:
 	* Handshake fails
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Campus_Pack.xml b/src/chrome/content/rules/Campus_Pack.xml
index 207b23f70297..05b1d545cd96 100644
--- a/src/chrome/content/rules/Campus_Pack.xml
+++ b/src/chrome/content/rules/Campus_Pack.xml
@@ -16,7 +16,7 @@ Fetch error: http://campuspack.eu/ => https://campuspack.eu/: (51, "SSL: no alte
 		- .+.campuspack.net		(at least some pages redirect to http)
 
 -->
-
+
 
 	
 	
@@ -37,4 +37,4 @@ Fetch error: http://campuspack.eu/ => https://campuspack.eu/: (51, "SSL: no alte
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CanLII.xml b/src/chrome/content/rules/CanLII.xml
index 80129a4d5ae1..0b59f6f049d3 100644
--- a/src/chrome/content/rules/CanLII.xml
+++ b/src/chrome/content/rules/CanLII.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CanSecWest.xml b/src/chrome/content/rules/CanSecWest.xml
index ad4d7ac9ea84..13c4f4745860 100644
--- a/src/chrome/content/rules/CanSecWest.xml
+++ b/src/chrome/content/rules/CanSecWest.xml
@@ -1,7 +1,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/CanadaHelps.xml b/src/chrome/content/rules/CanadaHelps.xml
index 1313ae93c809..adf512df658d 100644
--- a/src/chrome/content/rules/CanadaHelps.xml
+++ b/src/chrome/content/rules/CanadaHelps.xml
@@ -32,4 +32,4 @@ Fetch error: http://www.canadahelps.org/ => https://www.canadahelps.org/: Cycle
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Canadian-Lung-Assoc.xml b/src/chrome/content/rules/Canadian-Lung-Assoc.xml
index 73c633d32046..e010ec8c5662 100644
--- a/src/chrome/content/rules/Canadian-Lung-Assoc.xml
+++ b/src/chrome/content/rules/Canadian-Lung-Assoc.xml
@@ -3,4 +3,4 @@
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Canadian-Web-Hosting.xml b/src/chrome/content/rules/Canadian-Web-Hosting.xml
index 480b26594d25..098171697ca0 100644
--- a/src/chrome/content/rules/Canadian-Web-Hosting.xml
+++ b/src/chrome/content/rules/Canadian-Web-Hosting.xml
@@ -26,7 +26,7 @@
 	
 
 
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Canadian_Broadcasting_Corporation-mixedcontent.xml b/src/chrome/content/rules/Canadian_Broadcasting_Corporation-mixedcontent.xml
deleted file mode 100644
index 3117deb0a3f8..000000000000
--- a/src/chrome/content/rules/Canadian_Broadcasting_Corporation-mixedcontent.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-	
-		
-		
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Canadian_Broadcasting_Corporation.xml b/src/chrome/content/rules/Canadian_Broadcasting_Corporation.xml
deleted file mode 100644
index 1f89817569df..000000000000
--- a/src/chrome/content/rules/Canadian_Broadcasting_Corporation.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-	
-	
-		
-		
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Canadian_Institute_of_Chartered_Accountants.xml b/src/chrome/content/rules/Canadian_Institute_of_Chartered_Accountants.xml
index e3ac2b0c0350..9dd977225e8c 100644
--- a/src/chrome/content/rules/Canadian_Institute_of_Chartered_Accountants.xml
+++ b/src/chrome/content/rules/Canadian_Institute_of_Chartered_Accountants.xml
@@ -10,7 +10,7 @@ Fetch error: http://secure.cica.ca/ => https://secure.cica.ca/: (60, 'SSL certif
 		- (www.)	(redirects to secure; mismatched, CN: secure.cica.ca)
 
 -->
-
+
 
 	
 
@@ -20,4 +20,4 @@ Fetch error: http://secure.cica.ca/ => https://secure.cica.ca/: (60, 'SSL certif
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Canadian_Light_Source.xml b/src/chrome/content/rules/Canadian_Light_Source.xml
index fb85fe56c2c0..650dff77035f 100644
--- a/src/chrome/content/rules/Canadian_Light_Source.xml
+++ b/src/chrome/content/rules/Canadian_Light_Source.xml
@@ -14,4 +14,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Canadian_Security_Intelligence_Service.xml b/src/chrome/content/rules/Canadian_Security_Intelligence_Service.xml
deleted file mode 100644
index 2b8cffea0bbd..000000000000
--- a/src/chrome/content/rules/Canadian_Security_Intelligence_Service.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-    
-    
-    
-    
-    
-    
-
-    
-    
-
-    
-    
-    
-
-    
-    
-    
-
diff --git a/src/chrome/content/rules/CanalDigital.xml b/src/chrome/content/rules/CanalDigital.xml
index a09e6b8b2e6c..7fa0d78c8b8f 100644
--- a/src/chrome/content/rules/CanalDigital.xml
+++ b/src/chrome/content/rules/CanalDigital.xml
@@ -11,7 +11,7 @@ Fetch error: http://foreninger.canaldigital.dk/ => https://foreninger.canaldigit
 Fetch error: http://iptv.canaldigital.dk/ => https://iptv.canaldigital.dk/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 Fetch error: http://kabel.canaldigital.se/ => https://kabel.canaldigital.se/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
 	
diff --git a/src/chrome/content/rules/Canary_Watch.org.xml b/src/chrome/content/rules/Canary_Watch.org.xml
index 7789f51c6c94..562d2e4eabcb 100644
--- a/src/chrome/content/rules/Canary_Watch.org.xml
+++ b/src/chrome/content/rules/Canary_Watch.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://canarywatch.org/ => https://canarywatch.org/: (7, 'Failed to
 Fetch error: http://www.canarywatch.org/ => https://www.canarywatch.org/: (7, 'Failed to connect to www.canarywatch.org port 443: No route to host')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Canli_Alem.xml b/src/chrome/content/rules/Canli_Alem.xml
index be26b9f11a17..07b492287ff6 100644
--- a/src/chrome/content/rules/Canli_Alem.xml
+++ b/src/chrome/content/rules/Canli_Alem.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CannabisLegality.com.xml b/src/chrome/content/rules/CannabisLegality.com.xml
new file mode 100644
index 000000000000..7f75ebd820e3
--- /dev/null
+++ b/src/chrome/content/rules/CannabisLegality.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Canon.xml b/src/chrome/content/rules/Canon.xml
index de9731dc2bf3..7cf9bd9a03a3 100644
--- a/src/chrome/content/rules/Canon.xml
+++ b/src/chrome/content/rules/Canon.xml
@@ -33,7 +33,7 @@ Fetch error: http://newsletter.canon-europe.com/ => https://newsletter.canon-eur
 	ˢ Secured by us
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Canonical.xml b/src/chrome/content/rules/Canonical.xml
index 7e4a1394f886..734d1d3eaa49 100644
--- a/src/chrome/content/rules/Canonical.xml
+++ b/src/chrome/content/rules/Canonical.xml
@@ -17,7 +17,7 @@
 
 	
 	
-	
+	
 	
 	
 	
@@ -25,7 +25,6 @@
 	
 	
 	
-	
 	
 
 	
diff --git a/src/chrome/content/rules/Canonwatch.com.xml b/src/chrome/content/rules/Canonwatch.com.xml
new file mode 100644
index 000000000000..a37b52e397bc
--- /dev/null
+++ b/src/chrome/content/rules/Canonwatch.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/CanvasHolidays.co.uk.xml b/src/chrome/content/rules/CanvasHolidays.co.uk.xml
index 796398bd17ed..b193314cb192 100644
--- a/src/chrome/content/rules/CanvasHolidays.co.uk.xml
+++ b/src/chrome/content/rules/CanvasHolidays.co.uk.xml
@@ -1,5 +1,5 @@
 
-
+
   
 
   
diff --git a/src/chrome/content/rules/Capitol_Machine.com.xml b/src/chrome/content/rules/Capitol_Machine.com.xml
deleted file mode 100644
index e312eb149b4e..000000000000
--- a/src/chrome/content/rules/Capitol_Machine.com.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Capstone-engine.org.xml b/src/chrome/content/rules/Capstone-engine.org.xml
new file mode 100644
index 000000000000..69ac41f1dbfe
--- /dev/null
+++ b/src/chrome/content/rules/Capstone-engine.org.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Captura-Group.xml b/src/chrome/content/rules/Captura-Group.xml
deleted file mode 100644
index 609ec8f99e70..000000000000
--- a/src/chrome/content/rules/Captura-Group.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-
-	
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/CarAdvice.xml b/src/chrome/content/rules/CarAdvice.xml
index 42c79355f125..f893658e96b6 100644
--- a/src/chrome/content/rules/CarAdvice.xml
+++ b/src/chrome/content/rules/CarAdvice.xml
@@ -6,10 +6,11 @@ Fetch error: http://caradvice.com.au/ => https://caradvice.com.au/: (7, 'Failed
 Automatically by https-everywhere-checker because:
 Fetch error: http://caradvice.com.au/ => https://caradvice.com.au/: (7, 'Failed to connect to caradvice.com.au port 443: Connection refused')
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/CarProMods.com.xml b/src/chrome/content/rules/CarProMods.com.xml
index 9906e8c4bf1c..6016cab7f512 100644
--- a/src/chrome/content/rules/CarProMods.com.xml
+++ b/src/chrome/content/rules/CarProMods.com.xml
@@ -1,7 +1,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Carbonfund.org.xml b/src/chrome/content/rules/Carbonfund.org.xml
index 25bc3276f739..85d7b4bdba7d 100644
--- a/src/chrome/content/rules/Carbonfund.org.xml
+++ b/src/chrome/content/rules/Carbonfund.org.xml
@@ -21,4 +21,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Carbonwind.net.xml b/src/chrome/content/rules/Carbonwind.net.xml
index 38e384f11430..c0d41222458a 100644
--- a/src/chrome/content/rules/Carbonwind.net.xml
+++ b/src/chrome/content/rules/Carbonwind.net.xml
@@ -5,7 +5,7 @@ Fetch error: http://carbonwind.net/ => https://carbonwind.net/: (35, 'Unknown SS
 Fetch error: http://www.carbonwind.net/ => https://www.carbonwind.net/: (35, 'Unknown SSL protocol error in connection to www.carbonwind.net:443 ')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Cardiff-University.xml b/src/chrome/content/rules/Cardiff-University.xml
index 42d5e20e3cf5..78786cc9bcdb 100644
--- a/src/chrome/content/rules/Cardiff-University.xml
+++ b/src/chrome/content/rules/Cardiff-University.xml
@@ -1,4 +1,7 @@
 
-	
-	
-	
-	
-	
-
 	
 	
 	
@@ -66,15 +66,12 @@
 
 	
 	
-	
 	
-	
 	
-	
 	
 	
 		
 
-	
 
diff --git a/src/chrome/content/rules/Care-Net.org.xml b/src/chrome/content/rules/Care-Net.org.xml
new file mode 100644
index 000000000000..50892e7f1b4a
--- /dev/null
+++ b/src/chrome/content/rules/Care-Net.org.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Care-Net.xml b/src/chrome/content/rules/Care-Net.xml
deleted file mode 100644
index 63c0f231d45b..000000000000
--- a/src/chrome/content/rules/Care-Net.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Care2.com.xml b/src/chrome/content/rules/Care2.com.xml
index bf6849529d69..c68a5ceb2fa3 100644
--- a/src/chrome/content/rules/Care2.com.xml
+++ b/src/chrome/content/rules/Care2.com.xml
@@ -29,7 +29,7 @@ Fetch error: http://care2.com/ => https://www.care2.com/: (60, 'SSL certificate
 		- volunteer	(→ www)
 
 -->
-
+
 
 	
 	
@@ -56,4 +56,4 @@ Fetch error: http://care2.com/ => https://www.care2.com/: (60, 'SSL certificate
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Carecareers.com.au.xml b/src/chrome/content/rules/Carecareers.com.au.xml
index d655fd0792e0..bc57cd794bb6 100644
--- a/src/chrome/content/rules/Carecareers.com.au.xml
+++ b/src/chrome/content/rules/Carecareers.com.au.xml
@@ -20,7 +20,7 @@ Fetch error: http://jobs.carecareers.com.au/ => https://jobs.carecareers.com.au/
 	* Secured by us, doesn't trip MCB anyway
 
 -->
-
+
 
 	
 
@@ -30,4 +30,4 @@ Fetch error: http://jobs.carecareers.com.au/ => https://jobs.carecareers.com.au/
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CareerBuilder.xml b/src/chrome/content/rules/CareerBuilder.xml
index 2045560dabb1..8aa677162c9b 100644
--- a/src/chrome/content/rules/CareerBuilder.xml
+++ b/src/chrome/content/rules/CareerBuilder.xml
@@ -54,7 +54,7 @@ Fetch error: http://aol.careerbuilder.com/ => https://aol.careerbuilder.com/: (6
 		- Bug on www from centro.pixel.ad
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/CareerDean.com.xml b/src/chrome/content/rules/CareerDean.com.xml
index f0c26b4e746e..db95105897bd 100644
--- a/src/chrome/content/rules/CareerDean.com.xml
+++ b/src/chrome/content/rules/CareerDean.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://careerdean.com/ => https://careerdean.com/: (28, 'Connection
 Fetch error: http://www.careerdean.com/ => https://www.careerdean.com/: (28, 'Connection timed out after 20000 milliseconds')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/CareerPerfect.xml b/src/chrome/content/rules/CareerPerfect.xml
deleted file mode 100644
index 41eeb7529250..000000000000
--- a/src/chrome/content/rules/CareerPerfect.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Careers.fi.xml b/src/chrome/content/rules/Careers.fi.xml
deleted file mode 100644
index 5f1dff7bcac5..000000000000
--- a/src/chrome/content/rules/Careers.fi.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-  
-  
-  
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Carestream.com.xml b/src/chrome/content/rules/Carestream.com.xml
index 2155834e5407..85a0bbd6ed67 100644
--- a/src/chrome/content/rules/Carestream.com.xml
+++ b/src/chrome/content/rules/Carestream.com.xml
@@ -10,7 +10,7 @@
 
 
 	
-	
+	
 
 
 	
@@ -19,4 +19,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Cargo.xml b/src/chrome/content/rules/Cargo.xml
index b500c0d27f62..1997c05ab3a9 100644
--- a/src/chrome/content/rules/Cargo.xml
+++ b/src/chrome/content/rules/Cargo.xml
@@ -140,7 +140,39 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 		
diff --git a/src/chrome/content/rules/Carl_Zeiss.xml b/src/chrome/content/rules/Carl_Zeiss.xml
index 9b31d9a9dc68..53c6fba3ef6a 100644
--- a/src/chrome/content/rules/Carl_Zeiss.xml
+++ b/src/chrome/content/rules/Carl_Zeiss.xml
@@ -24,7 +24,7 @@
 	
 
 
-	
+	
 
 
 	
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 		
@@ -108,7 +130,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Carleton_College.xml b/src/chrome/content/rules/Carleton_College.xml
index 67977b5a3623..924b38a8018c 100644
--- a/src/chrome/content/rules/Carleton_College.xml
+++ b/src/chrome/content/rules/Carleton_College.xml
@@ -7,7 +7,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
@@ -16,7 +18,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Carnegie-Institution-for-Science.xml b/src/chrome/content/rules/Carnegie-Institution-for-Science.xml
index 976432434fbe..6c04c4aacd6a 100644
--- a/src/chrome/content/rules/Carnegie-Institution-for-Science.xml
+++ b/src/chrome/content/rules/Carnegie-Institution-for-Science.xml
@@ -27,7 +27,7 @@ Fetch error: http://vpn.carnegiescience.edu/ => https://vpn.carnegiescience.edu/
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Carnegie-Mellon-University-mismatches.xml b/src/chrome/content/rules/Carnegie-Mellon-University-mismatches.xml
index f02917abc16b..bdc54a24d98f 100644
--- a/src/chrome/content/rules/Carnegie-Mellon-University-mismatches.xml
+++ b/src/chrome/content/rules/Carnegie-Mellon-University-mismatches.xml
@@ -16,4 +16,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Carnegie-Mellon-University.xml b/src/chrome/content/rules/Carnegie-Mellon-University.xml
index 99e6194eff3b..a70643b2d189 100644
--- a/src/chrome/content/rules/Carnegie-Mellon-University.xml
+++ b/src/chrome/content/rules/Carnegie-Mellon-University.xml
@@ -126,7 +126,105 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 		
 		
 
@@ -134,12 +232,7 @@
 	
 
 
-	
 
-	
 
 	
@@ -151,4 +244,5 @@ from="^http://(www\.)?((?:directory\.|webiso\.)?andrew|cylab|ece|(?:sparrow|user
 	
 
+	
 
diff --git a/src/chrome/content/rules/Carphone_Warehouse.com.xml b/src/chrome/content/rules/Carphone_Warehouse.com.xml
index a3b880e3f6a1..0be0bb21a56d 100644
--- a/src/chrome/content/rules/Carphone_Warehouse.com.xml
+++ b/src/chrome/content/rules/Carphone_Warehouse.com.xml
@@ -1,12 +1,13 @@
 
 	
 	
-	
-	
 	
 
 	
-		
-		
-		
-
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-
 
 	
diff --git a/src/chrome/content/rules/Cars.com.xml b/src/chrome/content/rules/Cars.com.xml
index 69e36d8ffc5b..54934cb6fd38 100644
--- a/src/chrome/content/rules/Cars.com.xml
+++ b/src/chrome/content/rules/Cars.com.xml
@@ -2,7 +2,6 @@
 	Other Cars.com rulesets:
 
 		- Cstatic-graphics.com.xml
-		- Cstatic-images.com.xml
 
 
 	Insecure cookies are set for these domains and hosts:
diff --git a/src/chrome/content/rules/Carters_OshLosh.Ca.xml b/src/chrome/content/rules/Carters_OshLosh.Ca.xml
index 04758488c4c0..67193b93c594 100644
--- a/src/chrome/content/rules/Carters_OshLosh.Ca.xml
+++ b/src/chrome/content/rules/Carters_OshLosh.Ca.xml
@@ -29,7 +29,7 @@ Fetch error: http://cartersoshkosh.ca/ => https://www.cartersoshkosh.ca/: Too ma
 		- www.cartersoshkosh.ca
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Casascius.xml b/src/chrome/content/rules/Casascius.xml
deleted file mode 100644
index a02ed6b6a5f4..000000000000
--- a/src/chrome/content/rules/Casascius.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Case_Western_Reserve_University.xml b/src/chrome/content/rules/Case_Western_Reserve_University.xml
deleted file mode 100644
index a84c7efcdd83..000000000000
--- a/src/chrome/content/rules/Case_Western_Reserve_University.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Caseking.de.xml b/src/chrome/content/rules/Caseking.de.xml
index 7495568232b5..88fe760cf301 100644
--- a/src/chrome/content/rules/Caseking.de.xml
+++ b/src/chrome/content/rules/Caseking.de.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Cases_Ladder.xml b/src/chrome/content/rules/Cases_Ladder.xml
index 883725e86383..4fa7f93ddd5a 100644
--- a/src/chrome/content/rules/Cases_Ladder.xml
+++ b/src/chrome/content/rules/Cases_Ladder.xml
@@ -13,4 +13,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CashTravel.info.xml b/src/chrome/content/rules/CashTravel.info.xml
new file mode 100644
index 000000000000..432779cf66bf
--- /dev/null
+++ b/src/chrome/content/rules/CashTravel.info.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Cash_for_Contracts.xml b/src/chrome/content/rules/Cash_for_Contracts.xml
index 1b8e1bf01fd8..aefab97d38e1 100644
--- a/src/chrome/content/rules/Cash_for_Contracts.xml
+++ b/src/chrome/content/rules/Cash_for_Contracts.xml
@@ -8,7 +8,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Cashback.co.uk.xml b/src/chrome/content/rules/Cashback.co.uk.xml
index 04dfa6a697fd..6c4fbc2b4833 100644
--- a/src/chrome/content/rules/Cashback.co.uk.xml
+++ b/src/chrome/content/rules/Cashback.co.uk.xml
@@ -1,16 +1,12 @@
-
-
-	
-	
-		
-		
-
-	
-
-	
-	
-
+
+
+	
+	
+
+	
 
diff --git a/src/chrome/content/rules/CasinoAffiliatePrograms.xml b/src/chrome/content/rules/CasinoAffiliatePrograms.xml
index 11df9d3c9847..7685aa9f9e3f 100644
--- a/src/chrome/content/rules/CasinoAffiliatePrograms.xml
+++ b/src/chrome/content/rules/CasinoAffiliatePrograms.xml
@@ -8,7 +8,7 @@ Automatically by https-everywhere-checker because:
 Fetch error: http://casinoaffiliateprograms.com/ => https://casinoaffiliateprograms.com/: Cycle detected - URL already encountered: https://casinoaffiliateprograms.com/
 Fetch error: http://www.casinoaffiliateprograms.com/ => https://casinoaffiliateprograms.com/: Cycle detected - URL already encountered: https://casinoaffiliateprograms.com/
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/CasinoEstrella.com.xml b/src/chrome/content/rules/CasinoEstrella.com.xml
index f9911a91d544..858d3a841ae1 100644
--- a/src/chrome/content/rules/CasinoEstrella.com.xml
+++ b/src/chrome/content/rules/CasinoEstrella.com.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Casper_og_Frank.dk.xml b/src/chrome/content/rules/Casper_og_Frank.dk.xml
deleted file mode 100644
index 7e1e94955a75..000000000000
--- a/src/chrome/content/rules/Casper_og_Frank.dk.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/CassinoEstrela.xml b/src/chrome/content/rules/CassinoEstrela.xml
index ee99e200d6ed..afdbad983b50 100644
--- a/src/chrome/content/rules/CassinoEstrela.xml
+++ b/src/chrome/content/rules/CassinoEstrela.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.cassinoestrela.com/ => https://www.cassinoestrela.com/:
 Disabled by https-everywhere-checker because:
 Fetch error: http://cassinoestrela.com/ => https://cassinoestrela.com/: (35, 'error:140770FC:SSL routines:SSL23_GET_SERVER_HELLO:unknown protocol')
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://cassinoestrela.com/ => https://cassinoestrela.com/: (35, 'er
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Castel-Bayart.xml b/src/chrome/content/rules/Castel-Bayart.xml
deleted file mode 100644
index 8cd61fe2f9cd..000000000000
--- a/src/chrome/content/rules/Castel-Bayart.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Casual-Effects.com.xml b/src/chrome/content/rules/Casual-Effects.com.xml
new file mode 100644
index 000000000000..c9f2b035a045
--- /dev/null
+++ b/src/chrome/content/rules/Casual-Effects.com.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/CatN.com.xml b/src/chrome/content/rules/CatN.com.xml
index 39cf587c70fb..54a85c88e2f0 100644
--- a/src/chrome/content/rules/CatN.com.xml
+++ b/src/chrome/content/rules/CatN.com.xml
@@ -1,7 +1,7 @@
 
 
 	
-	
+	
 
 
 	
-
-
-	
-	
-	
-
-
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Catalyst_Host.com.xml b/src/chrome/content/rules/Catalyst_Host.com.xml
index 99551bd9d094..5a76d79a378e 100644
--- a/src/chrome/content/rules/Catalyst_Host.com.xml
+++ b/src/chrome/content/rules/Catalyst_Host.com.xml
@@ -14,7 +14,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Catalyst_Technology_Group.xml b/src/chrome/content/rules/Catalyst_Technology_Group.xml
index ec950db9e149..d1bea0b4d8c6 100644
--- a/src/chrome/content/rules/Catalyst_Technology_Group.xml
+++ b/src/chrome/content/rules/Catalyst_Technology_Group.xml
@@ -8,16 +8,16 @@ Fetch error: http://www.catalysttg.com/ => https://www.catalysttg.com/: (51, "SS
 Disabled by https-everywhere-checker because:
 Fetch error: http://catalysttg.com/ => https://catalysttg.com/: (51, "SSL: no alternative certificate subject name matches target host name 'catalysttg.com'")
 -->
-
+
 
 	
 	
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Catbox.moe.xml b/src/chrome/content/rules/Catbox.moe.xml
deleted file mode 100644
index 8a07bbc594d2..000000000000
--- a/src/chrome/content/rules/Catbox.moe.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Catch.com.au.xml b/src/chrome/content/rules/Catch.com.au.xml
index dc430ed12dd4..a34b3843c5bd 100644
--- a/src/chrome/content/rules/Catch.com.au.xml
+++ b/src/chrome/content/rules/Catch.com.au.xml
@@ -1,6 +1,10 @@
 
@@ -38,7 +42,7 @@
 	
 	
 	
-	
+
   	
 
 	
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/CatchConnect.com.au.xml b/src/chrome/content/rules/CatchConnect.com.au.xml
new file mode 100644
index 000000000000..4c8b8b187122
--- /dev/null
+++ b/src/chrome/content/rules/CatchConnect.com.au.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Caters_News_Agency.xml b/src/chrome/content/rules/Caters_News_Agency.xml
index c28a9cad846b..2481c8e819bf 100644
--- a/src/chrome/content/rules/Caters_News_Agency.xml
+++ b/src/chrome/content/rules/Caters_News_Agency.xml
@@ -12,4 +12,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CathayPacific.com.xml b/src/chrome/content/rules/CathayPacific.com.xml
new file mode 100644
index 000000000000..0762ffc1b1a0
--- /dev/null
+++ b/src/chrome/content/rules/CathayPacific.com.xml
@@ -0,0 +1,70 @@
+
+
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/CathayPacificCargo.com.xml b/src/chrome/content/rules/CathayPacificCargo.com.xml
new file mode 100644
index 000000000000..3e9c08096e34
--- /dev/null
+++ b/src/chrome/content/rules/CathayPacificCargo.com.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+		
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Cathay_Pacific.xml b/src/chrome/content/rules/Cathay_Pacific.xml
deleted file mode 100644
index be39695ea7d2..000000000000
--- a/src/chrome/content/rules/Cathay_Pacific.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
diff --git a/src/chrome/content/rules/Catlin_Sea_Survey.xml b/src/chrome/content/rules/Catlin_Sea_Survey.xml
index eecf9642a37c..5d392a8d4dce 100644
--- a/src/chrome/content/rules/Catlin_Sea_Survey.xml
+++ b/src/chrome/content/rules/Catlin_Sea_Survey.xml
@@ -19,7 +19,7 @@ Fetch error: http://catlinseaviewsurvey.com/ => https://www.catlinseaviewsurvey.
 		- www.catlinseaviewsurvey.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Cato-Institute.xml b/src/chrome/content/rules/Cato-Institute.xml
index c61a0f267a44..24c6b1f09223 100644
--- a/src/chrome/content/rules/Cato-Institute.xml
+++ b/src/chrome/content/rules/Cato-Institute.xml
@@ -22,7 +22,7 @@ Fetch error: http://secure.cato.org/ => https://secure.cato.org/: (51, "SSL: no
 	^: cert only matches www
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Catraca_Livre.com.br.xml b/src/chrome/content/rules/Catraca_Livre.com.br.xml
index e096f0dbfb49..f692fb600504 100644
--- a/src/chrome/content/rules/Catraca_Livre.com.br.xml
+++ b/src/chrome/content/rules/Catraca_Livre.com.br.xml
@@ -15,7 +15,7 @@ Fetch error: http://fazedores.catracalivre.com.br/ => https://fazedores.catracal
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Causes.xml b/src/chrome/content/rules/Causes.xml
index 4a12c6401ea5..9ed53543b730 100644
--- a/src/chrome/content/rules/Causes.xml
+++ b/src/chrome/content/rules/Causes.xml
@@ -6,7 +6,7 @@ Fetch error: http://causes.presscdn.com/ => https://exchange.causes.com/: (6, 'C
 Disabled by https-everywhere-checker because:
 Fetch error: http://causes.presscdn.com/ => https://exchange.causes.com/: (51, "SSL: no alternative certificate subject name matches target host name 'exchange.causes.com'")	s3.amazonaws.com/causes-prod/
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Cavatoyota.com.xml b/src/chrome/content/rules/Cavatoyota.com.xml
new file mode 100644
index 000000000000..65303591efdf
--- /dev/null
+++ b/src/chrome/content/rules/Cavatoyota.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Cavemancirus.com.xml b/src/chrome/content/rules/Cavemancirus.com.xml
new file mode 100644
index 000000000000..8a6af8569d98
--- /dev/null
+++ b/src/chrome/content/rules/Cavemancirus.com.xml
@@ -0,0 +1,25 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Cavirtex.com.xml b/src/chrome/content/rules/Cavirtex.com.xml
index 59227c99a9b8..25b679ad6263 100644
--- a/src/chrome/content/rules/Cavirtex.com.xml
+++ b/src/chrome/content/rules/Cavirtex.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.cavirtex.com/ => https://www.cavirtex.com/: (7, 'Failed
 	* Shows default page
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Cchtml.com.xml b/src/chrome/content/rules/Cchtml.com.xml
index 4ef5d90a1ad2..119823e4f1b6 100644
--- a/src/chrome/content/rules/Cchtml.com.xml
+++ b/src/chrome/content/rules/Cchtml.com.xml
@@ -1,7 +1,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -12,7 +13,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Cdig.me.xml b/src/chrome/content/rules/Cdig.me.xml
deleted file mode 100644
index 6c4939fc3802..000000000000
--- a/src/chrome/content/rules/Cdig.me.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Cdn-net.com.xml b/src/chrome/content/rules/Cdn-net.com.xml
index 8cfa9fe59370..f75b7ec5611b 100644
--- a/src/chrome/content/rules/Cdn-net.com.xml
+++ b/src/chrome/content/rules/Cdn-net.com.xml
@@ -5,8 +5,8 @@
 
 	
 	
-	
+
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Cdnads.com.xml b/src/chrome/content/rules/Cdnads.com.xml
index bcf699259b53..5a004c7d4ab2 100644
--- a/src/chrome/content/rules/Cdnads.com.xml
+++ b/src/chrome/content/rules/Cdnads.com.xml
@@ -8,18 +8,9 @@
 -->
 
 
-	
+	
 	
 
-	
-	
-
-
-	
-
 	
 
diff --git a/src/chrome/content/rules/Cdncomputer.com.xml b/src/chrome/content/rules/Cdncomputer.com.xml
index ffb526af422f..75e5869e2295 100644
--- a/src/chrome/content/rules/Cdncomputer.com.xml
+++ b/src/chrome/content/rules/Cdncomputer.com.xml
@@ -16,7 +16,7 @@ Fetch error: http://cdn.cdncomputer.com/ => https://d1eiwcwqdd4h4w.cloudfront.ne
 	(www.) does not exist.
 
 -->
-
+
 
 	
 
@@ -24,4 +24,4 @@ Fetch error: http://cdn.cdncomputer.com/ => https://d1eiwcwqdd4h4w.cloudfront.ne
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CeeJay.net.xml b/src/chrome/content/rules/CeeJay.net.xml
deleted file mode 100644
index 7505acbb4b22..000000000000
--- a/src/chrome/content/rules/CeeJay.net.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Cefbuilds.com.xml b/src/chrome/content/rules/Cefbuilds.com.xml
deleted file mode 100644
index 41efb1b98d5c..000000000000
--- a/src/chrome/content/rules/Cefbuilds.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Cellarmasters.com.au.xml b/src/chrome/content/rules/Cellarmasters.com.au.xml
index 98f0cc1bac06..cd90269b4660 100644
--- a/src/chrome/content/rules/Cellarmasters.com.au.xml
+++ b/src/chrome/content/rules/Cellarmasters.com.au.xml
@@ -3,7 +3,7 @@
 
 
 	Nonfunctional subdomains:
-	
+
 		- dev		(SSL handshake failed)
 		- email		(connection refused)
 		- emm		(timeout)
diff --git a/src/chrome/content/rules/Cengage.xml b/src/chrome/content/rules/Cengage.xml
index f450e4910d57..72160fc50318 100644
--- a/src/chrome/content/rules/Cengage.xml
+++ b/src/chrome/content/rules/Cengage.xml
@@ -8,18 +8,21 @@ Fetch error: http://cengagebrain.co.uk/ => https://cengagebrain.co.uk/: Cycle de
 Fetch error: http://multivu.com/ => https://www.multivu.com/: Redirect for 'http://multivu.com/' missing Location	!functional:
 		- gdc.gale.com
 -->
-
+
 
 	
 	
-	
+	
+	
 	
-	
+	
 	
-	
-	
+	
+	
+	
 	
-	
+	
+	
 	
 	
 	
diff --git a/src/chrome/content/rules/Censorship.govt.nz.xml b/src/chrome/content/rules/Censorship.govt.nz.xml
index 77a97027aa05..3b11557e2d68 100644
--- a/src/chrome/content/rules/Censorship.govt.nz.xml
+++ b/src/chrome/content/rules/Censorship.govt.nz.xml
@@ -8,7 +8,7 @@ Automatically by https-everywhere-checker because:
 Fetch error: http://censorship.govt.nz/ => https://www.censorship.govt.nz/: (51, "SSL: no alternative certificate subject name matches target host name 'www.censorship.govt.nz'")
 Fetch error: http://www.censorship.govt.nz/ => https://www.censorship.govt.nz/: (51, "SSL: no alternative certificate subject name matches target host name 'www.censorship.govt.nz'")
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/CentOS.org.xml b/src/chrome/content/rules/CentOS.org.xml
index b3147576007d..3ef8a7afb6f1 100644
--- a/src/chrome/content/rules/CentOS.org.xml
+++ b/src/chrome/content/rules/CentOS.org.xml
@@ -1,52 +1,46 @@
 
 
 
-	
 	
+	
+	
+	
+	
+	
 	
 	
+	
+	
+	
+	
+	
 	
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
-	
-
-
-	
-	
-	
-
-	
 
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Center-for-Responsive-Politics.xml b/src/chrome/content/rules/Center-for-Responsive-Politics.xml
deleted file mode 100644
index 2fb73f1a6359..000000000000
--- a/src/chrome/content/rules/Center-for-Responsive-Politics.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Center_for_Early_Childhood_Professional_Development.xml b/src/chrome/content/rules/Center_for_Early_Childhood_Professional_Development.xml
index 2a4efb74d37e..a424691ae4ba 100644
--- a/src/chrome/content/rules/Center_for_Early_Childhood_Professional_Development.xml
+++ b/src/chrome/content/rules/Center_for_Early_Childhood_Professional_Development.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Center_for_Individual_Freedom.xml b/src/chrome/content/rules/Center_for_Individual_Freedom.xml
index 7cda08fe7f73..c912574bb1f1 100644
--- a/src/chrome/content/rules/Center_for_Individual_Freedom.xml
+++ b/src/chrome/content/rules/Center_for_Individual_Freedom.xml
@@ -8,7 +8,7 @@ Non-2xx HTTP code: http://vs.cfif.org/ (200) => https://vs.cfif.org/ (403)
 		- mailserver	(data differs)
 
 -->
-
+
 
 	
 	
@@ -20,4 +20,4 @@ Non-2xx HTTP code: http://vs.cfif.org/ (200) => https://vs.cfif.org/ (403)
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Center_for_Land_Use_Interpretation.xml b/src/chrome/content/rules/Center_for_Land_Use_Interpretation.xml
index d93a8a199482..ab285a775a74 100644
--- a/src/chrome/content/rules/Center_for_Land_Use_Interpretation.xml
+++ b/src/chrome/content/rules/Center_for_Land_Use_Interpretation.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CentraFoods.com.xml b/src/chrome/content/rules/CentraFoods.com.xml
new file mode 100644
index 000000000000..b40cdb53a325
--- /dev/null
+++ b/src/chrome/content/rules/CentraFoods.com.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Centralfield.com.xml b/src/chrome/content/rules/Centralfield.com.xml
index cb4879064159..8d64ca6cf514 100644
--- a/src/chrome/content/rules/Centralfield.com.xml
+++ b/src/chrome/content/rules/Centralfield.com.xml
@@ -5,6 +5,9 @@
 			- mail.centralfield.com
 			- mbox.centralfield.com
 			- shop.centralfield.com
+
+		Different content:
+			- centralfield.com
 -->
 
 	
@@ -12,5 +15,8 @@
 
 	
 
+	
+
 	
 
diff --git a/src/chrome/content/rules/Centralparkzoo.com.xml b/src/chrome/content/rules/Centralparkzoo.com.xml
new file mode 100644
index 000000000000..4cf7cca68791
--- /dev/null
+++ b/src/chrome/content/rules/Centralparkzoo.com.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Centralreg.ru.xml b/src/chrome/content/rules/Centralreg.ru.xml
deleted file mode 100644
index c3548c99a8c0..000000000000
--- a/src/chrome/content/rules/Centralreg.ru.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Centre_for_the_Protection_of_National_Infrastructure.xml b/src/chrome/content/rules/Centre_for_the_Protection_of_National_Infrastructure.xml
index 7357dd8c1d8f..d6d57c5b728e 100644
--- a/src/chrome/content/rules/Centre_for_the_Protection_of_National_Infrastructure.xml
+++ b/src/chrome/content/rules/Centre_for_the_Protection_of_National_Infrastructure.xml
@@ -6,7 +6,7 @@ Fetch error: http://cpni.gov.uk/ => https://www.cpni.gov.uk/: (6, 'Could not res
     
     
 
-    
+    
 
     
diff --git a/src/chrome/content/rules/Centreon.com.xml b/src/chrome/content/rules/Centreon.com.xml
index 604745072fdf..493c4142ba64 100644
--- a/src/chrome/content/rules/Centreon.com.xml
+++ b/src/chrome/content/rules/Centreon.com.xml
@@ -36,7 +36,7 @@ Fetch error: http://login.centreon.com/ => https://login.centreon.com/: (6, 'Cou
 	* Secured by us
 
 -->
-
+
 
 	
@@ -61,7 +61,7 @@ Fetch error: http://login.centreon.com/ => https://login.centreon.com/: (6, 'Cou
 	
 	
 
-	
+	
 
 
 	
 
 	
-	
+	
+	
 
 
 	
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/CertifiedAccessories.com.xml b/src/chrome/content/rules/CertifiedAccessories.com.xml
new file mode 100644
index 000000000000..a88a4441dd34
--- /dev/null
+++ b/src/chrome/content/rules/CertifiedAccessories.com.xml
@@ -0,0 +1,12 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Certified_Secure.com.xml b/src/chrome/content/rules/Certified_Secure.com.xml
index 88251819d3b8..335dc713060b 100644
--- a/src/chrome/content/rules/Certified_Secure.com.xml
+++ b/src/chrome/content/rules/Certified_Secure.com.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Certona.xml b/src/chrome/content/rules/Certona.xml
index 847d22087752..f2d059897c0d 100644
--- a/src/chrome/content/rules/Certona.xml
+++ b/src/chrome/content/rules/Certona.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CeskaPosta.cz.xml b/src/chrome/content/rules/CeskaPosta.cz.xml
index 58b69a7752ee..baaa9380cbb6 100644
--- a/src/chrome/content/rules/CeskaPosta.cz.xml
+++ b/src/chrome/content/rules/CeskaPosta.cz.xml
@@ -4,7 +4,6 @@
     
     
 
-    
 
     
diff --git a/src/chrome/content/rules/Cgtk.co.uk.xml b/src/chrome/content/rules/Cgtk.co.uk.xml
new file mode 100644
index 000000000000..bae9f9ff9ff8
--- /dev/null
+++ b/src/chrome/content/rules/Cgtk.co.uk.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Chain.com.xml b/src/chrome/content/rules/Chain.com.xml
index 5b639c80b5d5..763a6e0c069f 100644
--- a/src/chrome/content/rules/Chain.com.xml
+++ b/src/chrome/content/rules/Chain.com.xml
@@ -23,7 +23,7 @@ Fetch error: http://api.chain.com/ => https://api.chain.com/: (6, 'Could not res
 		- api
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Chainlove.com.xml b/src/chrome/content/rules/Chainlove.com.xml
index 98a3a9600763..313a15927745 100644
--- a/src/chrome/content/rules/Chainlove.com.xml
+++ b/src/chrome/content/rules/Chainlove.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://images.chainlove.com/ => https://www.chainlove.com/: (6, 'Co
 	* Akamai
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Chaiscript.com.xml b/src/chrome/content/rules/Chaiscript.com.xml
new file mode 100644
index 000000000000..05059ac3ac0e
--- /dev/null
+++ b/src/chrome/content/rules/Chaiscript.com.xml
@@ -0,0 +1,10 @@
+
+    
+    
+
+    
+
+	
+    
+    
+
diff --git a/src/chrome/content/rules/ChakraOS.org.xml b/src/chrome/content/rules/ChakraOS.org.xml
index af95831f0940..af46bee906ed 100644
--- a/src/chrome/content/rules/ChakraOS.org.xml
+++ b/src/chrome/content/rules/ChakraOS.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.chakraos.org/ => https://www.chakraos.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.chakraos.org'")
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Challenge.gov.xml b/src/chrome/content/rules/Challenge.gov.xml
index 08786470614e..3b83385bf0f5 100644
--- a/src/chrome/content/rules/Challenge.gov.xml
+++ b/src/chrome/content/rules/Challenge.gov.xml
@@ -13,7 +13,7 @@ Fetch error: http://staging-api.challenge.gov/ => https://staging-api.challenge.
 		- www.challenge.gov
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ChallengePost.xml b/src/chrome/content/rules/ChallengePost.xml
index b244781b932c..8c3e486f75ea 100644
--- a/src/chrome/content/rules/ChallengePost.xml
+++ b/src/chrome/content/rules/ChallengePost.xml
@@ -31,7 +31,7 @@ Fetch error: http://challengepost.com/ => https://challengepost.com/: Cycle dete
 		- (www.)assetspost.com		(at least some pages redirect to http)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Chalmers.se.xml b/src/chrome/content/rules/Chalmers.se.xml
index ec4834ff64a0..fd83200003d6 100644
--- a/src/chrome/content/rules/Chalmers.se.xml
+++ b/src/chrome/content/rules/Chalmers.se.xml
@@ -1,13 +1,22 @@
+
+
 
 
 	
-	
-
+	
+	
+	
+	
+	
+	
+	
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Chambal.xml b/src/chrome/content/rules/Chambal.xml
deleted file mode 100644
index 7c080e0605b4..000000000000
--- a/src/chrome/content/rules/Chambal.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Chameleon.ad.xml b/src/chrome/content/rules/Chameleon.ad.xml
index 71a34e798eb1..82409957f04a 100644
--- a/src/chrome/content/rules/Chameleon.ad.xml
+++ b/src/chrome/content/rules/Chameleon.ad.xml
@@ -1,4 +1,4 @@
-
 
+	
+	
 
-	
-
-
-	
-
-
-	
+	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Champs_Sports.xml b/src/chrome/content/rules/Champs_Sports.xml
index 3606bb96be4b..33733661dcbb 100644
--- a/src/chrome/content/rules/Champs_Sports.xml
+++ b/src/chrome/content/rules/Champs_Sports.xml
@@ -22,7 +22,11 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 
 
 	
@@ -37,7 +41,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Change.org.xml b/src/chrome/content/rules/Change.org.xml
index 89638b45c105..333bcbffdb94 100644
--- a/src/chrome/content/rules/Change.org.xml
+++ b/src/chrome/content/rules/Change.org.xml
@@ -14,7 +14,8 @@
 
 
 	
-	
+	
+	
 
 
 	
-
+
 
 	
diff --git a/src/chrome/content/rules/ChannelIntelligence.com.xml b/src/chrome/content/rules/ChannelIntelligence.com.xml
deleted file mode 100644
index 22baf07b1b7b..000000000000
--- a/src/chrome/content/rules/ChannelIntelligence.com.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Channel_4-falsemixed.xml b/src/chrome/content/rules/Channel_4-falsemixed.xml
index f2c61c66bf8d..53d9029457fe 100644
--- a/src/chrome/content/rules/Channel_4-falsemixed.xml
+++ b/src/chrome/content/rules/Channel_4-falsemixed.xml
@@ -6,7 +6,7 @@ Fetch error: http://mailing.channel4.com/ => https://mailing.channel4.com/: (51,
 	For rules not causing false/broken MCB, see Channel_4.xml.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Channelme.tv.xml b/src/chrome/content/rules/Channelme.tv.xml
index d72391fd4ee1..126b69890f2f 100644
--- a/src/chrome/content/rules/Channelme.tv.xml
+++ b/src/chrome/content/rules/Channelme.tv.xml
@@ -6,10 +6,11 @@
 -->
 
 
-	
+	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Channelx.biz.xml b/src/chrome/content/rules/Channelx.biz.xml
deleted file mode 100644
index 0f6199dcf3f6..000000000000
--- a/src/chrome/content/rules/Channelx.biz.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Chaos-Reigns.xml b/src/chrome/content/rules/Chaos-Reigns.xml
index b1c33e7e9de1..9c024e2b9306 100644
--- a/src/chrome/content/rules/Chaos-Reigns.xml
+++ b/src/chrome/content/rules/Chaos-Reigns.xml
@@ -12,10 +12,11 @@
 
 
 	
-	
+	
+	
 
 
-	
+	
 
 
 	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/CharityWeb.xml b/src/chrome/content/rules/CharityWeb.xml
index 08e3dbfc8b31..14bd7d8c8781 100644
--- a/src/chrome/content/rules/CharityWeb.xml
+++ b/src/chrome/content/rules/CharityWeb.xml
@@ -7,14 +7,11 @@
 
 
 	
-	
+	
 
 
 	
-	
 
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Charlie.bz.xml b/src/chrome/content/rules/Charlie.bz.xml
index 65574cc50ea8..b17d824194c4 100644
--- a/src/chrome/content/rules/Charlie.bz.xml
+++ b/src/chrome/content/rules/Charlie.bz.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.charlie.bz/ => https://www.charlie.bz/: (51, "SSL: no alternative certificate subject name matches target host name 'www.charlie.bz'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Charter-Business.com.xml b/src/chrome/content/rules/Charter-Business.com.xml
index 0f8499997bb3..7182a6e1e8e5 100644
--- a/src/chrome/content/rules/Charter-Business.com.xml
+++ b/src/chrome/content/rules/Charter-Business.com.xml
@@ -30,7 +30,7 @@ Fetch error: http://connect.charter-business.com/ => https://connect.charter-bus
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Charter.com.xml b/src/chrome/content/rules/Charter.com.xml
index a4b7e9e5863c..bdb7d03e5c56 100644
--- a/src/chrome/content/rules/Charter.com.xml
+++ b/src/chrome/content/rules/Charter.com.xml
@@ -12,7 +12,6 @@ Fetch error: http://myaccount.charter.com/ => https://www.myaccount.charter.com/
 		- Charter-Business.com.xml
 		- Charter_our_Community.com.xml
 		- CharterBusiness.com.xml
-		- Spectrum.com.xml
 		- SpectrumBusiness.net.xml
 		- Spectrum_Business_Insights.com.xml
 
@@ -59,7 +58,7 @@ Fetch error: http://myaccount.charter.com/ => https://www.myaccount.charter.com/
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/CharterBusiness.com.xml b/src/chrome/content/rules/CharterBusiness.com.xml
index 70298f790ce6..5b024029dd3a 100644
--- a/src/chrome/content/rules/CharterBusiness.com.xml
+++ b/src/chrome/content/rules/CharterBusiness.com.xml
@@ -23,7 +23,7 @@ Fetch error: http://media.charterbusiness.com/ => https://media.charterbusiness.
 		- www2.charterbusiness.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Charter_our_Community.com.xml b/src/chrome/content/rules/Charter_our_Community.com.xml
index 895846283246..83e8aefb63a8 100644
--- a/src/chrome/content/rules/Charter_our_Community.com.xml
+++ b/src/chrome/content/rules/Charter_our_Community.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.charterourcommunity.com/ => https://www.charterourcommun
 		- www.charterourcommunity.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Chase.com.xml b/src/chrome/content/rules/Chase.com.xml
index 984d00b82b33..37e862a18d15 100644
--- a/src/chrome/content/rules/Chase.com.xml
+++ b/src/chrome/content/rules/Chase.com.xml
@@ -26,6 +26,6 @@
 	
 
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Chat-Place.xml b/src/chrome/content/rules/Chat-Place.xml
index 95f99b406a31..5d6646aef420 100644
--- a/src/chrome/content/rules/Chat-Place.xml
+++ b/src/chrome/content/rules/Chat-Place.xml
@@ -3,7 +3,7 @@
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Chatango.com.xml b/src/chrome/content/rules/Chatango.com.xml
index 973312a1f891..d3fbd3a9bce0 100644
--- a/src/chrome/content/rules/Chatango.com.xml
+++ b/src/chrome/content/rules/Chatango.com.xml
@@ -1,31 +1,39 @@
 
 
 
 	
 	
 
+	
+	
+	
+	
+	
+	
 
 	
 
+	
+	
+	
+	
+	
+	
+
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Chatelaine.com.xml b/src/chrome/content/rules/Chatelaine.com.xml
new file mode 100644
index 000000000000..84d0b39b0105
--- /dev/null
+++ b/src/chrome/content/rules/Chatelaine.com.xml
@@ -0,0 +1,50 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Chatter.xml b/src/chrome/content/rules/Chatter.xml
index d0b58dd0a4e6..03b9954dc1e1 100644
--- a/src/chrome/content/rules/Chatter.xml
+++ b/src/chrome/content/rules/Chatter.xml
@@ -10,7 +10,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -19,7 +20,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Chaturbate.com.xml b/src/chrome/content/rules/Chaturbate.com.xml
deleted file mode 100644
index 945527d539a1..000000000000
--- a/src/chrome/content/rules/Chaturbate.com.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-		
-		
-
-		
-
-	
-	
-	
-
-
-	
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Cheap-Ass-Gamer.xml b/src/chrome/content/rules/Cheap-Ass-Gamer.xml
index f449de7bd27a..bb908fbb349d 100644
--- a/src/chrome/content/rules/Cheap-Ass-Gamer.xml
+++ b/src/chrome/content/rules/Cheap-Ass-Gamer.xml
@@ -6,4 +6,4 @@
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CheapCheapLah.com.xml b/src/chrome/content/rules/CheapCheapLah.com.xml
index 5bf6c1ffb003..9cd000bdb5f2 100644
--- a/src/chrome/content/rules/CheapCheapLah.com.xml
+++ b/src/chrome/content/rules/CheapCheapLah.com.xml
@@ -12,4 +12,4 @@
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Cheap_Airport_Parking.xml b/src/chrome/content/rules/Cheap_Airport_Parking.xml
index 88c44d7962e7..dc7b11ff651f 100644
--- a/src/chrome/content/rules/Cheap_Airport_Parking.xml
+++ b/src/chrome/content/rules/Cheap_Airport_Parking.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.cheapairportparkingbirmingham.com/ => https://www.cheapa
 Disabled by https-everywhere-checker because:
 Fetch error: http://cheapairportparkingbirmingham.com/ => https://cheapairportparkingbirmingham.com/: (60, 'SSL certificate problem: self signed certificate')
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://cheapairportparkingbirmingham.com/ => https://cheapairportpa
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Cheapass_Fiction.com.xml b/src/chrome/content/rules/Cheapass_Fiction.com.xml
deleted file mode 100644
index f22e4b61c646..000000000000
--- a/src/chrome/content/rules/Cheapass_Fiction.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Cheapshark.com.xml b/src/chrome/content/rules/Cheapshark.com.xml
new file mode 100644
index 000000000000..0a88a1a54d47
--- /dev/null
+++ b/src/chrome/content/rules/Cheapshark.com.xml
@@ -0,0 +1,26 @@
+
+
+
+	
+	
+	
+	
+	
+    
+    
+    
+    
+    
+    
+    
+    
+
+	
+
diff --git a/src/chrome/content/rules/Cheatbook.de.xml b/src/chrome/content/rules/Cheatbook.de.xml
deleted file mode 100644
index c9227f41dac1..000000000000
--- a/src/chrome/content/rules/Cheatbook.de.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Check24.de.xml b/src/chrome/content/rules/Check24.de.xml
index b91582526f00..0dea492b7565 100644
--- a/src/chrome/content/rules/Check24.de.xml
+++ b/src/chrome/content/rules/Check24.de.xml
@@ -4,4 +4,4 @@
 
   
   
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CheckM8.com.xml b/src/chrome/content/rules/CheckM8.com.xml
new file mode 100644
index 000000000000..80ce7ac07027
--- /dev/null
+++ b/src/chrome/content/rules/CheckM8.com.xml
@@ -0,0 +1,22 @@
+
+
+
+	
+	
+		
+		
+		
+
+		
+			
+			
+
+	
+
+
diff --git a/src/chrome/content/rules/CheckM8.xml b/src/chrome/content/rules/CheckM8.xml
deleted file mode 100644
index a4f29850f4d4..000000000000
--- a/src/chrome/content/rules/CheckM8.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-		
-		
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Check_Point-problematic.xml b/src/chrome/content/rules/Check_Point-problematic.xml
deleted file mode 100644
index e3c802fac557..000000000000
--- a/src/chrome/content/rules/Check_Point-problematic.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Check_Point.xml b/src/chrome/content/rules/Check_Point.xml
deleted file mode 100644
index 5d8d02683437..000000000000
--- a/src/chrome/content/rules/Check_Point.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-
-		
-		
-
-			
-			
-			
-
-			
-			
-
-
-	
-	
-	
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Checkdomain.xml b/src/chrome/content/rules/Checkdomain.xml
deleted file mode 100644
index f68a68831a33..000000000000
--- a/src/chrome/content/rules/Checkdomain.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Checkmarx.com-problematic.xml b/src/chrome/content/rules/Checkmarx.com-problematic.xml
index ec219b544a67..179ab90957cf 100644
--- a/src/chrome/content/rules/Checkmarx.com-problematic.xml
+++ b/src/chrome/content/rules/Checkmarx.com-problematic.xml
@@ -4,13 +4,10 @@
 -->
 
 
-	
+	
 
 
-	
 
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Checkmyping.com.xml b/src/chrome/content/rules/Checkmyping.com.xml
index 18f48bce2aaa..79bd43275435 100644
--- a/src/chrome/content/rules/Checkmyping.com.xml
+++ b/src/chrome/content/rules/Checkmyping.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://checkmyping.com/ => https://checkmyping.com/: (60, 'SSL cert
 Fetch error: http://www.checkmyping.com/ => https://www.checkmyping.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Checktls.com.xml b/src/chrome/content/rules/Checktls.com.xml
index e1efa42df4d9..8ab5cc6ac16c 100644
--- a/src/chrome/content/rules/Checktls.com.xml
+++ b/src/chrome/content/rules/Checktls.com.xml
@@ -3,4 +3,4 @@
 
 
 
- 
+
diff --git a/src/chrome/content/rules/CheetahMail.xml b/src/chrome/content/rules/CheetahMail.xml
index a89a8241ed11..8c7fd1790125 100644
--- a/src/chrome/content/rules/CheetahMail.xml
+++ b/src/chrome/content/rules/CheetahMail.xml
@@ -10,7 +10,8 @@
 
 
 	
-	
+	
+	
 	
 	
 
@@ -18,10 +19,7 @@
 	
 
-	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Cheezburger.xml b/src/chrome/content/rules/Cheezburger.xml
index 043b69ce8378..7df1807113fb 100644
--- a/src/chrome/content/rules/Cheezburger.xml
+++ b/src/chrome/content/rules/Cheezburger.xml
@@ -1,67 +1,51 @@
-
 
-
 
+
+	
 	
 	
 	
+	
 	
+
+	
 	
 	
 	
 
 	
 
-	
+	
 	
 
 	
-
-	
-	
-
-	
+		to="https://cheezburger.freshdesk.com/" />
 
+	
 
diff --git a/src/chrome/content/rules/Chef.io.xml b/src/chrome/content/rules/Chef.io.xml
index 81df55a38587..76a4ba4ab7b9 100644
--- a/src/chrome/content/rules/Chef.io.xml
+++ b/src/chrome/content/rules/Chef.io.xml
@@ -20,11 +20,11 @@ Fetch error: http://happylaptop.chef.io/ => https://happylaptop.chef.io/: (6, 'C
 	Problematic hosts in *chef.io:
 
 		- friends *
-		
+
 	* Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Chefkoch.de.xml b/src/chrome/content/rules/Chefkoch.de.xml
index 1c0e93c928cf..fa991053e60b 100644
--- a/src/chrome/content/rules/Chefkoch.de.xml
+++ b/src/chrome/content/rules/Chefkoch.de.xml
@@ -1,35 +1,27 @@
-
 
-
+
 
-	
-	
-	
-	
-	
-	
 
 	
-	
 	
 	
 	
 
-	
+	
+				
 
-	
+	
+				
 
-	
+	
+				
 
 	
-
-	
-	
+			to="https:" />
 
 
diff --git a/src/chrome/content/rules/Chefmansousvide.com.xml b/src/chrome/content/rules/Chefmansousvide.com.xml
new file mode 100644
index 000000000000..93fc07d379ff
--- /dev/null
+++ b/src/chrome/content/rules/Chefmansousvide.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ChemSpider.com.xml b/src/chrome/content/rules/ChemSpider.com.xml
new file mode 100644
index 000000000000..c410f09cc3a3
--- /dev/null
+++ b/src/chrome/content/rules/ChemSpider.com.xml
@@ -0,0 +1,15 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Chemical_Abstracts_Service.xml b/src/chrome/content/rules/Chemical_Abstracts_Service.xml
index 4eb661dac568..7ce8608bb661 100644
--- a/src/chrome/content/rules/Chemical_Abstracts_Service.xml
+++ b/src/chrome/content/rules/Chemical_Abstracts_Service.xml
@@ -23,7 +23,11 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 		
 
 
@@ -33,7 +37,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/ChemistWarehouse.xml b/src/chrome/content/rules/ChemistWarehouse.xml
index 84760f2ccf6b..234dad0e66a6 100644
--- a/src/chrome/content/rules/ChemistWarehouse.xml
+++ b/src/chrome/content/rules/ChemistWarehouse.xml
@@ -18,4 +18,4 @@
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Cherenkov_Telescope_Array.xml b/src/chrome/content/rules/Cherenkov_Telescope_Array.xml
index a7784611f6f0..d0e66d284e96 100644
--- a/src/chrome/content/rules/Cherenkov_Telescope_Array.xml
+++ b/src/chrome/content/rules/Cherenkov_Telescope_Array.xml
@@ -5,13 +5,11 @@
 
 
 	
-	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Cherwell.gov.uk.xml b/src/chrome/content/rules/Cherwell.gov.uk.xml
index b6097f40a9d4..a956e8f256ef 100644
--- a/src/chrome/content/rules/Cherwell.gov.uk.xml
+++ b/src/chrome/content/rules/Cherwell.gov.uk.xml
@@ -1,91 +1,25 @@
-
 
-
-
-	
-	
+
+	
 	
+	
+	
 
-		
-		
-		
-		
-		
-		
-
-			
-			
-			
-			
-
-			
-			
-			
-			
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/Cheshire.gov.uk-falsemixed.xml b/src/chrome/content/rules/Cheshire.gov.uk-falsemixed.xml
deleted file mode 100644
index ef017bd010c7..000000000000
--- a/src/chrome/content/rules/Cheshire.gov.uk-falsemixed.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Cheshire_East.gov.uk.xml b/src/chrome/content/rules/Cheshire_East.gov.uk.xml
index 1d1b9f0060f6..e032690c344e 100644
--- a/src/chrome/content/rules/Cheshire_East.gov.uk.xml
+++ b/src/chrome/content/rules/Cheshire_East.gov.uk.xml
@@ -43,12 +43,12 @@
 	Mixed content:
 
 		- css, on:
-		
+
 			- apps from $self ˢ
 			- moderngov, online from www.cheshireeast.gov.uk ᵈ
 
 		- Images, on:
-		
+
 			- apps from $self ˢ
 			- moderngov from www.cheshireeast.gov.uk ᵈ
 
diff --git a/src/chrome/content/rules/Cheznous.com.xml b/src/chrome/content/rules/Cheznous.com.xml
index 59de8e6b899e..97933fb9941b 100644
--- a/src/chrome/content/rules/Cheznous.com.xml
+++ b/src/chrome/content/rules/Cheznous.com.xml
@@ -1,5 +1,5 @@
 
-
+
 
 	
 	
@@ -22,4 +22,4 @@ Fetch error: http://chickensoup.com/ => https://chickensoup.com/: Too many redir
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Childrens_Mutual.xml b/src/chrome/content/rules/Childrens_Mutual.xml
deleted file mode 100644
index 2be21fb115b2..000000000000
--- a/src/chrome/content/rules/Childrens_Mutual.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/ChiliProject.org.xml b/src/chrome/content/rules/ChiliProject.org.xml
index 0f642888c5d0..19a82d1103b9 100644
--- a/src/chrome/content/rules/ChiliProject.org.xml
+++ b/src/chrome/content/rules/ChiliProject.org.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Chillicothe_Gazette.xml b/src/chrome/content/rules/Chillicothe_Gazette.xml
index f6f38eec540b..46c6407d0d75 100644
--- a/src/chrome/content/rules/Chillicothe_Gazette.xml
+++ b/src/chrome/content/rules/Chillicothe_Gazette.xml
@@ -11,7 +11,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/ChinaPaymentServices.com.xml b/src/chrome/content/rules/ChinaPaymentServices.com.xml
deleted file mode 100644
index 8ef6ea66276a..000000000000
--- a/src/chrome/content/rules/ChinaPaymentServices.com.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-	
-
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Chip-Chap.xml b/src/chrome/content/rules/Chip-Chap.xml
deleted file mode 100644
index 886987868bcb..000000000000
--- a/src/chrome/content/rules/Chip-Chap.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-	
-
-    
-
-
diff --git a/src/chrome/content/rules/ChipLand.hu.xml b/src/chrome/content/rules/ChipLand.hu.xml
index 67b92f48c275..86a3327be6d8 100644
--- a/src/chrome/content/rules/ChipLand.hu.xml
+++ b/src/chrome/content/rules/ChipLand.hu.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.chipland.hu/ => https://www.chipland.hu/: (51, "SSL: no
 Disabled by https-everywhere-checker because:
 Fetch error: http://www.chipland.hu/ => https://www.chipland.hu/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
 	
 
 	
diff --git a/src/chrome/content/rules/Chipmixer.com.xml b/src/chrome/content/rules/Chipmixer.com.xml
new file mode 100644
index 000000000000..c26163b32a04
--- /dev/null
+++ b/src/chrome/content/rules/Chipmixer.com.xml
@@ -0,0 +1,10 @@
+
+	
+	
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/Chipworks.xml b/src/chrome/content/rules/Chipworks.xml
index 8d1fa39f76fb..93bc95223132 100644
--- a/src/chrome/content/rules/Chipworks.xml
+++ b/src/chrome/content/rules/Chipworks.xml
@@ -8,7 +8,7 @@ Fetch error: http://chipworks.com/ => https://chipworks.com/: (60, 'SSL certific
 	chipworks.secure.force.com
 
 -->
-
+
 
 	
 	
@@ -20,4 +20,4 @@ Fetch error: http://chipworks.com/ => https://chipworks.com/: (60, 'SSL certific
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Chistes_Cortos_Buenos.com.xml b/src/chrome/content/rules/Chistes_Cortos_Buenos.com.xml
deleted file mode 100644
index 6ab66c9a22c6..000000000000
--- a/src/chrome/content/rules/Chistes_Cortos_Buenos.com.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Chitika.net.xml b/src/chrome/content/rules/Chitika.net.xml
deleted file mode 100644
index 0dc699fefb17..000000000000
--- a/src/chrome/content/rules/Chitika.net.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Chitika.xml b/src/chrome/content/rules/Chitika.xml
index ade01b5429e4..82e1ba8a64dd 100644
--- a/src/chrome/content/rules/Chitika.xml
+++ b/src/chrome/content/rules/Chitika.xml
@@ -1,7 +1,13 @@
+
 
+	
+	
 
-	
 
+	
 
-	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Chloe.re.xml b/src/chrome/content/rules/Chloe.re.xml
deleted file mode 100644
index d4c39767e05b..000000000000
--- a/src/chrome/content/rules/Chloe.re.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/ChoiceStream.com.xml b/src/chrome/content/rules/ChoiceStream.com.xml
deleted file mode 100644
index ef0615fb63b5..000000000000
--- a/src/chrome/content/rules/ChoiceStream.com.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-	
-
-		
-		
-		
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Choon.net.xml b/src/chrome/content/rules/Choon.net.xml
index e7068c521b4f..a801a5295938 100644
--- a/src/chrome/content/rules/Choon.net.xml
+++ b/src/chrome/content/rules/Choon.net.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.choon.net/ => https://www.choon.net/: (60, 'SSL certific
 	* Refused
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Chooseblocks.com.xml b/src/chrome/content/rules/Chooseblocks.com.xml
index 20f6e5cc4cfa..58cc137a88d8 100644
--- a/src/chrome/content/rules/Chooseblocks.com.xml
+++ b/src/chrome/content/rules/Chooseblocks.com.xml
@@ -4,7 +4,7 @@ Cloudflare SSL
 
 	
 	
-	
+
 	
 
 	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Choualbox.com.xml b/src/chrome/content/rules/Choualbox.com.xml
new file mode 100644
index 000000000000..4c57c29140cf
--- /dev/null
+++ b/src/chrome/content/rules/Choualbox.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Chris.lu.xml b/src/chrome/content/rules/Chris.lu.xml
index dbe2a22fa8b3..229bc1db4edd 100644
--- a/src/chrome/content/rules/Chris.lu.xml
+++ b/src/chrome/content/rules/Chris.lu.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.chris.lu/ => https://www.chris.lu/: (51, "SSL: no alternative certificate subject name matches target host name 'www.chris.lu'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Chrisanthemums.xml b/src/chrome/content/rules/Chrisanthemums.xml
index 214e3a436c62..c9e71e4d562d 100644
--- a/src/chrome/content/rules/Chrisanthemums.xml
+++ b/src/chrome/content/rules/Chrisanthemums.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Chrismatic.io.xml b/src/chrome/content/rules/Chrismatic.io.xml
index b389230f5221..1e66ddf11c6f 100644
--- a/src/chrome/content/rules/Chrismatic.io.xml
+++ b/src/chrome/content/rules/Chrismatic.io.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.chrismatic.io/ => https://www.chrismatic.io/: (6, 'Could not resolve host: www.chrismatic.io')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Christianbook.com.xml b/src/chrome/content/rules/Christianbook.com.xml
index 2ab20a0e5fe3..cd4e5f516045 100644
--- a/src/chrome/content/rules/Christianbook.com.xml
+++ b/src/chrome/content/rules/Christianbook.com.xml
@@ -34,7 +34,7 @@
 	
 	
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ChromeStatus.com.xml b/src/chrome/content/rules/ChromeStatus.com.xml
new file mode 100644
index 000000000000..6ca712fa4221
--- /dev/null
+++ b/src/chrome/content/rules/ChromeStatus.com.xml
@@ -0,0 +1,16 @@
+
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Chrome_Data.xml b/src/chrome/content/rules/Chrome_Data.xml
index 2affb04b63df..30a5b447dea9 100644
--- a/src/chrome/content/rules/Chrome_Data.xml
+++ b/src/chrome/content/rules/Chrome_Data.xml
@@ -2,17 +2,18 @@
 
 	
 	
-	
+	
+	
+	
+	
+	
 
 
 	
 	
 
 
-	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Chrome_Status.com.xml b/src/chrome/content/rules/Chrome_Status.com.xml
deleted file mode 100644
index c8b73a051d91..000000000000
--- a/src/chrome/content/rules/Chrome_Status.com.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Chromium.org.xml b/src/chrome/content/rules/Chromium.org.xml
index 4bd6381f2fa1..68293bfc4363 100644
--- a/src/chrome/content/rules/Chromium.org.xml
+++ b/src/chrome/content/rules/Chromium.org.xml
@@ -1,6 +1,6 @@
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Chronicle-Store.com.xml b/src/chrome/content/rules/Chronicle-Store.com.xml
index 1ebdac00d011..11c9a17272a2 100644
--- a/src/chrome/content/rules/Chronicle-Store.com.xml
+++ b/src/chrome/content/rules/Chronicle-Store.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.chronicle-store.com/ => https://www.chronicle-store.com/
 	For other Chronicle of Higher Education coverage, see Chronicle.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Chronicle.xml b/src/chrome/content/rules/Chronicle.xml
index a8efd41429ef..f0c43ea34581 100644
--- a/src/chrome/content/rules/Chronicle.xml
+++ b/src/chrome/content/rules/Chronicle.xml
@@ -23,7 +23,7 @@ Fetch error: http://www.chronicle.com/ => https://chronicle.com/: Too many redir
 	² Rule disabled by default
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Cht.sh.xml b/src/chrome/content/rules/Cht.sh.xml
new file mode 100644
index 000000000000..180a16d48879
--- /dev/null
+++ b/src/chrome/content/rules/Cht.sh.xml
@@ -0,0 +1,10 @@
+
+	
+	
+		
+		
+		
+		
+
+	
+
diff --git a/src/chrome/content/rules/Church_Hill_Classics.xml b/src/chrome/content/rules/Church_Hill_Classics.xml
index 71f1aed4a8cd..9e75deda2fea 100644
--- a/src/chrome/content/rules/Church_Hill_Classics.xml
+++ b/src/chrome/content/rules/Church_Hill_Classics.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ciety.com.xml b/src/chrome/content/rules/Ciety.com.xml
index 80acbf264317..90f3763781d6 100644
--- a/src/chrome/content/rules/Ciety.com.xml
+++ b/src/chrome/content/rules/Ciety.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://ciety.com/ => https://ciety.com/: (60, 'SSL certificate prob
 	www doesn't exist.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Cihar.com.xml b/src/chrome/content/rules/Cihar.com.xml
deleted file mode 100644
index 6afaf66e10f4..000000000000
--- a/src/chrome/content/rules/Cihar.com.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Cilk_Plus.org.xml b/src/chrome/content/rules/Cilk_Plus.org.xml
index 72442a70214e..eb0eb90c7b3e 100644
--- a/src/chrome/content/rules/Cilk_Plus.org.xml
+++ b/src/chrome/content/rules/Cilk_Plus.org.xml
@@ -6,7 +6,7 @@ Fetch error: http://cilkplus.org/ => https://cilkplus.org/: (7, 'Failed to conne
 	For other Intel coverage, see Intel.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/CinCHouse.com.xml b/src/chrome/content/rules/CinCHouse.com.xml
index ff95ee779c24..640633008dcf 100644
--- a/src/chrome/content/rules/CinCHouse.com.xml
+++ b/src/chrome/content/rules/CinCHouse.com.xml
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Cinapalace.com.xml b/src/chrome/content/rules/Cinapalace.com.xml
deleted file mode 100644
index ec64daa32d05..000000000000
--- a/src/chrome/content/rules/Cinapalace.com.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Cincinnati.com.xml b/src/chrome/content/rules/Cincinnati.com.xml
index 846cb66a9e44..46873dd18848 100644
--- a/src/chrome/content/rules/Cincinnati.com.xml
+++ b/src/chrome/content/rules/Cincinnati.com.xml
@@ -114,7 +114,7 @@ Fetch error: http://cincinnati.com/ => https://cincinnati.com/: (51, "SSL: no al
 	³ Unsecurable
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Cinder.xml b/src/chrome/content/rules/Cinder.xml
index 8c1632a1a26b..847b23173056 100644
--- a/src/chrome/content/rules/Cinder.xml
+++ b/src/chrome/content/rules/Cinder.xml
@@ -14,4 +14,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CineStar.xml b/src/chrome/content/rules/CineStar.xml
index 2b24c9044995..fedaf529006e 100644
--- a/src/chrome/content/rules/CineStar.xml
+++ b/src/chrome/content/rules/CineStar.xml
@@ -9,7 +9,7 @@ Fetch error: http://cinestar.de/ => https://cinestar.de/: Too many redirects whi
 		- .shop.cinestar.de
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Cineble.com.xml b/src/chrome/content/rules/Cineble.com.xml
index 5ffc968bef39..fd46fa0fdcc8 100644
--- a/src/chrome/content/rules/Cineble.com.xml
+++ b/src/chrome/content/rules/Cineble.com.xml
@@ -16,4 +16,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CinemaNow.xml b/src/chrome/content/rules/CinemaNow.xml
index 1fc463381117..b2c9d96b1b17 100644
--- a/src/chrome/content/rules/CinemaNow.xml
+++ b/src/chrome/content/rules/CinemaNow.xml
@@ -5,7 +5,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -14,7 +15,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Cinemas-Utopia.org.xml b/src/chrome/content/rules/Cinemas-Utopia.org.xml
new file mode 100644
index 000000000000..52c859f9aec4
--- /dev/null
+++ b/src/chrome/content/rules/Cinemas-Utopia.org.xml
@@ -0,0 +1,7 @@
+
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Cinfu.com.xml b/src/chrome/content/rules/Cinfu.com.xml
index f61bb16ff151..4b2ed7be048a 100644
--- a/src/chrome/content/rules/Cinfu.com.xml
+++ b/src/chrome/content/rules/Cinfu.com.xml
@@ -14,7 +14,7 @@ Non-2xx HTTP code: http://cinfu.com/ (200) => https://cinfu.com/ (404)
 		- www	(redirects to http)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Cint.com.xml b/src/chrome/content/rules/Cint.com.xml
deleted file mode 100644
index 07643f66887e..000000000000
--- a/src/chrome/content/rules/Cint.com.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/CipherLaw.xml b/src/chrome/content/rules/CipherLaw.xml
deleted file mode 100644
index 2a84bc37ad96..000000000000
--- a/src/chrome/content/rules/CipherLaw.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/CipherShed.org.xml b/src/chrome/content/rules/CipherShed.org.xml
deleted file mode 100644
index aca7ebd3d585..000000000000
--- a/src/chrome/content/rules/CipherShed.org.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Cir.ca.xml b/src/chrome/content/rules/Cir.ca.xml
index 4b087265f51c..73d12e18146f 100644
--- a/src/chrome/content/rules/Cir.ca.xml
+++ b/src/chrome/content/rules/Cir.ca.xml
@@ -35,7 +35,7 @@ Fetch error: http://www.cir.ca/ => https://circanews.com/: (51, "SSL: no alterna
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Circa_News.com.xml b/src/chrome/content/rules/Circa_News.com.xml
index 193c68455de9..41d1e6fc4d92 100644
--- a/src/chrome/content/rules/Circa_News.com.xml
+++ b/src/chrome/content/rules/Circa_News.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://www.circanews.com/ => https://www.circanews.com/: (51, "SSL:
 		- www.circanews.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Circl.lu.xml b/src/chrome/content/rules/Circl.lu.xml
new file mode 100644
index 000000000000..23a834371222
--- /dev/null
+++ b/src/chrome/content/rules/Circl.lu.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Circle_of_Moms.xml b/src/chrome/content/rules/Circle_of_Moms.xml
index 5ee1c0813676..8e9d13bcb36d 100644
--- a/src/chrome/content/rules/Circle_of_Moms.xml
+++ b/src/chrome/content/rules/Circle_of_Moms.xml
@@ -20,7 +20,9 @@ Fetch error: http://circleofmoms.com/ => https://www.circleofmoms.com/: Cycle de
 
 
 	
-	
+	
+	
+	
 
 
 	
@@ -29,10 +31,7 @@ Fetch error: http://circleofmoms.com/ => https://www.circleofmoms.com/: Cycle de
 	
 
-	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Circular_Hub.xml b/src/chrome/content/rules/Circular_Hub.xml
index 8fb564cd243a..d771ff2d09d5 100644
--- a/src/chrome/content/rules/Circular_Hub.xml
+++ b/src/chrome/content/rules/Circular_Hub.xml
@@ -1,40 +1,16 @@
 
 
 
 	
-	
-
-
-	
-
+	
 
-	
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Cirrus-CI.com.xml b/src/chrome/content/rules/Cirrus-CI.com.xml
new file mode 100644
index 000000000000..e4dfef248e21
--- /dev/null
+++ b/src/chrome/content/rules/Cirrus-CI.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Cisco.mobi.xml b/src/chrome/content/rules/Cisco.mobi.xml
index a1793fd49f76..ea171b0fe66e 100644
--- a/src/chrome/content/rules/Cisco.mobi.xml
+++ b/src/chrome/content/rules/Cisco.mobi.xml
@@ -25,7 +25,7 @@ Fetch error: http://cln.cisco.mobi/ => https://cln.cisco.mobi/: (28, 'Connection
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Cisco.xml b/src/chrome/content/rules/Cisco.xml
index a784a24bd9ac..66fa5bbe94eb 100644
--- a/src/chrome/content/rules/Cisco.xml
+++ b/src/chrome/content/rules/Cisco.xml
@@ -1,9 +1,13 @@
+
 
-
+
 
-	
 	
 	
 	
-	
 	
 	
 	
 	
-	
+	
+	
 	
-	
 	
 	
 	
 	
 	
 	
-	
 	
 	
 	
@@ -128,76 +122,9 @@
 	
 	
 	
-	
-	
-	
-
-	
-	
-	
-
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-			
-			
-			
-			
-
-		
-
-			
-
-		
-		
-
-		
-		
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
 
 	
 
-
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Cisco_Connect_Cloud.com.xml b/src/chrome/content/rules/Cisco_Connect_Cloud.com.xml
deleted file mode 100644
index 284ef4bbcafc..000000000000
--- a/src/chrome/content/rules/Cisco_Connect_Cloud.com.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Citadium.com.xml b/src/chrome/content/rules/Citadium.com.xml
index ba648c6af91a..d4357e5bff17 100644
--- a/src/chrome/content/rules/Citadium.com.xml
+++ b/src/chrome/content/rules/Citadium.com.xml
@@ -22,4 +22,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Citi_Alumni_Network.xml b/src/chrome/content/rules/Citi_Alumni_Network.xml
index 68432dd678c3..2d0d3966b18b 100644
--- a/src/chrome/content/rules/Citi_Alumni_Network.xml
+++ b/src/chrome/content/rules/Citi_Alumni_Network.xml
@@ -19,4 +19,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Citibank.xml b/src/chrome/content/rules/Citibank.xml
index fd4a4c22a206..0cfe8adbd197 100644
--- a/src/chrome/content/rules/Citibank.xml
+++ b/src/chrome/content/rules/Citibank.xml
@@ -11,7 +11,7 @@ Fetch error: http://content22.online.citibank.com/ => https://content22.online.c
 		- .citibank.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/CitizenPost.fr.xml b/src/chrome/content/rules/CitizenPost.fr.xml
index d99440e6c78f..9b2cca72cc0b 100644
--- a/src/chrome/content/rules/CitizenPost.fr.xml
+++ b/src/chrome/content/rules/CitizenPost.fr.xml
@@ -3,7 +3,7 @@
 	
 	
 
-	
 
 
diff --git a/src/chrome/content/rules/CitizensForEthics.org.xml b/src/chrome/content/rules/CitizensForEthics.org.xml
new file mode 100644
index 000000000000..e5bf9f76e205
--- /dev/null
+++ b/src/chrome/content/rules/CitizensForEthics.org.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Citrix.xml b/src/chrome/content/rules/Citrix.xml
index 48494ccaf940..af503f29bbb0 100644
--- a/src/chrome/content/rules/Citrix.xml
+++ b/src/chrome/content/rules/Citrix.xml
@@ -11,7 +11,6 @@ Fetch error: http://tarpon.citrix.com/ => https://tarpon.citrix.com/: (6, 'Could
 	Other Citrix rulesets:
 
 		- Citrix_Online.com.xml
-		- Citrix_Online_CDN.com.xml
 		- GoToAssist.com.xml
 		- GoToMeeting.com.xml
 		- GoToTraining.com.xml
@@ -72,7 +71,7 @@ Fetch error: http://tarpon.citrix.com/ => https://tarpon.citrix.com/: (6, 'Could
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Citrix_Online_CDN.com.xml b/src/chrome/content/rules/Citrix_Online_CDN.com.xml
deleted file mode 100644
index 8b47e1ecdad4..000000000000
--- a/src/chrome/content/rules/Citrix_Online_CDN.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/City-Link.xml b/src/chrome/content/rules/City-Link.xml
index d660eea7c79f..3a0ea246ba38 100644
--- a/src/chrome/content/rules/City-Link.xml
+++ b/src/chrome/content/rules/City-Link.xml
@@ -12,7 +12,7 @@ Fetch error: http://city-link.co.uk/ => https://www.city-link.co.uk/: (28, 'Conn
 Fetch error: http://www.city-link.co.uk/ => https://www.city-link.co.uk/: (28, 'Connection timed out after 10001 milliseconds')
 
 -->
-
+
 
   
   
diff --git a/src/chrome/content/rules/City-Mail.xml b/src/chrome/content/rules/City-Mail.xml
deleted file mode 100644
index 7be549f25e79..000000000000
--- a/src/chrome/content/rules/City-Mail.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/City-of-Chicago.xml b/src/chrome/content/rules/City-of-Chicago.xml
index 9c9cca0fb2ba..1311af2b6e92 100644
--- a/src/chrome/content/rules/City-of-Chicago.xml
+++ b/src/chrome/content/rules/City-of-Chicago.xml
@@ -13,7 +13,9 @@
 
 
 	
-	
+	
+	
+	
 	
 	
 
@@ -37,10 +39,9 @@
 	
 
-	
 
 	
-	
+
+	
 
diff --git a/src/chrome/content/rules/CityEmail.com.xml b/src/chrome/content/rules/CityEmail.com.xml
new file mode 100644
index 000000000000..e7c8c32b3de6
--- /dev/null
+++ b/src/chrome/content/rules/CityEmail.com.xml
@@ -0,0 +1,16 @@
+
+
+
+	
+	
+
+
+	
+
+
+	
+
+
diff --git a/src/chrome/content/rules/CityNews.ca.xml b/src/chrome/content/rules/CityNews.ca.xml
new file mode 100644
index 000000000000..e929dbef2195
--- /dev/null
+++ b/src/chrome/content/rules/CityNews.ca.xml
@@ -0,0 +1,41 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/City_University_London.xml b/src/chrome/content/rules/City_University_London.xml
index cd6f790cdf0a..c77aec418f5b 100644
--- a/src/chrome/content/rules/City_University_London.xml
+++ b/src/chrome/content/rules/City_University_London.xml
@@ -11,10 +11,13 @@ Fetch error: http://www.soi.city.ac.uk/ => https://www.soi.city.ac.uk/: (28, 'Co
 		- soi
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
 
 
 	
@@ -23,7 +26,6 @@ Fetch error: http://www.soi.city.ac.uk/ => https://www.soi.city.ac.uk/: (28, 'Co
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/City_University_of_New_York-problematic.xml b/src/chrome/content/rules/City_University_of_New_York-problematic.xml
index 1abed081828c..a1d1545a2bba 100644
--- a/src/chrome/content/rules/City_University_of_New_York-problematic.xml
+++ b/src/chrome/content/rules/City_University_of_New_York-problematic.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/City_University_of_New_York.xml b/src/chrome/content/rules/City_University_of_New_York.xml
index b9771d187aba..548a08ba7c1a 100644
--- a/src/chrome/content/rules/City_University_of_New_York.xml
+++ b/src/chrome/content/rules/City_University_of_New_York.xml
@@ -40,4 +40,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/City_of_Mountain_View.xml b/src/chrome/content/rules/City_of_Mountain_View.xml
index 285698518d57..4bb15ac4b3a9 100644
--- a/src/chrome/content/rules/City_of_Mountain_View.xml
+++ b/src/chrome/content/rules/City_of_Mountain_View.xml
@@ -17,7 +17,7 @@ Fetch error: http://www.mountainview.gov/ => https://www.mountainview.gov/: (28,
 	Cert only matches www
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/City_of_Seattle.xml b/src/chrome/content/rules/City_of_Seattle.xml
index 60a28402f69c..a36aeaa6f1a8 100644
--- a/src/chrome/content/rules/City_of_Seattle.xml
+++ b/src/chrome/content/rules/City_of_Seattle.xml
@@ -34,7 +34,14 @@ Non-2xx HTTP code: http://seattle.gov/ (200) => https://www.seattle.gov/ (303)
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
@@ -46,10 +53,9 @@ Non-2xx HTTP code: http://seattle.gov/ (200) => https://www.seattle.gov/ (303)
 	
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Cityam.com.xml b/src/chrome/content/rules/Cityam.com.xml
new file mode 100644
index 000000000000..1869a9c8872b
--- /dev/null
+++ b/src/chrome/content/rules/Cityam.com.xml
@@ -0,0 +1,41 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Citymapper.xml b/src/chrome/content/rules/Citymapper.xml
index a1d8d771d8b2..4950c3970055 100644
--- a/src/chrome/content/rules/Citymapper.xml
+++ b/src/chrome/content/rules/Citymapper.xml
@@ -13,6 +13,6 @@
 
   	
 
-	
 
diff --git a/src/chrome/content/rules/CityofPortland.xml b/src/chrome/content/rules/CityofPortland.xml
index eafa64367d13..7381c96004c5 100644
--- a/src/chrome/content/rules/CityofPortland.xml
+++ b/src/chrome/content/rules/CityofPortland.xml
@@ -11,4 +11,4 @@
 		to="https://www.portlandonline.com/" />
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Citypaketet.xml b/src/chrome/content/rules/Citypaketet.xml
deleted file mode 100644
index cebe5d789f7a..000000000000
--- a/src/chrome/content/rules/Citypaketet.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Citywerkz.com.xml b/src/chrome/content/rules/Citywerkz.com.xml
index 057aec05c5f6..2641d2bd3b9b 100644
--- a/src/chrome/content/rules/Citywerkz.com.xml
+++ b/src/chrome/content/rules/Citywerkz.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.citywerkz.com/ => https://www.citywerkz.com/: (60, 'SSL
 Disabled by https-everywhere-checker because:
 Fetch error: http://citywerkz.com/ => https://citywerkz.com/: (51, "SSL: no alternative certificate subject name matches target host name 'citywerkz.com'")
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/CiviCRM.xml b/src/chrome/content/rules/CiviCRM.xml
index b99687d8c8e2..cad390a5a1c0 100644
--- a/src/chrome/content/rules/CiviCRM.xml
+++ b/src/chrome/content/rules/CiviCRM.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CivicScience.xml b/src/chrome/content/rules/CivicScience.xml
index 6082b44a70a3..f6b58e724202 100644
--- a/src/chrome/content/rules/CivicScience.xml
+++ b/src/chrome/content/rules/CivicScience.xml
@@ -19,7 +19,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Cl.ly.xml b/src/chrome/content/rules/Cl.ly.xml
index 7337b60419ed..a3f093e72874 100644
--- a/src/chrome/content/rules/Cl.ly.xml
+++ b/src/chrome/content/rules/Cl.ly.xml
@@ -1,48 +1,17 @@
 
-
-
+
 	
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-	
-
-	
+	
+	
 
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/Claim_Forms_Plus.xml b/src/chrome/content/rules/Claim_Forms_Plus.xml
index fd2944845a1b..08a2fbf7481b 100644
--- a/src/chrome/content/rules/Claim_Forms_Plus.xml
+++ b/src/chrome/content/rules/Claim_Forms_Plus.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Claranet.xml b/src/chrome/content/rules/Claranet.xml
index 3511cb887f75..77b786cb8e54 100644
--- a/src/chrome/content/rules/Claranet.xml
+++ b/src/chrome/content/rules/Claranet.xml
@@ -9,12 +9,18 @@ Fetch error: http://pop.claranet.de/ => https://pop.claranet.de/: (6, 'Could not
 Fetch error: http://webmail.claranet.pt/ => https://webmail.claranet.pt/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 Fetch error: http://secure.claranetsoho.co.uk/ => https://secure.claranetsoho.co.uk/: (28, 'Connection timed out after 10000 milliseconds')
 -->
-
-
-	
+
+
+	
+	
+	
+	
+	
+	
 	
 	
-	
+	
+	
 	
 	
 
@@ -25,22 +31,11 @@ Fetch error: http://secure.claranetsoho.co.uk/ => https://secure.claranetsoho.co
 	
 	
 
-	
 
-	
 
-	
 
-	
 
-	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Clarion-Ledger.xml b/src/chrome/content/rules/Clarion-Ledger.xml
index 885106277d13..ea896c75e542 100644
--- a/src/chrome/content/rules/Clarion-Ledger.xml
+++ b/src/chrome/content/rules/Clarion-Ledger.xml
@@ -16,7 +16,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/ClarityRay.xml b/src/chrome/content/rules/ClarityRay.xml
deleted file mode 100644
index 9457a8ec84bc..000000000000
--- a/src/chrome/content/rules/ClarityRay.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Clarkvision.com.xml b/src/chrome/content/rules/Clarkvision.com.xml
new file mode 100644
index 000000000000..4654f2555384
--- /dev/null
+++ b/src/chrome/content/rules/Clarkvision.com.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Classpath.org.xml b/src/chrome/content/rules/Classpath.org.xml
new file mode 100644
index 000000000000..24317e2c9a43
--- /dev/null
+++ b/src/chrome/content/rules/Classpath.org.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Cld.me.xml b/src/chrome/content/rules/Cld.me.xml
new file mode 100644
index 000000000000..23a650aba819
--- /dev/null
+++ b/src/chrome/content/rules/Cld.me.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Cldlr.com.xml b/src/chrome/content/rules/Cldlr.com.xml
deleted file mode 100644
index c6f85c10046b..000000000000
--- a/src/chrome/content/rules/Cldlr.com.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Clean-Energy-Experts.xml b/src/chrome/content/rules/Clean-Energy-Experts.xml
index de226062f842..0c806849c532 100644
--- a/src/chrome/content/rules/Clean-Energy-Experts.xml
+++ b/src/chrome/content/rules/Clean-Energy-Experts.xml
@@ -5,7 +5,7 @@
 	
 
 
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/CleanEnergyFinanceCorporation.xml b/src/chrome/content/rules/CleanEnergyFinanceCorporation.xml
deleted file mode 100644
index 1352520585f0..000000000000
--- a/src/chrome/content/rules/CleanEnergyFinanceCorporation.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-	
-
-	
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/CleanPrint.net.xml b/src/chrome/content/rules/CleanPrint.net.xml
index 81c334182817..44310713b9a3 100644
--- a/src/chrome/content/rules/CleanPrint.net.xml
+++ b/src/chrome/content/rules/CleanPrint.net.xml
@@ -26,7 +26,7 @@ Fetch error: http://cleanprint.net/ => https://cleanprint.net/: (51, "SSL: no al
 		- cache-02	(→ www)
 
 -->
-
+
 
 	
 	
@@ -35,4 +35,4 @@ Fetch error: http://cleanprint.net/ => https://cleanprint.net/: (51, "SSL: no al
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Clear-Code.com.xml b/src/chrome/content/rules/Clear-Code.com.xml
index 48fddb4faefa..cba409f20878 100644
--- a/src/chrome/content/rules/Clear-Code.com.xml
+++ b/src/chrome/content/rules/Clear-Code.com.xml
@@ -23,6 +23,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/Clear_Linux.org.xml b/src/chrome/content/rules/Clear_Linux.org.xml
deleted file mode 100644
index e82450add48f..000000000000
--- a/src/chrome/content/rules/Clear_Linux.org.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/CleverCoin.com.xml b/src/chrome/content/rules/CleverCoin.com.xml
deleted file mode 100644
index aa33fe391384..000000000000
--- a/src/chrome/content/rules/CleverCoin.com.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/CleverPush.com.xml b/src/chrome/content/rules/CleverPush.com.xml
new file mode 100644
index 000000000000..8aecbdeb83e4
--- /dev/null
+++ b/src/chrome/content/rules/CleverPush.com.xml
@@ -0,0 +1,20 @@
+
+
+
+	
+	
+		
+		
+		
+		
+		
+		
+		
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Cleverbridge.xml b/src/chrome/content/rules/Cleverbridge.xml
index 9306f73b4f6b..7c6a8bdee9b4 100644
--- a/src/chrome/content/rules/Cleverbridge.xml
+++ b/src/chrome/content/rules/Cleverbridge.xml
@@ -18,7 +18,7 @@ Fetch error: http://message.cleverbridge.com/ => https://message.cleverbridge.co
 	* Mismatched
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Click-Sec.com.xml b/src/chrome/content/rules/Click-Sec.com.xml
index 713fec90da4b..64126ac0f82c 100644
--- a/src/chrome/content/rules/Click-Sec.com.xml
+++ b/src/chrome/content/rules/Click-Sec.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://click-sec.com/ => https://click-sec.com/: (6, 'Could not res
 		- www.click-sec.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Click4Wheels.cn.xml b/src/chrome/content/rules/Click4Wheels.cn.xml
new file mode 100644
index 000000000000..fe0ced30189a
--- /dev/null
+++ b/src/chrome/content/rules/Click4Wheels.cn.xml
@@ -0,0 +1,21 @@
+
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Click4Wheels.co.kr.xml b/src/chrome/content/rules/Click4Wheels.co.kr.xml
new file mode 100644
index 000000000000..4e531226ebe0
--- /dev/null
+++ b/src/chrome/content/rules/Click4Wheels.co.kr.xml
@@ -0,0 +1,21 @@
+
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Click4Wheels.com.xml b/src/chrome/content/rules/Click4Wheels.com.xml
new file mode 100644
index 000000000000..01618c1d6e66
--- /dev/null
+++ b/src/chrome/content/rules/Click4Wheels.com.xml
@@ -0,0 +1,21 @@
+
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Click4Wheels.jp.xml b/src/chrome/content/rules/Click4Wheels.jp.xml
new file mode 100644
index 000000000000..65ccc0ba3835
--- /dev/null
+++ b/src/chrome/content/rules/Click4Wheels.jp.xml
@@ -0,0 +1,21 @@
+
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ClickEquations.net.xml b/src/chrome/content/rules/ClickEquations.net.xml
index 81ec4e235bf9..9d69d75b348a 100644
--- a/src/chrome/content/rules/ClickEquations.net.xml
+++ b/src/chrome/content/rules/ClickEquations.net.xml
@@ -16,16 +16,17 @@ Fetch error: http://clickequations.net/ => https://clickequations.net/: (7, 'Fai
 	whichever domain it is loaded from.
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/ClickMotive.xml b/src/chrome/content/rules/ClickMotive.xml
index a8118b870143..d2820a65692b 100644
--- a/src/chrome/content/rules/ClickMotive.xml
+++ b/src/chrome/content/rules/ClickMotive.xml
@@ -13,7 +13,7 @@ Fetch error: http://origin-assets.clickmotive.com/ => https://origin-assets.clic
 	* Akamai
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/ClickTale.xml b/src/chrome/content/rules/ClickTale.xml
index 5c15c50b7d7f..727bd64c3f1b 100644
--- a/src/chrome/content/rules/ClickTale.xml
+++ b/src/chrome/content/rules/ClickTale.xml
@@ -2,46 +2,53 @@
 	CDN buckets:
 
 		- clicktalecdn.sslcs.cdngc.net
-		- clicktale.pantherssl.com
-
 
 	Problematic domains:
 
 		- clicktale.com		(interrupted)
 		- cdn.clicktale.net	(403, mismatched, CN: ssl2.cdngc.net)
 		- s.clicktale.net	(403; mismatched, CN: ssl2.cdngc.net)
+    - www07.clicktale.net (unable to get local issuer certificate)
+
+  Connection Refused/Unresolved Hosts
+    - s.clicktale.net
+    - clicktale.pantherssl.com
 
 -->
 
 
 	
-	
-	
-
+	
+	
+	
+	
+	
 
 	
 
-
 	
 
-	
-
 	
+
+       - Times out
 	
+  -->
 
-	
 
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/Click_and_Pledge.com.xml b/src/chrome/content/rules/Click_and_Pledge.com.xml
index 4d760185235f..7ad490380987 100644
--- a/src/chrome/content/rules/Click_and_Pledge.com.xml
+++ b/src/chrome/content/rules/Click_and_Pledge.com.xml
@@ -39,7 +39,7 @@
 	
 	
 
-	
+	
 
 
 	 https://clickfuncasino.com/: (51, "SSL: no alternative certificate subject name matches target host name 'clickfuncasino.com'")
 
 -->
-
+
 
 	
-	
 	
-	
+	
+	
+	
+	
 
 
-	
+	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Clickmatic.pl.xml b/src/chrome/content/rules/Clickmatic.pl.xml
index acbfc3d2fbd2..73defb25445f 100644
--- a/src/chrome/content/rules/Clickmatic.pl.xml
+++ b/src/chrome/content/rules/Clickmatic.pl.xml
@@ -1,4 +1,4 @@
-
 
 
diff --git a/src/chrome/content/rules/Clicksor.com.xml b/src/chrome/content/rules/Clicksor.com.xml
deleted file mode 100644
index a0aa116b3121..000000000000
--- a/src/chrome/content/rules/Clicksor.com.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Clicktools.xml b/src/chrome/content/rules/Clicktools.xml
index ce984027ae5b..f8b99c217e91 100644
--- a/src/chrome/content/rules/Clicktools.xml
+++ b/src/chrome/content/rules/Clicktools.xml
@@ -22,7 +22,7 @@
 					-->
 	
 
-	
+	
 
 
 	
+
+
+	
+	
+		
+		
+		
+
+	
+
+
diff --git a/src/chrome/content/rules/Client.foldingathome.org.xml b/src/chrome/content/rules/Client.foldingathome.org.xml
new file mode 100644
index 000000000000..295b755a734e
--- /dev/null
+++ b/src/chrome/content/rules/Client.foldingathome.org.xml
@@ -0,0 +1,33 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Climate-Central.xml b/src/chrome/content/rules/Climate-Central.xml
index 4563a748aedb..0fa18e96f20a 100644
--- a/src/chrome/content/rules/Climate-Central.xml
+++ b/src/chrome/content/rules/Climate-Central.xml
@@ -1,7 +1,7 @@
 
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Clinkle.com.xml b/src/chrome/content/rules/Clinkle.com.xml
index 3400c2080fdf..719053847ddd 100644
--- a/src/chrome/content/rules/Clinkle.com.xml
+++ b/src/chrome/content/rules/Clinkle.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://clinkle.com/ => https://clinkle.com/: (60, 'SSL certificate
 Fetch error: http://www.clinkle.com/ => https://www.clinkle.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
@@ -13,4 +13,4 @@ Fetch error: http://www.clinkle.com/ => https://www.clinkle.com/: (60, 'SSL cert
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Clockworkmod.com.xml b/src/chrome/content/rules/Clockworkmod.com.xml
index 8570b679d687..3824514b7953 100644
--- a/src/chrome/content/rules/Clockworkmod.com.xml
+++ b/src/chrome/content/rules/Clockworkmod.com.xml
@@ -27,4 +27,4 @@
 	
 
- 
+
diff --git a/src/chrome/content/rules/Clothing_at_Tesco.com.xml b/src/chrome/content/rules/Clothing_at_Tesco.com.xml
index ef24b6bf213d..58a27e52a30f 100644
--- a/src/chrome/content/rules/Clothing_at_Tesco.com.xml
+++ b/src/chrome/content/rules/Clothing_at_Tesco.com.xml
@@ -20,7 +20,7 @@ Fetch error: http://www.clothingattesco.com/ => https://www.clothingattesco.com/
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/ClouDNS.net.xml b/src/chrome/content/rules/ClouDNS.net.xml
deleted file mode 100644
index e2df7d006f62..000000000000
--- a/src/chrome/content/rules/ClouDNS.net.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Cloud-Privacy.xml b/src/chrome/content/rules/Cloud-Privacy.xml
deleted file mode 100644
index 85b6daaacae7..000000000000
--- a/src/chrome/content/rules/Cloud-Privacy.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Cloud9.xml b/src/chrome/content/rules/Cloud9.xml
index 8a9d518220ee..60bbb7b38fda 100644
--- a/src/chrome/content/rules/Cloud9.xml
+++ b/src/chrome/content/rules/Cloud9.xml
@@ -11,8 +11,8 @@ Fetch error: http://cdn.c9.io/ => https://cdn.c9.io/: Too many redirects while f
 		- docs.c9.io
 
 -->
-
-    
+
+  
 	
 	
 	
diff --git a/src/chrome/content/rules/CloudAtCost.com.xml b/src/chrome/content/rules/CloudAtCost.com.xml
index 555f3ccef112..5d8575bdfa11 100644
--- a/src/chrome/content/rules/CloudAtCost.com.xml
+++ b/src/chrome/content/rules/CloudAtCost.com.xml
@@ -15,14 +15,9 @@
 
     
 
-        
         
         
 
     
 
-        
-        
-        
-
 
diff --git a/src/chrome/content/rules/CloudControl.com.xml b/src/chrome/content/rules/CloudControl.com.xml
index 03fdb7b3b4e4..80acd9fe890e 100644
--- a/src/chrome/content/rules/CloudControl.com.xml
+++ b/src/chrome/content/rules/CloudControl.com.xml
@@ -31,7 +31,7 @@ Fetch error: http://cloudcontrol.com/ => https://www.cloudcontrol.com/: (35, 'Un
 	* Secured by us, changes alignment slightly
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/CloudCracker.xml b/src/chrome/content/rules/CloudCracker.xml
index 4413dd91d43d..1a72b5aa5a8d 100644
--- a/src/chrome/content/rules/CloudCracker.xml
+++ b/src/chrome/content/rules/CloudCracker.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.wpacracker.com/ => https://cloudcracker.com/: (7, 'Faile
 	(www.)?wpacracker.com: Expired
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/CloudFlare.xml b/src/chrome/content/rules/CloudFlare.xml
deleted file mode 100644
index 952c86944807..000000000000
--- a/src/chrome/content/rules/CloudFlare.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/CloudFlare_Challenge.com.xml b/src/chrome/content/rules/CloudFlare_Challenge.com.xml
deleted file mode 100644
index dc0c6ff18a01..000000000000
--- a/src/chrome/content/rules/CloudFlare_Challenge.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/CloudLinux.com-falsemixed.xml b/src/chrome/content/rules/CloudLinux.com-falsemixed.xml
deleted file mode 100644
index 76467e0490f5..000000000000
--- a/src/chrome/content/rules/CloudLinux.com-falsemixed.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/CloudMagic.xml b/src/chrome/content/rules/CloudMagic.xml
index 1aff1cd1778d..6797260cdba4 100644
--- a/src/chrome/content/rules/CloudMagic.xml
+++ b/src/chrome/content/rules/CloudMagic.xml
@@ -16,5 +16,5 @@
 
 	
-		
+
 
diff --git a/src/chrome/content/rules/CloudSigma.xml b/src/chrome/content/rules/CloudSigma.xml
index 08f0aa1b95af..fd633881280d 100644
--- a/src/chrome/content/rules/CloudSigma.xml
+++ b/src/chrome/content/rules/CloudSigma.xml
@@ -4,19 +4,22 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://cloudsigma.com/ => https://cloudsigma.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
+	
 
 
-	
+	
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/CloudSwitch.xml b/src/chrome/content/rules/CloudSwitch.xml
index 75b472999b6b..3dc4b643860f 100644
--- a/src/chrome/content/rules/CloudSwitch.xml
+++ b/src/chrome/content/rules/CloudSwitch.xml
@@ -6,12 +6,12 @@ Fetch error: http://cloudswitch.com/ => https://cloudswitch.com/: (60, 'SSL cert
 Disabled by https-everywhere-checker because:
 Fetch error: http://cloudswitch.com/ => https://cloudswitch.com/: (51, "SSL: no alternative certificate subject name matches target host name 'cloudswitch.com'")	Bucket at d1jyhm1p20pq9z.cloudfront.net
 -->
-
+
 
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Cloud_Foundry.org.xml b/src/chrome/content/rules/Cloud_Foundry.org.xml
index 9e511aea2154..19d5363acd84 100644
--- a/src/chrome/content/rules/Cloud_Foundry.org.xml
+++ b/src/chrome/content/rules/Cloud_Foundry.org.xml
@@ -18,7 +18,7 @@ Fetch error: http://blog.cloudfoundry.org/wp-content/themes/custom-org14/images/
 		- blog		(→ i0.wp.com)
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Cloud_Foundry.xml b/src/chrome/content/rules/Cloud_Foundry.xml
index 52dc48914e46..6bd29e3c094d 100644
--- a/src/chrome/content/rules/Cloud_Foundry.xml
+++ b/src/chrome/content/rules/Cloud_Foundry.xml
@@ -15,7 +15,7 @@ Fetch error: http://www.cloudfoundry.com/ => https://www.cloudfoundry.com/: (28,
 			- docs
 
 		- i[012].wp.com/blog.cloudfoundry.com/
-	
+
 
 	Nonfunctional subdomains:
 
@@ -38,7 +38,7 @@ Fetch error: http://www.cloudfoundry.com/ => https://www.cloudfoundry.com/: (28,
 		- blog		(→ blog.pivotal.io)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Cloud_Proven.net.xml b/src/chrome/content/rules/Cloud_Proven.net.xml
index 3395e3f5926a..d10115b4e931 100644
--- a/src/chrome/content/rules/Cloud_Proven.net.xml
+++ b/src/chrome/content/rules/Cloud_Proven.net.xml
@@ -10,7 +10,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://cloudproven.net/ => https://cloudproven.net/: Too many redirects while fetching 'https://cloudproven.net/'
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Cloudera.com.xml b/src/chrome/content/rules/Cloudera.com.xml
index 9e50ad29bf62..4cc9b6067e0c 100644
--- a/src/chrome/content/rules/Cloudera.com.xml
+++ b/src/chrome/content/rules/Cloudera.com.xml
@@ -1,98 +1,24 @@
-
 
-
-
+
 	
-	
-
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-
-	
-
-	
-
-	
+	
+	
+	
+	
+	
 
-	
-	
-	
-	
-	
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/Cloudflare-ipfs.com.xml b/src/chrome/content/rules/Cloudflare-ipfs.com.xml
new file mode 100644
index 000000000000..b90527b4c233
--- /dev/null
+++ b/src/chrome/content/rules/Cloudflare-ipfs.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Cloudflare.com.xml b/src/chrome/content/rules/Cloudflare.com.xml
new file mode 100644
index 000000000000..dd3154994a91
--- /dev/null
+++ b/src/chrome/content/rules/Cloudflare.com.xml
@@ -0,0 +1,42 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/CloudflareStatus.com.xml b/src/chrome/content/rules/CloudflareStatus.com.xml
new file mode 100644
index 000000000000..1fd5c067b82f
--- /dev/null
+++ b/src/chrome/content/rules/CloudflareStatus.com.xml
@@ -0,0 +1,17 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Cloudflarestatus.com.xml b/src/chrome/content/rules/Cloudflarestatus.com.xml
deleted file mode 100644
index c91723d045c9..000000000000
--- a/src/chrome/content/rules/Cloudflarestatus.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Cloudfront.xml b/src/chrome/content/rules/Cloudfront.xml
index b6dd6ebb0ad9..9886a8f80fd7 100644
--- a/src/chrome/content/rules/Cloudfront.xml
+++ b/src/chrome/content/rules/Cloudfront.xml
@@ -8,6 +8,10 @@
 	
 	
 
+	
+	
+	
+
 		
 		
 		
@@ -52,7 +56,7 @@
 	
 		
 		
-		
+
 	
 	
 		
@@ -60,10 +64,17 @@
 	
 	
 		
-	
+
 	
 	
 		
 		
 
+	
+	
+		
+		
+
 
diff --git a/src/chrome/content/rules/Cloudhexa_Network.xml b/src/chrome/content/rules/Cloudhexa_Network.xml
deleted file mode 100644
index dfa71620d962..000000000000
--- a/src/chrome/content/rules/Cloudhexa_Network.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Cloudmining.guru.xml b/src/chrome/content/rules/Cloudmining.guru.xml
deleted file mode 100644
index 37d1713d9c89..000000000000
--- a/src/chrome/content/rules/Cloudmining.guru.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Cloudmutt.com.xml b/src/chrome/content/rules/Cloudmutt.com.xml
new file mode 100644
index 000000000000..e2448c5b2513
--- /dev/null
+++ b/src/chrome/content/rules/Cloudmutt.com.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Cloudscaling.com.xml b/src/chrome/content/rules/Cloudscaling.com.xml
index 309d1b1f459a..4a826175ad0a 100644
--- a/src/chrome/content/rules/Cloudscaling.com.xml
+++ b/src/chrome/content/rules/Cloudscaling.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://cloudscaling.com/ => https://cloudscaling.com/: (60, 'SSL ce
 		- engineering
 
 -->
-
+
 
 	
 	
@@ -24,4 +24,4 @@ Fetch error: http://cloudscaling.com/ => https://cloudscaling.com/: (60, 'SSL ce
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Cloudwear.com.xml b/src/chrome/content/rules/Cloudwear.com.xml
index 4b8e9bcfbab2..03c7eff2b539 100644
--- a/src/chrome/content/rules/Cloudwear.com.xml
+++ b/src/chrome/content/rules/Cloudwear.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://cloudwear.com/ => https://cloudwear.com/: (28, 'Connection t
 Fetch error: http://www.cloudwear.com/ => https://www.cloudwear.com/: (28, 'Connection timed out after 20000 milliseconds')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Clubic.com.xml b/src/chrome/content/rules/Clubic.com.xml
new file mode 100644
index 000000000000..1766a9912cbe
--- /dev/null
+++ b/src/chrome/content/rules/Clubic.com.xml
@@ -0,0 +1,35 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ClusterHQ.com.xml b/src/chrome/content/rules/ClusterHQ.com.xml
index 0acf1bb58d1b..e406ebcdb465 100644
--- a/src/chrome/content/rules/ClusterHQ.com.xml
+++ b/src/chrome/content/rules/ClusterHQ.com.xml
@@ -20,7 +20,7 @@ Fetch error: http://docs.clusterhq.com/ => https://docs.clusterhq.com/: (6, 'Cou
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Clusters.de.xml b/src/chrome/content/rules/Clusters.de.xml
index 09d6577b8403..45ea14aaaa56 100644
--- a/src/chrome/content/rules/Clusters.de.xml
+++ b/src/chrome/content/rules/Clusters.de.xml
@@ -1,7 +1,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
-
+
 
 	
@@ -33,7 +33,7 @@ Fetch error: http://s.cmcdn.net/ => https://d1gyuuidj3lauh.cloudfront.net/: (6,
 
 
 	
+		to="https://media.cmcdn.net/" />
 
 	
diff --git a/src/chrome/content/rules/Cmtt.ru.xml b/src/chrome/content/rules/Cmtt.ru.xml
deleted file mode 100644
index 50dd6a3f41f0..000000000000
--- a/src/chrome/content/rules/Cmtt.ru.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-	
-
-		
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Cnchost.com.xml b/src/chrome/content/rules/Cnchost.com.xml
index 195a165f56fd..edc645527ab2 100644
--- a/src/chrome/content/rules/Cnchost.com.xml
+++ b/src/chrome/content/rules/Cnchost.com.xml
@@ -22,7 +22,7 @@ Non-2xx HTTP code: http://secure.cnchost.com/ (200) => https://secure.cnchost.co
 		- secure
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Co-operative-bank.xml b/src/chrome/content/rules/Co-operative-bank.xml
index 513c8fd30e90..c6977686f08d 100644
--- a/src/chrome/content/rules/Co-operative-bank.xml
+++ b/src/chrome/content/rules/Co-operative-bank.xml
@@ -1,7 +1,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -11,7 +12,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Co3_Sys.com.xml b/src/chrome/content/rules/Co3_Sys.com.xml
deleted file mode 100644
index b422bba6df3a..000000000000
--- a/src/chrome/content/rules/Co3_Sys.com.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/CoCubes.com-falsemixed.xml b/src/chrome/content/rules/CoCubes.com-falsemixed.xml
deleted file mode 100644
index 613088b5dad2..000000000000
--- a/src/chrome/content/rules/CoCubes.com-falsemixed.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/CoCubes.com.xml b/src/chrome/content/rules/CoCubes.com.xml
deleted file mode 100644
index 00cc42498bcd..000000000000
--- a/src/chrome/content/rules/CoCubes.com.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/CoGen-Media.xml b/src/chrome/content/rules/CoGen-Media.xml
index a493e72be64b..7089db721077 100644
--- a/src/chrome/content/rules/CoGen-Media.xml
+++ b/src/chrome/content/rules/CoGen-Media.xml
@@ -38,7 +38,7 @@
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/CoNetrix.xml b/src/chrome/content/rules/CoNetrix.xml
index 37331f11e244..ac54bd5b8b95 100644
--- a/src/chrome/content/rules/CoNetrix.xml
+++ b/src/chrome/content/rules/CoNetrix.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Coalition-S.org.xml b/src/chrome/content/rules/Coalition-S.org.xml
new file mode 100644
index 000000000000..6aae3eb55bdb
--- /dev/null
+++ b/src/chrome/content/rules/Coalition-S.org.xml
@@ -0,0 +1,8 @@
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Coast-Capital-Savings.xml b/src/chrome/content/rules/Coast-Capital-Savings.xml
index 56bb433da846..ca50c882b5bf 100644
--- a/src/chrome/content/rules/Coast-Capital-Savings.xml
+++ b/src/chrome/content/rules/Coast-Capital-Savings.xml
@@ -10,7 +10,7 @@ Fetch error: http://vote.coastcapitalsavings.com/ => https://vote.coastcapitalsa
 		- www.copsforcancer.coastcapitalsavings.com
 -->
 
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Coast-Digital.xml b/src/chrome/content/rules/Coast-Digital.xml
index 95848cecad89..c0ac9f1f7d87 100644
--- a/src/chrome/content/rules/Coast-Digital.xml
+++ b/src/chrome/content/rules/Coast-Digital.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://coastdigital.co.uk/ => https://coastdigital.co.uk/: (60, 'SSL certificate problem: self signed certificate')
 Fetch error: http://www.coastdigital.co.uk/ => https://coastdigital.co.uk/: (60, 'SSL certificate problem: self signed certificate')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Coastal_Micro_Supply.xml b/src/chrome/content/rules/Coastal_Micro_Supply.xml
index 927062badb7f..8cd9274eefb6 100644
--- a/src/chrome/content/rules/Coastal_Micro_Supply.xml
+++ b/src/chrome/content/rules/Coastal_Micro_Supply.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.coastalmicrosupply.com/ => https://www.coastalmicrosuppl
 	Some (most)? pages redirect to http.
 
 -->
-
+
 
 	
 	
@@ -19,4 +19,4 @@ Fetch error: http://www.coastalmicrosupply.com/ => https://www.coastalmicrosuppl
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CoasterForce.com.xml b/src/chrome/content/rules/CoasterForce.com.xml
new file mode 100644
index 000000000000..e394efcccb2c
--- /dev/null
+++ b/src/chrome/content/rules/CoasterForce.com.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Cobalt_Mania.com.xml b/src/chrome/content/rules/Cobalt_Mania.com.xml
index e3a9c73e1208..969f0a998ad5 100644
--- a/src/chrome/content/rules/Cobalt_Mania.com.xml
+++ b/src/chrome/content/rules/Cobalt_Mania.com.xml
@@ -4,10 +4,10 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://cobaltmania.com/ => https://www.cobaltmania.com/: (7, 'Failed to connect to www.cobaltmania.com port 443: Connection refused')
 
 -->
-
+
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Coccoc.com.xml b/src/chrome/content/rules/Coccoc.com.xml
index a953523368b7..d73bbea27152 100644
--- a/src/chrome/content/rules/Coccoc.com.xml
+++ b/src/chrome/content/rules/Coccoc.com.xml
@@ -3,7 +3,6 @@
 	
 	
 
-  
   
   
 
diff --git a/src/chrome/content/rules/Cock.li.xml b/src/chrome/content/rules/Cock.li.xml
new file mode 100644
index 000000000000..c29d93a2feae
--- /dev/null
+++ b/src/chrome/content/rules/Cock.li.xml
@@ -0,0 +1,22 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Cockbox.org.xml b/src/chrome/content/rules/Cockbox.org.xml
new file mode 100644
index 000000000000..ad5812986e07
--- /dev/null
+++ b/src/chrome/content/rules/Cockbox.org.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/CodeWeavers.xml b/src/chrome/content/rules/CodeWeavers.xml
index 706ad6a339e6..415b707450a0 100644
--- a/src/chrome/content/rules/CodeWeavers.xml
+++ b/src/chrome/content/rules/CodeWeavers.xml
@@ -6,7 +6,7 @@
 
   	
 
-	
 
 
diff --git a/src/chrome/content/rules/Code_for_America.org.xml b/src/chrome/content/rules/Code_for_America.org.xml
index 816ad3a36d92..5ff587aacae6 100644
--- a/src/chrome/content/rules/Code_for_America.org.xml
+++ b/src/chrome/content/rules/Code_for_America.org.xml
@@ -23,7 +23,7 @@ Fetch error: http://people.codeforamerica.org/ => https://people.codeforamerica.
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Codebase_HQ.com.xml b/src/chrome/content/rules/Codebase_HQ.com.xml
index 81bcf92ef00a..433189fa5b11 100644
--- a/src/chrome/content/rules/Codebase_HQ.com.xml
+++ b/src/chrome/content/rules/Codebase_HQ.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://codebasehq.com/ => https://codebasehq.com/: (7, 'Failed to c
 		- www.codebasehq.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Codeblocks.org.xml b/src/chrome/content/rules/Codeblocks.org.xml
new file mode 100644
index 000000000000..d98e4966ff1f
--- /dev/null
+++ b/src/chrome/content/rules/Codeblocks.org.xml
@@ -0,0 +1,22 @@
+
+
+
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/CodecGuide.com.xml b/src/chrome/content/rules/CodecGuide.com.xml
new file mode 100644
index 000000000000..c2a74e961413
--- /dev/null
+++ b/src/chrome/content/rules/CodecGuide.com.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Codecombat.com.xml b/src/chrome/content/rules/Codecombat.com.xml
index b0aba90dcb5e..03699d1c8bad 100644
--- a/src/chrome/content/rules/Codecombat.com.xml
+++ b/src/chrome/content/rules/Codecombat.com.xml
@@ -9,11 +9,11 @@
 	
-	
+
 	
-	
+
 	
diff --git a/src/chrome/content/rules/Codecoon.com.xml b/src/chrome/content/rules/Codecoon.com.xml
index 16e65b7ac270..c4b31a84a2fa 100644
--- a/src/chrome/content/rules/Codecoon.com.xml
+++ b/src/chrome/content/rules/Codecoon.com.xml
@@ -18,7 +18,7 @@ Fetch error: http://www.codecoon.com/ => https://www.codecoon.com/: (51, "SSL: n
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Codeforces.com.xml b/src/chrome/content/rules/Codeforces.com.xml
new file mode 100644
index 000000000000..ee61d3843830
--- /dev/null
+++ b/src/chrome/content/rules/Codeforces.com.xml
@@ -0,0 +1,18 @@
+
+
+	
+		
+	
+		
+	
+		
+
+	
+
diff --git a/src/chrome/content/rules/Codehaus.org.xml b/src/chrome/content/rules/Codehaus.org.xml
index ed2aa3d6104f..a03beccf68e9 100644
--- a/src/chrome/content/rules/Codehaus.org.xml
+++ b/src/chrome/content/rules/Codehaus.org.xml
@@ -24,7 +24,7 @@ Fetch error: http://jira.codehaus.org/ => https://jira.codehaus.org/: (28, 'Conn
 		- Image on jira from www.codehaus.org
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Coderbits.com.xml b/src/chrome/content/rules/Coderbits.com.xml
index e4cf70edbbf0..dce70e459922 100644
--- a/src/chrome/content/rules/Coderbits.com.xml
+++ b/src/chrome/content/rules/Coderbits.com.xml
@@ -18,7 +18,7 @@ Fetch error: http://www.coderbits.com/ => https://www.coderbits.com/: (28, 'Conn
 		- (www.)?
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Coderouge.co.xml b/src/chrome/content/rules/Coderouge.co.xml
index 7f96a6e80d90..337efa6036ae 100644
--- a/src/chrome/content/rules/Coderouge.co.xml
+++ b/src/chrome/content/rules/Coderouge.co.xml
@@ -5,7 +5,7 @@ Fetch error: http://cdn.coderouge.co/ => https://cdn.coderouge.co/: (6, 'Could n
 Fetch error: http://git.coderouge.co/ => https://git.coderouge.co/: (6, 'Could not resolve host: git.coderouge.co')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Coderwall.xml b/src/chrome/content/rules/Coderwall.xml
index e50b22d4c892..5d47273ab2ae 100644
--- a/src/chrome/content/rules/Coderwall.xml
+++ b/src/chrome/content/rules/Coderwall.xml
@@ -26,7 +26,7 @@ Fetch error: http://www.coderwall.com/ => https://www.coderwall.com/: (7, 'Faile
 		- cdn		(→ d2h0j0bhq7ad3b.cloudfront.net)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Codex_NS.io.xml b/src/chrome/content/rules/Codex_NS.io.xml
index b2fda35e1d64..5d1d6db97e5e 100644
--- a/src/chrome/content/rules/Codex_NS.io.xml
+++ b/src/chrome/content/rules/Codex_NS.io.xml
@@ -11,7 +11,7 @@ Fetch error: http://rc.codexns.io/ => https://rc.codexns.io/: (60, 'SSL certific
 		- dev.codexns.io
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/CodiMD.org.xml b/src/chrome/content/rules/CodiMD.org.xml
new file mode 100644
index 000000000000..05a8055f713b
--- /dev/null
+++ b/src/chrome/content/rules/CodiMD.org.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Codinghorror.com.xml b/src/chrome/content/rules/Codinghorror.com.xml
index e7dce456e5c9..05f3262f4047 100644
--- a/src/chrome/content/rules/Codinghorror.com.xml
+++ b/src/chrome/content/rules/Codinghorror.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://codinghorror.com/ => https://codinghorror.com/: (51, "SSL: no alternative certificate subject name matches target host name 'codinghorror.com'")
 
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/Cognesia.net.xml b/src/chrome/content/rules/Cognesia.net.xml
index b7d697c4a261..774231911092 100644
--- a/src/chrome/content/rules/Cognesia.net.xml
+++ b/src/chrome/content/rules/Cognesia.net.xml
@@ -9,13 +9,12 @@
 -->
 
 
-	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CohnReznick.com.xml b/src/chrome/content/rules/CohnReznick.com.xml
index 149d5b720db9..047c8962be84 100644
--- a/src/chrome/content/rules/CohnReznick.com.xml
+++ b/src/chrome/content/rules/CohnReznick.com.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CoinPayments.com.xml b/src/chrome/content/rules/CoinPayments.com.xml
new file mode 100644
index 000000000000..cf3be4309c58
--- /dev/null
+++ b/src/chrome/content/rules/CoinPayments.com.xml
@@ -0,0 +1,7 @@
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/CoinPayments.net.xml b/src/chrome/content/rules/CoinPayments.net.xml
index 43d23ecbc9f2..23215fea3edc 100644
--- a/src/chrome/content/rules/CoinPayments.net.xml
+++ b/src/chrome/content/rules/CoinPayments.net.xml
@@ -1,18 +1,28 @@
+
 
 
-
 	
 	
-	
 	
+	
 	
-
-	
-	
+	
+	
+	
+	
 
 	
-
 
diff --git a/src/chrome/content/rules/CoinURL.com.xml b/src/chrome/content/rules/CoinURL.com.xml
deleted file mode 100644
index ab7a4000bf7c..000000000000
--- a/src/chrome/content/rules/CoinURL.com.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/CoinWorker.xml b/src/chrome/content/rules/CoinWorker.xml
deleted file mode 100644
index 324377644ca0..000000000000
--- a/src/chrome/content/rules/CoinWorker.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Coinerra.com.xml b/src/chrome/content/rules/Coinerra.com.xml
deleted file mode 100644
index 85574a999dfa..000000000000
--- a/src/chrome/content/rules/Coinerra.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Coinkite.com.xml b/src/chrome/content/rules/Coinkite.com.xml
index 433579e0a4d3..87a510ac4b57 100644
--- a/src/chrome/content/rules/Coinkite.com.xml
+++ b/src/chrome/content/rules/Coinkite.com.xml
@@ -30,7 +30,7 @@ Fetch error: http://docs.coinkite.com/ => https://docs.coinkite.com/: (6, 'Could
 		- .coinkite.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Coinpay.in.th.xml b/src/chrome/content/rules/Coinpay.in.th.xml
deleted file mode 100644
index 65ae47d8c79e..000000000000
--- a/src/chrome/content/rules/Coinpay.in.th.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Coinsecure.in.xml b/src/chrome/content/rules/Coinsecure.in.xml
deleted file mode 100644
index 681dbf68195b..000000000000
--- a/src/chrome/content/rules/Coinsecure.in.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Coinsh.red.xml b/src/chrome/content/rules/Coinsh.red.xml
new file mode 100644
index 000000000000..e4893614d6c4
--- /dev/null
+++ b/src/chrome/content/rules/Coinsh.red.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Cointelegraph.com.xml b/src/chrome/content/rules/Cointelegraph.com.xml
new file mode 100644
index 000000000000..a0ad3e24d2e4
--- /dev/null
+++ b/src/chrome/content/rules/Cointelegraph.com.xml
@@ -0,0 +1,44 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+  
+	
+
diff --git a/src/chrome/content/rules/Coles.com.au.xml b/src/chrome/content/rules/Coles.com.au.xml
new file mode 100644
index 000000000000..0c500145845e
--- /dev/null
+++ b/src/chrome/content/rules/Coles.com.au.xml
@@ -0,0 +1,172 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ColesExpress.com.au.xml b/src/chrome/content/rules/ColesExpress.com.au.xml
new file mode 100644
index 000000000000..8a5751f4ed4d
--- /dev/null
+++ b/src/chrome/content/rules/ColesExpress.com.au.xml
@@ -0,0 +1,28 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Coletivos.org.xml b/src/chrome/content/rules/Coletivos.org.xml
new file mode 100644
index 000000000000..435a1db045d6
--- /dev/null
+++ b/src/chrome/content/rules/Coletivos.org.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/CollabNet.xml b/src/chrome/content/rules/CollabNet.xml
index 34e9db7ae052..7150325fa31a 100644
--- a/src/chrome/content/rules/CollabNet.xml
+++ b/src/chrome/content/rules/CollabNet.xml
@@ -38,7 +38,13 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Collabnix.com.xml b/src/chrome/content/rules/Collabnix.com.xml
new file mode 100644
index 000000000000..923beae69d81
--- /dev/null
+++ b/src/chrome/content/rules/Collabnix.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Collateral_Murder.xml b/src/chrome/content/rules/Collateral_Murder.xml
index b502baae3381..eb033f725e56 100644
--- a/src/chrome/content/rules/Collateral_Murder.xml
+++ b/src/chrome/content/rules/Collateral_Murder.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CollegeBoundfund.xml b/src/chrome/content/rules/CollegeBoundfund.xml
deleted file mode 100644
index 018c13ffc71a..000000000000
--- a/src/chrome/content/rules/CollegeBoundfund.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/CollegiateLink.xml b/src/chrome/content/rules/CollegiateLink.xml
index 1aff7dec7987..d2dbe858bff5 100644
--- a/src/chrome/content/rules/CollegiateLink.xml
+++ b/src/chrome/content/rules/CollegiateLink.xml
@@ -9,7 +9,7 @@ Fetch error: http://ufl.collegiatelink.net/ => https://ufl.collegiatelink.net/:
 	^collegiatelink.net does not exist.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/CollegiatePeaksBank.com.xml b/src/chrome/content/rules/CollegiatePeaksBank.com.xml
index 5ee55d6190c6..23369370aedc 100644
--- a/src/chrome/content/rules/CollegiatePeaksBank.com.xml
+++ b/src/chrome/content/rules/CollegiatePeaksBank.com.xml
@@ -3,19 +3,16 @@
 		mobile.collegiatepeaksbank.com
 		cpbonlinebanking.com
 
+  Host unresolved:
+    cpbonlinebanking.com
 -->
 
 
 	
 	
-	
-	
 
 	
 
-	
-
 	
 
diff --git a/src/chrome/content/rules/Collyers.xml b/src/chrome/content/rules/Collyers.xml
index a5cf18c44c1a..28e007512cbd 100644
--- a/src/chrome/content/rules/Collyers.xml
+++ b/src/chrome/content/rules/Collyers.xml
@@ -4,17 +4,17 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://mail.collyers.ac.uk/ => https://mail.collyers.ac.uk/: (6, 'Could not resolve host: mail.collyers.ac.uk')
 
 -->
-
-        
-         
-         
-         
-         
-         
-    
-        
-        
-        
-
-        
-
+
+        
+         
+         
+         
+         
+         
+
+        
+        
+        
+
+        
+
diff --git a/src/chrome/content/rules/Colocation_America.com.xml b/src/chrome/content/rules/Colocation_America.com.xml
index 1596aad2261c..9be5aa92c963 100644
--- a/src/chrome/content/rules/Colocation_America.com.xml
+++ b/src/chrome/content/rules/Colocation_America.com.xml
@@ -20,13 +20,6 @@
 	
 	
 
-	
-	
-	
-	
-	
-
 		
 		
@@ -54,9 +47,6 @@
 	
 
 
-	
-
 	
 
diff --git a/src/chrome/content/rules/Color-Of-Change.xml b/src/chrome/content/rules/Color-Of-Change.xml
index 0cd3c4f8e30b..42475963d461 100644
--- a/src/chrome/content/rules/Color-Of-Change.xml
+++ b/src/chrome/content/rules/Color-Of-Change.xml
@@ -12,4 +12,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Colorado-Attorney-General.xml b/src/chrome/content/rules/Colorado-Attorney-General.xml
index efd6599da1f7..1283cd4a8fdb 100644
--- a/src/chrome/content/rules/Colorado-Attorney-General.xml
+++ b/src/chrome/content/rules/Colorado-Attorney-General.xml
@@ -5,9 +5,9 @@ Fetch error: http://coloradoattorneygeneral.gov/ => https://www.coloradoattorney
 Fetch error: http://www.coloradoattorneygeneral.gov/ => https://www.coloradoattorneygeneral.gov/: (51, "SSL: no alternative certificate subject name matches target host name 'www.coloradoattorneygeneral.gov'")
 
 -->
-
+
 	
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Colorado-No-Call-List.xml b/src/chrome/content/rules/Colorado-No-Call-List.xml
index a7750cdc4d33..801f512d1149 100644
--- a/src/chrome/content/rules/Colorado-No-Call-List.xml
+++ b/src/chrome/content/rules/Colorado-No-Call-List.xml
@@ -3,4 +3,4 @@
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Colorado_Captures.xml b/src/chrome/content/rules/Colorado_Captures.xml
index d69917a9cc2d..c02641b95b60 100644
--- a/src/chrome/content/rules/Colorado_Captures.xml
+++ b/src/chrome/content/rules/Colorado_Captures.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Coloradoan.xml b/src/chrome/content/rules/Coloradoan.xml
index 8410edc3a1ed..131b038570bd 100644
--- a/src/chrome/content/rules/Coloradoan.xml
+++ b/src/chrome/content/rules/Coloradoan.xml
@@ -26,10 +26,11 @@
 
 
 	
-	
+	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Colordiff.org.xml b/src/chrome/content/rules/Colordiff.org.xml
new file mode 100644
index 000000000000..a4386135f522
--- /dev/null
+++ b/src/chrome/content/rules/Colordiff.org.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Colors-il.com.xml b/src/chrome/content/rules/Colors-il.com.xml
index 4cfb128b3582..c97edcbb4c32 100644
--- a/src/chrome/content/rules/Colors-il.com.xml
+++ b/src/chrome/content/rules/Colors-il.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.colors-il.com/ => https://www.colors-il.com/: (51, "SSL:
 Disabled by https-everywhere-checker because:
 Fetch error: http://colors-il.com/ => https://colors-il.com/: (51, "SSL: no alternative certificate subject name matches target host name 'colors-il.com'")
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://colors-il.com/ => https://colors-il.com/: (51, "SSL: no alte
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Columbia_University-problematic.xml b/src/chrome/content/rules/Columbia_University-problematic.xml
index eb51379d2199..53cbfedd380e 100644
--- a/src/chrome/content/rules/Columbia_University-problematic.xml
+++ b/src/chrome/content/rules/Columbia_University-problematic.xml
@@ -13,7 +13,7 @@
 	
 	
 	
-	
+	
 	
 	
 	
@@ -21,13 +21,12 @@
 	
 
 
-	
+	
 
 
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Columbia_University.xml b/src/chrome/content/rules/Columbia_University.xml
index ed88f6b8ed6a..7944cf358642 100644
--- a/src/chrome/content/rules/Columbia_University.xml
+++ b/src/chrome/content/rules/Columbia_University.xml
@@ -4,7 +4,7 @@
 
 	cu.custhelp.com
 	columbia.studioabroad.com
-	academiccommons.uservoice.com 
+	academiccommons.uservoice.com
 
 
 	Nonfunctional subdomains:
@@ -51,7 +51,7 @@
 		- (www.)learn ⁶
 		- (www.)mailmain ⁷
 		- (www.)neighbors *
-		- (www.)pathology ***	
+		- (www.)pathology ***
 		- (www.)publichealth
 		- (www.)sas ⁹
 		- search
diff --git a/src/chrome/content/rules/ComCav.com.xml b/src/chrome/content/rules/ComCav.com.xml
index 3c53a3e06d0a..7d28970bc744 100644
--- a/src/chrome/content/rules/ComCav.com.xml
+++ b/src/chrome/content/rules/ComCav.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://comcav.com/ => https://comcav.com/: (51, "SSL: no alternativ
 Disabled by https-everywhere-checker because:
 Fetch error: http://comcav.com/ => https://comcav.com/: (6, 'Could not resolve host: comcav.com')
 -->
-
+
 
 	
 	
@@ -17,4 +17,4 @@ Fetch error: http://comcav.com/ => https://comcav.com/: (6, 'Could not resolve h
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ComSignTrust.com.xml b/src/chrome/content/rules/ComSignTrust.com.xml
deleted file mode 100644
index 0e768a62295b..000000000000
--- a/src/chrome/content/rules/ComSignTrust.com.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-		
-
-
-	
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/ComSuper.xml b/src/chrome/content/rules/ComSuper.xml
deleted file mode 100644
index 3f5f2db360c8..000000000000
--- a/src/chrome/content/rules/ComSuper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-	
-
-	
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Comcast.net.xml b/src/chrome/content/rules/Comcast.net.xml
index 38bb95d72493..bbf43a90ce1e 100644
--- a/src/chrome/content/rules/Comcast.net.xml
+++ b/src/chrome/content/rules/Comcast.net.xml
@@ -49,7 +49,7 @@ Fetch error: http://voice.connect.comcast.net/ => https://voice.connect.comcast.
 		- Images on login from por-img.cimcontent.net
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Comcast.xml b/src/chrome/content/rules/Comcast.xml
index 0da8c78c5c60..17a7e4d3875e 100644
--- a/src/chrome/content/rules/Comcast.xml
+++ b/src/chrome/content/rules/Comcast.xml
@@ -68,7 +68,7 @@ Non-2xx HTTP code: http://www.comcast.com/ (200) => https://www.comcast.com/ (40
 	ᵐ Not secured by us <= mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Comcate.xml b/src/chrome/content/rules/Comcate.xml
deleted file mode 100644
index 01ee65fd75b7..000000000000
--- a/src/chrome/content/rules/Comcate.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Comegacity.com.xml b/src/chrome/content/rules/Comegacity.com.xml
new file mode 100644
index 000000000000..cdecab7da50b
--- /dev/null
+++ b/src/chrome/content/rules/Comegacity.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ComiXology.com.xml b/src/chrome/content/rules/ComiXology.com.xml
index 4c013ff0572b..7560050fd2ba 100644
--- a/src/chrome/content/rules/ComiXology.com.xml
+++ b/src/chrome/content/rules/ComiXology.com.xml
@@ -1,95 +1,51 @@
 
-
-
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
+	
 	
+	
 	
 	
-	
-	
-
-	
-	
 	
+	
+	
 
-		
-
-			
-			
-
-			
-			
-
-
-	
-	
-	
-
-	
-
-
-	
-
-	
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/Comic-Con-Intl.xml b/src/chrome/content/rules/Comic-Con-Intl.xml
index 25f030e7ba35..0ee51800f839 100644
--- a/src/chrome/content/rules/Comic-Con-Intl.xml
+++ b/src/chrome/content/rules/Comic-Con-Intl.xml
@@ -1,18 +1,16 @@
 
-	
-	
 	
-	
-	
 	
+	
+	
+	
 
-	
-
-	
-	
-
-	
+	
+	
+	
 
-	
+	
 
diff --git a/src/chrome/content/rules/ComicFury.xml b/src/chrome/content/rules/ComicFury.xml
index 70b8689af348..944287de283f 100644
--- a/src/chrome/content/rules/ComicFury.xml
+++ b/src/chrome/content/rules/ComicFury.xml
@@ -1,26 +1,26 @@
 
 
 	
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Comiket.co.jp.xml b/src/chrome/content/rules/Comiket.co.jp.xml
new file mode 100644
index 000000000000..c1d3ca596e95
--- /dev/null
+++ b/src/chrome/content/rules/Comiket.co.jp.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Comkort.com.xml b/src/chrome/content/rules/Comkort.com.xml
index b9478b52e689..25fbb92945bf 100644
--- a/src/chrome/content/rules/Comkort.com.xml
+++ b/src/chrome/content/rules/Comkort.com.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.comkort.com/ => https://www.comkort.com/: (6, 'Could not
 		- .comkort.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Comm100.cn.xml b/src/chrome/content/rules/Comm100.cn.xml
deleted file mode 100644
index 02d755b718db..000000000000
--- a/src/chrome/content/rules/Comm100.cn.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/CommScope.com.xml b/src/chrome/content/rules/CommScope.com.xml
index bf75526e9fd2..562dd5506627 100644
--- a/src/chrome/content/rules/CommScope.com.xml
+++ b/src/chrome/content/rules/CommScope.com.xml
@@ -19,7 +19,7 @@
 		
 
 
-	
 
 	
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Commando_Boxing.com.xml b/src/chrome/content/rules/Commando_Boxing.com.xml
index fb5e01e26d7b..509e896e884d 100644
--- a/src/chrome/content/rules/Commando_Boxing.com.xml
+++ b/src/chrome/content/rules/Commando_Boxing.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.commandoboxing.com/ => https://www.commandoboxing.com/: (6, 'Could not resolve host: www.commandoboxing.com')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Commbank.com.au.xml b/src/chrome/content/rules/Commbank.com.au.xml
index cea54951df4b..f5ee61855f35 100644
--- a/src/chrome/content/rules/Commbank.com.au.xml
+++ b/src/chrome/content/rules/Commbank.com.au.xml
@@ -147,7 +147,7 @@
 	r: connection refused
 	s: self-signed certificate
 	t: timeout on https
-	
+
 -->
 
 
@@ -240,7 +240,7 @@
 	
 
   	
-		
+
 	
 
diff --git a/src/chrome/content/rules/Commercial-Radio-Hong-Kong.xml b/src/chrome/content/rules/Commercial-Radio-Hong-Kong.xml
new file mode 100644
index 000000000000..50aa40c4aa39
--- /dev/null
+++ b/src/chrome/content/rules/Commercial-Radio-Hong-Kong.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+		
+		
+		
+		
+
+		
+			
+
+	
+
diff --git a/src/chrome/content/rules/Commindo-media.xml b/src/chrome/content/rules/Commindo-media.xml
deleted file mode 100644
index 747b4c58e534..000000000000
--- a/src/chrome/content/rules/Commindo-media.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Commission_Junction.xml b/src/chrome/content/rules/Commission_Junction.xml
index fca844c691a2..ec1d2e2f1908 100644
--- a/src/chrome/content/rules/Commission_Junction.xml
+++ b/src/chrome/content/rules/Commission_Junction.xml
@@ -30,7 +30,6 @@
 	
 	
 	
-	
 	
 	
 	
@@ -44,7 +43,7 @@
 	
 
 
-	
 
 	 http://cftc.gov/: (28, 'Connection timed out after 20001 milliseconds')
-
-
-
-	Problematic subdomains:
-
-		- ^		(mismatched)
-
-
-	Some pages redirect to http.
-
--->
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Common-App.xml b/src/chrome/content/rules/Common-App.xml
deleted file mode 100644
index 70df19bc1e43..000000000000
--- a/src/chrome/content/rules/Common-App.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/CommonCrawl.xml b/src/chrome/content/rules/CommonCrawl.xml
index d0b49db5bca1..84f7dd767aac 100644
--- a/src/chrome/content/rules/CommonCrawl.xml
+++ b/src/chrome/content/rules/CommonCrawl.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Common_Criteria_Portal.xml b/src/chrome/content/rules/Common_Criteria_Portal.xml
index e867a20b98f5..8ef7ac2d55ea 100644
--- a/src/chrome/content/rules/Common_Criteria_Portal.xml
+++ b/src/chrome/content/rules/Common_Criteria_Portal.xml
@@ -8,7 +8,7 @@
 
 		
 
-    
+    
 
     
diff --git a/src/chrome/content/rules/CommonwealthCourtsPortal.xml b/src/chrome/content/rules/CommonwealthCourtsPortal.xml
index a3c207e373da..345db6763489 100644
--- a/src/chrome/content/rules/CommonwealthCourtsPortal.xml
+++ b/src/chrome/content/rules/CommonwealthCourtsPortal.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CommonwealthGITC.xml b/src/chrome/content/rules/CommonwealthGITC.xml
index cf62b48c63ad..d97cb3879be6 100644
--- a/src/chrome/content/rules/CommonwealthGITC.xml
+++ b/src/chrome/content/rules/CommonwealthGITC.xml
@@ -6,10 +6,10 @@ Fetch error: http://gitc.finance.gov.au/ => https://www.gitc.finance.gov.au/: (2
 Automatically by https-everywhere-checker because:
 Fetch error: http://gitc.finance.gov.au/ => https://www.gitc.finance.gov.au/: (6, 'Could not resolve host: gitc.finance.gov.au')
 -->
-
+
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CommonwealthGrantsCommission.xml b/src/chrome/content/rules/CommonwealthGrantsCommission.xml
index 3a5c05ce4a42..ba389ae12f74 100644
--- a/src/chrome/content/rules/CommonwealthGrantsCommission.xml
+++ b/src/chrome/content/rules/CommonwealthGrantsCommission.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CommonwealthSuperannuationCorporation.xml b/src/chrome/content/rules/CommonwealthSuperannuationCorporation.xml
index 8abf04ba42ca..3e07bc4c29a1 100644
--- a/src/chrome/content/rules/CommonwealthSuperannuationCorporation.xml
+++ b/src/chrome/content/rules/CommonwealthSuperannuationCorporation.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Commotionwireless.net.xml b/src/chrome/content/rules/Commotionwireless.net.xml
index 320192cfb191..961e01622007 100644
--- a/src/chrome/content/rules/Commotionwireless.net.xml
+++ b/src/chrome/content/rules/Commotionwireless.net.xml
@@ -6,7 +6,7 @@ Fetch error: http://wiki.commotionwireless.net/ => https://wiki.commotionwireles
 	Mismatch:
 		- code
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/CommuniGate.xml b/src/chrome/content/rules/CommuniGate.xml
index d4eb09f280fd..eecff69c9b8d 100644
--- a/src/chrome/content/rules/CommuniGate.xml
+++ b/src/chrome/content/rules/CommuniGate.xml
@@ -1,6 +1,6 @@
 
   
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/CommuniGator.co.uk.xml b/src/chrome/content/rules/CommuniGator.co.uk.xml
index 397c0c715e77..fd4d61b264ed 100644
--- a/src/chrome/content/rules/CommuniGator.co.uk.xml
+++ b/src/chrome/content/rules/CommuniGator.co.uk.xml
@@ -16,13 +16,13 @@
 
 
 	
-	
+	
+	
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Communicate_Live.xml b/src/chrome/content/rules/Communicate_Live.xml
index a5e9decf16ba..ce934f722212 100644
--- a/src/chrome/content/rules/Communicate_Live.xml
+++ b/src/chrome/content/rules/Communicate_Live.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Community.wbgames.com.xml b/src/chrome/content/rules/Community.wbgames.com.xml
index 2d091d6f8906..36937a09ea55 100644
--- a/src/chrome/content/rules/Community.wbgames.com.xml
+++ b/src/chrome/content/rules/Community.wbgames.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://wbplay.wbgames.com/ => https://wbplay.wbgames.com/: (60, 'SS
 		- community.wbgames.com
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Community_Matters.xml b/src/chrome/content/rules/Community_Matters.xml
index eb143e08ca6b..0277d8147906 100644
--- a/src/chrome/content/rules/Community_Matters.xml
+++ b/src/chrome/content/rules/Community_Matters.xml
@@ -13,7 +13,7 @@ Fetch error: http://trac.hohndel.org/ => https://trac.hohndel.org/: (51, "SSL: n
 	* Shows subsurface
 
 -->
-
+
 
 	
 	
@@ -25,4 +25,4 @@ Fetch error: http://trac.hohndel.org/ => https://trac.hohndel.org/: (51, "SSL: n
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Comodo.xml b/src/chrome/content/rules/Comodo.xml
index aafbd2006bb8..fbe07039ec06 100644
--- a/src/chrome/content/rules/Comodo.xml
+++ b/src/chrome/content/rules/Comodo.xml
@@ -59,7 +59,30 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
 	
 	
@@ -72,14 +95,10 @@
 	
 
 
-	
 
 	
 
-	
 
 	
@@ -87,11 +106,10 @@
 		to="https://app.webinspector.com/" />
 
 	
-	
 
 	
 	
 
+	
 
diff --git a/src/chrome/content/rules/CompEx.xml b/src/chrome/content/rules/CompEx.xml
index 56f857267326..5421bdca58e0 100644
--- a/src/chrome/content/rules/CompEx.xml
+++ b/src/chrome/content/rules/CompEx.xml
@@ -1,9 +1,9 @@
 
 
 	
-	
+	
 	
-	
+	
 
 	
 	
diff --git a/src/chrome/content/rules/CompaniesInTheUK.xml b/src/chrome/content/rules/CompaniesInTheUK.xml
index e10f3cd4e532..ecbe0f43db51 100644
--- a/src/chrome/content/rules/CompaniesInTheUK.xml
+++ b/src/chrome/content/rules/CompaniesInTheUK.xml
@@ -2,7 +2,7 @@
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/Company-target.com.xml b/src/chrome/content/rules/Company-target.com.xml
deleted file mode 100644
index a1476b43a438..000000000000
--- a/src/chrome/content/rules/Company-target.com.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Compaq.com.xml b/src/chrome/content/rules/Compaq.com.xml
deleted file mode 100644
index e49b6374260c..000000000000
--- a/src/chrome/content/rules/Compaq.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/CompareTheMarket.xml b/src/chrome/content/rules/CompareTheMarket.xml
index d001f8c7c038..214b9d9412c6 100644
--- a/src/chrome/content/rules/CompareTheMarket.xml
+++ b/src/chrome/content/rules/CompareTheMarket.xml
@@ -41,7 +41,7 @@ Fetch error: http://contact.comparethemarket.com/ => https://contact.comparethem
 		- www.comparethemarket.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Comparis.xml b/src/chrome/content/rules/Comparis.xml
index dabe1a950133..cfbec9125013 100644
--- a/src/chrome/content/rules/Comparis.xml
+++ b/src/chrome/content/rules/Comparis.xml
@@ -1,7 +1,7 @@
 
         
         
-        
+        
 
         
diff --git a/src/chrome/content/rules/CompassIslam.com.xml b/src/chrome/content/rules/CompassIslam.com.xml
deleted file mode 100644
index aa14273bf26e..000000000000
--- a/src/chrome/content/rules/CompassIslam.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Compasscard.ca.xml b/src/chrome/content/rules/Compasscard.ca.xml
deleted file mode 100644
index b388deafb0f5..000000000000
--- a/src/chrome/content/rules/Compasscard.ca.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Compendium.com.xml b/src/chrome/content/rules/Compendium.com.xml
index b2b0bdaf1dfe..1348998a3eb0 100644
--- a/src/chrome/content/rules/Compendium.com.xml
+++ b/src/chrome/content/rules/Compendium.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://www.compendium.com/ => https://www.oracle.com/us/corporate/a
 		- imagefilter.app.compendium.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Compendium.xml b/src/chrome/content/rules/Compendium.xml
deleted file mode 100644
index 70706e614092..000000000000
--- a/src/chrome/content/rules/Compendium.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-	
-
-	
-
-		
-
-
-	
-
-	
-	
-
-		
-
-	
-
-
diff --git a/src/chrome/content/rules/Compete.xml b/src/chrome/content/rules/Compete.xml
index 9a3b06ab3c22..48c8e206be6f 100644
--- a/src/chrome/content/rules/Compete.xml
+++ b/src/chrome/content/rules/Compete.xml
@@ -23,7 +23,7 @@ Fetch error: http://c.compete.com/ => https://c.compete.com/: (6, 'Could not res
 		- srp
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Competitive_Enterprise_Institute-problematic.xml b/src/chrome/content/rules/Competitive_Enterprise_Institute-problematic.xml
index 35ad0e759ed4..f4892140b3fe 100644
--- a/src/chrome/content/rules/Competitive_Enterprise_Institute-problematic.xml
+++ b/src/chrome/content/rules/Competitive_Enterprise_Institute-problematic.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Competitive_Enterprise_Institute.xml b/src/chrome/content/rules/Competitive_Enterprise_Institute.xml
index 24972d0df302..a7058e435a7a 100644
--- a/src/chrome/content/rules/Competitive_Enterprise_Institute.xml
+++ b/src/chrome/content/rules/Competitive_Enterprise_Institute.xml
@@ -13,7 +13,7 @@ Fetch error: http://shop.cei.org/ => https://shop.cei.org/: (60, 'SSL certificat
 		- (www.)	(expired 2011-06-12, CN: plesk)
 
 -->
-
+
 
 	
 
@@ -23,4 +23,4 @@ Fetch error: http://shop.cei.org/ => https://shop.cei.org/: (60, 'SSL certificat
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Compiz-themes.org.xml b/src/chrome/content/rules/Compiz-themes.org.xml
deleted file mode 100644
index f4f216ed130e..000000000000
--- a/src/chrome/content/rules/Compiz-themes.org.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Compiz.xml b/src/chrome/content/rules/Compiz.xml
index 771fa5e25981..80c2b5b171cb 100644
--- a/src/chrome/content/rules/Compiz.xml
+++ b/src/chrome/content/rules/Compiz.xml
@@ -1,9 +1,23 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
 
 	
diff --git a/src/chrome/content/rules/CompletelyPrivateFiles.com.xml b/src/chrome/content/rules/CompletelyPrivateFiles.com.xml
index 793cf4289e53..1b6a59c2fdeb 100644
--- a/src/chrome/content/rules/CompletelyPrivateFiles.com.xml
+++ b/src/chrome/content/rules/CompletelyPrivateFiles.com.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://completelyprivatefiles.com/ => https://completelyprivatefiles.com/: (35, 'error:14094410:SSL routines:SSL3_READ_BYTES:sslv3 alert handshake failure')
 Fetch error: http://www.completelyprivatefiles.com/ => https://www.completelyprivatefiles.com/: (35, 'error:14094410:SSL routines:SSL3_READ_BYTES:sslv3 alert handshake failure')
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.completelyprivatefiles.com/ => https://www.completelypri
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ComplianceSigns.com.xml b/src/chrome/content/rules/ComplianceSigns.com.xml
index 2c51336f04c2..8454b8327b2f 100644
--- a/src/chrome/content/rules/ComplianceSigns.com.xml
+++ b/src/chrome/content/rules/ComplianceSigns.com.xml
@@ -36,7 +36,8 @@
 
 
 	
-	
+	
+	
 
 
 	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Comprehensive-C-Archive-Network.xml b/src/chrome/content/rules/Comprehensive-C-Archive-Network.xml
deleted file mode 100644
index 0a84139edbeb..000000000000
--- a/src/chrome/content/rules/Comprehensive-C-Archive-Network.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Computec-Academy.de.xml b/src/chrome/content/rules/Computec-Academy.de.xml
index 0696388d6db3..3c60ac354ac6 100644
--- a/src/chrome/content/rules/Computec-Academy.de.xml
+++ b/src/chrome/content/rules/Computec-Academy.de.xml
@@ -8,7 +8,7 @@
 	² Server sends no certificate chain, see https://whatsmychaincert.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/ComputerCraft.ru.xml b/src/chrome/content/rules/ComputerCraft.ru.xml
new file mode 100644
index 000000000000..9ce070d77ffe
--- /dev/null
+++ b/src/chrome/content/rules/ComputerCraft.ru.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ComputerWorld.xml b/src/chrome/content/rules/ComputerWorld.xml
index 7915f8028c80..7aea1c16cdd2 100644
--- a/src/chrome/content/rules/ComputerWorld.xml
+++ b/src/chrome/content/rules/ComputerWorld.xml
@@ -56,7 +56,7 @@
 
 	
 
-	
 
 	
diff --git a/src/chrome/content/rules/Computer_Fulfillment.xml b/src/chrome/content/rules/Computer_Fulfillment.xml
index 324d0c747000..d430cbb5e4e4 100644
--- a/src/chrome/content/rules/Computer_Fulfillment.xml
+++ b/src/chrome/content/rules/Computer_Fulfillment.xml
@@ -11,7 +11,7 @@ Fetch error: http://computerfulfillment.com/ => https://www.computerfulfillment.
 		- ^	(cert only matches www)
 
 -->
-
+
 
 	
 	
@@ -20,4 +20,4 @@ Fetch error: http://computerfulfillment.com/ => https://www.computerfulfillment.
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Compuware_Gomez.xml b/src/chrome/content/rules/Compuware_Gomez.xml
index e2f5f35c8e14..67ebfe63a095 100644
--- a/src/chrome/content/rules/Compuware_Gomez.xml
+++ b/src/chrome/content/rules/Compuware_Gomez.xml
@@ -15,7 +15,7 @@ Fetch error: http://www.gomez.com/ => https://www.gomez.com/: (28, 'Connection t
 		- ^gomez.com	(expired, self-signed)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Con-tech.de.xml b/src/chrome/content/rules/Con-tech.de.xml
index f6b98d9b8963..0ac68a23dea9 100644
--- a/src/chrome/content/rules/Con-tech.de.xml
+++ b/src/chrome/content/rules/Con-tech.de.xml
@@ -15,7 +15,7 @@ Fetch error: http://ct-cds.con-tech.de/ => https://ct-cds.con-tech.de/: (7, 'Fai
 		- stat02	(works; expired 2012-03-01, self-signed, CN: Parallels Panel)
 
 -->
-
+
 
 	
 
@@ -25,4 +25,4 @@ Fetch error: http://ct-cds.con-tech.de/ => https://ct-cds.con-tech.de/: (7, 'Fai
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ConSecur.xml b/src/chrome/content/rules/ConSecur.xml
index 7e71508aacd0..1b118d4d2490 100644
--- a/src/chrome/content/rules/ConSecur.xml
+++ b/src/chrome/content/rules/ConSecur.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Concrete5.xml b/src/chrome/content/rules/Concrete5.xml
index 4bca3f99bac4..ab78d56ebeb0 100644
--- a/src/chrome/content/rules/Concrete5.xml
+++ b/src/chrome/content/rules/Concrete5.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ConcreteConstruction.net.xml b/src/chrome/content/rules/ConcreteConstruction.net.xml
new file mode 100644
index 000000000000..2ecb8c7bd325
--- /dev/null
+++ b/src/chrome/content/rules/ConcreteConstruction.net.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Concur.com.xml b/src/chrome/content/rules/Concur.com.xml
index 9be3c81ee9ea..04eacb1d18f2 100644
--- a/src/chrome/content/rules/Concur.com.xml
+++ b/src/chrome/content/rules/Concur.com.xml
@@ -13,7 +13,10 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
 
 
-	
 	
 	
 	
 
-	
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Conde-Nast.xml b/src/chrome/content/rules/Conde-Nast.xml
index 6f32153fa3bd..f102612d09dd 100644
--- a/src/chrome/content/rules/Conde-Nast.xml
+++ b/src/chrome/content/rules/Conde-Nast.xml
@@ -1,24 +1,19 @@
-
 
-
-
-	
-	
-	
+
 
-	
 	
+	
+	
 
+	
 
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Conde_Nast.co.uk.xml b/src/chrome/content/rules/Conde_Nast.co.uk.xml
deleted file mode 100644
index 2c039465d217..000000000000
--- a/src/chrome/content/rules/Conde_Nast.co.uk.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Conde_Nast_Traveler-problematic.xml b/src/chrome/content/rules/Conde_Nast_Traveler-problematic.xml
index 9cf6b8f400f5..5e363b14b8e1 100644
--- a/src/chrome/content/rules/Conde_Nast_Traveler-problematic.xml
+++ b/src/chrome/content/rules/Conde_Nast_Traveler-problematic.xml
@@ -23,4 +23,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Conde_Nast_Traveler.xml b/src/chrome/content/rules/Conde_Nast_Traveler.xml
index 1c07a0156a83..782df38563b7 100644
--- a/src/chrome/content/rules/Conde_Nast_Traveler.xml
+++ b/src/chrome/content/rules/Conde_Nast_Traveler.xml
@@ -29,7 +29,8 @@
 -->
 
 
-	
+	
+	
 
 
 	
-
+
 
 	
diff --git a/src/chrome/content/rules/Condenet.com.xml b/src/chrome/content/rules/Condenet.com.xml
index f04503378b81..ac351acc8fa1 100644
--- a/src/chrome/content/rules/Condenet.com.xml
+++ b/src/chrome/content/rules/Condenet.com.xml
@@ -12,7 +12,7 @@
 		- Bug on subscribe from condenast.112.2o7.net *
 
 	* Secured by us
-		- 
+		-
 -->
 
 
diff --git a/src/chrome/content/rules/Condominiums_for_Everyone.xml b/src/chrome/content/rules/Condominiums_for_Everyone.xml
index e36dafe8cd0f..370593e2d049 100644
--- a/src/chrome/content/rules/Condominiums_for_Everyone.xml
+++ b/src/chrome/content/rules/Condominiums_for_Everyone.xml
@@ -8,10 +8,10 @@ Fetch error: http://condosforeveryone.com/ => https://www.condosforeveryone.com/
 	!www times out.
 
 -->
-
+
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Conduit-data.com.xml b/src/chrome/content/rules/Conduit-data.com.xml
index dd3818adc995..00aaa0080b07 100644
--- a/src/chrome/content/rules/Conduit-data.com.xml
+++ b/src/chrome/content/rules/Conduit-data.com.xml
@@ -23,4 +23,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Conduit.xml b/src/chrome/content/rules/Conduit.xml
index 1c7e2aaebfd3..d1ba48ddc939 100644
--- a/src/chrome/content/rules/Conduit.xml
+++ b/src/chrome/content/rules/Conduit.xml
@@ -45,10 +45,18 @@ Fetch error: http://conduit.com/ => https://conduit.com/: (60, 'SSL certificate
 	² Secured by us
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Confederation_of_Danish_Industry.xml b/src/chrome/content/rules/Confederation_of_Danish_Industry.xml
index 02809b420a32..27113940ee4d 100644
--- a/src/chrome/content/rules/Confederation_of_Danish_Industry.xml
+++ b/src/chrome/content/rules/Confederation_of_Danish_Industry.xml
@@ -8,7 +8,7 @@ Non-2xx HTTP code: http://itek.di.dk/ (200) => https://itek.di.dk/ (503)
 		- (www.)	($ & sitecollectionimages/ 404)
 
 -->
-
+
 
 	
 	
@@ -21,4 +21,4 @@ Non-2xx HTTP code: http://itek.di.dk/ (200) => https://itek.di.dk/ (503)
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Confirmit.xml b/src/chrome/content/rules/Confirmit.xml
index f17e77e078ac..aecfaf63e30a 100644
--- a/src/chrome/content/rules/Confirmit.xml
+++ b/src/chrome/content/rules/Confirmit.xml
@@ -18,13 +18,22 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
-	
+	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Conformal-Systems.xml b/src/chrome/content/rules/Conformal-Systems.xml
index c4229dcaa442..d5e88137fd48 100644
--- a/src/chrome/content/rules/Conformal-Systems.xml
+++ b/src/chrome/content/rules/Conformal-Systems.xml
@@ -17,7 +17,7 @@ Fetch error: http://www.conformal.com/ => https://www.conformal.com/: (6, 'Could
 		- opensource
 
 -->
-
+
 
 	
@@ -27,7 +27,7 @@ Fetch error: http://www.conformal.com/ => https://www.conformal.com/: (6, 'Could
 	
 
 
-	
+	
 
 
 	 https://mgm.congstar.de/: (51, "SSL: no alternative certificate subject name matches target host name 'mgm.congstar.de'")
-
 	Other congstar rulesets:
 
 		- Congstar-media.de.xml
@@ -26,15 +22,30 @@ Fetch error: http://mgm.congstar.de/ => https://mgm.congstar.de/: (51, "SSL: no
 
 	* Secured by us
 
+	No alternative certificate subject name matches target host name:
+		- adventskalender.congstar.de
+		- handyhilfe.congstar.de
+
 -->
-
+
 
 	
+	
+	
+	
+	
+	
+	
+	
 	
+	
 	
-	
+	
+	
+	
+	
 	
-	
+	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ConnectMyPhone.com.xml b/src/chrome/content/rules/ConnectMyPhone.com.xml
index c2b1dc5f8723..85e91f955878 100644
--- a/src/chrome/content/rules/ConnectMyPhone.com.xml
+++ b/src/chrome/content/rules/ConnectMyPhone.com.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Connectify.me.xml b/src/chrome/content/rules/Connectify.me.xml
new file mode 100644
index 000000000000..a55a3acc6576
--- /dev/null
+++ b/src/chrome/content/rules/Connectify.me.xml
@@ -0,0 +1,17 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/Connexity.net.xml b/src/chrome/content/rules/Connexity.net.xml
index c6d6a5eeb1dc..7f4d88f8d538 100644
--- a/src/chrome/content/rules/Connexity.net.xml
+++ b/src/chrome/content/rules/Connexity.net.xml
@@ -1,38 +1,39 @@
-
 
-
+
 
-	
+	
+	
+	
+	
 	
+	
+	
 
-		
-		
-
-
-	
-	
-
-	
-	
-
+	
 
 	
diff --git a/src/chrome/content/rules/ConnochaetOS.org.xml b/src/chrome/content/rules/ConnochaetOS.org.xml
deleted file mode 100644
index 2d77d183ae0d..000000000000
--- a/src/chrome/content/rules/ConnochaetOS.org.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Conrad_Electronic.xml b/src/chrome/content/rules/Conrad_Electronic.xml
index 24ebf9b807ac..eb4d0e8c3a5a 100644
--- a/src/chrome/content/rules/Conrad_Electronic.xml
+++ b/src/chrome/content/rules/Conrad_Electronic.xml
@@ -9,7 +9,7 @@
 		conrad.sk (mismatch)
 		www.conrad.sk (mismatch)
 		velkoobchod.conrad.sk (mismatch)
-		
+
 	Redirect to HTTP:
 		www.conrad.be
 		conrad.com
@@ -32,7 +32,7 @@
 		conrad.it
 		conrad.nl (redirect rule as workaround)
 		conrad-electronic.co.uk
-	
+
 	Status code mismatch:
 		api.conrad.com
 
@@ -78,18 +78,18 @@
 	
 	
 	
-	
+
 	
 	
-	
+
 	
 	
-	
+
 	
 	
 	
-	
+
 	
 
     
 	
-	
+
 		
-		
+		to="https://www.conrad.ch/" />
+
 	
 
 	
-	
+
 	
 
 	
-	
+
 	
-	
+
 	
-			
+
 	
 
diff --git a/src/chrome/content/rules/Consensus911.org.xml b/src/chrome/content/rules/Consensus911.org.xml
new file mode 100644
index 000000000000..a95cc82027aa
--- /dev/null
+++ b/src/chrome/content/rules/Consensus911.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Constant-Contact.xml b/src/chrome/content/rules/Constant-Contact.xml
index d3fa849a6c7a..bbb54e5f0ba2 100644
--- a/src/chrome/content/rules/Constant-Contact.xml
+++ b/src/chrome/content/rules/Constant-Contact.xml
@@ -77,7 +77,7 @@ Fetch error: http://news.constantcontact.com/sites/constantcontact.newshq.busine
 		- Images on about from static.ctctcdn.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Consumentenbond.nl.xml b/src/chrome/content/rules/Consumentenbond.nl.xml
index a4951fcd542a..fc4a9393e647 100644
--- a/src/chrome/content/rules/Consumentenbond.nl.xml
+++ b/src/chrome/content/rules/Consumentenbond.nl.xml
@@ -4,7 +4,6 @@
 
   
 
-  
   
   
 
diff --git a/src/chrome/content/rules/Consumer.org.hk.xml b/src/chrome/content/rules/Consumer.org.hk.xml
index b03136918906..20b5d86dcd45 100644
--- a/src/chrome/content/rules/Consumer.org.hk.xml
+++ b/src/chrome/content/rules/Consumer.org.hk.xml
@@ -30,7 +30,7 @@ Fetch error: http://www4.consumer.org.hk/ => https://www4.consumer.org.hk/: (28,
 		Different content:
 			 - shopsmart.consumer.org.hk
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/ConsumerReports.xml b/src/chrome/content/rules/ConsumerReports.xml
index 2d0ddd6ebfd1..b6c227975d82 100644
--- a/src/chrome/content/rules/ConsumerReports.xml
+++ b/src/chrome/content/rules/ConsumerReports.xml
@@ -1,80 +1,20 @@
-
-
-
+
+	
 	
+	
+	
 	
+	
 	
-	
-		
-		
-	
 
-
-	
-	
-	
+	
+	
+	
+	
+	
+	
 
 	
 
-
-	
-	
-
-	
-
-	
-
-	
-
+	
 
-
diff --git a/src/chrome/content/rules/Consumer_Finance.gov.xml b/src/chrome/content/rules/Consumer_Finance.gov.xml
index 81512adbb73d..29c74b04575d 100644
--- a/src/chrome/content/rules/Consumer_Finance.gov.xml
+++ b/src/chrome/content/rules/Consumer_Finance.gov.xml
@@ -13,7 +13,7 @@
 
 	ʳ Refused
 
-	
+
 	^consumerfinance.gov Refused
 	www.consumerfinance.gov: Akamai
 
diff --git a/src/chrome/content/rules/Consumer_Reports.com-falsemixed.xml b/src/chrome/content/rules/Consumer_Reports.com-falsemixed.xml
deleted file mode 100644
index dc94642028df..000000000000
--- a/src/chrome/content/rules/Consumer_Reports.com-falsemixed.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Consumers_Union.org.xml b/src/chrome/content/rules/Consumers_Union.org.xml
index 4e7edfbd634f..c6c300b41575 100644
--- a/src/chrome/content/rules/Consumers_Union.org.xml
+++ b/src/chrome/content/rules/Consumers_Union.org.xml
@@ -11,7 +11,8 @@
 
 
 	
-	
+	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Contactual.xml b/src/chrome/content/rules/Contactual.xml
deleted file mode 100644
index f7bdfa371dec..000000000000
--- a/src/chrome/content/rules/Contactual.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Content.ad.xml b/src/chrome/content/rules/Content.ad.xml
index 613b46ddc792..5c4478d360fb 100644
--- a/src/chrome/content/rules/Content.ad.xml
+++ b/src/chrome/content/rules/Content.ad.xml
@@ -17,7 +17,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -26,7 +27,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Continent-8-Technologies.xml b/src/chrome/content/rules/Continent-8-Technologies.xml
deleted file mode 100644
index 915279e279a5..000000000000
--- a/src/chrome/content/rules/Continent-8-Technologies.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Continental.xml b/src/chrome/content/rules/Continental.xml
index e523bbca04d3..89cbf6cca4aa 100644
--- a/src/chrome/content/rules/Continental.xml
+++ b/src/chrome/content/rules/Continental.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.covacations.com/ => https://www.covacations.com/: (6, 'C
 Fetch error: http://covacations.com/ => https://www.covacations.com/: (6, 'Could not resolve host: covacations.com')
 Fetch error: http://checkin.continental.com/ => https://checkin.continental.com/: (7, 'Failed to connect to checkin.continental.com port 80: Connection refused')
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/Contributoria.com.xml b/src/chrome/content/rules/Contributoria.com.xml
index 1cbbbf1c0d32..1efaadfbaec0 100644
--- a/src/chrome/content/rules/Contributoria.com.xml
+++ b/src/chrome/content/rules/Contributoria.com.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.contributoria.com/ => https://www.contributoria.com/: (5
 		- .contributoria.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/ControlScan.com.xml b/src/chrome/content/rules/ControlScan.com.xml
index 6f4753f2f257..894bfa7aaad2 100644
--- a/src/chrome/content/rules/ControlScan.com.xml
+++ b/src/chrome/content/rules/ControlScan.com.xml
@@ -15,7 +15,10 @@ Fetch error: http://controlscan.com/ => https://controlscan.com/: (51, "SSL: no
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Conversejs.org.xml b/src/chrome/content/rules/Conversejs.org.xml
index 3bd5d178a3da..0764531c19fc 100644
--- a/src/chrome/content/rules/Conversejs.org.xml
+++ b/src/chrome/content/rules/Conversejs.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.conversejs.org/ => https://www.conversejs.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.conversejs.org'")
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Convert-JPG-to-PDF.net.xml b/src/chrome/content/rules/Convert-JPG-to-PDF.net.xml
new file mode 100644
index 000000000000..5bc3e77fc139
--- /dev/null
+++ b/src/chrome/content/rules/Convert-JPG-to-PDF.net.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Convio.xml b/src/chrome/content/rules/Convio.xml
index 47539495879f..707651fe689b 100644
--- a/src/chrome/content/rules/Convio.xml
+++ b/src/chrome/content/rules/Convio.xml
@@ -16,18 +16,18 @@ Fetch error: http://secure.commonground.convio.com/ => https://secure.commongrou
 	Nonfunctional hosts in *convio.net:
 
 		- service *
-		
+
 	* 503
 
 
 	Problematic domains:
 
 		- resources.convio.com *
-		
+
 	* Redirects to www.blackbaud.com; mismatched, CN: *.marketo.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Cookie_Reports.com.xml b/src/chrome/content/rules/Cookie_Reports.com.xml
index 1200a076a4ae..e644d1ef41d9 100644
--- a/src/chrome/content/rules/Cookie_Reports.com.xml
+++ b/src/chrome/content/rules/Cookie_Reports.com.xml
@@ -5,4 +5,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Cooking_Schools.com.xml b/src/chrome/content/rules/Cooking_Schools.com.xml
deleted file mode 100644
index 35ffb00c1e6c..000000000000
--- a/src/chrome/content/rules/Cooking_Schools.com.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/CoolBackgrounds.io.xml b/src/chrome/content/rules/CoolBackgrounds.io.xml
new file mode 100644
index 000000000000..ba03232b39bb
--- /dev/null
+++ b/src/chrome/content/rules/CoolBackgrounds.io.xml
@@ -0,0 +1,7 @@
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/CoolCart.Net.xml b/src/chrome/content/rules/CoolCart.Net.xml
deleted file mode 100644
index 466b33b472e8..000000000000
--- a/src/chrome/content/rules/CoolCart.Net.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-	
-	
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/CoolLib.com.xml b/src/chrome/content/rules/CoolLib.com.xml
new file mode 100644
index 000000000000..3403bbdfad5a
--- /dev/null
+++ b/src/chrome/content/rules/CoolLib.com.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/CoolMiniOrNot.com.xml b/src/chrome/content/rules/CoolMiniOrNot.com.xml
deleted file mode 100644
index f3e944268942..000000000000
--- a/src/chrome/content/rules/CoolMiniOrNot.com.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/CoolWebScripts.com.xml b/src/chrome/content/rules/CoolWebScripts.com.xml
index 28309b31eebb..7ee3292baa68 100644
--- a/src/chrome/content/rules/CoolWebScripts.com.xml
+++ b/src/chrome/content/rules/CoolWebScripts.com.xml
@@ -18,7 +18,7 @@
 					-->
 	
 
-	
+	
 
 
 	 https://cdn.cooldestinations.ne
 		- www.cooldestinations.net
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Cool_Key_West.xml b/src/chrome/content/rules/Cool_Key_West.xml
index 1a082da4c973..31add8a19df2 100644
--- a/src/chrome/content/rules/Cool_Key_West.xml
+++ b/src/chrome/content/rules/Cool_Key_West.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Cooliris.com.xml b/src/chrome/content/rules/Cooliris.com.xml
deleted file mode 100644
index a1e3d7817c95..000000000000
--- a/src/chrome/content/rules/Cooliris.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Cooperating-Objects.eu.xml b/src/chrome/content/rules/Cooperating-Objects.eu.xml
deleted file mode 100644
index 3e3a2911eeda..000000000000
--- a/src/chrome/content/rules/Cooperating-Objects.eu.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Cope-IT.xml b/src/chrome/content/rules/Cope-IT.xml
index 6c7ce7729dbe..d07061291e2d 100644
--- a/src/chrome/content/rules/Cope-IT.xml
+++ b/src/chrome/content/rules/Cope-IT.xml
@@ -12,4 +12,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Copenhagenmarathon.dk-falsemixed.xml b/src/chrome/content/rules/Copenhagenmarathon.dk-falsemixed.xml
deleted file mode 100644
index 3816feeba659..000000000000
--- a/src/chrome/content/rules/Copenhagenmarathon.dk-falsemixed.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Copenhagenmarathon.dk.xml b/src/chrome/content/rules/Copenhagenmarathon.dk.xml
index eee37b22fabb..a45b73f0bebc 100644
--- a/src/chrome/content/rules/Copenhagenmarathon.dk.xml
+++ b/src/chrome/content/rules/Copenhagenmarathon.dk.xml
@@ -1,12 +1,10 @@
-
 
 
 	
 	
+	
+	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Copernic.com.xml b/src/chrome/content/rules/Copernic.com.xml
index 89e7f28608a7..7e426aa14906 100644
--- a/src/chrome/content/rules/Copernic.com.xml
+++ b/src/chrome/content/rules/Copernic.com.xml
@@ -27,7 +27,10 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
@@ -36,8 +39,6 @@
 	
 
-	
 
 	
@@ -45,4 +46,5 @@
 	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Copernico.net.xml b/src/chrome/content/rules/Copernico.net.xml
index e7f1b6ebe200..395ce6a7a067 100644
--- a/src/chrome/content/rules/Copernico.net.xml
+++ b/src/chrome/content/rules/Copernico.net.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://pims.copernico.net/ => https://pims.copernico.net/: (6, 'Could not resolve host: pims.copernico.net')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Copiny.xml b/src/chrome/content/rules/Copiny.xml
index 9aa2b7103ed3..3f1d7df9f745 100644
--- a/src/chrome/content/rules/Copiny.xml
+++ b/src/chrome/content/rules/Copiny.xml
@@ -16,4 +16,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Copy.com.xml b/src/chrome/content/rules/Copy.com.xml
index 76b1bc48073e..43979a3ae630 100644
--- a/src/chrome/content/rules/Copy.com.xml
+++ b/src/chrome/content/rules/Copy.com.xml
@@ -20,16 +20,18 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Copyright_Clearance_Center.xml b/src/chrome/content/rules/Copyright_Clearance_Center.xml
index 382a7f9e15e1..588e59caafdf 100644
--- a/src/chrome/content/rules/Copyright_Clearance_Center.xml
+++ b/src/chrome/content/rules/Copyright_Clearance_Center.xml
@@ -10,4 +10,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Corbin_Fisher.xml b/src/chrome/content/rules/Corbin_Fisher.xml
index 5911f84cb2f5..f21e745f310c 100644
--- a/src/chrome/content/rules/Corbin_Fisher.xml
+++ b/src/chrome/content/rules/Corbin_Fisher.xml
@@ -13,4 +13,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CoreCode.xml b/src/chrome/content/rules/CoreCode.xml
index 72ec0d6abe6b..b9cfe97064dd 100644
--- a/src/chrome/content/rules/CoreCode.xml
+++ b/src/chrome/content/rules/CoreCode.xml
@@ -2,13 +2,13 @@
 
 	
 	
-	
+	
+	
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/CoreCommerce.xml b/src/chrome/content/rules/CoreCommerce.xml
index 0becbc131818..40f5fa3f5b77 100644
--- a/src/chrome/content/rules/CoreCommerce.xml
+++ b/src/chrome/content/rules/CoreCommerce.xml
@@ -8,13 +8,14 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/CoreInfrastructure.org.xml b/src/chrome/content/rules/CoreInfrastructure.org.xml
new file mode 100644
index 000000000000..36a8767b3ec6
--- /dev/null
+++ b/src/chrome/content/rules/CoreInfrastructure.org.xml
@@ -0,0 +1,19 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/CoreMetrics.xml b/src/chrome/content/rules/CoreMetrics.xml
index c3179015102c..3edf724d4b38 100644
--- a/src/chrome/content/rules/CoreMetrics.xml
+++ b/src/chrome/content/rules/CoreMetrics.xml
@@ -26,7 +26,7 @@ Fetch error: http://stats.surfaid.ihost.com/ => https://stats.surfaid.ihost.com/
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/CoreMotives.com.xml b/src/chrome/content/rules/CoreMotives.com.xml
deleted file mode 100644
index 542a88fdcc02..000000000000
--- a/src/chrome/content/rules/CoreMotives.com.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/CoreSite.com.xml b/src/chrome/content/rules/CoreSite.com.xml
deleted file mode 100644
index f6ab1e6f0af2..000000000000
--- a/src/chrome/content/rules/CoreSite.com.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Coreboot.xml b/src/chrome/content/rules/Coreboot.xml
index 80f01d3fadcc..afce2a2dde23 100644
--- a/src/chrome/content/rules/Coreboot.xml
+++ b/src/chrome/content/rules/Coreboot.xml
@@ -1,41 +1,32 @@
 
-
+
 
-	
+	
+	
+	
+	
 	
+	
+	
+	
+	
+	
+	
+	
+	
 	
 	
-	
-	
-
-	
-	
-
+	
 
 	
 
-
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Coreix.xml b/src/chrome/content/rules/Coreix.xml
index f7d7af70d2fd..2df0e91edd40 100644
--- a/src/chrome/content/rules/Coreix.xml
+++ b/src/chrome/content/rules/Coreix.xml
@@ -22,4 +22,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Cornell.xml b/src/chrome/content/rules/Cornell.xml
index ee57ea650572..4d17fe651371 100644
--- a/src/chrome/content/rules/Cornell.xml
+++ b/src/chrome/content/rules/Cornell.xml
@@ -158,7 +158,7 @@ Fetch error: http://news.cornell.edu/ => https://www.news.cornell.edu/: Too many
 	* Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Corpimages.de.xml b/src/chrome/content/rules/Corpimages.de.xml
index 8f03f16f6afc..9d4c670a1ec0 100644
--- a/src/chrome/content/rules/Corpimages.de.xml
+++ b/src/chrome/content/rules/Corpimages.de.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Corporate-ir.net.xml b/src/chrome/content/rules/Corporate-ir.net.xml
index 951e936fff18..d1778d886691 100644
--- a/src/chrome/content/rules/Corporate-ir.net.xml
+++ b/src/chrome/content/rules/Corporate-ir.net.xml
@@ -32,7 +32,9 @@
 -->
 
 
-	
+	
+	
+	
 		
diff --git a/src/chrome/content/rules/Corporate_Card_Application.com.xml b/src/chrome/content/rules/Corporate_Card_Application.com.xml
deleted file mode 100644
index 236f65cdf28c..000000000000
--- a/src/chrome/content/rules/Corporate_Card_Application.com.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Corporation_Service_Company.xml b/src/chrome/content/rules/Corporation_Service_Company.xml
index 6c5cd4023dbb..c64945c6c077 100644
--- a/src/chrome/content/rules/Corporation_Service_Company.xml
+++ b/src/chrome/content/rules/Corporation_Service_Company.xml
@@ -1,7 +1,10 @@
 
-
-
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-	
-
-		
-
-	
-
-
diff --git a/src/chrome/content/rules/Corrent.org.xml b/src/chrome/content/rules/Corrent.org.xml
index 9a640098c8e7..e078b9facecf 100644
--- a/src/chrome/content/rules/Corrent.org.xml
+++ b/src/chrome/content/rules/Corrent.org.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.corrent.org/ => https://www.corrent.org/: (28, 'Connecti
 		- .corrent.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Cosmo.org.xml b/src/chrome/content/rules/Cosmo.org.xml
index 274a2551380b..ab4d0d487216 100644
--- a/src/chrome/content/rules/Cosmo.org.xml
+++ b/src/chrome/content/rules/Cosmo.org.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.cosmo.org/ => https://www.cosmo.org/: (60, 'SSL certific
 		- ^	(works, cert only matches www)
 
 -->
-
+
 
 	
 	
@@ -24,4 +24,4 @@ Fetch error: http://www.cosmo.org/ => https://www.cosmo.org/: (60, 'SSL certific
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Cosmopolitan.xml b/src/chrome/content/rules/Cosmopolitan.xml
index 3c66203d070f..fb64f6707ce8 100644
--- a/src/chrome/content/rules/Cosmopolitan.xml
+++ b/src/chrome/content/rules/Cosmopolitan.xml
@@ -2,7 +2,6 @@
 	Other Hearst Corporation rulesets:
 
 		- Delish.xml
-		- Hearst-Corporation.xml
 
 
 	Nonfunctional hosts in *cosmopolitan.com:
diff --git a/src/chrome/content/rules/Cotera.xml b/src/chrome/content/rules/Cotera.xml
index fb74dec417e4..21fb235ee147 100644
--- a/src/chrome/content/rules/Cotera.xml
+++ b/src/chrome/content/rules/Cotera.xml
@@ -1,7 +1,10 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
 
-	
 	
-	
 
-	
+	
 
-	
 
diff --git a/src/chrome/content/rules/Cottagesdirect.co.uk.xml b/src/chrome/content/rules/Cottagesdirect.co.uk.xml
index 3e29dac8e59e..24bc6909e1d9 100644
--- a/src/chrome/content/rules/Cottagesdirect.co.uk.xml
+++ b/src/chrome/content/rules/Cottagesdirect.co.uk.xml
@@ -1,5 +1,5 @@
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Couchbase.xml b/src/chrome/content/rules/Couchbase.xml
index 66776a839d09..fbcc385725c6 100644
--- a/src/chrome/content/rules/Couchbase.xml
+++ b/src/chrome/content/rules/Couchbase.xml
@@ -39,6 +39,6 @@ Fetch error: http://couchbase.com/ => https://couchbase.com/: Cycle detected - U
 		to="https://na-a.marketo.com/" />
 
 	
+		to="https://packages.couchbase.com/" />
 
 
diff --git a/src/chrome/content/rules/Council_of_Europe.xml b/src/chrome/content/rules/Council_of_Europe.xml
index 80b4ea4db823..1925a6d5dccd 100644
--- a/src/chrome/content/rules/Council_of_Europe.xml
+++ b/src/chrome/content/rules/Council_of_Europe.xml
@@ -25,7 +25,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
@@ -34,7 +36,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Council_on_Foreign_Relations.xml b/src/chrome/content/rules/Council_on_Foreign_Relations.xml
index e28eaae928e5..bc7454323557 100644
--- a/src/chrome/content/rules/Council_on_Foreign_Relations.xml
+++ b/src/chrome/content/rules/Council_on_Foreign_Relations.xml
@@ -28,7 +28,10 @@
 
 
 	
-	
+	
+	
+	
+	
 		
 
 
diff --git a/src/chrome/content/rules/CouncilofAustralianGovernments.xml b/src/chrome/content/rules/CouncilofAustralianGovernments.xml
index 750fab14394f..a4c1144b7caf 100644
--- a/src/chrome/content/rules/CouncilofAustralianGovernments.xml
+++ b/src/chrome/content/rules/CouncilofAustralianGovernments.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Countdown.co.nz.xml b/src/chrome/content/rules/Countdown.co.nz.xml
index c4d2fb330993..31a329b7ce2c 100644
--- a/src/chrome/content/rules/Countdown.co.nz.xml
+++ b/src/chrome/content/rules/Countdown.co.nz.xml
@@ -3,7 +3,7 @@
 
 
 	Nonfunctional subdomains:
-	
+
 		- catalogues	(mismatch hostname, CN: *..dynamiccatalogue.com.au)
 		- now		(SSL handshake failed)
 		- shopmail	(expired cert)
diff --git a/src/chrome/content/rules/CounterMail.com.xml b/src/chrome/content/rules/CounterMail.com.xml
new file mode 100644
index 000000000000..b40a664b8137
--- /dev/null
+++ b/src/chrome/content/rules/CounterMail.com.xml
@@ -0,0 +1,14 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Countquest.se.xml b/src/chrome/content/rules/Countquest.se.xml
index 30e66b8a4a5f..7be6ba78917c 100644
--- a/src/chrome/content/rules/Countquest.se.xml
+++ b/src/chrome/content/rules/Countquest.se.xml
@@ -3,7 +3,7 @@
 Disabled by https-everywhere-checker because:
 Fetch error: http://sdc.countquest.se/ => https://sdc.countquest.se/: (28, 'Connection timed out after 20006 milliseconds')
  Another tracking firm -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/County_Star.xml b/src/chrome/content/rules/County_Star.xml
deleted file mode 100644
index a734d24fa437..000000000000
--- a/src/chrome/content/rules/County_Star.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Couponese.com.xml b/src/chrome/content/rules/Couponese.com.xml
index d5cb296d33d5..cb87e6c4ec16 100644
--- a/src/chrome/content/rules/Couponese.com.xml
+++ b/src/chrome/content/rules/Couponese.com.xml
@@ -11,4 +11,4 @@
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Coupons-Inc.xml b/src/chrome/content/rules/Coupons-Inc.xml
index 25e7f9532fae..a05c9688212c 100644
--- a/src/chrome/content/rules/Coupons-Inc.xml
+++ b/src/chrome/content/rules/Coupons-Inc.xml
@@ -1,19 +1,15 @@
 
 
+	
 	
-	
-	
-
-	
+	
+	
+	
+		
 
-	
-
-	
+	
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Courier-Post.xml b/src/chrome/content/rules/Courier-Post.xml
index fb2875172a51..4a085493f9f6 100644
--- a/src/chrome/content/rules/Courier-Post.xml
+++ b/src/chrome/content/rules/Courier-Post.xml
@@ -47,7 +47,7 @@ Fetch error: http://localsearch.courierpostonline.com/sf_frameworks/gdev/css/scr
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Cours_Crypto.org.xml b/src/chrome/content/rules/Cours_Crypto.org.xml
index 9ed07c19cbdf..cfcf8215267e 100644
--- a/src/chrome/content/rules/Cours_Crypto.org.xml
+++ b/src/chrome/content/rules/Cours_Crypto.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://courscrypto.org/ => https://courscrypto.org/: (60, 'SSL cert
 Fetch error: http://www.courscrypto.org/ => https://www.courscrypto.org/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/CourseFinder.io.xml b/src/chrome/content/rules/CourseFinder.io.xml
index dfa44caa880b..73818d0c6845 100644
--- a/src/chrome/content/rules/CourseFinder.io.xml
+++ b/src/chrome/content/rules/CourseFinder.io.xml
@@ -23,7 +23,7 @@ Fetch error: http://www.coursefinder.io/ => https://www.coursefinder.io/: (6, 'C
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Covad.com.xml b/src/chrome/content/rules/Covad.com.xml
index 11faeacde63a..9053946bfa45 100644
--- a/src/chrome/content/rules/Covad.com.xml
+++ b/src/chrome/content/rules/Covad.com.xml
@@ -34,7 +34,7 @@ Fetch error: http://my.covad.com/ => https://my.covad.com/: (60, 'SSL certificat
 	² Not secured by us <= expired & self-signed
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/CoverStand.com.xml b/src/chrome/content/rules/CoverStand.com.xml
index 7e552e4c9a22..5ab70369f499 100644
--- a/src/chrome/content/rules/CoverStand.com.xml
+++ b/src/chrome/content/rules/CoverStand.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://coverstand.com/ => https://coverstand.com/: (7, 'Failed to c
 Fetch error: http://www.coverstand.com/ => https://www.coverstand.com/: (7, 'Failed to connect to www.coverstand.com port 443: Connection refused')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Coverity.com.xml b/src/chrome/content/rules/Coverity.com.xml
index c52d78bc46cf..2fb039ddaa39 100644
--- a/src/chrome/content/rules/Coverity.com.xml
+++ b/src/chrome/content/rules/Coverity.com.xml
@@ -54,7 +54,7 @@ Fetch error: http://trial.coverity.com/ => https://trial.coverity.com/: (28, 'Co
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Covisint.xml b/src/chrome/content/rules/Covisint.xml
index 4f236da90109..c95a687bfc37 100644
--- a/src/chrome/content/rules/Covisint.xml
+++ b/src/chrome/content/rules/Covisint.xml
@@ -7,17 +7,18 @@ Non-2xx HTTP code: http://covisint.com/ (200) => https://covisint.com/ (500)
 
 
 	
-	
+	
+	
+	
 
 
-	
+	
 
 
-	
 
 	
 	
 
+	
 
diff --git a/src/chrome/content/rules/Cox-Digital-Solutions-problematic.xml b/src/chrome/content/rules/Cox-Digital-Solutions-problematic.xml
index 38790757a640..78fed6f6e165 100644
--- a/src/chrome/content/rules/Cox-Digital-Solutions-problematic.xml
+++ b/src/chrome/content/rules/Cox-Digital-Solutions-problematic.xml
@@ -12,4 +12,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Cox-Digital-Solutions.xml b/src/chrome/content/rules/Cox-Digital-Solutions.xml
index 032690fb4da0..a014fe57e066 100644
--- a/src/chrome/content/rules/Cox-Digital-Solutions.xml
+++ b/src/chrome/content/rules/Cox-Digital-Solutions.xml
@@ -8,12 +8,14 @@ Fetch error: http://coxds.com/ => https://www.coxdigitalsolutions.com/: (28, 'Co
 	For problematic rules, see Cox-Digital-Solutions-problematic.xml.
 
 -->
-
+
 
 	
 	
 	
-	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Cox_Communications.xml b/src/chrome/content/rules/Cox_Communications.xml
index d0fb5d2681a9..1d6ad4d9716d 100644
--- a/src/chrome/content/rules/Cox_Communications.xml
+++ b/src/chrome/content/rules/Cox_Communications.xml
@@ -45,11 +45,19 @@ Fetch error: http://cox.com/ => https://ww2.cox.com/: Cycle detected - URL alrea
 
 
 	
-	
+	
+	
+	
+	
+	
+	
 		
-	
+	
+	
 	
-	
+	
+	
+	
 
 
 	
@@ -61,16 +69,11 @@ Fetch error: http://cox.com/ => https://ww2.cox.com/: Cycle detected - URL alrea
 	
 
-	
 
-	
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Cp.fonality.com.xml b/src/chrome/content/rules/Cp.fonality.com.xml
index 828b28c1ebd8..e135a97e096e 100644
--- a/src/chrome/content/rules/Cp.fonality.com.xml
+++ b/src/chrome/content/rules/Cp.fonality.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.cp.fonality.com/ => https://www.cp.fonality.com/: (6, 'Could not resolve host: www.cp.fonality.com')
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Cpunks.org.xml b/src/chrome/content/rules/Cpunks.org.xml
index 72dd702db7d6..02a4e894d596 100644
--- a/src/chrome/content/rules/Cpunks.org.xml
+++ b/src/chrome/content/rules/Cpunks.org.xml
@@ -1,17 +1,9 @@
-
-
-
-
+
 	
 	
+	
 
+	
 
-	
-
+	
 
diff --git a/src/chrome/content/rules/CrackSAT.net.xml b/src/chrome/content/rules/CrackSAT.net.xml
new file mode 100644
index 000000000000..50d36cc8ef1e
--- /dev/null
+++ b/src/chrome/content/rules/CrackSAT.net.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Cracked.com.xml b/src/chrome/content/rules/Cracked.com.xml
new file mode 100644
index 000000000000..2ebdacd550b5
--- /dev/null
+++ b/src/chrome/content/rules/Cracked.com.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/CrackedCDN.com.xml b/src/chrome/content/rules/CrackedCDN.com.xml
new file mode 100644
index 000000000000..b7913e776ce1
--- /dev/null
+++ b/src/chrome/content/rules/CrackedCDN.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+		
+		
+
+	
+
diff --git a/src/chrome/content/rules/Crackedconsole.com.xml b/src/chrome/content/rules/Crackedconsole.com.xml
index 8a0411cb2e27..4de954c67175 100644
--- a/src/chrome/content/rules/Crackedconsole.com.xml
+++ b/src/chrome/content/rules/Crackedconsole.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://crackedconsole.com/ => https://crackedconsole.com/: (60, 'SS
 Fetch error: http://www.crackedconsole.com/ => https://www.crackedconsole.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.crackedconsole.com/ => https://www.crackedconsole.com/:
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CraftBanter.xml b/src/chrome/content/rules/CraftBanter.xml
index d8d85b788500..846aa9626fda 100644
--- a/src/chrome/content/rules/CraftBanter.xml
+++ b/src/chrome/content/rules/CraftBanter.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/CraftStats.com.xml b/src/chrome/content/rules/CraftStats.com.xml
index 6c3b5ae52825..44c21a2262da 100644
--- a/src/chrome/content/rules/CraftStats.com.xml
+++ b/src/chrome/content/rules/CraftStats.com.xml
@@ -11,10 +11,10 @@ Fetch error: http://craftstats.com/ => https://www.craftstats.com/: (7, 'Failed
 
 
 -->
-
+
 
 	
-	
+	
 
 
 	
@@ -23,4 +23,4 @@ Fetch error: http://craftstats.com/ => https://www.craftstats.com/: (7, 'Failed
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Crain-Communications.xml b/src/chrome/content/rules/Crain-Communications.xml
index 0d924bad02e8..55f66a96b91d 100644
--- a/src/chrome/content/rules/Crain-Communications.xml
+++ b/src/chrome/content/rules/Crain-Communications.xml
@@ -25,14 +25,17 @@ Fetch error: http://www.creativity-online.com/ => https://creativity-online.com/
 		- (www.)idea2009.org		(ssl_error_rx_record_too_long)
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
 	
 	
 	
-	
+	
 	
 	
 
diff --git a/src/chrome/content/rules/Crakpass.xml b/src/chrome/content/rules/Crakpass.xml
index 02ef30027663..958b5129acae 100644
--- a/src/chrome/content/rules/Crakpass.xml
+++ b/src/chrome/content/rules/Crakpass.xml
@@ -25,4 +25,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Craphound.xml b/src/chrome/content/rules/Craphound.xml
deleted file mode 100644
index 92af06fbf763..000000000000
--- a/src/chrome/content/rules/Craphound.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Crash-Space.xml b/src/chrome/content/rules/Crash-Space.xml
index 9ab9d62bf51c..a6e66bb4a73f 100644
--- a/src/chrome/content/rules/Crash-Space.xml
+++ b/src/chrome/content/rules/Crash-Space.xml
@@ -1,7 +1,8 @@
 
 
 	
-	
+	
+	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Creare.co.uk.xml b/src/chrome/content/rules/Creare.co.uk.xml
index b630f8e44d1c..f5407b6d6f09 100644
--- a/src/chrome/content/rules/Creare.co.uk.xml
+++ b/src/chrome/content/rules/Creare.co.uk.xml
@@ -23,7 +23,7 @@ Fetch error: http://creare.co.uk/ => https://creare.co.uk/: (60, 'SSL certificat
 		- .creare.co.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Creatavist.com.xml b/src/chrome/content/rules/Creatavist.com.xml
deleted file mode 100644
index 815962bce5f7..000000000000
--- a/src/chrome/content/rules/Creatavist.com.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/CreateSpace.xml b/src/chrome/content/rules/CreateSpace.xml
index d6b7d2aa0cf2..89cdc64eb1b7 100644
--- a/src/chrome/content/rules/CreateSpace.xml
+++ b/src/chrome/content/rules/CreateSpace.xml
@@ -18,7 +18,7 @@ Fetch error: http://createspace.com/ => https://createspace.com/: (7, 'Failed to
 		- www.createspace.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Creative-serving.com.xml b/src/chrome/content/rules/Creative-serving.com.xml
index b402af3c3b88..997c6d9a2b6a 100644
--- a/src/chrome/content/rules/Creative-serving.com.xml
+++ b/src/chrome/content/rules/Creative-serving.com.xml
@@ -14,4 +14,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CreativeCow.net.xml b/src/chrome/content/rules/CreativeCow.net.xml
index 17095c016a15..c056ce060912 100644
--- a/src/chrome/content/rules/CreativeCow.net.xml
+++ b/src/chrome/content/rules/CreativeCow.net.xml
@@ -5,21 +5,21 @@ Fetch error: http://creativecow.net/ => https://creativecow.net/: (51, "SSL: no
 Fetch error: http://creativecow.com/ => https://creativecow.com/: (51, "SSL: no alternative certificate subject name matches target host name 'creativecow.com'")
 
 -->
-
+
     
     
     
     
-    
+
     
     
     
     
     
     
-    
+
     
-    
+
     
 
diff --git a/src/chrome/content/rules/CreativePartnershipsAustralia.xml b/src/chrome/content/rules/CreativePartnershipsAustralia.xml
index b4403c8e036a..7c985e23c598 100644
--- a/src/chrome/content/rules/CreativePartnershipsAustralia.xml
+++ b/src/chrome/content/rules/CreativePartnershipsAustralia.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CreativeSyndicator.xml b/src/chrome/content/rules/CreativeSyndicator.xml
index c3f15c3c1035..25be73da5fbc 100644
--- a/src/chrome/content/rules/CreativeSyndicator.xml
+++ b/src/chrome/content/rules/CreativeSyndicator.xml
@@ -6,7 +6,7 @@ Fetch error: http://ads-creativesyndicator.com/ => https://ads-creativesyndicato
 Disabled by https-everywhere-checker because:
 Fetch error: http://ads-creativesyndicator.com/ => https://ads-creativesyndicator.com/: (28, 'Connection timed out after 10000 milliseconds')
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://ads-creativesyndicator.com/ => https://ads-creativesyndicato
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Creative_Little_Readers.com-falsemixed.xml b/src/chrome/content/rules/Creative_Little_Readers.com-falsemixed.xml
deleted file mode 100644
index 93ada7c9c0fd..000000000000
--- a/src/chrome/content/rules/Creative_Little_Readers.com-falsemixed.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Creative_Little_Readers.com.xml b/src/chrome/content/rules/Creative_Little_Readers.com.xml
deleted file mode 100644
index cc955a4b305e..000000000000
--- a/src/chrome/content/rules/Creative_Little_Readers.com.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-        
-	
-	
-		
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/CredAbility.com.xml b/src/chrome/content/rules/CredAbility.com.xml
index b818af41c945..c125c81f846f 100644
--- a/src/chrome/content/rules/CredAbility.com.xml
+++ b/src/chrome/content/rules/CredAbility.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://intake.credability.org/ => https://intake.credability.org/: Too many redirects while fetching 'https://intake.credability.org/'
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/CreditDisputeProgram.com.xml b/src/chrome/content/rules/CreditDisputeProgram.com.xml
deleted file mode 100644
index 1d185374ece5..000000000000
--- a/src/chrome/content/rules/CreditDisputeProgram.com.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Credit_Repair_Trust.com.xml b/src/chrome/content/rules/Credit_Repair_Trust.com.xml
deleted file mode 100644
index 9a48ac0f7042..000000000000
--- a/src/chrome/content/rules/Credit_Repair_Trust.com.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Credit_Report_Nation.xml b/src/chrome/content/rules/Credit_Report_Nation.xml
index 32e9bd54c9e3..75cf36ec1489 100644
--- a/src/chrome/content/rules/Credit_Report_Nation.xml
+++ b/src/chrome/content/rules/Credit_Report_Nation.xml
@@ -5,15 +5,15 @@ Fetch error: http://creditreportnation.com/ => https://creditreportnation.com/:
 Fetch error: http://www.creditreportnation.com/ => https://www.creditreportnation.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 
 	
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Crikey.xml b/src/chrome/content/rules/Crikey.xml
index f67384ce542f..15e366496bc3 100644
--- a/src/chrome/content/rules/Crikey.xml
+++ b/src/chrome/content/rules/Crikey.xml
@@ -14,7 +14,7 @@ Fetch error: http://crikey.com.au/ => https://crikey.com.au/: Too many redirects
 		- offers	(works; mismatched, CN: *.unbounce.com)
 
 -->
-
+
 
 	
 	
@@ -26,4 +26,4 @@ Fetch error: http://crikey.com.au/ => https://crikey.com.au/: Too many redirects
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Crimtan.xml b/src/chrome/content/rules/Crimtan.xml
deleted file mode 100644
index 36d766b24bb8..000000000000
--- a/src/chrome/content/rules/Crimtan.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Criosweb.xml b/src/chrome/content/rules/Criosweb.xml
index 8a5e054f7531..0075045da21e 100644
--- a/src/chrome/content/rules/Criosweb.xml
+++ b/src/chrome/content/rules/Criosweb.xml
@@ -6,7 +6,6 @@
 
 	
-		
 
 	
@@ -30,7 +29,6 @@
 
 	
-		
 		
 		
 		
@@ -42,7 +40,5 @@
 	
 
 	
-		
-		
 
 
diff --git a/src/chrome/content/rules/Crisco.com.xml b/src/chrome/content/rules/Crisco.com.xml
new file mode 100644
index 000000000000..9df7f5ca6a35
--- /dev/null
+++ b/src/chrome/content/rules/Crisco.com.xml
@@ -0,0 +1,29 @@
+
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Crisis.org.uk.xml b/src/chrome/content/rules/Crisis.org.uk.xml
deleted file mode 100644
index ee8fd890c87f..000000000000
--- a/src/chrome/content/rules/Crisis.org.uk.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Criteo.com.xml b/src/chrome/content/rules/Criteo.com.xml
index 71266138d95d..5c54f8dc1530 100644
--- a/src/chrome/content/rules/Criteo.com.xml
+++ b/src/chrome/content/rules/Criteo.com.xml
@@ -1,7 +1,4 @@
 
 
 
-
+	
 	
 	
-
 	
 	
 	
+	
+	
 	
 	
 	
 	
 	
+	
 	
 	
 	
 	
+	
 	
 	
 	
 	
 	
 	
-	
 	
 	
+	
 	
 	
-	
 	
+	
 	
 	
 	
@@ -127,14 +109,17 @@
 	
 	
 	
+	
 	
 	
 	
 	
 	
+	
 	
 	
 	
+	
 	
 	
 	
@@ -144,6 +129,8 @@
 	
 	
 	
+	
+	
 	
 	
 	
@@ -156,8 +143,14 @@
 	
 	
 	
+	
+	
+	
+	
+	
 	
 	
+	
 	
 	
 	
@@ -165,18 +158,28 @@
 	
 	
 	
+	
+	
+	
 	
 
+	
+	
+	
+	
 	
 	
-	
-	
+	
 	
-	
+	
+	
+	
+	
+	
 	
 
+
 	
 
 	
-
 
diff --git a/src/chrome/content/rules/Critical-Mass.xml b/src/chrome/content/rules/Critical-Mass.xml
deleted file mode 100644
index 9a17092eddb8..000000000000
--- a/src/chrome/content/rules/Critical-Mass.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Crittercism.com.xml b/src/chrome/content/rules/Crittercism.com.xml
index cc8508d98aea..3e5e01cf08ea 100644
--- a/src/chrome/content/rules/Crittercism.com.xml
+++ b/src/chrome/content/rules/Crittercism.com.xml
@@ -6,13 +6,13 @@
 -->
 
 
-	
+	
+	
 
 
 	
 
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Criu.org.xml b/src/chrome/content/rules/Criu.org.xml
new file mode 100644
index 000000000000..e3f969590fbf
--- /dev/null
+++ b/src/chrome/content/rules/Criu.org.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Crocs.xml b/src/chrome/content/rules/Crocs.xml
index 63c29a48a602..155fa4fa14f0 100644
--- a/src/chrome/content/rules/Crocs.xml
+++ b/src/chrome/content/rules/Crocs.xml
@@ -31,7 +31,7 @@ Fetch error: http://espanol.crocs.com/ => https://espanol.crocs.com/: (51, "SSL:
 		- images
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/CrooksAndLiars.com.xml b/src/chrome/content/rules/CrooksAndLiars.com.xml
new file mode 100644
index 000000000000..33f941f55ba4
--- /dev/null
+++ b/src/chrome/content/rules/CrooksAndLiars.com.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+	
+	
+		
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Cross-Pixel-Media-problematic.xml b/src/chrome/content/rules/Cross-Pixel-Media-problematic.xml
index 5f7183674140..4a90f91e86c9 100644
--- a/src/chrome/content/rules/Cross-Pixel-Media-problematic.xml
+++ b/src/chrome/content/rules/Cross-Pixel-Media-problematic.xml
@@ -12,4 +12,4 @@
 						-->
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Cross-Pixel-Media.xml b/src/chrome/content/rules/Cross-Pixel-Media.xml
index b7f7402562b8..2453593ce460 100644
--- a/src/chrome/content/rules/Cross-Pixel-Media.xml
+++ b/src/chrome/content/rules/Cross-Pixel-Media.xml
@@ -21,7 +21,8 @@
 
 
 
-	
+	
+	
 
 
 	
@@ -32,7 +33,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/CrossRef.org.xml b/src/chrome/content/rules/CrossRef.org.xml
index 93d09ac3f4ce..a703b2873be0 100644
--- a/src/chrome/content/rules/CrossRef.org.xml
+++ b/src/chrome/content/rules/CrossRef.org.xml
@@ -66,16 +66,16 @@
 	
 	
 	
-	
+
 	
-	
+
 	
-	
+
 	
-	
+
 		
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Crossrider.xml b/src/chrome/content/rules/Crossrider.xml
index 6dc056be8981..d1d6b00a616f 100644
--- a/src/chrome/content/rules/Crossrider.xml
+++ b/src/chrome/content/rules/Crossrider.xml
@@ -13,10 +13,10 @@ Fetch error: http://crossrider.com/ => https://crossrider.com/: (7, 'Failed to c
 		- www	(400)
 
 -->
-
+
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Crowd-Factory.xml b/src/chrome/content/rules/Crowd-Factory.xml
index 86f7fee83709..c9584c83c2fe 100644
--- a/src/chrome/content/rules/Crowd-Factory.xml
+++ b/src/chrome/content/rules/Crowd-Factory.xml
@@ -20,10 +20,12 @@ Fetch error: http://www.socialcampaign.com/ => https://www.socialcampaign.com/:
 	pages.crowdfactory.com cert: *.marketo.com
 
 -->
-
+
 
 	
-	
+	
+	
+	
 	
 	
 
@@ -36,10 +38,7 @@ Fetch error: http://www.socialcampaign.com/ => https://www.socialcampaign.com/:
 	
 
-	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Crowd-Science.xml b/src/chrome/content/rules/Crowd-Science.xml
index 9f3a338333ae..86199be276d0 100644
--- a/src/chrome/content/rules/Crowd-Science.xml
+++ b/src/chrome/content/rules/Crowd-Science.xml
@@ -40,7 +40,11 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
 		
 
 
diff --git a/src/chrome/content/rules/CrowdCulture.se.xml b/src/chrome/content/rules/CrowdCulture.se.xml
index 80830f128b89..3aca904d1b2e 100644
--- a/src/chrome/content/rules/CrowdCulture.se.xml
+++ b/src/chrome/content/rules/CrowdCulture.se.xml
@@ -19,4 +19,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/CrowdJustice.com.xml b/src/chrome/content/rules/CrowdJustice.com.xml
new file mode 100644
index 000000000000..34bf1d0e429c
--- /dev/null
+++ b/src/chrome/content/rules/CrowdJustice.com.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+	
+		
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/CrowdTangle.xml b/src/chrome/content/rules/CrowdTangle.xml
index 97235e286d4f..1dbbaa459f9f 100644
--- a/src/chrome/content/rules/CrowdTangle.xml
+++ b/src/chrome/content/rules/CrowdTangle.xml
@@ -1,19 +1,18 @@
 
-
 
+
 	
-	
-
-
-	
+	
+	
+	
+	
+	
 
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/Crowdin.com.xml b/src/chrome/content/rules/Crowdin.com.xml
index 433ffe8c7ece..2c6331bdb014 100644
--- a/src/chrome/content/rules/Crowdin.com.xml
+++ b/src/chrome/content/rules/Crowdin.com.xml
@@ -1,20 +1,35 @@
 
 
 	
 	
+	
+		
 	
 	
+	
+		
 	
+	
 
 	
+	
 	
 	
 	
 	
 	
+	
 	
 	
 	
@@ -23,7 +38,10 @@
 	
 	
 
+	
+	
+
 	
 
-	
+	
 
diff --git a/src/chrome/content/rules/Crowdin.net.xml b/src/chrome/content/rules/Crowdin.net.xml
deleted file mode 100644
index 4fac32923216..000000000000
--- a/src/chrome/content/rules/Crowdin.net.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Cru.fr.xml b/src/chrome/content/rules/Cru.fr.xml
index 6e6f75e53e4c..d1d7166c1e52 100644
--- a/src/chrome/content/rules/Cru.fr.xml
+++ b/src/chrome/content/rules/Cru.fr.xml
@@ -15,7 +15,7 @@ Non-2xx HTTP code: http://git.cru.fr/ (200) => https://git.renater.fr/ (403)
 	^cru.fr does not exist
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Cru.org.xml b/src/chrome/content/rules/Cru.org.xml
index 3645dbfe2f42..1a4c190f50ba 100644
--- a/src/chrome/content/rules/Cru.org.xml
+++ b/src/chrome/content/rules/Cru.org.xml
@@ -12,17 +12,12 @@ Fetch error: http://cru.org/ => https://cru.org/: (51, "SSL: no alternative cert
 
 	
 	
-
+		
+		
+		
 
 	
 
-
-	
-
-	
-	
-
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Crucial.xml b/src/chrome/content/rules/Crucial.xml
index 56449b0e586d..9f6a114cbc44 100644
--- a/src/chrome/content/rules/Crucial.xml
+++ b/src/chrome/content/rules/Crucial.xml
@@ -35,7 +35,7 @@
 		- (www.)?crucial.fr some pages redirect to http
 		- (www.)?crucial.jp some pages redirect to http
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/CruisersForum.com.xml b/src/chrome/content/rules/CruisersForum.com.xml
index c06cb63895a1..892278a34ee9 100644
--- a/src/chrome/content/rules/CruisersForum.com.xml
+++ b/src/chrome/content/rules/CruisersForum.com.xml
@@ -21,7 +21,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -30,4 +31,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Crunchyroll.com.xml b/src/chrome/content/rules/Crunchyroll.com.xml
new file mode 100644
index 000000000000..38b477f3a9fb
--- /dev/null
+++ b/src/chrome/content/rules/Crunchyroll.com.xml
@@ -0,0 +1,48 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Crux.nu.xml b/src/chrome/content/rules/Crux.nu.xml
index b76d22fb1102..027824f5cc1a 100644
--- a/src/chrome/content/rules/Crux.nu.xml
+++ b/src/chrome/content/rules/Crux.nu.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.crux.nu/ => https://www.crux.nu/: (60, 'SSL certificate
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Cryptalloy.de-problematic.xml b/src/chrome/content/rules/Cryptalloy.de-problematic.xml
index 6f2c1d25a965..a7a80b270fbc 100644
--- a/src/chrome/content/rules/Cryptalloy.de-problematic.xml
+++ b/src/chrome/content/rules/Cryptalloy.de-problematic.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Cryptalloy.de.xml b/src/chrome/content/rules/Cryptalloy.de.xml
index cf60fa012d7f..21591cd1cd96 100644
--- a/src/chrome/content/rules/Cryptalloy.de.xml
+++ b/src/chrome/content/rules/Cryptalloy.de.xml
@@ -22,4 +22,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Cryptanalysis.xml b/src/chrome/content/rules/Cryptanalysis.xml
index 1177758e9c8c..e0e4777e18ec 100644
--- a/src/chrome/content/rules/Cryptanalysis.xml
+++ b/src/chrome/content/rules/Cryptanalysis.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.cryptanalysis.eu/ => https://www.cryptanalysis.eu/: (51, "SSL: no alternative certificate subject name matches target host name 'www.cryptanalysis.eu'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Cryptbin.com.xml b/src/chrome/content/rules/Cryptbin.com.xml
index bd023bea5860..61c5ff600219 100644
--- a/src/chrome/content/rules/Cryptbin.com.xml
+++ b/src/chrome/content/rules/Cryptbin.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.cryptbin.com/ => https://www.cryptbin.com/: (60, 'SSL ce
 		- cryptbin.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/CryptedMemo.com.xml b/src/chrome/content/rules/CryptedMemo.com.xml
index a2b4ad845808..b7e4c0d31f1b 100644
--- a/src/chrome/content/rules/CryptedMemo.com.xml
+++ b/src/chrome/content/rules/CryptedMemo.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://cryptedmemo.com/ => https://cryptedmemo.com/: (60, 'SSL cert
 	www doesn't exist.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Crypteia_Networks.com.xml b/src/chrome/content/rules/Crypteia_Networks.com.xml
deleted file mode 100644
index 90be5383ae9c..000000000000
--- a/src/chrome/content/rules/Crypteia_Networks.com.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Crypto.cat.xml b/src/chrome/content/rules/Crypto.cat.xml
index 1d2a646cf1b0..b7b1c1db213c 100644
--- a/src/chrome/content/rules/Crypto.cat.xml
+++ b/src/chrome/content/rules/Crypto.cat.xml
@@ -4,7 +4,6 @@
 		- lists
 -->
 
-	
 	
 
 	
diff --git a/src/chrome/content/rules/CryptoLUX.org.xml b/src/chrome/content/rules/CryptoLUX.org.xml
index 1bb18aaf5a78..63d55fb230d0 100644
--- a/src/chrome/content/rules/CryptoLUX.org.xml
+++ b/src/chrome/content/rules/CryptoLUX.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://cryptolux.org/ => https://cryptolux.org/: (51, "SSL: no alternative certificate subject name matches target host name 'cryptolux.org'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/CryptoNetwork.com.xml b/src/chrome/content/rules/CryptoNetwork.com.xml
index 2233c48a0e04..5857ee96aa1a 100644
--- a/src/chrome/content/rules/CryptoNetwork.com.xml
+++ b/src/chrome/content/rules/CryptoNetwork.com.xml
@@ -3,7 +3,7 @@
 	www.cryptonetwork.com: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/CryptoSeal.com.xml b/src/chrome/content/rules/CryptoSeal.com.xml
index 380702d9eb30..d517761b5203 100644
--- a/src/chrome/content/rules/CryptoSeal.com.xml
+++ b/src/chrome/content/rules/CryptoSeal.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.cryptoseal.com/ => https://www.cryptoseal.com/: (28, 'Op
 		- connect
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/CryptoVPN.com.xml b/src/chrome/content/rules/CryptoVPN.com.xml
deleted file mode 100644
index 0051e279e6fe..000000000000
--- a/src/chrome/content/rules/CryptoVPN.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Crypto_Design.org.xml b/src/chrome/content/rules/Crypto_Design.org.xml
deleted file mode 100644
index bb6213e672f8..000000000000
--- a/src/chrome/content/rules/Crypto_Design.org.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Crypto_Santa.xyz.xml b/src/chrome/content/rules/Crypto_Santa.xyz.xml
index 9d5b5c9071d6..b6811d8eb709 100644
--- a/src/chrome/content/rules/Crypto_Santa.xyz.xml
+++ b/src/chrome/content/rules/Crypto_Santa.xyz.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.cryptosanta.xyz/ => https://www.cryptosanta.xyz/: (28, '
 		- .cryptosanta.xyz
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Cryptohaze.xml b/src/chrome/content/rules/Cryptohaze.xml
index d91ee3975242..72a6105fdfd0 100644
--- a/src/chrome/content/rules/Cryptohaze.xml
+++ b/src/chrome/content/rules/Cryptohaze.xml
@@ -18,7 +18,7 @@
 	
 
 
-	
+	
 
 
 	
-
-
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Cryptome.xml b/src/chrome/content/rules/Cryptome.xml
index 68f4c9bb80a3..152773c65eed 100644
--- a/src/chrome/content/rules/Cryptome.xml
+++ b/src/chrome/content/rules/Cryptome.xml
@@ -1,20 +1,13 @@
-
 
-
-
-  
-  
-
-  
-  
-
-  
+
+	
+	
 
-  
+	
 
+	
 
diff --git a/src/chrome/content/rules/Cryptonit.net.xml b/src/chrome/content/rules/Cryptonit.net.xml
deleted file mode 100644
index 1624d1f1a04a..000000000000
--- a/src/chrome/content/rules/Cryptonit.net.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Cryptopals.com.xml b/src/chrome/content/rules/Cryptopals.com.xml
index a697b37f5408..cd5fab544219 100644
--- a/src/chrome/content/rules/Cryptopals.com.xml
+++ b/src/chrome/content/rules/Cryptopals.com.xml
@@ -7,9 +7,9 @@
 	
 	
 
-	
 
-	
 
diff --git a/src/chrome/content/rules/Cryptoparty.xml b/src/chrome/content/rules/Cryptoparty.xml
index 93e6f1487c87..8ce9445a48d1 100644
--- a/src/chrome/content/rules/Cryptoparty.xml
+++ b/src/chrome/content/rules/Cryptoparty.xml
@@ -1,25 +1,16 @@
+
+
 
 
 	
 	
 	
-	
-
-	
-	
-
 
 	
-	
-
-
-	
-	
 
 	
diff --git a/src/chrome/content/rules/Cryptostocks.com.xml b/src/chrome/content/rules/Cryptostocks.com.xml
index 184a4628b1c5..3fde9b68cd40 100644
--- a/src/chrome/content/rules/Cryptostocks.com.xml
+++ b/src/chrome/content/rules/Cryptostocks.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.cryptostocks.com/ => https://www.cryptostocks.com/: Too
 		- .cryptostocks.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Cryptsy.com.xml b/src/chrome/content/rules/Cryptsy.com.xml
index aa85c25b8c82..280601381ca6 100644
--- a/src/chrome/content/rules/Cryptsy.com.xml
+++ b/src/chrome/content/rules/Cryptsy.com.xml
@@ -17,7 +17,7 @@ Fetch error: http://www.cryptsy.com/ => https://www.cryptsy.com/: (28, 'Connecti
 		- www.cryptsy.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Crystal_Delights.com.xml b/src/chrome/content/rules/Crystal_Delights.com.xml
index 8512c0451d33..fd5d02bcfd20 100644
--- a/src/chrome/content/rules/Crystal_Delights.com.xml
+++ b/src/chrome/content/rules/Crystal_Delights.com.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Crystal_Singing_Bowls.xml b/src/chrome/content/rules/Crystal_Singing_Bowls.xml
index 32597b4fc964..e41c2054da38 100644
--- a/src/chrome/content/rules/Crystal_Singing_Bowls.xml
+++ b/src/chrome/content/rules/Crystal_Singing_Bowls.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Crytography.com.xml b/src/chrome/content/rules/Crytography.com.xml
index f09f00ad2dfe..874c37f5fd34 100644
--- a/src/chrome/content/rules/Crytography.com.xml
+++ b/src/chrome/content/rules/Crytography.com.xml
@@ -18,7 +18,7 @@ Fetch error: http://www.cryptography.com/ => https://www.cryptography.com/: (28,
 	*  Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Csair.com.xml b/src/chrome/content/rules/Csair.com.xml
new file mode 100644
index 000000000000..b3171c688c8f
--- /dev/null
+++ b/src/chrome/content/rules/Csair.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Csob.sk.xml b/src/chrome/content/rules/Csob.sk.xml
index 5933a465d919..3996bd3c2219 100644
--- a/src/chrome/content/rules/Csob.sk.xml
+++ b/src/chrome/content/rules/Csob.sk.xml
@@ -1,26 +1,8 @@
-
-
-
+
   
   
   
   
-  
-
-  
-
-  
-  
 
-  
+  
 
diff --git a/src/chrome/content/rules/CspBuilder.info.xml b/src/chrome/content/rules/CspBuilder.info.xml
index d3b1d348c5b6..ee613c2529fb 100644
--- a/src/chrome/content/rules/CspBuilder.info.xml
+++ b/src/chrome/content/rules/CspBuilder.info.xml
@@ -5,7 +5,7 @@ Fetch error: http://cspbuilder.info/ => https://cspbuilder.info/: (28, 'Connecti
 Fetch error: http://www.cspbuilder.info/ => https://www.cspbuilder.info/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Css3test.com.xml b/src/chrome/content/rules/Css3test.com.xml
new file mode 100644
index 000000000000..3472ce8341ff
--- /dev/null
+++ b/src/chrome/content/rules/Css3test.com.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Cstatic-images.com.xml b/src/chrome/content/rules/Cstatic-images.com.xml
deleted file mode 100644
index e1cf5b851c12..000000000000
--- a/src/chrome/content/rules/Cstatic-images.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Cstatic.net.xml b/src/chrome/content/rules/Cstatic.net.xml
index 9984ad2234f4..f61cdc841718 100644
--- a/src/chrome/content/rules/Cstatic.net.xml
+++ b/src/chrome/content/rules/Cstatic.net.xml
@@ -14,7 +14,7 @@ Fetch error: http://cdn.cstatic.net/ => https://dzbb4sjawljdv.cloudfront.net/: (
 	^cstatic.net: Refused
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Ctrl_Alt_Del.xml b/src/chrome/content/rules/Ctrl_Alt_Del.xml
deleted file mode 100644
index 68e013ba51ba..000000000000
--- a/src/chrome/content/rules/Ctrl_Alt_Del.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-		
-		
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/CtsCDN.com.xml b/src/chrome/content/rules/CtsCDN.com.xml
deleted file mode 100644
index 8357ed84c2e6..000000000000
--- a/src/chrome/content/rules/CtsCDN.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Ctt.org.xml b/src/chrome/content/rules/Ctt.org.xml
index 52adc770f322..89393130dfe6 100644
--- a/src/chrome/content/rules/Ctt.org.xml
+++ b/src/chrome/content/rules/Ctt.org.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.ctt.org/ => https://www.ctt.org/: (28, 'Connection timed
 	^: cert only matches www
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Cubana.cu.xml b/src/chrome/content/rules/Cubana.cu.xml
new file mode 100644
index 000000000000..5cebbf51cbb1
--- /dev/null
+++ b/src/chrome/content/rules/Cubana.cu.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Cubics.xml b/src/chrome/content/rules/Cubics.xml
index c923f6b41a52..5044ab06307c 100644
--- a/src/chrome/content/rules/Cubics.xml
+++ b/src/chrome/content/rules/Cubics.xml
@@ -15,23 +15,21 @@ Fetch error: http://cubics.com/ => https://cubplat.bidsystem.com/signup/: (60, '
 		- (www.)cubics.com	(mismatched, CN: *.bidsystem.com)
 
 -->
-
+
 
 	
 	
-	
+	
+	
 
 
 	
 
 
-	
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Cubify.com.xml b/src/chrome/content/rules/Cubify.com.xml
new file mode 100644
index 000000000000..952df83d0b54
--- /dev/null
+++ b/src/chrome/content/rules/Cubify.com.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Cubify.xml b/src/chrome/content/rules/Cubify.xml
deleted file mode 100644
index db1aa1689ee3..000000000000
--- a/src/chrome/content/rules/Cubify.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Cucumber.io.xml b/src/chrome/content/rules/Cucumber.io.xml
new file mode 100644
index 000000000000..15b54cd1697a
--- /dev/null
+++ b/src/chrome/content/rules/Cucumber.io.xml
@@ -0,0 +1,26 @@
+
+
+
+
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/CufonFonts.com.xml b/src/chrome/content/rules/CufonFonts.com.xml
new file mode 100644
index 000000000000..cde81b75d3bc
--- /dev/null
+++ b/src/chrome/content/rules/CufonFonts.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Cupid.xml b/src/chrome/content/rules/Cupid.xml
index a1cddc987503..a327bf1bf968 100644
--- a/src/chrome/content/rules/Cupid.xml
+++ b/src/chrome/content/rules/Cupid.xml
@@ -44,7 +44,9 @@
 
 
 	
-	
+	
+	
+	
 		
diff --git a/src/chrome/content/rules/Cupid_plc.com.xml b/src/chrome/content/rules/Cupid_plc.com.xml
deleted file mode 100644
index 1a94641e7a7f..000000000000
--- a/src/chrome/content/rules/Cupid_plc.com.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Cupid_plc_CDN.xml b/src/chrome/content/rules/Cupid_plc_CDN.xml
index e4487a56f20e..38b52d041c5a 100644
--- a/src/chrome/content/rules/Cupid_plc_CDN.xml
+++ b/src/chrome/content/rules/Cupid_plc_CDN.xml
@@ -44,7 +44,7 @@ Fetch error: http://cdn.statimgs2.com/ => https://cdn.static2img.com/: (51, "SSL
 	Used on multiple Cupid plc sites.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Curbed.cc.xml b/src/chrome/content/rules/Curbed.cc.xml
index 217f308c24e1..810d03e51da7 100644
--- a/src/chrome/content/rules/Curbed.cc.xml
+++ b/src/chrome/content/rules/Curbed.cc.xml
@@ -6,7 +6,7 @@ Fetch error: http://f.curbed.cc/ => https://f.curbed.cc/: (28, 'Connection timed
 	For other Vox Media coverage, see Vox.com.xml.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/CureSec.com.xml b/src/chrome/content/rules/CureSec.com.xml
index da907ee11830..37a5087f4bd1 100644
--- a/src/chrome/content/rules/CureSec.com.xml
+++ b/src/chrome/content/rules/CureSec.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://curesec.com/ => https://curesec.com/: (60, 'SSL certificate
 	* Mismatched
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/CurrencyFair.com.xml b/src/chrome/content/rules/CurrencyFair.com.xml
new file mode 100644
index 000000000000..95f3c44d5c43
--- /dev/null
+++ b/src/chrome/content/rules/CurrencyFair.com.xml
@@ -0,0 +1,36 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Currys.co.uk.xml b/src/chrome/content/rules/Currys.co.uk.xml
deleted file mode 100644
index 5f73f97cbc93..000000000000
--- a/src/chrome/content/rules/Currys.co.uk.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Curso_de_Italiano.xml b/src/chrome/content/rules/Curso_de_Italiano.xml
index ad87f1b1a2b8..b7fa155fa451 100644
--- a/src/chrome/content/rules/Curso_de_Italiano.xml
+++ b/src/chrome/content/rules/Curso_de_Italiano.xml
@@ -1,7 +1,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/CustomWheelConnection.com.xml b/src/chrome/content/rules/CustomWheelConnection.com.xml
index 4ab02f73e63d..d7b4f0c64a52 100644
--- a/src/chrome/content/rules/CustomWheelConnection.com.xml
+++ b/src/chrome/content/rules/CustomWheelConnection.com.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Customer-Lobby.xml b/src/chrome/content/rules/Customer-Lobby.xml
index 707202c2b98f..bf01e6494e94 100644
--- a/src/chrome/content/rules/Customer-Lobby.xml
+++ b/src/chrome/content/rules/Customer-Lobby.xml
@@ -6,9 +6,9 @@
 	
 	
 	
-	
 
-	
+
+	
 
 	
 
diff --git a/src/chrome/content/rules/Customer.io.xml b/src/chrome/content/rules/Customer.io.xml
index f77e44604aaf..7f4b3bb5359b 100644
--- a/src/chrome/content/rules/Customer.io.xml
+++ b/src/chrome/content/rules/Customer.io.xml
@@ -13,4 +13,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Customersaas.com.xml b/src/chrome/content/rules/Customersaas.com.xml
index 44b80e8d0496..b8bb88286fb4 100644
--- a/src/chrome/content/rules/Customersaas.com.xml
+++ b/src/chrome/content/rules/Customersaas.com.xml
@@ -14,13 +14,10 @@
 -->
 
 
-	
+	
+	
 
 
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Customersvc.com.xml b/src/chrome/content/rules/Customersvc.com.xml
deleted file mode 100644
index c90fb59771e4..000000000000
--- a/src/chrome/content/rules/Customersvc.com.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Custy.com.xml b/src/chrome/content/rules/Custy.com.xml
new file mode 100644
index 000000000000..918d7d4e7b32
--- /dev/null
+++ b/src/chrome/content/rules/Custy.com.xml
@@ -0,0 +1,13 @@
+
+
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/CuteDigi.xml b/src/chrome/content/rules/CuteDigi.xml
index 207c0d04f4c2..3d5c5f2de77a 100644
--- a/src/chrome/content/rules/CuteDigi.xml
+++ b/src/chrome/content/rules/CuteDigi.xml
@@ -5,7 +5,7 @@ Fetch error: http://cutedigi.com/ => https://cutedigi.com/: (60, 'SSL certificat
 Fetch error: http://www.cutedigi.com/ => https://www.cutedigi.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.cutedigi.com/ => https://www.cutedigi.com/: (60, 'SSL ce
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Cuusoo.xml b/src/chrome/content/rules/Cuusoo.xml
index 51f817d0fefe..8f03b5afd55d 100644
--- a/src/chrome/content/rules/Cuusoo.xml
+++ b/src/chrome/content/rules/Cuusoo.xml
@@ -19,7 +19,7 @@ Non-2xx HTTP code: http://www.cuusoo.com/ (200) => https://www.cuusoo.com/ (404)
 		-      lego.cuusoo.com  (expired; empty page, but https working)
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Cvent.com.xml b/src/chrome/content/rules/Cvent.com.xml
index c38994261679..9187ef261455 100644
--- a/src/chrome/content/rules/Cvent.com.xml
+++ b/src/chrome/content/rules/Cvent.com.xml
@@ -21,7 +21,7 @@
 	
 	
 	
-	
+
 	
 	
 
diff --git a/src/chrome/content/rules/Cxcloud.com.xml b/src/chrome/content/rules/Cxcloud.com.xml
index c433beb32114..f90e6b78c6b8 100644
--- a/src/chrome/content/rules/Cxcloud.com.xml
+++ b/src/chrome/content/rules/Cxcloud.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.cxcloud.com/ => https://www.cxcloud.com/: (56, 'Recv fai
 	For other Checkmarx coverage, see Checkmarx.com.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Cxt.ms.xml b/src/chrome/content/rules/Cxt.ms.xml
deleted file mode 100644
index 9e72e1cd24d7..000000000000
--- a/src/chrome/content/rules/Cxt.ms.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/CyberAces.xml b/src/chrome/content/rules/CyberAces.xml
index c87fa41fe4f7..037d4b29ac66 100644
--- a/src/chrome/content/rules/CyberAces.xml
+++ b/src/chrome/content/rules/CyberAces.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://online.cyberaces.org/ => https://www.online.cyberaces.org/: (6, 'Could not resolve host: www.online.cyberaces.org')
 Fetch error: http://www.online.cyberaces.org/ => https://www.online.cyberaces.org/: (6, 'Could not resolve host: www.online.cyberaces.org')
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/CyberGhost.xml b/src/chrome/content/rules/CyberGhost.xml
index 2c7803d4c0a9..9f59bea6af07 100644
--- a/src/chrome/content/rules/CyberGhost.xml
+++ b/src/chrome/content/rules/CyberGhost.xml
@@ -6,7 +6,7 @@
 	
-	
+	
 
 	
-
+
 	
-	
+	
 	
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Cybercon.xml b/src/chrome/content/rules/Cybercon.xml
index 52ce046ad91b..6e0084d838f5 100644
--- a/src/chrome/content/rules/Cybercon.xml
+++ b/src/chrome/content/rules/Cybercon.xml
@@ -19,4 +19,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Cyberleninka.ru.xml b/src/chrome/content/rules/Cyberleninka.ru.xml
index a8b9ce8adcf3..8d505ab35a62 100644
--- a/src/chrome/content/rules/Cyberleninka.ru.xml
+++ b/src/chrome/content/rules/Cyberleninka.ru.xml
@@ -5,6 +5,6 @@
 
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Cyberplat.ru.xml b/src/chrome/content/rules/Cyberplat.ru.xml
index 0d7c10170cc7..b9c9fcc22d00 100644
--- a/src/chrome/content/rules/Cyberplat.ru.xml
+++ b/src/chrome/content/rules/Cyberplat.ru.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://info.cyberplat.ru/ => https://info.cyberplat.ru/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 kz. mismatch
 card. mixed content-->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Cyberstreetwise.xml b/src/chrome/content/rules/Cyberstreetwise.xml
index fd714f23f28c..a2b840bf7780 100644
--- a/src/chrome/content/rules/Cyberstreetwise.xml
+++ b/src/chrome/content/rules/Cyberstreetwise.xml
@@ -6,7 +6,7 @@
     
     
 
-    
+    
 
     
diff --git a/src/chrome/content/rules/Cyberus-Technology.de.xml b/src/chrome/content/rules/Cyberus-Technology.de.xml
new file mode 100644
index 000000000000..ad30afc3671a
--- /dev/null
+++ b/src/chrome/content/rules/Cyberus-Technology.de.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Cygwin.com.xml b/src/chrome/content/rules/Cygwin.com.xml
index dc0fc26a2c8f..1c57d813edd0 100644
--- a/src/chrome/content/rules/Cygwin.com.xml
+++ b/src/chrome/content/rules/Cygwin.com.xml
@@ -1,21 +1,17 @@
 
 
 
-	
 	
 	
-
-		
-
-
-	
+	
+	
+	
+	
+	
+	
+
+	
 
 
diff --git a/src/chrome/content/rules/Cykloserver.cz.xml b/src/chrome/content/rules/Cykloserver.cz.xml
new file mode 100644
index 000000000000..592761183b7d
--- /dev/null
+++ b/src/chrome/content/rules/Cykloserver.cz.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Cyngn.com.xml b/src/chrome/content/rules/Cyngn.com.xml
index f5fca925c029..f9a821708fc8 100644
--- a/src/chrome/content/rules/Cyngn.com.xml
+++ b/src/chrome/content/rules/Cyngn.com.xml
@@ -25,7 +25,7 @@ Fetch error: http://builds.cyngn.com/ => https://d199yez36w5w8l.cloudfront.net/:
 		- builds	(→ d199yez36w5w8l.cloudfront.net)
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Cyphar.com.xml b/src/chrome/content/rules/Cyphar.com.xml
deleted file mode 100644
index bc97570639b4..000000000000
--- a/src/chrome/content/rules/Cyphar.com.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Cyphertite.com.xml b/src/chrome/content/rules/Cyphertite.com.xml
index 594fab680294..3fd210089743 100644
--- a/src/chrome/content/rules/Cyphertite.com.xml
+++ b/src/chrome/content/rules/Cyphertite.com.xml
@@ -14,14 +14,14 @@ Fetch error: http://www.cyphertite.com/ => https://www.cyphertite.com/: (6, 'Cou
 		- blog
 
 -->
-
+
 
 	
 	
 	
 
 
-	
+	
 
 
 	 https://forums.satellitecypru
 		- (www.)	(shows default H-Sphere page; mismatched, CN: *.hostica.com)
 
 -->
-
+
 
 	
 
@@ -20,4 +20,4 @@ Fetch error: http://forums.satellitecyprus.com/ => https://forums.satellitecypru
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Cyscon.net.xml b/src/chrome/content/rules/Cyscon.net.xml
index 7f12d80eabd4..b849c7077233 100644
--- a/src/chrome/content/rules/Cyscon.net.xml
+++ b/src/chrome/content/rules/Cyscon.net.xml
@@ -6,7 +6,7 @@ Fetch error: http://stats.cyscon.net/ => https://stats.cyscon.net/: (6, 'Could n
 	(www.): dropped
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Cysec_Labs.com.xml b/src/chrome/content/rules/Cysec_Labs.com.xml
index 66bf2062d1d9..08a9511ed620 100644
--- a/src/chrome/content/rules/Cysec_Labs.com.xml
+++ b/src/chrome/content/rules/Cysec_Labs.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://cyseclabs.com/ => https://cyseclabs.com/: (60, 'SSL certific
 Fetch error: http://www.cyseclabs.com/ => https://www.cyseclabs.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Czech-Technical-University-in-Prague.xml b/src/chrome/content/rules/Czech-Technical-University-in-Prague.xml
index 5ac0abad1066..2a6738c9956b 100644
--- a/src/chrome/content/rules/Czech-Technical-University-in-Prague.xml
+++ b/src/chrome/content/rules/Czech-Technical-University-in-Prague.xml
@@ -5,7 +5,11 @@ Fetch error: http://cvut.cz/ => https://www.cvut.cz/: (60, 'SSL certificate prob
 
 
 	
-	
+	
+	
+	
+	
+	
 
 
 	
-
+
 
 	
diff --git a/src/chrome/content/rules/D2jsp.org.xml b/src/chrome/content/rules/D2jsp.org.xml
index 8b3e2dceb315..a868fdfb1941 100644
--- a/src/chrome/content/rules/D2jsp.org.xml
+++ b/src/chrome/content/rules/D2jsp.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://d2jsp.com/ => https://d2jsp.com/: Too many redirects while f
 Fetch error: http://www.d2jsp.com/ => https://www.d2jsp.com/: Too many redirects while fetching 'https://www.d2jsp.com/'
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/D3.ru.xml b/src/chrome/content/rules/D3.ru.xml
index ae920ef1ac2b..f1769e727e47 100644
--- a/src/chrome/content/rules/D3.ru.xml
+++ b/src/chrome/content/rules/D3.ru.xml
@@ -1,7 +1,6 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/DANTE.net.xml b/src/chrome/content/rules/DANTE.net.xml
deleted file mode 100644
index abff230ce7e1..000000000000
--- a/src/chrome/content/rules/DANTE.net.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-	
-	
-	
-		
-		
-		
-		
-		
-		
-		
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/DARC.de.xml b/src/chrome/content/rules/DARC.de.xml
new file mode 100644
index 000000000000..df4a88763ebe
--- /dev/null
+++ b/src/chrome/content/rules/DARC.de.xml
@@ -0,0 +1,20 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/DATACM.com.xml b/src/chrome/content/rules/DATACM.com.xml
new file mode 100644
index 000000000000..f6d4932223e8
--- /dev/null
+++ b/src/chrome/content/rules/DATACM.com.xml
@@ -0,0 +1,22 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/DBA.dk.xml b/src/chrome/content/rules/DBA.dk.xml
new file mode 100644
index 000000000000..e30268eca9a5
--- /dev/null
+++ b/src/chrome/content/rules/DBA.dk.xml
@@ -0,0 +1,42 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/DBS.xml b/src/chrome/content/rules/DBS.xml
index 7ff4c26d17f9..071831e1088e 100644
--- a/src/chrome/content/rules/DBS.xml
+++ b/src/chrome/content/rules/DBS.xml
@@ -1,35 +1,35 @@
 
-	
+
 
 	
 	
 	
 	
-	
+
 
 	
 	
-	
+
 
 	
 	
 	
-	
+
 
 	
 	
 	
-	
+
 
 	
 	
 	
-	
-	
+
+
 	
-	
+
 	
-	
+
 
diff --git a/src/chrome/content/rules/DBforums.xml b/src/chrome/content/rules/DBforums.xml
index 81b8d602d8a4..4f89fa66b763 100644
--- a/src/chrome/content/rules/DBforums.xml
+++ b/src/chrome/content/rules/DBforums.xml
@@ -18,7 +18,7 @@
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/DCBoEE.org.xml b/src/chrome/content/rules/DCBoEE.org.xml
deleted file mode 100644
index e5a5723caefd..000000000000
--- a/src/chrome/content/rules/DCBoEE.org.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/DC_Comics.com.xml b/src/chrome/content/rules/DC_Comics.com.xml
index b0f3d34e2c97..fb789797ace4 100644
--- a/src/chrome/content/rules/DC_Comics.com.xml
+++ b/src/chrome/content/rules/DC_Comics.com.xml
@@ -1,16 +1,36 @@
 
-
+		Timeout was reached:
+		- assets.dccomics.com
 
+		SSL peer certificate was not OK:
+		- dccomics.com
+		- batmanvsuperman.dccomics.com
+		- dcu.blog.dccomics.com
+		- mad.blog.dccomics.com
+		- vertigo.blog.dccomics.com
+		- wildstorm.blog.dccomics.com
+		- zuda.blog.dccomics.com
+		- dcublog.dccomics.com
+		- experienceatlantis.dccomics.com
+		- jointheleague.dccomics.com
+		- beta.jointheleague.dccomics.com
+		- dev.jointheleague.dccomics.com
+		- promo.dccomics.com
+		- read.dccomics.com
+		- www.read.dccomics.com
+-->
+
 	
 	
+	
+	
 
-
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/DC_Power.eu.xml b/src/chrome/content/rules/DC_Power.eu.xml
deleted file mode 100644
index ef70ab061d2d..000000000000
--- a/src/chrome/content/rules/DC_Power.eu.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/DC_Vote.org.xml b/src/chrome/content/rules/DC_Vote.org.xml
index ca953d3e3cd6..7937308909fb 100644
--- a/src/chrome/content/rules/DC_Vote.org.xml
+++ b/src/chrome/content/rules/DC_Vote.org.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.dcvote.org/ => https://www.dcvote.org/: (60, 'SSL certif
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/DD4.com.xml b/src/chrome/content/rules/DD4.com.xml
new file mode 100644
index 000000000000..839b10df2b1c
--- /dev/null
+++ b/src/chrome/content/rules/DD4.com.xml
@@ -0,0 +1,27 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/DDS2DDS.com.xml b/src/chrome/content/rules/DDS2DDS.com.xml
index a82886f722d5..61c3d27b86e0 100644
--- a/src/chrome/content/rules/DDS2DDS.com.xml
+++ b/src/chrome/content/rules/DDS2DDS.com.xml
@@ -7,12 +7,12 @@ Fetch error: http://www.dds2dds.com/ => https://www.dds2dds.com/: (28, 'Connecti
 Disabled by https-everywhere-checker because:
 Fetch error: http://kaizencrossfit.com/ => https://kaizencrossfit.com/: (51, "SSL: no alternative certificate subject name matches target host name 'kaizencrossfit.com'")
 -->
-
+
 
 	
 	
 	
-	
+	
 
 
 	
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.ddosbreak.com/ => https://www.ddosbreak.com/: (28, 'Oper
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/DEEWR.xml b/src/chrome/content/rules/DEEWR.xml
index b0eb4befadc1..e74bdabffbe8 100644
--- a/src/chrome/content/rules/DEEWR.xml
+++ b/src/chrome/content/rules/DEEWR.xml
@@ -4,10 +4,10 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://prisms.deewr.gov.au/ => https://prisms.deewr.gov.au/: (51, "SSL: no alternative certificate subject name matches target host name 'prisms.deewr.gov.au'")
 
 -->
-
+
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/DEF_CON_Groups.org.xml b/src/chrome/content/rules/DEF_CON_Groups.org.xml
deleted file mode 100644
index d8a970f99d11..000000000000
--- a/src/chrome/content/rules/DEF_CON_Groups.org.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-	
-		
-
-	
-
diff --git a/src/chrome/content/rules/DENX.de.xml b/src/chrome/content/rules/DENX.de.xml
index 2080b5ebfbe1..6adc4d66ab57 100644
--- a/src/chrome/content/rules/DENX.de.xml
+++ b/src/chrome/content/rules/DENX.de.xml
@@ -1,13 +1,34 @@
-
+
+
+	
+	
+	
+	
+	
 
+	
 
diff --git a/src/chrome/content/rules/DFTBA_Records.xml b/src/chrome/content/rules/DFTBA_Records.xml
index f601aa3d6737..2a482fa5a5e1 100644
--- a/src/chrome/content/rules/DFTBA_Records.xml
+++ b/src/chrome/content/rules/DFTBA_Records.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/DGEX.com.xml b/src/chrome/content/rules/DGEX.com.xml
index a0edc2c5f1e0..8c2eb635ebef 100644
--- a/src/chrome/content/rules/DGEX.com.xml
+++ b/src/chrome/content/rules/DGEX.com.xml
@@ -4,12 +4,12 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://dgex.com/ => https://dgex.com/: (28, 'Operation timed out after 30007 milliseconds with 0 bytes received')
 Fetch error: http://www.dgex.com/ => https://www.dgex.com/: (28, 'Operation timed out after 30001 milliseconds with 0 bytes received')
 
-	Insecure cookies are set for these 
+	Insecure cookies are set for these
 
 		- .dgex.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/DIYbanter.xml b/src/chrome/content/rules/DIYbanter.xml
index e276a84d9597..b4b82679eb82 100644
--- a/src/chrome/content/rules/DIYbanter.xml
+++ b/src/chrome/content/rules/DIYbanter.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/DJI.xml b/src/chrome/content/rules/DJI.xml
index 6682c867d0d0..f7af8ec3fdc3 100644
--- a/src/chrome/content/rules/DJI.xml
+++ b/src/chrome/content/rules/DJI.xml
@@ -49,7 +49,7 @@ Fetch error: http://www-dji-china.dji.com/ => https://www-dji-china.dji.com/: (2
 		wiki.dji.com
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/DJKit.xml b/src/chrome/content/rules/DJKit.xml
index 2cd794dd7286..9c6fd5da3ae5 100644
--- a/src/chrome/content/rules/DJKit.xml
+++ b/src/chrome/content/rules/DJKit.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/DKiT.ie.xml b/src/chrome/content/rules/DKiT.ie.xml
index a8cc92b857ed..3ce626857717 100644
--- a/src/chrome/content/rules/DKiT.ie.xml
+++ b/src/chrome/content/rules/DKiT.ie.xml
@@ -55,7 +55,7 @@ Fetch error: http://passwordreset.dkit.ie/ => https://passwordreset.dkit.ie/: (6
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/DLsite.com.xml b/src/chrome/content/rules/DLsite.com.xml
new file mode 100644
index 000000000000..5a15fd314bee
--- /dev/null
+++ b/src/chrome/content/rules/DLsite.com.xml
@@ -0,0 +1,74 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/DLsite.jp.xml b/src/chrome/content/rules/DLsite.jp.xml
new file mode 100644
index 000000000000..e6ecdafcdfbe
--- /dev/null
+++ b/src/chrome/content/rules/DLsite.jp.xml
@@ -0,0 +1,10 @@
+
+
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/DMCA_Services.xml b/src/chrome/content/rules/DMCA_Services.xml
index 64566b17f7a9..792dfa4089c2 100644
--- a/src/chrome/content/rules/DMCA_Services.xml
+++ b/src/chrome/content/rules/DMCA_Services.xml
@@ -24,7 +24,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -33,7 +34,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/DMLP.org.xml b/src/chrome/content/rules/DMLP.org.xml
index c679b8194a6e..59a6579ab861 100644
--- a/src/chrome/content/rules/DMLP.org.xml
+++ b/src/chrome/content/rules/DMLP.org.xml
@@ -1,36 +1,23 @@
-
 
-
+
 
 	
 	
 	
 	
 
+	
+	
 
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/DMS-Sweden.com.xml b/src/chrome/content/rules/DMS-Sweden.com.xml
deleted file mode 100644
index 8fc89b240d0f..000000000000
--- a/src/chrome/content/rules/DMS-Sweden.com.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/DMU.xml b/src/chrome/content/rules/DMU.xml
index f3077aac93fb..aeddaa34d3f5 100644
--- a/src/chrome/content/rules/DMU.xml
+++ b/src/chrome/content/rules/DMU.xml
@@ -22,7 +22,13 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/DN.com.xml b/src/chrome/content/rules/DN.com.xml
deleted file mode 100644
index 776d4d9506a5..000000000000
--- a/src/chrome/content/rules/DN.com.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/DN.dk.xml b/src/chrome/content/rules/DN.dk.xml
index 29f86c116fbb..b11b51aa4f41 100644
--- a/src/chrome/content/rules/DN.dk.xml
+++ b/src/chrome/content/rules/DN.dk.xml
@@ -13,7 +13,7 @@ Fetch error: http://www.dn.dk/ => https://www.dn.dk/: (7, 'Failed to connect to
 
 	¹: Refused
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/DNA_Serum.xml b/src/chrome/content/rules/DNA_Serum.xml
index 5fb33f60a1e7..90c05b38e0ea 100644
--- a/src/chrome/content/rules/DNA_Serum.xml
+++ b/src/chrome/content/rules/DNA_Serum.xml
@@ -14,7 +14,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://dnaserum.com/ => https://dnaserum.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
@@ -29,4 +29,4 @@ Fetch error: http://dnaserum.com/ => https://dnaserum.com/: (60, 'SSL certificat
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/DNS-shop.ru.xml b/src/chrome/content/rules/DNS-shop.ru.xml
new file mode 100644
index 000000000000..1efeb2ee3eed
--- /dev/null
+++ b/src/chrome/content/rules/DNS-shop.ru.xml
@@ -0,0 +1,44 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/DNSCurve.xml b/src/chrome/content/rules/DNSCurve.xml
index c453138586c6..ada5e0335947 100644
--- a/src/chrome/content/rules/DNSCurve.xml
+++ b/src/chrome/content/rules/DNSCurve.xml
@@ -8,4 +8,4 @@
 
     
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/DNSdynamic.xml b/src/chrome/content/rules/DNSdynamic.xml
deleted file mode 100644
index 433e46e22b34..000000000000
--- a/src/chrome/content/rules/DNSdynamic.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/DNSstuff.com.xml b/src/chrome/content/rules/DNSstuff.com.xml
index d990aef13278..4a808243da40 100644
--- a/src/chrome/content/rules/DNSstuff.com.xml
+++ b/src/chrome/content/rules/DNSstuff.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.dnsstuff.com/member/register/ => https://www.dnsstuff.co
 Fetch error: http://www.dnsstuff.com/templates/system/css/general.css => https://www.dnsstuff.com/templates/system/css/general.css: Too many redirects while fetching 'https://www.dnsstuff.com/templates/system/css/general.css'
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/DNTX.com.xml b/src/chrome/content/rules/DNTX.com.xml
index 8008facbc9a7..c14a6976c9b5 100644
--- a/src/chrome/content/rules/DNTX.com.xml
+++ b/src/chrome/content/rules/DNTX.com.xml
@@ -1,9 +1,7 @@
 
@@ -15,13 +13,6 @@
 
 	
 
-
-	
-	
-
-	
+  
 
 
diff --git a/src/chrome/content/rules/DNTrck.com.xml b/src/chrome/content/rules/DNTrck.com.xml
deleted file mode 100644
index 1430f67e98c2..000000000000
--- a/src/chrome/content/rules/DNTrck.com.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/DNV.com.xml b/src/chrome/content/rules/DNV.com.xml
deleted file mode 100644
index 4c56babb9eaa..000000000000
--- a/src/chrome/content/rules/DNV.com.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/DOCLIX.xml b/src/chrome/content/rules/DOCLIX.xml
deleted file mode 100644
index 268a32afc778..000000000000
--- a/src/chrome/content/rules/DOCLIX.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/DOI.org.xml b/src/chrome/content/rules/DOI.org.xml
deleted file mode 100644
index fef6a09ef8d1..000000000000
--- a/src/chrome/content/rules/DOI.org.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-	
-	
-	
-
-	
-	
-	
-
-
diff --git a/src/chrome/content/rules/DONGEnergy.xml b/src/chrome/content/rules/DONGEnergy.xml
index a689a5db5177..16236fe55370 100644
--- a/src/chrome/content/rules/DONGEnergy.xml
+++ b/src/chrome/content/rules/DONGEnergy.xml
@@ -37,7 +37,7 @@ Fetch error: http://ditgadelys.dongenergy.dk/ => https://ditgadelys.dongenergy.d
 	⁴: Refused
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/DPB.sk.xml b/src/chrome/content/rules/DPB.sk.xml
new file mode 100644
index 000000000000..f9421204f8db
--- /dev/null
+++ b/src/chrome/content/rules/DPB.sk.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/DPMC.xml b/src/chrome/content/rules/DPMC.xml
index e75823470515..0f3d42a94566 100644
--- a/src/chrome/content/rules/DPMC.xml
+++ b/src/chrome/content/rules/DPMC.xml
@@ -19,7 +19,7 @@
 					-->
 	
 
-	
+	
 
 
 	 https://www.dr.com.tr/: Too many redirects
 Fetch error: http://dr.com.tr/ => https://www.dr.com.tr/: Too many redirects while fetching 'https://www.dr.com.tr/'
 
 -->
-
+
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/DR.dk.xml b/src/chrome/content/rules/DR.dk.xml
index cf496bd9e7e8..69e9a629a7c1 100644
--- a/src/chrome/content/rules/DR.dk.xml
+++ b/src/chrome/content/rules/DR.dk.xml
@@ -22,7 +22,5 @@
 
 	
 
-	
-	
 
 
diff --git a/src/chrome/content/rules/DSF.my.xml b/src/chrome/content/rules/DSF.my.xml
new file mode 100644
index 000000000000..a8e6bd22594b
--- /dev/null
+++ b/src/chrome/content/rules/DSF.my.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/DSLReports.xml b/src/chrome/content/rules/DSLReports.xml
index e721e1379e5d..76105aeed5ff 100644
--- a/src/chrome/content/rules/DSLReports.xml
+++ b/src/chrome/content/rules/DSLReports.xml
@@ -3,13 +3,13 @@
 -->
 
 
-	
-	
-	
 	
 	
+	
 	
 	
+	
+	
 
 	
 	
@@ -20,6 +20,8 @@
 	
 	
 		
+	
+		
 
 	
 
@@ -29,7 +31,6 @@
 	
 
-		
 
 	
diff --git a/src/chrome/content/rules/DSNR-Media-Group.xml b/src/chrome/content/rules/DSNR-Media-Group.xml
index 4acec2a8463c..e0a35e207cd7 100644
--- a/src/chrome/content/rules/DSNR-Media-Group.xml
+++ b/src/chrome/content/rules/DSNR-Media-Group.xml
@@ -12,7 +12,7 @@ Fetch error: http://ad.z5x.net/ => https://ad.rmxads.net/: (28, 'Resolving timed
 		- (www.)z5x.net		(times out)
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/DShield.org.xml b/src/chrome/content/rules/DShield.org.xml
deleted file mode 100644
index b206f7c9c944..000000000000
--- a/src/chrome/content/rules/DShield.org.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/DTInt.com.xml b/src/chrome/content/rules/DTInt.com.xml
index 384db4c0c464..066e72fc2578 100644
--- a/src/chrome/content/rules/DTInt.com.xml
+++ b/src/chrome/content/rules/DTInt.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://customersonly.dtint.com/ => https://customersonly.dtint.com/
 		- customersonly.dtint.com
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/DUG.net.pl.xml b/src/chrome/content/rules/DUG.net.pl.xml
deleted file mode 100644
index 4cc60fe63807..000000000000
--- a/src/chrome/content/rules/DUG.net.pl.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/DW-World.de.xml b/src/chrome/content/rules/DW-World.de.xml
new file mode 100644
index 000000000000..a1ece54b3931
--- /dev/null
+++ b/src/chrome/content/rules/DW-World.de.xml
@@ -0,0 +1,16 @@
+
+
+
+	
+	
+
+	
+
+	
+	
+
+
diff --git a/src/chrome/content/rules/DW.com.xml b/src/chrome/content/rules/DW.com.xml
new file mode 100644
index 000000000000..8d30baeed1ed
--- /dev/null
+++ b/src/chrome/content/rules/DW.com.xml
@@ -0,0 +1,81 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/DW.de.xml b/src/chrome/content/rules/DW.de.xml
index c4f870ed3fda..200156b1fd59 100644
--- a/src/chrome/content/rules/DW.de.xml
+++ b/src/chrome/content/rules/DW.de.xml
@@ -1,34 +1,19 @@
 
 
 
+	
+	
 	
 
+	
+
+	
+	
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/DWheeler.xml b/src/chrome/content/rules/DWheeler.xml
index be3e2cfe0a1e..625f3cd28269 100644
--- a/src/chrome/content/rules/DWheeler.xml
+++ b/src/chrome/content/rules/DWheeler.xml
@@ -4,6 +4,6 @@
 	
 
 	
+		to="https://dwheeler.com/"/>
 
 
diff --git a/src/chrome/content/rules/DWin1.com.xml b/src/chrome/content/rules/DWin1.com.xml
index 155b65f2351f..8559d4a7d2ff 100644
--- a/src/chrome/content/rules/DWin1.com.xml
+++ b/src/chrome/content/rules/DWin1.com.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/D_Franke.us.xml b/src/chrome/content/rules/D_Franke.us.xml
deleted file mode 100644
index 89eacb3b01ea..000000000000
--- a/src/chrome/content/rules/D_Franke.us.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Da.gd.xml b/src/chrome/content/rules/Da.gd.xml
index 33646679eb8a..997b177ab488 100644
--- a/src/chrome/content/rules/Da.gd.xml
+++ b/src/chrome/content/rules/Da.gd.xml
@@ -1,11 +1,4 @@
-
-
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/DaButtonFactory.com.xml b/src/chrome/content/rules/DaButtonFactory.com.xml
deleted file mode 100644
index bd7d56e7163e..000000000000
--- a/src/chrome/content/rules/DaButtonFactory.com.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	
-	
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/DaWanda.xml b/src/chrome/content/rules/DaWanda.xml
index ea5c521b2a2f..1d4d032ecb7f 100644
--- a/src/chrome/content/rules/DaWanda.xml
+++ b/src/chrome/content/rules/DaWanda.xml
@@ -42,15 +42,23 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 		
-	
+	
+	
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/DaemonPage.com.xml b/src/chrome/content/rules/DaemonPage.com.xml
new file mode 100644
index 000000000000..f688e082126e
--- /dev/null
+++ b/src/chrome/content/rules/DaemonPage.com.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Dafdirect.org.xml b/src/chrome/content/rules/Dafdirect.org.xml
index 9d49f8700cb7..9a0f679d0155 100644
--- a/src/chrome/content/rules/Dafdirect.org.xml
+++ b/src/chrome/content/rules/Dafdirect.org.xml
@@ -10,7 +10,7 @@ Non-2xx HTTP code: http://www.dafdirect.org/ (200) => https://www.dafdirect.org/
 	^: cert only matches www
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Dafont.com.xml b/src/chrome/content/rules/Dafont.com.xml
deleted file mode 100644
index be3c5f42472a..000000000000
--- a/src/chrome/content/rules/Dafont.com.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-	
-	
-
-		
-		
-		
-		
-		
-		
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Daft.ie.xml b/src/chrome/content/rules/Daft.ie.xml
index c68a1c1af339..3639becc7501 100644
--- a/src/chrome/content/rules/Daft.ie.xml
+++ b/src/chrome/content/rules/Daft.ie.xml
@@ -8,7 +8,7 @@
 	
 	
 	
-	
+
 	
 
 	
diff --git a/src/chrome/content/rules/Daft_Media.xml b/src/chrome/content/rules/Daft_Media.xml
index fb6963b37c60..7eaaec7d55ee 100644
--- a/src/chrome/content/rules/Daft_Media.xml
+++ b/src/chrome/content/rules/Daft_Media.xml
@@ -14,4 +14,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Dagbladet.no-falsemixed.xml b/src/chrome/content/rules/Dagbladet.no-falsemixed.xml
index e8271951f26e..507bd3faab23 100644
--- a/src/chrome/content/rules/Dagbladet.no-falsemixed.xml
+++ b/src/chrome/content/rules/Dagbladet.no-falsemixed.xml
@@ -6,7 +6,7 @@ Fetch error: http://livebeta.dagbladet.no/ => https://livebeta.dagbladet.no/: (6
 	For rules not causing false/broken MCB, see Dagbladet.no.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Dagbladet.no.xml b/src/chrome/content/rules/Dagbladet.no.xml
index 62151ff6d37e..3050a4aac786 100644
--- a/src/chrome/content/rules/Dagbladet.no.xml
+++ b/src/chrome/content/rules/Dagbladet.no.xml
@@ -63,7 +63,7 @@ Fetch error: http://konto.dagbladet.no/ => https://konto.dagbladet.no/: (6, 'Cou
 	² Unsecurable <= refused
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Daily-Herald.xml b/src/chrome/content/rules/Daily-Herald.xml
index 83f6dd49bcf8..3783f73c6249 100644
--- a/src/chrome/content/rules/Daily-Herald.xml
+++ b/src/chrome/content/rules/Daily-Herald.xml
@@ -8,10 +8,13 @@ Fetch error: http://dailyherald.com/ => https://dailyherald.com/: (7, 'Failed to
 		- blogs		(times out)
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Daily-Star.xml b/src/chrome/content/rules/Daily-Star.xml
index 1890a861f12f..37d5deee4894 100644
--- a/src/chrome/content/rules/Daily-Star.xml
+++ b/src/chrome/content/rules/Daily-Star.xml
@@ -41,7 +41,7 @@ Fetch error: http://cdn.images.dailystar-uk.co.uk/ => https://d1gdw8d643djmp.clo
 	³ Cloudfront
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/DailyCaller.com.xml b/src/chrome/content/rules/DailyCaller.com.xml
new file mode 100644
index 000000000000..cecab011c933
--- /dev/null
+++ b/src/chrome/content/rules/DailyCaller.com.xml
@@ -0,0 +1,16 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/DailyDot.xml b/src/chrome/content/rules/DailyDot.xml
index 94f60b5acbd0..926abf660cfe 100644
--- a/src/chrome/content/rules/DailyDot.xml
+++ b/src/chrome/content/rules/DailyDot.xml
@@ -41,25 +41,15 @@
 
 
 	
-	
 	
 
-
 	
 	
 
-
 	
 
-	
-	
-
-		
-
 	
 
diff --git a/src/chrome/content/rules/DailyHiit.com.xml b/src/chrome/content/rules/DailyHiit.com.xml
index 079478720760..0e4fde850198 100644
--- a/src/chrome/content/rules/DailyHiit.com.xml
+++ b/src/chrome/content/rules/DailyHiit.com.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/DailyHive.com.xml b/src/chrome/content/rules/DailyHive.com.xml
new file mode 100644
index 000000000000..a161debbc881
--- /dev/null
+++ b/src/chrome/content/rules/DailyHive.com.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/DailyMail.co.uk.xml b/src/chrome/content/rules/DailyMail.co.uk.xml
new file mode 100644
index 000000000000..5542daa5bfd3
--- /dev/null
+++ b/src/chrome/content/rules/DailyMail.co.uk.xml
@@ -0,0 +1,14 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Daily_Fantasy_Radio.xml b/src/chrome/content/rules/Daily_Fantasy_Radio.xml
index 33887e39ce82..46cc00c8bc29 100644
--- a/src/chrome/content/rules/Daily_Fantasy_Radio.xml
+++ b/src/chrome/content/rules/Daily_Fantasy_Radio.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://dailyfantasyradio.com/ => https://dailyfantasyradio.com/: (51, "SSL: no alternative certificate subject name matches target host name 'dailyfantasyradio.com'")
 Fetch error: http://www.dailyfantasyradio.com/ => https://www.dailyfantasyradio.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.dailyfantasyradio.com'")
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.dailyfantasyradio.com/ => https://www.dailyfantasyradio.
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Daily_Mail-problematic.xml b/src/chrome/content/rules/Daily_Mail-problematic.xml
deleted file mode 100644
index 069343905f2d..000000000000
--- a/src/chrome/content/rules/Daily_Mail-problematic.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Daily_Mail_and_General_Trust.xml b/src/chrome/content/rules/Daily_Mail_and_General_Trust.xml
index d14ab50e5d88..1e6a14d271e4 100644
--- a/src/chrome/content/rules/Daily_Mail_and_General_Trust.xml
+++ b/src/chrome/content/rules/Daily_Mail_and_General_Trust.xml
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Dailymotion.xml b/src/chrome/content/rules/Dailymotion.xml
index 616800362c12..cf6b7c5e6edd 100644
--- a/src/chrome/content/rules/Dailymotion.xml
+++ b/src/chrome/content/rules/Dailymotion.xml
@@ -1,68 +1,42 @@
 
-
 
+
 	
-	
+	
 	
-		
-		
-	
-	
-	
+		
+		
+			
+			
 
+	
 
-	
+	
 
-		securecookie host="^.*\.dailymotion\.com$" name=".+" /-->
-	
+	
 	
 	
 
-
-	
+		
+		
+		
 
-	
-
-	
-
-	
-
-	
-
+		
+		
+		
 
diff --git a/src/chrome/content/rules/Dailynous.com.xml b/src/chrome/content/rules/Dailynous.com.xml
new file mode 100644
index 000000000000..72545ad4b752
--- /dev/null
+++ b/src/chrome/content/rules/Dailynous.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+  
diff --git a/src/chrome/content/rules/Daisy.net.au.xml b/src/chrome/content/rules/Daisy.net.au.xml
new file mode 100644
index 000000000000..abdf3b86fcd6
--- /dev/null
+++ b/src/chrome/content/rules/Daisy.net.au.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/DalailCentre.com.xml b/src/chrome/content/rules/DalailCentre.com.xml
new file mode 100644
index 000000000000..e6276191fa0b
--- /dev/null
+++ b/src/chrome/content/rules/DalailCentre.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Damballa.com.xml b/src/chrome/content/rules/Damballa.com.xml
index e3bdda55551f..92242dde4d4e 100644
--- a/src/chrome/content/rules/Damballa.com.xml
+++ b/src/chrome/content/rules/Damballa.com.xml
@@ -11,12 +11,12 @@ Fetch error: http://www.damballa.com/ => https://www.damballa.com/: (60, 'SSL ce
 	* Mismatched
 
 
-	Insecure cookies are set for these 
+	Insecure cookies are set for these
 
 		- .damballa.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/DanFleisch.com.xml b/src/chrome/content/rules/DanFleisch.com.xml
new file mode 100644
index 000000000000..30029f97abd1
--- /dev/null
+++ b/src/chrome/content/rules/DanFleisch.com.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/DanceSafe.org.xml b/src/chrome/content/rules/DanceSafe.org.xml
deleted file mode 100644
index fe80da243034..000000000000
--- a/src/chrome/content/rules/DanceSafe.org.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Dancing_Astronaut.xml b/src/chrome/content/rules/Dancing_Astronaut.xml
index e3eaf8d19078..bf2b9857c80f 100644
--- a/src/chrome/content/rules/Dancing_Astronaut.xml
+++ b/src/chrome/content/rules/Dancing_Astronaut.xml
@@ -12,4 +12,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/DandB.com.xml b/src/chrome/content/rules/DandB.com.xml
index 648d687b0b79..125d43d87f5f 100644
--- a/src/chrome/content/rules/DandB.com.xml
+++ b/src/chrome/content/rules/DandB.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://careers.dandb.com/ => https://careers.dandb.com/: (28, 'Conn
 	Mixed content:
 
 		- Images, on:
-		
+
 			- blog from $self *
 			- blog from assets.dandb.com *
 			- careers from $self *
@@ -15,7 +15,7 @@ Fetch error: http://careers.dandb.com/ => https://careers.dandb.com/: (28, 'Conn
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/DandB.xml b/src/chrome/content/rules/DandB.xml
index 4dffe31e838e..05ae507af046 100644
--- a/src/chrome/content/rules/DandB.xml
+++ b/src/chrome/content/rules/DandB.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Dangpu.com.xml b/src/chrome/content/rules/Dangpu.com.xml
index 85f33f7b291d..e239c5e03be0 100644
--- a/src/chrome/content/rules/Dangpu.com.xml
+++ b/src/chrome/content/rules/Dangpu.com.xml
@@ -17,7 +17,7 @@ Fetch error: http://www.dangpu.com/ => https://www.dangpu.com/: (6, 'Could not r
 		- .dangpu.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Danhlode.com.xml b/src/chrome/content/rules/Danhlode.com.xml
index c20298d8348d..5ed09d7c37e5 100644
--- a/src/chrome/content/rules/Danhlode.com.xml
+++ b/src/chrome/content/rules/Danhlode.com.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/DaniWeb.com.xml b/src/chrome/content/rules/DaniWeb.com.xml
deleted file mode 100644
index 128011b0a3a9..000000000000
--- a/src/chrome/content/rules/DaniWeb.com.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Daniel_Miessler.com.xml b/src/chrome/content/rules/Daniel_Miessler.com.xml
deleted file mode 100644
index e22187317638..000000000000
--- a/src/chrome/content/rules/Daniel_Miessler.com.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/DanskeBank.xml b/src/chrome/content/rules/DanskeBank.xml
index 8bef5102f115..40b640a6dfda 100644
--- a/src/chrome/content/rules/DanskeBank.xml
+++ b/src/chrome/content/rules/DanskeBank.xml
@@ -13,7 +13,7 @@ Other Danske Bank rulesets:
 -->
 
 
-   
+  
   
   
 
@@ -31,7 +31,7 @@ Other Danske Bank rulesets:
   
   
   
-  
+
   
 
diff --git a/src/chrome/content/rules/Danze.com.xml b/src/chrome/content/rules/Danze.com.xml
new file mode 100644
index 000000000000..c4a8349bd7c2
--- /dev/null
+++ b/src/chrome/content/rules/Danze.com.xml
@@ -0,0 +1,21 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Dap.com.xml b/src/chrome/content/rules/Dap.com.xml
new file mode 100644
index 000000000000..040026aaff73
--- /dev/null
+++ b/src/chrome/content/rules/Dap.com.xml
@@ -0,0 +1,27 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/DarAnNor.com.xml b/src/chrome/content/rules/DarAnNor.com.xml
new file mode 100644
index 000000000000..fb9e87448431
--- /dev/null
+++ b/src/chrome/content/rules/DarAnNor.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Darjeelin.fr.xml b/src/chrome/content/rules/Darjeelin.fr.xml
index 103d4975c9e6..493bae2d5957 100644
--- a/src/chrome/content/rules/Darjeelin.fr.xml
+++ b/src/chrome/content/rules/Darjeelin.fr.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.darjeelin.fr/ => https://www.darjeelin.fr/: (35, 'error:
 		- .darjeelin.fr
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/DarkSky.net.xml b/src/chrome/content/rules/DarkSky.net.xml
new file mode 100644
index 000000000000..b0d3b3bcacc5
--- /dev/null
+++ b/src/chrome/content/rules/DarkSky.net.xml
@@ -0,0 +1,32 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Dark_Reading.com.xml b/src/chrome/content/rules/Dark_Reading.com.xml
index 54167e0a95c4..b0871000e81d 100644
--- a/src/chrome/content/rules/Dark_Reading.com.xml
+++ b/src/chrome/content/rules/Dark_Reading.com.xml
@@ -30,7 +30,7 @@ Fetch error: http://events.darkreading.com/ => https://events.darkreading.com/:
 			 - events.darkreading.com
 			 - w1.darkreading.com
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Darkmail.info.xml b/src/chrome/content/rules/Darkmail.info.xml
index b210a27cf02c..e8b7e093f9d9 100644
--- a/src/chrome/content/rules/Darkmail.info.xml
+++ b/src/chrome/content/rules/Darkmail.info.xml
@@ -3,4 +3,4 @@
 
 
 
- 
+
diff --git a/src/chrome/content/rules/Darmstadt_University_of_Applied_Sciences.xml b/src/chrome/content/rules/Darmstadt_University_of_Applied_Sciences.xml
index 768352c8ebad..e91e21df3d1e 100644
--- a/src/chrome/content/rules/Darmstadt_University_of_Applied_Sciences.xml
+++ b/src/chrome/content/rules/Darmstadt_University_of_Applied_Sciences.xml
@@ -40,4 +40,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/DartSearch.net.xml b/src/chrome/content/rules/DartSearch.net.xml
new file mode 100644
index 000000000000..a9e4f7534375
--- /dev/null
+++ b/src/chrome/content/rules/DartSearch.net.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/DarwinProject.ac.uk.xml b/src/chrome/content/rules/DarwinProject.ac.uk.xml
new file mode 100644
index 000000000000..963fb6bd402b
--- /dev/null
+++ b/src/chrome/content/rules/DarwinProject.ac.uk.xml
@@ -0,0 +1,8 @@
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Darwinsys.com.xml b/src/chrome/content/rules/Darwinsys.com.xml
new file mode 100644
index 000000000000..3aaabaa946cb
--- /dev/null
+++ b/src/chrome/content/rules/Darwinsys.com.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/DasErste.de.xml b/src/chrome/content/rules/DasErste.de.xml
new file mode 100644
index 000000000000..b84d0c1356ff
--- /dev/null
+++ b/src/chrome/content/rules/DasErste.de.xml
@@ -0,0 +1,92 @@
+
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Das_Parlament.xml b/src/chrome/content/rules/Das_Parlament.xml
index 4e4ab3be19aa..d54c46a403ac 100644
--- a/src/chrome/content/rules/Das_Parlament.xml
+++ b/src/chrome/content/rules/Das_Parlament.xml
@@ -11,11 +11,11 @@ Fetch error: http://www.das-parlament.de/ => https://www.das-parlament.de/: (28,
 	^das-parlament.de doesn't exist.
 
 -->
-
+
 
 	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Dasezna.lgbt.xml b/src/chrome/content/rules/Dasezna.lgbt.xml
new file mode 100644
index 000000000000..f72425026b78
--- /dev/null
+++ b/src/chrome/content/rules/Dasezna.lgbt.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Dash-Player.com.xml b/src/chrome/content/rules/Dash-Player.com.xml
index 69f7c9e0f56e..4d0029713620 100644
--- a/src/chrome/content/rules/Dash-Player.com.xml
+++ b/src/chrome/content/rules/Dash-Player.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.dash-player.com/ => https://www.dash-player.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Dask.org.xml b/src/chrome/content/rules/Dask.org.xml
new file mode 100644
index 000000000000..2829ad1de88e
--- /dev/null
+++ b/src/chrome/content/rules/Dask.org.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Dassault_Falcon.xml b/src/chrome/content/rules/Dassault_Falcon.xml
index 6bea3c5e810b..e2d1c6fe3792 100644
--- a/src/chrome/content/rules/Dassault_Falcon.xml
+++ b/src/chrome/content/rules/Dassault_Falcon.xml
@@ -10,9 +10,20 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
@@ -21,10 +32,7 @@
 	
 
-	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Dassault_Systemes.xml b/src/chrome/content/rules/Dassault_Systemes.xml
index b5be60767cda..f6aa33c7729b 100644
--- a/src/chrome/content/rules/Dassault_Systemes.xml
+++ b/src/chrome/content/rules/Dassault_Systemes.xml
@@ -24,4 +24,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Dastelefonbuch.de.xml b/src/chrome/content/rules/Dastelefonbuch.de.xml
deleted file mode 100644
index 984c12146597..000000000000
--- a/src/chrome/content/rules/Dastelefonbuch.de.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
- 
diff --git a/src/chrome/content/rules/Data-Protection-Commissioner.xml b/src/chrome/content/rules/Data-Protection-Commissioner.xml
index 0db4538b230b..763b1afcae50 100644
--- a/src/chrome/content/rules/Data-Protection-Commissioner.xml
+++ b/src/chrome/content/rules/Data-Protection-Commissioner.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Data.com.xml b/src/chrome/content/rules/Data.com.xml
index 868388e3faa9..c31feb7996d0 100644
--- a/src/chrome/content/rules/Data.com.xml
+++ b/src/chrome/content/rules/Data.com.xml
@@ -15,7 +15,11 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 
 
 	
@@ -24,7 +28,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Data.fm.xml b/src/chrome/content/rules/Data.fm.xml
index 84933f86a9aa..4770359cf392 100644
--- a/src/chrome/content/rules/Data.fm.xml
+++ b/src/chrome/content/rules/Data.fm.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://data.fm/ => https://data.fm/: (28, 'Connection timed out after 20000 milliseconds')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/DataCamp.com.xml b/src/chrome/content/rules/DataCamp.com.xml
index e8cc493b83b6..9ca9f9a6b8c3 100644
--- a/src/chrome/content/rules/DataCamp.com.xml
+++ b/src/chrome/content/rules/DataCamp.com.xml
@@ -5,7 +5,8 @@
 
 
 	
-	
+	
+	
 
 
 	
-
+
 
 	
-	
+	
+	
 		
 		
diff --git a/src/chrome/content/rules/DataMineLab.com.xml b/src/chrome/content/rules/DataMineLab.com.xml
index b0e3317cecfe..7370b7ec0d12 100644
--- a/src/chrome/content/rules/DataMineLab.com.xml
+++ b/src/chrome/content/rules/DataMineLab.com.xml
@@ -1,15 +1,19 @@
-
+
+
 
+	
+	
 
-	
-	
+	
 
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/DataSavesLives.eu.xml b/src/chrome/content/rules/DataSavesLives.eu.xml
index 5b726d5b1996..19293a65dfc2 100644
--- a/src/chrome/content/rules/DataSavesLives.eu.xml
+++ b/src/chrome/content/rules/DataSavesLives.eu.xml
@@ -5,7 +5,7 @@ Fetch error: http://datasaveslives.eu/ => https://datasaveslives.eu/: (51, "SSL:
 Fetch error: http://www.datasaveslives.eu/ => https://www.datasaveslives.eu/: (51, "SSL: no alternative certificate subject name matches target host name 'www.datasaveslives.eu'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Data_Conservancy.org.xml b/src/chrome/content/rules/Data_Conservancy.org.xml
index 8dd6c46d883e..4c4b338c37d5 100644
--- a/src/chrome/content/rules/Data_Conservancy.org.xml
+++ b/src/chrome/content/rules/Data_Conservancy.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://dataconservancy.org/ => https://dataconservancy.org/: (35, '
 Fetch error: http://www.dataconservancy.org/ => https://www.dataconservancy.org/: (35, 'error:14077410:SSL routines:SSL23_GET_SERVER_HELLO:sslv3 alert handshake failure')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Data_Informed.xml b/src/chrome/content/rules/Data_Informed.xml
index e6a5262f093e..f721ddf91349 100644
--- a/src/chrome/content/rules/Data_Informed.xml
+++ b/src/chrome/content/rules/Data_Informed.xml
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Databits.net.xml b/src/chrome/content/rules/Databits.net.xml
index a8c814da15ff..0cd1c9c7a160 100644
--- a/src/chrome/content/rules/Databits.net.xml
+++ b/src/chrome/content/rules/Databits.net.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://databits.net/ => https://databits.net/: (60, 'SSL certificate problem: certificate has expired')
 Fetch error: http://www.databits.net/ => https://www.databits.net/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Databricks.com.xml b/src/chrome/content/rules/Databricks.com.xml
deleted file mode 100644
index 986d511adb0d..000000000000
--- a/src/chrome/content/rules/Databricks.com.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-	
-
-	
-	
-	
-
-	
-	
-	
-
-
-	
-	
-	
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Datacard.com.xml b/src/chrome/content/rules/Datacard.com.xml
index aa13db445673..6c7899a1875f 100644
--- a/src/chrome/content/rules/Datacard.com.xml
+++ b/src/chrome/content/rules/Datacard.com.xml
@@ -5,31 +5,18 @@
 		- Entrust.com.xml
 
 
-	^: cert only matches www
-
-
-	These altnames don't exist:
-
-		- www.careers.datacard.com
+	Non-functional hosts:
+		Timeout:
+		- careers.datacard.com
 
 -->
 
 
 	
-	
-
-
-	
-	
-
-	
-
+	
 
-	
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/DatacentrumGids.nl.xml b/src/chrome/content/rules/DatacentrumGids.nl.xml
deleted file mode 100644
index d124d47ad38c..000000000000
--- a/src/chrome/content/rules/DatacentrumGids.nl.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Datalogix.com.xml b/src/chrome/content/rules/Datalogix.com.xml
index 5423fb3e787c..60af0c74d0f3 100644
--- a/src/chrome/content/rules/Datalogix.com.xml
+++ b/src/chrome/content/rules/Datalogix.com.xml
@@ -17,7 +17,7 @@ Fetch error: http://www.datalogix.com/ => http://www.datalogix.com/: Too many re
 	Some pages redirect to http.
 
 -->
-
+
 
 	
 	
@@ -26,4 +26,4 @@ Fetch error: http://www.datalogix.com/ => http://www.datalogix.com/: Too many re
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Datamappi.fi.xml b/src/chrome/content/rules/Datamappi.fi.xml
index 7ddddff2703f..a1356a322a5d 100644
--- a/src/chrome/content/rules/Datamappi.fi.xml
+++ b/src/chrome/content/rules/Datamappi.fi.xml
@@ -14,10 +14,11 @@ Fetch error: http://datamappi.fi/ => https://www.datamappi.fi/: (7, 'Failed to c
 		- owa
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
@@ -26,7 +27,6 @@ Fetch error: http://datamappi.fi/ => https://www.datamappi.fi/: (7, 'Failed to c
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Datamind.ru.xml b/src/chrome/content/rules/Datamind.ru.xml
index 1c02a18297e0..16e557cb2156 100644
--- a/src/chrome/content/rules/Datamind.ru.xml
+++ b/src/chrome/content/rules/Datamind.ru.xml
@@ -1,12 +1,9 @@
 
 
-	
+	
 
 
-	
 
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Datared.dk.xml b/src/chrome/content/rules/Datared.dk.xml
index d2531d6e59d9..3f2384aeb980 100644
--- a/src/chrome/content/rules/Datared.dk.xml
+++ b/src/chrome/content/rules/Datared.dk.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.datared.dk/ => https://datared.dk/: (60, 'SSL certificat
 
 	¹: Bad CN in cert
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Datemas.de.xml b/src/chrome/content/rules/Datemas.de.xml
deleted file mode 100644
index 7a84393d5597..000000000000
--- a/src/chrome/content/rules/Datemas.de.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Daum_Communications.xml b/src/chrome/content/rules/Daum_Communications.xml
deleted file mode 100644
index 96f3777e8f1b..000000000000
--- a/src/chrome/content/rules/Daum_Communications.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/David_Gold.xml b/src/chrome/content/rules/David_Gold.xml
index d80f582be7eb..07f6e1f1cfd7 100644
--- a/src/chrome/content/rules/David_Gold.xml
+++ b/src/chrome/content/rules/David_Gold.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/David_Lazar.org.xml b/src/chrome/content/rules/David_Lazar.org.xml
index 9082abf4d079..0b5acf812579 100644
--- a/src/chrome/content/rules/David_Lazar.org.xml
+++ b/src/chrome/content/rules/David_Lazar.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.davidlazar.org/ => https://www.davidlazar.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.davidlazar.org'")
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/David_Sopas.com.xml b/src/chrome/content/rules/David_Sopas.com.xml
deleted file mode 100644
index c4f524b589db..000000000000
--- a/src/chrome/content/rules/David_Sopas.com.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Davinci_Vaporizor.xml b/src/chrome/content/rules/Davinci_Vaporizor.xml
index b391d5eb75bc..2fb7c3911bf1 100644
--- a/src/chrome/content/rules/Davinci_Vaporizor.xml
+++ b/src/chrome/content/rules/Davinci_Vaporizor.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/DavisSystem.xml b/src/chrome/content/rules/DavisSystem.xml
index 3dad78a8c188..f77618109326 100644
--- a/src/chrome/content/rules/DavisSystem.xml
+++ b/src/chrome/content/rules/DavisSystem.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Davis_Instruments.xml b/src/chrome/content/rules/Davis_Instruments.xml
index f7657fe1e296..88db09af5a83 100644
--- a/src/chrome/content/rules/Davis_Instruments.xml
+++ b/src/chrome/content/rules/Davis_Instruments.xml
@@ -1,7 +1,8 @@
 
 
 	
-	
+	
+	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/De-Captcher.com.xml b/src/chrome/content/rules/De-Captcher.com.xml
index e264bd0a0f49..c8bc43329e61 100644
--- a/src/chrome/content/rules/De-Captcher.com.xml
+++ b/src/chrome/content/rules/De-Captcher.com.xml
@@ -20,7 +20,7 @@
 
 	
-	 
+	
 
 	
 
diff --git a/src/chrome/content/rules/De-Centralize.com.xml b/src/chrome/content/rules/De-Centralize.com.xml
deleted file mode 100644
index 0b7dbe2fb167..000000000000
--- a/src/chrome/content/rules/De-Centralize.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/De17a.com.xml b/src/chrome/content/rules/De17a.com.xml
index d468276553fe..d9168e963142 100644
--- a/src/chrome/content/rules/De17a.com.xml
+++ b/src/chrome/content/rules/De17a.com.xml
@@ -7,13 +7,11 @@
 
 
 	
-	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/DeNA.com.xml b/src/chrome/content/rules/DeNA.com.xml
new file mode 100644
index 000000000000..fc909466f9ac
--- /dev/null
+++ b/src/chrome/content/rules/DeNA.com.xml
@@ -0,0 +1,19 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/De_Bekijkerie.nl.xml b/src/chrome/content/rules/De_Bekijkerie.nl.xml
deleted file mode 100644
index 6addc79866a5..000000000000
--- a/src/chrome/content/rules/De_Bekijkerie.nl.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/De_Correspondent.nl.xml b/src/chrome/content/rules/De_Correspondent.nl.xml
index b7fd521a029a..9e3c2f700a8a 100644
--- a/src/chrome/content/rules/De_Correspondent.nl.xml
+++ b/src/chrome/content/rules/De_Correspondent.nl.xml
@@ -1,7 +1,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
-
+
 
 	
diff --git a/src/chrome/content/rules/Deadspin.com.xml b/src/chrome/content/rules/Deadspin.com.xml
deleted file mode 100644
index b2e13918bf0c..000000000000
--- a/src/chrome/content/rules/Deadspin.com.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
-	
-	
-
-		
-
-			
-			
-			
-
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-
-		
-		
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/DealExtreme.xml b/src/chrome/content/rules/DealExtreme.xml
index ec06a9672a19..03711068421f 100644
--- a/src/chrome/content/rules/DealExtreme.xml
+++ b/src/chrome/content/rules/DealExtreme.xml
@@ -8,22 +8,27 @@ Fetch error: http://dx.com/ => https://dx.com/: (28, 'Operation timed out after
 
 
 	
-	
+	
+	
+	
+	
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
 	
 
 
 	
 
 
-	
 
-	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/DealTime.xml b/src/chrome/content/rules/DealTime.xml
deleted file mode 100644
index e84e7d5efcd2..000000000000
--- a/src/chrome/content/rules/DealTime.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/DealerFire.xml b/src/chrome/content/rules/DealerFire.xml
deleted file mode 100644
index 49b0ec4b8b61..000000000000
--- a/src/chrome/content/rules/DealerFire.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/DealerRater.com.xml b/src/chrome/content/rules/DealerRater.com.xml
index 1131ba584227..d0e5b38232bf 100644
--- a/src/chrome/content/rules/DealerRater.com.xml
+++ b/src/chrome/content/rules/DealerRater.com.xml
@@ -1,36 +1,15 @@
 
-
+
 
 	
 	
-		
-		
-		
-
-
-	
-
-	
+	
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/DealerTrend.com.xml b/src/chrome/content/rules/DealerTrend.com.xml
index bef61725b032..2d4aca1f2a99 100644
--- a/src/chrome/content/rules/DealerTrend.com.xml
+++ b/src/chrome/content/rules/DealerTrend.com.xml
@@ -1,24 +1,24 @@
-
-
-
-	
-
-
-	
-
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
 
diff --git a/src/chrome/content/rules/Dealfish.co.th.xml b/src/chrome/content/rules/Dealfish.co.th.xml
index acd4603e94f5..da9ebadbadde 100644
--- a/src/chrome/content/rules/Dealfish.co.th.xml
+++ b/src/chrome/content/rules/Dealfish.co.th.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://dealfish.co.th/ => https://www.dealfish.co.th/: (7, 'Failed to connect to www.dealfish.co.th port 443: Connection refused')
 Fetch error: http://www.dealfish.co.th/ => https://www.dealfish.co.th/: (7, 'Failed to connect to www.dealfish.co.th port 443: Connection refused')
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Dean-Evans-and-Associates.xml b/src/chrome/content/rules/Dean-Evans-and-Associates.xml
index 9d61cca61000..cfaf6adb5e69 100644
--- a/src/chrome/content/rules/Dean-Evans-and-Associates.xml
+++ b/src/chrome/content/rules/Dean-Evans-and-Associates.xml
@@ -24,7 +24,7 @@ Non-2xx HTTP code: http://pages.dea.com/rs/deanevansassoc/images/DEA-2001-LP-TY-
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/DeathGenerator.com.xml b/src/chrome/content/rules/DeathGenerator.com.xml
new file mode 100644
index 000000000000..fa8b9e506726
--- /dev/null
+++ b/src/chrome/content/rules/DeathGenerator.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Debian.net.xml b/src/chrome/content/rules/Debian.net.xml
index ed2fa93cfd2f..7f883f7b37a5 100644
--- a/src/chrome/content/rules/Debian.net.xml
+++ b/src/chrome/content/rules/Debian.net.xml
@@ -1,39 +1,25 @@
 
 
 
-	
+	
+	
+	
 	
 	
 	
@@ -50,27 +36,22 @@
 	
 	
 	
+	
 	
 	
 	
 	
-	
-	
 	
 	
 	
 	
 	
 	
+	
 	
 
-	
-	
-
-
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Debian.org-problematic.xml b/src/chrome/content/rules/Debian.org-problematic.xml
deleted file mode 100644
index f21700b6a0e6..000000000000
--- a/src/chrome/content/rules/Debian.org-problematic.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Debian.xml b/src/chrome/content/rules/Debian.xml
index 04fb4869b097..e54b7f3ff75c 100644
--- a/src/chrome/content/rules/Debian.xml
+++ b/src/chrome/content/rules/Debian.xml
@@ -1,7 +1,4 @@
 
-
+
 
 	
 	
-	
-	
-		
-		
-		
 	
 	
 	
@@ -83,15 +41,12 @@
 	
 	
 	
-	
 	
 	
 	
 	
 	
-	
 	
-	
 	
 	
 	
@@ -100,10 +55,10 @@
 	
 	
 	
+	
 	
 	
 	
-	
 	
 	
 	
@@ -113,6 +68,7 @@
 	
 	
 	
+	
 	
 	
 	
@@ -122,7 +78,9 @@
 	
 	
 	
+	
 	
+	
 	
 	
 	
@@ -130,13 +88,14 @@
 	
 	
 	
+	
 	
 	
 	
 	
 	
+	
 	
-	
 	
 	
 	
@@ -177,6 +136,8 @@
 
 	
+	
 
 	
diff --git a/src/chrome/content/rules/Debuggable.xml b/src/chrome/content/rules/Debuggable.xml
index 94b665e3a96e..9a085bd037ec 100644
--- a/src/chrome/content/rules/Debuggable.xml
+++ b/src/chrome/content/rules/Debuggable.xml
@@ -5,7 +5,9 @@
 
 
 	
-	
+	
+	
+	
 
 	
diff --git a/src/chrome/content/rules/Debuggex.com.xml b/src/chrome/content/rules/Debuggex.com.xml
index 5eee9763503e..fb6c0fd5d7e9 100644
--- a/src/chrome/content/rules/Debuggex.com.xml
+++ b/src/chrome/content/rules/Debuggex.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://debuggex.com/ => https://debuggex.com/: (60, 'SSL certificat
 Fetch error: http://www.debuggex.com/ => https://www.debuggex.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Decdna.net.xml b/src/chrome/content/rules/Decdna.net.xml
index 70fde316bc7a..9fb5f5127a60 100644
--- a/src/chrome/content/rules/Decdna.net.xml
+++ b/src/chrome/content/rules/Decdna.net.xml
@@ -5,9 +5,9 @@ Fetch error: http://na.decdna.net/ => https://na.decdna.net/: (6, 'Could not res
 Fetch error: http://eu.link.decdna.net/ => https://eu.link.decdna.net/: (6, 'Could not resolve host: eu.link.decdna.net')
 
 -->
-
+
 	
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Decipher_Inc.com.xml b/src/chrome/content/rules/Decipher_Inc.com.xml
index 2519c3404b03..894e8e044360 100644
--- a/src/chrome/content/rules/Decipher_Inc.com.xml
+++ b/src/chrome/content/rules/Decipher_Inc.com.xml
@@ -14,16 +14,17 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/DecisionBriefs.xml b/src/chrome/content/rules/DecisionBriefs.xml
index fb67ad86c2a0..ee7884c6d559 100644
--- a/src/chrome/content/rules/DecisionBriefs.xml
+++ b/src/chrome/content/rules/DecisionBriefs.xml
@@ -1,13 +1,14 @@
 
 
 	
-	
+	
+	
+	
 
 
-	
+	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Declaration-of-Russian-Hosting-Providers.xml b/src/chrome/content/rules/Declaration-of-Russian-Hosting-Providers.xml
index 303cb06d3b13..d3b295726f16 100644
--- a/src/chrome/content/rules/Declaration-of-Russian-Hosting-Providers.xml
+++ b/src/chrome/content/rules/Declaration-of-Russian-Hosting-Providers.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://hostdeclaration.ru/ => https://hostdeclaration.ru/: (51, "SSL: no alternative certificate subject name matches target host name 'hostdeclaration.ru'")
 Fetch error: http://www.hostdeclaration.ru/ => https://hostdeclaration.ru/: (51, "SSL: no alternative certificate subject name matches target host name 'hostdeclaration.ru'")
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/DecorAdventures.com.xml b/src/chrome/content/rules/DecorAdventures.com.xml
new file mode 100644
index 000000000000..7f7392086186
--- /dev/null
+++ b/src/chrome/content/rules/DecorAdventures.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Decrypt_CryptoLocker.com.xml b/src/chrome/content/rules/Decrypt_CryptoLocker.com.xml
index a04f478ee246..9a6d414165df 100644
--- a/src/chrome/content/rules/Decrypt_CryptoLocker.com.xml
+++ b/src/chrome/content/rules/Decrypt_CryptoLocker.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://decryptcryptolocker.com/ => https://decryptcryptolocker.com/
 Fetch error: http://www.decryptcryptolocker.com/ => https://www.decryptcryptolocker.com/: (6, 'Could not resolve host: www.decryptcryptolocker.com')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Dedicated_Gaming.xml b/src/chrome/content/rules/Dedicated_Gaming.xml
index 1896f19d10e4..5977cec4fc33 100644
--- a/src/chrome/content/rules/Dedicated_Gaming.xml
+++ b/src/chrome/content/rules/Dedicated_Gaming.xml
@@ -10,4 +10,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Dedikuoti.lt.xml b/src/chrome/content/rules/Dedikuoti.lt.xml
index 81b4948f3dab..5faf94b82400 100644
--- a/src/chrome/content/rules/Dedikuoti.lt.xml
+++ b/src/chrome/content/rules/Dedikuoti.lt.xml
@@ -1,7 +1,7 @@
 
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Deekayen.net.xml b/src/chrome/content/rules/Deekayen.net.xml
index a408ba7258ad..1ae6fe0dd2ad 100644
--- a/src/chrome/content/rules/Deekayen.net.xml
+++ b/src/chrome/content/rules/Deekayen.net.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.deekayen.net/ => https://www.deekayen.net/: (51, "SSL: no alternative certificate subject name matches target host name 'www.deekayen.net'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/DeepDyve.xml b/src/chrome/content/rules/DeepDyve.xml
index 64c95ac0f19b..2acfd269dfc7 100644
--- a/src/chrome/content/rules/DeepDyve.xml
+++ b/src/chrome/content/rules/DeepDyve.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/DeepField-Networks.xml b/src/chrome/content/rules/DeepField-Networks.xml
index 290dd7b5e452..9a2581cb5fa8 100644
--- a/src/chrome/content/rules/DeepField-Networks.xml
+++ b/src/chrome/content/rules/DeepField-Networks.xml
@@ -1,7 +1,8 @@
 
 
 	
-	
+	
+	
 
 	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Dein.dk.xml b/src/chrome/content/rules/Dein.dk.xml
index 9b7f5478b127..2cfb78c70ff9 100644
--- a/src/chrome/content/rules/Dein.dk.xml
+++ b/src/chrome/content/rules/Dein.dk.xml
@@ -5,7 +5,7 @@ Fetch error: http://dein.dk/ => https://dein.dk/: (35, 'Unknown SSL protocol err
 Fetch error: http://www.dein.dk/ => https://www.dein.dk/: (35, 'Unknown SSL protocol error in connection to www.dein.dk:443 ')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Deis.com.xml b/src/chrome/content/rules/Deis.com.xml
deleted file mode 100644
index e2c35ac0e265..000000000000
--- a/src/chrome/content/rules/Deis.com.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Delaware_Online.xml b/src/chrome/content/rules/Delaware_Online.xml
index 44bee0f27af5..3d86bc8403e9 100644
--- a/src/chrome/content/rules/Delaware_Online.xml
+++ b/src/chrome/content/rules/Delaware_Online.xml
@@ -26,7 +26,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Delfogo_Rx.xml b/src/chrome/content/rules/Delfogo_Rx.xml
deleted file mode 100644
index 6a8c9d615346..000000000000
--- a/src/chrome/content/rules/Delfogo_Rx.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Delish.xml b/src/chrome/content/rules/Delish.xml
index 7623a6bc79e2..2478f3750cac 100644
--- a/src/chrome/content/rules/Delish.xml
+++ b/src/chrome/content/rules/Delish.xml
@@ -1,7 +1,6 @@
 
 
diff --git a/src/chrome/content/rules/Deliveras.gr.xml b/src/chrome/content/rules/Deliveras.gr.xml
index 636d16fd8a34..1a0b63a5ad21 100644
--- a/src/chrome/content/rules/Deliveras.gr.xml
+++ b/src/chrome/content/rules/Deliveras.gr.xml
@@ -18,7 +18,7 @@
 	* Ruleset disabled by default
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Delivery.com.xml b/src/chrome/content/rules/Delivery.com.xml
index bd278420d7f2..b391d0d7efa5 100644
--- a/src/chrome/content/rules/Delivery.com.xml
+++ b/src/chrome/content/rules/Delivery.com.xml
@@ -17,7 +17,7 @@
 					-->
 	
 
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Dell.com-falsemixed.xml b/src/chrome/content/rules/Dell.com-falsemixed.xml
deleted file mode 100644
index 4a750122dfb1..000000000000
--- a/src/chrome/content/rules/Dell.com-falsemixed.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-		
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Dell.xml b/src/chrome/content/rules/Dell.xml
index 583f87cd517a..3d3a18a1c396 100644
--- a/src/chrome/content/rules/Dell.xml
+++ b/src/chrome/content/rules/Dell.xml
@@ -1,113 +1,51 @@
-
 
-		- Images, on:
+
-
 
 	
 	
 	
-	
-	
-	
-	
-	
-	
+	
+	
+	
+	
+	
 	
-	
-	
+	
+	
 	
 	
 	
 	
 	
 	
-	
 	
 	
 	
 	
-	
+	
 	
 	
 	
@@ -116,46 +54,17 @@
 	
 	
 	
-	
-	
-	
+	
+	
 	
 	
-	
+	
+	
 	
 	
-	
-	
+
 
 	
 
-	
-	
 	
-
-	
-
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-
-	
-	
-	
-	
 
diff --git a/src/chrome/content/rules/DellCDN.com.xml b/src/chrome/content/rules/DellCDN.com.xml
new file mode 100644
index 000000000000..c78227b8be69
--- /dev/null
+++ b/src/chrome/content/rules/DellCDN.com.xml
@@ -0,0 +1,10 @@
+
+	
+	
+		
+	
+		
+	
+
+	
+
diff --git a/src/chrome/content/rules/Deluge-torrent.org.xml b/src/chrome/content/rules/Deluge-torrent.org.xml
new file mode 100644
index 000000000000..5cefc9fd30a5
--- /dev/null
+++ b/src/chrome/content/rules/Deluge-torrent.org.xml
@@ -0,0 +1,19 @@
+
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Deluge.xml b/src/chrome/content/rules/Deluge.xml
deleted file mode 100644
index bfb60d453ad5..000000000000
--- a/src/chrome/content/rules/Deluge.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-	
-	
-	
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Demand-Base.xml b/src/chrome/content/rules/Demand-Base.xml
index 16718ddb8a56..fca0bf3a64f3 100644
--- a/src/chrome/content/rules/Demand-Base.xml
+++ b/src/chrome/content/rules/Demand-Base.xml
@@ -37,7 +37,7 @@ Fetch error: http://leads.demandbase.com/ => https://leads.demandbase.com/: (6,
 	* Secured by us
 
 -->
-
+
 
 	
@@ -60,7 +60,7 @@ Fetch error: http://leads.demandbase.com/ => https://leads.demandbase.com/: (6,
 	
 	
 
-	
+	
 
 
 	
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-	
-
-
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Demand-Media.xml b/src/chrome/content/rules/Demand-Media.xml
index 3c5fa1e094e4..493e82beb33d 100644
--- a/src/chrome/content/rules/Demand-Media.xml
+++ b/src/chrome/content/rules/Demand-Media.xml
@@ -1,66 +1,31 @@
-
 
-
-
-	
-	
-
-	
-	
-	
-	
-
+
+	
 
 	
 
-
-	
-
-
+	
 
diff --git a/src/chrome/content/rules/Demand-driver.com.xml b/src/chrome/content/rules/Demand-driver.com.xml
deleted file mode 100644
index 4fc8b6d7fd8e..000000000000
--- a/src/chrome/content/rules/Demand-driver.com.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/DemandStudios.com.xml b/src/chrome/content/rules/DemandStudios.com.xml
new file mode 100644
index 000000000000..afa48cdff586
--- /dev/null
+++ b/src/chrome/content/rules/DemandStudios.com.xml
@@ -0,0 +1,23 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Demandware.net.xml b/src/chrome/content/rules/Demandware.net.xml
deleted file mode 100644
index 9e362c36fad1..000000000000
--- a/src/chrome/content/rules/Demandware.net.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-
-
-	
-
-		
-		
-		
-
-
diff --git a/src/chrome/content/rules/Demandware.xml b/src/chrome/content/rules/Demandware.xml
index fe744a0d3df8..242f30382f2a 100644
--- a/src/chrome/content/rules/Demandware.xml
+++ b/src/chrome/content/rules/Demandware.xml
@@ -1,13 +1,14 @@
 
 
-
-
-	
-	
-	
-	
-
-	
-	
-
-		
-		
-
-			
-			
-			
-			
-
-			
-			
-			
+
 
+	
+	
 		
 		
+	
+	
+	
+	
+	
+	
 
 
 	
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Demdex.net.xml b/src/chrome/content/rules/Demdex.net.xml
index e18cb48dfa2e..2f9821586fa3 100644
--- a/src/chrome/content/rules/Demdex.net.xml
+++ b/src/chrome/content/rules/Demdex.net.xml
@@ -33,7 +33,7 @@
 	
 	
 
-	
+	
 
 
 	 https://blog.demisto.com/: (51, "SSL: n
 		- www.blog.demisto.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Democrat_and_Chronicle.xml b/src/chrome/content/rules/Democrat_and_Chronicle.xml
index 1b8c2e1d7f48..890df88ca889 100644
--- a/src/chrome/content/rules/Democrat_and_Chronicle.xml
+++ b/src/chrome/content/rules/Democrat_and_Chronicle.xml
@@ -11,9 +11,12 @@ Fetch error: http://democratandchronicle.com/ => https://www.democratandchronicl
 			- feeds		(redirects to ipad; mismatched, CN: roctoday.democratandchronicle.com)
 			- rocdocs	(no https)
 			- tablet	(403, akamai)
+      - localshopping (403)
 
 		- democratandchronicle.gannettonline.com
-
+    - meetthebabies.democratandchronicle.com (no alternative SSL cert)
+    - roctoday.democratandchronicle.com (host unresolved)
+    - findnsave.democratandchronicle.com (no alternative SSL cert)
 
 	Problematic subdomains:
 
@@ -21,8 +24,6 @@ Fetch error: http://democratandchronicle.com/ => https://www.democratandchronicl
 		- cmsimg		(503, akamai)
 		- findnsave		(pages redirect to http; mismatched, CN: *.findnsave.com)
 		- ipad			(works; mismatched, CN: roctoday.democratandchronicle.com)
-		- localshopping		(works; mismatched, CN: *.shoplocal.com)
-
 
 	Mixed images from:
 
@@ -32,12 +33,17 @@ Fetch error: http://democratandchronicle.com/ => https://www.democratandchronicl
 
 	No insecure css nor scripts.
 
+  Timeout
+    - classifieds
+
 -->
 
 
 	
-	
-
+	
+	
+	
+	
 
 	
 	
 
-
 	
 
-	
-
-	
-
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Demonoid.xml b/src/chrome/content/rules/Demonoid.xml
deleted file mode 100644
index e4b1a5a70979..000000000000
--- a/src/chrome/content/rules/Demonoid.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-	
-	
-
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Demosisto.hk.xml b/src/chrome/content/rules/Demosisto.hk.xml
new file mode 100644
index 000000000000..7ccd0578a4ff
--- /dev/null
+++ b/src/chrome/content/rules/Demosisto.hk.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Denfri.dk.xml b/src/chrome/content/rules/Denfri.dk.xml
index eae449736770..fcd56e7dc234 100644
--- a/src/chrome/content/rules/Denfri.dk.xml
+++ b/src/chrome/content/rules/Denfri.dk.xml
@@ -5,7 +5,7 @@ Fetch error: http://denfri.dk/ => https://denfri.dk/: (60, 'SSL certificate prob
 Fetch error: http://www.denfri.dk/ => https://www.denfri.dk/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Denh.am.xml b/src/chrome/content/rules/Denh.am.xml
deleted file mode 100644
index 555546d8f979..000000000000
--- a/src/chrome/content/rules/Denh.am.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Denic.de.xml b/src/chrome/content/rules/Denic.de.xml
index e60ab2b4dd38..1fdbdea67a61 100644
--- a/src/chrome/content/rules/Denic.de.xml
+++ b/src/chrome/content/rules/Denic.de.xml
@@ -5,11 +5,11 @@ Fetch error: http://www.secure.denic.de/ => https://www.secure.denic.de/: (6, 'C
 
 	Announcement:
 		- https://denic.de/en/denic-in-dialogue/news/4079.html
-		
+
 	Nonfunctional subdomains:
 		- secure     -> DNS resolve error
 -->
-
+
     
     
     
diff --git a/src/chrome/content/rules/Denis_Matsuev.xml b/src/chrome/content/rules/Denis_Matsuev.xml
index bc976ad0032c..2569427a0359 100644
--- a/src/chrome/content/rules/Denis_Matsuev.xml
+++ b/src/chrome/content/rules/Denis_Matsuev.xml
@@ -5,7 +5,7 @@ Fetch error: http://matsuev.com/ => https://matsuev.com/: (60, 'SSL certificate
 Fetch error: http://www.matsuev.com/ => https://www.matsuev.com/: (60, 'SSL certificate problem: self signed certificate')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.matsuev.com/ => https://www.matsuev.com/: (60, 'SSL cert
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/DepFile.com.xml b/src/chrome/content/rules/DepFile.com.xml
deleted file mode 100644
index bb26ed1aa82a..000000000000
--- a/src/chrome/content/rules/DepFile.com.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/DepartmentofEducation.xml b/src/chrome/content/rules/DepartmentofEducation.xml
index b224b201d7c7..eda0e32c2ef6 100644
--- a/src/chrome/content/rules/DepartmentofEducation.xml
+++ b/src/chrome/content/rules/DepartmentofEducation.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/DepartmentofEmployment.xml b/src/chrome/content/rules/DepartmentofEmployment.xml
index bd4af13c589c..a9d0f224c6d4 100644
--- a/src/chrome/content/rules/DepartmentofEmployment.xml
+++ b/src/chrome/content/rules/DepartmentofEmployment.xml
@@ -4,4 +4,4 @@
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/DepartmentofForeignAffairsandTrade.xml b/src/chrome/content/rules/DepartmentofForeignAffairsandTrade.xml
index 53322d7bb009..c642bebad117 100644
--- a/src/chrome/content/rules/DepartmentofForeignAffairsandTrade.xml
+++ b/src/chrome/content/rules/DepartmentofForeignAffairsandTrade.xml
@@ -4,13 +4,15 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://dfat.gov.au/ => https://www.dfat.gov.au/: Too many redirects while fetching 'https://www.dfat.gov.au/'
 
 -->
-
+
 	
-	
+	
+	
+	
 
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/DepartmentofInfrastructureandRegionalDevelopment.xml b/src/chrome/content/rules/DepartmentofInfrastructureandRegionalDevelopment.xml
index 62a31ae94c6f..0ef278abc63b 100644
--- a/src/chrome/content/rules/DepartmentofInfrastructureandRegionalDevelopment.xml
+++ b/src/chrome/content/rules/DepartmentofInfrastructureandRegionalDevelopment.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Dephormation.org.uk.xml b/src/chrome/content/rules/Dephormation.org.uk.xml
index dc1ff15b571f..db33a2f91c13 100644
--- a/src/chrome/content/rules/Dephormation.org.uk.xml
+++ b/src/chrome/content/rules/Dephormation.org.uk.xml
@@ -3,4 +3,4 @@
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Deposit-Files.xml b/src/chrome/content/rules/Deposit-Files.xml
index 69b4e357114f..323a4d2f2aac 100644
--- a/src/chrome/content/rules/Deposit-Files.xml
+++ b/src/chrome/content/rules/Deposit-Files.xml
@@ -24,7 +24,7 @@
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Deprexis.xml b/src/chrome/content/rules/Deprexis.xml
index 48dde2cd0d5c..58fd6201d606 100644
--- a/src/chrome/content/rules/Deprexis.xml
+++ b/src/chrome/content/rules/Deprexis.xml
@@ -10,7 +10,7 @@ Fetch error: http://deprexis.com/ => https://deprexis.com/: (51, "SSL: no altern
 		- (www.)deprexis.eu	(refused)
 
 -->
-
+
 
 	
 	
@@ -22,4 +22,4 @@ Fetch error: http://deprexis.com/ => https://deprexis.com/: (51, "SSL: no altern
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Der-preis-jaeger.de.xml b/src/chrome/content/rules/Der-preis-jaeger.de.xml
index 1f77b64e31ee..fb4cf4bb3038 100644
--- a/src/chrome/content/rules/Der-preis-jaeger.de.xml
+++ b/src/chrome/content/rules/Der-preis-jaeger.de.xml
@@ -15,7 +15,7 @@ Fetch error: http://www.der-preis-jaeger.de/ => https://www.der-preis-jaeger.de/
 			- myclipster.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Derpibooru.xml b/src/chrome/content/rules/Derpibooru.xml
index 5f37b7248906..6279bcb36269 100644
--- a/src/chrome/content/rules/Derpibooru.xml
+++ b/src/chrome/content/rules/Derpibooru.xml
@@ -4,11 +4,9 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://img5.derpicdn.net/img/view/2015/1/18/808969.png => https://img5.derpicdn.net/img/view/2015/1/18/808969.png: (6, 'Could not resolve host: img5.derpicdn.net')
 
 -->
-
+
     
     
-    
-    
     
     
 
diff --git a/src/chrome/content/rules/Derpy.me.xml b/src/chrome/content/rules/Derpy.me.xml
index 0579ff321d3c..f539eb923544 100644
--- a/src/chrome/content/rules/Derpy.me.xml
+++ b/src/chrome/content/rules/Derpy.me.xml
@@ -15,7 +15,7 @@ Fetch error: http://piwik.derpy.me/ => https://piwik.derpy.me/: (60, 'SSL certif
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Derwesten.de.xml b/src/chrome/content/rules/Derwesten.de.xml
index 7bf9c8b1198f..eee8c4461627 100644
--- a/src/chrome/content/rules/Derwesten.de.xml
+++ b/src/chrome/content/rules/Derwesten.de.xml
@@ -1,10 +1,12 @@
 
-
+
+
+
 
 
 
 
 
-
 
+
 
diff --git a/src/chrome/content/rules/Desert_News.xml b/src/chrome/content/rules/Desert_News.xml
deleted file mode 100644
index bb16c7b0ff11..000000000000
--- a/src/chrome/content/rules/Desert_News.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-	
-	
-		
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/DesignAddict.xml b/src/chrome/content/rules/DesignAddict.xml
index 992c476d91f4..fdc841862add 100644
--- a/src/chrome/content/rules/DesignAddict.xml
+++ b/src/chrome/content/rules/DesignAddict.xml
@@ -7,20 +7,19 @@ Fetch error: http://generationawake.eu/ => https://generationawake.eu/: (60, 'SS
 Disabled by https-everywhere-checker because:
 Fetch error: http://designaddict.com/ => https://designaddict.com/: (60, 'SSL certificate problem: self signed certificate')
 -->
-
+
 
 	
-	
 	
-	
+	
+	
 
 
 	
-	
+	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Designova.net.xml b/src/chrome/content/rules/Designova.net.xml
index b8d53eaa8305..4d3fb5732681 100644
--- a/src/chrome/content/rules/Designova.net.xml
+++ b/src/chrome/content/rules/Designova.net.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.designova.net/ => https://www.designova.net/: (60, 'SSL
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Desire2learn.com.xml b/src/chrome/content/rules/Desire2learn.com.xml
index 939b1dd3139e..7e34eca23daf 100644
--- a/src/chrome/content/rules/Desire2learn.com.xml
+++ b/src/chrome/content/rules/Desire2learn.com.xml
@@ -29,13 +29,15 @@ Fetch error: http://desire2learn.com/ => https://desire2learn.com/: (60, 'SSL ce
 
 
 	
-	
+	
+	
+	
+	
 
 
-	
+	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Desjardins.xml b/src/chrome/content/rules/Desjardins.xml
index 7ff38658e47a..e325088be102 100644
--- a/src/chrome/content/rules/Desjardins.xml
+++ b/src/chrome/content/rules/Desjardins.xml
@@ -2,7 +2,7 @@
 
 
 	blogues.desjardins.com does not work with https at this time
-  
+
 -->
 
   
@@ -10,7 +10,7 @@
 	
   
   
-  
+
   
   
   
@@ -18,7 +18,7 @@
   
   
-	 
+
   
 	
diff --git a/src/chrome/content/rules/Desk.com.xml b/src/chrome/content/rules/Desk.com.xml
index 7d2f1609e949..9950d60a233f 100644
--- a/src/chrome/content/rules/Desk.com.xml
+++ b/src/chrome/content/rules/Desk.com.xml
@@ -1,87 +1,634 @@
-
 
-
-
-	
-	
+
 	
-	
-
-
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-	
+	
+	
+	
+	
+	
 
+	
 
diff --git a/src/chrome/content/rules/Despora.de.xml b/src/chrome/content/rules/Despora.de.xml
deleted file mode 100644
index d058dbbc3729..000000000000
--- a/src/chrome/content/rules/Despora.de.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Destructoid.xml b/src/chrome/content/rules/Destructoid.xml
index 735f5f085248..5e9531ee8850 100644
--- a/src/chrome/content/rules/Destructoid.xml
+++ b/src/chrome/content/rules/Destructoid.xml
@@ -1,14 +1,12 @@
-
+
 	
 	
 	
 	
-	
-		
 		
 		
-		
-		
+
 	
+
 	
 
diff --git a/src/chrome/content/rules/Desura.xml b/src/chrome/content/rules/Desura.xml
deleted file mode 100644
index a298cb7b546e..000000000000
--- a/src/chrome/content/rules/Desura.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Desy.de.xml b/src/chrome/content/rules/Desy.de.xml
index 49d87d8a5d48..034769cf176a 100644
--- a/src/chrome/content/rules/Desy.de.xml
+++ b/src/chrome/content/rules/Desy.de.xml
@@ -63,7 +63,7 @@ Fetch error: http://wof-piwik2.desy.de/ => https://wof-piwik2.desy.de/: (60, 'SS
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Details.com-falsemixed.xml b/src/chrome/content/rules/Details.com-falsemixed.xml
index 20234262e1e7..59df37df1595 100644
--- a/src/chrome/content/rules/Details.com-falsemixed.xml
+++ b/src/chrome/content/rules/Details.com-falsemixed.xml
@@ -8,7 +8,7 @@ Fetch error: http://wp-poc.details.com/ => https://wp-poc.details.com/: (6, 'Cou
 	For rules not causing false/broken MCB, see Details.com.xml.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Details.xml b/src/chrome/content/rules/Details.xml
index 07bb14d14100..c402bfae2a1a 100644
--- a/src/chrome/content/rules/Details.xml
+++ b/src/chrome/content/rules/Details.xml
@@ -44,7 +44,9 @@
 
 
 	
-	
+	
+	
+	
 		
 
 
diff --git a/src/chrome/content/rules/Deutsche-BKK.xml b/src/chrome/content/rules/Deutsche-BKK.xml
deleted file mode 100644
index 5a9085272409..000000000000
--- a/src/chrome/content/rules/Deutsche-BKK.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/src/chrome/content/rules/Deutsche-Finanzagentur.de.xml b/src/chrome/content/rules/Deutsche-Finanzagentur.de.xml
new file mode 100644
index 000000000000..224245230a14
--- /dev/null
+++ b/src/chrome/content/rules/Deutsche-Finanzagentur.de.xml
@@ -0,0 +1,19 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Deutsche-Rohstoffagentur.de.xml b/src/chrome/content/rules/Deutsche-Rohstoffagentur.de.xml
new file mode 100644
index 000000000000..5998c3a69499
--- /dev/null
+++ b/src/chrome/content/rules/Deutsche-Rohstoffagentur.de.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Deutsche_Boerse.xml b/src/chrome/content/rules/Deutsche_Boerse.xml
index 748281a4cb6e..5fb034cc421a 100644
--- a/src/chrome/content/rules/Deutsche_Boerse.xml
+++ b/src/chrome/content/rules/Deutsche_Boerse.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.deutsche-boerse.com/ => https://www.deutsche-boerse.com/
 
 -->
 
-
+
     
     
 
diff --git a/src/chrome/content/rules/Deutsche_Telekom.xml b/src/chrome/content/rules/Deutsche_Telekom.xml
index dc575789d359..f615ad78dee9 100644
--- a/src/chrome/content/rules/Deutsche_Telekom.xml
+++ b/src/chrome/content/rules/Deutsche_Telekom.xml
@@ -11,7 +11,6 @@ Fetch error: http://videomeet.telekom.de/ => https://videomeet.telekom.de/: (6,
 	Other Deutsche Telekom rulesets:
 
 		- T-Mobile.xml
-		- T-Mobile.co.uk.xml
 		- T-Online.xml
 		- TMobile.com.xml
 		- TMobile.nl.xml
@@ -20,7 +19,6 @@ Fetch error: http://videomeet.telekom.de/ => https://videomeet.telekom.de/: (6,
 		- Telekom-Partnerwelt.de.xml
 		- Telekom-Profis.de.xml
 		- Telekom-dienste.de.xml
-		- Wtpx-Telekom.com.xml
 
 
 	Insecure cookies are set for these domains and hosts:
@@ -35,7 +33,7 @@ Fetch error: http://videomeet.telekom.de/ => https://videomeet.telekom.de/: (6,
 		- Bug on (www.)?forum from stats.t-online.de
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Deutscher_Bundestag.xml b/src/chrome/content/rules/Deutscher_Bundestag.xml
index 3ec48890992c..7090c3cdfb94 100644
--- a/src/chrome/content/rules/Deutscher_Bundestag.xml
+++ b/src/chrome/content/rules/Deutscher_Bundestag.xml
@@ -1,19 +1,28 @@
 
 
 
 	
-	
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 	
 
+	
 
-	
-
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Deutsches_Klimaportal.xml b/src/chrome/content/rules/Deutsches_Klimaportal.xml
new file mode 100644
index 000000000000..d3dd591388f0
--- /dev/null
+++ b/src/chrome/content/rules/Deutsches_Klimaportal.xml
@@ -0,0 +1,10 @@
+
+
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/DeutschlandRadio.xml b/src/chrome/content/rules/DeutschlandRadio.xml
deleted file mode 100644
index 2070219db274..000000000000
--- a/src/chrome/content/rules/DeutschlandRadio.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Deutschlandfunk.de.xml b/src/chrome/content/rules/Deutschlandfunk.de.xml
new file mode 100644
index 000000000000..aa033bda91c7
--- /dev/null
+++ b/src/chrome/content/rules/Deutschlandfunk.de.xml
@@ -0,0 +1,32 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Deutschlandfunkkultur.de.xml b/src/chrome/content/rules/Deutschlandfunkkultur.de.xml
new file mode 100644
index 000000000000..7ab3342ca8fc
--- /dev/null
+++ b/src/chrome/content/rules/Deutschlandfunkkultur.de.xml
@@ -0,0 +1,18 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Deutschlandfunknova.de.xml b/src/chrome/content/rules/Deutschlandfunknova.de.xml
new file mode 100644
index 000000000000..92bce48d613c
--- /dev/null
+++ b/src/chrome/content/rules/Deutschlandfunknova.de.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Deutschlandradio.de.xml b/src/chrome/content/rules/Deutschlandradio.de.xml
new file mode 100644
index 000000000000..71c15eb1ba04
--- /dev/null
+++ b/src/chrome/content/rules/Deutschlandradio.de.xml
@@ -0,0 +1,47 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/DevStructure.xml b/src/chrome/content/rules/DevStructure.xml
index 003122f67101..8d223f77532f 100644
--- a/src/chrome/content/rules/DevStructure.xml
+++ b/src/chrome/content/rules/DevStructure.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://devstructure.com/ => https://devstructure.com/: (51, "SSL: no alternative certificate subject name matches target host name 'devstructure.com'")
 Fetch error: http://www.devstructure.com/ => https://devstructure.com/: (51, "SSL: no alternative certificate subject name matches target host name 'devstructure.com'")
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/DevZing.com.xml b/src/chrome/content/rules/DevZing.com.xml
index e7e24af899df..08ee82c58c72 100644
--- a/src/chrome/content/rules/DevZing.com.xml
+++ b/src/chrome/content/rules/DevZing.com.xml
@@ -22,4 +22,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Devast.io.xml b/src/chrome/content/rules/Devast.io.xml
new file mode 100644
index 000000000000..454fbc6eee0e
--- /dev/null
+++ b/src/chrome/content/rules/Devast.io.xml
@@ -0,0 +1,23 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Deverge.com.xml b/src/chrome/content/rules/Deverge.com.xml
new file mode 100644
index 000000000000..5247ec5c780a
--- /dev/null
+++ b/src/chrome/content/rules/Deverge.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Devmonk.com.xml b/src/chrome/content/rules/Devmonk.com.xml
deleted file mode 100644
index 348bbe342061..000000000000
--- a/src/chrome/content/rules/Devmonk.com.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Devon.gov.uk.xml b/src/chrome/content/rules/Devon.gov.uk.xml
index bd3e0a818ab6..c12cd730200c 100644
--- a/src/chrome/content/rules/Devon.gov.uk.xml
+++ b/src/chrome/content/rules/Devon.gov.uk.xml
@@ -28,6 +28,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/DevonandCornwallPolice.xml b/src/chrome/content/rules/DevonandCornwallPolice.xml
index c43ae96b39f8..5c82a507a845 100644
--- a/src/chrome/content/rules/DevonandCornwallPolice.xml
+++ b/src/chrome/content/rules/DevonandCornwallPolice.xml
@@ -17,7 +17,7 @@ Fetch error: http://devon-cornwall.police.uk/ => https://devon-cornwall.police.u
 			- digitalmediablog.devon-cornwall.police.uk
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Devpen.io.xml b/src/chrome/content/rules/Devpen.io.xml
new file mode 100644
index 000000000000..a991acf78e14
--- /dev/null
+++ b/src/chrome/content/rules/Devpen.io.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Devprom.ru.xml b/src/chrome/content/rules/Devprom.ru.xml
index 4c07fe3f440f..460c97b694bf 100644
--- a/src/chrome/content/rules/Devprom.ru.xml
+++ b/src/chrome/content/rules/Devprom.ru.xml
@@ -11,7 +11,7 @@
 	NB: Server sends no certificate chain, see https://whatsmychaincert.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Diakonie.de.xml b/src/chrome/content/rules/Diakonie.de.xml
new file mode 100644
index 000000000000..1b5397276773
--- /dev/null
+++ b/src/chrome/content/rules/Diakonie.de.xml
@@ -0,0 +1,20 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Dianomi.com.xml b/src/chrome/content/rules/Dianomi.com.xml
new file mode 100644
index 000000000000..54155cdc5d73
--- /dev/null
+++ b/src/chrome/content/rules/Dianomi.com.xml
@@ -0,0 +1,24 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Dianomi.xml b/src/chrome/content/rules/Dianomi.xml
deleted file mode 100644
index 3dafb7d14562..000000000000
--- a/src/chrome/content/rules/Dianomi.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Diasp.eu.xml b/src/chrome/content/rules/Diasp.eu.xml
index f8e352c9ebc2..94300c36e61e 100644
--- a/src/chrome/content/rules/Diasp.eu.xml
+++ b/src/chrome/content/rules/Diasp.eu.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.diasp.eu/ => https://www.diasp.eu/: (51, "SSL: no alternative certificate subject name matches target host name 'www.diasp.eu'")
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Diaspora_Brazil.org.xml b/src/chrome/content/rules/Diaspora_Brazil.org.xml
index 9df01d7d6746..d2564a2bd7a9 100644
--- a/src/chrome/content/rules/Diaspora_Brazil.org.xml
+++ b/src/chrome/content/rules/Diaspora_Brazil.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.diasporabrazil.org/ => https://www.diasporabrazil.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.diasporabrazil.org'")
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Dice-problematic.xml b/src/chrome/content/rules/Dice-problematic.xml
deleted file mode 100644
index 3235dab79b11..000000000000
--- a/src/chrome/content/rules/Dice-problematic.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-
-		
-		
-
-			
-			
-			
-			
-
-			
-			
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Dice.com.xml b/src/chrome/content/rules/Dice.com.xml
new file mode 100644
index 000000000000..d87918b34c36
--- /dev/null
+++ b/src/chrome/content/rules/Dice.com.xml
@@ -0,0 +1,30 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Dice.xml b/src/chrome/content/rules/Dice.xml
deleted file mode 100644
index 6384a9fbc5d3..000000000000
--- a/src/chrome/content/rules/Dice.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-
-	
-	
-
-		
-		
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-			
-
-
-	
-	
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Dict.cn.xml b/src/chrome/content/rules/Dict.cn.xml
new file mode 100644
index 000000000000..871464899840
--- /dev/null
+++ b/src/chrome/content/rules/Dict.cn.xml
@@ -0,0 +1,46 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
\ No newline at end of file
diff --git a/src/chrome/content/rules/Dictionary.com.xml b/src/chrome/content/rules/Dictionary.com.xml
new file mode 100644
index 000000000000..b135493b1410
--- /dev/null
+++ b/src/chrome/content/rules/Dictionary.com.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+		
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/DidierStevens.xml b/src/chrome/content/rules/DidierStevens.xml
new file mode 100644
index 000000000000..a9899301438b
--- /dev/null
+++ b/src/chrome/content/rules/DidierStevens.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Die-Linke.lgbt.xml b/src/chrome/content/rules/Die-Linke.lgbt.xml
deleted file mode 100644
index d472a6b8f4fe..000000000000
--- a/src/chrome/content/rules/Die-Linke.lgbt.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/DieTrollDie.com.xml b/src/chrome/content/rules/DieTrollDie.com.xml
deleted file mode 100644
index 75a72d376f6e..000000000000
--- a/src/chrome/content/rules/DieTrollDie.com.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Diesel.rs.xml b/src/chrome/content/rules/Diesel.rs.xml
new file mode 100644
index 000000000000..482ef345b13d
--- /dev/null
+++ b/src/chrome/content/rules/Diesel.rs.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/DifferenceBetween.info.xml b/src/chrome/content/rules/DifferenceBetween.info.xml
new file mode 100644
index 000000000000..372ceeb9d9c4
--- /dev/null
+++ b/src/chrome/content/rules/DifferenceBetween.info.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Difference_Between.xml b/src/chrome/content/rules/Difference_Between.xml
index a09c5a255cfe..5b6c7cddc81e 100644
--- a/src/chrome/content/rules/Difference_Between.xml
+++ b/src/chrome/content/rules/Difference_Between.xml
@@ -6,7 +6,8 @@
 
 
 	
-	
+	
+	
 
 
 	 https://stat.difi.no/: (6, 'Could not resol
 
 -->
 
-
+
 
 	
 	
@@ -78,7 +78,7 @@ Fetch error: http://stat.difi.no/ => https://stat.difi.no/: (6, 'Could not resol
 	
 	
 	
-	
+
 		
 		
diff --git a/src/chrome/content/rules/DigCoin.com.xml b/src/chrome/content/rules/DigCoin.com.xml
index dd0c2a14c0e6..e83cdf19588a 100644
--- a/src/chrome/content/rules/DigCoin.com.xml
+++ b/src/chrome/content/rules/DigCoin.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.digcoin.com/ => https://www.digcoin.com/: (7, 'Failed to
 		- digcoin.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Digg.xml b/src/chrome/content/rules/Digg.xml
index 4739302d9462..bbc7607c8cab 100644
--- a/src/chrome/content/rules/Digg.xml
+++ b/src/chrome/content/rules/Digg.xml
@@ -1,33 +1,20 @@
 
-
 
+
 	
-	
-
+	
+	
+	
 
 	
 
-
-	
-
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Digi-Key.xml b/src/chrome/content/rules/Digi-Key.xml
index 4b5211d4dcfe..3e3f5f9e69c3 100644
--- a/src/chrome/content/rules/Digi-Key.xml
+++ b/src/chrome/content/rules/Digi-Key.xml
@@ -35,7 +35,7 @@ Fetch error: http://punchouttest.digikey.de/ => https://punchouttest.digikey.de/
 			- punchouttest
 
 -->
-
+
 
 	
 	
@@ -61,7 +61,7 @@ Fetch error: http://punchouttest.digikey.de/ => https://punchouttest.digikey.de/
 			These paths redirect to http:
 
 				- scripts/dksearch/dksus.dll
-							
+
 		exclusion pattern="^http://(www\.)?digikey\.(com|de)/(product-(detail|search)|scripts/dksearch)" /-->
 
 
diff --git a/src/chrome/content/rules/Digi.hu.xml b/src/chrome/content/rules/Digi.hu.xml
index 05076751f054..840c9ba9e961 100644
--- a/src/chrome/content/rules/Digi.hu.xml
+++ b/src/chrome/content/rules/Digi.hu.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://ox.digi.hu/ => https://ox.digi.hu/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Digia.xml b/src/chrome/content/rules/Digia.xml
index a5f3807fd288..2a736bef127b 100644
--- a/src/chrome/content/rules/Digia.xml
+++ b/src/chrome/content/rules/Digia.xml
@@ -17,16 +17,17 @@ Fetch error: http://blog.qt.digia.com/ => https://blog.qt.digia.com/: (51, "SSL:
 		- vousikertomus2011	(ditto)
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
-	
+	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Digilinux.ru.xml b/src/chrome/content/rules/Digilinux.ru.xml
index 508bfbda0498..726d541ca34f 100644
--- a/src/chrome/content/rules/Digilinux.ru.xml
+++ b/src/chrome/content/rules/Digilinux.ru.xml
@@ -23,4 +23,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Digint.ch.xml b/src/chrome/content/rules/Digint.ch.xml
new file mode 100644
index 000000000000..d8d342d43101
--- /dev/null
+++ b/src/chrome/content/rules/Digint.ch.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Digiology.org.xml b/src/chrome/content/rules/Digiology.org.xml
new file mode 100644
index 000000000000..adc039eae700
--- /dev/null
+++ b/src/chrome/content/rules/Digiology.org.xml
@@ -0,0 +1,22 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Digital-River.xml b/src/chrome/content/rules/Digital-River.xml
index 25e634fea5fe..b1f8d035fb9a 100644
--- a/src/chrome/content/rules/Digital-River.xml
+++ b/src/chrome/content/rules/Digital-River.xml
@@ -6,7 +6,6 @@
 		- Element_5.xml
 		- Esellerate.net.xml
 		- Find_My_Order.com.xml
-		- Marketstudio.net.xml
 		- MyCommerce.xml
 		- Netflame.cc.xml
 		- Share_it.com.xml
@@ -15,13 +14,12 @@
 	Nonfunctional hosts in *digitalriver.com:
 
 		- info *
+    - corporate
 
-	* invalid certificate
+	* invalid certificate\
 
 
 	Partially covered hosts in *digitalriver.com:
-
-		- corporate	(pages redirect to http)
 		- info		(→ na-sj03.marketo.com)
 
 
@@ -60,29 +58,14 @@
 	
 	
-	
-	
 	
 	
-	
 	
 	
 
-		
-		
-
-		
-
-		
-
-
-	
+	
 	
-
-	
+	
 	
 
 	
diff --git a/src/chrome/content/rules/DigitalForensicsMagazine.xml b/src/chrome/content/rules/DigitalForensicsMagazine.xml
index 190402d7cd26..8837e7efebfe 100644
--- a/src/chrome/content/rules/DigitalForensicsMagazine.xml
+++ b/src/chrome/content/rules/DigitalForensicsMagazine.xml
@@ -19,7 +19,7 @@
 	
 	
 
-	
+	
 
 
 	
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+
+	
+	
+	
+
+	
+	
+	
+	
+
+	
+
+	
+	
+
+
+	
+
+
diff --git a/src/chrome/content/rules/Digital_Dollhouse.com.xml b/src/chrome/content/rules/Digital_Dollhouse.com.xml
index d0eb9767dcdf..224c50d2a9e8 100644
--- a/src/chrome/content/rules/Digital_Dollhouse.com.xml
+++ b/src/chrome/content/rules/Digital_Dollhouse.com.xml
@@ -18,7 +18,7 @@ Fetch error: http://www.digitaldollhouse.com/ => https://www.digitaldollhouse.co
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Digital_Ocean.com.xml b/src/chrome/content/rules/Digital_Ocean.com.xml
deleted file mode 100644
index 2e47bda8c3ae..000000000000
--- a/src/chrome/content/rules/Digital_Ocean.com.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-	
-	
-	
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Digital_Shelf_Space.xml b/src/chrome/content/rules/Digital_Shelf_Space.xml
index cfddc04cc11b..c1b044cbc8db 100644
--- a/src/chrome/content/rules/Digital_Shelf_Space.xml
+++ b/src/chrome/content/rules/Digital_Shelf_Space.xml
@@ -11,7 +11,7 @@ Fetch error: http://cdn.mypypeline.com/ => https://cdn.mypypeline.com/: (6, 'Cou
 	* Times out
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Digital_Trends.com.xml b/src/chrome/content/rules/Digital_Trends.com.xml
deleted file mode 100644
index fa716f311db6..000000000000
--- a/src/chrome/content/rules/Digital_Trends.com.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Digital_WPC.com.xml b/src/chrome/content/rules/Digital_WPC.com.xml
index 03fb08e3e4b0..802147e78ee2 100644
--- a/src/chrome/content/rules/Digital_WPC.com.xml
+++ b/src/chrome/content/rules/Digital_WPC.com.xml
@@ -29,7 +29,7 @@ Fetch error: http://connect.digitalwpc.com/ => https://connect.digitalwpc.com/:
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Digitaltrends.com.xml b/src/chrome/content/rules/Digitaltrends.com.xml
new file mode 100644
index 000000000000..685cff64c52a
--- /dev/null
+++ b/src/chrome/content/rules/Digitaltrends.com.xml
@@ -0,0 +1,33 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Digitaria.xml b/src/chrome/content/rules/Digitaria.xml
index 797cfefb9ca5..bc22178ec0c5 100644
--- a/src/chrome/content/rules/Digitaria.xml
+++ b/src/chrome/content/rules/Digitaria.xml
@@ -13,17 +13,15 @@ Fetch error: http://redmine.digitaria.com/ => https://redmine.digitaria.com/: (7
 
 
 	
-	
+	
+	
 
 
 	
 	
 
 
-	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Digitec.ch.xml b/src/chrome/content/rules/Digitec.ch.xml
deleted file mode 100644
index 801989ae5517..000000000000
--- a/src/chrome/content/rules/Digitec.ch.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-	
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Digitecgalaxus.ch.xml b/src/chrome/content/rules/Digitecgalaxus.ch.xml
deleted file mode 100644
index 003e40ad3893..000000000000
--- a/src/chrome/content/rules/Digitecgalaxus.ch.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Digium.xml b/src/chrome/content/rules/Digium.xml
index 805d84de8065..7c26fa01bd90 100644
--- a/src/chrome/content/rules/Digium.xml
+++ b/src/chrome/content/rules/Digium.xml
@@ -30,7 +30,9 @@
 
 
 	
-	
+	
+	
+	
 
 		
 
 
-	
-	
-	
 	
 	
 	
@@ -20,15 +17,6 @@
 	
 
 
-	
-
-	
-
-	
-
 	
 
diff --git a/src/chrome/content/rules/Digiweb.xml b/src/chrome/content/rules/Digiweb.xml
index 6bffa190fb91..2f658d7d919c 100644
--- a/src/chrome/content/rules/Digiweb.xml
+++ b/src/chrome/content/rules/Digiweb.xml
@@ -34,7 +34,7 @@ Fetch error: http://ncm.novarait.com/ => https://ncm.novarait.com/: (7, 'Failed
 		- (www.)whoislookup.ie		(cert: novweb.novara.ie, self-signed; shows that domain's data)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Diigo.xml b/src/chrome/content/rules/Diigo.xml
index 15f1bf428d07..c929060161de 100644
--- a/src/chrome/content/rules/Diigo.xml
+++ b/src/chrome/content/rules/Diigo.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/DilbertFiles.org.xml b/src/chrome/content/rules/DilbertFiles.org.xml
index 22bb4c7bf675..a805c1f968b5 100644
--- a/src/chrome/content/rules/DilbertFiles.org.xml
+++ b/src/chrome/content/rules/DilbertFiles.org.xml
@@ -14,7 +14,7 @@ Fetch error: http://secure.dilbertfiles.com/ => https://secure.dilbertfiles.com/
 		- Image on secure from www
 
 -->
-
+
 
 	
 
@@ -24,4 +24,4 @@ Fetch error: http://secure.dilbertfiles.com/ => https://secure.dilbertfiles.com/
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Dilcdn.com.xml b/src/chrome/content/rules/Dilcdn.com.xml
index cccba2003236..36a4f6051b0a 100644
--- a/src/chrome/content/rules/Dilcdn.com.xml
+++ b/src/chrome/content/rules/Dilcdn.com.xml
@@ -19,4 +19,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Dillinger.io.xml b/src/chrome/content/rules/Dillinger.io.xml
new file mode 100644
index 000000000000..6aae15d3fb5b
--- /dev/null
+++ b/src/chrome/content/rules/Dillinger.io.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Dinahosting.pt.xml b/src/chrome/content/rules/Dinahosting.pt.xml
index faeecbc895aa..d3f378649861 100644
--- a/src/chrome/content/rules/Dinahosting.pt.xml
+++ b/src/chrome/content/rules/Dinahosting.pt.xml
@@ -15,7 +15,7 @@ Fetch error: http://www.dinahosting.pt/ => https://dinahosting.pt/: (51, "SSL: n
 		- .dinahosting.pt
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Direct-Marketing-Association.xml b/src/chrome/content/rules/Direct-Marketing-Association.xml
index fd63408a5441..90db3de74ff5 100644
--- a/src/chrome/content/rules/Direct-Marketing-Association.xml
+++ b/src/chrome/content/rules/Direct-Marketing-Association.xml
@@ -3,7 +3,7 @@
 	
 	
 
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/DirectActionEverywhere.com.xml b/src/chrome/content/rules/DirectActionEverywhere.com.xml
index 0eabacd929e2..8a84f8fa590e 100644
--- a/src/chrome/content/rules/DirectActionEverywhere.com.xml
+++ b/src/chrome/content/rules/DirectActionEverywhere.com.xml
@@ -22,7 +22,7 @@
 	
 
-	
 
 
diff --git a/src/chrome/content/rules/DirectAdvert.ru.xml b/src/chrome/content/rules/DirectAdvert.ru.xml
index d5a0b9abcebe..dbe10d495d40 100644
--- a/src/chrome/content/rules/DirectAdvert.ru.xml
+++ b/src/chrome/content/rules/DirectAdvert.ru.xml
@@ -26,7 +26,7 @@ Fetch error: http://directadvert.ru/ => https://directadvert.ru/: (51, "SSL: no
 	² Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Direct_Line.com.xml b/src/chrome/content/rules/Direct_Line.com.xml
index dc28b1042ed6..a92e1471112f 100644
--- a/src/chrome/content/rules/Direct_Line.com.xml
+++ b/src/chrome/content/rules/Direct_Line.com.xml
@@ -25,10 +25,13 @@ Fetch error: http://directline.com/ => https://uk3.directline.com/: (28, 'Resolv
 	² → directline.metafaq.com
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
 	
 
 
@@ -41,10 +44,9 @@ Fetch error: http://directline.com/ => https://uk3.directline.com/: (28, 'Resolv
 	
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Direct_Mail_Mac.com.xml b/src/chrome/content/rules/Direct_Mail_Mac.com.xml
index 0a28770ca58f..8e7da96244db 100644
--- a/src/chrome/content/rules/Direct_Mail_Mac.com.xml
+++ b/src/chrome/content/rules/Direct_Mail_Mac.com.xml
@@ -27,7 +27,6 @@
 		
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Directbox.xml b/src/chrome/content/rules/Directbox.xml
index aa4a16d83f1d..d47f3ba302d6 100644
--- a/src/chrome/content/rules/Directbox.xml
+++ b/src/chrome/content/rules/Directbox.xml
@@ -39,4 +39,4 @@
 
 	
 
- 
+
diff --git a/src/chrome/content/rules/Directgov-mismatches.xml b/src/chrome/content/rules/Directgov-mismatches.xml
index cf6c4be5257b..465901a30d3e 100644
--- a/src/chrome/content/rules/Directgov-mismatches.xml
+++ b/src/chrome/content/rules/Directgov-mismatches.xml
@@ -7,7 +7,7 @@
 	
 	
 	
-		
+	
 
 	
diff --git a/src/chrome/content/rules/Directgov.xml b/src/chrome/content/rules/Directgov.xml
index f2209e4a15c1..5d2647679d25 100644
--- a/src/chrome/content/rules/Directgov.xml
+++ b/src/chrome/content/rules/Directgov.xml
@@ -29,7 +29,7 @@ Fetch error: http://www.nationalcareersservice.direct.gov.uk/ => https://www.nat
 		- nationalcareersservice.direct.gov.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/DirectoryOpus.xml b/src/chrome/content/rules/DirectoryOpus.xml
index 4447de8524e4..f11f74f4442b 100644
--- a/src/chrome/content/rules/DirectoryOpus.xml
+++ b/src/chrome/content/rules/DirectoryOpus.xml
@@ -1,7 +1,7 @@
 
         
         
-		
+
 
         
diff --git a/src/chrome/content/rules/Directorystore.com.xml b/src/chrome/content/rules/Directorystore.com.xml
index 9981804e625b..d06a12a0cfd4 100644
--- a/src/chrome/content/rules/Directorystore.com.xml
+++ b/src/chrome/content/rules/Directorystore.com.xml
@@ -20,7 +20,7 @@ Fetch error: http://www.directorystore.com/ => https://www.directorystore.com/:
 		- www.directorystore.com
 
 -->
-
+
 
         
         
diff --git a/src/chrome/content/rules/Dirty.ru.xml b/src/chrome/content/rules/Dirty.ru.xml
index a977b45ff9b3..ab9a05f2a7e9 100644
--- a/src/chrome/content/rules/Dirty.ru.xml
+++ b/src/chrome/content/rules/Dirty.ru.xml
@@ -6,7 +6,7 @@
 	* Server sends no certificate chain, see https://whatsmychaincert.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Dirxion.xml b/src/chrome/content/rules/Dirxion.xml
index b46f11a24195..24fe7dc8dfa7 100644
--- a/src/chrome/content/rules/Dirxion.xml
+++ b/src/chrome/content/rules/Dirxion.xml
@@ -5,7 +5,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -14,7 +15,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/DisabledGo.com.xml b/src/chrome/content/rules/DisabledGo.com.xml
index 0118425b0bba..cf26096badfa 100644
--- a/src/chrome/content/rules/DisabledGo.com.xml
+++ b/src/chrome/content/rules/DisabledGo.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://disabledgo.com/ => https://disabledgo.com/: Cycle detected -
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Disc-soft.com.xml b/src/chrome/content/rules/Disc-soft.com.xml
index 8112c6ef12e9..1a5685577b47 100644
--- a/src/chrome/content/rules/Disc-soft.com.xml
+++ b/src/chrome/content/rules/Disc-soft.com.xml
@@ -3,7 +3,7 @@
   
   
   
-  
+
   
   
 
diff --git a/src/chrome/content/rules/DiscountTheatre.xml b/src/chrome/content/rules/DiscountTheatre.xml
deleted file mode 100644
index ec21e2b8ea8a..000000000000
--- a/src/chrome/content/rules/DiscountTheatre.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Discourse.org.xml b/src/chrome/content/rules/Discourse.org.xml
index 5491d2892fe2..f6b714342d52 100644
--- a/src/chrome/content/rules/Discourse.org.xml
+++ b/src/chrome/content/rules/Discourse.org.xml
@@ -12,9 +12,9 @@
 
 	¹ Redirects to http, valid cert
 	² Refused
-	
+
 	Cloudflare SSL:
-	
+
 		- $
 		- www
 		- blog
diff --git a/src/chrome/content/rules/Discover_Merchants.com.xml b/src/chrome/content/rules/Discover_Merchants.com.xml
index f5c871c2a115..a85261c16bc0 100644
--- a/src/chrome/content/rules/Discover_Merchants.com.xml
+++ b/src/chrome/content/rules/Discover_Merchants.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.discovermerchants.com/ => https://www.discovermerchants.
 	For other Discover coverage, see Discover.com.xml
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Discover_Signage.com.xml b/src/chrome/content/rules/Discover_Signage.com.xml
index 4f1859d39e16..bdd35dcbaf3e 100644
--- a/src/chrome/content/rules/Discover_Signage.com.xml
+++ b/src/chrome/content/rules/Discover_Signage.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.discoversignage.com/ => https://www.discoversignage.com/
 	For other Discover coverage, see Discover.com.xml
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Discovery-Communications.xml b/src/chrome/content/rules/Discovery-Communications.xml
index 2ff132e8779e..916a00a5f8b7 100644
--- a/src/chrome/content/rules/Discovery-Communications.xml
+++ b/src/chrome/content/rules/Discovery-Communications.xml
@@ -85,7 +85,7 @@ Fetch error: http://store.discovery.com/ => https://securestore.discovery.com/:
 	¹ Rule not enabled by default <= mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Discovery.org.xml b/src/chrome/content/rules/Discovery.org.xml
index f36b2d6ff76c..a11f49cd9de8 100644
--- a/src/chrome/content/rules/Discovery.org.xml
+++ b/src/chrome/content/rules/Discovery.org.xml
@@ -10,7 +10,7 @@ Fetch error: http://discovery.org/ => https://discovery.org/: Too many redirects
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/DiskCryptor.net.xml b/src/chrome/content/rules/DiskCryptor.net.xml
deleted file mode 100644
index 3eb3380d85d5..000000000000
--- a/src/chrome/content/rules/DiskCryptor.net.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Diskusjon.no.xml b/src/chrome/content/rules/Diskusjon.no.xml
new file mode 100644
index 000000000000..0cd4313020f7
--- /dev/null
+++ b/src/chrome/content/rules/Diskusjon.no.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Diskusjon.xml b/src/chrome/content/rules/Diskusjon.xml
deleted file mode 100644
index 8a7643e90d33..000000000000
--- a/src/chrome/content/rules/Diskusjon.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-  
-  
-
-  
-
-
diff --git a/src/chrome/content/rules/Disney.co.jp.xml b/src/chrome/content/rules/Disney.co.jp.xml
index fb84b370d66e..8c05b76a8b2b 100644
--- a/src/chrome/content/rules/Disney.co.jp.xml
+++ b/src/chrome/content/rules/Disney.co.jp.xml
@@ -1,23 +1,56 @@
 
 
-
-	
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
 
 	
-
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Disney_International.com.xml b/src/chrome/content/rules/Disney_International.com.xml
index 62c21bce2d06..09f44ce5fca3 100644
--- a/src/chrome/content/rules/Disney_International.com.xml
+++ b/src/chrome/content/rules/Disney_International.com.xml
@@ -1,7 +1,6 @@
 
 
   
diff --git a/src/chrome/content/rules/Displaymarketplace.com.xml b/src/chrome/content/rules/Displaymarketplace.com.xml
deleted file mode 100644
index 0c6246161258..000000000000
--- a/src/chrome/content/rules/Displaymarketplace.com.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Distil.xml b/src/chrome/content/rules/Distil.xml
deleted file mode 100644
index 3dbf86b79cea..000000000000
--- a/src/chrome/content/rules/Distil.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Distil_Networks.com.xml b/src/chrome/content/rules/Distil_Networks.com.xml
index 0a3210b157ff..a8d9b7ce7455 100644
--- a/src/chrome/content/rules/Distil_Networks.com.xml
+++ b/src/chrome/content/rules/Distil_Networks.com.xml
@@ -5,13 +5,12 @@ Fetch error: http://support.distilnetworks.com/ => https://support.distilnetwork
 
 	Other Distil Networks rulesets:
 
-		- Distil.xml
 
 
 	(www.)?distilnetworks.com: Redirects to http
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Distraction.gov.xml b/src/chrome/content/rules/Distraction.gov.xml
deleted file mode 100644
index 53409fbb7b93..000000000000
--- a/src/chrome/content/rules/Distraction.gov.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Distributed.net.xml b/src/chrome/content/rules/Distributed.net.xml
index e7a4df85b746..52ecf1291eec 100644
--- a/src/chrome/content/rules/Distributed.net.xml
+++ b/src/chrome/content/rules/Distributed.net.xml
@@ -11,11 +11,11 @@
 
 	
 	
-	
 	
 	
 	
 	
+	
 
 	
diff --git a/src/chrome/content/rules/Dittdistrikt.xml b/src/chrome/content/rules/Dittdistrikt.xml
index cd0c51f693e0..852aca9e970d 100644
--- a/src/chrome/content/rules/Dittdistrikt.xml
+++ b/src/chrome/content/rules/Dittdistrikt.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://dittdistrikt.no/ => https://www.dittdistrikt.no/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 Fetch error: http://www.dittdistrikt.no/ => https://www.dittdistrikt.no/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Divide.xml b/src/chrome/content/rules/Divide.xml
index d0ca5dfec421..346ca626ba5d 100644
--- a/src/chrome/content/rules/Divide.xml
+++ b/src/chrome/content/rules/Divide.xml
@@ -21,7 +21,11 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Divipay.com.xml b/src/chrome/content/rules/Divipay.com.xml
new file mode 100644
index 000000000000..3ee2665afb87
--- /dev/null
+++ b/src/chrome/content/rules/Divipay.com.xml
@@ -0,0 +1,25 @@
+
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Divshot.xml b/src/chrome/content/rules/Divshot.xml
index 868469e0fcd9..6498e4ecfb65 100644
--- a/src/chrome/content/rules/Divshot.xml
+++ b/src/chrome/content/rules/Divshot.xml
@@ -9,16 +9,14 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Diwi.org.xml b/src/chrome/content/rules/Diwi.org.xml
index 42d12d2cb319..ce56dac600da 100644
--- a/src/chrome/content/rules/Diwi.org.xml
+++ b/src/chrome/content/rules/Diwi.org.xml
@@ -19,13 +19,16 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Dizaineriai.lt.xml b/src/chrome/content/rules/Dizaineriai.lt.xml
index f57194f821b4..d45f4848234b 100644
--- a/src/chrome/content/rules/Dizaineriai.lt.xml
+++ b/src/chrome/content/rules/Dizaineriai.lt.xml
@@ -1,7 +1,7 @@
 
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/DjurRattsAlliansen.se.xml b/src/chrome/content/rules/DjurRattsAlliansen.se.xml
index 9f07b6bcd798..5acd46223783 100644
--- a/src/chrome/content/rules/DjurRattsAlliansen.se.xml
+++ b/src/chrome/content/rules/DjurRattsAlliansen.se.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.djurrattsalliansen.se/ => https://djurrattsalliansen.se/: (60, 'SSL certificate problem: certificate has expired')
 Fetch error: http://djurrattsalliansen.se/ => https://djurrattsalliansen.se/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/Dlisted.com.xml b/src/chrome/content/rules/Dlisted.com.xml
index 161765999e53..38f12d94b739 100644
--- a/src/chrome/content/rules/Dlisted.com.xml
+++ b/src/chrome/content/rules/Dlisted.com.xml
@@ -29,7 +29,8 @@
 
 
 	
-	
+	
+	
 
 
 	
 
 
-	
+	
 
 
 	
-
+
   
   
 
diff --git a/src/chrome/content/rules/Dmri-library.com.xml b/src/chrome/content/rules/Dmri-library.com.xml
index 0a0ba48091f5..084668570acc 100644
--- a/src/chrome/content/rules/Dmri-library.com.xml
+++ b/src/chrome/content/rules/Dmri-library.com.xml
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Dnsexit.xml b/src/chrome/content/rules/Dnsexit.xml
index 1057b5f144f4..4b56b4ca87c6 100644
--- a/src/chrome/content/rules/Dnsexit.xml
+++ b/src/chrome/content/rules/Dnsexit.xml
@@ -1,8 +1,8 @@
 
 	
 	
-	
-	
-	
+
+	
+
 	
 
diff --git a/src/chrome/content/rules/Dntly.com.xml b/src/chrome/content/rules/Dntly.com.xml
index 07f3c90934d6..fa5bbe6dbdeb 100644
--- a/src/chrome/content/rules/Dntly.com.xml
+++ b/src/chrome/content/rules/Dntly.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://dntly.com/ => https://dntly.com/: (28, 'Connection timed out
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/DoNotCallRegister.xml b/src/chrome/content/rules/DoNotCallRegister.xml
index bea2247eeeea..74e3cda68571 100644
--- a/src/chrome/content/rules/DoNotCallRegister.xml
+++ b/src/chrome/content/rules/DoNotCallRegister.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Do_Not_Track-doc.com.xml b/src/chrome/content/rules/Do_Not_Track-doc.com.xml
deleted file mode 100644
index f137e28e7d93..000000000000
--- a/src/chrome/content/rules/Do_Not_Track-doc.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Doarama.com.xml b/src/chrome/content/rules/Doarama.com.xml
new file mode 100644
index 000000000000..745c092779f5
--- /dev/null
+++ b/src/chrome/content/rules/Doarama.com.xml
@@ -0,0 +1,27 @@
+
+
+
+	
+	
+	
+	
+	
+		
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/DocSend.com.xml b/src/chrome/content/rules/DocSend.com.xml
deleted file mode 100644
index b9281b83fbc5..000000000000
--- a/src/chrome/content/rules/DocSend.com.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Docelu.pl-problematic.xml b/src/chrome/content/rules/Docelu.pl-problematic.xml
index bdf5952d1273..8400fd756da2 100644
--- a/src/chrome/content/rules/Docelu.pl-problematic.xml
+++ b/src/chrome/content/rules/Docelu.pl-problematic.xml
@@ -7,13 +7,14 @@
 -->
 
 
-	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Docelu.pl.xml b/src/chrome/content/rules/Docelu.pl.xml
index 6cf5c282b123..1de9630069cd 100644
--- a/src/chrome/content/rules/Docelu.pl.xml
+++ b/src/chrome/content/rules/Docelu.pl.xml
@@ -49,7 +49,7 @@ Fetch error: http://www.docelu.pl/ => https://docelu.pl/: (60, 'SSL certificate
 				- ^ *
 				- i.wp.pl *
 				- b.wpimg.com *
-			
+
 
 		- Images, on:
 
@@ -90,7 +90,7 @@ Fetch error: http://www.docelu.pl/ => https://docelu.pl/: (60, 'SSL certificate
 	mixedcontent due to css from ^docelu.pl, i.wp.pl, & b.wpimg.com.
 
 -->
-
+
 
 	
 	
@@ -100,10 +100,10 @@ Fetch error: http://www.docelu.pl/ => https://docelu.pl/: (60, 'SSL certificate
 	
 	
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Docstoc.xml b/src/chrome/content/rules/Docstoc.xml
deleted file mode 100644
index d283ac7adc8b..000000000000
--- a/src/chrome/content/rules/Docstoc.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-	
-
-	
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Docstorepro.com.xml b/src/chrome/content/rules/Docstorepro.com.xml
index baba7d171632..bcf8e4a43b52 100644
--- a/src/chrome/content/rules/Docstorepro.com.xml
+++ b/src/chrome/content/rules/Docstorepro.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://docstorepro.com/ => https://docstorepro.com/: (60, 'SSL cert
 	For other NiKec Solutions coverage, see NiKec_Solutions.xml.
 
 -->
-
+
 
 	
 	
@@ -17,4 +17,4 @@ Fetch error: http://docstorepro.com/ => https://docstorepro.com/: (60, 'SSL cert
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Doctor_Trusted.org.xml b/src/chrome/content/rules/Doctor_Trusted.org.xml
index 2df1fca8639e..f37d3a60f7f9 100644
--- a/src/chrome/content/rules/Doctor_Trusted.org.xml
+++ b/src/chrome/content/rules/Doctor_Trusted.org.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.doctortrusted.org/ => https://doctortrusted.org/: (28, '
 		- doctortrusted.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/DocumentCloud.xml b/src/chrome/content/rules/DocumentCloud.xml
index c46124025218..118e947f3689 100644
--- a/src/chrome/content/rules/DocumentCloud.xml
+++ b/src/chrome/content/rules/DocumentCloud.xml
@@ -1,22 +1,24 @@
 
-
-
+
 	
-	
-
-
-	
-
-
-	
+	
+	
+	
+	
 
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/Document_Freedom_Day.xml b/src/chrome/content/rules/Document_Freedom_Day.xml
index b7a1e8a216a4..4d17422086c6 100644
--- a/src/chrome/content/rules/Document_Freedom_Day.xml
+++ b/src/chrome/content/rules/Document_Freedom_Day.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.documentfreedom.net/ => https://www.documentfreedom.net/
 	For other FSFE coverage, see FSFE.org.xml.
 
 -->
-
+
 
 	
 	
@@ -22,4 +22,4 @@ Fetch error: http://www.documentfreedom.net/ => https://www.documentfreedom.net/
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Docusign.com.xml b/src/chrome/content/rules/Docusign.com.xml
deleted file mode 100644
index d4e69385e24b..000000000000
--- a/src/chrome/content/rules/Docusign.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-  
-  
-
-  
-
diff --git a/src/chrome/content/rules/Dodo.com.au.xml b/src/chrome/content/rules/Dodo.com.au.xml
index c67ec3b1f9c2..e8c51b93911f 100644
--- a/src/chrome/content/rules/Dodo.com.au.xml
+++ b/src/chrome/content/rules/Dodo.com.au.xml
@@ -26,7 +26,7 @@
 		- google	²
 		- home		(¹, CN: *.dodo.com)
 		- hosting	⁴
-		- landing	(¹, CN: try.unbounce.com)	
+		- landing	(¹, CN: try.unbounce.com)
 		- login		(¹, CN: *.dodo.com)
 		- m			(¹, CN: *.dodo.com)
 		- postoffice01.mail-hub		⁴
@@ -41,7 +41,7 @@
 		- dnscache42nx.nc.nsw		³
 		- dnscache52nx.nc.nsw		³
 		- dnscache62nx.nc.nsw		³
-		- offers		(¹, CN: try.unbounce.com)	
+		- offers		(¹, CN: try.unbounce.com)
 		- payments		(¹, CN: *.dodo.com)
 		- photos		(¹, CN: *.dodo.com)
 		- pop		³
diff --git a/src/chrome/content/rules/Dodo.com.xml b/src/chrome/content/rules/Dodo.com.xml
index 64d27a49d25f..8d20165a7ea5 100644
--- a/src/chrome/content/rules/Dodo.com.xml
+++ b/src/chrome/content/rules/Dodo.com.xml
@@ -75,4 +75,4 @@
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Dods_People.com.xml b/src/chrome/content/rules/Dods_People.com.xml
index f92d1e59aa66..393d5f68affa 100644
--- a/src/chrome/content/rules/Dods_People.com.xml
+++ b/src/chrome/content/rules/Dods_People.com.xml
@@ -12,7 +12,8 @@
 
 
 	
-	
+	
+	
 
 
 	 https://www.doesnotwork.eu/: (7, '')
 
 	For other Nebezi.cz coverage, see Nebezi.cz.xml.
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Dof.dk.xml b/src/chrome/content/rules/Dof.dk.xml
index b29ea6d2f623..b0b61ed0d983 100644
--- a/src/chrome/content/rules/Dof.dk.xml
+++ b/src/chrome/content/rules/Dof.dk.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.dof.dk/ => https://www.dof.dk/: (60, 'SSL certificate pr
 	¹: Refused
 	²: Bad cert (CN: *.your-server.de)
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Dogpile.com.xml b/src/chrome/content/rules/Dogpile.com.xml
new file mode 100644
index 000000000000..c5fe7f75133b
--- /dev/null
+++ b/src/chrome/content/rules/Dogpile.com.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/DogsbodyTechnologyLtd.xml b/src/chrome/content/rules/DogsbodyTechnologyLtd.xml
new file mode 100644
index 000000000000..96cec46e3351
--- /dev/null
+++ b/src/chrome/content/rules/DogsbodyTechnologyLtd.xml
@@ -0,0 +1,30 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Dogsbodytechnology.com.xml b/src/chrome/content/rules/Dogsbodytechnology.com.xml
deleted file mode 100644
index 2aa1a1e296ba..000000000000
--- a/src/chrome/content/rules/Dogsbodytechnology.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-        
-	
-        
-
-	
-
diff --git a/src/chrome/content/rules/Dogz_Online.xml b/src/chrome/content/rules/Dogz_Online.xml
index ed5ad7e5fd08..1ea7032f506a 100644
--- a/src/chrome/content/rules/Dogz_Online.xml
+++ b/src/chrome/content/rules/Dogz_Online.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Doi2bib.org.xml b/src/chrome/content/rules/Doi2bib.org.xml
new file mode 100644
index 000000000000..b71feb7e1083
--- /dev/null
+++ b/src/chrome/content/rules/Doi2bib.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Doitgarden.ch.xml b/src/chrome/content/rules/Doitgarden.ch.xml
deleted file mode 100644
index d78beddc8e0c..000000000000
--- a/src/chrome/content/rules/Doitgarden.ch.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Dolibarr.org.xml b/src/chrome/content/rules/Dolibarr.org.xml
new file mode 100644
index 000000000000..0514ba8cf29b
--- /dev/null
+++ b/src/chrome/content/rules/Dolibarr.org.xml
@@ -0,0 +1,31 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Dolimg.com.xml b/src/chrome/content/rules/Dolimg.com.xml
index 6368e31bddb1..0180ef26abdd 100644
--- a/src/chrome/content/rules/Dolimg.com.xml
+++ b/src/chrome/content/rules/Dolimg.com.xml
@@ -44,4 +44,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Dollar.co.uk.xml b/src/chrome/content/rules/Dollar.co.uk.xml
new file mode 100644
index 000000000000..b4f9c3f77f37
--- /dev/null
+++ b/src/chrome/content/rules/Dollar.co.uk.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Dollar.com.xml b/src/chrome/content/rules/Dollar.com.xml
new file mode 100644
index 000000000000..c9ab5d5eb667
--- /dev/null
+++ b/src/chrome/content/rules/Dollar.com.xml
@@ -0,0 +1,48 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Dollar.de.xml b/src/chrome/content/rules/Dollar.de.xml
new file mode 100644
index 000000000000..c85322f86e79
--- /dev/null
+++ b/src/chrome/content/rules/Dollar.de.xml
@@ -0,0 +1,12 @@
+
+
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/DollarCanada.ca.xml b/src/chrome/content/rules/DollarCanada.ca.xml
new file mode 100644
index 000000000000..ae1195fcbc9c
--- /dev/null
+++ b/src/chrome/content/rules/DollarCanada.ca.xml
@@ -0,0 +1,21 @@
+
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Dollar_a_Day.co.xml b/src/chrome/content/rules/Dollar_a_Day.co.xml
index 0d80e862ccc1..82035f352b3b 100644
--- a/src/chrome/content/rules/Dollar_a_Day.co.xml
+++ b/src/chrome/content/rules/Dollar_a_Day.co.xml
@@ -5,7 +5,7 @@ Fetch error: http://dollaraday.co/ => https://dollaraday.co/: (60, 'SSL certific
 Fetch error: http://www.dollaraday.co/ => https://www.dollaraday.co/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Dolphin-emu.org.xml b/src/chrome/content/rules/Dolphin-emu.org.xml
index e900c71aa74e..0081ecc72ae5 100644
--- a/src/chrome/content/rules/Dolphin-emu.org.xml
+++ b/src/chrome/content/rules/Dolphin-emu.org.xml
@@ -16,13 +16,15 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
 
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Domain.com.xml b/src/chrome/content/rules/Domain.com.xml
index 5f91f5c08d83..8c8a4137b58c 100644
--- a/src/chrome/content/rules/Domain.com.xml
+++ b/src/chrome/content/rules/Domain.com.xml
@@ -14,7 +14,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
@@ -22,14 +24,13 @@
 
 			
+					-->
 	
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Domain.de.xml b/src/chrome/content/rules/Domain.de.xml
deleted file mode 100644
index 814b4d40778b..000000000000
--- a/src/chrome/content/rules/Domain.de.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/DomainCoin.net.xml b/src/chrome/content/rules/DomainCoin.net.xml
deleted file mode 100644
index d73c3f82d2bb..000000000000
--- a/src/chrome/content/rules/DomainCoin.net.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/DomainContext.com.xml b/src/chrome/content/rules/DomainContext.com.xml
index 7a4597c63971..3aaf6338cc43 100644
--- a/src/chrome/content/rules/DomainContext.com.xml
+++ b/src/chrome/content/rules/DomainContext.com.xml
@@ -1,7 +1,19 @@
+
+
+
 
-
+
 
-	
-	
+	
+	
 	
 
 
diff --git a/src/chrome/content/rules/DomainSigma.com.xml b/src/chrome/content/rules/DomainSigma.com.xml
deleted file mode 100644
index 7abc8f212b24..000000000000
--- a/src/chrome/content/rules/DomainSigma.com.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/DomainSponsor.xml b/src/chrome/content/rules/DomainSponsor.xml
deleted file mode 100644
index 7728e90bc09d..000000000000
--- a/src/chrome/content/rules/DomainSponsor.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/DomainTools.com-falsemixed.xml b/src/chrome/content/rules/DomainTools.com-falsemixed.xml
deleted file mode 100644
index 984ba90a624c..000000000000
--- a/src/chrome/content/rules/DomainTools.com-falsemixed.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/DomainTools.xml b/src/chrome/content/rules/DomainTools.xml
index 156a0431c125..7df2c006d46b 100644
--- a/src/chrome/content/rules/DomainTools.xml
+++ b/src/chrome/content/rules/DomainTools.xml
@@ -31,7 +31,7 @@
 			- whois
 			- www
 			- yahoo
-		
+
 		- dt-static.com
 			- assets
 			- images
@@ -60,11 +60,11 @@
 	
 	
 	
-	
+
 	
 	
 
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/DomainWho.is.xml b/src/chrome/content/rules/DomainWho.is.xml
index 33b8a86642b5..00ac18e25235 100644
--- a/src/chrome/content/rules/DomainWho.is.xml
+++ b/src/chrome/content/rules/DomainWho.is.xml
@@ -7,7 +7,7 @@ Fetch error: http://styles.domainwho.is/ => https://styles.domainwho.is/: (6, 'C
 Fetch error: http://www.domainwho.is/ => https://www.domainwho.is/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Domainbox.com.xml b/src/chrome/content/rules/Domainbox.com.xml
deleted file mode 100644
index 4ca7c930f74b..000000000000
--- a/src/chrome/content/rules/Domainbox.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Domains_By_Proxy.xml b/src/chrome/content/rules/Domains_By_Proxy.xml
index 0bba8d903283..5f66735ed8ad 100644
--- a/src/chrome/content/rules/Domains_By_Proxy.xml
+++ b/src/chrome/content/rules/Domains_By_Proxy.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Domena.pl.xml b/src/chrome/content/rules/Domena.pl.xml
index 9083d303440b..abf7bd428bda 100644
--- a/src/chrome/content/rules/Domena.pl.xml
+++ b/src/chrome/content/rules/Domena.pl.xml
@@ -23,4 +23,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Domreg.lt.xml b/src/chrome/content/rules/Domreg.lt.xml
deleted file mode 100644
index 667bf7dfe7ab..000000000000
--- a/src/chrome/content/rules/Domreg.lt.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Doncaster.gov.uk.xml b/src/chrome/content/rules/Doncaster.gov.uk.xml
index 6d5791dce94a..e869166ce740 100644
--- a/src/chrome/content/rules/Doncaster.gov.uk.xml
+++ b/src/chrome/content/rules/Doncaster.gov.uk.xml
@@ -40,7 +40,7 @@ Fetch error: http://doncaster.gov.uk/Eforms/BusGenEform/Boot/803 => https://donc
 		- www.doncaster.gov.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Doncaster_College.xml b/src/chrome/content/rules/Doncaster_College.xml
index b441bb305034..835c25c7ea3b 100644
--- a/src/chrome/content/rules/Doncaster_College.xml
+++ b/src/chrome/content/rules/Doncaster_College.xml
@@ -36,4 +36,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Doodle.xml b/src/chrome/content/rules/Doodle.xml
deleted file mode 100644
index 11eca1cf289a..000000000000
--- a/src/chrome/content/rules/Doodle.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-		
-		
-		
-		
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Doorbell.io.xml b/src/chrome/content/rules/Doorbell.io.xml
index abe7a607d594..760db42de7e0 100644
--- a/src/chrome/content/rules/Doorbell.io.xml
+++ b/src/chrome/content/rules/Doorbell.io.xml
@@ -2,13 +2,13 @@
 Mismatch:
 	blog.	(Based on Tumblr)
 	status.
-	
+
 -->
 
-	
+
 	
 	
-	
+
 	
 
 
diff --git a/src/chrome/content/rules/Doria.fi.xml b/src/chrome/content/rules/Doria.fi.xml
new file mode 100644
index 000000000000..dbc01b95782a
--- /dev/null
+++ b/src/chrome/content/rules/Doria.fi.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Dot429.xml b/src/chrome/content/rules/Dot429.xml
deleted file mode 100644
index 18114ef60746..000000000000
--- a/src/chrome/content/rules/Dot429.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Dot5Hosting.xml b/src/chrome/content/rules/Dot5Hosting.xml
index 6130eac38410..d5e7ebe4f159 100644
--- a/src/chrome/content/rules/Dot5Hosting.xml
+++ b/src/chrome/content/rules/Dot5Hosting.xml
@@ -1,13 +1,14 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/DotCOM-host.xml b/src/chrome/content/rules/DotCOM-host.xml
index 2d90e3b40875..bfeb7acd4839 100644
--- a/src/chrome/content/rules/DotCOM-host.xml
+++ b/src/chrome/content/rules/DotCOM-host.xml
@@ -5,7 +5,7 @@
 	
 
 
-	
+	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/DotMailer.xml b/src/chrome/content/rules/DotMailer.xml
index 20ff2ee1f535..30a810eb12cf 100644
--- a/src/chrome/content/rules/DotMailer.xml
+++ b/src/chrome/content/rules/DotMailer.xml
@@ -7,7 +7,9 @@
 
 
 	
-	
+	
+	
+	
 	
 	
 		
@@ -20,13 +22,8 @@
 	
 
-	
 
-	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Dota2lounge.com.xml b/src/chrome/content/rules/Dota2lounge.com.xml
index 3680c5b1954e..856fb7abc90b 100644
--- a/src/chrome/content/rules/Dota2lounge.com.xml
+++ b/src/chrome/content/rules/Dota2lounge.com.xml
@@ -1,15 +1,12 @@
 
 
 	
-	
 
-	
-	
-	
-	
 	
 
diff --git a/src/chrome/content/rules/Dota_2.com.xml b/src/chrome/content/rules/Dota_2.com.xml
index bbd0288a7754..1c5797ae66fb 100644
--- a/src/chrome/content/rules/Dota_2.com.xml
+++ b/src/chrome/content/rules/Dota_2.com.xml
@@ -69,7 +69,7 @@
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Dotcomsecurity.de.xml b/src/chrome/content/rules/Dotcomsecurity.de.xml
index bb6f45bb9b2e..bc5a1c2f0b5e 100644
--- a/src/chrome/content/rules/Dotcomsecurity.de.xml
+++ b/src/chrome/content/rules/Dotcomsecurity.de.xml
@@ -5,7 +5,7 @@ Fetch error: http://dotcomsecurity.de/ => https://dotcomsecurity.de/: (60, 'SSL
 Fetch error: http://www.dotcomsecurity.de/ => https://www.dotcomsecurity.de/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Dotwhat.net.xml b/src/chrome/content/rules/Dotwhat.net.xml
new file mode 100644
index 000000000000..7bd4f07ea5a3
--- /dev/null
+++ b/src/chrome/content/rules/Dotwhat.net.xml
@@ -0,0 +1,17 @@
+
+
+    
+    
+    
+    
+
+    
+
+    
+
diff --git a/src/chrome/content/rules/Douban.com.xml b/src/chrome/content/rules/Douban.com.xml
index 25e0b1d33ebc..96d0008b58c9 100644
--- a/src/chrome/content/rules/Douban.com.xml
+++ b/src/chrome/content/rules/Douban.com.xml
@@ -1,29 +1,27 @@
 
 
 	
+	
 	
 	
 	
-	
 	
 	
-	
 	
 	
 	
 	
 	
-	
 	
 	
-	
 	
 	
 	
@@ -31,14 +29,9 @@
 	
 	
 	
-	
 	
 
-	
-
-	
+	
 
-	
+	
 
diff --git a/src/chrome/content/rules/DoubleClick_by_Google.com.xml b/src/chrome/content/rules/DoubleClick_by_Google.com.xml
deleted file mode 100644
index 970c5d9208e6..000000000000
--- a/src/chrome/content/rules/DoubleClick_by_Google.com.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Doutula.com.xml b/src/chrome/content/rules/Doutula.com.xml
new file mode 100644
index 000000000000..2b1dce92ed47
--- /dev/null
+++ b/src/chrome/content/rules/Doutula.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Douyu.xml b/src/chrome/content/rules/Douyu.xml
index c96504440389..b65c40950375 100644
--- a/src/chrome/content/rules/Douyu.xml
+++ b/src/chrome/content/rules/Douyu.xml
@@ -22,7 +22,7 @@
 	
 	
 	
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Dover.gov.uk.xml b/src/chrome/content/rules/Dover.gov.uk.xml
index b9e6b2cc10ad..e2ad133f92fd 100644
--- a/src/chrome/content/rules/Dover.gov.uk.xml
+++ b/src/chrome/content/rules/Dover.gov.uk.xml
@@ -54,7 +54,7 @@
 	
 
 	
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Dovetail_Services.xml b/src/chrome/content/rules/Dovetail_Services.xml
index da5939a839b7..c7ecd362d318 100644
--- a/src/chrome/content/rules/Dovetail_Services.xml
+++ b/src/chrome/content/rules/Dovetail_Services.xml
@@ -6,13 +6,13 @@ Fetch error: http://subscribeonline.co.uk/ => https://subscribeonline.co.uk/: (3
 	For problematic rules, see Dovetail_Services-problematic.xml.
 
 -->
-
+
 
 	
 	
 
 
-	
+	
 
 
 	
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Down_for_Everyone.com-falsemixed.xml b/src/chrome/content/rules/Down_for_Everyone.com-falsemixed.xml
deleted file mode 100644
index f41d4dd3cf38..000000000000
--- a/src/chrome/content/rules/Down_for_Everyone.com-falsemixed.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Down_for_Everyone.com.xml b/src/chrome/content/rules/Down_for_Everyone.com.xml
deleted file mode 100644
index 60f7e62614e7..000000000000
--- a/src/chrome/content/rules/Down_for_Everyone.com.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Download-Islamic-Religion-PDF-Ebooks.com.xml b/src/chrome/content/rules/Download-Islamic-Religion-PDF-Ebooks.com.xml
new file mode 100644
index 000000000000..987a56664ef7
--- /dev/null
+++ b/src/chrome/content/rules/Download-Islamic-Religion-PDF-Ebooks.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/DownloadVerse.com.xml b/src/chrome/content/rules/DownloadVerse.com.xml
index 9f24aebd1bfe..942ba99af845 100644
--- a/src/chrome/content/rules/DownloadVerse.com.xml
+++ b/src/chrome/content/rules/DownloadVerse.com.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Downloadbox.xml b/src/chrome/content/rules/Downloadbox.xml
index ea058b64a4ef..b3da50cf9aeb 100644
--- a/src/chrome/content/rules/Downloadbox.xml
+++ b/src/chrome/content/rules/Downloadbox.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/DownstreamToday.com.xml b/src/chrome/content/rules/DownstreamToday.com.xml
index f9c756d10038..b976ff2a6945 100644
--- a/src/chrome/content/rules/DownstreamToday.com.xml
+++ b/src/chrome/content/rules/DownstreamToday.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.downstreamtoday.com/ => https://www.downstreamtoday.com/
 	For other Bishop Interactive coverage, see Bishop_Interactive.xml.
 
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://www.downstreamtoday.com/ => https://www.downstreamtoday.com/
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Downtown_Host.xml b/src/chrome/content/rules/Downtown_Host.xml
index bc9a23aee5c0..0e434b1aa9cc 100644
--- a/src/chrome/content/rules/Downtown_Host.xml
+++ b/src/chrome/content/rules/Downtown_Host.xml
@@ -11,9 +11,9 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Dpaydinlatma.com.xml b/src/chrome/content/rules/Dpaydinlatma.com.xml
new file mode 100644
index 000000000000..0c60c5f285f4
--- /dev/null
+++ b/src/chrome/content/rules/Dpaydinlatma.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Dpskolkata.com.xml b/src/chrome/content/rules/Dpskolkata.com.xml
deleted file mode 100644
index 4082cdd4657e..000000000000
--- a/src/chrome/content/rules/Dpskolkata.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Dr-Ghanim.com.xml b/src/chrome/content/rules/Dr-Ghanim.com.xml
new file mode 100644
index 000000000000..9152193722e8
--- /dev/null
+++ b/src/chrome/content/rules/Dr-Ghanim.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/DrAgnDroPbuilder.com.xml b/src/chrome/content/rules/DrAgnDroPbuilder.com.xml
deleted file mode 100644
index 4617bd8b72c0..000000000000
--- a/src/chrome/content/rules/DrAgnDroPbuilder.com.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/DrJonathanBrown.com.xml b/src/chrome/content/rules/DrJonathanBrown.com.xml
new file mode 100644
index 000000000000..18b3360b99b8
--- /dev/null
+++ b/src/chrome/content/rules/DrJonathanBrown.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Dragonair.xml b/src/chrome/content/rules/Dragonair.xml
deleted file mode 100644
index fe8e22bbcf91..000000000000
--- a/src/chrome/content/rules/Dragonair.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-	
-	
-	
-
- 
diff --git a/src/chrome/content/rules/Draugiem.lv.xml b/src/chrome/content/rules/Draugiem.lv.xml
index f00a334d5762..fbc6ddae253e 100644
--- a/src/chrome/content/rules/Draugiem.lv.xml
+++ b/src/chrome/content/rules/Draugiem.lv.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.baratikor.com/ => https://www.baratikor.com/: (51, "SSL:
 	Everything but that which has been tested is excluded below.
 
 -->
-
+
 
 	
 	
@@ -20,7 +20,11 @@ Fetch error: http://www.baratikor.com/ => https://www.baratikor.com/: (51, "SSL:
 	
 		
 	
-	
+	
+	
+	
+	
+	
 		
 	
 
@@ -31,16 +35,11 @@ Fetch error: http://www.baratikor.com/ => https://www.baratikor.com/: (51, "SSL:
 	
 
-	
 
 	
 
-	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Drawception.xml b/src/chrome/content/rules/Drawception.xml
index 1d3723db3a8a..6386842d3d69 100644
--- a/src/chrome/content/rules/Drawception.xml
+++ b/src/chrome/content/rules/Drawception.xml
@@ -2,8 +2,7 @@
   
   
 
-  
-  
+
   
   
 
diff --git a/src/chrome/content/rules/Drawing_by_Numbers.org.xml b/src/chrome/content/rules/Drawing_by_Numbers.org.xml
deleted file mode 100644
index 20d81c0dff13..000000000000
--- a/src/chrome/content/rules/Drawing_by_Numbers.org.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Drawthelines.ca.xml b/src/chrome/content/rules/Drawthelines.ca.xml
new file mode 100644
index 000000000000..3fc0acfaa79d
--- /dev/null
+++ b/src/chrome/content/rules/Drawthelines.ca.xml
@@ -0,0 +1,13 @@
+
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Drchrono.com.xml b/src/chrome/content/rules/Drchrono.com.xml
index 5d1b33314256..28e9fa93361d 100644
--- a/src/chrome/content/rules/Drchrono.com.xml
+++ b/src/chrome/content/rules/Drchrono.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://drchrono.com/ => https://drchrono.com/: Too many redirects w
 		- www.drchrono.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/DreamHost.xml b/src/chrome/content/rules/DreamHost.xml
index 37ca1d2e84d7..aad42680f573 100644
--- a/src/chrome/content/rules/DreamHost.xml
+++ b/src/chrome/content/rules/DreamHost.xml
@@ -66,9 +66,8 @@
 
 	
-		
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/DreamSpark.com.xml b/src/chrome/content/rules/DreamSpark.com.xml
index 0f66c910ee42..154cd6e55f62 100644
--- a/src/chrome/content/rules/DreamSpark.com.xml
+++ b/src/chrome/content/rules/DreamSpark.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://dreamspark.com/ => https://www.dreamspark.com/: (60, 'SSL ce
 	^dreamspark.com: Dropped
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Dreamboxcart.com.xml b/src/chrome/content/rules/Dreamboxcart.com.xml
deleted file mode 100644
index f7c2f4ae7a31..000000000000
--- a/src/chrome/content/rules/Dreamboxcart.com.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Dreampass.jp.xml b/src/chrome/content/rules/Dreampass.jp.xml
index 882a67c938a2..5c4e69a21e98 100644
--- a/src/chrome/content/rules/Dreampass.jp.xml
+++ b/src/chrome/content/rules/Dreampass.jp.xml
@@ -10,4 +10,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Dreamsolution.nl.xml b/src/chrome/content/rules/Dreamsolution.nl.xml
deleted file mode 100644
index 8071d918eac8..000000000000
--- a/src/chrome/content/rules/Dreamsolution.nl.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Dreamstime-problematic.xml b/src/chrome/content/rules/Dreamstime-problematic.xml
index 55ecb239d8c5..7ffa4f42c1e2 100644
--- a/src/chrome/content/rules/Dreamstime-problematic.xml
+++ b/src/chrome/content/rules/Dreamstime-problematic.xml
@@ -10,4 +10,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Dreamstime.xml b/src/chrome/content/rules/Dreamstime.xml
index 0269dc597131..02f886a7e041 100644
--- a/src/chrome/content/rules/Dreamstime.xml
+++ b/src/chrome/content/rules/Dreamstime.xml
@@ -12,7 +12,8 @@ Fetch error: http://dreamstime.com/ => https://dreamstime.com/: Cycle detected -
 
 
 	
-	
+	
+	
 		
 
 
diff --git a/src/chrome/content/rules/Drexel_University.xml b/src/chrome/content/rules/Drexel_University.xml
index 7011999e0c2b..4e0c7146a887 100644
--- a/src/chrome/content/rules/Drexel_University.xml
+++ b/src/chrome/content/rules/Drexel_University.xml
@@ -14,7 +14,7 @@ Fetch error: http://psal.cs.drexel.edu/ => https://psal.cs.drexel.edu/: (60, 'SS
 		- psal.cs
 
 -->
-
+
 
 	
 	
@@ -26,4 +26,4 @@ Fetch error: http://psal.cs.drexel.edu/ => https://psal.cs.drexel.edu/: (60, 'SS
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/DriveStyle_Insure.xml b/src/chrome/content/rules/DriveStyle_Insure.xml
index 6a08ef420325..28c1c67ba54b 100644
--- a/src/chrome/content/rules/DriveStyle_Insure.xml
+++ b/src/chrome/content/rules/DriveStyle_Insure.xml
@@ -5,7 +5,7 @@ Fetch error: http://drivestyle.co.uk/ => https://drivestyle.co.uk/: (7, 'Failed
 Fetch error: http://www.drivestyle.co.uk/ => https://www.drivestyle.co.uk/: (7, 'Failed to connect to www.drivestyle.co.uk port 443: Connection refused')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.drivestyle.co.uk/ => https://www.drivestyle.co.uk/: (7,
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Drivee.xml b/src/chrome/content/rules/Drivee.xml
index aeda784ecc5d..57a160f73e02 100644
--- a/src/chrome/content/rules/Drivee.xml
+++ b/src/chrome/content/rules/Drivee.xml
@@ -17,7 +17,7 @@ Fetch error: http://www.drivee.ne.jp/ => https://www.drivee.jp/: Too many redire
 	* Mismatched, CN: secure.drivee.ne.jp
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Dro-s.com.xml b/src/chrome/content/rules/Dro-s.com.xml
new file mode 100644
index 000000000000..6df1c6b224ba
--- /dev/null
+++ b/src/chrome/content/rules/Dro-s.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/DropDav.xml b/src/chrome/content/rules/DropDav.xml
index 4c0ea434bc12..18a8bd055b03 100644
--- a/src/chrome/content/rules/DropDav.xml
+++ b/src/chrome/content/rules/DropDav.xml
@@ -11,13 +11,13 @@
   
   
   
-  
+
 
 	
 	
 
-	
+	
 
 
 	
 
 
-	
-
-
 	
 
diff --git a/src/chrome/content/rules/DrugPolicy.org.xml b/src/chrome/content/rules/DrugPolicy.org.xml
index 3c5adf3f3046..f006772dc2e7 100644
--- a/src/chrome/content/rules/DrugPolicy.org.xml
+++ b/src/chrome/content/rules/DrugPolicy.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://www.drugpolicy.org/ => https://www.drugpolicy.org/: Too many
 Fetch error: http://drugpolicy.org/ => https://www.drugpolicy.org/: Too many redirects while fetching 'https://www.drugpolicy.org/'
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Drug_Forum-problematic.xml b/src/chrome/content/rules/Drug_Forum-problematic.xml
index 552873dae6b0..35f6afc16008 100644
--- a/src/chrome/content/rules/Drug_Forum-problematic.xml
+++ b/src/chrome/content/rules/Drug_Forum-problematic.xml
@@ -10,4 +10,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Drugstore.com.xml b/src/chrome/content/rules/Drugstore.com.xml
index fdf2f9fc1c0a..f17f5d0a13d7 100644
--- a/src/chrome/content/rules/Drugstore.com.xml
+++ b/src/chrome/content/rules/Drugstore.com.xml
@@ -1,8 +1,17 @@
 
 
 	
-	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
-
-
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Drweb.com.xml b/src/chrome/content/rules/Drweb.com.xml
index 1e341fb3dcb9..91f24281b97f 100644
--- a/src/chrome/content/rules/Drweb.com.xml
+++ b/src/chrome/content/rules/Drweb.com.xml
@@ -23,7 +23,7 @@ Fetch error: http://update.drweb.com/ => https://update.drweb.com/: (51, "SSL: n
 	⁴ Refused
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Dshop.se.xml b/src/chrome/content/rules/Dshop.se.xml
deleted file mode 100644
index b7cb9588d9a3..000000000000
--- a/src/chrome/content/rules/Dshop.se.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Dsp.io.xml b/src/chrome/content/rules/Dsp.io.xml
deleted file mode 100644
index a313b40bc7f1..000000000000
--- a/src/chrome/content/rules/Dsp.io.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/DualShockers.com.xml b/src/chrome/content/rules/DualShockers.com.xml
index b999aeb2a854..f1bbe6010468 100644
--- a/src/chrome/content/rules/DualShockers.com.xml
+++ b/src/chrome/content/rules/DualShockers.com.xml
@@ -17,10 +17,11 @@
 -->
 
 
-	
+	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/DuckCorp.xml b/src/chrome/content/rules/DuckCorp.xml
deleted file mode 100644
index e12fd1d0f847..000000000000
--- a/src/chrome/content/rules/DuckCorp.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/DuckDuckGo.xml b/src/chrome/content/rules/DuckDuckGo.xml
index 751da9ce14ad..433591cfcd05 100644
--- a/src/chrome/content/rules/DuckDuckGo.xml
+++ b/src/chrome/content/rules/DuckDuckGo.xml
@@ -1,13 +1,15 @@
 
 
 	
@@ -38,8 +41,7 @@
 	
 	
 	
-	
-		
+	
 	
 	
 	
@@ -62,8 +64,6 @@
 	
 	
 
-	
-
 	
 	
 
@@ -75,6 +75,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/Dudley.gov.uk-mixedcontent.xml b/src/chrome/content/rules/Dudley.gov.uk-mixedcontent.xml
index 59a4bfd2eaef..4d995f6e3d3c 100644
--- a/src/chrome/content/rules/Dudley.gov.uk-mixedcontent.xml
+++ b/src/chrome/content/rules/Dudley.gov.uk-mixedcontent.xml
@@ -7,7 +7,7 @@ Fetch error: http://www2.dudley.gov.uk/ => https://www2.dudley.gov.uk/: (51, "SS
 	For rules not causing MCB, see Dudley.gov.uk.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Dudley.gov.uk.xml b/src/chrome/content/rules/Dudley.gov.uk.xml
index e8e737f43aa4..5aac515fa20e 100644
--- a/src/chrome/content/rules/Dudley.gov.uk.xml
+++ b/src/chrome/content/rules/Dudley.gov.uk.xml
@@ -60,13 +60,13 @@
 	Mixed content:
 
 		- css, on:
-		
-			- moodle from $self 
+
+			- moodle from $self
 			- online from gismo.dudley.gov.uk
 			- www2 from www.dudley.gov.uk
 
 		- Images, on:
-		
+
 			- online, www2 from www.dudley.gov.uk
 			- moodle, www2 from $self
 
diff --git a/src/chrome/content/rules/Dueling_Aanalogs.com.xml b/src/chrome/content/rules/Dueling_Aanalogs.com.xml
index 52ee08d0f12c..d1df262973a9 100644
--- a/src/chrome/content/rules/Dueling_Aanalogs.com.xml
+++ b/src/chrome/content/rules/Dueling_Aanalogs.com.xml
@@ -19,4 +19,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Duke-Energy-Convention-Center.xml b/src/chrome/content/rules/Duke-Energy-Convention-Center.xml
index 548343469b16..0988fc5decc2 100644
--- a/src/chrome/content/rules/Duke-Energy-Convention-Center.xml
+++ b/src/chrome/content/rules/Duke-Energy-Convention-Center.xml
@@ -14,10 +14,11 @@ Fetch error: http://duke-energycenter.com/ => https://www.duke-energycenter.com/
 		- m	(interrupted)
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
@@ -29,7 +30,6 @@ Fetch error: http://duke-energycenter.com/ => https://www.duke-energycenter.com/
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Duke.edu.xml b/src/chrome/content/rules/Duke.edu.xml
index e560790321e7..ebde0704a4af 100644
--- a/src/chrome/content/rules/Duke.edu.xml
+++ b/src/chrome/content/rules/Duke.edu.xml
@@ -55,12 +55,12 @@
 		SSL peer certificate was not OK:
 			 - dukeexechealth.org
 			 - www.dukeexechealth.org
-	
+
 	Non-functional host in *.dukeexecutivehealth.org:
 		SSL peer certificate was not OK:
 			 - dukeexecutivehealth.org
 			 - www.dukeexecutivehealth.org
-		
+
 -->
 
 	
diff --git a/src/chrome/content/rules/Dunkelangst.org.xml b/src/chrome/content/rules/Dunkelangst.org.xml
index d99f6b0eb6bf..cd668ea05f76 100644
--- a/src/chrome/content/rules/Dunkelangst.org.xml
+++ b/src/chrome/content/rules/Dunkelangst.org.xml
@@ -15,7 +15,7 @@ Fetch error: http://www.dunkelangst.org/ => https://www.dunkelangst.org/: (60, '
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Duo-Security.xml b/src/chrome/content/rules/Duo-Security.xml
index 68bc2a2d8bdd..d3fb657e5c5f 100644
--- a/src/chrome/content/rules/Duo-Security.xml
+++ b/src/chrome/content/rules/Duo-Security.xml
@@ -20,7 +20,13 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Duolingo.xml b/src/chrome/content/rules/Duolingo.xml
new file mode 100644
index 000000000000..2eca1098c671
--- /dev/null
+++ b/src/chrome/content/rules/Duolingo.xml
@@ -0,0 +1,51 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Duply.net.xml b/src/chrome/content/rules/Duply.net.xml
new file mode 100644
index 000000000000..170796c4fd94
--- /dev/null
+++ b/src/chrome/content/rules/Duply.net.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Duracell_Cloud.com.xml b/src/chrome/content/rules/Duracell_Cloud.com.xml
deleted file mode 100644
index efee6f23a060..000000000000
--- a/src/chrome/content/rules/Duracell_Cloud.com.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Dustinabbott.net.xml b/src/chrome/content/rules/Dustinabbott.net.xml
new file mode 100644
index 000000000000..21b3d8560ee6
--- /dev/null
+++ b/src/chrome/content/rules/Dustinabbott.net.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/DutyFreeIslandShop.com.xml b/src/chrome/content/rules/DutyFreeIslandShop.com.xml
new file mode 100644
index 000000000000..a2a15cfbc53c
--- /dev/null
+++ b/src/chrome/content/rules/DutyFreeIslandShop.com.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Dwolla.xml b/src/chrome/content/rules/Dwolla.xml
index 331671b4ef86..8375d4702efc 100644
--- a/src/chrome/content/rules/Dwolla.xml
+++ b/src/chrome/content/rules/Dwolla.xml
@@ -40,7 +40,7 @@ Fetch error: http://api-devint.dwolla.com/ => https://api-devint.dwolla.com/: (7
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Dxtorrent.com.xml b/src/chrome/content/rules/Dxtorrent.com.xml
deleted file mode 100644
index 4b89f8317bfa..000000000000
--- a/src/chrome/content/rules/Dxtorrent.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Dyankov.eu.xml b/src/chrome/content/rules/Dyankov.eu.xml
deleted file mode 100644
index c9a041c2a0ff..000000000000
--- a/src/chrome/content/rules/Dyankov.eu.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Dyn_Status.com.xml b/src/chrome/content/rules/Dyn_Status.com.xml
index 9dcdfaa5a26d..972d2a59776d 100644
--- a/src/chrome/content/rules/Dyn_Status.com.xml
+++ b/src/chrome/content/rules/Dyn_Status.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://internal.dynstatus.com/ => https://internal.dynstatus.com/:
 	For other Dyn coverage, see Dyn.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/DynaDot.xml b/src/chrome/content/rules/DynaDot.xml
index ae4abbeaac64..60b406f9218d 100644
--- a/src/chrome/content/rules/DynaDot.xml
+++ b/src/chrome/content/rules/DynaDot.xml
@@ -2,7 +2,7 @@
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/Dynamics.com.xml b/src/chrome/content/rules/Dynamics.com.xml
index 6d8aac0a88b0..057a2c981b0c 100644
--- a/src/chrome/content/rules/Dynamics.com.xml
+++ b/src/chrome/content/rules/Dynamics.com.xml
@@ -16,7 +16,7 @@ Fetch error: http://dynamics.com/ => https://www.dynamics.com/: (28, 'Connection
 		- www.dynamics.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Dynamite-Data-mismatches.xml b/src/chrome/content/rules/Dynamite-Data-mismatches.xml
index eff924106442..65033c300e82 100644
--- a/src/chrome/content/rules/Dynamite-Data-mismatches.xml
+++ b/src/chrome/content/rules/Dynamite-Data-mismatches.xml
@@ -5,10 +5,10 @@
 
 
 	
-	
+	
 
 
-	
+	
 
 
 	
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Dynatech.de.xml b/src/chrome/content/rules/Dynatech.de.xml
index 9e0e31aa9685..31527f1f3111 100644
--- a/src/chrome/content/rules/Dynatech.de.xml
+++ b/src/chrome/content/rules/Dynatech.de.xml
@@ -1,7 +1,7 @@
 
     
-	
+
     
 
diff --git a/src/chrome/content/rules/Dyne.org.xml b/src/chrome/content/rules/Dyne.org.xml
index 55ca3d550348..ce98b6819de4 100644
--- a/src/chrome/content/rules/Dyne.org.xml
+++ b/src/chrome/content/rules/Dyne.org.xml
@@ -50,17 +50,21 @@ Fetch error: http://dyne.org/ => https://dyne.org/: (60, 'SSL certificate proble
 	⁵ Rule disabled by default <= CAcert
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
+	
+	
 		
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Dyson.xml b/src/chrome/content/rules/Dyson.xml
index e22ec90d134e..59275aec40fc 100644
--- a/src/chrome/content/rules/Dyson.xml
+++ b/src/chrome/content/rules/Dyson.xml
@@ -8,7 +8,7 @@ Fetch error: http://content.dyson.co.uk/ => http://content.dyson.co.uk/: (28, 'C
 Disabled by https-everywhere-checker because:
 Fetch error: http://dyson.co.uk/ => https://www.dyson.co.uk/: (7, 'Failed to connect to dyson.co.uk port 80: No route to host')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/E-Estonia.com.xml b/src/chrome/content/rules/E-Estonia.com.xml
deleted file mode 100644
index 4693e784d769..000000000000
--- a/src/chrome/content/rules/E-Estonia.com.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/E-Generator.com.xml b/src/chrome/content/rules/E-Generator.com.xml
deleted file mode 100644
index fabf604ec1c5..000000000000
--- a/src/chrome/content/rules/E-Generator.com.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/E-Hentai-Forums.xml b/src/chrome/content/rules/E-Hentai-Forums.xml
deleted file mode 100644
index 1b6d69ea3fcd..000000000000
--- a/src/chrome/content/rules/E-Hentai-Forums.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-  
-  
-
-  
-
diff --git a/src/chrome/content/rules/E-Hentai.org.xml b/src/chrome/content/rules/E-Hentai.org.xml
new file mode 100644
index 000000000000..2142b660714f
--- /dev/null
+++ b/src/chrome/content/rules/E-Hentai.org.xml
@@ -0,0 +1,34 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/E-Plus-problematic.xml b/src/chrome/content/rules/E-Plus-problematic.xml
index 44b76dc53399..e1032b5983c0 100644
--- a/src/chrome/content/rules/E-Plus-problematic.xml
+++ b/src/chrome/content/rules/E-Plus-problematic.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/E-Plus.xml b/src/chrome/content/rules/E-Plus.xml
index d52aaf8bbbee..93c7cc933575 100644
--- a/src/chrome/content/rules/E-Plus.xml
+++ b/src/chrome/content/rules/E-Plus.xml
@@ -23,10 +23,17 @@ Fetch error: http://e-plus.de/ => https://www.e-plus.de/: (7, 'Failed to connect
 		- einstellungen		(works, mismatched, CN: *.customersaas.com)
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
@@ -35,7 +42,6 @@ Fetch error: http://e-plus.de/ => https://www.e-plus.de/: (7, 'Failed to connect
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/E-Sports_Entertainment.xml b/src/chrome/content/rules/E-Sports_Entertainment.xml
index 11ac23746729..cab78dc32251 100644
--- a/src/chrome/content/rules/E-Sports_Entertainment.xml
+++ b/src/chrome/content/rules/E-Sports_Entertainment.xml
@@ -11,7 +11,7 @@
 -->
 
 
-	
+	
 	
 	
 
@@ -22,4 +22,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/E-boks.dk.xml b/src/chrome/content/rules/E-boks.dk.xml
index 21b55a098282..5ab26ad06877 100644
--- a/src/chrome/content/rules/E-boks.dk.xml
+++ b/src/chrome/content/rules/E-boks.dk.xml
@@ -5,7 +5,9 @@
 
 
 	
-	
+	
+	
+	
 		
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/E-junkie.xml b/src/chrome/content/rules/E-junkie.xml
index 6b0ac2c5c6a3..c11c2385c4ea 100644
--- a/src/chrome/content/rules/E-junkie.xml
+++ b/src/chrome/content/rules/E-junkie.xml
@@ -1,15 +1,18 @@
-
+
-	
+-->
+
+
+	
+	
+	
+	
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/E-magazin.se.xml b/src/chrome/content/rules/E-magazin.se.xml
index f7132e8bc39e..778ddffb3ed9 100644
--- a/src/chrome/content/rules/E-magazin.se.xml
+++ b/src/chrome/content/rules/E-magazin.se.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/E-mielenterveys.xml b/src/chrome/content/rules/E-mielenterveys.xml
index 262d7cef3d79..0bdd6d123783 100644
--- a/src/chrome/content/rules/E-mielenterveys.xml
+++ b/src/chrome/content/rules/E-mielenterveys.xml
@@ -5,7 +5,7 @@ Fetch error: http://e-mielenterveys.fi/ => https://www.e-mielenterveys.fi/: (60,
 Fetch error: http://www.e-mielenterveys.fi/ => https://www.e-mielenterveys.fi/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/E-onlinedata.com.xml b/src/chrome/content/rules/E-onlinedata.com.xml
deleted file mode 100644
index dfdb934c0bc7..000000000000
--- a/src/chrome/content/rules/E-onlinedata.com.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/E-prawnik.pl.xml b/src/chrome/content/rules/E-prawnik.pl.xml
index 12761d6bef81..3dabaa9425b3 100644
--- a/src/chrome/content/rules/E-prawnik.pl.xml
+++ b/src/chrome/content/rules/E-prawnik.pl.xml
@@ -21,7 +21,9 @@
 
 
 	
-	
+	
+	
+	
 		
@@ -42,4 +44,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/E-rewards.com.xml b/src/chrome/content/rules/E-rewards.com.xml
index e58e0177af21..a23cac2c2045 100644
--- a/src/chrome/content/rules/E-rewards.com.xml
+++ b/src/chrome/content/rules/E-rewards.com.xml
@@ -1,4 +1,7 @@
 
-  
-  
+	
+	
+
+	
 
diff --git a/src/chrome/content/rules/E.ON_UK.xml b/src/chrome/content/rules/E.ON_UK.xml
index c6ec593cfc6c..f2f422ffb333 100644
--- a/src/chrome/content/rules/E.ON_UK.xml
+++ b/src/chrome/content/rules/E.ON_UK.xml
@@ -11,7 +11,7 @@ Fetch error: http://stats.eon-uk.com/ => https://stats.eon-uk.com/: (28, 'Operat
 	Some pages redirect to http.
 
 -->
-
+
 
 	
 	
@@ -24,4 +24,4 @@ Fetch error: http://stats.eon-uk.com/ => https://stats.eon-uk.com/: (28, 'Operat
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/E2E-Networks.xml b/src/chrome/content/rules/E2E-Networks.xml
deleted file mode 100644
index 9e339446d1f4..000000000000
--- a/src/chrome/content/rules/E2E-Networks.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/E2ma.net.xml b/src/chrome/content/rules/E2ma.net.xml
deleted file mode 100644
index 296a5a532db9..000000000000
--- a/src/chrome/content/rules/E2ma.net.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/EArcu.xml b/src/chrome/content/rules/EArcu.xml
index fd1a485a9bd8..f3c6f3a3faf3 100644
--- a/src/chrome/content/rules/EArcu.xml
+++ b/src/chrome/content/rules/EArcu.xml
@@ -6,16 +6,16 @@ Fetch error: http://earcu.com/ => https://earcu.com/: (28, 'Connection timed out
 Automatically by https-everywhere-checker because:
 Fetch error: http://earcu.com/ => https://earcu.com/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
 
 	
 	
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/EBSCO-content.com.xml b/src/chrome/content/rules/EBSCO-content.com.xml
deleted file mode 100644
index 462452a367be..000000000000
--- a/src/chrome/content/rules/EBSCO-content.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/EBlastEngine.com.xml b/src/chrome/content/rules/EBlastEngine.com.xml
index 74de97690798..199f1c55a2bf 100644
--- a/src/chrome/content/rules/EBlastEngine.com.xml
+++ b/src/chrome/content/rules/EBlastEngine.com.xml
@@ -39,7 +39,7 @@
 					-->
 	
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ECPIC.gov.xml b/src/chrome/content/rules/ECPIC.gov.xml
deleted file mode 100644
index ba200f8ea000..000000000000
--- a/src/chrome/content/rules/ECPIC.gov.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/ECSI.xml b/src/chrome/content/rules/ECSI.xml
index bd74277386c5..3368d93e095a 100644
--- a/src/chrome/content/rules/ECSI.xml
+++ b/src/chrome/content/rules/ECSI.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://ecsi.com/ => https://www.ecsi.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.ecsi.com'")
 Fetch error: http://www.ecsi.com/ => https://www.ecsi.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.ecsi.com'")
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ECTC-online.org.xml b/src/chrome/content/rules/ECTC-online.org.xml
new file mode 100644
index 000000000000..c3a7f0740f18
--- /dev/null
+++ b/src/chrome/content/rules/ECTC-online.org.xml
@@ -0,0 +1,9 @@
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/ECampus.no.xml b/src/chrome/content/rules/ECampus.no.xml
index b453c0cd690e..c0af9862cf4e 100644
--- a/src/chrome/content/rules/ECampus.no.xml
+++ b/src/chrome/content/rules/ECampus.no.xml
@@ -23,7 +23,7 @@ Fetch error: http://www.ecampus.no/ => https://www.ecampus.no/: (6, 'Could not r
 		- www-ecampus.uninett.no
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/ECigPros.xml b/src/chrome/content/rules/ECigPros.xml
index df4bef1ce40c..2160e137edc4 100644
--- a/src/chrome/content/rules/ECigPros.xml
+++ b/src/chrome/content/rules/ECigPros.xml
@@ -4,9 +4,9 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ECosCentric.com.xml b/src/chrome/content/rules/ECosCentric.com.xml
index f96fb01fa641..1ea6f9b330ec 100644
--- a/src/chrome/content/rules/ECosCentric.com.xml
+++ b/src/chrome/content/rules/ECosCentric.com.xml
@@ -12,7 +12,10 @@ Fetch error: http://ecoscentric.com/ => https://www.ecoscentric.com/: (60, 'SSL
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
@@ -24,7 +27,6 @@ Fetch error: http://ecoscentric.com/ => https://www.ecoscentric.com/: (60, 'SSL
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/ECustomerOpinions.com.xml b/src/chrome/content/rules/ECustomerOpinions.com.xml
index a8e0e9d4aeb9..69c4bd0f810d 100644
--- a/src/chrome/content/rules/ECustomerOpinions.com.xml
+++ b/src/chrome/content/rules/ECustomerOpinions.com.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.ecustomeropinions.com/ => https://www.ecustomeropinions.
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/EDF_Energy.xml b/src/chrome/content/rules/EDF_Energy.xml
index ee1c3a0b5875..e322e3df04df 100644
--- a/src/chrome/content/rules/EDF_Energy.xml
+++ b/src/chrome/content/rules/EDF_Energy.xml
@@ -7,7 +7,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -16,7 +17,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/EDG.com.xml b/src/chrome/content/rules/EDG.com.xml
index e9900fdfabf8..a16bbb13e498 100644
--- a/src/chrome/content/rules/EDG.com.xml
+++ b/src/chrome/content/rules/EDG.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://edg.com/ => https://edg.com/: (60, 'SSL certificate problem:
 Fetch error: http://www.edg.com/ => https://www.edg.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/EDI-Health-Group-mismatches.xml b/src/chrome/content/rules/EDI-Health-Group-mismatches.xml
index c183b184add2..72a571fbc1ea 100644
--- a/src/chrome/content/rules/EDI-Health-Group-mismatches.xml
+++ b/src/chrome/content/rules/EDI-Health-Group-mismatches.xml
@@ -3,7 +3,7 @@
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/EDI-Health-Group.xml b/src/chrome/content/rules/EDI-Health-Group.xml
index 5e64a8ddb0bf..55753a824b00 100644
--- a/src/chrome/content/rules/EDI-Health-Group.xml
+++ b/src/chrome/content/rules/EDI-Health-Group.xml
@@ -3,7 +3,8 @@
 	
 	
 	
-	
+	
+	
 	
 	
 	
@@ -21,13 +22,10 @@
 	
 
-	
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/EDP.pt.xml b/src/chrome/content/rules/EDP.pt.xml
index c28d6618b73f..1a06e311fa8f 100644
--- a/src/chrome/content/rules/EDP.pt.xml
+++ b/src/chrome/content/rules/EDP.pt.xml
@@ -30,7 +30,7 @@ Fetch error: http://www.edpessoa.internet.edp.pt/ => https://www.edpessoa.intern
 	(www.)premioedpinovacao.edp.pt
 -->
 
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/EDRDG.org.xml b/src/chrome/content/rules/EDRDG.org.xml
new file mode 100644
index 000000000000..713f598fa383
--- /dev/null
+++ b/src/chrome/content/rules/EDRDG.org.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/EDigitalResearch.xml b/src/chrome/content/rules/EDigitalResearch.xml
index df282b91c4d8..5315413ae1a4 100644
--- a/src/chrome/content/rules/EDigitalResearch.xml
+++ b/src/chrome/content/rules/EDigitalResearch.xml
@@ -8,7 +8,6 @@ Fetch error: http://www.edigitalresearch.com/ => https://www.edigitalresearch.co
 
 		- ECustomerOpinions.com.xml
 		- EDR_CDN.com.xml
-		- EDigitalSurvey.com.xml
 
 
 	Nonfunctional hosts in *edigitalresearch.com:
@@ -25,7 +24,7 @@ Fetch error: http://www.edigitalresearch.com/ => https://www.edigitalresearch.co
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/EDirectDebit.xml b/src/chrome/content/rules/EDirectDebit.xml
index fb003e1a647e..0e932a0e1cf8 100644
--- a/src/chrome/content/rules/EDirectDebit.xml
+++ b/src/chrome/content/rules/EDirectDebit.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.edirectdebit.com/ => https://www.edirectdebit.com/: (28,
 	!www: cert only matches www
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/EET_Group.xml b/src/chrome/content/rules/EET_Group.xml
index 38eb79568609..97526b7c6bb9 100644
--- a/src/chrome/content/rules/EET_Group.xml
+++ b/src/chrome/content/rules/EET_Group.xml
@@ -6,21 +6,49 @@ Fetch error: http://eet.eu/ => https://eet.eu/: (28, 'Connection timed out after
 Disabled by https-everywhere-checker because:
 Fetch error: http://eet.eu/ => https://eet.eu/: (28, 'Connection timed out after 10000 milliseconds')
 -->
-
+
 
 	
-	
-	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/EE_Times-mixed.xml b/src/chrome/content/rules/EE_Times-mixed.xml
index 37761f38f78e..dfe76b2e468c 100644
--- a/src/chrome/content/rules/EE_Times-mixed.xml
+++ b/src/chrome/content/rules/EE_Times-mixed.xml
@@ -8,7 +8,7 @@ Fetch error: http://video.eetimes.com/ => https://video.eetimes.com/: (6, 'Could
 	For rules that do not cause mixed content, see EE_Times.xml.
 
 -->
-
+
 
 	
 
@@ -18,4 +18,4 @@ Fetch error: http://video.eetimes.com/ => https://video.eetimes.com/: (6, 'Could
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/EE_Times.xml b/src/chrome/content/rules/EE_Times.xml
index 774632aa53f3..468ed5adaaaf 100644
--- a/src/chrome/content/rules/EE_Times.xml
+++ b/src/chrome/content/rules/EE_Times.xml
@@ -22,10 +22,14 @@ Fetch error: http://eetimes.com/ => https://eetimes.com/: (7, 'Failed to connect
 		- video		(mixed iframe from sso.techonline.com & video from brightcove.vo.llnwd.net)
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/EFinancialCareers.xml b/src/chrome/content/rules/EFinancialCareers.xml
index 776cab007f07..0524d8ac4af4 100644
--- a/src/chrome/content/rules/EFinancialCareers.xml
+++ b/src/chrome/content/rules/EFinancialCareers.xml
@@ -41,7 +41,7 @@ Fetch error: http://news-cdn.efinancialcareers.com/ => https://d2p98mys7gexzy.cl
 		- www.efinancialcareers.com
 
 -->
-
+
 
 	
@@ -84,10 +84,6 @@ Fetch error: http://news-cdn.efinancialcareers.com/ => https://d2p98mys7gexzy.cl
 	
 
 
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/EFurnitureNY.xml b/src/chrome/content/rules/EFurnitureNY.xml
index 6f6e9279c08c..0c4c7f87f3af 100644
--- a/src/chrome/content/rules/EFurnitureNY.xml
+++ b/src/chrome/content/rules/EFurnitureNY.xml
@@ -4,9 +4,9 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/EHWiki.org.xml b/src/chrome/content/rules/EHWiki.org.xml
new file mode 100644
index 000000000000..f1593602baae
--- /dev/null
+++ b/src/chrome/content/rules/EHWiki.org.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/EIDQ.xml b/src/chrome/content/rules/EIDQ.xml
index 4075f5253890..b46c73a0767c 100644
--- a/src/chrome/content/rules/EIDQ.xml
+++ b/src/chrome/content/rules/EIDQ.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://eidq.org/ => https://eidq.org/: (60, 'SSL certificate problem: certificate has expired')
 Fetch error: http://www.eidq.org/ => https://www.eidq.org/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/EIS_Kent.co.uk.xml b/src/chrome/content/rules/EIS_Kent.co.uk.xml
index bb5eb22368f6..a64a0f1904a5 100644
--- a/src/chrome/content/rules/EIS_Kent.co.uk.xml
+++ b/src/chrome/content/rules/EIS_Kent.co.uk.xml
@@ -24,7 +24,7 @@ Fetch error: http://eiskent.co.uk/ => https://www.eiskent.co.uk/: (51, "SSL: no
 	ˢ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/EKWB.com.xml b/src/chrome/content/rules/EKWB.com.xml
index 59da11e023ee..1d5d1fd907a5 100644
--- a/src/chrome/content/rules/EKWB.com.xml
+++ b/src/chrome/content/rules/EKWB.com.xml
@@ -3,6 +3,6 @@
 	
 
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/ELENA-Verfahren.de.xml b/src/chrome/content/rules/ELENA-Verfahren.de.xml
index d14ed1f9f438..8398f83ffb6d 100644
--- a/src/chrome/content/rules/ELENA-Verfahren.de.xml
+++ b/src/chrome/content/rules/ELENA-Verfahren.de.xml
@@ -6,9 +6,9 @@ Fetch error: http://das-elena-verfahren.de/ => https://www.das-elena-verfahren.d
 Disabled by https-everywhere-checker because:
 Fetch error: http://das-elena-verfahren.de/ => https://www.das-elena-verfahren.de/: (35, 'error:140770FC:SSL routines:SSL23_GET_SERVER_HELLO:unknown protocol')
 -->
-
+
  
- 
+ 
 
  
 
diff --git a/src/chrome/content/rules/ELO_edge.com.xml b/src/chrome/content/rules/ELO_edge.com.xml
index a2003dda9e28..09cfce5e5d8c 100644
--- a/src/chrome/content/rules/ELO_edge.com.xml
+++ b/src/chrome/content/rules/ELO_edge.com.xml
@@ -20,7 +20,7 @@ Fetch error: http://eloedge.com/ => https://eloedge.com/: (51, "SSL: no alternat
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ELTE.hu.xml b/src/chrome/content/rules/ELTE.hu.xml
index 97e286f60062..f0244f303961 100644
--- a/src/chrome/content/rules/ELTE.hu.xml
+++ b/src/chrome/content/rules/ELTE.hu.xml
@@ -51,14 +51,27 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
 
 	
@@ -68,4 +81,5 @@
 	
 
+	
 
diff --git a/src/chrome/content/rules/ELY-keskus.fi.xml b/src/chrome/content/rules/ELY-keskus.fi.xml
new file mode 100644
index 000000000000..2d252386f38c
--- /dev/null
+++ b/src/chrome/content/rules/ELY-keskus.fi.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ELabor.xml b/src/chrome/content/rules/ELabor.xml
index 9f17bf9ac431..ddd0bda701af 100644
--- a/src/chrome/content/rules/ELabor.xml
+++ b/src/chrome/content/rules/ELabor.xml
@@ -17,4 +17,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ELatinos.com.xml b/src/chrome/content/rules/ELatinos.com.xml
index 992bf89ad0be..0458ce46ff6c 100644
--- a/src/chrome/content/rules/ELatinos.com.xml
+++ b/src/chrome/content/rules/ELatinos.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://www.elatinos.com/ => https://www.elatinos.com/: (6, 'Could n
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/EMS.xml b/src/chrome/content/rules/EMS.xml
new file mode 100644
index 000000000000..7165b46e9f36
--- /dev/null
+++ b/src/chrome/content/rules/EMS.xml
@@ -0,0 +1,37 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/ENS.fr.xml b/src/chrome/content/rules/ENS.fr.xml
index 4a89bdc9def8..152480045412 100644
--- a/src/chrome/content/rules/ENS.fr.xml
+++ b/src/chrome/content/rules/ENS.fr.xml
@@ -127,7 +127,7 @@
 	
 	
 	
-	
+
 	
 	
 
@@ -143,11 +143,11 @@
 	
 	
 	
-	
+
 		
 		
 			
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/ENomCentral.xml b/src/chrome/content/rules/ENomCentral.xml
index 76d336bb8490..34e9346227cd 100644
--- a/src/chrome/content/rules/ENomCentral.xml
+++ b/src/chrome/content/rules/ENomCentral.xml
@@ -1,18 +1,11 @@
 
 
 
 	
 	
 
+	
 
-	
-
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/EOL.org.xml b/src/chrome/content/rules/EOL.org.xml
index c3d74c96e9b0..8c8774196ec7 100644
--- a/src/chrome/content/rules/EOL.org.xml
+++ b/src/chrome/content/rules/EOL.org.xml
@@ -1,7 +1,7 @@
 
-
+
 
 	
-	
+	
+	
+	
+	
+	
+	
 	
 	
 
@@ -35,7 +40,6 @@ Fetch error: http://www.eprize.net/ => https://www.eprize.com/: (51, "SSL: no al
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/EQBank.ca.xml b/src/chrome/content/rules/EQBank.ca.xml
new file mode 100644
index 000000000000..999ac77c6b49
--- /dev/null
+++ b/src/chrome/content/rules/EQBank.ca.xml
@@ -0,0 +1,24 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ERC.edu.xml b/src/chrome/content/rules/ERC.edu.xml
index d2f1d38a6a07..4a8332c9e18f 100644
--- a/src/chrome/content/rules/ERC.edu.xml
+++ b/src/chrome/content/rules/ERC.edu.xml
@@ -9,7 +9,7 @@ Fetch error: http://faq.erc.edu/ => https://faq.erc.edu/: (28, 'Connection timed
 		- courses.erc.edu
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/ESB.ie.xml b/src/chrome/content/rules/ESB.ie.xml
index 2f79a2f656c8..d7717f0a30ee 100644
--- a/src/chrome/content/rules/ESB.ie.xml
+++ b/src/chrome/content/rules/ESB.ie.xml
@@ -5,7 +5,7 @@ Fetch error: http://www.esbie.ie/ => https://www.esbie.ie/: (35, 'Unknown SSL pr
 Fetch error: http://esbie.ie/ => https://esbie.ie/: (35, 'Unknown SSL protocol error in connection to esbie.ie:443 ')
 
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/ESF-Works.com.xml b/src/chrome/content/rules/ESF-Works.com.xml
index 7141fa59b359..d57c040cbbfb 100644
--- a/src/chrome/content/rules/ESF-Works.com.xml
+++ b/src/chrome/content/rules/ESF-Works.com.xml
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ESI.xml b/src/chrome/content/rules/ESI.xml
index 65d437388db4..ec5df4920e9e 100644
--- a/src/chrome/content/rules/ESI.xml
+++ b/src/chrome/content/rules/ESI.xml
@@ -4,13 +4,12 @@
 -->
 
 
-	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ESISS.xml b/src/chrome/content/rules/ESISS.xml
deleted file mode 100644
index 2c35a50b4f55..000000000000
--- a/src/chrome/content/rules/ESISS.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-  
-  
-
-  
-
-  
-
diff --git a/src/chrome/content/rules/ESLint.org.xml b/src/chrome/content/rules/ESLint.org.xml
index db96c86887fb..e83d700cf822 100644
--- a/src/chrome/content/rules/ESLint.org.xml
+++ b/src/chrome/content/rules/ESLint.org.xml
@@ -1,4 +1,5 @@
 
+
 	
 	
 	
@@ -7,4 +8,5 @@
 	
 
 	
+
 
diff --git a/src/chrome/content/rules/ESRB.xml b/src/chrome/content/rules/ESRB.xml
index a971aec1c615..77e4a02b14bc 100644
--- a/src/chrome/content/rules/ESRB.xml
+++ b/src/chrome/content/rules/ESRB.xml
@@ -3,4 +3,4 @@
   
 
   
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ESTA_Visas.org.uk.xml b/src/chrome/content/rules/ESTA_Visas.org.uk.xml
index 94f2a4e09a47..4da9a5aef2a0 100644
--- a/src/chrome/content/rules/ESTA_Visas.org.uk.xml
+++ b/src/chrome/content/rules/ESTA_Visas.org.uk.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.estavisas.org.uk/ => https://www.estavisas.org.uk/: (51,
 		- www.estavisas.org.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/ESTA_Visas.org.xml b/src/chrome/content/rules/ESTA_Visas.org.xml
index b5d0d3a51efe..59d98e74f336 100644
--- a/src/chrome/content/rules/ESTA_Visas.org.xml
+++ b/src/chrome/content/rules/ESTA_Visas.org.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.estavisas.org/ => https://www.estavisas.org/: (7, 'Faile
 		- www.estavisas.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/ETH_Zurich.xml b/src/chrome/content/rules/ETH_Zurich.xml
index 7359fcb787e3..a296bea08c78 100644
--- a/src/chrome/content/rules/ETH_Zurich.xml
+++ b/src/chrome/content/rules/ETH_Zurich.xml
@@ -73,7 +73,7 @@ Fetch error: http://www1.ethz.ch/ => https://www1.ethz.ch/: (6, 'Could not resol
 		- www1.ethz.ch
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/ETS.xml b/src/chrome/content/rules/ETS.xml
index 34e980fd3996..a8103d2e4e0d 100644
--- a/src/chrome/content/rules/ETS.xml
+++ b/src/chrome/content/rules/ETS.xml
@@ -1,7 +1,19 @@
 
   
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
   
-  
-
\ No newline at end of file
+  
+
diff --git a/src/chrome/content/rules/EToro.xml b/src/chrome/content/rules/EToro.xml
index e8c724996af8..1274478709ca 100644
--- a/src/chrome/content/rules/EToro.xml
+++ b/src/chrome/content/rules/EToro.xml
@@ -1,59 +1,47 @@
 
-
-
+
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
-	
-	
+	
+	
+	
+	
 	
+	
+	
 	
-	
 	
+	
+	
 	
 
-
-	
-	
-	
-	
-
 	
 
-
-	
-
-	
+	
+
diff --git a/src/chrome/content/rules/EUBA.sk.xml b/src/chrome/content/rules/EUBA.sk.xml
new file mode 100644
index 000000000000..9200a562d105
--- /dev/null
+++ b/src/chrome/content/rules/EUBA.sk.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/EUKhost.xml b/src/chrome/content/rules/EUKhost.xml
index 2d813bb83210..61de8c8df3ad 100644
--- a/src/chrome/content/rules/EUKhost.xml
+++ b/src/chrome/content/rules/EUKhost.xml
@@ -35,4 +35,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/EUKhosting.xml b/src/chrome/content/rules/EUKhosting.xml
index f15873b83e53..9ab6fb1df09f 100644
--- a/src/chrome/content/rules/EUKhosting.xml
+++ b/src/chrome/content/rules/EUKhosting.xml
@@ -15,10 +15,10 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/EUSecWest.xml b/src/chrome/content/rules/EUSecWest.xml
deleted file mode 100644
index 7572bbf69e3a..000000000000
--- a/src/chrome/content/rules/EUSecWest.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/EUserv.de.xml b/src/chrome/content/rules/EUserv.de.xml
index fcd123f02b74..e8c66b31f177 100644
--- a/src/chrome/content/rules/EUserv.de.xml
+++ b/src/chrome/content/rules/EUserv.de.xml
@@ -13,14 +13,16 @@
 
 
 	
-	
+	
+	
+	
+	
 		
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/EVEX.xml b/src/chrome/content/rules/EVEX.xml
new file mode 100644
index 000000000000..2e9fb839c1da
--- /dev/null
+++ b/src/chrome/content/rules/EVEX.xml
@@ -0,0 +1,32 @@
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+	
+
diff --git a/src/chrome/content/rules/EVE_Online.com.xml b/src/chrome/content/rules/EVE_Online.com.xml
deleted file mode 100644
index bcc4b6c5fa19..000000000000
--- a/src/chrome/content/rules/EVE_Online.com.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-	
-	
-		
-
-
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/EVGA.com.xml b/src/chrome/content/rules/EVGA.com.xml
deleted file mode 100644
index 14cbddab9d48..000000000000
--- a/src/chrome/content/rules/EVGA.com.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/EW-Scripps-Company-mismatches.xml b/src/chrome/content/rules/EW-Scripps-Company-mismatches.xml
index 05d21daaa19b..16149a534b41 100644
--- a/src/chrome/content/rules/EW-Scripps-Company-mismatches.xml
+++ b/src/chrome/content/rules/EW-Scripps-Company-mismatches.xml
@@ -8,17 +8,16 @@ Some buckets:
 
 	
 	
-	
+	
+	
+	
 	
 	
 
-	
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/EW-Scripps-Company.xml b/src/chrome/content/rules/EW-Scripps-Company.xml
index 2f33da9c2f3a..74c2da464c28 100644
--- a/src/chrome/content/rules/EW-Scripps-Company.xml
+++ b/src/chrome/content/rules/EW-Scripps-Company.xml
@@ -24,7 +24,7 @@ Fetch error: http://www.redding.com/ => https://www.redding.com/: (51, "SSL: no
 		- www.theindychannel.com	(prints "Down For Maintenance", akamai)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/EWONTFIX.com.xml b/src/chrome/content/rules/EWONTFIX.com.xml
new file mode 100644
index 000000000000..6bfac83be336
--- /dev/null
+++ b/src/chrome/content/rules/EWONTFIX.com.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/EWebScapes.com.xml b/src/chrome/content/rules/EWebScapes.com.xml
index 96c76a7301b0..be0cd5b5946c 100644
--- a/src/chrome/content/rules/EWebScapes.com.xml
+++ b/src/chrome/content/rules/EWebScapes.com.xml
@@ -1,7 +1,6 @@
 
 	
-	
 	
 
-		
-		
-
-
 	
@@ -27,14 +20,4 @@
 
 		
 
-	
-	
-
-		
-		
-		
-		
-
 
diff --git a/src/chrome/content/rules/EWellness_magazine.xml b/src/chrome/content/rules/EWellness_magazine.xml
index b55c7a0a00c3..2ff2fd59bb85 100644
--- a/src/chrome/content/rules/EWellness_magazine.xml
+++ b/src/chrome/content/rules/EWellness_magazine.xml
@@ -19,7 +19,7 @@ Fetch error: http://www.ewellnessmag.com/ => https://www.ewellnessmag.com/: (51,
 		- cart
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/EXANTE.xml b/src/chrome/content/rules/EXANTE.xml
index 5af6475c3f0a..27ce876f7339 100644
--- a/src/chrome/content/rules/EXANTE.xml
+++ b/src/chrome/content/rules/EXANTE.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/EXXile.net.xml b/src/chrome/content/rules/EXXile.net.xml
index 85826fd82729..2eb02eace4b1 100644
--- a/src/chrome/content/rules/EXXile.net.xml
+++ b/src/chrome/content/rules/EXXile.net.xml
@@ -5,7 +5,8 @@
 
 
 	
-	
+	
+	
 
 
 	
-
+
 
 	
-	
-	
-	
-	
-	
-	
+	
+	
 
-	
+	
 	
-	
-
-	
-
-
-	
-	
+	
+	
+	
 
+	
 
 	
 
-	
-
-	
-
 	
 
diff --git a/src/chrome/content/rules/EXiled.xml b/src/chrome/content/rules/EXiled.xml
index 88734220e5d7..9332273686ec 100644
--- a/src/chrome/content/rules/EXiled.xml
+++ b/src/chrome/content/rules/EXiled.xml
@@ -15,4 +15,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/EZGram.xml b/src/chrome/content/rules/EZGram.xml
deleted file mode 100644
index b1fae66aba7e..000000000000
--- a/src/chrome/content/rules/EZGram.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-  
-  
-  
-  
-
diff --git a/src/chrome/content/rules/EZOSHosting.xml b/src/chrome/content/rules/EZOSHosting.xml
index 447be5c17c44..6c8925ed67d0 100644
--- a/src/chrome/content/rules/EZOSHosting.xml
+++ b/src/chrome/content/rules/EZOSHosting.xml
@@ -35,7 +35,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/EZTV.xml b/src/chrome/content/rules/EZTV.xml
index f7d326ac07b5..4d2ec4115c09 100644
--- a/src/chrome/content/rules/EZTV.xml
+++ b/src/chrome/content/rules/EZTV.xml
@@ -8,7 +8,7 @@ Fetch error: http://ezrss.it/ => https://ezrss.it/: (28, 'Resolving timed out af
 Fetch error: http://www.ezrss.it/ => https://ezrss.it/: (28, 'Resolving timed out after 10519 milliseconds')
 Fetch error: http://eztv.it/ => https://eztv.it/: (6, 'Could not resolve host: eztv.it')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Eager.io.xml b/src/chrome/content/rules/Eager.io.xml
index 4fef06c921b6..927c882b344c 100644
--- a/src/chrome/content/rules/Eager.io.xml
+++ b/src/chrome/content/rules/Eager.io.xml
@@ -3,17 +3,24 @@
 
 		- store.eager.io
 
+  May 7, 2020: This service now exists with Cloudflare apps as of 2017
+
+  Refused:
+    - bus.*
+    - embedded.*
+    - dev.*
+    - status.*
 -->
 
 
 	
-	
-
-
-	
+	
 
-	
+  -->
 
+	
 
diff --git a/src/chrome/content/rules/Eagle_Rock_Reservation.xml b/src/chrome/content/rules/Eagle_Rock_Reservation.xml
index e6e72993977b..efd5a4dbd204 100644
--- a/src/chrome/content/rules/Eagle_Rock_Reservation.xml
+++ b/src/chrome/content/rules/Eagle_Rock_Reservation.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/EarthLink.xml b/src/chrome/content/rules/EarthLink.xml
index c79fcbc8bacb..fa2d88ea480b 100644
--- a/src/chrome/content/rules/EarthLink.xml
+++ b/src/chrome/content/rules/EarthLink.xml
@@ -1,18 +1,18 @@
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/East_Riding.gov.uk.xml b/src/chrome/content/rules/East_Riding.gov.uk.xml
index ec5d168335a9..d0e5cf4cd857 100644
--- a/src/chrome/content/rules/East_Riding.gov.uk.xml
+++ b/src/chrome/content/rules/East_Riding.gov.uk.xml
@@ -71,7 +71,7 @@ Non-2xx HTTP code: http://consult.eastriding.gov.uk/ (200) => https://eastriding
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Eastbay-problematic.xml b/src/chrome/content/rules/Eastbay-problematic.xml
index 453d9cb1e000..9367eb80294c 100644
--- a/src/chrome/content/rules/Eastbay-problematic.xml
+++ b/src/chrome/content/rules/Eastbay-problematic.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Eastbay.xml b/src/chrome/content/rules/Eastbay.xml
index f8829f27af2a..dca7e9d312a6 100644
--- a/src/chrome/content/rules/Eastbay.xml
+++ b/src/chrome/content/rules/Eastbay.xml
@@ -35,7 +35,10 @@ Fetch error: http://eastbay.com/ => https://www.eastbay.com/: Cycle detected - U
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
@@ -44,7 +47,6 @@ Fetch error: http://eastbay.com/ => https://www.eastbay.com/: Cycle detected - U
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Eastbay_Team_Services.xml b/src/chrome/content/rules/Eastbay_Team_Services.xml
index d2d5911b8c34..36ca8a42d24b 100644
--- a/src/chrome/content/rules/Eastbay_Team_Services.xml
+++ b/src/chrome/content/rules/Eastbay_Team_Services.xml
@@ -14,16 +14,14 @@ Fetch error: http://eastbayteamservices.com/ => http://eastbayteamservices.com/:
 		- ^		(expired, cert only matches www)
 
 -->
-
+
 
-	
 	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Eastday.com.xml b/src/chrome/content/rules/Eastday.com.xml
index 48a4a19cc300..52cdd1fac21a 100644
--- a/src/chrome/content/rules/Eastday.com.xml
+++ b/src/chrome/content/rules/Eastday.com.xml
@@ -1,35 +1,29 @@
 
-
 
 
 	
@@ -57,7 +51,7 @@
 	
 		
 		
-		
+
 	
 		
 		
@@ -97,6 +91,8 @@
 	
 	
 		
+	
+	
 	
 		
 	
@@ -112,13 +108,14 @@
 	
 	
 		
-	
-		
+	
+		
 	
 		
 		
 	
 		
+	
 	
 
 	
diff --git a/src/chrome/content/rules/EasterSeals.org.xml b/src/chrome/content/rules/EasterSeals.org.xml
new file mode 100644
index 000000000000..56ae9f71d709
--- /dev/null
+++ b/src/chrome/content/rules/EasterSeals.org.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Eastern-Collegiate-Taekwondo-Conference.xml b/src/chrome/content/rules/Eastern-Collegiate-Taekwondo-Conference.xml
deleted file mode 100644
index b3bb685515ae..000000000000
--- a/src/chrome/content/rules/Eastern-Collegiate-Taekwondo-Conference.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/EasyChair.org.xml b/src/chrome/content/rules/EasyChair.org.xml
index bf44664d06ee..1796d95d2b6c 100644
--- a/src/chrome/content/rules/EasyChair.org.xml
+++ b/src/chrome/content/rules/EasyChair.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://easychair.org/ => https://easychair.org/: Too many redirects while fetching 'https://easychair.org/'
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/EasyDNS.xml b/src/chrome/content/rules/EasyDNS.xml
index 8e22e417d5c2..de76451ee8e1 100644
--- a/src/chrome/content/rules/EasyDNS.xml
+++ b/src/chrome/content/rules/EasyDNS.xml
@@ -72,7 +72,7 @@ Fetch error: http://nps.easydns.com/ => https://nps.easydns.com/: (28, 'Connecti
 			- signup.easydns.com from ws-na.amazon-adsystem.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/EasyJet.com.xml b/src/chrome/content/rules/EasyJet.com.xml
index 02c061a3334f..946cbf0915dc 100644
--- a/src/chrome/content/rules/EasyJet.com.xml
+++ b/src/chrome/content/rules/EasyJet.com.xml
@@ -50,10 +50,14 @@ Non-2xx HTTP code: http://easyjet.com/ (200) => http://easyjet.com/ (403)
 	* Rule disabled by default
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
+	
 		
diff --git a/src/chrome/content/rules/EasyNews.com.xml b/src/chrome/content/rules/EasyNews.com.xml
new file mode 100644
index 000000000000..3f0da2e311d8
--- /dev/null
+++ b/src/chrome/content/rules/EasyNews.com.xml
@@ -0,0 +1,30 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/EasyNews.xml b/src/chrome/content/rules/EasyNews.xml
deleted file mode 100644
index 93c2cb5ad1ba..000000000000
--- a/src/chrome/content/rules/EasyNews.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-  
-  
-  
-
-  
-  
-
-
diff --git a/src/chrome/content/rules/EasyVoiceBiometrics.xml b/src/chrome/content/rules/EasyVoiceBiometrics.xml
index 2ce4fa7ff418..c53b53bfde80 100644
--- a/src/chrome/content/rules/EasyVoiceBiometrics.xml
+++ b/src/chrome/content/rules/EasyVoiceBiometrics.xml
@@ -1,10 +1,10 @@
 
 
 	
-	
+	
 
 
-	
+	
 
 
 	 https://support.easy-hebergement.fr/: (6, 'Could not resolve host: support.easy-hebergement.fr')
 
 -->
-
+
 
 	
 	
@@ -20,4 +20,4 @@ Fetch error: http://support.easy-hebergement.fr/ => https://support.easy-heberge
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Easyspace.xml b/src/chrome/content/rules/Easyspace.xml
index 16b308e7f24d..b1335ea42a43 100644
--- a/src/chrome/content/rules/Easyspace.xml
+++ b/src/chrome/content/rules/Easyspace.xml
@@ -12,13 +12,12 @@
 -->
 
 
-	
+	
 
 
-	
+	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Easywallet.org.xml b/src/chrome/content/rules/Easywallet.org.xml
index f851b8a4284f..beec998dbe73 100644
--- a/src/chrome/content/rules/Easywallet.org.xml
+++ b/src/chrome/content/rules/Easywallet.org.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/EatbyDate.com.xml b/src/chrome/content/rules/EatbyDate.com.xml
new file mode 100644
index 000000000000..c4c638a17623
--- /dev/null
+++ b/src/chrome/content/rules/EatbyDate.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ebis.ne.jp.xml b/src/chrome/content/rules/Ebis.ne.jp.xml
index 42f77f65cdcc..cad4ceda8a90 100644
--- a/src/chrome/content/rules/Ebis.ne.jp.xml
+++ b/src/chrome/content/rules/Ebis.ne.jp.xml
@@ -21,7 +21,7 @@
 
 	¹ Unsecurable <= shows another domain
 	² Unsecurable <= refused
-	
+
 -->
 
 
diff --git a/src/chrome/content/rules/Ebuyer.com.xml b/src/chrome/content/rules/Ebuyer.com.xml
index b0ab7adf3afe..6b9db4664594 100644
--- a/src/chrome/content/rules/Ebuyer.com.xml
+++ b/src/chrome/content/rules/Ebuyer.com.xml
@@ -29,7 +29,7 @@
 		- image
 		- forums
 		- orders
-		- static		
+		- static
 
 
 	These altnames don't exist:
@@ -53,7 +53,12 @@
 		duplicate target warning by blanket-rewriting !www here.
 					-->
 	
-	
+	
+	
+	
+	
+	
+	
 		
diff --git a/src/chrome/content/rules/Ebuzzing.xml b/src/chrome/content/rules/Ebuzzing.xml
index 21e0e2c73ecc..9a885683fd1d 100644
--- a/src/chrome/content/rules/Ebuzzing.xml
+++ b/src/chrome/content/rules/Ebuzzing.xml
@@ -42,7 +42,7 @@ Fetch error: http://ebuzzing.de/ => https://social.ebuzzing.de/: (51, "SSL: no a
 		- www.ebuzzing.com	(prints domain name)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/EchoDitto.com.xml b/src/chrome/content/rules/EchoDitto.com.xml
index 60f1fe18a2e1..9965895b8b75 100644
--- a/src/chrome/content/rules/EchoDitto.com.xml
+++ b/src/chrome/content/rules/EchoDitto.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://echoditto.com/ => https://echoditto.com/: (51, "SSL: no alte
 Disabled by https-everywhere-checker because:
 Fetch error: http://echoditto.com/ => https://echoditto.com/: (51, "SSL: no alternative certificate subject name matches target host name 'echoditto.com'")
 -->
-
+
 
 	
 	
@@ -17,4 +17,4 @@ Fetch error: http://echoditto.com/ => https://echoditto.com/: (51, "SSL: no alte
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Echoplex.us.xml b/src/chrome/content/rules/Echoplex.us.xml
index 855e36e26403..8326f9af644f 100644
--- a/src/chrome/content/rules/Echoplex.us.xml
+++ b/src/chrome/content/rules/Echoplex.us.xml
@@ -32,7 +32,7 @@ Fetch error: http://www.echoplex.us/ => https://echoplex.us/: (60, 'SSL certific
 		- chat
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Eclipse.xml b/src/chrome/content/rules/Eclipse.xml
index d2f4c685be98..f948f28732f8 100644
--- a/src/chrome/content/rules/Eclipse.xml
+++ b/src/chrome/content/rules/Eclipse.xml
@@ -1,26 +1,71 @@
 
-
 
+
 	
+	
+	
+	
+	
+	
+	
 	
+	
+	
 	
+	
+	
+	
 	
-	
-	
+	
+	
+	
+	
+	
+	
 	
-	
-
-	
-	
-	
+	
+	
+	
+	
+	
+		
+		
+		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
-	
+	
 
 	
-
 
diff --git a/src/chrome/content/rules/EclipseCon.org.xml b/src/chrome/content/rules/EclipseCon.org.xml
new file mode 100644
index 000000000000..d90c56ef990e
--- /dev/null
+++ b/src/chrome/content/rules/EclipseCon.org.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ecm74.com.xml b/src/chrome/content/rules/Ecm74.com.xml
index f07ae539b0b8..380a07d8f05c 100644
--- a/src/chrome/content/rules/Ecm74.com.xml
+++ b/src/chrome/content/rules/Ecm74.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.ecm74.com/ => https://ecm74.com/: (35, 'Unknown SSL prot
 	www: cert only matches ^ecm74.com.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Econoday.com.xml b/src/chrome/content/rules/Econoday.com.xml
new file mode 100644
index 000000000000..b103727547a7
--- /dev/null
+++ b/src/chrome/content/rules/Econoday.com.xml
@@ -0,0 +1,45 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Economic-Policy-Institute.xml b/src/chrome/content/rules/Economic-Policy-Institute.xml
index 32e3228488ab..07f05419c812 100644
--- a/src/chrome/content/rules/Economic-Policy-Institute.xml
+++ b/src/chrome/content/rules/Economic-Policy-Institute.xml
@@ -9,7 +9,9 @@
 -->
 
 
-	
+	
+	
+	
 	
 
 
diff --git a/src/chrome/content/rules/Economist.xml b/src/chrome/content/rules/Economist.xml
index 3693811881bb..9015d8ce8b3a 100644
--- a/src/chrome/content/rules/Economist.xml
+++ b/src/chrome/content/rules/Economist.xml
@@ -1,10 +1,4 @@
-
 
-
+
 
 	
+	
+	
+	
 	
 	
 	
 	
-	
-	
 	
-	
+	
 	
 	
 	
-	
-	
+	
 
 	
-	
 	
+	
+
+	
 
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-			
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-
-
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Economist_Intelligence_Unit.xml b/src/chrome/content/rules/Economist_Intelligence_Unit.xml
index fbe7e8126fe8..e3b6ba5a9969 100644
--- a/src/chrome/content/rules/Economist_Intelligence_Unit.xml
+++ b/src/chrome/content/rules/Economist_Intelligence_Unit.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ecosia.org.xml b/src/chrome/content/rules/Ecosia.org.xml
index 656a8e6b1369..3d7f6c73dbc3 100644
--- a/src/chrome/content/rules/Ecosia.org.xml
+++ b/src/chrome/content/rules/Ecosia.org.xml
@@ -1,10 +1,27 @@
 
-  
-  
-  
-
-  
-
-  
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
diff --git a/src/chrome/content/rules/Ecwid.com.xml b/src/chrome/content/rules/Ecwid.com.xml
new file mode 100644
index 000000000000..2754efd0960d
--- /dev/null
+++ b/src/chrome/content/rules/Ecwid.com.xml
@@ -0,0 +1,23 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Ecwid.xml b/src/chrome/content/rules/Ecwid.xml
deleted file mode 100644
index 73acc10fd927..000000000000
--- a/src/chrome/content/rules/Ecwid.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/EdWeek.org.xml b/src/chrome/content/rules/EdWeek.org.xml
index c4ff16c9c096..4d432c97db41 100644
--- a/src/chrome/content/rules/EdWeek.org.xml
+++ b/src/chrome/content/rules/EdWeek.org.xml
@@ -13,7 +13,12 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
 		
 		
-
+
 
 	
diff --git a/src/chrome/content/rules/Edarabia.com.xml b/src/chrome/content/rules/Edarabia.com.xml
index 77f434d6e45a..74594f4dcc63 100644
--- a/src/chrome/content/rules/Edarabia.com.xml
+++ b/src/chrome/content/rules/Edarabia.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.edarabia.com/ => https://www.edarabia.com/: Too many red
 		- ^	(http reply)
 
 -->
-
+
 
 	
 	
@@ -20,4 +20,4 @@ Fetch error: http://www.edarabia.com/ => https://www.edarabia.com/: Too many red
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Edas.xml b/src/chrome/content/rules/Edas.xml
deleted file mode 100644
index a9746f77e254..000000000000
--- a/src/chrome/content/rules/Edas.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-  
-  
-
-  
-
diff --git a/src/chrome/content/rules/EdenHost.com.xml b/src/chrome/content/rules/EdenHost.com.xml
index 9ef965f8a2fc..8524f0ad3784 100644
--- a/src/chrome/content/rules/EdenHost.com.xml
+++ b/src/chrome/content/rules/EdenHost.com.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ederdrom.de.xml b/src/chrome/content/rules/Ederdrom.de.xml
index 8eda7c47f7a1..81cd0ce0baf7 100644
--- a/src/chrome/content/rules/Ederdrom.de.xml
+++ b/src/chrome/content/rules/Ederdrom.de.xml
@@ -5,7 +5,7 @@ Fetch error: http://oc.ederdrom.de/ => https://oc.ederdrom.de/: (6, 'Could not r
 Fetch error: http://www.ederdrom.de/ => https://www.ederdrom.de/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/EdgeCast-networks.xml b/src/chrome/content/rules/EdgeCast-networks.xml
index 95de1da7be5e..fc5e8e824c5a 100644
--- a/src/chrome/content/rules/EdgeCast-networks.xml
+++ b/src/chrome/content/rules/EdgeCast-networks.xml
@@ -3,11 +3,11 @@ Others: See Web.com.xml
 
 	Redirect to http:
 	status.edgecast.com
-	
+
 	Mismatch:
 	blog..edgecast.com
 	large..edgecast.com
-	
+
 	wac.*.edgecastcdn.net
 	wpc.*.edgecastcdn.net
 -->
@@ -20,10 +20,10 @@ Others: See Web.com.xml
 	
 	
 	
-	
+
 	
 	
-		
+	
 	
 	
 	
diff --git a/src/chrome/content/rules/Edgerunner.com.xml b/src/chrome/content/rules/Edgerunner.com.xml
index 006fc8964ab9..c9b0fe31ce0f 100644
--- a/src/chrome/content/rules/Edgerunner.com.xml
+++ b/src/chrome/content/rules/Edgerunner.com.xml
@@ -14,4 +14,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Edinburgh.gov.uk.xml b/src/chrome/content/rules/Edinburgh.gov.uk.xml
index fc18740a8eea..11180222aa02 100644
--- a/src/chrome/content/rules/Edinburgh.gov.uk.xml
+++ b/src/chrome/content/rules/Edinburgh.gov.uk.xml
@@ -16,7 +16,7 @@
 	These altnames don't exist:
 
 		- www.consultationhub.edinburgh.gov.uk
-	
+
 
 	Insecure cookies are set for these domains and hosts:
 
diff --git a/src/chrome/content/rules/Editmysite.com.xml b/src/chrome/content/rules/Editmysite.com.xml
index 4f3e525b33fb..eeaa36b18a3d 100644
--- a/src/chrome/content/rules/Editmysite.com.xml
+++ b/src/chrome/content/rules/Editmysite.com.xml
@@ -35,7 +35,9 @@
 
 
 	
-	
+	
+	
+	
 		
@@ -45,7 +47,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Editola.xml b/src/chrome/content/rules/Editola.xml
index c3009f24cda8..6a6e42f44ff1 100644
--- a/src/chrome/content/rules/Editola.xml
+++ b/src/chrome/content/rules/Editola.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.editola.com/ => https://www.editola.com/: (7, 'Failed to
 Disabled by https-everywhere-checker because:
 Fetch error: http://editola.com/ => https://editola.com/: (28, 'Connection timed out after 10000 milliseconds')
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://editola.com/ => https://editola.com/: (28, 'Connection timed
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/EditorConfig.org.xml b/src/chrome/content/rules/EditorConfig.org.xml
new file mode 100644
index 000000000000..976d92b2f7e2
--- /dev/null
+++ b/src/chrome/content/rules/EditorConfig.org.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Edrive-hosting.xml b/src/chrome/content/rules/Edrive-hosting.xml
index 5559c82cb28e..f316eede801d 100644
--- a/src/chrome/content/rules/Edrive-hosting.xml
+++ b/src/chrome/content/rules/Edrive-hosting.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.edrive-hosting.cz/ => https://www.edrive-hosting.cz/: (6
 Disabled by https-everywhere-checker because:
 Fetch error: http://edrive-hosting.cz/ => https://edrive-hosting.cz/: (51, "SSL: no alternative certificate subject name matches target host name 'edrive-hosting.cz'")
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/EduBlogs.org.xml b/src/chrome/content/rules/EduBlogs.org.xml
new file mode 100644
index 000000000000..1a581e02f3cd
--- /dev/null
+++ b/src/chrome/content/rules/EduBlogs.org.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/EduId.ch.xml b/src/chrome/content/rules/EduId.ch.xml
index e919faf13ada..16bdbe93c380 100644
--- a/src/chrome/content/rules/EduId.ch.xml
+++ b/src/chrome/content/rules/EduId.ch.xml
@@ -14,7 +14,7 @@
 	
 
 	
 	
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/EducaCursos.xml b/src/chrome/content/rules/EducaCursos.xml
index c9e1d00f8fad..59b87bd3f503 100644
--- a/src/chrome/content/rules/EducaCursos.xml
+++ b/src/chrome/content/rules/EducaCursos.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/EducateAutism.com.xml b/src/chrome/content/rules/EducateAutism.com.xml
new file mode 100644
index 000000000000..3bcc9eb8d423
--- /dev/null
+++ b/src/chrome/content/rules/EducateAutism.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Educate_the_world.com.au.xml b/src/chrome/content/rules/Educate_the_world.com.au.xml
index 14a6979a10b7..01f8d3106e14 100644
--- a/src/chrome/content/rules/Educate_the_world.com.au.xml
+++ b/src/chrome/content/rules/Educate_the_world.com.au.xml
@@ -16,7 +16,7 @@ Fetch error: http://www.educatetheworld.com.au/ => https://www.educatetheworld.c
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Education-Next.xml b/src/chrome/content/rules/Education-Next.xml
deleted file mode 100644
index ba784cdb8995..000000000000
--- a/src/chrome/content/rules/Education-Next.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/EducationNext.org.xml b/src/chrome/content/rules/EducationNext.org.xml
new file mode 100644
index 000000000000..507270667f85
--- /dev/null
+++ b/src/chrome/content/rules/EducationNext.org.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Eduid.cz.xml b/src/chrome/content/rules/Eduid.cz.xml
index 22364051f5dc..5a4d318420d0 100644
--- a/src/chrome/content/rules/Eduid.cz.xml
+++ b/src/chrome/content/rules/Eduid.cz.xml
@@ -5,7 +5,7 @@ Fetch error: http://www2.eduid.cz/ => https://www2.eduid.cz/: (51, "SSL: no alte
 Fetch error: http://www3.eduid.cz/ => https://www3.eduid.cz/: (51, "SSL: no alternative certificate subject name matches target host name 'www3.eduid.cz'")
 
 -->
-
+
     
     
     
diff --git a/src/chrome/content/rules/Eduroam.org.xml b/src/chrome/content/rules/Eduroam.org.xml
deleted file mode 100644
index be309020acc4..000000000000
--- a/src/chrome/content/rules/Eduroam.org.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Eduroam_ES.xml b/src/chrome/content/rules/Eduroam_ES.xml
index 21d70f1327f2..8855cf4900ec 100644
--- a/src/chrome/content/rules/Eduroam_ES.xml
+++ b/src/chrome/content/rules/Eduroam_ES.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Eerdmans.com.xml b/src/chrome/content/rules/Eerdmans.com.xml
index 0453088a32ff..5241c14fbce0 100644
--- a/src/chrome/content/rules/Eerdmans.com.xml
+++ b/src/chrome/content/rules/Eerdmans.com.xml
@@ -12,7 +12,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/EfficiOS.xml b/src/chrome/content/rules/EfficiOS.xml
index bc658e465ae1..a3a1d6607a6e 100644
--- a/src/chrome/content/rules/EfficiOS.xml
+++ b/src/chrome/content/rules/EfficiOS.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Effiliation.xml b/src/chrome/content/rules/Effiliation.xml
index dee1b1b9ffde..260e56567c60 100644
--- a/src/chrome/content/rules/Effiliation.xml
+++ b/src/chrome/content/rules/Effiliation.xml
@@ -14,4 +14,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Egg.xml b/src/chrome/content/rules/Egg.xml
index 4e2876e1e78b..0909ab6c28d8 100644
--- a/src/chrome/content/rules/Egg.xml
+++ b/src/chrome/content/rules/Egg.xml
@@ -1,7 +1,10 @@
 
-  
+  
+  
+  
+  
   
 
   
-  
+  
 
diff --git a/src/chrome/content/rules/Egnyte.xml b/src/chrome/content/rules/Egnyte.xml
index 39021110b2de..c13426d10ae4 100644
--- a/src/chrome/content/rules/Egnyte.xml
+++ b/src/chrome/content/rules/Egnyte.xml
@@ -3,7 +3,7 @@
 	
 	
 
-	
+	
 
 	
-
+
 
 	
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Ehospice.xml b/src/chrome/content/rules/Ehospice.xml
index 1c66b6c64f94..c1ff16b79cf3 100644
--- a/src/chrome/content/rules/Ehospice.xml
+++ b/src/chrome/content/rules/Ehospice.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ehrensenf.xml b/src/chrome/content/rules/Ehrensenf.xml
index 6e7f2cd75e19..d714f87239f5 100644
--- a/src/chrome/content/rules/Ehrensenf.xml
+++ b/src/chrome/content/rules/Ehrensenf.xml
@@ -2,7 +2,7 @@
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/Eid.lt.xml b/src/chrome/content/rules/Eid.lt.xml
index 13332e2f02d0..518da8218afd 100644
--- a/src/chrome/content/rules/Eid.lt.xml
+++ b/src/chrome/content/rules/Eid.lt.xml
@@ -10,11 +10,11 @@ Fetch error: http://stork.eid.lt/ => https://stork.eid.lt/: (28, 'Connection tim
 		- (www.)	(times out)
 
 -->
-
+
 
 	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Eide-ITC.no.xml b/src/chrome/content/rules/Eide-ITC.no.xml
index 64e189583535..ce125b5d7be1 100644
--- a/src/chrome/content/rules/Eide-ITC.no.xml
+++ b/src/chrome/content/rules/Eide-ITC.no.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.eide-itc.no/ => https://eide-itc.no/: (51, "SSL: no alte
 	Eide ITC Consulting
 
 -->
-
+
 
 	
 	
@@ -19,4 +19,4 @@ Fetch error: http://www.eide-itc.no/ => https://eide-itc.no/: (51, "SSL: no alte
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Eindbazen.net.xml b/src/chrome/content/rules/Eindbazen.net.xml
index 3a4c928cdeb8..4601ef43fc29 100644
--- a/src/chrome/content/rules/Eindbazen.net.xml
+++ b/src/chrome/content/rules/Eindbazen.net.xml
@@ -6,7 +6,7 @@ Non-2xx HTTP code: http://ctf.eindbazen.net/ (200) => https://ctf.eindbazen.net/
 	www.eindbazen.net: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Ejaaba.com.xml b/src/chrome/content/rules/Ejaaba.com.xml
new file mode 100644
index 000000000000..f96f264e2a5e
--- /dev/null
+++ b/src/chrome/content/rules/Ejaaba.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ekiga.xml b/src/chrome/content/rules/Ekiga.xml
deleted file mode 100644
index f3126e0ac72c..000000000000
--- a/src/chrome/content/rules/Ekiga.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-	
-	
-	
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/EkmPowershop.com.xml b/src/chrome/content/rules/EkmPowershop.com.xml
deleted file mode 100644
index dad25ffae11a..000000000000
--- a/src/chrome/content/rules/EkmPowershop.com.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Ekm_secure6.co.uk.xml b/src/chrome/content/rules/Ekm_secure6.co.uk.xml
deleted file mode 100644
index 55ebbdad5866..000000000000
--- a/src/chrome/content/rules/Ekm_secure6.co.uk.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Ekm_secure_22.co.uk.xml b/src/chrome/content/rules/Ekm_secure_22.co.uk.xml
deleted file mode 100644
index 4dbf89c3750a..000000000000
--- a/src/chrome/content/rules/Ekm_secure_22.co.uk.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/EksiSozluk.com.xml b/src/chrome/content/rules/EksiSozluk.com.xml
new file mode 100644
index 000000000000..931a3646ddcd
--- /dev/null
+++ b/src/chrome/content/rules/EksiSozluk.com.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/El_pueblo.xml b/src/chrome/content/rules/El_pueblo.xml
index ff7b0599c5fc..c9e4d394c95f 100644
--- a/src/chrome/content/rules/El_pueblo.xml
+++ b/src/chrome/content/rules/El_pueblo.xml
@@ -11,7 +11,7 @@ Fetch error: http://elpueblo.com/ => https://elpueblo.com/: (7, 'Failed to conne
 		- wac.7ee8.edgecastcdn.net/807EE8/
 
 -->
-
+
 
 	
 	
@@ -22,4 +22,4 @@ Fetch error: http://elpueblo.com/ => https://elpueblo.com/: (7, 'Failed to conne
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Elaf_Net_TV.xml b/src/chrome/content/rules/Elaf_Net_TV.xml
index 302ef88dda9f..38d85fcf1dd4 100644
--- a/src/chrome/content/rules/Elaf_Net_TV.xml
+++ b/src/chrome/content/rules/Elaf_Net_TV.xml
@@ -5,7 +5,7 @@ Fetch error: http://elafnettv.com/ => https://elafnettv.com/: Too many redirects
 Fetch error: http://www.elafnettv.com/ => https://www.elafnettv.com/: Too many redirects while fetching 'https://www.elafnettv.com/'
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.elafnettv.com/ => https://www.elafnettv.com/: Too many r
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Elal.co.il.xml b/src/chrome/content/rules/Elal.co.il.xml
new file mode 100644
index 000000000000..cacd1b5c1dfe
--- /dev/null
+++ b/src/chrome/content/rules/Elal.co.il.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Elal.com.xml b/src/chrome/content/rules/Elal.com.xml
new file mode 100644
index 000000000000..944472c2140b
--- /dev/null
+++ b/src/chrome/content/rules/Elal.com.xml
@@ -0,0 +1,14 @@
+
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Elanex.biz.xml b/src/chrome/content/rules/Elanex.biz.xml
deleted file mode 100644
index 489265f2c3ab..000000000000
--- a/src/chrome/content/rules/Elanex.biz.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	
-	
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/ElasticTrace.com.xml b/src/chrome/content/rules/ElasticTrace.com.xml
deleted file mode 100644
index b335a8892f32..000000000000
--- a/src/chrome/content/rules/ElasticTrace.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/ElberethZone.xml b/src/chrome/content/rules/ElberethZone.xml
new file mode 100644
index 000000000000..d926cda86d9d
--- /dev/null
+++ b/src/chrome/content/rules/ElberethZone.xml
@@ -0,0 +1,29 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Elcomsoft.xml b/src/chrome/content/rules/Elcomsoft.xml
index c1ecd74dbe8f..afac6ffc362c 100644
--- a/src/chrome/content/rules/Elcomsoft.xml
+++ b/src/chrome/content/rules/Elcomsoft.xml
@@ -14,4 +14,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Elder_Scrolls_Online.com.xml b/src/chrome/content/rules/Elder_Scrolls_Online.com.xml
index 9d7801134fa0..e197540e350d 100644
--- a/src/chrome/content/rules/Elder_Scrolls_Online.com.xml
+++ b/src/chrome/content/rules/Elder_Scrolls_Online.com.xml
@@ -30,7 +30,7 @@ Fetch error: http://elderscrollsonline.com/ => https://elderscrollsonline.com/:
 	* Secured by us
 
 -->
-
+
 
 	
 	
@@ -43,5 +43,5 @@ Fetch error: http://elderscrollsonline.com/ => https://elderscrollsonline.com/:
 
 	
-	
+
 
diff --git a/src/chrome/content/rules/Electric_Embers.xml b/src/chrome/content/rules/Electric_Embers.xml
index 4507f1cb9b9a..22ba66c7e6dc 100644
--- a/src/chrome/content/rules/Electric_Embers.xml
+++ b/src/chrome/content/rules/Electric_Embers.xml
@@ -16,4 +16,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Electric_Studio.xml b/src/chrome/content/rules/Electric_Studio.xml
index 145275366c2d..5edd46715aeb 100644
--- a/src/chrome/content/rules/Electric_Studio.xml
+++ b/src/chrome/content/rules/Electric_Studio.xml
@@ -18,7 +18,7 @@ Fetch error: http://clients.electricstudio.co.uk/ => https://clients.electricstu
 		- cdn		(404; mismatched, CN: *.netdna-ssl.com)
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Electronic-Arts.xml b/src/chrome/content/rules/Electronic-Arts.xml
index 54a7f0b440a9..115058c5d1c5 100644
--- a/src/chrome/content/rules/Electronic-Arts.xml
+++ b/src/chrome/content/rules/Electronic-Arts.xml
@@ -1,76 +1,80 @@
 
-
 
+
+	
 	
-	
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+
+	
 	
 	
-	
-	
 
 
 	
-	
-	
-	
-
-
-	
-	
+	
+	
 
-	
 
-	
 
-	
 	
 
 	
-
-	
-
-	
-	
-
-	
-	
-
-	
-
-	
-	
+		to="https://eamobile.122.2o7.net/"/>
 
+	
 
diff --git a/src/chrome/content/rules/ElectronicInsanity.com.xml b/src/chrome/content/rules/ElectronicInsanity.com.xml
index 939b751bde6e..d4e1fc7242df 100644
--- a/src/chrome/content/rules/ElectronicInsanity.com.xml
+++ b/src/chrome/content/rules/ElectronicInsanity.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://electronicinsanity.com/ => https://www.electronicinsanity.co
 	* Shows api.vistumbler.net
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Electrospaces.net.xml b/src/chrome/content/rules/Electrospaces.net.xml
new file mode 100644
index 000000000000..afc152c2254a
--- /dev/null
+++ b/src/chrome/content/rules/Electrospaces.net.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Electrum.org.xml b/src/chrome/content/rules/Electrum.org.xml
deleted file mode 100644
index e8cd1a39a945..000000000000
--- a/src/chrome/content/rules/Electrum.org.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-	
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Elektronik-Kompendium.de.xml b/src/chrome/content/rules/Elektronik-Kompendium.de.xml
new file mode 100644
index 000000000000..cff90f2b3e59
--- /dev/null
+++ b/src/chrome/content/rules/Elektronik-Kompendium.de.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Element14.com-Mixed.xml b/src/chrome/content/rules/Element14.com-Mixed.xml
deleted file mode 100644
index 5474047be47b..000000000000
--- a/src/chrome/content/rules/Element14.com-Mixed.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Element14.com.xml b/src/chrome/content/rules/Element14.com.xml
index 42b42a4e5e61..ba9838f537fb 100644
--- a/src/chrome/content/rules/Element14.com.xml
+++ b/src/chrome/content/rules/Element14.com.xml
@@ -1,6 +1,12 @@
+
 
 
-	
-	
+	
+	
 	
 		
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/ElephantLeague.org.xml b/src/chrome/content/rules/ElephantLeague.org.xml
new file mode 100644
index 000000000000..baec548b2157
--- /dev/null
+++ b/src/chrome/content/rules/ElephantLeague.org.xml
@@ -0,0 +1,8 @@
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/ElevenPaths.xml b/src/chrome/content/rules/ElevenPaths.xml
deleted file mode 100644
index 53f7df86057e..000000000000
--- a/src/chrome/content/rules/ElevenPaths.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Elgas.com.au.xml b/src/chrome/content/rules/Elgas.com.au.xml
new file mode 100644
index 000000000000..0a0a6bdc03a8
--- /dev/null
+++ b/src/chrome/content/rules/Elgas.com.au.xml
@@ -0,0 +1,19 @@
+
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Elgiganten.xml b/src/chrome/content/rules/Elgiganten.xml
index 31379b34d17e..e9353a1725da 100644
--- a/src/chrome/content/rules/Elgiganten.xml
+++ b/src/chrome/content/rules/Elgiganten.xml
@@ -8,7 +8,7 @@
 		- presentjakten.elgiganten.se ¹
 		- pressroom.elgiganten.dk ¹
 		- tilbudsavis.elgiganten.dk ¹
-		
+
 	¹ Mismatched
 	² Timeout
 
diff --git a/src/chrome/content/rules/Elie_Bursztein.xml b/src/chrome/content/rules/Elie_Bursztein.xml
index 409670255231..12c92d209421 100644
--- a/src/chrome/content/rules/Elie_Bursztein.xml
+++ b/src/chrome/content/rules/Elie_Bursztein.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/EliteKeyboards.com.xml b/src/chrome/content/rules/EliteKeyboards.com.xml
deleted file mode 100644
index 9b29954b5a90..000000000000
--- a/src/chrome/content/rules/EliteKeyboards.com.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Elite_Casting_Network.com.xml b/src/chrome/content/rules/Elite_Casting_Network.com.xml
index ffefecff9373..8586de08d95c 100644
--- a/src/chrome/content/rules/Elite_Casting_Network.com.xml
+++ b/src/chrome/content/rules/Elite_Casting_Network.com.xml
@@ -12,7 +12,8 @@
 
 
 	
-	
+	
+	
 
 
 	
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Elizabeth_Smart_Foundation.xml b/src/chrome/content/rules/Elizabeth_Smart_Foundation.xml
index edbb0c6b5345..37d14d245916 100644
--- a/src/chrome/content/rules/Elizabeth_Smart_Foundation.xml
+++ b/src/chrome/content/rules/Elizabeth_Smart_Foundation.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Elliptic-Technologies.xml b/src/chrome/content/rules/Elliptic-Technologies.xml
index 62a5f6d2c28d..24847efd423a 100644
--- a/src/chrome/content/rules/Elliptic-Technologies.xml
+++ b/src/chrome/content/rules/Elliptic-Technologies.xml
@@ -5,7 +5,7 @@ Fetch error: http://elliptictech.com/ => https://elliptictech.com/: (51, "SSL: n
 Fetch error: http://www.elliptictech.com/ => https://www.elliptictech.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.elliptictech.com'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Elmbridge.gov.uk-falsemixed.xml b/src/chrome/content/rules/Elmbridge.gov.uk-falsemixed.xml
deleted file mode 100644
index 821e961bdbfc..000000000000
--- a/src/chrome/content/rules/Elmbridge.gov.uk-falsemixed.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Elo_Global_e-services.xml b/src/chrome/content/rules/Elo_Global_e-services.xml
index 814b304e69a8..73fe6532e999 100644
--- a/src/chrome/content/rules/Elo_Global_e-services.xml
+++ b/src/chrome/content/rules/Elo_Global_e-services.xml
@@ -7,7 +7,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://elotouchexpress.com/ => https://elotouchexpress.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 Fetch error: http://www.elotouchexpress.com/ => https://www.elotouchexpress.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://www.elotouchexpress.com/ => https://www.elotouchexpress.com/
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Eloqua-mismatches.xml b/src/chrome/content/rules/Eloqua-mismatches.xml
index b871dc084bbe..23b4e02ced68 100644
--- a/src/chrome/content/rules/Eloqua-mismatches.xml
+++ b/src/chrome/content/rules/Eloqua-mismatches.xml
@@ -16,9 +16,7 @@
 				-->
 	
 
-
-	
-	
+	
 
 
 	 https://cloudconnectors.eloqu
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Eloquent_JavaScript.net.xml b/src/chrome/content/rules/Eloquent_JavaScript.net.xml
index b73ccff178d3..4c84237c2d3b 100644
--- a/src/chrome/content/rules/Eloquent_JavaScript.net.xml
+++ b/src/chrome/content/rules/Eloquent_JavaScript.net.xml
@@ -1,19 +1,13 @@
-
 
-
-
+
 	
 	
+	
 
+	
 
 	
-
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Elsevier_Health.com.au.xml b/src/chrome/content/rules/Elsevier_Health.com.au.xml
index 95fc99530408..d726a4a3fe39 100644
--- a/src/chrome/content/rules/Elsevier_Health.com.au.xml
+++ b/src/chrome/content/rules/Elsevier_Health.com.au.xml
@@ -8,7 +8,7 @@
 	
 
 
-	
+	
 
 
 	 https://www.elsevierhealth.com/:
 	* Mismatched
 
 -->
-
+
 
 	
@@ -39,7 +39,7 @@ Fetch error: http://www.elsevierhealth.com/ => https://www.elsevierhealth.com/:
 		
 
 
-	
+	
 
 
 	 https://emailvision.com/: (60, 'SSL cert
 	* Works, mismatched, CN: *.emv3.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Emap_Awards.xml b/src/chrome/content/rules/Emap_Awards.xml
index 5d1112e73cb1..98c6bffea01f 100644
--- a/src/chrome/content/rules/Emap_Awards.xml
+++ b/src/chrome/content/rules/Emap_Awards.xml
@@ -5,7 +5,7 @@ Fetch error: http://emapawards.com/ => https://emapawards.com/: (28, 'Connection
 Fetch error: http://www.emapawards.com/ => https://www.emapawards.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.emapawards.com/ => https://www.emapawards.com/: (28, 'Co
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Embed.ly.xml b/src/chrome/content/rules/Embed.ly.xml
index 122ea162ffa2..a7b6c069a25d 100644
--- a/src/chrome/content/rules/Embed.ly.xml
+++ b/src/chrome/content/rules/Embed.ly.xml
@@ -35,7 +35,7 @@ Fetch error: http://t.embed.ly/ => https://t.embed.ly/: (28, 'Operation timed ou
 		- api.embed.ly
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Embedded_ARM.com.xml b/src/chrome/content/rules/Embedded_ARM.com.xml
index e5371b11f6cc..380e336c45cc 100644
--- a/src/chrome/content/rules/Embedded_ARM.com.xml
+++ b/src/chrome/content/rules/Embedded_ARM.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://embeddedarm.com/ => https://embeddedarm.com/: (51, "SSL: no
 	ʳ Refused
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Embedresponsively.com.xml b/src/chrome/content/rules/Embedresponsively.com.xml
new file mode 100644
index 000000000000..4a944041159e
--- /dev/null
+++ b/src/chrome/content/rules/Embedresponsively.com.xml
@@ -0,0 +1,15 @@
+
+
+   
+   
+
+   
+
diff --git a/src/chrome/content/rules/Emberjs.com.xml b/src/chrome/content/rules/Emberjs.com.xml
new file mode 100644
index 000000000000..ae79d83a8fe7
--- /dev/null
+++ b/src/chrome/content/rules/Emberjs.com.xml
@@ -0,0 +1,30 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Emcraft.com.xml b/src/chrome/content/rules/Emcraft.com.xml
index d6df253277f9..ca85ec053001 100644
--- a/src/chrome/content/rules/Emcraft.com.xml
+++ b/src/chrome/content/rules/Emcraft.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://order.emcraft.com/ => https://order.emcraft.com/: (6, 'Could not resolve host: order.emcraft.com')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Emediate.eu.xml b/src/chrome/content/rules/Emediate.eu.xml
deleted file mode 100644
index 851c18ef8322..000000000000
--- a/src/chrome/content/rules/Emediate.eu.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Emerald.xml b/src/chrome/content/rules/Emerald.xml
index 880e98785072..9b460e703e57 100644
--- a/src/chrome/content/rules/Emerald.xml
+++ b/src/chrome/content/rules/Emerald.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://emeraldinsight.com/ => https://emeraldinsight.com/: Cycle detected - URL already encountered: https://emeraldinsight.com/action/cookieAbsent
 Fetch error: http://www.emeraldinsight.com/ => https://www.emeraldinsight.com/: Cycle detected - URL already encountered: https://www.emeraldinsight.com/action/cookieAbsent
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/EmergeConference.ca.xml b/src/chrome/content/rules/EmergeConference.ca.xml
new file mode 100644
index 000000000000..5d9d6819dd2b
--- /dev/null
+++ b/src/chrome/content/rules/EmergeConference.ca.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Employease.xml b/src/chrome/content/rules/Employease.xml
deleted file mode 100644
index 977372206ab1..000000000000
--- a/src/chrome/content/rules/Employease.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Employeeexpress.gov.xml b/src/chrome/content/rules/Employeeexpress.gov.xml
deleted file mode 100644
index 73f01543008b..000000000000
--- a/src/chrome/content/rules/Employeeexpress.gov.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/EmploymentLaw101.ca.xml b/src/chrome/content/rules/EmploymentLaw101.ca.xml
new file mode 100644
index 000000000000..1bf643392672
--- /dev/null
+++ b/src/chrome/content/rules/EmploymentLaw101.ca.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Emptypage.jp.xml b/src/chrome/content/rules/Emptypage.jp.xml
new file mode 100644
index 000000000000..f7fdb889d546
--- /dev/null
+++ b/src/chrome/content/rules/Emptypage.jp.xml
@@ -0,0 +1,16 @@
+
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Emsisoft.com.xml b/src/chrome/content/rules/Emsisoft.com.xml
index e20af8fd8f09..f7bff14c9c82 100644
--- a/src/chrome/content/rules/Emsisoft.com.xml
+++ b/src/chrome/content/rules/Emsisoft.com.xml
@@ -15,7 +15,11 @@
 -->
 
 	
-	
+	
+	
+	
+	
+	
 		
@@ -35,6 +39,6 @@
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/EmuNewz-Network.xml b/src/chrome/content/rules/EmuNewz-Network.xml
deleted file mode 100644
index f9cfc545fd58..000000000000
--- a/src/chrome/content/rules/EmuNewz-Network.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-	
-
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/EmuNewz.net.xml b/src/chrome/content/rules/EmuNewz.net.xml
new file mode 100644
index 000000000000..583925b6a3be
--- /dev/null
+++ b/src/chrome/content/rules/EmuNewz.net.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/EmulationStation.org.xml b/src/chrome/content/rules/EmulationStation.org.xml
new file mode 100644
index 000000000000..5ea869c7a96d
--- /dev/null
+++ b/src/chrome/content/rules/EmulationStation.org.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Emulex.xml b/src/chrome/content/rules/Emulex.xml
index f9a67a3b4366..e5107fd1dc6f 100644
--- a/src/chrome/content/rules/Emulex.xml
+++ b/src/chrome/content/rules/Emulex.xml
@@ -6,16 +6,16 @@ Fetch error: http://emulex.com/ => https://emulex.com/: (51, "SSL: no alternativ
 Disabled by https-everywhere-checker because:
 Non-2xx HTTP code: http://emulex.com/ (200) => https://emulex.com/ (303)
 -->
-
+
 
 	
-	
+	
+	
 
 
-	
+	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/En-Pro.com.xml b/src/chrome/content/rules/En-Pro.com.xml
new file mode 100644
index 000000000000..3f55049606cf
--- /dev/null
+++ b/src/chrome/content/rules/En-Pro.com.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Enalean.com.xml b/src/chrome/content/rules/Enalean.com.xml
deleted file mode 100644
index 63bdaa4f7666..000000000000
--- a/src/chrome/content/rules/Enalean.com.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Encipher.It.xml b/src/chrome/content/rules/Encipher.It.xml
index e76558cd5970..d36105750cd0 100644
--- a/src/chrome/content/rules/Encipher.It.xml
+++ b/src/chrome/content/rules/Encipher.It.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.encipher.it/ => https://www.encipher.it/: (51, "SSL: no
 		- www.encipher.it
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Encosia.xml b/src/chrome/content/rules/Encosia.xml
index a0f89cceb317..defd93a8658a 100644
--- a/src/chrome/content/rules/Encosia.xml
+++ b/src/chrome/content/rules/Encosia.xml
@@ -7,11 +7,11 @@ Fetch error: http://www.encosia.com/ => https://www.encosia.com/: (35, 'error:14
 	Mismatch:
 		- i
 -->
-
+
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/EncryptEverything.ca.xml b/src/chrome/content/rules/EncryptEverything.ca.xml
new file mode 100644
index 000000000000..44fe034af111
--- /dev/null
+++ b/src/chrome/content/rules/EncryptEverything.ca.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Encrypt_Everything.ca.xml b/src/chrome/content/rules/Encrypt_Everything.ca.xml
deleted file mode 100644
index 0c542ae8ec7e..000000000000
--- a/src/chrome/content/rules/Encrypt_Everything.ca.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Encryptmas.org.xml b/src/chrome/content/rules/Encryptmas.org.xml
index b5850d15f3ed..1336fa1663c9 100644
--- a/src/chrome/content/rules/Encryptmas.org.xml
+++ b/src/chrome/content/rules/Encryptmas.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://encryptmas.org/ => https://encryptmas.org/: (60, 'SSL certif
 Fetch error: http://www.encryptmas.org/ => https://www.encryptmas.org/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Encryptr.org.xml b/src/chrome/content/rules/Encryptr.org.xml
index 5a233245ccef..2b7d0ae1890c 100644
--- a/src/chrome/content/rules/Encryptr.org.xml
+++ b/src/chrome/content/rules/Encryptr.org.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.encryptr.org/ => https://www.encryptr.org/: (7, 'Failed
 		- secure.encryptr.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Encyclopatia.ru.xml b/src/chrome/content/rules/Encyclopatia.ru.xml
new file mode 100644
index 000000000000..9c27f073efe0
--- /dev/null
+++ b/src/chrome/content/rules/Encyclopatia.ru.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Encyclopedia_Dramatica.xml b/src/chrome/content/rules/Encyclopedia_Dramatica.xml
deleted file mode 100644
index b04f10062b7f..000000000000
--- a/src/chrome/content/rules/Encyclopedia_Dramatica.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/EndNote_Web.xml b/src/chrome/content/rules/EndNote_Web.xml
index 8685d1e4a2db..fca8196f2439 100644
--- a/src/chrome/content/rules/EndNote_Web.xml
+++ b/src/chrome/content/rules/EndNote_Web.xml
@@ -13,4 +13,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Endace.xml b/src/chrome/content/rules/Endace.xml
index 886b8aa5de9e..05626a8c1ed3 100644
--- a/src/chrome/content/rules/Endace.xml
+++ b/src/chrome/content/rules/Endace.xml
@@ -9,7 +9,8 @@ Fetch error: http://endace.com/ => https://www.endace.com/: (6, 'Could not resol
 
 
 	
-	
+	
+	
 
 
 	
@@ -21,7 +22,6 @@ Fetch error: http://endace.com/ => https://www.endace.com/: (6, 'Could not resol
 		to="https://www.endace.com/" />
 
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Endchan.xyz.xml b/src/chrome/content/rules/Endchan.xyz.xml
deleted file mode 100644
index fd1165cd9fbd..000000000000
--- a/src/chrome/content/rules/Endchan.xyz.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Endrift.com.xml b/src/chrome/content/rules/Endrift.com.xml
index c22fff6b47cf..55ab84cdb80d 100644
--- a/src/chrome/content/rules/Endrift.com.xml
+++ b/src/chrome/content/rules/Endrift.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.endrift.com/ => https://www.endrift.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.endrift.com'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Energetix.xml b/src/chrome/content/rules/Energetix.xml
index 1a83aa30fbe4..f00dc0f76fc9 100644
--- a/src/chrome/content/rules/Energetix.xml
+++ b/src/chrome/content/rules/Energetix.xml
@@ -8,7 +8,7 @@ Fetch error: http://files.goenergetix.com/ => https://files.goenergetix.com/: (6
 		- blog		(shows RHEL test page)
 
 -->
-
+
 
 	
 	
@@ -20,4 +20,4 @@ Fetch error: http://files.goenergetix.com/ => https://files.goenergetix.com/: (6
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/EnergiWatch.xml b/src/chrome/content/rules/EnergiWatch.xml
index 65576c7d27a6..19c0a9cd0a40 100644
--- a/src/chrome/content/rules/EnergiWatch.xml
+++ b/src/chrome/content/rules/EnergiWatch.xml
@@ -6,7 +6,7 @@
 
 	www: Mismatched
 
-	
+
 	Remark:
 		This page gets content from other *watch.dk-domains,
 		not all of which work flawlessly with HTTPS Everywhere
diff --git a/src/chrome/content/rules/Energy.gov.xml b/src/chrome/content/rules/Energy.gov.xml
index 42029f94ca7f..c4b90b675e3b 100644
--- a/src/chrome/content/rules/Energy.gov.xml
+++ b/src/chrome/content/rules/Energy.gov.xml
@@ -115,7 +115,7 @@ Fetch error: http://www3.energy.gov/ => https://www3.energy.gov/: (6, 'Could not
 	* See https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/EnergyMadeEasy.xml b/src/chrome/content/rules/EnergyMadeEasy.xml
index 5945dca6ff38..06a2a368f907 100644
--- a/src/chrome/content/rules/EnergyMadeEasy.xml
+++ b/src/chrome/content/rules/EnergyMadeEasy.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Energy_Live_News.com.xml b/src/chrome/content/rules/Energy_Live_News.com.xml
index 15d0de6b3f27..934988565de6 100644
--- a/src/chrome/content/rules/Energy_Live_News.com.xml
+++ b/src/chrome/content/rules/Energy_Live_News.com.xml
@@ -17,7 +17,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Engadget.com.xml b/src/chrome/content/rules/Engadget.com.xml
index 1081f1173d24..c6a174622817 100644
--- a/src/chrome/content/rules/Engadget.com.xml
+++ b/src/chrome/content/rules/Engadget.com.xml
@@ -2,51 +2,30 @@
 	For other AOL coverage, see AOL.xml.
 
 
-	CDN buckets:
-
-		- v4.engadget.com.aol.akadns.net
-
-			- alt.engadget.com
-			- hd.engadget.com
-			- mobile.engadget.com
-			- www.engadget.com
-
-
 	Nonfunctional hosts in *engadget.com:
 
-		- alt ¹
-		- de ¹
-		- hd ¹
-		- m ¹
-		- mobile ¹
+		- feeds ¹
 
 	¹ Refused
 
-
-	^engadget.com: Refused
-
 -->
-
+
 
 	
-	
-
-	
 	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
-	
-
-	
-	
-
-
-	
+	
 
 	
diff --git a/src/chrome/content/rules/EngageSciences.xml b/src/chrome/content/rules/EngageSciences.xml
index 49cf30eff3ea..5a80bf295f76 100644
--- a/src/chrome/content/rules/EngageSciences.xml
+++ b/src/chrome/content/rules/EngageSciences.xml
@@ -11,7 +11,7 @@ Fetch error: http://engagesciences.com/ => https://engagesciences.com/: (7, 'Fai
 		- (www.)ngx.me		(shows another domain; mismatched, CN: *.engagesciences.com)
 
 -->
-
+
 
 	
 	
@@ -23,4 +23,4 @@ Fetch error: http://engagesciences.com/ => https://engagesciences.com/: (7, 'Fai
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Engaged_Doncaster.co.uk.xml b/src/chrome/content/rules/Engaged_Doncaster.co.uk.xml
index 1acab86e6ae3..c0d7ae0c75db 100644
--- a/src/chrome/content/rules/Engaged_Doncaster.co.uk.xml
+++ b/src/chrome/content/rules/Engaged_Doncaster.co.uk.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.doncaster.engagedoncaster.co.uk/ => https://www.doncaste
 	For other UK government coverage, see GOV.UK.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Engineering.com.xml b/src/chrome/content/rules/Engineering.com.xml
index f250e3e570ef..78c1bfbfb0cd 100644
--- a/src/chrome/content/rules/Engineering.com.xml
+++ b/src/chrome/content/rules/Engineering.com.xml
@@ -1,24 +1,11 @@
-
 
 
 	
-	
-
-
-	
+	
+	
+	
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/English-Country-Cottages.co.uk.xml b/src/chrome/content/rules/English-Country-Cottages.co.uk.xml
index 0577b5756cab..0b25e4bb5554 100644
--- a/src/chrome/content/rules/English-Country-Cottages.co.uk.xml
+++ b/src/chrome/content/rules/English-Country-Cottages.co.uk.xml
@@ -1,5 +1,5 @@
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/EnglishPage.com.xml b/src/chrome/content/rules/EnglishPage.com.xml
new file mode 100644
index 000000000000..fe7f99f4adca
--- /dev/null
+++ b/src/chrome/content/rules/EnglishPage.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/EnhancedSteam.com.xml b/src/chrome/content/rules/EnhancedSteam.com.xml
deleted file mode 100644
index c2333c2c79da..000000000000
--- a/src/chrome/content/rules/EnhancedSteam.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Enigmabox.net.xml b/src/chrome/content/rules/Enigmabox.net.xml
deleted file mode 100644
index 584eb21d3327..000000000000
--- a/src/chrome/content/rules/Enigmabox.net.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Enjin.xml b/src/chrome/content/rules/Enjin.xml
index 329dbd266934..170bde252cd9 100644
--- a/src/chrome/content/rules/Enjin.xml
+++ b/src/chrome/content/rules/Enjin.xml
@@ -1,47 +1,38 @@
-
 
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-
-	
 
-	
-
-	
-	
-
-	
-	
+
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+
+	
 
diff --git a/src/chrome/content/rules/Enlightened_Perl.org.xml b/src/chrome/content/rules/Enlightened_Perl.org.xml
deleted file mode 100644
index 22a20bbcd7dd..000000000000
--- a/src/chrome/content/rules/Enlightened_Perl.org.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Enlightenment.org.xml b/src/chrome/content/rules/Enlightenment.org.xml
new file mode 100644
index 000000000000..10b229bcbd6e
--- /dev/null
+++ b/src/chrome/content/rules/Enlightenment.org.xml
@@ -0,0 +1,27 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Enom.xml b/src/chrome/content/rules/Enom.xml
index 92d4d6ac1c52..e12cc6f3af7b 100644
--- a/src/chrome/content/rules/Enom.xml
+++ b/src/chrome/content/rules/Enom.xml
@@ -1,64 +1,11 @@
 
 
 
 	
 	
 
-		
-
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-			
-
-		
-		
-
-			
-			
-			
-			
-			
-
-
-	
-	
-
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/EnricoZini.org.xml b/src/chrome/content/rules/EnricoZini.org.xml
new file mode 100644
index 000000000000..08f31c14377f
--- /dev/null
+++ b/src/chrome/content/rules/EnricoZini.org.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+ 	
+
diff --git a/src/chrome/content/rules/Ensighten.com.xml b/src/chrome/content/rules/Ensighten.com.xml
new file mode 100644
index 000000000000..6e63df7bc6b4
--- /dev/null
+++ b/src/chrome/content/rules/Ensighten.com.xml
@@ -0,0 +1,18 @@
+
+
+
+	
+	
+	
+	
+		
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Ensighten.xml b/src/chrome/content/rules/Ensighten.xml
deleted file mode 100644
index 0b793c9e6cb3..000000000000
--- a/src/chrome/content/rules/Ensighten.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Enterprise_CIO_Forum.com.xml b/src/chrome/content/rules/Enterprise_CIO_Forum.com.xml
index 6773e2bc09eb..b0af3142d350 100644
--- a/src/chrome/content/rules/Enterprise_CIO_Forum.com.xml
+++ b/src/chrome/content/rules/Enterprise_CIO_Forum.com.xml
@@ -6,7 +6,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -15,4 +16,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Entertainment-Consumers-Association-mismatches.xml b/src/chrome/content/rules/Entertainment-Consumers-Association-mismatches.xml
deleted file mode 100644
index c7bba34dbe88..000000000000
--- a/src/chrome/content/rules/Entertainment-Consumers-Association-mismatches.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Entertainment-Consumers-Association.xml b/src/chrome/content/rules/Entertainment-Consumers-Association.xml
deleted file mode 100644
index 893eb19c6539..000000000000
--- a/src/chrome/content/rules/Entertainment-Consumers-Association.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Entertainment.ie.xml b/src/chrome/content/rules/Entertainment.ie.xml
index 81c747e40299..58088e168957 100644
--- a/src/chrome/content/rules/Entertainment.ie.xml
+++ b/src/chrome/content/rules/Entertainment.ie.xml
@@ -11,10 +11,11 @@ Fetch error: http://entertainment.ie/ => https://entertainment.ie/: Cycle detect
 		- www		(500, valid cert)
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
@@ -23,4 +24,4 @@ Fetch error: http://entertainment.ie/ => https://entertainment.ie/: Cycle detect
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Entertainment_Weekly.xml b/src/chrome/content/rules/Entertainment_Weekly.xml
index c852c8ce823a..55090ff5d01a 100644
--- a/src/chrome/content/rules/Entertainment_Weekly.xml
+++ b/src/chrome/content/rules/Entertainment_Weekly.xml
@@ -16,7 +16,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
@@ -25,7 +27,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Entrust.xml b/src/chrome/content/rules/Entrust.xml
index 351fb787d6cd..12082a0d4eb5 100644
--- a/src/chrome/content/rules/Entrust.xml
+++ b/src/chrome/content/rules/Entrust.xml
@@ -13,7 +13,7 @@ Fetch error: http://home.entrust.net/ => https://home.entrust.net/: (56, 'SSL re
 	* Dropped
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Envirotrend-mismatches.xml b/src/chrome/content/rules/Envirotrend-mismatches.xml
index 3a0e690b99df..cf8b529f4938 100644
--- a/src/chrome/content/rules/Envirotrend-mismatches.xml
+++ b/src/chrome/content/rules/Envirotrend-mismatches.xml
@@ -1,7 +1,7 @@
 
 
 	
-	
+	
 	
 	
 	
@@ -12,8 +12,6 @@
 	
 
-	
 
 
 	
@@ -21,4 +19,5 @@
 	
 
 
+	
 
diff --git a/src/chrome/content/rules/Envirotrend.xml b/src/chrome/content/rules/Envirotrend.xml
index e8b3d3676c19..60ccd420e438 100644
--- a/src/chrome/content/rules/Envirotrend.xml
+++ b/src/chrome/content/rules/Envirotrend.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://envirotrend.com.au/ => https://envirotrend.com.au/: (51, "SSL: no alternative certificate subject name matches target host name 'envirotrend.com.au'")
 Fetch error: http://www.envirotrend.com.au/ => https://envirotrend.com.au/: (51, "SSL: no alternative certificate subject name matches target host name 'envirotrend.com.au'")
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Envoy_Direct.com.xml b/src/chrome/content/rules/Envoy_Direct.com.xml
deleted file mode 100644
index a137a3f38d58..000000000000
--- a/src/chrome/content/rules/Envoy_Direct.com.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Envoy_Media_Group.com.xml b/src/chrome/content/rules/Envoy_Media_Group.com.xml
index 184d091de894..a7d3a7e93ec8 100644
--- a/src/chrome/content/rules/Envoy_Media_Group.com.xml
+++ b/src/chrome/content/rules/Envoy_Media_Group.com.xml
@@ -1,7 +1,6 @@
 
-
+
 
 	
diff --git a/src/chrome/content/rules/Epartnershub.com.xml b/src/chrome/content/rules/Epartnershub.com.xml
index 71fc4a6a3bf8..e493b9c4410f 100644
--- a/src/chrome/content/rules/Epartnershub.com.xml
+++ b/src/chrome/content/rules/Epartnershub.com.xml
@@ -16,4 +16,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Epaysol.com.xml b/src/chrome/content/rules/Epaysol.com.xml
deleted file mode 100644
index cee8bb90a457..000000000000
--- a/src/chrome/content/rules/Epaysol.com.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Ephotozine.com.xml b/src/chrome/content/rules/Ephotozine.com.xml
new file mode 100644
index 000000000000..0e9aa971d403
--- /dev/null
+++ b/src/chrome/content/rules/Ephotozine.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Epic-Systems.xml b/src/chrome/content/rules/Epic-Systems.xml
index 05072ac544df..3438c713eda4 100644
--- a/src/chrome/content/rules/Epic-Systems.xml
+++ b/src/chrome/content/rules/Epic-Systems.xml
@@ -2,17 +2,17 @@
 
 	
 	
+		
+		
+		
+		
+		
+		
+		
 
 	
 
-	
-
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Epilepsy-Foundation-America.xml b/src/chrome/content/rules/Epilepsy-Foundation-America.xml
index 3c11e4cd002f..1169e08b6ae7 100644
--- a/src/chrome/content/rules/Epilepsy-Foundation-America.xml
+++ b/src/chrome/content/rules/Epilepsy-Foundation-America.xml
@@ -8,9 +8,9 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://epilepsyfoundation.org/ => https://www.epilepsyfoundation.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.epilepsyfoundation.org'")
 Fetch error: http://www.epilepsyfoundation.org/ => https://www.epilepsyfoundation.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.epilepsyfoundation.org'")
 -->
-
+
 	
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Epilepsy-Ontario.xml b/src/chrome/content/rules/Epilepsy-Ontario.xml
index aa64bca00c8c..2ee3a508647a 100644
--- a/src/chrome/content/rules/Epilepsy-Ontario.xml
+++ b/src/chrome/content/rules/Epilepsy-Ontario.xml
@@ -8,7 +8,7 @@ Automatically by https-everywhere-checker because:
 Fetch error: http://epilepsyontario.org/ => https://www.epilepsyontario.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.epilepsyontario.org'")
 Fetch error: http://www.epilepsyontario.org/ => https://www.epilepsyontario.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.epilepsyontario.org'")
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Epistemic.lgbt.xml b/src/chrome/content/rules/Epistemic.lgbt.xml
deleted file mode 100644
index 25edffc04388..000000000000
--- a/src/chrome/content/rules/Epistemic.lgbt.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/EpochStats.com.xml b/src/chrome/content/rules/EpochStats.com.xml
index 632a9b6449cd..f2644045a798 100644
--- a/src/chrome/content/rules/EpochStats.com.xml
+++ b/src/chrome/content/rules/EpochStats.com.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.epochstats.com/ => https://www.epochstats.com/: (60, 'SS
 		- sales
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/EpochTimes.com.xml b/src/chrome/content/rules/EpochTimes.com.xml
new file mode 100644
index 000000000000..27b85038bfb5
--- /dev/null
+++ b/src/chrome/content/rules/EpochTimes.com.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Epoch_Times.xml b/src/chrome/content/rules/Epoch_Times.xml
deleted file mode 100644
index b8a6538e1822..000000000000
--- a/src/chrome/content/rules/Epoch_Times.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Epoxate.com.xml b/src/chrome/content/rules/Epoxate.com.xml
index 6e14371eb8d9..37a43994bdf8 100644
--- a/src/chrome/content/rules/Epoxate.com.xml
+++ b/src/chrome/content/rules/Epoxate.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://epoxate.com/ => https://epoxate.com/: (35, 'Unknown SSL protocol error in connection to epoxate.com:443 ')
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Eprncdn.com.xml b/src/chrome/content/rules/Eprncdn.com.xml
deleted file mode 100644
index 264dcd8bcb68..000000000000
--- a/src/chrome/content/rules/Eprncdn.com.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Epson.xml b/src/chrome/content/rules/Epson.xml
index 31a4b134f1d3..4c0d85430a03 100644
--- a/src/chrome/content/rules/Epson.xml
+++ b/src/chrome/content/rules/Epson.xml
@@ -26,19 +26,23 @@ Fetch error: http://www.epson.com.mx/ => https://global.latin.epson.com/mx: Redi
 	* Secured by us
 
 -->
-
+
 
 	
 	
 	
-	
+	
+	
+	
+	
 		
 		
 		
 		
 	
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Equifax.xml b/src/chrome/content/rules/Equifax.xml
index f781a1a0c0a4..968e148dbb82 100644
--- a/src/chrome/content/rules/Equifax.xml
+++ b/src/chrome/content/rules/Equifax.xml
@@ -3,10 +3,10 @@
 		Mismatch:
 			- inform.equifax.com
 			- app.inform.equifax.com
-			
+
 			- consumer.equifax.com
 			- www.consumer.equifax.com
-			
+
 			- emortgage.equifax.com
 			- eport.equifax.com
 
@@ -14,7 +14,7 @@
 			- help.equifax.com
 			- help-en.equifax.ca
 			- help-fr.equifax.ca
-		
+
 		Connection timeout:
 			- emscert.equifax.com
 -->
@@ -34,11 +34,11 @@
 	
 	
 	
-	
+
 	
 	
 	
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/EquifaxBreachSettlement.com.xml b/src/chrome/content/rules/EquifaxBreachSettlement.com.xml
new file mode 100644
index 000000000000..6dc80b717cc9
--- /dev/null
+++ b/src/chrome/content/rules/EquifaxBreachSettlement.com.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Equinix.com.xml b/src/chrome/content/rules/Equinix.com.xml
index 65e743b8d1bd..0e696a741034 100644
--- a/src/chrome/content/rules/Equinix.com.xml
+++ b/src/chrome/content/rules/Equinix.com.xml
@@ -1,6 +1,6 @@
 
diff --git a/src/chrome/content/rules/ErgotechGroup.com.xml b/src/chrome/content/rules/ErgotechGroup.com.xml
new file mode 100644
index 000000000000..8467573cdf7b
--- /dev/null
+++ b/src/chrome/content/rules/ErgotechGroup.com.xml
@@ -0,0 +1,19 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ericsson.xml b/src/chrome/content/rules/Ericsson.xml
index 6f205067b266..4ea71cf265d5 100644
--- a/src/chrome/content/rules/Ericsson.xml
+++ b/src/chrome/content/rules/Ericsson.xml
@@ -11,11 +11,11 @@ Fetch error: http://webtrends-lb.ericsson.net/ => https://webtrends-lb.ericsson.
 		- www	(redirects to http, akamai)
 
 -->
-
+
 
 	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Erinn.org.xml b/src/chrome/content/rules/Erinn.org.xml
index fb6685f9343d..858811abd2c1 100644
--- a/src/chrome/content/rules/Erinn.org.xml
+++ b/src/chrome/content/rules/Erinn.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://erinn.org/ => https://erinn.org/: (7, 'Failed to connect to
 Fetch error: http://www.erinn.org/ => https://www.erinn.org/: (7, 'Failed to connect to www.erinn.org port 443: Connection refused')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Erlang.org.xml b/src/chrome/content/rules/Erlang.org.xml
index 18a1d5ede727..0a9b5a904d85 100644
--- a/src/chrome/content/rules/Erlang.org.xml
+++ b/src/chrome/content/rules/Erlang.org.xml
@@ -1,22 +1,22 @@
 
-
-
+
 	
 	
+	
+	
 	
 	
 
-	
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/Ernst-and-Young.xml b/src/chrome/content/rules/Ernst-and-Young.xml
index dae2e9fdcfee..011397d7e8de 100644
--- a/src/chrome/content/rules/Ernst-and-Young.xml
+++ b/src/chrome/content/rules/Ernst-and-Young.xml
@@ -7,7 +7,10 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
-	
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Errorception.com.xml b/src/chrome/content/rules/Errorception.com.xml
index ab12f854d361..aec587a11c90 100644
--- a/src/chrome/content/rules/Errorception.com.xml
+++ b/src/chrome/content/rules/Errorception.com.xml
@@ -2,11 +2,11 @@
 
 	
 	
-		
+
 	
-		
+
 	
 
diff --git a/src/chrome/content/rules/Es.gy.xml b/src/chrome/content/rules/Es.gy.xml
index 6426fb9b386c..0601cf3aba0a 100644
--- a/src/chrome/content/rules/Es.gy.xml
+++ b/src/chrome/content/rules/Es.gy.xml
@@ -9,7 +9,7 @@ Fetch error: http://bbs.es.gy/ => https://bbs.es.gy/: (51, "SSL: no alternative
 	(www.)?: Expired
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Escrow_Live.net.xml b/src/chrome/content/rules/Escrow_Live.net.xml
index 0ace4a6682a7..cfa3e4145e0c 100644
--- a/src/chrome/content/rules/Escrow_Live.net.xml
+++ b/src/chrome/content/rules/Escrow_Live.net.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.escrowlive.net/ => https://www.escrowlive.net/: (7, 'Fai
 	^: refused
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Esdominios.com.xml b/src/chrome/content/rules/Esdominios.com.xml
deleted file mode 100644
index d5901e9b8913..000000000000
--- a/src/chrome/content/rules/Esdominios.com.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Esellerate.net.xml b/src/chrome/content/rules/Esellerate.net.xml
index ed8b3a9d5991..a5e2abd43406 100644
--- a/src/chrome/content/rules/Esellerate.net.xml
+++ b/src/chrome/content/rules/Esellerate.net.xml
@@ -48,13 +48,7 @@
 	
 
 
-	
-	
-	
-	
-
-	
+	
 
 
 	
-                
+
         
 
diff --git a/src/chrome/content/rules/Espacejeux.xml b/src/chrome/content/rules/Espacejeux.xml
index 4f4167b0810d..280d327e4a84 100644
--- a/src/chrome/content/rules/Espacejeux.xml
+++ b/src/chrome/content/rules/Espacejeux.xml
@@ -2,5 +2,5 @@
   
   
   
-  
+  
 
diff --git a/src/chrome/content/rules/EspagnolFacile.com.xml b/src/chrome/content/rules/EspagnolFacile.com.xml
new file mode 100644
index 000000000000..cd3dab2cc798
--- /dev/null
+++ b/src/chrome/content/rules/EspagnolFacile.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/EspressoBin.net.xml b/src/chrome/content/rules/EspressoBin.net.xml
new file mode 100644
index 000000000000..bff5b643eba5
--- /dev/null
+++ b/src/chrome/content/rules/EspressoBin.net.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Esri.xml b/src/chrome/content/rules/Esri.xml
index 3174fa2db02e..fa86e0a9d1e7 100644
--- a/src/chrome/content/rules/Esri.xml
+++ b/src/chrome/content/rules/Esri.xml
@@ -52,7 +52,20 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
 	
 
@@ -61,10 +74,9 @@
 	
 
 
-	
 
 	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Estara.com.xml b/src/chrome/content/rules/Estara.com.xml
deleted file mode 100644
index e6608cc7660c..000000000000
--- a/src/chrome/content/rules/Estara.com.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-	
-	
-	
-
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Estonian_Public_Broadcasting.xml b/src/chrome/content/rules/Estonian_Public_Broadcasting.xml
index 3c699ef03285..8167b853ed66 100644
--- a/src/chrome/content/rules/Estonian_Public_Broadcasting.xml
+++ b/src/chrome/content/rules/Estonian_Public_Broadcasting.xml
@@ -29,7 +29,7 @@ Fetch error: http://www.err.ee/ => https://www.err.ee/: Too many redirects while
 	*** No https
 
 -->
-
+
 
 	
 	
@@ -37,9 +37,9 @@ Fetch error: http://www.err.ee/ => https://www.err.ee/: Too many redirects while
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/EtaLabs.net.xml b/src/chrome/content/rules/EtaLabs.net.xml
new file mode 100644
index 000000000000..6d9ba52d3968
--- /dev/null
+++ b/src/chrome/content/rules/EtaLabs.net.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Etapestry.com.xml b/src/chrome/content/rules/Etapestry.com.xml
index b2b996ecbe22..554c95e7847f 100644
--- a/src/chrome/content/rules/Etapestry.com.xml
+++ b/src/chrome/content/rules/Etapestry.com.xml
@@ -11,7 +11,7 @@ Non-2xx HTTP code: http://www.etapestry.com/?f (200) => https://www.blackbaud.co
 		- (www.)	(mismatched, CN: *.blackbaud.com)
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Eth0.nl.xml b/src/chrome/content/rules/Eth0.nl.xml
index adca643e01ba..b3df5de07dd4 100644
--- a/src/chrome/content/rules/Eth0.nl.xml
+++ b/src/chrome/content/rules/Eth0.nl.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://tickets.eth-0.nl/ => https://tickets.eth-0.nl/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Ethn.io.xml b/src/chrome/content/rules/Ethn.io.xml
index 0bdf2adc6437..d2a92188d957 100644
--- a/src/chrome/content/rules/Ethn.io.xml
+++ b/src/chrome/content/rules/Ethn.io.xml
@@ -7,7 +7,7 @@
 
 
 	
-	
+	
 
 
 	
@@ -16,4 +16,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ethnologue.xml b/src/chrome/content/rules/Ethnologue.xml
index d70ac5c9a0f9..61975b0d4736 100644
--- a/src/chrome/content/rules/Ethnologue.xml
+++ b/src/chrome/content/rules/Ethnologue.xml
@@ -14,4 +14,4 @@
 					-->
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ethos_Custom_Brands.xml b/src/chrome/content/rules/Ethos_Custom_Brands.xml
index 72200ca0b00b..8c9e579fc3db 100644
--- a/src/chrome/content/rules/Ethos_Custom_Brands.xml
+++ b/src/chrome/content/rules/Ethos_Custom_Brands.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://ethoscustombrands.com/ => https://ethoscustombrands.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 
 	
 	
@@ -15,4 +15,4 @@ Fetch error: http://ethoscustombrands.com/ => https://ethoscustombrands.com/: (2
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Etiqa.com.my.xml b/src/chrome/content/rules/Etiqa.com.my.xml
new file mode 100644
index 000000000000..06df24214f86
--- /dev/null
+++ b/src/chrome/content/rules/Etiqa.com.my.xml
@@ -0,0 +1,58 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+
+		
+		
+		
+		
+		
+		
+
+	
+
diff --git a/src/chrome/content/rules/Etnasoft.com.xml b/src/chrome/content/rules/Etnasoft.com.xml
index 7214af3db5b4..758a70645595 100644
--- a/src/chrome/content/rules/Etnasoft.com.xml
+++ b/src/chrome/content/rules/Etnasoft.com.xml
@@ -17,7 +17,7 @@ Fetch error: http://old.etnasoft.com/ => https://old.etnasoft.com/: (6, 'Could n
 		* tasks.etnasoft.com
 		* webmail.etnasoft.com
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Etracker.xml b/src/chrome/content/rules/Etracker.xml
index 1788c2c203be..7e0e0542bef4 100644
--- a/src/chrome/content/rules/Etracker.xml
+++ b/src/chrome/content/rules/Etracker.xml
@@ -37,7 +37,7 @@ Fetch error: http://owa.etracker.com/ => https://owa.etracker.com/: (6, 'Could n
 	on whichever domain it is loaded from.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Etravelway.com.xml b/src/chrome/content/rules/Etravelway.com.xml
index 8e8a3e32460a..58159b7c107c 100644
--- a/src/chrome/content/rules/Etravelway.com.xml
+++ b/src/chrome/content/rules/Etravelway.com.xml
@@ -18,7 +18,7 @@
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Etre_Shop.com.xml b/src/chrome/content/rules/Etre_Shop.com.xml
index 10fddf5d5084..2d8c8e558ea1 100644
--- a/src/chrome/content/rules/Etre_Shop.com.xml
+++ b/src/chrome/content/rules/Etre_Shop.com.xml
@@ -22,7 +22,7 @@ Fetch error: http://www.etreshop.com/ => https://www.etreshop.com/: (60, 'SSL ce
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Eucalyptus.com.xml b/src/chrome/content/rules/Eucalyptus.com.xml
index fb9aabc26686..b2f70b89fb9a 100644
--- a/src/chrome/content/rules/Eucalyptus.com.xml
+++ b/src/chrome/content/rules/Eucalyptus.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://eucalyptus.com/ => https://eucalyptus.com/: (51, "SSL: no alternative certificate subject name matches target host name 'eucalyptus.com'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Eurex_Repo.com.xml b/src/chrome/content/rules/Eurex_Repo.com.xml
index 1ca2f437c4d6..b7e0561ac187 100644
--- a/src/chrome/content/rules/Eurex_Repo.com.xml
+++ b/src/chrome/content/rules/Eurex_Repo.com.xml
@@ -13,7 +13,8 @@
 
 
 	
-	
+	
+	
 		
@@ -27,7 +28,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Eurexchange.com.xml b/src/chrome/content/rules/Eurexchange.com.xml
index b6780e5f9832..65c8ab5dfa97 100644
--- a/src/chrome/content/rules/Eurexchange.com.xml
+++ b/src/chrome/content/rules/Eurexchange.com.xml
@@ -14,15 +14,12 @@
 
 	
 	
-		
-		
-		
-		
+	
 
+	
+	
+	
+	
 
 	
diff --git a/src/chrome/content/rules/EuroAds.se.xml b/src/chrome/content/rules/EuroAds.se.xml
deleted file mode 100644
index 300c0e3b92ab..000000000000
--- a/src/chrome/content/rules/EuroAds.se.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/EuroFlorist.no.xml b/src/chrome/content/rules/EuroFlorist.no.xml
index 86a72d4ca161..6a1896612fc3 100644
--- a/src/chrome/content/rules/EuroFlorist.no.xml
+++ b/src/chrome/content/rules/EuroFlorist.no.xml
@@ -10,7 +10,8 @@
 
 
 	
-	
+	
+	
 		
 		
 
@@ -21,7 +22,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/EuroPython.xml b/src/chrome/content/rules/EuroPython.xml
index dd0c0b56a9c4..eb2f1fb5ac74 100644
--- a/src/chrome/content/rules/EuroPython.xml
+++ b/src/chrome/content/rules/EuroPython.xml
@@ -17,7 +17,7 @@ Fetch error: http://ep2014.europython.eu/ => https://ep2014.europython.eu/: (60,
 		- ep2015.europython.eu
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Euroforum-problematic.xml b/src/chrome/content/rules/Euroforum-problematic.xml
index 12786794dbcf..845bfab95d23 100644
--- a/src/chrome/content/rules/Euroforum-problematic.xml
+++ b/src/chrome/content/rules/Euroforum-problematic.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Euroforum.xml b/src/chrome/content/rules/Euroforum.xml
index 06b1706aadeb..54308e33a9b2 100644
--- a/src/chrome/content/rules/Euroforum.xml
+++ b/src/chrome/content/rules/Euroforum.xml
@@ -28,13 +28,13 @@
 
 	
 	
-	
+	
+	
 
 
-	
 
 	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Eurogap.cz.xml b/src/chrome/content/rules/Eurogap.cz.xml
index ed2aa87c4aca..e4baba71b639 100644
--- a/src/chrome/content/rules/Eurogap.cz.xml
+++ b/src/chrome/content/rules/Eurogap.cz.xml
@@ -12,4 +12,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Europa.eu.xml b/src/chrome/content/rules/Europa.eu.xml
index 14e8591bf62b..f2691efe5dbc 100644
--- a/src/chrome/content/rules/Europa.eu.xml
+++ b/src/chrome/content/rules/Europa.eu.xml
@@ -3,9 +3,7 @@
 
 	For rules causing false/broken MCB, see Europa.eu-falsemixed.xml.
 
-
 	Nonfunctional hosts in *europa.eu:
-
 		- ^ ¹
 		- curia ¹
 
@@ -14,9 +12,7 @@
 		- trade.ec ⁴
 
 		- archive.eiopa ʳ
-		- eur-lex ⁵
 		- m.europarl ᵈ
-		- www.europarl ᵈ
 		- eurovoc ¹
 		- www.iss ʳ
 		- (www.)ombudsman ᵈ
@@ -26,14 +22,11 @@
 
 	¹ 400
 	⁴ 403; mismatched, CN: europa.eu
-	⁵ Shows ^; mismatched, CN: europa.eu
 	ᵈ Dropped
 	ʰ Redirects to http
 	ʳ Refused
 
-
 	Problematic hosts in *europa.eu:
-
 		- video.consilium ᶜ ᵐ
 		- een.ec ˣ
 		- eeas ᵐ
@@ -45,9 +38,7 @@
 	ᵐ Mismatched
 	ˣ Mixed css
 
-
 	Partially covered hosts in *europa.eu:
-
 		- www.consilium ʰ
 		- cordis ʰ
 		- ec ²
@@ -55,9 +46,7 @@
 	ʰ Some pages redirect to http
 	² $ 400s
 
-
 	Insecure cookies are set for these domains and hosts:
-
 		- bookshop.europa.eu
 		- ec.europa.eu
 		- .een.ec.europa.eu
@@ -67,9 +56,7 @@
 		- oami.europa.eu
 		- publication.europa.eu
 
-
 	Mixed content:
-
 		- css on een.ec from $self ˢ
 
 		- Images, on:
@@ -84,12 +71,9 @@
 			- publications from $self ˢ
 
 	ˢ Secured by us
-
 -->
 
-
-	
+	
 	
 	
 	
@@ -107,29 +91,26 @@
 	
 	
 	
+	
+	
 	
 	
 	
 	
 
-	
+	
 	
 
 	
 	
 	
 
-		
+		
 		
-		
+		
 		
 
-			
+			
 			
 			
 			
@@ -138,8 +119,7 @@
 			
 			
 
-			
+			
 			
 			
 			
@@ -147,16 +127,12 @@
 			
 			
 
-		
+		
 		
-		
+		
 		
 
-			
+			
 			
 			
 			
@@ -173,8 +149,7 @@
 			
 			
 
-			
+			
 			
 			
 			
@@ -190,20 +165,16 @@
 			
 			
 
-		
+		
 		
-		
+
+		
 		
-		
+
+		
 		
 
-			
+			
 			
 			
 			
@@ -219,8 +190,7 @@
 			
 			
 
-			
+			
 			
 			
 			
@@ -238,9 +208,7 @@
 		
 		
 
-
-	
+	
 	
 	
 	
@@ -253,22 +221,13 @@
 	
 	
 
+	
 
-	
-
-	
-
-	
-	
+	
 
+	
+	
 		
 
-	
-
+	
 
diff --git a/src/chrome/content/rules/Europcar-Group.com.xml b/src/chrome/content/rules/Europcar-Group.com.xml
new file mode 100644
index 000000000000..bd6cfc4a9bb6
--- /dev/null
+++ b/src/chrome/content/rules/Europcar-Group.com.xml
@@ -0,0 +1,18 @@
+
+
+
+	
+	
+	
+	
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Europcar.co.nz.xml b/src/chrome/content/rules/Europcar.co.nz.xml
new file mode 100644
index 000000000000..b098ace14995
--- /dev/null
+++ b/src/chrome/content/rules/Europcar.co.nz.xml
@@ -0,0 +1,36 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Europcar.com.au.xml b/src/chrome/content/rules/Europcar.com.au.xml
new file mode 100644
index 000000000000..0921463fbece
--- /dev/null
+++ b/src/chrome/content/rules/Europcar.com.au.xml
@@ -0,0 +1,35 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Europcar.de.xml b/src/chrome/content/rules/Europcar.de.xml
new file mode 100644
index 000000000000..c97da523cc35
--- /dev/null
+++ b/src/chrome/content/rules/Europcar.de.xml
@@ -0,0 +1,46 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Europcar.es.xml b/src/chrome/content/rules/Europcar.es.xml
new file mode 100644
index 000000000000..ca81e97ee47f
--- /dev/null
+++ b/src/chrome/content/rules/Europcar.es.xml
@@ -0,0 +1,31 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Europcar.fr.xml b/src/chrome/content/rules/Europcar.fr.xml
new file mode 100644
index 000000000000..1c03e5b1e7b0
--- /dev/null
+++ b/src/chrome/content/rules/Europcar.fr.xml
@@ -0,0 +1,38 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Europcar.it.xml b/src/chrome/content/rules/Europcar.it.xml
new file mode 100644
index 000000000000..e652e1c77d01
--- /dev/null
+++ b/src/chrome/content/rules/Europcar.it.xml
@@ -0,0 +1,53 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/EuropePMC.org.xml b/src/chrome/content/rules/EuropePMC.org.xml
new file mode 100644
index 000000000000..c89a551640b4
--- /dev/null
+++ b/src/chrome/content/rules/EuropePMC.org.xml
@@ -0,0 +1,25 @@
+
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Europe_Miniatures.xml b/src/chrome/content/rules/Europe_Miniatures.xml
deleted file mode 100644
index 4878f178ed96..000000000000
--- a/src/chrome/content/rules/Europe_Miniatures.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/EuropeanSSL.xml b/src/chrome/content/rules/EuropeanSSL.xml
index 718a085d3095..2ebc3a113003 100644
--- a/src/chrome/content/rules/EuropeanSSL.xml
+++ b/src/chrome/content/rules/EuropeanSSL.xml
@@ -8,7 +8,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
@@ -17,4 +19,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/European_Energy_Exchange.xml b/src/chrome/content/rules/European_Energy_Exchange.xml
index 881eadd86e96..d62dcb764aec 100644
--- a/src/chrome/content/rules/European_Energy_Exchange.xml
+++ b/src/chrome/content/rules/European_Energy_Exchange.xml
@@ -12,7 +12,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -21,7 +22,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/European_Space_Agency.xml b/src/chrome/content/rules/European_Space_Agency.xml
index 8c3cdfa2e2ed..502ae1b163b8 100644
--- a/src/chrome/content/rules/European_Space_Agency.xml
+++ b/src/chrome/content/rules/European_Space_Agency.xml
@@ -19,7 +19,7 @@ Fetch error: http://esa.int/ => https://www.esa.int/: Too many redirects while f
 	Some pages redirect to http.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Eurovision.de.xml b/src/chrome/content/rules/Eurovision.de.xml
index 763f53f57820..5c3b043299b2 100644
--- a/src/chrome/content/rules/Eurovision.de.xml
+++ b/src/chrome/content/rules/Eurovision.de.xml
@@ -1,7 +1,7 @@
 
 
diff --git a/src/chrome/content/rules/Eurowings.com.xml b/src/chrome/content/rules/Eurowings.com.xml
new file mode 100644
index 000000000000..2af9e6e084ec
--- /dev/null
+++ b/src/chrome/content/rules/Eurowings.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Eustace.io.xml b/src/chrome/content/rules/Eustace.io.xml
new file mode 100644
index 000000000000..2ec4b0334414
--- /dev/null
+++ b/src/chrome/content/rules/Eustace.io.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/EvEGer.xml b/src/chrome/content/rules/EvEGer.xml
index 30e13c3ec589..11bd32a74386 100644
--- a/src/chrome/content/rules/EvEGer.xml
+++ b/src/chrome/content/rules/EvEGer.xml
@@ -1,6 +1,6 @@
 
   
   
- 
+
   
 
diff --git a/src/chrome/content/rules/Evanced.info.xml b/src/chrome/content/rules/Evanced.info.xml
index d5efbcbbe131..a490b918e358 100644
--- a/src/chrome/content/rules/Evanced.info.xml
+++ b/src/chrome/content/rules/Evanced.info.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://evanced.info/ => https://evanced.info/: (51, "SSL: no alternative certificate subject name matches target host name 'evanced.info'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Evaske.com.xml b/src/chrome/content/rules/Evaske.com.xml
index 890907ef5b91..a999eafb8572 100644
--- a/src/chrome/content/rules/Evaske.com.xml
+++ b/src/chrome/content/rules/Evaske.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://clients.evaske.com/ => https://clients.evaske.com/: Too many
 	Problematic:
 		- dev (Some sites serve wrong content)
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Evenmere.org.xml b/src/chrome/content/rules/Evenmere.org.xml
index 5669a234bfbe..bbbedffddac8 100644
--- a/src/chrome/content/rules/Evenmere.org.xml
+++ b/src/chrome/content/rules/Evenmere.org.xml
@@ -20,7 +20,7 @@ Fetch error: http://blog.evenmere.org/ => https://blog.evenmere.org/: (6, 'Could
 		- https://panopticlick.eff.org
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/EventOverload.xml b/src/chrome/content/rules/EventOverload.xml
index 3ce594ebe38b..8e7cfe505ad3 100644
--- a/src/chrome/content/rules/EventOverload.xml
+++ b/src/chrome/content/rules/EventOverload.xml
@@ -6,7 +6,7 @@ Fetch error: http://eventoverload.com/ => https://eventoverload.com/: (51, "SSL:
 Disabled by https-everywhere-checker because:
 Fetch error: http://eventoverload.com/ => https://eventoverload.com/: (60, 'SSL certificate problem: self signed certificate')
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://eventoverload.com/ => https://eventoverload.com/: (60, 'SSL
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Event_Booking_Online.com.xml b/src/chrome/content/rules/Event_Booking_Online.com.xml
deleted file mode 100644
index df4e7727b585..000000000000
--- a/src/chrome/content/rules/Event_Booking_Online.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Eventim.co.il.xml b/src/chrome/content/rules/Eventim.co.il.xml
new file mode 100644
index 000000000000..024d11bfdf07
--- /dev/null
+++ b/src/chrome/content/rules/Eventim.co.il.xml
@@ -0,0 +1,25 @@
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Eventim.co.uk.xml b/src/chrome/content/rules/Eventim.co.uk.xml
new file mode 100644
index 000000000000..9c98e62c0bdf
--- /dev/null
+++ b/src/chrome/content/rules/Eventim.co.uk.xml
@@ -0,0 +1,27 @@
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Eventim.com.br.xml b/src/chrome/content/rules/Eventim.com.br.xml
new file mode 100644
index 000000000000..9ffe3e3c6976
--- /dev/null
+++ b/src/chrome/content/rules/Eventim.com.br.xml
@@ -0,0 +1,23 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Eventim.com.xml b/src/chrome/content/rules/Eventim.com.xml
new file mode 100644
index 000000000000..4bf19edb97fa
--- /dev/null
+++ b/src/chrome/content/rules/Eventim.com.xml
@@ -0,0 +1,70 @@
+
+
+	
+		
+	
+	
+		
+	
+		
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Eventim.cu.xml b/src/chrome/content/rules/Eventim.cu.xml
new file mode 100644
index 000000000000..3da2dfc169bc
--- /dev/null
+++ b/src/chrome/content/rules/Eventim.cu.xml
@@ -0,0 +1,23 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Eventim.de.xml b/src/chrome/content/rules/Eventim.de.xml
new file mode 100644
index 000000000000..6044ff36137f
--- /dev/null
+++ b/src/chrome/content/rules/Eventim.de.xml
@@ -0,0 +1,29 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Eventim.fr.xml b/src/chrome/content/rules/Eventim.fr.xml
new file mode 100644
index 000000000000..cdd6cd6b62d5
--- /dev/null
+++ b/src/chrome/content/rules/Eventim.fr.xml
@@ -0,0 +1,23 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Eventim.nl.xml b/src/chrome/content/rules/Eventim.nl.xml
new file mode 100644
index 000000000000..6592b59aef38
--- /dev/null
+++ b/src/chrome/content/rules/Eventim.nl.xml
@@ -0,0 +1,30 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Eventim.no.xml b/src/chrome/content/rules/Eventim.no.xml
new file mode 100644
index 000000000000..cbe2b5fdf97e
--- /dev/null
+++ b/src/chrome/content/rules/Eventim.no.xml
@@ -0,0 +1,23 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Eventim.pl.xml b/src/chrome/content/rules/Eventim.pl.xml
new file mode 100644
index 000000000000..598080c0d959
--- /dev/null
+++ b/src/chrome/content/rules/Eventim.pl.xml
@@ -0,0 +1,25 @@
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Eventim.se.xml b/src/chrome/content/rules/Eventim.se.xml
new file mode 100644
index 000000000000..55ff1cb41231
--- /dev/null
+++ b/src/chrome/content/rules/Eventim.se.xml
@@ -0,0 +1,24 @@
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Eventim.sk.xml b/src/chrome/content/rules/Eventim.sk.xml
new file mode 100644
index 000000000000..0212000bba53
--- /dev/null
+++ b/src/chrome/content/rules/Eventim.sk.xml
@@ -0,0 +1,23 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Eventim.xml b/src/chrome/content/rules/Eventim.xml
deleted file mode 100644
index d92c1418e8f5..000000000000
--- a/src/chrome/content/rules/Eventim.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-
-	
-	
-	
-		
-		
-		
-		
-		
-	
-	
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Eventpoint.com.xml b/src/chrome/content/rules/Eventpoint.com.xml
index ba70841484d4..1f1942196d17 100644
--- a/src/chrome/content/rules/Eventpoint.com.xml
+++ b/src/chrome/content/rules/Eventpoint.com.xml
@@ -17,7 +17,7 @@ Fetch error: http://acs-stage.eventpoint.com/ => https://acs-stage.eventpoint.co
 		- acs-stage
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Events.ch.xml b/src/chrome/content/rules/Events.ch.xml
index cd73625576f9..6aabc2c9b203 100644
--- a/src/chrome/content/rules/Events.ch.xml
+++ b/src/chrome/content/rules/Events.ch.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.events.ch/ => https://www.events.ch/: (60, 'SSL certific
 		- www.fmr.events.ch
 		- www.a.events.ch
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Evermeet.cx.xml b/src/chrome/content/rules/Evermeet.cx.xml
index 687bc236a597..34d5b23c51e3 100644
--- a/src/chrome/content/rules/Evermeet.cx.xml
+++ b/src/chrome/content/rules/Evermeet.cx.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.evermeet.cx/ => https://www.evermeet.cx/: (51, "SSL: no alternative certificate subject name matches target host name 'www.evermeet.cx'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/EverydayGiftCards.com.au.xml b/src/chrome/content/rules/EverydayGiftCards.com.au.xml
new file mode 100644
index 000000000000..deda7033fec6
--- /dev/null
+++ b/src/chrome/content/rules/EverydayGiftCards.com.au.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Everyday_Health.xml b/src/chrome/content/rules/Everyday_Health.xml
index 2862a48615db..4dba57c36ad9 100644
--- a/src/chrome/content/rules/Everyday_Health.xml
+++ b/src/chrome/content/rules/Everyday_Health.xml
@@ -10,21 +10,18 @@ Fetch error: http://everydayhealth.com/ => https://everydayhealth.com/: Cycle de
 		- corporate.everydayhealth.com
 
 -->
-
+
 
 	
-	
-	
 	
+	
+	
+	
 
 
 	
 
 
-	
-
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Everyday_Hero.xml b/src/chrome/content/rules/Everyday_Hero.xml
index 9ec8c744c010..78338ca786e6 100644
--- a/src/chrome/content/rules/Everyday_Hero.xml
+++ b/src/chrome/content/rules/Everyday_Hero.xml
@@ -20,4 +20,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Everydayfeminism.com.xml b/src/chrome/content/rules/Everydayfeminism.com.xml
index 0342f6e8db63..4d7cd27d0ee1 100644
--- a/src/chrome/content/rules/Everydayfeminism.com.xml
+++ b/src/chrome/content/rules/Everydayfeminism.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://everydayfeminism.com/ => https://everydayfeminism.com/: Too
 Fetch error: http://www.everydayfeminism.com/ => https://www.everydayfeminism.com/: Too many redirects while fetching 'https://www.everydayfeminism.com/'
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Everyone_is_Gay.com.xml b/src/chrome/content/rules/Everyone_is_Gay.com.xml
index 29cce7260837..7c357ddcb1a9 100644
--- a/src/chrome/content/rules/Everyone_is_Gay.com.xml
+++ b/src/chrome/content/rules/Everyone_is_Gay.com.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Everything_Everywhere.xml b/src/chrome/content/rules/Everything_Everywhere.xml
index c79657b85ed3..083b63891840 100644
--- a/src/chrome/content/rules/Everything_Everywhere.xml
+++ b/src/chrome/content/rules/Everything_Everywhere.xml
@@ -1,6 +1,5 @@
 
-
-
+
 	
-	
-		
-
-
-	
-	
-
-
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
 
 	
@@ -100,4 +83,5 @@
 	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Evidon.xml b/src/chrome/content/rules/Evidon.xml
index 86ed497143cc..5afbbf5d82c9 100644
--- a/src/chrome/content/rules/Evidon.xml
+++ b/src/chrome/content/rules/Evidon.xml
@@ -2,40 +2,55 @@
 	Other Evidon related rulesets:
 		+ Ghostery.com.xml
 
-
-	Non-functional hosts in *betteradvertising.com
-		SSL peer certificate was not OK:
-			 - cdn.betteradvertising.com
-
-		Peer certificate cannot be authenticated with given CA certificates:
-			 - my.betteradvertising.com
-
-
-	Non-functional hosts in *betrad.com
-		Peer certificate cannot be authenticated with given CA certificates:
-			 - betrad.com
-			 - www.betrad.com
-
-
-	Non-functional hosts in *evidon.com
-		SSL peer certificate was not OK:
-			 - cdn.evidon.com
-
-		Peer certificate cannot be authenticated with given CA certificates:
-			 - blog.evidon.com
-			 - my.evidon.com
-
+	Self-signed cert:
+		- betteradvertising.com
+		- www.betteradvertising.com
+		- betrad.com
+		- www.betrad.com
+		- blog.evidon.com
+
+	Cert expired:
+		- my.betteradvertising.com
+		- ads.evidon.com
+		- my.evidon.com
+
+	Cert mismatch:
+		- cdn.betteradvertising.com
+		- cdn.evidon.com
+		- em.evidon.com
+
+	Connection refused:
+		- graphite.evidon.com
 -->
 
+
 	
+
 	
 	
 	
+	
 
 	
 	
 	
-	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Ex_Libris.xml b/src/chrome/content/rules/Ex_Libris.xml
index bf0d85a6b495..85ec0d13e07e 100644
--- a/src/chrome/content/rules/Ex_Libris.xml
+++ b/src/chrome/content/rules/Ex_Libris.xml
@@ -21,4 +21,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Exaccess.ru.xml b/src/chrome/content/rules/Exaccess.ru.xml
index 0ba5e5854153..be6335b6b875 100644
--- a/src/chrome/content/rules/Exaccess.ru.xml
+++ b/src/chrome/content/rules/Exaccess.ru.xml
@@ -12,4 +12,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ExactTarget.xml b/src/chrome/content/rules/ExactTarget.xml
index a7d69983f115..b6dd415dcc46 100644
--- a/src/chrome/content/rules/ExactTarget.xml
+++ b/src/chrome/content/rules/ExactTarget.xml
@@ -1,10 +1,29 @@
+
 
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 	
 
-	
+	
 
 
 	
 	
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Exactag.xml b/src/chrome/content/rules/Exactag.xml
index 778c09b853dc..4ce26b868263 100644
--- a/src/chrome/content/rules/Exactag.xml
+++ b/src/chrome/content/rules/Exactag.xml
@@ -1,25 +1,45 @@
-
 
-
+
 
 	
+	
+
+	
+	
+	
+	
 	
+	
+	
 	
+	
+	
+	
 	
-	
-		
-
-
-	
+	
+	
+	
+	
+	
+	
+	
 
+	
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Examiner.com.xml b/src/chrome/content/rules/Examiner.com.xml
index 8b382db54d3c..b43bd200c76b 100644
--- a/src/chrome/content/rules/Examiner.com.xml
+++ b/src/chrome/content/rules/Examiner.com.xml
@@ -18,7 +18,7 @@ Fetch error: http://examiner.com/ => https://examiner.com/: (60, 'SSL certificat
 		- cdn.exm.nr	(works; mismatched, CN: gp1.wac.edgecastcdn.net)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Examp1e.net.xml b/src/chrome/content/rules/Examp1e.net.xml
index 9c269e5c9e05..2ed8d4da8cc7 100644
--- a/src/chrome/content/rules/Examp1e.net.xml
+++ b/src/chrome/content/rules/Examp1e.net.xml
@@ -8,7 +8,7 @@ Fetch error: http://examp1e.net/ => https://examp1e.net/: (60, 'SSL certificate
 		- www.examp1e.net
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Excaliburfilms.xml b/src/chrome/content/rules/Excaliburfilms.xml
index 58f18d5334dc..52013a20fce9 100644
--- a/src/chrome/content/rules/Excaliburfilms.xml
+++ b/src/chrome/content/rules/Excaliburfilms.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://images.excaliburfilms.com/ => https://images.excaliburfilms.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Excelsior-USA.com.xml b/src/chrome/content/rules/Excelsior-USA.com.xml
deleted file mode 100644
index 238010c3458a..000000000000
--- a/src/chrome/content/rules/Excelsior-USA.com.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-		
-		
-		
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Excitations.com.xml b/src/chrome/content/rules/Excitations.com.xml
index 0935272ed26a..49f74e4119e7 100644
--- a/src/chrome/content/rules/Excitations.com.xml
+++ b/src/chrome/content/rules/Excitations.com.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Exclusive_X.xml b/src/chrome/content/rules/Exclusive_X.xml
index f6bda2eff071..dd4217f0f954 100644
--- a/src/chrome/content/rules/Exclusive_X.xml
+++ b/src/chrome/content/rules/Exclusive_X.xml
@@ -4,9 +4,9 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Exede.xml b/src/chrome/content/rules/Exede.xml
deleted file mode 100644
index aca19a569913..000000000000
--- a/src/chrome/content/rules/Exede.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Exeter_Friendly_Society.xml b/src/chrome/content/rules/Exeter_Friendly_Society.xml
index 1d6cb6c853e8..302125ebcbfb 100644
--- a/src/chrome/content/rules/Exeter_Friendly_Society.xml
+++ b/src/chrome/content/rules/Exeter_Friendly_Society.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.exeterfriendly.co.uk/ => https://www.exeterfamily.co.uk/
 	* Times out
 
 -->
-
+
 
 	
 	
@@ -31,4 +31,4 @@ Fetch error: http://www.exeterfriendly.co.uk/ => https://www.exeterfamily.co.uk/
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Exhale.xml b/src/chrome/content/rules/Exhale.xml
index 4ad10fe0b22b..2e8b84c04e69 100644
--- a/src/chrome/content/rules/Exhale.xml
+++ b/src/chrome/content/rules/Exhale.xml
@@ -2,18 +2,21 @@
 	Problematic domains:
 
 		- (www.)4exhale.org	(502; mismatched, CN: *.electricembers.net)
+		- mail.exhaleprovoice.org	(mismatched, CN: *.outlook.com)
 
 -->
 
 
+	
+	
 	
 	
-
+	
 
 	
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Exim.org.xml b/src/chrome/content/rules/Exim.org.xml
index ab7397c80ba4..6adc8b9a8879 100644
--- a/src/chrome/content/rules/Exim.org.xml
+++ b/src/chrome/content/rules/Exim.org.xml
@@ -1,11 +1,26 @@
 
-
+
 
+	
+	
 	
+	
+	
+	
+	
 	
+	
+	
 
 
 	
 
 
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Exitec.xml b/src/chrome/content/rules/Exitec.xml
deleted file mode 100644
index 91743026f87f..000000000000
--- a/src/chrome/content/rules/Exitec.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Exmasters.com.xml b/src/chrome/content/rules/Exmasters.com.xml
index edae425b94ef..cc28ec54a743 100644
--- a/src/chrome/content/rules/Exmasters.com.xml
+++ b/src/chrome/content/rules/Exmasters.com.xml
@@ -20,4 +20,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Exmo.com.xml b/src/chrome/content/rules/Exmo.com.xml
index abf6b9373a37..e023dcda49ed 100644
--- a/src/chrome/content/rules/Exmo.com.xml
+++ b/src/chrome/content/rules/Exmo.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://merchant.exmo.com/ => https://merchant.exmo.com/: (6, 'Could
 		- www.exmo.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/ExootLab.xml b/src/chrome/content/rules/ExootLab.xml
deleted file mode 100644
index 7cc30db90877..000000000000
--- a/src/chrome/content/rules/ExootLab.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/ExoticVM.com.xml b/src/chrome/content/rules/ExoticVM.com.xml
new file mode 100644
index 000000000000..9c14880b0188
--- /dev/null
+++ b/src/chrome/content/rules/ExoticVM.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Expedia.at.xml b/src/chrome/content/rules/Expedia.at.xml
index 9fd11e75a24d..51a7cdacfa58 100644
--- a/src/chrome/content/rules/Expedia.at.xml
+++ b/src/chrome/content/rules/Expedia.at.xml
@@ -10,7 +10,7 @@
 		- inside	(t)
 		- support	(i)
 		- wwph		(r)
-	
+
 	e: expired certificate
 	h: http redirect
 	i: invalid certificate chain
diff --git a/src/chrome/content/rules/Expedia.be.xml b/src/chrome/content/rules/Expedia.be.xml
index 6b1271f7a663..be36622ad262 100644
--- a/src/chrome/content/rules/Expedia.be.xml
+++ b/src/chrome/content/rules/Expedia.be.xml
@@ -8,7 +8,7 @@
 		- eurostar	(t)
 		- support	(i)
 		- vakantiehuizen	(t)
-	
+
 	e: expired certificate
 	h: http redirect
 	i: invalid certificate chain
diff --git a/src/chrome/content/rules/Expedia.ca.xml b/src/chrome/content/rules/Expedia.ca.xml
index cad52f8fc7cc..044969d752a5 100644
--- a/src/chrome/content/rules/Expedia.ca.xml
+++ b/src/chrome/content/rules/Expedia.ca.xml
@@ -21,7 +21,7 @@
 		- support	(i)
 		- booking.vacations	(t)
 		- wwph	(r)
-	
+
 	e: expired certificate
 	h: http redirect
 	i: invalid certificate chain
diff --git a/src/chrome/content/rules/Expedia.ch.xml b/src/chrome/content/rules/Expedia.ch.xml
index ea099e5f56c6..c140f8b5ed8f 100644
--- a/src/chrome/content/rules/Expedia.ch.xml
+++ b/src/chrome/content/rules/Expedia.ch.xml
@@ -5,7 +5,7 @@
 	Non-functional subdomains:
 		- ferienwohnung	(t)
 		- location-vacances	(t)
-	
+
 	e: expired certificate
 	h: http redirect
 	i: invalid certificate chain
diff --git a/src/chrome/content/rules/Expedia.cn.xml b/src/chrome/content/rules/Expedia.cn.xml
index 382eac4cb424..35778dc3f6e4 100644
--- a/src/chrome/content/rules/Expedia.cn.xml
+++ b/src/chrome/content/rules/Expedia.cn.xml
@@ -5,7 +5,7 @@
 	Non-functional subdomains:
 		- $self (t)
 
-	
+
 	e: expired certificate
 	h: http redirect
 	i: invalid certificate chain
diff --git a/src/chrome/content/rules/Expedia.co.id.xml b/src/chrome/content/rules/Expedia.co.id.xml
index 62de44a8c15d..28c8d309b6da 100644
--- a/src/chrome/content/rules/Expedia.co.id.xml
+++ b/src/chrome/content/rules/Expedia.co.id.xml
@@ -6,7 +6,7 @@
 		- deals	(t)
 		- enfaq	(t)
 		- faq	(t)
-	
+
 	e: expired certificate
 	h: http redirect
 	i: invalid certificate chain
diff --git a/src/chrome/content/rules/Expedia.co.in.xml b/src/chrome/content/rules/Expedia.co.in.xml
index 0caa42647cec..6f07a4f75d8c 100644
--- a/src/chrome/content/rules/Expedia.co.in.xml
+++ b/src/chrome/content/rules/Expedia.co.in.xml
@@ -11,7 +11,7 @@
 		- holidayplanner	(m)
 		- press	(r)
 		- support	(i)
-	
+
 	e: expired certificate
 	h: http redirect
 	i: invalid certificate chain
diff --git a/src/chrome/content/rules/Expedia.co.jp.xml b/src/chrome/content/rules/Expedia.co.jp.xml
index f1e320755b4d..cd67c8dbc5da 100644
--- a/src/chrome/content/rules/Expedia.co.jp.xml
+++ b/src/chrome/content/rules/Expedia.co.jp.xml
@@ -15,7 +15,7 @@
 		- support	(i)
 		- tm	(t)
 		- tour	(t)
-	
+
 	e: expired certificate
 	h: http redirect
 	i: invalid certificate chain
diff --git a/src/chrome/content/rules/Expedia.co.kr.xml b/src/chrome/content/rules/Expedia.co.kr.xml
index 904b4ba08437..7abef76197f3 100644
--- a/src/chrome/content/rules/Expedia.co.kr.xml
+++ b/src/chrome/content/rules/Expedia.co.kr.xml
@@ -9,7 +9,7 @@
 		- faq		(t)
 		- support	(i)
 		- wwch		(t)
-	
+
 	e: expired certificate
 	h: http redirect
 	i: invalid certificate chain
diff --git a/src/chrome/content/rules/Expedia.co.nz.xml b/src/chrome/content/rules/Expedia.co.nz.xml
index acceeb09615f..3f03ee538d7f 100644
--- a/src/chrome/content/rules/Expedia.co.nz.xml
+++ b/src/chrome/content/rules/Expedia.co.nz.xml
@@ -29,4 +29,4 @@
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Expedia.co.th.xml b/src/chrome/content/rules/Expedia.co.th.xml
index 21f2a4f29a40..b671afc88329 100644
--- a/src/chrome/content/rules/Expedia.co.th.xml
+++ b/src/chrome/content/rules/Expedia.co.th.xml
@@ -6,7 +6,7 @@
 		- deals	(t)
 		- enfaq	(r)
 		- faq	(r)
-	
+
 	e: expired certificate
 	h: http redirect
 	i: invalid certificate chain
diff --git a/src/chrome/content/rules/Expedia.co.uk.xml b/src/chrome/content/rules/Expedia.co.uk.xml
index eafe8f7f5b55..01e41515c973 100644
--- a/src/chrome/content/rules/Expedia.co.uk.xml
+++ b/src/chrome/content/rules/Expedia.co.uk.xml
@@ -1,4 +1,4 @@
-
-
+
 
 	
 	
 	
-	
-
-
-	
-
-
-	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Explainxkcd.com.xml b/src/chrome/content/rules/Explainxkcd.com.xml
index 379b4f9257f4..8c4afa80af02 100644
--- a/src/chrome/content/rules/Explainxkcd.com.xml
+++ b/src/chrome/content/rules/Explainxkcd.com.xml
@@ -1,7 +1,7 @@
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ExploreFlask.com.xml b/src/chrome/content/rules/ExploreFlask.com.xml
new file mode 100644
index 000000000000..a7fb87bc7eba
--- /dev/null
+++ b/src/chrome/content/rules/ExploreFlask.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Explosm.net.xml b/src/chrome/content/rules/Explosm.net.xml
index 99b75e92c726..067c49009f44 100644
--- a/src/chrome/content/rules/Explosm.net.xml
+++ b/src/chrome/content/rules/Explosm.net.xml
@@ -24,19 +24,19 @@ Fetch error: http://explosm.net/ => https://explosm.net/: Cycle detected - URL a
 	a problem for mixed content blockers.
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
 
 
-	
 
 	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Expo2020.xml b/src/chrome/content/rules/Expo2020.xml
index 47a452067c1b..d71efa5423b2 100644
--- a/src/chrome/content/rules/Expo2020.xml
+++ b/src/chrome/content/rules/Expo2020.xml
@@ -13,7 +13,7 @@ Fetch error: http://grant.expo2020dubai.ae/ => https://grant.expo2020dubai.ae/:
 		- expo2020dubai.ae
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Express.de.xml b/src/chrome/content/rules/Express.de.xml
new file mode 100644
index 000000000000..314d873ac8ab
--- /dev/null
+++ b/src/chrome/content/rules/Express.de.xml
@@ -0,0 +1,32 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Expresscoin.com.xml b/src/chrome/content/rules/Expresscoin.com.xml
index 7ebf545c52b7..8f6933107ca0 100644
--- a/src/chrome/content/rules/Expresscoin.com.xml
+++ b/src/chrome/content/rules/Expresscoin.com.xml
@@ -24,7 +24,7 @@ Fetch error: http://accounts.expresscoin.com/ => https://accounts.expresscoin.co
 		- www.expresscoin.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Expressen.se.xml b/src/chrome/content/rules/Expressen.se.xml
new file mode 100644
index 000000000000..8f2a12ff0468
--- /dev/null
+++ b/src/chrome/content/rules/Expressen.se.xml
@@ -0,0 +1,26 @@
+
+
+
+
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Extabit.xml b/src/chrome/content/rules/Extabit.xml
index c8b059c95954..378a2b740a94 100644
--- a/src/chrome/content/rules/Extabit.xml
+++ b/src/chrome/content/rules/Extabit.xml
@@ -16,7 +16,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Extensis.com.xml b/src/chrome/content/rules/Extensis.com.xml
index b88c46947fbd..b6d365efec6f 100644
--- a/src/chrome/content/rules/Extensis.com.xml
+++ b/src/chrome/content/rules/Extensis.com.xml
@@ -36,7 +36,7 @@ Fetch error: http://www2.extensis.com/ => https://www2.extensis.com/: (51, "SSL:
 		- www.extensis.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Extra_Lunch_Money.xml b/src/chrome/content/rules/Extra_Lunch_Money.xml
index f60c37447d74..c27769f3fbcf 100644
--- a/src/chrome/content/rules/Extra_Lunch_Money.xml
+++ b/src/chrome/content/rules/Extra_Lunch_Money.xml
@@ -12,16 +12,16 @@
 
 
 	
-	
+	
+	
 
 
 	
 
 
-	
 
 	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Extratorrent.com.xml b/src/chrome/content/rules/Extratorrent.com.xml
index 460444ca9f36..4c14f5a5f7e3 100644
--- a/src/chrome/content/rules/Extratorrent.com.xml
+++ b/src/chrome/content/rules/Extratorrent.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.extratorrentonline.com/ => https://www.extratorrentonlin
 
 static.etproxy.com different content
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Extreme-Dm.com.xml b/src/chrome/content/rules/Extreme-Dm.com.xml
index c3c4d60f1bb2..39e36b4880f4 100644
--- a/src/chrome/content/rules/Extreme-Dm.com.xml
+++ b/src/chrome/content/rules/Extreme-Dm.com.xml
@@ -20,11 +20,13 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
 
 
-	
 
 	
@@ -32,4 +34,5 @@
 	
 
+	
 
diff --git a/src/chrome/content/rules/Extreme-Light-Infrastructure.xml b/src/chrome/content/rules/Extreme-Light-Infrastructure.xml
deleted file mode 100644
index 46111b8a359a..000000000000
--- a/src/chrome/content/rules/Extreme-Light-Infrastructure.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/ExtremeTacticalDynamics.com.xml b/src/chrome/content/rules/ExtremeTacticalDynamics.com.xml
new file mode 100644
index 000000000000..35d7dfebc02b
--- /dev/null
+++ b/src/chrome/content/rules/ExtremeTacticalDynamics.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ExtremeTech.com.xml b/src/chrome/content/rules/ExtremeTech.com.xml
new file mode 100644
index 000000000000..371e1a42882f
--- /dev/null
+++ b/src/chrome/content/rules/ExtremeTech.com.xml
@@ -0,0 +1,32 @@
+
+
+
+	
+	
+	
+	
+		
+		
+		
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Extreme_Digital.xml b/src/chrome/content/rules/Extreme_Digital.xml
deleted file mode 100644
index 509bee00ebbe..000000000000
--- a/src/chrome/content/rules/Extreme_Digital.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-
-	
-	
-
diff --git a/src/chrome/content/rules/Extreme_Tech.com.xml b/src/chrome/content/rules/Extreme_Tech.com.xml
deleted file mode 100644
index 238275bf9a44..000000000000
--- a/src/chrome/content/rules/Extreme_Tech.com.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-	
-		
-		
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/EyeReturn.com.xml b/src/chrome/content/rules/EyeReturn.com.xml
deleted file mode 100644
index 616a5ed704f2..000000000000
--- a/src/chrome/content/rules/EyeReturn.com.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/EyeReturn_Marketing.com.xml b/src/chrome/content/rules/EyeReturn_Marketing.com.xml
index 485f21ab64e7..fd9053c0e43e 100644
--- a/src/chrome/content/rules/EyeReturn_Marketing.com.xml
+++ b/src/chrome/content/rules/EyeReturn_Marketing.com.xml
@@ -1,7 +1,6 @@
 
-		
-	
 
-
-	
+  
 
 
diff --git a/src/chrome/content/rules/EyeTech.xml b/src/chrome/content/rules/EyeTech.xml
index a1041f02a3e1..c297fd8eeeba 100644
--- a/src/chrome/content/rules/EyeTech.xml
+++ b/src/chrome/content/rules/EyeTech.xml
@@ -12,7 +12,7 @@ Fetch error: http://eyetechds.com/ => https://eyetechds.com/: (51, "SSL: no alte
 Fetch error: http://www.eyetechds.com/ => https://www.eyetechds.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.eyetechds.com'")
 
 -->
-
+
 
 	
 	
@@ -20,4 +20,4 @@ Fetch error: http://www.eyetechds.com/ => https://www.eyetechds.com/: (51, "SSL:
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Eyeviewads.com.xml b/src/chrome/content/rules/Eyeviewads.com.xml
index c9d2556416c6..1be7773b8dc4 100644
--- a/src/chrome/content/rules/Eyeviewads.com.xml
+++ b/src/chrome/content/rules/Eyeviewads.com.xml
@@ -5,7 +5,7 @@
 
 	Time out:
 		connectad.eyeviewads.com
-		videoiq-backoffice.eyeviewades.com		
+		videoiq-backoffice.eyeviewades.com
 
 -->
 
diff --git a/src/chrome/content/rules/Eyny.com.xml b/src/chrome/content/rules/Eyny.com.xml
new file mode 100644
index 000000000000..a31051620ffd
--- /dev/null
+++ b/src/chrome/content/rules/Eyny.com.xml
@@ -0,0 +1,26 @@
+
+
+
+	
+	
+		
+		
+		
+		
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/EzAccessory.com.xml b/src/chrome/content/rules/EzAccessory.com.xml
index def7db50318b..25049ec5f6be 100644
--- a/src/chrome/content/rules/EzAccessory.com.xml
+++ b/src/chrome/content/rules/EzAccessory.com.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/EzDing.com.tw.xml b/src/chrome/content/rules/EzDing.com.tw.xml
index 43eb2149c8a8..2724b0f6580d 100644
--- a/src/chrome/content/rules/EzDing.com.tw.xml
+++ b/src/chrome/content/rules/EzDing.com.tw.xml
@@ -21,7 +21,7 @@ Fetch error: http://ezding.com.tw/ => https://ezding.com.tw/: (28, 'Connection t
 	* Unsecurable
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Ezaxess.com.xml b/src/chrome/content/rules/Ezaxess.com.xml
deleted file mode 100644
index ea9ab1450155..000000000000
--- a/src/chrome/content/rules/Ezaxess.com.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-	
-		
-		
-		
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/EzineArticles.xml b/src/chrome/content/rules/EzineArticles.xml
index 097950f83465..a30ae02123dc 100644
--- a/src/chrome/content/rules/EzineArticles.xml
+++ b/src/chrome/content/rules/EzineArticles.xml
@@ -11,7 +11,8 @@
 -->
 
   
-  
+  
+  
 		
+  
 
diff --git a/src/chrome/content/rules/F-Secure.xml b/src/chrome/content/rules/F-Secure.xml
index fc48e4883c37..fb4be2659bb1 100644
--- a/src/chrome/content/rules/F-Secure.xml
+++ b/src/chrome/content/rules/F-Secure.xml
@@ -80,7 +80,7 @@ Fetch error: http://trial.f-secure.com/ => https://trial.f-secure.com/: (6, 'Cou
 	² Unsecurable
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/F35.com.xml b/src/chrome/content/rules/F35.com.xml
deleted file mode 100644
index f0fe1ef30ed0..000000000000
--- a/src/chrome/content/rules/F35.com.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/FAZ-mismatches.xml b/src/chrome/content/rules/FAZ-mismatches.xml
deleted file mode 100644
index 6073b91c9617..000000000000
--- a/src/chrome/content/rules/FAZ-mismatches.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/FAZ.xml b/src/chrome/content/rules/FAZ.xml
index 3833ec8dcc99..502c6e4cdef0 100644
--- a/src/chrome/content/rules/FAZ.xml
+++ b/src/chrome/content/rules/FAZ.xml
@@ -1,76 +1,66 @@
 
+
 
-	Self-signed:
-		- 50plus.faz.net
-		- literaturkalender.faz.net
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
-	Timeout:
-		- financeforum.fazjob.net
-		- immobilien.faz.net
+	
+	
 
-	Timeout at HTTP Port 80:
-		- filebox.faz.de
--->
-
-	
-	
-	
-	
-	
-	
-	
+	
+	
+	
+	
 
-	
+	
+	
 
-	
-
-	
+	
 
 	
@@ -78,6 +68,11 @@
 	
 
-	
+	
+	
+
+	
+
 
diff --git a/src/chrome/content/rules/FBINAA.org.xml b/src/chrome/content/rules/FBINAA.org.xml
new file mode 100644
index 000000000000..f3589de55ebc
--- /dev/null
+++ b/src/chrome/content/rules/FBINAA.org.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/FC2.com.xml b/src/chrome/content/rules/FC2.com.xml
index 9ecef54875f1..87242a2bf3ee 100644
--- a/src/chrome/content/rules/FC2.com.xml
+++ b/src/chrome/content/rules/FC2.com.xml
@@ -24,7 +24,11 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
 
 
 	
@@ -32,7 +36,6 @@
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/FCA.org.uk.xml b/src/chrome/content/rules/FCA.org.uk.xml
index 2d40d81505c7..07061375ad04 100644
--- a/src/chrome/content/rules/FCA.org.uk.xml
+++ b/src/chrome/content/rules/FCA.org.uk.xml
@@ -1,26 +1,29 @@
-
 
 
 	
-	
+	
 	
-	
+	
 	
 	
 	
-	
 	
 
 
diff --git a/src/chrome/content/rules/FCBarcelonaClan.com.xml b/src/chrome/content/rules/FCBarcelonaClan.com.xml
new file mode 100644
index 000000000000..4af995b9de6b
--- /dev/null
+++ b/src/chrome/content/rules/FCBarcelonaClan.com.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/FCPA-Blog.xml b/src/chrome/content/rules/FCPA-Blog.xml
index 90c0701da42d..b1ba61eb294a 100644
--- a/src/chrome/content/rules/FCPA-Blog.xml
+++ b/src/chrome/content/rules/FCPA-Blog.xml
@@ -12,7 +12,7 @@ Fetch error: http://fcpablog.com/ => https://fcpablog.squarespace.com/: Too many
 Fetch error: http://www.fcpablog.com/ => https://fcpablog.squarespace.com/: Too many redirects while fetching 'https://fcpablog.squarespace.com/'
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/FF7.fr.xml b/src/chrome/content/rules/FF7.fr.xml
new file mode 100644
index 000000000000..e987f4ef6342
--- /dev/null
+++ b/src/chrome/content/rules/FF7.fr.xml
@@ -0,0 +1,23 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/FFSG.org.xml b/src/chrome/content/rules/FFSG.org.xml
index 1c13b7931049..58f75eae8b82 100644
--- a/src/chrome/content/rules/FFSG.org.xml
+++ b/src/chrome/content/rules/FFSG.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.ffsg.org/ => https://www.ffsg.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.ffsg.org'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/FHEM.de.xml b/src/chrome/content/rules/FHEM.de.xml
new file mode 100644
index 000000000000..e4f8e9da1893
--- /dev/null
+++ b/src/chrome/content/rules/FHEM.de.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/FIGUE.com.xml b/src/chrome/content/rules/FIGUE.com.xml
index 8da7fe50edb6..4e8c23fef9a9 100644
--- a/src/chrome/content/rules/FIGUE.com.xml
+++ b/src/chrome/content/rules/FIGUE.com.xml
@@ -18,7 +18,8 @@
 
 
 	
-	
+	
+	
 		
 		
 
@@ -29,4 +30,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/FINANZEN.NET.xml b/src/chrome/content/rules/FINANZEN.NET.xml
new file mode 100644
index 000000000000..5e611a90950a
--- /dev/null
+++ b/src/chrome/content/rules/FINANZEN.NET.xml
@@ -0,0 +1,76 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/FKFeV.de.xml b/src/chrome/content/rules/FKFeV.de.xml
new file mode 100644
index 000000000000..9f9461884f3d
--- /dev/null
+++ b/src/chrome/content/rules/FKFeV.de.xml
@@ -0,0 +1,16 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/FLIF.info.xml b/src/chrome/content/rules/FLIF.info.xml
new file mode 100644
index 000000000000..23582be18493
--- /dev/null
+++ b/src/chrome/content/rules/FLIF.info.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/FLOSS-Shop.de.xml b/src/chrome/content/rules/FLOSS-Shop.de.xml
index f587776330c3..beae6f2a200f 100644
--- a/src/chrome/content/rules/FLOSS-Shop.de.xml
+++ b/src/chrome/content/rules/FLOSS-Shop.de.xml
@@ -10,6 +10,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/FLonline.eu.xml b/src/chrome/content/rules/FLonline.eu.xml
deleted file mode 100644
index 779d3465cf5c..000000000000
--- a/src/chrome/content/rules/FLonline.eu.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/FMSA.de.xml b/src/chrome/content/rules/FMSA.de.xml
new file mode 100644
index 000000000000..8d381d0c7dd3
--- /dev/null
+++ b/src/chrome/content/rules/FMSA.de.xml
@@ -0,0 +1,23 @@
+
+
+	
+
+	
+	
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/FMyLife.com.xml b/src/chrome/content/rules/FMyLife.com.xml
index e46978e8c9f7..16e9f8d39f53 100644
--- a/src/chrome/content/rules/FMyLife.com.xml
+++ b/src/chrome/content/rules/FMyLife.com.xml
@@ -1,30 +1,19 @@
 
-
+
 
 	
 	
@@ -42,4 +31,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/FN_Mag.co-falsemixed.xml b/src/chrome/content/rules/FN_Mag.co-falsemixed.xml
index a2eb9ce157a5..62f3dc93e3ec 100644
--- a/src/chrome/content/rules/FN_Mag.co-falsemixed.xml
+++ b/src/chrome/content/rules/FN_Mag.co-falsemixed.xml
@@ -9,7 +9,7 @@ Fetch error: http://fnmag.co/ => https://fnmag.co/: (35, 'error:140770FC:SSL rou
 	For rules not causing false/broken mixed content, see FN_Mag.co.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/FN_Mag.co.xml b/src/chrome/content/rules/FN_Mag.co.xml
deleted file mode 100644
index 089e232d847e..000000000000
--- a/src/chrome/content/rules/FN_Mag.co.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/FOM_Networks.com.xml b/src/chrome/content/rules/FOM_Networks.com.xml
index 918281d1acb9..ecbaf5c460bf 100644
--- a/src/chrome/content/rules/FOM_Networks.com.xml
+++ b/src/chrome/content/rules/FOM_Networks.com.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/FOSSBazaar.org.xml b/src/chrome/content/rules/FOSSBazaar.org.xml
index cecf0ca71acd..0d5af7a9a16c 100644
--- a/src/chrome/content/rules/FOSSBazaar.org.xml
+++ b/src/chrome/content/rules/FOSSBazaar.org.xml
@@ -11,7 +11,7 @@
 		
 
 
-	
+	
 
 
 	
-
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/FP_Complete.com.xml b/src/chrome/content/rules/FP_Complete.com.xml
index 69ab5ed12585..601cd7eb0e3b 100644
--- a/src/chrome/content/rules/FP_Complete.com.xml
+++ b/src/chrome/content/rules/FP_Complete.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://haskell.fpcomplete.com/ => https://haskell.fpcomplete.com/:
 		- www.fpcomplete.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/FR.de.xml b/src/chrome/content/rules/FR.de.xml
new file mode 100644
index 000000000000..a90c3836f974
--- /dev/null
+++ b/src/chrome/content/rules/FR.de.xml
@@ -0,0 +1,50 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/FRA_LLC.com.xml b/src/chrome/content/rules/FRA_LLC.com.xml
deleted file mode 100644
index 2289256cd083..000000000000
--- a/src/chrome/content/rules/FRA_LLC.com.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-	
-	
-	
-
-		
-		
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/FREECULTR.xml b/src/chrome/content/rules/FREECULTR.xml
index 91367ba8afe2..7edfa26377ff 100644
--- a/src/chrome/content/rules/FREECULTR.xml
+++ b/src/chrome/content/rules/FREECULTR.xml
@@ -15,10 +15,11 @@ Fetch error: http://freecultr.com/ => https://www.freecultr.com/: (7, 'Failed to
 		- static
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/FRUCT.org.xml b/src/chrome/content/rules/FRUCT.org.xml
index aca31bdba840..6c8b9dc92772 100644
--- a/src/chrome/content/rules/FRUCT.org.xml
+++ b/src/chrome/content/rules/FRUCT.org.xml
@@ -6,7 +6,7 @@
 		- (www.)?md ¹
 		- (www.)?rusmart ¹
 		- vyatka.yar ¹
-		
+
 	¹ Shows another domain
 	² Refused
 
@@ -38,7 +38,7 @@
 		- css on social from $self
 
 		- Images, on:
-		
+
 			- (www.)?, (www.)?forum from ssl.gstatic.com *
 			- (www.)?forum from ^fruct.org *
 			- social from $self
diff --git a/src/chrome/content/rules/FSF.xml b/src/chrome/content/rules/FSF.xml
index a59f8fe52c99..a0fad3c6b320 100644
--- a/src/chrome/content/rules/FSF.xml
+++ b/src/chrome/content/rules/FSF.xml
@@ -8,101 +8,46 @@
 
 	Nonfunctional domains:
 
-		- amt.fsf.org ¹
-		- mirror.fsf.org ¹
-		- shop.fsf.org		(redirects to http):
-		- specialk.nongnu.org	(dropped)
-
-	¹ Dropped	
-
-
-	Fully covered domains:
-
-		- fsf.org subdomains:
-
-			- (www.)?
-			- cas
-			- crm
-			- directory
-			- donate		(→ my.fsf.org)
-			- emailselfdefense
-			- my
-			- patron		(→ www.fsf.org)
-			- piwik
-			- static
-			- status
-			- u
-
-		- bugs.gnewsense.org	(→ savannah.nongnu.org)
-
-		- in *nongnu.org:
-
-			- lists
-			- savannah
-
-
-	Mixed content:
-
-		- Image on directory from static *
-
-	* Secured by us
-
+		- specialk.nongnu.org (m)
+		- bugs.gnewsense.org (m)
+
+	h: http redirect
+	m: certificate mismatch
+	r: connection refused
+	s: self-signed certificate
+	t: timeout on https
 -->
 
 
 	
 	
+	
 	
 	
 	
+	
 	
 	
+	
+	
 	
 	
 	
 	
 	
-	
 
-        
-        
+	
+	
+	
+	
+	
 
 	
-	
-	
-
 	
 
 
-		
-		
-
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-
-		
-
-
 	
 	
@@ -114,19 +59,6 @@
 		-->
 	
 
-
-	
-	
-
-	
-	
-
 	
 	
 
-        
+	
 
 
diff --git a/src/chrome/content/rules/FSFE.org.xml b/src/chrome/content/rules/FSFE.org.xml
index d65bd1c8672a..c4e09a15d9ad 100644
--- a/src/chrome/content/rules/FSFE.org.xml
+++ b/src/chrome/content/rules/FSFE.org.xml
@@ -30,7 +30,7 @@ Fetch error: http://vote.fsfe.org/ => https://vote.fsfe.org/: (60, 'SSL certific
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/FSFEurope.org.xml b/src/chrome/content/rules/FSFEurope.org.xml
index f5ff47415118..5b34efa0785e 100644
--- a/src/chrome/content/rules/FSFEurope.org.xml
+++ b/src/chrome/content/rules/FSFEurope.org.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.fsfeurope.org/ => https://www.fsfeurope.org/: (51, "SSL:
 	For other Free Software Foundation Europe coverage, see FSFE.org.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/FSU.edu.xml b/src/chrome/content/rules/FSU.edu.xml
index 959e8f434ce0..ce6852694f96 100644
--- a/src/chrome/content/rules/FSU.edu.xml
+++ b/src/chrome/content/rules/FSU.edu.xml
@@ -73,7 +73,22 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
+
+
+	
+	
+	
+
+	
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/FTL_Game.com.xml b/src/chrome/content/rules/FTL_Game.com.xml
index 6b81910c41b0..409d39889208 100644
--- a/src/chrome/content/rules/FTL_Game.com.xml
+++ b/src/chrome/content/rules/FTL_Game.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://ftlgame.com/ => https://ftlgame.com/: (7, 'Failed to connect
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/FX_Prime.com.xml b/src/chrome/content/rules/FX_Prime.com.xml
index 99debfdce9ad..195f84ab5e94 100644
--- a/src/chrome/content/rules/FX_Prime.com.xml
+++ b/src/chrome/content/rules/FX_Prime.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://mirror.fxprime.com/ => https://mirror.fxprime.com/: (28, 'Co
 		- mirror
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/FX_Systems.xml b/src/chrome/content/rules/FX_Systems.xml
index eae3af51ccff..85876225651e 100644
--- a/src/chrome/content/rules/FX_Systems.xml
+++ b/src/chrome/content/rules/FX_Systems.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.fxsystems.com/ => https://www.fxsystems.com/: (7, 'Faile
 Disabled by https-everywhere-checker because:
 Fetch error: http://fxsystems.com/ => https://fxsystems.com/: (51, "SSL: no alternative certificate subject name matches target host name 'fxsystems.com'")
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://fxsystems.com/ => https://fxsystems.com/: (51, "SSL: no alte
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/FabLab_Tacoma.xml b/src/chrome/content/rules/FabLab_Tacoma.xml
index 89dd26d9c26f..6ac372b63d84 100644
--- a/src/chrome/content/rules/FabLab_Tacoma.xml
+++ b/src/chrome/content/rules/FabLab_Tacoma.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Fabricatorz.xml b/src/chrome/content/rules/Fabricatorz.xml
index e31692cc5453..57de986c9bc4 100644
--- a/src/chrome/content/rules/Fabricatorz.xml
+++ b/src/chrome/content/rules/Fabricatorz.xml
@@ -8,10 +8,11 @@ Fetch error: http://fabricatorz.com/ => https://fabricatorz.com/: (51, "SSL: no
 		- ^	(mismatched)
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Facebook.xml b/src/chrome/content/rules/Facebook.xml
index 24793601c7f3..36a86a53828e 100644
--- a/src/chrome/content/rules/Facebook.xml
+++ b/src/chrome/content/rules/Facebook.xml
@@ -6,7 +6,6 @@
 		- Fb.com.xml
 		- Messenger.com.xml
 		- PrivateCore.com.xml
-		- FacebookCoreWWWi.onion.xml
 
 
 	CDN buckets:
diff --git a/src/chrome/content/rules/FacebookCoreWWWi.onion.xml b/src/chrome/content/rules/FacebookCoreWWWi.onion.xml
index 27e62a7d2f5c..e9b74393eeb5 100644
--- a/src/chrome/content/rules/FacebookCoreWWWi.onion.xml
+++ b/src/chrome/content/rules/FacebookCoreWWWi.onion.xml
@@ -1,10 +1,10 @@
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Facebook_Studio.xml b/src/chrome/content/rules/Facebook_Studio.xml
index f7f27a2e0673..4d3d3458eab9 100644
--- a/src/chrome/content/rules/Facebook_Studio.xml
+++ b/src/chrome/content/rules/Facebook_Studio.xml
@@ -11,7 +11,7 @@ Fetch error: http://facebook-studio.com/ => https://www.facebook-studio.com/: (5
 	 ^facebook-studio.com: Cert only matches *.facebook-studio.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Facebook_ccTLDs.xml b/src/chrome/content/rules/Facebook_ccTLDs.xml
index 821813ffa647..892e13b578aa 100644
--- a/src/chrome/content/rules/Facebook_ccTLDs.xml
+++ b/src/chrome/content/rules/Facebook_ccTLDs.xml
@@ -75,7 +75,7 @@
 		        -->
         
-	
+
 	
 	 https://wiki.facepunch.com/: (28, 'Co
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Facetz.net.xml b/src/chrome/content/rules/Facetz.net.xml
deleted file mode 100644
index 7ec9ca9afab8..000000000000
--- a/src/chrome/content/rules/Facetz.net.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/FactWire.org.xml b/src/chrome/content/rules/FactWire.org.xml
new file mode 100644
index 000000000000..bead08b9510d
--- /dev/null
+++ b/src/chrome/content/rules/FactWire.org.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Factiva.com.xml b/src/chrome/content/rules/Factiva.com.xml
new file mode 100644
index 000000000000..c9a1bba42b15
--- /dev/null
+++ b/src/chrome/content/rules/Factiva.com.xml
@@ -0,0 +1,30 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Factorable.net.xml b/src/chrome/content/rules/Factorable.net.xml
index 954307a9cfb3..28dc86ffa514 100644
--- a/src/chrome/content/rules/Factorable.net.xml
+++ b/src/chrome/content/rules/Factorable.net.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Factory_Expo_Home_Centers.xml b/src/chrome/content/rules/Factory_Expo_Home_Centers.xml
index d8f1a4663632..d8f29d2e7207 100644
--- a/src/chrome/content/rules/Factory_Expo_Home_Centers.xml
+++ b/src/chrome/content/rules/Factory_Expo_Home_Centers.xml
@@ -3,46 +3,42 @@
 
 		- Park_Models_Direct.xml
 
-
 	Nonfunctional domains:
+		SSL errors:
+		- prestigehomes.com
+		- www.prestigehomes.com
 
-		- (www.)prestigehomes.com	(502)
-
+		Mismatched:
+		- factorydirectcabins.com
+		- www.factorydirectcabins.com
 -->
 
 
 	
-	
+	
 	
 	
 	
-	
+	
 	
-	
-	
-	
+	
 	
-	
+	
 	
-	
+	
 	
-	
+	
 	
 	
 	
-	
+	
 	
-	
-
+	
 
-	
-	
 
+	
 
-	
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Fail2ban.org.xml b/src/chrome/content/rules/Fail2ban.org.xml
index 73c64973a6bc..fc1736d5d4af 100644
--- a/src/chrome/content/rules/Fail2ban.org.xml
+++ b/src/chrome/content/rules/Fail2ban.org.xml
@@ -1,4 +1,5 @@
 
+	
 	
 
 	
diff --git a/src/chrome/content/rules/Failure-Magazine.xml b/src/chrome/content/rules/Failure-Magazine.xml
index 703c276d9179..180efae4bd4e 100644
--- a/src/chrome/content/rules/Failure-Magazine.xml
+++ b/src/chrome/content/rules/Failure-Magazine.xml
@@ -3,9 +3,10 @@
 	
 	
 	
-	
+	
+	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/FairSSL.se.xml b/src/chrome/content/rules/FairSSL.se.xml
deleted file mode 100644
index a02577310e67..000000000000
--- a/src/chrome/content/rules/FairSSL.se.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/FairWorkCommission.xml b/src/chrome/content/rules/FairWorkCommission.xml
index a6c2cbcc3d1d..323456b50387 100644
--- a/src/chrome/content/rules/FairWorkCommission.xml
+++ b/src/chrome/content/rules/FairWorkCommission.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/FairWorkOmbudsman.xml b/src/chrome/content/rules/FairWorkOmbudsman.xml
index 1b8ebd42fed8..896452500b63 100644
--- a/src/chrome/content/rules/FairWorkOmbudsman.xml
+++ b/src/chrome/content/rules/FairWorkOmbudsman.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Fairfax-Digital.xml b/src/chrome/content/rules/Fairfax-Digital.xml
index c0e89257af9c..2abceeb90c5d 100644
--- a/src/chrome/content/rules/Fairfax-Digital.xml
+++ b/src/chrome/content/rules/Fairfax-Digital.xml
@@ -50,7 +50,7 @@ Fetch error: http://ads.afraccess.com/ => https://ads.afraccess.com/: (28, 'Conn
 		- (www.)theage.com.au			(ditto)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Fairfax_Public_Access.xml b/src/chrome/content/rules/Fairfax_Public_Access.xml
index 98efea1b82d0..23e35c45f3fa 100644
--- a/src/chrome/content/rules/Fairfax_Public_Access.xml
+++ b/src/chrome/content/rules/Fairfax_Public_Access.xml
@@ -8,7 +8,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/FaithBooks.co.uk.xml b/src/chrome/content/rules/FaithBooks.co.uk.xml
new file mode 100644
index 000000000000..e0800f288db0
--- /dev/null
+++ b/src/chrome/content/rules/FaithBooks.co.uk.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Fakturownia.xml b/src/chrome/content/rules/Fakturownia.xml
index 8b31082b20a0..bea5cd3f838d 100644
--- a/src/chrome/content/rules/Fakturownia.xml
+++ b/src/chrome/content/rules/Fakturownia.xml
@@ -27,4 +27,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Falcon-UAV.com.xml b/src/chrome/content/rules/Falcon-UAV.com.xml
index 80a0a71fe919..80fd345abec8 100644
--- a/src/chrome/content/rules/Falcon-UAV.com.xml
+++ b/src/chrome/content/rules/Falcon-UAV.com.xml
@@ -1,7 +1,7 @@
 
 
 
diff --git a/src/chrome/content/rules/Familie-redlich.xml b/src/chrome/content/rules/Familie-redlich.xml
index ce64ca449cea..e36b17212a49 100644
--- a/src/chrome/content/rules/Familie-redlich.xml
+++ b/src/chrome/content/rules/Familie-redlich.xml
@@ -3,7 +3,9 @@
 	
 	
-	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Family-Christian-Stores.xml b/src/chrome/content/rules/Family-Christian-Stores.xml
index c2937d3dd2f3..66fb1a375d69 100644
--- a/src/chrome/content/rules/Family-Christian-Stores.xml
+++ b/src/chrome/content/rules/Family-Christian-Stores.xml
@@ -6,7 +6,7 @@ Fetch error: http://media.familychristian.com/ => https://media.familychristian.
 Fetch error: http://www.familychristian.com/ => https://www.familychristian.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/FamilySearch.org.xml b/src/chrome/content/rules/FamilySearch.org.xml
index 5b3a9bb57cc3..fe54104f20f4 100644
--- a/src/chrome/content/rules/FamilySearch.org.xml
+++ b/src/chrome/content/rules/FamilySearch.org.xml
@@ -30,7 +30,7 @@ Fetch error: http://ident.familysearch.org/ => https://ident.familysearch.org/:
 		- indexing.familysearch.org
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/FamousFolks.ca.xml b/src/chrome/content/rules/FamousFolks.ca.xml
new file mode 100644
index 000000000000..d4d7c633ba77
--- /dev/null
+++ b/src/chrome/content/rules/FamousFolks.ca.xml
@@ -0,0 +1,38 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Fan.tv.xml b/src/chrome/content/rules/Fan.tv.xml
deleted file mode 100644
index 000a73bb8b4f..000000000000
--- a/src/chrome/content/rules/Fan.tv.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Fanatics.xml b/src/chrome/content/rules/Fanatics.xml
index a3b1c838da65..b33faa449937 100644
--- a/src/chrome/content/rules/Fanatics.xml
+++ b/src/chrome/content/rules/Fanatics.xml
@@ -7,7 +7,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -22,4 +23,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Fanboy.xml b/src/chrome/content/rules/Fanboy.xml
index 0a03e83afe3f..fa9c51700982 100644
--- a/src/chrome/content/rules/Fanboy.xml
+++ b/src/chrome/content/rules/Fanboy.xml
@@ -23,7 +23,7 @@ Fetch error: http://forums.fanboy.co.nz/ => https://forums.fanboy.co.nz/: (6, 'C
 		- .fanboy.co.nz
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Fandago.xml b/src/chrome/content/rules/Fandago.xml
index 532d16d24951..7636a3cabb72 100644
--- a/src/chrome/content/rules/Fandago.xml
+++ b/src/chrome/content/rules/Fandago.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://fandago.com/ => https://fandago.com/: Redirect for 'http://famdengo.com' missing Location
 Fetch error: http://www.fandago.com/ => https://www.fandago.com/: Redirect for 'http://famdengo.com' missing Location
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Fandango.xml b/src/chrome/content/rules/Fandango.xml
index ca16295aca58..df6517881c23 100644
--- a/src/chrome/content/rules/Fandango.xml
+++ b/src/chrome/content/rules/Fandango.xml
@@ -9,7 +9,7 @@ Fetch error: http://statf.com/ => https://a248.e.akamai.net/f/248/9057/1d/conten
 	For other Comcast coverage, see Comcast.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Fanhattan.com.xml b/src/chrome/content/rules/Fanhattan.com.xml
deleted file mode 100644
index 4374470bfc3c..000000000000
--- a/src/chrome/content/rules/Fanhattan.com.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Fanli.com.xml b/src/chrome/content/rules/Fanli.com.xml
index 4d38f4d57300..bc81b82cc47d 100644
--- a/src/chrome/content/rules/Fanli.com.xml
+++ b/src/chrome/content/rules/Fanli.com.xml
@@ -2,47 +2,32 @@
 	Other Fanli rulesets:
 		- 51fanli.net.xml
 
+	CI test error:
+		ubt[0-9].fanli.com
+
 	MCB:
-		- (www.)?
-		- 9
-		- f
-		- fun	( test: https://fun.fanli.com/topheader/www.51fanli.com )
-		- gongyi
-		- help
-		- huodong
-		- passport
-		- super
-		- taobao
-		- travel
-		- xiaozu
-		- zhide
+		gongyi.fanli.com
 -->
-
 
-
-	
-		
-		
-		
-
-		
-		
-
+	
+	
+	
 	
 		
+	
+	
+		
 	
+	
+	
+		
 	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
+	
+	
+	
+	
+	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Fanoe.dk.xml b/src/chrome/content/rules/Fanoe.dk.xml
index b95d31040eb2..f9e7012364dc 100644
--- a/src/chrome/content/rules/Fanoe.dk.xml
+++ b/src/chrome/content/rules/Fanoe.dk.xml
@@ -5,7 +5,7 @@ Fetch error: http://fanoe.dk/ => https://fanoe.dk/: (51, "SSL: no alternative ce
 Fetch error: http://www.fanoe.dk/ => https://www.fanoe.dk/: (51, "SSL: no alternative certificate subject name matches target host name 'www.fanoe.dk'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Fantia.jp.xml b/src/chrome/content/rules/Fantia.jp.xml
new file mode 100644
index 000000000000..bca9933d0675
--- /dev/null
+++ b/src/chrome/content/rules/Fantia.jp.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Fark.xml b/src/chrome/content/rules/Fark.xml
index a2d71f99a7e5..8b2fd04b7fa9 100644
--- a/src/chrome/content/rules/Fark.xml
+++ b/src/chrome/content/rules/Fark.xml
@@ -1,85 +1,29 @@
 
-
+
 
+	
 	
+	
 	
+	
 	
-	
-	
-	
+	
 	
-	
 	
 	
-	
-	
-	
+	
+	
 
+	
 	
-	
-
-		
-		
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-			
-			
-			
-			
-
-		
-
-
-	
-	
-	
 
+	
 
 	
diff --git a/src/chrome/content/rules/Faround.net.xml b/src/chrome/content/rules/Faround.net.xml
index b0ae94e82049..ae67b3b41a6c 100644
--- a/src/chrome/content/rules/Faround.net.xml
+++ b/src/chrome/content/rules/Faround.net.xml
@@ -21,10 +21,10 @@ Non-2xx HTTP code: http://faround.net/ (200) => https://www.faround.net/ (403)
 	* Secured by us
 
 -->
-
+
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Fashion_Dip.xml b/src/chrome/content/rules/Fashion_Dip.xml
deleted file mode 100644
index 4bbd997f3606..000000000000
--- a/src/chrome/content/rules/Fashion_Dip.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Fass.se.xml b/src/chrome/content/rules/Fass.se.xml
index 49cb53f41a4c..234c7f529cda 100644
--- a/src/chrome/content/rules/Fass.se.xml
+++ b/src/chrome/content/rules/Fass.se.xml
@@ -1,8 +1,19 @@
-
+
 
 	
 	
-	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
-
diff --git a/src/chrome/content/rules/Fast-Company.xml b/src/chrome/content/rules/Fast-Company.xml
index 6219e48d863d..716a11dcbf9f 100644
--- a/src/chrome/content/rules/Fast-Company.xml
+++ b/src/chrome/content/rules/Fast-Company.xml
@@ -1,8 +1,12 @@
+
 
-	
+	
 	
 	
 
diff --git a/src/chrome/content/rules/Fast-Web-Media.xml b/src/chrome/content/rules/Fast-Web-Media.xml
index 2246405607d8..85c0b452b10d 100644
--- a/src/chrome/content/rules/Fast-Web-Media.xml
+++ b/src/chrome/content/rules/Fast-Web-Media.xml
@@ -16,7 +16,7 @@ Fetch error: http://fwmapps.co.uk/ => https://fwmapps.co.uk/: (6, 'Could not res
 		- (www.)fastwebmedia.gr
 
 -->
-
+
 
 	
 	
@@ -35,4 +35,4 @@ Fetch error: http://fwmapps.co.uk/ => https://fwmapps.co.uk/: (6, 'Could not res
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Fast.com.xml b/src/chrome/content/rules/Fast.com.xml
new file mode 100644
index 000000000000..2cb97446b85b
--- /dev/null
+++ b/src/chrome/content/rules/Fast.com.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/FastSpring-mismatches.xml b/src/chrome/content/rules/FastSpring-mismatches.xml
deleted file mode 100644
index 2c934c5a094e..000000000000
--- a/src/chrome/content/rules/FastSpring-mismatches.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/FastSpring.com.xml b/src/chrome/content/rules/FastSpring.com.xml
new file mode 100644
index 000000000000..b1728f528f09
--- /dev/null
+++ b/src/chrome/content/rules/FastSpring.com.xml
@@ -0,0 +1,21 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/FastSpring.xml b/src/chrome/content/rules/FastSpring.xml
deleted file mode 100644
index ae252af5e6ee..000000000000
--- a/src/chrome/content/rules/FastSpring.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-	
-
-
-	
-	
-
-
-	
-
-		
-
-	
-
-
diff --git a/src/chrome/content/rules/Fast_Company.net.xml b/src/chrome/content/rules/Fast_Company.net.xml
deleted file mode 100644
index 9d9dadbbfe23..000000000000
--- a/src/chrome/content/rules/Fast_Company.net.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-		
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Fast_and_the_Furious.xml b/src/chrome/content/rules/Fast_and_the_Furious.xml
index fa18e2436742..b929c478be38 100644
--- a/src/chrome/content/rules/Fast_and_the_Furious.xml
+++ b/src/chrome/content/rules/Fast_and_the_Furious.xml
@@ -16,4 +16,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Fasthosts.xml b/src/chrome/content/rules/Fasthosts.xml
index 992f87023db2..da0e625654c3 100644
--- a/src/chrome/content/rules/Fasthosts.xml
+++ b/src/chrome/content/rules/Fasthosts.xml
@@ -10,37 +10,49 @@
 
 	
 	
+		
+		
+		
 	
 	
 	
 
-
 	
 	
 
+	
-	
+
+		
+	-->
 
 	
 	
 
-	
-
-	
+		
+		
+		
+		
+		
+		
+		
 
 	
 	
 
+	
 
diff --git a/src/chrome/content/rules/Fastly.net.xml b/src/chrome/content/rules/Fastly.net.xml
index 154a43ad3f5c..424ea23daa27 100644
--- a/src/chrome/content/rules/Fastly.net.xml
+++ b/src/chrome/content/rules/Fastly.net.xml
@@ -32,7 +32,7 @@
 		
 		
 		
-		
+
 		
 		
 		
 
-
-	
-	
-	
-	
-	
-
 	
+	
 	
-	
 	
-	
+	
 
+	
+	
 
-	
-	
+	
+	
+	
+	
 
-	
+	
 
-	
+	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/FatCow-Web-Hosting.xml b/src/chrome/content/rules/FatCow-Web-Hosting.xml
index df98f3304703..3221fe577fd9 100644
--- a/src/chrome/content/rules/FatCow-Web-Hosting.xml
+++ b/src/chrome/content/rules/FatCow-Web-Hosting.xml
@@ -3,7 +3,7 @@
 	
 	
 
-	
+	
 
 	
 	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/FaxCritics.xml b/src/chrome/content/rules/FaxCritics.xml
deleted file mode 100644
index ff3732b4f81c..000000000000
--- a/src/chrome/content/rules/FaxCritics.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Fax_Robot.com.xml b/src/chrome/content/rules/Fax_Robot.com.xml
index 0e38234922b8..2787141a2c6f 100644
--- a/src/chrome/content/rules/Fax_Robot.com.xml
+++ b/src/chrome/content/rules/Fax_Robot.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.faxrobot.com/ => https://www.faxrobot.com/: (28, 'Operat
 		- .faxrobot.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Fazekas.xml b/src/chrome/content/rules/Fazekas.xml
index 31dcdfcf1976..c00fef9a1c5c 100644
--- a/src/chrome/content/rules/Fazekas.xml
+++ b/src/chrome/content/rules/Fazekas.xml
@@ -5,7 +5,7 @@ Fetch error: http://fazekas.hu/ => https://fazekas.hu/: Too many redirects while
 Fetch error: http://www.fazekas.hu/ => https://fazekas.hu/: Too many redirects while fetching 'https://fazekas.hu/'
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Fb.com.xml b/src/chrome/content/rules/Fb.com.xml
index 946b630e0dc0..fd76cd32d114 100644
--- a/src/chrome/content/rules/Fb.com.xml
+++ b/src/chrome/content/rules/Fb.com.xml
@@ -5,7 +5,7 @@
 	Nonfunctional hosts in *fb.com:
 
 		investor *
-		
+
 	* 504, valid cert
 
 -->
diff --git a/src/chrome/content/rules/Fbk.info.xml b/src/chrome/content/rules/Fbk.info.xml
index 3dc08b07f0ae..1f62ff20a383 100644
--- a/src/chrome/content/rules/Fbk.info.xml
+++ b/src/chrome/content/rules/Fbk.info.xml
@@ -25,6 +25,6 @@ www.fbk.info ⁴
 	
 
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/FeatherCoin.xml b/src/chrome/content/rules/FeatherCoin.xml
index f2431319b50c..3aeb2b624333 100644
--- a/src/chrome/content/rules/FeatherCoin.xml
+++ b/src/chrome/content/rules/FeatherCoin.xml
@@ -14,4 +14,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/FedEx.com-problematic.xml b/src/chrome/content/rules/FedEx.com-problematic.xml
deleted file mode 100644
index 72bab2eaac30..000000000000
--- a/src/chrome/content/rules/FedEx.com-problematic.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/FedEx.com.xml b/src/chrome/content/rules/FedEx.com.xml
index 343e2568a94c..79d9afe2500a 100644
--- a/src/chrome/content/rules/FedEx.com.xml
+++ b/src/chrome/content/rules/FedEx.com.xml
@@ -1,64 +1,47 @@
 
 
-
 	
-	
-		
-		
-
-
-	
-
-
-	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+
+	
 
-	
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/Federal-Communications-Commission.xml b/src/chrome/content/rules/Federal-Communications-Commission.xml
index 82995a10a032..0d5949fcee67 100644
--- a/src/chrome/content/rules/Federal-Communications-Commission.xml
+++ b/src/chrome/content/rules/Federal-Communications-Commission.xml
@@ -17,6 +17,7 @@
 		- transition (404 on http://transition.fcc.gov/Daily_Releases/Daily_Digest/2015/dd2015.html)
 		- apps (404, expired)
 		- fjallfoss (404)
+    - stations (unresolved)
 
 	* Times out
 
@@ -34,7 +35,6 @@
 	
 	
 	
-	
 	
 	
 
@@ -43,16 +43,10 @@
 	
 	
 
-		
-
-			
-			
-
-			
-			
+		
 
 		
-		
-		
 
-			
-			
-			
+			
+			
+
+			This used to 404:
 
-		
 		
 
 
@@ -88,12 +76,11 @@
 	
 
-	
+		Redirects like so:
 	
 
-	
-
-
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Federal_Reserve.xml b/src/chrome/content/rules/Federal_Reserve.xml
deleted file mode 100644
index 751d19446882..000000000000
--- a/src/chrome/content/rules/Federal_Reserve.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-		
-		
-		
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Federated-Investors.xml b/src/chrome/content/rules/Federated-Investors.xml
index ce7f29fc6168..f615eac6bb11 100644
--- a/src/chrome/content/rules/Federated-Investors.xml
+++ b/src/chrome/content/rules/Federated-Investors.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.federatedinvestors.com/ => https://www.federatedinvestor
 Disabled by https-everywhere-checker because:
 Fetch error: http://federatedinvestors.com/ => https://federatedinvestors.com/: (51, "SSL: no alternative certificate subject name matches target host name 'federatedinvestors.com'")
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Federated-Media-Publishing.xml b/src/chrome/content/rules/Federated-Media-Publishing.xml
index 3a01343e96a0..0eab2409af53 100644
--- a/src/chrome/content/rules/Federated-Media-Publishing.xml
+++ b/src/chrome/content/rules/Federated-Media-Publishing.xml
@@ -12,26 +12,27 @@ Fetch error: http://www.federatedmedia.net/ => https://www.federatedmedia.net/:
 		- cm.cdn.fm
 
 -->
-
+
 
 	
 	
-	
+	
+	
+	
+	
+	
 
 
 	
 	
 
 
-	
 
 	
-	
 
 	
 	
 
+	
 
diff --git a/src/chrome/content/rules/Federation-of-American-Scientists.xml b/src/chrome/content/rules/Federation-of-American-Scientists.xml
index 06d5ce6a0b84..6186e0f3c990 100644
--- a/src/chrome/content/rules/Federation-of-American-Scientists.xml
+++ b/src/chrome/content/rules/Federation-of-American-Scientists.xml
@@ -11,7 +11,7 @@ Fetch error: http://members.fas.org/ => https://members.fas.org/: (6, 'Could not
 		- .fas.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Federation-of-Small-Businesses.xml b/src/chrome/content/rules/Federation-of-Small-Businesses.xml
index 0f05e2b0d2cb..b80e846770e6 100644
--- a/src/chrome/content/rules/Federation-of-Small-Businesses.xml
+++ b/src/chrome/content/rules/Federation-of-Small-Businesses.xml
@@ -11,7 +11,8 @@ Fetch error: http://fsb.org.uk/ => http://fsb.org.uk/: (28, 'Connection timed ou
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Fedora_Project.org.xml b/src/chrome/content/rules/Fedora_Project.org.xml
deleted file mode 100644
index 6e24633f6075..000000000000
--- a/src/chrome/content/rules/Fedora_Project.org.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-		
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Fedorainfracloud.org.xml b/src/chrome/content/rules/Fedorainfracloud.org.xml
index 1a7fcc30cb8f..c5e805830d26 100644
--- a/src/chrome/content/rules/Fedorainfracloud.org.xml
+++ b/src/chrome/content/rules/Fedorainfracloud.org.xml
@@ -1,6 +1,4 @@
 
-
+
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/Feed2JS.org.xml b/src/chrome/content/rules/Feed2JS.org.xml
index 7cbd69c2dc7c..e9b2d7b9a5ac 100644
--- a/src/chrome/content/rules/Feed2JS.org.xml
+++ b/src/chrome/content/rules/Feed2JS.org.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/FeedBlitz.xml b/src/chrome/content/rules/FeedBlitz.xml
index d2ce2e61a8e8..904ce9fbb220 100644
--- a/src/chrome/content/rules/FeedBlitz.xml
+++ b/src/chrome/content/rules/FeedBlitz.xml
@@ -1,8 +1,6 @@
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/FeedPress.me.xml b/src/chrome/content/rules/FeedPress.me.xml
index 488b6bfd8bcd..6eacd1780944 100644
--- a/src/chrome/content/rules/FeedPress.me.xml
+++ b/src/chrome/content/rules/FeedPress.me.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.feedpress.me/ => https://www.feedpress.me/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Feedjit.xml b/src/chrome/content/rules/Feedjit.xml
index 63364a5b9a68..a869e860e139 100644
--- a/src/chrome/content/rules/Feedjit.xml
+++ b/src/chrome/content/rules/Feedjit.xml
@@ -16,4 +16,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Feedmyinbox.xml b/src/chrome/content/rules/Feedmyinbox.xml
index 32cff397ff3e..cd259f42fc09 100644
--- a/src/chrome/content/rules/Feedmyinbox.xml
+++ b/src/chrome/content/rules/Feedmyinbox.xml
@@ -5,11 +5,11 @@ Fetch error: http://www.feedmyinbox.com/ => https://www.feedmyinbox.com/: (28, '
 Fetch error: http://feedmyinbox.com/ => https://www.feedmyinbox.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/Feedsportal.com.xml b/src/chrome/content/rules/Feedsportal.com.xml
index ad0713e6d0ae..d51d1bca0502 100644
--- a/src/chrome/content/rules/Feedsportal.com.xml
+++ b/src/chrome/content/rules/Feedsportal.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://stats.feedsportal.com/ => https://stats.feedsportal.com/: (2
 	www: refused
 
 -->
-
+
 
 	
 		
diff --git a/src/chrome/content/rules/Fefe.xml b/src/chrome/content/rules/Fefe.xml
index df4323378c92..4bb576b970b8 100644
--- a/src/chrome/content/rules/Fefe.xml
+++ b/src/chrome/content/rules/Fefe.xml
@@ -4,7 +4,7 @@
 		- bulk *
 
 	* invalid certificate
-	
+
 	       - dl *
 
 
diff --git a/src/chrome/content/rules/Feide.xml b/src/chrome/content/rules/Feide.xml
index a45e1cf50773..c5fa9cb0b395 100644
--- a/src/chrome/content/rules/Feide.xml
+++ b/src/chrome/content/rules/Feide.xml
@@ -23,7 +23,7 @@ Fetch error: http://wiki.feide.no/ => https://wiki.feide.no/: (6, 'Could not res
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Feminism.lgbt.xml b/src/chrome/content/rules/Feminism.lgbt.xml
deleted file mode 100644
index df4f63c0f9df..000000000000
--- a/src/chrome/content/rules/Feminism.lgbt.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Fence_Center.com.xml b/src/chrome/content/rules/Fence_Center.com.xml
index c945e52906b6..63d4d8a1f010 100644
--- a/src/chrome/content/rules/Fence_Center.com.xml
+++ b/src/chrome/content/rules/Fence_Center.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.fencecenter.com/ => https://www.fencecenter.com/: (60, '
 		- ^	(cert only matches www)
 
 -->
-
+
 
 	
 	
@@ -21,4 +21,4 @@ Fetch error: http://www.fencecenter.com/ => https://www.fencecenter.com/: (60, '
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Fender.com-problematic.xml b/src/chrome/content/rules/Fender.com-problematic.xml
index 3d16e39f019b..fe519bc3badb 100644
--- a/src/chrome/content/rules/Fender.com-problematic.xml
+++ b/src/chrome/content/rules/Fender.com-problematic.xml
@@ -5,13 +5,11 @@
 
 
 	
-	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Fender.com.xml b/src/chrome/content/rules/Fender.com.xml
index e30390810058..27cd16aabde7 100644
--- a/src/chrome/content/rules/Fender.com.xml
+++ b/src/chrome/content/rules/Fender.com.xml
@@ -16,7 +16,7 @@
 
 
 	
-	
+	
 
 
 	
@@ -25,4 +25,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Fenland.gov.uk.xml b/src/chrome/content/rules/Fenland.gov.uk.xml
index b236b901f86b..3542cc59156c 100644
--- a/src/chrome/content/rules/Fenland.gov.uk.xml
+++ b/src/chrome/content/rules/Fenland.gov.uk.xml
@@ -30,12 +30,12 @@
 			
 			
 			
+			
 			
 			
 			
 			
 			
-			
 			
 			
 			
diff --git a/src/chrome/content/rules/Fermi_National_Accelerator_Laboratory.xml b/src/chrome/content/rules/Fermi_National_Accelerator_Laboratory.xml
index 2900e0a38a36..32941fb84a77 100644
--- a/src/chrome/content/rules/Fermi_National_Accelerator_Laboratory.xml
+++ b/src/chrome/content/rules/Fermi_National_Accelerator_Laboratory.xml
@@ -65,7 +65,7 @@ Fetch error: http://astro.fnal.gov/ => https://astro.fnal.gov/: (28, 'Connection
 		www.fermilab.jobs
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/FernUni-Hagen.de.xml b/src/chrome/content/rules/FernUni-Hagen.de.xml
index 52bc7deee6cb..3bec2bca8e42 100644
--- a/src/chrome/content/rules/FernUni-Hagen.de.xml
+++ b/src/chrome/content/rules/FernUni-Hagen.de.xml
@@ -27,7 +27,14 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
@@ -36,7 +43,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Ferris_State_University-problematic.xml b/src/chrome/content/rules/Ferris_State_University-problematic.xml
index 5ab1deb5d421..e1f234883583 100644
--- a/src/chrome/content/rules/Ferris_State_University-problematic.xml
+++ b/src/chrome/content/rules/Ferris_State_University-problematic.xml
@@ -11,4 +11,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ferris_State_University.xml b/src/chrome/content/rules/Ferris_State_University.xml
index 5ee7fee73c8c..451cdf192742 100644
--- a/src/chrome/content/rules/Ferris_State_University.xml
+++ b/src/chrome/content/rules/Ferris_State_University.xml
@@ -27,14 +27,17 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
 		
 
 
 	
 
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Ferroh.com.xml b/src/chrome/content/rules/Ferroh.com.xml
deleted file mode 100644
index 64f268e63a97..000000000000
--- a/src/chrome/content/rules/Ferroh.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/FetLife.xml b/src/chrome/content/rules/FetLife.xml
deleted file mode 100644
index 20c13d3498bb..000000000000
--- a/src/chrome/content/rules/FetLife.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-  
-  
-
-  
-
-  
-
diff --git a/src/chrome/content/rules/FetShop.co.uk.xml b/src/chrome/content/rules/FetShop.co.uk.xml
index 22d6181dc15f..8d247ee264dd 100644
--- a/src/chrome/content/rules/FetShop.co.uk.xml
+++ b/src/chrome/content/rules/FetShop.co.uk.xml
@@ -23,7 +23,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
@@ -38,4 +40,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Fhserve.com.xml b/src/chrome/content/rules/Fhserve.com.xml
index b07ed613574e..662c31bb21bc 100644
--- a/src/chrome/content/rules/Fhserve.com.xml
+++ b/src/chrome/content/rules/Fhserve.com.xml
@@ -28,7 +28,7 @@
 		- (www.)?	(^ → www)
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Fidelity.com.hk.xml b/src/chrome/content/rules/Fidelity.com.hk.xml
new file mode 100644
index 000000000000..43cba3c04e28
--- /dev/null
+++ b/src/chrome/content/rules/Fidelity.com.hk.xml
@@ -0,0 +1,74 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Fidelity.com.xml b/src/chrome/content/rules/Fidelity.com.xml
index 70bd534cec06..d5c313de2478 100644
--- a/src/chrome/content/rules/Fidelity.com.xml
+++ b/src/chrome/content/rules/Fidelity.com.xml
@@ -59,7 +59,19 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
+	
+	
 	
+		
+		
 
-
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Fife_Direct.org.uk.xml b/src/chrome/content/rules/Fife_Direct.org.uk.xml
index cd36fb272ff0..5ce12c6fc258 100644
--- a/src/chrome/content/rules/Fife_Direct.org.uk.xml
+++ b/src/chrome/content/rules/Fife_Direct.org.uk.xml
@@ -24,7 +24,7 @@ Fetch error: http://m.fifedirect.org.uk/ => https://m.fifedirect.org.uk/: (6, 'C
 	⁴ Unsecurable <= 404
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Fifi.Org.xml b/src/chrome/content/rules/Fifi.Org.xml
index 783798680b66..71818980d15f 100644
--- a/src/chrome/content/rules/Fifi.Org.xml
+++ b/src/chrome/content/rules/Fifi.Org.xml
@@ -6,13 +6,10 @@
 -->
 
 
-	
+	
 
 
-	
 
+	
 
-	
-
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Fight-for-the-Future-mismatches.xml b/src/chrome/content/rules/Fight-for-the-Future-mismatches.xml
index d28396c8e1fc..b3668772731a 100644
--- a/src/chrome/content/rules/Fight-for-the-Future-mismatches.xml
+++ b/src/chrome/content/rules/Fight-for-the-Future-mismatches.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 	
 	
 	
@@ -46,10 +46,9 @@
 	
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Fight-for-the-Future.xml b/src/chrome/content/rules/Fight-for-the-Future.xml
index e911f1fb5a1f..fad239547ec2 100644
--- a/src/chrome/content/rules/Fight-for-the-Future.xml
+++ b/src/chrome/content/rules/Fight-for-the-Future.xml
@@ -9,7 +9,6 @@
 		- Fax_Big_Brother.com.xml
 		- Free_Chelsea.com.xml
 		- Internet_Defense_League.xml
-		- InternetVotes.org.xml
 		- Reset_the_Net.org.xml
 		- You_Betrayed_us.org.xml
 
diff --git a/src/chrome/content/rules/File.io.xml b/src/chrome/content/rules/File.io.xml
new file mode 100644
index 000000000000..a03e0cc96360
--- /dev/null
+++ b/src/chrome/content/rules/File.io.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/FileCloud.io.xml b/src/chrome/content/rules/FileCloud.io.xml
deleted file mode 100644
index 033fe0e85aa4..000000000000
--- a/src/chrome/content/rules/FileCloud.io.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/FileFactory.xml b/src/chrome/content/rules/FileFactory.xml
index 5dc0b87c28f5..213e5121c52c 100644
--- a/src/chrome/content/rules/FileFactory.xml
+++ b/src/chrome/content/rules/FileFactory.xml
@@ -11,7 +11,7 @@ Fetch error: http://support.filefactory.com/ => https://support.filefactory.com/
 	* Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/FileFormat.info.xml b/src/chrome/content/rules/FileFormat.info.xml
index e2e9f6f64ac1..c64b89943d9f 100644
--- a/src/chrome/content/rules/FileFormat.info.xml
+++ b/src/chrome/content/rules/FileFormat.info.xml
@@ -1,17 +1,20 @@
 
-
-
-
+
 	
 	
+	
+	
 
-	
-
+	
+	
 
diff --git a/src/chrome/content/rules/FileHoot.com.xml b/src/chrome/content/rules/FileHoot.com.xml
index 50965dce7eee..58bfa4b5629f 100644
--- a/src/chrome/content/rules/FileHoot.com.xml
+++ b/src/chrome/content/rules/FileHoot.com.xml
@@ -23,7 +23,7 @@ Fetch error: http://www.filehoot.com/ => https://www.filehoot.com/: (7, 'Failed
 	² Unsecurable <= connection refused
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/FileNuke.com.xml b/src/chrome/content/rules/FileNuke.com.xml
deleted file mode 100644
index 653ca92accdb..000000000000
--- a/src/chrome/content/rules/FileNuke.com.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/FileRio.in.xml b/src/chrome/content/rules/FileRio.in.xml
index 51212880537e..272ef217675e 100644
--- a/src/chrome/content/rules/FileRio.in.xml
+++ b/src/chrome/content/rules/FileRio.in.xml
@@ -19,10 +19,10 @@ Fetch error: http://filerio.in/ => https://filerio.in/: (60, 'SSL certificate pr
 	* Secured by us
 
 -->
-
+
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/FileZilla.xml b/src/chrome/content/rules/FileZilla.xml
deleted file mode 100644
index e1656ee4125e..000000000000
--- a/src/chrome/content/rules/FileZilla.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
-
diff --git a/src/chrome/content/rules/Filebyid.com.xml b/src/chrome/content/rules/Filebyid.com.xml
index 174464afefba..38961a7864d6 100644
--- a/src/chrome/content/rules/Filebyid.com.xml
+++ b/src/chrome/content/rules/Filebyid.com.xml
@@ -2,7 +2,7 @@
 	NB: Server sends no certificate chain, see https://whatsmychaincert.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Filehippo.com.xml b/src/chrome/content/rules/Filehippo.com.xml
deleted file mode 100644
index 648f0f4de2dc..000000000000
--- a/src/chrome/content/rules/Filehippo.com.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-  	
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Filemobile.xml b/src/chrome/content/rules/Filemobile.xml
deleted file mode 100644
index 939cd3892f67..000000000000
--- a/src/chrome/content/rules/Filemobile.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Film-Threat.xml b/src/chrome/content/rules/Film-Threat.xml
index 80f793df4dd3..1ab2cc52aa4e 100644
--- a/src/chrome/content/rules/Film-Threat.xml
+++ b/src/chrome/content/rules/Film-Threat.xml
@@ -6,15 +6,16 @@ Fetch error: http://filmthreat.com/ => https://filmthreat.com/: (7, 'Failed to c
 Disabled by https-everywhere-checker because:
 Fetch error: http://filmthreat.com/ => https://filmthreat.com/: (60, 'SSL certificate problem: self signed certificate')
 -->
-
+
 
-	
-	
+	
+	
+	
+	
 	
 
-	
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/FilmTrack.xml b/src/chrome/content/rules/FilmTrack.xml
index 0c96f4ad36e0..9a03d11c6a06 100644
--- a/src/chrome/content/rules/FilmTrack.xml
+++ b/src/chrome/content/rules/FilmTrack.xml
@@ -9,7 +9,7 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Film_Linc.com-falsemixed.xml b/src/chrome/content/rules/Film_Linc.com-falsemixed.xml
index 7df0ff466cab..3a8f707fad3c 100644
--- a/src/chrome/content/rules/Film_Linc.com-falsemixed.xml
+++ b/src/chrome/content/rules/Film_Linc.com-falsemixed.xml
@@ -4,13 +4,12 @@
 -->
 
 
-	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Film_Linc.com.xml b/src/chrome/content/rules/Film_Linc.com.xml
index ada4af10b0dd..e615b7234148 100644
--- a/src/chrome/content/rules/Film_Linc.com.xml
+++ b/src/chrome/content/rules/Film_Linc.com.xml
@@ -17,7 +17,7 @@ Fetch error: http://filmlinc.com/ => https://filmlinc.com/: (51, "SSL: no altern
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Filmdates.co.uk.xml b/src/chrome/content/rules/Filmdates.co.uk.xml
index f33a20431bfa..053294820c5e 100644
--- a/src/chrome/content/rules/Filmdates.co.uk.xml
+++ b/src/chrome/content/rules/Filmdates.co.uk.xml
@@ -24,4 +24,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Filmlair.xml b/src/chrome/content/rules/Filmlair.xml
deleted file mode 100644
index 4ea55e821473..000000000000
--- a/src/chrome/content/rules/Filmlair.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Filmlash.com.xml b/src/chrome/content/rules/Filmlash.com.xml
index 834a8de79709..722e226f7bc9 100644
--- a/src/chrome/content/rules/Filmlash.com.xml
+++ b/src/chrome/content/rules/Filmlash.com.xml
@@ -20,4 +20,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Filter.xml b/src/chrome/content/rules/Filter.xml
index 7325b4a9b135..408649cd0433 100644
--- a/src/chrome/content/rules/Filter.xml
+++ b/src/chrome/content/rules/Filter.xml
@@ -9,4 +9,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Fimfiction.net.xml b/src/chrome/content/rules/Fimfiction.net.xml
deleted file mode 100644
index ec279e6167e7..000000000000
--- a/src/chrome/content/rules/Fimfiction.net.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-	
-  
-	
-	
-  
-
-
-	
-	
-
-	
-
-
-  
-
-
diff --git a/src/chrome/content/rules/Fimserve.com.xml b/src/chrome/content/rules/Fimserve.com.xml
index 7fa558cb8b73..eb6a944b0538 100644
--- a/src/chrome/content/rules/Fimserve.com.xml
+++ b/src/chrome/content/rules/Fimserve.com.xml
@@ -14,7 +14,7 @@ Fetch error: http://trgc.opt.fimserve.com/ => https://trgc.opt.fimserve.com/: (6
 	For other Rubicon Project coverage, see Rubicon-Project.xml.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Final-Score.xml b/src/chrome/content/rules/Final-Score.xml
index 77c2188edfc8..119eb56da78d 100644
--- a/src/chrome/content/rules/Final-Score.xml
+++ b/src/chrome/content/rules/Final-Score.xml
@@ -17,7 +17,11 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 
 
 	
@@ -32,7 +36,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Finalsite.xml b/src/chrome/content/rules/Finalsite.xml
index d5e12b8b8852..8b4b7384dce1 100644
--- a/src/chrome/content/rules/Finalsite.xml
+++ b/src/chrome/content/rules/Finalsite.xml
@@ -19,16 +19,21 @@ Fetch error: http://finalsite.com/ => https://finalsite.com/: (51, "SSL: no alte
 		- secureprivate
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Finam.xml b/src/chrome/content/rules/Finam.xml
index 0ddb948c723f..c021d7af8ee3 100644
--- a/src/chrome/content/rules/Finam.xml
+++ b/src/chrome/content/rules/Finam.xml
@@ -6,7 +6,7 @@ Fetch error: http://fb.finam.ru/ => https://fb.finam.ru/: (28, 'Connection timed
 Disabled by https-everywhere-checker because:
 Fetch error: http://fb.finam.ru/ => https://fb.finam.ru/: (28, 'Connection timed out after 10001 milliseconds')
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/FinancialHacks.ca.xml b/src/chrome/content/rules/FinancialHacks.ca.xml
new file mode 100644
index 000000000000..e3b5a9ef2c56
--- /dev/null
+++ b/src/chrome/content/rules/FinancialHacks.ca.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Financial_Times.xml b/src/chrome/content/rules/Financial_Times.xml
index 602358ab4b96..e187ec24e9e3 100644
--- a/src/chrome/content/rules/Financial_Times.xml
+++ b/src/chrome/content/rules/Financial_Times.xml
@@ -7,42 +7,21 @@
 		- discussions.ft.com
 		- funds.ft.com
 		- membership.ft.com
-		- nbe.ft.com
 
 		SSL connect error:
 		- ftcorporate.ft.com
 
 		SSL peer certificate was not OK:
-		- blogs.ft.com
-		- im.media.ft.com
-		- s1.media.ft.com
-		- s4.media.ft.com
-		- test.media.ft.com
-		- reg.test.media.ft.com
-		- s1.test.media.ft.com
-		- s2.test.media.ft.com
-		- s3.test.media.ft.com
-		- origami.ft.com
-		- rankings.ft.com
-		- search.ft.com
-		- static-render-p.ft.com
 		- webservices.ft.com
-		- navigation.webservices.ft.com
 
-		Status code mismatch:
-		- h2.ft.com
-
-		5xx server error:
-		- registration.ft.com
-
-		Secure connection redirects to plaintext:
+		Redirects to HTTP:
 		- announce.ft.com
 -->
 
 	
-	
 	
 	
+	
 	
 	
 	
@@ -52,23 +31,34 @@
 	
 	
 	
-	
 	
+	
+	
+	
+	
+	
 	
 	
+	
 	
 	
 	
+	
 	
+	
 	
+	
 	
+	
 	
 	
 	
 	
-	
 	
 	
+	
+
+	
 
 	
 
diff --git a/src/chrome/content/rules/Financialtrans.com.xml b/src/chrome/content/rules/Financialtrans.com.xml
index 2b73d52f9833..389d77c10196 100644
--- a/src/chrome/content/rules/Financialtrans.com.xml
+++ b/src/chrome/content/rules/Financialtrans.com.xml
@@ -7,4 +7,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/FinansWatch.xml b/src/chrome/content/rules/FinansWatch.xml
index c8856a2e28e0..52819166909e 100644
--- a/src/chrome/content/rules/FinansWatch.xml
+++ b/src/chrome/content/rules/FinansWatch.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.finanswatch.dk/ => https://www.finanswatch.dk/: (51, "SS
     http://finanswatch.dk/template/fwVer1-0/css/fw_global.css?rev=35794
   is essential for the layout but is served through http.
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Finansportalen.no.xml b/src/chrome/content/rules/Finansportalen.no.xml
index cabda0e3fcbf..371fd20f755e 100644
--- a/src/chrome/content/rules/Finansportalen.no.xml
+++ b/src/chrome/content/rules/Finansportalen.no.xml
@@ -10,7 +10,7 @@ Fetch error: http://stat.finansportalen.no/ => https://stat.finansportalen.no/:
 		- www.finansportalen.no
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Finanssialan-Keskusliitto.xml b/src/chrome/content/rules/Finanssialan-Keskusliitto.xml
index a91ed72c7177..0552ad9f0d8b 100644
--- a/src/chrome/content/rules/Finanssialan-Keskusliitto.xml
+++ b/src/chrome/content/rules/Finanssialan-Keskusliitto.xml
@@ -5,7 +5,7 @@ Fetch error: http://fkl.fi/ => https://fkl.fi/: (7, 'Failed to connect to fkl.fi
 Fetch error: http://www.fkl.fi/ => https://www.fkl.fi/: (7, 'Failed to connect to www.fkl.fi port 443: Connection refused')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Finanstilsynet.dk.xml b/src/chrome/content/rules/Finanstilsynet.dk.xml
deleted file mode 100644
index e8a2fb0e436e..000000000000
--- a/src/chrome/content/rules/Finanstilsynet.dk.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Finanzberatung_Max_Herbst.xml b/src/chrome/content/rules/Finanzberatung_Max_Herbst.xml
index 0bb13a0e4080..71e4f102d9f7 100644
--- a/src/chrome/content/rules/Finanzberatung_Max_Herbst.xml
+++ b/src/chrome/content/rules/Finanzberatung_Max_Herbst.xml
@@ -12,7 +12,8 @@
 -->
 
 
-	
+	
+	
 
 
 	 https://d3ne1tggqg4fzy.cloudfront.net/
 
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Find.ly.xml b/src/chrome/content/rules/Find.ly.xml
deleted file mode 100644
index eec91a0c2457..000000000000
--- a/src/chrome/content/rules/Find.ly.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/FindArticles.com.xml b/src/chrome/content/rules/FindArticles.com.xml
new file mode 100644
index 000000000000..8e64a95e07e1
--- /dev/null
+++ b/src/chrome/content/rules/FindArticles.com.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/FindTheBest.xml b/src/chrome/content/rules/FindTheBest.xml
index c144a00630d4..205977e854c5 100644
--- a/src/chrome/content/rules/FindTheBest.xml
+++ b/src/chrome/content/rules/FindTheBest.xml
@@ -28,7 +28,7 @@ Fetch error: http://findthebest.com/ => https://findthebest.com/: (51, "SSL: no
 			- *		(per-client domains)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Find_a_Grave.xml b/src/chrome/content/rules/Find_a_Grave.xml
index dd2039a6fd1a..c64699c346b8 100644
--- a/src/chrome/content/rules/Find_a_Grave.xml
+++ b/src/chrome/content/rules/Find_a_Grave.xml
@@ -12,7 +12,8 @@
 
 
 	
-	
+	
+	
 		
@@ -22,4 +23,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Findgravy.com.xml b/src/chrome/content/rules/Findgravy.com.xml
index 314e568076f2..a6def9b61970 100644
--- a/src/chrome/content/rules/Findgravy.com.xml
+++ b/src/chrome/content/rules/Findgravy.com.xml
@@ -20,7 +20,7 @@ Fetch error: http://www.findgravy.com/ => https://www.findgravy.com/: (51, "SSL:
 	* Not secured by us <= mismatched (forced endpoint)
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Findlawimages.com.xml b/src/chrome/content/rules/Findlawimages.com.xml
new file mode 100644
index 000000000000..4bb0c3b2abf1
--- /dev/null
+++ b/src/chrome/content/rules/Findlawimages.com.xml
@@ -0,0 +1,9 @@
+
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Fine_Art_America.xml b/src/chrome/content/rules/Fine_Art_America.xml
index 12080a6af946..5202dae43dba 100644
--- a/src/chrome/content/rules/Fine_Art_America.xml
+++ b/src/chrome/content/rules/Fine_Art_America.xml
@@ -55,10 +55,6 @@
 	
 	
 
-
-	
-
 	
 
diff --git a/src/chrome/content/rules/Fineproxy.org-problematic.xml b/src/chrome/content/rules/Fineproxy.org-problematic.xml
index 3ceb27761fc7..6e118ccc3fa3 100644
--- a/src/chrome/content/rules/Fineproxy.org-problematic.xml
+++ b/src/chrome/content/rules/Fineproxy.org-problematic.xml
@@ -13,4 +13,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Fineproxy.org.xml b/src/chrome/content/rules/Fineproxy.org.xml
index b06944b834ca..720d8eed1e4b 100644
--- a/src/chrome/content/rules/Fineproxy.org.xml
+++ b/src/chrome/content/rules/Fineproxy.org.xml
@@ -39,7 +39,7 @@ Fetch error: http://forum.fineproxy.org/ => https://forum.fineproxy.org/: (6, 'C
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/FinnChristiansen.de.xml b/src/chrome/content/rules/FinnChristiansen.de.xml
index 250b5fc8f32d..5bfdb6dc7eae 100644
--- a/src/chrome/content/rules/FinnChristiansen.de.xml
+++ b/src/chrome/content/rules/FinnChristiansen.de.xml
@@ -4,7 +4,7 @@
 		- css from $self
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Finto.fi.xml b/src/chrome/content/rules/Finto.fi.xml
new file mode 100644
index 000000000000..e1ec37c588a8
--- /dev/null
+++ b/src/chrome/content/rules/Finto.fi.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Fio.bank.xml b/src/chrome/content/rules/Fio.bank.xml
new file mode 100644
index 000000000000..a5fa73d407a0
--- /dev/null
+++ b/src/chrome/content/rules/Fio.bank.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Fio.cz.xml b/src/chrome/content/rules/Fio.cz.xml
new file mode 100644
index 000000000000..c39fb0f5794a
--- /dev/null
+++ b/src/chrome/content/rules/Fio.cz.xml
@@ -0,0 +1,152 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Fio.hu.xml b/src/chrome/content/rules/Fio.hu.xml
new file mode 100644
index 000000000000..61dbe9788f54
--- /dev/null
+++ b/src/chrome/content/rules/Fio.hu.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Fio.pl.xml b/src/chrome/content/rules/Fio.pl.xml
new file mode 100644
index 000000000000..3548b8af8241
--- /dev/null
+++ b/src/chrome/content/rules/Fio.pl.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Fio.sk.xml b/src/chrome/content/rules/Fio.sk.xml
new file mode 100644
index 000000000000..9f0589d5a20d
--- /dev/null
+++ b/src/chrome/content/rules/Fio.sk.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/FiqhAcademy.com.xml b/src/chrome/content/rules/FiqhAcademy.com.xml
deleted file mode 100644
index e20f64923156..000000000000
--- a/src/chrome/content/rules/FiqhAcademy.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/FireEye.xml b/src/chrome/content/rules/FireEye.xml
index 5b6cbbd6d1a3..d4d408280b74 100644
--- a/src/chrome/content/rules/FireEye.xml
+++ b/src/chrome/content/rules/FireEye.xml
@@ -1,66 +1,49 @@
 
-
-
+
 	
-	
-		
-
-
-	
-
-
-	
-
-	
-	
-
-	
-
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
\ No newline at end of file
diff --git a/src/chrome/content/rules/FireHost.xml b/src/chrome/content/rules/FireHost.xml
index ffbf63acebb0..839e2342c19c 100644
--- a/src/chrome/content/rules/FireHost.xml
+++ b/src/chrome/content/rules/FireHost.xml
@@ -5,13 +5,13 @@ Fetch error: http://firehost.com/ => http://firehost.com/: (60, 'SSL certificate
 	ne.wac.edgecastcdn.net/001415/assets/
 	ne.wac.edgecastcdn.net/801415/firehost.com/
 -->
-
+
 
 	
 	
 		
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/FireSmoke.ca.xml b/src/chrome/content/rules/FireSmoke.ca.xml
new file mode 100644
index 000000000000..b10987e0cc56
--- /dev/null
+++ b/src/chrome/content/rules/FireSmoke.ca.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Firedoglake.xml b/src/chrome/content/rules/Firedoglake.xml
index c8cdcabf1db5..90623e612bc1 100644
--- a/src/chrome/content/rules/Firedoglake.xml
+++ b/src/chrome/content/rules/Firedoglake.xml
@@ -14,7 +14,7 @@ Fetch error: http://members.firedoglake.com/ => https://members.firedoglake.com/
 		- static1
 
 -->
-
+
 
 	
 
@@ -24,4 +24,4 @@ Fetch error: http://members.firedoglake.com/ => https://members.firedoglake.com/
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Firefox.com.xml b/src/chrome/content/rules/Firefox.com.xml
index ab4ece3baff9..dea849b61639 100644
--- a/src/chrome/content/rules/Firefox.com.xml
+++ b/src/chrome/content/rules/Firefox.com.xml
@@ -1,30 +1,39 @@
 
 
 	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
+	
+
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+
+	
+	
+		
 
 	
 	
 		
+	
+		
 
 	
 
diff --git a/src/chrome/content/rules/FirstChoiceLiquor.com.au.xml b/src/chrome/content/rules/FirstChoiceLiquor.com.au.xml
new file mode 100644
index 000000000000..711bbed5ec80
--- /dev/null
+++ b/src/chrome/content/rules/FirstChoiceLiquor.com.au.xml
@@ -0,0 +1,23 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/FirstTag.xml b/src/chrome/content/rules/FirstTag.xml
index 9b1f90f59897..2c6c44adb345 100644
--- a/src/chrome/content/rules/FirstTag.xml
+++ b/src/chrome/content/rules/FirstTag.xml
@@ -4,4 +4,4 @@
 
 
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/FirstVDS.ru.xml b/src/chrome/content/rules/FirstVDS.ru.xml
index 2e5e5a11538b..33c23c870a9e 100644
--- a/src/chrome/content/rules/FirstVDS.ru.xml
+++ b/src/chrome/content/rules/FirstVDS.ru.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.firstvds.ru/ => https://www.firstvds.ru/: (60, 'SSL cert
 	ᵈ Dropped
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/First_Amendment_Coalition.xml b/src/chrome/content/rules/First_Amendment_Coalition.xml
index 0214a0b8992e..eee7e007e1fb 100644
--- a/src/chrome/content/rules/First_Amendment_Coalition.xml
+++ b/src/chrome/content/rules/First_Amendment_Coalition.xml
@@ -4,7 +4,7 @@
 		- www	(wpengine)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/First_Class_Magazine.se.xml b/src/chrome/content/rules/First_Class_Magazine.se.xml
index b52fb8e6a3b8..ce29e93f1d40 100644
--- a/src/chrome/content/rules/First_Class_Magazine.se.xml
+++ b/src/chrome/content/rules/First_Class_Magazine.se.xml
@@ -15,15 +15,7 @@
 	
 	
 
-
 	
 
-
-	
-	
-
 	
-
 
diff --git a/src/chrome/content/rules/Firsts.com.xml b/src/chrome/content/rules/Firsts.com.xml
index 16a03b62d9f7..454ce3274557 100644
--- a/src/chrome/content/rules/Firsts.com.xml
+++ b/src/chrome/content/rules/Firsts.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.firsts.com/ => https://www.firsts.com/: (51, "SSL: no al
 	For other Vodafone Group coverage, see Vodafone.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/FishNet_Security.com.xml b/src/chrome/content/rules/FishNet_Security.com.xml
index b493d486f068..7aaede8728f5 100644
--- a/src/chrome/content/rules/FishNet_Security.com.xml
+++ b/src/chrome/content/rules/FishNet_Security.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://fishnetsecurity.com/ => https://fishnetsecurity.com/: (60, '
 Fetch error: http://www.fishnetsecurity.com/ => https://www.fishnetsecurity.com/: (60, 'SSL certificate problem: self signed certificate')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/FitBit.xml b/src/chrome/content/rules/FitBit.xml
index 9ae47f450552..c49f68d1c980 100644
--- a/src/chrome/content/rules/FitBit.xml
+++ b/src/chrome/content/rules/FitBit.xml
@@ -26,7 +26,7 @@ Fetch error: http://m.fitbit.com/ => https://m.fitbit.com/: (6, 'Could not resol
 		- lp.fitbit.com
 		- cache.fitbit.com (https://d6y8zfzc2qfsl.cloudfront.net/)
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/FitStudio.com.xml b/src/chrome/content/rules/FitStudio.com.xml
index e238900db56f..5fa797aa6950 100644
--- a/src/chrome/content/rules/FitStudio.com.xml
+++ b/src/chrome/content/rules/FitStudio.com.xml
@@ -42,10 +42,15 @@ Fetch error: http://fitstudio.com/ => https://fitstudio.com/: (56, 'SSL read: er
 	* Secured by us
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
+	
+	
 		
diff --git a/src/chrome/content/rules/Fitgirl-repacks.site.xml b/src/chrome/content/rules/Fitgirl-repacks.site.xml
new file mode 100644
index 000000000000..4e1a517e6234
--- /dev/null
+++ b/src/chrome/content/rules/Fitgirl-repacks.site.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Fitness_Market.xml b/src/chrome/content/rules/Fitness_Market.xml
index 29f9009a73a0..4cab6288a524 100644
--- a/src/chrome/content/rules/Fitness_Market.xml
+++ b/src/chrome/content/rules/Fitness_Market.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Fiuza.me.xml b/src/chrome/content/rules/Fiuza.me.xml
index e168ad2f3c72..9d2094fd4e2d 100644
--- a/src/chrome/content/rules/Fiuza.me.xml
+++ b/src/chrome/content/rules/Fiuza.me.xml
@@ -6,11 +6,11 @@ Fetch error: http://fiuza.me/ => https://fiuza.me/: (7, 'Failed to connect to fi
 Disabled by https-everywhere-checker because:
 Fetch error: http://fiuza.me/ => https://fiuza.me/: (60, 'SSL certificate problem: self signed certificate')
 -->
-
+
 
 	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/FiveThirtyEight.com.xml b/src/chrome/content/rules/FiveThirtyEight.com.xml
deleted file mode 100644
index 781f59c2eb85..000000000000
--- a/src/chrome/content/rules/FiveThirtyEight.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-		
-		
-		
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/FixUnix.xml b/src/chrome/content/rules/FixUnix.xml
index da7dc42a1d7b..d50f0b23317f 100644
--- a/src/chrome/content/rules/FixUnix.xml
+++ b/src/chrome/content/rules/FixUnix.xml
@@ -16,7 +16,7 @@ Fetch error: http://c.fixunix.com/ => https://d2yvm6gxdmpjqc.cloudfront.net/: (2
 	(www.)?fixunix.com: Plaintext reply
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Fix_Ubuntu.com.xml b/src/chrome/content/rules/Fix_Ubuntu.com.xml
deleted file mode 100644
index 92c8c0164864..000000000000
--- a/src/chrome/content/rules/Fix_Ubuntu.com.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Fizy.com.xml b/src/chrome/content/rules/Fizy.com.xml
new file mode 100644
index 000000000000..96fb12e90cbb
--- /dev/null
+++ b/src/chrome/content/rules/Fizy.com.xml
@@ -0,0 +1,23 @@
+
+
+
+	
+
+	
+	
+	
+
+	
+
\ No newline at end of file
diff --git a/src/chrome/content/rules/Flameeyes.xml b/src/chrome/content/rules/Flameeyes.xml
deleted file mode 100644
index 57e3d151290d..000000000000
--- a/src/chrome/content/rules/Flameeyes.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Flappening.watch.xml b/src/chrome/content/rules/Flappening.watch.xml
new file mode 100644
index 000000000000..0f168ce7bfe3
--- /dev/null
+++ b/src/chrome/content/rules/Flappening.watch.xml
@@ -0,0 +1,9 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Flashtalking.xml b/src/chrome/content/rules/Flashtalking.xml
index e6c47e070636..114425e7a8b1 100644
--- a/src/chrome/content/rules/Flashtalking.xml
+++ b/src/chrome/content/rules/Flashtalking.xml
@@ -17,9 +17,10 @@
 
 
 	
-	
+	
+	
 	
-	
+	
 
 
 	
-
+
 
 	
 		
diff --git a/src/chrome/content/rules/FlatKill.org.xml b/src/chrome/content/rules/FlatKill.org.xml
new file mode 100644
index 000000000000..e5bb278fc905
--- /dev/null
+++ b/src/chrome/content/rules/FlatKill.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Flattr.net.xml b/src/chrome/content/rules/Flattr.net.xml
index 435d3f762d34..949d84eaf3ed 100644
--- a/src/chrome/content/rules/Flattr.net.xml
+++ b/src/chrome/content/rules/Flattr.net.xml
@@ -24,7 +24,7 @@ Fetch error: http://static4.flattr.net/ => https://static4.flattr.net/: (51, "SS
 	¹ Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Flattr.xml b/src/chrome/content/rules/Flattr.xml
index a2b20d50293f..f8f669342e0c 100644
--- a/src/chrome/content/rules/Flattr.xml
+++ b/src/chrome/content/rules/Flattr.xml
@@ -31,7 +31,7 @@
 					-->
 	
 
-	
+	
 
 
   
diff --git a/src/chrome/content/rules/Flavors.me.xml b/src/chrome/content/rules/Flavors.me.xml
deleted file mode 100644
index 1d5e5f4a22a6..000000000000
--- a/src/chrome/content/rules/Flavors.me.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-        
-
-        
-
-
-
diff --git a/src/chrome/content/rules/Flibusta.is.xml b/src/chrome/content/rules/Flibusta.is.xml
deleted file mode 100644
index efcf8782084f..000000000000
--- a/src/chrome/content/rules/Flibusta.is.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Flightglobal.xml b/src/chrome/content/rules/Flightglobal.xml
index 9835de22457d..118e78816aa4 100644
--- a/src/chrome/content/rules/Flightglobal.xml
+++ b/src/chrome/content/rules/Flightglobal.xml
@@ -5,7 +5,8 @@
 
 
 	
-	
+	
+	
 	
 	
 
diff --git a/src/chrome/content/rules/Flinq.de.xml b/src/chrome/content/rules/Flinq.de.xml
deleted file mode 100644
index 0b803baa081a..000000000000
--- a/src/chrome/content/rules/Flinq.de.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Flinto.com.xml b/src/chrome/content/rules/Flinto.com.xml
index fe0b2f1231ed..351b663f3d52 100644
--- a/src/chrome/content/rules/Flinto.com.xml
+++ b/src/chrome/content/rules/Flinto.com.xml
@@ -27,7 +27,8 @@
 
 
 	
-	
+	
+	
 		
diff --git a/src/chrome/content/rules/Flite.xml b/src/chrome/content/rules/Flite.xml
deleted file mode 100644
index e833aae7c8e5..000000000000
--- a/src/chrome/content/rules/Flite.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-	
-
-
-	
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Flix123.com.xml b/src/chrome/content/rules/Flix123.com.xml
deleted file mode 100644
index a504eee5fed8..000000000000
--- a/src/chrome/content/rules/Flix123.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/FlixBus.xml b/src/chrome/content/rules/FlixBus.xml
index 94f2ac5acb0d..905bbe2d94e4 100644
--- a/src/chrome/content/rules/FlixBus.xml
+++ b/src/chrome/content/rules/FlixBus.xml
@@ -32,6 +32,6 @@
 
   	
 
-	
 
diff --git a/src/chrome/content/rules/FlixDen.xml b/src/chrome/content/rules/FlixDen.xml
index ea461ef1ad99..0eb4e81109a0 100644
--- a/src/chrome/content/rules/FlixDen.xml
+++ b/src/chrome/content/rules/FlixDen.xml
@@ -5,7 +5,7 @@ Fetch error: http://flixden.com/ => https://flixden.com/: (51, "SSL: no alternat
 Fetch error: http://www.flixden.com/ => https://www.flixden.com/: (6, 'Could not resolve host: www.flixden.com')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.flixden.com/ => https://www.flixden.com/: (6, 'Could not
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Flixster.xml b/src/chrome/content/rules/Flixster.xml
index 345250a4b66d..2334da3fbd2c 100644
--- a/src/chrome/content/rules/Flixster.xml
+++ b/src/chrome/content/rules/Flixster.xml
@@ -67,7 +67,7 @@ Fetch error: http://static.flixstercdn.com/ => https://static.flixstercdn.com/:
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Floek.net.xml b/src/chrome/content/rules/Floek.net.xml
index 0934348ca9e1..e46ba57660b8 100644
--- a/src/chrome/content/rules/Floek.net.xml
+++ b/src/chrome/content/rules/Floek.net.xml
@@ -20,7 +20,8 @@ Fetch error: http://binefreund.de/ => https://www.floek.net/: (51, "SSL: no alte
 
 
 	
-	
+	
+	
 	
 	
 
@@ -31,7 +32,6 @@ Fetch error: http://binefreund.de/ => https://www.floek.net/: (51, "SSL: no alte
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Florida-Institute-of-Technology.xml b/src/chrome/content/rules/Florida-Institute-of-Technology.xml
index e160dcd3ffea..75763cef517d 100644
--- a/src/chrome/content/rules/Florida-Institute-of-Technology.xml
+++ b/src/chrome/content/rules/Florida-Institute-of-Technology.xml
@@ -7,7 +7,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://spam.fit.edu/ => https://spam.fit.edu/: (60, 'SSL certificate problem: certificate has expired')
 Fetch error: http://webmail.fit.edu/ => https://webmail.fit.edu/: (6, 'Could not resolve host: webmail.fit.edu')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/FloridaPolitics.com.xml b/src/chrome/content/rules/FloridaPolitics.com.xml
new file mode 100644
index 000000000000..5f2a421912da
--- /dev/null
+++ b/src/chrome/content/rules/FloridaPolitics.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Florida_Today.xml b/src/chrome/content/rules/Florida_Today.xml
index b541cb15837b..e66c98893b52 100644
--- a/src/chrome/content/rules/Florida_Today.xml
+++ b/src/chrome/content/rules/Florida_Today.xml
@@ -1,83 +1,46 @@
-
 
-
-
-	
+
 	
-	
-
-
-	
-	
-
-
-	
-
-	
-
-	
-	
-
-	
-	
-
-	
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+
+	
+
+	
 
diff --git a/src/chrome/content/rules/FlowBTC.com.xml b/src/chrome/content/rules/FlowBTC.com.xml
deleted file mode 100644
index cb6b90eacc83..000000000000
--- a/src/chrome/content/rules/FlowBTC.com.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-	
-
-
-	
-	
-
-		
-
-	
-
-
diff --git a/src/chrome/content/rules/Flowplayer.org.xml b/src/chrome/content/rules/Flowplayer.org.xml
index 692b19d9e58f..4e38d7d13286 100644
--- a/src/chrome/content/rules/Flowplayer.org.xml
+++ b/src/chrome/content/rules/Flowplayer.org.xml
@@ -19,4 +19,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Flowtab.com.xml b/src/chrome/content/rules/Flowtab.com.xml
index ee6fb660357a..8e19e9edc012 100644
--- a/src/chrome/content/rules/Flowtab.com.xml
+++ b/src/chrome/content/rules/Flowtab.com.xml
@@ -12,20 +12,19 @@ Fetch error: http://flowtab.com/ => https://flowtab.com/: (60, 'SSL certificate
 			- cdn.flowtab.mobi
 
 -->
-
+
 
 	
-	
+	
 	
 
 
 	
 
 
-	
 
 	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/FluentInTurkish.com.xml b/src/chrome/content/rules/FluentInTurkish.com.xml
new file mode 100644
index 000000000000..dd3fa08aa5e4
--- /dev/null
+++ b/src/chrome/content/rules/FluentInTurkish.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Flurry-problematic.xml b/src/chrome/content/rules/Flurry-problematic.xml
index f26f7987c706..22f97633d414 100644
--- a/src/chrome/content/rules/Flurry-problematic.xml
+++ b/src/chrome/content/rules/Flurry-problematic.xml
@@ -12,4 +12,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Flurry.xml b/src/chrome/content/rules/Flurry.xml
index eaa0a2f58f34..3db31551f5b2 100644
--- a/src/chrome/content/rules/Flurry.xml
+++ b/src/chrome/content/rules/Flurry.xml
@@ -24,4 +24,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/FlutterToday.com.xml b/src/chrome/content/rules/FlutterToday.com.xml
deleted file mode 100644
index 9b166d3a0d4e..000000000000
--- a/src/chrome/content/rules/FlutterToday.com.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Fluxx.io.xml b/src/chrome/content/rules/Fluxx.io.xml
index 34e3ef3a8a2b..f25651f7ca19 100644
--- a/src/chrome/content/rules/Fluxx.io.xml
+++ b/src/chrome/content/rules/Fluxx.io.xml
@@ -9,8 +9,8 @@
 
 	Insecure cookies are set for these hosts:
 
-		- blog.fluxx.io 
-		- info.fluxx.io 
+		- blog.fluxx.io
+		- info.fluxx.io
 
 
 	Mixed content:
diff --git a/src/chrome/content/rules/FlyEdelweiss.com.xml b/src/chrome/content/rules/FlyEdelweiss.com.xml
new file mode 100644
index 000000000000..8148801c6d36
--- /dev/null
+++ b/src/chrome/content/rules/FlyEdelweiss.com.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/Flyasite.com.xml b/src/chrome/content/rules/Flyasite.com.xml
deleted file mode 100644
index 77e6fac1b4d3..000000000000
--- a/src/chrome/content/rules/Flyasite.com.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Flyerify.com.xml b/src/chrome/content/rules/Flyerify.com.xml
new file mode 100644
index 000000000000..b1090842f0c4
--- /dev/null
+++ b/src/chrome/content/rules/Flyerify.com.xml
@@ -0,0 +1,17 @@
+
+
+
+	
+	
+		
+		
+		
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/FlyersRights.com.xml b/src/chrome/content/rules/FlyersRights.com.xml
new file mode 100644
index 000000000000..b4d5e486f5a3
--- /dev/null
+++ b/src/chrome/content/rules/FlyersRights.com.xml
@@ -0,0 +1,33 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/FlyersRights.org.xml b/src/chrome/content/rules/FlyersRights.org.xml
index 6304f6897335..bdf1694d0dad 100644
--- a/src/chrome/content/rules/FlyersRights.org.xml
+++ b/src/chrome/content/rules/FlyersRights.org.xml
@@ -1,27 +1,37 @@
-
 
-
+
 
-	
-	
 	
 	
+	
+	
 
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Flyertown.xml b/src/chrome/content/rules/Flyertown.xml
index 9ca7f8fe4d28..3576028518fe 100644
--- a/src/chrome/content/rules/Flyertown.xml
+++ b/src/chrome/content/rules/Flyertown.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Flygo-Aviation.com.xml b/src/chrome/content/rules/Flygo-Aviation.com.xml
new file mode 100644
index 000000000000..2f548cc9d1b1
--- /dev/null
+++ b/src/chrome/content/rules/Flygo-Aviation.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Flying_Meat.xml b/src/chrome/content/rules/Flying_Meat.xml
index 9ba9ab04eccc..352d70aa0bce 100644
--- a/src/chrome/content/rules/Flying_Meat.xml
+++ b/src/chrome/content/rules/Flying_Meat.xml
@@ -17,10 +17,11 @@
 
 
 	
-	
+	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Flyspray.org.xml b/src/chrome/content/rules/Flyspray.org.xml
new file mode 100644
index 000000000000..2c9c8dd0c369
--- /dev/null
+++ b/src/chrome/content/rules/Flyspray.org.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Fnac.pt.xml b/src/chrome/content/rules/Fnac.pt.xml
index e54bb2eba28f..d45dc24b8991 100644
--- a/src/chrome/content/rules/Fnac.pt.xml
+++ b/src/chrome/content/rules/Fnac.pt.xml
@@ -1,14 +1,14 @@
 
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Focaljet.com.xml b/src/chrome/content/rules/Focaljet.com.xml
index 4447050a0963..fe2e55fb7dd6 100644
--- a/src/chrome/content/rules/Focaljet.com.xml
+++ b/src/chrome/content/rules/Focaljet.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.focaljet.com/ => https://www.focaljet.com/: (51, "SSL: n
 Disabled by https-everywhere-checker because:
 Fetch error: http://focaljet.com/ => https://focaljet.com/: (60, 'SSL certificate problem: self signed certificate')
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://focaljet.com/ => https://focaljet.com/: (60, 'SSL certificat
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Focloir.ie.xml b/src/chrome/content/rules/Focloir.ie.xml
index 68972517b9c0..57ed0335edc6 100644
--- a/src/chrome/content/rules/Focloir.ie.xml
+++ b/src/chrome/content/rules/Focloir.ie.xml
@@ -10,4 +10,4 @@
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Focus.de.xml b/src/chrome/content/rules/Focus.de.xml
index 7dfb18bd7f90..dd131b264a53 100644
--- a/src/chrome/content/rules/Focus.de.xml
+++ b/src/chrome/content/rules/Focus.de.xml
@@ -1,89 +1,32 @@
 
-
+
 
 	
-	
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
-		
-		
-		
-		
-		
-		
-	
+	
+	
+	
+	
+	
 
-
-	
-	
-
-	
-	
 	
 
-	
-		
+	
+
 
diff --git a/src/chrome/content/rules/FodevareWatch.xml b/src/chrome/content/rules/FodevareWatch.xml
index 4999da72274e..8120b944324d 100644
--- a/src/chrome/content/rules/FodevareWatch.xml
+++ b/src/chrome/content/rules/FodevareWatch.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.fodevarewatch.dk/ => https://www.fodevarewatch.dk/: (51,
 	Not covered:
 		s7.addthis.com
 		adserver.adtech.de
-	
+
 	Remark:
 		This page gets content from other *watch.dk-domains,
 		not all of which work flawlessly with HTTPS Everywhere
@@ -14,7 +14,7 @@ Fetch error: http://www.fodevarewatch.dk/ => https://www.fodevarewatch.dk/: (51,
 
 -->
 
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/FogBugz.com.xml b/src/chrome/content/rules/FogBugz.com.xml
index 007177aa0c19..b0ff0dbe1115 100644
--- a/src/chrome/content/rules/FogBugz.com.xml
+++ b/src/chrome/content/rules/FogBugz.com.xml
@@ -35,4 +35,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/FogCreek.com.xml b/src/chrome/content/rules/FogCreek.com.xml
new file mode 100644
index 000000000000..9058dcf3cf52
--- /dev/null
+++ b/src/chrome/content/rules/FogCreek.com.xml
@@ -0,0 +1,24 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Fog_Creek.xml b/src/chrome/content/rules/Fog_Creek.xml
deleted file mode 100644
index 9cc12063d173..000000000000
--- a/src/chrome/content/rules/Fog_Creek.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Fokus.no.xml b/src/chrome/content/rules/Fokus.no.xml
index 82c88bc428ef..af512b3596e9 100644
--- a/src/chrome/content/rules/Fokus.no.xml
+++ b/src/chrome/content/rules/Fokus.no.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://fokus.no/ => https://www.fokus.no/: (7, 'Failed to connect to www.fokus.no port 443: Connection timed out')
 Fetch error: http://www.fokus.no/ => https://www.fokus.no/: (7, 'Failed to connect to www.fokus.no port 443: Connection timed out')
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/FoldingCoin.net.xml b/src/chrome/content/rules/FoldingCoin.net.xml
index fb52b2c20cd1..987b5bcc6830 100644
--- a/src/chrome/content/rules/FoldingCoin.net.xml
+++ b/src/chrome/content/rules/FoldingCoin.net.xml
@@ -1,32 +1,10 @@
-
-
+
 
 	
 	
 
 
-	
-	
-
-	
+	
 
 
 	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Folksam.se.xml b/src/chrome/content/rules/Folksam.se.xml
index b01405b43b73..4ab3729bba16 100644
--- a/src/chrome/content/rules/Folksam.se.xml
+++ b/src/chrome/content/rules/Folksam.se.xml
@@ -1,8 +1,55 @@
-
-
+
+
 	
 	
-	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
-
diff --git a/src/chrome/content/rules/Fontdeck.xml b/src/chrome/content/rules/Fontdeck.xml
index abb9eb23730c..465f310beeef 100644
--- a/src/chrome/content/rules/Fontdeck.xml
+++ b/src/chrome/content/rules/Fontdeck.xml
@@ -23,7 +23,7 @@ Fetch error: http://www.fontdeck.com/ => https://fontdeck.com/: (28, 'Connection
 	www: cert only matches ^fontdeck.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Fonts.com.xml b/src/chrome/content/rules/Fonts.com.xml
index ccdb966231b5..0ee3646a6825 100644
--- a/src/chrome/content/rules/Fonts.com.xml
+++ b/src/chrome/content/rules/Fonts.com.xml
@@ -16,7 +16,7 @@
 	
 	
 	
-		 
+		
 
 	
diff --git a/src/chrome/content/rules/FooFighters.xml b/src/chrome/content/rules/FooFighters.xml
index c785fcc03055..a933da4b5ca4 100644
--- a/src/chrome/content/rules/FooFighters.xml
+++ b/src/chrome/content/rules/FooFighters.xml
@@ -2,7 +2,7 @@
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/Food-Allergy-Initiative.xml b/src/chrome/content/rules/Food-Allergy-Initiative.xml
index a56d3897e9a2..bb939f30a2f0 100644
--- a/src/chrome/content/rules/Food-Allergy-Initiative.xml
+++ b/src/chrome/content/rules/Food-Allergy-Initiative.xml
@@ -1,7 +1,7 @@
 
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/FoodAndWaterWatch.org.xml b/src/chrome/content/rules/FoodAndWaterWatch.org.xml
index 19d97f6de07c..f5e15f7cc91e 100644
--- a/src/chrome/content/rules/FoodAndWaterWatch.org.xml
+++ b/src/chrome/content/rules/FoodAndWaterWatch.org.xml
@@ -10,7 +10,7 @@ Non-2xx HTTP code: http://edit.foodandwaterwatch.org/ (200) => https://edit.food
 		documents.foodandwaterwatch.org (502)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/FoodRepublic.com.xml b/src/chrome/content/rules/FoodRepublic.com.xml
new file mode 100644
index 000000000000..064f692366aa
--- /dev/null
+++ b/src/chrome/content/rules/FoodRepublic.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Food_Protection_Task_Force.com.xml b/src/chrome/content/rules/Food_Protection_Task_Force.com.xml
index 90467e90c602..2b634b01f2ba 100644
--- a/src/chrome/content/rules/Food_Protection_Task_Force.com.xml
+++ b/src/chrome/content/rules/Food_Protection_Task_Force.com.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Foodl.org.xml b/src/chrome/content/rules/Foodl.org.xml
index beb0d8af3127..4e9901b88984 100644
--- a/src/chrome/content/rules/Foodl.org.xml
+++ b/src/chrome/content/rules/Foodl.org.xml
@@ -17,7 +17,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
@@ -26,7 +28,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Foodler.com.xml b/src/chrome/content/rules/Foodler.com.xml
index e5f97ec0dde2..5edb3fea99de 100644
--- a/src/chrome/content/rules/Foodler.com.xml
+++ b/src/chrome/content/rules/Foodler.com.xml
@@ -3,4 +3,4 @@
     
 
     
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Fool-CDN.com.xml b/src/chrome/content/rules/Fool-CDN.com.xml
new file mode 100644
index 000000000000..bdc717fa884a
--- /dev/null
+++ b/src/chrome/content/rules/Fool-CDN.com.xml
@@ -0,0 +1,18 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Fool.com-falsemixed.xml b/src/chrome/content/rules/Fool.com-falsemixed.xml
deleted file mode 100644
index 9a803739990d..000000000000
--- a/src/chrome/content/rules/Fool.com-falsemixed.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-	
-
-
-	
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Foolz.us.xml b/src/chrome/content/rules/Foolz.us.xml
deleted file mode 100644
index 847960b4febd..000000000000
--- a/src/chrome/content/rules/Foolz.us.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-
-
diff --git a/src/chrome/content/rules/Foot_Locker_Canada.xml b/src/chrome/content/rules/Foot_Locker_Canada.xml
index 93a6aa01b0e4..3778645562eb 100644
--- a/src/chrome/content/rules/Foot_Locker_Canada.xml
+++ b/src/chrome/content/rules/Foot_Locker_Canada.xml
@@ -10,7 +10,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Foot_Locker_Europe.xml b/src/chrome/content/rules/Foot_Locker_Europe.xml
deleted file mode 100644
index 3c33b3efbee0..000000000000
--- a/src/chrome/content/rules/Foot_Locker_Europe.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Foot_Locker_Inc.xml b/src/chrome/content/rules/Foot_Locker_Inc.xml
index fbb3d856505d..1c45c490df49 100644
--- a/src/chrome/content/rules/Foot_Locker_Inc.xml
+++ b/src/chrome/content/rules/Foot_Locker_Inc.xml
@@ -9,7 +9,6 @@
 		- Footaction_USA.xml
 		- Foot_Locker.xml
 		- Foot_Locker_Canada.xml
-		- Foot_Locker_Europe.xml
 		- Kids_Foot_Locker.xml
 		- Lady_Foot_Locker.xml
 
diff --git a/src/chrome/content/rules/Footaction_USA.xml b/src/chrome/content/rules/Footaction_USA.xml
index 29dad234f8e8..2357fe38c2cb 100644
--- a/src/chrome/content/rules/Footaction_USA.xml
+++ b/src/chrome/content/rules/Footaction_USA.xml
@@ -18,7 +18,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
@@ -27,7 +29,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Football_Fanatics.xml b/src/chrome/content/rules/Football_Fanatics.xml
index bb782afeb3a4..63624cf8888a 100644
--- a/src/chrome/content/rules/Football_Fanatics.xml
+++ b/src/chrome/content/rules/Football_Fanatics.xml
@@ -21,4 +21,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Footholds.net.xml b/src/chrome/content/rules/Footholds.net.xml
index 17591585d366..f5d27b688c57 100644
--- a/src/chrome/content/rules/Footholds.net.xml
+++ b/src/chrome/content/rules/Footholds.net.xml
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/FootprintCalculator.org.xml b/src/chrome/content/rules/FootprintCalculator.org.xml
new file mode 100644
index 000000000000..08fec7f43ead
--- /dev/null
+++ b/src/chrome/content/rules/FootprintCalculator.org.xml
@@ -0,0 +1,18 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/ForAndBy.lgbt.xml b/src/chrome/content/rules/ForAndBy.lgbt.xml
deleted file mode 100644
index 8cc90bc3f0b9..000000000000
--- a/src/chrome/content/rules/ForAndBy.lgbt.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Forbrukerraadet.xml b/src/chrome/content/rules/Forbrukerraadet.xml
index 1bc27a57bcf3..caaebb5b4466 100644
--- a/src/chrome/content/rules/Forbrukerraadet.xml
+++ b/src/chrome/content/rules/Forbrukerraadet.xml
@@ -8,9 +8,9 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.forbrukerportalen.no/ => https://forbrukerportalen.no/: (28, 'Connection timed out after 10000 milliseconds')
 Fetch error: http://forbrukerportalen.no/ => https://forbrukerportalen.no/: (28, 'Connection timed out after 10001 milliseconds')
 -->
-
+
   
   
 
   
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ford.xml b/src/chrome/content/rules/Ford.xml
index fc24d6ab171c..5f1327f6ce32 100644
--- a/src/chrome/content/rules/Ford.xml
+++ b/src/chrome/content/rules/Ford.xml
@@ -7,4 +7,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Fordela.com.xml b/src/chrome/content/rules/Fordela.com.xml
index a8839d188b96..c3e35f276e71 100644
--- a/src/chrome/content/rules/Fordela.com.xml
+++ b/src/chrome/content/rules/Fordela.com.xml
@@ -29,10 +29,12 @@ Fetch error: http://fordela.com/ => https://www.fordela.com/: (60, 'SSL certific
 	* Secured by us
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
 	
@@ -41,7 +43,6 @@ Fetch error: http://fordela.com/ => https://www.fordela.com/: (60, 'SSL certific
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/ForeSee_Results.com.xml b/src/chrome/content/rules/ForeSee_Results.com.xml
index 98ba56958054..1d776e5843c0 100644
--- a/src/chrome/content/rules/ForeSee_Results.com.xml
+++ b/src/chrome/content/rules/ForeSee_Results.com.xml
@@ -21,7 +21,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
@@ -30,7 +32,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Forecast.io.xml b/src/chrome/content/rules/Forecast.io.xml
index 564c49cee553..7616da799848 100644
--- a/src/chrome/content/rules/Forecast.io.xml
+++ b/src/chrome/content/rules/Forecast.io.xml
@@ -23,7 +23,7 @@ Fetch error: http://www.forecast.io/ => https://www.forecast.io/: (51, "SSL: no
 	* Secured by us
 
 -->
-
+
 
 
@@ -37,7 +37,7 @@ Fetch error: http://www.forecast.io/ => https://www.forecast.io/: (51, "SSL: no
 					-->
 	
 
-	
+	
 
 
   
diff --git a/src/chrome/content/rules/ForeignPolicy.com.xml b/src/chrome/content/rules/ForeignPolicy.com.xml
index a78f36af8791..dc4539bcd0fa 100644
--- a/src/chrome/content/rules/ForeignPolicy.com.xml
+++ b/src/chrome/content/rules/ForeignPolicy.com.xml
@@ -61,7 +61,7 @@ Fetch error: http://turtlebay.foreignpolicy.com/ => https://turtlebay.foreignpol
 	* Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Foreningen_for_Dansk_Internethandel.xml b/src/chrome/content/rules/Foreningen_for_Dansk_Internethandel.xml
index 91fbaf8e11ba..4d8e9e78de7e 100644
--- a/src/chrome/content/rules/Foreningen_for_Dansk_Internethandel.xml
+++ b/src/chrome/content/rules/Foreningen_for_Dansk_Internethandel.xml
@@ -11,4 +11,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Forensics.ca.xml b/src/chrome/content/rules/Forensics.ca.xml
new file mode 100644
index 000000000000..11d78239dd21
--- /dev/null
+++ b/src/chrome/content/rules/Forensics.ca.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Foresight.org.xml b/src/chrome/content/rules/Foresight.org.xml
index bd57cd2bce1b..fb0e6de6ea47 100644
--- a/src/chrome/content/rules/Foresight.org.xml
+++ b/src/chrome/content/rules/Foresight.org.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/ForestSangha.org.xml b/src/chrome/content/rules/ForestSangha.org.xml
index 6eb56ba6e61f..b5c19a93e461 100644
--- a/src/chrome/content/rules/ForestSangha.org.xml
+++ b/src/chrome/content/rules/ForestSangha.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.forestsangha.org/ => https://www.forestsangha.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.forestsangha.org'")
 
 -->
-
+
         
         
         
diff --git a/src/chrome/content/rules/Foresters.com.xml b/src/chrome/content/rules/Foresters.com.xml
new file mode 100644
index 000000000000..f5b20e1abc34
--- /dev/null
+++ b/src/chrome/content/rules/Foresters.com.xml
@@ -0,0 +1,19 @@
+
+
+	
+  
+    
+    
+    
+
+	
+
diff --git a/src/chrome/content/rules/Foresters.xml b/src/chrome/content/rules/Foresters.xml
deleted file mode 100644
index aecc688ce670..000000000000
--- a/src/chrome/content/rules/Foresters.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/ForeverNew.xml b/src/chrome/content/rules/ForeverNew.xml
index 7ec4930489f6..2c0b7b735998 100644
--- a/src/chrome/content/rules/ForeverNew.xml
+++ b/src/chrome/content/rules/ForeverNew.xml
@@ -5,4 +5,4 @@
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Forex-Metal.xml b/src/chrome/content/rules/Forex-Metal.xml
index 23ec52bd771b..864b500a3a9f 100644
--- a/src/chrome/content/rules/Forex-Metal.xml
+++ b/src/chrome/content/rules/Forex-Metal.xml
@@ -5,7 +5,7 @@ Fetch error: http://forex-metal.com/ => https://forex-metal.com/: (28, 'Connecti
 Fetch error: http://www.forex-metal.com/ => https://forex-metal.com/: (28, 'Connection timed out after 20008 milliseconds')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Forex.com.xml b/src/chrome/content/rules/Forex.com.xml
index fb06235877e4..29e632b3f701 100644
--- a/src/chrome/content/rules/Forex.com.xml
+++ b/src/chrome/content/rules/Forex.com.xml
@@ -27,10 +27,18 @@ Fetch error: http://forex.com/ => https://secure.forex.com/: Too many redirects
 		- jp	(403; mismatched, CN: ssl2.cdngc.net)
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
@@ -39,7 +47,6 @@ Fetch error: http://forex.com/ => https://secure.forex.com/: Too many redirects
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/ForexCT.xml b/src/chrome/content/rules/ForexCT.xml
index ca64fb483739..cd3f669c0e87 100644
--- a/src/chrome/content/rules/ForexCT.xml
+++ b/src/chrome/content/rules/ForexCT.xml
@@ -11,7 +11,8 @@
 
 
 	
-	
+	
+	
 		
 	
 
@@ -22,10 +23,7 @@
 	
 
-	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/ForgeFields.com-problematic.xml b/src/chrome/content/rules/ForgeFields.com-problematic.xml
index 7c9eeeba09b3..693b24adcd44 100644
--- a/src/chrome/content/rules/ForgeFields.com-problematic.xml
+++ b/src/chrome/content/rules/ForgeFields.com-problematic.xml
@@ -5,7 +5,6 @@
 
 
 	
-	
 
 
 	
-
-
-	
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/ForgottenLands.eu.xml b/src/chrome/content/rules/ForgottenLands.eu.xml
index ce5cc066acac..108cc503c6cf 100644
--- a/src/chrome/content/rules/ForgottenLands.eu.xml
+++ b/src/chrome/content/rules/ForgottenLands.eu.xml
@@ -13,7 +13,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -22,7 +23,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/ForisWine.xml b/src/chrome/content/rules/ForisWine.xml
index b3ebc57b5471..7ee3ca0b8ce2 100644
--- a/src/chrome/content/rules/ForisWine.xml
+++ b/src/chrome/content/rules/ForisWine.xml
@@ -5,7 +5,7 @@ Fetch error: http://foriswine.com/ => https://www.foriswine.com/: (51, "SSL: no
 Fetch error: http://www.foriswine.com/ => https://www.foriswine.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.foriswine.com'")
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/FormAssembly.com.xml b/src/chrome/content/rules/FormAssembly.com.xml
index f764646e27e3..b1714f794ae2 100644
--- a/src/chrome/content/rules/FormAssembly.com.xml
+++ b/src/chrome/content/rules/FormAssembly.com.xml
@@ -10,7 +10,7 @@
 
 
 	Problematic subdomains:
-	
+
 		- (www.) *	(CN: secure.formassembly.com)
 
 	* Redirects to www3.formassembly.com
diff --git a/src/chrome/content/rules/FormatDynamics.com.xml b/src/chrome/content/rules/FormatDynamics.com.xml
index cb215b4a31a2..a7ead80cf7ed 100644
--- a/src/chrome/content/rules/FormatDynamics.com.xml
+++ b/src/chrome/content/rules/FormatDynamics.com.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.formatdynamics.com/ => https://www.formatdynamics.com/:
 		- new	(http reply)
 
 -->
-
+
 
 	
 	
@@ -25,4 +25,4 @@ Fetch error: http://www.formatdynamics.com/ => https://www.formatdynamics.com/:
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Fornex.com.xml b/src/chrome/content/rules/Fornex.com.xml
index 2c4e83fa9484..3cbaa46d563a 100644
--- a/src/chrome/content/rules/Fornex.com.xml
+++ b/src/chrome/content/rules/Fornex.com.xml
@@ -18,4 +18,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Forsiden.xml b/src/chrome/content/rules/Forsiden.xml
index 12ff80517f0e..2b1f9384c1b6 100644
--- a/src/chrome/content/rules/Forsiden.xml
+++ b/src/chrome/content/rules/Forsiden.xml
@@ -13,10 +13,11 @@ Fetch error: http://fvn.no/ => https://www.fvn.no/: Cycle detected - URL already
 	* Works; mismatched, CN: www.aftenposten.no
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
@@ -25,7 +26,6 @@ Fetch error: http://fvn.no/ => https://www.fvn.no/: Cycle detected - URL already
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Forthnet.gr.xml b/src/chrome/content/rules/Forthnet.gr.xml
index a84d1385001f..0263b535caf8 100644
--- a/src/chrome/content/rules/Forthnet.gr.xml
+++ b/src/chrome/content/rules/Forthnet.gr.xml
@@ -8,7 +8,7 @@ Fetch error: http://webmail.forthnet.gr/ => https://webmail.forthnet.gr/: (28, '
 Fetch error: http://services.forthnet.gr/ => https://services.forthnet.gr/: (56, 'Recv failure: Connection reset by peer') This ruleset is experimental. If you experience problems please
 	 open an issue at https://github.com/kargig/https-everywhere-greek-rules -->
 
-
+
   
   
 
diff --git a/src/chrome/content/rules/FortiGuard.com.xml b/src/chrome/content/rules/FortiGuard.com.xml
index b88aea7648e9..a0a265d74016 100644
--- a/src/chrome/content/rules/FortiGuard.com.xml
+++ b/src/chrome/content/rules/FortiGuard.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://api.fortiguard.com/ => https://api.fortiguard.com/: (7, 'Fai
 	Nonfunctional hosts in *fortiguard.com:
 
 		- threatmap *
-		
+
 	* Refused
 
 
@@ -29,7 +29,7 @@ Fetch error: http://api.fortiguard.com/ => https://api.fortiguard.com/: (7, 'Fai
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Fortinet.com.xml b/src/chrome/content/rules/Fortinet.com.xml
index bba0c433c293..b0dfb2f7164e 100644
--- a/src/chrome/content/rules/Fortinet.com.xml
+++ b/src/chrome/content/rules/Fortinet.com.xml
@@ -29,7 +29,7 @@ Fetch error: http://partners.fortinet.com/ => https://partners.fortinet.com/: (6
 		- www.fortinet.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Fortnite.com.xml b/src/chrome/content/rules/Fortnite.com.xml
index ce7614c25958..50225786126d 100644
--- a/src/chrome/content/rules/Fortnite.com.xml
+++ b/src/chrome/content/rules/Fortnite.com.xml
@@ -24,7 +24,7 @@ Fetch error: http://alpha.fortnite.com/ => https://alpha.fortnite.com/: (6, 'Cou
 		- www.fortnite.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Fortress_Linux.org.xml b/src/chrome/content/rules/Fortress_Linux.org.xml
deleted file mode 100644
index f6e32d9ddfff..000000000000
--- a/src/chrome/content/rules/Fortress_Linux.org.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Fortum.xml b/src/chrome/content/rules/Fortum.xml
index f190b6127751..a36b93b0bd9f 100644
--- a/src/chrome/content/rules/Fortum.xml
+++ b/src/chrome/content/rules/Fortum.xml
@@ -6,7 +6,7 @@
 					-->
 	
 
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Fortumo.xml b/src/chrome/content/rules/Fortumo.xml
index c8aaa16b6f3b..207dc7c72997 100644
--- a/src/chrome/content/rules/Fortumo.xml
+++ b/src/chrome/content/rules/Fortumo.xml
@@ -7,7 +7,7 @@ Fetch error: http://developers.fortumo.com/ => https://developers.fortumo.com/:
 		- dyq29inb4n9ck.cloudfront.net
 -->
 
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/ForumBlog.org.xml b/src/chrome/content/rules/ForumBlog.org.xml
index a250b45ac12e..f5a260712877 100644
--- a/src/chrome/content/rules/ForumBlog.org.xml
+++ b/src/chrome/content/rules/ForumBlog.org.xml
@@ -8,10 +8,10 @@ Non-2xx HTTP code: http://forumblog.org/ (200) => https://forumblog.org/ (525)
 		- www	(expired 2012-12-27, only matches ^forumblog.org, self-signed)
 
 -->
-
+
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Forumatic.xml b/src/chrome/content/rules/Forumatic.xml
index 23fd175a8fd7..7ec5ba8996bf 100644
--- a/src/chrome/content/rules/Forumatic.xml
+++ b/src/chrome/content/rules/Forumatic.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.forumatic.com/ => https://www.forumatic.com/: (35, 'erro
 		- support	(redirects to www; mismatched, CN: www.forumatic.com)
 
 -->
-
+
 
 	
 	
@@ -20,4 +20,4 @@ Fetch error: http://www.forumatic.com/ => https://www.forumatic.com/: (35, 'erro
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Forums_fur_Naturfotografen.xml b/src/chrome/content/rules/Forums_fur_Naturfotografen.xml
index 7d1225b165d1..d9ab4d08ae3c 100644
--- a/src/chrome/content/rules/Forums_fur_Naturfotografen.xml
+++ b/src/chrome/content/rules/Forums_fur_Naturfotografen.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Fosscon.us.xml b/src/chrome/content/rules/Fosscon.us.xml
index 781d81350f8a..1a5988e8e9df 100644
--- a/src/chrome/content/rules/Fosscon.us.xml
+++ b/src/chrome/content/rules/Fosscon.us.xml
@@ -11,5 +11,5 @@
     
 
     
-    
+
 
diff --git a/src/chrome/content/rules/Fotisl.com.xml b/src/chrome/content/rules/Fotisl.com.xml
deleted file mode 100644
index 80df88226fff..000000000000
--- a/src/chrome/content/rules/Fotisl.com.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Fotki.xml b/src/chrome/content/rules/Fotki.xml
index 0ed3503dcadf..3f5e57270ce6 100644
--- a/src/chrome/content/rules/Fotki.xml
+++ b/src/chrome/content/rules/Fotki.xml
@@ -11,7 +11,7 @@
 
 	
-		
+
 	
 	
 
diff --git a/src/chrome/content/rules/FotoForensics.com.xml b/src/chrome/content/rules/FotoForensics.com.xml
index 2b0f733c63ba..fcb285f17286 100644
--- a/src/chrome/content/rules/FotoForensics.com.xml
+++ b/src/chrome/content/rules/FotoForensics.com.xml
@@ -1,18 +1,28 @@
 
+
 
 
+	
+	
 	
 	
+	
+	
 	
+	
+	
+	
+
+	
+
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/FotoPigeon.xml b/src/chrome/content/rules/FotoPigeon.xml
index 30d4f36f422f..fa98f43502d3 100644
--- a/src/chrome/content/rules/FotoPigeon.xml
+++ b/src/chrome/content/rules/FotoPigeon.xml
@@ -15,7 +15,7 @@ Fetch error: http://www.fotopigeon.com/ => https://www.fotopigeon.com/: (28, 'Co
 		- www.fotopigeon.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/FoulaBook.com.xml b/src/chrome/content/rules/FoulaBook.com.xml
new file mode 100644
index 000000000000..6925ca9d88f3
--- /dev/null
+++ b/src/chrome/content/rules/FoulaBook.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Foundation-Source.xml b/src/chrome/content/rules/Foundation-Source.xml
index 2125a7c73793..f2a80c697213 100644
--- a/src/chrome/content/rules/Foundation-Source.xml
+++ b/src/chrome/content/rules/Foundation-Source.xml
@@ -1,13 +1,15 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
-	
+	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Foundation_Beyond_Belief.org.xml b/src/chrome/content/rules/Foundation_Beyond_Belief.org.xml
index 44af49db95a6..b3e2915b4fd7 100644
--- a/src/chrome/content/rules/Foundation_Beyond_Belief.org.xml
+++ b/src/chrome/content/rules/Foundation_Beyond_Belief.org.xml
@@ -17,4 +17,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Fourecks.de.xml b/src/chrome/content/rules/Fourecks.de.xml
index c0bf12353553..0e828f169cbc 100644
--- a/src/chrome/content/rules/Fourecks.de.xml
+++ b/src/chrome/content/rules/Fourecks.de.xml
@@ -25,7 +25,7 @@ Fetch error: http://www.fourecks.de/ => https://fourecks.de/: (60, 'SSL certific
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Foursquare.com.xml b/src/chrome/content/rules/Foursquare.com.xml
index 0f1aeff85026..dc8c24495b8d 100644
--- a/src/chrome/content/rules/Foursquare.com.xml
+++ b/src/chrome/content/rules/Foursquare.com.xml
@@ -63,7 +63,7 @@ Fetch error: http://translate.foursquare.com/ => https://translate.foursquare.co
 		- .foursquare.com
 
 -->
-
+
 
 	
@@ -91,7 +91,7 @@ Fetch error: http://translate.foursquare.com/ => https://translate.foursquare.co
 					-->
 	
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Fox-News.xml b/src/chrome/content/rules/Fox-News.xml
new file mode 100644
index 000000000000..6757552ec4b2
--- /dev/null
+++ b/src/chrome/content/rules/Fox-News.xml
@@ -0,0 +1,54 @@
+
+
+
+	
+	
+	
+
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Fox_News.xml b/src/chrome/content/rules/Fox_News.xml
deleted file mode 100644
index 9fe365985294..000000000000
--- a/src/chrome/content/rules/Fox_News.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
-
-	
-	
-		
-		
-	
-	
-	
-	
-
-
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/FoxyCart.com.xml b/src/chrome/content/rules/FoxyCart.com.xml
index 2b497f8e8703..a36d5a37a4b7 100644
--- a/src/chrome/content/rules/FoxyCart.com.xml
+++ b/src/chrome/content/rules/FoxyCart.com.xml
@@ -41,14 +41,16 @@
 -->
 
 
-	
-	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Foxydeal.de-falsemixed.xml b/src/chrome/content/rules/Foxydeal.de-falsemixed.xml
index 938889b26a0a..1b40e1632c23 100644
--- a/src/chrome/content/rules/Foxydeal.de-falsemixed.xml
+++ b/src/chrome/content/rules/Foxydeal.de-falsemixed.xml
@@ -7,7 +7,7 @@ Fetch error: http://foxydeal.com/ => https://foxydeal.de/: (28, 'Connection time
 	For rules not causing false/broken MCB, see Foxydeal.de.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Foxydeal.de.xml b/src/chrome/content/rules/Foxydeal.de.xml
index 8053c063cf13..5695e99485de 100644
--- a/src/chrome/content/rules/Foxydeal.de.xml
+++ b/src/chrome/content/rules/Foxydeal.de.xml
@@ -22,7 +22,7 @@ Fetch error: http://foxydeal.com/ => http://foxydeal.com/: (28, 'Connection time
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Fqtag.com.xml b/src/chrome/content/rules/Fqtag.com.xml
new file mode 100644
index 000000000000..32e9113220b3
--- /dev/null
+++ b/src/chrome/content/rules/Fqtag.com.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/FragDenStaat.de.xml b/src/chrome/content/rules/FragDenStaat.de.xml
deleted file mode 100644
index 11be6d10118b..000000000000
--- a/src/chrome/content/rules/FragDenStaat.de.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-  
-  
-
-  
-
-  
-
diff --git a/src/chrome/content/rules/Frama.io.xml b/src/chrome/content/rules/Frama.io.xml
new file mode 100644
index 000000000000..7503a3cf39b9
--- /dev/null
+++ b/src/chrome/content/rules/Frama.io.xml
@@ -0,0 +1,16 @@
+
+
+
+	
+	
+		
+		
+		
+
+	
+
+
diff --git a/src/chrome/content/rules/Framasoft.xml b/src/chrome/content/rules/Framasoft.xml
index e15c7c43d0a9..b48712454818 100644
--- a/src/chrome/content/rules/Framasoft.xml
+++ b/src/chrome/content/rules/Framasoft.xml
@@ -1,39 +1,6 @@
 
-        
-        
-        
-        
         
-        
-        
         
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-                                                                                                                                                      
-                                                                                                                                                               
-                                                                                                                                                           
-                                                                                                                                                          
-                                                                                                                                                              
-                                                                                                                                                             
-                                                                                                                                                                  
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
 
 		
 
diff --git a/src/chrome/content/rules/FrancaisFacile.com.xml b/src/chrome/content/rules/FrancaisFacile.com.xml
new file mode 100644
index 000000000000..70700a7e744d
--- /dev/null
+++ b/src/chrome/content/rules/FrancaisFacile.com.xml
@@ -0,0 +1,21 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/FranceTVInfo.fr.xml b/src/chrome/content/rules/FranceTVInfo.fr.xml
index d749afdf425a..6f2234395de1 100644
--- a/src/chrome/content/rules/FranceTVInfo.fr.xml
+++ b/src/chrome/content/rules/FranceTVInfo.fr.xml
@@ -4,7 +4,7 @@
 
 	Mixed content:
 		geopolis.francetvinfo.fr
-	
+
 	Different content HTTP/HTTPS:
 		m.geopolis.francetvinfo.fr
 
@@ -40,7 +40,7 @@
 	
 
-	
 
 
diff --git a/src/chrome/content/rules/Franceserv.xml b/src/chrome/content/rules/Franceserv.xml
index 1201d0ccfe18..ba108cc785a4 100644
--- a/src/chrome/content/rules/Franceserv.xml
+++ b/src/chrome/content/rules/Franceserv.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Frank_Timis.xml b/src/chrome/content/rules/Frank_Timis.xml
deleted file mode 100644
index 72f1c98984fb..000000000000
--- a/src/chrome/content/rules/Frank_Timis.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Franken.de.xml b/src/chrome/content/rules/Franken.de.xml
index 94bd5770542a..8552c29a7781 100644
--- a/src/chrome/content/rules/Franken.de.xml
+++ b/src/chrome/content/rules/Franken.de.xml
@@ -8,7 +8,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Franklin_W_Olin_College_of_Engineering.xml b/src/chrome/content/rules/Franklin_W_Olin_College_of_Engineering.xml
index 8b9a91b32d73..63c4f9f817b8 100644
--- a/src/chrome/content/rules/Franklin_W_Olin_College_of_Engineering.xml
+++ b/src/chrome/content/rules/Franklin_W_Olin_College_of_Engineering.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.olin.edu/ => https://www.olin.edu/: Cycle detected - URL
 		- ieee		(times out)
 
 -->
-
+
 
 	
 	
@@ -20,4 +20,4 @@ Fetch error: http://www.olin.edu/ => https://www.olin.edu/: Cycle detected - URL
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Frascati_Producties.nl.xml b/src/chrome/content/rules/Frascati_Producties.nl.xml
index 1bcbfa234629..3ae2d97e391f 100644
--- a/src/chrome/content/rules/Frascati_Producties.nl.xml
+++ b/src/chrome/content/rules/Frascati_Producties.nl.xml
@@ -14,7 +14,7 @@
 
 
 	
-	
+	
 
 
 	
-	
+	
 
 
 	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Frdic.com.xml b/src/chrome/content/rules/Frdic.com.xml
new file mode 100644
index 000000000000..696210a77161
--- /dev/null
+++ b/src/chrome/content/rules/Frdic.com.xml
@@ -0,0 +1,28 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
\ No newline at end of file
diff --git a/src/chrome/content/rules/Fred_and_Pickles.xml b/src/chrome/content/rules/Fred_and_Pickles.xml
index a7e288773ca5..34b82565af26 100644
--- a/src/chrome/content/rules/Fred_and_Pickles.xml
+++ b/src/chrome/content/rules/Fred_and_Pickles.xml
@@ -5,7 +5,7 @@ Fetch error: http://fredandpickles.co.uk/ => https://fredandpickles.co.uk/: (28,
 Fetch error: http://www.fredandpickles.co.uk/ => https://www.fredandpickles.co.uk/: (28, 'Operation timed out after 30001 milliseconds with 0 bytes received')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.fredandpickles.co.uk/ => https://www.fredandpickles.co.u
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Fredericia.dk.xml b/src/chrome/content/rules/Fredericia.dk.xml
index 9c5fe316ad44..60fdf52bdac9 100644
--- a/src/chrome/content/rules/Fredericia.dk.xml
+++ b/src/chrome/content/rules/Fredericia.dk.xml
@@ -5,7 +5,7 @@ Fetch error: http://fredericia.dk/ => https://fredericia.dk/: (60, 'SSL certific
 Fetch error: http://www.fredericia.dk/ => https://www.fredericia.dk/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Free-TV-Video-Online.me.xml b/src/chrome/content/rules/Free-TV-Video-Online.me.xml
index a847d1a591cb..dfe8cfecdb70 100644
--- a/src/chrome/content/rules/Free-TV-Video-Online.me.xml
+++ b/src/chrome/content/rules/Free-TV-Video-Online.me.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.free-tv-video-online.me/ => https://www.free-tv-video-on
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/FreeBSD.org.xml b/src/chrome/content/rules/FreeBSD.org.xml
index 279da4ddf177..50674cb0f679 100644
--- a/src/chrome/content/rules/FreeBSD.org.xml
+++ b/src/chrome/content/rules/FreeBSD.org.xml
@@ -78,4 +78,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/FreeBSoft.org.xml b/src/chrome/content/rules/FreeBSoft.org.xml
index 204d8bfe966a..6df3b39ac8c9 100644
--- a/src/chrome/content/rules/FreeBSoft.org.xml
+++ b/src/chrome/content/rules/FreeBSoft.org.xml
@@ -4,9 +4,7 @@
 		- www *
 		- beta **
 		- cvs **
-		- devel *
-		- git **
-		- live *
+		- lists
 
 	* Shows www.ktn.cz, valid cert
 	** 500, valid cert
@@ -23,8 +21,12 @@
 -->
 
 
+	
+	
+	
 	
-	
+	
+	
 
 
 	
 
-
-	
 	
+	
 	
 	
 	
 	
-	
 	
+	
 	
 	
+	
 	
 	
+	
+	
 	
 	
 	
 	
 	
+	
 	
+	
 	
 	
 	
 	
 	
+	
 	
 	
 	
 	
 	
 	
-	
 	
-	
 	
 	
-	
-
-	
-	
-	
+	
 	
 
-		
-		
-
-
-	
-
-
-	
-	
-
-	
-
-		
-
-	
-
-		
+	
 
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/FreePDFHosting.com.xml b/src/chrome/content/rules/FreePDFHosting.com.xml
new file mode 100644
index 000000000000..c690f67dbbb5
--- /dev/null
+++ b/src/chrome/content/rules/FreePDFHosting.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/FreePress.net.xml b/src/chrome/content/rules/FreePress.net.xml
new file mode 100644
index 000000000000..eec0b63f6515
--- /dev/null
+++ b/src/chrome/content/rules/FreePress.net.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/FreeRADIUS.org.xml b/src/chrome/content/rules/FreeRADIUS.org.xml
new file mode 100644
index 000000000000..fb881907d3a4
--- /dev/null
+++ b/src/chrome/content/rules/FreeRADIUS.org.xml
@@ -0,0 +1,21 @@
+
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/FreeRTOS.org.xml b/src/chrome/content/rules/FreeRTOS.org.xml
deleted file mode 100644
index 07a968cd33de..000000000000
--- a/src/chrome/content/rules/FreeRTOS.org.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/FreeSWITCH.org.xml b/src/chrome/content/rules/FreeSWITCH.org.xml
index a874c18900df..a49e1a480007 100644
--- a/src/chrome/content/rules/FreeSWITCH.org.xml
+++ b/src/chrome/content/rules/FreeSWITCH.org.xml
@@ -1,33 +1,18 @@
 
-
+
 
-	
 	
+	
 	
 	
+	
 	
+	
+	
 	
-	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/FreeThesaurus.com.xml b/src/chrome/content/rules/FreeThesaurus.com.xml
new file mode 100644
index 000000000000..69f79a5fc94c
--- /dev/null
+++ b/src/chrome/content/rules/FreeThesaurus.com.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+
+		
+		
+		
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/FreeWheel-problematic.xml b/src/chrome/content/rules/FreeWheel-problematic.xml
index e29c2847b94a..bd7e3b5d4e96 100644
--- a/src/chrome/content/rules/FreeWheel-problematic.xml
+++ b/src/chrome/content/rules/FreeWheel-problematic.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/FreeWheel.xml b/src/chrome/content/rules/FreeWheel.xml
index ad14bd5b3c77..592b1654b087 100644
--- a/src/chrome/content/rules/FreeWheel.xml
+++ b/src/chrome/content/rules/FreeWheel.xml
@@ -18,10 +18,11 @@ Fetch error: http://mrm.freewheel.tv/ => https://mrm.freewhell.tv/: (6, 'Could n
 		- m1.fwmrm.net	(503, akamai)
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
@@ -33,7 +34,6 @@ Fetch error: http://mrm.freewheel.tv/ => https://mrm.freewhell.tv/: (6, 'Could n
 
 	
-	
 
+	
 
diff --git a/src/chrome/content/rules/Free_Bible_Software.com.xml b/src/chrome/content/rules/Free_Bible_Software.com.xml
index 398f6c3eee76..1548eed788a1 100644
--- a/src/chrome/content/rules/Free_Bible_Software.com.xml
+++ b/src/chrome/content/rules/Free_Bible_Software.com.xml
@@ -9,7 +9,7 @@
 		- www.freebiblesoftware.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Free_Movement.org.uk.xml b/src/chrome/content/rules/Free_Movement.org.uk.xml
index c594a920a90a..c37f8ebbd69d 100644
--- a/src/chrome/content/rules/Free_Movement.org.uk.xml
+++ b/src/chrome/content/rules/Free_Movement.org.uk.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://freemovement.org.uk/ => https://freemovement.org.uk/: (51, "SSL: no alternative certificate subject name matches target host name 'freemovement.org.uk'")
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Free_Porn_Gif.com-falsemixed.xml b/src/chrome/content/rules/Free_Porn_Gif.com-falsemixed.xml
deleted file mode 100644
index b0203265f68b..000000000000
--- a/src/chrome/content/rules/Free_Porn_Gif.com-falsemixed.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Free_Porn_Gif.com.xml b/src/chrome/content/rules/Free_Porn_Gif.com.xml
deleted file mode 100644
index 13fe450e64d8..000000000000
--- a/src/chrome/content/rules/Free_Porn_Gif.com.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-	
-	
-	
-
-		
-		
-
-			
-			
-			
-			
-
-			
-			
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Free_Press.xml b/src/chrome/content/rules/Free_Press.xml
deleted file mode 100644
index 3bec521416ad..000000000000
--- a/src/chrome/content/rules/Free_Press.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Free_Rainbow_Tables.xml b/src/chrome/content/rules/Free_Rainbow_Tables.xml
index baf9ceb15bbd..d432247fc857 100644
--- a/src/chrome/content/rules/Free_Rainbow_Tables.xml
+++ b/src/chrome/content/rules/Free_Rainbow_Tables.xml
@@ -5,7 +5,7 @@ Fetch error: http://freerainbowtables.com/ => https://freerainbowtables.com/: (7
 Fetch error: http://www.freerainbowtables.com/ => https://www.freerainbowtables.com/: (7, 'Failed to connect to www.freerainbowtables.com port 443: Connection refused')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Free_State_Project.org.xml b/src/chrome/content/rules/Free_State_Project.org.xml
index 93847806d87a..b43575385b05 100644
--- a/src/chrome/content/rules/Free_State_Project.org.xml
+++ b/src/chrome/content/rules/Free_State_Project.org.xml
@@ -14,7 +14,7 @@ Fetch error: http://pledge.freestateproject.org/ => https://pledge.freestateproj
 		- pledge.freestateproject.org
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Freebase.xml b/src/chrome/content/rules/Freebase.xml
index d0fff9c2f56a..57d689f2a107 100644
--- a/src/chrome/content/rules/Freebase.xml
+++ b/src/chrome/content/rules/Freebase.xml
@@ -21,7 +21,7 @@ Fetch error: http://freebase.com/ => https://www.freebase.com/: (60, 'SSL certif
 	^freebase.com: Handshake fails
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Freebaselibs.com.xml b/src/chrome/content/rules/Freebaselibs.com.xml
index 5757a60fef7a..317f6c9c9d80 100644
--- a/src/chrome/content/rules/Freebaselibs.com.xml
+++ b/src/chrome/content/rules/Freebaselibs.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://freebaselibs.com/ => https://static.freebase.com/: (60, 'SSL
 	^freebaselibs.com: Handshake fails
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Freecause.xml b/src/chrome/content/rules/Freecause.xml
index c928647bf465..70f238dc3961 100644
--- a/src/chrome/content/rules/Freecause.xml
+++ b/src/chrome/content/rules/Freecause.xml
@@ -5,7 +5,7 @@ Fetch error: http://freecause.com/ => https://freecause.com/: (28, 'Connection t
 Fetch error: http://www.freecause.com/ => https://www.freecause.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Freed0m4All.net.xml b/src/chrome/content/rules/Freed0m4All.net.xml
index 332ebf5a5bfd..f42bfc5e5bdd 100644
--- a/src/chrome/content/rules/Freed0m4All.net.xml
+++ b/src/chrome/content/rules/Freed0m4All.net.xml
@@ -22,7 +22,7 @@
 		- .freed0m4all.net
 
 -->
-
+
 
 	
 	
@@ -36,7 +36,7 @@
 					-->
 	
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Freedom-to-Tinker.xml b/src/chrome/content/rules/Freedom-to-Tinker.xml
index b5c4bc6e297d..7263d389ca34 100644
--- a/src/chrome/content/rules/Freedom-to-Tinker.xml
+++ b/src/chrome/content/rules/Freedom-to-Tinker.xml
@@ -4,7 +4,7 @@
 	
 
 
-	
+	
 
 
 	
 
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Freefilm.to.xml b/src/chrome/content/rules/Freefilm.to.xml
new file mode 100644
index 000000000000..c28d109db493
--- /dev/null
+++ b/src/chrome/content/rules/Freefilm.to.xml
@@ -0,0 +1,9 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Freegeoip.net.xml b/src/chrome/content/rules/Freegeoip.net.xml
index 3256be89ccbe..844e9db12cf8 100644
--- a/src/chrome/content/rules/Freegeoip.net.xml
+++ b/src/chrome/content/rules/Freegeoip.net.xml
@@ -6,7 +6,7 @@
 	
 
 
-	
+	
 
 
 	
 
 
-	
+	
 
 
 	 https://freelancersunion.org/: (51,
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Freelibrary.org.xml b/src/chrome/content/rules/Freelibrary.org.xml
new file mode 100644
index 000000000000..772d7ee955e3
--- /dev/null
+++ b/src/chrome/content/rules/Freelibrary.org.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Freenet.de.xml b/src/chrome/content/rules/Freenet.de.xml
index f2074907e947..6ebf86c48f40 100644
--- a/src/chrome/content/rules/Freenet.de.xml
+++ b/src/chrome/content/rules/Freenet.de.xml
@@ -89,7 +89,7 @@ Fetch error: http://www.mload.freenet.de/ => https://www.mload.freenet.de/: (35,
 		- .freenet.de
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Freenom.com.xml b/src/chrome/content/rules/Freenom.com.xml
new file mode 100644
index 000000000000..45b596ac7dde
--- /dev/null
+++ b/src/chrome/content/rules/Freenom.com.xml
@@ -0,0 +1,22 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Freenom.world.xml b/src/chrome/content/rules/Freenom.world.xml
new file mode 100644
index 000000000000..3dbb9b40ca18
--- /dev/null
+++ b/src/chrome/content/rules/Freenom.world.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Freeones.xml b/src/chrome/content/rules/Freeones.xml
new file mode 100644
index 000000000000..6404b4dcd106
--- /dev/null
+++ b/src/chrome/content/rules/Freeones.xml
@@ -0,0 +1,192 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Freepik.com.xml b/src/chrome/content/rules/Freepik.com.xml
deleted file mode 100644
index 13dc20dc6f07..000000000000
--- a/src/chrome/content/rules/Freepik.com.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Freescale.com.xml b/src/chrome/content/rules/Freescale.com.xml
index cbdf3a94e9f2..c24755ec54b0 100644
--- a/src/chrome/content/rules/Freescale.com.xml
+++ b/src/chrome/content/rules/Freescale.com.xml
@@ -85,7 +85,7 @@ Fetch error: http://fdc.freescale.com/ => https://fdc.freescale.com/: (6, 'Could
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Freetorrent.fr.xml b/src/chrome/content/rules/Freetorrent.fr.xml
deleted file mode 100644
index 137b4488818a..000000000000
--- a/src/chrome/content/rules/Freetorrent.fr.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Freezone.co.uk.xml b/src/chrome/content/rules/Freezone.co.uk.xml
index 0fda55bded09..8084065bdb37 100644
--- a/src/chrome/content/rules/Freezone.co.uk.xml
+++ b/src/chrome/content/rules/Freezone.co.uk.xml
@@ -17,7 +17,7 @@ Fetch error: http://support.freezone.co.uk/ => https://support.freezone.co.uk/:
 		- .freezone.co.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Freifunk-Ansbach.de.xml b/src/chrome/content/rules/Freifunk-Ansbach.de.xml
index eeef76ffdebb..e273e08a1d24 100644
--- a/src/chrome/content/rules/Freifunk-Ansbach.de.xml
+++ b/src/chrome/content/rules/Freifunk-Ansbach.de.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.freifunk-ansbach.de/ => https://www.freifunk-ansbach.de/: (51, "SSL: no alternative certificate subject name matches target host name 'www.freifunk-ansbach.de'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Freifunk.xml b/src/chrome/content/rules/Freifunk.xml
index eca8015e7f9d..149469a8e2b8 100644
--- a/src/chrome/content/rules/Freifunk.xml
+++ b/src/chrome/content/rules/Freifunk.xml
@@ -2,6 +2,7 @@
 	Other rulesets for freifunk.net:
 		- Freifunk-Bremen.xml
 		- Freifunk-FFM.xml
+		- ortenau.freifunk.net.xml
 
 	Nonfunctional subdomains:
 
@@ -19,6 +20,7 @@
 		- mailinglisten ¹
 		- piwik ³
 		- twitter ¹
+		- umfragen ¹
 		- vimeo ¹
 		- youtube ¹
 
@@ -46,11 +48,10 @@
 	
 	
 	
-	
 	
 	
 	
-	
+
         
 
 	
diff --git a/src/chrome/content/rules/Freight_Calculator_Australia.xml b/src/chrome/content/rules/Freight_Calculator_Australia.xml
deleted file mode 100644
index 4e0e37237e6d..000000000000
--- a/src/chrome/content/rules/Freight_Calculator_Australia.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Freitag.xml b/src/chrome/content/rules/Freitag.xml
index df90f31af507..6e45b1cada3d 100644
--- a/src/chrome/content/rules/Freitag.xml
+++ b/src/chrome/content/rules/Freitag.xml
@@ -4,8 +4,8 @@
     
     
 
-    	
-	
+    
+
     
 
diff --git a/src/chrome/content/rules/French-Country-Cottages.co.uk.xml b/src/chrome/content/rules/French-Country-Cottages.co.uk.xml
index 273a8d59ad9b..5bc4fe812916 100644
--- a/src/chrome/content/rules/French-Country-Cottages.co.uk.xml
+++ b/src/chrome/content/rules/French-Country-Cottages.co.uk.xml
@@ -10,9 +10,9 @@
 	
 	
 
-	
 
-	
 
diff --git a/src/chrome/content/rules/French-National-Centre-for-Scientific-Research.xml b/src/chrome/content/rules/French-National-Centre-for-Scientific-Research.xml
index 21149ce1de58..04a8ec0f1744 100644
--- a/src/chrome/content/rules/French-National-Centre-for-Scientific-Research.xml
+++ b/src/chrome/content/rules/French-National-Centre-for-Scientific-Research.xml
@@ -116,7 +116,7 @@ Fetch error: http://labintel.cnrs.fr/ => https://labintel.cnrs.fr/: (60, 'SSL ce
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
@@ -147,6 +147,8 @@ Fetch error: http://labintel.cnrs.fr/ => https://labintel.cnrs.fr/: (60, 'SSL ce
 	
 	
 	
+	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/FrenchLeaks.fr.xml b/src/chrome/content/rules/FrenchLeaks.fr.xml
new file mode 100644
index 000000000000..b319d5897495
--- /dev/null
+++ b/src/chrome/content/rules/FrenchLeaks.fr.xml
@@ -0,0 +1,9 @@
+
+
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/FreshBooks.xml b/src/chrome/content/rules/FreshBooks.xml
deleted file mode 100644
index 3cba4fcf3cd7..000000000000
--- a/src/chrome/content/rules/FreshBooks.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-	
-	
-	
-	
-		
-		
-
-
-	
-
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/FreshFromThePot.com.xml b/src/chrome/content/rules/FreshFromThePot.com.xml
new file mode 100644
index 000000000000..72be7c0e343d
--- /dev/null
+++ b/src/chrome/content/rules/FreshFromThePot.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Freshdesk.com.xml b/src/chrome/content/rules/Freshdesk.com.xml
new file mode 100644
index 000000000000..841c276be0b6
--- /dev/null
+++ b/src/chrome/content/rules/Freshdesk.com.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Freshdesk.xml b/src/chrome/content/rules/Freshdesk.xml
deleted file mode 100644
index 033c81028dcd..000000000000
--- a/src/chrome/content/rules/Freshdesk.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-	
-		
-
-
-	
-
-	
-
-	
-
-	
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Freshmilk.de.xml b/src/chrome/content/rules/Freshmilk.de.xml
index d13500298907..53de75afe6dc 100644
--- a/src/chrome/content/rules/Freshmilk.de.xml
+++ b/src/chrome/content/rules/Freshmilk.de.xml
@@ -21,13 +21,13 @@
 
 
 	
-	
+	
+	
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Freshmilk.tv.xml b/src/chrome/content/rules/Freshmilk.tv.xml
deleted file mode 100644
index 4c7efa69d6dd..000000000000
--- a/src/chrome/content/rules/Freshmilk.tv.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Frictional-Games.xml b/src/chrome/content/rules/Frictional-Games.xml
index eea2ed6e2554..477c683f297c 100644
--- a/src/chrome/content/rules/Frictional-Games.xml
+++ b/src/chrome/content/rules/Frictional-Games.xml
@@ -4,7 +4,7 @@
 	
 	
 
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/FriendFinder.xml b/src/chrome/content/rules/FriendFinder.xml
index 2877fd5c6146..47efbdbbef14 100644
--- a/src/chrome/content/rules/FriendFinder.xml
+++ b/src/chrome/content/rules/FriendFinder.xml
@@ -49,7 +49,7 @@ Fetch error: http://media.friendfinder.com/ => https://media.friendfinder.com/:
 	* Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Friendster.xml b/src/chrome/content/rules/Friendster.xml
index ad0ee6d84139..35d4b4d5d783 100644
--- a/src/chrome/content/rules/Friendster.xml
+++ b/src/chrome/content/rules/Friendster.xml
@@ -26,7 +26,7 @@ Fetch error: http://assets0.frndcdn.net/ => https://d3outgkpos8q21.cloudfront.ne
 	Some pages redirect to http
 
 -->
-
+
 
 	
 	
@@ -39,4 +39,4 @@ Fetch error: http://assets0.frndcdn.net/ => https://d3outgkpos8q21.cloudfront.ne
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Friesland_Bank.nl.xml b/src/chrome/content/rules/Friesland_Bank.nl.xml
deleted file mode 100644
index d2f1b529f049..000000000000
--- a/src/chrome/content/rules/Friesland_Bank.nl.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-		
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Frim.nl.xml b/src/chrome/content/rules/Frim.nl.xml
index a8ebc280db40..e9e2a96fd7d4 100644
--- a/src/chrome/content/rules/Frim.nl.xml
+++ b/src/chrome/content/rules/Frim.nl.xml
@@ -1,13 +1,14 @@
 
 
 	
-	
+	
+	
+	
 
 	
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Frivillighetshuset.no.xml b/src/chrome/content/rules/Frivillighetshuset.no.xml
index 1d808962e1b0..29cbc134e32c 100644
--- a/src/chrome/content/rules/Frivillighetshuset.no.xml
+++ b/src/chrome/content/rules/Frivillighetshuset.no.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.frivillighetshuset.no/ => https://www.frivillighetshuset
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/From-UA.com.xml b/src/chrome/content/rules/From-UA.com.xml
new file mode 100644
index 000000000000..e2338879058b
--- /dev/null
+++ b/src/chrome/content/rules/From-UA.com.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/FrontEndChecklist.io.xml b/src/chrome/content/rules/FrontEndChecklist.io.xml
new file mode 100644
index 000000000000..6f8faa501961
--- /dev/null
+++ b/src/chrome/content/rules/FrontEndChecklist.io.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Frontier-Network-and-Computing-Systems.xml b/src/chrome/content/rules/Frontier-Network-and-Computing-Systems.xml
index c3724235ba27..026853d4dc88 100644
--- a/src/chrome/content/rules/Frontier-Network-and-Computing-Systems.xml
+++ b/src/chrome/content/rules/Frontier-Network-and-Computing-Systems.xml
@@ -19,10 +19,10 @@ Fetch error: http://fcns.eu/ => https://fcns.eu/: (7, 'Failed to connect to fcns
 	² Secured by us
 
 -->
-
+
 
 	
-	
+	
 
 
 	
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://frozen-yogurt-franchise.org/ => https://frozen-yogurt-franch
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Frugalware.org.xml b/src/chrome/content/rules/Frugalware.org.xml
index 0e0694ba7d35..3327b76790cf 100644
--- a/src/chrome/content/rules/Frugalware.org.xml
+++ b/src/chrome/content/rules/Frugalware.org.xml
@@ -7,6 +7,7 @@
 		packages.frugalware.org
 		planet.frugalware.org
 		wiki.frugalware.org
+    bugs.frugalware.org
 
 	Private subdomain:
 		webmail.frugalware.org
@@ -15,18 +16,16 @@
 		www\d.frugalware.org
 		rsync\d.frugalware.org
 
+  Unresolved host:
+    - planet.frugalware.org
+
 -->
 
 
 	
 	
-	
 	
 	
-	
-		
-			
-			
 
 	
 
@@ -36,9 +35,6 @@
 	
 
-	
-
 	
 
diff --git a/src/chrome/content/rules/Frys.xml b/src/chrome/content/rules/Frys.xml
index f3cba6fe880d..ea237c4e4b87 100644
--- a/src/chrome/content/rules/Frys.xml
+++ b/src/chrome/content/rules/Frys.xml
@@ -4,10 +4,16 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
+	
+	
 
 
-	
+	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Fuerza_Popular.xml b/src/chrome/content/rules/Fuerza_Popular.xml
deleted file mode 100644
index a3f9f8a36eb4..000000000000
--- a/src/chrome/content/rules/Fuerza_Popular.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-	
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Fujirumors.com.xml b/src/chrome/content/rules/Fujirumors.com.xml
new file mode 100644
index 000000000000..720c063bf24c
--- /dev/null
+++ b/src/chrome/content/rules/Fujirumors.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Fujitsu.xml b/src/chrome/content/rules/Fujitsu.xml
index 6f93473b2aa2..57f91d2578c4 100644
--- a/src/chrome/content/rules/Fujitsu.xml
+++ b/src/chrome/content/rules/Fujitsu.xml
@@ -1,42 +1,32 @@
 
-
-
-	
-	
-	
-	
-		
-	
-	
-	
-	
-
-
-	
-	
+	Non-functional hosts in *.fujitsu.com:
+		SSL connect error:
+		- sports-topics.jp.fujitsu.com
 
+		SSL peer certificate was not OK:
+		- img.jp.fujitsu.com
 
-	
-	
+		Self-signed certificate chain error:
+		- www.fei.fujitsu.com
 
-	
-
-	
-	
-
-	
-
-	
-	
+-->
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
+	
 
diff --git a/src/chrome/content/rules/Fukuchi.org.xml b/src/chrome/content/rules/Fukuchi.org.xml
index 05d6920d0df3..a37a3f01e7d5 100644
--- a/src/chrome/content/rules/Fukuchi.org.xml
+++ b/src/chrome/content/rules/Fukuchi.org.xml
@@ -13,4 +13,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Fulcrum_Biometrics.xml b/src/chrome/content/rules/Fulcrum_Biometrics.xml
index 132042ab2f90..dc63680fa875 100644
--- a/src/chrome/content/rules/Fulcrum_Biometrics.xml
+++ b/src/chrome/content/rules/Fulcrum_Biometrics.xml
@@ -13,4 +13,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Full-Circle-Studies.xml b/src/chrome/content/rules/Full-Circle-Studies.xml
index 684b08f5728b..f18a35b03942 100644
--- a/src/chrome/content/rules/Full-Circle-Studies.xml
+++ b/src/chrome/content/rules/Full-Circle-Studies.xml
@@ -22,7 +22,7 @@
 					-->
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/FullSlate.xml b/src/chrome/content/rules/FullSlate.xml
index a10b5ffbd956..13eeaa03f2d6 100644
--- a/src/chrome/content/rules/FullSlate.xml
+++ b/src/chrome/content/rules/FullSlate.xml
@@ -2,7 +2,6 @@
 	
 	
 
-	
 	
 	
 	
diff --git a/src/chrome/content/rules/FullTraffic.xml b/src/chrome/content/rules/FullTraffic.xml
index 11471d3184fd..f3769a191141 100644
--- a/src/chrome/content/rules/FullTraffic.xml
+++ b/src/chrome/content/rules/FullTraffic.xml
@@ -12,4 +12,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Full_Signal.xml b/src/chrome/content/rules/Full_Signal.xml
index 5cd3f12ef96f..bcba7564f327 100644
--- a/src/chrome/content/rules/Full_Signal.xml
+++ b/src/chrome/content/rules/Full_Signal.xml
@@ -16,7 +16,6 @@
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Fullerton.edu.xml b/src/chrome/content/rules/Fullerton.edu.xml
index 84532d74be5c..75e3f5aa25f7 100644
--- a/src/chrome/content/rules/Fullerton.edu.xml
+++ b/src/chrome/content/rules/Fullerton.edu.xml
@@ -89,16 +89,36 @@ Fetch error: http://fullerton.edu/ => https://fullerton.edu/: (51, "SSL: no alte
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/FundRazr.com.xml b/src/chrome/content/rules/FundRazr.com.xml
index 7378d1f08443..ec5ff8251e02 100644
--- a/src/chrome/content/rules/FundRazr.com.xml
+++ b/src/chrome/content/rules/FundRazr.com.xml
@@ -23,7 +23,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Fundinfo.com.xml b/src/chrome/content/rules/Fundinfo.com.xml
index a7611ca17a5d..c2f018068c95 100644
--- a/src/chrome/content/rules/Fundinfo.com.xml
+++ b/src/chrome/content/rules/Fundinfo.com.xml
@@ -1,59 +1,37 @@
 
-
+
 
 	
+	
 	
+	
+	
 	
+	
+	
+	
+	
 	
+		
 	
 	
-	
-		
-		
-
+	
+	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Funet.fi.xml b/src/chrome/content/rules/Funet.fi.xml
index 6f969c027354..aa36054b25ec 100644
--- a/src/chrome/content/rules/Funet.fi.xml
+++ b/src/chrome/content/rules/Funet.fi.xml
@@ -2,8 +2,13 @@
 
 	
+	
 	
 	
+	
+	
+	
+	
 
 
 	 https://funkyandroid.com/: (51, "SS
 	Cert only matches ^funkyandroid.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Furaffinity.xml b/src/chrome/content/rules/Furaffinity.xml
index f92d7fde5754..8a4c368bf315 100644
--- a/src/chrome/content/rules/Furaffinity.xml
+++ b/src/chrome/content/rules/Furaffinity.xml
@@ -8,9 +8,13 @@
 -->
 
 
-	
+	
+	
 	
-	
+	
+	
+	
+	
 
 
 	
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Fusion-lifestyle.com.xml b/src/chrome/content/rules/Fusion-lifestyle.com.xml
index c185c98a5a91..970e9b395968 100644
--- a/src/chrome/content/rules/Fusion-lifestyle.com.xml
+++ b/src/chrome/content/rules/Fusion-lifestyle.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://fusion-lifestyle.com/ => https://www.fusion-lifestyle.com/:
 Fetch error: http://www.fusion-lifestyle.com/ => https://www.fusion-lifestyle.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/FusionForge.xml b/src/chrome/content/rules/FusionForge.xml
index 7d7b73d6955d..fa7af5753a60 100644
--- a/src/chrome/content/rules/FusionForge.xml
+++ b/src/chrome/content/rules/FusionForge.xml
@@ -5,7 +5,7 @@
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/FusionIO.xml b/src/chrome/content/rules/FusionIO.xml
index 88817d5b02b1..4d99096908d2 100644
--- a/src/chrome/content/rules/FusionIO.xml
+++ b/src/chrome/content/rules/FusionIO.xml
@@ -4,16 +4,19 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://fusionio.com/ => https://fusionio.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
+	
 
 
-	
+	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/FusionNet.xml b/src/chrome/content/rules/FusionNet.xml
deleted file mode 100644
index 682ea2a888c8..000000000000
--- a/src/chrome/content/rules/FusionNet.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-  
-  
-
-  
-
-  
-
diff --git a/src/chrome/content/rules/Fuskator.com.xml b/src/chrome/content/rules/Fuskator.com.xml
index b17ebeaedf85..85651b74a759 100644
--- a/src/chrome/content/rules/Fuskator.com.xml
+++ b/src/chrome/content/rules/Fuskator.com.xml
@@ -20,4 +20,4 @@
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Futura-Sciences.com.xml b/src/chrome/content/rules/Futura-Sciences.com.xml
new file mode 100644
index 000000000000..3c455785906e
--- /dev/null
+++ b/src/chrome/content/rules/Futura-Sciences.com.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+	
+	
+	
+		
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Future-Publishing.xml b/src/chrome/content/rules/Future-Publishing.xml
deleted file mode 100644
index ae987002c395..000000000000
--- a/src/chrome/content/rules/Future-Publishing.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/FutureQuest.net.xml b/src/chrome/content/rules/FutureQuest.net.xml
index 7f6e81373509..b735e798a6aa 100644
--- a/src/chrome/content/rules/FutureQuest.net.xml
+++ b/src/chrome/content/rules/FutureQuest.net.xml
@@ -15,7 +15,7 @@ Fetch error: http://www.service.futurequest.net/ => https://www.service.futurequ
 		- (www.)questadmin.net		(shows secure, mismatched)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Futurity.org.xml b/src/chrome/content/rules/Futurity.org.xml
index a99a14e0c528..60aba807580f 100644
--- a/src/chrome/content/rules/Futurity.org.xml
+++ b/src/chrome/content/rules/Futurity.org.xml
@@ -1,4 +1,4 @@
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Fxguide.com.xml b/src/chrome/content/rules/Fxguide.com.xml
deleted file mode 100644
index 2f782c47b5be..000000000000
--- a/src/chrome/content/rules/Fxguide.com.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-		
-
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Fxphd.xml b/src/chrome/content/rules/Fxphd.xml
index 5272863c3d27..ec275220ee7c 100644
--- a/src/chrome/content/rules/Fxphd.xml
+++ b/src/chrome/content/rules/Fxphd.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/G-Data-Software.xml b/src/chrome/content/rules/G-Data-Software.xml
index 57950e765eac..46f55be167a4 100644
--- a/src/chrome/content/rules/G-Data-Software.xml
+++ b/src/chrome/content/rules/G-Data-Software.xml
@@ -67,7 +67,7 @@ Fetch error: http://www.gdata.co.mx/ => https://www.gdata.co.mx/: (6, 'Could not
 	Missing tw coverage => partial
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/G33kinfo.com-falsemixed.xml b/src/chrome/content/rules/G33kinfo.com-falsemixed.xml
deleted file mode 100644
index 3a08507e4a3e..000000000000
--- a/src/chrome/content/rules/G33kinfo.com-falsemixed.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/G33kinfo.com.xml b/src/chrome/content/rules/G33kinfo.com.xml
index 300fb8194e87..05892e5e6697 100644
--- a/src/chrome/content/rules/G33kinfo.com.xml
+++ b/src/chrome/content/rules/G33kinfo.com.xml
@@ -1,50 +1,8 @@
-
-
+
 
 	
 	
-
-		
-		
-
-			
-			
-			
-			
-			
-
-			
-			
-
+	
 
 	
diff --git a/src/chrome/content/rules/G5.gov.xml b/src/chrome/content/rules/G5.gov.xml
deleted file mode 100644
index 7ceb3de66a3b..000000000000
--- a/src/chrome/content/rules/G5.gov.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/GAIA_Host_Collective.xml b/src/chrome/content/rules/GAIA_Host_Collective.xml
index a7d0a4c7ab1f..dcca48c4f88f 100644
--- a/src/chrome/content/rules/GAIA_Host_Collective.xml
+++ b/src/chrome/content/rules/GAIA_Host_Collective.xml
@@ -1,13 +1,14 @@
 
 
 	
-	
+	
+	
+	
 
 
-	
+	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/GAcollege411.org.xml b/src/chrome/content/rules/GAcollege411.org.xml
index 61c9120f3ea4..58d21c25a9eb 100644
--- a/src/chrome/content/rules/GAcollege411.org.xml
+++ b/src/chrome/content/rules/GAcollege411.org.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.gacollege411.org/ => https://www.gacollege411.org/: (60,
 		- secure
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/GBConsult.info.xml b/src/chrome/content/rules/GBConsult.info.xml
index 09ef0ab5f670..e62be7168f3f 100644
--- a/src/chrome/content/rules/GBConsult.info.xml
+++ b/src/chrome/content/rules/GBConsult.info.xml
@@ -9,17 +9,17 @@
 
 	
 	
-	
+
 	
 	
 	
 
-	
-	
-	
-	
+
 	
 
diff --git a/src/chrome/content/rules/GCM_Asia.com.xml b/src/chrome/content/rules/GCM_Asia.com.xml
index 2f3d52195b5c..449dfb1afeb1 100644
--- a/src/chrome/content/rules/GCM_Asia.com.xml
+++ b/src/chrome/content/rules/GCM_Asia.com.xml
@@ -19,4 +19,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/GCM_Computers.com.xml b/src/chrome/content/rules/GCM_Computers.com.xml
index b61adf493d0e..9b2ebe2efb6f 100644
--- a/src/chrome/content/rules/GCM_Computers.com.xml
+++ b/src/chrome/content/rules/GCM_Computers.com.xml
@@ -5,13 +5,14 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/GCN.lgbt.xml b/src/chrome/content/rules/GCN.lgbt.xml
deleted file mode 100644
index c26d05389362..000000000000
--- a/src/chrome/content/rules/GCN.lgbt.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/GCWStorage.xyz.xml b/src/chrome/content/rules/GCWStorage.xyz.xml
deleted file mode 100644
index ab879ffe2cd5..000000000000
--- a/src/chrome/content/rules/GCWStorage.xyz.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/GCaptain.com.xml b/src/chrome/content/rules/GCaptain.com.xml
index 4efcfebc9872..ce98b37d330a 100644
--- a/src/chrome/content/rules/GCaptain.com.xml
+++ b/src/chrome/content/rules/GCaptain.com.xml
@@ -28,7 +28,7 @@ Non-2xx HTTP code: http://cfs1.gcaptain.com/ (200) => https://d2m8pnbf2v4ae2.clo
 	* cloudfront
 
 -->
-
+
 
 	
@@ -69,9 +69,6 @@ Non-2xx HTTP code: http://cfs1.gcaptain.com/ (200) => https://d2m8pnbf2v4ae2.clo
 	
 
-	
-
 	
 
diff --git a/src/chrome/content/rules/GCemetery.co.xml b/src/chrome/content/rules/GCemetery.co.xml
new file mode 100644
index 000000000000..e9cebf282abf
--- /dev/null
+++ b/src/chrome/content/rules/GCemetery.co.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/GEANT.net.xml b/src/chrome/content/rules/GEANT.net.xml
index 99f168f08ee6..7fa572a408a5 100644
--- a/src/chrome/content/rules/GEANT.net.xml
+++ b/src/chrome/content/rules/GEANT.net.xml
@@ -34,7 +34,7 @@ Fetch error: http://weblogin2.geant.net/ => https://weblogin2.geant.net/: (28, '
 		- www
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/GEANT.org.xml b/src/chrome/content/rules/GEANT.org.xml
index d7a9a5910560..92527d5d6b8e 100644
--- a/src/chrome/content/rules/GEANT.org.xml
+++ b/src/chrome/content/rules/GEANT.org.xml
@@ -62,7 +62,7 @@ Fetch error: http://test-login.geant.org/ => https://test-login.geant.org/: (6,
 		- uat-intranet.geant.org
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/GEBlogs.com.xml b/src/chrome/content/rules/GEBlogs.com.xml
new file mode 100644
index 000000000000..e75fbe1c4533
--- /dev/null
+++ b/src/chrome/content/rules/GEBlogs.com.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/GEMoney.xml b/src/chrome/content/rules/GEMoney.xml
index 887718313f87..f96c28fd8455 100644
--- a/src/chrome/content/rules/GEMoney.xml
+++ b/src/chrome/content/rules/GEMoney.xml
@@ -5,7 +5,7 @@ Fetch error: http://apply.gemoney.com.au/ => https://apply.gemoney.com.au/: (35,
 Fetch error: http://28degrees-online.gemoney.com.au/ => https://28degrees-online.gemoney.com.au/: (35, 'Unknown SSL protocol error in connection to 28degrees-online.gemoney.com.au:443 ')
 
 -->
-
+
 	
 	
 	
@@ -13,4 +13,4 @@ Fetch error: http://28degrees-online.gemoney.com.au/ => https://28degrees-online
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/GER-WLAN.de.xml b/src/chrome/content/rules/GER-WLAN.de.xml
new file mode 100644
index 000000000000..27c792b0c19e
--- /dev/null
+++ b/src/chrome/content/rules/GER-WLAN.de.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/GFI_Cloud.xml b/src/chrome/content/rules/GFI_Cloud.xml
index c856a43d5aff..24f5285c3d6b 100644
--- a/src/chrome/content/rules/GFI_Cloud.xml
+++ b/src/chrome/content/rules/GFI_Cloud.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.gficloud.com/ => https://www.gficloud.com/: (60, 'SSL ce
 	For other GFI Software Development coverage, see GFI_Software_Development.xml.
 
 -->
-
+
 
 	
 	
@@ -19,4 +19,4 @@ Fetch error: http://www.gficloud.com/ => https://www.gficloud.com/: (60, 'SSL ce
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/GFM_Trader.com.xml b/src/chrome/content/rules/GFM_Trader.com.xml
deleted file mode 100644
index 130b32c8cdbd..000000000000
--- a/src/chrome/content/rules/GFM_Trader.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/GHacks.net.xml b/src/chrome/content/rules/GHacks.net.xml
index fd86cffe346b..22f5f85a9e41 100644
--- a/src/chrome/content/rules/GHacks.net.xml
+++ b/src/chrome/content/rules/GHacks.net.xml
@@ -5,8 +5,8 @@
 		
 		
 		
-		
-	
+	
+
 	
 
 	
diff --git a/src/chrome/content/rules/GHash.IO.xml b/src/chrome/content/rules/GHash.IO.xml
index 69b597cb3ead..9544bb878203 100644
--- a/src/chrome/content/rules/GHash.IO.xml
+++ b/src/chrome/content/rules/GHash.IO.xml
@@ -6,7 +6,7 @@ Fetch error: http://ws.ghash.io/ => https://ws.ghash.io/: (6, 'Could not resolve
 Fetch error: http://www.ghash.io/ => https://www.ghash.io/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/GIAC.org.xml b/src/chrome/content/rules/GIAC.org.xml
deleted file mode 100644
index 3c773b5d427e..000000000000
--- a/src/chrome/content/rules/GIAC.org.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/GIDNetwork.com.xml b/src/chrome/content/rules/GIDNetwork.com.xml
index 197ff02d2b3b..eb2dc4be7e6e 100644
--- a/src/chrome/content/rules/GIDNetwork.com.xml
+++ b/src/chrome/content/rules/GIDNetwork.com.xml
@@ -22,7 +22,7 @@ Fetch error: http://samia.gidnetwork.com/ => https://samia.gidnetwork.com/: (60,
 		- .gidnetwork.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/GISTI.org.xml b/src/chrome/content/rules/GISTI.org.xml
new file mode 100644
index 000000000000..5aefff862267
--- /dev/null
+++ b/src/chrome/content/rules/GISTI.org.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/GKG.xml b/src/chrome/content/rules/GKG.xml
index 18e84eb7535b..1dd001adc4f7 100644
--- a/src/chrome/content/rules/GKG.xml
+++ b/src/chrome/content/rules/GKG.xml
@@ -2,7 +2,7 @@
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/GMO_Cloud.com.xml b/src/chrome/content/rules/GMO_Cloud.com.xml
index 1d86f367d37c..b37245628d68 100644
--- a/src/chrome/content/rules/GMO_Cloud.com.xml
+++ b/src/chrome/content/rules/GMO_Cloud.com.xml
@@ -65,7 +65,7 @@ Fetch error: http://contact.gmocloud.com/ => https://contact.gmocloud.com/: (60,
 	³ Unsecurable <= 404
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/GMO_Internet.xml b/src/chrome/content/rules/GMO_Internet.xml
index 7a06fffcbab5..ee79c64018a2 100644
--- a/src/chrome/content/rules/GMO_Internet.xml
+++ b/src/chrome/content/rules/GMO_Internet.xml
@@ -25,7 +25,6 @@
 		- Rentalserver.jp.xml
 		- Rocketnet.jp.xml
 		- Tenten.vn.xml
-		- Win-is.com.xml
 		- Win-rd.jp.xml
 
 
@@ -33,9 +32,7 @@
 
 		- error
 		- cache.im	(reset)
-		- ir ²
 		- help.point *
-		- recruit ²
 
 	² Refused
 	* Dropped
@@ -48,13 +45,6 @@
 	* Refused
 
 
-	Partially covered subdomains:
-
-		- cloud *
-
-	* At least some pages redirect to http
-
-
 	Fully covered subdomains:
 
 		- cache.img
@@ -88,7 +78,9 @@
 	
 	
 	
+	
 	
+	
 	
 	
 	
@@ -97,41 +89,7 @@
 				-->
 	
 
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-
-		
-
-	
-	
-
-	
-
+	
 
 	
diff --git a/src/chrome/content/rules/GMPG.org.xml b/src/chrome/content/rules/GMPG.org.xml
new file mode 100644
index 000000000000..6039b50b6dbe
--- /dev/null
+++ b/src/chrome/content/rules/GMPG.org.xml
@@ -0,0 +1,8 @@
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/GND-Tech.com-problematic.xml b/src/chrome/content/rules/GND-Tech.com-problematic.xml
index d7b968a180cb..ac79302f090e 100644
--- a/src/chrome/content/rules/GND-Tech.com-problematic.xml
+++ b/src/chrome/content/rules/GND-Tech.com-problematic.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/GNOME-falsemixed.xml b/src/chrome/content/rules/GNOME-falsemixed.xml
index 22b2cd7d7f36..2b25fda12597 100644
--- a/src/chrome/content/rules/GNOME-falsemixed.xml
+++ b/src/chrome/content/rules/GNOME-falsemixed.xml
@@ -8,7 +8,7 @@ Fetch error: http://news.gnome.org/ => https://news.gnome.org/: Cycle detected -
 	For rules not causing false/broken MCB, see GNOME.xml.
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://news.gnome.org/ => https://news.gnome.org/: Cycle detected -
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/GNOME.xml b/src/chrome/content/rules/GNOME.xml
index 2e4dead1fff4..a81b3e7bb2d4 100644
--- a/src/chrome/content/rules/GNOME.xml
+++ b/src/chrome/content/rules/GNOME.xml
@@ -17,8 +17,6 @@
 
 		- gnome.org subdomains:
 
-			- art		(prints "ok"; self-signed, CN: CentOS-63-64-minimal)
-			- ftp		(refused)
 			- jabber **
 			- webapps **
 			- webapps2 **
@@ -139,7 +137,7 @@
 		
-		
+		
 	
 	
 	
@@ -149,7 +147,7 @@
 	
 
 
-	
 
 	
 
-	
 
-	
 
 
diff --git a/src/chrome/content/rules/GNU.io.xml b/src/chrome/content/rules/GNU.io.xml
index 258647faeb6e..a18615332dbf 100644
--- a/src/chrome/content/rules/GNU.io.xml
+++ b/src/chrome/content/rules/GNU.io.xml
@@ -2,12 +2,12 @@
 
-
+
 
 	
diff --git a/src/chrome/content/rules/GNU.org.xml b/src/chrome/content/rules/GNU.org.xml
index a5340e21d985..f2c04c9df916 100644
--- a/src/chrome/content/rules/GNU.org.xml
+++ b/src/chrome/content/rules/GNU.org.xml
@@ -14,27 +14,21 @@ Invalid certificate:
 	savanna.gnu.org
 	arch0.savannah.gnu.org
 	audio-video0.savannah.gnu.org
-	bzr0.savannah.gnu.org
-	web.cvs0.savannah.gnu.org
-	dl0.savannah.gnu.org
+	download0.savannah.gnu.org
 	download-mirror0.savannah.gnu.org
+	frontend0.savannah.gnu.org
 	ftpmirror0.savannah.gnu.org
 	git0.savannah.gnu.org
 	web.git0.savannah.gnu.org
-	hg0.savannah.gnu.org
 	vcs0.savannah.gnu.org
 	subversions.gnu.org
-	arch0.sv.gnu.org
 	audio-video0.sv.gnu.org
-	bzr0.sv.gnu.org
-	web.cvs0.sv.gnu.org
-	dl0.sv.gnu.org
+	download0.sv.gnu.org
 	download-mirror0.sv.gnu.org
+	frontend0.sv.gnu.org
 	ftpmirror0.sv.gnu.org
 	web.git.sv.gnu.org
-	git0.sv.gnu.org
 	web.git0.sv.gnu.org
-	hg0.sv.gnu.org
 	vcs0.sv.gnu.org
 	wildebeest.gnu.org
 
@@ -72,6 +66,7 @@ Timeout:
 	
 	
 	
+	
 	
 	
 	
@@ -79,57 +74,40 @@ Timeout:
 	
 	
 	
-	
 	
 	
-	
 	
-	
 	
 	
-	
-	
 	
 	
 	
 	
 	
 	
-	
 	
 	
 	
 	
 	
 	
-	
 	
 	
-	
 	
 	
-	
 	
-	
 	
 	
-	
-	
 	
 	
 	
-	
 	
 	
-	
 	
 	
 
-	
+	
 	
 	
-	
-	
-	
 	
 
diff --git a/src/chrome/content/rules/GNUsocial.no.xml b/src/chrome/content/rules/GNUsocial.no.xml
index ba5a727bb750..c95d24f3f057 100644
--- a/src/chrome/content/rules/GNUsocial.no.xml
+++ b/src/chrome/content/rules/GNUsocial.no.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.gnusocial.no/ => https://www.gnusocial.no/: (51, "SSL: n
 		- www.gnusocial.no
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/GO.com.xml b/src/chrome/content/rules/GO.com.xml
deleted file mode 100644
index 044ea0b3c321..000000000000
--- a/src/chrome/content/rules/GO.com.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-
-
-
-	
-	
-		
-		
-
-
-	
-	
-	
-	
-	
-	
-
-
-	
-
-	
-
-	
-	
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/GOC.io.xml b/src/chrome/content/rules/GOC.io.xml
deleted file mode 100644
index 700f51870e33..000000000000
--- a/src/chrome/content/rules/GOC.io.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/GOV.UK.xml b/src/chrome/content/rules/GOV.UK.xml
index 2acbe9ad54f3..c87a8043bd7c 100644
--- a/src/chrome/content/rules/GOV.UK.xml
+++ b/src/chrome/content/rules/GOV.UK.xml
@@ -1,18 +1,15 @@
 
 
-
-	
+  
 	
 
-	
-
+	
 
diff --git a/src/chrome/content/rules/GO_Transit.xml b/src/chrome/content/rules/GO_Transit.xml
index edea7fb2d41f..96bb6a14d778 100644
--- a/src/chrome/content/rules/GO_Transit.xml
+++ b/src/chrome/content/rules/GO_Transit.xml
@@ -21,4 +21,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/GP.se.xml b/src/chrome/content/rules/GP.se.xml
index 769ef49d08d9..cb44629aa6d7 100644
--- a/src/chrome/content/rules/GP.se.xml
+++ b/src/chrome/content/rules/GP.se.xml
@@ -41,10 +41,12 @@ Fetch error: http://gp.se/ => https://gp.se/: (7, 'Failed to connect to gp.se po
 	² Unsecurable <= refused
 
 -->
-
+
 
 	
-	
+	
+	
+	
 		
 		
-
+
 
 	
 	
@@ -15,4 +15,4 @@ Fetch error: http://www.gpfi.org/ => https://www.gpfi.org/: (51, "SSL: no altern
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/GPLHost.xml b/src/chrome/content/rules/GPLHost.xml
deleted file mode 100644
index 2706e416fdda..000000000000
--- a/src/chrome/content/rules/GPLHost.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/GPUL.org.xml b/src/chrome/content/rules/GPUL.org.xml
index 718873a285ef..419fcf484424 100644
--- a/src/chrome/content/rules/GPUL.org.xml
+++ b/src/chrome/content/rules/GPUL.org.xml
@@ -19,7 +19,7 @@ Fetch error: http://www.gpul.org/ => https://gpul.org/: (35, 'error:140770FC:SSL
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/GQ-magazine.co.uk.xml b/src/chrome/content/rules/GQ-magazine.co.uk.xml
deleted file mode 100644
index 7d037825de67..000000000000
--- a/src/chrome/content/rules/GQ-magazine.co.uk.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-	
-	
-	
-
-		
-		
-
-			
-			
-			
-			
-
-			
-			
-			
-
-
-	
-
-
diff --git a/src/chrome/content/rules/GRSecurity.net.xml b/src/chrome/content/rules/GRSecurity.net.xml
deleted file mode 100644
index 324c2d102783..000000000000
--- a/src/chrome/content/rules/GRSecurity.net.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-
diff --git a/src/chrome/content/rules/GRSecurity.xml b/src/chrome/content/rules/GRSecurity.xml
new file mode 100644
index 000000000000..1a8c1168f59b
--- /dev/null
+++ b/src/chrome/content/rules/GRSecurity.xml
@@ -0,0 +1,37 @@
+
+
+	
+	
+	
+	
+
+	
+	
+	
+	
+
+	
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/GRUN_Software.xml b/src/chrome/content/rules/GRUN_Software.xml
index d84f81926bbf..19bb7839d752 100644
--- a/src/chrome/content/rules/GRUN_Software.xml
+++ b/src/chrome/content/rules/GRUN_Software.xml
@@ -13,4 +13,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/GS-media.de.xml b/src/chrome/content/rules/GS-media.de.xml
deleted file mode 100644
index 9cfcc7f249eb..000000000000
--- a/src/chrome/content/rules/GS-media.de.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/GSA.gov.xml b/src/chrome/content/rules/GSA.gov.xml
index c195652a1763..ddcd64406ba8 100644
--- a/src/chrome/content/rules/GSA.gov.xml
+++ b/src/chrome/content/rules/GSA.gov.xml
@@ -7,12 +7,11 @@ Fetch error: http://fbopen.gsa.gov/ => https://fbopen.gsa.gov/: (6, 'Could not r
 
 
 -->
-
+
 
 	
 	
-	
 
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/GSU.edu.xml b/src/chrome/content/rules/GSU.edu.xml
index d7315bb70bc4..5698744ed4eb 100644
--- a/src/chrome/content/rules/GSU.edu.xml
+++ b/src/chrome/content/rules/GSU.edu.xml
@@ -118,7 +118,14 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
 		
diff --git a/src/chrome/content/rules/GTCs-Online.xml b/src/chrome/content/rules/GTCs-Online.xml
deleted file mode 100644
index 8524c1132f85..000000000000
--- a/src/chrome/content/rules/GTCs-Online.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/GTRK.TV.xml b/src/chrome/content/rules/GTRK.TV.xml
new file mode 100644
index 000000000000..5fc6e68686c0
--- /dev/null
+++ b/src/chrome/content/rules/GTRK.TV.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/GU.se.xml b/src/chrome/content/rules/GU.se.xml
index e292447e90a3..3255f934c0c1 100644
--- a/src/chrome/content/rules/GU.se.xml
+++ b/src/chrome/content/rules/GU.se.xml
@@ -16,7 +16,8 @@ lots of subdomains lack ssl, and the site does less intelligent rewriting. how t
 -->
 
 
-	
+	
+	
 		
@@ -34,7 +35,6 @@ lots of subdomains lack ssl, and the site does less intelligent rewriting. how t
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/GVNTube.com.xml b/src/chrome/content/rules/GVNTube.com.xml
index 9290d283d09a..730e857b2a1e 100644
--- a/src/chrome/content/rules/GVNTube.com.xml
+++ b/src/chrome/content/rules/GVNTube.com.xml
@@ -16,4 +16,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Gaatur_u_stig_slapen.nl.xml b/src/chrome/content/rules/Gaatur_u_stig_slapen.nl.xml
index 014ef850b516..2491e44c1816 100644
--- a/src/chrome/content/rules/Gaatur_u_stig_slapen.nl.xml
+++ b/src/chrome/content/rules/Gaatur_u_stig_slapen.nl.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://gaaturustigslapen.nl/ => https://gaaturustigslapen.nl/: (60, 'SSL certificate problem: certificate has expired')
 Fetch error: http://www.gaaturustigslapen.nl/ => https://www.gaaturustigslapen.nl/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Gab.com.xml b/src/chrome/content/rules/Gab.com.xml
new file mode 100644
index 000000000000..c7698ef413dc
--- /dev/null
+++ b/src/chrome/content/rules/Gab.com.xml
@@ -0,0 +1,38 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Gaia-GIS.it.xml b/src/chrome/content/rules/Gaia-GIS.it.xml
index 0b66ad827909..4aaaf3512a52 100644
--- a/src/chrome/content/rules/Gaia-GIS.it.xml
+++ b/src/chrome/content/rules/Gaia-GIS.it.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://gaia-gis.it/ => https://gaia-gis.it/: (51, "SSL: no alternative certificate subject name matches target host name 'gaia-gis.it'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/GaiaOnline.xml b/src/chrome/content/rules/GaiaOnline.xml
index dcf089026c3f..0e27bb3ff36f 100644
--- a/src/chrome/content/rules/GaiaOnline.xml
+++ b/src/chrome/content/rules/GaiaOnline.xml
@@ -11,23 +11,20 @@
       
       
       
-      
 
 
 
 
-      
+
       
       
-      
       
             
+            to="https://www.gaiaonlinehelp.com/" />
       
-      
+
 
diff --git a/src/chrome/content/rules/Galaxis.xml b/src/chrome/content/rules/Galaxis.xml
index 98722cab3040..582116e96369 100644
--- a/src/chrome/content/rules/Galaxis.xml
+++ b/src/chrome/content/rules/Galaxis.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Galaxus.ch.xml b/src/chrome/content/rules/Galaxus.ch.xml
deleted file mode 100644
index a6c1f658bc28..000000000000
--- a/src/chrome/content/rules/Galaxus.ch.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Galois.com.xml b/src/chrome/content/rules/Galois.com.xml
index ab0db33d64df..de81b06978ec 100644
--- a/src/chrome/content/rules/Galois.com.xml
+++ b/src/chrome/content/rules/Galois.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.galois.com/ => https://www.galois.com/: Too many redirec
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/GamCare.xml b/src/chrome/content/rules/GamCare.xml
index 0b9dd4e515cd..5618ed946f53 100644
--- a/src/chrome/content/rules/GamCare.xml
+++ b/src/chrome/content/rules/GamCare.xml
@@ -10,7 +10,8 @@
 
 
 	
-	
+	
+	
 
 
 	
-
+
 
 	
-	
+	
+	
+	
+	
+	
 
 
 	
-
+
 
 	
-	
+	
+	
+	
 	
-	
+	
+	
 
 	
 	
diff --git a/src/chrome/content/rules/GameCopyWorld.com.xml b/src/chrome/content/rules/GameCopyWorld.com.xml
index 247aee18467c..6a35c87faa44 100644
--- a/src/chrome/content/rules/GameCopyWorld.com.xml
+++ b/src/chrome/content/rules/GameCopyWorld.com.xml
@@ -2,10 +2,8 @@
 	Other GameCopyWorld rulesets:
 		+ ConsoleBackup.com.xml
 		+ FileTarget.net.xml
-		+ GCWStorage.xyz.xml
 		+ GameCopyWorld.click.xml
 		+ GameCopyWorld.eu.xml
-		+ GetItHere.xyz.xml
 		+ WireTarget.com.xml
 
 	Expired:
diff --git a/src/chrome/content/rules/GameHouse.xml b/src/chrome/content/rules/GameHouse.xml
index a2b255b6b6c7..de0e86b8e4f1 100644
--- a/src/chrome/content/rules/GameHouse.xml
+++ b/src/chrome/content/rules/GameHouse.xml
@@ -12,10 +12,12 @@ Fetch error: http://ad.ghfusion.com/ => https://ad.ghfusion.com/: (6, 'Could not
 		- dlr6ze9oohko6.cloudfront.net
 
 -->
-
+
 
 	
-	
+	
+	
+	
 	
 
 
@@ -26,10 +28,7 @@ Fetch error: http://ad.ghfusion.com/ => https://ad.ghfusion.com/: (6, 'Could not
 	
 
-	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/GamePro.de.xml b/src/chrome/content/rules/GamePro.de.xml
new file mode 100644
index 000000000000..189db9703ec0
--- /dev/null
+++ b/src/chrome/content/rules/GamePro.de.xml
@@ -0,0 +1,26 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/GameSports.net-falsemixed.xml b/src/chrome/content/rules/GameSports.net-falsemixed.xml
deleted file mode 100644
index 23732b6e5507..000000000000
--- a/src/chrome/content/rules/GameSports.net-falsemixed.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/GameSports.net.xml b/src/chrome/content/rules/GameSports.net.xml
deleted file mode 100644
index 88f7efc82ab0..000000000000
--- a/src/chrome/content/rules/GameSports.net.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-	
-		
-		
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/GameSpot.com-falsemixed.xml b/src/chrome/content/rules/GameSpot.com-falsemixed.xml
deleted file mode 100644
index 5904e59e5eb5..000000000000
--- a/src/chrome/content/rules/GameSpot.com-falsemixed.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/GameSpot.com.xml b/src/chrome/content/rules/GameSpot.com.xml
new file mode 100644
index 000000000000..8954e3e8bb2a
--- /dev/null
+++ b/src/chrome/content/rules/GameSpot.com.xml
@@ -0,0 +1,21 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/GameSpot.xml b/src/chrome/content/rules/GameSpot.xml
deleted file mode 100644
index ff2d60cc5ff3..000000000000
--- a/src/chrome/content/rules/GameSpot.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
-
-	
-	
-
-		
-		
-		
-
-
-	
-	
-	
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/GameTechWiki.com.xml b/src/chrome/content/rules/GameTechWiki.com.xml
new file mode 100644
index 000000000000..33e823710726
--- /dev/null
+++ b/src/chrome/content/rules/GameTechWiki.com.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/GameTree.xml b/src/chrome/content/rules/GameTree.xml
index 4dc97a1b9bc9..0fc00ca1dc34 100644
--- a/src/chrome/content/rules/GameTree.xml
+++ b/src/chrome/content/rules/GameTree.xml
@@ -8,12 +8,13 @@ Fetch error: http://gametreelinux.com/ => https://gametreedeveloper.com/: (60, '
 	(www.)gametreelinux.com: plaintext reply
 
 -->
-
+
 
 	
 	
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Gamedesire.net.xml b/src/chrome/content/rules/Gamedesire.net.xml
index bb3e377c80da..4fb7f21037f0 100644
--- a/src/chrome/content/rules/Gamedesire.net.xml
+++ b/src/chrome/content/rules/Gamedesire.net.xml
@@ -61,7 +61,28 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
 
-	
 
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Gamegeek-denter.de.xml b/src/chrome/content/rules/Gamegeek-denter.de.xml
deleted file mode 100644
index 148c878164d5..000000000000
--- a/src/chrome/content/rules/Gamegeek-denter.de.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Gameladen.xml b/src/chrome/content/rules/Gameladen.xml
index 1d1229696b96..17bc77bd7d81 100644
--- a/src/chrome/content/rules/Gameladen.xml
+++ b/src/chrome/content/rules/Gameladen.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Gameoapp.com.xml b/src/chrome/content/rules/Gameoapp.com.xml
deleted file mode 100644
index a505525cc542..000000000000
--- a/src/chrome/content/rules/Gameoapp.com.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Gameological_Society.xml b/src/chrome/content/rules/Gameological_Society.xml
index b91401ff11ac..23391af32e04 100644
--- a/src/chrome/content/rules/Gameological_Society.xml
+++ b/src/chrome/content/rules/Gameological_Society.xml
@@ -14,11 +14,12 @@
 
 
 	
-	
+	
+	
 		
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Gamer-network.net.xml b/src/chrome/content/rules/Gamer-network.net.xml
new file mode 100644
index 000000000000..a3d9e4d0d646
--- /dev/null
+++ b/src/chrome/content/rules/Gamer-network.net.xml
@@ -0,0 +1,44 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/GamerSky.com.xml b/src/chrome/content/rules/GamerSky.com.xml
new file mode 100644
index 000000000000..543f259901ce
--- /dev/null
+++ b/src/chrome/content/rules/GamerSky.com.xml
@@ -0,0 +1,157 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/GamesOnly.xml b/src/chrome/content/rules/GamesOnly.xml
index f134451c7a16..49d4e516605e 100644
--- a/src/chrome/content/rules/GamesOnly.xml
+++ b/src/chrome/content/rules/GamesOnly.xml
@@ -3,4 +3,4 @@
     
 
     
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Gameselectors.com.xml b/src/chrome/content/rules/Gameselectors.com.xml
deleted file mode 100644
index 604679c71121..000000000000
--- a/src/chrome/content/rules/Gameselectors.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Gamestar_Mechanic.xml b/src/chrome/content/rules/Gamestar_Mechanic.xml
index 27ba443cffa9..439a974679a7 100644
--- a/src/chrome/content/rules/Gamestar_Mechanic.xml
+++ b/src/chrome/content/rules/Gamestar_Mechanic.xml
@@ -32,16 +32,33 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Gameswelt.de.xml b/src/chrome/content/rules/Gameswelt.de.xml
index 20d796e729ce..aaaaf0a65e85 100644
--- a/src/chrome/content/rules/Gameswelt.de.xml
+++ b/src/chrome/content/rules/Gameswelt.de.xml
@@ -4,4 +4,4 @@
 
 
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Gamezebo.xml b/src/chrome/content/rules/Gamezebo.xml
index 637e6144d925..84d0a639f9fd 100644
--- a/src/chrome/content/rules/Gamezebo.xml
+++ b/src/chrome/content/rules/Gamezebo.xml
@@ -27,4 +27,4 @@ Fetch error: http://gamezebo.com/ => https://gamezebo.com/: (28, 'Connection tim
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Gamigo.com.xml b/src/chrome/content/rules/Gamigo.com.xml
index bd2800ac52a3..f5d352622dea 100644
--- a/src/chrome/content/rules/Gamigo.com.xml
+++ b/src/chrome/content/rules/Gamigo.com.xml
@@ -32,7 +32,7 @@ Fetch error: http://support.gamigo.com/ => https://support.gamigo.com/: (60, 'SS
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Gaminator.xml b/src/chrome/content/rules/Gaminator.xml
deleted file mode 100644
index c4bfbb0fe5f3..000000000000
--- a/src/chrome/content/rules/Gaminator.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Gamma-Group.xml b/src/chrome/content/rules/Gamma-Group.xml
deleted file mode 100644
index 95f29bee5257..000000000000
--- a/src/chrome/content/rules/Gamma-Group.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/GammaE.com.xml b/src/chrome/content/rules/GammaE.com.xml
index 51e60e93b5da..896412e5a581 100644
--- a/src/chrome/content/rules/GammaE.com.xml
+++ b/src/chrome/content/rules/GammaE.com.xml
@@ -13,7 +13,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -22,7 +23,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Gang_Land_News.xml b/src/chrome/content/rules/Gang_Land_News.xml
index eeb1f863e3e9..bf8a66b30dc6 100644
--- a/src/chrome/content/rules/Gang_Land_News.xml
+++ b/src/chrome/content/rules/Gang_Land_News.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ganjoor.net.xml b/src/chrome/content/rules/Ganjoor.net.xml
index ce5022e12566..8910c069cf61 100644
--- a/src/chrome/content/rules/Ganjoor.net.xml
+++ b/src/chrome/content/rules/Ganjoor.net.xml
@@ -12,4 +12,4 @@
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Gannett-Company.xml b/src/chrome/content/rules/Gannett-Company.xml
index fed1b6bad96c..11045d12dcf5 100644
--- a/src/chrome/content/rules/Gannett-Company.xml
+++ b/src/chrome/content/rules/Gannett-Company.xml
@@ -16,7 +16,6 @@ Fetch error: http://deals.montomeryadvertiser.com/ => http://deals.montomeryadve
 		- Cincinnati.com.xml
 		- Coloradoan.xml
 		- GCIon.com.xml
-		- GannettLocal.xml
 		- Azcentral.com.xml
 		- Battle_Creek_Enquirer.xml
 		- Baxter_Bulletin.xml
@@ -56,7 +55,7 @@ Fetch error: http://deals.montomeryadvertiser.com/ => http://deals.montomeryadve
 
 		- bcdownload.gannett.edgesuite.net
 
-		- img.gannett.edgesuite.net 
+		- img.gannett.edgesuite.net
 			- cmsimg.floridatoday.com
 
 		- i.usatoday.net.edgesuite.net
@@ -111,7 +110,7 @@ Fetch error: http://deals.montomeryadvertiser.com/ => http://deals.montomeryadve
 		- classifieds.nncogannett.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/GannettLocal.xml b/src/chrome/content/rules/GannettLocal.xml
deleted file mode 100644
index dc226d00e4e6..000000000000
--- a/src/chrome/content/rules/GannettLocal.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Gannett_Ridge.xml b/src/chrome/content/rules/Gannett_Ridge.xml
index b9e2c6bc3e15..464874f36b63 100644
--- a/src/chrome/content/rules/Gannett_Ridge.xml
+++ b/src/chrome/content/rules/Gannett_Ridge.xml
@@ -11,7 +11,7 @@ Fetch error: http://gannettridge.com/ => https://gannettridge.com/: (51, "SSL: n
 Fetch error: http://www.gannettridge.com/ => https://www.gannettridge.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.gannettridge.com'")
 
 -->
-
+
 
 	
 	
@@ -22,4 +22,4 @@ Fetch error: http://www.gannettridge.com/ => https://www.gannettridge.com/: (51,
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ganz_eStore.com.xml b/src/chrome/content/rules/Ganz_eStore.com.xml
index d8e6d23688f3..43f8c4200caa 100644
--- a/src/chrome/content/rules/Ganz_eStore.com.xml
+++ b/src/chrome/content/rules/Ganz_eStore.com.xml
@@ -5,7 +5,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -14,7 +15,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/GarageGames.xml b/src/chrome/content/rules/GarageGames.xml
index ddd168d8d0af..0d82608da043 100644
--- a/src/chrome/content/rules/GarageGames.xml
+++ b/src/chrome/content/rules/GarageGames.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://service.garagegames.com/ => https://service.garagegames.com/: (6, 'Could not resolve host: service.garagegames.com')
 
 -->
-
+
 
 	
 	
@@ -17,4 +17,4 @@ Fetch error: http://service.garagegames.com/ => https://service.garagegames.com/
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Garcinia_Cambogia_VitalMend.com.xml b/src/chrome/content/rules/Garcinia_Cambogia_VitalMend.com.xml
index 3539b1b4ffb4..b65997ba2f79 100644
--- a/src/chrome/content/rules/Garcinia_Cambogia_VitalMend.com.xml
+++ b/src/chrome/content/rules/Garcinia_Cambogia_VitalMend.com.xml
@@ -8,7 +8,7 @@
 
 
 	
-	
+	
 		
diff --git a/src/chrome/content/rules/Gardening-Know-How.com.xml b/src/chrome/content/rules/Gardening-Know-How.com.xml
new file mode 100644
index 000000000000..0bcfef01ca05
--- /dev/null
+++ b/src/chrome/content/rules/Gardening-Know-How.com.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Garfield.com.xml b/src/chrome/content/rules/Garfield.com.xml
index efa21c4c6f12..d1ccfe25a19d 100644
--- a/src/chrome/content/rules/Garfield.com.xml
+++ b/src/chrome/content/rules/Garfield.com.xml
@@ -5,4 +5,4 @@
 
   
   
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Gasngrills.com.xml b/src/chrome/content/rules/Gasngrills.com.xml
index 23ca2ad7956e..bd5840e439be 100644
--- a/src/chrome/content/rules/Gasngrills.com.xml
+++ b/src/chrome/content/rules/Gasngrills.com.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Gateshead.gov.uk.xml b/src/chrome/content/rules/Gateshead.gov.uk.xml
index 1eae9b9f161e..0333da24e12a 100644
--- a/src/chrome/content/rules/Gateshead.gov.uk.xml
+++ b/src/chrome/content/rules/Gateshead.gov.uk.xml
@@ -42,7 +42,7 @@ Fetch error: http://www.gateshead.gov.uk/ => https://www.gateshead.gov.uk/: Too
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Gavel_Buddy.com.xml b/src/chrome/content/rules/Gavel_Buddy.com.xml
index 399bdcad8da2..9ed8f80319d3 100644
--- a/src/chrome/content/rules/Gavel_Buddy.com.xml
+++ b/src/chrome/content/rules/Gavel_Buddy.com.xml
@@ -2,7 +2,6 @@
 	Other Gavel Buddy rulesets:
 
 		- BidItBob.com.xml
-		- Gavel_Buddy_Live.com.xml
 
 
 	Mixed content:
diff --git a/src/chrome/content/rules/Gavel_Buddy_Live.com.xml b/src/chrome/content/rules/Gavel_Buddy_Live.com.xml
deleted file mode 100644
index ad716a9e0136..000000000000
--- a/src/chrome/content/rules/Gavel_Buddy_Live.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Gavin_Hungry.io.xml b/src/chrome/content/rules/Gavin_Hungry.io.xml
deleted file mode 100644
index 73fd168f81af..000000000000
--- a/src/chrome/content/rules/Gavin_Hungry.io.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Gawker-labs.com.xml b/src/chrome/content/rules/Gawker-labs.com.xml
deleted file mode 100644
index 8044462c32fa..000000000000
--- a/src/chrome/content/rules/Gawker-labs.com.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Gawker.xml b/src/chrome/content/rules/Gawker.xml
index 3039fb1d0f8d..457162bc8f0b 100644
--- a/src/chrome/content/rules/Gawker.xml
+++ b/src/chrome/content/rules/Gawker.xml
@@ -1,17 +1,7 @@
 
 
-	
-	
-	
-	
-	
-	
-
 	
 	
 
-
 	
 	
 	
 
-
 	
-	
+
 
diff --git a/src/chrome/content/rules/Gawkerassets.com.xml b/src/chrome/content/rules/Gawkerassets.com.xml
deleted file mode 100644
index b6214ffffd95..000000000000
--- a/src/chrome/content/rules/Gawkerassets.com.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-	
-
-		
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Gay180.xml b/src/chrome/content/rules/Gay180.xml
deleted file mode 100644
index 96dd911203ec..000000000000
--- a/src/chrome/content/rules/Gay180.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/GayBoysTube.com.xml b/src/chrome/content/rules/GayBoysTube.com.xml
new file mode 100644
index 000000000000..ac8e64ffbdd2
--- /dev/null
+++ b/src/chrome/content/rules/GayBoysTube.com.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/GayRomeo.com.xml b/src/chrome/content/rules/GayRomeo.com.xml
new file mode 100644
index 000000000000..0cdd70ed67f0
--- /dev/null
+++ b/src/chrome/content/rules/GayRomeo.com.xml
@@ -0,0 +1,8 @@
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/GaySaltLake.com.xml b/src/chrome/content/rules/GaySaltLake.com.xml
new file mode 100644
index 000000000000..603be4c7729c
--- /dev/null
+++ b/src/chrome/content/rules/GaySaltLake.com.xml
@@ -0,0 +1,13 @@
+
+
+
+	
+		
+
+	
+
+
diff --git a/src/chrome/content/rules/GaySexPositionsGuide.com.xml b/src/chrome/content/rules/GaySexPositionsGuide.com.xml
new file mode 100644
index 000000000000..f471cec2690d
--- /dev/null
+++ b/src/chrome/content/rules/GaySexPositionsGuide.com.xml
@@ -0,0 +1,12 @@
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Gayby.lgbt.xml b/src/chrome/content/rules/Gayby.lgbt.xml
deleted file mode 100644
index a0c12fb310e5..000000000000
--- a/src/chrome/content/rules/Gayby.lgbt.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-	
-
-	
-	
-
diff --git a/src/chrome/content/rules/Gdl-hof.de.xml b/src/chrome/content/rules/Gdl-hof.de.xml
new file mode 100644
index 000000000000..2c0ed9c4e168
--- /dev/null
+++ b/src/chrome/content/rules/Gdl-hof.de.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Gdl-kempten.de.xml b/src/chrome/content/rules/Gdl-kempten.de.xml
new file mode 100644
index 000000000000..4777f08b6518
--- /dev/null
+++ b/src/chrome/content/rules/Gdl-kempten.de.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Gdl-m.de.xml b/src/chrome/content/rules/Gdl-m.de.xml
new file mode 100644
index 000000000000..7003d18d3c9b
--- /dev/null
+++ b/src/chrome/content/rules/Gdl-m.de.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Gdl-nn.de.xml b/src/chrome/content/rules/Gdl-nn.de.xml
new file mode 100644
index 000000000000..476fa8b4012e
--- /dev/null
+++ b/src/chrome/content/rules/Gdl-nn.de.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Gdl-og-gera.de.xml b/src/chrome/content/rules/Gdl-og-gera.de.xml
new file mode 100644
index 000000000000..ff2575617040
--- /dev/null
+++ b/src/chrome/content/rules/Gdl-og-gera.de.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Gdl-sbahn-berlin.de.xml b/src/chrome/content/rules/Gdl-sbahn-berlin.de.xml
new file mode 100644
index 000000000000..fc09d139722e
--- /dev/null
+++ b/src/chrome/content/rules/Gdl-sbahn-berlin.de.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Gdl.de.xml b/src/chrome/content/rules/Gdl.de.xml
new file mode 100644
index 000000000000..dec0846a54d3
--- /dev/null
+++ b/src/chrome/content/rules/Gdl.de.xml
@@ -0,0 +1,155 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Gdlhamm.de.xml b/src/chrome/content/rules/Gdlhamm.de.xml
new file mode 100644
index 000000000000..be10341df702
--- /dev/null
+++ b/src/chrome/content/rules/Gdlhamm.de.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/GearBest.com.xml b/src/chrome/content/rules/GearBest.com.xml
new file mode 100644
index 000000000000..c95ab60f8542
--- /dev/null
+++ b/src/chrome/content/rules/GearBest.com.xml
@@ -0,0 +1,54 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/GearSourceCDN.com.xml b/src/chrome/content/rules/GearSourceCDN.com.xml
deleted file mode 100644
index 2f40c1bebd49..000000000000
--- a/src/chrome/content/rules/GearSourceCDN.com.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Gearworks_Manufacturing.xml b/src/chrome/content/rules/Gearworks_Manufacturing.xml
index b17be07ded3a..d23f07c6c9c2 100644
--- a/src/chrome/content/rules/Gearworks_Manufacturing.xml
+++ b/src/chrome/content/rules/Gearworks_Manufacturing.xml
@@ -7,15 +7,15 @@ Fetch error: http://www.gearworkstire.com/ => https://www.gearworkstire.com/: (2
 Disabled by https-everywhere-checker because:
 Fetch error: http://gearworkstire.com/ => https://gearworkstire.com/: (28, 'Connection timed out after 10000 milliseconds')
 -->
-
+
 
 	
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Geek.net.xml b/src/chrome/content/rules/Geek.net.xml
deleted file mode 100644
index 2a9d1c2efbed..000000000000
--- a/src/chrome/content/rules/Geek.net.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/GeekGhost.net.xml b/src/chrome/content/rules/GeekGhost.net.xml
new file mode 100644
index 000000000000..83d8fa7a9c82
--- /dev/null
+++ b/src/chrome/content/rules/GeekGhost.net.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/GeekPark.xml b/src/chrome/content/rules/GeekPark.xml
index 3bc646bdb9ad..45e00a8e3399 100644
--- a/src/chrome/content/rules/GeekPark.xml
+++ b/src/chrome/content/rules/GeekPark.xml
@@ -1,12 +1,12 @@
 
 
 
-	
+
 	
 	
 	
@@ -27,6 +27,6 @@
 
 	
-			
+		
 
 
diff --git a/src/chrome/content/rules/GeekWire.com.xml b/src/chrome/content/rules/GeekWire.com.xml
new file mode 100644
index 000000000000..ce2e063bbfe2
--- /dev/null
+++ b/src/chrome/content/rules/GeekWire.com.xml
@@ -0,0 +1,9 @@
+
+
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/GeekWire.xml b/src/chrome/content/rules/GeekWire.xml
deleted file mode 100644
index 8d765be91648..000000000000
--- a/src/chrome/content/rules/GeekWire.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/GeekZu.xml b/src/chrome/content/rules/GeekZu.xml
index 780a8ffb5b94..c96c69b17b89 100644
--- a/src/chrome/content/rules/GeekZu.xml
+++ b/src/chrome/content/rules/GeekZu.xml
@@ -1,16 +1,16 @@
 
 
-	
+
 	
 	
 	
-	
+
 	
 
 
diff --git a/src/chrome/content/rules/Geek_Squad.co.uk.xml b/src/chrome/content/rules/Geek_Squad.co.uk.xml
deleted file mode 100644
index 99a4e1deb8fa..000000000000
--- a/src/chrome/content/rules/Geek_Squad.co.uk.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Geek_Tech_Labs.com.xml b/src/chrome/content/rules/Geek_Tech_Labs.com.xml
index e47110e23665..5dd2490c3040 100644
--- a/src/chrome/content/rules/Geek_Tech_Labs.com.xml
+++ b/src/chrome/content/rules/Geek_Tech_Labs.com.xml
@@ -32,7 +32,7 @@ Fetch error: http://mysql.geektechlabs.com/ => https://mysql.geektechlabs.com/:
 	*** Rule not on by default, doesn't trip MCB
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Geekbuying.com.xml b/src/chrome/content/rules/Geekbuying.com.xml
new file mode 100644
index 000000000000..bcf1a616e2b6
--- /dev/null
+++ b/src/chrome/content/rules/Geekbuying.com.xml
@@ -0,0 +1,51 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Geekheim.de.xml b/src/chrome/content/rules/Geekheim.de.xml
index b977e124d27b..663bf3a80aa6 100644
--- a/src/chrome/content/rules/Geekheim.de.xml
+++ b/src/chrome/content/rules/Geekheim.de.xml
@@ -5,4 +5,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Geekify.xml b/src/chrome/content/rules/Geekify.xml
index fb88f5f4188f..9a82e8a3d720 100644
--- a/src/chrome/content/rules/Geekify.xml
+++ b/src/chrome/content/rules/Geekify.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.geekify.com.au/ => http://www.geekify.com.au/: (6, 'Coul
 	Some pages redirect to http.
 
 -->
-
+
 
 	
 	
@@ -15,4 +15,4 @@ Fetch error: http://www.geekify.com.au/ => http://www.geekify.com.au/: (6, 'Coul
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Geeksphone.com.xml b/src/chrome/content/rules/Geeksphone.com.xml
index 3519d1997b1e..a6a09a5d4b33 100644
--- a/src/chrome/content/rules/Geeksphone.com.xml
+++ b/src/chrome/content/rules/Geeksphone.com.xml
@@ -21,10 +21,13 @@ Fetch error: http://geeksphone.com/ => https://geeksphone.com/: (60, 'SSL certif
 	* Secured by us
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
 
 
 	
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Geht.net.xml b/src/chrome/content/rules/Geht.net.xml
index 67860dc9fb09..55f7744525b9 100644
--- a/src/chrome/content/rules/Geht.net.xml
+++ b/src/chrome/content/rules/Geht.net.xml
@@ -13,7 +13,7 @@ Fetch error: http://hydra.geht.net/ => https://hydra.geht.net/: (7, 'Failed to c
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Gem.co.xml b/src/chrome/content/rules/Gem.co.xml
index 1d1c95e31098..4641a63e09be 100644
--- a/src/chrome/content/rules/Gem.co.xml
+++ b/src/chrome/content/rules/Gem.co.xml
@@ -19,7 +19,7 @@ Fetch error: http://www.gem.co/ => https://www.gem.co/: (51, "SSL: no alternativ
 		- my
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/GemCutter.org.xml b/src/chrome/content/rules/GemCutter.org.xml
index 802554f28ec4..a800fd3addd5 100644
--- a/src/chrome/content/rules/GemCutter.org.xml
+++ b/src/chrome/content/rules/GemCutter.org.xml
@@ -9,7 +9,7 @@
 
 	
 
-	
 
 
diff --git a/src/chrome/content/rules/Gemalto.com.xml b/src/chrome/content/rules/Gemalto.com.xml
index 0b558719c0c1..408959b3bc66 100644
--- a/src/chrome/content/rules/Gemalto.com.xml
+++ b/src/chrome/content/rules/Gemalto.com.xml
@@ -47,7 +47,7 @@ Fetch error: http://allynisconnect1.gemalto.com/ => https://allynisconnect1.gema
 	³ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Gemklub.xml b/src/chrome/content/rules/Gemklub.xml
index d1d8cb0993d8..8ae207fe1b83 100644
--- a/src/chrome/content/rules/Gemklub.xml
+++ b/src/chrome/content/rules/Gemklub.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.gemklub.hu/ => https://www.gemklub.hu/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 	
 
 	
diff --git a/src/chrome/content/rules/GenGes.com.xml b/src/chrome/content/rules/GenGes.com.xml
index 7edce1d8ff00..20251b9119cd 100644
--- a/src/chrome/content/rules/GenGes.com.xml
+++ b/src/chrome/content/rules/GenGes.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.genges.com/ => https://www.genges.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.genges.com'")
 
 -->
-
+
 
 	
 	
@@ -15,4 +15,4 @@ Fetch error: http://www.genges.com/ => https://www.genges.com/: (51, "SSL: no al
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/GenNextFoundation.org.xml b/src/chrome/content/rules/GenNextFoundation.org.xml
new file mode 100644
index 000000000000..df8e8d8804a0
--- /dev/null
+++ b/src/chrome/content/rules/GenNextFoundation.org.xml
@@ -0,0 +1,9 @@
+
+
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/GenderJam-NI.xml b/src/chrome/content/rules/GenderJam-NI.xml
deleted file mode 100644
index e63596dfcec6..000000000000
--- a/src/chrome/content/rules/GenderJam-NI.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/General-Electric.xml b/src/chrome/content/rules/General-Electric.xml
deleted file mode 100644
index a2c9bf6cf1e2..000000000000
--- a/src/chrome/content/rules/General-Electric.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/General-anzeiger-bonn.de.xml b/src/chrome/content/rules/General-anzeiger-bonn.de.xml
index 986073ea2fa8..525bd671447b 100644
--- a/src/chrome/content/rules/General-anzeiger-bonn.de.xml
+++ b/src/chrome/content/rules/General-anzeiger-bonn.de.xml
@@ -1,13 +1,13 @@
+
+
 
 	
 	
-	
 	
-		
-
-	
 
-	
 
diff --git a/src/chrome/content/rules/Generalitat-of-Catalonia.xml b/src/chrome/content/rules/Generalitat-of-Catalonia.xml
index fe07dedd110a..4f0e393c9acb 100644
--- a/src/chrome/content/rules/Generalitat-of-Catalonia.xml
+++ b/src/chrome/content/rules/Generalitat-of-Catalonia.xml
@@ -6,10 +6,11 @@ Fetch error: http://gencat.cat/ => https://gencat.cat/: (51, "SSL: no alternativ
 Disabled by https-everywhere-checker because:
 Fetch error: http://gencat.cat/ => https://gencat.cat/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 -->
-
+
 
 	
-	
+	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Genesis-Technologies.xml b/src/chrome/content/rules/Genesis-Technologies.xml
index cb0e3fd4aa8a..8ccc927cd9b9 100644
--- a/src/chrome/content/rules/Genesis-Technologies.xml
+++ b/src/chrome/content/rules/Genesis-Technologies.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Gentle_labs.com.xml b/src/chrome/content/rules/Gentle_labs.com.xml
index b46d79023c55..9302e2fbbf58 100644
--- a/src/chrome/content/rules/Gentle_labs.com.xml
+++ b/src/chrome/content/rules/Gentle_labs.com.xml
@@ -14,7 +14,7 @@ Fetch error: http://gentlelabs.com/ => https://www.gentlelabs.com/: (6, 'Could n
 	^gentlelabs.com: Refused
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/GeoAmigo.xml b/src/chrome/content/rules/GeoAmigo.xml
deleted file mode 100644
index 8b02ef8bc4cb..000000000000
--- a/src/chrome/content/rules/GeoAmigo.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/GeoCoder.xml b/src/chrome/content/rules/GeoCoder.xml
index 14a47e5639e8..c270861c3464 100644
--- a/src/chrome/content/rules/GeoCoder.xml
+++ b/src/chrome/content/rules/GeoCoder.xml
@@ -16,7 +16,7 @@ Fetch error: http://www.geocoder.ca/ => https://www.geocoder.ca/: Too many redir
 	* Secured by us
 
 -->
-
+
 
 	
 	
@@ -25,7 +25,7 @@ Fetch error: http://www.geocoder.ca/ => https://www.geocoder.ca/: Too many redir
 					-->
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/GeoTrust.net.xml b/src/chrome/content/rules/GeoTrust.net.xml
deleted file mode 100644
index 99baad11cd0c..000000000000
--- a/src/chrome/content/rules/GeoTrust.net.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Geocaching.com-falsemixed.xml b/src/chrome/content/rules/Geocaching.com-falsemixed.xml
deleted file mode 100644
index 1890b9333c56..000000000000
--- a/src/chrome/content/rules/Geocaching.com-falsemixed.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-	
-
-
-	
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Geocaching.com.xml b/src/chrome/content/rules/Geocaching.com.xml
index d27e6118eee6..1fa7401796ac 100644
--- a/src/chrome/content/rules/Geocaching.com.xml
+++ b/src/chrome/content/rules/Geocaching.com.xml
@@ -1,97 +1,42 @@
 
-
+
 
-	
 	
+	
+	
+	
 	
 	
-	
-
-	
-	
-
-		
-		
-
-			
-			
-			
-			
-
+	
+	
+	
 
 	
 	
 	
 
-	
-
-
-	
-	
-
-	
-	
-
-		
-		
-		
-		
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/George-Mason-University.xml b/src/chrome/content/rules/George-Mason-University.xml
index 8b2e9ff11dd4..cf565fe5f31a 100644
--- a/src/chrome/content/rules/George-Mason-University.xml
+++ b/src/chrome/content/rules/George-Mason-University.xml
@@ -84,7 +84,7 @@ Fetch error: http://welcomeweek.gmu.edu/ => https://welcomeweek.gmu.edu/: (60, '
 			- si from www.facebook.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/George-Washington-University.xml b/src/chrome/content/rules/George-Washington-University.xml
index db21f87bd684..7c66db28306c 100644
--- a/src/chrome/content/rules/George-Washington-University.xml
+++ b/src/chrome/content/rules/George-Washington-University.xml
@@ -27,19 +27,20 @@
 -->
 
 
-	
+	
+	
+	
 		
 		
 
 
-	
+	
 
 
 	
-	
+	
 
 
diff --git a/src/chrome/content/rules/Geotrust.xml b/src/chrome/content/rules/Geotrust.xml
index 6315dce2155e..f8200a25f3a8 100644
--- a/src/chrome/content/rules/Geotrust.xml
+++ b/src/chrome/content/rules/Geotrust.xml
@@ -1,45 +1,36 @@
-
 
 
 	
-	
-
-
-	
-	
-	
-	
-	
-	
-	
+	
+	
+	
+	
+	
+	
+	
 
 	
 
-
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/German-Academic-Exchange-Service.xml b/src/chrome/content/rules/German-Academic-Exchange-Service.xml
index b7152fde86ae..9708a4724b32 100644
--- a/src/chrome/content/rules/German-Academic-Exchange-Service.xml
+++ b/src/chrome/content/rules/German-Academic-Exchange-Service.xml
@@ -1,7 +1,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/German-Design-Council.xml b/src/chrome/content/rules/German-Design-Council.xml
index f041f6173ff0..95bcd90ebafd 100644
--- a/src/chrome/content/rules/German-Design-Council.xml
+++ b/src/chrome/content/rules/German-Design-Council.xml
@@ -3,7 +3,7 @@
 	
 	
 
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/German_Center_for_Neurodegenerative_Diseases.xml b/src/chrome/content/rules/German_Center_for_Neurodegenerative_Diseases.xml
index 41db727c6f15..7d2e4e5e050d 100644
--- a/src/chrome/content/rules/German_Center_for_Neurodegenerative_Diseases.xml
+++ b/src/chrome/content/rules/German_Center_for_Neurodegenerative_Diseases.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Get.It.xml b/src/chrome/content/rules/Get.It.xml
deleted file mode 100644
index 3146dba46b7d..000000000000
--- a/src/chrome/content/rules/Get.It.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Get.it.xml b/src/chrome/content/rules/Get.it.xml
new file mode 100644
index 000000000000..88968e510802
--- /dev/null
+++ b/src/chrome/content/rules/Get.it.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/GetAwayGrey.xml b/src/chrome/content/rules/GetAwayGrey.xml
index 6ac970cea012..2b300046f446 100644
--- a/src/chrome/content/rules/GetAwayGrey.xml
+++ b/src/chrome/content/rules/GetAwayGrey.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/GetChef.com.xml b/src/chrome/content/rules/GetChef.com.xml
index 455fa5619443..2e606192e21d 100644
--- a/src/chrome/content/rules/GetChef.com.xml
+++ b/src/chrome/content/rules/GetChef.com.xml
@@ -1,7 +1,7 @@
 
 
 
diff --git a/src/chrome/content/rules/GetChute.com.xml b/src/chrome/content/rules/GetChute.com.xml
new file mode 100644
index 000000000000..345354f1080c
--- /dev/null
+++ b/src/chrome/content/rules/GetChute.com.xml
@@ -0,0 +1,8 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/GetChute.xml b/src/chrome/content/rules/GetChute.xml
deleted file mode 100644
index 9c51f0c0bc35..000000000000
--- a/src/chrome/content/rules/GetChute.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-
-
-	
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/GetClicky.com.xml b/src/chrome/content/rules/GetClicky.com.xml
new file mode 100644
index 000000000000..8eaebabbac3c
--- /dev/null
+++ b/src/chrome/content/rules/GetClicky.com.xml
@@ -0,0 +1,20 @@
+
+
+
+	
+	
+		
+		
+		
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/GetCloudApp.com.xml b/src/chrome/content/rules/GetCloudApp.com.xml
new file mode 100644
index 000000000000..a25346e3258d
--- /dev/null
+++ b/src/chrome/content/rules/GetCloudApp.com.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/GetClouder.com.xml b/src/chrome/content/rules/GetClouder.com.xml
index 0e8d400e0b36..47208141ed65 100644
--- a/src/chrome/content/rules/GetClouder.com.xml
+++ b/src/chrome/content/rules/GetClouder.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://tutorials.getclouder.com/ => https://tutorials.getclouder.co
 Fetch error: http://www.getclouder.com/ => https://www.getclouder.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/GetGlue.xml b/src/chrome/content/rules/GetGlue.xml
index 996cc7291b96..3db3b54874b4 100644
--- a/src/chrome/content/rules/GetGlue.xml
+++ b/src/chrome/content/rules/GetGlue.xml
@@ -9,16 +9,13 @@ Fetch error: http://getglue.com/ => https://getglue.com/: (51, "SSL: no alternat
 
 
 	
-	
+	
+	
 
 
 	
 
 
-	
+	
 
-	
-
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/GetHOW.xml b/src/chrome/content/rules/GetHOW.xml
deleted file mode 100644
index 907fe4d15cb4..000000000000
--- a/src/chrome/content/rules/GetHOW.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/GetHarvest.com.xml b/src/chrome/content/rules/GetHarvest.com.xml
index 3477b5ba3d74..71bf1c38455d 100644
--- a/src/chrome/content/rules/GetHarvest.com.xml
+++ b/src/chrome/content/rules/GetHarvest.com.xml
@@ -27,4 +27,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/GetHashing.com.xml b/src/chrome/content/rules/GetHashing.com.xml
deleted file mode 100644
index 3ef978cbedc1..000000000000
--- a/src/chrome/content/rules/GetHashing.com.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/GetItHere.xyz.xml b/src/chrome/content/rules/GetItHere.xyz.xml
deleted file mode 100644
index d1fd12c5d34a..000000000000
--- a/src/chrome/content/rules/GetItHere.xyz.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/GetOutline.org.xml b/src/chrome/content/rules/GetOutline.org.xml
new file mode 100644
index 000000000000..908f143313a9
--- /dev/null
+++ b/src/chrome/content/rules/GetOutline.org.xml
@@ -0,0 +1,17 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Get_ASGard.com.xml b/src/chrome/content/rules/Get_ASGard.com.xml
index 078297850833..2044bfb0149d 100644
--- a/src/chrome/content/rules/Get_ASGard.com.xml
+++ b/src/chrome/content/rules/Get_ASGard.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.getasgard.com/ => https://www.getasgard.com/: (28, 'Oper
 		- .getasgard.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Get_Beagle.co.xml b/src/chrome/content/rules/Get_Beagle.co.xml
index 50938a1ffdee..2a08711df5a0 100644
--- a/src/chrome/content/rules/Get_Beagle.co.xml
+++ b/src/chrome/content/rules/Get_Beagle.co.xml
@@ -15,7 +15,7 @@ Fetch error: http://www.getbeagle.co/ => https://www.getbeagle.co/: (28, 'Connec
 	* Tumblr
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Get_Out_of_Debt_Guy.xml b/src/chrome/content/rules/Get_Out_of_Debt_Guy.xml
deleted file mode 100644
index 9dbe1b986f16..000000000000
--- a/src/chrome/content/rules/Get_Out_of_Debt_Guy.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Get_Shine.com.xml b/src/chrome/content/rules/Get_Shine.com.xml
index 4d83c3447f23..a209b4d70494 100644
--- a/src/chrome/content/rules/Get_Shine.com.xml
+++ b/src/chrome/content/rules/Get_Shine.com.xml
@@ -4,10 +4,10 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://getshine.com/ => https://www.getshine.com/: Too many redirects while fetching 'https://www.getshine.com/'
 
 -->
-
+
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Get_jaco.com.xml b/src/chrome/content/rules/Get_jaco.com.xml
index 8c917e4cd16f..92198d53733b 100644
--- a/src/chrome/content/rules/Get_jaco.com.xml
+++ b/src/chrome/content/rules/Get_jaco.com.xml
@@ -17,7 +17,7 @@ Fetch error: http://getjaco.com/ => https://getjaco.com/: (28, 'Operation timed
 	* Secured by us
 
 -->
-
+
 
 	
@@ -32,12 +32,7 @@ Fetch error: http://getjaco.com/ => https://getjaco.com/: (28, 'Operation timed
 		
 
 
-	
-	
-	
-
-	
+	
 
 
 	
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Getbootstrap.com.xml b/src/chrome/content/rules/Getbootstrap.com.xml
deleted file mode 100644
index 8af75d47940c..000000000000
--- a/src/chrome/content/rules/Getbootstrap.com.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-
-    
-
diff --git a/src/chrome/content/rules/Getclicky.xml b/src/chrome/content/rules/Getclicky.xml
deleted file mode 100644
index 1a7f694a1c44..000000000000
--- a/src/chrome/content/rules/Getclicky.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-
-
-	
-	
-
-
-	
-
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Getemoji.com.xml b/src/chrome/content/rules/Getemoji.com.xml
new file mode 100644
index 000000000000..0fc276c5e0f1
--- /dev/null
+++ b/src/chrome/content/rules/Getemoji.com.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Getgo.de.xml b/src/chrome/content/rules/Getgo.de.xml
new file mode 100644
index 000000000000..60ee27dcb23e
--- /dev/null
+++ b/src/chrome/content/rules/Getgo.de.xml
@@ -0,0 +1,27 @@
+
+
+	
+	
+	
+		
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Getgo.xml b/src/chrome/content/rules/Getgo.xml
deleted file mode 100644
index 06f8cb973a42..000000000000
--- a/src/chrome/content/rules/Getgo.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Getname.ru.xml b/src/chrome/content/rules/Getname.ru.xml
deleted file mode 100644
index 616ea493b19b..000000000000
--- a/src/chrome/content/rules/Getname.ru.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Getprice.xml b/src/chrome/content/rules/Getprice.xml
index 623b96a9776d..bd99664db251 100644
--- a/src/chrome/content/rules/Getprice.xml
+++ b/src/chrome/content/rules/Getprice.xml
@@ -5,4 +5,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Getsatisfaction.com.xml b/src/chrome/content/rules/Getsatisfaction.com.xml
index 52561c6fa755..57f30371f2db 100644
--- a/src/chrome/content/rules/Getsatisfaction.com.xml
+++ b/src/chrome/content/rules/Getsatisfaction.com.xml
@@ -53,7 +53,7 @@ Fetch error: http://info.getsatisfaction.com/ => https://info.getsatisfaction.co
 	* Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Getty.edu.xml b/src/chrome/content/rules/Getty.edu.xml
index caf4a868f8d2..4ec5913cde97 100644
--- a/src/chrome/content/rules/Getty.edu.xml
+++ b/src/chrome/content/rules/Getty.edu.xml
@@ -15,7 +15,8 @@
 
 
 	
-	
+	
+	
 
 
 	 https://secure.stage-gett
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/GfK_Etilize.xml b/src/chrome/content/rules/GfK_Etilize.xml
index 48a7b6a0c3fe..0f9dbdfb1de3 100644
--- a/src/chrome/content/rules/GfK_Etilize.xml
+++ b/src/chrome/content/rules/GfK_Etilize.xml
@@ -11,4 +11,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Gfycat.com.xml b/src/chrome/content/rules/Gfycat.com.xml
index 5494f1083231..5d88f661370a 100644
--- a/src/chrome/content/rules/Gfycat.com.xml
+++ b/src/chrome/content/rules/Gfycat.com.xml
@@ -11,7 +11,7 @@
 		
 		
 		
-	
+
 		
 		
 
diff --git a/src/chrome/content/rules/Ghbtns.com.xml b/src/chrome/content/rules/Ghbtns.com.xml
deleted file mode 100644
index 62d5876dca66..000000000000
--- a/src/chrome/content/rules/Ghbtns.com.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Ghidra-SRE.org.xml b/src/chrome/content/rules/Ghidra-SRE.org.xml
new file mode 100644
index 000000000000..7e13126d3943
--- /dev/null
+++ b/src/chrome/content/rules/Ghidra-SRE.org.xml
@@ -0,0 +1,9 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ghirardelligiftguides.com.xml b/src/chrome/content/rules/Ghirardelligiftguides.com.xml
index 9fbed3f4a994..7317433bdb31 100644
--- a/src/chrome/content/rules/Ghirardelligiftguides.com.xml
+++ b/src/chrome/content/rules/Ghirardelligiftguides.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.ghirardelligiftguides.com/ => https://www.ghirardelligif
 Disabled by https-everywhere-checker because:
 Fetch error: http://ghirardelligiftguides.com/ => https://ghirardelligiftguides.com/: (51, "SSL: no alternative certificate subject name matches target host name 'ghirardelligiftguides.com'")
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Ghisler.com.xml b/src/chrome/content/rules/Ghisler.com.xml
new file mode 100644
index 000000000000..713e6bd7d003
--- /dev/null
+++ b/src/chrome/content/rules/Ghisler.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ghost.org.xml b/src/chrome/content/rules/Ghost.org.xml
index 0570abce3594..37d592e5f00b 100644
--- a/src/chrome/content/rules/Ghost.org.xml
+++ b/src/chrome/content/rules/Ghost.org.xml
@@ -1,33 +1,44 @@
 
-
+
 
-	
 	
 	
-
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
+	
+	
+	
 
-
-	
-	
-
-	
-	
-
-
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Ghostscript.com.xml b/src/chrome/content/rules/Ghostscript.com.xml
new file mode 100644
index 000000000000..1ff039f1a1e1
--- /dev/null
+++ b/src/chrome/content/rules/Ghostscript.com.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Giant_Bomb.com.xml b/src/chrome/content/rules/Giant_Bomb.com.xml
index d371cc77345f..d4bd8acb7910 100644
--- a/src/chrome/content/rules/Giant_Bomb.com.xml
+++ b/src/chrome/content/rules/Giant_Bomb.com.xml
@@ -1,49 +1,15 @@
 
 
 
 	
-	
 	
-		
-		
-		
-		
-		
-		
-
-
-	
-	
-
-	
-	
-	
-
+	
+	
 
-	
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Giardini.biz.xml b/src/chrome/content/rules/Giardini.biz.xml
new file mode 100644
index 000000000000..52b4adcb1573
--- /dev/null
+++ b/src/chrome/content/rules/Giardini.biz.xml
@@ -0,0 +1,11 @@
+
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/GigaSize.xml b/src/chrome/content/rules/GigaSize.xml
index d120149fe7ed..d0ee5fc39fe2 100644
--- a/src/chrome/content/rules/GigaSize.xml
+++ b/src/chrome/content/rules/GigaSize.xml
@@ -5,12 +5,12 @@ Fetch error: http://gigasize.com/ => https://gigasize.com/: (60, 'SSL certificat
 Fetch error: http://www.gigasize.com/ => https://www.gigasize.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
 
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Gigabyte.cn.xml b/src/chrome/content/rules/Gigabyte.cn.xml
new file mode 100644
index 000000000000..29b38f11243c
--- /dev/null
+++ b/src/chrome/content/rules/Gigabyte.cn.xml
@@ -0,0 +1,21 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Gigabyte.com.xml b/src/chrome/content/rules/Gigabyte.com.xml
index 03d0260442a2..e49ca311805f 100644
--- a/src/chrome/content/rules/Gigabyte.com.xml
+++ b/src/chrome/content/rules/Gigabyte.com.xml
@@ -1,160 +1,153 @@
 
-
-	
+
 	
 	
+	
 	
-	
-		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
+	
 	
-		
 	
+	
 	
-	
-
-	
 
-	
+	
 
diff --git a/src/chrome/content/rules/Gigabyte.us.xml b/src/chrome/content/rules/Gigabyte.us.xml
new file mode 100644
index 000000000000..01da3ca162f1
--- /dev/null
+++ b/src/chrome/content/rules/Gigabyte.us.xml
@@ -0,0 +1,28 @@
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Gigantic_Tickets.xml b/src/chrome/content/rules/Gigantic_Tickets.xml
index 1b161cebccd1..1361d49ab14b 100644
--- a/src/chrome/content/rules/Gigantic_Tickets.xml
+++ b/src/chrome/content/rules/Gigantic_Tickets.xml
@@ -10,7 +10,7 @@ Fetch error: http://gigantic.com/ => https://gigantic.com/: Redirect for 'http:/
 		- dashboard	(shows default CentOS page)
 
 -->
-
+
 
 	
 	
@@ -18,9 +18,9 @@ Fetch error: http://gigantic.com/ => https://gigantic.com/: Redirect for 'http:/
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Gigaserver.xml b/src/chrome/content/rules/Gigaserver.xml
index 0af1bbf4edfc..63c78a4e2f1f 100644
--- a/src/chrome/content/rules/Gigaserver.xml
+++ b/src/chrome/content/rules/Gigaserver.xml
@@ -17,7 +17,7 @@
 	
 
 
-	
+	
 
 
 	
-
+
 
 	
diff --git a/src/chrome/content/rules/Gihyo.jp.xml b/src/chrome/content/rules/Gihyo.jp.xml
index 163165b6bc7d..dd56097151e4 100644
--- a/src/chrome/content/rules/Gihyo.jp.xml
+++ b/src/chrome/content/rules/Gihyo.jp.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.gihyo.jp/ => https://gihyo/: (6, 'Could not resolve host
 		- gihyo.jp
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/GijsK.com.xml b/src/chrome/content/rules/GijsK.com.xml
new file mode 100644
index 000000000000..9b37168aee27
--- /dev/null
+++ b/src/chrome/content/rules/GijsK.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/GileadHIV.com.xml b/src/chrome/content/rules/GileadHIV.com.xml
new file mode 100644
index 000000000000..ba0195463b66
--- /dev/null
+++ b/src/chrome/content/rules/GileadHIV.com.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+	
+		
+
+	
+
+
diff --git a/src/chrome/content/rules/Gimme_Bar.com.xml b/src/chrome/content/rules/Gimme_Bar.com.xml
deleted file mode 100644
index 0334553c6ef4..000000000000
--- a/src/chrome/content/rules/Gimme_Bar.com.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Gimmickwear.xml b/src/chrome/content/rules/Gimmickwear.xml
index 008551743e2f..dea23a4c44a8 100644
--- a/src/chrome/content/rules/Gimmickwear.xml
+++ b/src/chrome/content/rules/Gimmickwear.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Gionn.net.xml b/src/chrome/content/rules/Gionn.net.xml
index e9c2fb041665..53483a945305 100644
--- a/src/chrome/content/rules/Gionn.net.xml
+++ b/src/chrome/content/rules/Gionn.net.xml
@@ -1,11 +1,9 @@
 
 
 
@@ -13,21 +11,12 @@
 				-->
 	
 
-	
-	
-
-
 	
 	
 
 	
 
-
-	
-
 	
 
diff --git a/src/chrome/content/rules/GirlLoveGirl.net.xml b/src/chrome/content/rules/GirlLoveGirl.net.xml
deleted file mode 100644
index ebd6ccc70af5..000000000000
--- a/src/chrome/content/rules/GirlLoveGirl.net.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-	
-
-	
-	
-
diff --git a/src/chrome/content/rules/Girl_Scouts.xml b/src/chrome/content/rules/Girl_Scouts.xml
index b160aaae85e0..c866dda1ca41 100644
--- a/src/chrome/content/rules/Girl_Scouts.xml
+++ b/src/chrome/content/rules/Girl_Scouts.xml
@@ -1,29 +1,25 @@
 
 
 
 	
 	
-
+	
 
 	
 
-
-	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/GirlsChannel.net.xml b/src/chrome/content/rules/GirlsChannel.net.xml
new file mode 100644
index 000000000000..1c5da27de335
--- /dev/null
+++ b/src/chrome/content/rules/GirlsChannel.net.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Gistmarks.com.xml b/src/chrome/content/rules/Gistmarks.com.xml
deleted file mode 100644
index 677823dbc074..000000000000
--- a/src/chrome/content/rules/Gistmarks.com.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Git.io.xml b/src/chrome/content/rules/Git.io.xml
index b4b930628a51..edcb7c8a763e 100644
--- a/src/chrome/content/rules/Git.io.xml
+++ b/src/chrome/content/rules/Git.io.xml
@@ -5,7 +5,7 @@
 
 	
 	
-	
+
 	
 
 	
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/GitCDN.xyz.xml b/src/chrome/content/rules/GitCDN.xyz.xml
new file mode 100644
index 000000000000..8a3c8077687b
--- /dev/null
+++ b/src/chrome/content/rules/GitCDN.xyz.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/GitFoo.com.xml b/src/chrome/content/rules/GitFoo.com.xml
new file mode 100644
index 000000000000..1f371d6a051e
--- /dev/null
+++ b/src/chrome/content/rules/GitFoo.com.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/GitHub.xml b/src/chrome/content/rules/GitHub.xml
index ae51b1ccf217..6d48b0a203d4 100644
--- a/src/chrome/content/rules/GitHub.xml
+++ b/src/chrome/content/rules/GitHub.xml
@@ -6,13 +6,13 @@
 	Other GitHub rulesets:
 		- Choosealicense.com.xml
 		- Github-Pages.xml
+		- githubassets.com.xml
 		- Guag.es.xml
 		- Speaker_Deck.com.xml
 -->
 
 	
 
-	
 
 	
 	
diff --git a/src/chrome/content/rules/GitLab.io.xml b/src/chrome/content/rules/GitLab.io.xml
index dd8af97499ad..eea97a475761 100644
--- a/src/chrome/content/rules/GitLab.io.xml
+++ b/src/chrome/content/rules/GitLab.io.xml
@@ -18,10 +18,10 @@
 	
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Github-Pages.xml b/src/chrome/content/rules/Github-Pages.xml
index 5ec63d5833a9..86c627e10fb5 100644
--- a/src/chrome/content/rules/Github-Pages.xml
+++ b/src/chrome/content/rules/Github-Pages.xml
@@ -15,9 +15,8 @@
 		
 		
 
-	
-	
-		
+	
+		
 		
 
 	
@@ -27,11 +26,6 @@
 		
 		
 
-	
-	
-		
-		
-
 	
 
 	
diff --git a/src/chrome/content/rules/Githubstats.com.xml b/src/chrome/content/rules/Githubstats.com.xml
deleted file mode 100644
index d8740491208d..000000000000
--- a/src/chrome/content/rules/Githubstats.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Gitorious.xml b/src/chrome/content/rules/Gitorious.xml
deleted file mode 100644
index 7a135644243c..000000000000
--- a/src/chrome/content/rules/Gitorious.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Gittigidiyor.net.xml b/src/chrome/content/rules/Gittigidiyor.net.xml
new file mode 100644
index 000000000000..2652e767569d
--- /dev/null
+++ b/src/chrome/content/rules/Gittigidiyor.net.xml
@@ -0,0 +1,30 @@
+
+
+
+	
+		
+	
+	
+	
+
+	
+	
+		
+
+	
+		
+
+	
+
diff --git a/src/chrome/content/rules/Gittigidiyor.xml b/src/chrome/content/rules/Gittigidiyor.xml
deleted file mode 100644
index e8afde5accc6..000000000000
--- a/src/chrome/content/rules/Gittigidiyor.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-	
-		
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Gittip.com.xml b/src/chrome/content/rules/Gittip.com.xml
deleted file mode 100644
index e19666d0a958..000000000000
--- a/src/chrome/content/rules/Gittip.com.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Give-Kids-the-World.xml b/src/chrome/content/rules/Give-Kids-the-World.xml
index abcd225f2654..9d85fda672ff 100644
--- a/src/chrome/content/rules/Give-Kids-the-World.xml
+++ b/src/chrome/content/rules/Give-Kids-the-World.xml
@@ -27,13 +27,13 @@ Fetch error: http://secure.gktw.org/ => https://secure.gktw.org/: (60, 'SSL cert
 	**	The ruleset redirects givekidstheworldstore.org to www.givekidstheworldstore.org; both appear
 		to have the same content.
 -->
-
+
 	
 	
 	
 	
 	
-	
+
 	
 	
 
diff --git a/src/chrome/content/rules/GiveDirect.xml b/src/chrome/content/rules/GiveDirect.xml
index ff188cccc3a8..e77f7e0015a9 100644
--- a/src/chrome/content/rules/GiveDirect.xml
+++ b/src/chrome/content/rules/GiveDirect.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Givex.xml b/src/chrome/content/rules/Givex.xml
index acd01883f360..5af3b1564c03 100644
--- a/src/chrome/content/rules/Givex.xml
+++ b/src/chrome/content/rules/Givex.xml
@@ -29,4 +29,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/GivingPrograms.com.xml b/src/chrome/content/rules/GivingPrograms.com.xml
index 9240f799c8db..c92909fd3c2f 100644
--- a/src/chrome/content/rules/GivingPrograms.com.xml
+++ b/src/chrome/content/rules/GivingPrograms.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://givingprograms.com/ => https://givingprograms.com/: (60, 'SS
 	Mixed css from amerigives.com (expired 2013-03-08)
 
 -->
-
+
 
 	
 	
@@ -16,9 +16,9 @@ Fetch error: http://givingprograms.com/ => https://givingprograms.com/: (60, 'SS
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Gizmodo.com.xml b/src/chrome/content/rules/Gizmodo.com.xml
deleted file mode 100644
index a035165e8b46..000000000000
--- a/src/chrome/content/rules/Gizmodo.com.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-	
-	
-
-		
-
-			
-			
-			
-
-		
-
-		
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Glam.xml b/src/chrome/content/rules/Glam.xml
index fd92c8f4a416..fa255ecae8d1 100644
--- a/src/chrome/content/rules/Glam.xml
+++ b/src/chrome/content/rules/Glam.xml
@@ -45,7 +45,7 @@ Fetch error: http://swww2.glam.com/ => https://swww2.glam.com/: (28, 'Operation
 	* → akamai
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Glamorous_UK.xml b/src/chrome/content/rules/Glamorous_UK.xml
index f5d8002ff345..62297f02afbc 100644
--- a/src/chrome/content/rules/Glamorous_UK.xml
+++ b/src/chrome/content/rules/Glamorous_UK.xml
@@ -8,10 +8,10 @@ Fetch error: http://glamorousuk.com/ => https://glamorousuk.com/: (51, "SSL: no
 	Cert only matches glamorousuk.com.
 
 -->
-
+
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Glasgow.gov.uk.xml b/src/chrome/content/rules/Glasgow.gov.uk.xml
index 08d7e4a4b03b..11f4e3cd787b 100644
--- a/src/chrome/content/rules/Glasgow.gov.uk.xml
+++ b/src/chrome/content/rules/Glasgow.gov.uk.xml
@@ -74,7 +74,7 @@
 	
 	
 	
-	
+
 	
 
 	
diff --git a/src/chrome/content/rules/Glasses.com.xml b/src/chrome/content/rules/Glasses.com.xml
index d7ceb11ee89c..996fa5aaa6d7 100644
--- a/src/chrome/content/rules/Glasses.com.xml
+++ b/src/chrome/content/rules/Glasses.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://media.glasses.com/ => https://media.glasses.com/: (60, 'SSL
 	Some pages redirect to http.
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://media.glasses.com/ => https://media.glasses.com/: (60, 'SSL
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/GlenScott.xml b/src/chrome/content/rules/GlenScott.xml
index 0e4b6e220a5e..811242d4a06a 100644
--- a/src/chrome/content/rules/GlenScott.xml
+++ b/src/chrome/content/rules/GlenScott.xml
@@ -2,7 +2,7 @@
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/Glenoit.com.xml b/src/chrome/content/rules/Glenoit.com.xml
deleted file mode 100644
index 2afb70f2672c..000000000000
--- a/src/chrome/content/rules/Glenoit.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/GloDLS.to.xml b/src/chrome/content/rules/GloDLS.to.xml
new file mode 100644
index 000000000000..8cd312af7536
--- /dev/null
+++ b/src/chrome/content/rules/GloDLS.to.xml
@@ -0,0 +1,24 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
\ No newline at end of file
diff --git a/src/chrome/content/rules/GlobaLeaks.org.xml b/src/chrome/content/rules/GlobaLeaks.org.xml
deleted file mode 100644
index cb9ac275ac39..000000000000
--- a/src/chrome/content/rules/GlobaLeaks.org.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Global-Marine-Networks.xml b/src/chrome/content/rules/Global-Marine-Networks.xml
index 10eba36e1972..2b196f1a14b1 100644
--- a/src/chrome/content/rules/Global-Marine-Networks.xml
+++ b/src/chrome/content/rules/Global-Marine-Networks.xml
@@ -16,12 +16,12 @@ Fetch error: http://www.globalmarinenet.com/ => https://www.globalmarinenet.com/
 		- web	(ditto)
 
 -->
-
+
 
 	
 	
 	
-	
+
 
 
 	
diff --git a/src/chrome/content/rules/Global-Marketing-Strategies.xml b/src/chrome/content/rules/Global-Marketing-Strategies.xml
index 189f88dd2737..881ca7555db3 100644
--- a/src/chrome/content/rules/Global-Marketing-Strategies.xml
+++ b/src/chrome/content/rules/Global-Marketing-Strategies.xml
@@ -18,7 +18,7 @@ Fetch error: http://www.howtowriteabookasap.com/ => https://www.howtowriteabooka
 		- Trust-Guard.com.xml
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Global-Witness.xml b/src/chrome/content/rules/Global-Witness.xml
deleted file mode 100644
index fb36aae58f10..000000000000
--- a/src/chrome/content/rules/Global-Witness.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/GlobalConnect.dk.xml b/src/chrome/content/rules/GlobalConnect.dk.xml
new file mode 100644
index 000000000000..10ef10e41ab8
--- /dev/null
+++ b/src/chrome/content/rules/GlobalConnect.dk.xml
@@ -0,0 +1,49 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/GlobalSign.xml b/src/chrome/content/rules/GlobalSign.xml
index 1334385cc1fa..090cd473eacf 100644
--- a/src/chrome/content/rules/GlobalSign.xml
+++ b/src/chrome/content/rules/GlobalSign.xml
@@ -83,6 +83,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/GlobalTestSupply.com.xml b/src/chrome/content/rules/GlobalTestSupply.com.xml
index ee555f2bff55..ccbca9dd0b7f 100644
--- a/src/chrome/content/rules/GlobalTestSupply.com.xml
+++ b/src/chrome/content/rules/GlobalTestSupply.com.xml
@@ -8,7 +8,7 @@
 	
 	
 
-	
 
 
diff --git a/src/chrome/content/rules/Global_Bersih.xml b/src/chrome/content/rules/Global_Bersih.xml
index e9b8de659d78..760014cdc122 100644
--- a/src/chrome/content/rules/Global_Bersih.xml
+++ b/src/chrome/content/rules/Global_Bersih.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Global_Cloud_Xchange.com.xml b/src/chrome/content/rules/Global_Cloud_Xchange.com.xml
index 74574a861262..3c32a3d5cc32 100644
--- a/src/chrome/content/rules/Global_Cloud_Xchange.com.xml
+++ b/src/chrome/content/rules/Global_Cloud_Xchange.com.xml
@@ -28,7 +28,7 @@ Fetch error: http://cdn.globalcloudxchange.com/ => https://d6v3rabjzlopt.cloudfr
 	² Insecure renegotiation
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Global_Network.pl.xml b/src/chrome/content/rules/Global_Network.pl.xml
index ca57fc1b9727..f2080d5c6630 100644
--- a/src/chrome/content/rules/Global_Network.pl.xml
+++ b/src/chrome/content/rules/Global_Network.pl.xml
@@ -16,7 +16,7 @@ Fetch error: http://www.globalnetwork.pl/ => https://globalnetwork.pl/: (60, 'SS
 		- (www.)?	(www → ^)
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Global_Perspectives_Canada.xml b/src/chrome/content/rules/Global_Perspectives_Canada.xml
deleted file mode 100644
index ca94e9ffa70c..000000000000
--- a/src/chrome/content/rules/Global_Perspectives_Canada.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Global_Policy_Forum.xml b/src/chrome/content/rules/Global_Policy_Forum.xml
index 84064f22c7ca..69a402c075fb 100644
--- a/src/chrome/content/rules/Global_Policy_Forum.xml
+++ b/src/chrome/content/rules/Global_Policy_Forum.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Global_Promote.xml b/src/chrome/content/rules/Global_Promote.xml
index 71ea60a731ec..9e399a67f824 100644
--- a/src/chrome/content/rules/Global_Promote.xml
+++ b/src/chrome/content/rules/Global_Promote.xml
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Global_Sources.xml b/src/chrome/content/rules/Global_Sources.xml
index 22220ebdda10..e42f487b7abe 100644
--- a/src/chrome/content/rules/Global_Sources.xml
+++ b/src/chrome/content/rules/Global_Sources.xml
@@ -25,10 +25,12 @@ Fetch error: http://globalsources.com/ => https://www.globalsources.com/: (51, "
 	p serves images only.
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
 	
@@ -37,7 +39,6 @@ Fetch error: http://globalsources.com/ => https://www.globalsources.com/: (51, "
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Global_Voices_Online.org.xml b/src/chrome/content/rules/Global_Voices_Online.org.xml
index 0034bf48ea22..404afd3423e9 100644
--- a/src/chrome/content/rules/Global_Voices_Online.org.xml
+++ b/src/chrome/content/rules/Global_Voices_Online.org.xml
@@ -85,14 +85,41 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 		
 
 
 	
 
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Globalclimatemarch.org.xml b/src/chrome/content/rules/Globalclimatemarch.org.xml
index 763c92f6c9e6..ff4f7a100b4b 100644
--- a/src/chrome/content/rules/Globalclimatemarch.org.xml
+++ b/src/chrome/content/rules/Globalclimatemarch.org.xml
@@ -12,7 +12,7 @@
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Globalogiq.com.xml b/src/chrome/content/rules/Globalogiq.com.xml
deleted file mode 100644
index 0fc013ee3ccd..000000000000
--- a/src/chrome/content/rules/Globalogiq.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Globalscaletechnologies.com.xml b/src/chrome/content/rules/Globalscaletechnologies.com.xml
index 35a4e9d3fcc4..bfafd53dfa96 100644
--- a/src/chrome/content/rules/Globalscaletechnologies.com.xml
+++ b/src/chrome/content/rules/Globalscaletechnologies.com.xml
@@ -4,7 +4,7 @@
 	
 
 
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Globaltap.com.xml b/src/chrome/content/rules/Globaltap.com.xml
index 5892236a0c50..f9af471e2386 100644
--- a/src/chrome/content/rules/Globaltap.com.xml
+++ b/src/chrome/content/rules/Globaltap.com.xml
@@ -20,4 +20,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Globat.com.xml b/src/chrome/content/rules/Globat.com.xml
new file mode 100644
index 000000000000..d368f2787bc5
--- /dev/null
+++ b/src/chrome/content/rules/Globat.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Globat.xml b/src/chrome/content/rules/Globat.xml
deleted file mode 100644
index 091ecb9d52c6..000000000000
--- a/src/chrome/content/rules/Globat.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Globes.xml b/src/chrome/content/rules/Globes.xml
index b714cd642344..c72a28472150 100644
--- a/src/chrome/content/rules/Globes.xml
+++ b/src/chrome/content/rules/Globes.xml
@@ -23,4 +23,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Globus-Online.xml b/src/chrome/content/rules/Globus-Online.xml
index b08b75f1e17d..9a82e44b7b8e 100644
--- a/src/chrome/content/rules/Globus-Online.xml
+++ b/src/chrome/content/rules/Globus-Online.xml
@@ -11,7 +11,7 @@
 	
 
 
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Gluster.org.xml b/src/chrome/content/rules/Gluster.org.xml
index 42ddee4bbd1a..906471ea8557 100644
--- a/src/chrome/content/rules/Gluster.org.xml
+++ b/src/chrome/content/rules/Gluster.org.xml
@@ -13,7 +13,7 @@ Fetch error: http://forge.gluster.org/ => https://forge.gluster.org/: (6, 'Could
 		- forge
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Glyph.im.xml b/src/chrome/content/rules/Glyph.im.xml
index 73c5d6397c32..b2b3edec48f8 100644
--- a/src/chrome/content/rules/Glyph.im.xml
+++ b/src/chrome/content/rules/Glyph.im.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.glyph.im/ => https://www.glyph.im/: (51, "SSL: no alternative certificate subject name matches target host name 'www.glyph.im'")
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Gmedianetworks.com.xml b/src/chrome/content/rules/Gmedianetworks.com.xml
deleted file mode 100644
index 7119f72f33ce..000000000000
--- a/src/chrome/content/rules/Gmedianetworks.com.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Gna.xml b/src/chrome/content/rules/Gna.xml
index 512e276a61d4..6255f33c975b 100644
--- a/src/chrome/content/rules/Gna.xml
+++ b/src/chrome/content/rules/Gna.xml
@@ -12,7 +12,7 @@
 	NB: server sends no certificate chain, see https://whatsmychaincert.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Gngr.info.xml b/src/chrome/content/rules/Gngr.info.xml
index f296a189ee77..42369061a300 100644
--- a/src/chrome/content/rules/Gngr.info.xml
+++ b/src/chrome/content/rules/Gngr.info.xml
@@ -5,7 +5,8 @@
 
 
 	
-	
+	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/GnuPG.com.xml b/src/chrome/content/rules/GnuPG.com.xml
new file mode 100644
index 000000000000..fd8694281751
--- /dev/null
+++ b/src/chrome/content/rules/GnuPG.com.xml
@@ -0,0 +1,18 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/GnuPG.org.xml b/src/chrome/content/rules/GnuPG.org.xml
index 3c25479c127d..4a50f1b5db1a 100644
--- a/src/chrome/content/rules/GnuPG.org.xml
+++ b/src/chrome/content/rules/GnuPG.org.xml
@@ -1,29 +1,48 @@
 
 
 
 	
 	
 	
+	
+	
 	
 	
-	
+	
 	
+	
+	
 	
+	
+		
 	
-	
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/GnuTLS.org.xml b/src/chrome/content/rules/GnuTLS.org.xml
index 1fc693258ae1..4ebcdd7ae3aa 100644
--- a/src/chrome/content/rules/GnuTLS.org.xml
+++ b/src/chrome/content/rules/GnuTLS.org.xml
@@ -1,27 +1,22 @@
 
-
+
 
 	
 	
 	
 	
-	
-
-
-	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/GoAbroad.com.xml b/src/chrome/content/rules/GoAbroad.com.xml
deleted file mode 100644
index 05b638c1e81c..000000000000
--- a/src/chrome/content/rules/GoAbroad.com.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/GoAruna.com.xml b/src/chrome/content/rules/GoAruna.com.xml
index 8b04ea6ff707..cc7e10278910 100644
--- a/src/chrome/content/rules/GoAruna.com.xml
+++ b/src/chrome/content/rules/GoAruna.com.xml
@@ -13,7 +13,7 @@
 
 
 	
-	
+	
 		
@@ -27,4 +27,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/GoDaddy.xml b/src/chrome/content/rules/GoDaddy.xml
index 94db61abd119..305ee7cf306d 100644
--- a/src/chrome/content/rules/GoDaddy.xml
+++ b/src/chrome/content/rules/GoDaddy.xml
@@ -1,11 +1,13 @@
 
+  
+
 	
 
diff --git a/src/chrome/content/rules/GoDaddy_mobile.com.xml b/src/chrome/content/rules/GoDaddy_mobile.com.xml
index 4ee31bee388e..fbe4a5f1ead2 100644
--- a/src/chrome/content/rules/GoDaddy_mobile.com.xml
+++ b/src/chrome/content/rules/GoDaddy_mobile.com.xml
@@ -16,7 +16,7 @@ Non-2xx HTTP code: http://godaddymobile.com/ (200) => https://godaddymobile.com/
 		- .godaddymobile.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/GoExplore.net.xml b/src/chrome/content/rules/GoExplore.net.xml
index 31a291ee4f96..97956ea31bac 100644
--- a/src/chrome/content/rules/GoExplore.net.xml
+++ b/src/chrome/content/rules/GoExplore.net.xml
@@ -12,11 +12,11 @@ Fetch error: http://static.goexplore.net/ => https://static.goexplore.net/: (60,
 		- ESET_static.com.xml
 		- Sicontact.at.xml
 -->
-
+
 	
 	
 	
-	
+
 	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Go_Lang.org.xml b/src/chrome/content/rules/Go_Lang.org.xml
deleted file mode 100644
index 7684f63eda29..000000000000
--- a/src/chrome/content/rules/Go_Lang.org.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-
-		
-		
-		
-		
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Go_Turkey.com.xml b/src/chrome/content/rules/Go_Turkey.com.xml
index 30f9c2f8cf95..e7220b09f9d6 100644
--- a/src/chrome/content/rules/Go_Turkey.com.xml
+++ b/src/chrome/content/rules/Go_Turkey.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.goturkey.com/ => https://www.goturkey.com/: (35, 'Unknow
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Go_eShow.com.xml b/src/chrome/content/rules/Go_eShow.com.xml
deleted file mode 100644
index 2ac0c4841a9c..000000000000
--- a/src/chrome/content/rules/Go_eShow.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Goaldet.com.xml b/src/chrome/content/rules/Goaldet.com.xml
deleted file mode 100644
index 7d8149fa66ac..000000000000
--- a/src/chrome/content/rules/Goaldet.com.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/GodPraksis.no.xml b/src/chrome/content/rules/GodPraksis.no.xml
index 1740fdf73697..76e237bfec71 100644
--- a/src/chrome/content/rules/GodPraksis.no.xml
+++ b/src/chrome/content/rules/GodPraksis.no.xml
@@ -5,7 +5,7 @@ Fetch error: http://godpraksis.no/ => https://godpraksis.no/: (7, 'Failed to con
 Fetch error: http://www.godpraksis.no/ => https://www.godpraksis.no/: (7, 'Failed to connect to www.godpraksis.no port 443: Connection refused')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Goddard-Group.xml b/src/chrome/content/rules/Goddard-Group.xml
deleted file mode 100644
index 01753488ff28..000000000000
--- a/src/chrome/content/rules/Goddard-Group.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Goeswhere.com.xml b/src/chrome/content/rules/Goeswhere.com.xml
index 564c58a73bcb..13483b4996d5 100644
--- a/src/chrome/content/rules/Goeswhere.com.xml
+++ b/src/chrome/content/rules/Goeswhere.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.goeswhere.com/ => https://www.goeswhere.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.goeswhere.com'")
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Goke.me.xml b/src/chrome/content/rules/Goke.me.xml
deleted file mode 100644
index 3363b2ef3405..000000000000
--- a/src/chrome/content/rules/Goke.me.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Golden_Adventures.xml b/src/chrome/content/rules/Golden_Adventures.xml
index 348d894ddd48..d33d72cf75e7 100644
--- a/src/chrome/content/rules/Golden_Adventures.xml
+++ b/src/chrome/content/rules/Golden_Adventures.xml
@@ -11,7 +11,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://goldenadventures.com/ => https://goldenadventures.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Golden_Charter.xml b/src/chrome/content/rules/Golden_Charter.xml
index 6d5c1459431b..b6f8d40df8b3 100644
--- a/src/chrome/content/rules/Golden_Charter.xml
+++ b/src/chrome/content/rules/Golden_Charter.xml
@@ -35,4 +35,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Golden_Frog.com.xml b/src/chrome/content/rules/Golden_Frog.com.xml
index 4fe759439707..705173b9f83e 100644
--- a/src/chrome/content/rules/Golden_Frog.com.xml
+++ b/src/chrome/content/rules/Golden_Frog.com.xml
@@ -39,7 +39,7 @@ Fetch error: http://app.dumptruck.goldenfrog.com/ => https://app.dumptruck.golde
 		- www.goldenfrog.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Goldkeys.net.xml b/src/chrome/content/rules/Goldkeys.net.xml
index d66476526422..5c06dbc8f41d 100644
--- a/src/chrome/content/rules/Goldkeys.net.xml
+++ b/src/chrome/content/rules/Goldkeys.net.xml
@@ -1,33 +1,15 @@
-
 
-
-
-	
-	
-
-
-	
-
-
-	
-
+
+	
+	
+	
+	
+	
+
+	
 
diff --git a/src/chrome/content/rules/Goldkeys.org.xml b/src/chrome/content/rules/Goldkeys.org.xml
new file mode 100644
index 000000000000..fc7d6fa453f6
--- /dev/null
+++ b/src/chrome/content/rules/Goldkeys.org.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Goldlit.ru.xml b/src/chrome/content/rules/Goldlit.ru.xml
index 496af8c466e1..e6c52322f595 100644
--- a/src/chrome/content/rules/Goldlit.ru.xml
+++ b/src/chrome/content/rules/Goldlit.ru.xml
@@ -9,4 +9,4 @@
 
 	
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Goldmann.pl.xml b/src/chrome/content/rules/Goldmann.pl.xml
index 0078b1e09f88..63f048f58aef 100644
--- a/src/chrome/content/rules/Goldmann.pl.xml
+++ b/src/chrome/content/rules/Goldmann.pl.xml
@@ -16,7 +16,7 @@ Fetch error: http://secure.goldmann.pl/ => https://secure.goldmann.pl/: (6, 'Cou
 		- secure
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Goldsboro_Web_Development.xml b/src/chrome/content/rules/Goldsboro_Web_Development.xml
index 6a549b619dec..55d4ab67968a 100644
--- a/src/chrome/content/rules/Goldsboro_Web_Development.xml
+++ b/src/chrome/content/rules/Goldsboro_Web_Development.xml
@@ -10,7 +10,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://my.goldsborowebdevelopment.com/ => https://my.goldsborowebdevelopment.com/: (6, 'Could not resolve host: my.goldsborowebdevelopment.com')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Goldstar.xml b/src/chrome/content/rules/Goldstar.xml
index 92308c7366ae..6c883360af4b 100644
--- a/src/chrome/content/rules/Goldstar.xml
+++ b/src/chrome/content/rules/Goldstar.xml
@@ -3,28 +3,35 @@
 
 		- ^	(cert only matches www)
 		- gifts	(mismatched, CN: *.myshopify.com)
-
+    - i.goldstar.com (unresolved)
 
 	Some pages redirect to http
 
+  CDN:
+    images - i.gse.io
+
 -->
 
 
 	
-	
-		
-
-
-	
+	
+	
+	
+		
 
+	
 
 	
-
-	
-
-	
-
-
\ No newline at end of file
+    
+  
+
+	
+
diff --git a/src/chrome/content/rules/GolfLink.com.xml b/src/chrome/content/rules/GolfLink.com.xml
index ea1acf8a41f1..7bf914afd3c4 100644
--- a/src/chrome/content/rules/GolfLink.com.xml
+++ b/src/chrome/content/rules/GolfLink.com.xml
@@ -1,33 +1,14 @@
 
 
-
-	
 	
-	
-	
-	
-
-
-	
-	
-
-
-	
+	
+	
 
+	
 
diff --git a/src/chrome/content/rules/GolfLink.net.xml b/src/chrome/content/rules/GolfLink.net.xml
new file mode 100644
index 000000000000..9e646aaf0ea3
--- /dev/null
+++ b/src/chrome/content/rules/GolfLink.net.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Golf_Digest.xml b/src/chrome/content/rules/Golf_Digest.xml
index 5da43a812909..ca57eef54556 100644
--- a/src/chrome/content/rules/Golf_Digest.xml
+++ b/src/chrome/content/rules/Golf_Digest.xml
@@ -74,7 +74,7 @@
 	
 	
 	
-	
+
 	
 
 
diff --git a/src/chrome/content/rules/GoodSmile.info.xml b/src/chrome/content/rules/GoodSmile.info.xml
new file mode 100644
index 000000000000..c9b098f80a7a
--- /dev/null
+++ b/src/chrome/content/rules/GoodSmile.info.xml
@@ -0,0 +1,35 @@
+
+
+	
+	
+	
+		
+		
+	
+	
+		
+		
+		
+	
+	
+	
+	
+	
+		
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Good_Luck_Trunk.com.xml b/src/chrome/content/rules/Good_Luck_Trunk.com.xml
deleted file mode 100644
index 5aac40124f2f..000000000000
--- a/src/chrome/content/rules/Good_Luck_Trunk.com.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Goodreads.xml b/src/chrome/content/rules/Goodreads.xml
index c649e7a674cf..436094e04273 100644
--- a/src/chrome/content/rules/Goodreads.xml
+++ b/src/chrome/content/rules/Goodreads.xml
@@ -1,22 +1,17 @@
 
 
 
-	
 	
 	
 
-	
-	
-
-	
-
 	
 
 	
diff --git a/src/chrome/content/rules/Goodsie.xml b/src/chrome/content/rules/Goodsie.xml
deleted file mode 100644
index 46a674888363..000000000000
--- a/src/chrome/content/rules/Goodsie.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Google.com_Subdomains.xml b/src/chrome/content/rules/Google.com_Subdomains.xml
index 6cd4291031ea..8bc6fe425668 100644
--- a/src/chrome/content/rules/Google.com_Subdomains.xml
+++ b/src/chrome/content/rules/Google.com_Subdomains.xml
@@ -53,11 +53,9 @@
 	
 		
 	
-	
 	
 	
 	
-	
 	
 		
 		
diff --git a/src/chrome/content/rules/Google.tld_Subdomains.xml b/src/chrome/content/rules/Google.tld_Subdomains.xml
index 39b36723f0af..442c669a6796 100644
--- a/src/chrome/content/rules/Google.tld_Subdomains.xml
+++ b/src/chrome/content/rules/Google.tld_Subdomains.xml
@@ -10,111 +10,172 @@
 		failure: *.google.* failed: The target host must be a hostname, not URL, and must use at most one wildcard.
 	-->
 	
-	
-	
 	
-	
 	
-	
-	
-	
-	
-	
 	
 	
 	
-	
 	
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
 
 	
 	
-	
 	
-	
 	
-	
-	
-	
-	
-	
-	
 	
 	
-	
-	
 	
 
-	
+	
 
-	
+
 		
-		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+
+    
 		
-		
-		
+    
+    
+    
+    
+    
+    
+    
+    
+
 		
-		
-		
-		
+    
+    
+    
+    
+    
+    
+    
+    
+
 		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+
 		
 		
-		
-		
-		
+		
+		
+		
+		
+		
+		
+		
+
 		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+
 		
 		
-		
-		
-		
+		
+		
+		
+		
+		
+		
+		
+
 		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+
 		
 		
+		
+		
+		
+		
+		
+		
+		
+		
+
 		
+    
+    
+    
+    
+    
+    
+    
+    
+
 		
-		
-		
-		
-		
 		
 		
 		
+		
+		
+		
+
 		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+
 		
 		
+		
+		
+		
+		
+		
+		
 		
 		
 		
-		
-		
-		
-		
-		
-		
-		
-		
+
 		
+		
+		
+		
+		
+		
+		
+		
+		
 
 		
 
 
@@ -40,6 +34,8 @@
 	
 	
 
+	
+	
 	
 	
 	
@@ -104,11 +100,6 @@
 	
 	
 
-
-	
-	
-
-
 	
 
 	
diff --git a/src/chrome/content/rules/GoogleAPIs.xml b/src/chrome/content/rules/GoogleAPIs.xml
index 92172b139230..3993d9d3ddfe 100644
--- a/src/chrome/content/rules/GoogleAPIs.xml
+++ b/src/chrome/content/rules/GoogleAPIs.xml
@@ -119,7 +119,6 @@
 		
 		
 		
-		
 		
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 5e89ca624b79..c432eddbbf21 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -6,13 +6,12 @@
 		- Apture.com.xml
 		- Blogspot.com_blogs.xml
 		- Certificate-transparency.org.xml
-		- ChannelIntelligence.com.xml
-		- Chrome_Status.com.xml
+		- ChromeStatus.com.xml
 		- Chromium.org.xml
-		- DoubleClick_by_Google.com.xml
+		- DartSearch.net.xml
 		- Doubleclick.net.xml
 		- FeedBurner.xml
-		- Go_Lang.org.xml
+		- GetOutline.org.xml
 		- Google.com_Subdomains.xml
 		- Google.com_Subdomains_Complex.html
 		- Google.org.xml
@@ -29,15 +28,13 @@
 		- Made_with_Code.com.xml
 		- Meebo.xml
 		- Orkut.xml
+		- pki.goog.xml
 		- Polymer-Project.org.xml
-		- Postini.xml
 		- Waze.com.xml
 		- WebM_Project.org.xml
 		- With_Google.com.xml
 -->
 
-	
-	
 
 	
 	
diff --git a/src/chrome/content/rules/Google_App_Engine.xml b/src/chrome/content/rules/Google_App_Engine.xml
index 76658417da82..c639af8699c7 100644
--- a/src/chrome/content/rules/Google_App_Engine.xml
+++ b/src/chrome/content/rules/Google_App_Engine.xml
@@ -32,7 +32,7 @@
 	
 
 
-	
+	
 
 
 	 https://gotvape.com/: (51, "SSL: no alternat
 
 
 	
-	
+	
+	
+	
 	
-	
+	
+	
+	
 
 
 	
@@ -31,7 +35,6 @@ Fetch error: http://gotvape.com/ => https://gotvape.com/: (51, "SSL: no alternat
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Gotmerchant.com.xml b/src/chrome/content/rules/Gotmerchant.com.xml
index f1838cd99c5e..7a0766d313c1 100644
--- a/src/chrome/content/rules/Gotmerchant.com.xml
+++ b/src/chrome/content/rules/Gotmerchant.com.xml
@@ -13,4 +13,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Goud.ma.xml b/src/chrome/content/rules/Goud.ma.xml
new file mode 100644
index 000000000000..92ca1b9985ca
--- /dev/null
+++ b/src/chrome/content/rules/Goud.ma.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+	
+		
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/GourmetGiftBaskets.com.xml b/src/chrome/content/rules/GourmetGiftBaskets.com.xml
index c58c97923050..a93d4b1e7baf 100644
--- a/src/chrome/content/rules/GourmetGiftBaskets.com.xml
+++ b/src/chrome/content/rules/GourmetGiftBaskets.com.xml
@@ -11,7 +11,8 @@
 
 
 	
-	
+	
+	
 
 
 	
 
 	
-	
 
 	
 
diff --git a/src/chrome/content/rules/GovMetric.com.xml b/src/chrome/content/rules/GovMetric.com.xml
index b74233997dbb..5f11bb3d7171 100644
--- a/src/chrome/content/rules/GovMetric.com.xml
+++ b/src/chrome/content/rules/GovMetric.com.xml
@@ -7,7 +7,7 @@
 	These altnames don't exist:
 
 		- govmetric.com
-	
+
 
 	Insecure cookies are set for these hosts: ᶜ
 
diff --git a/src/chrome/content/rules/Gov_Waste.co.uk.xml b/src/chrome/content/rules/Gov_Waste.co.uk.xml
index 7f3478312963..45325b2f3c91 100644
--- a/src/chrome/content/rules/Gov_Waste.co.uk.xml
+++ b/src/chrome/content/rules/Gov_Waste.co.uk.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.govwaste.co.uk/ => https://www.govwaste.co.uk/: (7, 'Fai
 		- .govwaste.co.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Government-Attic.xml b/src/chrome/content/rules/Government-Attic.xml
new file mode 100644
index 000000000000..209d732295c1
--- /dev/null
+++ b/src/chrome/content/rules/Government-Attic.xml
@@ -0,0 +1,16 @@
+
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Governmentattic.org.xml b/src/chrome/content/rules/Governmentattic.org.xml
deleted file mode 100644
index 4bd0a7b0a0f5..000000000000
--- a/src/chrome/content/rules/Governmentattic.org.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Gpg4win.de.xml b/src/chrome/content/rules/Gpg4win.de.xml
new file mode 100644
index 000000000000..f81e9a41f160
--- /dev/null
+++ b/src/chrome/content/rules/Gpg4win.de.xml
@@ -0,0 +1,17 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Gpg4win.org.xml b/src/chrome/content/rules/Gpg4win.org.xml
index 37951547e199..8314a307cc9b 100644
--- a/src/chrome/content/rules/Gpg4win.org.xml
+++ b/src/chrome/content/rules/Gpg4win.org.xml
@@ -1,10 +1,17 @@
+
 
 
 	
 	
 	
 
-	
+	
+
+	
 
 
diff --git a/src/chrome/content/rules/Gr-assets.com.xml b/src/chrome/content/rules/Gr-assets.com.xml
index 7054f1248c5b..c5bab54eab4f 100644
--- a/src/chrome/content/rules/Gr-assets.com.xml
+++ b/src/chrome/content/rules/Gr-assets.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://p.gr-assets.com/ => https://p.gr-assets.com/: (6, 'Could not
 	For other Goodreads coverage, see Goodreads.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Graasmilk.net.xml b/src/chrome/content/rules/Graasmilk.net.xml
index 80b509208a7e..fff5e1e72da7 100644
--- a/src/chrome/content/rules/Graasmilk.net.xml
+++ b/src/chrome/content/rules/Graasmilk.net.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://graasmilk.net/ => https://graasmilk.net/: (60, 'SSL certificate problem: self signed certificate')
 Fetch error: http://www.graasmilk.net/ => https://graasmilk.net/: (60, 'SSL certificate problem: self signed certificate')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Grab_Media.xml b/src/chrome/content/rules/Grab_Media.xml
deleted file mode 100644
index 05b3171a4781..000000000000
--- a/src/chrome/content/rules/Grab_Media.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/GradImages.xml b/src/chrome/content/rules/GradImages.xml
index e7d6f491d5dd..1fd138e9cb14 100644
--- a/src/chrome/content/rules/GradImages.xml
+++ b/src/chrome/content/rules/GradImages.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Gradle.org.xml b/src/chrome/content/rules/Gradle.org.xml
deleted file mode 100644
index 5bd37795ac22..000000000000
--- a/src/chrome/content/rules/Gradle.org.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Gradwell.com.xml b/src/chrome/content/rules/Gradwell.com.xml
index 5db04b7da5fa..c3ef447864f1 100644
--- a/src/chrome/content/rules/Gradwell.com.xml
+++ b/src/chrome/content/rules/Gradwell.com.xml
@@ -1,13 +1,17 @@
+
 
 	
 
 	
-
-
-	
-	
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Graham_Cluley.com.xml b/src/chrome/content/rules/Graham_Cluley.com.xml
deleted file mode 100644
index 70c685a83ec9..000000000000
--- a/src/chrome/content/rules/Graham_Cluley.com.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/GrainsResearchandDevelopmentCorporation.xml b/src/chrome/content/rules/GrainsResearchandDevelopmentCorporation.xml
index 6ffabe5ea42b..d5e54ac2ca37 100644
--- a/src/chrome/content/rules/GrainsResearchandDevelopmentCorporation.xml
+++ b/src/chrome/content/rules/GrainsResearchandDevelopmentCorporation.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Grand-Rapids-Community-Media-Center.xml b/src/chrome/content/rules/Grand-Rapids-Community-Media-Center.xml
index 334e696dc45f..5944dbd32c92 100644
--- a/src/chrome/content/rules/Grand-Rapids-Community-Media-Center.xml
+++ b/src/chrome/content/rules/Grand-Rapids-Community-Media-Center.xml
@@ -7,7 +7,8 @@ Fetch error: http://www.wealthytheatre.org/ => https://www.grcmc.org/theatre/: R
 
 
 	
-	
+	
+	
 	
 	
 
@@ -15,11 +16,10 @@ Fetch error: http://www.wealthytheatre.org/ => https://www.grcmc.org/theatre/: R
 	
 
 
-	
 
 	
 	
 
+	
 
diff --git a/src/chrome/content/rules/GrandViewOutdoors.com.xml b/src/chrome/content/rules/GrandViewOutdoors.com.xml
new file mode 100644
index 000000000000..2693d61c1ddb
--- /dev/null
+++ b/src/chrome/content/rules/GrandViewOutdoors.com.xml
@@ -0,0 +1,17 @@
+
+
+
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Grand_Haven_Tribune.xml b/src/chrome/content/rules/Grand_Haven_Tribune.xml
index 480c97e0140d..d4dc812c27d3 100644
--- a/src/chrome/content/rules/Grand_Haven_Tribune.xml
+++ b/src/chrome/content/rules/Grand_Haven_Tribune.xml
@@ -17,4 +17,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Grand_Lodge_of_British_Columbia.xml b/src/chrome/content/rules/Grand_Lodge_of_British_Columbia.xml
index 3aaf1f53e788..c8c4db536c70 100644
--- a/src/chrome/content/rules/Grand_Lodge_of_British_Columbia.xml
+++ b/src/chrome/content/rules/Grand_Lodge_of_British_Columbia.xml
@@ -9,13 +9,15 @@ Fetch error: http://bcy.ca/ => https://www.freemasonry.bcy.ca/: (51, "SSL: no al
 		- freemasonry	(cert only matches www.freemasonry)
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/GraphQL.org.xml b/src/chrome/content/rules/GraphQL.org.xml
new file mode 100644
index 000000000000..26fc6eb14d96
--- /dev/null
+++ b/src/chrome/content/rules/GraphQL.org.xml
@@ -0,0 +1,31 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Graphene-lda.com.xml b/src/chrome/content/rules/Graphene-lda.com.xml
index 1771274932be..50f3ba9d5eb6 100644
--- a/src/chrome/content/rules/Graphene-lda.com.xml
+++ b/src/chrome/content/rules/Graphene-lda.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://graphene-lda.com/ => https://graphene-lda.com/: (6, 'Could n
 Fetch error: http://www.graphene-lda.com/ => https://www.graphene-lda.com/: (6, 'Could not resolve host: www.graphene-lda.com')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Graphviz.org.xml b/src/chrome/content/rules/Graphviz.org.xml
new file mode 100644
index 000000000000..86394124dd9f
--- /dev/null
+++ b/src/chrome/content/rules/Graphviz.org.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Grassroots.org.xml b/src/chrome/content/rules/Grassroots.org.xml
index 993b36d104e6..1e1a7ae85c84 100644
--- a/src/chrome/content/rules/Grassroots.org.xml
+++ b/src/chrome/content/rules/Grassroots.org.xml
@@ -9,12 +9,12 @@ Fetch error: http://grassroots.org/ => https://grassroots.org/: (28, 'Operation
 	For problematic rules, see Grassroots.org-mismatches.xml.
 
 -->
-
+
 
 	
 	
 	
-	
+
 
 
 	
diff --git a/src/chrome/content/rules/Gravity.com.xml b/src/chrome/content/rules/Gravity.com.xml
deleted file mode 100644
index e41dd67f807e..000000000000
--- a/src/chrome/content/rules/Gravity.com.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Gravity4.com.xml b/src/chrome/content/rules/Gravity4.com.xml
deleted file mode 100644
index 5f2ec8944b72..000000000000
--- a/src/chrome/content/rules/Gravity4.com.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/GreatDomains.com.xml b/src/chrome/content/rules/GreatDomains.com.xml
deleted file mode 100644
index 9ead9f5450b5..000000000000
--- a/src/chrome/content/rules/GreatDomains.com.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Great_American_Office.xml b/src/chrome/content/rules/Great_American_Office.xml
index d128105f6024..832adbf22867 100644
--- a/src/chrome/content/rules/Great_American_Office.xml
+++ b/src/chrome/content/rules/Great_American_Office.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Greatis.net.xml b/src/chrome/content/rules/Greatis.net.xml
new file mode 100644
index 000000000000..4f9177d9c496
--- /dev/null
+++ b/src/chrome/content/rules/Greatis.net.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Greek-banks.xml b/src/chrome/content/rules/Greek-banks.xml
index 5e139a9f90f4..3831c2030758 100644
--- a/src/chrome/content/rules/Greek-banks.xml
+++ b/src/chrome/content/rules/Greek-banks.xml
@@ -7,7 +7,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.probank.gr/ => https://www.probank.gr/: (28, 'Resolving timed out after 10520 milliseconds') This ruleset is experimental. If you experience problems please
 	 open an issue at https://github.com/kargig/https-everywhere-greek-rules -->
 
-
+
   
   
   
diff --git a/src/chrome/content/rules/Greek-gov.xml b/src/chrome/content/rules/Greek-gov.xml
index e462f86532bc..5e74176b00d1 100644
--- a/src/chrome/content/rules/Greek-gov.xml
+++ b/src/chrome/content/rules/Greek-gov.xml
@@ -2,15 +2,16 @@
 	 open an issue at https://github.com/kargig/https-everywhere-greek-rules -->
 
 
-  
-  
+  
+  
+  
+  
+  
   
 
 	
 	
 	
 
-  
-  
-  
+  
 
diff --git a/src/chrome/content/rules/Greek-media.xml b/src/chrome/content/rules/Greek-media.xml
index 8cfb9fe83f56..bcea15139d5a 100644
--- a/src/chrome/content/rules/Greek-media.xml
+++ b/src/chrome/content/rules/Greek-media.xml
@@ -13,8 +13,6 @@ open an issue at https://github.com/kargig/https-everywhere-greek-rules
 
 	
 
-	
-
 	
 
diff --git a/src/chrome/content/rules/Greek-travel.xml b/src/chrome/content/rules/Greek-travel.xml
index eca0b93688bb..7e70d5ba94ff 100644
--- a/src/chrome/content/rules/Greek-travel.xml
+++ b/src/chrome/content/rules/Greek-travel.xml
@@ -1,5 +1,8 @@
 
 
 
-	
-	
 	
-	
 	
 	
 	
 	
 	
 	
-	
-	
-	
 	
 	
 	
 	
 
 	
-	
+
 	
 	
-	
-	
+
 	
 	
 	
 	
 	
 	
-	
-	
+
 	
 	
 	
 	
 	
 	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
+
 	
 	
 	
 	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
+
 	
 	
 	
 	
 	
 	
-	
-	
+
 	
 	
 	
 	
-	
-	
-	
-	
+	
+	
+
 	
 	
 	
 	
 	
 	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
+
 	
 	
 	
 	
 	
 	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
+
 	
 	
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/GreenIT-BB-mismatches.xml b/src/chrome/content/rules/GreenIT-BB-mismatches.xml
index 319293b2e537..3e5392561e67 100644
--- a/src/chrome/content/rules/GreenIT-BB-mismatches.xml
+++ b/src/chrome/content/rules/GreenIT-BB-mismatches.xml
@@ -3,7 +3,7 @@
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/GreenIT-BB.xml b/src/chrome/content/rules/GreenIT-BB.xml
index 16a7024605a2..8e4402121778 100644
--- a/src/chrome/content/rules/GreenIT-BB.xml
+++ b/src/chrome/content/rules/GreenIT-BB.xml
@@ -10,7 +10,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://benchmarking.greenit-bb.de/ => https://benchmarking.greenit-bb.de/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/GreenQloud.com.xml b/src/chrome/content/rules/GreenQloud.com.xml
index aced569e920e..fd31ea8998b4 100644
--- a/src/chrome/content/rules/GreenQloud.com.xml
+++ b/src/chrome/content/rules/GreenQloud.com.xml
@@ -6,7 +6,6 @@ Fetch error: http://my.greenqloud.com/ => https://my.greenqloud.com/: (6, 'Could
 
 	Other GreenQloud rulesets:
 
-		- QStack.com.xml
 
 
 	Problematic hosts in *greenqloud.com:
@@ -22,7 +21,7 @@ Fetch error: http://my.greenqloud.com/ => https://my.greenqloud.com/: (6, 'Could
 		- auth.greenqloud.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/GreenSky_Credit.com.xml b/src/chrome/content/rules/GreenSky_Credit.com.xml
index 156b6b8bfcc0..608d32a8317e 100644
--- a/src/chrome/content/rules/GreenSky_Credit.com.xml
+++ b/src/chrome/content/rules/GreenSky_Credit.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://greensky.com/ => http://greensky.com/: Cycle detected - URL
 
 
 	
-	
+	
 
 
 	 http://greensky.com/: Cycle detected - URL
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/GreenVehicleGuide.xml b/src/chrome/content/rules/GreenVehicleGuide.xml
index 4d99d886bfd0..e592ef27c11c 100644
--- a/src/chrome/content/rules/GreenVehicleGuide.xml
+++ b/src/chrome/content/rules/GreenVehicleGuide.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Green_Coffee_Bean_Extract.xml b/src/chrome/content/rules/Green_Coffee_Bean_Extract.xml
deleted file mode 100644
index fa229113c448..000000000000
--- a/src/chrome/content/rules/Green_Coffee_Bean_Extract.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Green_Party.org.xml b/src/chrome/content/rules/Green_Party.org.xml
deleted file mode 100644
index dae5b97d8ef8..000000000000
--- a/src/chrome/content/rules/Green_Party.org.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Green_PolkaDot_Box.xml b/src/chrome/content/rules/Green_PolkaDot_Box.xml
index 3f5a26d8696b..90f10512a333 100644
--- a/src/chrome/content/rules/Green_PolkaDot_Box.xml
+++ b/src/chrome/content/rules/Green_PolkaDot_Box.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Greenbone.xml b/src/chrome/content/rules/Greenbone.xml
index c52d6af7c629..201778643d2b 100644
--- a/src/chrome/content/rules/Greenbone.xml
+++ b/src/chrome/content/rules/Greenbone.xml
@@ -20,4 +20,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Greenhouse.io.xml b/src/chrome/content/rules/Greenhouse.io.xml
index 0796d0c5d4bc..90ca2cf7abdd 100644
--- a/src/chrome/content/rules/Greenhouse.io.xml
+++ b/src/chrome/content/rules/Greenhouse.io.xml
@@ -21,13 +21,15 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Greenpeace.org.xml b/src/chrome/content/rules/Greenpeace.org.xml
index 508854782fe2..00b93d7bd481 100644
--- a/src/chrome/content/rules/Greenpeace.org.xml
+++ b/src/chrome/content/rules/Greenpeace.org.xml
@@ -23,7 +23,7 @@ Fetch error: http://www.moon.greenpeace.org/ => https://www.moon.greenpeace.org/
 	² 503
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/GreenvilleOnline.com.xml b/src/chrome/content/rules/GreenvilleOnline.com.xml
index 17b76ddfd94c..8b4970c477d6 100644
--- a/src/chrome/content/rules/GreenvilleOnline.com.xml
+++ b/src/chrome/content/rules/GreenvilleOnline.com.xml
@@ -37,10 +37,11 @@
 
 
 	
-	
+	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Grenoble-INP.fr.xml b/src/chrome/content/rules/Grenoble-INP.fr.xml
index a8afc6fbb24b..f08d2604d0d7 100644
--- a/src/chrome/content/rules/Grenoble-INP.fr.xml
+++ b/src/chrome/content/rules/Grenoble-INP.fr.xml
@@ -12,7 +12,7 @@
 	Fully covered subdomains:
 
 		- applicationform
-		- edt 
+		- edt
 		- emploi-du-temps
 
 -->
diff --git a/src/chrome/content/rules/Greystripe.com.xml b/src/chrome/content/rules/Greystripe.com.xml
index c3f8b3738e26..41a6d7fff52a 100644
--- a/src/chrome/content/rules/Greystripe.com.xml
+++ b/src/chrome/content/rules/Greystripe.com.xml
@@ -1,13 +1,13 @@
 
 
 	
-	
+	
+	
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Gridcoin.us.xml b/src/chrome/content/rules/Gridcoin.us.xml
index 568083596ba3..22540efa21bd 100644
--- a/src/chrome/content/rules/Gridcoin.us.xml
+++ b/src/chrome/content/rules/Gridcoin.us.xml
@@ -17,7 +17,7 @@ Fetch error: http://pool.gridcoin.us/ => https://pool.gridcoin.us/: (28, 'Connec
 		- (www.)?
 		- pool
 
-		- 
+		-
 	Mixed content:
 
 		- css on (www.)? from fonts.googleapis.com *
@@ -27,7 +27,7 @@ Fetch error: http://pool.gridcoin.us/ => https://pool.gridcoin.us/: (28, 'Connec
 	² Rule disabled by default
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Gridz_Direct.com-falsemixed.xml b/src/chrome/content/rules/Gridz_Direct.com-falsemixed.xml
index 60b56df1d32d..17fc0265bc0b 100644
--- a/src/chrome/content/rules/Gridz_Direct.com-falsemixed.xml
+++ b/src/chrome/content/rules/Gridz_Direct.com-falsemixed.xml
@@ -4,13 +4,12 @@
 -->
 
 
-	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Griffin_Technology.com.xml b/src/chrome/content/rules/Griffin_Technology.com.xml
deleted file mode 100644
index bfd5bbdeabff..000000000000
--- a/src/chrome/content/rules/Griffin_Technology.com.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Griffith-University.xml b/src/chrome/content/rules/Griffith-University.xml
index b9127351f9c3..d62c1962c788 100644
--- a/src/chrome/content/rules/Griffith-University.xml
+++ b/src/chrome/content/rules/Griffith-University.xml
@@ -1,7 +1,15 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Grinnell_College.xml b/src/chrome/content/rules/Grinnell_College.xml
index e35fa5305eca..b0a3c891cb86 100644
--- a/src/chrome/content/rules/Grinnell_College.xml
+++ b/src/chrome/content/rules/Grinnell_College.xml
@@ -2,10 +2,7 @@
 	Nonfunctional subdomains:
 
 		- athdb			(replies with http)
-		- catalog		(shows www.acalogadmin.com; mismatched, CN: *.acalogadmin.com)
-		- perecruiting.cs
 		- pdid			(times out)
-		- pioneers
 		- schedule25wb		(times out)
 		- (www.)web
 		- wm
@@ -15,9 +12,12 @@
 	Problematic subdomains:
 
 		- ^		(times out)
-		- www.cs	(works; expired 2010-08-17, self-signed)
 		- drupal	(works, mismatched, CN: www.cs.grinnell.edu)
 		- www.cat.lib	(cert only matches ^cat.lib)
+		- db		(cert only matches ^itwebapps)
+		- www.math	(cert only matches ^www.cs)
+		- magazine	(bad cert domain)
+		- *.grin.edu	(bad cert domain)
 
 
 	Partially covered subdomains:
@@ -27,37 +27,53 @@
 
 	Fully covered subdomains:
 
-		- autodiscover
 		- bookstore
-		- db
 		- digital
 		- help
 		- imap
 		- itwebapps
 		- (www.)cat.lib		(www → ^)
 		- libweb
-		- loggia
 		- mail
 		- webmail
+		- www.cs
 
 -->
 
 
 	
-	
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+		
+		
+		
+		
+	
 
 	
-	
-
-
-	
+	
 
-	
 
-	
+        
 
 
diff --git a/src/chrome/content/rules/Gris.ca.xml b/src/chrome/content/rules/Gris.ca.xml
new file mode 100644
index 000000000000..4540ead2085c
--- /dev/null
+++ b/src/chrome/content/rules/Gris.ca.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Grocery_Server.com.xml b/src/chrome/content/rules/Grocery_Server.com.xml
index 0722b99cc4f0..7e59593d955d 100644
--- a/src/chrome/content/rules/Grocery_Server.com.xml
+++ b/src/chrome/content/rules/Grocery_Server.com.xml
@@ -18,7 +18,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/GroenLinks.nl.xml b/src/chrome/content/rules/GroenLinks.nl.xml
index a339d2cf62db..a29f2b329dea 100644
--- a/src/chrome/content/rules/GroenLinks.nl.xml
+++ b/src/chrome/content/rules/GroenLinks.nl.xml
@@ -29,7 +29,7 @@
 	
 	
 
-	
+	
 
 
 	
 	
 
-	
 
 	
diff --git a/src/chrome/content/rules/Group-Commerce.xml b/src/chrome/content/rules/Group-Commerce.xml
index dc003953d8dc..06c18c0d77a9 100644
--- a/src/chrome/content/rules/Group-Commerce.xml
+++ b/src/chrome/content/rules/Group-Commerce.xml
@@ -10,7 +10,7 @@ Fetch error: http://admin.groupcommerce.com/ => https://admin.groupcommerce.com/
 		- (www.)groupcommerce.com
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Groupees.com.xml b/src/chrome/content/rules/Groupees.com.xml
index 36bf650e2f4f..ed4bb475f6c5 100644
--- a/src/chrome/content/rules/Groupees.com.xml
+++ b/src/chrome/content/rules/Groupees.com.xml
@@ -2,6 +2,6 @@
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Grouper_Social_Club.com.xml b/src/chrome/content/rules/Grouper_Social_Club.com.xml
index 4e262e7fb027..40f550369b18 100644
--- a/src/chrome/content/rules/Grouper_Social_Club.com.xml
+++ b/src/chrome/content/rules/Grouper_Social_Club.com.xml
@@ -8,18 +8,17 @@ Fetch error: http://groupersocialclub.com.au/ => https://groupersocialclub.com.a
 		- groupergram-photos.s3.amazonaws.com
 
 -->
-
+
 
 	
-	
 	
-	
+	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Groupon.com.br.xml b/src/chrome/content/rules/Groupon.com.br.xml
index 267415e48814..a4d0b5948727 100644
--- a/src/chrome/content/rules/Groupon.com.br.xml
+++ b/src/chrome/content/rules/Groupon.com.br.xml
@@ -19,7 +19,7 @@ Non-2xx HTTP code: http://www.groupon.com.br/ (200) => https://www.groupon.com.b
 		- www.groupon.com.br
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Groupon.gr.xml b/src/chrome/content/rules/Groupon.gr.xml
index b350832c3445..a32c5c6517fb 100644
--- a/src/chrome/content/rules/Groupon.gr.xml
+++ b/src/chrome/content/rules/Groupon.gr.xml
@@ -5,11 +5,11 @@ Fetch error: http://groupon.gr/ => https://groupon.gr/: (51, "SSL: no alternativ
  This ruleset is experimental. If you experience problems please
 	 open an issue at https://github.com/kargig/https-everywhere -->
 
-
+
   
   
 
-	
+	
 
   
 
diff --git a/src/chrome/content/rules/Groupon.se.xml b/src/chrome/content/rules/Groupon.se.xml
index bf818d300e25..661e90483ff4 100644
--- a/src/chrome/content/rules/Groupon.se.xml
+++ b/src/chrome/content/rules/Groupon.se.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://groupon.se/ => https://www.groupon.se/: (51, "SSL: no alternative certificate subject name matches target host name 'www.groupon.se'")
 
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/Groupon.xml b/src/chrome/content/rules/Groupon.xml
index 17d18673ed05..79936e5aad18 100644
--- a/src/chrome/content/rules/Groupon.xml
+++ b/src/chrome/content/rules/Groupon.xml
@@ -7,7 +7,7 @@ Non-2xx HTTP code: http://groupon.co.uk/ (200) => https://www.groupon.co.uk/ (40
 	For other Groupon coverage, see Groupon.com.xml.
 
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/Groupon_Works.com.xml b/src/chrome/content/rules/Groupon_Works.com.xml
index 127453ac1e30..6a10543678ef 100644
--- a/src/chrome/content/rules/Groupon_Works.com.xml
+++ b/src/chrome/content/rules/Groupon_Works.com.xml
@@ -7,7 +7,7 @@ Non-2xx HTTP code: http://www.grouponworks.com/ (200) => https://www.grouponwork
 	For other Groupon coverage, see Groupon.com.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Grove.io.xml b/src/chrome/content/rules/Grove.io.xml
index 33a38d4c8313..b25f875277bd 100644
--- a/src/chrome/content/rules/Grove.io.xml
+++ b/src/chrome/content/rules/Grove.io.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.grove.io/ => https://www.grove.io/: (60, 'SSL certificate problem: self signed certificate')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Grow_HQ.com.xml b/src/chrome/content/rules/Grow_HQ.com.xml
index 299fe40b0964..e2a2ee1835b3 100644
--- a/src/chrome/content/rules/Grow_HQ.com.xml
+++ b/src/chrome/content/rules/Grow_HQ.com.xml
@@ -4,16 +4,17 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://growhq.com/ => https://growhq.com/: (35, 'Unknown SSL protocol error in connection to growhq.com:443 ')
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Growery.xml b/src/chrome/content/rules/Growery.xml
index 05e9f81fcfde..4a4ca25a1b54 100644
--- a/src/chrome/content/rules/Growery.xml
+++ b/src/chrome/content/rules/Growery.xml
@@ -7,4 +7,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Grsm.io.xml b/src/chrome/content/rules/Grsm.io.xml
new file mode 100644
index 000000000000..7845f55cbbc3
--- /dev/null
+++ b/src/chrome/content/rules/Grsm.io.xml
@@ -0,0 +1,17 @@
+
+
+
+	
+	
+		
+		
+		
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Grubstreet.com.xml b/src/chrome/content/rules/Grubstreet.com.xml
new file mode 100644
index 000000000000..edb1c0e03dc1
--- /dev/null
+++ b/src/chrome/content/rules/Grubstreet.com.xml
@@ -0,0 +1,47 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Grupfoni.xml b/src/chrome/content/rules/Grupfoni.xml
index 6dd7bb092fa1..241da0146c21 100644
--- a/src/chrome/content/rules/Grupfoni.xml
+++ b/src/chrome/content/rules/Grupfoni.xml
@@ -2,7 +2,7 @@
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/Grupo-Triton.xml b/src/chrome/content/rules/Grupo-Triton.xml
index 5f37b3c71d8e..36be07f55925 100644
--- a/src/chrome/content/rules/Grupo-Triton.xml
+++ b/src/chrome/content/rules/Grupo-Triton.xml
@@ -3,7 +3,7 @@
 	
 	
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/GrvCDN.com.xml b/src/chrome/content/rules/GrvCDN.com.xml
deleted file mode 100644
index d520b6798710..000000000000
--- a/src/chrome/content/rules/GrvCDN.com.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-	
-	
-		
-	
-		
-	
-		
-	
-		
-	
-
-	
-	
-
-	
-		
-
-	
-
diff --git a/src/chrome/content/rules/Gs1ca.org.xml b/src/chrome/content/rules/Gs1ca.org.xml
new file mode 100644
index 000000000000..ed2fb233dce3
--- /dev/null
+++ b/src/chrome/content/rules/Gs1ca.org.xml
@@ -0,0 +1,20 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Gsfacket.se.xml b/src/chrome/content/rules/Gsfacket.se.xml
index f4e28f2128ff..91c9911f5ead 100644
--- a/src/chrome/content/rules/Gsfacket.se.xml
+++ b/src/chrome/content/rules/Gsfacket.se.xml
@@ -1,8 +1,29 @@
-
+
 
 	
 	
-	
-	
-
+	
+	
 
+	
+
diff --git a/src/chrome/content/rules/Gsfn.us.xml b/src/chrome/content/rules/Gsfn.us.xml
index a2028e87f53d..c9a30f8f27b3 100644
--- a/src/chrome/content/rules/Gsfn.us.xml
+++ b/src/chrome/content/rules/Gsfn.us.xml
@@ -22,4 +22,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Gsmhosting.com.xml b/src/chrome/content/rules/Gsmhosting.com.xml
deleted file mode 100644
index 9020727a962c..000000000000
--- a/src/chrome/content/rules/Gsmhosting.com.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-  
-  
-  
-
-  
-
diff --git a/src/chrome/content/rules/Gsspcln.jp.xml b/src/chrome/content/rules/Gsspcln.jp.xml
index c33f83f6485b..06f36799c6fe 100644
--- a/src/chrome/content/rules/Gsspcln.jp.xml
+++ b/src/chrome/content/rules/Gsspcln.jp.xml
@@ -1,5 +1,5 @@
 
 
diff --git a/src/chrome/content/rules/Gtimg.com.xml b/src/chrome/content/rules/Gtimg.com.xml
index 06c4aa19ba18..f59ce3c62d21 100644
--- a/src/chrome/content/rules/Gtimg.com.xml
+++ b/src/chrome/content/rules/Gtimg.com.xml
@@ -3,7 +3,6 @@
 		3366.gtimg.com
 
 	Mismatch:
-		ac.gtimg.com
 		a.map.gtimg.com
 -->
 
@@ -15,6 +14,10 @@
 		
 		
 
+	
+		
+		
+
 	
 		
 		
@@ -40,6 +43,12 @@
 	
 	
 
+	
+	
+		
+	
+	
+
 	
 	
 	
@@ -84,6 +93,9 @@
 	
 	
 
+	
+	
+
 	
 		
 
diff --git a/src/chrome/content/rules/Gtk.org.xml b/src/chrome/content/rules/Gtk.org.xml
new file mode 100644
index 000000000000..218032edd166
--- /dev/null
+++ b/src/chrome/content/rules/Gtk.org.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Gu.com.xml b/src/chrome/content/rules/Gu.com.xml
index 423267d887be..9a069e909b2d 100644
--- a/src/chrome/content/rules/Gu.com.xml
+++ b/src/chrome/content/rules/Gu.com.xml
@@ -18,4 +18,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Guarantorus_Loans.co.uk.xml b/src/chrome/content/rules/Guarantorus_Loans.co.uk.xml
index 95917de5122f..e985a4f8b810 100644
--- a/src/chrome/content/rules/Guarantorus_Loans.co.uk.xml
+++ b/src/chrome/content/rules/Guarantorus_Loans.co.uk.xml
@@ -2,7 +2,7 @@
 	NB: Server sends no certificate chain, see https://whatsmychaincert.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Guardian.co.tt.xml b/src/chrome/content/rules/Guardian.co.tt.xml
deleted file mode 100644
index 0c75169d2081..000000000000
--- a/src/chrome/content/rules/Guardian.co.tt.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Guardian.xml b/src/chrome/content/rules/Guardian.xml
index ea7af67aed77..2de1b6265cc2 100644
--- a/src/chrome/content/rules/Guardian.xml
+++ b/src/chrome/content/rules/Guardian.xml
@@ -1,10 +1,9 @@
-
 
-
+
 
 	
diff --git a/src/chrome/content/rules/GuardianFX.com.xml b/src/chrome/content/rules/GuardianFX.com.xml
new file mode 100644
index 000000000000..822194270d89
--- /dev/null
+++ b/src/chrome/content/rules/GuardianFX.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Guardian_Offers.co.uk.xml b/src/chrome/content/rules/Guardian_Offers.co.uk.xml
index db3a3780158f..24b079211671 100644
--- a/src/chrome/content/rules/Guardian_Offers.co.uk.xml
+++ b/src/chrome/content/rules/Guardian_Offers.co.uk.xml
@@ -23,7 +23,7 @@ Fetch error: http://essentials.guardianoffers.co.uk/ => https://essentials.guard
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Guardian_Subscriptions.co.uk.xml b/src/chrome/content/rules/Guardian_Subscriptions.co.uk.xml
deleted file mode 100644
index 1bad19a0100e..000000000000
--- a/src/chrome/content/rules/Guardian_Subscriptions.co.uk.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/GuideStar.xml b/src/chrome/content/rules/GuideStar.xml
index b10cca460f4c..4e67184c3981 100644
--- a/src/chrome/content/rules/GuideStar.xml
+++ b/src/chrome/content/rules/GuideStar.xml
@@ -16,7 +16,7 @@ Fetch error: http://www2.guidestar.org/ => https://www2.guidestar.org/: (60, 'SS
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Guild-Wars-2.xml b/src/chrome/content/rules/Guild-Wars-2.xml
index 9a6113d0f956..be4f99905024 100644
--- a/src/chrome/content/rules/Guild-Wars-2.xml
+++ b/src/chrome/content/rules/Guild-Wars-2.xml
@@ -32,13 +32,21 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
-	
+	
 
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/GuildEducation.com.xml b/src/chrome/content/rules/GuildEducation.com.xml
new file mode 100644
index 000000000000..d7254da195d2
--- /dev/null
+++ b/src/chrome/content/rules/GuildEducation.com.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Guitar_Center.com.xml b/src/chrome/content/rules/Guitar_Center.com.xml
index 1a4bcd46a3c8..7aba59ce4121 100644
--- a/src/chrome/content/rules/Guitar_Center.com.xml
+++ b/src/chrome/content/rules/Guitar_Center.com.xml
@@ -72,10 +72,15 @@ Non-2xx HTTP code: http://guitarcenter.com/ (200) => http://guitarcenter.com/ (4
 	² Unsecurable <= interrupted
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
+	
+	
 		
diff --git a/src/chrome/content/rules/Guldencoin.com.xml b/src/chrome/content/rules/Guldencoin.com.xml
index 3aa5fde8b08a..de5bd366b781 100644
--- a/src/chrome/content/rules/Guldencoin.com.xml
+++ b/src/chrome/content/rules/Guldencoin.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.guldencoin.com/ => https://www.guldencoin.com/: (35, 'er
 		- s3-eu-west-1.amazonaws.com/guldencoin.com/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/GumGum.xml b/src/chrome/content/rules/GumGum.xml
index 9b2f6e91848c..1e91aa2b596d 100644
--- a/src/chrome/content/rules/GumGum.xml
+++ b/src/chrome/content/rules/GumGum.xml
@@ -21,7 +21,10 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
 
 	
+		to="https://c.gumgum.com/" />
 
 
diff --git a/src/chrome/content/rules/Gumstix.xml b/src/chrome/content/rules/Gumstix.xml
index 405e2ccd2c0c..7883f273cfff 100644
--- a/src/chrome/content/rules/Gumstix.xml
+++ b/src/chrome/content/rules/Gumstix.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Gumtree.co.za.xml b/src/chrome/content/rules/Gumtree.co.za.xml
index a7610a84ff34..10c592873e06 100644
--- a/src/chrome/content/rules/Gumtree.co.za.xml
+++ b/src/chrome/content/rules/Gumtree.co.za.xml
@@ -14,7 +14,7 @@
 		- origin-cache	(r)
 		- tm	(t)
 
-	
+
 	e: expired certificate
 	h: http redirect
 	i: invalid certificate chain
diff --git a/src/chrome/content/rules/Gumtree.com.au.xml b/src/chrome/content/rules/Gumtree.com.au.xml
index aabb142b557d..67330da029e6 100644
--- a/src/chrome/content/rules/Gumtree.com.au.xml
+++ b/src/chrome/content/rules/Gumtree.com.au.xml
@@ -11,7 +11,7 @@
 		- www.paramount-motors	(r)
 		- sfapi.cloud.qa1	(t)
 		- static2	(m)
-	
+
 	e: expired certificate
 	h: http redirect
 	i: invalid certificate chain
diff --git a/src/chrome/content/rules/Gumtree.com.xml b/src/chrome/content/rules/Gumtree.com.xml
index ea04f4348d38..f8bd44a53769 100644
--- a/src/chrome/content/rules/Gumtree.com.xml
+++ b/src/chrome/content/rules/Gumtree.com.xml
@@ -20,7 +20,7 @@
 		- newyork	(t)
 		- integration.sf	(r)
 		- sfgw.sf	(r)
-	
+
 	e: expired certificate
 	h: http redirect
 	i: invalid certificate chain
diff --git a/src/chrome/content/rules/Gumtree.ie.xml b/src/chrome/content/rules/Gumtree.ie.xml
index bebe8727cdd9..4b38742dfba1 100644
--- a/src/chrome/content/rules/Gumtree.ie.xml
+++ b/src/chrome/content/rules/Gumtree.ie.xml
@@ -8,7 +8,7 @@
 		- mktg		(t)
 		- secure	(t)
 		- wwww		(t)
-	
+
 	e: expired certificate
 	h: http redirect
 	i: invalid certificate chain
diff --git a/src/chrome/content/rules/Gumtree.sg.xml b/src/chrome/content/rules/Gumtree.sg.xml
index 9f0518035230..43ac3fbba92d 100644
--- a/src/chrome/content/rules/Gumtree.sg.xml
+++ b/src/chrome/content/rules/Gumtree.sg.xml
@@ -14,7 +14,7 @@
 		- singapore4	(t)
 		- singfapore	(t)
 		- sngapore	(t)
-	
+
 	e: expired certificate
 	h: http redirect
 	i: invalid certificate chain
diff --git a/src/chrome/content/rules/GunFacts.info.xml b/src/chrome/content/rules/GunFacts.info.xml
new file mode 100644
index 000000000000..10a06c820974
--- /dev/null
+++ b/src/chrome/content/rules/GunFacts.info.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Gust.xml b/src/chrome/content/rules/Gust.xml
index 5e93c90c3cc7..c853a3280479 100644
--- a/src/chrome/content/rules/Gust.xml
+++ b/src/chrome/content/rules/Gust.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Gutenberg.org.xml b/src/chrome/content/rules/Gutenberg.org.xml
index cce664121929..964951225726 100644
--- a/src/chrome/content/rules/Gutenberg.org.xml
+++ b/src/chrome/content/rules/Gutenberg.org.xml
@@ -12,7 +12,7 @@
 
 
 	
-	
+	
 
 
 	
-
-
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
-
 		
 
+	
 
-	
-
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Gwern.net.xml b/src/chrome/content/rules/Gwern.net.xml
new file mode 100644
index 000000000000..7ec584f13642
--- /dev/null
+++ b/src/chrome/content/rules/Gwern.net.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/H-T.co.xml b/src/chrome/content/rules/H-T.co.xml
index 976b78b07644..255bb5f219d0 100644
--- a/src/chrome/content/rules/H-T.co.xml
+++ b/src/chrome/content/rules/H-T.co.xml
@@ -12,7 +12,7 @@ Fetch error: http://h-t.co/ => https://h-t.co/: (51, "SSL: no alternative certif
 		- i.h-t.co
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/H5n.us.xml b/src/chrome/content/rules/H5n.us.xml
index 966473436df2..2d361cb4c4b9 100644
--- a/src/chrome/content/rules/H5n.us.xml
+++ b/src/chrome/content/rules/H5n.us.xml
@@ -4,10 +4,11 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://h5n.us/ => https://h5n.us/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
+
+
+	
+	
+	
+
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/HBAnet.org.xml b/src/chrome/content/rules/HBAnet.org.xml
index f480c956d906..ec60bb86cf41 100644
--- a/src/chrome/content/rules/HBAnet.org.xml
+++ b/src/chrome/content/rules/HBAnet.org.xml
@@ -7,7 +7,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/HBO.xml b/src/chrome/content/rules/HBO.xml
index fb49409222e0..6f7f3a31b915 100644
--- a/src/chrome/content/rules/HBO.xml
+++ b/src/chrome/content/rules/HBO.xml
@@ -50,7 +50,7 @@ Fetch error: http://talk.hbo.com/ => https://talk.hbo.com/: (7, 'Failed to conne
 	ˢ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/HBR.org.xml b/src/chrome/content/rules/HBR.org.xml
index 6f1b18bce8cd..cb44ada35027 100644
--- a/src/chrome/content/rules/HBR.org.xml
+++ b/src/chrome/content/rules/HBR.org.xml
@@ -39,7 +39,11 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 
 
 	
-
-
-	
-	
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
 	
 
@@ -57,16 +70,6 @@ Fetch error: http://autodiscover.hcl-axon.com/ => https://autodiscover.hcl-axon.
 	
 
 
-	
-
-	
-
-	
-
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/HD.se.xml b/src/chrome/content/rules/HD.se.xml
index df084eddd7aa..25b7f48c0956 100644
--- a/src/chrome/content/rules/HD.se.xml
+++ b/src/chrome/content/rules/HD.se.xml
@@ -4,8 +4,8 @@ Fetch error: http://hd.se/ => https://hd.se/: Cycle detected - URL already encou
 -->
 
   
-  
-  
+  
   
+  
 
 
diff --git a/src/chrome/content/rules/HDM-Stuttgart.de.xml b/src/chrome/content/rules/HDM-Stuttgart.de.xml
new file mode 100644
index 000000000000..3b328b9daa23
--- /dev/null
+++ b/src/chrome/content/rules/HDM-Stuttgart.de.xml
@@ -0,0 +1,226 @@
+
+
+
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+
+	
+	
+	
+
+	
+	
+	
+	
+	
+
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/HDME.eu.xml b/src/chrome/content/rules/HDME.eu.xml
new file mode 100644
index 000000000000..c3b76ae356b5
--- /dev/null
+++ b/src/chrome/content/rules/HDME.eu.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/HDSA.xml b/src/chrome/content/rules/HDSA.xml
index dab34408d812..3e15918293a2 100644
--- a/src/chrome/content/rules/HDSA.xml
+++ b/src/chrome/content/rules/HDSA.xml
@@ -5,7 +5,7 @@ Fetch error: http://hdsa.org/ => https://www.hdsa.org/: Too many redirects while
 Fetch error: http://www.hdsa.org/ => https://www.hdsa.org/: Too many redirects while fetching 'https://www.hdsa.org/'
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/HDserviceproviders.com.xml b/src/chrome/content/rules/HDserviceproviders.com.xml
index eb20cb042fa0..f286c534635c 100644
--- a/src/chrome/content/rules/HDserviceproviders.com.xml
+++ b/src/chrome/content/rules/HDserviceproviders.com.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/HDtracks.com.xml b/src/chrome/content/rules/HDtracks.com.xml
index d9ccd153b48b..ea197f199c2a 100644
--- a/src/chrome/content/rules/HDtracks.com.xml
+++ b/src/chrome/content/rules/HDtracks.com.xml
@@ -20,4 +20,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/HFO-Telecom.xml b/src/chrome/content/rules/HFO-Telecom.xml
index eaf781550e2a..712b0c2f831e 100644
--- a/src/chrome/content/rules/HFO-Telecom.xml
+++ b/src/chrome/content/rules/HFO-Telecom.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.hfo-telecom.de/ => https://www.hfo-telecom.de/: (60, 'SS
 Fetch error: http://www.telefonanschluss.de/ => https://www.telefonanschluss.de/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/HGO.se.xml b/src/chrome/content/rules/HGO.se.xml
index a53bca669ad7..fe43000ee6a7 100644
--- a/src/chrome/content/rules/HGO.se.xml
+++ b/src/chrome/content/rules/HGO.se.xml
@@ -9,7 +9,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.hgo.se/ => https://www.hgo.se/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 Fetch error: http://hgo.se/ => https://www.hgo.se/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/HH.ru.xml b/src/chrome/content/rules/HH.ru.xml
index c24e96ce29d7..d947cffb1b52 100644
--- a/src/chrome/content/rules/HH.ru.xml
+++ b/src/chrome/content/rules/HH.ru.xml
@@ -175,7 +175,6 @@
 		
 		
 		
-		
 		
 		
 		
diff --git a/src/chrome/content/rules/HHVM.com.xml b/src/chrome/content/rules/HHVM.com.xml
new file mode 100644
index 000000000000..cac0f52e4236
--- /dev/null
+++ b/src/chrome/content/rules/HHVM.com.xml
@@ -0,0 +1,12 @@
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/HI.is.xml b/src/chrome/content/rules/HI.is.xml
index cbf8bd5b0c1c..5de027180db5 100644
--- a/src/chrome/content/rules/HI.is.xml
+++ b/src/chrome/content/rules/HI.is.xml
@@ -26,7 +26,7 @@
 	² Refused
 	³ Shows default page
 	⁴ Dropped
-	⁵ Shows trabant.rhi.hi.is	
+	⁵ Shows trabant.rhi.hi.is
 
 
 	Problematic hosts in *hi.is:
diff --git a/src/chrome/content/rules/HIBAPRESS.com.xml b/src/chrome/content/rules/HIBAPRESS.com.xml
new file mode 100644
index 000000000000..d3fbe347a1b5
--- /dev/null
+++ b/src/chrome/content/rules/HIBAPRESS.com.xml
@@ -0,0 +1,15 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/HIG.se.xml b/src/chrome/content/rules/HIG.se.xml
index 7f567457e3a8..30a4b86311c3 100644
--- a/src/chrome/content/rules/HIG.se.xml
+++ b/src/chrome/content/rules/HIG.se.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.hig.se/ => https://www.hig.se/: Cycle detected - URL already encountered: https://www.hig.se/
 Fetch error: http://hig.se/ => https://www.hig.se/: Cycle detected - URL already encountered: https://www.hig.se/
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/HIIG.de.xml b/src/chrome/content/rules/HIIG.de.xml
index af81e7bce7f3..13e52e66f516 100644
--- a/src/chrome/content/rules/HIIG.de.xml
+++ b/src/chrome/content/rules/HIIG.de.xml
@@ -10,7 +10,7 @@
 		- css on www from fonts.googleapis.com *
 
 		- Images, on:
-		
+
 			- os from www.openingscience.org
 			- os, www from $self
 
diff --git a/src/chrome/content/rules/HJR-Verlag.de.xml b/src/chrome/content/rules/HJR-Verlag.de.xml
index 7c63940700be..aa286feb3291 100644
--- a/src/chrome/content/rules/HJR-Verlag.de.xml
+++ b/src/chrome/content/rules/HJR-Verlag.de.xml
@@ -5,7 +5,8 @@
 
 
 	
-	
+	
+	
 
 
 	
+
+	
+	
+	
+	
+	
+		
+	
+		
+	
+	
+	
+	
+	
+	
+		
+	
+		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/HKEdCity.xml b/src/chrome/content/rules/HKEdCity.xml
index 2fa09390ae3a..9d6a079fbe47 100644
--- a/src/chrome/content/rules/HKEdCity.xml
+++ b/src/chrome/content/rules/HKEdCity.xml
@@ -3,6 +3,10 @@
 	
 	
 
+	
+	
+	
+
 	
 
 
diff --git a/src/chrome/content/rules/HKGOLDEN.com.xml b/src/chrome/content/rules/HKGOLDEN.com.xml
index 78e718fae129..04b71130ee73 100644
--- a/src/chrome/content/rules/HKGOLDEN.com.xml
+++ b/src/chrome/content/rules/HKGOLDEN.com.xml
@@ -12,16 +12,13 @@
 
 	
 	
-	
-	
-	
-	
+	
+	
 	
-	
 	
+	
 	
 	
-	
 	
 	
 	
@@ -42,8 +39,8 @@
 	
 	
 	
-	
-	
+	
+	
 
 	
 
diff --git a/src/chrome/content/rules/HKGov-ArchSD.xml b/src/chrome/content/rules/HKGov-ArchSD.xml
index e3706649f3ef..ec80db9dfeb2 100644
--- a/src/chrome/content/rules/HKGov-ArchSD.xml
+++ b/src/chrome/content/rules/HKGov-ArchSD.xml
@@ -1,7 +1,7 @@
 
-
+
 
 	
 
diff --git a/src/chrome/content/rules/HKGov-HKMA.xml b/src/chrome/content/rules/HKGov-HKMA.xml
index c92cb32a2713..f1b784630f08 100644
--- a/src/chrome/content/rules/HKGov-HKMA.xml
+++ b/src/chrome/content/rules/HKGov-HKMA.xml
@@ -1,17 +1,16 @@
 
 
-
+	
 	
 	
+	
+	
 
-		
-
+	
 
diff --git a/src/chrome/content/rules/HKGov-HYD.xml b/src/chrome/content/rules/HKGov-HYD.xml
index 2b3da17f17bd..a71a84b66def 100644
--- a/src/chrome/content/rules/HKGov-HYD.xml
+++ b/src/chrome/content/rules/HKGov-HYD.xml
@@ -10,7 +10,7 @@
 	
 	
 	
-	
+
 	
 
 
diff --git a/src/chrome/content/rules/HKGov-ITF.xml b/src/chrome/content/rules/HKGov-ITF.xml
index 080b2c0a43ae..9ed2c238e424 100644
--- a/src/chrome/content/rules/HKGov-ITF.xml
+++ b/src/chrome/content/rules/HKGov-ITF.xml
@@ -9,7 +9,7 @@
 
 	
 	
-	
+
 	
 
 
diff --git a/src/chrome/content/rules/HKGov-LCSD.xml b/src/chrome/content/rules/HKGov-LCSD.xml
index 3dc7daca4b58..0efc925b74a8 100644
--- a/src/chrome/content/rules/HKGov-LCSD.xml
+++ b/src/chrome/content/rules/HKGov-LCSD.xml
@@ -10,7 +10,7 @@
 	
 	
 	
-	
+
 	
 	
 	
@@ -20,7 +20,7 @@
 	
 	
 	
-	
+
 	
 	
 	
@@ -34,6 +34,6 @@
 
 
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/HKGov-TID.xml b/src/chrome/content/rules/HKGov-TID.xml
index a47e3c976eb8..355865fb7bfd 100644
--- a/src/chrome/content/rules/HKGov-TID.xml
+++ b/src/chrome/content/rules/HKGov-TID.xml
@@ -11,7 +11,7 @@
 	
 	
 	
-		
+	
 
 	
diff --git a/src/chrome/content/rules/HKN.xml b/src/chrome/content/rules/HKN.xml
index 966ca2cc3e60..82ce24b69165 100644
--- a/src/chrome/content/rules/HKN.xml
+++ b/src/chrome/content/rules/HKN.xml
@@ -16,4 +16,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/HKUST-GZ.edu.cn.xml b/src/chrome/content/rules/HKUST-GZ.edu.cn.xml
new file mode 100644
index 000000000000..7ded22e4a465
--- /dev/null
+++ b/src/chrome/content/rules/HKUST-GZ.edu.cn.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/HKUST.edu.cn.xml b/src/chrome/content/rules/HKUST.edu.cn.xml
new file mode 100644
index 000000000000..6b034aff4a00
--- /dev/null
+++ b/src/chrome/content/rules/HKUST.edu.cn.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/HKUST.edu.hk.xml b/src/chrome/content/rules/HKUST.edu.hk.xml
new file mode 100644
index 000000000000..c827fd94bfad
--- /dev/null
+++ b/src/chrome/content/rules/HKUST.edu.hk.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/HK_Yanto_Yan.com-falsemixed.xml b/src/chrome/content/rules/HK_Yanto_Yan.com-falsemixed.xml
index 6747284e4dc1..87e1f99f4066 100644
--- a/src/chrome/content/rules/HK_Yanto_Yan.com-falsemixed.xml
+++ b/src/chrome/content/rules/HK_Yanto_Yan.com-falsemixed.xml
@@ -4,13 +4,12 @@
 -->
 
 
-	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/HM.com.xml b/src/chrome/content/rules/HM.com.xml
index 1bc5c7886cad..882ded3baa72 100644
--- a/src/chrome/content/rules/HM.com.xml
+++ b/src/chrome/content/rules/HM.com.xml
@@ -1,11 +1,12 @@
 
 
-
-  
-  
-  
-  
-
+
+	
+	
 
+	
+	
+
diff --git a/src/chrome/content/rules/HMV_Japan.xml b/src/chrome/content/rules/HMV_Japan.xml
index 14b66a32a814..3e2a3ae7dcb8 100644
--- a/src/chrome/content/rules/HMV_Japan.xml
+++ b/src/chrome/content/rules/HMV_Japan.xml
@@ -21,7 +21,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/HON.ch.xml b/src/chrome/content/rules/HON.ch.xml
index 0c1629a5a688..5ba9c36493d1 100644
--- a/src/chrome/content/rules/HON.ch.xml
+++ b/src/chrome/content/rules/HON.ch.xml
@@ -17,7 +17,7 @@ Fetch error: http://team.hon.ch/ => https://team.hon.ch/: (60, 'SSL certificate
 			- (www.)? from www.provisu.ch
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/HP_Cloud.com.xml b/src/chrome/content/rules/HP_Cloud.com.xml
index 5e68830ddcb6..b7ae9acbf43f 100644
--- a/src/chrome/content/rules/HP_Cloud.com.xml
+++ b/src/chrome/content/rules/HP_Cloud.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://hpcloud.com/ => https://hpcloud.com/: (28, 'Connection timed
 	For other HP coverage, see Hewlett-Packard.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/HPlus_the_Digital_Series.xml b/src/chrome/content/rules/HPlus_the_Digital_Series.xml
index d5d1acbc6d68..4bbaae48e9b8 100644
--- a/src/chrome/content/rules/HPlus_the_Digital_Series.xml
+++ b/src/chrome/content/rules/HPlus_the_Digital_Series.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.hplusdigitalseries.com/ => https://www.hplusdigitalserie
 		- ^	(mismatched, CN: wbpinewmedia.warnerbros.com)
 
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://www.hplusdigitalseries.com/ => https://www.hplusdigitalserie
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/HR_Solutions.xml b/src/chrome/content/rules/HR_Solutions.xml
index aad352f7f117..1144988c3353 100644
--- a/src/chrome/content/rules/HR_Solutions.xml
+++ b/src/chrome/content/rules/HR_Solutions.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://hr-s.co.jp/ => https://hr-s.co.jp/: (51, "SSL: no alternative certificate subject name matches target host name 'hr-s.co.jp'")
 
 -->
-
+
 
 	
 	
@@ -12,4 +12,4 @@ Fetch error: http://hr-s.co.jp/ => https://hr-s.co.jp/: (51, "SSL: no alternativ
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/HRsmart.xml b/src/chrome/content/rules/HRsmart.xml
deleted file mode 100644
index b8593f8ef7ae..000000000000
--- a/src/chrome/content/rules/HRsmart.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-	
-	
-	
-	
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/HSI.com.hk.xml b/src/chrome/content/rules/HSI.com.hk.xml
new file mode 100644
index 000000000000..02b13c44743f
--- /dev/null
+++ b/src/chrome/content/rules/HSI.com.hk.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/HSLDA.xml b/src/chrome/content/rules/HSLDA.xml
index 21469ee81f03..2dcebfb7fe97 100644
--- a/src/chrome/content/rules/HSLDA.xml
+++ b/src/chrome/content/rules/HSLDA.xml
@@ -5,4 +5,4 @@
 
 	
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/HSV.se.xml b/src/chrome/content/rules/HSV.se.xml
index 4ab35cc62ded..dc039622f1fa 100644
--- a/src/chrome/content/rules/HSV.se.xml
+++ b/src/chrome/content/rules/HSV.se.xml
@@ -11,7 +11,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.hsv.se/ => https://www.hsv.se/: (51, "SSL: no alternative certificate subject name matches target host name 'www.hsv.se'")
 Fetch error: http://hsv.se/ => https://www.hsv.se/: (51, "SSL: no alternative certificate subject name matches target host name 'www.hsv.se'")
  hogskoleverket -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/HSappstatic.net.xml b/src/chrome/content/rules/HSappstatic.net.xml
deleted file mode 100644
index ec50a7c7bb18..000000000000
--- a/src/chrome/content/rules/HSappstatic.net.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-
-
-	
-
diff --git a/src/chrome/content/rules/HTC.com.xml b/src/chrome/content/rules/HTC.com.xml
index 1fc64c77de8a..87ea3a848ab5 100644
--- a/src/chrome/content/rules/HTC.com.xml
+++ b/src/chrome/content/rules/HTC.com.xml
@@ -8,7 +8,7 @@
 
 	
-	
-	
 
diff --git a/src/chrome/content/rules/HTML5Video.org.xml b/src/chrome/content/rules/HTML5Video.org.xml
deleted file mode 100644
index c802d593a5dc..000000000000
--- a/src/chrome/content/rules/HTML5Video.org.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/HTTP.cat.xml b/src/chrome/content/rules/HTTP.cat.xml
index bbbdfd0ee5c3..83802f240c41 100644
--- a/src/chrome/content/rules/HTTP.cat.xml
+++ b/src/chrome/content/rules/HTTP.cat.xml
@@ -9,6 +9,6 @@
 
 	
 
-	
 
diff --git a/src/chrome/content/rules/HTTrack.com.xml b/src/chrome/content/rules/HTTrack.com.xml
new file mode 100644
index 000000000000..57a30a12910f
--- /dev/null
+++ b/src/chrome/content/rules/HTTrack.com.xml
@@ -0,0 +1,18 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/HTW-Berlin.de.xml b/src/chrome/content/rules/HTW-Berlin.de.xml
index 6c7ab1583690..3be54235e288 100644
--- a/src/chrome/content/rules/HTW-Berlin.de.xml
+++ b/src/chrome/content/rules/HTW-Berlin.de.xml
@@ -103,7 +103,7 @@ Fetch error: http://www.f4.htw-berlin.de/ => https://www.f4.htw-berlin.de/: Too
 		- signal.htw-berlin.de
 -->
 
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/HTWG-Konstanz.xml b/src/chrome/content/rules/HTWG-Konstanz.xml
index 30ebbbd3e2dc..06741b0d4d0b 100644
--- a/src/chrome/content/rules/HTWG-Konstanz.xml
+++ b/src/chrome/content/rules/HTWG-Konstanz.xml
@@ -5,4 +5,4 @@
     
 
     
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/HaCoder.com.xml b/src/chrome/content/rules/HaCoder.com.xml
index ed9aba669636..c691cd77c63f 100644
--- a/src/chrome/content/rules/HaCoder.com.xml
+++ b/src/chrome/content/rules/HaCoder.com.xml
@@ -21,7 +21,7 @@ Non-2xx HTTP code: http://www.hacoder.com/ (200) => https://www.hacoder.com/ (40
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/HabboLatino.xml b/src/chrome/content/rules/HabboLatino.xml
index d5965a645a1e..46609a1eb737 100644
--- a/src/chrome/content/rules/HabboLatino.xml
+++ b/src/chrome/content/rules/HabboLatino.xml
@@ -8,10 +8,10 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://hlat.us/ => https://hlat.us/: Cycle detected - URL already encountered: http://hlat.us/
 	Nonfunctional domains:
 
-		- (www.)hlat.me	
+		- (www.)hlat.me
 
 -->
-
+
 
 	
 	
@@ -22,4 +22,4 @@ Fetch error: http://hlat.us/ => https://hlat.us/: Cycle detected - URL already e
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Haber-Vision.xml b/src/chrome/content/rules/Haber-Vision.xml
index b4489741a75a..9b1ebbc33bd5 100644
--- a/src/chrome/content/rules/Haber-Vision.xml
+++ b/src/chrome/content/rules/Haber-Vision.xml
@@ -3,9 +3,8 @@
 	
 	
 
-	
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Habets.se.xml b/src/chrome/content/rules/Habets.se.xml
index a72874863a77..b052041383f3 100644
--- a/src/chrome/content/rules/Habets.se.xml
+++ b/src/chrome/content/rules/Habets.se.xml
@@ -22,6 +22,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/Habpl.us.xml b/src/chrome/content/rules/Habpl.us.xml
index 3131055d7505..78ccb8851abc 100644
--- a/src/chrome/content/rules/Habpl.us.xml
+++ b/src/chrome/content/rules/Habpl.us.xml
@@ -5,7 +5,7 @@ Fetch error: http://habpl.us/ => https://habpl.us/: Too many redirects while fet
 Fetch error: http://www.habpl.us/ => https://www.habpl.us/: Too many redirects while fetching 'https://www.habpl.us/'
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.habpl.us/ => https://www.habpl.us/: Too many redirects w
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Habrahabr.ru.xml b/src/chrome/content/rules/Habrahabr.ru.xml
index e798816f2c31..5b508cd0e52e 100644
--- a/src/chrome/content/rules/Habrahabr.ru.xml
+++ b/src/chrome/content/rules/Habrahabr.ru.xml
@@ -24,7 +24,7 @@ Fetch error: http://auth.habrahabr.ru/ => https://auth.habrahabr.ru/: (51, "SSL:
 	ʳ Unsecurable <= refused
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Habrastorage.org.xml b/src/chrome/content/rules/Habrastorage.org.xml
deleted file mode 100644
index 873a5e889ce6..000000000000
--- a/src/chrome/content/rules/Habrastorage.org.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Hack.chat.xml b/src/chrome/content/rules/Hack.chat.xml
new file mode 100644
index 000000000000..7cc4f1992ac5
--- /dev/null
+++ b/src/chrome/content/rules/Hack.chat.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/HackLang.org.xml b/src/chrome/content/rules/HackLang.org.xml
new file mode 100644
index 000000000000..a996e88e3c33
--- /dev/null
+++ b/src/chrome/content/rules/HackLang.org.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/HackerNews.xml b/src/chrome/content/rules/HackerNews.xml
index c63bcceab79b..203a010b6330 100644
--- a/src/chrome/content/rules/HackerNews.xml
+++ b/src/chrome/content/rules/HackerNews.xml
@@ -19,7 +19,7 @@
 					-->
 	
 
-	
+	
 
 
 	
 	
 	
-	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Hackers.fi.xml b/src/chrome/content/rules/Hackers.fi.xml
index 7d88eba212a3..13586929fe78 100644
--- a/src/chrome/content/rules/Hackers.fi.xml
+++ b/src/chrome/content/rules/Hackers.fi.xml
@@ -10,10 +10,11 @@ Fetch error: http://hackers.fi/ => https://hackers.fi/: (60, 'SSL certificate pr
 		- www	(mismatched, CN: www.noelia.fi)
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
 	
 
-	
+	
 
 	
 	 https://redmine.hackerspace.pl/:
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Hacking.Ventures.xml b/src/chrome/content/rules/Hacking.Ventures.xml
index f7da667a7b1b..c5df530f26d2 100644
--- a/src/chrome/content/rules/Hacking.Ventures.xml
+++ b/src/chrome/content/rules/Hacking.Ventures.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.hacking.ventures/ => https://hacking.ventures/: (51, "SS
 	www: Mismatched
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Hackinthebox.org.xml b/src/chrome/content/rules/Hackinthebox.org.xml
index 1d3a7a71c717..7a3df93a4a77 100644
--- a/src/chrome/content/rules/Hackinthebox.org.xml
+++ b/src/chrome/content/rules/Hackinthebox.org.xml
@@ -10,7 +10,7 @@ Fetch error: http://hackinthebox.org/ => https://www.hackinthebox.org/: (60, 'SS
 Fetch error: http://www.hackinthebox.org/ => https://www.hackinthebox.org/: (60, 'SSL certificate problem: certificate has expired')
 Fetch error: http://forum.hackinthebox.org/ => https://forum.hackinthebox.org/: (60, 'SSL certificate problem: self signed certificate')
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/Hackthe.computer.xml b/src/chrome/content/rules/Hackthe.computer.xml
index 395a44091034..21c662391446 100644
--- a/src/chrome/content/rules/Hackthe.computer.xml
+++ b/src/chrome/content/rules/Hackthe.computer.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.hackthe.computer/ => https://hackthe.computer/: (60, 'SS
 	www.hackthe.computer: Refused
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/HacktionLab.org.xml b/src/chrome/content/rules/HacktionLab.org.xml
index 22ff79ce063e..f14faca58011 100644
--- a/src/chrome/content/rules/HacktionLab.org.xml
+++ b/src/chrome/content/rules/HacktionLab.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.hacktionlab.org/ => https://www.hacktionlab.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.hacktionlab.org'")
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Haiku_Project.xml b/src/chrome/content/rules/Haiku_Project.xml
index cd1e6b8cae8b..955646fa2b06 100644
--- a/src/chrome/content/rules/Haiku_Project.xml
+++ b/src/chrome/content/rules/Haiku_Project.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Hail_Protector.xml b/src/chrome/content/rules/Hail_Protector.xml
deleted file mode 100644
index 1f9df22e3d89..000000000000
--- a/src/chrome/content/rules/Hail_Protector.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Hail_Storm_Products.xml b/src/chrome/content/rules/Hail_Storm_Products.xml
deleted file mode 100644
index 87f0ea8ed0a8..000000000000
--- a/src/chrome/content/rules/Hail_Storm_Products.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Hairsmize.com.xml b/src/chrome/content/rules/Hairsmize.com.xml
deleted file mode 100644
index 34f6e0bbe9a3..000000000000
--- a/src/chrome/content/rules/Hairsmize.com.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Hakko.com.xml b/src/chrome/content/rules/Hakko.com.xml
deleted file mode 100644
index 4a853c5dc64f..000000000000
--- a/src/chrome/content/rules/Hakko.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-  
-  
-
-  
-
diff --git a/src/chrome/content/rules/HalalTube.com.xml b/src/chrome/content/rules/HalalTube.com.xml
new file mode 100644
index 000000000000..99c284bc0c55
--- /dev/null
+++ b/src/chrome/content/rules/HalalTube.com.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Halebop.se.xml b/src/chrome/content/rules/Halebop.se.xml
index fa88c5efbfe8..7d51271c9d76 100644
--- a/src/chrome/content/rules/Halebop.se.xml
+++ b/src/chrome/content/rules/Halebop.se.xml
@@ -1,8 +1,12 @@
-
-
+
 	
 	
-	
-	
-
+	
+	
+	
+	
+	
+	
 
+	
+
diff --git a/src/chrome/content/rules/Halifax-Online.co.uk.xml b/src/chrome/content/rules/Halifax-Online.co.uk.xml
new file mode 100644
index 000000000000..91f3f6671e5c
--- /dev/null
+++ b/src/chrome/content/rules/Halifax-Online.co.uk.xml
@@ -0,0 +1,12 @@
+
+	
+	
+	
+		
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Halifax.co.uk.xml b/src/chrome/content/rules/Halifax.co.uk.xml
new file mode 100644
index 000000000000..8d668c3c2d45
--- /dev/null
+++ b/src/chrome/content/rules/Halifax.co.uk.xml
@@ -0,0 +1,14 @@
+
+	
+	
+	
+		
+	
+		
+	
+		
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Halifax.xml b/src/chrome/content/rules/Halifax.xml
deleted file mode 100644
index 3188790d6c46..000000000000
--- a/src/chrome/content/rules/Halifax.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Halo-oglasi.xml b/src/chrome/content/rules/Halo-oglasi.xml
new file mode 100644
index 000000000000..95340e9940bd
--- /dev/null
+++ b/src/chrome/content/rules/Halo-oglasi.xml
@@ -0,0 +1,19 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Hammacher-Schlemmer.xml b/src/chrome/content/rules/Hammacher-Schlemmer.xml
index 88cb4abdd2c2..356933e24b32 100644
--- a/src/chrome/content/rules/Hammacher-Schlemmer.xml
+++ b/src/chrome/content/rules/Hammacher-Schlemmer.xml
@@ -1,7 +1,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
-
+
   
   
 
diff --git a/src/chrome/content/rules/Handbrake.fr.xml b/src/chrome/content/rules/Handbrake.fr.xml
deleted file mode 100644
index f742da959a5d..000000000000
--- a/src/chrome/content/rules/Handbrake.fr.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Handelsbanken.fi.xml b/src/chrome/content/rules/Handelsbanken.fi.xml
index 51affe170db4..ab62d990cac0 100644
--- a/src/chrome/content/rules/Handelsbanken.fi.xml
+++ b/src/chrome/content/rules/Handelsbanken.fi.xml
@@ -7,7 +7,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www2.handelsbanken.fi/ => https://www2.handelsbanken.fi/: (7, 'Failed to connect to www2.handelsbanken.fi port 80: Connection refused')
 Fetch error: http://www9.handelsbanken.fi/ => https://www9.handelsbanken.fi/: 'NoneType' object has no attribute 'xpath'
 -->
-
+
   
   
   
@@ -16,7 +16,7 @@ Fetch error: http://www9.handelsbanken.fi/ => https://www9.handelsbanken.fi/: 'N
   
   
   
-  
+
   
   
   
diff --git a/src/chrome/content/rules/Handelsblatt.xml b/src/chrome/content/rules/Handelsblatt.xml
index 5db715ef40b0..a864f54477d2 100644
--- a/src/chrome/content/rules/Handelsblatt.xml
+++ b/src/chrome/content/rules/Handelsblatt.xml
@@ -1,62 +1,65 @@
 
-
 
+
 	
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 
 
-		
-
-	
-
 	
+		to="https://d30no8cbyph8wj.cloudfront.net/" />
+		
+		
+
+	
 
 
diff --git a/src/chrome/content/rules/Handelsregister.de.xml b/src/chrome/content/rules/Handelsregister.de.xml
index 4fe71b5f3d13..fa079446bb6a 100644
--- a/src/chrome/content/rules/Handelsregister.de.xml
+++ b/src/chrome/content/rules/Handelsregister.de.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://handelsregister.de/ => https://handelsregister.de/: (51, "SSL: no alternative certificate subject name matches target host name 'handelsregister.de'")
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Handy.de.xml b/src/chrome/content/rules/Handy.de.xml
deleted file mode 100644
index d0467dde722b..000000000000
--- a/src/chrome/content/rules/Handy.de.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/HangSeng.com.cn.xml b/src/chrome/content/rules/HangSeng.com.cn.xml
new file mode 100644
index 000000000000..86b956e8298d
--- /dev/null
+++ b/src/chrome/content/rules/HangSeng.com.cn.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/HangSengBank.xml b/src/chrome/content/rules/HangSengBank.xml
index e96433c326d6..6169f5ca5f51 100644
--- a/src/chrome/content/rules/HangSengBank.xml
+++ b/src/chrome/content/rules/HangSengBank.xml
@@ -1,38 +1,46 @@
 
 
+	
 	
+
 	
+	
+	
+	
+	
+	
+
+	
+	
+
+	
+
 	
 	
 	
+	
 	
-	
-		
-	
+	
+
+	
+	
+
+	
+	
+	
+
+	
+
+	
 
 	
 
diff --git a/src/chrome/content/rules/Hants.gov.uk.xml b/src/chrome/content/rules/Hants.gov.uk.xml
index cab833159be6..47a87dd2533c 100644
--- a/src/chrome/content/rules/Hants.gov.uk.xml
+++ b/src/chrome/content/rules/Hants.gov.uk.xml
@@ -27,7 +27,7 @@ Non-2xx HTTP code: http://tribal.hants.gov.uk/ (200) => https://tribal.hants.gov
 		- ict.hias ᵃ
 		- re.hias ᵃ
 		- science.hias ᵃ
-		
+
 		- historicenvironment ᵃ
 		- linkeddata ʳ
 		- localviewmaps ᵖ
@@ -81,7 +81,7 @@ Non-2xx HTTP code: http://tribal.hants.gov.uk/ (200) => https://tribal.hants.gov
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Hao123.com-mixedcontent.xml b/src/chrome/content/rules/Hao123.com-mixedcontent.xml
deleted file mode 100644
index 1e72246599a2..000000000000
--- a/src/chrome/content/rules/Hao123.com-mixedcontent.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Hao123.com.xml b/src/chrome/content/rules/Hao123.com.xml
index 4b25650f1c7f..d2594db8dc7c 100644
--- a/src/chrome/content/rules/Hao123.com.xml
+++ b/src/chrome/content/rules/Hao123.com.xml
@@ -1,118 +1,49 @@
 
 
-	
-	
-	
-	
-	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
-	
-	
-	
-	
-	
-
-		
-		
-
-		
-		
-		
+	
 
-	
-	
+	
 
+	
 	
 
diff --git a/src/chrome/content/rules/Haobtc.com.xml b/src/chrome/content/rules/Haobtc.com.xml
deleted file mode 100644
index fa5df01df08a..000000000000
--- a/src/chrome/content/rules/Haobtc.com.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/HappyKnowledge.com.xml b/src/chrome/content/rules/HappyKnowledge.com.xml
index e0b443cbb66a..57a21f653acf 100644
--- a/src/chrome/content/rules/HappyKnowledge.com.xml
+++ b/src/chrome/content/rules/HappyKnowledge.com.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Happy_Herbivore.xml b/src/chrome/content/rules/Happy_Herbivore.xml
deleted file mode 100644
index d2a20b474b7d..000000000000
--- a/src/chrome/content/rules/Happy_Herbivore.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-	
-
-
-	
-
-	
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Happyassassin.net.xml b/src/chrome/content/rules/Happyassassin.net.xml
index 7d1f9f92bf48..af4be16b898f 100644
--- a/src/chrome/content/rules/Happyassassin.net.xml
+++ b/src/chrome/content/rules/Happyassassin.net.xml
@@ -5,7 +5,7 @@ Fetch error: http://happyassassin.net/ => https://happyassassin.net/: (51, "SSL:
 Fetch error: http://mail.happyassassin.net/ => https://mail.happyassassin.net/: (51, "SSL: no alternative certificate subject name matches target host name 'mail.happyassassin.net'")
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Harakahdaily.xml b/src/chrome/content/rules/Harakahdaily.xml
index 3ce88f0327a3..59bc24549ccb 100644
--- a/src/chrome/content/rules/Harakahdaily.xml
+++ b/src/chrome/content/rules/Harakahdaily.xml
@@ -14,21 +14,13 @@ Non-2xx HTTP code: http://harakah.net.my/ (200) => https://harakah.net.my/ (521)
 -->
 
 
-	
-	
-		
 	
-	
-
+	
+	
 
 	
 	
 
+	
 
-	
-
-	
-
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/HardenedBSD.org.xml b/src/chrome/content/rules/HardenedBSD.org.xml
index d0aba8b1eca3..805ccf40efaa 100644
--- a/src/chrome/content/rules/HardenedBSD.org.xml
+++ b/src/chrome/content/rules/HardenedBSD.org.xml
@@ -19,7 +19,7 @@ Fetch error: http://pkg.hardenedbsd.org/ => https://pkg.hardenedbsd.org/: (60, '
 		- .hardenedbsd.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Hark.xml b/src/chrome/content/rules/Hark.xml
index 900171c6e522..2c233d4c8dde 100644
--- a/src/chrome/content/rules/Hark.xml
+++ b/src/chrome/content/rules/Hark.xml
@@ -6,7 +6,7 @@ Fetch error: http://hark.com/ => https://hark.com/: (7, 'Failed to connect to ha
 Disabled by https-everywhere-checker because:
 Fetch error: http://hark.com/ => https://hark.com/: (7, 'Failed to connect to hark.com port 443: Connection refused')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Harland-Clarke.xml b/src/chrome/content/rules/Harland-Clarke.xml
index b1d38629ad77..7c4eb8ad0bd8 100644
--- a/src/chrome/content/rules/Harland-Clarke.xml
+++ b/src/chrome/content/rules/Harland-Clarke.xml
@@ -18,7 +18,7 @@ Fetch error: http://harlandclarkegiftcard.com/ => https://www.harlandclarkegiftc
 Fetch error: http://harlandclarkewebsmart.com/ => https://www.harlandclarkewebsmart.com/: (28, 'Connection timed out after 10000 milliseconds')
 Fetch error: http://www.harlandclarkewebsmart.com/ => https://www.harlandclarkewebsmart.com/: (28, 'Connection timed out after 10000 milliseconds')
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Harman-International-Industries.xml b/src/chrome/content/rules/Harman-International-Industries.xml
deleted file mode 100644
index 858b392b5123..000000000000
--- a/src/chrome/content/rules/Harman-International-Industries.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-	
-	
-		
-		
-	
-	
-	
-	
-	
-
-	
-	
-
-
-
diff --git a/src/chrome/content/rules/Harrenmedianetwork.com.xml b/src/chrome/content/rules/Harrenmedianetwork.com.xml
deleted file mode 100644
index 7c30e3a0cbc2..000000000000
--- a/src/chrome/content/rules/Harrenmedianetwork.com.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Harris-Interactive.xml b/src/chrome/content/rules/Harris-Interactive.xml
deleted file mode 100644
index b667e6ffc934..000000000000
--- a/src/chrome/content/rules/Harris-Interactive.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Harris_Computer.com.xml b/src/chrome/content/rules/Harris_Computer.com.xml
deleted file mode 100644
index b4a2695c56c5..000000000000
--- a/src/chrome/content/rules/Harris_Computer.com.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Harrow.io.xml b/src/chrome/content/rules/Harrow.io.xml
deleted file mode 100644
index c4761b600be7..000000000000
--- a/src/chrome/content/rules/Harrow.io.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Hashbang.ca.xml b/src/chrome/content/rules/Hashbang.ca.xml
index 47f61f17c2c7..816a85d4835f 100644
--- a/src/chrome/content/rules/Hashbang.ca.xml
+++ b/src/chrome/content/rules/Hashbang.ca.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.hashbang.ca/ => https://www.hashbang.ca/: (51, "SSL: no alternative certificate subject name matches target host name 'www.hashbang.ca'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Haskell_on_Heroku.com.xml b/src/chrome/content/rules/Haskell_on_Heroku.com.xml
deleted file mode 100644
index c6ed6049a7f4..000000000000
--- a/src/chrome/content/rules/Haskell_on_Heroku.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Hatatorium.xml b/src/chrome/content/rules/Hatatorium.xml
index 2315c5be5160..e8ef3d4f5270 100644
--- a/src/chrome/content/rules/Hatatorium.xml
+++ b/src/chrome/content/rules/Hatatorium.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://hatatorium.com/ => https://hatatorium.com/: (35, 'error:140770FC:SSL routines:SSL23_GET_SERVER_HELLO:unknown protocol')
 Fetch error: http://www.hatatorium.com/ => https://www.hatatorium.com/: (35, 'error:140770FC:SSL routines:SSL23_GET_SERVER_HELLO:unknown protocol')
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.hatatorium.com/ => https://www.hatatorium.com/: (35, 'er
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Hatena.xml b/src/chrome/content/rules/Hatena.xml
index 681048e97ec6..51f6696cc7c3 100644
--- a/src/chrome/content/rules/Hatena.xml
+++ b/src/chrome/content/rules/Hatena.xml
@@ -53,8 +53,12 @@
 -->
 
 
-	
-	
+	
+	
+	
+	
+	
+	
 
 	
 	
@@ -62,7 +66,7 @@
 
 
 	
+		to="https://www.hatena.ne.jp/$1" />
 
 		
 		
@@ -80,12 +84,8 @@
 	
 
-		
-		
-
 	
 
-		
 
 
diff --git a/src/chrome/content/rules/HathiTrust-Digital-Library.xml b/src/chrome/content/rules/HathiTrust-Digital-Library.xml
index 61bf176b519b..580ce3b15e17 100644
--- a/src/chrome/content/rules/HathiTrust-Digital-Library.xml
+++ b/src/chrome/content/rules/HathiTrust-Digital-Library.xml
@@ -22,4 +22,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/HaveProof.com.xml b/src/chrome/content/rules/HaveProof.com.xml
index 9fe21bb8b337..7c6315599648 100644
--- a/src/chrome/content/rules/HaveProof.com.xml
+++ b/src/chrome/content/rules/HaveProof.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.haveproof.com/ => https://haveproof.com/: (51, "SSL: no
 	www: cert only maches ^haveproof.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Havelock_Investments.com.xml b/src/chrome/content/rules/Havelock_Investments.com.xml
deleted file mode 100644
index 84c4a68581ed..000000000000
--- a/src/chrome/content/rules/Havelock_Investments.com.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Havering.gov.uk.xml b/src/chrome/content/rules/Havering.gov.uk.xml
index 09f088efe405..db03e4c7198a 100644
--- a/src/chrome/content/rules/Havering.gov.uk.xml
+++ b/src/chrome/content/rules/Havering.gov.uk.xml
@@ -19,6 +19,6 @@
 	
 
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Hawaii.gov.xml b/src/chrome/content/rules/Hawaii.gov.xml
index 4eb9f6eaeadb..fa4b1e71dea1 100644
--- a/src/chrome/content/rules/Hawaii.gov.xml
+++ b/src/chrome/content/rules/Hawaii.gov.xml
@@ -17,20 +17,20 @@ Fetch error: http://ehawaii.gov/ => https://ehawaii.gov/: (6, 'Could not resolve
 -->
 
 
+	
+	
+	
 	
-	
+	
+	
 		
-	
+
 
 
 	
 	
 
 
-	
-
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/HawaiianAirlines.xml b/src/chrome/content/rules/HawaiianAirlines.xml
index 77078bf4e23c..60004ff503ae 100644
--- a/src/chrome/content/rules/HawaiianAirlines.xml
+++ b/src/chrome/content/rules/HawaiianAirlines.xml
@@ -1,9 +1,10 @@
 
   
-  
+  
+  
+  
 
   
-  
+  
 
diff --git a/src/chrome/content/rules/Hawk_Host.com.xml b/src/chrome/content/rules/Hawk_Host.com.xml
index 0e4e19f8fc01..42124dae781f 100644
--- a/src/chrome/content/rules/Hawk_Host.com.xml
+++ b/src/chrome/content/rules/Hawk_Host.com.xml
@@ -23,7 +23,10 @@
 
 
 	
-	
+	
+	
+	
+	
 		
 
 
@@ -36,7 +39,6 @@
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Haymarket-problematic.xml b/src/chrome/content/rules/Haymarket-problematic.xml
index c744e64687f2..89578ad4040a 100644
--- a/src/chrome/content/rules/Haymarket-problematic.xml
+++ b/src/chrome/content/rules/Haymarket-problematic.xml
@@ -4,13 +4,12 @@
 -->
 
 
-	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Haymarket.xml b/src/chrome/content/rules/Haymarket.xml
index bdd8d6e70cb3..3bb7b3b98c88 100644
--- a/src/chrome/content/rules/Haymarket.xml
+++ b/src/chrome/content/rules/Haymarket.xml
@@ -48,21 +48,14 @@
 
 	
 	
-	
-	
+	
 
 
 	
-	
-	
+					-->	
 	
 
 
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/HaystackSoftware.xml b/src/chrome/content/rules/HaystackSoftware.xml
index e1ded791387e..97e31c2e633c 100644
--- a/src/chrome/content/rules/HaystackSoftware.xml
+++ b/src/chrome/content/rules/HaystackSoftware.xml
@@ -4,4 +4,4 @@
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/HbbTV.xml b/src/chrome/content/rules/HbbTV.xml
index dbf56a4da66c..3e1651db0df7 100644
--- a/src/chrome/content/rules/HbbTV.xml
+++ b/src/chrome/content/rules/HbbTV.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Hbz.xml b/src/chrome/content/rules/Hbz.xml
index 5f659712c20b..e6cee0929cd3 100644
--- a/src/chrome/content/rules/Hbz.xml
+++ b/src/chrome/content/rules/Hbz.xml
@@ -10,7 +10,7 @@ Fetch error: http://dbspixel.hbz-nrw.de/ => https://dbspixel.hbz-nrw.de/: (28, '
 	dbspixel: Tracking
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Hdbits.org.xml b/src/chrome/content/rules/Hdbits.org.xml
deleted file mode 100644
index ff948ef37826..000000000000
--- a/src/chrome/content/rules/Hdbits.org.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Hdfcbank.com.xml b/src/chrome/content/rules/Hdfcbank.com.xml
index 2cbd10e2cedd..181e6fdbc15d 100644
--- a/src/chrome/content/rules/Hdfcbank.com.xml
+++ b/src/chrome/content/rules/Hdfcbank.com.xml
@@ -1,17 +1,17 @@
-
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/HealthDesigns.xml b/src/chrome/content/rules/HealthDesigns.xml
index 99ea06455ab8..ce9e1efe3c24 100644
--- a/src/chrome/content/rules/HealthDesigns.xml
+++ b/src/chrome/content/rules/HealthDesigns.xml
@@ -3,17 +3,17 @@
 Disabled by https-everywhere-checker because:
 Fetch error: http://healthdesigns.com/ => https://healthdesigns.com/: (7, 'Failed to connect to healthdesigns.com port 443: No route to host')
 Fetch error: http://www.healthdesigns.com/ => https://www.healthdesigns.com/: (7, 'Failed to connect to www.healthdesigns.com port 443: No route to host')
- 
-		
+
+
 		Refused:
 		- rewards.
-		
+
 		Expired:
 		- br.
-		
+
 -->
 
-
+
         
         
 
diff --git a/src/chrome/content/rules/Healthcare.gov.xml b/src/chrome/content/rules/Healthcare.gov.xml
deleted file mode 100644
index 140e69a9cfff..000000000000
--- a/src/chrome/content/rules/Healthcare.gov.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-    
-    
-
-		
-		
-		
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Healthcare_Staff_Benefits.xml b/src/chrome/content/rules/Healthcare_Staff_Benefits.xml
index 81b06b32022d..3e58dd8fcc0a 100644
--- a/src/chrome/content/rules/Healthcare_Staff_Benefits.xml
+++ b/src/chrome/content/rules/Healthcare_Staff_Benefits.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/HealthdirectAustralia.xml b/src/chrome/content/rules/HealthdirectAustralia.xml
index 3cebf1ae561f..c2a1f8681fb0 100644
--- a/src/chrome/content/rules/HealthdirectAustralia.xml
+++ b/src/chrome/content/rules/HealthdirectAustralia.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/HealthyEating.science.xml b/src/chrome/content/rules/HealthyEating.science.xml
deleted file mode 100644
index a2822023259b..000000000000
--- a/src/chrome/content/rules/HealthyEating.science.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/HealthyGeorge.com.xml b/src/chrome/content/rules/HealthyGeorge.com.xml
new file mode 100644
index 000000000000..917736f27865
--- /dev/null
+++ b/src/chrome/content/rules/HealthyGeorge.com.xml
@@ -0,0 +1,12 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Healthy_for_Kids.xml b/src/chrome/content/rules/Healthy_for_Kids.xml
index 34805a758486..96367b4ca711 100644
--- a/src/chrome/content/rules/Healthy_for_Kids.xml
+++ b/src/chrome/content/rules/Healthy_for_Kids.xml
@@ -12,4 +12,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Hearst-Corporation.xml b/src/chrome/content/rules/Hearst-Corporation.xml
deleted file mode 100644
index 97d032445f46..000000000000
--- a/src/chrome/content/rules/Hearst-Corporation.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Heart.org.xml b/src/chrome/content/rules/Heart.org.xml
index 70f4dfbeccb5..355380510e2d 100644
--- a/src/chrome/content/rules/Heart.org.xml
+++ b/src/chrome/content/rules/Heart.org.xml
@@ -20,7 +20,7 @@ Fetch error: http://heart.org/ => https://www.heart.org/: (60, 'SSL certificate
 		- newsroom ³
 
 	¹ Cert only matches www
-	² Mismatched, CN: 
+	² Mismatched, CN:
 	³ Works; mismatched, CN: cms.iprsoftware.com
 
 
@@ -47,7 +47,12 @@ Fetch error: http://heart.org/ => https://www.heart.org/: (60, 'SSL certificate
 
 
 	
-	
+	
+	
+	
+	
+	
+	
 
 
 	
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Heatmap.xml b/src/chrome/content/rules/Heatmap.xml
index 803d29c403ff..4b91f46b2dff 100644
--- a/src/chrome/content/rules/Heatmap.xml
+++ b/src/chrome/content/rules/Heatmap.xml
@@ -1,27 +1,29 @@
-
 
-
-	
+
+
+	
 	
-	
-	
 
-		
-		
-		
-		
-		
-		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
 
-  	
+	
 
-	
 
diff --git a/src/chrome/content/rules/Heckrath.net.xml b/src/chrome/content/rules/Heckrath.net.xml
deleted file mode 100644
index f02bb8d97742..000000000000
--- a/src/chrome/content/rules/Heckrath.net.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-  
-  
-
-  
-
-  
-  
-
diff --git a/src/chrome/content/rules/Hegerys.com.xml b/src/chrome/content/rules/Hegerys.com.xml
deleted file mode 100644
index 721fd65b3fab..000000000000
--- a/src/chrome/content/rules/Hegerys.com.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-	
-		
-
-
-	
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Heidelberg.de.xml b/src/chrome/content/rules/Heidelberg.de.xml
index be1c6e2ade11..f2f4f8370e86 100644
--- a/src/chrome/content/rules/Heidelberg.de.xml
+++ b/src/chrome/content/rules/Heidelberg.de.xml
@@ -5,7 +5,7 @@ Fetch error: http://heidelberg.de/ => https://www.heidelberg.de/: (60, 'SSL cert
 Fetch error: http://www.heidelberg.de/ => https://www.heidelberg.de/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Heifer.org.xml b/src/chrome/content/rules/Heifer.org.xml
index abc72ff297d8..eb3cac880eb4 100644
--- a/src/chrome/content/rules/Heifer.org.xml
+++ b/src/chrome/content/rules/Heifer.org.xml
@@ -10,7 +10,7 @@ Fetch error: http://secure1.heifer.org/ => https://secure1.heifer.org/: (7, 'Fai
 		- 9dc3f407a257cfd3f7ea-d14ef12e680aa00597bdffb57368cf92.r6.cf2.rackcdn.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Heise.de.xml b/src/chrome/content/rules/Heise.de.xml
index c7d8f67f3ed5..b0a4bfaf90b9 100644
--- a/src/chrome/content/rules/Heise.de.xml
+++ b/src/chrome/content/rules/Heise.de.xml
@@ -42,7 +42,7 @@
 	
 	
 
-	
+
 			
 			
 			
@@ -80,7 +80,7 @@
 
 	
-		
+
 	
 
diff --git a/src/chrome/content/rules/Hell_Hole_Cheese_Factory.org.xml b/src/chrome/content/rules/Hell_Hole_Cheese_Factory.org.xml
index 35a657c00bd5..c035e52c748b 100644
--- a/src/chrome/content/rules/Hell_Hole_Cheese_Factory.org.xml
+++ b/src/chrome/content/rules/Hell_Hole_Cheese_Factory.org.xml
@@ -8,7 +8,7 @@ Automatically by https-everywhere-checker because:
 Fetch error: http://hellholecheesefactory.org/ => https://hellholecheesefactory.org/: (51, "SSL: no alternative certificate subject name matches target host name 'hellholecheesefactory.org'")
 Fetch error: http://www.hellholecheesefactory.org/ => https://www.hellholecheesefactory.org/: (51, "SSL: no alternative certificate subject name matches target host name 'hellholecheesefactory.org'")
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Heller-Information-Services.xml b/src/chrome/content/rules/Heller-Information-Services.xml
index 5caeaeb83514..3ddb4ee55731 100644
--- a/src/chrome/content/rules/Heller-Information-Services.xml
+++ b/src/chrome/content/rules/Heller-Information-Services.xml
@@ -12,7 +12,7 @@
 	
 
 
-	
+	
 
 
 	
-
+
 
 	
 	
@@ -38,7 +38,7 @@ Fetch error: http://hellobar.com/ => https://hellobar.com/: (60, 'SSL certificat
 					-->
 	
 
-	
+	
 
 
 	 https://www.helloneighbour.com/:
 		- (www.)askyourneighbour.ca	(ssl_error_rx_record_too_long)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Hello_Bond.com.xml b/src/chrome/content/rules/Hello_Bond.com.xml
index 8c8d353903e4..d974bddf17dd 100644
--- a/src/chrome/content/rules/Hello_Bond.com.xml
+++ b/src/chrome/content/rules/Hello_Bond.com.xml
@@ -20,7 +20,7 @@ Fetch error: http://www.hellobond.com/ => https://www.hellobond.com/: (60, 'SSL
 		- staging.hellobond.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Helmich_IT-Security.xml b/src/chrome/content/rules/Helmich_IT-Security.xml
index 4f808badf45c..136853927587 100644
--- a/src/chrome/content/rules/Helmich_IT-Security.xml
+++ b/src/chrome/content/rules/Helmich_IT-Security.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/HelpOcean.xml b/src/chrome/content/rules/HelpOcean.xml
index 2c5fdfad56b6..2ae53ed3a547 100644
--- a/src/chrome/content/rules/HelpOcean.xml
+++ b/src/chrome/content/rules/HelpOcean.xml
@@ -8,7 +8,7 @@ Fetch error: http://helpocean.com/ => https://helpocean.com/: (51, "SSL: no alte
 	Many in *.helpocean.com: clients
 
 -->
-
+
 
 	
 	
@@ -20,4 +20,4 @@ Fetch error: http://helpocean.com/ => https://helpocean.com/: (51, "SSL: no alte
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/HelpOnClick.xml b/src/chrome/content/rules/HelpOnClick.xml
index c8260bcd12bf..ecf90da4da2f 100644
--- a/src/chrome/content/rules/HelpOnClick.xml
+++ b/src/chrome/content/rules/HelpOnClick.xml
@@ -4,9 +4,9 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/HelpSpot.xml b/src/chrome/content/rules/HelpSpot.xml
index c1bb7977ac5d..7f66292e0f39 100644
--- a/src/chrome/content/rules/HelpSpot.xml
+++ b/src/chrome/content/rules/HelpSpot.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Helsingor.dk.xml b/src/chrome/content/rules/Helsingor.dk.xml
index 0ad45b3bf17b..2d1a2cd7640e 100644
--- a/src/chrome/content/rules/Helsingor.dk.xml
+++ b/src/chrome/content/rules/Helsingor.dk.xml
@@ -2,7 +2,7 @@
 	Subdomains not covered:
 		- rotteanmeldelse¹
 		- webgis¹
-	
+
 	¹: Refused
 -->
 
diff --git a/src/chrome/content/rules/HentaiVerse.org.xml b/src/chrome/content/rules/HentaiVerse.org.xml
new file mode 100644
index 000000000000..daf693be6663
--- /dev/null
+++ b/src/chrome/content/rules/HentaiVerse.org.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Herald_Times_Reporter.xml b/src/chrome/content/rules/Herald_Times_Reporter.xml
index c131cca43560..a04ad2581452 100644
--- a/src/chrome/content/rules/Herald_Times_Reporter.xml
+++ b/src/chrome/content/rules/Herald_Times_Reporter.xml
@@ -15,7 +15,7 @@ Fetch error: http://htrnews.com/ => https://www.htrnews.com/: (51, "SSL: no alte
 		- deals		(mismatched, CN: *.planetdiscover.com)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Herbal-nutrition2.net.xml b/src/chrome/content/rules/Herbal-nutrition2.net.xml
index 30b5284fd59a..dc4952464f09 100644
--- a/src/chrome/content/rules/Herbal-nutrition2.net.xml
+++ b/src/chrome/content/rules/Herbal-nutrition2.net.xml
@@ -5,7 +5,7 @@ Fetch error: http://herbal-nutrition2.net/ => https://herbal-nutrition2.net/: To
 Fetch error: http://www.herbal-nutrition2.net/ => https://www.herbal-nutrition2.net/: Too many redirects while fetching 'https://www.herbal-nutrition2.net/'
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.herbal-nutrition2.net/ => https://www.herbal-nutrition2.
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Hercrentals.com.xml b/src/chrome/content/rules/Hercrentals.com.xml
new file mode 100644
index 000000000000..0af8f078c98e
--- /dev/null
+++ b/src/chrome/content/rules/Hercrentals.com.xml
@@ -0,0 +1,48 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+  	
+
+	
+
diff --git a/src/chrome/content/rules/Herefordshire.gov.uk.xml b/src/chrome/content/rules/Herefordshire.gov.uk.xml
index 0e48e375f2fd..38e5f78e54db 100644
--- a/src/chrome/content/rules/Herefordshire.gov.uk.xml
+++ b/src/chrome/content/rules/Herefordshire.gov.uk.xml
@@ -61,7 +61,7 @@
 
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/HeroX.com.xml b/src/chrome/content/rules/HeroX.com.xml
index f1874a358abe..9ef9da2e51fd 100644
--- a/src/chrome/content/rules/HeroX.com.xml
+++ b/src/chrome/content/rules/HeroX.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.herox.com/ => https://www.herox.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.herox.com'")
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Hertsdirect.org-falsemixed.xml b/src/chrome/content/rules/Hertsdirect.org-falsemixed.xml
index 479e981d4b8a..acaa244dbd91 100644
--- a/src/chrome/content/rules/Hertsdirect.org-falsemixed.xml
+++ b/src/chrome/content/rules/Hertsdirect.org-falsemixed.xml
@@ -6,7 +6,7 @@ Fetch error: http://drivertraining.hertsdirect.org/ => https://drivertraining.he
 	For rules not causing false/broken MCB, see Hertsdirect.org.xml.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Hertsdirect.org.xml b/src/chrome/content/rules/Hertsdirect.org.xml
index 89feb43662c2..cf0815a7fe1f 100644
--- a/src/chrome/content/rules/Hertsdirect.org.xml
+++ b/src/chrome/content/rules/Hertsdirect.org.xml
@@ -58,7 +58,7 @@ Fetch error: http://m.hertsdirect.org/images/interface/govmetric_orangeface28x28
 	ˢ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Hertz-Australia.xml b/src/chrome/content/rules/Hertz-Australia.xml
index 8ed50ffe9b54..957fc544a63d 100644
--- a/src/chrome/content/rules/Hertz-Australia.xml
+++ b/src/chrome/content/rules/Hertz-Australia.xml
@@ -40,7 +40,7 @@ Non-2xx HTTP code: http://www.hertz.com.au/ (200) => https://www.hertz.com.au/ (
 		- Hertz-UAE.xml
 		- Hertz-UK.xml
 		- Hertz-US.xml
-		
+
 	Non-functional domains:
 		- (www.)hertzrent2buy.com.au	(¹, CN: secure.cdsonline.com.au)
 		- (www.)hertzcarsales.com.au	(¹, CN: secure.cdsonline.com.au)
@@ -49,7 +49,7 @@ Non-2xx HTTP code: http://www.hertz.com.au/ (200) => https://www.hertz.com.au/ (
 
 	¹ hostname mismatch
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Hertz-Austria.xml b/src/chrome/content/rules/Hertz-Austria.xml
index 1e1a5fd63ee9..b3d5b253bdfb 100644
--- a/src/chrome/content/rules/Hertz-Austria.xml
+++ b/src/chrome/content/rules/Hertz-Austria.xml
@@ -41,7 +41,7 @@ Non-2xx HTTP code: http://www.hertz.at/ (200) => https://www.hertz.at/ (403)
 		- Hertz-UK.xml
 		- Hertz-US.xml
 -->
-
+
 	
 
 	 https://nl.hertz.be/ (403)
 		- Hertz-UK.xml
 		- Hertz-US.xml
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Hertz-Canada.xml b/src/chrome/content/rules/Hertz-Canada.xml
index 38a75fb6435b..e783886901d5 100644
--- a/src/chrome/content/rules/Hertz-Canada.xml
+++ b/src/chrome/content/rules/Hertz-Canada.xml
@@ -41,7 +41,7 @@ Non-2xx HTTP code: http://fr.hertz.ca/ (200) => https://fr.hertz.ca/ (403)
 		- Hertz-UK.xml
 		- Hertz-US.xml
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Hertz-China.xml b/src/chrome/content/rules/Hertz-China.xml
index fc3db925c8e6..062c8de46a78 100644
--- a/src/chrome/content/rules/Hertz-China.xml
+++ b/src/chrome/content/rules/Hertz-China.xml
@@ -1,8 +1,4 @@
-
 
-
+
 	
 
-	
+	
 
diff --git a/src/chrome/content/rules/Hertz-Croatia.xml b/src/chrome/content/rules/Hertz-Croatia.xml
index 1b2983437100..06bcabaafdee 100644
--- a/src/chrome/content/rules/Hertz-Croatia.xml
+++ b/src/chrome/content/rules/Hertz-Croatia.xml
@@ -41,7 +41,7 @@ Fetch error: http://www.hertz.hr/ => https://www.hertz.hr/: (35, 'Unknown SSL pr
 		- Hertz-UK.xml
 		- Hertz-US.xml
 -->
-
+
 	
 
 	 https://www.hertz.fi/ (403)
 		- Hertz-UK.xml
 		- Hertz-US.xml
 -->
-
+
 	
 
 	 https://www.hertztrucks.d
 
 -->
 
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Hertz-Hong-Kong.xml b/src/chrome/content/rules/Hertz-Hong-Kong.xml
index c618b734dab4..40d46e74e190 100644
--- a/src/chrome/content/rules/Hertz-Hong-Kong.xml
+++ b/src/chrome/content/rules/Hertz-Hong-Kong.xml
@@ -41,7 +41,7 @@ Non-2xx HTTP code: http://www.hertz.com.hk/ (200) => https://www.hertz.com.hk/ (
 		- Hertz-UK.xml
 		- Hertz-US.xml
 -->
-
+
 	
 
 	 https://www.hertz.co.id/ (40
 		- Hertz-UK.xml
 		- Hertz-US.xml
 -->
-
+
 	
 
 	 https://www.hertz.ie/ (403)
 		- Hertz-UK.xml
 		- Hertz-US.xml
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Hertz-Italy.xml b/src/chrome/content/rules/Hertz-Italy.xml
index 291cede64dac..28f512f91e4f 100644
--- a/src/chrome/content/rules/Hertz-Italy.xml
+++ b/src/chrome/content/rules/Hertz-Italy.xml
@@ -50,7 +50,7 @@ Non-2xx HTTP code: http://www.hertz.it/ (200) => https://www.hertz.it/ (403)
 		- (www.)hertzusato.it		(self-signed)
 -->
 
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Hertz-Kuwait.xml b/src/chrome/content/rules/Hertz-Kuwait.xml
index ebc21ee7bc18..ebda6abc1205 100644
--- a/src/chrome/content/rules/Hertz-Kuwait.xml
+++ b/src/chrome/content/rules/Hertz-Kuwait.xml
@@ -41,7 +41,7 @@ Non-2xx HTTP code: http://www.hertz.com.kw/ (200) => https://www.hertz.com.kw/ (
 		- Hertz-UK.xml
 		- Hertz-US.xml
 -->
-
+
 	
 
 	 https://www.hertz.nl/ (403)
 	Non-functional domains:
 		- (www.)minilease.nl	(connection refused)
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Hertz-New-Zealand.xml b/src/chrome/content/rules/Hertz-New-Zealand.xml
index 75d72eb241a7..5c06a382e22b 100644
--- a/src/chrome/content/rules/Hertz-New-Zealand.xml
+++ b/src/chrome/content/rules/Hertz-New-Zealand.xml
@@ -41,7 +41,7 @@ Non-2xx HTTP code: http://www.hertz.co.nz/ (200) => https://www.hertz.co.nz/ (40
 		- Hertz-UK.xml
 		- Hertz-US.xml
 -->
-
+
 	
 
 	 https://www.hertz.no/ (403)
 		- Hertz-UK.xml
 		- Hertz-US.xml
 -->
-
+
 	
 
 	 https://www.hertz.pt/ (403)
 		- Hertz-UK.xml
 		- Hertz-US.xml
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Hertz-Qatar.xml b/src/chrome/content/rules/Hertz-Qatar.xml
index 58b1f2cddef4..1c88d541600e 100644
--- a/src/chrome/content/rules/Hertz-Qatar.xml
+++ b/src/chrome/content/rules/Hertz-Qatar.xml
@@ -41,7 +41,7 @@ Non-2xx HTTP code: http://www.hertz.qa/ (200) => https://www.hertz.qa/ (403)
 		- Hertz-UK.xml
 		- Hertz-US.xml
 -->
-
+
 	
 
 	 https://www.hertz.co.kr/ (40
 		- Hertz-UK.xml
 		- Hertz-US.xml
 -->
-
+
 	
 
 	 https://www.hertz.es/ (403)
 	¹ hostname mismatch
 -->
 
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Hertz-Sweden.xml b/src/chrome/content/rules/Hertz-Sweden.xml
index 207b5939fd15..ef430eb1d4a4 100644
--- a/src/chrome/content/rules/Hertz-Sweden.xml
+++ b/src/chrome/content/rules/Hertz-Sweden.xml
@@ -41,7 +41,7 @@ Non-2xx HTTP code: http://www.hertz.se/ (200) => https://www.hertz.se/ (403)
 		- Hertz-UK.xml
 		- Hertz-US.xml
 -->
-
+
 	
 
 	 https://fr.hertz.ch/ (403)
 		- Hertz-UK.xml
 		- Hertz-US.xml
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Hertz-Taiwan.xml b/src/chrome/content/rules/Hertz-Taiwan.xml
index 9b853f8f6329..67cb2bb897ce 100644
--- a/src/chrome/content/rules/Hertz-Taiwan.xml
+++ b/src/chrome/content/rules/Hertz-Taiwan.xml
@@ -41,7 +41,7 @@ Non-2xx HTTP code: http://www.hertz.com.tw/ (200) => https://www.hertz.com.tw/ (
 		- Hertz-UK.xml
 		- Hertz-US.xml
 -->
-
+
 	
 
 	 https://www.hertz.ae/ (403)
 		- Hertz-UK.xml
 		- Hertz-US.xml
 -->
-
+
 	
 
 	 https://www.hertzvans.co
 	¹ hostname mismatch
 -->
 
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Hertz-US.xml b/src/chrome/content/rules/Hertz-US.xml
index 01d75d5ba70f..0a7451ffffce 100644
--- a/src/chrome/content/rules/Hertz-US.xml
+++ b/src/chrome/content/rules/Hertz-US.xml
@@ -73,7 +73,7 @@ Fetch error: http://www.hertzequipsales.com/ => https://www.hertzequipsales.com/
 	¹ invalid hostname
 	² timeout
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Hesapla_Bakalim.com.xml b/src/chrome/content/rules/Hesapla_Bakalim.com.xml
index 3dfe6a70ba60..9b7e094e2593 100644
--- a/src/chrome/content/rules/Hesapla_Bakalim.com.xml
+++ b/src/chrome/content/rules/Hesapla_Bakalim.com.xml
@@ -21,7 +21,7 @@ Fetch error: http://www.hesaplabakalim.com/ => https://www.hesaplabakalim.com/:
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Hesecure.com.xml b/src/chrome/content/rules/Hesecure.com.xml
index 6630a6ed352a..55b2dcf9f0ee 100644
--- a/src/chrome/content/rules/Hesecure.com.xml
+++ b/src/chrome/content/rules/Hesecure.com.xml
@@ -7,10 +7,10 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Hewlett-Packard.xml b/src/chrome/content/rules/Hewlett-Packard.xml
index 78f10566dd8d..1b1558bcc8ba 100644
--- a/src/chrome/content/rules/Hewlett-Packard.xml
+++ b/src/chrome/content/rules/Hewlett-Packard.xml
@@ -1,7 +1,6 @@
 
-
+
 
 	
diff --git a/src/chrome/content/rules/Hezenparastin.com.xml b/src/chrome/content/rules/Hezenparastin.com.xml
deleted file mode 100644
index 7731cce06775..000000000000
--- a/src/chrome/content/rules/Hezenparastin.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Hft-leipzig.de.xml b/src/chrome/content/rules/Hft-leipzig.de.xml
index b03cd67a38c3..816b06f88541 100644
--- a/src/chrome/content/rules/Hft-leipzig.de.xml
+++ b/src/chrome/content/rules/Hft-leipzig.de.xml
@@ -11,7 +11,7 @@
 		- www.bpmn  -> wrong domain
 		- bibo      -> no connection
 		- www1      -> different site
-	
+
 	Notes:
 		- www1   -> different sites, but also HTTP version is useless for visitor, real sites like https://www1.hft-leipzig.de/bpmn/ e.g. works.
 -->
diff --git a/src/chrome/content/rules/Hi.nl.xml b/src/chrome/content/rules/Hi.nl.xml
index 4abe453f4c2e..da7efadbb73d 100644
--- a/src/chrome/content/rules/Hi.nl.xml
+++ b/src/chrome/content/rules/Hi.nl.xml
@@ -1,6 +1,6 @@
 
   
-  
+
   
   
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/HiFX.xml b/src/chrome/content/rules/HiFX.xml
index 49ef92810a3f..27a7286e1f60 100644
--- a/src/chrome/content/rules/HiFX.xml
+++ b/src/chrome/content/rules/HiFX.xml
@@ -7,7 +7,8 @@
 	
 	
 	
-	
+	
+	
 
 
 	
@@ -16,7 +17,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/HiPEAC.net.xml b/src/chrome/content/rules/HiPEAC.net.xml
index 2112cab577e6..c26ae6c82aae 100644
--- a/src/chrome/content/rules/HiPEAC.net.xml
+++ b/src/chrome/content/rules/HiPEAC.net.xml
@@ -13,7 +13,7 @@ Fetch error: http://www.hipeac.org/ => https://www.hipeac.org/: (28, 'Connection
 	² Shows www.hipeac.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Hide.me.xml b/src/chrome/content/rules/Hide.me.xml
index d157f5caa52c..36681d544c02 100644
--- a/src/chrome/content/rules/Hide.me.xml
+++ b/src/chrome/content/rules/Hide.me.xml
@@ -1,23 +1,12 @@
 
-
-	
-	
-	
-	
+
 
 	
-	
 
 	
 
-	
+	
 
diff --git a/src/chrome/content/rules/Hideman.net.xml b/src/chrome/content/rules/Hideman.net.xml
index bfbe3062c914..9a617062f1c2 100644
--- a/src/chrome/content/rules/Hideman.net.xml
+++ b/src/chrome/content/rules/Hideman.net.xml
@@ -14,13 +14,14 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Hidemyass.xml b/src/chrome/content/rules/Hidemyass.xml
index ddf6ca5b26e0..bd53204fd164 100644
--- a/src/chrome/content/rules/Hidemyass.xml
+++ b/src/chrome/content/rules/Hidemyass.xml
@@ -10,13 +10,13 @@
 	
 	
 
-	
+
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Hidepay.net.xml b/src/chrome/content/rules/Hidepay.net.xml
index e0be1136c82e..f9a468728b92 100644
--- a/src/chrome/content/rules/Hidepay.net.xml
+++ b/src/chrome/content/rules/Hidepay.net.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.hidepay.net/ => https://www.hidepay.net/: (6, 'Could not
 	For other Hideman coverage, see Hideman.net.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/High.fi.xml b/src/chrome/content/rules/High.fi.xml
new file mode 100644
index 000000000000..3f00269d9868
--- /dev/null
+++ b/src/chrome/content/rules/High.fi.xml
@@ -0,0 +1,13 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/HighQ_Solutions.xml b/src/chrome/content/rules/HighQ_Solutions.xml
index fa59fc53f26f..68b27a04b397 100644
--- a/src/chrome/content/rules/HighQ_Solutions.xml
+++ b/src/chrome/content/rules/HighQ_Solutions.xml
@@ -17,7 +17,8 @@
 
 
 	
-	
+	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/HighWire.xml b/src/chrome/content/rules/HighWire.xml
deleted file mode 100644
index e2ee0c8c703a..000000000000
--- a/src/chrome/content/rules/HighWire.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Highcharts.com-mixedcontent.xml b/src/chrome/content/rules/Highcharts.com-mixedcontent.xml
deleted file mode 100644
index 95afe708bf1b..000000000000
--- a/src/chrome/content/rules/Highcharts.com-mixedcontent.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Highcharts.com.xml b/src/chrome/content/rules/Highcharts.com.xml
index ca9358ee6e79..a125ea758e9b 100644
--- a/src/chrome/content/rules/Highcharts.com.xml
+++ b/src/chrome/content/rules/Highcharts.com.xml
@@ -1,39 +1,21 @@
 
-
 
 	
-	
-
 	
+	
+	
 	
 	
 
-	
-
-	
-	
-		
-
-			
-			
-			
-
-			
-			
+	
 
 	
 
diff --git a/src/chrome/content/rules/Higher_Education_Academy.xml b/src/chrome/content/rules/Higher_Education_Academy.xml
index 26df474afff9..41ef7300e74d 100644
--- a/src/chrome/content/rules/Higher_Education_Academy.xml
+++ b/src/chrome/content/rules/Higher_Education_Academy.xml
@@ -1,35 +1,27 @@
 
 
 
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
-	
+	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Highsoft.com.xml b/src/chrome/content/rules/Highsoft.com.xml
new file mode 100644
index 000000000000..8b70d9368587
--- /dev/null
+++ b/src/chrome/content/rules/Highsoft.com.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Highwebmedia.com.xml b/src/chrome/content/rules/Highwebmedia.com.xml
index 82263db5f52d..b138217d527c 100644
--- a/src/chrome/content/rules/Highwebmedia.com.xml
+++ b/src/chrome/content/rules/Highwebmedia.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://ssl-cdn.highwebmedia.com/ => https://ssl-cdn.highwebmedia.co
 		- .highwebmedia.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Himediadx.com.xml b/src/chrome/content/rules/Himediadx.com.xml
index f308abe5b7dc..207b37c4719c 100644
--- a/src/chrome/content/rules/Himediadx.com.xml
+++ b/src/chrome/content/rules/Himediadx.com.xml
@@ -10,4 +10,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Hinckley-Bosworth.gov.uk.xml b/src/chrome/content/rules/Hinckley-Bosworth.gov.uk.xml
index d4d0fe582b4a..528721f31379 100644
--- a/src/chrome/content/rules/Hinckley-Bosworth.gov.uk.xml
+++ b/src/chrome/content/rules/Hinckley-Bosworth.gov.uk.xml
@@ -26,7 +26,7 @@ Fetch error: http://services.hinckley-bosworth.gov.uk/ => https://services.hinck
 		- .www.hinckley-bosworth.gov.uk
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Hinckley_and_Bosworth_online.org.uk.xml b/src/chrome/content/rules/Hinckley_and_Bosworth_online.org.uk.xml
index c0ccdacc0453..6d4dbd7bfa21 100644
--- a/src/chrome/content/rules/Hinckley_and_Bosworth_online.org.uk.xml
+++ b/src/chrome/content/rules/Hinckley_and_Bosworth_online.org.uk.xml
@@ -20,6 +20,8 @@
 	
 
-		
+		
+		
+		
 
 
diff --git a/src/chrome/content/rules/HindustanTimes.com.xml b/src/chrome/content/rules/HindustanTimes.com.xml
new file mode 100644
index 000000000000..a66afb7a68d0
--- /dev/null
+++ b/src/chrome/content/rules/HindustanTimes.com.xml
@@ -0,0 +1,40 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/Hip-Hop.ru.xml b/src/chrome/content/rules/Hip-Hop.ru.xml
index 367e3175df18..521e516784ac 100644
--- a/src/chrome/content/rules/Hip-Hop.ru.xml
+++ b/src/chrome/content/rules/Hip-Hop.ru.xml
@@ -1,26 +1,26 @@
-
-
-
-	
-	
-	
-
-	
-
-	
-
+
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Hipercor.es.xml b/src/chrome/content/rules/Hipercor.es.xml
index 53547380a5a2..602f1583e391 100644
--- a/src/chrome/content/rules/Hipercor.es.xml
+++ b/src/chrome/content/rules/Hipercor.es.xml
@@ -5,7 +5,7 @@
 	Not supporting HTTPS or using an invalid certificate:
 
 		* hipercor.es
-	
+
 		* c.hipercor.es
 		* juguetes.hipercor.es
 		* www.familiasnumerosas.hipercor.es
diff --git a/src/chrome/content/rules/Hipmunk.com-falsemixed.xml b/src/chrome/content/rules/Hipmunk.com-falsemixed.xml
deleted file mode 100644
index 8864737f10be..000000000000
--- a/src/chrome/content/rules/Hipmunk.com-falsemixed.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Hipmunk.com.xml b/src/chrome/content/rules/Hipmunk.com.xml
deleted file mode 100644
index de04c6a39cf1..000000000000
--- a/src/chrome/content/rules/Hipmunk.com.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-  
-	
-
-
-	
-
-
-  
-
diff --git a/src/chrome/content/rules/HistoryOfPhilosophy.net.xml b/src/chrome/content/rules/HistoryOfPhilosophy.net.xml
deleted file mode 100644
index a7403dece0a0..000000000000
--- a/src/chrome/content/rules/HistoryOfPhilosophy.net.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/HitBTC.com.xml b/src/chrome/content/rules/HitBTC.com.xml
index 2cfb097e365e..5ff463e3d345 100644
--- a/src/chrome/content/rules/HitBTC.com.xml
+++ b/src/chrome/content/rules/HitBTC.com.xml
@@ -18,8 +18,12 @@
 
 
 	
-
-	
+	
+	
+	
+	
+	
+	
 
 
 	
-
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Hitchhq.com.xml b/src/chrome/content/rules/Hitchhq.com.xml
deleted file mode 100644
index ff10146e0a05..000000000000
--- a/src/chrome/content/rules/Hitchhq.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/HitsLink.xml b/src/chrome/content/rules/HitsLink.xml
index ad7a3a3fb7e6..a58c2b0c57c1 100644
--- a/src/chrome/content/rules/HitsLink.xml
+++ b/src/chrome/content/rules/HitsLink.xml
@@ -9,7 +9,7 @@
 	
 
 
-	
+	
 
 
 	 https://loc1.hitsprocessor.com/:
 	(www.)?hitsprocessor.com doesn't exist.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Hivos.org.xml b/src/chrome/content/rules/Hivos.org.xml
index 67b8c8926f58..18d5816d62ff 100644
--- a/src/chrome/content/rules/Hivos.org.xml
+++ b/src/chrome/content/rules/Hivos.org.xml
@@ -17,7 +17,7 @@ Fetch error: http://india.hivos.org/ => https://india.hivos.org/: (52, 'Empty re
 	² different content; mismatched, CN: digitaldefenders.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Hizli_Saat.xml b/src/chrome/content/rules/Hizli_Saat.xml
index e25efa7de5c5..50a5e82ced30 100644
--- a/src/chrome/content/rules/Hizli_Saat.xml
+++ b/src/chrome/content/rules/Hizli_Saat.xml
@@ -7,7 +7,7 @@ Fetch error: http://taki.hizlisaat.com/ => https://taki.hizlisaat.com/: (60, 'SS
 Fetch error: http://www.hizlisaat.com/ => https://www.hizlisaat.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
 	
@@ -15,9 +15,9 @@ Fetch error: http://www.hizlisaat.com/ => https://www.hizlisaat.com/: (60, 'SSL
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Hizook.xml b/src/chrome/content/rules/Hizook.xml
index ff89e68e7bdd..e1ac26e15009 100644
--- a/src/chrome/content/rules/Hizook.xml
+++ b/src/chrome/content/rules/Hizook.xml
@@ -3,7 +3,7 @@
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Hmapps.net.xml b/src/chrome/content/rules/Hmapps.net.xml
index c0832792439e..232db1e1c7e6 100644
--- a/src/chrome/content/rules/Hmapps.net.xml
+++ b/src/chrome/content/rules/Hmapps.net.xml
@@ -5,7 +5,7 @@ Fetch error: http://hmapps.net/ => https://hmapps.net/: (60, 'SSL certificate pr
 Fetch error: http://www.hmapps.net/ => https://www.hmapps.net/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.hmapps.net/ => https://www.hmapps.net/: (60, 'SSL certif
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Hn.premii.com.xml b/src/chrome/content/rules/Hn.premii.com.xml
index 99877ea210ab..bbdf0762897d 100644
--- a/src/chrome/content/rules/Hn.premii.com.xml
+++ b/src/chrome/content/rules/Hn.premii.com.xml
@@ -4,10 +4,6 @@
 	
 	
 
-	
-	
-	
-	
 
 	
diff --git a/src/chrome/content/rules/Hnonline.sk.xml b/src/chrome/content/rules/Hnonline.sk.xml
deleted file mode 100644
index 9187dc451d77..000000000000
--- a/src/chrome/content/rules/Hnonline.sk.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Hobocomp.com.xml b/src/chrome/content/rules/Hobocomp.com.xml
deleted file mode 100644
index cf962b63b7ef..000000000000
--- a/src/chrome/content/rules/Hobocomp.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Hochschule-Esslingen.xml b/src/chrome/content/rules/Hochschule-Esslingen.xml
index 66fd0aecf0a2..8b8e396ec565 100644
--- a/src/chrome/content/rules/Hochschule-Esslingen.xml
+++ b/src/chrome/content/rules/Hochschule-Esslingen.xml
@@ -3,6 +3,7 @@
 	
 	
 	
+	
 	
 	
 	
@@ -13,7 +14,7 @@
 	
 	
 
-	
 
 	
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
+
+
+	
+	
+	
+	
+
+	
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Hochwasserzentralen.de.xml b/src/chrome/content/rules/Hochwasserzentralen.de.xml
new file mode 100644
index 000000000000..03d3eac3c1be
--- /dev/null
+++ b/src/chrome/content/rules/Hochwasserzentralen.de.xml
@@ -0,0 +1,19 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Hochwasserzentralen.info.xml b/src/chrome/content/rules/Hochwasserzentralen.info.xml
new file mode 100644
index 000000000000..36d7d14619ae
--- /dev/null
+++ b/src/chrome/content/rules/Hochwasserzentralen.info.xml
@@ -0,0 +1,17 @@
+
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/HolidayBullshit.com.xml b/src/chrome/content/rules/HolidayBullshit.com.xml
index 0bff891f4de6..5672b0ad801c 100644
--- a/src/chrome/content/rules/HolidayBullshit.com.xml
+++ b/src/chrome/content/rules/HolidayBullshit.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.holidaybullshit.com/ => https://www.holidaybullshit.com/
 	^: refused
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/HolidayExtras.com.xml b/src/chrome/content/rules/HolidayExtras.com.xml
index 529eb7b66b3d..722d144a63e0 100644
--- a/src/chrome/content/rules/HolidayExtras.com.xml
+++ b/src/chrome/content/rules/HolidayExtras.com.xml
@@ -19,7 +19,7 @@ Fetch error: http://www.holidayextras.com/ => https://www.holidayextras.com/: To
 
 		¹ hostname mismatch
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Holidaybreak-mismatches.xml b/src/chrome/content/rules/Holidaybreak-mismatches.xml
index f1fc5f69b5f3..9de17cd63597 100644
--- a/src/chrome/content/rules/Holidaybreak-mismatches.xml
+++ b/src/chrome/content/rules/Holidaybreak-mismatches.xml
@@ -5,7 +5,7 @@
 		
 		
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Holidaybreak.xml b/src/chrome/content/rules/Holidaybreak.xml
index 0ba47ead8aee..b197e6b63261 100644
--- a/src/chrome/content/rules/Holidaybreak.xml
+++ b/src/chrome/content/rules/Holidaybreak.xml
@@ -25,7 +25,7 @@ Fetch error: http://www.holidaybreak.co.uk/ => https://ww7.investorrelations.co.
 	* Reset
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Hollywood-Reporter.xml b/src/chrome/content/rules/Hollywood-Reporter.xml
index f159b315c33f..0318fd7fb0e3 100644
--- a/src/chrome/content/rules/Hollywood-Reporter.xml
+++ b/src/chrome/content/rules/Hollywood-Reporter.xml
@@ -31,7 +31,7 @@
 
 	
 	
-		
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Hololive.tv.xml b/src/chrome/content/rules/Hololive.tv.xml
new file mode 100644
index 000000000000..a4ae113c15dd
--- /dev/null
+++ b/src/chrome/content/rules/Hololive.tv.xml
@@ -0,0 +1,15 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Holoscripter.org.xml b/src/chrome/content/rules/Holoscripter.org.xml
deleted file mode 100644
index 443b895d216c..000000000000
--- a/src/chrome/content/rules/Holoscripter.org.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Home-Assistant.io.xml b/src/chrome/content/rules/Home-Assistant.io.xml
new file mode 100644
index 000000000000..6f608aa598fc
--- /dev/null
+++ b/src/chrome/content/rules/Home-Assistant.io.xml
@@ -0,0 +1,22 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Home-of-the-Sebijk.com.xml b/src/chrome/content/rules/Home-of-the-Sebijk.com.xml
index 3b1270a030b0..6c5df51a1a8a 100644
--- a/src/chrome/content/rules/Home-of-the-Sebijk.com.xml
+++ b/src/chrome/content/rules/Home-of-the-Sebijk.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.sebijk.com/ => https://www.sebijk.com/: (60, 'SSL certif
 Disabled by https-everywhere-checker because:
 Fetch error: http://freemail.sebijk.com/ => https://freemail.sebijk.com/: Redirect for 'http://freemail.sebijk.com/' missing Location
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/Home.ch.xml b/src/chrome/content/rules/Home.ch.xml
index 761dbda19745..282f063ba037 100644
--- a/src/chrome/content/rules/Home.ch.xml
+++ b/src/chrome/content/rules/Home.ch.xml
@@ -16,4 +16,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Home.pl.xml b/src/chrome/content/rules/Home.pl.xml
index 3cd86e31ac73..2c46b335d179 100644
--- a/src/chrome/content/rules/Home.pl.xml
+++ b/src/chrome/content/rules/Home.pl.xml
@@ -9,13 +9,20 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
-	
+	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/HomeBello.xml b/src/chrome/content/rules/HomeBello.xml
index 187848e72ad8..af0143db8ac8 100644
--- a/src/chrome/content/rules/HomeBello.xml
+++ b/src/chrome/content/rules/HomeBello.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/HomeInsurance.com.xml b/src/chrome/content/rules/HomeInsurance.com.xml
index 6c8ab36c440f..4f602bdd034e 100644
--- a/src/chrome/content/rules/HomeInsurance.com.xml
+++ b/src/chrome/content/rules/HomeInsurance.com.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Home_Depot.com-problematic.xml b/src/chrome/content/rules/Home_Depot.com-problematic.xml
index 4d440cb509d1..c9a84df028a8 100644
--- a/src/chrome/content/rules/Home_Depot.com-problematic.xml
+++ b/src/chrome/content/rules/Home_Depot.com-problematic.xml
@@ -18,4 +18,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Home_Depot_Foundation.org.xml b/src/chrome/content/rules/Home_Depot_Foundation.org.xml
index d29ba3e0774e..44486148dd58 100644
--- a/src/chrome/content/rules/Home_Depot_Foundation.org.xml
+++ b/src/chrome/content/rules/Home_Depot_Foundation.org.xml
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Home_Mentors.com.xml b/src/chrome/content/rules/Home_Mentors.com.xml
index 8589b24efddf..2f14bc3cda11 100644
--- a/src/chrome/content/rules/Home_Mentors.com.xml
+++ b/src/chrome/content/rules/Home_Mentors.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://homementors.com/ => https://homementors.com/: (60, 'SSL cert
 Fetch error: http://www.homementors.com/ => https://www.homementors.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Homecomputing.fr.xml b/src/chrome/content/rules/Homecomputing.fr.xml
index c0ddd2fab70d..eb42223a1d61 100644
--- a/src/chrome/content/rules/Homecomputing.fr.xml
+++ b/src/chrome/content/rules/Homecomputing.fr.xml
@@ -57,7 +57,7 @@
 	
 	
 	
-	
+
 	
 
 
diff --git a/src/chrome/content/rules/Homeless_Veterans.co.uk-falsemixed.xml b/src/chrome/content/rules/Homeless_Veterans.co.uk-falsemixed.xml
deleted file mode 100644
index 8a49b2bd06fe..000000000000
--- a/src/chrome/content/rules/Homeless_Veterans.co.uk-falsemixed.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Homeless_Veterans.co.uk.xml b/src/chrome/content/rules/Homeless_Veterans.co.uk.xml
index 63b19fe29131..4aa6e98f8132 100644
--- a/src/chrome/content/rules/Homeless_Veterans.co.uk.xml
+++ b/src/chrome/content/rules/Homeless_Veterans.co.uk.xml
@@ -40,7 +40,7 @@ Fetch error: http://donate.homelessveterans.co.uk/ => https://donate.homelessvet
 		- donate
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Homeless_World_Cup.xml b/src/chrome/content/rules/Homeless_World_Cup.xml
index 5c6171246f3b..9af98cf8001a 100644
--- a/src/chrome/content/rules/Homeless_World_Cup.xml
+++ b/src/chrome/content/rules/Homeless_World_Cup.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Honest.com.xml b/src/chrome/content/rules/Honest.com.xml
index 4973e36764c7..eda934f15b1a 100644
--- a/src/chrome/content/rules/Honest.com.xml
+++ b/src/chrome/content/rules/Honest.com.xml
@@ -23,8 +23,9 @@
 
 
 	
-
-	
+	
+	
+	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Honolulu_Star_Advertiser.xml b/src/chrome/content/rules/Honolulu_Star_Advertiser.xml
index a97fbdda9bd2..06d294a4ffb3 100644
--- a/src/chrome/content/rules/Honolulu_Star_Advertiser.xml
+++ b/src/chrome/content/rules/Honolulu_Star_Advertiser.xml
@@ -19,19 +19,20 @@ Fetch error: http://staradvertiser.com/ => https://www.staradvertiser.com/: Cycl
 		- ^
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
 	
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Hooch.net.xml b/src/chrome/content/rules/Hooch.net.xml
new file mode 100644
index 000000000000..71c8b66b21c7
--- /dev/null
+++ b/src/chrome/content/rules/Hooch.net.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/HootSuite.xml b/src/chrome/content/rules/HootSuite.xml
index 6c60c426531f..203614e3d240 100644
--- a/src/chrome/content/rules/HootSuite.xml
+++ b/src/chrome/content/rules/HootSuite.xml
@@ -81,7 +81,7 @@
 	
 	
 
-	
+	
 
 
 	
 
 	
-	
+	
+	
 
 
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Hoovers.xml b/src/chrome/content/rules/Hoovers.xml
index 4e01d70f127f..acdc6d672c79 100644
--- a/src/chrome/content/rules/Hoovers.xml
+++ b/src/chrome/content/rules/Hoovers.xml
@@ -7,13 +7,13 @@
 -->
 
 
-	
+	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Hop-Studios.xml b/src/chrome/content/rules/Hop-Studios.xml
index ec6e8afaa8a2..532208985102 100644
--- a/src/chrome/content/rules/Hop-Studios.xml
+++ b/src/chrome/content/rules/Hop-Studios.xml
@@ -4,7 +4,7 @@
 	
 	
 
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Horde.xml b/src/chrome/content/rules/Horde.xml
index ee3ba3113506..d80cba3c4750 100644
--- a/src/chrome/content/rules/Horde.xml
+++ b/src/chrome/content/rules/Horde.xml
@@ -13,7 +13,7 @@ Fetch error: http://horde-llc.com/ => https://horde-llc.com/: (51, "SSL: no alte
 		- wiki		(cert: dev.horde.org; shows dev's data)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Hornstra_Farms.com.xml b/src/chrome/content/rules/Hornstra_Farms.com.xml
index f7cab84d54de..8d4402772f94 100644
--- a/src/chrome/content/rules/Hornstra_Farms.com.xml
+++ b/src/chrome/content/rules/Hornstra_Farms.com.xml
@@ -23,7 +23,7 @@ Fetch error: http://www.hornstrafarms.com/ => https://hornstrafarms.com/: (51, "
 		- (www.)?	(www → ^)
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Hoseasons.co.uk.xml b/src/chrome/content/rules/Hoseasons.co.uk.xml
index 3cee98ae10f1..e332d7cb57a0 100644
--- a/src/chrome/content/rules/Hoseasons.co.uk.xml
+++ b/src/chrome/content/rules/Hoseasons.co.uk.xml
@@ -1,5 +1,9 @@
 
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://ads.hospitalityleaders.com/ => https://ads.hospitalityleader
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Host-Creo.xml b/src/chrome/content/rules/Host-Creo.xml
index d5649841b28d..9b8b53d2efdc 100644
--- a/src/chrome/content/rules/Host-Creo.xml
+++ b/src/chrome/content/rules/Host-Creo.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.hostcreo.com/ => https://www.creocommunico.com/: (51, "S
 Fetch error: http://secure.creocommunico.com/ => https://secure.creocommunico.com/: (35, 'error:140770FC:SSL routines:SSL23_GET_SERVER_HELLO:unknown protocol')
 Fetch error: http://www.creocommunico.com/ => https://www.creocommunico.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.creocommunico.com'")
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Host-Europe-Group.xml b/src/chrome/content/rules/Host-Europe-Group.xml
index 335f1199ac1f..a392785e3d61 100644
--- a/src/chrome/content/rules/Host-Europe-Group.xml
+++ b/src/chrome/content/rules/Host-Europe-Group.xml
@@ -24,7 +24,7 @@ Fetch error: http://www.hosteuropegroup.com/ => https://www.hosteuropegroup.com/
 
 -->
 
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Host.co.id.xml b/src/chrome/content/rules/Host.co.id.xml
index 648ffa9066e2..751fabb958d3 100644
--- a/src/chrome/content/rules/Host.co.id.xml
+++ b/src/chrome/content/rules/Host.co.id.xml
@@ -5,7 +5,7 @@ Fetch error: http://site.biz.id/ => https://site.biz.id/: (6, 'Could not resolve
 Fetch error: http://www.site.biz.id/ => https://www.site.biz.id/: (6, 'Could not resolve host: www.site.biz.id')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Host1Plus.xml b/src/chrome/content/rules/Host1Plus.xml
deleted file mode 100644
index 296f8b46b719..000000000000
--- a/src/chrome/content/rules/Host1Plus.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Host2.bg.xml b/src/chrome/content/rules/Host2.bg.xml
index 9ae6d6321798..ed7b5c36bb98 100644
--- a/src/chrome/content/rules/Host2.bg.xml
+++ b/src/chrome/content/rules/Host2.bg.xml
@@ -5,7 +5,7 @@ Fetch error: http://host2.bg/ => https://host2.bg/: (60, 'SSL certificate proble
 Fetch error: http://www.host2.bg/ => https://www.host2.bg/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/HostDime.xml b/src/chrome/content/rules/HostDime.xml
index 8059f3040ea8..9a5531bb3446 100644
--- a/src/chrome/content/rules/HostDime.xml
+++ b/src/chrome/content/rules/HostDime.xml
@@ -39,7 +39,7 @@ Fetch error: http://forum.hostdime.com/ => https://forum.hostdime.com/: (6, 'Cou
 	² 404 page only
 
 -->
-
+
 
 	
@@ -58,7 +58,7 @@ Fetch error: http://forum.hostdime.com/ => https://forum.hostdime.com/: (6, 'Cou
 					-->
 	
 
-	
+	
 
 
 	
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Host_Analytics.xml b/src/chrome/content/rules/Host_Analytics.xml
index 9ea91185e96f..fecb80eb6427 100644
--- a/src/chrome/content/rules/Host_Analytics.xml
+++ b/src/chrome/content/rules/Host_Analytics.xml
@@ -13,7 +13,7 @@ Fetch error: http://hive.hostanalytics.com/ => https://hive.hostanalytics.com/:
 	ᵉ Expired
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Host_One.xml b/src/chrome/content/rules/Host_One.xml
index 8f1de5da5341..64003893be84 100644
--- a/src/chrome/content/rules/Host_One.xml
+++ b/src/chrome/content/rules/Host_One.xml
@@ -10,7 +10,7 @@ Fetch error: http://sugarcrm.hostone.com.au/ => https://sugarcrm.hostone.com.au/
 		- (www.)	(shows sugarcrm; mismatched, CN: sugarcrm.hostone.com.au)
 
 -->
-
+
 
 	
 
@@ -20,4 +20,4 @@ Fetch error: http://sugarcrm.hostone.com.au/ => https://sugarcrm.hostone.com.au/
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Host_Voice.com.xml b/src/chrome/content/rules/Host_Voice.com.xml
index d72939de7124..8da512988284 100644
--- a/src/chrome/content/rules/Host_Voice.com.xml
+++ b/src/chrome/content/rules/Host_Voice.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.hostvoice.com/ => https://www.hostvoice.com/: (60, 'SSL
 	For other iNET Interactive coverage, see INet-Interactive.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/HostingCon.xml b/src/chrome/content/rules/HostingCon.xml
index 2e6529079e12..767aea22823d 100644
--- a/src/chrome/content/rules/HostingCon.xml
+++ b/src/chrome/content/rules/HostingCon.xml
@@ -13,7 +13,7 @@ Fetch error: http://europe.hostingcon.com/ => https://europe.hostingcon.com/: (5
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/HostingXtreme.com.xml b/src/chrome/content/rules/HostingXtreme.com.xml
index 822674fc62ed..e1af919f1a5d 100644
--- a/src/chrome/content/rules/HostingXtreme.com.xml
+++ b/src/chrome/content/rules/HostingXtreme.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.hostingxtreme.com/ => https://www.hostingxtreme.com/: (2
 		- news	(http reply)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Hosting_Catalog.com-falsemixed.xml b/src/chrome/content/rules/Hosting_Catalog.com-falsemixed.xml
deleted file mode 100644
index 75c58f165867..000000000000
--- a/src/chrome/content/rules/Hosting_Catalog.com-falsemixed.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Hosting_Catalog.com.xml b/src/chrome/content/rules/Hosting_Catalog.com.xml
deleted file mode 100644
index b14a49b5beb6..000000000000
--- a/src/chrome/content/rules/Hosting_Catalog.com.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-	
-		
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Hostname.sk.xml b/src/chrome/content/rules/Hostname.sk.xml
index 802f8e9de808..0de242207915 100644
--- a/src/chrome/content/rules/Hostname.sk.xml
+++ b/src/chrome/content/rules/Hostname.sk.xml
@@ -23,14 +23,15 @@
 -->
 
 
-	
+	
+	
+	
 		
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Hostoople.com-falsemixed.xml b/src/chrome/content/rules/Hostoople.com-falsemixed.xml
index 78d97a0d2ff3..f52777387983 100644
--- a/src/chrome/content/rules/Hostoople.com-falsemixed.xml
+++ b/src/chrome/content/rules/Hostoople.com-falsemixed.xml
@@ -6,7 +6,7 @@
 
 	
 	
-	
+	
 
 
 	
 
 	
-	
+	
+	
+	
 		
@@ -48,7 +50,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Hostpoint.xml b/src/chrome/content/rules/Hostpoint.xml
deleted file mode 100644
index 820100c1e94a..000000000000
--- a/src/chrome/content/rules/Hostpoint.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-	
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Hostpointpartner.ch.xml b/src/chrome/content/rules/Hostpointpartner.ch.xml
index 3acd04e1f583..1e50233a810b 100644
--- a/src/chrome/content/rules/Hostpointpartner.ch.xml
+++ b/src/chrome/content/rules/Hostpointpartner.ch.xml
@@ -10,4 +10,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/HotHardware.com.xml b/src/chrome/content/rules/HotHardware.com.xml
new file mode 100644
index 000000000000..5464ae02c1c8
--- /dev/null
+++ b/src/chrome/content/rules/HotHardware.com.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/HotLog.ru.xml b/src/chrome/content/rules/HotLog.ru.xml
index 306fc41678d3..ddc9e5cc1932 100644
--- a/src/chrome/content/rules/HotLog.ru.xml
+++ b/src/chrome/content/rules/HotLog.ru.xml
@@ -16,7 +16,7 @@
 		- .hotlog.ru
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/HotUKDeals.xml b/src/chrome/content/rules/HotUKDeals.xml
index 998927553184..297a5d62a0ab 100644
--- a/src/chrome/content/rules/HotUKDeals.xml
+++ b/src/chrome/content/rules/HotUKDeals.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.hotukdeals.com/ => http://www.hotukdeals.com/: Cycle det
 Fetch error: http://statichukd.com/ => https://www.hotukdeals.com/: Pycurl fetch failed for 'http://statichukd.com/'
 Fetch error: http://www.statichukd.com/ => https://www.hotukdeals.com/: Cycle detected - URL already encountered: http://www.hotukdeals.com/
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Hot_Pics_Amateur.xml b/src/chrome/content/rules/Hot_Pics_Amateur.xml
index 79f6b04b26f9..69420b1f4fe8 100644
--- a/src/chrome/content/rules/Hot_Pics_Amateur.xml
+++ b/src/chrome/content/rules/Hot_Pics_Amateur.xml
@@ -5,7 +5,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Hotel_Wifi.com.xml b/src/chrome/content/rules/Hotel_Wifi.com.xml
index fb727a2a312f..313486d389a8 100644
--- a/src/chrome/content/rules/Hotel_Wifi.com.xml
+++ b/src/chrome/content/rules/Hotel_Wifi.com.xml
@@ -18,7 +18,7 @@ Fetch error: http://hotelwifi.com/ => https://hotelwifi.com/: (60, 'SSL certific
 	* Plaintext reply
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Hotels.com.xml b/src/chrome/content/rules/Hotels.com.xml
deleted file mode 100644
index 0c05afc220b9..000000000000
--- a/src/chrome/content/rules/Hotels.com.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-
-	
-
-	
-
-	
-	
-
-	
-	
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Hotspot_Shield.xml b/src/chrome/content/rules/Hotspot_Shield.xml
index d241923c7965..877a2e0dc5a3 100644
--- a/src/chrome/content/rules/Hotspot_Shield.xml
+++ b/src/chrome/content/rules/Hotspot_Shield.xml
@@ -36,4 +36,4 @@ Fetch error: http://hotspotshield.com/ => https://hotspotshield.com/: (7, 'Faile
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Hotwire.xml b/src/chrome/content/rules/Hotwire.xml
index e4f8d934aac3..b7e5cb4e8c1f 100644
--- a/src/chrome/content/rules/Hotwire.xml
+++ b/src/chrome/content/rules/Hotwire.xml
@@ -1,9 +1,10 @@
 
   
-  
+  
+  
+  
 
   
-  
-
\ No newline at end of file
+  
+
diff --git a/src/chrome/content/rules/Hounddog_Central.xml b/src/chrome/content/rules/Hounddog_Central.xml
index 008c4c63dcb3..5a75e716356b 100644
--- a/src/chrome/content/rules/Hounddog_Central.xml
+++ b/src/chrome/content/rules/Hounddog_Central.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Houseoffraser.co.uk.xml b/src/chrome/content/rules/Houseoffraser.co.uk.xml
deleted file mode 100644
index 4eaf46772a3c..000000000000
--- a/src/chrome/content/rules/Houseoffraser.co.uk.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/HousingWire.com.xml b/src/chrome/content/rules/HousingWire.com.xml
index 11ed574e5b28..db469617c10d 100644
--- a/src/chrome/content/rules/HousingWire.com.xml
+++ b/src/chrome/content/rules/HousingWire.com.xml
@@ -19,4 +19,4 @@ Fetch error: http://housingwire.com/ => https://www.housingwire.com/: Cycle dete
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Houston_Chronicle.xml b/src/chrome/content/rules/Houston_Chronicle.xml
index dc1872f17788..96bdcc67bf0b 100644
--- a/src/chrome/content/rules/Houston_Chronicle.xml
+++ b/src/chrome/content/rules/Houston_Chronicle.xml
@@ -63,7 +63,10 @@
 -->
 
 
-	
+	
+	
+	
+	
 		
 	
 
diff --git a/src/chrome/content/rules/HowManyDaysTill.com.xml b/src/chrome/content/rules/HowManyDaysTill.com.xml
new file mode 100644
index 000000000000..0473d224f80b
--- /dev/null
+++ b/src/chrome/content/rules/HowManyDaysTill.com.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/HowManyPeopleAreInSpaceRightNow.com.xml b/src/chrome/content/rules/HowManyPeopleAreInSpaceRightNow.com.xml
index 8df596f1fa30..c60917bd9a12 100644
--- a/src/chrome/content/rules/HowManyPeopleAreInSpaceRightNow.com.xml
+++ b/src/chrome/content/rules/HowManyPeopleAreInSpaceRightNow.com.xml
@@ -4,5 +4,6 @@
 
 	
 
+	
 	
 
diff --git a/src/chrome/content/rules/HowTo.gov.xml b/src/chrome/content/rules/HowTo.gov.xml
deleted file mode 100644
index 176330aa0e5c..000000000000
--- a/src/chrome/content/rules/HowTo.gov.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/How_to_Box.xml b/src/chrome/content/rules/How_to_Box.xml
deleted file mode 100644
index b6a40ac653d2..000000000000
--- a/src/chrome/content/rules/How_to_Box.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Howinerd.com.xml b/src/chrome/content/rules/Howinerd.com.xml
deleted file mode 100644
index 85b5eea683e8..000000000000
--- a/src/chrome/content/rules/Howinerd.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/HowiyaPress.com.xml b/src/chrome/content/rules/HowiyaPress.com.xml
new file mode 100644
index 000000000000..8dee595df542
--- /dev/null
+++ b/src/chrome/content/rules/HowiyaPress.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/HrC.onl.xml b/src/chrome/content/rules/HrC.onl.xml
deleted file mode 100644
index 8f6ac4975a40..000000000000
--- a/src/chrome/content/rules/HrC.onl.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/HsI_cloud.com.xml b/src/chrome/content/rules/HsI_cloud.com.xml
index 5dfdf23531f7..8a1a28e7b913 100644
--- a/src/chrome/content/rules/HsI_cloud.com.xml
+++ b/src/chrome/content/rules/HsI_cloud.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://fb.hsicloud.com/ => https://fb.hsicloud.com/: (60, 'SSL cert
 	* http reply
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Hstor.org.xml b/src/chrome/content/rules/Hstor.org.xml
index ae30e6bff81a..4d71a945c6d4 100644
--- a/src/chrome/content/rules/Hstor.org.xml
+++ b/src/chrome/content/rules/Hstor.org.xml
@@ -13,7 +13,7 @@ Fetch error: http://beta.hstor.org/ => https://beta.hstor.org/: (60, 'SSL certif
 	www.hstor.org doesn't exist.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Ht.vc.xml b/src/chrome/content/rules/Ht.vc.xml
index 36c05c833ec3..44b3c0558e63 100644
--- a/src/chrome/content/rules/Ht.vc.xml
+++ b/src/chrome/content/rules/Ht.vc.xml
@@ -6,7 +6,7 @@ Fetch error: http://bh.ht.vc/ => https://bh.ht.vc/: (60, 'SSL certificate proble
 Fetch error: http://www.ht.vc/ => https://www.ht.vc/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Htwk-leipzig-owndomains.xml b/src/chrome/content/rules/Htwk-leipzig-owndomains.xml
index 3a5a1aa523b1..6b6418f4328e 100644
--- a/src/chrome/content/rules/Htwk-leipzig-owndomains.xml
+++ b/src/chrome/content/rules/Htwk-leipzig-owndomains.xml
@@ -7,11 +7,11 @@ Fetch error: http://www.cmw-leipzig.de/ => https://www.cmw-leipzig.de/: (51, "SS
 	Nonfunctional subdomains:
 		- streifband.de
 			- www	-> wrong cert
-	
+
 	Other HTWK Leipzig rulesets:
 		- Htwk-leipzig.de.xml
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Htwk-leipzig.de.xml b/src/chrome/content/rules/Htwk-leipzig.de.xml
index fb50b37ff497..c440392e59e1 100644
--- a/src/chrome/content/rules/Htwk-leipzig.de.xml
+++ b/src/chrome/content/rules/Htwk-leipzig.de.xml
@@ -17,11 +17,11 @@ Fetch error: http://cmw.htwk-leipzig.de/ => https://cmw.htwk-leipzig.de/: (51, "
 		- naoteam.imn	        -> different site
 		- www.fitl		        -> times out
 		- katalog.bib	        -> DNS error
-	
+
 	Other HTWK Leipzig rulesets:
 		- Htwk-leipzig-owndomains.xml
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Huawei.com.xml b/src/chrome/content/rules/Huawei.com.xml
index 415968e033a8..2cb87e8a6c93 100644
--- a/src/chrome/content/rules/Huawei.com.xml
+++ b/src/chrome/content/rules/Huawei.com.xml
@@ -57,7 +57,7 @@ Fetch error: http://imailpk.huawei.com/ => https://imailpk.huawei.com/OWA: (60,
 		- uniportal.huawei.com
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/HubSpot.com.xml b/src/chrome/content/rules/HubSpot.com.xml
deleted file mode 100644
index 20e13c12c517..000000000000
--- a/src/chrome/content/rules/HubSpot.com.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/HubSpot.net.xml b/src/chrome/content/rules/HubSpot.net.xml
index ef741c488e22..8d8bd7087c51 100644
--- a/src/chrome/content/rules/HubSpot.net.xml
+++ b/src/chrome/content/rules/HubSpot.net.xml
@@ -1,7 +1,4 @@
 
-
+
 
 	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/HugoBoss.xml b/src/chrome/content/rules/HugoBoss.xml
index 6c199de3c370..86bad8ee9c88 100644
--- a/src/chrome/content/rules/HugoBoss.xml
+++ b/src/chrome/content/rules/HugoBoss.xml
@@ -21,7 +21,7 @@
 	
 	
 
-	
 	
 	
diff --git a/src/chrome/content/rules/HumanDesign.fi.xml b/src/chrome/content/rules/HumanDesign.fi.xml
new file mode 100644
index 000000000000..f7b0ad4272a8
--- /dev/null
+++ b/src/chrome/content/rules/HumanDesign.fi.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/HumanResearchEthicsPortal.xml b/src/chrome/content/rules/HumanResearchEthicsPortal.xml
index cf3c0f7cdb07..06aab896a788 100644
--- a/src/chrome/content/rules/HumanResearchEthicsPortal.xml
+++ b/src/chrome/content/rules/HumanResearchEthicsPortal.xml
@@ -4,10 +4,10 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://hrep.nhmrc.gov.au/ => https://hrep.nhmrc.gov.au/: (6, 'Could not resolve host: hrep.nhmrc.gov.au')
 
 -->
-
+
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Human_Action.xml b/src/chrome/content/rules/Human_Action.xml
index ad3740717a80..e855cc0afa54 100644
--- a/src/chrome/content/rules/Human_Action.xml
+++ b/src/chrome/content/rules/Human_Action.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Human_Brain_Project.eu.xml b/src/chrome/content/rules/Human_Brain_Project.eu.xml
index 3b5eca05e9f5..438e871c1673 100644
--- a/src/chrome/content/rules/Human_Brain_Project.eu.xml
+++ b/src/chrome/content/rules/Human_Brain_Project.eu.xml
@@ -1,7 +1,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
-
+
 
 	
 	
@@ -26,4 +26,4 @@ Fetch error: http://order.humanevents.com/ => https://order.humanevents.com/: (6
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/HumanityPlus.xml b/src/chrome/content/rules/HumanityPlus.xml
index 37c994ed8474..f097c07c5e23 100644
--- a/src/chrome/content/rules/HumanityPlus.xml
+++ b/src/chrome/content/rules/HumanityPlus.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Hunch.xml b/src/chrome/content/rules/Hunch.xml
index a103cfe0d85c..f1fc3e830678 100644
--- a/src/chrome/content/rules/Hunch.xml
+++ b/src/chrome/content/rules/Hunch.xml
@@ -24,7 +24,7 @@ Fetch error: http://hunch.com/ => https://hunch.com/: (60, 'SSL certificate prob
 		- img-1.hunch.com		(mismatched, CN: HUNCH.COM)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Hungry-for-Change.xml b/src/chrome/content/rules/Hungry-for-Change.xml
index 15083282b16f..d11e0f767e00 100644
--- a/src/chrome/content/rules/Hungry-for-Change.xml
+++ b/src/chrome/content/rules/Hungry-for-Change.xml
@@ -3,10 +3,10 @@
 	
 	
 	
-	
+	
 
 
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Hunting_Bears.nl.xml b/src/chrome/content/rules/Hunting_Bears.nl.xml
index 6eef84edf5fd..ba4d205c085d 100644
--- a/src/chrome/content/rules/Hunting_Bears.nl.xml
+++ b/src/chrome/content/rules/Hunting_Bears.nl.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.huntingbears.nl/ => https://www.huntingbears.nl/: (51, "SSL: no alternative certificate subject name matches target host name 'www.huntingbears.nl'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Huobi.com.xml b/src/chrome/content/rules/Huobi.com.xml
index e673eb52b25d..00d5ae8b8402 100644
--- a/src/chrome/content/rules/Huobi.com.xml
+++ b/src/chrome/content/rules/Huobi.com.xml
@@ -31,7 +31,7 @@ Fetch error: http://s.huobi.com/ => https://s.huobi.com/: (7, 'Failed to connect
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Hupu.xml b/src/chrome/content/rules/Hupu.xml
index 5487d2e859bc..5c4f7550b151 100644
--- a/src/chrome/content/rules/Hupu.xml
+++ b/src/chrome/content/rules/Hupu.xml
@@ -43,7 +43,7 @@
     
     
     
-    
+
     
     
     
diff --git a/src/chrome/content/rules/Hurley_Medical_Center.xml b/src/chrome/content/rules/Hurley_Medical_Center.xml
index 1267a5f41226..097df5f3fa98 100644
--- a/src/chrome/content/rules/Hurley_Medical_Center.xml
+++ b/src/chrome/content/rules/Hurley_Medical_Center.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://hurleymc.com/ => https://hurleymc.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.hurleymc.com'")
 Fetch error: http://www.hurleymc.com/ => https://www.hurleymc.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.hurleymc.com'")
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.hurleymc.com/ => https://www.hurleymc.com/: (51, "SSL: n
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/HurricaneElectric.xml b/src/chrome/content/rules/HurricaneElectric.xml
index fdf946061e83..8039843d7420 100644
--- a/src/chrome/content/rules/HurricaneElectric.xml
+++ b/src/chrome/content/rules/HurricaneElectric.xml
@@ -3,41 +3,40 @@
 
 		- TunnelBroker.xml
 
-
-
-	Nonfunctional subdomains:
-
-		- bgp.he.net	(refused)
-		- man.he.net	(redirects to www.he.net, valid cert)
-
-
-	bgp.he.net and faq.he.net don't support SSL at the moment
-
-
-	Problematic domains:
-
-		- (www.)hu.com *
-		- hurricaneelectric.com *
-
-	* Alternative domains, same content, using he.net certificate
-
+	Non-functional hosts
+		SSL connect error:
+		- man.he.net
+
+		SSL peer certificate was not OK:
+		- he.com
+		- www.he.com
+		- hurricaneelectric.net
 -->
-
-
+
 	
 	
+	
 	
-	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+	
 	
+		
 
+	
+	
+	
+	
+	
 
-	
-
-
-	
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/HurricaneTweets.com.xml b/src/chrome/content/rules/HurricaneTweets.com.xml
deleted file mode 100644
index 4175876e9674..000000000000
--- a/src/chrome/content/rules/HurricaneTweets.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Hush-Hush.xml b/src/chrome/content/rules/Hush-Hush.xml
index 5f84d45d3509..337a20000660 100644
--- a/src/chrome/content/rules/Hush-Hush.xml
+++ b/src/chrome/content/rules/Hush-Hush.xml
@@ -1,7 +1,8 @@
 
 
 	
-	
+	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Hush.technology.xml b/src/chrome/content/rules/Hush.technology.xml
deleted file mode 100644
index e5f579aee5d9..000000000000
--- a/src/chrome/content/rules/Hush.technology.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Hustler.xml b/src/chrome/content/rules/Hustler.xml
index 25317ff096f0..24cdf4d601b4 100644
--- a/src/chrome/content/rules/Hustler.xml
+++ b/src/chrome/content/rules/Hustler.xml
@@ -14,7 +14,7 @@ Fetch error: http://hustlermagazine.com/ => https://www.hustlermagazine.com/: (7
 	* Handshake fails
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Huxiu.com.xml b/src/chrome/content/rules/Huxiu.com.xml
index cba4d3954388..dd185e346941 100644
--- a/src/chrome/content/rules/Huxiu.com.xml
+++ b/src/chrome/content/rules/Huxiu.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://huxiu.com/ => https://huxiu.com/: (60, 'SSL certificate prob
 	- Refused on:
 		duwu.huxiu.com
 -->
-
+
 	
 	
 	
@@ -18,6 +18,6 @@ Fetch error: http://huxiu.com/ => https://huxiu.com/: (60, 'SSL certificate prob
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Hvosting.ua.xml b/src/chrome/content/rules/Hvosting.ua.xml
index c14b50d3fbf2..0a0ae5aeb095 100644
--- a/src/chrome/content/rules/Hvosting.ua.xml
+++ b/src/chrome/content/rules/Hvosting.ua.xml
@@ -13,9 +13,9 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Hwbot.org.xml b/src/chrome/content/rules/Hwbot.org.xml
index 90d682fcbea8..08e3731b05c3 100644
--- a/src/chrome/content/rules/Hwbot.org.xml
+++ b/src/chrome/content/rules/Hwbot.org.xml
@@ -15,7 +15,8 @@
 -->
 
 
-	
+	
+	
 
 
 	 https://www.hypanova.com/: (60, 'SSL ce
 Disabled by https-everywhere-checker because:
 Fetch error: http://hypanova.com/ => https://hypanova.com/: (51, "SSL: no alternative certificate subject name matches target host name 'hypanova.com'")
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/HypeMachine.xml b/src/chrome/content/rules/HypeMachine.xml
index 8d30b454c8b6..773a08946225 100644
--- a/src/chrome/content/rules/HypeMachine.xml
+++ b/src/chrome/content/rules/HypeMachine.xml
@@ -1,43 +1,17 @@
 
-
-    
-    
-		
-		
-	
-
-
-	
-
-
-	
+
+	
+	
+	
+	
+	
 
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/Hyper.sh.xml b/src/chrome/content/rules/Hyper.sh.xml
deleted file mode 100644
index 02f87ab871c5..000000000000
--- a/src/chrome/content/rules/Hyper.sh.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Hyperoptic.com.xml b/src/chrome/content/rules/Hyperoptic.com.xml
index e376b49288e4..597513202a83 100644
--- a/src/chrome/content/rules/Hyperoptic.com.xml
+++ b/src/chrome/content/rules/Hyperoptic.com.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Hypovereinsbank.de.xml b/src/chrome/content/rules/Hypovereinsbank.de.xml
index 62ec28643514..4254e36b4caf 100644
--- a/src/chrome/content/rules/Hypovereinsbank.de.xml
+++ b/src/chrome/content/rules/Hypovereinsbank.de.xml
@@ -3,9 +3,7 @@
   
   
   
-
-  
-  
+  
 
   
   
diff --git a/src/chrome/content/rules/I-Do-Foundation.xml b/src/chrome/content/rules/I-Do-Foundation.xml
deleted file mode 100644
index 7843e7958b4b..000000000000
--- a/src/chrome/content/rules/I-Do-Foundation.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/I2PD.website.xml b/src/chrome/content/rules/I2PD.website.xml
new file mode 100644
index 000000000000..c7fd3127ab1c
--- /dev/null
+++ b/src/chrome/content/rules/I2PD.website.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/I3D.net.xml b/src/chrome/content/rules/I3D.net.xml
index ca5839ebe9f0..64233ef8cfa4 100644
--- a/src/chrome/content/rules/I3D.net.xml
+++ b/src/chrome/content/rules/I3D.net.xml
@@ -10,7 +10,8 @@
 
 
 	
-	
+	
+	
 
 
 	
-
+
 
 	
-	
+	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/IAB.org.xml b/src/chrome/content/rules/IAB.org.xml
deleted file mode 100644
index 06ceda32f40b..000000000000
--- a/src/chrome/content/rules/IAB.org.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/IARU-R1.org.xml b/src/chrome/content/rules/IARU-R1.org.xml
new file mode 100644
index 000000000000..513a50610ee7
--- /dev/null
+++ b/src/chrome/content/rules/IARU-R1.org.xml
@@ -0,0 +1,26 @@
+
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/IAS.edu.xml b/src/chrome/content/rules/IAS.edu.xml
index 821943e4ca0d..fd98b957bd01 100644
--- a/src/chrome/content/rules/IAS.edu.xml
+++ b/src/chrome/content/rules/IAS.edu.xml
@@ -41,7 +41,7 @@ Fetch error: http://springdale.math.ias.edu/ => https://springdale.math.ias.edu/
 		- (www.)sss	(^ → www)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/IATS_Payments.com.xml b/src/chrome/content/rules/IATS_Payments.com.xml
index 431cd629a6dc..049c731b8fe3 100644
--- a/src/chrome/content/rules/IATS_Payments.com.xml
+++ b/src/chrome/content/rules/IATS_Payments.com.xml
@@ -17,4 +17,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/IB-IBI.com.xml b/src/chrome/content/rules/IB-IBI.com.xml
index 585e42ad4c91..2190f2e47f6f 100644
--- a/src/chrome/content/rules/IB-IBI.com.xml
+++ b/src/chrome/content/rules/IB-IBI.com.xml
@@ -16,7 +16,7 @@ Fetch error: http://global.ib-ibi.com/ => https://global.ib-ibi.com/: (56, 'SSL
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/IBM.xml b/src/chrome/content/rules/IBM.xml
index 5b020f9574be..7bf2450865b7 100644
--- a/src/chrome/content/rules/IBM.xml
+++ b/src/chrome/content/rules/IBM.xml
@@ -1,4 +1,9 @@
+
 
 	
 	
 
diff --git a/src/chrome/content/rules/IBPhoenix.com.xml b/src/chrome/content/rules/IBPhoenix.com.xml
index 8453c806a7b1..226088e9b000 100644
--- a/src/chrome/content/rules/IBPhoenix.com.xml
+++ b/src/chrome/content/rules/IBPhoenix.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.ibphoenix.com/ => https://www.ibphoenix.com/: (60, 'SSL
 	^: 503
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/IBario.com.xml b/src/chrome/content/rules/IBario.com.xml
index 4f688a2b4316..9d7d5444960e 100644
--- a/src/chrome/content/rules/IBario.com.xml
+++ b/src/chrome/content/rules/IBario.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.ibario.com/ => https://www.ibario.com/: (60, 'SSL certif
 	^: refused
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/IBsrv.net.xml b/src/chrome/content/rules/IBsrv.net.xml
new file mode 100644
index 000000000000..6d1467cda200
--- /dev/null
+++ b/src/chrome/content/rules/IBsrv.net.xml
@@ -0,0 +1,26 @@
+
+
+
+	
+		
+	
+		
+	
+		
+	
+		
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/ICA.se.xml b/src/chrome/content/rules/ICA.se.xml
index c4f5484da0e3..2e609ec99818 100644
--- a/src/chrome/content/rules/ICA.se.xml
+++ b/src/chrome/content/rules/ICA.se.xml
@@ -1,7 +1,10 @@
 
-	
 	
-	
-	
-
+	
+	
+	
 
+	
+
+	
+
diff --git a/src/chrome/content/rules/ICANN.xml b/src/chrome/content/rules/ICANN.xml
index f89a04e9986f..19698f5a7da1 100644
--- a/src/chrome/content/rules/ICANN.xml
+++ b/src/chrome/content/rules/ICANN.xml
@@ -97,7 +97,7 @@
 		
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ICMail.xml b/src/chrome/content/rules/ICMail.xml
deleted file mode 100644
index f1aecaf640bc..000000000000
--- a/src/chrome/content/rules/ICMail.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-  
-  
-
-  
-
diff --git a/src/chrome/content/rules/ICPDR.org.xml b/src/chrome/content/rules/ICPDR.org.xml
new file mode 100644
index 000000000000..53a35ada0826
--- /dev/null
+++ b/src/chrome/content/rules/ICPDR.org.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ICPEN.xml b/src/chrome/content/rules/ICPEN.xml
index 2287a90f69b0..34364549441f 100644
--- a/src/chrome/content/rules/ICPEN.xml
+++ b/src/chrome/content/rules/ICPEN.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.icpen.org/ => https://icpen.org/: Too many redirects whi
 	Cert only matches ^icpen.org
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ICRAA.org.xml b/src/chrome/content/rules/ICRAA.org.xml
new file mode 100644
index 000000000000..a4f6f12ef0ec
--- /dev/null
+++ b/src/chrome/content/rules/ICRAA.org.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ICSA_Labs.com.xml b/src/chrome/content/rules/ICSA_Labs.com.xml
deleted file mode 100644
index e1b5911f181e..000000000000
--- a/src/chrome/content/rules/ICSA_Labs.com.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/ICTRecht.xml b/src/chrome/content/rules/ICTRecht.xml
index ec7d26cf55c8..412f10a4a6c7 100644
--- a/src/chrome/content/rules/ICTRecht.xml
+++ b/src/chrome/content/rules/ICTRecht.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ICharts.xml b/src/chrome/content/rules/ICharts.xml
deleted file mode 100644
index 347bfe374269..000000000000
--- a/src/chrome/content/rules/ICharts.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/IClick_Interactive.xml b/src/chrome/content/rules/IClick_Interactive.xml
index 1c9366641765..1c9abd78381a 100644
--- a/src/chrome/content/rules/IClick_Interactive.xml
+++ b/src/chrome/content/rules/IClick_Interactive.xml
@@ -6,14 +6,11 @@
 -->
 
 
-	
+	
 
-
-	
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ICommunity.fr.xml b/src/chrome/content/rules/ICommunity.fr.xml
index 302888583a83..f7ab5a3763e6 100644
--- a/src/chrome/content/rules/ICommunity.fr.xml
+++ b/src/chrome/content/rules/ICommunity.fr.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.icommunity.fr/ => https://www.icommunity.fr/: (7, 'Faile
 	^icommunity.fr doesn't exist.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/IDC.xml b/src/chrome/content/rules/IDC.xml
index 3a69b16098c8..ca16b290f5fc 100644
--- a/src/chrome/content/rules/IDC.xml
+++ b/src/chrome/content/rules/IDC.xml
@@ -17,7 +17,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
@@ -26,7 +28,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/IDG.com.au.xml b/src/chrome/content/rules/IDG.com.au.xml
index 98d3402d6821..a3004019f697 100644
--- a/src/chrome/content/rules/IDG.com.au.xml
+++ b/src/chrome/content/rules/IDG.com.au.xml
@@ -23,23 +23,21 @@ Fetch error: http://computerworld.com.au/ => https://computerworld.com.au/: (51,
 
 
 	
-	
-	
+	
+	
+	
 
 
 	
 
 
-	
 
 	
-	
 
 	
 
+	
 
 
diff --git a/src/chrome/content/rules/IDG.se.xml b/src/chrome/content/rules/IDG.se.xml
index 9139b3ee8e6f..b7a1a75c931d 100644
--- a/src/chrome/content/rules/IDG.se.xml
+++ b/src/chrome/content/rules/IDG.se.xml
@@ -63,7 +63,7 @@ Non-2xx HTTP code: http://upphandling24.idg.se/ (200) => https://upphandling24.i
 	* Times out
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ID_managed_solutions.com.xml b/src/chrome/content/rules/ID_managed_solutions.com.xml
deleted file mode 100644
index a24a1e7a4068..000000000000
--- a/src/chrome/content/rules/ID_managed_solutions.com.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/IEEE.org-falsemixed.xml b/src/chrome/content/rules/IEEE.org-falsemixed.xml
index b2afcdca70fe..5fb1d3c2a968 100644
--- a/src/chrome/content/rules/IEEE.org-falsemixed.xml
+++ b/src/chrome/content/rules/IEEE.org-falsemixed.xml
@@ -6,7 +6,7 @@ Fetch error: http://ieeexplore.ieee.org/ => https://ieeexplore.ieee.org/: Too ma
 	For rules not causing false/broken MCB, see IEEE.xml.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/IEEE_USA.org-falsemixed.xml b/src/chrome/content/rules/IEEE_USA.org-falsemixed.xml
index f2aadd96e446..dfae2b05935a 100644
--- a/src/chrome/content/rules/IEEE_USA.org-falsemixed.xml
+++ b/src/chrome/content/rules/IEEE_USA.org-falsemixed.xml
@@ -7,7 +7,7 @@ Fetch error: http://entportal.ieeeusa.org/ => https://entportal.ieeeusa.org/: (6
 	For rules not causing false/broken MCB, see IEEE_USA.org.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/IELTS.org.xml b/src/chrome/content/rules/IELTS.org.xml
new file mode 100644
index 000000000000..dfac9c5c40ae
--- /dev/null
+++ b/src/chrome/content/rules/IELTS.org.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/IELTS.xml b/src/chrome/content/rules/IELTS.xml
deleted file mode 100644
index 750188010352..000000000000
--- a/src/chrome/content/rules/IELTS.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-  
-	
-	
-
-  
-
diff --git a/src/chrome/content/rules/IEQuran.com.xml b/src/chrome/content/rules/IEQuran.com.xml
new file mode 100644
index 000000000000..0dd0d6100d02
--- /dev/null
+++ b/src/chrome/content/rules/IEQuran.com.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/IET.xml b/src/chrome/content/rules/IET.xml
index d52e0abe1334..038c3c686539 100644
--- a/src/chrome/content/rules/IET.xml
+++ b/src/chrome/content/rules/IET.xml
@@ -8,7 +8,8 @@
 
 
 	
-	
+	
+	
 		
diff --git a/src/chrome/content/rules/IETF.org.xml b/src/chrome/content/rules/IETF.org.xml
index 407b54c5b591..e66cc347f325 100644
--- a/src/chrome/content/rules/IETF.org.xml
+++ b/src/chrome/content/rules/IETF.org.xml
@@ -108,10 +108,10 @@
 	
 
 	
-	
+
 	
-		  
+
 	
 
diff --git a/src/chrome/content/rules/IFA.ch.xml b/src/chrome/content/rules/IFA.ch.xml
index cb5dd9780510..7203fc1e4bc0 100644
--- a/src/chrome/content/rules/IFA.ch.xml
+++ b/src/chrome/content/rules/IFA.ch.xml
@@ -1,6 +1,6 @@
 
 	
-	
+	
 
 	
diff --git a/src/chrome/content/rules/IFriends.xml b/src/chrome/content/rules/IFriends.xml
deleted file mode 100644
index ef108fccca87..000000000000
--- a/src/chrome/content/rules/IFriends.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/IGCD.net.xml b/src/chrome/content/rules/IGCD.net.xml
new file mode 100644
index 000000000000..a720beb8e3cd
--- /dev/null
+++ b/src/chrome/content/rules/IGCD.net.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/IGN-problematic.xml b/src/chrome/content/rules/IGN-problematic.xml
deleted file mode 100644
index a75fff864850..000000000000
--- a/src/chrome/content/rules/IGN-problematic.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/IGN.xml b/src/chrome/content/rules/IGN.xml
index d40db0b4eb19..1e231ada7fd5 100644
--- a/src/chrome/content/rules/IGN.xml
+++ b/src/chrome/content/rules/IGN.xml
@@ -1,127 +1,69 @@
-
 
-
 
+
+	
+	
+	
 	
-	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+	
 	
+	
 	
 	
 	
+	
 	
+	
+	
+	
 	
-	
-		
-		
+	
+
+	
+	
+	
+	
+	
+	
+	
+
+
+	
 
 
-	
+	
 
+	
 
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/IGaming-mismatches.xml b/src/chrome/content/rules/IGaming-mismatches.xml
index 391482d1ca12..8819d0d05492 100644
--- a/src/chrome/content/rules/IGaming-mismatches.xml
+++ b/src/chrome/content/rules/IGaming-mismatches.xml
@@ -15,7 +15,7 @@
 	
 	
 	
-	
+	
 
 	
 	
diff --git a/src/chrome/content/rules/IGaming.xml b/src/chrome/content/rules/IGaming.xml
index f04a5d263805..d404408ba8dd 100644
--- a/src/chrome/content/rules/IGaming.xml
+++ b/src/chrome/content/rules/IGaming.xml
@@ -1,21 +1,20 @@
 
 
 	
-	
+	
+	
 	
 	
-	
-	
+	
+	
+	
 
-	
+	
 
 	
 
-	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/IGoDigital.com.xml b/src/chrome/content/rules/IGoDigital.com.xml
deleted file mode 100644
index d47b25b1fcf3..000000000000
--- a/src/chrome/content/rules/IGoDigital.com.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/IGrasp.xml b/src/chrome/content/rules/IGrasp.xml
index 255bfbd0b01a..31e04ccfe453 100644
--- a/src/chrome/content/rules/IGrasp.xml
+++ b/src/chrome/content/rules/IGrasp.xml
@@ -3,10 +3,10 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/IHG_Merlin.com.xml b/src/chrome/content/rules/IHG_Merlin.com.xml
index 084cb8aaf9ce..957377b3566d 100644
--- a/src/chrome/content/rules/IHG_Merlin.com.xml
+++ b/src/chrome/content/rules/IHG_Merlin.com.xml
@@ -29,7 +29,12 @@ Fetch error: http://ihgmerlin.com/ => https://ihgmerlin.com/: (60, 'SSL certific
 
 
 	
-	
+	
+	
+	
+	
+	
+	
 
 
 	
@@ -68,4 +70,5 @@
 	
 
+	
 
diff --git a/src/chrome/content/rules/IIPVV.nl.xml b/src/chrome/content/rules/IIPVV.nl.xml
index 9c98d2b9ab89..88b203e0eb40 100644
--- a/src/chrome/content/rules/IIPVV.nl.xml
+++ b/src/chrome/content/rules/IIPVV.nl.xml
@@ -5,7 +5,7 @@ Fetch error: http://iipvv.nl/ => https://iipvv.nl/: (51, "SSL: no alternative ce
 Fetch error: http://www.iipvv.nl/ => https://www.iipvv.nl/: (51, "SSL: no alternative certificate subject name matches target host name 'www.iipvv.nl'")
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/IIS.net.xml b/src/chrome/content/rules/IIS.net.xml
deleted file mode 100644
index fcc102e379e1..000000000000
--- a/src/chrome/content/rules/IIS.net.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/IISP.org.xml b/src/chrome/content/rules/IISP.org.xml
index b51bb7583150..b7bcf6666baa 100644
--- a/src/chrome/content/rules/IISP.org.xml
+++ b/src/chrome/content/rules/IISP.org.xml
@@ -11,13 +11,13 @@
 
 
 	
-	
+	
+	
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/IITBooks.co.in.xml b/src/chrome/content/rules/IITBooks.co.in.xml
new file mode 100644
index 000000000000..e197d058d18c
--- /dev/null
+++ b/src/chrome/content/rules/IITBooks.co.in.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/IJM_Freedom_Maker.xml b/src/chrome/content/rules/IJM_Freedom_Maker.xml
deleted file mode 100644
index 770c68cd4dbd..000000000000
--- a/src/chrome/content/rules/IJM_Freedom_Maker.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/IJReview.com-falsemixed.xml b/src/chrome/content/rules/IJReview.com-falsemixed.xml
deleted file mode 100644
index ec7be8d701a4..000000000000
--- a/src/chrome/content/rules/IJReview.com-falsemixed.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/IKSR.org.xml b/src/chrome/content/rules/IKSR.org.xml
new file mode 100644
index 000000000000..8a8075221f5d
--- /dev/null
+++ b/src/chrome/content/rules/IKSR.org.xml
@@ -0,0 +1,16 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/IKeepinCloud.com.xml b/src/chrome/content/rules/IKeepinCloud.com.xml
deleted file mode 100644
index c337b0d00992..000000000000
--- a/src/chrome/content/rules/IKeepinCloud.com.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/IKoruna.xml b/src/chrome/content/rules/IKoruna.xml
index 0e317b2de167..c4acffdd4f8b 100644
--- a/src/chrome/content/rules/IKoruna.xml
+++ b/src/chrome/content/rules/IKoruna.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://i-koruna.com/ => https://i-koruna.com/: (35, 'error:140770FC:SSL routines:SSL23_GET_SERVER_HELLO:unknown protocol')
 Fetch error: http://www.i-koruna.com/ => https://www.i-koruna.com/: (6, 'Could not resolve host: www.i-koruna.com')
 -->
-
+
 
 	
 	
@@ -19,4 +19,4 @@ Fetch error: http://www.i-koruna.com/ => https://www.i-koruna.com/: (6, 'Could n
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ILO.org.xml b/src/chrome/content/rules/ILO.org.xml
index 7d06a135c626..c058b669fb30 100644
--- a/src/chrome/content/rules/ILO.org.xml
+++ b/src/chrome/content/rules/ILO.org.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.ilo.org/ => https://www.ilo.org/: Cycle detected - URL already encountered: https://www.ilo.org/global/lang- -en/index.htm
 Fetch error: http://ilo.org/ => https://www.ilo.org/: Cycle detected - URL already encountered: https://www.ilo.org/global/lang- -en/index.htm
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/ILikeBigBits.com.xml b/src/chrome/content/rules/ILikeBigBits.com.xml
new file mode 100644
index 000000000000..9f3f7d71feaa
--- /dev/null
+++ b/src/chrome/content/rules/ILikeBigBits.com.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/ILogo.xml b/src/chrome/content/rules/ILogo.xml
index 55799d860690..85e356aabbf6 100644
--- a/src/chrome/content/rules/ILogo.xml
+++ b/src/chrome/content/rules/ILogo.xml
@@ -4,9 +4,9 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/IMDB.xml b/src/chrome/content/rules/IMDB.xml
index 5b6ce5e9af14..4678becbba54 100644
--- a/src/chrome/content/rules/IMDB.xml
+++ b/src/chrome/content/rules/IMDB.xml
@@ -24,20 +24,6 @@
 
 -->
 
-
-	
-	
-	
-		
-	
-	
-	
-	
-	
-		
-	
-		
-
 	
 		
 	
diff --git a/src/chrome/content/rules/IMGrind.com.xml b/src/chrome/content/rules/IMGrind.com.xml
index 3ab9db852333..823f2e7fbd8c 100644
--- a/src/chrome/content/rules/IMGrind.com.xml
+++ b/src/chrome/content/rules/IMGrind.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://www.imgrind.com/ => https://www.imgrind.com/: (28, 'Connecti
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/IMSLP.xml b/src/chrome/content/rules/IMSLP.xml
new file mode 100644
index 000000000000..79826f74d7ff
--- /dev/null
+++ b/src/chrome/content/rules/IMSLP.xml
@@ -0,0 +1,35 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+		
+
+	
+
diff --git a/src/chrome/content/rules/IMshopping.com.xml b/src/chrome/content/rules/IMshopping.com.xml
index ca02fd696a98..2c972b297cc9 100644
--- a/src/chrome/content/rules/IMshopping.com.xml
+++ b/src/chrome/content/rules/IMshopping.com.xml
@@ -1,28 +1,10 @@
 
 
+	
 
-	
-	
-
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/INDURE.xml b/src/chrome/content/rules/INDURE.xml
index e137496d5077..2ff45a4439ab 100644
--- a/src/chrome/content/rules/INDURE.xml
+++ b/src/chrome/content/rules/INDURE.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.indure.org/ => https://www.indure.org/: (51, "SSL: no al
 	!www doesn't exist.
 
 -->
-
+
 
 	
 
@@ -19,4 +19,4 @@ Fetch error: http://www.indure.org/ => https://www.indure.org/: (51, "SSL: no al
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/INFN.it.xml b/src/chrome/content/rules/INFN.it.xml
index 4878c9be09eb..289ce7c3d930 100644
--- a/src/chrome/content/rules/INFN.it.xml
+++ b/src/chrome/content/rules/INFN.it.xml
@@ -20,7 +20,7 @@ Fetch error: http://www.lnf.infn.it/ => https://www.lnf.infn.it/: Too many redir
 
 		- edu.lnf ¹
 		- scienzapertutti.lnf ¹
-		- w3.lnf ¹ 
+		- w3.lnf ¹
 
 		- sperimentando.lnl ³
 		- trasparenza ⁴
@@ -91,7 +91,7 @@ Fetch error: http://www.lnf.infn.it/ => https://www.lnf.infn.it/: Too many redir
 	* Secured by us
 
 -->
-
+
 
 	
 	
@@ -118,8 +118,8 @@ Fetch error: http://www.lnf.infn.it/ => https://www.lnf.infn.it/: Too many redir
 	
 	
 	
-	
-	
+
+
 	
 	
 	
diff --git a/src/chrome/content/rules/ING-Direct.xml b/src/chrome/content/rules/ING-Direct.xml
index fe7b243bbd56..7e1f0faf0156 100644
--- a/src/chrome/content/rules/ING-Direct.xml
+++ b/src/chrome/content/rules/ING-Direct.xml
@@ -10,10 +10,14 @@ Fetch error: http://ingdirect.com/ => https://www.ingdirect.com/: (60, 'SSL cert
 		- cafes.ingdirect.com	(cert: 217569-2.217569-2.com, self-signed; shows RHEL Apache test page)
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
+	
 	
 	
 
@@ -27,11 +31,10 @@ Fetch error: http://ingdirect.com/ => https://www.ingdirect.com/: (60, 'SSL cert
 	
 
-	
 
 	
 	
 
+	
 
diff --git a/src/chrome/content/rules/INYT.com.xml b/src/chrome/content/rules/INYT.com.xml
deleted file mode 100644
index db9046ece1b2..000000000000
--- a/src/chrome/content/rules/INYT.com.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-	
-		
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/INaturalist.org.xml b/src/chrome/content/rules/INaturalist.org.xml
index 71fb027e5158..76792e1c0b07 100644
--- a/src/chrome/content/rules/INaturalist.org.xml
+++ b/src/chrome/content/rules/INaturalist.org.xml
@@ -1,35 +1,29 @@
 
 
 
 	
-	
 	
-
+	
+	
+		
+	
 
 	
 
-
 	
 
-	
-
 	
 
diff --git a/src/chrome/content/rules/INet-Interactive.xml b/src/chrome/content/rules/INet-Interactive.xml
index b2312e93da21..a4a7b4d2fc0b 100644
--- a/src/chrome/content/rules/INet-Interactive.xml
+++ b/src/chrome/content/rules/INet-Interactive.xml
@@ -5,12 +5,10 @@ Fetch error: http://inetinteractive.com/ => https://inetinteractive.com/: (51, "
 
 	Other iNet Interactive rulesets:
 
-		- ABestWeb.com.xml
 		- AFCOM.com.xml
 		- DataCenterKnowledge.com.xml
 		- Data_Center_World.com.xml
 		- DBforums.xml
-		- Hosting_Catalog.com.xml
 		- HostingCon.xml
 		- Host_Voice.com.xml
 		- Hot_Scripts.com.xml
@@ -32,7 +30,7 @@ Fetch error: http://inetinteractive.com/ => https://inetinteractive.com/: (51, "
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/IOCCC.org.xml b/src/chrome/content/rules/IOCCC.org.xml
index c64d1b2ffd69..c5236f061fd3 100644
--- a/src/chrome/content/rules/IOCCC.org.xml
+++ b/src/chrome/content/rules/IOCCC.org.xml
@@ -1,17 +1,9 @@
-
-
+
 
+	
+	
 	
 
-
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/IOLProperty.co.za.xml b/src/chrome/content/rules/IOLProperty.co.za.xml
index 5734530bfaaf..f61222248f6d 100644
--- a/src/chrome/content/rules/IOLProperty.co.za.xml
+++ b/src/chrome/content/rules/IOLProperty.co.za.xml
@@ -23,4 +23,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ION-Audio.xml b/src/chrome/content/rules/ION-Audio.xml
deleted file mode 100644
index 65344619c750..000000000000
--- a/src/chrome/content/rules/ION-Audio.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/IONAudio.com.xml b/src/chrome/content/rules/IONAudio.com.xml
new file mode 100644
index 000000000000..a439e9d65052
--- /dev/null
+++ b/src/chrome/content/rules/IONAudio.com.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/IOPLEX_Software.xml b/src/chrome/content/rules/IOPLEX_Software.xml
index 9fc2268008f6..322860064544 100644
--- a/src/chrome/content/rules/IOPLEX_Software.xml
+++ b/src/chrome/content/rules/IOPLEX_Software.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/IOpus.com.xml b/src/chrome/content/rules/IOpus.com.xml
deleted file mode 100644
index 1f700e72fe41..000000000000
--- a/src/chrome/content/rules/IOpus.com.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/IPAC.global.xml b/src/chrome/content/rules/IPAC.global.xml
new file mode 100644
index 000000000000..9a9ea03ba9fa
--- /dev/null
+++ b/src/chrome/content/rules/IPAC.global.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+	
+  
+	
+
+	
+
diff --git a/src/chrome/content/rules/IPAddressLabs.com.xml b/src/chrome/content/rules/IPAddressLabs.com.xml
index e8a876f3355e..1cc11854a21e 100644
--- a/src/chrome/content/rules/IPAddressLabs.com.xml
+++ b/src/chrome/content/rules/IPAddressLabs.com.xml
@@ -11,10 +11,12 @@ Fetch error: http://ipaddresslabs.com/ => http://ipaddresslabs.com/: (6, 'Could
 	Some pages redirect to http.
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/IPQualityScore.com.xml b/src/chrome/content/rules/IPQualityScore.com.xml
index 88eb2723baf8..636ebf60594d 100644
--- a/src/chrome/content/rules/IPQualityScore.com.xml
+++ b/src/chrome/content/rules/IPQualityScore.com.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/IPR_Software.com.xml b/src/chrome/content/rules/IPR_Software.com.xml
index 07900d79bf77..03d3c822f38d 100644
--- a/src/chrome/content/rules/IPR_Software.com.xml
+++ b/src/chrome/content/rules/IPR_Software.com.xml
@@ -1,36 +1,16 @@
-
 
-
-
-	
+
 	
-	
-
-	
-	
-
-
-	
-	
-	
-	
-
-	
-
-
-	
+	
 
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/IPVanish.com.xml b/src/chrome/content/rules/IPVanish.com.xml
index cd7aeedc423b..f831a61fd28b 100644
--- a/src/chrome/content/rules/IPVanish.com.xml
+++ b/src/chrome/content/rules/IPVanish.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://forum.ipvanish.com/ => https://forum.ipvanish.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/IPXE.org.xml b/src/chrome/content/rules/IPXE.org.xml
index bb534c9312e0..3df97daaf0d0 100644
--- a/src/chrome/content/rules/IPXE.org.xml
+++ b/src/chrome/content/rules/IPXE.org.xml
@@ -35,4 +35,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/IP_check.xml b/src/chrome/content/rules/IP_check.xml
index 4233dbca9558..48328c54bd7b 100644
--- a/src/chrome/content/rules/IP_check.xml
+++ b/src/chrome/content/rules/IP_check.xml
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/IPredator.xml b/src/chrome/content/rules/IPredator.xml
index 7df9d83fe051..20d6c3371be7 100644
--- a/src/chrome/content/rules/IPredator.xml
+++ b/src/chrome/content/rules/IPredator.xml
@@ -12,7 +12,7 @@ Fetch error: http://beta.ipredator.se/ => https://beta.ipredator.se/: (7, 'Faile
 	³ Untrusted root
 
 -->
-
+
 
 	
 	
@@ -20,7 +20,7 @@ Fetch error: http://beta.ipredator.se/ => https://beta.ipredator.se/: (7, 'Faile
 	
 
 
-	
+	
 
 
 	 https://www.iproduction.com/: (60, 'SSL
 		- cdn	(403; mismatched, CN: *.pantherssl.com)
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
@@ -21,4 +22,4 @@ Fetch error: http://iproduction.com/ => https://www.iproduction.com/: (60, 'SSL
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/IPv6Forum.com.xml b/src/chrome/content/rules/IPv6Forum.com.xml
new file mode 100644
index 000000000000..535ffd6179e7
--- /dev/null
+++ b/src/chrome/content/rules/IPv6Forum.com.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/IPython.org.xml b/src/chrome/content/rules/IPython.org.xml
index a3fa213cfcdd..53e9c33ff6a2 100644
--- a/src/chrome/content/rules/IPython.org.xml
+++ b/src/chrome/content/rules/IPython.org.xml
@@ -15,7 +15,7 @@
 
 	
 	
-	
+
 	
 
 	
-
+
 
 	
 
diff --git a/src/chrome/content/rules/IRON_Search.xml b/src/chrome/content/rules/IRON_Search.xml
index 25f4820cc132..716ea4f5b316 100644
--- a/src/chrome/content/rules/IRON_Search.xml
+++ b/src/chrome/content/rules/IRON_Search.xml
@@ -13,16 +13,16 @@ Fetch error: http://ironsearch.com/ => https://www.ironsearch.com/: Cycle detect
 		- ^	(mismatched, CN: secure.ironsearch.com)
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/IRON_Solutions.xml b/src/chrome/content/rules/IRON_Solutions.xml
index d947eb607d11..3d53bb015a11 100644
--- a/src/chrome/content/rules/IRON_Solutions.xml
+++ b/src/chrome/content/rules/IRON_Solutions.xml
@@ -16,4 +16,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/IRTF.org.xml b/src/chrome/content/rules/IRTF.org.xml
deleted file mode 100644
index 79046903fcef..000000000000
--- a/src/chrome/content/rules/IRTF.org.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/ISC.xml b/src/chrome/content/rules/ISC.xml
index 6e2552d6de55..e1bc1bfd30a9 100644
--- a/src/chrome/content/rules/ISC.xml
+++ b/src/chrome/content/rules/ISC.xml
@@ -18,7 +18,7 @@ Fetch error: http://store.isc.org/ => https://store.isc.org/: (6, 'Could not res
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/ISC2_cares.org.xml b/src/chrome/content/rules/ISC2_cares.org.xml
index 526f9bce30fb..e5ee64f93415 100644
--- a/src/chrome/content/rules/ISC2_cares.org.xml
+++ b/src/chrome/content/rules/ISC2_cares.org.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.isc2cares.org/ => https://www.isc2cares.org/: (60, 'SSL
 	^: cert only matches www
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ISEC-Partners.xml b/src/chrome/content/rules/ISEC-Partners.xml
index 08efb34c5111..85858bc2070c 100644
--- a/src/chrome/content/rules/ISEC-Partners.xml
+++ b/src/chrome/content/rules/ISEC-Partners.xml
@@ -4,14 +4,14 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://labs.isecpartners.com/ => https://labs.isecpartners.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 
 	
 	
 	
 
 
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/ISOC.org.xml b/src/chrome/content/rules/ISOC.org.xml
index 1462c9d8973e..c65625c9e4f1 100644
--- a/src/chrome/content/rules/ISOC.org.xml
+++ b/src/chrome/content/rules/ISOC.org.xml
@@ -3,7 +3,7 @@
 Disabled by https-everywhere-checker because:
 Fetch error: http://ws.edu.isoc.org/ => https://ws.edu.isoc.org/: (60, 'SSL certificate problem: certificate has expired')
 
-	For other Internet Society overage, see Internet-Society.xml.
+	For other Internet Society overage, see InternetSociety.org.xml.
 
 
 	Insecure cookies are set for these hosts:
@@ -19,7 +19,7 @@ Fetch error: http://ws.edu.isoc.org/ => https://ws.edu.isoc.org/: (60, 'SSL cert
 	* Secure by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/IT-Agenten.xml b/src/chrome/content/rules/IT-Agenten.xml
index 6881d12abf94..490d28d0abaf 100644
--- a/src/chrome/content/rules/IT-Agenten.xml
+++ b/src/chrome/content/rules/IT-Agenten.xml
@@ -5,7 +5,7 @@ Fetch error: http://crm.it-agenten.com/ => https://crm.it-agenten.com/: (60, 'SS
 Fetch error: http://www.it-agenten.com/ => https://www.it-agenten.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.it-agenten.com'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/IT-Cube_Systems.xml b/src/chrome/content/rules/IT-Cube_Systems.xml
index 31e252a793de..14450b1a28ef 100644
--- a/src/chrome/content/rules/IT-Cube_Systems.xml
+++ b/src/chrome/content/rules/IT-Cube_Systems.xml
@@ -15,4 +15,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/IT-University-of-Copenhagen.xml b/src/chrome/content/rules/IT-University-of-Copenhagen.xml
index a3bca2f7b2b0..65dc1881cff1 100644
--- a/src/chrome/content/rules/IT-University-of-Copenhagen.xml
+++ b/src/chrome/content/rules/IT-University-of-Copenhagen.xml
@@ -1,13 +1,10 @@
-
-
+
 	
-	
-
-
-	
-
-
-	
+	
+	
+	
+	
+	
 
+	
 
diff --git a/src/chrome/content/rules/ITPC.xml b/src/chrome/content/rules/ITPC.xml
index 80fc29c6436b..e1aec87dd272 100644
--- a/src/chrome/content/rules/ITPC.xml
+++ b/src/chrome/content/rules/ITPC.xml
@@ -22,7 +22,7 @@
 					-->
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/ITSPA.org.uk.xml b/src/chrome/content/rules/ITSPA.org.uk.xml
index 7bd0dcf3d9a9..5b9861453b4d 100644
--- a/src/chrome/content/rules/ITSPA.org.uk.xml
+++ b/src/chrome/content/rules/ITSPA.org.uk.xml
@@ -19,7 +19,7 @@ Fetch error: http://www.itspa.org.uk/ => https://www.itspa.org.uk/: (60, 'SSL ce
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/ITU.xml b/src/chrome/content/rules/ITU.xml
index 4c9f1c4692ad..b9088656915a 100644
--- a/src/chrome/content/rules/ITU.xml
+++ b/src/chrome/content/rules/ITU.xml
@@ -13,7 +13,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
@@ -25,4 +27,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ITWeb.co.za.xml b/src/chrome/content/rules/ITWeb.co.za.xml
deleted file mode 100644
index f1d95b3180c3..000000000000
--- a/src/chrome/content/rules/ITWeb.co.za.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/IT_Toolbox.com.xml b/src/chrome/content/rules/IT_Toolbox.com.xml
index 7a1c86c218f6..4ef9f442ccfc 100644
--- a/src/chrome/content/rules/IT_Toolbox.com.xml
+++ b/src/chrome/content/rules/IT_Toolbox.com.xml
@@ -21,7 +21,8 @@
 -->
 
 
-	
+	
+	
 
 
 	
 
 
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/IUCNredlist.org.xml b/src/chrome/content/rules/IUCNredlist.org.xml
deleted file mode 100644
index 8074c7d4e8aa..000000000000
--- a/src/chrome/content/rules/IUCNredlist.org.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/IVPN.net.xml b/src/chrome/content/rules/IVPN.net.xml
index 2aafe5c1569b..f83e5e356fd9 100644
--- a/src/chrome/content/rules/IVPN.net.xml
+++ b/src/chrome/content/rules/IVPN.net.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://static.ivpn.net/ => https://static.ivpn.net/: (6, 'Could not resolve host: static.ivpn.net')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/IVW.xml b/src/chrome/content/rules/IVW.xml
index 78cb36c0fe26..c0959988202e 100644
--- a/src/chrome/content/rules/IVW.xml
+++ b/src/chrome/content/rules/IVW.xml
@@ -6,7 +6,7 @@
 		- www		(shows heft)
 
 	* Mismatched, CN: heft.ivw.eu
-	
+
 
 
 -->
@@ -20,4 +20,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/IWOWCase.xml b/src/chrome/content/rules/IWOWCase.xml
deleted file mode 100644
index 2791776fe87e..000000000000
--- a/src/chrome/content/rules/IWOWCase.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/IWPR.net.xml b/src/chrome/content/rules/IWPR.net.xml
new file mode 100644
index 000000000000..8907d3e7169a
--- /dev/null
+++ b/src/chrome/content/rules/IWPR.net.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/IWeb.com.xml b/src/chrome/content/rules/IWeb.com.xml
index 3b21a35092d2..5b5b021bbecf 100644
--- a/src/chrome/content/rules/IWeb.com.xml
+++ b/src/chrome/content/rules/IWeb.com.xml
@@ -4,7 +4,7 @@
 
 	Nonfunctional hosts in *iweb.com:
 
-		- blog 
+		- blog
 		- carrieres ²
 
 	¹ Redirects to http
diff --git a/src/chrome/content/rules/IWebReader.xml b/src/chrome/content/rules/IWebReader.xml
index ea9e1b111590..0ababfc262d6 100644
--- a/src/chrome/content/rules/IWebReader.xml
+++ b/src/chrome/content/rules/IWebReader.xml
@@ -13,13 +13,13 @@
 -->
 
 
-	
+	
+	
 
 
-	
 
 	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/IWouldDo.It.xml b/src/chrome/content/rules/IWouldDo.It.xml
index a8dec928196e..c7cbd3b5e151 100644
--- a/src/chrome/content/rules/IWouldDo.It.xml
+++ b/src/chrome/content/rules/IWouldDo.It.xml
@@ -12,7 +12,7 @@ Fetch error: http://iwoulddo.it/ => https://www.iwoulddo.it/: (60, 'SSL certific
 	* Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/IXI.xml b/src/chrome/content/rules/IXI.xml
index cff4ee45b529..c222abd4e932 100644
--- a/src/chrome/content/rules/IXI.xml
+++ b/src/chrome/content/rules/IXI.xml
@@ -6,7 +6,7 @@ Fetch error: http://s.ixiaa.com/ => https://s.ixiaa.com/: (60, 'SSL certificate
 	For problematic rules, see IXI-mismatches.xml.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/IXit.cz.xml b/src/chrome/content/rules/IXit.cz.xml
deleted file mode 100644
index 2f563f0f0944..000000000000
--- a/src/chrome/content/rules/IXit.cz.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/IYouPort.com.xml b/src/chrome/content/rules/IYouPort.com.xml
index a3e9388282b4..061be9291471 100644
--- a/src/chrome/content/rules/IYouPort.com.xml
+++ b/src/chrome/content/rules/IYouPort.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://iyouport.com/ => https://iyouport.com/: (28, 'Connection tim
 Fetch error: http://www.iyouport.com/ => https://www.iyouport.com/: (28, 'Connection timed out after 20000 milliseconds')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/I_Make_Things_Work.xml b/src/chrome/content/rules/I_Make_Things_Work.xml
index 3bf026f39e00..b3bfe3a7d594 100644
--- a/src/chrome/content/rules/I_Make_Things_Work.xml
+++ b/src/chrome/content/rules/I_Make_Things_Work.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/I_love_Freegle.org.xml b/src/chrome/content/rules/I_love_Freegle.org.xml
index 01cc701a2f4c..26595543fd66 100644
--- a/src/chrome/content/rules/I_love_Freegle.org.xml
+++ b/src/chrome/content/rules/I_love_Freegle.org.xml
@@ -25,7 +25,7 @@ Fetch error: http://shared.ilovefreegle.org/ => https://shared.ilovefreegle.org/
 			- mm from www.w3.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/I_love_blue_sea.com.xml b/src/chrome/content/rules/I_love_blue_sea.com.xml
index b7fa125eeaa0..6f74c3b321b0 100644
--- a/src/chrome/content/rules/I_love_blue_sea.com.xml
+++ b/src/chrome/content/rules/I_love_blue_sea.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://ilovebluesea.com/ => https://ilovebluesea.com/: (35, 'Unknow
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Iamnoone-solutions.net.xml b/src/chrome/content/rules/Iamnoone-solutions.net.xml
deleted file mode 100644
index e9b5b14e238e..000000000000
--- a/src/chrome/content/rules/Iamnoone-solutions.net.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Iberdrola.xml b/src/chrome/content/rules/Iberdrola.xml
index 90dbac591f8b..bcb94b97fd6a 100644
--- a/src/chrome/content/rules/Iberdrola.xml
+++ b/src/chrome/content/rules/Iberdrola.xml
@@ -12,7 +12,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Iberia.xml b/src/chrome/content/rules/Iberia.xml
index c49fa02d1b2b..2fb302ee83b8 100644
--- a/src/chrome/content/rules/Iberia.xml
+++ b/src/chrome/content/rules/Iberia.xml
@@ -6,10 +6,10 @@ Fetch error: http://iberia.com/ => https://iberia.com/: (60, 'SSL certificate pr
 Disabled by https-everywhere-checker because:
 Fetch error: http://iberia.com/ => https://iberia.com/: (28, 'Operation timed out after 0 milliseconds with 0 out of 0 bytes received')
 -->
-
+
   
   
-  
+
   
   
 
diff --git a/src/chrome/content/rules/Iberiabank.xml b/src/chrome/content/rules/Iberiabank.xml
index 8600b9fbc680..80f5ff9f42bd 100644
--- a/src/chrome/content/rules/Iberiabank.xml
+++ b/src/chrome/content/rules/Iberiabank.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ibibo.com.xml b/src/chrome/content/rules/Ibibo.com.xml
index aa1e9b5171d2..1ad8813ac98f 100644
--- a/src/chrome/content/rules/Ibibo.com.xml
+++ b/src/chrome/content/rules/Ibibo.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://ads.ibibo.com/ => https://ads.ibibo.com/: (6, 'Could not res
 	* Refused
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Ibiza-Rocks.xml b/src/chrome/content/rules/Ibiza-Rocks.xml
index e42baff1f72b..2a89657faeac 100644
--- a/src/chrome/content/rules/Ibiza-Rocks.xml
+++ b/src/chrome/content/rules/Ibiza-Rocks.xml
@@ -5,13 +5,13 @@ Fetch error: http://bookings.ibizarocks.com/ => https://bookings.ibizarocks.com/
 Fetch error: http://mrh.ibizarocks.com/ => https://mrh.ibizarocks.com/: (6, 'Could not resolve host: mrh.ibizarocks.com')
 
 -->
-
+
 
 	
 	
 
 
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Ibqonline.com.xml b/src/chrome/content/rules/Ibqonline.com.xml
deleted file mode 100644
index 3803aee65615..000000000000
--- a/src/chrome/content/rules/Ibqonline.com.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Ibs.sberbank.sk.xml b/src/chrome/content/rules/Ibs.sberbank.sk.xml
deleted file mode 100644
index fa1df68f72a2..000000000000
--- a/src/chrome/content/rules/Ibs.sberbank.sk.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-  
-
-  
-
diff --git a/src/chrome/content/rules/Ic-live.com.xml b/src/chrome/content/rules/Ic-live.com.xml
deleted file mode 100644
index 4ab3343cb2c4..000000000000
--- a/src/chrome/content/rules/Ic-live.com.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Ice-WM.org.xml b/src/chrome/content/rules/Ice-WM.org.xml
new file mode 100644
index 000000000000..c13ef2439a9b
--- /dev/null
+++ b/src/chrome/content/rules/Ice-WM.org.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+
+	
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/IceDivX.com.xml b/src/chrome/content/rules/IceDivX.com.xml
deleted file mode 100644
index 36af4287c52a..000000000000
--- a/src/chrome/content/rules/IceDivX.com.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/IceFilms.info.xml b/src/chrome/content/rules/IceFilms.info.xml
deleted file mode 100644
index bbda466de389..000000000000
--- a/src/chrome/content/rules/IceFilms.info.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-		
-
-
-	
-	
-	
-	
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/IceWarp.com.xml b/src/chrome/content/rules/IceWarp.com.xml
index 9f3afbcb0663..923a36552644 100644
--- a/src/chrome/content/rules/IceWarp.com.xml
+++ b/src/chrome/content/rules/IceWarp.com.xml
@@ -50,7 +50,7 @@ Fetch error: http://www.icewarp.com/ => https://www.icewarp.com/: (60, 'SSL cert
 	² Unsecurable <= refused
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Icecast.org.xml b/src/chrome/content/rules/Icecast.org.xml
new file mode 100644
index 000000000000..b1337b88b089
--- /dev/null
+++ b/src/chrome/content/rules/Icecast.org.xml
@@ -0,0 +1,28 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Icecat.xml b/src/chrome/content/rules/Icecat.xml
index 92c2dc676d65..30b69a6ae35e 100644
--- a/src/chrome/content/rules/Icecat.xml
+++ b/src/chrome/content/rules/Icecat.xml
@@ -33,7 +33,7 @@
 		- www.icecat.biz
 		- .www.icecat.biz
 
-		Off due to continuous reloading as reported in 
+		Off due to continuous reloading as reported in
 		https://github.com/EFForg/https-everywhere/issues/1711
 -->
 
diff --git a/src/chrome/content/rules/Ichijinsha.co.jp.xml b/src/chrome/content/rules/Ichijinsha.co.jp.xml
new file mode 100644
index 000000000000..994da8c61d82
--- /dev/null
+++ b/src/chrome/content/rules/Ichijinsha.co.jp.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Iciciprulife.com.xml b/src/chrome/content/rules/Iciciprulife.com.xml
index bcdb4a96e5c5..cacbd1a3ee91 100644
--- a/src/chrome/content/rules/Iciciprulife.com.xml
+++ b/src/chrome/content/rules/Iciciprulife.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://documents.iciciprulife.com/ => https://documents.iciciprulif
 		clickpss.iciciprulife.com
 -->
 
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Icinga.xml b/src/chrome/content/rules/Icinga.xml
index 6fced327a45b..674017e0af23 100644
--- a/src/chrome/content/rules/Icinga.xml
+++ b/src/chrome/content/rules/Icinga.xml
@@ -1,20 +1,41 @@
 
 
 
 	
-	
-
-
-	
-
-
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+	
+
+
+	
+	
 
 
diff --git a/src/chrome/content/rules/Icio.us.xml b/src/chrome/content/rules/Icio.us.xml
index 31fcceed47ba..964596f40968 100644
--- a/src/chrome/content/rules/Icio.us.xml
+++ b/src/chrome/content/rules/Icio.us.xml
@@ -37,7 +37,7 @@ Fetch error: http://images.del.icio.us/ => https://api.del.icio.us/: (60, 'SSL c
 	* See https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Icony.xml b/src/chrome/content/rules/Icony.xml
index c3fef162302a..4be72bdf7a2e 100644
--- a/src/chrome/content/rules/Icony.xml
+++ b/src/chrome/content/rules/Icony.xml
@@ -5,7 +5,7 @@ Fetch error: http://flirt.icony.com/ => https://flirt.icony.com/: (6, 'Could not
 Fetch error: http://jira.icony.com/ => https://jira.icony.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 		
 	
diff --git a/src/chrome/content/rules/Icsdelivery.com.xml b/src/chrome/content/rules/Icsdelivery.com.xml
index 0b6a139b4282..ab6562f09ecb 100644
--- a/src/chrome/content/rules/Icsdelivery.com.xml
+++ b/src/chrome/content/rules/Icsdelivery.com.xml
@@ -13,7 +13,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -22,7 +23,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Ida2at.com.xml b/src/chrome/content/rules/Ida2at.com.xml
new file mode 100644
index 000000000000..bfe9f1e4dd94
--- /dev/null
+++ b/src/chrome/content/rules/Ida2at.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/IdeaFit.com.xml b/src/chrome/content/rules/IdeaFit.com.xml
new file mode 100644
index 000000000000..3cee8789d130
--- /dev/null
+++ b/src/chrome/content/rules/IdeaFit.com.xml
@@ -0,0 +1,21 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Idea_Fit.com.xml b/src/chrome/content/rules/Idea_Fit.com.xml
deleted file mode 100644
index 7961771ded0a..000000000000
--- a/src/chrome/content/rules/Idea_Fit.com.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-	
-	
-		
-		
-		
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Idea_Stations.org.xml b/src/chrome/content/rules/Idea_Stations.org.xml
index 8007dd8315ff..460e7b6c05cb 100644
--- a/src/chrome/content/rules/Idea_Stations.org.xml
+++ b/src/chrome/content/rules/Idea_Stations.org.xml
@@ -1,50 +1,6 @@
-
-
-
-
-	
+
 	
 	
 
-	
-	
-
-		
-		
-		
-		
-
-			
-			
-			
-			
-
-			
-			
-			
-
-
-	
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/Idea_Storm.com.xml b/src/chrome/content/rules/Idea_Storm.com.xml
deleted file mode 100644
index e97ac5118eeb..000000000000
--- a/src/chrome/content/rules/Idea_Storm.com.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
-
diff --git a/src/chrome/content/rules/Idealo.com.xml b/src/chrome/content/rules/Idealo.com.xml
index 13fb0fad5412..1b7c1839427a 100644
--- a/src/chrome/content/rules/Idealo.com.xml
+++ b/src/chrome/content/rules/Idealo.com.xml
@@ -36,7 +36,7 @@
 					-->
 	
 
-	
+	
 
 
 	 https://support.ideel.com/: (7, 'Faile
 		- www.ideel.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Ideenw3rk.de.xml b/src/chrome/content/rules/Ideenw3rk.de.xml
new file mode 100644
index 000000000000..4aa1ff515d50
--- /dev/null
+++ b/src/chrome/content/rules/Ideenw3rk.de.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Idefi.xml b/src/chrome/content/rules/Idefi.xml
index 532913ff8510..fdea14b3eeee 100644
--- a/src/chrome/content/rules/Idefi.xml
+++ b/src/chrome/content/rules/Idefi.xml
@@ -11,7 +11,7 @@ Fetch error: http://idefimusic.com/ => https://idefimusic.com/: (28, 'Connection
 		- production-idefi.s3.amazonaws.com
 
 -->
-
+
 
 	
 	
@@ -22,4 +22,4 @@ Fetch error: http://idefimusic.com/ => https://idefimusic.com/: (28, 'Connection
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Idefix.xml b/src/chrome/content/rules/Idefix.xml
index ec8c2848541e..aacb4b4245b1 100644
--- a/src/chrome/content/rules/Idefix.xml
+++ b/src/chrome/content/rules/Idefix.xml
@@ -5,7 +5,7 @@ Fetch error: http://www.idefix.com/ => https://www.idefix.com/: Too many redirec
 Fetch error: http://idefix.com/ => https://www.idefix.com/: Too many redirects while fetching 'https://www.idefix.com/'
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Identica.xml b/src/chrome/content/rules/Identica.xml
index 2dab4ab0e1e0..1077fe83914e 100644
--- a/src/chrome/content/rules/Identica.xml
+++ b/src/chrome/content/rules/Identica.xml
@@ -7,7 +7,7 @@ Fetch error: http://files.status.net/ => https://files.status.net/: (6, 'Could n
 Disabled by https-everywhere-checker because:
 Fetch error: http://files.status.net/ => https://files.status.net/: (28, 'Connection timed out after 10001 milliseconds')
 -->
-
+
   
   
   
@@ -19,7 +19,7 @@ Fetch error: http://files.status.net/ => https://files.status.net/: (28, 'Connec
 	        to="https://identi.ca/"/>
   
-  
   
diff --git a/src/chrome/content/rules/IdentityTheft.xml b/src/chrome/content/rules/IdentityTheft.xml
index 4cb3482d99b8..ee783898faef 100644
--- a/src/chrome/content/rules/IdentityTheft.xml
+++ b/src/chrome/content/rules/IdentityTheft.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://identitytheft.org.uk/ => https://www.identitytheft.org.uk/: (7, 'Failed to connect to www.identitytheft.org.uk port 443: Connection refused')
 Fetch error: http://www.identitytheft.org.uk/ => https://www.identitytheft.org.uk/: (7, 'Failed to connect to www.identitytheft.org.uk port 443: Connection refused')
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Identity_Workshop.eu.xml b/src/chrome/content/rules/Identity_Workshop.eu.xml
index 3e74f68bb184..65e48132ef74 100644
--- a/src/chrome/content/rules/Identity_Workshop.eu.xml
+++ b/src/chrome/content/rules/Identity_Workshop.eu.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.identityworkshop.eu/ => https://www.identityworkshop.eu/
 		- www.identityworkshop.eu
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/IdeoClick.com.xml b/src/chrome/content/rules/IdeoClick.com.xml
index 1150b6419a5b..442302be1ff1 100644
--- a/src/chrome/content/rules/IdeoClick.com.xml
+++ b/src/chrome/content/rules/IdeoClick.com.xml
@@ -6,7 +6,6 @@ Fetch error: http://www.ideoclick.com/ => https://www.ideoclick.com/: (60, 'SSL
 
 	Other IdeoClick rulesets:
 
-		- Demand-driver.com.xml
 
 
 	Insecure cookies are set for these hosts:
@@ -22,7 +21,7 @@ Fetch error: http://www.ideoclick.com/ => https://www.ideoclick.com/: (60, 'SSL
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Ideone.com.xml b/src/chrome/content/rules/Ideone.com.xml
index 48fc6ada5c0b..90bb40035208 100644
--- a/src/chrome/content/rules/Ideone.com.xml
+++ b/src/chrome/content/rules/Ideone.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://okta6.ideone.com/ => https://okta6.ideone.com/: (28, 'Connec
 		- www.ideone.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Idevelop.ro.xml b/src/chrome/content/rules/Idevelop.ro.xml
index 54319a1d0729..081fceeacfe3 100644
--- a/src/chrome/content/rules/Idevelop.ro.xml
+++ b/src/chrome/content/rules/Idevelop.ro.xml
@@ -4,7 +4,7 @@ Cloudflare SSL
 
     
     
-	
+
     
 
diff --git a/src/chrome/content/rules/Idris-lang.org.xml b/src/chrome/content/rules/Idris-lang.org.xml
index 4495bb52b83c..7daef3aa2f50 100644
--- a/src/chrome/content/rules/Idris-lang.org.xml
+++ b/src/chrome/content/rules/Idris-lang.org.xml
@@ -1,12 +1,10 @@
 
 
 	
 	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Iemoji.com.xml b/src/chrome/content/rules/Iemoji.com.xml
new file mode 100644
index 000000000000..e0b7cf816a54
--- /dev/null
+++ b/src/chrome/content/rules/Iemoji.com.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/IgHome.com.xml b/src/chrome/content/rules/IgHome.com.xml
index 7a4d2cc116ea..e813864e0d4f 100644
--- a/src/chrome/content/rules/IgHome.com.xml
+++ b/src/chrome/content/rules/IgHome.com.xml
@@ -16,7 +16,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -25,7 +26,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Igalia-self-signed.xml b/src/chrome/content/rules/Igalia-self-signed.xml
index 05a49ce92e4a..46028669a441 100644
--- a/src/chrome/content/rules/Igalia-self-signed.xml
+++ b/src/chrome/content/rules/Igalia-self-signed.xml
@@ -1,12 +1,12 @@
 
 
-	
+	
+	
 		
 		
 
 	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Igalia.xml b/src/chrome/content/rules/Igalia.xml
index 63a0f79eb0af..726d9e2c8bb3 100644
--- a/src/chrome/content/rules/Igalia.xml
+++ b/src/chrome/content/rules/Igalia.xml
@@ -18,7 +18,7 @@ Fetch error: http://labs.igalia.com/ => https://labs.igalia.com/: (6, 'Could not
 	² Works, self-signed
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/IiBuy.com.au.xml b/src/chrome/content/rules/IiBuy.com.au.xml
index 0346e61918db..1f0a78e661a7 100644
--- a/src/chrome/content/rules/IiBuy.com.au.xml
+++ b/src/chrome/content/rules/IiBuy.com.au.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/IiNet.net.au.xml b/src/chrome/content/rules/IiNet.net.au.xml
index fa0af2f84024..363360b5b11b 100644
--- a/src/chrome/content/rules/IiNet.net.au.xml
+++ b/src/chrome/content/rules/IiNet.net.au.xml
@@ -37,7 +37,13 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
+			
 			
 			
 			
diff --git a/src/chrome/content/rules/Iki.fi.xml b/src/chrome/content/rules/Iki.fi.xml
index 7f372e0cc645..02d75315f08f 100644
--- a/src/chrome/content/rules/Iki.fi.xml
+++ b/src/chrome/content/rules/Iki.fi.xml
@@ -1,17 +1,7 @@
+
+	
+	
+	
 
-
-
-  
-  
-  
-
-  
-  
+	
 
diff --git a/src/chrome/content/rules/Ikoula.com.xml b/src/chrome/content/rules/Ikoula.com.xml
index db4aa3ea2472..e06f48bb3258 100644
--- a/src/chrome/content/rules/Ikoula.com.xml
+++ b/src/chrome/content/rules/Ikoula.com.xml
@@ -5,8 +5,6 @@ Fetch error: http://livehelpvm01.ikoula.com/ => https://livehelpvm01.ikoula.com/
 
 	Other Ikoula rulesets:
 
-		- Ex10.biz.xml
-		- IKeepinCloud.com.xml
 
 
 	Insecure cookies are set for these domains:
@@ -14,7 +12,7 @@ Fetch error: http://livehelpvm01.ikoula.com/ => https://livehelpvm01.ikoula.com/
 		- .ikoula.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Iljmp.com.xml b/src/chrome/content/rules/Iljmp.com.xml
index 4de4581f5716..06fe9c8030bc 100644
--- a/src/chrome/content/rules/Iljmp.com.xml
+++ b/src/chrome/content/rules/Iljmp.com.xml
@@ -9,16 +9,16 @@ Fetch error: http://iljmp.com/ => https://iljmp.com/: (51, "SSL: no alternative
 	Web bugs.
 
 -->
-
+
 
 	
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Illinois_Department_of_Financial_and_Professional_Regulation.xml b/src/chrome/content/rules/Illinois_Department_of_Financial_and_Professional_Regulation.xml
index 21579f94ef45..f1196e489b7a 100644
--- a/src/chrome/content/rules/Illinois_Department_of_Financial_and_Professional_Regulation.xml
+++ b/src/chrome/content/rules/Illinois_Department_of_Financial_and_Professional_Regulation.xml
@@ -16,4 +16,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Illuminated_Pots.xml b/src/chrome/content/rules/Illuminated_Pots.xml
deleted file mode 100644
index df80fadd84ac..000000000000
--- a/src/chrome/content/rules/Illuminated_Pots.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Imag.fr.xml b/src/chrome/content/rules/Imag.fr.xml
index e48482dd8ad6..b6220509cb84 100644
--- a/src/chrome/content/rules/Imag.fr.xml
+++ b/src/chrome/content/rules/Imag.fr.xml
@@ -65,7 +65,13 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
+	
+	
 		
@@ -75,7 +81,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/ImageMagick.xml b/src/chrome/content/rules/ImageMagick.xml
index 5aeb23def1f4..e88bac6ca4b7 100644
--- a/src/chrome/content/rules/ImageMagick.xml
+++ b/src/chrome/content/rules/ImageMagick.xml
@@ -1,21 +1,27 @@
 
-
-
+
 	
 	
-
+	
+	
+	
 
 	
 
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/ImageShack.xml b/src/chrome/content/rules/ImageShack.xml
index 5957eae9985e..be664b5d78a0 100644
--- a/src/chrome/content/rules/ImageShack.xml
+++ b/src/chrome/content/rules/ImageShack.xml
@@ -19,7 +19,7 @@
 	
 		
 		
-			
+		
 		
 		
 		
diff --git a/src/chrome/content/rules/ImageTwist.com.xml b/src/chrome/content/rules/ImageTwist.com.xml
new file mode 100644
index 000000000000..30df5cce63e5
--- /dev/null
+++ b/src/chrome/content/rules/ImageTwist.com.xml
@@ -0,0 +1,13 @@
+
+	
+	
+
+		
+		
+		
+		
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Imageforensic.org.xml b/src/chrome/content/rules/Imageforensic.org.xml
index 246335f69326..7eb8caa163f1 100644
--- a/src/chrome/content/rules/Imageforensic.org.xml
+++ b/src/chrome/content/rules/Imageforensic.org.xml
@@ -1,4 +1,4 @@
-
 
diff --git a/src/chrome/content/rules/Images-Amazon.com.xml b/src/chrome/content/rules/Images-Amazon.com.xml
index 56e4f8efefa2..06dc0696199b 100644
--- a/src/chrome/content/rules/Images-Amazon.com.xml
+++ b/src/chrome/content/rules/Images-Amazon.com.xml
@@ -7,7 +7,7 @@
 		ec8.images-amazon.com
 		ecx.images-amazon.com
 		g-ecx.images-amazon.com
-	
+
 	Time out:
 		ec1.images-amazon.com
 		ec3.images-amazon.com
@@ -30,7 +30,7 @@
 
 	
-		
+
 		
 
 	
-
-
-	
-
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/ImagesBN.com.xml b/src/chrome/content/rules/ImagesBN.com.xml
index 7a8e494f4b5a..05df96d4389e 100644
--- a/src/chrome/content/rules/ImagesBN.com.xml
+++ b/src/chrome/content/rules/ImagesBN.com.xml
@@ -13,7 +13,11 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
 
 
 	
-	
 
+	
 
diff --git a/src/chrome/content/rules/Imagestash.xml b/src/chrome/content/rules/Imagestash.xml
index 863f3332932e..5ae18b293175 100644
--- a/src/chrome/content/rules/Imagestash.xml
+++ b/src/chrome/content/rules/Imagestash.xml
@@ -5,7 +5,7 @@ Fetch error: http://imagestash.org/ => https://imagestash.org/: (60, 'SSL certif
 Fetch error: http://www.imagestash.org/ => https://www.imagestash.org/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.imagestash.org/ => https://www.imagestash.org/: (60, 'SS
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Imaging-resource.com.xml b/src/chrome/content/rules/Imaging-resource.com.xml
new file mode 100644
index 000000000000..02a24e10ba55
--- /dev/null
+++ b/src/chrome/content/rules/Imaging-resource.com.xml
@@ -0,0 +1,12 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ImamReza.net.xml b/src/chrome/content/rules/ImamReza.net.xml
new file mode 100644
index 000000000000..9a4d656392e5
--- /dev/null
+++ b/src/chrome/content/rules/ImamReza.net.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Imation.com.xml b/src/chrome/content/rules/Imation.com.xml
index 5e61196af3dc..248b394e1fe3 100644
--- a/src/chrome/content/rules/Imation.com.xml
+++ b/src/chrome/content/rules/Imation.com.xml
@@ -14,7 +14,7 @@ Fetch error: http://support.imation.com/ => https://support.imation.com/: (60, '
 		- support
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Imerys.com.xml b/src/chrome/content/rules/Imerys.com.xml
index 7dbe1a78c322..49f1293299f9 100644
--- a/src/chrome/content/rules/Imerys.com.xml
+++ b/src/chrome/content/rules/Imerys.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://www.imerys.com/ => https://www.imerys.com/: (60, 'SSL certif
 	² Not secured by us <= mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Imfimg.com.xml b/src/chrome/content/rules/Imfimg.com.xml
deleted file mode 100644
index 43c81c7c78af..000000000000
--- a/src/chrome/content/rules/Imfimg.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/ImgTC.com.xml b/src/chrome/content/rules/ImgTC.com.xml
deleted file mode 100644
index 513aababa310..000000000000
--- a/src/chrome/content/rules/ImgTC.com.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	
-	
-	
-		
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Imgflip.com.xml b/src/chrome/content/rules/Imgflip.com.xml
index cc7d82f29a0b..eac3861b52e2 100644
--- a/src/chrome/content/rules/Imgflip.com.xml
+++ b/src/chrome/content/rules/Imgflip.com.xml
@@ -1,7 +1,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
-
+
 
 	
diff --git a/src/chrome/content/rules/Imgs_Mail.ru.xml b/src/chrome/content/rules/Imgs_Mail.ru.xml
index 2aac54edccc0..db130d5d4426 100644
--- a/src/chrome/content/rules/Imgs_Mail.ru.xml
+++ b/src/chrome/content/rules/Imgs_Mail.ru.xml
@@ -61,9 +61,10 @@
 		
 		
 		
-		
 		
 		
+		
+		
 		
 		
 		
diff --git a/src/chrome/content/rules/Imgur.com.xml b/src/chrome/content/rules/Imgur.com.xml
new file mode 100644
index 000000000000..8deee9ccfd5c
--- /dev/null
+++ b/src/chrome/content/rules/Imgur.com.xml
@@ -0,0 +1,43 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Imgur.xml b/src/chrome/content/rules/Imgur.xml
deleted file mode 100644
index 7c8ecbffb2e3..000000000000
--- a/src/chrome/content/rules/Imgur.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-	
-	
-
-		
-		
-		
-		
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Imgurp.com.xml b/src/chrome/content/rules/Imgurp.com.xml
new file mode 100644
index 000000000000..68d3aeb756d5
--- /dev/null
+++ b/src/chrome/content/rules/Imgurp.com.xml
@@ -0,0 +1,15 @@
+
+	
+	
+	
+	
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Imine.co.xml b/src/chrome/content/rules/Imine.co.xml
deleted file mode 100644
index f3b2f3783b41..000000000000
--- a/src/chrome/content/rules/Imine.co.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Iminent.com.xml b/src/chrome/content/rules/Iminent.com.xml
index 28a872bd3c8e..38ee3b66a5a8 100644
--- a/src/chrome/content/rules/Iminent.com.xml
+++ b/src/chrome/content/rules/Iminent.com.xml
@@ -27,4 +27,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ImmobilienScout24.xml b/src/chrome/content/rules/ImmobilienScout24.xml
index ca7fef428571..b5ade85ab59e 100644
--- a/src/chrome/content/rules/ImmobilienScout24.xml
+++ b/src/chrome/content/rules/ImmobilienScout24.xml
@@ -2,24 +2,24 @@
 
 
-
+
 
 	
 	
@@ -43,7 +43,7 @@ Fetch error: http://service.immobilienscout24.de/ => https://service.immobiliens
 
 	
-		
+
 	
 
diff --git a/src/chrome/content/rules/Immunicity.org.xml b/src/chrome/content/rules/Immunicity.org.xml
deleted file mode 100644
index 8c89979732da..000000000000
--- a/src/chrome/content/rules/Immunicity.org.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/ImpAct.xml b/src/chrome/content/rules/ImpAct.xml
index 2989cefa98e0..8caf36d2c703 100644
--- a/src/chrome/content/rules/ImpAct.xml
+++ b/src/chrome/content/rules/ImpAct.xml
@@ -32,7 +32,12 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
+	
 
 
 	
@@ -40,10 +45,6 @@
 
 	
-	
+	
 
-	
-
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Impactstory.org.xml b/src/chrome/content/rules/Impactstory.org.xml
index c92ed067896c..9e88bdfe3d16 100644
--- a/src/chrome/content/rules/Impactstory.org.xml
+++ b/src/chrome/content/rules/Impactstory.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.impactstory.org/ => https://www.impactstory.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.impactstory.org'")
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Imperative_Ideas.com.xml b/src/chrome/content/rules/Imperative_Ideas.com.xml
deleted file mode 100644
index dca9fb1f4636..000000000000
--- a/src/chrome/content/rules/Imperative_Ideas.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Imperial-College-London-Union.xml b/src/chrome/content/rules/Imperial-College-London-Union.xml
index e2ef5db3ff3a..46d2b578c14a 100644
--- a/src/chrome/content/rules/Imperial-College-London-Union.xml
+++ b/src/chrome/content/rules/Imperial-College-London-Union.xml
@@ -1,5 +1,5 @@
 
 
diff --git a/src/chrome/content/rules/Imperial-College-London.xml b/src/chrome/content/rules/Imperial-College-London.xml
index 5b28240f6ead..8614debf62a9 100644
--- a/src/chrome/content/rules/Imperial-College-London.xml
+++ b/src/chrome/content/rules/Imperial-College-London.xml
@@ -1,28 +1,48 @@
-
 
-
-
-	
+
 	
-	
-
-
-	
-
-	
-	
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
 
diff --git a/src/chrome/content/rules/ImperialViolet.org.xml b/src/chrome/content/rules/ImperialViolet.org.xml
index dee3784616fa..3355065957fe 100644
--- a/src/chrome/content/rules/ImperialViolet.org.xml
+++ b/src/chrome/content/rules/ImperialViolet.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://pond.imperialviolet.org/ => https://pond.imperialviolet.org/: (6, 'Could not resolve host: pond.imperialviolet.org')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ImprintMusic.ca.xml b/src/chrome/content/rules/ImprintMusic.ca.xml
new file mode 100644
index 000000000000..a584e7cc102a
--- /dev/null
+++ b/src/chrome/content/rules/ImprintMusic.ca.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ImprovedTube.com.xml b/src/chrome/content/rules/ImprovedTube.com.xml
new file mode 100644
index 000000000000..4855322fb6e9
--- /dev/null
+++ b/src/chrome/content/rules/ImprovedTube.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Improvely.com.xml b/src/chrome/content/rules/Improvely.com.xml
index 666d9ab5dc9e..0b6ed259e090 100644
--- a/src/chrome/content/rules/Improvely.com.xml
+++ b/src/chrome/content/rules/Improvely.com.xml
@@ -13,4 +13,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Impulse.net.xml b/src/chrome/content/rules/Impulse.net.xml
index b6a4de7b98c6..286b5b545f2b 100644
--- a/src/chrome/content/rules/Impulse.net.xml
+++ b/src/chrome/content/rules/Impulse.net.xml
@@ -29,7 +29,7 @@ Fetch error: http://impulse.net/ => https://impulse.net/: (51, "SSL: no alternat
 	platform should be removed with Ffx 24.
 
 -->
-
+
 
 	
 	
@@ -41,4 +41,4 @@ Fetch error: http://impulse.net/ => https://impulse.net/: (51, "SSL: no alternat
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Impulsedriven.com.xml b/src/chrome/content/rules/Impulsedriven.com.xml
deleted file mode 100644
index c669e91ad80d..000000000000
--- a/src/chrome/content/rules/Impulsedriven.com.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/In-Disguise.com.xml b/src/chrome/content/rules/In-Disguise.com.xml
index f6f501952493..2af263e4ae57 100644
--- a/src/chrome/content/rules/In-Disguise.com.xml
+++ b/src/chrome/content/rules/In-Disguise.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.vpnincome.com/ => https://www.vpnincome.com/: (28, 'Conn
 		- (www.)wpnincome.com
 
 -->
-
+
 
 	
 	
@@ -29,6 +29,6 @@ Fetch error: http://www.vpnincome.com/ => https://www.vpnincome.com/: (28, 'Conn
 
 	
-	
+
 
 
diff --git a/src/chrome/content/rules/In-Q-Tel.xml b/src/chrome/content/rules/In-Q-Tel.xml
index 6e4eb12c818e..bc58b49bdf26 100644
--- a/src/chrome/content/rules/In-Q-Tel.xml
+++ b/src/chrome/content/rules/In-Q-Tel.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.iqt.org/ => https://www.iqt.org/: (60, 'SSL certificate
 		- ^	(cert only matches www)
 
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://www.iqt.org/ => https://www.iqt.org/: (60, 'SSL certificate
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/InCloak.com.xml b/src/chrome/content/rules/InCloak.com.xml
index 24fbe751eaa8..3d253c51f5c3 100644
--- a/src/chrome/content/rules/InCloak.com.xml
+++ b/src/chrome/content/rules/InCloak.com.xml
@@ -13,4 +13,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/InCommon.xml b/src/chrome/content/rules/InCommon.xml
index 590360c63078..77db79176606 100644
--- a/src/chrome/content/rules/InCommon.xml
+++ b/src/chrome/content/rules/InCommon.xml
@@ -9,19 +9,19 @@ Fetch error: http://incommonfederation.org/ => https://incommonfederation.org/:
 		- wayf2.incommonfederation.org	(mismatched, CN: wayf.incommonfederation.org)
 
 -->
-
+
 
 	
 	
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
 
 	
@@ -29,4 +29,5 @@ Fetch error: http://incommonfederation.org/ => https://incommonfederation.org/:
 	
 
+	
 
diff --git a/src/chrome/content/rules/InSided.xml b/src/chrome/content/rules/InSided.xml
index b104af50ac69..f77d68da15c7 100644
--- a/src/chrome/content/rules/InSided.xml
+++ b/src/chrome/content/rules/InSided.xml
@@ -9,7 +9,7 @@ Fetch error: http://static.insided.nl/ => https://static.insided.nl/: (28, 'Conn
 		- www
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Inapub.co.uk.xml b/src/chrome/content/rules/Inapub.co.uk.xml
index 48fd054229ef..2b2ee0b05f88 100644
--- a/src/chrome/content/rules/Inapub.co.uk.xml
+++ b/src/chrome/content/rules/Inapub.co.uk.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/InboxApp.com.xml b/src/chrome/content/rules/InboxApp.com.xml
index 1348facaed9f..cab4f070d386 100644
--- a/src/chrome/content/rules/InboxApp.com.xml
+++ b/src/chrome/content/rules/InboxApp.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://inboxapp.com/ => https://inboxapp.com/: (60, 'SSL certificat
 Fetch error: http://www.inboxapp.com/ => https://www.inboxapp.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Inburke.com.xml b/src/chrome/content/rules/Inburke.com.xml
index 2975307b8a5f..782d18dc15c0 100644
--- a/src/chrome/content/rules/Inburke.com.xml
+++ b/src/chrome/content/rules/Inburke.com.xml
@@ -10,7 +10,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
-
-
-	
-	
-	
-	
-
-
-	
-
-	
-
-
-
diff --git a/src/chrome/content/rules/Inc.com.xml b/src/chrome/content/rules/Inc.com.xml
index 230441359672..c21d59217628 100644
--- a/src/chrome/content/rules/Inc.com.xml
+++ b/src/chrome/content/rules/Inc.com.xml
@@ -1,68 +1,19 @@
 
-
-
+
 	
-	
-		
-		
-		
-
+	
+	
+	
+	
 
-	
-	
-	
-
-	
-
-
-	
-
-	
+	
 
+	
 
-
diff --git a/src/chrome/content/rules/Incisive_Media.xml b/src/chrome/content/rules/Incisive_Media.xml
index 62d22b114471..4f99c66782b2 100644
--- a/src/chrome/content/rules/Incisive_Media.xml
+++ b/src/chrome/content/rules/Incisive_Media.xml
@@ -18,10 +18,12 @@ Fetch error: http://incisivemedia.com/ => https://secure.incisivemedia.com/: (60
 	* Mismatched, CN: secure.incisivemedia.com
 
 -->
-
+
 
 	
-	
+	
+	
+	
 	
 
 
diff --git a/src/chrome/content/rules/IncludeOS.org.xml b/src/chrome/content/rules/IncludeOS.org.xml
new file mode 100644
index 000000000000..9e3e9ada2912
--- /dev/null
+++ b/src/chrome/content/rules/IncludeOS.org.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Incoin.io.xml b/src/chrome/content/rules/Incoin.io.xml
index ceb01b92b107..148a21f4b7eb 100644
--- a/src/chrome/content/rules/Incoin.io.xml
+++ b/src/chrome/content/rules/Incoin.io.xml
@@ -17,7 +17,7 @@ Fetch error: http://www.incoin.io/ => https://www.incoin.io/: (28, 'Connection t
 		- www.beta.incoin.io
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Indaba_Music.com.xml b/src/chrome/content/rules/Indaba_Music.com.xml
index abf3cfeea7e1..7e07495f9459 100644
--- a/src/chrome/content/rules/Indaba_Music.com.xml
+++ b/src/chrome/content/rules/Indaba_Music.com.xml
@@ -21,13 +21,13 @@
 
 
 	
-	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Indeed.co.uk.xml b/src/chrome/content/rules/Indeed.co.uk.xml
new file mode 100644
index 000000000000..af357a2d71d1
--- /dev/null
+++ b/src/chrome/content/rules/Indeed.co.uk.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Independent-Centre-for-Privacy-Protection-Schleswig-Holstein.xml b/src/chrome/content/rules/Independent-Centre-for-Privacy-Protection-Schleswig-Holstein.xml
deleted file mode 100644
index 67867c7b2418..000000000000
--- a/src/chrome/content/rules/Independent-Centre-for-Privacy-Protection-Schleswig-Holstein.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Independent_News.xml b/src/chrome/content/rules/Independent_News.xml
index 380425de2cfc..f5fd5d03f822 100644
--- a/src/chrome/content/rules/Independent_News.xml
+++ b/src/chrome/content/rules/Independent_News.xml
@@ -15,4 +15,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Indepnet.net.xml b/src/chrome/content/rules/Indepnet.net.xml
index a70dbb9341ed..7d979f44f147 100644
--- a/src/chrome/content/rules/Indepnet.net.xml
+++ b/src/chrome/content/rules/Indepnet.net.xml
@@ -38,7 +38,7 @@ Fetch error: http://forge.indepnet.net/ => https://forge.indepnet.net/: (28, 'Co
 	* Secured by us
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Index_on_Censorship.org.xml b/src/chrome/content/rules/Index_on_Censorship.org.xml
index 11bb978d2581..863db4b497d0 100644
--- a/src/chrome/content/rules/Index_on_Censorship.org.xml
+++ b/src/chrome/content/rules/Index_on_Censorship.org.xml
@@ -15,7 +15,7 @@ Fetch error: http://awards.indexoncensorship.org/ => https://awards.indexoncenso
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/India.com.xml b/src/chrome/content/rules/India.com.xml
index 93e90a0434e6..37ebd31d9842 100644
--- a/src/chrome/content/rules/India.com.xml
+++ b/src/chrome/content/rules/India.com.xml
@@ -1,44 +1,36 @@
 
-
-
-	
+
+	
+	
+	
+	
+	
 	
-
-
-	
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
 
diff --git a/src/chrome/content/rules/IndiaMART.xml b/src/chrome/content/rules/IndiaMART.xml
index e7e4f56faba9..e9327d48def0 100644
--- a/src/chrome/content/rules/IndiaMART.xml
+++ b/src/chrome/content/rules/IndiaMART.xml
@@ -33,23 +33,13 @@
 -->
 
 
-	
+	
+	
+	
+	
 	
 
 
-	
+	
 
-	
-
-	
-
-	
-
-	
-
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Indiana-University.xml b/src/chrome/content/rules/Indiana-University.xml
index 1ff40f83655b..bf6aba3e2d6b 100644
--- a/src/chrome/content/rules/Indiana-University.xml
+++ b/src/chrome/content/rules/Indiana-University.xml
@@ -92,7 +92,7 @@ Fetch error: http://osl.iu.edu/ => https://www.osl.iu.edu/: (51, "SSL: no altern
 	² Unsecurable <= refused
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Indiana.edu.xml b/src/chrome/content/rules/Indiana.edu.xml
index 7d1d12522e0f..e4b779daa85e 100644
--- a/src/chrome/content/rules/Indiana.edu.xml
+++ b/src/chrome/content/rules/Indiana.edu.xml
@@ -16,6 +16,11 @@
 
 	
 	
+		
+		
+			
+			
+			
 	
 	
 	
diff --git a/src/chrome/content/rules/IndianaCourts.us.xml b/src/chrome/content/rules/IndianaCourts.us.xml
new file mode 100644
index 000000000000..06dda1e529d4
--- /dev/null
+++ b/src/chrome/content/rules/IndianaCourts.us.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Indiana_State_University.xml b/src/chrome/content/rules/Indiana_State_University.xml
index 75b8700279bd..ce41a5dc5d37 100644
--- a/src/chrome/content/rules/Indiana_State_University.xml
+++ b/src/chrome/content/rules/Indiana_State_University.xml
@@ -1,30 +1,16 @@
 
 
+	
+	
+	
+	
 
-	
-		
-
-
-	
-
-
-	
-
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Indianapolis_Star.xml b/src/chrome/content/rules/Indianapolis_Star.xml
index ba5797d230bf..bc0b08588957 100644
--- a/src/chrome/content/rules/Indianapolis_Star.xml
+++ b/src/chrome/content/rules/Indianapolis_Star.xml
@@ -14,7 +14,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/IndieHackers.com.xml b/src/chrome/content/rules/IndieHackers.com.xml
new file mode 100644
index 000000000000..45b0d92872dd
--- /dev/null
+++ b/src/chrome/content/rules/IndieHackers.com.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/IndieMerch.xml b/src/chrome/content/rules/IndieMerch.xml
index 42e591a9e73e..324bb08c7cdb 100644
--- a/src/chrome/content/rules/IndieMerch.xml
+++ b/src/chrome/content/rules/IndieMerch.xml
@@ -13,7 +13,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
@@ -22,7 +24,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/IndieMerchandising.xml b/src/chrome/content/rules/IndieMerchandising.xml
index d15c2672b46d..26fb9dabaa48 100644
--- a/src/chrome/content/rules/IndieMerchandising.xml
+++ b/src/chrome/content/rules/IndieMerchandising.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Induction_Solutions.com-falsemixed.xml b/src/chrome/content/rules/Induction_Solutions.com-falsemixed.xml
deleted file mode 100644
index a695bfc4566d..000000000000
--- a/src/chrome/content/rules/Induction_Solutions.com-falsemixed.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-		
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Induction_Solutions.com.xml b/src/chrome/content/rules/Induction_Solutions.com.xml
deleted file mode 100644
index 023b35d78a55..000000000000
--- a/src/chrome/content/rules/Induction_Solutions.com.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-	
-	
-		
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/IndusGuard.xml b/src/chrome/content/rules/IndusGuard.xml
deleted file mode 100644
index cb794406ac77..000000000000
--- a/src/chrome/content/rules/IndusGuard.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Indymedia.xml b/src/chrome/content/rules/Indymedia.xml
index 0198d3f8f3f9..009c13416504 100644
--- a/src/chrome/content/rules/Indymedia.xml
+++ b/src/chrome/content/rules/Indymedia.xml
@@ -1,264 +1,101 @@
 
-
-
-	
+
 	
+	
+	
+	
+	
 	
-	
+	
+	
 	
-	
 	
-	
-	
-	
+	
+	
 	
 	
-	
+	
 	
-	
-	
-	
-	
-	
-	
-	
-
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
+	
+	
 
-			
-			
-			
-			
-
-		
-		
-		
-
-	
-	
-
-
-	
-	
-	
-	
-	
-	
-
-	
-
-
-	
-
-	
-
-	
-
-
-
+	
 
+	
 
diff --git a/src/chrome/content/rules/InfNX.xml b/src/chrome/content/rules/InfNX.xml
deleted file mode 100644
index eeadfd58846c..000000000000
--- a/src/chrome/content/rules/InfNX.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-	
-
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Infamous.xml b/src/chrome/content/rules/Infamous.xml
deleted file mode 100644
index c2f7e5bf174e..000000000000
--- a/src/chrome/content/rules/Infamous.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Infinet.com.au.xml b/src/chrome/content/rules/Infinet.com.au.xml
index d2a5eed24d32..a2036db63d7e 100644
--- a/src/chrome/content/rules/Infinet.com.au.xml
+++ b/src/chrome/content/rules/Infinet.com.au.xml
@@ -21,7 +21,8 @@ Fetch error: http://support.infinet.com.au/ => https://support.infinet.com.au/:
 
 
 	
-	
+	
+	
 	
 		
 		
-	
-	
+
 		
@@ -42,7 +42,6 @@ Fetch error: http://support.infinet.com.au/ => https://support.infinet.com.au/:
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/InfiniteDescent.xyz.xml b/src/chrome/content/rules/InfiniteDescent.xyz.xml
new file mode 100644
index 000000000000..ec0afe016575
--- /dev/null
+++ b/src/chrome/content/rules/InfiniteDescent.xyz.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/InfinityDev.org.xml b/src/chrome/content/rules/InfinityDev.org.xml
deleted file mode 100644
index a5ce5f4cf4f0..000000000000
--- a/src/chrome/content/rules/InfinityDev.org.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Infinity_Tracking.xml b/src/chrome/content/rules/Infinity_Tracking.xml
index c93e9f1deb5e..51750f86877a 100644
--- a/src/chrome/content/rules/Infinity_Tracking.xml
+++ b/src/chrome/content/rules/Infinity_Tracking.xml
@@ -24,4 +24,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Infinow.net.xml b/src/chrome/content/rules/Infinow.net.xml
deleted file mode 100644
index 62e1aab9f3b8..000000000000
--- a/src/chrome/content/rules/Infinow.net.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-	
-	
-
diff --git a/src/chrome/content/rules/InfluAds.xml b/src/chrome/content/rules/InfluAds.xml
deleted file mode 100644
index b620099697dc..000000000000
--- a/src/chrome/content/rules/InfluAds.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Influencers_Conference.xml b/src/chrome/content/rules/Influencers_Conference.xml
deleted file mode 100644
index 8f604074a0c5..000000000000
--- a/src/chrome/content/rules/Influencers_Conference.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/InfoJobs.net.xml b/src/chrome/content/rules/InfoJobs.net.xml
index bc8c343bf1e1..f8b9377ab774 100644
--- a/src/chrome/content/rules/InfoJobs.net.xml
+++ b/src/chrome/content/rules/InfoJobs.net.xml
@@ -40,7 +40,13 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/InfoWar.com.xml b/src/chrome/content/rules/InfoWar.com.xml
index c63fb0c3c86f..d51d61b57c1e 100644
--- a/src/chrome/content/rules/InfoWar.com.xml
+++ b/src/chrome/content/rules/InfoWar.com.xml
@@ -18,7 +18,7 @@
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Infocube.xml b/src/chrome/content/rules/Infocube.xml
index b8d435d19935..d8ed849d4497 100644
--- a/src/chrome/content/rules/Infocube.xml
+++ b/src/chrome/content/rules/Infocube.xml
@@ -6,7 +6,7 @@ Fetch error: http://ogt.jp/ => https://ogt.jp/: (7, 'Failed to connect to ogt.jp
 Automatically by https-everywhere-checker because:
 Fetch error: http://ogt.jp/ => https://ogt.jp/: (28, 'Connection timed out after 10000 milliseconds')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Infogroup.xml b/src/chrome/content/rules/Infogroup.xml
index cdf695befe34..8ab1931c8d72 100644
--- a/src/chrome/content/rules/Infogroup.xml
+++ b/src/chrome/content/rules/Infogroup.xml
@@ -35,7 +35,7 @@ Fetch error: http://shared.sub.infousa.com/ => https://shared.sub.infousa.com/:
 		- .link.p0.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Infolinks.xml b/src/chrome/content/rules/Infolinks.xml
index b2fea8e8ace6..eba64aeb8c93 100644
--- a/src/chrome/content/rules/Infolinks.xml
+++ b/src/chrome/content/rules/Infolinks.xml
@@ -48,14 +48,23 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 		
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Infopaginas.xml b/src/chrome/content/rules/Infopaginas.xml
index a6ace957367a..d043308d606b 100644
--- a/src/chrome/content/rules/Infopaginas.xml
+++ b/src/chrome/content/rules/Infopaginas.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/InformIT.com.xml b/src/chrome/content/rules/InformIT.com.xml
new file mode 100644
index 000000000000..4fde352b4160
--- /dev/null
+++ b/src/chrome/content/rules/InformIT.com.xml
@@ -0,0 +1,38 @@
+
+
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/InformIT.xml b/src/chrome/content/rules/InformIT.xml
deleted file mode 100644
index e7c92f44ab6a..000000000000
--- a/src/chrome/content/rules/InformIT.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Informa.xml b/src/chrome/content/rules/Informa.xml
index b4979f4717a4..ddc7aad4ef79 100644
--- a/src/chrome/content/rules/Informa.xml
+++ b/src/chrome/content/rules/Informa.xml
@@ -15,7 +15,7 @@ Fetch error: http://garlandscience.com/ => https://www.garlandscience.com/: (60,
 		- Informa_Healthcare.xml
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Informa_Healthcare-problematic.xml b/src/chrome/content/rules/Informa_Healthcare-problematic.xml
index 3f7f46135dc9..05046046a519 100644
--- a/src/chrome/content/rules/Informa_Healthcare-problematic.xml
+++ b/src/chrome/content/rules/Informa_Healthcare-problematic.xml
@@ -13,4 +13,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Informa_Healthcare.xml b/src/chrome/content/rules/Informa_Healthcare.xml
index 5a9927fe4aa4..990f49a6a004 100644
--- a/src/chrome/content/rules/Informa_Healthcare.xml
+++ b/src/chrome/content/rules/Informa_Healthcare.xml
@@ -40,7 +40,7 @@ Fetch error: http://www.informahealthcare.com/templates/jsp/style.css => https:/
 		- (www.)informahealthcare.com		(most pages redirect to http)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Informatick.net.xml b/src/chrome/content/rules/Informatick.net.xml
index 3cafc1ca602a..e030065da7a1 100644
--- a/src/chrome/content/rules/Informatick.net.xml
+++ b/src/chrome/content/rules/Informatick.net.xml
@@ -10,7 +10,7 @@ Fetch error: http://informatick.com/ => https://informatick.com/: (60, 'SSL cert
 Fetch error: http://www.informatick.com/ => https://www.informatick.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 Fetch error: http://informatick.net/ => https://informatick.net/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/InformationWeek.xml b/src/chrome/content/rules/InformationWeek.xml
index 33bfe7041469..3cf088f12b8b 100644
--- a/src/chrome/content/rules/InformationWeek.xml
+++ b/src/chrome/content/rules/InformationWeek.xml
@@ -46,7 +46,7 @@ Non-2xx HTTP code: http://webinar.informationweek.com/ (200) => https://webinar.
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Infoworld.com.xml b/src/chrome/content/rules/Infoworld.com.xml
index 8b164356ac7a..8f517dda25e2 100644
--- a/src/chrome/content/rules/Infoworld.com.xml
+++ b/src/chrome/content/rules/Infoworld.com.xml
@@ -20,10 +20,11 @@ Fetch error: http://infoworld.com/ => https://www.infoworld.com/: (28, 'Connecti
 		- m	(mismatched, CN: *.mobify.com)
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Infra-Furth.xml b/src/chrome/content/rules/Infra-Furth.xml
index 5752e8ab13b8..7388fdf01a5c 100644
--- a/src/chrome/content/rules/Infra-Furth.xml
+++ b/src/chrome/content/rules/Infra-Furth.xml
@@ -6,7 +6,6 @@
 
 
 
-
 
 
 
diff --git a/src/chrome/content/rules/Infradead.org.xml b/src/chrome/content/rules/Infradead.org.xml
index fe12cfd9785d..1d44a93ad6c6 100644
--- a/src/chrome/content/rules/Infradead.org.xml
+++ b/src/chrome/content/rules/Infradead.org.xml
@@ -1,8 +1,4 @@
-
 
-
+
 	
-	
 	
 	
 	
-	
 	
-	
 	
+	
 
 	
 	
diff --git a/src/chrome/content/rules/Infused-Systems.xml b/src/chrome/content/rules/Infused-Systems.xml
index 24bb97a4a9ac..a40689e8c070 100644
--- a/src/chrome/content/rules/Infused-Systems.xml
+++ b/src/chrome/content/rules/Infused-Systems.xml
@@ -9,7 +9,7 @@
 		- 2012.infusioncon.com
 		- help(center).infusionsoft.com
 		- marketplace.infusionsoft.com
--->	
+-->
 
 
 	
@@ -20,9 +20,7 @@
 	
 		
 
-
-	
-	
+	
 
 
 	
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Ingress.xml b/src/chrome/content/rules/Ingress.xml
index 3e53e09bfe9c..de566426be52 100644
--- a/src/chrome/content/rules/Ingress.xml
+++ b/src/chrome/content/rules/Ingress.xml
@@ -10,4 +10,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Inhabitat.com.xml b/src/chrome/content/rules/Inhabitat.com.xml
new file mode 100644
index 000000000000..af0638b75109
--- /dev/null
+++ b/src/chrome/content/rules/Inhabitat.com.xml
@@ -0,0 +1,21 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Init7.xml b/src/chrome/content/rules/Init7.xml
index d595429efd1f..2b5e35a2c3b5 100644
--- a/src/chrome/content/rules/Init7.xml
+++ b/src/chrome/content/rules/Init7.xml
@@ -16,27 +16,54 @@
 		- notomys.init7.net
 
 	Incomplete cert chain:
-		- enoc.init7.net
+		- rt.init7.net
 		- wc.init7.net
+		- webmail.init7.net
+
+	No 2xx response:
+		- kanban.init7.net
 
 	User-controlled subdomains (*.fiber7.init7.net) not covered here.
 
 -->
 
 
-
 	
 	
 
 	
 	
 
+	
+	
+
 	
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 	
 	
 
+	
+
+	
+
 	
 
diff --git a/src/chrome/content/rules/InkFrog.com.xml b/src/chrome/content/rules/InkFrog.com.xml
index 0bcfadc4ce8d..4e02f7aadc80 100644
--- a/src/chrome/content/rules/InkFrog.com.xml
+++ b/src/chrome/content/rules/InkFrog.com.xml
@@ -16,7 +16,7 @@
 		- img ¹
 		- imgs ²
 		- thmb ¹
-		- thumbnails ²
+		- thumbnails (expired)
 
 	¹ Works, expired 2013-04-24
 	² Cloudfront
@@ -36,22 +36,14 @@
 -->
 
 
+	
 	
-	
+	
 
 
 	
 
 
-	
-
-	
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Inkbunny.xml b/src/chrome/content/rules/Inkbunny.xml
deleted file mode 100644
index afa09d67caf1..000000000000
--- a/src/chrome/content/rules/Inkbunny.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-  
-  
-
-  
-
-  
-
diff --git a/src/chrome/content/rules/Inmoment.com.xml b/src/chrome/content/rules/Inmoment.com.xml
new file mode 100644
index 000000000000..fd3c1f52f759
--- /dev/null
+++ b/src/chrome/content/rules/Inmoment.com.xml
@@ -0,0 +1,23 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Innocence_Project.xml b/src/chrome/content/rules/Innocence_Project.xml
index e7b21d3bb329..3b67bcacbd0d 100644
--- a/src/chrome/content/rules/Innocence_Project.xml
+++ b/src/chrome/content/rules/Innocence_Project.xml
@@ -14,4 +14,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Innometrics.com.xml b/src/chrome/content/rules/Innometrics.com.xml
index 076fcce8dbe4..4e6127b843c4 100644
--- a/src/chrome/content/rules/Innometrics.com.xml
+++ b/src/chrome/content/rules/Innometrics.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://customer.innometrics.com/ => https://customer.innometrics.co
 		- (www.)	(refused)
 
 -->
-
+
 
 	
 
@@ -23,4 +23,4 @@ Fetch error: http://customer.innometrics.com/ => https://customer.innometrics.co
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/InoReader.com.xml b/src/chrome/content/rules/InoReader.com.xml
deleted file mode 100644
index da4ce7bbda38..000000000000
--- a/src/chrome/content/rules/InoReader.com.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-    
-    
-    
-    
-
-    
-
-    
-
diff --git a/src/chrome/content/rules/Inphi.xml b/src/chrome/content/rules/Inphi.xml
deleted file mode 100644
index 1f1a8fb8e9cb..000000000000
--- a/src/chrome/content/rules/Inphi.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Inpros.net.xml b/src/chrome/content/rules/Inpros.net.xml
index 4c923298ee50..815d0132ffee 100644
--- a/src/chrome/content/rules/Inpros.net.xml
+++ b/src/chrome/content/rules/Inpros.net.xml
@@ -17,7 +17,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/InsideUniversal.xml b/src/chrome/content/rules/InsideUniversal.xml
new file mode 100644
index 000000000000..4af74f25dfb9
--- /dev/null
+++ b/src/chrome/content/rules/InsideUniversal.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Inside_Illinois.info.xml b/src/chrome/content/rules/Inside_Illinois.info.xml
index 8649c6fc1136..c10ed979f62d 100644
--- a/src/chrome/content/rules/Inside_Illinois.info.xml
+++ b/src/chrome/content/rules/Inside_Illinois.info.xml
@@ -6,7 +6,7 @@ Fetch error: http://insideillinois.info/ => https://insideillinois.info/: (28, '
 	www.insideillinois.info doesn't exist.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Insidecelebs.com.xml b/src/chrome/content/rules/Insidecelebs.com.xml
deleted file mode 100644
index f9dab335e658..000000000000
--- a/src/chrome/content/rules/Insidecelebs.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Insideygs.com.xml b/src/chrome/content/rules/Insideygs.com.xml
index e7a0d474ae9f..03ac0b3ab0ac 100644
--- a/src/chrome/content/rules/Insideygs.com.xml
+++ b/src/chrome/content/rules/Insideygs.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.insideygs.com/ => https://www.insideygs.com/: (28, 'Conn
 		- adintegration.insideygs.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/InsightExpress.com.xml b/src/chrome/content/rules/InsightExpress.com.xml
index 1b856d3fd5bf..1c97e39bcdbb 100644
--- a/src/chrome/content/rules/InsightExpress.com.xml
+++ b/src/chrome/content/rules/InsightExpress.com.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/InsightExpressai.com.xml b/src/chrome/content/rules/InsightExpressai.com.xml
index 3b0a8229b35c..d6f131c3aa98 100644
--- a/src/chrome/content/rules/InsightExpressai.com.xml
+++ b/src/chrome/content/rules/InsightExpressai.com.xml
@@ -21,7 +21,7 @@ Fetch error: http://icompass.insightexpressai.com/ => https://icompass.insightex
 		- .insightexpressai.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Insnw.net.xml b/src/chrome/content/rules/Insnw.net.xml
index 6d57e3768bbe..3b6e2e7d9b5f 100644
--- a/src/chrome/content/rules/Insnw.net.xml
+++ b/src/chrome/content/rules/Insnw.net.xml
@@ -1,5 +1,5 @@
 
 
diff --git a/src/chrome/content/rules/Inspectlet.com.xml b/src/chrome/content/rules/Inspectlet.com.xml
index afdca2a91326..24e9d82e3e22 100644
--- a/src/chrome/content/rules/Inspectlet.com.xml
+++ b/src/chrome/content/rules/Inspectlet.com.xml
@@ -20,7 +20,7 @@
 	
 		
 		
-	
+
 	
 
 	
diff --git a/src/chrome/content/rules/Inspiration_Green.xml b/src/chrome/content/rules/Inspiration_Green.xml
deleted file mode 100644
index 50c4cb843f71..000000000000
--- a/src/chrome/content/rules/Inspiration_Green.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Instaemail.net.xml b/src/chrome/content/rules/Instaemail.net.xml
deleted file mode 100644
index 74cab9ff7a36..000000000000
--- a/src/chrome/content/rules/Instaemail.net.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Instagr.am.xml b/src/chrome/content/rules/Instagr.am.xml
index 89cb1ac309d9..aa6b1d2e5c72 100644
--- a/src/chrome/content/rules/Instagr.am.xml
+++ b/src/chrome/content/rules/Instagr.am.xml
@@ -1,26 +1,13 @@
 
-
+
 
-	
 	
+	
 
-
-	
-
-	
-	
+	
 
 
diff --git a/src/chrome/content/rules/Instagram.xml b/src/chrome/content/rules/Instagram.xml
deleted file mode 100644
index 27f181727750..000000000000
--- a/src/chrome/content/rules/Instagram.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-
-
-	
-	
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Instagrampartners.com.xml b/src/chrome/content/rules/Instagrampartners.com.xml
index 4efe39ea1bce..3960ba09479b 100644
--- a/src/chrome/content/rules/Instagrampartners.com.xml
+++ b/src/chrome/content/rules/Instagrampartners.com.xml
@@ -1,5 +1,5 @@
 
 
 	
diff --git a/src/chrome/content/rules/Instantbird.org.xml b/src/chrome/content/rules/Instantbird.org.xml
index b82d32e95ce7..f5f828d65d2e 100644
--- a/src/chrome/content/rules/Instantbird.org.xml
+++ b/src/chrome/content/rules/Instantbird.org.xml
@@ -28,7 +28,7 @@ Fetch error: http://wiki.instantbird.org/ => https://wiki.instantbird.org/: (60,
 		- bugzilla.instantbird.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Instart_Logic.com.xml b/src/chrome/content/rules/Instart_Logic.com.xml
deleted file mode 100644
index 9890c76ab6d3..000000000000
--- a/src/chrome/content/rules/Instart_Logic.com.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Instella_Platform.xml b/src/chrome/content/rules/Instella_Platform.xml
deleted file mode 100644
index 36704a639335..000000000000
--- a/src/chrome/content/rules/Instella_Platform.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Institut_fur_Internet-Sicherheit.xml b/src/chrome/content/rules/Institut_fur_Internet-Sicherheit.xml
index b2e5fc16d297..0f8def95aa8b 100644
--- a/src/chrome/content/rules/Institut_fur_Internet-Sicherheit.xml
+++ b/src/chrome/content/rules/Institut_fur_Internet-Sicherheit.xml
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Institute-of-Physics.xml b/src/chrome/content/rules/Institute-of-Physics.xml
index 6f7db2bb5c37..63a371de1a9b 100644
--- a/src/chrome/content/rules/Institute-of-Physics.xml
+++ b/src/chrome/content/rules/Institute-of-Physics.xml
@@ -43,7 +43,7 @@ Fetch error: http://iopscience.iop.org/ => https://iopscience.iop.org/: (28, 'Op
 	ᵐ Rule disabled by default <= mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Instogram.pro.xml b/src/chrome/content/rules/Instogram.pro.xml
new file mode 100644
index 000000000000..1201f79c2dea
--- /dev/null
+++ b/src/chrome/content/rules/Instogram.pro.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Instra.xml b/src/chrome/content/rules/Instra.xml
index 6382389e5440..72715f9597f3 100644
--- a/src/chrome/content/rules/Instra.xml
+++ b/src/chrome/content/rules/Instra.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Intan.net.xml b/src/chrome/content/rules/Intan.net.xml
deleted file mode 100644
index b8a879bed63a..000000000000
--- a/src/chrome/content/rules/Intan.net.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Integral-Marketing.com.xml b/src/chrome/content/rules/Integral-Marketing.com.xml
deleted file mode 100644
index 64e712e236fe..000000000000
--- a/src/chrome/content/rules/Integral-Marketing.com.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Intel-mismatches.xml b/src/chrome/content/rules/Intel-mismatches.xml
deleted file mode 100644
index 45a19e73e7c4..000000000000
--- a/src/chrome/content/rules/Intel-mismatches.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-	
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Intel.co.uk.xml b/src/chrome/content/rules/Intel.co.uk.xml
index 830f5c1f6474..403545b018ba 100644
--- a/src/chrome/content/rules/Intel.co.uk.xml
+++ b/src/chrome/content/rules/Intel.co.uk.xml
@@ -1,35 +1,13 @@
 
 
-
 	
-		
-		
-
+	
 
 	
-
 
diff --git a/src/chrome/content/rules/Intel.xml b/src/chrome/content/rules/Intel.xml
index 5d2fa937bdf5..472b81cc59e5 100644
--- a/src/chrome/content/rules/Intel.xml
+++ b/src/chrome/content/rules/Intel.xml
@@ -1,239 +1,70 @@
 
 
-
-	
+	
+	
 	
 	
-	
 	
 	
 	
 	
 	
+		
 	
 	
 	
-	
-	
+	
+		
+	
 	
-	
-	
 	
+	
+		
+	
 	
 	
-	
+	
+	
+	
 	
-	
-
-	
-	
-	
-	
-	
-
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-			
-			
-
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-	
-
-	
-
-	
-	
-
-		
-		
-		
-		
-
-	
-
-	
-	
-
-		
-
-	
-
-		
 
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/Intelexit.org.xml b/src/chrome/content/rules/Intelexit.org.xml
deleted file mode 100644
index 511472844da7..000000000000
--- a/src/chrome/content/rules/Intelexit.org.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Inteligo.pl.xml b/src/chrome/content/rules/Inteligo.pl.xml
new file mode 100644
index 000000000000..2ad3cc8dfd53
--- /dev/null
+++ b/src/chrome/content/rules/Inteligo.pl.xml
@@ -0,0 +1,35 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/Intelli-direct.com.xml b/src/chrome/content/rules/Intelli-direct.com.xml
index 5cc667642c2f..f9b50200d82b 100644
--- a/src/chrome/content/rules/Intelli-direct.com.xml
+++ b/src/chrome/content/rules/Intelli-direct.com.xml
@@ -16,4 +16,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/IntelliResponse.com.xml b/src/chrome/content/rules/IntelliResponse.com.xml
new file mode 100644
index 000000000000..df319d0abb96
--- /dev/null
+++ b/src/chrome/content/rules/IntelliResponse.com.xml
@@ -0,0 +1,108 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Intelligent_Exploit.com.xml b/src/chrome/content/rules/Intelligent_Exploit.com.xml
deleted file mode 100644
index e938de7e48fb..000000000000
--- a/src/chrome/content/rules/Intelligent_Exploit.com.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Intelliserver.net.xml b/src/chrome/content/rules/Intelliserver.net.xml
index e1ff49450c70..80bafe09ad0c 100644
--- a/src/chrome/content/rules/Intelliserver.net.xml
+++ b/src/chrome/content/rules/Intelliserver.net.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.intelliserver.net/ => https://www.intelliserver.net/: (5
 	^: mismatched
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Intelliworks_Chat.com.xml b/src/chrome/content/rules/Intelliworks_Chat.com.xml
index 5a05a54b1bd9..8d379e3b6107 100644
--- a/src/chrome/content/rules/Intelliworks_Chat.com.xml
+++ b/src/chrome/content/rules/Intelliworks_Chat.com.xml
@@ -1,4 +1,6 @@
 
-
+
 
 	
-	
-
-
-	
-	
-
-	
-
-	
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/Intelrad.com.xml b/src/chrome/content/rules/Intelrad.com.xml
index 3d3224d7e854..da69fe4ec099 100644
--- a/src/chrome/content/rules/Intelrad.com.xml
+++ b/src/chrome/content/rules/Intelrad.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.intelrad.com/ => https://www.intelrad.com/: (7, 'Failed
 Disabled by https-everywhere-checker because:
 Non-2xx HTTP code: http://intelrad.com/ (200) => https://intelrad.com/ (400)
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Intent-Media.xml b/src/chrome/content/rules/Intent-Media.xml
deleted file mode 100644
index bc6beb9d0bce..000000000000
--- a/src/chrome/content/rules/Intent-Media.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Inter.net.xml b/src/chrome/content/rules/Inter.net.xml
index bc261221d3aa..b2e9431364a7 100644
--- a/src/chrome/content/rules/Inter.net.xml
+++ b/src/chrome/content/rules/Inter.net.xml
@@ -3,7 +3,7 @@
 Disabled by https-everywhere-checker because:
 Fetch error: http://br.inter.net/ => https://br.inter.net/: (60, 'SSL certificate problem: certificate has expired')
 
-	www.br.inter.net , owa.br.inter.net , mail.br.inter.net , autodiscover.br.inter.net , br.inter.net 
+	www.br.inter.net , owa.br.inter.net , mail.br.inter.net , autodiscover.br.inter.net , br.inter.net
 
 
 	Nonfunctional domains:
@@ -21,18 +21,17 @@ Fetch error: http://br.inter.net/ => https://br.inter.net/: (60, 'SSL certificat
 		- www.intersite.mobi		(cert: www.br.inter.net; redirects to www.br.inter.net/inicio)
 
 -->
-
+
 
 	
-	
+	
+	
 	
 
 
 	
 
 
-	
 
 	
 	
+	
 
diff --git a/src/chrome/content/rules/InterContinental_Hotels_Group.xml b/src/chrome/content/rules/InterContinental_Hotels_Group.xml
index 198cbf583087..73d5afde2ebf 100644
--- a/src/chrome/content/rules/InterContinental_Hotels_Group.xml
+++ b/src/chrome/content/rules/InterContinental_Hotels_Group.xml
@@ -53,7 +53,7 @@ Non-2xx HTTP code: http://ihg.com/ (200) => https://www.ihg.com/ (403)
 		- aci-qap.secure.contact.ihg.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/InterNetworX.xml b/src/chrome/content/rules/InterNetworX.xml
index 4b3888fd55e0..7b8032544df5 100644
--- a/src/chrome/content/rules/InterNetworX.xml
+++ b/src/chrome/content/rules/InterNetworX.xml
@@ -1,18 +1,18 @@
 
-  
+  
   
-  
+  
   
-  
+  
   
-  
+  
   
-  
+  
   
-  
+  
   
 
-  
+  
 
   
   
diff --git a/src/chrome/content/rules/InterWorx.xml b/src/chrome/content/rules/InterWorx.xml
index 2b3ee5d6a040..efa33fbf0a4f 100644
--- a/src/chrome/content/rules/InterWorx.xml
+++ b/src/chrome/content/rules/InterWorx.xml
@@ -6,10 +6,12 @@ Fetch error: http://interworx.com/ => https://interworx.com/: Too many redirects
 Disabled by https-everywhere-checker because:
 Fetch error: http://interworx.com/ => https://interworx.com/: Cycle detected - URL already encountered: https://www.interworx.com/
 -->
-
+
 
-	
-	
+	
+	
+	
+	
 
 	
 	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Interactive_Data_Corporation.xml b/src/chrome/content/rules/Interactive_Data_Corporation.xml
index 6fcbecc01b08..f9c162a4c2f5 100644
--- a/src/chrome/content/rules/Interactive_Data_Corporation.xml
+++ b/src/chrome/content/rules/Interactive_Data_Corporation.xml
@@ -8,7 +8,11 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Interactive_Online.xml b/src/chrome/content/rules/Interactive_Online.xml
index 48ee426d1ef1..4f2053d7964f 100644
--- a/src/chrome/content/rules/Interactive_Online.xml
+++ b/src/chrome/content/rules/Interactive_Online.xml
@@ -11,7 +11,11 @@ Fetch error: http://www.interactiveonline.com/ => https://interactiveonline.com/
 
 	
 	
-	
+	
+	
+	
+	
+	
 
 
 	
@@ -20,7 +24,6 @@ Fetch error: http://www.interactiveonline.com/ => https://interactiveonline.com/
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Interbix.net.xml b/src/chrome/content/rules/Interbix.net.xml
new file mode 100644
index 000000000000..08975b16fa3f
--- /dev/null
+++ b/src/chrome/content/rules/Interbix.net.xml
@@ -0,0 +1,23 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Intercom.io.xml b/src/chrome/content/rules/Intercom.io.xml
deleted file mode 100644
index 35eac20e7392..000000000000
--- a/src/chrome/content/rules/Intercom.io.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Intercom_CDN.com.xml b/src/chrome/content/rules/Intercom_CDN.com.xml
index a0b0968f11dd..7bc7d8a276b8 100644
--- a/src/chrome/content/rules/Intercom_CDN.com.xml
+++ b/src/chrome/content/rules/Intercom_CDN.com.xml
@@ -1,7 +1,4 @@
 
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Intergi.xml b/src/chrome/content/rules/Intergi.xml
index 84118b303ae7..614b585fa5e0 100644
--- a/src/chrome/content/rules/Intergi.xml
+++ b/src/chrome/content/rules/Intergi.xml
@@ -40,7 +40,7 @@ Fetch error: http://app.intergi.com/ => https://app.intergi.com/: (28, 'Connecti
 		- .intergi.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Interia.pl.xml b/src/chrome/content/rules/Interia.pl.xml
new file mode 100644
index 000000000000..9931d2994204
--- /dev/null
+++ b/src/chrome/content/rules/Interia.pl.xml
@@ -0,0 +1,43 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+
+	
+	
+	
+
+	
+	
+
+	
+	
+
+
diff --git a/src/chrome/content/rules/Interkassa.xml b/src/chrome/content/rules/Interkassa.xml
index 1f7f4d63d49e..ec90485c906b 100644
--- a/src/chrome/content/rules/Interkassa.xml
+++ b/src/chrome/content/rules/Interkassa.xml
@@ -8,7 +8,7 @@
 	
 
 
-	
+	
 
 
 	 https://intermundomedia.com/: (51, "
 		- media
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Internap.xml b/src/chrome/content/rules/Internap.xml
index ecfe9a83180d..b7519db156c3 100644
--- a/src/chrome/content/rules/Internap.xml
+++ b/src/chrome/content/rules/Internap.xml
@@ -17,12 +17,14 @@ Non-2xx HTTP code: http://sslcdce.internapcdn.net/ (200) => https://sslcdce.inte
 		- (www.)internap.com
 
 -->
-
+
 
 	
 	
 	
-	
+	
+	
+	
 	
 
 
diff --git a/src/chrome/content/rules/International-Business-Times.xml b/src/chrome/content/rules/International-Business-Times.xml
index f0563b05c228..41f60bb507d3 100644
--- a/src/chrome/content/rules/International-Business-Times.xml
+++ b/src/chrome/content/rules/International-Business-Times.xml
@@ -25,7 +25,8 @@
 -->
 
 
-	
+	
+	
 
 
 	
-
-
-	
-	
-		
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/International-Finance-Corporation.xml b/src/chrome/content/rules/International-Finance-Corporation.xml
index 917e65633f66..9ab7ef6afee3 100644
--- a/src/chrome/content/rules/International-Finance-Corporation.xml
+++ b/src/chrome/content/rules/International-Finance-Corporation.xml
@@ -28,7 +28,7 @@ Fetch error: http://www.wbginvestmentclimate.org/ => https://www.wbginvestmentcl
 
 	See International-Finance-Corporation-mismatches.xml for problematic rules
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/International-Supercomputing-Conference.xml b/src/chrome/content/rules/International-Supercomputing-Conference.xml
index df4a7b9d7d12..c615f2577a91 100644
--- a/src/chrome/content/rules/International-Supercomputing-Conference.xml
+++ b/src/chrome/content/rules/International-Supercomputing-Conference.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://isc-events.com/ => https://isc-events.com/: (60, 'SSL certificate problem: self signed certificate')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/InternationalMan.xml b/src/chrome/content/rules/InternationalMan.xml
index 7e0cfe39fd79..f21924112f3d 100644
--- a/src/chrome/content/rules/InternationalMan.xml
+++ b/src/chrome/content/rules/InternationalMan.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.internationalman.com/ => https://www.internationalman.co
 Disabled by https-everywhere-checker because:
 Fetch error: http://internationalman.com/ => https://internationalman.com/: Cycle detected - URL already encountered: https://www.internationalman.com/
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/International_Association_of_Privacy_Professionals.xml b/src/chrome/content/rules/International_Association_of_Privacy_Professionals.xml
index 02f9351acb8e..0fa7f2994bb3 100644
--- a/src/chrome/content/rules/International_Association_of_Privacy_Professionals.xml
+++ b/src/chrome/content/rules/International_Association_of_Privacy_Professionals.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.privacyassociation.org/ => https://www.privacyassociatio
 	International Association of Privacy Professionals
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/International_Energy_Agency.xml b/src/chrome/content/rules/International_Energy_Agency.xml
index 69df339e8444..f21ec93a3e1b 100644
--- a/src/chrome/content/rules/International_Energy_Agency.xml
+++ b/src/chrome/content/rules/International_Energy_Agency.xml
@@ -10,4 +10,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/International_Financial_Cryptography_Association.xml b/src/chrome/content/rules/International_Financial_Cryptography_Association.xml
index 76ab2fb457b4..7349f80f6cda 100644
--- a/src/chrome/content/rules/International_Financial_Cryptography_Association.xml
+++ b/src/chrome/content/rules/International_Financial_Cryptography_Association.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.ifca.ai/ => https://www.ifca.ai/: (60, 'SSL certificate
 		- fc13	(works; mismatched, CN: www.ifca.ai)
 
 -->
-
+
 
 	
 	
@@ -20,4 +20,4 @@ Fetch error: http://www.ifca.ai/ => https://www.ifca.ai/: (60, 'SSL certificate
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/International_School_of_the_Sacred_Heart.xml b/src/chrome/content/rules/International_School_of_the_Sacred_Heart.xml
index e2492fbbad5a..6471fcd7f082 100644
--- a/src/chrome/content/rules/International_School_of_the_Sacred_Heart.xml
+++ b/src/chrome/content/rules/International_School_of_the_Sacred_Heart.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://issh.ac.jp/ => https://issh.ac.jp/: (28, 'Connection timed out after 20000 milliseconds')
 
 -->
-
+
 
 	
 	
@@ -15,4 +15,4 @@ Fetch error: http://issh.ac.jp/ => https://issh.ac.jp/: (28, 'Connection timed o
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Internet-Safety-Project.xml b/src/chrome/content/rules/Internet-Safety-Project.xml
index cf6e2cc0ff61..c4fcbcd207ba 100644
--- a/src/chrome/content/rules/Internet-Safety-Project.xml
+++ b/src/chrome/content/rules/Internet-Safety-Project.xml
@@ -8,6 +8,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/Internet-Society.xml b/src/chrome/content/rules/Internet-Society.xml
deleted file mode 100644
index bf99c19fcfe6..000000000000
--- a/src/chrome/content/rules/Internet-Society.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-			
-			
-			
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Internet.bs.xml b/src/chrome/content/rules/Internet.bs.xml
index ff025629cb9f..8692010fc91a 100644
--- a/src/chrome/content/rules/Internet.bs.xml
+++ b/src/chrome/content/rules/Internet.bs.xml
@@ -8,9 +8,10 @@
 
 
 	
-	
+	
+	
 	
-	
+	
 
 
 	
@@ -22,4 +23,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Internet.org.nz.xml b/src/chrome/content/rules/Internet.org.nz.xml
index b80bfd204206..93cd50059b80 100644
--- a/src/chrome/content/rules/Internet.org.nz.xml
+++ b/src/chrome/content/rules/Internet.org.nz.xml
@@ -6,7 +6,7 @@ Non-2xx HTTP code: http://static.internet.org.nz/ (200) => https://static.intern
 	Internet Party
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Internet.org.xml b/src/chrome/content/rules/Internet.org.xml
deleted file mode 100644
index 4452d0499c42..000000000000
--- a/src/chrome/content/rules/Internet.org.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Internet2.xml b/src/chrome/content/rules/Internet2.xml
index 76cea3276fed..0a2cab4be6bb 100644
--- a/src/chrome/content/rules/Internet2.xml
+++ b/src/chrome/content/rules/Internet2.xml
@@ -48,7 +48,7 @@ Fetch error: http://mail.internet2.edu/ => https://mail.internet2.edu/: (60, 'SS
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/InternetSociety.org.xml b/src/chrome/content/rules/InternetSociety.org.xml
new file mode 100644
index 000000000000..76760cf00c16
--- /dev/null
+++ b/src/chrome/content/rules/InternetSociety.org.xml
@@ -0,0 +1,36 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/InternetVotes.org.xml b/src/chrome/content/rules/InternetVotes.org.xml
deleted file mode 100644
index 4a775e1fc054..000000000000
--- a/src/chrome/content/rules/InternetVotes.org.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/InternetX.com.xml b/src/chrome/content/rules/InternetX.com.xml
new file mode 100644
index 000000000000..ddff5eb32c41
--- /dev/null
+++ b/src/chrome/content/rules/InternetX.com.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Internet_Brands.xml b/src/chrome/content/rules/Internet_Brands.xml
index fcb0e26173b0..b9d1475c4487 100644
--- a/src/chrome/content/rules/Internet_Brands.xml
+++ b/src/chrome/content/rules/Internet_Brands.xml
@@ -2,65 +2,16 @@
 	Other Internet Brands rulesets:
 
 		- Model_Mayhem.xml
-
-
-	CDN buckets:
-
-		- wac.2632.edgecastcdn.net
-
-			- cdc.ibsrv.net
-			- mms.ibsrv.net
-			- static.ibsrv.net
-			- www.internetbrands.com
-
-
-	Problematic domains:
-
-		- cdc.ibsrv.net			(works, mismatched, CN: gp1.wac.edgecastcdn.net)
-		- mms.ibsrv.net *
-		- static.ibsrv.net *
-		- internetbrands.com		(expired, mismatched, CN: www.internetbrands.com)
-		- www.internetbrands.com *
-
-	* 404, mismatched, CN: gp1.wac.edgecastcdn.net
-
-
-	Partially covered domains:
-
-		- (www.)internetbrands.com	(→ cdcssl.ibsrv.net)
-
-
-	Fully covered domains:
-
-		- pxlssl.ibpxl.com
-
-		- ibsrv.net subdomains:
-
-			- cdc		(→ cdcssl)
-			- cdcssl
-			- mms		(→ cdcssl)
-			- static	(→ staticssl)
-			- staticssl
+		- IBsrv.net.xml
 
 -->
 
 
 	
-	
 	
 	
 
-
-	
-
-	
-
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Internet_Video_Archive.com.xml b/src/chrome/content/rules/Internet_Video_Archive.com.xml
index a424d17b8921..16e46bd06bb5 100644
--- a/src/chrome/content/rules/Internet_Video_Archive.com.xml
+++ b/src/chrome/content/rules/Internet_Video_Archive.com.xml
@@ -9,7 +9,6 @@
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Internetfonden.se.xml b/src/chrome/content/rules/Internetfonden.se.xml
deleted file mode 100644
index 84007a44576a..000000000000
--- a/src/chrome/content/rules/Internetfonden.se.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Internetsuccess.at.xml b/src/chrome/content/rules/Internetsuccess.at.xml
index 003f8cee7f63..d9b09f7ef9a2 100644
--- a/src/chrome/content/rules/Internetsuccess.at.xml
+++ b/src/chrome/content/rules/Internetsuccess.at.xml
@@ -6,10 +6,12 @@ Fetch error: http://internetsuccess.at/ => https://internetsuccess.at/: (51, "SS
 	www: mismatched
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
 	
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Interpol.int.xml b/src/chrome/content/rules/Interpol.int.xml
index cbba79286f9f..bd3b2feddbc9 100644
--- a/src/chrome/content/rules/Interpol.int.xml
+++ b/src/chrome/content/rules/Interpol.int.xml
@@ -1,4 +1,4 @@
-
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Intrepid_Museum.xml b/src/chrome/content/rules/Intrepid_Museum.xml
index b4297d62ecdf..4c3c83dcfc5d 100644
--- a/src/chrome/content/rules/Intrepid_Museum.xml
+++ b/src/chrome/content/rules/Intrepid_Museum.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Intrepidus_Group.com.xml b/src/chrome/content/rules/Intrepidus_Group.com.xml
index e0a06e8bd1b6..dce9d8d5013e 100644
--- a/src/chrome/content/rules/Intrepidus_Group.com.xml
+++ b/src/chrome/content/rules/Intrepidus_Group.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.intrepidusgroup.com/ => https://www.intrepidusgroup.com/
 	Server is configured for rc4 only.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Intuit-problematic.xml b/src/chrome/content/rules/Intuit-problematic.xml
deleted file mode 100644
index f7c2ea6f27ed..000000000000
--- a/src/chrome/content/rules/Intuit-problematic.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Intuit.com.xml b/src/chrome/content/rules/Intuit.com.xml
new file mode 100644
index 000000000000..f7e0c020177b
--- /dev/null
+++ b/src/chrome/content/rules/Intuit.com.xml
@@ -0,0 +1,59 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Intuit.xml b/src/chrome/content/rules/Intuit.xml
deleted file mode 100644
index b15a57b50efb..000000000000
--- a/src/chrome/content/rules/Intuit.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/IntuitPayments.com.xml b/src/chrome/content/rules/IntuitPayments.com.xml
new file mode 100644
index 000000000000..ac5036e67a8a
--- /dev/null
+++ b/src/chrome/content/rules/IntuitPayments.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/IntuitStatic.com.xml b/src/chrome/content/rules/IntuitStatic.com.xml
new file mode 100644
index 000000000000..d84b960c86f3
--- /dev/null
+++ b/src/chrome/content/rules/IntuitStatic.com.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Intuit_Labs.com.xml b/src/chrome/content/rules/Intuit_Labs.com.xml
deleted file mode 100644
index 6672c8e3873f..000000000000
--- a/src/chrome/content/rules/Intuit_Labs.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Intuitive_Password.com.xml b/src/chrome/content/rules/Intuitive_Password.com.xml
index f8ac6bfba046..56855c44cd09 100644
--- a/src/chrome/content/rules/Intuitive_Password.com.xml
+++ b/src/chrome/content/rules/Intuitive_Password.com.xml
@@ -12,7 +12,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Invaluable.com.xml b/src/chrome/content/rules/Invaluable.com.xml
new file mode 100644
index 000000000000..0f9a75cd60c4
--- /dev/null
+++ b/src/chrome/content/rules/Invaluable.com.xml
@@ -0,0 +1,35 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/InvenSense.com.xml b/src/chrome/content/rules/InvenSense.com.xml
deleted file mode 100644
index 85ab83e8d18f..000000000000
--- a/src/chrome/content/rules/InvenSense.com.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Invenio-software.org.xml b/src/chrome/content/rules/Invenio-software.org.xml
index 0fc8d0cf3833..5140d659e37d 100644
--- a/src/chrome/content/rules/Invenio-software.org.xml
+++ b/src/chrome/content/rules/Invenio-software.org.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.invenio-software.org/ => https://www.invenio-software.or
 	* Unsecurable <= dropped
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/InventHelp.xml b/src/chrome/content/rules/InventHelp.xml
index f42fc085a457..1bcee2a431f6 100644
--- a/src/chrome/content/rules/InventHelp.xml
+++ b/src/chrome/content/rules/InventHelp.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Inventive_Designers.com.xml b/src/chrome/content/rules/Inventive_Designers.com.xml
index f88f7a0bc2ba..914efbf0decf 100644
--- a/src/chrome/content/rules/Inventive_Designers.com.xml
+++ b/src/chrome/content/rules/Inventive_Designers.com.xml
@@ -20,7 +20,7 @@ Fetch error: http://support.inventivedesigners.com/ => https://support.inventive
 		- www.inventivedesigners.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Investigative-News-Network.xml b/src/chrome/content/rules/Investigative-News-Network.xml
deleted file mode 100644
index 0650e2f93476..000000000000
--- a/src/chrome/content/rules/Investigative-News-Network.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Investing-Channel.xml b/src/chrome/content/rules/Investing-Channel.xml
deleted file mode 100644
index d216ebb23529..000000000000
--- a/src/chrome/content/rules/Investing-Channel.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Investing.com.xml b/src/chrome/content/rules/Investing.com.xml
new file mode 100644
index 000000000000..b829dc50b820
--- /dev/null
+++ b/src/chrome/content/rules/Investing.com.xml
@@ -0,0 +1,75 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/InvestingChannel.com.xml b/src/chrome/content/rules/InvestingChannel.com.xml
new file mode 100644
index 000000000000..3abcbec13180
--- /dev/null
+++ b/src/chrome/content/rules/InvestingChannel.com.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Investis.com.xml b/src/chrome/content/rules/Investis.com.xml
deleted file mode 100644
index 1cd231d61d02..000000000000
--- a/src/chrome/content/rules/Investis.com.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Invidious.site.xml b/src/chrome/content/rules/Invidious.site.xml
new file mode 100644
index 000000000000..63605f5492e5
--- /dev/null
+++ b/src/chrome/content/rules/Invidious.site.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Invidious.tube.xml b/src/chrome/content/rules/Invidious.tube.xml
new file mode 100644
index 000000000000..1022b1ed76a7
--- /dev/null
+++ b/src/chrome/content/rules/Invidious.tube.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Invidious.xyz.xml b/src/chrome/content/rules/Invidious.xyz.xml
new file mode 100644
index 000000000000..89dc00d89715
--- /dev/null
+++ b/src/chrome/content/rules/Invidious.xyz.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Invincea.com.xml b/src/chrome/content/rules/Invincea.com.xml
index efc40cf49bc0..0c6460060269 100644
--- a/src/chrome/content/rules/Invincea.com.xml
+++ b/src/chrome/content/rules/Invincea.com.xml
@@ -5,7 +5,8 @@
 
 
 	
-	
+	
+	
 		
diff --git a/src/chrome/content/rules/InviteMedia.com.xml b/src/chrome/content/rules/InviteMedia.com.xml
new file mode 100644
index 000000000000..651fb9e17c15
--- /dev/null
+++ b/src/chrome/content/rules/InviteMedia.com.xml
@@ -0,0 +1,27 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Invite_Media.xml b/src/chrome/content/rules/Invite_Media.xml
deleted file mode 100644
index e575551c5ec2..000000000000
--- a/src/chrome/content/rules/Invite_Media.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Invitel.xml b/src/chrome/content/rules/Invitel.xml
deleted file mode 100644
index 8d926f7c99e0..000000000000
--- a/src/chrome/content/rules/Invitel.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-
-	
-	
-
diff --git a/src/chrome/content/rules/Invoca.net.xml b/src/chrome/content/rules/Invoca.net.xml
index a547636012a5..e32f56842d23 100644
--- a/src/chrome/content/rules/Invoca.net.xml
+++ b/src/chrome/content/rules/Invoca.net.xml
@@ -5,7 +5,8 @@
 
 
 	
-	
+	
+	
 
 
 	
-
+
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Io9.com.xml b/src/chrome/content/rules/Io9.com.xml
deleted file mode 100644
index 52530e4c8903..000000000000
--- a/src/chrome/content/rules/Io9.com.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/IoMTT.com.xml b/src/chrome/content/rules/IoMTT.com.xml
index 89c63914932c..729f5199f4f1 100644
--- a/src/chrome/content/rules/IoMTT.com.xml
+++ b/src/chrome/content/rules/IoMTT.com.xml
@@ -23,14 +23,14 @@
 
 
 	
-	
+	
+	
 		
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Iono.fm.xml b/src/chrome/content/rules/Iono.fm.xml
index 0f68dd55c5a7..a3df11cb2914 100644
--- a/src/chrome/content/rules/Iono.fm.xml
+++ b/src/chrome/content/rules/Iono.fm.xml
@@ -42,10 +42,6 @@
 	
 
 
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Iovation.xml b/src/chrome/content/rules/Iovation.xml
index 3bf08cc7dd01..8842117e740c 100644
--- a/src/chrome/content/rules/Iovation.xml
+++ b/src/chrome/content/rules/Iovation.xml
@@ -14,9 +14,9 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ipfs.io.xml b/src/chrome/content/rules/Ipfs.io.xml
deleted file mode 100644
index 2a72272c3ef9..000000000000
--- a/src/chrome/content/rules/Ipfs.io.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-    
-    
-
-    
-
-    
-
diff --git a/src/chrome/content/rules/Ipfs.pics.xml b/src/chrome/content/rules/Ipfs.pics.xml
deleted file mode 100644
index 3f46f629121d..000000000000
--- a/src/chrome/content/rules/Ipfs.pics.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-    
-    
-
-    
-
-    
-
diff --git a/src/chrome/content/rules/Iphoneblog.de.xml b/src/chrome/content/rules/Iphoneblog.de.xml
index b2215dc7466c..6dd11888f866 100644
--- a/src/chrome/content/rules/Iphoneblog.de.xml
+++ b/src/chrome/content/rules/Iphoneblog.de.xml
@@ -1,6 +1,6 @@
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Iphonelife.com.xml b/src/chrome/content/rules/Iphonelife.com.xml
index 3cfddeceb793..aed79ec23bcd 100644
--- a/src/chrome/content/rules/Iphonelife.com.xml
+++ b/src/chrome/content/rules/Iphonelife.com.xml
@@ -16,7 +16,7 @@
 	
 	
 	
-	
+
 	
 
 
diff --git a/src/chrome/content/rules/Iplay.com.xml b/src/chrome/content/rules/Iplay.com.xml
index d2d329fed971..37218ff13f82 100644
--- a/src/chrome/content/rules/Iplay.com.xml
+++ b/src/chrome/content/rules/Iplay.com.xml
@@ -12,7 +12,8 @@
 
 
 	
-	
+	
+	
 		
diff --git a/src/chrome/content/rules/Ipsidixit.net.xml b/src/chrome/content/rules/Ipsidixit.net.xml
index 8febfbf57ef7..67de74f343bc 100644
--- a/src/chrome/content/rules/Ipsidixit.net.xml
+++ b/src/chrome/content/rules/Ipsidixit.net.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://ipsidixit.net/ => https://ipsidixit.net/: (51, "SSL: no alternative certificate subject name matches target host name 'ipsidixit.net'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/IraqBodyCount.org.xml b/src/chrome/content/rules/IraqBodyCount.org.xml
new file mode 100644
index 000000000000..a6c4385e5c37
--- /dev/null
+++ b/src/chrome/content/rules/IraqBodyCount.org.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Iraqueer.org.xml b/src/chrome/content/rules/Iraqueer.org.xml
new file mode 100644
index 000000000000..7bdf51859152
--- /dev/null
+++ b/src/chrome/content/rules/Iraqueer.org.xml
@@ -0,0 +1,20 @@
+
+
+
+	
+	
+
+	
+	
+
+	
+		
+
+	
+
+
diff --git a/src/chrome/content/rules/Irish-Country-Cottages.co.uk.xml b/src/chrome/content/rules/Irish-Country-Cottages.co.uk.xml
index 13d338e1dbd5..6aa15d4b9599 100644
--- a/src/chrome/content/rules/Irish-Country-Cottages.co.uk.xml
+++ b/src/chrome/content/rules/Irish-Country-Cottages.co.uk.xml
@@ -1,5 +1,5 @@
 
-
+
   
   
 
diff --git a/src/chrome/content/rules/Ironwhale.com.xml b/src/chrome/content/rules/Ironwhale.com.xml
index a7f979d7a9b9..42f3e18e801e 100644
--- a/src/chrome/content/rules/Ironwhale.com.xml
+++ b/src/chrome/content/rules/Ironwhale.com.xml
@@ -4,13 +4,13 @@
 -->
 
 
-	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Isalo.org.xml b/src/chrome/content/rules/Isalo.org.xml
index 0cb31f13e30b..5c4ddc42f2ae 100644
--- a/src/chrome/content/rules/Isalo.org.xml
+++ b/src/chrome/content/rules/Isalo.org.xml
@@ -17,14 +17,14 @@ Fetch error: http://pix.isalo.org/ => https://pix.isalo.org/: (51, "SSL: no alte
 		- css on paste from www.karma.mg ˢ
 
 		- Images, on:
-		
+
 			- paste from www.karma.mg ˢ
 			- www from $self ˢ
 
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Iscturkey.org.xml b/src/chrome/content/rules/Iscturkey.org.xml
new file mode 100644
index 000000000000..cde499685f68
--- /dev/null
+++ b/src/chrome/content/rules/Iscturkey.org.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Iseclab.org.xml b/src/chrome/content/rules/Iseclab.org.xml
index b4c5d8a40979..e40e77a970f2 100644
--- a/src/chrome/content/rules/Iseclab.org.xml
+++ b/src/chrome/content/rules/Iseclab.org.xml
@@ -1,44 +1,20 @@
-
 
-
+
 
-	
 	
-	
-	
 	
-
-
-	
-	
-
-	
-
+	
 
 	
 
 
-
diff --git a/src/chrome/content/rules/Islam-Globe.com.xml b/src/chrome/content/rules/Islam-Globe.com.xml
deleted file mode 100644
index 23bc90e13482..000000000000
--- a/src/chrome/content/rules/Islam-Globe.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Islam21c.com.xml b/src/chrome/content/rules/Islam21c.com.xml
new file mode 100644
index 000000000000..136e2c8c2cfd
--- /dev/null
+++ b/src/chrome/content/rules/Islam21c.com.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/IslamAcademy.net.xml b/src/chrome/content/rules/IslamAcademy.net.xml
index 15bfc8c66f62..312d45f1a454 100644
--- a/src/chrome/content/rules/IslamAcademy.net.xml
+++ b/src/chrome/content/rules/IslamAcademy.net.xml
@@ -10,7 +10,7 @@ Fetch error: http://intesab.islamacademy.net/ => https://intesab.islamacademy.ne
 	- www.forum.islamacademy.net
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/IslamQA.info.xml b/src/chrome/content/rules/IslamQA.info.xml
deleted file mode 100644
index 589727c95472..000000000000
--- a/src/chrome/content/rules/IslamQA.info.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-	
-	
-	
-	
-		
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/IslamSpirit.com.xml b/src/chrome/content/rules/IslamSpirit.com.xml
new file mode 100644
index 000000000000..9245b1c2e236
--- /dev/null
+++ b/src/chrome/content/rules/IslamSpirit.com.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/IslamSyria.com.xml b/src/chrome/content/rules/IslamSyria.com.xml
new file mode 100644
index 000000000000..cc328a230ee7
--- /dev/null
+++ b/src/chrome/content/rules/IslamSyria.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/IslamToday.net.xml b/src/chrome/content/rules/IslamToday.net.xml
index c3dbd18bd6a2..ff9ada647894 100644
--- a/src/chrome/content/rules/IslamToday.net.xml
+++ b/src/chrome/content/rules/IslamToday.net.xml
@@ -14,7 +14,7 @@ Fetch error: http://dev.islamtoday.net/ => https://dev.islamtoday.net/: (28, 'Op
 	- muntada.islamtoday.net
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Islamic-Awareness.org.xml b/src/chrome/content/rules/Islamic-Awareness.org.xml
new file mode 100644
index 000000000000..fcf85121fda1
--- /dev/null
+++ b/src/chrome/content/rules/Islamic-Awareness.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/IslamicBand.com.xml b/src/chrome/content/rules/IslamicBand.com.xml
deleted file mode 100644
index 4ab03d3cf8ff..000000000000
--- a/src/chrome/content/rules/IslamicBand.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/IslamicBulletin.org.xml b/src/chrome/content/rules/IslamicBulletin.org.xml
new file mode 100644
index 000000000000..9b9965d299cf
--- /dev/null
+++ b/src/chrome/content/rules/IslamicBulletin.org.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/IslamicPortal.co.uk.xml b/src/chrome/content/rules/IslamicPortal.co.uk.xml
new file mode 100644
index 000000000000..a4ceb6de6363
--- /dev/null
+++ b/src/chrome/content/rules/IslamicPortal.co.uk.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/IslamicTech.com.xml b/src/chrome/content/rules/IslamicTech.com.xml
index e7df03231493..7659cd8919e6 100644
--- a/src/chrome/content/rules/IslamicTech.com.xml
+++ b/src/chrome/content/rules/IslamicTech.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://bramj.islamictech.com/ => https://bramj.islamictech.com/: la
 Fetch error: http://soft.islamictech.com/ => https://soft.islamictech.com/: label empty or too long
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Islamosaic.com.xml b/src/chrome/content/rules/Islamosaic.com.xml
new file mode 100644
index 000000000000..c606dece083e
--- /dev/null
+++ b/src/chrome/content/rules/Islamosaic.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Island-Savings.xml b/src/chrome/content/rules/Island-Savings.xml
index 80955eecf2f4..14e547af427b 100644
--- a/src/chrome/content/rules/Island-Savings.xml
+++ b/src/chrome/content/rules/Island-Savings.xml
@@ -7,7 +7,7 @@ Fetch error: http://dashband.islandsavings.ca/ => https://dashband.islandsavings
 		- partners.islandsavings.ca
 -->
 
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Islington.gov.uk.xml b/src/chrome/content/rules/Islington.gov.uk.xml
index 175d5a30efef..a53e2460a6dd 100644
--- a/src/chrome/content/rules/Islington.gov.uk.xml
+++ b/src/chrome/content/rules/Islington.gov.uk.xml
@@ -42,7 +42,7 @@
 		- css on touchchoices from $self ᵐ
 
 		- Images, on:
-		
+
 			- democracy from $self ˢ
 			- www.energyadvice, touchchoices from $self ᵐ
 
diff --git a/src/chrome/content/rules/IsoHunt.xml b/src/chrome/content/rules/IsoHunt.xml
index 1f360ca9dd84..738a7899c9c7 100644
--- a/src/chrome/content/rules/IsoHunt.xml
+++ b/src/chrome/content/rules/IsoHunt.xml
@@ -15,14 +15,14 @@ Fetch error: http://isohunt.com/ => https://isohunt.com/: (7, 'Failed to connect
 		- tickets
 
 -->
-
+
 
 	  
 	
 	
 
 
-	
+	
 
 
 	  
diff --git a/src/chrome/content/rules/Isomorphic_Software.xml b/src/chrome/content/rules/Isomorphic_Software.xml
index 25a3050ab68c..e639134521d7 100644
--- a/src/chrome/content/rules/Isomorphic_Software.xml
+++ b/src/chrome/content/rules/Isomorphic_Software.xml
@@ -15,7 +15,7 @@ Fetch error: http://www.isomorphic.com/ => https://www.isomorphic.com/: (51, "SS
 	Cert only matches www.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Isorno.com.xml b/src/chrome/content/rules/Isorno.com.xml
index 8f77991b2628..ffe317b28f81 100644
--- a/src/chrome/content/rules/Isorno.com.xml
+++ b/src/chrome/content/rules/Isorno.com.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Ispgateway.de.xml b/src/chrome/content/rules/Ispgateway.de.xml
deleted file mode 100644
index ff56bc66b7b1..000000000000
--- a/src/chrome/content/rules/Ispgateway.de.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Issuu_Aps.xml b/src/chrome/content/rules/Issuu_Aps.xml
index bbaf9f049570..463a0103b391 100644
--- a/src/chrome/content/rules/Issuu_Aps.xml
+++ b/src/chrome/content/rules/Issuu_Aps.xml
@@ -5,16 +5,11 @@
 
 		- Isu.pub.xml
 
-
-	CDN buckets:
-
-		- s3.amazonaws.com/feed.issuu.com/
-		- s3.amazonaws.com/sidebar.issuu.com/
-
-
 	Nonfunctional hosts in *issuu.com:
 
 		- help *
+    - feed *
+    - sidebar *
 
 	* Zendesk / redirects to http
 
@@ -23,7 +18,7 @@
 
 		- issuu.com
 		- .issuu.com
- 
+
 -->
 
 
@@ -39,9 +34,7 @@
 
 	
-	
 	
-	
 
 		
 
@@ -64,10 +57,6 @@
 	
 	
 
-
-	
-
 	
 
diff --git a/src/chrome/content/rules/Istanbul_hs.org.xml b/src/chrome/content/rules/Istanbul_hs.org.xml
index bbb8d1001c7f..356585496cb2 100644
--- a/src/chrome/content/rules/Istanbul_hs.org.xml
+++ b/src/chrome/content/rules/Istanbul_hs.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://istanbulhs.org/ => https://istanbulhs.org/: (52, 'Empty repl
 Fetch error: http://www.istanbulhs.org/ => https://www.istanbulhs.org/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Istio.io.xml b/src/chrome/content/rules/Istio.io.xml
new file mode 100644
index 000000000000..8c78698a10fa
--- /dev/null
+++ b/src/chrome/content/rules/Istio.io.xml
@@ -0,0 +1,27 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/IsyVmon.xml b/src/chrome/content/rules/IsyVmon.xml
index 117b8097b4fa..ad5f526ddf83 100644
--- a/src/chrome/content/rules/IsyVmon.xml
+++ b/src/chrome/content/rules/IsyVmon.xml
@@ -19,4 +19,4 @@ Fetch error: http://www.isyvmon.com/ => http://www.isyvmon.com/: (28, 'Connectio
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ItHappens.me.xml b/src/chrome/content/rules/ItHappens.me.xml
new file mode 100644
index 000000000000..b32e3be4789e
--- /dev/null
+++ b/src/chrome/content/rules/ItHappens.me.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ItHappens.ru.xml b/src/chrome/content/rules/ItHappens.ru.xml
new file mode 100644
index 000000000000..1c07ea3a1943
--- /dev/null
+++ b/src/chrome/content/rules/ItHappens.ru.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Italian-Country-Cottages.co.uk.xml b/src/chrome/content/rules/Italian-Country-Cottages.co.uk.xml
index 6558c125242d..97e716ac0d67 100644
--- a/src/chrome/content/rules/Italian-Country-Cottages.co.uk.xml
+++ b/src/chrome/content/rules/Italian-Country-Cottages.co.uk.xml
@@ -1,5 +1,5 @@
 
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Itc.cn.xml b/src/chrome/content/rules/Itc.cn.xml
index 49c556abe948..67c8469c4911 100644
--- a/src/chrome/content/rules/Itc.cn.xml
+++ b/src/chrome/content/rules/Itc.cn.xml
@@ -1,15 +1,38 @@
+
+
 
-	
-	
-	
-	
-	
+	
+	
+	
+	
+	
 	
 	
 	
 	
-	
-		
 	
 		
 	
@@ -21,13 +44,21 @@
 	
 	
 	
-		
 	
 	
 	
+	
+	
+	
+	
+		
+	
+	
 	
 		
-	
+	
+	
+		
 	
 		
 	
@@ -48,5 +79,7 @@
 
 	
 
+	
+
 	
 
diff --git a/src/chrome/content/rules/Itex.xml b/src/chrome/content/rules/Itex.xml
index bd44eff2b92c..648997d6d1f9 100644
--- a/src/chrome/content/rules/Itex.xml
+++ b/src/chrome/content/rules/Itex.xml
@@ -1,9 +1,9 @@
 
 
 	
-	
+	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Ithenticate.com.xml b/src/chrome/content/rules/Ithenticate.com.xml
new file mode 100644
index 000000000000..ead29016ee8c
--- /dev/null
+++ b/src/chrome/content/rules/Ithenticate.com.xml
@@ -0,0 +1,25 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/ItsAnHonour.xml b/src/chrome/content/rules/ItsAnHonour.xml
deleted file mode 100644
index 1fa2c9af20f8..000000000000
--- a/src/chrome/content/rules/ItsAnHonour.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-	
-
-	
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Ittisaq.com.xml b/src/chrome/content/rules/Ittisaq.com.xml
new file mode 100644
index 000000000000..680e454b3440
--- /dev/null
+++ b/src/chrome/content/rules/Ittisaq.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Iv.lt.xml b/src/chrome/content/rules/Iv.lt.xml
index 1d6b7ac21792..218dd973f12b 100644
--- a/src/chrome/content/rules/Iv.lt.xml
+++ b/src/chrome/content/rules/Iv.lt.xml
@@ -16,14 +16,18 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
 		
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ivarch.com.xml b/src/chrome/content/rules/Ivarch.com.xml
deleted file mode 100644
index 9f09b05a8b74..000000000000
--- a/src/chrome/content/rules/Ivarch.com.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Ivorde.com.xml b/src/chrome/content/rules/Ivorde.com.xml
deleted file mode 100644
index 3a028944fbb0..000000000000
--- a/src/chrome/content/rules/Ivorde.com.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Ivwbox.de.xml b/src/chrome/content/rules/Ivwbox.de.xml
index 65723a6c9889..60500fd5ae88 100644
--- a/src/chrome/content/rules/Ivwbox.de.xml
+++ b/src/chrome/content/rules/Ivwbox.de.xml
@@ -26,4 +26,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ix.de.xml b/src/chrome/content/rules/Ix.de.xml
index ceb72a31e11d..52c28ac9fb11 100644
--- a/src/chrome/content/rules/Ix.de.xml
+++ b/src/chrome/content/rules/Ix.de.xml
@@ -7,7 +7,7 @@ Fetch error: http://3.f.ix.de/ => https://3.f.ix.de/: (6, 'Could not resolve hos
 	For other Heise coverage, see Heise.de.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Ixbt.com.xml b/src/chrome/content/rules/Ixbt.com.xml
index 8a761e0634ce..4b0a779bbb5b 100644
--- a/src/chrome/content/rules/Ixbt.com.xml
+++ b/src/chrome/content/rules/Ixbt.com.xml
@@ -40,4 +40,4 @@
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Izvestia.ru.xml b/src/chrome/content/rules/Izvestia.ru.xml
index 4ed7e4b5c3d9..4718b82292a9 100644
--- a/src/chrome/content/rules/Izvestia.ru.xml
+++ b/src/chrome/content/rules/Izvestia.ru.xml
@@ -17,7 +17,7 @@ Timeout:
 	admin.izvestia.ru
 	oauth-admin.izvestia.ru
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/JAMA-Network.xml b/src/chrome/content/rules/JAMA-Network.xml
index 3a82d21aef61..cb2665632534 100644
--- a/src/chrome/content/rules/JAMA-Network.xml
+++ b/src/chrome/content/rules/JAMA-Network.xml
@@ -56,17 +56,27 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 	
 
-	
+	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/JAMF_Software.com.xml b/src/chrome/content/rules/JAMF_Software.com.xml
index f25f70123c0f..e37ad99af510 100644
--- a/src/chrome/content/rules/JAMF_Software.com.xml
+++ b/src/chrome/content/rules/JAMF_Software.com.xml
@@ -1,20 +1,17 @@
-
-
+
 	
 	
 	
 	
-		
-		
-
 
-	
-	
+	
+		
+		
+		
 
+	
+	
+		
 
 	
-
 
diff --git a/src/chrome/content/rules/JANET.xml b/src/chrome/content/rules/JANET.xml
index cffae37de56d..8d65a55c2afc 100644
--- a/src/chrome/content/rules/JANET.xml
+++ b/src/chrome/content/rules/JANET.xml
@@ -17,10 +17,11 @@ Fetch error: http://ja.net/ => https://www.ja.net/: (6, 'Could not resolve host:
 -->
 
   
-  
+  
+  
+  
 
   
 
-	
+  
 
diff --git a/src/chrome/content/rules/JBoss.com.xml b/src/chrome/content/rules/JBoss.com.xml
deleted file mode 100644
index d544b789087d..000000000000
--- a/src/chrome/content/rules/JBoss.com.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/JBoss.xml b/src/chrome/content/rules/JBoss.xml
index 448835dc6a8d..9853165be553 100644
--- a/src/chrome/content/rules/JBoss.xml
+++ b/src/chrome/content/rules/JBoss.xml
@@ -13,7 +13,7 @@ Fetch error: http://jboss.jboss.org/ => https://jboss.jboss.org/: (6, 'Could not
 		- issues.jboss.org
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/JCB.co.jp.xml b/src/chrome/content/rules/JCB.co.jp.xml
new file mode 100644
index 000000000000..84f9556a8e5d
--- /dev/null
+++ b/src/chrome/content/rules/JCB.co.jp.xml
@@ -0,0 +1,23 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/JD.com-CIties.xml b/src/chrome/content/rules/JD.com-CIties.xml
deleted file mode 100644
index 404dfd940298..000000000000
--- a/src/chrome/content/rules/JD.com-CIties.xml
+++ /dev/null
@@ -1,308 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/JD.com-Cities.xml b/src/chrome/content/rules/JD.com-Cities.xml
new file mode 100644
index 000000000000..4b06ae80a25e
--- /dev/null
+++ b/src/chrome/content/rules/JD.com-Cities.xml
@@ -0,0 +1,296 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/JD.com-Problematic.xml b/src/chrome/content/rules/JD.com-Problematic.xml
deleted file mode 100644
index b92cb1bb44c8..000000000000
--- a/src/chrome/content/rules/JD.com-Problematic.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
-
-	
-
-	
-	
-		
-	
-	
-
-	
-	
-	
-		
-		
-
-	
-	
-	
-		
-		
-
-	
-	
-	
-		
-		
-
-	
-	
-	
-		
-
-	
-	
-	
-		
-		
-		
-
-	
-	
-	
-		
-		
-
-	
-	
-	
-		
-		
-
-	
-	
-	
-		
-		
-		
-		
-	
-		
-		
-
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-		
-		
-		
-		
-		
-		
-
-
diff --git a/src/chrome/content/rules/JD.com.xml b/src/chrome/content/rules/JD.com.xml
index df82b9d06d03..5ca6945603e0 100644
--- a/src/chrome/content/rules/JD.com.xml
+++ b/src/chrome/content/rules/JD.com.xml
@@ -4,7 +4,6 @@
 		- 360buy.com.xml
 		- 360buyimg.com.xml
 		- Jcloud.com.xml
-		- JD.com-Problematic.xml
 		- JD.hk.xml
 
 	Nonfunctional hosts in *jd.com:
@@ -40,23 +39,15 @@
 	⁵ Reset
 	* Timeout
 
-	Problematic hosts in *jd.com:
-		- licai.bx *
-		- chat2 ³
-		- cread.e *
-		- fashion *
-		- gongyi ⁴
-		- ir *
-		- misc.jzt *
-		- nj *
-		- click.union *
-		- ccc.x *
-
-	¹ Mixed css
-	* Mismatched
-	³ Weak DHE key
-	⁴ Mixed flash
-	⁵ Mixed iframe
+	Mismatched:
+		- licai.bx
+		- cread.e
+		- fashion
+		- ir
+		- misc.jzt
+		- nj
+		- click.union
+		- ccc.x
 
 	Insecure cookies are set for these domains and hosts:
 		- .jd.com
@@ -72,63 +63,51 @@
 		- xjzt.jd.com
 		- zhaopin.jd.com
 
-	Mixed content:
-		- reg.jd.com/reg/$
-		- Flash on gongyi from player.youku.com
-		- Images, on:
-			- baby, china from tp4.sinaimg.cn *
-			- jzt from misc.jzt.jd.com
-			- me from storage.jd.com *
-			- safe from authcode.jd.com *
-		- Bugs, on:
-			- baby, china, gongyi, shouji from widget.weibo.com *
-			- zx from wpa.qq.com
-
-	* Secured by us
-
 	Redirect to www.jd.com :
 		- item.jd.com/$
 
 	Too many redirects:
-		- ^
-		- ccc
 		- group
 		- huishou
-		- list
 		- market
 		- mine
-		- sale
 		- sq
 		- storage
-		- www
-		- x
 -->
-
 
 	
+	
+	
 	
 	
 	
+	
+		
 	
 	
 	
 	
 	
+	
+		
 	
 	
 	
-	
 	
 	
 	
 	
 	
-	
+	
 	
 	
 	
 	
+	
 	
+	
+		
+		
 	
 	
 	
@@ -143,7 +122,6 @@
 	
 	
 	
-	
 	
 	
 	
@@ -160,7 +138,7 @@
 	
 	
 	
-	
+	
 	
 	
 	
@@ -170,10 +148,11 @@
 	
 	
 	
+	
+		
 	
 	
 	
-	
 	
 	
 	
@@ -183,14 +162,15 @@
 	
 	
 	
-	
-	
 	
 	
 	
 	
 	
 	
+	
+		
+		
 	
 	
 	
@@ -218,6 +198,11 @@
 	
 	
 	
+	
+		
+		
+		
+		
 	
 	
 	
@@ -228,6 +213,12 @@
 	
 	
 	
+	
+		
+		
+		
+		
+		
 	
 	
 	
@@ -255,10 +246,6 @@
 	
 	
 	
-	
-	
-		
-		
 	
 	
 	
@@ -267,17 +254,15 @@
 	
 	
 	
-	
 	
 	
 	
 	
 
-	
+	
 	
 	
 	
-	
 	
 	
 	
diff --git a/src/chrome/content/rules/JD_Kasten.com.xml b/src/chrome/content/rules/JD_Kasten.com.xml
index 2d4f81fe6f1a..304b4190f2fe 100644
--- a/src/chrome/content/rules/JD_Kasten.com.xml
+++ b/src/chrome/content/rules/JD_Kasten.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.jdkasten.com/ => https://www.jdkasten.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.jdkasten.com'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/JEDEC.com.xml b/src/chrome/content/rules/JEDEC.com.xml
index bf73ed190af8..1d7ef15dfe77 100644
--- a/src/chrome/content/rules/JEDEC.com.xml
+++ b/src/chrome/content/rules/JEDEC.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.jedec.com/ => https://www.jedec.com/: (51, "SSL: no alte
 		- .jedec.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/JIDE.com.xml b/src/chrome/content/rules/JIDE.com.xml
index 04775de9c131..a7c2d7abe276 100644
--- a/src/chrome/content/rules/JIDE.com.xml
+++ b/src/chrome/content/rules/JIDE.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://forum.jide.com/ => https://forum.jide.com/: (28, 'Connection
 	Non-functional subdomain:
 		- www	        (404 not found)
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/JISCMail.xml b/src/chrome/content/rules/JISCMail.xml
index 117c4f8e4e82..c1c151a651c5 100644
--- a/src/chrome/content/rules/JISCMail.xml
+++ b/src/chrome/content/rules/JISCMail.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://jiscmail.ac.uk/ => https://jiscmail.ac.uk/: (51, "SSL: no alternative certificate subject name matches target host name 'jiscmail.ac.uk'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/JJC.edu.xml b/src/chrome/content/rules/JJC.edu.xml
index 8bbc2d4dc6db..087af2fb62f6 100644
--- a/src/chrome/content/rules/JJC.edu.xml
+++ b/src/chrome/content/rules/JJC.edu.xml
@@ -18,7 +18,7 @@
 		- eresources
 
 
-	Insecure cookies are set for these 
+	Insecure cookies are set for these
 
 		- employment.jjc.edu
 		- eresources.jjc.edu
diff --git a/src/chrome/content/rules/JList.com.xml b/src/chrome/content/rules/JList.com.xml
index 8da8b8f44d0d..e033fda96739 100644
--- a/src/chrome/content/rules/JList.com.xml
+++ b/src/chrome/content/rules/JList.com.xml
@@ -1,57 +1,27 @@
-
 
-
-
-	
+
 	
-	
 	
+	
+	
+	
+	
+	
+	
+	
+	
 
-	
-	
-
-
-	
-	
-
-	
-	
-
-
-	
-
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/JML_Direct.com.xml b/src/chrome/content/rules/JML_Direct.com.xml
index 1663e7e55815..f39a3cad01f2 100644
--- a/src/chrome/content/rules/JML_Direct.com.xml
+++ b/src/chrome/content/rules/JML_Direct.com.xml
@@ -21,10 +21,10 @@ Fetch error: http://jmldirect.uat.venda.com/ => http://jmldirect.uat.venda.com/:
 	* Secured by us
 
 -->
-
+
 
 	
-	
+	
 	
 
 
diff --git a/src/chrome/content/rules/JPCSP.org.xml b/src/chrome/content/rules/JPCSP.org.xml
new file mode 100644
index 000000000000..03b917bf66b8
--- /dev/null
+++ b/src/chrome/content/rules/JPCSP.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/JRES.org.xml b/src/chrome/content/rules/JRES.org.xml
index 0b45d6b62ee6..9eb5dc50f40b 100644
--- a/src/chrome/content/rules/JRES.org.xml
+++ b/src/chrome/content/rules/JRES.org.xml
@@ -12,7 +12,7 @@ Fetch error: http://archives.jres.org/ => https://archives.jres.org/: (60, 'SSL
 		- www
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/JREast.co.jp.xml b/src/chrome/content/rules/JREast.co.jp.xml
new file mode 100644
index 000000000000..db98bb31108a
--- /dev/null
+++ b/src/chrome/content/rules/JREast.co.jp.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/JS.org.xml b/src/chrome/content/rules/JS.org.xml
index 7742cf4fbe21..1bd6855c4d7b 100644
--- a/src/chrome/content/rules/JS.org.xml
+++ b/src/chrome/content/rules/JS.org.xml
@@ -2,7 +2,7 @@
 	See https://github.com/js-org/dns.js.org/blob/master/cnames_active.js for JS.org subdomain list.
 
 	Mismatched hosts in js.org*:
-	
+
 		- 101
 		- 7anshuai
 		- 8art
diff --git a/src/chrome/content/rules/JSBi.org.xml b/src/chrome/content/rules/JSBi.org.xml
index 9aaaf421e8e2..54f8de8e7547 100644
--- a/src/chrome/content/rules/JSBi.org.xml
+++ b/src/chrome/content/rules/JSBi.org.xml
@@ -2,7 +2,7 @@
 	NB: Server sends no certificate chain, see https://whatsmychaincert.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/JSON-Schema.org.xml b/src/chrome/content/rules/JSON-Schema.org.xml
new file mode 100644
index 000000000000..43f54afecee8
--- /dev/null
+++ b/src/chrome/content/rules/JSON-Schema.org.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/JSXC.org.xml b/src/chrome/content/rules/JSXC.org.xml
new file mode 100644
index 000000000000..c7f4aa4457d5
--- /dev/null
+++ b/src/chrome/content/rules/JSXC.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/JUA.com.xml b/src/chrome/content/rules/JUA.com.xml
index 5385232e4eab..c1819c7b80dc 100644
--- a/src/chrome/content/rules/JUA.com.xml
+++ b/src/chrome/content/rules/JUA.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://jua.com/ => https://www.jua.com/: (51, "SSL: no alternative
 		- www.jua.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/JUCY-New-Zealand.xml b/src/chrome/content/rules/JUCY-New-Zealand.xml
index 729434d70c22..4d439edf0085 100644
--- a/src/chrome/content/rules/JUCY-New-Zealand.xml
+++ b/src/chrome/content/rules/JUCY-New-Zealand.xml
@@ -14,7 +14,7 @@ Fetch error: http://jucy.co.nz/ => https://jucy.co.nz/: (51, "SSL: no alternativ
 
 	¹ Hostname mismatch
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/JUKI.xml b/src/chrome/content/rules/JUKI.xml
index 17fe44161683..5b58ab1e9c89 100644
--- a/src/chrome/content/rules/JUKI.xml
+++ b/src/chrome/content/rules/JUKI.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/JULAC.org.xml b/src/chrome/content/rules/JULAC.org.xml
new file mode 100644
index 000000000000..7fc41f4f3bbc
--- /dev/null
+++ b/src/chrome/content/rules/JULAC.org.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/JWChat.org.xml b/src/chrome/content/rules/JWChat.org.xml
index c8ac63c7da34..c397259d44c8 100644
--- a/src/chrome/content/rules/JWChat.org.xml
+++ b/src/chrome/content/rules/JWChat.org.xml
@@ -4,7 +4,7 @@
 	* See https://whatsmychaincert.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/JXT.net.au.xml b/src/chrome/content/rules/JXT.net.au.xml
index ce378fd75196..f3159600c79f 100644
--- a/src/chrome/content/rules/JXT.net.au.xml
+++ b/src/chrome/content/rules/JXT.net.au.xml
@@ -9,4 +9,4 @@ Fetch error: http://images.jxt.net.au/ => https://images.jxt.net.au/: (60, 'SSL
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/J_Deslippe.com.xml b/src/chrome/content/rules/J_Deslippe.com.xml
index 7fc02614034e..a499d9be57ed 100644
--- a/src/chrome/content/rules/J_Deslippe.com.xml
+++ b/src/chrome/content/rules/J_Deslippe.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.jdeslippe.com/ => https://www.jdeslippe.com/: (35, 'Unkn
 	^: mismatched, CN: jdeslip.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/JabRef.org.xml b/src/chrome/content/rules/JabRef.org.xml
new file mode 100644
index 000000000000..7e3329847725
--- /dev/null
+++ b/src/chrome/content/rules/JabRef.org.xml
@@ -0,0 +1,29 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/JabbR.net.xml b/src/chrome/content/rules/JabbR.net.xml
index fba2dceb109c..8899cb01c721 100644
--- a/src/chrome/content/rules/JabbR.net.xml
+++ b/src/chrome/content/rules/JabbR.net.xml
@@ -6,10 +6,9 @@ Fetch error: http://jabbr.net/ => https://jabbr.net/: (51, "SSL: no alternative
 	www doesn't exist.
 
 -->
-
+
 
 	
-	
 
 
 	
-
+
 
 	
diff --git a/src/chrome/content/rules/Jack_Imaging.com.xml b/src/chrome/content/rules/Jack_Imaging.com.xml
index d21b236a6b0f..2bdf03dc6057 100644
--- a/src/chrome/content/rules/Jack_Imaging.com.xml
+++ b/src/chrome/content/rules/Jack_Imaging.com.xml
@@ -12,7 +12,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Jackson_Sun.xml b/src/chrome/content/rules/Jackson_Sun.xml
index 33e7cb957490..a6cf964afb5e 100644
--- a/src/chrome/content/rules/Jackson_Sun.xml
+++ b/src/chrome/content/rules/Jackson_Sun.xml
@@ -11,7 +11,8 @@
 
 
 	
-	
+	
+	
 
 
 	
-
-
-	
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Jacqueline_Gold.xml b/src/chrome/content/rules/Jacqueline_Gold.xml
index b7668212ad09..0c74652a471c 100644
--- a/src/chrome/content/rules/Jacqueline_Gold.xml
+++ b/src/chrome/content/rules/Jacqueline_Gold.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Jaim.at.xml b/src/chrome/content/rules/Jaim.at.xml
index 89a2a280dc53..d424283622d5 100644
--- a/src/chrome/content/rules/Jaim.at.xml
+++ b/src/chrome/content/rules/Jaim.at.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://jaim.at/ => https://jaim.at/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Jalopnik.com.xml b/src/chrome/content/rules/Jalopnik.com.xml
deleted file mode 100644
index fca2513147d4..000000000000
--- a/src/chrome/content/rules/Jalopnik.com.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-	
-	
-
-		
-
-			
-			
-			
-
-		
-		
-		
-		
-		
-		
-		
-
-		
-		
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/JamPlay.xml b/src/chrome/content/rules/JamPlay.xml
index e347a2ac7662..27b0e0021a8b 100644
--- a/src/chrome/content/rules/JamPlay.xml
+++ b/src/chrome/content/rules/JamPlay.xml
@@ -2,4 +2,4 @@
     
 
     
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Jamalon.com.xml b/src/chrome/content/rules/Jamalon.com.xml
new file mode 100644
index 000000000000..0bf24125dbc1
--- /dev/null
+++ b/src/chrome/content/rules/Jamalon.com.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Jamendo.com.xml b/src/chrome/content/rules/Jamendo.com.xml
index ee75b120ec9d..e3ee07f562a5 100644
--- a/src/chrome/content/rules/Jamendo.com.xml
+++ b/src/chrome/content/rules/Jamendo.com.xml
@@ -1,46 +1,15 @@
 
 
-
-	
 	
 	
 	
 	
 	
+	
 	
 	
 	
@@ -48,18 +17,7 @@
 	
 	
 
+	
 
-	
-	
-	
-	
-	
-
-	
-
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/Jamendo.xml b/src/chrome/content/rules/Jamendo.xml
deleted file mode 100644
index 7989f37045d7..000000000000
--- a/src/chrome/content/rules/Jamendo.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/JamesVillas.co.uk.xml b/src/chrome/content/rules/JamesVillas.co.uk.xml
index 2cc17fdae573..96de1e0f29a3 100644
--- a/src/chrome/content/rules/JamesVillas.co.uk.xml
+++ b/src/chrome/content/rules/JamesVillas.co.uk.xml
@@ -1,5 +1,5 @@
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Jammerbugt.dk-mixedcontent.xml b/src/chrome/content/rules/Jammerbugt.dk-mixedcontent.xml
deleted file mode 100644
index 1f7925d14132..000000000000
--- a/src/chrome/content/rules/Jammerbugt.dk-mixedcontent.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Jammerbugt.dk.xml b/src/chrome/content/rules/Jammerbugt.dk.xml
index a811dc9a46da..3e2d75a916e3 100644
--- a/src/chrome/content/rules/Jammerbugt.dk.xml
+++ b/src/chrome/content/rules/Jammerbugt.dk.xml
@@ -1,14 +1,14 @@
 
 
+	
+	
 	
+	
 	
 	
 
diff --git a/src/chrome/content/rules/JanRain.xml b/src/chrome/content/rules/JanRain.xml
index cfd8c15bbb64..fd6847c03c94 100644
--- a/src/chrome/content/rules/JanRain.xml
+++ b/src/chrome/content/rules/JanRain.xml
@@ -1,57 +1,25 @@
 
-
-
-	
-	
-	
-
-
-	
-	
-
-
-	
-
-	
-	
-
-	
+
+	
+	
+	
+	
+	
+	
 
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/JanRainCapture.com.xml b/src/chrome/content/rules/JanRainCapture.com.xml
new file mode 100644
index 000000000000..e8205f1f0213
--- /dev/null
+++ b/src/chrome/content/rules/JanRainCapture.com.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Janalta.com.xml b/src/chrome/content/rules/Janalta.com.xml
index 829f2842cd55..ea06b97df612 100644
--- a/src/chrome/content/rules/Janalta.com.xml
+++ b/src/chrome/content/rules/Janalta.com.xml
@@ -8,7 +8,6 @@
 
 	Fully covered subdomains:
 
-		- ftp.amazonweb1
 		- cdn		(→ d2hcl8anv7xxg0.cloudfront.net)
 		- www
 
@@ -26,17 +25,10 @@
 
 -->
 
+	
+	
 
-	
-
-
-	
-
-
-	
-
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/JapanAirlines.xml b/src/chrome/content/rules/JapanAirlines.xml
deleted file mode 100644
index bbfe8e09c338..000000000000
--- a/src/chrome/content/rules/JapanAirlines.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-  
-  
-
-  
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/JapanTimes.co.jp.xml b/src/chrome/content/rules/JapanTimes.co.jp.xml
index 78611a8e6e58..2f872f9083ee 100644
--- a/src/chrome/content/rules/JapanTimes.co.jp.xml
+++ b/src/chrome/content/rules/JapanTimes.co.jp.xml
@@ -52,7 +52,7 @@ Fetch error: http://weekly.japantimes.co.jp/ => https://weekly.japantimes.co.jp/
 			 - club.japantimes.co.jp
 			 - spelling-bee.japantimes.co.jp
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Japanese-Communist-Party.xml b/src/chrome/content/rules/Japanese-Communist-Party.xml
new file mode 100644
index 000000000000..a753fac26f2e
--- /dev/null
+++ b/src/chrome/content/rules/Japanese-Communist-Party.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Japias.jp.xml b/src/chrome/content/rules/Japias.jp.xml
deleted file mode 100644
index 2a1b54aa5bb6..000000000000
--- a/src/chrome/content/rules/Japias.jp.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Jappix.xml b/src/chrome/content/rules/Jappix.xml
index 3dbde3fd7f99..a66e3ff96fdc 100644
--- a/src/chrome/content/rules/Jappix.xml
+++ b/src/chrome/content/rules/Jappix.xml
@@ -24,7 +24,7 @@ Fetch error: http://jappix.com/ => https://jappix.com/: (51, "SSL: no alternativ
 		- websocket
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Jarian_Gibson.com.xml b/src/chrome/content/rules/Jarian_Gibson.com.xml
index ffd290c5095a..4fe702d5def5 100644
--- a/src/chrome/content/rules/Jarian_Gibson.com.xml
+++ b/src/chrome/content/rules/Jarian_Gibson.com.xml
@@ -22,7 +22,7 @@ Fetch error: http://cdn.jariangibson.com/ => https://cdn.jariangibson.com/: (51,
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Jarir.com.xml b/src/chrome/content/rules/Jarir.com.xml
new file mode 100644
index 000000000000..5bab5d251599
--- /dev/null
+++ b/src/chrome/content/rules/Jarir.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Jaspan.com.xml b/src/chrome/content/rules/Jaspan.com.xml
index 5e04eb0aad83..f69656cba904 100644
--- a/src/chrome/content/rules/Jaspan.com.xml
+++ b/src/chrome/content/rules/Jaspan.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.jaspan.com/themes/acquia/acquia_marina/images/close-quot
 	www.jaspan.com: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Java.net.xml b/src/chrome/content/rules/Java.net.xml
index 364814f891d6..1cd0e38dcfd6 100644
--- a/src/chrome/content/rules/Java.net.xml
+++ b/src/chrome/content/rules/Java.net.xml
@@ -1,76 +1,33 @@
-
 
-
-
-	
+
 	
-	
-	
-	
-	
+	
+	
 	
-	
 	
+	
 	
 	
+	
+	
+	
+	
+	
+	
 	
 	
-	
-
-
-	
-	
-	
-	
 
 	
 
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/JavaLand.eu.xml b/src/chrome/content/rules/JavaLand.eu.xml
new file mode 100644
index 000000000000..7be607acc6ad
--- /dev/null
+++ b/src/chrome/content/rules/JavaLand.eu.xml
@@ -0,0 +1,17 @@
+
+
+
+	
+	
+	
+
+	
+    
+
+	
+
+
diff --git a/src/chrome/content/rules/JavaScriptIsSexy.com.xml b/src/chrome/content/rules/JavaScriptIsSexy.com.xml
new file mode 100644
index 000000000000..d4810d732d5f
--- /dev/null
+++ b/src/chrome/content/rules/JavaScriptIsSexy.com.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/JavaScriptMVC.xml b/src/chrome/content/rules/JavaScriptMVC.xml
index a208ffa56937..a75051dec30a 100644
--- a/src/chrome/content/rules/JavaScriptMVC.xml
+++ b/src/chrome/content/rules/JavaScriptMVC.xml
@@ -17,7 +17,8 @@ Fetch error: http://javascriptmvc.com/ => http://javascriptmvc.com/: Cycle detec
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Javacoolsoftware.com.xml b/src/chrome/content/rules/Javacoolsoftware.com.xml
index 3885b5d45bfc..625a27e76ed5 100644
--- a/src/chrome/content/rules/Javacoolsoftware.com.xml
+++ b/src/chrome/content/rules/Javacoolsoftware.com.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.javacoolsoftware.com/ => https://www.javacoolsoftware.com/: (28, 'Connection timed out after 10001 milliseconds')
 Fetch error: http://javacoolsoftware.com/ => https://www.javacoolsoftware.com/: (28, 'Connection timed out after 10000 milliseconds')
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/Javelin_Strategy.com.xml b/src/chrome/content/rules/Javelin_Strategy.com.xml
index d35aaad0314e..94b92850bd78 100644
--- a/src/chrome/content/rules/Javelin_Strategy.com.xml
+++ b/src/chrome/content/rules/Javelin_Strategy.com.xml
@@ -11,7 +11,8 @@
 
 
 	
-	
+	
+	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Jawbone.com.xml b/src/chrome/content/rules/Jawbone.com.xml
index b46be5103ec4..3ffaf3eed701 100644
--- a/src/chrome/content/rules/Jawbone.com.xml
+++ b/src/chrome/content/rules/Jawbone.com.xml
@@ -9,6 +9,10 @@
 
 			- forums
 
+	Non-functional hosts:
+		Timeout:
+		- jawbone.com
+
 
 	Partially covered subdomains:
 
@@ -47,18 +51,21 @@
 -->
 
 
-	
-	
+	
+	
+	
+	
+	
+	
+	
+	
 		
 
 
 	
 
 
-	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Jcloud.com.xml b/src/chrome/content/rules/Jcloud.com.xml
index b9cee53d1a81..24064a8259ca 100644
--- a/src/chrome/content/rules/Jcloud.com.xml
+++ b/src/chrome/content/rules/Jcloud.com.xml
@@ -1,88 +1,17 @@
-
 
-
-	
-	
-
-	
-	
-	
-	
-	
-		
-		
-		
-		
-		
-		
-		
-		
-	
-	
-	
-	
-		
-		
-		
-		
-		
-	
-	
-
+
+	
+	
 	
-	
+	
+	
+		
 	
-	
 	
-	
-	
 
 	
 
 	
-
 
diff --git a/src/chrome/content/rules/Jeena.net.xml b/src/chrome/content/rules/Jeena.net.xml
index f7c827dc49ee..b5522b3d0ae3 100644
--- a/src/chrome/content/rules/Jeena.net.xml
+++ b/src/chrome/content/rules/Jeena.net.xml
@@ -1,7 +1,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Jeep_Tops_Direct.com.xml b/src/chrome/content/rules/Jeep_Tops_Direct.com.xml
index 0885d7be6841..ee7b675f3ba9 100644
--- a/src/chrome/content/rules/Jeep_Tops_Direct.com.xml
+++ b/src/chrome/content/rules/Jeep_Tops_Direct.com.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Jeff_Mitchell.me.xml b/src/chrome/content/rules/Jeff_Mitchell.me.xml
index eee35af52bcb..bafc60678e8f 100644
--- a/src/chrome/content/rules/Jeff_Mitchell.me.xml
+++ b/src/chrome/content/rules/Jeff_Mitchell.me.xml
@@ -8,7 +8,7 @@ Fetch error: http://jeffmitchell.me/ => https://jeffmitchell.me/: (60, 'SSL cert
 	STS header includes includeSubdomains
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Jeff_Nabers.com-falsemixed.xml b/src/chrome/content/rules/Jeff_Nabers.com-falsemixed.xml
index 5d0227a3e031..20189d2a9e92 100644
--- a/src/chrome/content/rules/Jeff_Nabers.com-falsemixed.xml
+++ b/src/chrome/content/rules/Jeff_Nabers.com-falsemixed.xml
@@ -4,13 +4,10 @@
 -->
 
 
-	
+	
 
 
-	
 
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Jenkins-CI.org.xml b/src/chrome/content/rules/Jenkins-CI.org.xml
index 8202c8dead72..4cc3c296fb4a 100644
--- a/src/chrome/content/rules/Jenkins-CI.org.xml
+++ b/src/chrome/content/rules/Jenkins-CI.org.xml
@@ -1,59 +1,36 @@
 
 
 
 	
+	
+	
 	
+	
+	
+	
 	
 	
 	
-	
-
-
-	
-	
-	
-
-	
 
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Jenkins-X.io.xml b/src/chrome/content/rules/Jenkins-X.io.xml
new file mode 100644
index 000000000000..6ece69aa6c6f
--- /dev/null
+++ b/src/chrome/content/rules/Jenkins-X.io.xml
@@ -0,0 +1,13 @@
+
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Jennyvixenryan.com.xml b/src/chrome/content/rules/Jennyvixenryan.com.xml
new file mode 100644
index 000000000000..14ccec806734
--- /dev/null
+++ b/src/chrome/content/rules/Jennyvixenryan.com.xml
@@ -0,0 +1,5 @@
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/Jensge.org.xml b/src/chrome/content/rules/Jensge.org.xml
index 29828603ff60..2a18dbaa3574 100644
--- a/src/chrome/content/rules/Jensge.org.xml
+++ b/src/chrome/content/rules/Jensge.org.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.jensge.org/ => https://jensge.org/: (60, 'SSL certificat
 		- www	(mismatched, CN: www.webstreams.de)
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Jet2.com.xml b/src/chrome/content/rules/Jet2.com.xml
index 7972e1d70518..8f6834210d60 100644
--- a/src/chrome/content/rules/Jet2.com.xml
+++ b/src/chrome/content/rules/Jet2.com.xml
@@ -4,12 +4,13 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://jet2.com/ => https://www.jet2.com/: Too many redirects while fetching 'https://www.jet2.com/'
 
 -->
-
+
   
-  
+  
+  
+  
 
   
-  
-
\ No newline at end of file
+  
+
diff --git a/src/chrome/content/rules/JetBrains.com-falsemixed.xml b/src/chrome/content/rules/JetBrains.com-falsemixed.xml
deleted file mode 100644
index 177fc11a6bc0..000000000000
--- a/src/chrome/content/rules/JetBrains.com-falsemixed.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-	
-	
-
-	
-	
-
-		
-		
-
-			
-			
-			
-			
-			
-			
-
-			
-			
-
-
-	
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/JetBrains.com.xml b/src/chrome/content/rules/JetBrains.com.xml
new file mode 100644
index 000000000000..4ab1561f441d
--- /dev/null
+++ b/src/chrome/content/rules/JetBrains.com.xml
@@ -0,0 +1,54 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/JetBrains.xml b/src/chrome/content/rules/JetBrains.xml
deleted file mode 100644
index c24b3cf2c91e..000000000000
--- a/src/chrome/content/rules/JetBrains.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-
-		
-		
-
-			
-			
-			
-			
-			
-			
-
-			
-			
-
-		
-
-			
-			
-			
-			
-			
-			
-
-			
-			
-
-		
-
-			
-			
-			
-			
-			
-
-			
-			
-			
-
-			
-			
-
-			
-
-
-	
-	
-	
-	
-
-	
-
-
-	
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Jetico.com.xml b/src/chrome/content/rules/Jetico.com.xml
index 7087a2245b58..2b13eb4d2b22 100644
--- a/src/chrome/content/rules/Jetico.com.xml
+++ b/src/chrome/content/rules/Jetico.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://jetico.com/ => https://jetico.com/: (51, "SSL: no alternativ
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Jewel_Osco.com.xml b/src/chrome/content/rules/Jewel_Osco.com.xml
index 06ae7d28007b..15c764b0f7c5 100644
--- a/src/chrome/content/rules/Jewel_Osco.com.xml
+++ b/src/chrome/content/rules/Jewel_Osco.com.xml
@@ -21,7 +21,7 @@ Fetch error: http://jewelosco.com/ => https://jewelosco.com/: (51, "SSL: no alte
 	² Unsecurable <= refused
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/JewishPress.com.xml b/src/chrome/content/rules/JewishPress.com.xml
index 0ec81a4ae059..0913904a1a84 100644
--- a/src/chrome/content/rules/JewishPress.com.xml
+++ b/src/chrome/content/rules/JewishPress.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.jewishpress.com/ => https://www.jewishpress.com/: (7, 'F
 		- i[012].wp.com/www.jewishpress.com/
 
 -->
-
+
 
 	
 	
@@ -20,4 +20,4 @@ Fetch error: http://www.jewishpress.com/ => https://www.jewishpress.com/: (7, 'F
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Jezebel.com.xml b/src/chrome/content/rules/Jezebel.com.xml
deleted file mode 100644
index 9ff84bdec4b2..000000000000
--- a/src/chrome/content/rules/Jezebel.com.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/JiWire.xml b/src/chrome/content/rules/JiWire.xml
index 9a3477c31ca3..b9781d9766cf 100644
--- a/src/chrome/content/rules/JiWire.xml
+++ b/src/chrome/content/rules/JiWire.xml
@@ -33,10 +33,16 @@ Fetch error: http://jiwire.com/ => https://www.jiwire.com/: (60, 'SSL certificat
 		- v4
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
@@ -45,7 +51,6 @@ Fetch error: http://jiwire.com/ => https://www.jiwire.com/: (60, 'SSL certificat
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/JianGuoYun.xml b/src/chrome/content/rules/JianGuoYun.xml
index 33dc469a0491..98eb6f6206cb 100644
--- a/src/chrome/content/rules/JianGuoYun.xml
+++ b/src/chrome/content/rules/JianGuoYun.xml
@@ -14,7 +14,6 @@
 
 	  
 		
-		
 		
 		
 
diff --git a/src/chrome/content/rules/Jigsaw.xml b/src/chrome/content/rules/Jigsaw.xml
deleted file mode 100644
index b7867b9f1074..000000000000
--- a/src/chrome/content/rules/Jigsaw.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Jim_static.com.xml b/src/chrome/content/rules/Jim_static.com.xml
deleted file mode 100644
index cb8d6fda0173..000000000000
--- a/src/chrome/content/rules/Jim_static.com.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Jimcdn.com.xml b/src/chrome/content/rules/Jimcdn.com.xml
new file mode 100644
index 000000000000..8dd6d53269d8
--- /dev/null
+++ b/src/chrome/content/rules/Jimcdn.com.xml
@@ -0,0 +1,19 @@
+
+
+
+
+	
+	
+	
+
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Jimdo-Server.com.xml b/src/chrome/content/rules/Jimdo-Server.com.xml
new file mode 100644
index 000000000000..498d64a08156
--- /dev/null
+++ b/src/chrome/content/rules/Jimdo-Server.com.xml
@@ -0,0 +1,23 @@
+
+
+
+
+	
+	
+	
+	
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Jimdo.design.xml b/src/chrome/content/rules/Jimdo.design.xml
new file mode 100644
index 000000000000..89aa5ed44484
--- /dev/null
+++ b/src/chrome/content/rules/Jimdo.design.xml
@@ -0,0 +1,15 @@
+
+
+
+
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Jimdo.xml b/src/chrome/content/rules/Jimdo.xml
index 7d9eddf5cb9b..13c95c3b0a2b 100644
--- a/src/chrome/content/rules/Jimdo.xml
+++ b/src/chrome/content/rules/Jimdo.xml
@@ -1,46 +1,23 @@
 
 
-
-
-	
-	
-	
-	
-
-
-	
-	
-	
-	
+
 
-	
+	
+	
+			
+			
+			
+			
 
+	
 
 	
diff --git a/src/chrome/content/rules/Jimg.dk.xml b/src/chrome/content/rules/Jimg.dk.xml
index d4d079ed6297..302cd2ef30bd 100644
--- a/src/chrome/content/rules/Jimg.dk.xml
+++ b/src/chrome/content/rules/Jimg.dk.xml
@@ -13,7 +13,7 @@ Fetch error: http://jimg.dk/ => https://jimg.dk/: (51, "SSL: no alternative cert
 		- z
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Jimstatic.com.xml b/src/chrome/content/rules/Jimstatic.com.xml
new file mode 100644
index 000000000000..595cf2b3a951
--- /dev/null
+++ b/src/chrome/content/rules/Jimstatic.com.xml
@@ -0,0 +1,21 @@
+
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Jit.su.xml b/src/chrome/content/rules/Jit.su.xml
index 3203f6f52037..d471423ff066 100644
--- a/src/chrome/content/rules/Jit.su.xml
+++ b/src/chrome/content/rules/Jit.su.xml
@@ -8,7 +8,7 @@ Fetch error: http://xmpp-ftw.jit.su/ => https://xmpp-ftw.jit.su/: (7, 'Failed to
 	For other GoDaddy coverage, see GoDaddy.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Jitscale.com-falsemixed.xml b/src/chrome/content/rules/Jitscale.com-falsemixed.xml
index be515d96868f..1f5776fa030d 100644
--- a/src/chrome/content/rules/Jitscale.com-falsemixed.xml
+++ b/src/chrome/content/rules/Jitscale.com-falsemixed.xml
@@ -13,4 +13,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Jitscale.com.xml b/src/chrome/content/rules/Jitscale.com.xml
index 80a638e4ba69..455e762aecf9 100644
--- a/src/chrome/content/rules/Jitscale.com.xml
+++ b/src/chrome/content/rules/Jitscale.com.xml
@@ -51,4 +51,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Jive.com.xml b/src/chrome/content/rules/Jive.com.xml
index 3a4a78d48062..2220ce69eaf8 100644
--- a/src/chrome/content/rules/Jive.com.xml
+++ b/src/chrome/content/rules/Jive.com.xml
@@ -19,7 +19,7 @@
 	² Server sends no certificate chain
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Jjslinterrors.com.xml b/src/chrome/content/rules/Jjslinterrors.com.xml
index 743b88cebfd6..60abd79ce6a9 100644
--- a/src/chrome/content/rules/Jjslinterrors.com.xml
+++ b/src/chrome/content/rules/Jjslinterrors.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.jslinterrors.com/ => https://www.jslinterrors.com/: (28,
   Notes:
   - Cloudflare SSL
 -->
-
+
     
     
 
diff --git a/src/chrome/content/rules/Jku.at.xml b/src/chrome/content/rules/Jku.at.xml
new file mode 100644
index 000000000000..0d90eef00c33
--- /dev/null
+++ b/src/chrome/content/rules/Jku.at.xml
@@ -0,0 +1,31 @@
+
+	
+	
+
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/JobCloud.ch.xml b/src/chrome/content/rules/JobCloud.ch.xml
new file mode 100644
index 000000000000..0174bab69b06
--- /dev/null
+++ b/src/chrome/content/rules/JobCloud.ch.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Job_a_matic.com.xml b/src/chrome/content/rules/Job_a_matic.com.xml
index d81958f5121d..083a6f006412 100644
--- a/src/chrome/content/rules/Job_a_matic.com.xml
+++ b/src/chrome/content/rules/Job_a_matic.com.xml
@@ -23,7 +23,7 @@ Fetch error: http://jobamatic.com/ => https://jobamatic.com/: (7, 'Failed to con
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Jobindex.dk.xml b/src/chrome/content/rules/Jobindex.dk.xml
deleted file mode 100644
index 4fe7a4b2e326..000000000000
--- a/src/chrome/content/rules/Jobindex.dk.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-  
-  
-  
-  
-  
-  
-
-  
-
-  
-
diff --git a/src/chrome/content/rules/Jobs2Web.xml b/src/chrome/content/rules/Jobs2Web.xml
index 6ba13be9711b..dbbf9f1a29c5 100644
--- a/src/chrome/content/rules/Jobs2Web.xml
+++ b/src/chrome/content/rules/Jobs2Web.xml
@@ -14,13 +14,13 @@ Fetch error: http://jobs2web.com/ => https://jobs2web.com/: (51, "SSL: no altern
 			- \w+		(per-client subdomains)
 
 -->
-
+
 
 	
 	
 
 
-	
+	
 
 
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Jobsgopublic.com.xml b/src/chrome/content/rules/Jobsgopublic.com.xml
index 9dc71c6a4781..becaf5d906e6 100644
--- a/src/chrome/content/rules/Jobsgopublic.com.xml
+++ b/src/chrome/content/rules/Jobsgopublic.com.xml
@@ -18,10 +18,11 @@
 
 
 	
-	
+	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Jobsite.com.xml b/src/chrome/content/rules/Jobsite.com.xml
index 6ed7d83f8fc5..6ba2be5ba66f 100644
--- a/src/chrome/content/rules/Jobsite.com.xml
+++ b/src/chrome/content/rules/Jobsite.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://jobsite.com/ => https://jobsite.com/: (51, "SSL: no alternat
 Fetch error: http://www.jobsite.com/ => https://www.jobsite.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.jobsite.com'")
 
 -->
-
+
 
 	
 	
@@ -13,4 +13,4 @@ Fetch error: http://www.jobsite.com/ => https://www.jobsite.com/: (51, "SSL: no
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Jobvite.xml b/src/chrome/content/rules/Jobvite.xml
index ca3b8378495b..85dea3f4d7b0 100644
--- a/src/chrome/content/rules/Jobvite.xml
+++ b/src/chrome/content/rules/Jobvite.xml
@@ -1,15 +1,13 @@
 
 
-
+
 
 	
 	
 	
 	
-	
 	
 	
 	
@@ -73,24 +70,6 @@ Non-2xx HTTP code: http://web.jobvite.com/rs/jobvite/images/jobvite-logo-gunmeta
 			
 			
 
-	
-	
-
-		
-
-			
-			
-			
-			
-
-			
-			
-			
-
-
 	
 	
@@ -102,9 +81,6 @@ Non-2xx HTTP code: http://web.jobvite.com/rs/jobvite/images/jobvite-logo-gunmeta
 	
 
 
-	
-
 	
 
diff --git a/src/chrome/content/rules/Jobzonen.xml b/src/chrome/content/rules/Jobzonen.xml
index 40e9fced6ce1..60faf01c6df8 100644
--- a/src/chrome/content/rules/Jobzonen.xml
+++ b/src/chrome/content/rules/Jobzonen.xml
@@ -7,7 +7,7 @@ Fetch error: http://arbejdsgiver.jobzonen.dk/ => https://arbejdsgiver.jobzonen.d
 
 	Note: https://jobzonen.dk (without the www) redirects to its http counterpart.
 
-	Not included:	
+	Not included:
 		kursuszonen.dk (cert expired)
 		analytics.clickdimensions.com/ (used for newsletter)¹
 		business.jobzonen.dk (bad cert)
@@ -16,7 +16,7 @@ Fetch error: http://arbejdsgiver.jobzonen.dk/ => https://arbejdsgiver.jobzonen.d
            fails as mixed content. Interestingly, the same problem does not
 	   occur on arbejdsgiver.jobzonen.dk.
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/JodoHost.xml b/src/chrome/content/rules/JodoHost.xml
index cf4f2cbd815f..70b490782779 100644
--- a/src/chrome/content/rules/JodoHost.xml
+++ b/src/chrome/content/rules/JodoHost.xml
@@ -7,7 +7,8 @@
 
 
 	
-	
+	
+	
 	
 
 
@@ -15,13 +16,6 @@
 	
 
 
-	
+	
 
-	
-
-	
-
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/JoeRockHeads.com.xml b/src/chrome/content/rules/JoeRockHeads.com.xml
new file mode 100644
index 000000000000..d24941e26861
--- /dev/null
+++ b/src/chrome/content/rules/JoeRockHeads.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/JoeyH.name.xml b/src/chrome/content/rules/JoeyH.name.xml
index b04da5c99ece..7809cc304e6a 100644
--- a/src/chrome/content/rules/JoeyH.name.xml
+++ b/src/chrome/content/rules/JoeyH.name.xml
@@ -12,4 +12,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Johnson-King.xml b/src/chrome/content/rules/Johnson-King.xml
index a9566f31259c..4aa99a68638d 100644
--- a/src/chrome/content/rules/Johnson-King.xml
+++ b/src/chrome/content/rules/Johnson-King.xml
@@ -2,9 +2,9 @@
 
 	
 	
-	
+	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Johnson_Press.xml b/src/chrome/content/rules/Johnson_Press.xml
index 203ed8551aab..8eb6fcfd3193 100644
--- a/src/chrome/content/rules/Johnson_Press.xml
+++ b/src/chrome/content/rules/Johnson_Press.xml
@@ -12,7 +12,7 @@ Fetch error: http://remote.jpress.co.uk/ => https://remote.jpress.co.uk/: (28, '
 		- www.johnstonpress.co.uk	(refused)
 
 -->
-
+
 
 	
 	
@@ -23,4 +23,4 @@ Fetch error: http://remote.jpress.co.uk/ => https://remote.jpress.co.uk/: (28, '
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Johoobuy.com.xml b/src/chrome/content/rules/Johoobuy.com.xml
index 884131f303cc..a807d7fc0859 100644
--- a/src/chrome/content/rules/Johoobuy.com.xml
+++ b/src/chrome/content/rules/Johoobuy.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.johoobuy.com/ => https://www.johoobuy.com/: (28, 'Connec
 	^: dropped
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Joico.com.xml b/src/chrome/content/rules/Joico.com.xml
new file mode 100644
index 000000000000..f361ddfd4745
--- /dev/null
+++ b/src/chrome/content/rules/Joico.com.xml
@@ -0,0 +1,17 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/JoinMastodon.org.xml b/src/chrome/content/rules/JoinMastodon.org.xml
index 379444198577..bd405f3c8cb8 100644
--- a/src/chrome/content/rules/JoinMastodon.org.xml
+++ b/src/chrome/content/rules/JoinMastodon.org.xml
@@ -1,6 +1,7 @@
 
 	
 	
+	
 	
 	
 
diff --git a/src/chrome/content/rules/JoinUs.Today.xml b/src/chrome/content/rules/JoinUs.Today.xml
index e069a80fbf70..ecab144ff789 100644
--- a/src/chrome/content/rules/JoinUs.Today.xml
+++ b/src/chrome/content/rules/JoinUs.Today.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.joinus.today/ => https://www.joinus.today/: (60, 'SSL ce
 	For other TransIP coverage, see TransIP.nl.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Joinos.com.xml b/src/chrome/content/rules/Joinos.com.xml
index cd7cb670d6b4..19c425800053 100644
--- a/src/chrome/content/rules/Joinos.com.xml
+++ b/src/chrome/content/rules/Joinos.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://joinos.com/ => https://joinos.com/: (7, 'Failed to connect t
 		- pay.joinos.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/JonDos.xml b/src/chrome/content/rules/JonDos.xml
index e3456d185807..01d6d2894af8 100644
--- a/src/chrome/content/rules/JonDos.xml
+++ b/src/chrome/content/rules/JonDos.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.jondos.org/ => https://www.jondos.org/: (7, 'Failed to c
 		- IP_check.xml
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Joomag.com.xml b/src/chrome/content/rules/Joomag.com.xml
index 9248d424dd63..7906ae8c1d19 100644
--- a/src/chrome/content/rules/Joomag.com.xml
+++ b/src/chrome/content/rules/Joomag.com.xml
@@ -18,7 +18,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
-
-
+
 	
 	
+	
 
-
-	
-
-
-	
-
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Joseph-Rowntree-Reform-Trust-mismatches.xml b/src/chrome/content/rules/Joseph-Rowntree-Reform-Trust-mismatches.xml
index d1aaccb282a9..9b79fcd70d02 100644
--- a/src/chrome/content/rules/Joseph-Rowntree-Reform-Trust-mismatches.xml
+++ b/src/chrome/content/rules/Joseph-Rowntree-Reform-Trust-mismatches.xml
@@ -9,7 +9,7 @@
 	
-	
+	
 		
diff --git a/src/chrome/content/rules/JotForm.xml b/src/chrome/content/rules/JotForm.xml
index 3417b200e423..4894bbc21c5f 100644
--- a/src/chrome/content/rules/JotForm.xml
+++ b/src/chrome/content/rules/JotForm.xml
@@ -21,9 +21,10 @@
 
 	
 	
-	
+	
 	
-	
+	
+	
 
 
 	
@@ -38,7 +39,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Jottit.com.xml b/src/chrome/content/rules/Jottit.com.xml
deleted file mode 100644
index 69bb06ea137f..000000000000
--- a/src/chrome/content/rules/Jottit.com.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-	
-	
-	
-		
-		
-		
-		
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Journal-News.net-problematic.xml b/src/chrome/content/rules/Journal-News.net-problematic.xml
index e905b84e6517..b98c63abf68b 100644
--- a/src/chrome/content/rules/Journal-News.net-problematic.xml
+++ b/src/chrome/content/rules/Journal-News.net-problematic.xml
@@ -4,13 +4,13 @@
 -->
 
 
-	
+	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Journal-of-Bodywork-and-Movement-Therapies.xml b/src/chrome/content/rules/Journal-of-Bodywork-and-Movement-Therapies.xml
index 761fe96720c4..69f69e4138a8 100644
--- a/src/chrome/content/rules/Journal-of-Bodywork-and-Movement-Therapies.xml
+++ b/src/chrome/content/rules/Journal-of-Bodywork-and-Movement-Therapies.xml
@@ -7,7 +7,7 @@
 	
 	
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Journal_of_Affective_Disorders.xml b/src/chrome/content/rules/Journal_of_Affective_Disorders.xml
index 3abbcb6c8f52..589d22f0425d 100644
--- a/src/chrome/content/rules/Journal_of_Affective_Disorders.xml
+++ b/src/chrome/content/rules/Journal_of_Affective_Disorders.xml
@@ -7,7 +7,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Journal_of_Clinical_Investigation.xml b/src/chrome/content/rules/Journal_of_Clinical_Investigation.xml
index 68b285d47eb5..8d6a27e5f3ee 100644
--- a/src/chrome/content/rules/Journal_of_Clinical_Investigation.xml
+++ b/src/chrome/content/rules/Journal_of_Clinical_Investigation.xml
@@ -18,4 +18,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Journeyed.com.xml b/src/chrome/content/rules/Journeyed.com.xml
index 84847cb62e1a..353c3f723689 100644
--- a/src/chrome/content/rules/Journeyed.com.xml
+++ b/src/chrome/content/rules/Journeyed.com.xml
@@ -1,7 +1,22 @@
-
-  
-  
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
 
-  
 
-
diff --git a/src/chrome/content/rules/Joyent_Cloud.com.xml b/src/chrome/content/rules/Joyent_Cloud.com.xml
index e60a574894e3..82a0c5671e01 100644
--- a/src/chrome/content/rules/Joyent_Cloud.com.xml
+++ b/src/chrome/content/rules/Joyent_Cloud.com.xml
@@ -24,7 +24,7 @@ Fetch error: http://my.joyentcloud.com/ => https://my.joyentcloud.com/: (60, 'SS
 	* Mismatched
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Jsclasses.org.xml b/src/chrome/content/rules/Jsclasses.org.xml
index 6afaa57ecf4a..eb0c58c6ddbb 100644
--- a/src/chrome/content/rules/Jsclasses.org.xml
+++ b/src/chrome/content/rules/Jsclasses.org.xml
@@ -7,7 +7,7 @@ safe.jsclasses.net mismatch-->
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Jtlebi.fr.xml b/src/chrome/content/rules/Jtlebi.fr.xml
deleted file mode 100644
index 4350a61043a9..000000000000
--- a/src/chrome/content/rules/Jtlebi.fr.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Jubii.dk.xml b/src/chrome/content/rules/Jubii.dk.xml
index 0dd2641bba81..a64b79f7316c 100644
--- a/src/chrome/content/rules/Jubii.dk.xml
+++ b/src/chrome/content/rules/Jubii.dk.xml
@@ -46,7 +46,8 @@
 -->
 
 
-	
+	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Judicial_Watch.xml b/src/chrome/content/rules/Judicial_Watch.xml
index 195426a2d04b..fff0bb6eb5f0 100644
--- a/src/chrome/content/rules/Judicial_Watch.xml
+++ b/src/chrome/content/rules/Judicial_Watch.xml
@@ -5,7 +5,7 @@ Fetch error: http://judicialwatch.org/ => https://judicialwatch.org/: Too many r
 Fetch error: http://www.judicialwatch.org/ => https://www.judicialwatch.org/: Too many redirects while fetching 'https://www.judicialwatch.org/'
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.judicialwatch.org/ => https://www.judicialwatch.org/: To
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Jugendaemter.com.xml b/src/chrome/content/rules/Jugendaemter.com.xml
new file mode 100644
index 000000000000..5844a7afafb5
--- /dev/null
+++ b/src/chrome/content/rules/Jugendaemter.com.xml
@@ -0,0 +1,9 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Jugendschutzprogramm.de.xml b/src/chrome/content/rules/Jugendschutzprogramm.de.xml
index 5813fc95670e..08a8e4e40f12 100644
--- a/src/chrome/content/rules/Jugendschutzprogramm.de.xml
+++ b/src/chrome/content/rules/Jugendschutzprogramm.de.xml
@@ -1,5 +1,5 @@
 
 
-	
+
 
 
diff --git a/src/chrome/content/rules/Jugger.ru.xml b/src/chrome/content/rules/Jugger.ru.xml
index d7cf8cd1b914..25461aa9ec05 100644
--- a/src/chrome/content/rules/Jugger.ru.xml
+++ b/src/chrome/content/rules/Jugger.ru.xml
@@ -22,7 +22,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Juliar.xml b/src/chrome/content/rules/Juliar.xml
index 415fadd779e6..6a9311a72c6d 100644
--- a/src/chrome/content/rules/Juliar.xml
+++ b/src/chrome/content/rules/Juliar.xml
@@ -2,7 +2,7 @@
 	
 	
 	
-	
+
 	
 	
- 
\ No newline at end of file
+ 
diff --git a/src/chrome/content/rules/Jumio.xml b/src/chrome/content/rules/Jumio.xml
index 52f5e7adb31c..1392cd3a49f9 100644
--- a/src/chrome/content/rules/Jumio.xml
+++ b/src/chrome/content/rules/Jumio.xml
@@ -17,12 +17,16 @@ Fetch error: http://netswipe.com/ => https://netswipe.com/: Cycle detected - URL
 		- (www.)jumio.com
 
 -->
-
+
 
 	
-	
+	
+	
+	
 	
-	
+	
+	
+	
 
 
 	
@@ -31,7 +35,6 @@ Fetch error: http://netswipe.com/ => https://netswipe.com/: Cycle detected - URL
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/JumpingJack.xml b/src/chrome/content/rules/JumpingJack.xml
index 5f4c60aea024..e9c34f5b5269 100644
--- a/src/chrome/content/rules/JumpingJack.xml
+++ b/src/chrome/content/rules/JumpingJack.xml
@@ -6,20 +6,17 @@ Fetch error: http://images.jitsmart.com/ => https://images.jitsmart.com/: (6, 'C
 Disabled by https-everywhere-checker because:
 Fetch error: http://images.jitsmart.com/ => https://images.jitsmart.com/: (28, 'Connection timed out after 10000 milliseconds')
 -->
-
+
 
 	
 	
-	
+	
+	
 
 
 	
 
 
-	
+	
 
-	
-
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Junge-Piraten.de.xml b/src/chrome/content/rules/Junge-Piraten.de.xml
index 15e3100b3e61..9f44d9f1bdd0 100644
--- a/src/chrome/content/rules/Junge-Piraten.de.xml
+++ b/src/chrome/content/rules/Junge-Piraten.de.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.junge-piraten.de/ => https://www.junge-piraten.de/: (51,
 	For other Pirate Party coverage, see PirateParty.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Junglee.com.xml b/src/chrome/content/rules/Junglee.com.xml
deleted file mode 100644
index 725f2a1f2249..000000000000
--- a/src/chrome/content/rules/Junglee.com.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
-	
-	
-	
-	
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Juniper-Research.xml b/src/chrome/content/rules/Juniper-Research.xml
index 5fe5f868ed9a..8b73c78ffca4 100644
--- a/src/chrome/content/rules/Juniper-Research.xml
+++ b/src/chrome/content/rules/Juniper-Research.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://juniperresearch.com/ => https://junipersearch.com/: (28, 'Connection timed out after 10001 milliseconds')
 Fetch error: http://www.juniperresearch.com/ => https://www.junipersearch.com/: (28, 'Connection timed out after 10000 milliseconds')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Junkudo.xml b/src/chrome/content/rules/Junkudo.xml
new file mode 100644
index 000000000000..8d5b90771d37
--- /dev/null
+++ b/src/chrome/content/rules/Junkudo.xml
@@ -0,0 +1,6 @@
+
+    
+    
+
+    
+
diff --git a/src/chrome/content/rules/JunoDownload.xml b/src/chrome/content/rules/JunoDownload.xml
deleted file mode 100644
index 06ddb8653e65..000000000000
--- a/src/chrome/content/rules/JunoDownload.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-  
-  
-  
-
-
-	
-	
-
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
diff --git a/src/chrome/content/rules/JunoRecords.xml b/src/chrome/content/rules/JunoRecords.xml
deleted file mode 100644
index 2abc7adcd2b5..000000000000
--- a/src/chrome/content/rules/JunoRecords.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-	
-	
-		
-		
-	
-	
-
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Jupiter_Artland.org.xml b/src/chrome/content/rules/Jupiter_Artland.org.xml
index ac84e9a925e9..01e428651611 100644
--- a/src/chrome/content/rules/Jupiter_Artland.org.xml
+++ b/src/chrome/content/rules/Jupiter_Artland.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Non-2xx HTTP code: http://jupiterartland.org/ (200) => https://jupiterartland.org/ (404)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Jussieu.fr.xml b/src/chrome/content/rules/Jussieu.fr.xml
index 73bd1921a59f..bf617f9e9ab5 100644
--- a/src/chrome/content/rules/Jussieu.fr.xml
+++ b/src/chrome/content/rules/Jussieu.fr.xml
@@ -30,7 +30,7 @@ Fetch error: http://forge.ipsl.jussieu.fr/ => https://forge.ipsl.jussieu.fr/: (6
 	* Unsecurable <= refused
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Just-Develop-It.xml b/src/chrome/content/rules/Just-Develop-It.xml
index 7979423e3a3c..3c6dda5d0596 100644
--- a/src/chrome/content/rules/Just-Develop-It.xml
+++ b/src/chrome/content/rules/Just-Develop-It.xml
@@ -16,7 +16,7 @@ Fetch error: http://zipcloud.com/ => https://zipcloud.com/: Redirect for 'http:/
 		- justcloud.com.xml
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Just-Extend.com.xml b/src/chrome/content/rules/Just-Extend.com.xml
new file mode 100644
index 000000000000..0b79552d9bab
--- /dev/null
+++ b/src/chrome/content/rules/Just-Extend.com.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/JustApple.com.xml b/src/chrome/content/rules/JustApple.com.xml
deleted file mode 100644
index 9dc321daa625..000000000000
--- a/src/chrome/content/rules/JustApple.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/JustGiving.xml b/src/chrome/content/rules/JustGiving.xml
index d2f61584f5a9..0d4279e82ac0 100644
--- a/src/chrome/content/rules/JustGiving.xml
+++ b/src/chrome/content/rules/JustGiving.xml
@@ -46,7 +46,7 @@ Non-2xx HTTP code: http://pages.justgiving.com/css/mktLPSupport.css (200) => htt
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/JustTomatoes.com.xml b/src/chrome/content/rules/JustTomatoes.com.xml
index e0df0ebb1ee7..db84b6303515 100644
--- a/src/chrome/content/rules/JustTomatoes.com.xml
+++ b/src/chrome/content/rules/JustTomatoes.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://justtomatoes.com/ => https://www.justtomatoes.com/: (60, 'SS
 Fetch error: http://www.justtomatoes.com/ => https://www.justtomatoes.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Justaguy.pw.xml b/src/chrome/content/rules/Justaguy.pw.xml
index 38bc5f2c6de9..b4fef9bbfaea 100644
--- a/src/chrome/content/rules/Justaguy.pw.xml
+++ b/src/chrome/content/rules/Justaguy.pw.xml
@@ -6,7 +6,7 @@ Fetch error: http://services.justaguy.pw/ => https://services.justaguy.pw/: (28,
 Fetch error: http://www.justaguy.pw/ => https://www.justaguy.pw/: (6, 'Could not resolve host: www.justaguy.pw')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Justia.com.xml b/src/chrome/content/rules/Justia.com.xml
new file mode 100644
index 000000000000..e2a3241431f6
--- /dev/null
+++ b/src/chrome/content/rules/Justia.com.xml
@@ -0,0 +1,161 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Justia.xml b/src/chrome/content/rules/Justia.xml
deleted file mode 100644
index a387ab535baa..000000000000
--- a/src/chrome/content/rules/Justia.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/JusticeForKatie.com.xml b/src/chrome/content/rules/JusticeForKatie.com.xml
deleted file mode 100644
index 146b4f40c642..000000000000
--- a/src/chrome/content/rules/JusticeForKatie.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/JusticeForStrumia.org.xml b/src/chrome/content/rules/JusticeForStrumia.org.xml
new file mode 100644
index 000000000000..e1033b864d64
--- /dev/null
+++ b/src/chrome/content/rules/JusticeForStrumia.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/JusticeMail.xml b/src/chrome/content/rules/JusticeMail.xml
index 55706efec13f..84f126fc9581 100644
--- a/src/chrome/content/rules/JusticeMail.xml
+++ b/src/chrome/content/rules/JusticeMail.xml
@@ -6,8 +6,8 @@ Fetch error: http://mail.justice.com/ => https://mail.justice.com/: (51, "SSL: n
 Disabled by https-everywhere-checker because:
 Fetch error: http://mail.justice.com/ => https://mail.justice.com/: (51, "SSL: no alternative certificate subject name matches target host name 'mail.justice.com'")
 -->
-
+
   
-  
+  
   
 
diff --git a/src/chrome/content/rules/KAKAO.com.xml b/src/chrome/content/rules/KAKAO.com.xml
new file mode 100644
index 000000000000..ff212dd24b21
--- /dev/null
+++ b/src/chrome/content/rules/KAKAO.com.xml
@@ -0,0 +1,13 @@
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/KAKAO.xml b/src/chrome/content/rules/KAKAO.xml
deleted file mode 100644
index bfd29460e6f4..000000000000
--- a/src/chrome/content/rules/KAKAO.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/KAU.se-problematic.xml b/src/chrome/content/rules/KAU.se-problematic.xml
index 28dde6a21851..89f5dbb47269 100644
--- a/src/chrome/content/rules/KAU.se-problematic.xml
+++ b/src/chrome/content/rules/KAU.se-problematic.xml
@@ -5,13 +5,12 @@
 
 
 	
-	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/KD2.us.xml b/src/chrome/content/rules/KD2.us.xml
index eaa520ea34b2..0aadd2fe1bcd 100644
--- a/src/chrome/content/rules/KD2.us.xml
+++ b/src/chrome/content/rules/KD2.us.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.kd2.us/ => https://www.kd2.us/: (51, "SSL: no alternativ
 		- (www.)?
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/KEMI.se.xml b/src/chrome/content/rules/KEMI.se.xml
index eabd65ce62ea..1eb8cd759859 100644
--- a/src/chrome/content/rules/KEMI.se.xml
+++ b/src/chrome/content/rules/KEMI.se.xml
@@ -5,7 +5,7 @@ Fetch error: http://kemi.se/ => https://kemi.se/: (60, 'SSL certificate problem:
 Fetch error: http://www.kemi.se/ => https://www.kemi.se/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/KETrade.com.sg.xml b/src/chrome/content/rules/KETrade.com.sg.xml
new file mode 100644
index 000000000000..3f5bb21857a7
--- /dev/null
+++ b/src/chrome/content/rules/KETrade.com.sg.xml
@@ -0,0 +1,30 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/KH.hu.xml b/src/chrome/content/rules/KH.hu.xml
index 371b5dd51d15..22428eda35f0 100644
--- a/src/chrome/content/rules/KH.hu.xml
+++ b/src/chrome/content/rules/KH.hu.xml
@@ -5,7 +5,7 @@ Fetch error: http://mi-vsp2.kh.hu/ => https://mi-vsp2.kh.hu/: (35, 'Unknown SSL
 
 
 	Valid site, broken https:
-	
+
 		Timeout:
 			- aliases.kh.hu
 			- khb.hu (redirects www.khb.hu)
@@ -20,7 +20,7 @@ Fetch error: http://mi-vsp2.kh.hu/ => https://mi-vsp2.kh.hu/: (35, 'Unknown SSL
 		Timeout:
 			- rtitest.kh.hu
 			- biztosnetwsact.kh.hu
-	
+
 		Invalid certificate:
 			- mi-sentry-test.kh.hu (http redirects to https)
 			- edma.khb.hu (http timeout)
@@ -29,7 +29,7 @@ Fetch error: http://mi-vsp2.kh.hu/ => https://mi-vsp2.kh.hu/: (35, 'Unknown SSL
 			- im.kh.hu (http empty)
 
 -->
-
+
 	
 	
 	
@@ -73,7 +73,7 @@ Fetch error: http://mi-vsp2.kh.hu/ => https://mi-vsp2.kh.hu/: (35, 'Unknown SSL
 			to="https://szepkartya.kh.hu/" />
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/KHN.nl.xml b/src/chrome/content/rules/KHN.nl.xml
deleted file mode 100644
index 271e172d4007..000000000000
--- a/src/chrome/content/rules/KHN.nl.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/KHOC.co.xml b/src/chrome/content/rules/KHOC.co.xml
index 110d02058675..620d14af115f 100644
--- a/src/chrome/content/rules/KHOC.co.xml
+++ b/src/chrome/content/rules/KHOC.co.xml
@@ -23,10 +23,10 @@ Fetch error: http://khoc.co/ => https://www.khoc.co/: (7, 'Failed to connect to
 	* Secured by us
 
 -->
-
+
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/KI.se.xml b/src/chrome/content/rules/KI.se.xml
index d45c725149e0..26fc8742ccb7 100644
--- a/src/chrome/content/rules/KI.se.xml
+++ b/src/chrome/content/rules/KI.se.xml
@@ -14,7 +14,7 @@ Fetch error: http://fonder.ki.se/ => https://fonder.ki.se/: (28, 'Operation time
 Fetch error: http://kib.ki.se/ => https://kib.ki.se/: (28, 'Connection timed out after 10000 milliseconds')
 Fetch error: http://metasearch.kib.ki.se/ => https://metasearch.kib.ki.se/: (6, 'Could not resolve host: metasearch.kib.ki.se')
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/KIT_digital.xml b/src/chrome/content/rules/KIT_digital.xml
index 3cbe76c4f123..08e7d0c0c2ee 100644
--- a/src/chrome/content/rules/KIT_digital.xml
+++ b/src/chrome/content/rules/KIT_digital.xml
@@ -16,7 +16,7 @@ Fetch error: http://kitd.com/ => https://kitd.com/: (51, "SSL: no alternative ce
 		- ir	(works, akamai)
 
 -->
-
+
 
 	
 	
@@ -27,4 +27,4 @@ Fetch error: http://kitd.com/ => https://kitd.com/: (51, "SSL: no alternative ce
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/KIXEYE.com.xml b/src/chrome/content/rules/KIXEYE.com.xml
new file mode 100644
index 000000000000..f8b496c2b5bc
--- /dev/null
+++ b/src/chrome/content/rules/KIXEYE.com.xml
@@ -0,0 +1,134 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/KIXEYE.xml b/src/chrome/content/rules/KIXEYE.xml
deleted file mode 100644
index 00cdd20f18f9..000000000000
--- a/src/chrome/content/rules/KIXEYE.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-		
-	
-
-
diff --git a/src/chrome/content/rules/KK.dk.xml b/src/chrome/content/rules/KK.dk.xml
index bde68a5f87de..67e0f03dcb10 100644
--- a/src/chrome/content/rules/KK.dk.xml
+++ b/src/chrome/content/rules/KK.dk.xml
@@ -23,7 +23,7 @@ Fetch error: http://medarbejdere.kk.dk/ => https://medarbejdere.kk.dk/: (6, 'Cou
 
 -->
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/KKH.de.xml b/src/chrome/content/rules/KKH.de.xml
index 3ff3faafe4a2..9ff5dca2d823 100644
--- a/src/chrome/content/rules/KKH.de.xml
+++ b/src/chrome/content/rules/KKH.de.xml
@@ -9,17 +9,10 @@ Fetch error: http://stats.kkh-allianz.de/ => https://stats.kkh-allianz.de/: (60,
         have a wrong certificate (*.kkh.de, kkh.de),
         so we need to handle the https redirect.
 -->
-
+
 
 
-
-
-
 
-
-
-
-
-
+
 
 
diff --git a/src/chrome/content/rules/KKR.bund.de.xml b/src/chrome/content/rules/KKR.bund.de.xml
new file mode 100644
index 000000000000..43570e3dfde4
--- /dev/null
+++ b/src/chrome/content/rules/KKR.bund.de.xml
@@ -0,0 +1,18 @@
+
+
+
+	
+	
+
+	
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/KLDP.net.xml b/src/chrome/content/rules/KLDP.net.xml
index 6df25c30d617..d7afa39a71f9 100644
--- a/src/chrome/content/rules/KLDP.net.xml
+++ b/src/chrome/content/rules/KLDP.net.xml
@@ -34,7 +34,7 @@ Fetch error: http://qmail.kldp.net/ => https://qmail.kldp.net/: (7, 'Failed to c
 
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/KLDP.org.xml b/src/chrome/content/rules/KLDP.org.xml
index 7dbbee14bfd2..98ab5673a449 100644
--- a/src/chrome/content/rules/KLDP.org.xml
+++ b/src/chrome/content/rules/KLDP.org.xml
@@ -40,10 +40,10 @@ Fetch error: http://weblog.kldp.org/ => https://weblog.kldp.org/: (51, "SSL: no
 			- validator from validator.w3.org ²
 
 	¹ Secured by us
-	² Unsecurable			- 
+	² Unsecurable			-
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/KLM.xml b/src/chrome/content/rules/KLM.xml
index 3c645875de72..797f3ac2f1dc 100644
--- a/src/chrome/content/rules/KLM.xml
+++ b/src/chrome/content/rules/KLM.xml
@@ -4,12 +4,12 @@ Disabled by https-everywhere-checker because:
 Non-2xx HTTP code: http://klm.com/ (200) => https://www.klm.com/ (403)
 
 -->
-
+
   
-  
+  
+  
 
   
-  
+  
 
diff --git a/src/chrome/content/rules/KNET.cn.xml b/src/chrome/content/rules/KNET.cn.xml
index 2e15d851d39c..e252031d294f 100644
--- a/src/chrome/content/rules/KNET.cn.xml
+++ b/src/chrome/content/rules/KNET.cn.xml
@@ -9,14 +9,14 @@ Fetch error: http://yida.knet.cn/ => https://yida.knet.cn/: (60, 'SSL certificat
 	Dropped:
 		- jubao *
 		- t *
-	
+
 	Mismatch:
 		- (www.)?
 		- rr
 		- ts
 		- yida
 		- zt *
-		
+
 	Redirect to http:
 		- dmp
 		- domain
@@ -37,8 +37,8 @@ Fetch error: http://yida.knet.cn/ => https://yida.knet.cn/: (60, 'SSL certificat
 		- ss.knet.cn
 
 -->
-
-	
+
+
 	
 	
 	
diff --git a/src/chrome/content/rules/KOLRanking.com.xml b/src/chrome/content/rules/KOLRanking.com.xml
new file mode 100644
index 000000000000..f7c2b29632cb
--- /dev/null
+++ b/src/chrome/content/rules/KOLRanking.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/KOOORA.com.xml b/src/chrome/content/rules/KOOORA.com.xml
index 4e19081f7766..fde14ab1853e 100644
--- a/src/chrome/content/rules/KOOORA.com.xml
+++ b/src/chrome/content/rules/KOOORA.com.xml
@@ -1,16 +1,11 @@
 
 
 	
 	
+	
 	
 	
 
diff --git a/src/chrome/content/rules/KPN.com.xml b/src/chrome/content/rules/KPN.com.xml
index 4dc826443235..067a5e2d7f03 100644
--- a/src/chrome/content/rules/KPN.com.xml
+++ b/src/chrome/content/rules/KPN.com.xml
@@ -11,20 +11,20 @@
 -->
 
 
-	
+	
 	
-	
+	
 	
-	
-	
+	
+	
+	
+	
 
 
 	
 	
 
 
-	
 
 	
-	
-	
+
+
 	
 	
 	
@@ -14,7 +14,7 @@
 	
 	
 	
-	
+
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/KQED.org.xml b/src/chrome/content/rules/KQED.org.xml
index d68476d4c2e5..11b16b9c4d09 100644
--- a/src/chrome/content/rules/KQED.org.xml
+++ b/src/chrome/content/rules/KQED.org.xml
@@ -16,7 +16,7 @@ Non-2xx HTTP code: http://u.s.kqed.org/ (200) => https://u.s.kqed.net/ (403)
 	² Redirects to http
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/KSH.xml b/src/chrome/content/rules/KSH.xml
index b9793d563e52..2e4405bea69a 100644
--- a/src/chrome/content/rules/KSH.xml
+++ b/src/chrome/content/rules/KSH.xml
@@ -6,6 +6,12 @@
 
 	
+	
+	
+	
+		
+		
+		
 
 	
diff --git a/src/chrome/content/rules/KSL.xml b/src/chrome/content/rules/KSL.xml
index 269f46da7d43..129ec1585892 100644
--- a/src/chrome/content/rules/KSL.xml
+++ b/src/chrome/content/rules/KSL.xml
@@ -1,13 +1,15 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/KT.kz.xml b/src/chrome/content/rules/KT.kz.xml
new file mode 100644
index 000000000000..6d4bd5b26d46
--- /dev/null
+++ b/src/chrome/content/rules/KT.kz.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/KTAS.com.au.xml b/src/chrome/content/rules/KTAS.com.au.xml
new file mode 100644
index 000000000000..3b02fba8a110
--- /dev/null
+++ b/src/chrome/content/rules/KTAS.com.au.xml
@@ -0,0 +1,31 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/KTk.de.xml b/src/chrome/content/rules/KTk.de.xml
index 7e7463516a1e..495a2909e610 100644
--- a/src/chrome/content/rules/KTk.de.xml
+++ b/src/chrome/content/rules/KTk.de.xml
@@ -1,7 +1,7 @@
 
diff --git a/src/chrome/content/rules/KYM-CDN.com.xml b/src/chrome/content/rules/KYM-CDN.com.xml
index bafa761ce586..397be50aab18 100644
--- a/src/chrome/content/rules/KYM-CDN.com.xml
+++ b/src/chrome/content/rules/KYM-CDN.com.xml
@@ -9,12 +9,25 @@
 	* 503
 
 -->
-
+
 
+	
+		
+	
 	
+		
+	
 	
+		
+	
 	
+		
+	
 	
+	
+	
+	
+		
 
 
 	
diff --git a/src/chrome/content/rules/KabelDeutschland.xml b/src/chrome/content/rules/KabelDeutschland.xml
index 280c308a7c0e..66ccb2fb0275 100644
--- a/src/chrome/content/rules/KabelDeutschland.xml
+++ b/src/chrome/content/rules/KabelDeutschland.xml
@@ -5,7 +5,7 @@ Fetch error: http://newsletter.kabelmail.de/ => https://newsletter.kabelmail.de/
 Fetch error: http://static.kabelmail.de/ => https://static.kabelmail.de/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
     
     
     
@@ -21,7 +21,7 @@ Fetch error: http://static.kabelmail.de/ => https://static.kabelmail.de/: (28, '
     
     
     
-    
+
     
 
diff --git a/src/chrome/content/rules/Kabelkiosk.de.xml b/src/chrome/content/rules/Kabelkiosk.de.xml
deleted file mode 100644
index 0a214c89d145..000000000000
--- a/src/chrome/content/rules/Kabelkiosk.de.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/src/chrome/content/rules/Kable_Media_Services.xml b/src/chrome/content/rules/Kable_Media_Services.xml
index 54a1336b6fab..31531a87fe08 100644
--- a/src/chrome/content/rules/Kable_Media_Services.xml
+++ b/src/chrome/content/rules/Kable_Media_Services.xml
@@ -19,7 +19,7 @@ Fetch error: http://www.kable.com/ => https://www.kable.com/: (60, 'SSL certific
 		- ^kable.com	(cert only matches www)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Kachingle.xml b/src/chrome/content/rules/Kachingle.xml
index a102132cfded..7d998b784cf6 100644
--- a/src/chrome/content/rules/Kachingle.xml
+++ b/src/chrome/content/rules/Kachingle.xml
@@ -11,14 +11,14 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://downloads.kachingle.com/ => https://downloads.kachingle.com/: (60, 'SSL certificate problem: certificate has expired')
 Fetch error: http://assets.kachingle.com/ => https://assets.kachingle.com/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
   
   
   
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/Kaggle.com.xml b/src/chrome/content/rules/Kaggle.com.xml
deleted file mode 100644
index b326c2724282..000000000000
--- a/src/chrome/content/rules/Kaggle.com.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/KaiRo.xml b/src/chrome/content/rules/KaiRo.xml
index 6aef3cf20562..2dbec26d197f 100644
--- a/src/chrome/content/rules/KaiRo.xml
+++ b/src/chrome/content/rules/KaiRo.xml
@@ -16,7 +16,7 @@ Fetch error: http://mail.kairo.at/ => https://mail.kairo.at/: (28, 'Connection t
 		- spoeck.kairo.at
 		- www.uze.kairo.at
 -->
-
+
 
 	
 	
@@ -51,7 +51,7 @@ Fetch error: http://mail.kairo.at/ => https://mail.kairo.at/: (28, 'Connection t
 	
 	
 	
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Kaimi.io.xml b/src/chrome/content/rules/Kaimi.io.xml
index 5cc5dd23b7a7..4d32005a9254 100644
--- a/src/chrome/content/rules/Kaimi.io.xml
+++ b/src/chrome/content/rules/Kaimi.io.xml
@@ -5,14 +5,11 @@
 -->
 
 
-	
-	
 
 	
 	
 
 	
 
-	
 	
 
diff --git a/src/chrome/content/rules/Kaiseki.me.xml b/src/chrome/content/rules/Kaiseki.me.xml
deleted file mode 100644
index 5f78955e40df..000000000000
--- a/src/chrome/content/rules/Kaiseki.me.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Kaiser_Systeme.xml b/src/chrome/content/rules/Kaiser_Systeme.xml
index bc7c9ac39cb8..c85cde2c475e 100644
--- a/src/chrome/content/rules/Kaiser_Systeme.xml
+++ b/src/chrome/content/rules/Kaiser_Systeme.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Kaldi-ASR.org.xml b/src/chrome/content/rules/Kaldi-ASR.org.xml
new file mode 100644
index 000000000000..a043d3d260d4
--- /dev/null
+++ b/src/chrome/content/rules/Kaldi-ASR.org.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Kalooga.com.xml b/src/chrome/content/rules/Kalooga.com.xml
index 772af459df19..cb4362143b30 100644
--- a/src/chrome/content/rules/Kalooga.com.xml
+++ b/src/chrome/content/rules/Kalooga.com.xml
@@ -55,7 +55,7 @@
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Kaltura.com-falsemixed.xml b/src/chrome/content/rules/Kaltura.com-falsemixed.xml
index aa290220763e..85bed5e42743 100644
--- a/src/chrome/content/rules/Kaltura.com-falsemixed.xml
+++ b/src/chrome/content/rules/Kaltura.com-falsemixed.xml
@@ -1,5 +1,5 @@
 
 
diff --git a/src/chrome/content/rules/Kangurum.xml b/src/chrome/content/rules/Kangurum.xml
index c5b245a0097e..d2661bdc5901 100644
--- a/src/chrome/content/rules/Kangurum.xml
+++ b/src/chrome/content/rules/Kangurum.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.kangurum.com.tr/ => https://www.kangurum.com.tr/: Redirect for 'http://www.kangurum.com.tr/' missing Location
 Fetch error: http://kangurum.com.tr/ => https://www.kangurum.com.tr/: Redirect for 'http://kangurum.com.tr/' missing Location
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Kansas.com.xml b/src/chrome/content/rules/Kansas.com.xml
index 903fddef4833..d42dacc96514 100644
--- a/src/chrome/content/rules/Kansas.com.xml
+++ b/src/chrome/content/rules/Kansas.com.xml
@@ -14,7 +14,7 @@ Fetch error: http://customercare.kansas.com/ => https://customercare.kansas.com/
 	* 503, akamai
 
 -->
-
+
 
 	
 
@@ -24,4 +24,4 @@ Fetch error: http://customercare.kansas.com/ => https://customercare.kansas.com/
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Kantar-Latam-Portal.xml b/src/chrome/content/rules/Kantar-Latam-Portal.xml
index 39329dfa170b..d434b9e05599 100644
--- a/src/chrome/content/rules/Kantar-Latam-Portal.xml
+++ b/src/chrome/content/rules/Kantar-Latam-Portal.xml
@@ -8,10 +8,10 @@ Fetch error: http://kantarlatam.com/ => https://www.kantarlatam.com/: (6, 'Could
 	For other Kanvar coverage, see TNS-Global.xml.
 
 -->
-
+
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/KapWatch.com.xml b/src/chrome/content/rules/KapWatch.com.xml
new file mode 100644
index 000000000000..dc3d77882e6b
--- /dev/null
+++ b/src/chrome/content/rules/KapWatch.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Kapital.kz.xml b/src/chrome/content/rules/Kapital.kz.xml
new file mode 100644
index 000000000000..dd0b2fa2986d
--- /dev/null
+++ b/src/chrome/content/rules/Kapital.kz.xml
@@ -0,0 +1,21 @@
+
+
+	
+	
+	
+	
+		
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Kapiton.se.xml b/src/chrome/content/rules/Kapiton.se.xml
index 9ff64e41e9e8..22646e7bdf90 100644
--- a/src/chrome/content/rules/Kapiton.se.xml
+++ b/src/chrome/content/rules/Kapiton.se.xml
@@ -5,7 +5,7 @@ Fetch error: http://kapiton.se/ => https://kapiton.se/: (7, 'Failed to connect t
 Fetch error: http://www.kapiton.se/ => https://www.kapiton.se/: (7, 'Failed to connect to www.kapiton.se port 443: Connection refused')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.kapiton.se/ => https://www.kapiton.se/: (7, 'Failed to c
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Kaply.com.xml b/src/chrome/content/rules/Kaply.com.xml
index aba250356354..d8b8e78084d6 100644
--- a/src/chrome/content/rules/Kaply.com.xml
+++ b/src/chrome/content/rules/Kaply.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.mike.kaply.com/ => https://www.mike.kaply.com/: (51, "SS
 	(www.)?kaply.com: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Kapsi.fi.xml b/src/chrome/content/rules/Kapsi.fi.xml
index e5cdf6a76f4f..cacb45636c50 100644
--- a/src/chrome/content/rules/Kapsi.fi.xml
+++ b/src/chrome/content/rules/Kapsi.fi.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://koti.kapsi.fi/ => https://koti.kapsi.fi/: label empty or too long
 
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/Kapt-Cha.xml b/src/chrome/content/rules/Kapt-Cha.xml
index 52bd8fc2ac88..506d1c344717 100644
--- a/src/chrome/content/rules/Kapt-Cha.xml
+++ b/src/chrome/content/rules/Kapt-Cha.xml
@@ -2,7 +2,7 @@
 	
 
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Karger.com.xml b/src/chrome/content/rules/Karger.com.xml
deleted file mode 100644
index 2c4b59aa277c..000000000000
--- a/src/chrome/content/rules/Karger.com.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Kariera.gr.xml b/src/chrome/content/rules/Kariera.gr.xml
index 5b401074c784..3bb918d58b45 100644
--- a/src/chrome/content/rules/Kariera.gr.xml
+++ b/src/chrome/content/rules/Kariera.gr.xml
@@ -4,7 +4,7 @@
 
   
 
-	
+	
 
   
 
diff --git a/src/chrome/content/rules/Karlsruhe.de.xml b/src/chrome/content/rules/Karlsruhe.de.xml
new file mode 100644
index 000000000000..b52351b9224a
--- /dev/null
+++ b/src/chrome/content/rules/Karlsruhe.de.xml
@@ -0,0 +1,142 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Karlsruhe_Institute_of_Technology.xml b/src/chrome/content/rules/Karlsruhe_Institute_of_Technology.xml
index 692a52576c8f..f4d1886364b5 100644
--- a/src/chrome/content/rules/Karlsruhe_Institute_of_Technology.xml
+++ b/src/chrome/content/rules/Karlsruhe_Institute_of_Technology.xml
@@ -1,46 +1,41 @@
 
 
 	
 	
 	
 	
+	
+	
 	
 	
+	
+	
+	
+	
+	
 	
+	
 	
 	
+	
+	
 	
 	
-	
 	
+	
 	
+	
 	
+	
 	
 	
 	
+	
 	
 
-	
-
-	
-
-	
+	
 
diff --git a/src/chrome/content/rules/Kart_Fighter.com.xml b/src/chrome/content/rules/Kart_Fighter.com.xml
index c46a0645aa0d..4d7c3206d980 100644
--- a/src/chrome/content/rules/Kart_Fighter.com.xml
+++ b/src/chrome/content/rules/Kart_Fighter.com.xml
@@ -35,7 +35,7 @@ Fetch error: http://worldtour.kartfighter.com/ => https://worldtour.kartfighter.
 		- app.kartfighter.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Kaseya.net.xml b/src/chrome/content/rules/Kaseya.net.xml
index 75629589f12f..dee88bfe619e 100644
--- a/src/chrome/content/rules/Kaseya.net.xml
+++ b/src/chrome/content/rules/Kaseya.net.xml
@@ -12,7 +12,7 @@ Fetch error: http://provision.relay.kaseya.net/ => https://provision.relay.kasey
 	^kaseya.net doesn't exist.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Kasimp3.xml b/src/chrome/content/rules/Kasimp3.xml
index 88cb15c81649..aa14bb1ec29a 100644
--- a/src/chrome/content/rules/Kasimp3.xml
+++ b/src/chrome/content/rules/Kasimp3.xml
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Kaspersky-cyberstat.com.xml b/src/chrome/content/rules/Kaspersky-cyberstat.com.xml
index 7423d43d1d23..0b182c89b4a9 100644
--- a/src/chrome/content/rules/Kaspersky-cyberstat.com.xml
+++ b/src/chrome/content/rules/Kaspersky-cyberstat.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.kaspersky-cyberstat.com/ => https://www.kaspersky-cybers
 	For other Kaspersky coverage, see Kaspersky.com.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Kasperskycontenthub.com.xml b/src/chrome/content/rules/Kasperskycontenthub.com.xml
index ca49eee5cb7d..004f142d979b 100644
--- a/src/chrome/content/rules/Kasperskycontenthub.com.xml
+++ b/src/chrome/content/rules/Kasperskycontenthub.com.xml
@@ -18,7 +18,7 @@ Fetch error: http://www.kasperskycontenthub.com/ => https://www.kasperskycontent
 	* Secured by us, doesn't trip MCB
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Kat_de_Paris.xml b/src/chrome/content/rules/Kat_de_Paris.xml
deleted file mode 100644
index 161a5d777edf..000000000000
--- a/src/chrome/content/rules/Kat_de_Paris.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-	
-	
-	
-
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-			
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Kates_Comment.com.xml b/src/chrome/content/rules/Kates_Comment.com.xml
index 578fbc460f7f..307262e2bffb 100644
--- a/src/chrome/content/rules/Kates_Comment.com.xml
+++ b/src/chrome/content/rules/Kates_Comment.com.xml
@@ -21,7 +21,7 @@
 	
 
 
-	
+	
 
 
 	 https://netlogin.kuleuven.be/: (28,
 	¹ * Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Katwarn.de.xml b/src/chrome/content/rules/Katwarn.de.xml
new file mode 100644
index 000000000000..f8d394542997
--- /dev/null
+++ b/src/chrome/content/rules/Katwarn.de.xml
@@ -0,0 +1,27 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Kaufland.cz.xml b/src/chrome/content/rules/Kaufland.cz.xml
index 4a974730075b..8c665e0eaaa7 100644
--- a/src/chrome/content/rules/Kaufland.cz.xml
+++ b/src/chrome/content/rules/Kaufland.cz.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www-q.kaufland.cz/ => https://www-q.kaufland.cz/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
     
     
 
diff --git a/src/chrome/content/rules/Kayako-clients.xml b/src/chrome/content/rules/Kayako-clients.xml
index a9e8c08c5a07..0a61edf48425 100644
--- a/src/chrome/content/rules/Kayako-clients.xml
+++ b/src/chrome/content/rules/Kayako-clients.xml
@@ -9,7 +9,7 @@
 	
 
 
-	
+	
 
 
 	
+
+	
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/Kb8ojh.net.xml b/src/chrome/content/rules/Kb8ojh.net.xml
index 01711a30bf45..fe01e3642a78 100644
--- a/src/chrome/content/rules/Kb8ojh.net.xml
+++ b/src/chrome/content/rules/Kb8ojh.net.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.kb8ojh.net/ => https://www.kb8ojh.net/: (51, "SSL: no al
 Disabled by https-everywhere-checker because:
 Fetch error: http://www.kb8ojh.net/ => https://www.kb8ojh.net/: (51, "SSL: no alternative certificate subject name matches target host name 'www.kb8ojh.net'")
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Kbia-gmbh.de.xml b/src/chrome/content/rules/Kbia-gmbh.de.xml
index 8653980ee51e..f19f6db6a788 100644
--- a/src/chrome/content/rules/Kbia-gmbh.de.xml
+++ b/src/chrome/content/rules/Kbia-gmbh.de.xml
@@ -18,7 +18,7 @@
 		- cloud.kbia-gmbh.de
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Kdelive.org.xml b/src/chrome/content/rules/Kdelive.org.xml
index 85545cb86211..02f63b7569a7 100644
--- a/src/chrome/content/rules/Kdelive.org.xml
+++ b/src/chrome/content/rules/Kdelive.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://kdelive.org/ => https://kdelive.org/: (7, 'Failed to connect
 Fetch error: http://www.kdelive.org/ => https://www.kdelive.org/: (7, 'Failed to connect to www.kdelive.org port 443: Connection refused')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/KeePassXC.org.xml b/src/chrome/content/rules/KeePassXC.org.xml
new file mode 100644
index 000000000000..3654300f4ead
--- /dev/null
+++ b/src/chrome/content/rules/KeePassXC.org.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Keelog.com.xml b/src/chrome/content/rules/Keelog.com.xml
index 22dfb3d777d4..8034c870a37c 100644
--- a/src/chrome/content/rules/Keelog.com.xml
+++ b/src/chrome/content/rules/Keelog.com.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/KeepTempo.com.xml b/src/chrome/content/rules/KeepTempo.com.xml
index 83dcd1889ee4..5adcc3ec503d 100644
--- a/src/chrome/content/rules/KeepTempo.com.xml
+++ b/src/chrome/content/rules/KeepTempo.com.xml
@@ -14,7 +14,7 @@ Fetch error: http://app.keeptempo.com/ => https://app.keeptempo.com/: (6, 'Could
 		- app.keeptempo.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Keep_all_the_things.com.xml b/src/chrome/content/rules/Keep_all_the_things.com.xml
index f3f7c16c7ce9..2a9dcea844d1 100644
--- a/src/chrome/content/rules/Keep_all_the_things.com.xml
+++ b/src/chrome/content/rules/Keep_all_the_things.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://keepallthethings.com/ => https://keepallthethings.com/: (6, 'Could not resolve host: keepallthethings.com')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Keksbude.net.xml b/src/chrome/content/rules/Keksbude.net.xml
index 31decc9a4f57..4c6b98a84419 100644
--- a/src/chrome/content/rules/Keksbude.net.xml
+++ b/src/chrome/content/rules/Keksbude.net.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.keksbude.net/ => https://www.keksbude.net/: (6, 'Could n
 	* Mismatched
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Kelley-Blue-Book.xml b/src/chrome/content/rules/Kelley-Blue-Book.xml
index 0ae4d0d6c500..0c90b3681432 100644
--- a/src/chrome/content/rules/Kelley-Blue-Book.xml
+++ b/src/chrome/content/rules/Kelley-Blue-Book.xml
@@ -6,19 +6,20 @@ Fetch error: http://kbb.com/ => https://kbb.com/: (28, 'Connection timed out aft
 Disabled by https-everywhere-checker because:
 Fetch error: http://kbb.com/ => https://kbb.com/: (28, 'Connection timed out after 10000 milliseconds')
 -->
-
+
 
 	
-	
+	
+	
+	
 	
 	
 
 	
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Kenengba.com.xml b/src/chrome/content/rules/Kenengba.com.xml
index 34c1621ea2cf..4eabbacd1de8 100644
--- a/src/chrome/content/rules/Kenengba.com.xml
+++ b/src/chrome/content/rules/Kenengba.com.xml
@@ -3,4 +3,4 @@
   
 
   
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Kent.gov.uk.xml b/src/chrome/content/rules/Kent.gov.uk.xml
index 1898ff5a31aa..0bb6c58f9173 100644
--- a/src/chrome/content/rules/Kent.gov.uk.xml
+++ b/src/chrome/content/rules/Kent.gov.uk.xml
@@ -32,10 +32,10 @@ Fetch error: http://www.eis.kent.gov.uk/ => https://www.eiskent.co.uk/: (51, "SS
 
 
 	These altnames don't exist:
-	
+
 		- www.ola.kent.gov.uk
 
-	
+
 	Insecure cookies are set for these hosts: ᶜ
 
 		- beta.kent.gov.uk
@@ -57,14 +57,14 @@ Fetch error: http://www.eis.kent.gov.uk/ => https://www.eiskent.co.uk/: (51, "SS
 	Mixed content:
 
 		- css, on:
-		
+
 			- consultations from fonts.googleapis.com ˢ
 			- www.eis, oktd, admin.oktd, open, admin.open from www.google.com ˢ
 
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Kent_Backman.com.xml b/src/chrome/content/rules/Kent_Backman.com.xml
index d6ff85b3df3a..d99319a9a301 100644
--- a/src/chrome/content/rules/Kent_Backman.com.xml
+++ b/src/chrome/content/rules/Kent_Backman.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://b.kentbackman.com/ => https://b.kentbackman.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 	
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/KentuckyOneHealth.org.xml b/src/chrome/content/rules/KentuckyOneHealth.org.xml
index 59f05f169f3f..0633ccf2a64c 100644
--- a/src/chrome/content/rules/KentuckyOneHealth.org.xml
+++ b/src/chrome/content/rules/KentuckyOneHealth.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://www.jhsmh.org/ => https://www.jhsmh.org/: (6, 'Could not res
 Fetch error: http://jhsmh.org/ => https://jhsmh.org/: (7, 'Failed to connect to jhsmh.org port 443: Connection timed out')
 
 -->
-
+
 
 
 
diff --git a/src/chrome/content/rules/Ketchum.com.xml b/src/chrome/content/rules/Ketchum.com.xml
deleted file mode 100644
index 5cbb2da9ff90..000000000000
--- a/src/chrome/content/rules/Ketchum.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/KettleBrand.com.xml b/src/chrome/content/rules/KettleBrand.com.xml
new file mode 100644
index 000000000000..baf7922fd8c7
--- /dev/null
+++ b/src/chrome/content/rules/KettleBrand.com.xml
@@ -0,0 +1,12 @@
+
+
+
+	
+	
+
+
+	
+
diff --git a/src/chrome/content/rules/KevinAThompson.com.xml b/src/chrome/content/rules/KevinAThompson.com.xml
new file mode 100644
index 000000000000..27fbdb19687a
--- /dev/null
+++ b/src/chrome/content/rules/KevinAThompson.com.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Key-server.io.xml b/src/chrome/content/rules/Key-server.io.xml
new file mode 100644
index 000000000000..b24b173348a7
--- /dev/null
+++ b/src/chrome/content/rules/Key-server.io.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Keygens.nl.xml b/src/chrome/content/rules/Keygens.nl.xml
index 162620ba7d0b..7dbcf3e5fb8a 100644
--- a/src/chrome/content/rules/Keygens.nl.xml
+++ b/src/chrome/content/rules/Keygens.nl.xml
@@ -4,7 +4,7 @@
 	www.keygens.nl: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Keygiveaway.xml b/src/chrome/content/rules/Keygiveaway.xml
deleted file mode 100644
index ed26a0041238..000000000000
--- a/src/chrome/content/rules/Keygiveaway.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Kfc.ca.xml b/src/chrome/content/rules/Kfc.ca.xml
new file mode 100644
index 000000000000..74428200426c
--- /dev/null
+++ b/src/chrome/content/rules/Kfc.ca.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/KhalifaofIslam.com.xml b/src/chrome/content/rules/KhalifaofIslam.com.xml
deleted file mode 100644
index 5ed135baaff8..000000000000
--- a/src/chrome/content/rules/KhalifaofIslam.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-	
-
diff --git a/src/chrome/content/rules/Khalsa-Credit-Union.xml b/src/chrome/content/rules/Khalsa-Credit-Union.xml
index 7faec0fdb499..df684a00b59c 100644
--- a/src/chrome/content/rules/Khalsa-Credit-Union.xml
+++ b/src/chrome/content/rules/Khalsa-Credit-Union.xml
@@ -5,11 +5,9 @@
 
 
 	
-	
+	
 
 	
 
-	
-		
 	
 
diff --git a/src/chrome/content/rules/Khamsat.com.xml b/src/chrome/content/rules/Khamsat.com.xml
new file mode 100644
index 000000000000..55493ca894d0
--- /dev/null
+++ b/src/chrome/content/rules/Khamsat.com.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Khan-Academy.xml b/src/chrome/content/rules/Khan-Academy.xml
index 7166941c7172..3d81a4c2ce43 100644
--- a/src/chrome/content/rules/Khan-Academy.xml
+++ b/src/chrome/content/rules/Khan-Academy.xml
@@ -1,32 +1,140 @@
 
-
 
-	
-	
-	
+
+	
 	
+
+
+	
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
-	
-	
 
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
-	
 
-	
+	
+	
+	
 
+	
 
diff --git a/src/chrome/content/rules/KiCanada.com.xml b/src/chrome/content/rules/KiCanada.com.xml
new file mode 100644
index 000000000000..e2da4375f412
--- /dev/null
+++ b/src/chrome/content/rules/KiCanada.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/KickApps.xml b/src/chrome/content/rules/KickApps.xml
index 88a255b7c7e3..c3f0f40287d3 100644
--- a/src/chrome/content/rules/KickApps.xml
+++ b/src/chrome/content/rules/KickApps.xml
@@ -16,19 +16,16 @@ Fetch error: http://media.kickstatic.com/ => https://media.kickstatic.com/: (6,
 		- login.cloud	(works, depth mismatched)
 
 -->
-
+
 
-	
+	
+	
 	
 
 
 	
 
 
-	
+	
 
-	
-
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Kicker.de.xml b/src/chrome/content/rules/Kicker.de.xml
index c1b20488fbec..b8db34bc46d0 100644
--- a/src/chrome/content/rules/Kicker.de.xml
+++ b/src/chrome/content/rules/Kicker.de.xml
@@ -1,28 +1,67 @@
 
-
-	
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
-	
+	
+	
+	
+	
+	
+	
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
 
-	
 
diff --git a/src/chrome/content/rules/Kicktraq.xml b/src/chrome/content/rules/Kicktraq.xml
deleted file mode 100644
index c0c51a7529ab..000000000000
--- a/src/chrome/content/rules/Kicktraq.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/KidsHealth.xml b/src/chrome/content/rules/KidsHealth.xml
index d184c21e0466..9c56f92b54b8 100644
--- a/src/chrome/content/rules/KidsHealth.xml
+++ b/src/chrome/content/rules/KidsHealth.xml
@@ -9,7 +9,7 @@ Fetch error: http://teenshealth.org/ => https://secure02.kidshealth.org/teen/: (
 Fetch error: http://www.teenshealth.org/ => https://secure02.kidshealth.org/teen/: (6, 'Could not resolve host: secure02.kidshealth.org')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Kids_Foot_Locker.xml b/src/chrome/content/rules/Kids_Foot_Locker.xml
index 8f88c2a82a88..dbdac5ac8047 100644
--- a/src/chrome/content/rules/Kids_Foot_Locker.xml
+++ b/src/chrome/content/rules/Kids_Foot_Locker.xml
@@ -18,7 +18,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -27,7 +28,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Kijiji.ca.xml b/src/chrome/content/rules/Kijiji.ca.xml
new file mode 100644
index 000000000000..fe97d775da57
--- /dev/null
+++ b/src/chrome/content/rules/Kijiji.ca.xml
@@ -0,0 +1,57 @@
+
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Kijijiblog.ca.xml b/src/chrome/content/rules/Kijijiblog.ca.xml
deleted file mode 100644
index 672a178e8c74..000000000000
--- a/src/chrome/content/rules/Kijijiblog.ca.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Kimono_Labs.com.xml b/src/chrome/content/rules/Kimono_Labs.com.xml
index 840497ef141f..b682671154c2 100644
--- a/src/chrome/content/rules/Kimono_Labs.com.xml
+++ b/src/chrome/content/rules/Kimono_Labs.com.xml
@@ -9,12 +9,12 @@ Fetch error: http://www.kimonolabs.com/ => https://www.kimonolabs.com/: (60, 'SS
 		- (www.)?
 
 
-	Insecure cookies are set for these 
+	Insecure cookies are set for these
 
 		- .kimonolabs.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Kimpluscraig.com.xml b/src/chrome/content/rules/Kimpluscraig.com.xml
index 35bbcea4d3f1..c429795b8b2f 100644
--- a/src/chrome/content/rules/Kimpluscraig.com.xml
+++ b/src/chrome/content/rules/Kimpluscraig.com.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Kinesis-Ergo.com.xml b/src/chrome/content/rules/Kinesis-Ergo.com.xml
index b04f29b054d6..327879b5edc1 100644
--- a/src/chrome/content/rules/Kinesis-Ergo.com.xml
+++ b/src/chrome/content/rules/Kinesis-Ergo.com.xml
@@ -3,7 +3,7 @@
 
 		- Web bug from alaskaoregonwesternwashington.bbb.org *
 
-	* Secured by us 
+	* Secured by us
 
 -->
 
diff --git a/src/chrome/content/rules/Kings-College-London.xml b/src/chrome/content/rules/Kings-College-London.xml
index 1f2a09732c8c..e7b6f592c708 100644
--- a/src/chrome/content/rules/Kings-College-London.xml
+++ b/src/chrome/content/rules/Kings-College-London.xml
@@ -6,7 +6,7 @@ Fetch error: http://kcl.ac.uk/ => https://kcl.ac.uk/: (51, "SSL: no alternative
 Disabled by https-everywhere-checker because:
 Fetch error: http://kcl.ac.uk/ => https://kcl.ac.uk/: (28, 'Operation timed out after 0 milliseconds with 0 out of 0 bytes received')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Kings_Road_Merch.xml b/src/chrome/content/rules/Kings_Road_Merch.xml
index 44b9361e8eba..1d54bcb67020 100644
--- a/src/chrome/content/rules/Kings_Road_Merch.xml
+++ b/src/chrome/content/rules/Kings_Road_Merch.xml
@@ -7,7 +7,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -16,4 +17,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Kinja.xml b/src/chrome/content/rules/Kinja.xml
deleted file mode 100644
index 80f3f76ae2ba..000000000000
--- a/src/chrome/content/rules/Kinja.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-
-
-
-	
-	
-
-		
-
-			
-			
-			
-
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/KinkLink.me.xml b/src/chrome/content/rules/KinkLink.me.xml
index 9a306773eec2..545e2a19ce15 100644
--- a/src/chrome/content/rules/KinkLink.me.xml
+++ b/src/chrome/content/rules/KinkLink.me.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://kinklink.me/ => https://kinklink.me/: (60, 'SSL certificate problem: certificate has expired')
 Fetch error: http://www.kinklink.me/ => https://www.kinklink.me/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Kinko.me.xml b/src/chrome/content/rules/Kinko.me.xml
index dbf128c60632..49da1a6135be 100644
--- a/src/chrome/content/rules/Kinko.me.xml
+++ b/src/chrome/content/rules/Kinko.me.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.kinko.me/ => https://www.kinko.me/: (60, 'SSL certificat
 Disabled by https-everywhere-checker because:
 Fetch error: http://kinko.me/ => https://kinko.me/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Kintera-Network.xml b/src/chrome/content/rules/Kintera-Network.xml
deleted file mode 100644
index de95f1a75026..000000000000
--- a/src/chrome/content/rules/Kintera-Network.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Kirjoitusalusta.xml b/src/chrome/content/rules/Kirjoitusalusta.xml
index 65d9f5a1e423..46e981098d3f 100644
--- a/src/chrome/content/rules/Kirjoitusalusta.xml
+++ b/src/chrome/content/rules/Kirjoitusalusta.xml
@@ -8,7 +8,7 @@
 	
 
 
-	
+	
 
 
 	
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Kitapyurdu.xml b/src/chrome/content/rules/Kitapyurdu.xml
index e25bb871599c..da7491cab5a9 100644
--- a/src/chrome/content/rules/Kitapyurdu.xml
+++ b/src/chrome/content/rules/Kitapyurdu.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.kitapyurdu.com/ => https://www.kitapyurdu.com/: (28, 'Operation timed out after 0 milliseconds with 0 out of 0 bytes received')
 Fetch error: http://kitapyurdu.com/ => https://www.kitapyurdu.com/: (28, 'Operation timed out after 0 milliseconds with 0 out of 0 bytes received')
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Kitenet.net.xml b/src/chrome/content/rules/Kitenet.net.xml
index b8a204b6d4cd..3b22cd2ced2e 100644
--- a/src/chrome/content/rules/Kitenet.net.xml
+++ b/src/chrome/content/rules/Kitenet.net.xml
@@ -16,4 +16,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Kivo.com.xml b/src/chrome/content/rules/Kivo.com.xml
index b7b420608ab0..0f3f6f289f4c 100644
--- a/src/chrome/content/rules/Kivo.com.xml
+++ b/src/chrome/content/rules/Kivo.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://kivo.com/ => https://kivo.com/: (60, 'SSL certificate proble
 Fetch error: http://www.kivo.com/ => https://www.kivo.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Kiwiirc.com.xml b/src/chrome/content/rules/Kiwiirc.com.xml
index 82bb0b37602f..0685f098e9e1 100644
--- a/src/chrome/content/rules/Kiwiirc.com.xml
+++ b/src/chrome/content/rules/Kiwiirc.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://owa.clients.kiwiirc.com/ => https://owa.clients.kiwiirc.com/
 		- .kiwiirc.com
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Kiwix.org.xml b/src/chrome/content/rules/Kiwix.org.xml
index 2b09ba5fe42c..903a4ee133b2 100644
--- a/src/chrome/content/rules/Kiwix.org.xml
+++ b/src/chrome/content/rules/Kiwix.org.xml
@@ -1,9 +1,8 @@
 
 
 	
-	
+		
+	
+	
+	
 
-	
+	
 
diff --git a/src/chrome/content/rules/KizlarSoruyor.com.xml b/src/chrome/content/rules/KizlarSoruyor.com.xml
new file mode 100644
index 000000000000..bf3213eb4b98
--- /dev/null
+++ b/src/chrome/content/rules/KizlarSoruyor.com.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+	
+		
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Kizunaai.com.xml b/src/chrome/content/rules/Kizunaai.com.xml
new file mode 100644
index 000000000000..f5cc7dd610f1
--- /dev/null
+++ b/src/chrome/content/rules/Kizunaai.com.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Kkk.com.xml b/src/chrome/content/rules/Kkk.com.xml
index e16a0a72d793..8de5ff895857 100644
--- a/src/chrome/content/rules/Kkk.com.xml
+++ b/src/chrome/content/rules/Kkk.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://kkk.com/ => https://kkk.com/: (28, 'Connection timed out aft
 Fetch error: http://www.kkk.com/ => https://www.kkk.com/: (28, 'Connection timed out after 20000 milliseconds')
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Klinika.zdravie.sk.xml b/src/chrome/content/rules/Klinika.zdravie.sk.xml
index b4194550b8bd..7ec2931957f2 100644
--- a/src/chrome/content/rules/Klinika.zdravie.sk.xml
+++ b/src/chrome/content/rules/Klinika.zdravie.sk.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://klinika.zdravie.sk/ => https://klinika.zdravie.sk/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
   
 
   
diff --git a/src/chrome/content/rules/Kmart.com.au.xml b/src/chrome/content/rules/Kmart.com.au.xml
new file mode 100644
index 000000000000..1b2f8f54ec13
--- /dev/null
+++ b/src/chrome/content/rules/Kmart.com.au.xml
@@ -0,0 +1,56 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/KnCMiner.com.xml b/src/chrome/content/rules/KnCMiner.com.xml
deleted file mode 100644
index 9e528475c12c..000000000000
--- a/src/chrome/content/rules/KnCMiner.com.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-	
-	
-	
-
-		
-		
-
-			
-			
-			
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Knappschaft-Bahn-See.xml b/src/chrome/content/rules/Knappschaft-Bahn-See.xml
index 55f1a55a7aaa..d75e5d685f23 100644
--- a/src/chrome/content/rules/Knappschaft-Bahn-See.xml
+++ b/src/chrome/content/rules/Knappschaft-Bahn-See.xml
@@ -2,24 +2,11 @@
 	Domains without SSL/TLS:
 		kbs-jobboerse.de
 		willkommen-im-job.de
--->	
+-->
 
-
-
-
-
 
-
+
 
-
-
-
-
-
-
 
 
diff --git a/src/chrome/content/rules/Kneon.com-problematic.xml b/src/chrome/content/rules/Kneon.com-problematic.xml
index 90acd950e0fa..603f39dd5475 100644
--- a/src/chrome/content/rules/Kneon.com-problematic.xml
+++ b/src/chrome/content/rules/Kneon.com-problematic.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Kneon.com.xml b/src/chrome/content/rules/Kneon.com.xml
index 955916290080..c24e44816d38 100644
--- a/src/chrome/content/rules/Kneon.com.xml
+++ b/src/chrome/content/rules/Kneon.com.xml
@@ -17,7 +17,7 @@ Fetch error: http://beta.kneon.com/ => https://beta.kneon.com/: (6, 'Could not r
 	² Squarespace
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/KnewOne.com.xml b/src/chrome/content/rules/KnewOne.com.xml
deleted file mode 100644
index 58c97cc33d02..000000000000
--- a/src/chrome/content/rules/KnewOne.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Knexjs.org.xml b/src/chrome/content/rules/Knexjs.org.xml
new file mode 100644
index 000000000000..89de3600da74
--- /dev/null
+++ b/src/chrome/content/rules/Knexjs.org.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/KnightSwarm.xml b/src/chrome/content/rules/KnightSwarm.xml
index a89d697a9db7..d3e99f5e2a8c 100644
--- a/src/chrome/content/rules/KnightSwarm.xml
+++ b/src/chrome/content/rules/KnightSwarm.xml
@@ -22,7 +22,7 @@ Fetch error: http://my.knightswarm.com/ => https://my.knightswarm.com/: (6, 'Cou
 		- www.knightswarm.com
 
 -->
-
+
 
 	
@@ -37,7 +37,7 @@ Fetch error: http://my.knightswarm.com/ => https://my.knightswarm.com/: (6, 'Cou
 	
 	
 
-	
+	
 
 
 	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Knowledge_Blog.org.xml b/src/chrome/content/rules/Knowledge_Blog.org.xml
index c0d396af0c2d..5b18b3026535 100644
--- a/src/chrome/content/rules/Knowledge_Blog.org.xml
+++ b/src/chrome/content/rules/Knowledge_Blog.org.xml
@@ -9,7 +9,7 @@
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/KnownHost.com.xml b/src/chrome/content/rules/KnownHost.com.xml
new file mode 100644
index 000000000000..1abe7f428162
--- /dev/null
+++ b/src/chrome/content/rules/KnownHost.com.xml
@@ -0,0 +1,21 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Kobo.xml b/src/chrome/content/rules/Kobo.xml
index 1aebeec2d786..76c92f45281a 100644
--- a/src/chrome/content/rules/Kobo.xml
+++ b/src/chrome/content/rules/Kobo.xml
@@ -137,7 +137,7 @@
 	
-		
+	
 	
 	
 	
diff --git a/src/chrome/content/rules/KodeRoot.net.xml b/src/chrome/content/rules/KodeRoot.net.xml
index 7a0cf7b62618..ea6560b37fc2 100644
--- a/src/chrome/content/rules/KodeRoot.net.xml
+++ b/src/chrome/content/rules/KodeRoot.net.xml
@@ -16,7 +16,7 @@ Fetch error: http://xmpp.koderoot.net/ => https://xmpp.koderoot.net/: (6, 'Could
 	² Unsecurable <= refused
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Kodi.tv.xml b/src/chrome/content/rules/Kodi.tv.xml
index bfba6ea48970..78ee935ea4c8 100644
--- a/src/chrome/content/rules/Kodi.tv.xml
+++ b/src/chrome/content/rules/Kodi.tv.xml
@@ -5,7 +5,7 @@
 		ftp.kodi.tv
 		graphs.kodi.tv
 		mirrors.kodi.tv
-		
+
 	No working URL known:
 		issues.kodi.tv
 		wiki.kodi.tv
diff --git a/src/chrome/content/rules/Koding.xml b/src/chrome/content/rules/Koding.xml
index fa1815444028..9c39bdeaeddf 100644
--- a/src/chrome/content/rules/Koding.xml
+++ b/src/chrome/content/rules/Koding.xml
@@ -4,10 +4,10 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Koen_Rouwhorst.nl.xml b/src/chrome/content/rules/Koen_Rouwhorst.nl.xml
deleted file mode 100644
index 0330a3cb3279..000000000000
--- a/src/chrome/content/rules/Koen_Rouwhorst.nl.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Kogan.com.xml b/src/chrome/content/rules/Kogan.com.xml
index 14ceae2e0dd8..616b35ca990c 100644
--- a/src/chrome/content/rules/Kogan.com.xml
+++ b/src/chrome/content/rules/Kogan.com.xml
@@ -2,7 +2,7 @@
 	Other Kogan rulesets:
 		- KoganInsurance.com.au.xml
 		- KoganMobile.com.au.xml
-	
+
 
 	Non-functional subdomains:
 
@@ -51,28 +51,28 @@
 	
 	
 	
-	
+
 	
 	
 
 	
 	
-	
+
 	
 	
-		
+	
 	
-	
+
   	
 
 	
 	
-		
+
 	
 	
-		
+
 	
 
diff --git a/src/chrome/content/rules/KoganInsurance.com.au.xml b/src/chrome/content/rules/KoganInsurance.com.au.xml
index 9d4640298c9a..e2bcdffda4e0 100644
--- a/src/chrome/content/rules/KoganInsurance.com.au.xml
+++ b/src/chrome/content/rules/KoganInsurance.com.au.xml
@@ -1,7 +1,7 @@
 
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Koinify.com.xml b/src/chrome/content/rules/Koinify.com.xml
index acc65b51c59a..102ebebad2cb 100644
--- a/src/chrome/content/rules/Koinify.com.xml
+++ b/src/chrome/content/rules/Koinify.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://koinify.com/ => https://koinify.com/: (28, 'Connection timed
 Fetch error: http://www.koinify.com/ => https://www.koinify.com/: (28, 'Connection timed out after 20000 milliseconds')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Kolektiva.com.xml b/src/chrome/content/rules/Kolektiva.com.xml
index 0a5f40259536..de5419ddf809 100644
--- a/src/chrome/content/rules/Kolektiva.com.xml
+++ b/src/chrome/content/rules/Kolektiva.com.xml
@@ -18,7 +18,7 @@ Fetch error: http://www.kolektiva.com/ => https://www.kolektiva.com/: (7, 'Faile
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Komments.net.xml b/src/chrome/content/rules/Komments.net.xml
index b7e2578069f7..9077e89aae04 100644
--- a/src/chrome/content/rules/Komments.net.xml
+++ b/src/chrome/content/rules/Komments.net.xml
@@ -5,7 +5,7 @@ Fetch error: http://komments.net/ => https://komments.net/: (35, 'Unknown SSL pr
 Fetch error: http://www.komments.net/ => https://www.komments.net/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Komoona.com.xml b/src/chrome/content/rules/Komoona.com.xml
deleted file mode 100644
index fb316318e715..000000000000
--- a/src/chrome/content/rules/Komoona.com.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-		
-
-	
-	
-	
-	
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Konami-Korea.kr.xml b/src/chrome/content/rules/Konami-Korea.kr.xml
index be970f86a1b1..9aa1c4d2ea62 100644
--- a/src/chrome/content/rules/Konami-Korea.kr.xml
+++ b/src/chrome/content/rules/Konami-Korea.kr.xml
@@ -13,7 +13,7 @@ Fetch error: http://www.konami-korea.kr/ => https://www.konami-korea.kr/: (28, '
 	^: cert only matches www
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Kontalk.xml b/src/chrome/content/rules/Kontalk.xml
index 41e3b91f58ae..cc79415843a8 100644
--- a/src/chrome/content/rules/Kontalk.xml
+++ b/src/chrome/content/rules/Kontalk.xml
@@ -6,7 +6,7 @@
     
     
     
-	
+
     
     
     
diff --git a/src/chrome/content/rules/Kontera.xml b/src/chrome/content/rules/Kontera.xml
index 9023a2342d1e..f133c31214e4 100644
--- a/src/chrome/content/rules/Kontera.xml
+++ b/src/chrome/content/rules/Kontera.xml
@@ -66,7 +66,7 @@ Fetch error: http://publishers.kontera.com/ => https://publishers.kontera.com/:
 		- publishers
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Konto_API.xml b/src/chrome/content/rules/Konto_API.xml
index 6716fd547e79..cc4273476297 100644
--- a/src/chrome/content/rules/Konto_API.xml
+++ b/src/chrome/content/rules/Konto_API.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Koonoz.info.xml b/src/chrome/content/rules/Koonoz.info.xml
new file mode 100644
index 000000000000..5bd30f2c1683
--- /dev/null
+++ b/src/chrome/content/rules/Koonoz.info.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Kopiosto.xml b/src/chrome/content/rules/Kopiosto.xml
index 07c46a39e2fd..249025ab7514 100644
--- a/src/chrome/content/rules/Kopiosto.xml
+++ b/src/chrome/content/rules/Kopiosto.xml
@@ -7,12 +7,12 @@ Working subdomains:
 -->
 
 	
-	
+	
+	
 
 	
 	
 
-	
+	
 
diff --git a/src/chrome/content/rules/Kornerstone_Admin.com.xml b/src/chrome/content/rules/Kornerstone_Admin.com.xml
index 1818809085cf..b2d8a96f0233 100644
--- a/src/chrome/content/rules/Kornerstone_Admin.com.xml
+++ b/src/chrome/content/rules/Kornerstone_Admin.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.kornerstoneadmin.com/ => https://kornerstoneadmin.com/:
 	www: cert only matches ^kornerstoneadmin.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Korora_Project.org.xml b/src/chrome/content/rules/Korora_Project.org.xml
index 0fa868a5e307..07e6c9eedbe8 100644
--- a/src/chrome/content/rules/Korora_Project.org.xml
+++ b/src/chrome/content/rules/Korora_Project.org.xml
@@ -6,7 +6,7 @@ Fetch error: http://archive.kororaproject.org/ => https://archive.kororaproject.
 	www.kororaproject.org: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Kotaku.com.xml b/src/chrome/content/rules/Kotaku.com.xml
deleted file mode 100644
index 825659637e26..000000000000
--- a/src/chrome/content/rules/Kotaku.com.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
-	
-	
-
-		
-
-			
-			
-			
-
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-
-		
-		
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Kotex.xml b/src/chrome/content/rules/Kotex.xml
index 7d55d05ea3f1..9e9bbb0cd514 100644
--- a/src/chrome/content/rules/Kotex.xml
+++ b/src/chrome/content/rules/Kotex.xml
@@ -8,7 +8,7 @@ Fetch error: http://kotex.com/ => https://www.kotex.com/: Cycle detected - URL a
 Fetch error: http://www.kotex.com/ => https://www.kotex.com/: Cycle detected - URL already encountered: https://www.kotex.com/
 Fetch error: http://dare.kotex.com/ => https://dare.kotex.com/: (35, 'error:140770FC:SSL routines:SSL23_GET_SERVER_HELLO:unknown protocol')
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Kouio.com.xml b/src/chrome/content/rules/Kouio.com.xml
deleted file mode 100644
index e24a92c00d68..000000000000
--- a/src/chrome/content/rules/Kouio.com.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Kpopstage.co.xml b/src/chrome/content/rules/Kpopstage.co.xml
deleted file mode 100644
index 62e487177fff..000000000000
--- a/src/chrome/content/rules/Kpopstage.co.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Kr36.co.xml b/src/chrome/content/rules/Kr36.co.xml
index 686b9e033380..e6f98613e77f 100644
--- a/src/chrome/content/rules/Kr36.co.xml
+++ b/src/chrome/content/rules/Kr36.co.xml
@@ -5,7 +5,7 @@ Fetch error: http://kr36.co/ => https://kr36.co/: (7, 'Failed to connect to kr36
 Fetch error: http://www.kr36.co/ => https://www.kr36.co/: (7, 'Failed to connect to www.kr36.co port 443: Connection refused')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/KralenStart.nl.xml b/src/chrome/content/rules/KralenStart.nl.xml
index b4228961ad44..301971f696db 100644
--- a/src/chrome/content/rules/KralenStart.nl.xml
+++ b/src/chrome/content/rules/KralenStart.nl.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.kralenstart.nl/ => https://www.kralenstart.nl/: (28, 'Op
 	For other xCAT coverage, XCAT.nl.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Krautchan.xml b/src/chrome/content/rules/Krautchan.xml
deleted file mode 100644
index beff4d5a719f..000000000000
--- a/src/chrome/content/rules/Krautchan.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Kreativ_Media.xml b/src/chrome/content/rules/Kreativ_Media.xml
index 21f71388e903..b68c8bdd23be 100644
--- a/src/chrome/content/rules/Kreativ_Media.xml
+++ b/src/chrome/content/rules/Kreativ_Media.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Krihelinator.xyz.xml b/src/chrome/content/rules/Krihelinator.xyz.xml
new file mode 100644
index 000000000000..7805fc226773
--- /dev/null
+++ b/src/chrome/content/rules/Krihelinator.xyz.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Kriminalvarden.se.xml b/src/chrome/content/rules/Kriminalvarden.se.xml
index 109949f6a8a0..87660fe69981 100644
--- a/src/chrome/content/rules/Kriminalvarden.se.xml
+++ b/src/chrome/content/rules/Kriminalvarden.se.xml
@@ -1,7 +1,7 @@
-
+
 	
 	
-	
-	
+  	
+	
+	
 
-
diff --git a/src/chrome/content/rules/Krux-Digital.xml b/src/chrome/content/rules/Krux-Digital.xml
deleted file mode 100644
index 1768993a2996..000000000000
--- a/src/chrome/content/rules/Krux-Digital.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Kryptnostic.com.xml b/src/chrome/content/rules/Kryptnostic.com.xml
index 60f155576ad7..d8bc8dc40f74 100644
--- a/src/chrome/content/rules/Kryptnostic.com.xml
+++ b/src/chrome/content/rules/Kryptnostic.com.xml
@@ -22,7 +22,7 @@ Fetch error: http://kryptnostic.com/ => https://kryptnostic.com/: (60, 'SSL cert
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Kryptronic.xml b/src/chrome/content/rules/Kryptronic.xml
index 450d8c386a91..cf039eda14df 100644
--- a/src/chrome/content/rules/Kryptronic.xml
+++ b/src/chrome/content/rules/Kryptronic.xml
@@ -4,7 +4,7 @@
 	
 		
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/KsiegarniaWarszawa.pl.xml b/src/chrome/content/rules/KsiegarniaWarszawa.pl.xml
index 0747f3cd6d51..736a40bd9818 100644
--- a/src/chrome/content/rules/KsiegarniaWarszawa.pl.xml
+++ b/src/chrome/content/rules/KsiegarniaWarszawa.pl.xml
@@ -5,7 +5,7 @@ Fetch error: http://ksiegarniawarszawa.pl/ => https://ksiegarniawarszawa.pl/: (5
 Fetch error: http://www.ksiegarniawarszawa.pl/ => https://www.ksiegarniawarszawa.pl/: (51, "SSL: no alternative certificate subject name matches target host name 'www.ksiegarniawarszawa.pl'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Ksplice.xml b/src/chrome/content/rules/Ksplice.xml
index 229df857b751..63bfd9e2c91e 100644
--- a/src/chrome/content/rules/Ksplice.xml
+++ b/src/chrome/content/rules/Ksplice.xml
@@ -1,11 +1,5 @@
 
 
diff --git a/src/chrome/content/rules/Kuechenstud.io.xml b/src/chrome/content/rules/Kuechenstud.io.xml
index 808fb9ad9c40..727a1dc01c0d 100644
--- a/src/chrome/content/rules/Kuechenstud.io.xml
+++ b/src/chrome/content/rules/Kuechenstud.io.xml
@@ -19,4 +19,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Kundelik.kz.xml b/src/chrome/content/rules/Kundelik.kz.xml
new file mode 100644
index 000000000000..146c030ea0a3
--- /dev/null
+++ b/src/chrome/content/rules/Kundelik.kz.xml
@@ -0,0 +1,18 @@
+
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Kununu.xml b/src/chrome/content/rules/Kununu.xml
index 89cb48dfc709..4fbce1184f67 100644
--- a/src/chrome/content/rules/Kununu.xml
+++ b/src/chrome/content/rules/Kununu.xml
@@ -28,7 +28,8 @@
 
 
 	
-	
+	
+	
 		
diff --git a/src/chrome/content/rules/Kuro5hin.xml b/src/chrome/content/rules/Kuro5hin.xml
index 35218335af28..cfb8daca56c8 100644
--- a/src/chrome/content/rules/Kuro5hin.xml
+++ b/src/chrome/content/rules/Kuro5hin.xml
@@ -5,7 +5,7 @@ Fetch error: http://kuro5hin.org/ => https://www.kuro5hin.org/: (28, 'Connection
 Fetch error: http://www.kuro5hin.org/ => https://www.kuro5hin.org/: (28, 'Connection timed out after 20000 milliseconds')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Kursbuero.de.xml b/src/chrome/content/rules/Kursbuero.de.xml
deleted file mode 100644
index 83fd3b030975..000000000000
--- a/src/chrome/content/rules/Kursbuero.de.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Kuruc.info.xml b/src/chrome/content/rules/Kuruc.info.xml
index 677de411237c..66d4019aa3b0 100644
--- a/src/chrome/content/rules/Kuruc.info.xml
+++ b/src/chrome/content/rules/Kuruc.info.xml
@@ -1,7 +1,9 @@
 
 	
-	
-	
+	
 
-	
+	
+
+	
 
diff --git a/src/chrome/content/rules/Kutub.one.xml b/src/chrome/content/rules/Kutub.one.xml
new file mode 100644
index 000000000000..5e4f21ce69cf
--- /dev/null
+++ b/src/chrome/content/rules/Kutub.one.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/KutubPDFBook.com.xml b/src/chrome/content/rules/KutubPDFBook.com.xml
new file mode 100644
index 000000000000..1c4b336f3dbb
--- /dev/null
+++ b/src/chrome/content/rules/KutubPDFBook.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Kvack.org.xml b/src/chrome/content/rules/Kvack.org.xml
index 8ef7b7ad32bb..475896adc5ba 100644
--- a/src/chrome/content/rules/Kvack.org.xml
+++ b/src/chrome/content/rules/Kvack.org.xml
@@ -12,4 +12,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/KwikSurveys.xml b/src/chrome/content/rules/KwikSurveys.xml
index 46ade1084321..7f94778866ad 100644
--- a/src/chrome/content/rules/KwikSurveys.xml
+++ b/src/chrome/content/rules/KwikSurveys.xml
@@ -5,4 +5,4 @@
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Kyani.net.xml b/src/chrome/content/rules/Kyani.net.xml
index 5b4e2c0cc097..37877426ce34 100644
--- a/src/chrome/content/rules/Kyani.net.xml
+++ b/src/chrome/content/rules/Kyani.net.xml
@@ -32,4 +32,4 @@ Fetch error: http://kyani.net/ => https://eu.kyani.net/public/eu/en/main: Too ma
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Kylie.com.xml b/src/chrome/content/rules/Kylie.com.xml
new file mode 100644
index 000000000000..d8824669c254
--- /dev/null
+++ b/src/chrome/content/rules/Kylie.com.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+
+
+	
+
+
+	
+
+
diff --git a/src/chrome/content/rules/L-rumors.com.xml b/src/chrome/content/rules/L-rumors.com.xml
new file mode 100644
index 000000000000..e48e1512bfe3
--- /dev/null
+++ b/src/chrome/content/rules/L-rumors.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/L0g.us.xml b/src/chrome/content/rules/L0g.us.xml
index ca3880fdb452..3e8a2867999a 100644
--- a/src/chrome/content/rules/L0g.us.xml
+++ b/src/chrome/content/rules/L0g.us.xml
@@ -5,7 +5,7 @@ Fetch error: http://l0g.us/ => https://l0g.us/: (7, 'Failed to connect to l0g.us
 Fetch error: http://www.l0g.us/ => https://www.l0g.us/: (7, 'Failed to connect to www.l0g.us port 443: No route to host')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/L2020.xml b/src/chrome/content/rules/L2020.xml
index 171c0f733583..0d05a61f7c5c 100644
--- a/src/chrome/content/rules/L2020.xml
+++ b/src/chrome/content/rules/L2020.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://l2020.org/ => https://l2020.org/: (51, "SSL: no alternative certificate subject name matches target host name 'l2020.org'")
 Fetch error: http://www.l2020.org/ => https://l2020.org/: (51, "SSL: no alternative certificate subject name matches target host name 'l2020.org'")
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/L2C.xml b/src/chrome/content/rules/L2C.xml
index f63a7d64a033..e1db3fffac01 100644
--- a/src/chrome/content/rules/L2C.xml
+++ b/src/chrome/content/rules/L2C.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://l2c.co.kr/ => https://l2c.co.kr/: (60, 'SSL certificate problem: certificate has expired')
 Fetch error: http://www.l2c.co.kr/ => https://www.l2c.co.kr/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/LADSPA.org.xml b/src/chrome/content/rules/LADSPA.org.xml
new file mode 100644
index 000000000000..1272f81bf603
--- /dev/null
+++ b/src/chrome/content/rules/LADSPA.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/LANsquared.xml b/src/chrome/content/rules/LANsquared.xml
index ef1587382afa..7c64b54269fb 100644
--- a/src/chrome/content/rules/LANsquared.xml
+++ b/src/chrome/content/rules/LANsquared.xml
@@ -1,7 +1,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/LBHF.gov.uk.xml b/src/chrome/content/rules/LBHF.gov.uk.xml
index 7c59c8abf359..d589c072d111 100644
--- a/src/chrome/content/rules/LBHF.gov.uk.xml
+++ b/src/chrome/content/rules/LBHF.gov.uk.xml
@@ -36,7 +36,7 @@ Fetch error: http://www.apps4.lbhf.gov.uk/ => https://www.apps4.lbhf.gov.uk/: (7
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/LCHost.xml b/src/chrome/content/rules/LCHost.xml
index 39188d26d49a..1e696abeae0e 100644
--- a/src/chrome/content/rules/LCHost.xml
+++ b/src/chrome/content/rules/LCHost.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://cloud0.lchost.co.uk/ => https://cloud0.lchost.co.uk/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/LEspace_client.fr.xml b/src/chrome/content/rules/LEspace_client.fr.xml
index f80d0f2a739a..747bd7cc1ef8 100644
--- a/src/chrome/content/rules/LEspace_client.fr.xml
+++ b/src/chrome/content/rules/LEspace_client.fr.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.lespaceclient.fr/ => https://www.lespaceclient.fr/: (60,
 	For other Magic Online coverage, see Magic.fr.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/LExpress.fr.xml b/src/chrome/content/rules/LExpress.fr.xml
index 8086553c51ed..c03d4d1a9253 100644
--- a/src/chrome/content/rules/LExpress.fr.xml
+++ b/src/chrome/content/rules/LExpress.fr.xml
@@ -22,13 +22,14 @@
 -->
 
 
-	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/LFC-Hosting.xml b/src/chrome/content/rules/LFC-Hosting.xml
index 1614979749c1..023b42244f65 100644
--- a/src/chrome/content/rules/LFC-Hosting.xml
+++ b/src/chrome/content/rules/LFC-Hosting.xml
@@ -6,22 +6,18 @@ Fetch error: http://208.68.106.8/ => https://208.68.106.8/: (60, 'SSL certificat
 Automatically by https-everywhere-checker because:
 Fetch error: http://208.68.106.8/ => https://208.68.106.8/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
 
-	
 	
-	
+	
+	
+	
+	
 
 
 	
 
 
-	
-	
-
 	
 	
 
 	
-	
+	
 		
diff --git a/src/chrome/content/rules/LFov.net.xml b/src/chrome/content/rules/LFov.net.xml
index e78d703afd4f..b1dc9acefadc 100644
--- a/src/chrome/content/rules/LFov.net.xml
+++ b/src/chrome/content/rules/LFov.net.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.lfov.net/ => https://www.lfov.net/: (28, 'Connection tim
 	cookie on whichever domain it is loaded from.
 
 -->
-
+
 
 	
 	
@@ -25,4 +25,4 @@ Fetch error: http://www.lfov.net/ => https://www.lfov.net/: (28, 'Connection tim
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/LGTM.com.xml b/src/chrome/content/rules/LGTM.com.xml
new file mode 100644
index 000000000000..998b648211a3
--- /dev/null
+++ b/src/chrome/content/rules/LGTM.com.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/LIHKG.com.xml b/src/chrome/content/rules/LIHKG.com.xml
new file mode 100644
index 000000000000..46321ad49854
--- /dev/null
+++ b/src/chrome/content/rules/LIHKG.com.xml
@@ -0,0 +1,17 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/LINBIT.com-falsemixed.xml b/src/chrome/content/rules/LINBIT.com-falsemixed.xml
deleted file mode 100644
index e66c11ad1bd8..000000000000
--- a/src/chrome/content/rules/LINBIT.com-falsemixed.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/LINBIT.com.xml b/src/chrome/content/rules/LINBIT.com.xml
new file mode 100644
index 000000000000..bf4dc279a12e
--- /dev/null
+++ b/src/chrome/content/rules/LINBIT.com.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/LINBIT.xml b/src/chrome/content/rules/LINBIT.xml
deleted file mode 100644
index a7d6d4ad617e..000000000000
--- a/src/chrome/content/rules/LINBIT.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-	
-	
-		
-		
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/LIS.gov.xml b/src/chrome/content/rules/LIS.gov.xml
index 0f088af6db4e..a21b16294883 100644
--- a/src/chrome/content/rules/LIS.gov.xml
+++ b/src/chrome/content/rules/LIS.gov.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.lis.gov/ => https://www.lis.gov/: Too many redirects whi
 
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/LIU.se.xml b/src/chrome/content/rules/LIU.se.xml
index c9afd56c1de2..06c95cee19a5 100644
--- a/src/chrome/content/rules/LIU.se.xml
+++ b/src/chrome/content/rules/LIU.se.xml
@@ -1,11 +1,4 @@
-
 
-
+
 
 	
@@ -115,7 +110,6 @@ Fetch error: http://moviii.liu.se/ => https://moviii.isy.liu.se/: (7, 'Failed to
 	
 	
 	
-	
 	
 	
 	
@@ -124,12 +118,10 @@ Fetch error: http://moviii.liu.se/ => https://moviii.isy.liu.se/: (7, 'Failed to
 	
 	
 	
-	
 	
 	
 	
 
-	
 	
 	
 	
@@ -145,10 +137,8 @@ Fetch error: http://moviii.liu.se/ => https://moviii.isy.liu.se/: (7, 'Failed to
 	
 	
-	
 	
 	
-	
 
 		
@@ -166,9 +156,6 @@ Fetch error: http://moviii.liu.se/ => https://moviii.isy.liu.se/: (7, 'Failed to
 	
 
-	
-
 	
 
diff --git a/src/chrome/content/rules/LKQD.net.xml b/src/chrome/content/rules/LKQD.net.xml
index 405cf6e86254..a681c9752358 100644
--- a/src/chrome/content/rules/LKQD.net.xml
+++ b/src/chrome/content/rules/LKQD.net.xml
@@ -3,7 +3,7 @@
 		- lookup.lkqd.net
 		- rs-lb-a.lkqd.net
 		- rs-lb-b.lkqd.net
-		
+
 	Timeout
 		- lkqd.net
 		- www.lkqd.net
diff --git a/src/chrome/content/rules/LLS.org.xml b/src/chrome/content/rules/LLS.org.xml
index 3783f6c1bb94..14c43b9170aa 100644
--- a/src/chrome/content/rules/LLS.org.xml
+++ b/src/chrome/content/rules/LLS.org.xml
@@ -47,7 +47,7 @@ Fetch error: http://community.lls.org/ => https://community.lls.org/: (51, "SSL:
 	* Secured by us, doesn't trip MCB anyway
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/LLVM.org.xml b/src/chrome/content/rules/LLVM.org.xml
index 1e9590680f39..3a2899f23cb6 100644
--- a/src/chrome/content/rules/LLVM.org.xml
+++ b/src/chrome/content/rules/LLVM.org.xml
@@ -39,6 +39,7 @@
 	
 	
 	
+	
 	
 	
 	
diff --git a/src/chrome/content/rules/LMU-Muenchen-IFI.xml b/src/chrome/content/rules/LMU-Muenchen-IFI.xml
index 6c84f00c18b2..3d8fef8a457f 100644
--- a/src/chrome/content/rules/LMU-Muenchen-IFI.xml
+++ b/src/chrome/content/rules/LMU-Muenchen-IFI.xml
@@ -1,7 +1,7 @@
 
 	
-  
+
 	
 
 
diff --git a/src/chrome/content/rules/LMU-Muenchen.xml b/src/chrome/content/rules/LMU-Muenchen.xml
index 22bb70da14e6..46a4f9f4701d 100644
--- a/src/chrome/content/rules/LMU-Muenchen.xml
+++ b/src/chrome/content/rules/LMU-Muenchen.xml
@@ -4,7 +4,7 @@
 	Univeristy sites are big. For better maintaining there are seperate rulesets:
 	department: Library / Bibliothek, see LMU-Muenchen-Library.xml
 	department: Institute of Informatics / Institut fuer Informatik, see LMU-Muenchen-IFI.xml
-	
+
 	These altnames don't exist:
 
 		- uni-muenchen.de
@@ -25,7 +25,7 @@
 	
 	
 	
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/LPI.org.xml b/src/chrome/content/rules/LPI.org.xml
index 16ffaceb7aa6..9f2c9207517e 100644
--- a/src/chrome/content/rules/LPI.org.xml
+++ b/src/chrome/content/rules/LPI.org.xml
@@ -20,4 +20,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/LPICE.eu.xml b/src/chrome/content/rules/LPICE.eu.xml
index 7e527ba9250a..4ef215709758 100644
--- a/src/chrome/content/rules/LPICE.eu.xml
+++ b/src/chrome/content/rules/LPICE.eu.xml
@@ -1,6 +1,6 @@
 
-
+
 
 	
diff --git a/src/chrome/content/rules/LTER.xml b/src/chrome/content/rules/LTER.xml
index 819ef5c0cfff..42187cbfcc82 100644
--- a/src/chrome/content/rules/LTER.xml
+++ b/src/chrome/content/rules/LTER.xml
@@ -16,7 +16,10 @@ Fetch error: http://lternet.edu/ => https://www.lternet.edu/: (35, 'error:140770
 
 
 	
-	
+	
+	
+	
+	
 		
 
 
@@ -30,7 +33,6 @@ Fetch error: http://lternet.edu/ => https://www.lternet.edu/: (35, 'error:140770
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/LTH.se.xml b/src/chrome/content/rules/LTH.se.xml
index 62d5c42fe605..0163f9d69449 100644
--- a/src/chrome/content/rules/LTH.se.xml
+++ b/src/chrome/content/rules/LTH.se.xml
@@ -29,7 +29,7 @@ Fetch error: http://doc.ddg.lth.se/ => https://doc.ddg.lth.se/: (60, 'SSL certif
 		- Image on www from www.lu.se
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/LTRADIO.com.xml b/src/chrome/content/rules/LTRADIO.com.xml
index 9f1a8097a7e8..f8bb414f7752 100644
--- a/src/chrome/content/rules/LTRADIO.com.xml
+++ b/src/chrome/content/rules/LTRADIO.com.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/LTTStore.com.xml b/src/chrome/content/rules/LTTStore.com.xml
new file mode 100644
index 000000000000..e468bb5253dc
--- /dev/null
+++ b/src/chrome/content/rules/LTTStore.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/LTTng_Project.xml b/src/chrome/content/rules/LTTng_Project.xml
index e4f649971431..e6f09902f56e 100644
--- a/src/chrome/content/rules/LTTng_Project.xml
+++ b/src/chrome/content/rules/LTTng_Project.xml
@@ -19,7 +19,11 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 
 
 	
-
-
-	
-	
-
-
-	
-	
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/LVOC.org.xml b/src/chrome/content/rules/LVOC.org.xml
index 16661fb4f043..62eb9d393605 100644
--- a/src/chrome/content/rules/LVOC.org.xml
+++ b/src/chrome/content/rules/LVOC.org.xml
@@ -11,7 +11,7 @@
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/LaCaixa.xml b/src/chrome/content/rules/LaCaixa.xml
index 9054f00182c6..6d15398cc860 100644
--- a/src/chrome/content/rules/LaCaixa.xml
+++ b/src/chrome/content/rules/LaCaixa.xml
@@ -2,7 +2,7 @@
   
   
 
-  
+  
 
   
   
diff --git a/src/chrome/content/rules/LaDepeche.fr.xml b/src/chrome/content/rules/LaDepeche.fr.xml
index c8f846e5d61c..eba58dfb39cf 100644
--- a/src/chrome/content/rules/LaDepeche.fr.xml
+++ b/src/chrome/content/rules/LaDepeche.fr.xml
@@ -43,7 +43,7 @@
 	
 	
 	
-	 
+	
 	
 	
 	
diff --git a/src/chrome/content/rules/La_Cie.com.xml b/src/chrome/content/rules/La_Cie.com.xml
index 2bd32e2da9f2..1dfcd4bbe5f8 100644
--- a/src/chrome/content/rules/La_Cie.com.xml
+++ b/src/chrome/content/rules/La_Cie.com.xml
@@ -21,7 +21,7 @@ Fetch error: http://lacie.com/ => https://www.lacie.com/: Too many redirects whi
 		- www.lacie.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/La_Crosse_Alerts.com.xml b/src/chrome/content/rules/La_Crosse_Alerts.com.xml
index 9888993264cd..0ae808b26990 100644
--- a/src/chrome/content/rules/La_Crosse_Alerts.com.xml
+++ b/src/chrome/content/rules/La_Crosse_Alerts.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.lacrossealerts.com/ => https://www.lacrossealerts.com/:
 	^: dropped
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/La_Crosse_Technology.com.xml b/src/chrome/content/rules/La_Crosse_Technology.com.xml
index c18d7975e85f..0fd7d63b5f3b 100644
--- a/src/chrome/content/rules/La_Crosse_Technology.com.xml
+++ b/src/chrome/content/rules/La_Crosse_Technology.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://store.lacrossetechnology.com/ => https://store.lacrossetechn
 		- La_Crosse_Alerts.com.xml
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/La_Naya_Chocolate.xml b/src/chrome/content/rules/La_Naya_Chocolate.xml
index 8b2180091d87..c7db61ff128c 100644
--- a/src/chrome/content/rules/La_Naya_Chocolate.xml
+++ b/src/chrome/content/rules/La_Naya_Chocolate.xml
@@ -1,7 +1,7 @@
 
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/LabCorp.xml b/src/chrome/content/rules/LabCorp.xml
index f6b16b441e26..eb8220342eb3 100644
--- a/src/chrome/content/rules/LabCorp.xml
+++ b/src/chrome/content/rules/LabCorp.xml
@@ -16,7 +16,7 @@ Fetch error: http://hypersend.labcorp.com/ => https://hypersend.labcorp.com/: (2
 		- www.labcorp.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Labaia.xml b/src/chrome/content/rules/Labaia.xml
index 52b6e39b032a..511fc1a63071 100644
--- a/src/chrome/content/rules/Labaia.xml
+++ b/src/chrome/content/rules/Labaia.xml
@@ -10,7 +10,7 @@ Fetch error: http://labaia.ws/ => https://labaia.ws/: (7, 'Failed to connect to
 		- bayimg	(mismatch; reset)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Labix.org.xml b/src/chrome/content/rules/Labix.org.xml
new file mode 100644
index 000000000000..6866571d3d98
--- /dev/null
+++ b/src/chrome/content/rules/Labix.org.xml
@@ -0,0 +1,27 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/LackName.org.xml b/src/chrome/content/rules/LackName.org.xml
deleted file mode 100644
index 191d58a0c02c..000000000000
--- a/src/chrome/content/rules/LackName.org.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Lady_Foot_Locker.xml b/src/chrome/content/rules/Lady_Foot_Locker.xml
index 4db7c8c5d4d9..4a5239db17bc 100644
--- a/src/chrome/content/rules/Lady_Foot_Locker.xml
+++ b/src/chrome/content/rules/Lady_Foot_Locker.xml
@@ -18,7 +18,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -27,7 +28,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Ladysmith-District-Credit-Union.xml b/src/chrome/content/rules/Ladysmith-District-Credit-Union.xml
index 1f84a0382b63..c428c8e2fdfe 100644
--- a/src/chrome/content/rules/Ladysmith-District-Credit-Union.xml
+++ b/src/chrome/content/rules/Ladysmith-District-Credit-Union.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://ldcu.ca/ => https://ldcu.ca/: (56, 'SSL read: error:00000000:lib(0):func(0):reason(0), errno 104')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Lainfile.pw.xml b/src/chrome/content/rules/Lainfile.pw.xml
deleted file mode 100644
index 1df4027912e7..000000000000
--- a/src/chrome/content/rules/Lainfile.pw.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Lambda-Linux.io.xml b/src/chrome/content/rules/Lambda-Linux.io.xml
index c96b881d9bfd..268739fecf9d 100644
--- a/src/chrome/content/rules/Lambda-Linux.io.xml
+++ b/src/chrome/content/rules/Lambda-Linux.io.xml
@@ -7,7 +7,7 @@
 	
 	
-	
+
 	
 	
diff --git a/src/chrome/content/rules/Landal.xml b/src/chrome/content/rules/Landal.xml
index e16fc60771d6..76931d412240 100644
--- a/src/chrome/content/rules/Landal.xml
+++ b/src/chrome/content/rules/Landal.xml
@@ -1,5 +1,5 @@
 
-
+
 
 	
-	
+	
+	
 
 
 	
@@ -25,7 +26,6 @@ Fetch error: http://landslide.com/ => https://www.campaignercrm.com/: (60, 'SSL
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Langille.org.xml b/src/chrome/content/rules/Langille.org.xml
index 01da1ccf6958..145c6dd5de0d 100644
--- a/src/chrome/content/rules/Langille.org.xml
+++ b/src/chrome/content/rules/Langille.org.xml
@@ -6,7 +6,7 @@ Fetch error: http://dan.langille.org/ => https://dan.langille.org/: (60, 'SSL ce
 	(www.)?langille.org: Plaintext reply
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Langtons.com.au.xml b/src/chrome/content/rules/Langtons.com.au.xml
index 81a17415c1af..796afefcf391 100644
--- a/src/chrome/content/rules/Langtons.com.au.xml
+++ b/src/chrome/content/rules/Langtons.com.au.xml
@@ -3,7 +3,7 @@
 
 
 	Nonfunctional subdomains:
-	
+
 		- links.email	(mismatch hostname, CN: *.ibmmarketingcloud.com)
 		- img		(SSL handshake failed)
 		- promo		(mismatch hostname, CN: *.azurewebsites.net)
diff --git a/src/chrome/content/rules/Language_Perfect.xml b/src/chrome/content/rules/Language_Perfect.xml
index 9b52c8e1b839..0ac075226e4c 100644
--- a/src/chrome/content/rules/Language_Perfect.xml
+++ b/src/chrome/content/rules/Language_Perfect.xml
@@ -23,4 +23,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Langui.sh.xml b/src/chrome/content/rules/Langui.sh.xml
index 73c7f62bd977..60c72d00071d 100644
--- a/src/chrome/content/rules/Langui.sh.xml
+++ b/src/chrome/content/rules/Langui.sh.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.langui.sh/ => https://www.langui.sh/: (51, "SSL: no alternative certificate subject name matches target host name 'www.langui.sh'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Lanik.us.xml b/src/chrome/content/rules/Lanik.us.xml
index a2f52f94840a..a685c3466b04 100644
--- a/src/chrome/content/rules/Lanik.us.xml
+++ b/src/chrome/content/rules/Lanik.us.xml
@@ -20,4 +20,4 @@
 
 	
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Lansforsakringar.se.xml b/src/chrome/content/rules/Lansforsakringar.se.xml
index 6c44ab6956d2..9d23f9353c2d 100644
--- a/src/chrome/content/rules/Lansforsakringar.se.xml
+++ b/src/chrome/content/rules/Lansforsakringar.se.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://lansforsakringar.se/ => https://www.lansforsakringar.se/: Too many redirects while fetching 'https://www.lansforsakringar.se/'
 Fetch error: http://www.lansforsakringar.se/ => https://www.lansforsakringar.se/: Too many redirects while fetching 'https://www.lansforsakringar.se/'
  This is a swedish insurance company -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Lanyrd.xml b/src/chrome/content/rules/Lanyrd.xml
deleted file mode 100644
index 5a12b2b33c81..000000000000
--- a/src/chrome/content/rules/Lanyrd.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Laptop.hu.xml b/src/chrome/content/rules/Laptop.hu.xml
index fd65fc6888d4..6b67c316d130 100644
--- a/src/chrome/content/rules/Laptop.hu.xml
+++ b/src/chrome/content/rules/Laptop.hu.xml
@@ -18,7 +18,7 @@ Fetch error: http://www.onlinenotebook.hu/ => https://laptop.hu/: (7, 'Failed to
 Fetch error: http://www.laptoplap.hu/ => https://laptop.hu/: (7, 'Failed to connect to laptop.hu port 443: Connection refused')
 Fetch error: http://gfxpro.hu/ => https://gfxpro.hu/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Las_Vegas_Review-Journal.xml b/src/chrome/content/rules/Las_Vegas_Review-Journal.xml
index 2e65aad3cb97..c9883730c815 100644
--- a/src/chrome/content/rules/Las_Vegas_Review-Journal.xml
+++ b/src/chrome/content/rules/Las_Vegas_Review-Journal.xml
@@ -23,11 +23,13 @@ Fetch error: http://oneday.lvrj.com/ => https://oneday.lvrj.com/: Redirect for '
 	* Works; mismatched, CN: *.reviewjournal.com
 
 -->
-
+
 
 	
 	
-	
+	
+	
+	
 
 
 	
 	
 	
diff --git a/src/chrome/content/rules/LastStopShop.co.nz.xml b/src/chrome/content/rules/LastStopShop.co.nz.xml
deleted file mode 100644
index 56a1e226293c..000000000000
--- a/src/chrome/content/rules/LastStopShop.co.nz.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/LastStopShop.com.au.xml b/src/chrome/content/rules/LastStopShop.com.au.xml
deleted file mode 100644
index ce555d69bce6..000000000000
--- a/src/chrome/content/rules/LastStopShop.com.au.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Lastlog.de.xml b/src/chrome/content/rules/Lastlog.de.xml
index 6b6c36181916..cfb91affdd72 100644
--- a/src/chrome/content/rules/Lastlog.de.xml
+++ b/src/chrome/content/rules/Lastlog.de.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.lastlog.de/ => https://www.lastlog.de/: (51, "SSL: no alternative certificate subject name matches target host name 'www.lastlog.de'")
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Lastminute.xml b/src/chrome/content/rules/Lastminute.xml
index 18d247f8294b..0a4d47febc57 100644
--- a/src/chrome/content/rules/Lastminute.xml
+++ b/src/chrome/content/rules/Lastminute.xml
@@ -62,7 +62,7 @@ Fetch error: http://it.lastminute.com/ => https://www.it.lastminute.com/: (51, "
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Launchpad.xml b/src/chrome/content/rules/Launchpad.xml
index 2f2b28786a95..54b809012989 100644
--- a/src/chrome/content/rules/Launchpad.xml
+++ b/src/chrome/content/rules/Launchpad.xml
@@ -67,7 +67,7 @@
 			
 			
 			
-			
+
 
 		
 		
@@ -83,9 +83,7 @@
 
 
 	
-	
-    
+					-->    
 
     
     
diff --git a/src/chrome/content/rules/Laup.xml b/src/chrome/content/rules/Laup.xml
index 65380f93f806..9334c01f7cce 100644
--- a/src/chrome/content/rules/Laup.xml
+++ b/src/chrome/content/rules/Laup.xml
@@ -13,4 +13,4 @@ Fetch error: http://laup.nu/ => https://laup.nu/: (35, 'error:140770FC:SSL routi
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Lavabit.xml b/src/chrome/content/rules/Lavabit.xml
deleted file mode 100644
index d561fd64d694..000000000000
--- a/src/chrome/content/rules/Lavabit.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Lavaboom.com.xml b/src/chrome/content/rules/Lavaboom.com.xml
index 5e56658bab6b..8dc5f2228aa3 100644
--- a/src/chrome/content/rules/Lavaboom.com.xml
+++ b/src/chrome/content/rules/Lavaboom.com.xml
@@ -22,7 +22,7 @@ Fetch error: http://www.lavaboom.com/ => https://www.lavaboom.com/: (60, 'SSL ce
 		- technical.lavaboom.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Laverna.xml b/src/chrome/content/rules/Laverna.xml
index a6481297856b..9286b81d9182 100644
--- a/src/chrome/content/rules/Laverna.xml
+++ b/src/chrome/content/rules/Laverna.xml
@@ -1,6 +1,6 @@
 
 	
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Law_Business_Research_CDN.xml b/src/chrome/content/rules/Law_Business_Research_CDN.xml
deleted file mode 100644
index d90a216a565a..000000000000
--- a/src/chrome/content/rules/Law_Business_Research_CDN.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Law_School_Admission_Council.xml b/src/chrome/content/rules/Law_School_Admission_Council.xml
index 3ff7d230e730..e0d2951d8576 100644
--- a/src/chrome/content/rules/Law_School_Admission_Council.xml
+++ b/src/chrome/content/rules/Law_School_Admission_Council.xml
@@ -18,9 +18,9 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Lawrence-Livermore-National-Laboratory.xml b/src/chrome/content/rules/Lawrence-Livermore-National-Laboratory.xml
index d11cabd1df68..c5711d7e7dbf 100644
--- a/src/chrome/content/rules/Lawrence-Livermore-National-Laboratory.xml
+++ b/src/chrome/content/rules/Lawrence-Livermore-National-Laboratory.xml
@@ -40,7 +40,7 @@ Fetch error: http://publicaffairs.llnl.gov/ => https://publicaffairs.llnl.gov/:
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Lawyermarketing.com.xml b/src/chrome/content/rules/Lawyermarketing.com.xml
new file mode 100644
index 000000000000..c599ffbdc53c
--- /dev/null
+++ b/src/chrome/content/rules/Lawyermarketing.com.xml
@@ -0,0 +1,6 @@
+
+    
+    
+
+    
+
diff --git a/src/chrome/content/rules/LayerBNC.org.xml b/src/chrome/content/rules/LayerBNC.org.xml
deleted file mode 100644
index 17eba987dc29..000000000000
--- a/src/chrome/content/rules/LayerBNC.org.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Layne_Publications.xml b/src/chrome/content/rules/Layne_Publications.xml
index 5ce40afa6f2b..1227c39c5201 100644
--- a/src/chrome/content/rules/Layne_Publications.xml
+++ b/src/chrome/content/rules/Layne_Publications.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/LazyCoins.com.xml b/src/chrome/content/rules/LazyCoins.com.xml
index c360f11111f4..b12cc021f819 100644
--- a/src/chrome/content/rules/LazyCoins.com.xml
+++ b/src/chrome/content/rules/LazyCoins.com.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.lazycoins.com/ => https://www.lazycoins.com/: (28, 'Conn
 		- .lazycoins.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Lazy_Kush.xml b/src/chrome/content/rules/Lazy_Kush.xml
index 570d4cc571f8..98051856b2ed 100644
--- a/src/chrome/content/rules/Lazy_Kush.xml
+++ b/src/chrome/content/rules/Lazy_Kush.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Lb.ca.xml b/src/chrome/content/rules/Lb.ca.xml
index 1791005b60c2..910a6d78703b 100644
--- a/src/chrome/content/rules/Lb.ca.xml
+++ b/src/chrome/content/rules/Lb.ca.xml
@@ -4,7 +4,7 @@
 		- (www.)?
 
 
-	Insecure cookies are set for these 
+	Insecure cookies are set for these
 
 		- lb.ca
 		- www.lb.ca
diff --git a/src/chrome/content/rules/LeFebvre.org.xml b/src/chrome/content/rules/LeFebvre.org.xml
index 23ea378f85fc..f0867a7e426e 100644
--- a/src/chrome/content/rules/LeFebvre.org.xml
+++ b/src/chrome/content/rules/LeFebvre.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://lefebvre.org/ => https://lefebvre.org/: (51, "SSL: no alternative certificate subject name matches target host name 'lefebvre.org'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/LeMonde.fr.xml b/src/chrome/content/rules/LeMonde.fr.xml
index 9614267cc77f..8314361409ee 100644
--- a/src/chrome/content/rules/LeMonde.fr.xml
+++ b/src/chrome/content/rules/LeMonde.fr.xml
@@ -83,7 +83,7 @@
 		paroles2chansons.lemonde.fr
 
 -->
-
+
 
 	
 	
@@ -148,7 +148,7 @@
 
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/LePoing.net.xml b/src/chrome/content/rules/LePoing.net.xml
new file mode 100644
index 000000000000..35385a8a63ab
--- /dev/null
+++ b/src/chrome/content/rules/LePoing.net.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Le_Loop.org.xml b/src/chrome/content/rules/Le_Loop.org.xml
index 8802b0d85b9f..27103c2b960c 100644
--- a/src/chrome/content/rules/Le_Loop.org.xml
+++ b/src/chrome/content/rules/Le_Loop.org.xml
@@ -18,7 +18,7 @@ Fetch error: http://www.leloop.org/ => https://www.leloop.org/: (60, 'SSL certif
 		- links.leloop.org
 
 -->
-
+
 
 	
@@ -29,7 +29,7 @@ Fetch error: http://www.leloop.org/ => https://www.leloop.org/: (60, 'SSL certif
 	
 	
 	
-        			
+
 
 	
diff --git a/src/chrome/content/rules/LeadPages.net.xml b/src/chrome/content/rules/LeadPages.net.xml
index 4bcf72096267..528bde1beccf 100644
--- a/src/chrome/content/rules/LeadPages.net.xml
+++ b/src/chrome/content/rules/LeadPages.net.xml
@@ -12,7 +12,7 @@
 	
 	
 	
-		
+	
 	
 	
 	
diff --git a/src/chrome/content/rules/LeadSpend.com.xml b/src/chrome/content/rules/LeadSpend.com.xml
index 38524e8f9004..5e3d50ce3bbd 100644
--- a/src/chrome/content/rules/LeadSpend.com.xml
+++ b/src/chrome/content/rules/LeadSpend.com.xml
@@ -11,7 +11,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://leadspend.com/ => https://leadspend.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Leader-Manager.com.xml b/src/chrome/content/rules/Leader-Manager.com.xml
deleted file mode 100644
index cd81a4b85daf..000000000000
--- a/src/chrome/content/rules/Leader-Manager.com.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Leader-Technologies.xml b/src/chrome/content/rules/Leader-Technologies.xml
index 61cb372cd016..eba6d6916743 100644
--- a/src/chrome/content/rules/Leader-Technologies.xml
+++ b/src/chrome/content/rules/Leader-Technologies.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.leadertech.com/ => https://www.leadertech.com/: (60, 'SS
 		- Online-Register.xml
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Leader.xml b/src/chrome/content/rules/Leader.xml
deleted file mode 100644
index 92be246212af..000000000000
--- a/src/chrome/content/rules/Leader.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Leadnow.xml b/src/chrome/content/rules/Leadnow.xml
index 2d4d903b3056..df227206f5e3 100644
--- a/src/chrome/content/rules/Leadnow.xml
+++ b/src/chrome/content/rules/Leadnow.xml
@@ -2,10 +2,10 @@
 
 	
 	
-	
+	
 
 
-	
+	
 
 
 	
-	
-
-	
-
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Leakedsource.com.xml b/src/chrome/content/rules/Leakedsource.com.xml
index 2ff49afe39a2..e2934a4aa6bf 100644
--- a/src/chrome/content/rules/Leakedsource.com.xml
+++ b/src/chrome/content/rules/Leakedsource.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://id.leakedsource.com/ => https://id.leakedsource.com/: (6, 'C
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/LeanCrew.com.xml b/src/chrome/content/rules/LeanCrew.com.xml
new file mode 100644
index 000000000000..b0ba59d4e365
--- /dev/null
+++ b/src/chrome/content/rules/LeanCrew.com.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Leanpub.com.xml b/src/chrome/content/rules/Leanpub.com.xml
index 043dc34f2d8a..7cc7620d28a6 100644
--- a/src/chrome/content/rules/Leanpub.com.xml
+++ b/src/chrome/content/rules/Leanpub.com.xml
@@ -1,28 +1,14 @@
 
 
-
 	
-	
-
-
-	
-	
-
-	
-
-
-	
+	
 
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/Leap_Motion.xml b/src/chrome/content/rules/Leap_Motion.xml
index e6c51255c3de..8873a81039d5 100644
--- a/src/chrome/content/rules/Leap_Motion.xml
+++ b/src/chrome/content/rules/Leap_Motion.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Learn-C.org.xml b/src/chrome/content/rules/Learn-C.org.xml
index ce843c539136..cc7df3c5216d 100644
--- a/src/chrome/content/rules/Learn-C.org.xml
+++ b/src/chrome/content/rules/Learn-C.org.xml
@@ -1,16 +1,16 @@
 
 
 	
diff --git a/src/chrome/content/rules/LearnShare.com.xml b/src/chrome/content/rules/LearnShare.com.xml
index 9444f79ce526..d1d73a93dfb0 100644
--- a/src/chrome/content/rules/LearnShare.com.xml
+++ b/src/chrome/content/rules/LearnShare.com.xml
@@ -5,9 +5,9 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/LearnXInYMinutes.com.xml b/src/chrome/content/rules/LearnXInYMinutes.com.xml
new file mode 100644
index 000000000000..5beee6671997
--- /dev/null
+++ b/src/chrome/content/rules/LearnXInYMinutes.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/LeaseRig.net.xml b/src/chrome/content/rules/LeaseRig.net.xml
index 48340cecc8f1..90ccd9e064a5 100644
--- a/src/chrome/content/rules/LeaseRig.net.xml
+++ b/src/chrome/content/rules/LeaseRig.net.xml
@@ -5,7 +5,7 @@ Fetch error: http://leaserig.net/ => https://leaserig.net/: (7, 'Failed to conne
 Fetch error: http://www.leaserig.net/ => https://www.leaserig.net/: (7, 'Failed to connect to www.leaserig.net port 443: Connection refused')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/LeaseWeb.xml b/src/chrome/content/rules/LeaseWeb.xml
index be742f4f1cd1..9478fa0f4023 100644
--- a/src/chrome/content/rules/LeaseWeb.xml
+++ b/src/chrome/content/rules/LeaseWeb.xml
@@ -22,7 +22,7 @@
 	
 	
 	
-	
+
 	
 	
 	
@@ -36,7 +36,7 @@
 	
 	
 	
-		
+	
 
 
 	
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/Ledgerscope.xml b/src/chrome/content/rules/Ledgerscope.xml
index 1cb4c9e86f2a..1be38a099cab 100644
--- a/src/chrome/content/rules/Ledgerscope.xml
+++ b/src/chrome/content/rules/Ledgerscope.xml
@@ -5,7 +5,7 @@ Fetch error: http://ledgerscope.net/ => https://ledgerscope.net/: (51, "SSL: no
 Fetch error: http://www.ledgerscope.net/ => https://www.ledgerscope.net/: (51, "SSL: no alternative certificate subject name matches target host name 'www.ledgerscope.net'")
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Leeds.ac.uk-falsemixed.xml b/src/chrome/content/rules/Leeds.ac.uk-falsemixed.xml
deleted file mode 100644
index 39af9d454215..000000000000
--- a/src/chrome/content/rules/Leeds.ac.uk-falsemixed.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Leet_Media.com.xml b/src/chrome/content/rules/Leet_Media.com.xml
index 5cb37668b6c0..bbbfd0ddebf8 100644
--- a/src/chrome/content/rules/Leet_Media.com.xml
+++ b/src/chrome/content/rules/Leet_Media.com.xml
@@ -11,7 +11,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://leetmedia.com/ => https://leetmedia.com/: (28, 'Operation timed out after 15000 milliseconds with 0 bytes received')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Leetway.com.xml b/src/chrome/content/rules/Leetway.com.xml
index b53916add92d..993008e0ad81 100644
--- a/src/chrome/content/rules/Leetway.com.xml
+++ b/src/chrome/content/rules/Leetway.com.xml
@@ -34,7 +34,7 @@ Fetch error: http://leetway.com/ => https://leetway.com/: (28, 'Operation timed
 	and css from (www.).
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Lef.org.xml b/src/chrome/content/rules/Lef.org.xml
deleted file mode 100644
index 43c22b56bf76..000000000000
--- a/src/chrome/content/rules/Lef.org.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-  
-  
-
-  
-
diff --git a/src/chrome/content/rules/Legacy.com.xml b/src/chrome/content/rules/Legacy.com.xml
index 40840728b54c..605aba0b1dfa 100644
--- a/src/chrome/content/rules/Legacy.com.xml
+++ b/src/chrome/content/rules/Legacy.com.xml
@@ -1,68 +1,44 @@
-
 
-
 
+
+	
+	
+	
 	
 	
+	
 	
 	
+		
+		
+			
+			
+			
+			
 	
+	
+	
 	
 	
 
-		
-		
-
-			
-			
-			
-			
-
-
 	
 	
 	
 
 
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/Legal_Directores.xml b/src/chrome/content/rules/Legal_Directores.xml
index 9a25d38b0702..112150cff77d 100644
--- a/src/chrome/content/rules/Legal_Directores.xml
+++ b/src/chrome/content/rules/Legal_Directores.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/LegiScan.com.xml b/src/chrome/content/rules/LegiScan.com.xml
index 834f89d23fd5..1b1e08cbcadf 100644
--- a/src/chrome/content/rules/LegiScan.com.xml
+++ b/src/chrome/content/rules/LegiScan.com.xml
@@ -14,7 +14,7 @@ Fetch error: http://acme.legiscan.com/ => https://acme.legiscan.com/: (60, 'SSL
 		- .legiscan.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Legolanddiscoverycenter.xml b/src/chrome/content/rules/Legolanddiscoverycenter.xml
index 6d79a0b2749b..b8087da3e03a 100644
--- a/src/chrome/content/rules/Legolanddiscoverycenter.xml
+++ b/src/chrome/content/rules/Legolanddiscoverycenter.xml
@@ -15,7 +15,7 @@ Fetch error: http://secure.legolanddiscoverycentre.co.uk/ => https://secure.lego
 
 	¹ cert mismatch
 -->
-
+
 	
 	
 	
@@ -23,7 +23,7 @@ Fetch error: http://secure.legolanddiscoverycentre.co.uk/ => https://secure.lego
 	
 	
 	
-	
+
 	
 	
 
diff --git a/src/chrome/content/rules/Legolas-Media.xml b/src/chrome/content/rules/Legolas-Media.xml
deleted file mode 100644
index 4e11b20eb137..000000000000
--- a/src/chrome/content/rules/Legolas-Media.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Leia_Jung.org.xml b/src/chrome/content/rules/Leia_Jung.org.xml
index 3a4cd5382306..e5b631850e46 100644
--- a/src/chrome/content/rules/Leia_Jung.org.xml
+++ b/src/chrome/content/rules/Leia_Jung.org.xml
@@ -12,4 +12,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Leibniz_Supercomputing_Centre.xml b/src/chrome/content/rules/Leibniz_Supercomputing_Centre.xml
index 26b612ed7ed0..e4e36d279a49 100644
--- a/src/chrome/content/rules/Leibniz_Supercomputing_Centre.xml
+++ b/src/chrome/content/rules/Leibniz_Supercomputing_Centre.xml
@@ -12,7 +12,7 @@ Fetch error: http://idportal.lrz-muenchen.de/ => https://idportal.lrz-muenchen.d
 		- servicedesk.lrz.de
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Leiden_Univ.nl.xml b/src/chrome/content/rules/Leiden_Univ.nl.xml
index ad717e676954..6f0bad7dcf7b 100644
--- a/src/chrome/content/rules/Leiden_Univ.nl.xml
+++ b/src/chrome/content/rules/Leiden_Univ.nl.xml
@@ -78,14 +78,33 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 		
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Lemde.fr.xml b/src/chrome/content/rules/Lemde.fr.xml
index 93686988d36a..bf57487b0e1c 100644
--- a/src/chrome/content/rules/Lemde.fr.xml
+++ b/src/chrome/content/rules/Lemde.fr.xml
@@ -16,7 +16,7 @@
 		
 	
 		
-    
+
 	
 
diff --git a/src/chrome/content/rules/Lending-Club.xml b/src/chrome/content/rules/Lending-Club.xml
deleted file mode 100644
index 4ae836cc6556..000000000000
--- a/src/chrome/content/rules/Lending-Club.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-  	
-
-	
-
diff --git a/src/chrome/content/rules/Lendo.se.xml b/src/chrome/content/rules/Lendo.se.xml
index 055941699345..bb5df0ce05cc 100644
--- a/src/chrome/content/rules/Lendo.se.xml
+++ b/src/chrome/content/rules/Lendo.se.xml
@@ -18,7 +18,7 @@
 
 
 	
-	
+	
 
 
 	
-	
-
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Lenos-Software.xml b/src/chrome/content/rules/Lenos-Software.xml
deleted file mode 100644
index 5c3b4e2548b3..000000000000
--- a/src/chrome/content/rules/Lenos-Software.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Lenovo.com.cn.xml b/src/chrome/content/rules/Lenovo.com.cn.xml
index fc0396a7d703..2671a2af6c1f 100644
--- a/src/chrome/content/rules/Lenovo.com.cn.xml
+++ b/src/chrome/content/rules/Lenovo.com.cn.xml
@@ -43,7 +43,7 @@ Fetch error: http://welfare.lenovo.com.cn/ => https://welfare.lenovo.com.cn/: (2
 		iknow.lenovo.com.cn	( https://iknow.lenovo.com.cn/detail/dc_153184.html )
 		m.lenovo.com.cn
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Leo.org.xml b/src/chrome/content/rules/Leo.org.xml
index 04eb3bd5dd19..8447edc05b04 100644
--- a/src/chrome/content/rules/Leo.org.xml
+++ b/src/chrome/content/rules/Leo.org.xml
@@ -1,20 +1,58 @@
 
-
+
 
 	
 	
+	
+		
+	
+	
 	
 	
+	
+	
+	
+	
+	
+	
+	
+	
 	
 	
+	
+	
+	
+	
+	
+	
+	
 	
+	
+	
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Leona.my.xml b/src/chrome/content/rules/Leona.my.xml
new file mode 100644
index 000000000000..dc911d2b3f82
--- /dev/null
+++ b/src/chrome/content/rules/Leona.my.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Leroy_Farmer_City_Press.xml b/src/chrome/content/rules/Leroy_Farmer_City_Press.xml
deleted file mode 100644
index 43bef015be9c..000000000000
--- a/src/chrome/content/rules/Leroy_Farmer_City_Press.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Les-Crises.fr.xml b/src/chrome/content/rules/Les-Crises.fr.xml
new file mode 100644
index 000000000000..d1eda4adb96a
--- /dev/null
+++ b/src/chrome/content/rules/Les-Crises.fr.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/LesFurets.com.xml b/src/chrome/content/rules/LesFurets.com.xml
deleted file mode 100644
index 529373e37953..000000000000
--- a/src/chrome/content/rules/LesFurets.com.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/LesInrocks.com.xml b/src/chrome/content/rules/LesInrocks.com.xml
index cc3579e51d6e..f273ded097f3 100644
--- a/src/chrome/content/rules/LesInrocks.com.xml
+++ b/src/chrome/content/rules/LesInrocks.com.xml
@@ -6,7 +6,7 @@
 		mon-compte.lesinrocks.com
 		revue-du-web.lesinrocks.com
 		statics.lesinrocks.com
-		
+
 	Time out:
 		lesinrocks.com
 		blogs.lesinrocks.com
@@ -49,7 +49,7 @@
 	
 
-	
 
 
diff --git a/src/chrome/content/rules/LesLumieresdOrient.com.xml b/src/chrome/content/rules/LesLumieresdOrient.com.xml
new file mode 100644
index 000000000000..db29cdac45c8
--- /dev/null
+++ b/src/chrome/content/rules/LesLumieresdOrient.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/LessThan3.xml b/src/chrome/content/rules/LessThan3.xml
index 0f4faab0f614..9f95070ceac1 100644
--- a/src/chrome/content/rules/LessThan3.xml
+++ b/src/chrome/content/rules/LessThan3.xml
@@ -9,13 +9,13 @@
 
 
 	
-	
+	
+	
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/LessWrong.com.xml b/src/chrome/content/rules/LessWrong.com.xml
new file mode 100644
index 000000000000..58ed4ab7e653
--- /dev/null
+++ b/src/chrome/content/rules/LessWrong.com.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Lessig_for_president.com.xml b/src/chrome/content/rules/Lessig_for_president.com.xml
index e69f2395a7e8..2fee85ec6fc5 100644
--- a/src/chrome/content/rules/Lessig_for_president.com.xml
+++ b/src/chrome/content/rules/Lessig_for_president.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.lessigforpresident.com/ => https://www.lessigforpresiden
 		- .lessigforpresident.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Lester_Chan.net.xml b/src/chrome/content/rules/Lester_Chan.net.xml
index 96af4228621a..d73a04d6008c 100644
--- a/src/chrome/content/rules/Lester_Chan.net.xml
+++ b/src/chrome/content/rules/Lester_Chan.net.xml
@@ -20,29 +20,11 @@
 -->
 
 
-	
-	
-	
-
-	
 	
 
 	
 
-
-	
-	
-
-	
-
-
 	
 
-	
-
 
diff --git a/src/chrome/content/rules/LetMeTurnTheTables.com.xml b/src/chrome/content/rules/LetMeTurnTheTables.com.xml
new file mode 100644
index 000000000000..93b9d2441069
--- /dev/null
+++ b/src/chrome/content/rules/LetMeTurnTheTables.com.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Lets_Encrypt.org.xml b/src/chrome/content/rules/Lets_Encrypt.org.xml
index 6df8c770110f..85b79864ceec 100644
--- a/src/chrome/content/rules/Lets_Encrypt.org.xml
+++ b/src/chrome/content/rules/Lets_Encrypt.org.xml
@@ -1,19 +1,26 @@
+
 
 
-	
-	
-	
 	
 	
-
-		
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 	
 
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Lets_Talk_Bitcoin.com.xml b/src/chrome/content/rules/Lets_Talk_Bitcoin.com.xml
index 0610625418a9..b073b720cf03 100644
--- a/src/chrome/content/rules/Lets_Talk_Bitcoin.com.xml
+++ b/src/chrome/content/rules/Lets_Talk_Bitcoin.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://www.letstalkbitcoin.com/ => https://www.letstalkbitcoin.com/
 		- .letstalkbitcoin.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Letterboxd.com.xml b/src/chrome/content/rules/Letterboxd.com.xml
index ec4988bdf4ff..34800b6c9aed 100644
--- a/src/chrome/content/rules/Letterboxd.com.xml
+++ b/src/chrome/content/rules/Letterboxd.com.xml
@@ -2,21 +2,21 @@
 	
 	
 
-
 
 
 
 
 
-
 
 	
@@ -26,8 +26,6 @@
 	
 
 
-	
-	
 
 	
 
diff --git a/src/chrome/content/rules/Level1Techs.com.xml b/src/chrome/content/rules/Level1Techs.com.xml
new file mode 100644
index 000000000000..953bd327292f
--- /dev/null
+++ b/src/chrome/content/rules/Level1Techs.com.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Leveson_Inquiry.xml b/src/chrome/content/rules/Leveson_Inquiry.xml
index 8f8a3cecc3ee..a05c4e1919cb 100644
--- a/src/chrome/content/rules/Leveson_Inquiry.xml
+++ b/src/chrome/content/rules/Leveson_Inquiry.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.levesoninquiry.org.uk/ => https://www.levesoninquiry.org
 	!www doesn't work.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Levo.com.xml b/src/chrome/content/rules/Levo.com.xml
deleted file mode 100644
index 15351da7d1e7..000000000000
--- a/src/chrome/content/rules/Levo.com.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Levonline.com.xml b/src/chrome/content/rules/Levonline.com.xml
index 9bac1432012d..aa0048a70bfa 100644
--- a/src/chrome/content/rules/Levonline.com.xml
+++ b/src/chrome/content/rules/Levonline.com.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Lh.co.th.xml b/src/chrome/content/rules/Lh.co.th.xml
index f149de25759d..9f4e422a051c 100644
--- a/src/chrome/content/rules/Lh.co.th.xml
+++ b/src/chrome/content/rules/Lh.co.th.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://lh.co.th/ => https://www.lh.co.th/: (7, 'Failed to connect to www.lh.co.th port 443: Connection refused')
 Fetch error: http://www.lh.co.th/ => https://www.lh.co.th/: (7, 'Failed to connect to www.lh.co.th port 443: Connection refused')
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Li.ru.xml b/src/chrome/content/rules/Li.ru.xml
new file mode 100644
index 000000000000..369416ce99cb
--- /dev/null
+++ b/src/chrome/content/rules/Li.ru.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/LiLux.lu.xml b/src/chrome/content/rules/LiLux.lu.xml
index d1ce47089107..9698faede84c 100644
--- a/src/chrome/content/rules/LiLux.lu.xml
+++ b/src/chrome/content/rules/LiLux.lu.xml
@@ -17,13 +17,14 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/LibApps.com.xml b/src/chrome/content/rules/LibApps.com.xml
index 39c1b06222ec..1bfd7cafe95a 100644
--- a/src/chrome/content/rules/LibApps.com.xml
+++ b/src/chrome/content/rules/LibApps.com.xml
@@ -1,7 +1,7 @@
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Libarchive.org.xml b/src/chrome/content/rules/Libarchive.org.xml
new file mode 100644
index 000000000000..db8b6316971f
--- /dev/null
+++ b/src/chrome/content/rules/Libarchive.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Libdems.org.uk.xml b/src/chrome/content/rules/Libdems.org.uk.xml
index fd8fd12d1962..634501d79602 100644
--- a/src/chrome/content/rules/Libdems.org.uk.xml
+++ b/src/chrome/content/rules/Libdems.org.uk.xml
@@ -10,7 +10,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -22,4 +23,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Liberal_America.org-falsemixed.xml b/src/chrome/content/rules/Liberal_America.org-falsemixed.xml
index 7ee0a0d9b178..d92b4119fc52 100644
--- a/src/chrome/content/rules/Liberal_America.org-falsemixed.xml
+++ b/src/chrome/content/rules/Liberal_America.org-falsemixed.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Liberdade.Digital.xml b/src/chrome/content/rules/Liberdade.Digital.xml
index 54f6f65a2b6d..11cbec541f60 100644
--- a/src/chrome/content/rules/Liberdade.Digital.xml
+++ b/src/chrome/content/rules/Liberdade.Digital.xml
@@ -16,7 +16,7 @@ Fetch error: http://piwik.liberdade.digital/ => https://piwik.liberdade.digital/
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Liberty.xml b/src/chrome/content/rules/Liberty.xml
deleted file mode 100644
index 91b8aa71d2ad..000000000000
--- a/src/chrome/content/rules/Liberty.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Libevent.org.xml b/src/chrome/content/rules/Libevent.org.xml
new file mode 100644
index 000000000000..f26d3a0fde3a
--- /dev/null
+++ b/src/chrome/content/rules/Libevent.org.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Libgen.xml b/src/chrome/content/rules/Libgen.xml
index 136887571007..a8d713638bab 100644
--- a/src/chrome/content/rules/Libgen.xml
+++ b/src/chrome/content/rules/Libgen.xml
@@ -6,7 +6,7 @@
 		*.libgen.me
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Libravatar.org.xml b/src/chrome/content/rules/Libravatar.org.xml
deleted file mode 100644
index d97acfdb4cd6..000000000000
--- a/src/chrome/content/rules/Libravatar.org.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-		
-
-	
-
-
diff --git a/src/chrome/content/rules/LibreLabUCM.org.xml b/src/chrome/content/rules/LibreLabUCM.org.xml
new file mode 100644
index 000000000000..aff9e1c21ef4
--- /dev/null
+++ b/src/chrome/content/rules/LibreLabUCM.org.xml
@@ -0,0 +1,26 @@
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+    
+
diff --git a/src/chrome/content/rules/LibreOffice.org.xml b/src/chrome/content/rules/LibreOffice.org.xml
index b938add91162..c6075ee0dbb3 100644
--- a/src/chrome/content/rules/LibreOffice.org.xml
+++ b/src/chrome/content/rules/LibreOffice.org.xml
@@ -27,6 +27,7 @@
 	
 	
 	
+	
 	
 	
 	
diff --git a/src/chrome/content/rules/LibreOfficeBox.xml b/src/chrome/content/rules/LibreOfficeBox.xml
deleted file mode 100644
index 77783e40416e..000000000000
--- a/src/chrome/content/rules/LibreOfficeBox.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/src/chrome/content/rules/Libre_Graphics_World.org.xml b/src/chrome/content/rules/Libre_Graphics_World.org.xml
index 480ce2b90ae8..d866d5353727 100644
--- a/src/chrome/content/rules/Libre_Graphics_World.org.xml
+++ b/src/chrome/content/rules/Libre_Graphics_World.org.xml
@@ -28,4 +28,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Libregamewiki.org.xml b/src/chrome/content/rules/Libregamewiki.org.xml
deleted file mode 100644
index 538b1cb337c6..000000000000
--- a/src/chrome/content/rules/Libregamewiki.org.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Libri.de.xml b/src/chrome/content/rules/Libri.de.xml
index 9d819412f919..50d337333da0 100644
--- a/src/chrome/content/rules/Libri.de.xml
+++ b/src/chrome/content/rules/Libri.de.xml
@@ -1,17 +1,19 @@
+
 
 
 	
-	
-
+	
 
 	
 
-
-	
-	
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/Libspf2.org.xml b/src/chrome/content/rules/Libspf2.org.xml
new file mode 100644
index 000000000000..278173965da6
--- /dev/null
+++ b/src/chrome/content/rules/Libspf2.org.xml
@@ -0,0 +1,7 @@
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Libssh2.org.xml b/src/chrome/content/rules/Libssh2.org.xml
new file mode 100644
index 000000000000..c836b96030ea
--- /dev/null
+++ b/src/chrome/content/rules/Libssh2.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Libsyn.xml b/src/chrome/content/rules/Libsyn.xml
index fd5a2c908f29..5c2762ee22c9 100644
--- a/src/chrome/content/rules/Libsyn.xml
+++ b/src/chrome/content/rules/Libsyn.xml
@@ -20,7 +20,7 @@
 		
 		
 		
-	
+
 		
 		
 		
diff --git a/src/chrome/content/rules/Lidl.xml b/src/chrome/content/rules/Lidl.xml
index a86d55b7cf59..7fb89e2a2c06 100644
--- a/src/chrome/content/rules/Lidl.xml
+++ b/src/chrome/content/rules/Lidl.xml
@@ -8,7 +8,7 @@
 	Insecure cookies are set for these hosts: ᶜ
 
 		- webforms.lidl.com
-	
+
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
diff --git a/src/chrome/content/rules/Lifars.com.xml b/src/chrome/content/rules/Lifars.com.xml
deleted file mode 100644
index 850226c4b7f8..000000000000
--- a/src/chrome/content/rules/Lifars.com.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/LifeReimagined.org.xml b/src/chrome/content/rules/LifeReimagined.org.xml
index 2a2b7d39cc4d..4fef1f52c04e 100644
--- a/src/chrome/content/rules/LifeReimagined.org.xml
+++ b/src/chrome/content/rules/LifeReimagined.org.xml
@@ -6,7 +6,7 @@
 	* Server sends no certificate chain, see https://whatsmychaincert.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Lifehacker.com.xml b/src/chrome/content/rules/Lifehacker.com.xml
deleted file mode 100644
index 2cb9ddf9b4ee..000000000000
--- a/src/chrome/content/rules/Lifehacker.com.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-		
-		
-
-	
-
diff --git a/src/chrome/content/rules/Lift-conference.xml b/src/chrome/content/rules/Lift-conference.xml
index 0500c0502a57..fddbfa597dd3 100644
--- a/src/chrome/content/rules/Lift-conference.xml
+++ b/src/chrome/content/rules/Lift-conference.xml
@@ -1,7 +1,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/LiftShare.xml b/src/chrome/content/rules/LiftShare.xml
index 018757d2e7aa..709bbf8c4975 100644
--- a/src/chrome/content/rules/LiftShare.xml
+++ b/src/chrome/content/rules/LiftShare.xml
@@ -4,7 +4,7 @@
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/Lift_Security.io.xml b/src/chrome/content/rules/Lift_Security.io.xml
index 11440cd66b03..0ca6a26729f6 100644
--- a/src/chrome/content/rules/Lift_Security.io.xml
+++ b/src/chrome/content/rules/Lift_Security.io.xml
@@ -5,7 +5,8 @@
 
 
 	
-	
+	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ligatus.xml b/src/chrome/content/rules/Ligatus.xml
index 6aa2e9b68b65..01f845501dbb 100644
--- a/src/chrome/content/rules/Ligatus.xml
+++ b/src/chrome/content/rules/Ligatus.xml
@@ -125,7 +125,7 @@
 		to="https://$1-ssl.ligatus.com/" />
 
 
-		
+
 	
 
 
diff --git a/src/chrome/content/rules/Light-Paint.com.xml b/src/chrome/content/rules/Light-Paint.com.xml
deleted file mode 100644
index 85c0ec93e1d4..000000000000
--- a/src/chrome/content/rules/Light-Paint.com.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/LightEdge.com.xml b/src/chrome/content/rules/LightEdge.com.xml
new file mode 100644
index 000000000000..2a95fe71937c
--- /dev/null
+++ b/src/chrome/content/rules/LightEdge.com.xml
@@ -0,0 +1,28 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/LightTheNight.org.xml b/src/chrome/content/rules/LightTheNight.org.xml
new file mode 100644
index 000000000000..20dfa8911b0b
--- /dev/null
+++ b/src/chrome/content/rules/LightTheNight.org.xml
@@ -0,0 +1,22 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Light_the_Night.org.xml b/src/chrome/content/rules/Light_the_Night.org.xml
deleted file mode 100644
index aa63e5550928..000000000000
--- a/src/chrome/content/rules/Light_the_Night.org.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/LightningMaps.org.xml b/src/chrome/content/rules/LightningMaps.org.xml
index 509c6905e17f..ef79b5f3978b 100644
--- a/src/chrome/content/rules/LightningMaps.org.xml
+++ b/src/chrome/content/rules/LightningMaps.org.xml
@@ -1,25 +1,46 @@
 
 
-
 	
 	
 	
+	
+	
 	
+	
+	
 	
+	
+	
 	
 	
-		
 	
-	
-
-	
 
+	
 
diff --git a/src/chrome/content/rules/Lijit.com.xml b/src/chrome/content/rules/Lijit.com.xml
index 6a4cb9f1f22b..d7a2a436c78c 100644
--- a/src/chrome/content/rules/Lijit.com.xml
+++ b/src/chrome/content/rules/Lijit.com.xml
@@ -16,8 +16,10 @@
 	Connection refused:
 		- up.lijit.com
 		- vap1sjc1.lijit.com
+		- vap1yyz1.lijit.com
 		- vap2sjc1.lijit.com
 		- vap2sna1.lijit.com
+		- vap3iad1.lijit.com
 		- vap4sna1.lijit.com
 
 	Timeout:
@@ -33,6 +35,18 @@
 		- vap4yyz1.lijit.com
 		- vap5iad1.lijit.com
 		- vapden1.lijit.com
+		- vap1iad3.lijit.com
+		- vap1sna1.lijit.com
+		- vap2iad3.lijit.com
+		- vap2yyz1.lijit.com
+		- vap3iad3.lijit.com
+		- vap3sna1.lijit.com
+		- vap4iad3.lijit.com
+		- vap5iad3.lijit.com
+		- vap5sna1.lijit.com
+		- vap6iad3.lijit.com
+		- vap6sna1.lijit.com
+		- vap6iad1.lijit.com
 -->
 
 
@@ -47,24 +61,21 @@
 	
 	
 	
+	
 	
-	
-	
-	
+	
 	
+	
 	
-	
-	
-	
-	
-	
+	
+	
+	
+	
 	
-	
-	
-	
-	
-	
-	
+	
+	
+	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Likes.xml b/src/chrome/content/rules/Likes.xml
deleted file mode 100644
index a9fce39b782a..000000000000
--- a/src/chrome/content/rules/Likes.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Likeyed.com.xml b/src/chrome/content/rules/Likeyed.com.xml
deleted file mode 100644
index 021eb421b386..000000000000
--- a/src/chrome/content/rules/Likeyed.com.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Limango.xml b/src/chrome/content/rules/Limango.xml
index 967cebb5bc77..3e67df30133b 100644
--- a/src/chrome/content/rules/Limango.xml
+++ b/src/chrome/content/rules/Limango.xml
@@ -4,20 +4,18 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://img.limango-media.de/ => https://img.limango-media.de/: (6, 'Could not resolve host: img.limango-media.de')
 
 -->
-
+
 
 	
-	
+	
+	
 	
 
 
 	
 
 
-	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/LimeService.xml b/src/chrome/content/rules/LimeService.xml
deleted file mode 100644
index 7156ee0464a9..000000000000
--- a/src/chrome/content/rules/LimeService.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/LimeSurvey.com.xml b/src/chrome/content/rules/LimeSurvey.com.xml
new file mode 100644
index 000000000000..70f345cb9b30
--- /dev/null
+++ b/src/chrome/content/rules/LimeSurvey.com.xml
@@ -0,0 +1,16 @@
+
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/LimeSurvey.org.xml b/src/chrome/content/rules/LimeSurvey.org.xml
new file mode 100644
index 000000000000..0ae8483607fa
--- /dev/null
+++ b/src/chrome/content/rules/LimeSurvey.org.xml
@@ -0,0 +1,17 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/LimeSurvey.xml b/src/chrome/content/rules/LimeSurvey.xml
deleted file mode 100644
index b5606c5996ad..000000000000
--- a/src/chrome/content/rules/LimeSurvey.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Limelight-Networks.xml b/src/chrome/content/rules/Limelight-Networks.xml
index f34a73f85736..068f40ee0c82 100644
--- a/src/chrome/content/rules/Limelight-Networks.xml
+++ b/src/chrome/content/rules/Limelight-Networks.xml
@@ -7,10 +7,16 @@
 
 
 	
+		
+		
+		
+	
 
-
-	
 	
 
diff --git a/src/chrome/content/rules/Limited_2_Art.com.xml b/src/chrome/content/rules/Limited_2_Art.com.xml
index cfa4fecedb0b..a1f588643728 100644
--- a/src/chrome/content/rules/Limited_2_Art.com.xml
+++ b/src/chrome/content/rules/Limited_2_Art.com.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Limun.org.xml b/src/chrome/content/rules/Limun.org.xml
index 2fe8771c89f2..d76119bf04c3 100644
--- a/src/chrome/content/rules/Limun.org.xml
+++ b/src/chrome/content/rules/Limun.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://archlinux.limun.org/ => https://archlinux.limun.org/: (7, 'Failed to connect to archlinux.limun.org port 443: Connection refused')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Lincolnshire.gov.uk-falsemixed.xml b/src/chrome/content/rules/Lincolnshire.gov.uk-falsemixed.xml
deleted file mode 100644
index e6c415f5f608..000000000000
--- a/src/chrome/content/rules/Lincolnshire.gov.uk-falsemixed.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Lincolnshire.gov.uk.xml b/src/chrome/content/rules/Lincolnshire.gov.uk.xml
index 4db8169cfcd9..a3e9afbbfd52 100644
--- a/src/chrome/content/rules/Lincolnshire.gov.uk.xml
+++ b/src/chrome/content/rules/Lincolnshire.gov.uk.xml
@@ -45,7 +45,7 @@
 		- css on apps from aspapps.lincolnshire.gov.uk ˢ
 
 		- Images, on:
-		
+
 			- apps from aspapps.lincolnshire.gov.uk ˢ
 			- microsites, www from $self ˢ
 
diff --git a/src/chrome/content/rules/Lincs_to_the_Past.com.xml b/src/chrome/content/rules/Lincs_to_the_Past.com.xml
index 73701f76d658..2fb9abed0e32 100644
--- a/src/chrome/content/rules/Lincs_to_the_Past.com.xml
+++ b/src/chrome/content/rules/Lincs_to_the_Past.com.xml
@@ -13,7 +13,7 @@
 		- Images from $self
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Lindy.com.xml b/src/chrome/content/rules/Lindy.com.xml
index 7f85fa846a98..b629b40f8db0 100644
--- a/src/chrome/content/rules/Lindy.com.xml
+++ b/src/chrome/content/rules/Lindy.com.xml
@@ -19,4 +19,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/LineageOS.org.xml b/src/chrome/content/rules/LineageOS.org.xml
deleted file mode 100644
index a3d07925db6b..000000000000
--- a/src/chrome/content/rules/LineageOS.org.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Linear.com.xml b/src/chrome/content/rules/Linear.com.xml
deleted file mode 100644
index fd0bb597cd94..000000000000
--- a/src/chrome/content/rules/Linear.com.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-	
-		
-		
-		
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Linear_Collider_Collaboration.xml b/src/chrome/content/rules/Linear_Collider_Collaboration.xml
index d873e9822065..0543d4ec19a7 100644
--- a/src/chrome/content/rules/Linear_Collider_Collaboration.xml
+++ b/src/chrome/content/rules/Linear_Collider_Collaboration.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Linerunner-mismatches.xml b/src/chrome/content/rules/Linerunner-mismatches.xml
deleted file mode 100644
index 1c4e7afe8289..000000000000
--- a/src/chrome/content/rules/Linerunner-mismatches.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Linerunner.xml b/src/chrome/content/rules/Linerunner.xml
deleted file mode 100644
index a19a5428cf95..000000000000
--- a/src/chrome/content/rules/Linerunner.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Lingospot.xml b/src/chrome/content/rules/Lingospot.xml
index c44c8029181e..dc5bea323ce0 100644
--- a/src/chrome/content/rules/Lingospot.xml
+++ b/src/chrome/content/rules/Lingospot.xml
@@ -22,7 +22,7 @@ Fetch error: http://engine.lingospot.com/ => https://engine.lingospot.com/: (6,
 		- .lingospot.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Linguee.xml b/src/chrome/content/rules/Linguee.xml
index d3b827562054..2c1c238e0165 100644
--- a/src/chrome/content/rules/Linguee.xml
+++ b/src/chrome/content/rules/Linguee.xml
@@ -3,7 +3,7 @@
 
 	Localized versions of linguee (eg. de.linguee.com, cn.linguee.com)
 	have mixed content but it doesn't hinder site functionality.
-		
+
 -->
 
 
diff --git a/src/chrome/content/rules/Lingvoforum.net.xml b/src/chrome/content/rules/Lingvoforum.net.xml
index 4e79dc2ddec2..b24ec24d1fb5 100644
--- a/src/chrome/content/rules/Lingvoforum.net.xml
+++ b/src/chrome/content/rules/Lingvoforum.net.xml
@@ -10,4 +10,4 @@
 
 	
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/LinkShare.xml b/src/chrome/content/rules/LinkShare.xml
index 790e61567571..0e60ec8abbf5 100644
--- a/src/chrome/content/rules/LinkShare.xml
+++ b/src/chrome/content/rules/LinkShare.xml
@@ -4,10 +4,10 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.lsh.re/ => https://www.lsh.re/: (51, "SSL: no alternative certificate subject name matches target host name 'www.lsh.re'")
 
 -->
-
-	
-	
-
-	
-
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Linkbucks.xml b/src/chrome/content/rules/Linkbucks.xml
index cdd227de189f..3d44fa79adcc 100644
--- a/src/chrome/content/rules/Linkbucks.xml
+++ b/src/chrome/content/rules/Linkbucks.xml
@@ -7,7 +7,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/LinkedIn.xml b/src/chrome/content/rules/LinkedIn.xml
index f1536424bfdb..16279f2c852a 100644
--- a/src/chrome/content/rules/LinkedIn.xml
+++ b/src/chrome/content/rules/LinkedIn.xml
@@ -238,7 +238,7 @@
 			Redirects to http:
 						-->
 		
-	
+
 		
 		
 
diff --git a/src/chrome/content/rules/Linkomanija.xml b/src/chrome/content/rules/Linkomanija.xml
index 893ec7424dbf..ab85831d4fea 100644
--- a/src/chrome/content/rules/Linkomanija.xml
+++ b/src/chrome/content/rules/Linkomanija.xml
@@ -2,6 +2,6 @@
 	
 	
 
-	
 
diff --git a/src/chrome/content/rules/LinksAlpha.com.xml b/src/chrome/content/rules/LinksAlpha.com.xml
index c7b1db66dbe5..45f5fb9b4c24 100644
--- a/src/chrome/content/rules/LinksAlpha.com.xml
+++ b/src/chrome/content/rules/LinksAlpha.com.xml
@@ -22,7 +22,7 @@ Fetch error: http://api.linksalpha.com/ => https://api.linksalpha.com/: (35, 'Un
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Linksynergy.com.xml b/src/chrome/content/rules/Linksynergy.com.xml
index 14995b470539..0f7d64edf33c 100644
--- a/src/chrome/content/rules/Linksynergy.com.xml
+++ b/src/chrome/content/rules/Linksynergy.com.xml
@@ -1,63 +1,31 @@
 
-
 
-	
+
+	
+	
+	
+	
+	
 	
+	
+	
+	
 	
 	
 
-	
-	
-
-
-	
+	
 	
 	
 	
-
 	
 
-
 	
-
-	
+		to="https://linkshare.com/" />
 
+	
 
diff --git a/src/chrome/content/rules/Linksys.xml b/src/chrome/content/rules/Linksys.xml
index 35d7c56d69a7..8ba369ec5322 100644
--- a/src/chrome/content/rules/Linksys.xml
+++ b/src/chrome/content/rules/Linksys.xml
@@ -1,108 +1,209 @@
-
 
-
-
-	
+
+	
+	
+	
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
-	
-
-	
-	
-
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-
-
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-
-
-	
+	
+	
+	
+	
 
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/Linn_Records.com.xml b/src/chrome/content/rules/Linn_Records.com.xml
index 198b9bedff06..efe8763aefb6 100644
--- a/src/chrome/content/rules/Linn_Records.com.xml
+++ b/src/chrome/content/rules/Linn_Records.com.xml
@@ -36,4 +36,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Linode.xml b/src/chrome/content/rules/Linode.xml
index 8003690aa8c2..9cee7761f9f5 100644
--- a/src/chrome/content/rules/Linode.xml
+++ b/src/chrome/content/rules/Linode.xml
@@ -37,7 +37,7 @@ Fetch error: http://tokyo.webconsole.linode.com/ => https://tokyo.webconsole.lin
 	¹ Refused
 	² Customer load balancers and VPSes. Mismatched, refused or time out.
 -->
-
+
 
 	
@@ -71,7 +71,7 @@ Fetch error: http://tokyo.webconsole.linode.com/ => https://tokyo.webconsole.lin
 					-->
 	
 
-	
+	
 
 
 	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Linutronix.xml b/src/chrome/content/rules/Linutronix.xml
index d806b9ced881..bf1d77ccf2e2 100644
--- a/src/chrome/content/rules/Linutronix.xml
+++ b/src/chrome/content/rules/Linutronix.xml
@@ -3,10 +3,10 @@
 	
 	
 	
-	
 
 
-	
+
+	
 
 
 	
diff --git a/src/chrome/content/rules/Linux-Counter.xml b/src/chrome/content/rules/Linux-Counter.xml
deleted file mode 100644
index 559ff2a01bdd..000000000000
--- a/src/chrome/content/rules/Linux-Counter.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Linux-KVM.org.xml b/src/chrome/content/rules/Linux-KVM.org.xml
new file mode 100644
index 000000000000..1659042a7434
--- /dev/null
+++ b/src/chrome/content/rules/Linux-KVM.org.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Linux-Magazin-Online.xml b/src/chrome/content/rules/Linux-Magazin-Online.xml
index 3217fdc7e6bf..b3413e37758b 100644
--- a/src/chrome/content/rules/Linux-Magazin-Online.xml
+++ b/src/chrome/content/rules/Linux-Magazin-Online.xml
@@ -26,7 +26,7 @@ Fetch error: http://linux-magazin.de/ => https://www.linux-magazin.de/: Too many
 	* Expired
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Linux-New-Media.xml b/src/chrome/content/rules/Linux-New-Media.xml
index ad2b92882f90..7681a6234d79 100644
--- a/src/chrome/content/rules/Linux-New-Media.xml
+++ b/src/chrome/content/rules/Linux-New-Media.xml
@@ -10,18 +10,16 @@
 -->
 
 
-	
+	
+	
+	
 	
-	
 
 
-	
 
+	
 
-	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Linux-nfs.org.xml b/src/chrome/content/rules/Linux-nfs.org.xml
new file mode 100644
index 000000000000..259e1aeb623f
--- /dev/null
+++ b/src/chrome/content/rules/Linux-nfs.org.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Linux.lu.xml b/src/chrome/content/rules/Linux.lu.xml
index 6652ceb83acf..d3d22bfa5595 100644
--- a/src/chrome/content/rules/Linux.lu.xml
+++ b/src/chrome/content/rules/Linux.lu.xml
@@ -16,7 +16,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 	
 		
 		
diff --git a/src/chrome/content/rules/LinuxMIPS.xml b/src/chrome/content/rules/LinuxMIPS.xml
index c12bf2cf1ac6..30f6a2c98d55 100644
--- a/src/chrome/content/rules/LinuxMIPS.xml
+++ b/src/chrome/content/rules/LinuxMIPS.xml
@@ -12,7 +12,7 @@
 		- patchwork.linux-mips.org
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/LinuxQuestions.xml b/src/chrome/content/rules/LinuxQuestions.xml
index c197c3616c73..3db3f760d0d6 100644
--- a/src/chrome/content/rules/LinuxQuestions.xml
+++ b/src/chrome/content/rules/LinuxQuestions.xml
@@ -32,7 +32,8 @@
 
 
 	
-	
+	
+	
 
 
 	
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Linux_Distro_Community.com.xml b/src/chrome/content/rules/Linux_Distro_Community.com.xml
deleted file mode 100644
index 43ad9f1eb8a3..000000000000
--- a/src/chrome/content/rules/Linux_Distro_Community.com.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Linux_Forums.xml b/src/chrome/content/rules/Linux_Forums.xml
deleted file mode 100644
index 4abc61172455..000000000000
--- a/src/chrome/content/rules/Linux_Forums.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Linux_Game_Publishing.xml b/src/chrome/content/rules/Linux_Game_Publishing.xml
index d7bee65fe96b..d22dee17fd40 100644
--- a/src/chrome/content/rules/Linux_Game_Publishing.xml
+++ b/src/chrome/content/rules/Linux_Game_Publishing.xml
@@ -17,7 +17,7 @@ Fetch error: http://www.linuxgamepublishing.com/ => https://www.linuxgamepublish
 	* Shows www
 
 -->
-
+
 
 	
 	
@@ -25,4 +25,4 @@ Fetch error: http://www.linuxgamepublishing.com/ => https://www.linuxgamepublish
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Linux_Voice.com.xml b/src/chrome/content/rules/Linux_Voice.com.xml
deleted file mode 100644
index ded3d0be216c..000000000000
--- a/src/chrome/content/rules/Linux_Voice.com.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Linuxaudio.org.xml b/src/chrome/content/rules/Linuxaudio.org.xml
index 363913c82359..2bf4d1d409a5 100644
--- a/src/chrome/content/rules/Linuxaudio.org.xml
+++ b/src/chrome/content/rules/Linuxaudio.org.xml
@@ -6,7 +6,7 @@
 
 	
 	
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Linuxbenchmarking.com.xml b/src/chrome/content/rules/Linuxbenchmarking.com.xml
new file mode 100644
index 000000000000..2e284f2b7d77
--- /dev/null
+++ b/src/chrome/content/rules/Linuxbenchmarking.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Linuxpl.com.xml b/src/chrome/content/rules/Linuxpl.com.xml
index 570c6f4eaff1..1f0218ee183a 100644
--- a/src/chrome/content/rules/Linuxpl.com.xml
+++ b/src/chrome/content/rules/Linuxpl.com.xml
@@ -26,7 +26,10 @@
 
 
 	
-	
+	
+	
+	
+	
 		
 
 
@@ -39,7 +42,6 @@
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Linuxslut.net.xml b/src/chrome/content/rules/Linuxslut.net.xml
index ba9712616e91..77665010ce01 100644
--- a/src/chrome/content/rules/Linuxslut.net.xml
+++ b/src/chrome/content/rules/Linuxslut.net.xml
@@ -11,7 +11,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.linuxslut.net/ => https://www.linuxslut.net/: (51, "SSL: no alternative certificate subject name matches target host name 'www.linuxslut.net'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Lionbrand.com.xml b/src/chrome/content/rules/Lionbrand.com.xml
new file mode 100644
index 000000000000..8c5eea7f4b54
--- /dev/null
+++ b/src/chrome/content/rules/Lionbrand.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Lippincott_Williams_and_Wilkins.xml b/src/chrome/content/rules/Lippincott_Williams_and_Wilkins.xml
deleted file mode 100644
index a7f166b95afa..000000000000
--- a/src/chrome/content/rules/Lippincott_Williams_and_Wilkins.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Lippincott_Williams_and_Wilkins_problematic.xml b/src/chrome/content/rules/Lippincott_Williams_and_Wilkins_problematic.xml
index d17be1540ff0..5797f9d994d1 100644
--- a/src/chrome/content/rules/Lippincott_Williams_and_Wilkins_problematic.xml
+++ b/src/chrome/content/rules/Lippincott_Williams_and_Wilkins_problematic.xml
@@ -15,4 +15,4 @@
 							-->
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Lippupiste_Oy.xml b/src/chrome/content/rules/Lippupiste_Oy.xml
index 2cd945531cb9..bf03b3cd8518 100644
--- a/src/chrome/content/rules/Lippupiste_Oy.xml
+++ b/src/chrome/content/rules/Lippupiste_Oy.xml
@@ -5,7 +5,7 @@ Non-2xx HTTP code: http://lippu.fi/ (200) => https://www.lippu.fi/ (403)
 
 Disabled by https-everywhere-checker because:
 Fetch error: http://lippu.fi/ => https://www.lippu.fi/: Redirect for 'http://lippu.fi/' missing Location
-	For other Eventim coverage, see Eventim.xml.
+	For other Eventim coverage, see Eventim.com.xml.
 
 
 	Problematic domains:
@@ -14,12 +14,13 @@ Fetch error: http://lippu.fi/ => https://www.lippu.fi/: Redirect for 'http://lip
 		- lippu.fi
 
 -->
-
+
 
 	
 	
 	
-	
+	
+	
 
 
 	
@@ -28,7 +29,6 @@ Fetch error: http://lippu.fi/ => https://www.lippu.fi/: Redirect for 'http://lip
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Liquid-Web.xml b/src/chrome/content/rules/Liquid-Web.xml
index f0a3949e9e1d..17b3a3a79b6b 100644
--- a/src/chrome/content/rules/Liquid-Web.xml
+++ b/src/chrome/content/rules/Liquid-Web.xml
@@ -1,15 +1,17 @@
 
 
 	
-	
+	
+	
+	
+	
 
-	
+	
 
-	
 
 	
 	
 
+	
 
diff --git a/src/chrome/content/rules/Liquidmatrix.org.xml b/src/chrome/content/rules/Liquidmatrix.org.xml
deleted file mode 100644
index 1abad93d690c..000000000000
--- a/src/chrome/content/rules/Liquidmatrix.org.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Liquorland.com.au.xml b/src/chrome/content/rules/Liquorland.com.au.xml
new file mode 100644
index 000000000000..b5d4f731cef8
--- /dev/null
+++ b/src/chrome/content/rules/Liquorland.com.au.xml
@@ -0,0 +1,23 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/List.org.xml b/src/chrome/content/rules/List.org.xml
new file mode 100644
index 000000000000..a3d32ff71bed
--- /dev/null
+++ b/src/chrome/content/rules/List.org.xml
@@ -0,0 +1,9 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Listener.co.nz.xml b/src/chrome/content/rules/Listener.co.nz.xml
index 890e3d5e1b3d..ca209cdb4d37 100644
--- a/src/chrome/content/rules/Listener.co.nz.xml
+++ b/src/chrome/content/rules/Listener.co.nz.xml
@@ -15,7 +15,7 @@ Fetch error: http://www.listener.co.nz/ => https://www.listener.co.nz/: Cycle de
 		- ^	(refused)
 
 -->
-
+
 
 	
 	
@@ -27,4 +27,4 @@ Fetch error: http://www.listener.co.nz/ => https://www.listener.co.nz/: Cycle de
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Listener_Approved.xml b/src/chrome/content/rules/Listener_Approved.xml
index 5d6a60bbc45f..6452a5abcb2c 100644
--- a/src/chrome/content/rules/Listener_Approved.xml
+++ b/src/chrome/content/rules/Listener_Approved.xml
@@ -12,7 +12,7 @@ Disabled by https-everywhere-checker because:
 Non-2xx HTTP code: http://listenerapproved.com/ (200) => https://listenerapproved.com/ (500)
 
 -->
-
+
 
 	
 	
@@ -24,4 +24,4 @@ Non-2xx HTTP code: http://listenerapproved.com/ (200) => https://listenerapprove
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Listings360.xml b/src/chrome/content/rules/Listings360.xml
new file mode 100644
index 000000000000..0e42232f5d94
--- /dev/null
+++ b/src/chrome/content/rules/Listings360.xml
@@ -0,0 +1,117 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Listonic.xml b/src/chrome/content/rules/Listonic.xml
index b1fd67347efb..df555615b08a 100644
--- a/src/chrome/content/rules/Listonic.xml
+++ b/src/chrome/content/rules/Listonic.xml
@@ -18,7 +18,8 @@
 
 
 	
-	
+	
+	
 
 
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/LitHive.com.xml b/src/chrome/content/rules/LitHive.com.xml
deleted file mode 100644
index 5260b5bcc0b3..000000000000
--- a/src/chrome/content/rules/LitHive.com.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/LitRes.ru.xml b/src/chrome/content/rules/LitRes.ru.xml
new file mode 100644
index 000000000000..a482c79a37a8
--- /dev/null
+++ b/src/chrome/content/rules/LitRes.ru.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+
+	
+
+	
+
+	
+	
+	
+	
+	
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/LiteBit.eu.xml b/src/chrome/content/rules/LiteBit.eu.xml
deleted file mode 100644
index 620d80543177..000000000000
--- a/src/chrome/content/rules/LiteBit.eu.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/LiteSpeed-Technologies-mismatches.xml b/src/chrome/content/rules/LiteSpeed-Technologies-mismatches.xml
index 6ee6785c12ab..c757b362d481 100644
--- a/src/chrome/content/rules/LiteSpeed-Technologies-mismatches.xml
+++ b/src/chrome/content/rules/LiteSpeed-Technologies-mismatches.xml
@@ -1,10 +1,10 @@
 
 
 	
-	
+	
 
 
-	
+	
 
 
 	
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Literotica.com.xml b/src/chrome/content/rules/Literotica.com.xml
index a51c7594c42c..b384bb3d8892 100644
--- a/src/chrome/content/rules/Literotica.com.xml
+++ b/src/chrome/content/rules/Literotica.com.xml
@@ -25,7 +25,7 @@
 	Mixed content:
 
 		- Bug on i from piwik1eaf.literotica.com *
- 
+
 		- Images, on:
 
 			- shop from cnvassets.s3.amazonaws.com *
diff --git a/src/chrome/content/rules/Litle.com.xml b/src/chrome/content/rules/Litle.com.xml
deleted file mode 100644
index 9b4e2f4238a1..000000000000
--- a/src/chrome/content/rules/Litle.com.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Litter.com.xml b/src/chrome/content/rules/Litter.com.xml
index 002c59423a54..639f72e6dc9a 100644
--- a/src/chrome/content/rules/Litter.com.xml
+++ b/src/chrome/content/rules/Litter.com.xml
@@ -13,4 +13,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Little.my.xml b/src/chrome/content/rules/Little.my.xml
index 8a5b8f0f822e..dff98ba7e815 100644
--- a/src/chrome/content/rules/Little.my.xml
+++ b/src/chrome/content/rules/Little.my.xml
@@ -11,4 +11,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/LittleSis.org.xml b/src/chrome/content/rules/LittleSis.org.xml
index 373ce3ad5f9b..751118a8e5f9 100644
--- a/src/chrome/content/rules/LittleSis.org.xml
+++ b/src/chrome/content/rules/LittleSis.org.xml
@@ -36,7 +36,7 @@ Non-2xx HTTP code: http://api.littlesis.org/ (200) => https://api.littlesis.org/
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Little_CMS.com.xml b/src/chrome/content/rules/Little_CMS.com.xml
index 88f3c729f403..37d36c4c2bb6 100644
--- a/src/chrome/content/rules/Little_CMS.com.xml
+++ b/src/chrome/content/rules/Little_CMS.com.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Liv.ac.uk.xml b/src/chrome/content/rules/Liv.ac.uk.xml
index 9222bf995e34..ad1be48b5f4e 100644
--- a/src/chrome/content/rules/Liv.ac.uk.xml
+++ b/src/chrome/content/rules/Liv.ac.uk.xml
@@ -17,13 +17,16 @@
 		- people
 		- staff
 		- student
-		- 
+		-
 
 -->
 
 
 	
-	
+	
+	
+	
+	
 		
@@ -33,7 +36,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Live-Chat.xml b/src/chrome/content/rules/Live-Chat.xml
index 463339a3250e..8a9969595d0b 100644
--- a/src/chrome/content/rules/Live-Chat.xml
+++ b/src/chrome/content/rules/Live-Chat.xml
@@ -1,7 +1,11 @@
+
 
 	
 	
 	
diff --git a/src/chrome/content/rules/Live.net.xml b/src/chrome/content/rules/Live.net.xml
index 4fb80a30959c..5d3b059e160f 100644
--- a/src/chrome/content/rules/Live.net.xml
+++ b/src/chrome/content/rules/Live.net.xml
@@ -7,7 +7,7 @@ Fetch error: http://feeds.live.net/ => https://feeds.live.net/: (7, 'Failed to c
 	For other Microsoft coverage, see Microsoft.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/LiveChat_Inc.net.xml b/src/chrome/content/rules/LiveChat_Inc.net.xml
deleted file mode 100644
index 843ac81cfccf..000000000000
--- a/src/chrome/content/rules/LiveChat_Inc.net.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/LiveCorp.xml b/src/chrome/content/rules/LiveCorp.xml
index b00bf44cc117..9fc0ba7086f2 100644
--- a/src/chrome/content/rules/LiveCorp.xml
+++ b/src/chrome/content/rules/LiveCorp.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.livecorp.com.au/favicon.ico => https://www.livecorp.com.au/favicon.ico: Too many redirects while fetching 'https://www.livecorp.com.au/favicon.ico'
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/LiveInternet-falsemixed.xml b/src/chrome/content/rules/LiveInternet-falsemixed.xml
deleted file mode 100644
index a0b799258b06..000000000000
--- a/src/chrome/content/rules/LiveInternet-falsemixed.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/LiveInternet.ru.xml b/src/chrome/content/rules/LiveInternet.ru.xml
new file mode 100644
index 000000000000..ac8ded94a9cf
--- /dev/null
+++ b/src/chrome/content/rules/LiveInternet.ru.xml
@@ -0,0 +1,22 @@
+
+
+
+	
+	
+		
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/LiveInternet.xml b/src/chrome/content/rules/LiveInternet.xml
deleted file mode 100644
index 69c92c713a14..000000000000
--- a/src/chrome/content/rules/LiveInternet.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/LiveMeme.xml b/src/chrome/content/rules/LiveMeme.xml
index a7dce78b11ac..0e99de357a22 100644
--- a/src/chrome/content/rules/LiveMeme.xml
+++ b/src/chrome/content/rules/LiveMeme.xml
@@ -14,7 +14,7 @@ Fetch error: http://i.lvme.me/ => https://i.lvme.me/: (60, 'SSL certificate prob
 
 -->
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/LiveNation.com.xml b/src/chrome/content/rules/LiveNation.com.xml
index 4efe1ca4c448..e125909f14dd 100644
--- a/src/chrome/content/rules/LiveNation.com.xml
+++ b/src/chrome/content/rules/LiveNation.com.xml
@@ -45,6 +45,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/LiveNationInternational.com.xml b/src/chrome/content/rules/LiveNationInternational.com.xml
deleted file mode 100644
index 3466ab3d1be5..000000000000
--- a/src/chrome/content/rules/LiveNationInternational.com.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-	
-		
-
-	
-
diff --git a/src/chrome/content/rules/LivePerson.net.xml b/src/chrome/content/rules/LivePerson.net.xml
index 5a9ecb379ce3..3c6e6bc57330 100644
--- a/src/chrome/content/rules/LivePerson.net.xml
+++ b/src/chrome/content/rules/LivePerson.net.xml
@@ -47,7 +47,7 @@ Fetch error: http://sso.liveperson.net/ => https://sso.liveperson.net/: (60, 'SS
 		- \d{8}-VID
 
 -->
-
+
 
 	
 	
@@ -61,7 +61,7 @@ Fetch error: http://sso.liveperson.net/ => https://sso.liveperson.net/: (60, 'SS
 	
 
 
-	
+	
 
 
 	
-
+
 
 	
diff --git a/src/chrome/content/rules/LiveRail.xml b/src/chrome/content/rules/LiveRail.xml
index 1136925975aa..4f2adc4be31f 100644
--- a/src/chrome/content/rules/LiveRail.xml
+++ b/src/chrome/content/rules/LiveRail.xml
@@ -61,7 +61,7 @@ Fetch error: http://t4.liverail.com/ => https://t4.liverail.com/: (6, 'Could not
 		- platform4.liverail.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/LiveStrong.com.xml b/src/chrome/content/rules/LiveStrong.com.xml
index 9a78ebe75ab1..a58a3e10ff58 100644
--- a/src/chrome/content/rules/LiveStrong.com.xml
+++ b/src/chrome/content/rules/LiveStrong.com.xml
@@ -3,20 +3,22 @@
 
 	All subdomains seem to redirect to www.livestrong.com.
 
+	Non-functional hosts:
+		Timeout:
+		- i.lsimg.net
+
 -->
 
 
 	
 	
 
-	
-	
 	
 	
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/LiveWyer.com.xml b/src/chrome/content/rules/LiveWyer.com.xml
index 54bb9ac60d92..227e029175ba 100644
--- a/src/chrome/content/rules/LiveWyer.com.xml
+++ b/src/chrome/content/rules/LiveWyer.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://livewyer.com/ => https://livewyer.com/: (60, 'SSL certificat
 Fetch error: http://www.livewyer.com/ => https://www.livewyer.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/LiveZilla.net.xml b/src/chrome/content/rules/LiveZilla.net.xml
index c6607b259ac6..bb917aef0b77 100644
--- a/src/chrome/content/rules/LiveZilla.net.xml
+++ b/src/chrome/content/rules/LiveZilla.net.xml
@@ -33,7 +33,7 @@ Fetch error: http://livezilla.net/ => https://livezilla.net/: (51, "SSL: no alte
 		- .livezilla.net
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Live_Business_Chat.com.xml b/src/chrome/content/rules/Live_Business_Chat.com.xml
deleted file mode 100644
index 42e91f8bc508..000000000000
--- a/src/chrome/content/rules/Live_Business_Chat.com.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Livefyre.xml b/src/chrome/content/rules/Livefyre.xml
index 1d0ff515619e..b72700b63f5c 100644
--- a/src/chrome/content/rules/Livefyre.xml
+++ b/src/chrome/content/rules/Livefyre.xml
@@ -1,55 +1,20 @@
 
-
-
-	
-	
-	
-	
-	
-	
-
+
 
-	
+	
+	
+	
 
+	
+	
+	
+	
+	
 
-	
-
-	
-	
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Livermores-Centennial-Light-Live-Cam.xml b/src/chrome/content/rules/Livermores-Centennial-Light-Live-Cam.xml
deleted file mode 100644
index 951fe2b72dc3..000000000000
--- a/src/chrome/content/rules/Livermores-Centennial-Light-Live-Cam.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Liverpool_Victoria.xml b/src/chrome/content/rules/Liverpool_Victoria.xml
index 11eb8d6cf9b6..693f02815fce 100644
--- a/src/chrome/content/rules/Liverpool_Victoria.xml
+++ b/src/chrome/content/rules/Liverpool_Victoria.xml
@@ -18,4 +18,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Livestatserver.com.xml b/src/chrome/content/rules/Livestatserver.com.xml
index 8e105580a9ec..1741eac3d975 100644
--- a/src/chrome/content/rules/Livestatserver.com.xml
+++ b/src/chrome/content/rules/Livestatserver.com.xml
@@ -1,19 +1,20 @@
 
-
-
-	
+
 
+	
+		
+	
+		
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Livestock-Transport.xml b/src/chrome/content/rules/Livestock-Transport.xml
index 1c556c77ce60..bf71d9fe0fe8 100644
--- a/src/chrome/content/rules/Livestock-Transport.xml
+++ b/src/chrome/content/rules/Livestock-Transport.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.livestock-transport.com/ => https://www.livestock-transp
 	livestock.ning.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Livestream.xml b/src/chrome/content/rules/Livestream.xml
index 45f40a3e7e88..e0e8c022143d 100644
--- a/src/chrome/content/rules/Livestream.xml
+++ b/src/chrome/content/rules/Livestream.xml
@@ -2,7 +2,7 @@
 	Nonfunctional hosts in *livestream.com:
 
 		- upload-downloads -> refused
-		- blog             -> wrong domain 
+		- blog             -> wrong domain
 
 
 	^(?!thumbnail\.)*.api: Per-account subdomains
diff --git a/src/chrome/content/rules/Livestrong.xml b/src/chrome/content/rules/Livestrong.xml
index b9d94efc147d..e401f7235860 100644
--- a/src/chrome/content/rules/Livestrong.xml
+++ b/src/chrome/content/rules/Livestrong.xml
@@ -3,10 +3,10 @@
 	- ^ŵww
 	- blog (expired)
 -->
-
+
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/LivingSocial.co.uk.xml b/src/chrome/content/rules/LivingSocial.co.uk.xml
index 7c34995c2c33..05c7cc27b45d 100644
--- a/src/chrome/content/rules/LivingSocial.co.uk.xml
+++ b/src/chrome/content/rules/LivingSocial.co.uk.xml
@@ -12,7 +12,7 @@ Fetch error: http://help.livingsocial.co.uk/ => https://help.livingsocial.co.uk/
 		- help
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/LivingSocial.xml b/src/chrome/content/rules/LivingSocial.xml
index abe86dfe069f..f0e9dc1e5a6f 100644
--- a/src/chrome/content/rules/LivingSocial.xml
+++ b/src/chrome/content/rules/LivingSocial.xml
@@ -56,7 +56,7 @@ Fetch error: http://paypass.livingsocial.com/ => https://paypass.livingsocial.co
 		- www.livingsocial.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Living_Routes.org.xml b/src/chrome/content/rules/Living_Routes.org.xml
deleted file mode 100644
index 0c70f25bc76f..000000000000
--- a/src/chrome/content/rules/Living_Routes.org.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Llanfairpwllgwyngyllgogerychwyrndrobwllllantysiliogogogoch.co.uk.xml b/src/chrome/content/rules/Llanfairpwllgwyngyllgogerychwyrndrobwllllantysiliogogogoch.co.uk.xml
new file mode 100644
index 000000000000..c6859aecc6bd
--- /dev/null
+++ b/src/chrome/content/rules/Llanfairpwllgwyngyllgogerychwyrndrobwllllantysiliogogogoch.co.uk.xml
@@ -0,0 +1,6 @@
+
+  
+  
+  
+  
+
diff --git a/src/chrome/content/rules/Lloyds_TSB_Offshore.xml b/src/chrome/content/rules/Lloyds_TSB_Offshore.xml
index 8f41b8ef931c..96a2a11bb553 100644
--- a/src/chrome/content/rules/Lloyds_TSB_Offshore.xml
+++ b/src/chrome/content/rules/Lloyds_TSB_Offshore.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.lloydstsb-offshore.com/ => https://www.lloydstsb-offshor
 		- lloydstsb-offshore.com	(cert only matches www)
 
 -->
-
+
 
 	
 	
@@ -30,4 +30,4 @@ Fetch error: http://www.lloydstsb-offshore.com/ => https://www.lloydstsb-offshor
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Lloydsbank.com.xml b/src/chrome/content/rules/Lloydsbank.com.xml
index 8bd2be141a7f..2b80daaa178b 100644
--- a/src/chrome/content/rules/Lloydsbank.com.xml
+++ b/src/chrome/content/rules/Lloydsbank.com.xml
@@ -1,15 +1,24 @@
+
 
 
 
 	
 	
-	
+	
 	
 	
 	
@@ -19,15 +28,9 @@
 	
 	
 	
-	
-	
+	
 
 	
 
 	
-
-	
-
-	
-	
 
diff --git a/src/chrome/content/rules/Loan_Science.xml b/src/chrome/content/rules/Loan_Science.xml
deleted file mode 100644
index 8adcd27be6ba..000000000000
--- a/src/chrome/content/rules/Loan_Science.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Loans.com.au.xml b/src/chrome/content/rules/Loans.com.au.xml
new file mode 100644
index 000000000000..bd2b034415fb
--- /dev/null
+++ b/src/chrome/content/rules/Loans.com.au.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Lob.com.xml b/src/chrome/content/rules/Lob.com.xml
deleted file mode 100644
index 7b4a717e1541..000000000000
--- a/src/chrome/content/rules/Lob.com.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Locaid.xml b/src/chrome/content/rules/Locaid.xml
deleted file mode 100644
index 462828cb91c8..000000000000
--- a/src/chrome/content/rules/Locaid.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
-	
-	
-
-		
-
-
diff --git a/src/chrome/content/rules/LocalEdge.xml b/src/chrome/content/rules/LocalEdge.xml
index 622441985851..f535c7dfca37 100644
--- a/src/chrome/content/rules/LocalEdge.xml
+++ b/src/chrome/content/rules/LocalEdge.xml
@@ -11,16 +11,18 @@
 
 
 	
-	
+	
+	
+	
+	
 	
-	
+	
+	
 
 
 	
 
 
-	
 
 	
+	
+		
+		
+		
+		
+
+	
+
diff --git a/src/chrome/content/rules/LogicBox_Software.xml b/src/chrome/content/rules/LogicBox_Software.xml
deleted file mode 100644
index b6c81ceed27f..000000000000
--- a/src/chrome/content/rules/LogicBox_Software.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Logilab.fr.xml b/src/chrome/content/rules/Logilab.fr.xml
index 74bc683c8d59..69108c5ea032 100644
--- a/src/chrome/content/rules/Logilab.fr.xml
+++ b/src/chrome/content/rules/Logilab.fr.xml
@@ -27,7 +27,7 @@
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Logilab.org.xml b/src/chrome/content/rules/Logilab.org.xml
index 16a558eaa65f..2986bf07bc37 100644
--- a/src/chrome/content/rules/Logilab.org.xml
+++ b/src/chrome/content/rules/Logilab.org.xml
@@ -20,7 +20,7 @@
 
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Logitech.com.xml b/src/chrome/content/rules/Logitech.com.xml
index af3e603208e2..96611128716a 100644
--- a/src/chrome/content/rules/Logitech.com.xml
+++ b/src/chrome/content/rules/Logitech.com.xml
@@ -39,7 +39,13 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
 		
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Lohud.com.xml b/src/chrome/content/rules/Lohud.com.xml
index 938aa5918846..e944580eae9d 100644
--- a/src/chrome/content/rules/Lohud.com.xml
+++ b/src/chrome/content/rules/Lohud.com.xml
@@ -1,37 +1,19 @@
 
-
+
 
 	
-	
-	
-	
-
+	
+	
 
-	
+	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Lokun.is.xml b/src/chrome/content/rules/Lokun.is.xml
index 07d1da9e68dd..7e5d19b9015f 100644
--- a/src/chrome/content/rules/Lokun.is.xml
+++ b/src/chrome/content/rules/Lokun.is.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.lokun.is/ => https://www.lokun.is/: (60, 'SSL certificat
 		- www.lokun.is
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Lokus.no.xml b/src/chrome/content/rules/Lokus.no.xml
index 0d414ab74333..07cb19149080 100644
--- a/src/chrome/content/rules/Lokus.no.xml
+++ b/src/chrome/content/rules/Lokus.no.xml
@@ -16,4 +16,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Lokus.se.xml b/src/chrome/content/rules/Lokus.se.xml
index fc3995b62bfe..a0a65642a37e 100644
--- a/src/chrome/content/rules/Lokus.se.xml
+++ b/src/chrome/content/rules/Lokus.se.xml
@@ -7,7 +7,8 @@
 -->
 
 
-	
+	
+	
 
 
 	
-
+
 
 	
diff --git a/src/chrome/content/rules/London-2012-mismatches.xml b/src/chrome/content/rules/London-2012-mismatches.xml
index 1775ac8cde24..0ebca3248c2a 100644
--- a/src/chrome/content/rules/London-2012-mismatches.xml
+++ b/src/chrome/content/rules/London-2012-mismatches.xml
@@ -4,7 +4,7 @@
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/London-2012.xml b/src/chrome/content/rules/London-2012.xml
index df79f8105831..17673d135462 100644
--- a/src/chrome/content/rules/London-2012.xml
+++ b/src/chrome/content/rules/London-2012.xml
@@ -10,10 +10,15 @@ Fetch error: http://london2012.com/ => https://www.london2012.com/: (7, 'Failed
 Fetch error: http://www.festival.london2012.com/ => https://festival.london2002.com/: (6, 'Could not resolve host: festival.london2002.com')
 Fetch error: http://tickets.london2012.com/ => https://www.tickets.london2012.com/: (7, 'Failed to connect to www.tickets.london2012.com port 443: Connection refused')
 -->
-
+
 
 	
-	
+	
+	
+	
+	
+	
+	
 		
 
 	
diff --git a/src/chrome/content/rules/London-Nano.com.xml b/src/chrome/content/rules/London-Nano.com.xml
deleted file mode 100644
index 42a99a9339a3..000000000000
--- a/src/chrome/content/rules/London-Nano.com.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/London-School-of-Hygiene-and-Tropical-Medicine.xml b/src/chrome/content/rules/London-School-of-Hygiene-and-Tropical-Medicine.xml
index cad36a39a3da..3eedbc03011e 100644
--- a/src/chrome/content/rules/London-School-of-Hygiene-and-Tropical-Medicine.xml
+++ b/src/chrome/content/rules/London-School-of-Hygiene-and-Tropical-Medicine.xml
@@ -8,7 +8,7 @@ Fetch error: http://lshtm.ac.uk/ => https://www.lshtm.ac.uk/: (6, 'Could not res
 Fetch error: http://blogs.lshtm.ac.uk/ => https://blogs.lshtm.ac.uk/: Cycle detected - URL already encountered: https://blogs.lshtm.ac.uk/
 Fetch error: http://forums.lshtm.ac.uk/ => https://forums.lshtm.ac.uk/: (6, 'Could not resolve host: forums.lshtm.ac.uk')
 -->
-
+
 
   
   
diff --git a/src/chrome/content/rules/London-Stock-Exchange.xml b/src/chrome/content/rules/London-Stock-Exchange.xml
deleted file mode 100644
index 55824854d010..000000000000
--- a/src/chrome/content/rules/London-Stock-Exchange.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-	
-	
-
-	
-	
-
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/London.gov.uk.xml b/src/chrome/content/rules/London.gov.uk.xml
index d7c367a05789..40f4958e3f3d 100644
--- a/src/chrome/content/rules/London.gov.uk.xml
+++ b/src/chrome/content/rules/London.gov.uk.xml
@@ -26,7 +26,7 @@
 	These altnames don't exist:
 
 		- www.volunteerbooking.london.gov.uk
-	
+
 
 	Insecure cookies are set for these hosts:
 
@@ -41,7 +41,7 @@
 	
 	
 	
-	
+
 		
 		
diff --git a/src/chrome/content/rules/LondonStockExchange.com.xml b/src/chrome/content/rules/LondonStockExchange.com.xml
new file mode 100644
index 000000000000..60f680d5bb91
--- /dev/null
+++ b/src/chrome/content/rules/LondonStockExchange.com.xml
@@ -0,0 +1,15 @@
+
+	
+	
+	
+		
+	
+		
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/London_City_Airport.xml b/src/chrome/content/rules/London_City_Airport.xml
index f21e2371a433..fae5314f9dd7 100644
--- a/src/chrome/content/rules/London_City_Airport.xml
+++ b/src/chrome/content/rules/London_City_Airport.xml
@@ -2,7 +2,7 @@
     
     
 
-    
+    
 
     
diff --git a/src/chrome/content/rules/London_Review_of_Books.xml b/src/chrome/content/rules/London_Review_of_Books.xml
index 1ed524173fdc..1fcf35db10a9 100644
--- a/src/chrome/content/rules/London_Review_of_Books.xml
+++ b/src/chrome/content/rules/London_Review_of_Books.xml
@@ -18,13 +18,14 @@
 
 
 	
-	
+	
+	
 
 
 	
 
 	
+		to="https://cdn.lrb.co.uk/" />
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Londonist.com.xml b/src/chrome/content/rules/Londonist.com.xml
index ebf89e94374c..f35cc1adabc7 100644
--- a/src/chrome/content/rules/Londonist.com.xml
+++ b/src/chrome/content/rules/Londonist.com.xml
@@ -19,7 +19,8 @@
 
 
 	
-	
+	
+	
 		
diff --git a/src/chrome/content/rules/LongDate.pl.xml b/src/chrome/content/rules/LongDate.pl.xml
index 0129a7a1d233..a5e00aa4dd20 100644
--- a/src/chrome/content/rules/LongDate.pl.xml
+++ b/src/chrome/content/rules/LongDate.pl.xml
@@ -22,7 +22,7 @@ Fetch error: http://www.longdate.pl/ => https://www.longdate.pl/: (6, 'Could not
 		- www.longdate.pl
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/LongTail.xml b/src/chrome/content/rules/LongTail.xml
index 509adddddeb7..938002f6029f 100644
--- a/src/chrome/content/rules/LongTail.xml
+++ b/src/chrome/content/rules/LongTail.xml
@@ -3,59 +3,48 @@
 		- Bitsontherun.com.xml
 		- JW_Platform.com.xml
 
-	Cert expired:
-		- dev.jwpltx.com
-		- i.dev.jwpltx.com
-		- stg.jwpltx.com
-		
 	Cert mismatch:
-		- code.longtailvideo.com
-		- developer.longtailvideo.com
 		- go.longtailvideo.com
-		- secure.longtailvideo.com
-		- www2.longtailvideo.com
 		- ltvimg.com
 		- s0-www.ltvimg.com
 		- s1-www.ltvimg.com
 		- www.ltvimg.com
 		- a.jwpcdn.com
-		- p.jwpcdn.com
-		- go.jwplayer.com
-		- ovp.jwplayer.com
-		- i.n.jwpltx.com
+		- p.jwpcdn.com, equivalent to ssl.p.jwpcdn.com
+
+	Redirect loop:
+		- mvn.jwplayer.com
+
 	Timeout:
 		- demo.longtailvideo.com
 		- design.longtailvideo.com
 		- bob.jwplayer.com
 		- demo.jwplayer.com
-		- jw7.jwplayer.com
-		- jw7beta.jwplayer.com
 		- qa.jwplayer.com
-		- recommendations.jwplayer.com
-		- sdk.jwplayer.com
-		
-		
+
 	TLS error:
 		- g5bmawnx.cdn.jwplayer.com
 -->
 
 
+	
 	
 
 	
-	
-	
-	
+	
+	
 
 	
 	
 	
-	
+	
+	
 	
 	
 	
 	
 	
+	
 	
 	
 	
@@ -72,19 +61,22 @@
 	
 	
 	
-	
+	
 	
-	
-	
-	
+	
+	
+	
+	
 	
-	
 	
 	
 	
 
 	
 
+	
+
 	
 
 
diff --git a/src/chrome/content/rules/Long_Access.com.xml b/src/chrome/content/rules/Long_Access.com.xml
deleted file mode 100644
index 18ace9c26d69..000000000000
--- a/src/chrome/content/rules/Long_Access.com.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
-	
-	
-		
-		
-		
-		
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
-
-
diff --git a/src/chrome/content/rules/LoohPress.com.xml b/src/chrome/content/rules/LoohPress.com.xml
new file mode 100644
index 000000000000..718c3b72a650
--- /dev/null
+++ b/src/chrome/content/rules/LoohPress.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Look.co.uk-mixed.xml b/src/chrome/content/rules/Look.co.uk-mixed.xml
index 2f9e4c96269b..5fbf75a27c0d 100644
--- a/src/chrome/content/rules/Look.co.uk-mixed.xml
+++ b/src/chrome/content/rules/Look.co.uk-mixed.xml
@@ -6,7 +6,7 @@ Fetch error: http://shop.look.co.uk/ => https://shop.look.co.uk/: (7, 'Failed to
 	For rules not causing mixed content, see Look.co.uk.xml.
 
 -->
-
+
 
 	
 		
 
 
-	
+	
+	
 		
@@ -40,7 +41,6 @@
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Look_Dumbass.xml b/src/chrome/content/rules/Look_Dumbass.xml
index fe37a94e1e6b..000e5ef2f084 100644
--- a/src/chrome/content/rules/Look_Dumbass.xml
+++ b/src/chrome/content/rules/Look_Dumbass.xml
@@ -23,4 +23,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Lookback.io.xml b/src/chrome/content/rules/Lookback.io.xml
index fc0cc2e21bab..8d8818c8db73 100644
--- a/src/chrome/content/rules/Lookback.io.xml
+++ b/src/chrome/content/rules/Lookback.io.xml
@@ -10,6 +10,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/Lookingglass.xml b/src/chrome/content/rules/Lookingglass.xml
index 51f21bd7773b..83aa6542b47d 100644
--- a/src/chrome/content/rules/Lookingglass.xml
+++ b/src/chrome/content/rules/Lookingglass.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Lookup.uribl.com.xml b/src/chrome/content/rules/Lookup.uribl.com.xml
new file mode 100644
index 000000000000..2b52a169caa4
--- /dev/null
+++ b/src/chrome/content/rules/Lookup.uribl.com.xml
@@ -0,0 +1,5 @@
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Looloo.com.xml b/src/chrome/content/rules/Looloo.com.xml
index 8afe13cb6d5b..381c17bac3f5 100644
--- a/src/chrome/content/rules/Looloo.com.xml
+++ b/src/chrome/content/rules/Looloo.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.looloo.com/ => https://www.looloo.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.looloo.com'")
 
 -->
-
+
 
 	
 	
@@ -15,4 +15,4 @@ Fetch error: http://www.looloo.com/ => https://www.looloo.com/: (51, "SSL: no al
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/LoopPay.xml b/src/chrome/content/rules/LoopPay.xml
index c776c531da54..a633f98d92b4 100644
--- a/src/chrome/content/rules/LoopPay.xml
+++ b/src/chrome/content/rules/LoopPay.xml
@@ -4,12 +4,12 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://checkout.looppay.com/ => https://checkout.looppay.com/: (28, 'Connection timed out after 20000 milliseconds')
 
 -->
-
+
 
 	
 	
 	
-	
+
 	
 
   
diff --git a/src/chrome/content/rules/Loopia.xml b/src/chrome/content/rules/Loopia.xml
index cc3664d10e20..f85fc2b438f7 100644
--- a/src/chrome/content/rules/Loopia.xml
+++ b/src/chrome/content/rules/Loopia.xml
@@ -9,7 +9,10 @@ Fetch error: http://loopiasecure.com/ => https://www.loopia.se/: (60, 'SSL certi
 
 
 	
-	
+	
+	
+	
+	
 		
 		
 	
@@ -19,12 +22,11 @@ Fetch error: http://loopiasecure.com/ => https://www.loopia.se/: (60, 'SSL certi
 	
 
 
-	
 
 	
 	
 
+	
 
diff --git a/src/chrome/content/rules/Loopt.xml b/src/chrome/content/rules/Loopt.xml
index 4043ac9efbdf..83792bc265ae 100644
--- a/src/chrome/content/rules/Loopt.xml
+++ b/src/chrome/content/rules/Loopt.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://loopt.com/ => https://www.loopt.com/: (28, 'Connection timed out after 10001 milliseconds')
 Fetch error: http://www.loopt.com/ => https://www.loopt.com/: (28, 'Connection timed out after 10001 milliseconds')
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Los_Angeles_Times.xml b/src/chrome/content/rules/Los_Angeles_Times.xml
index 31e335a1db68..b7207559b5b6 100644
--- a/src/chrome/content/rules/Los_Angeles_Times.xml
+++ b/src/chrome/content/rules/Los_Angeles_Times.xml
@@ -1,8 +1,16 @@
+
 
 
 
 	
-	
+	
+	
+	
+	
+	
 		
-		
-
-
-	
-	
-	
-
-
-	
-
-	
-
-	
+  
 
+  
 
diff --git a/src/chrome/content/rules/Lotame.xml b/src/chrome/content/rules/Lotame.xml
index e7f44f3bb569..77d4e95f7cce 100644
--- a/src/chrome/content/rules/Lotame.xml
+++ b/src/chrome/content/rules/Lotame.xml
@@ -1,19 +1,35 @@
+
+
 
+	
+	
+	
+	
+	
+	
+	
+	
+
 
+	
+	
+	
 	
 	
 	
 	
+	
 	
-
-	
-	
-	
-	
+	
+	
+	
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Lotus.xml b/src/chrome/content/rules/Lotus.xml
deleted file mode 100644
index c3b4f1065723..000000000000
--- a/src/chrome/content/rules/Lotus.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-	
-	
-	
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-
-	
-	
-
-	
-
-
-	
-
diff --git a/src/chrome/content/rules/Louder_Than_War.com.xml b/src/chrome/content/rules/Louder_Than_War.com.xml
index bd158b5b8a96..91c7c859e763 100644
--- a/src/chrome/content/rules/Louder_Than_War.com.xml
+++ b/src/chrome/content/rules/Louder_Than_War.com.xml
@@ -14,7 +14,7 @@
 
 
 	
-	
+	
 
 
 	
@@ -23,4 +23,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Louhi.net.xml b/src/chrome/content/rules/Louhi.net.xml
index 1051e9095473..71b8ec6a6c8a 100644
--- a/src/chrome/content/rules/Louhi.net.xml
+++ b/src/chrome/content/rules/Louhi.net.xml
@@ -23,4 +23,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Louise_Harrison_Couture.com.xml b/src/chrome/content/rules/Louise_Harrison_Couture.com.xml
index 559cef2a9d3b..41ec91d13891 100644
--- a/src/chrome/content/rules/Louise_Harrison_Couture.com.xml
+++ b/src/chrome/content/rules/Louise_Harrison_Couture.com.xml
@@ -5,7 +5,7 @@ Non-2xx HTTP code: http://louiseharrisoncouture.com/ (200) => https://louiseharr
 Non-2xx HTTP code: http://www.louiseharrisoncouture.com/ (200) => https://www.louiseharrisoncouture.com/ (521)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Louisiana_State_University-problematic.xml b/src/chrome/content/rules/Louisiana_State_University-problematic.xml
index 5cd19f9430a6..c1731480701c 100644
--- a/src/chrome/content/rules/Louisiana_State_University-problematic.xml
+++ b/src/chrome/content/rules/Louisiana_State_University-problematic.xml
@@ -12,4 +12,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Louisiana_State_University.xml b/src/chrome/content/rules/Louisiana_State_University.xml
index 9db3934ffefb..591c52ad7f0f 100644
--- a/src/chrome/content/rules/Louisiana_State_University.xml
+++ b/src/chrome/content/rules/Louisiana_State_University.xml
@@ -112,7 +112,60 @@ Fetch error: http://lsu.edu/ => https://www.lsu.edu/: Pycurl fetch failed for 'h
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 		
 
 
@@ -128,14 +181,10 @@ Fetch error: http://lsu.edu/ => https://www.lsu.edu/: Pycurl fetch failed for 'h
 	
 
-	
 
 	
-	
 
 	
@@ -151,4 +200,5 @@ Fetch error: http://lsu.edu/ => https://www.lsu.edu/: Pycurl fetch failed for 'h
 	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/LoveFilm.xml b/src/chrome/content/rules/LoveFilm.xml
deleted file mode 100644
index 48c968668120..000000000000
--- a/src/chrome/content/rules/LoveFilm.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-	
-	
-	
-
-	
-	
-	
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/LoveHoney.xml b/src/chrome/content/rules/LoveHoney.xml
deleted file mode 100644
index b49e2d8b9e1e..000000000000
--- a/src/chrome/content/rules/LoveHoney.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/LovePlanet.ru.xml b/src/chrome/content/rules/LovePlanet.ru.xml
index ecad3b665edd..d56346f50041 100644
--- a/src/chrome/content/rules/LovePlanet.ru.xml
+++ b/src/chrome/content/rules/LovePlanet.ru.xml
@@ -42,7 +42,7 @@ Fetch error: http://www.loveplanet.ru/ => https://www.loveplanet.ru/: (51, "SSL:
 	⁴ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Love_Our_Local_Business.xml b/src/chrome/content/rules/Love_Our_Local_Business.xml
deleted file mode 100644
index bdfb1e915008..000000000000
--- a/src/chrome/content/rules/Love_Our_Local_Business.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Lovemoney.xml b/src/chrome/content/rules/Lovemoney.xml
index 506bd0b374a8..42d11c048bad 100644
--- a/src/chrome/content/rules/Lovemoney.xml
+++ b/src/chrome/content/rules/Lovemoney.xml
@@ -3,7 +3,9 @@
 	
 	
 	
-	
+	
+	
+	
 
 	
diff --git a/src/chrome/content/rules/Loverpi.com.xml b/src/chrome/content/rules/Loverpi.com.xml
index 98929b0221fb..c010497983ba 100644
--- a/src/chrome/content/rules/Loverpi.com.xml
+++ b/src/chrome/content/rules/Loverpi.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://forum.loverpi.com/ => https://forum.loverpi.com/: (6, 'Could
 	share.loverpi.com (refused)
 -->
 
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Lovett_Publishing_House.com.xml b/src/chrome/content/rules/Lovett_Publishing_House.com.xml
index b0637b722b12..d36c42fee6dc 100644
--- a/src/chrome/content/rules/Lovett_Publishing_House.com.xml
+++ b/src/chrome/content/rules/Lovett_Publishing_House.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://lovettpublishinghouse.com/ => https://lovettpublishinghouse.
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Lovtidende.dk.xml b/src/chrome/content/rules/Lovtidende.dk.xml
index f89a111f4053..9f95f087bd9b 100644
--- a/src/chrome/content/rules/Lovtidende.dk.xml
+++ b/src/chrome/content/rules/Lovtidende.dk.xml
@@ -11,7 +11,7 @@ Fetch error: http://lovtidende.dk/ => https://lovtidende.dk/: (56, 'SSL read: er
 		- www.lovtidende.dk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Lowes.com.xml b/src/chrome/content/rules/Lowes.com.xml
index 4d1477430684..afcd0bb55f85 100644
--- a/src/chrome/content/rules/Lowes.com.xml
+++ b/src/chrome/content/rules/Lowes.com.xml
@@ -27,6 +27,6 @@
 
 	
 
-	
 
diff --git a/src/chrome/content/rules/Loyal_Forex.xml b/src/chrome/content/rules/Loyal_Forex.xml
index 27d8d88c7837..d92643add474 100644
--- a/src/chrome/content/rules/Loyal_Forex.xml
+++ b/src/chrome/content/rules/Loyal_Forex.xml
@@ -5,7 +5,7 @@ Fetch error: http://loyalforex.com/ => https://loyalforex.com/: (35, 'Unknown SS
 Fetch error: http://www.loyalforex.com/ => https://www.loyalforex.com/: (35, 'Unknown SSL protocol error in connection to www.loyalforex.com:443 ')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.loyalforex.com/ => https://www.loyalforex.com/: (35, 'Un
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/LuaJIT.org.xml b/src/chrome/content/rules/LuaJIT.org.xml
new file mode 100644
index 000000000000..a88f4fd811c1
--- /dev/null
+++ b/src/chrome/content/rules/LuaJIT.org.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Luadns.com.xml b/src/chrome/content/rules/Luadns.com.xml
new file mode 100644
index 000000000000..1c4162230449
--- /dev/null
+++ b/src/chrome/content/rules/Luadns.com.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Lubuntu.me.xml b/src/chrome/content/rules/Lubuntu.me.xml
new file mode 100644
index 000000000000..b2aafcbe4220
--- /dev/null
+++ b/src/chrome/content/rules/Lubuntu.me.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Lucid-Reverie.xml b/src/chrome/content/rules/Lucid-Reverie.xml
index bd48b4b27a25..a5d85aa5d3ef 100644
--- a/src/chrome/content/rules/Lucid-Reverie.xml
+++ b/src/chrome/content/rules/Lucid-Reverie.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://lrcd.com/ => https://lrcd.com/: (60, 'SSL certificate problem: self signed certificate')
 Fetch error: http://www.lrcd.com/ => https://lrcd.com/: (60, 'SSL certificate problem: self signed certificate')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Lucios_Gold.xml b/src/chrome/content/rules/Lucios_Gold.xml
index 40cc81168338..01a9c6f8b98b 100644
--- a/src/chrome/content/rules/Lucios_Gold.xml
+++ b/src/chrome/content/rules/Lucios_Gold.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.luciosgold.ca/ => https://www.luciosgold.ca/: (60, 'SSL
 Disabled by https-everywhere-checker because:
 Fetch error: http://luciosgold.ca/ => https://luciosgold.ca/: (60, 'SSL certificate problem: self signed certificate')
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://luciosgold.ca/ => https://luciosgold.ca/: (60, 'SSL certific
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Lucky2u.net.xml b/src/chrome/content/rules/Lucky2u.net.xml
index 3e1f9b862eb9..19b1e4adaba7 100644
--- a/src/chrome/content/rules/Lucky2u.net.xml
+++ b/src/chrome/content/rules/Lucky2u.net.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ludwigshafen-diskutiert.de.xml b/src/chrome/content/rules/Ludwigshafen-diskutiert.de.xml
new file mode 100644
index 000000000000..2fffe4487a64
--- /dev/null
+++ b/src/chrome/content/rules/Ludwigshafen-diskutiert.de.xml
@@ -0,0 +1,13 @@
+
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Ludwigshafen.de.xml b/src/chrome/content/rules/Ludwigshafen.de.xml
new file mode 100644
index 000000000000..3209e1b1dc72
--- /dev/null
+++ b/src/chrome/content/rules/Ludwigshafen.de.xml
@@ -0,0 +1,42 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Lufthansa.xml b/src/chrome/content/rules/Lufthansa.xml
index 902694addf38..04d66afa7cf2 100644
--- a/src/chrome/content/rules/Lufthansa.xml
+++ b/src/chrome/content/rules/Lufthansa.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Non-2xx HTTP code: http://lufthansa.com/ (200) => https://www.lufthansa.com/ (404)
 
 -->
-
+
     
     
 
diff --git a/src/chrome/content/rules/LukeSmith.xyz.xml b/src/chrome/content/rules/LukeSmith.xyz.xml
new file mode 100644
index 000000000000..34c76056b203
--- /dev/null
+++ b/src/chrome/content/rules/LukeSmith.xyz.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Lulea_Municipality.xml b/src/chrome/content/rules/Lulea_Municipality.xml
index 54e2181dfa55..a5a314209b42 100644
--- a/src/chrome/content/rules/Lulea_Municipality.xml
+++ b/src/chrome/content/rules/Lulea_Municipality.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Lulea_University_of_Technology.xml b/src/chrome/content/rules/Lulea_University_of_Technology.xml
index f9eeb6d91c24..7bbf680e3891 100644
--- a/src/chrome/content/rules/Lulea_University_of_Technology.xml
+++ b/src/chrome/content/rules/Lulea_University_of_Technology.xml
@@ -15,7 +15,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -27,4 +28,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Lulu.xml b/src/chrome/content/rules/Lulu.xml
index 3a690e2b7241..dd210b4ded07 100644
--- a/src/chrome/content/rules/Lulu.xml
+++ b/src/chrome/content/rules/Lulu.xml
@@ -1,7 +1,8 @@
 
 
 	
-	
+	
+	
 
 	
diff --git a/src/chrome/content/rules/Lumen.xml b/src/chrome/content/rules/Lumen.xml
index a95d10d0ca71..68119abd00cd 100644
--- a/src/chrome/content/rules/Lumen.xml
+++ b/src/chrome/content/rules/Lumen.xml
@@ -6,4 +6,4 @@
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Lumesse.com.xml b/src/chrome/content/rules/Lumesse.com.xml
index 4b1c99a99112..352e98859883 100644
--- a/src/chrome/content/rules/Lumesse.com.xml
+++ b/src/chrome/content/rules/Lumesse.com.xml
@@ -41,7 +41,7 @@ Fetch error: http://www.lumesse.com/ => https://www.lumesse.com/: (51, "SSL: no
 	⁴ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Lumiblade.xml b/src/chrome/content/rules/Lumiblade.xml
index d67cb3f384f5..8163ed028fda 100644
--- a/src/chrome/content/rules/Lumiblade.xml
+++ b/src/chrome/content/rules/Lumiblade.xml
@@ -8,12 +8,12 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://lumiblade-shop.com/ => https://lumiblade-shop.com/: (7, 'Failed to connect to lumiblade-shop.com port 443: Connection refused')
 Fetch error: http://www.lumiblade-shop.com/ => https://www.lumiblade-shop.com/: (7, 'Failed to connect to www.lumiblade-shop.com port 443: Connection refused')
 -->
-
+
 
 	
 	
 	
-	
+
 
 
 	
diff --git a/src/chrome/content/rules/LuminoWorld.com.xml b/src/chrome/content/rules/LuminoWorld.com.xml
index d065e93cae6a..c3a655790c9b 100644
--- a/src/chrome/content/rules/LuminoWorld.com.xml
+++ b/src/chrome/content/rules/LuminoWorld.com.xml
@@ -14,4 +14,4 @@ Fetch error: http://www.luminoworld.com/ => http://www.luminoworld.com/: (6, 'Co
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Lumo.xml b/src/chrome/content/rules/Lumo.xml
deleted file mode 100644
index 92806baf22d8..000000000000
--- a/src/chrome/content/rules/Lumo.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Lumosity.xml b/src/chrome/content/rules/Lumosity.xml
index a8f0ce152e08..f7093a99dce3 100644
--- a/src/chrome/content/rules/Lumosity.xml
+++ b/src/chrome/content/rules/Lumosity.xml
@@ -7,7 +7,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Luna-Nivius.xml b/src/chrome/content/rules/Luna-Nivius.xml
index 5e6b2645fc40..c10c7ace2512 100644
--- a/src/chrome/content/rules/Luna-Nivius.xml
+++ b/src/chrome/content/rules/Luna-Nivius.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://niveusluna.org/ => https://niveusluna.org/: (28, 'Connection timed out after 10001 milliseconds')
 Fetch error: http://www.niveusluna.org/ => https://www.niveusluna.org/: (28, 'Connection timed out after 10001 milliseconds')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Lurkmore.to.xml b/src/chrome/content/rules/Lurkmore.to.xml
index f56b153662f8..f77af99dc622 100644
--- a/src/chrome/content/rules/Lurkmore.to.xml
+++ b/src/chrome/content/rules/Lurkmore.to.xml
@@ -1,42 +1,54 @@
-
 
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
+
 	
 	
-	
-	
-	
-	
-	
-
-
-	
-
-
-	
+	
+	
+	
 
+	
+	
 
diff --git a/src/chrome/content/rules/Luxomo.com.xml b/src/chrome/content/rules/Luxomo.com.xml
index ad29b4ace77c..5428d707a6ff 100644
--- a/src/chrome/content/rules/Luxomo.com.xml
+++ b/src/chrome/content/rules/Luxomo.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://luxomo.com/ => https://luxomo.com/: (28, 'Connection timed o
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Luxury_Custom_Wheels.xml b/src/chrome/content/rules/Luxury_Custom_Wheels.xml
index c5f9056b336f..98055c6cf6e6 100644
--- a/src/chrome/content/rules/Luxury_Custom_Wheels.xml
+++ b/src/chrome/content/rules/Luxury_Custom_Wheels.xml
@@ -5,15 +5,15 @@ Fetch error: http://luxurycustomwheels.com/ => https://luxurycustomwheels.com/:
 Fetch error: http://www.luxurycustomwheels.com/ => https://www.luxurycustomwheels.com/: (35, 'Unknown SSL protocol error in connection to www.luxurycustomwheels.com:443 ')
 
 -->
-
+
 
 	
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Luxury_Replica.xml b/src/chrome/content/rules/Luxury_Replica.xml
index a62b2247360a..f6ca93dac62e 100644
--- a/src/chrome/content/rules/Luxury_Replica.xml
+++ b/src/chrome/content/rules/Luxury_Replica.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.luxuryreplica.net/ => https://www.luxuryreplica.net/: (2
 Disabled by https-everywhere-checker because:
 Fetch error: http://luxuryreplica.net/ => https://luxuryreplica.net/: (28, 'Connection timed out after 10000 milliseconds')
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://luxuryreplica.net/ => https://luxuryreplica.net/: (28, 'Conn
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Lxde.org.xml b/src/chrome/content/rules/Lxde.org.xml
new file mode 100644
index 000000000000..0f5cc0003922
--- /dev/null
+++ b/src/chrome/content/rules/Lxde.org.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/LyinComey.com.xml b/src/chrome/content/rules/LyinComey.com.xml
new file mode 100644
index 000000000000..ac7335cc9b8f
--- /dev/null
+++ b/src/chrome/content/rules/LyinComey.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Lymo.fr.xml b/src/chrome/content/rules/Lymo.fr.xml
index a0a3d0c73c32..15405ded50ff 100644
--- a/src/chrome/content/rules/Lymo.fr.xml
+++ b/src/chrome/content/rules/Lymo.fr.xml
@@ -1,11 +1,11 @@
-
-
-	
-	
-
-	
-
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Lynch_Interactive.com.xml b/src/chrome/content/rules/Lynch_Interactive.com.xml
index 23fbd95bea62..5d0f1015956a 100644
--- a/src/chrome/content/rules/Lynch_Interactive.com.xml
+++ b/src/chrome/content/rules/Lynch_Interactive.com.xml
@@ -10,7 +10,7 @@ Disabled by https-everywhere-checker because:
 Non-2xx HTTP code: http://lynchinteractive.com/ (200) => https://lynchinteractive.com/ (404)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Lynda.com.xml b/src/chrome/content/rules/Lynda.com.xml
index 2846ac82e1d5..e6c7f2e04516 100644
--- a/src/chrome/content/rules/Lynda.com.xml
+++ b/src/chrome/content/rules/Lynda.com.xml
@@ -43,7 +43,6 @@
 					-->
 			
 			
-			
 			
 			
 			
diff --git a/src/chrome/content/rules/Lynku.com.xml b/src/chrome/content/rules/Lynku.com.xml
index 8b5c6278fb02..b99e9a0ccdf0 100644
--- a/src/chrome/content/rules/Lynku.com.xml
+++ b/src/chrome/content/rules/Lynku.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://images.lynku.com/ => https://shop.look.co.uk/: (7, 'Failed t
 		- images	(mismatched, CN: shop.look.co.uk)
 
 -->
-
+
 
 	
 
@@ -23,4 +23,4 @@ Fetch error: http://images.lynku.com/ => https://shop.look.co.uk/: (7, 'Failed t
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Lyris.xml b/src/chrome/content/rules/Lyris.xml
index adc923ec4f8d..2266b31fb8f9 100644
--- a/src/chrome/content/rules/Lyris.xml
+++ b/src/chrome/content/rules/Lyris.xml
@@ -18,12 +18,14 @@ Fetch error: http://www.lyrishq.com/ => https://www.lyris.com/blog: (28, 'Connec
 		- Up0.net.xml
 
 -->
-
+
 
 	
-	
+	
+	
 	
-	
+	
+	
 	
 	
 
@@ -35,16 +37,13 @@ Fetch error: http://www.lyrishq.com/ => https://www.lyris.com/blog: (28, 'Connec
 	
 
-	
 
 	
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Lyrk.de.xml b/src/chrome/content/rules/Lyrk.de.xml
index e4bad3a79f84..08dd1293bb4d 100644
--- a/src/chrome/content/rules/Lyrk.de.xml
+++ b/src/chrome/content/rules/Lyrk.de.xml
@@ -9,7 +9,8 @@
 
 
 	
-	
+	
+	
 
 
 	
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/M-W.co.uk.xml b/src/chrome/content/rules/M-W.co.uk.xml
index a17d4062babe..c1036b8ebf24 100644
--- a/src/chrome/content/rules/M-W.co.uk.xml
+++ b/src/chrome/content/rules/M-W.co.uk.xml
@@ -17,7 +17,7 @@ Fetch error: http://m-w.co.uk/ => https://m-w.co.uk/: Too many redirects while f
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/M-and-T_Bank.xml b/src/chrome/content/rules/M-and-T_Bank.xml
index 1276a5c26c57..f54c72baa872 100644
--- a/src/chrome/content/rules/M-and-T_Bank.xml
+++ b/src/chrome/content/rules/M-and-T_Bank.xml
@@ -14,7 +14,10 @@
 
 	
 	
-	
+	
+	
+	
+	
 	
 
 
@@ -22,16 +25,11 @@
 	
 
 
-	
 
 	
 
-	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/M-net.de.xml b/src/chrome/content/rules/M-net.de.xml
deleted file mode 100644
index 6d9b03aab62f..000000000000
--- a/src/chrome/content/rules/M-net.de.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-
- 
diff --git a/src/chrome/content/rules/M-pathy.xml b/src/chrome/content/rules/M-pathy.xml
index 33d16df76c35..04f45723f3d3 100644
--- a/src/chrome/content/rules/M-pathy.xml
+++ b/src/chrome/content/rules/M-pathy.xml
@@ -10,7 +10,8 @@
 
 
 	
-	
+	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/M-privacy.xml b/src/chrome/content/rules/M-privacy.xml
index dd73c404f552..c20c2bf48e62 100644
--- a/src/chrome/content/rules/M-privacy.xml
+++ b/src/chrome/content/rules/M-privacy.xml
@@ -1,7 +1,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/M2pub.com.xml b/src/chrome/content/rules/M2pub.com.xml
deleted file mode 100644
index 156ab9967b9c..000000000000
--- a/src/chrome/content/rules/M2pub.com.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-	
-
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/MAC_Paper.com.xml b/src/chrome/content/rules/MAC_Paper.com.xml
index c3fabcc79cfe..5f715035742c 100644
--- a/src/chrome/content/rules/MAC_Paper.com.xml
+++ b/src/chrome/content/rules/MAC_Paper.com.xml
@@ -20,10 +20,11 @@ Fetch error: http://macpaper.com/ => https://secure.macpaper.com/: (51, "SSL: no
 	* Secured by us
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/MADD-California.xml b/src/chrome/content/rules/MADD-California.xml
index 8a65a1e0a463..50d7e3611b3f 100644
--- a/src/chrome/content/rules/MADD-California.xml
+++ b/src/chrome/content/rules/MADD-California.xml
@@ -5,9 +5,9 @@ Fetch error: http://maddcalifornia.org/ => https://www.maddcalifornia.org/: (35,
 Fetch error: http://www.maddcalifornia.org/ => https://www.maddcalifornia.org/: (35, 'Unknown SSL protocol error in connection to www.maddcalifornia.org:443 ')
 
 -->
-
+
 	
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MARC.info.xml b/src/chrome/content/rules/MARC.info.xml
deleted file mode 100644
index a6bc3ed773ff..000000000000
--- a/src/chrome/content/rules/MARC.info.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/MARE-system.de.xml b/src/chrome/content/rules/MARE-system.de.xml
index 64a8fd053d8a..3745e3bde58d 100644
--- a/src/chrome/content/rules/MARE-system.de.xml
+++ b/src/chrome/content/rules/MARE-system.de.xml
@@ -7,7 +7,7 @@ Fetch error: http://mare-system.de/ => https://www.mare-system.de/: (60, 'SSL ce
 	^: Cert only matches www
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/MARSocial.com.xml b/src/chrome/content/rules/MARSocial.com.xml
index db9c19b38213..12681362aea1 100644
--- a/src/chrome/content/rules/MARSocial.com.xml
+++ b/src/chrome/content/rules/MARSocial.com.xml
@@ -17,7 +17,7 @@ Fetch error: http://www.marsocial.com/ => https://www.marsocial.com/: (28, 'Conn
 	* Not secured by us <= missing certificate chain
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/MASSPIRG.xml b/src/chrome/content/rules/MASSPIRG.xml
index d3579a4107d2..09874dd763ed 100644
--- a/src/chrome/content/rules/MASSPIRG.xml
+++ b/src/chrome/content/rules/MASSPIRG.xml
@@ -17,4 +17,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MASSPIRG_Education_Fund.xml b/src/chrome/content/rules/MASSPIRG_Education_Fund.xml
index d1b75dbf77e6..5d4732615273 100644
--- a/src/chrome/content/rules/MASSPIRG_Education_Fund.xml
+++ b/src/chrome/content/rules/MASSPIRG_Education_Fund.xml
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MASSPIRG_Students.xml b/src/chrome/content/rules/MASSPIRG_Students.xml
index 44e8658438f6..034b315025c1 100644
--- a/src/chrome/content/rules/MASSPIRG_Students.xml
+++ b/src/chrome/content/rules/MASSPIRG_Students.xml
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MAXROAM.xml b/src/chrome/content/rules/MAXROAM.xml
index 0bac73aa668b..eb7106dc6b69 100644
--- a/src/chrome/content/rules/MAXROAM.xml
+++ b/src/chrome/content/rules/MAXROAM.xml
@@ -1,7 +1,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/MAZDA_Web_Members.xml b/src/chrome/content/rules/MAZDA_Web_Members.xml
index ce85f7b882d8..180407254d96 100644
--- a/src/chrome/content/rules/MAZDA_Web_Members.xml
+++ b/src/chrome/content/rules/MAZDA_Web_Members.xml
@@ -4,11 +4,11 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.m-wm.com/ => https://www.m-wm.com/: (6, 'Could not resolve host: www.m-wm.com')
 
 -->
-
+
 
 	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MA_Legislature.gov.xml b/src/chrome/content/rules/MA_Legislature.gov.xml
deleted file mode 100644
index 327fd9c8d03f..000000000000
--- a/src/chrome/content/rules/MA_Legislature.gov.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/MBC-Karlsruhe.de.xml b/src/chrome/content/rules/MBC-Karlsruhe.de.xml
new file mode 100644
index 000000000000..f56fb2b00404
--- /dev/null
+++ b/src/chrome/content/rules/MBC-Karlsruhe.de.xml
@@ -0,0 +1,8 @@
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/MBSportsWeb.xml b/src/chrome/content/rules/MBSportsWeb.xml
index 682ba6afd753..723ace1146cf 100644
--- a/src/chrome/content/rules/MBSportsWeb.xml
+++ b/src/chrome/content/rules/MBSportsWeb.xml
@@ -14,7 +14,7 @@
 	
 	
 	
-	
+	
 
 
 	
@@ -23,4 +23,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MBank.xml b/src/chrome/content/rules/MBank.xml
index d674ea51bf0f..71a3903a42b4 100644
--- a/src/chrome/content/rules/MBank.xml
+++ b/src/chrome/content/rules/MBank.xml
@@ -49,7 +49,7 @@ Fetch error: http://ssl1.mbank.pl/ => https://ssl1.mbank.pl/: (60, 'SSL certific
 		- media.mbank.eu
 			- Presents cert for secure.netpr.pl.
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/MBnet.xml b/src/chrome/content/rules/MBnet.xml
index bacbbcd13c9b..662fcb9f89ee 100644
--- a/src/chrome/content/rules/MBnet.xml
+++ b/src/chrome/content/rules/MBnet.xml
@@ -13,7 +13,7 @@ Fetch error: http://webmail.mbnet.fi/ => https://webmail.mbnet.fi/: (7, 'Failed
 		- webmail.mbnet.fi
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/MBuy.com.xml b/src/chrome/content/rules/MBuy.com.xml
index 56f8c7a9a724..d2d967c4e02f 100644
--- a/src/chrome/content/rules/MBuy.com.xml
+++ b/src/chrome/content/rules/MBuy.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://app.mbuy.com/ => https://app.mbuy.com/: (7, 'Failed to conne
 		- (www.)	(refused)
 
 -->
-
+
 
 	
 
@@ -18,4 +18,4 @@ Fetch error: http://app.mbuy.com/ => https://app.mbuy.com/: (7, 'Failed to conne
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MCLU.xml b/src/chrome/content/rules/MCLU.xml
index c4bcabdfd2cc..0555a04794f5 100644
--- a/src/chrome/content/rules/MCLU.xml
+++ b/src/chrome/content/rules/MCLU.xml
@@ -8,9 +8,9 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://mclu.org/ => https://www.mclu.org/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 Fetch error: http://www.mclu.org/ => https://www.mclu.org/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 -->
-
+
 	
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MCM_Electronics.com.xml b/src/chrome/content/rules/MCM_Electronics.com.xml
index 1b373e740838..d39adcf03a34 100644
--- a/src/chrome/content/rules/MCM_Electronics.com.xml
+++ b/src/chrome/content/rules/MCM_Electronics.com.xml
@@ -31,4 +31,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MDC_US.com.xml b/src/chrome/content/rules/MDC_US.com.xml
deleted file mode 100644
index 3b1f3f43097c..000000000000
--- a/src/chrome/content/rules/MDC_US.com.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/MDR.de.xml b/src/chrome/content/rules/MDR.de.xml
new file mode 100644
index 000000000000..81ae42fb2019
--- /dev/null
+++ b/src/chrome/content/rules/MDR.de.xml
@@ -0,0 +1,105 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/MDTS.xml b/src/chrome/content/rules/MDTS.xml
deleted file mode 100644
index a33e49a38ffa..000000000000
--- a/src/chrome/content/rules/MDTS.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/MEBank.xml b/src/chrome/content/rules/MEBank.xml
index 59ecc8ba3a3b..2600c0525e0e 100644
--- a/src/chrome/content/rules/MEBank.xml
+++ b/src/chrome/content/rules/MEBank.xml
@@ -11,4 +11,4 @@
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MEPS-FPX.com.my.xml b/src/chrome/content/rules/MEPS-FPX.com.my.xml
new file mode 100644
index 000000000000..1fce1b7863c5
--- /dev/null
+++ b/src/chrome/content/rules/MEPS-FPX.com.my.xml
@@ -0,0 +1,24 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/MERY.jp.xml b/src/chrome/content/rules/MERY.jp.xml
index 8584a8c27594..9aecb60bd1fe 100644
--- a/src/chrome/content/rules/MERY.jp.xml
+++ b/src/chrome/content/rules/MERY.jp.xml
@@ -5,7 +5,7 @@ Fetch error: http://mery.jp/ => https://mery.jp/: (60, 'SSL certificate problem:
 Fetch error: http://www.mery.jp/ => https://www.mery.jp/: (6, 'Could not resolve host: www.mery.jp')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/MESO-Rx.xml b/src/chrome/content/rules/MESO-Rx.xml
index 27e830d48415..88189014db93 100644
--- a/src/chrome/content/rules/MESO-Rx.xml
+++ b/src/chrome/content/rules/MESO-Rx.xml
@@ -25,7 +25,7 @@ Non-2xx HTTP code: http://www.thinksteroids.com/ (200) => https://www.thinkstero
 			- cdn-ru.thinksteroids.com
 
 -->
-
+
 
 	
@@ -43,12 +43,9 @@ Non-2xx HTTP code: http://www.thinksteroids.com/ (200) => https://www.thinkstero
 	
 
 
-	
+	
 
 
-	
-
 	
 
diff --git a/src/chrome/content/rules/METEO.PL.xml b/src/chrome/content/rules/METEO.PL.xml
new file mode 100644
index 000000000000..56e1e25c7c0b
--- /dev/null
+++ b/src/chrome/content/rules/METEO.PL.xml
@@ -0,0 +1,14 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/MGID.com.xml b/src/chrome/content/rules/MGID.com.xml
index c91444702811..5af1018e08ee 100644
--- a/src/chrome/content/rules/MGID.com.xml
+++ b/src/chrome/content/rules/MGID.com.xml
@@ -73,14 +73,30 @@
 -->
 
 
-	
+	
+	
+	
+	
 		
 		
-	
+	
+	
+	
+	
+	
+	
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
-
-
-	
-
-
-	
-
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/MICGadget.com.xml b/src/chrome/content/rules/MICGadget.com.xml
new file mode 100644
index 000000000000..9052d06c3651
--- /dev/null
+++ b/src/chrome/content/rules/MICGadget.com.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/MIMS.xml b/src/chrome/content/rules/MIMS.xml
index 6259983bd872..55fc195e8bbd 100644
--- a/src/chrome/content/rules/MIMS.xml
+++ b/src/chrome/content/rules/MIMS.xml
@@ -13,7 +13,7 @@ Non-2xx HTTP code: http://www.mims.com.tw/ (200) => https://www.mims.com.tw/ (50
 		- mims.com
 			- pubmiddleware		(timeout)
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/MINV.sk.xml b/src/chrome/content/rules/MINV.sk.xml
new file mode 100644
index 000000000000..1811063c7156
--- /dev/null
+++ b/src/chrome/content/rules/MINV.sk.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/MIUI.com.xml b/src/chrome/content/rules/MIUI.com.xml
index a8250f732aa3..34874084eca8 100644
--- a/src/chrome/content/rules/MIUI.com.xml
+++ b/src/chrome/content/rules/MIUI.com.xml
@@ -1,39 +1,47 @@
 
 
+	
+	
+	
+	
+		
+	
+		
+		
+	
 	
+	
+	
+	
 	
+	
 	
 	
-		
+		
+
+	
 
+	
+		
+		
+		
+	
 	
 
diff --git a/src/chrome/content/rules/MJG_International.xml b/src/chrome/content/rules/MJG_International.xml
index fc890972b728..58a3313288ad 100644
--- a/src/chrome/content/rules/MJG_International.xml
+++ b/src/chrome/content/rules/MJG_International.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://mjg.in/ => https://mjg.in/: (60, 'SSL certificate problem: certificate has expired')
 Fetch error: http://www.mjg.in/ => https://www.mjg.in/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
 
 	
 	
@@ -19,4 +19,4 @@ Fetch error: http://www.mjg.in/ => https://www.mjg.in/: (60, 'SSL certificate pr
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MK2.com.xml b/src/chrome/content/rules/MK2.com.xml
index 864ba8b3808e..7c87b2b6e492 100644
--- a/src/chrome/content/rules/MK2.com.xml
+++ b/src/chrome/content/rules/MK2.com.xml
@@ -24,14 +24,14 @@
 -->
 
 
-  
+
 	
 	
 	
 	
 	
 	
-  
+
 	
 
 	
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/MLSec_Project.org.xml b/src/chrome/content/rules/MLSec_Project.org.xml
index bdc6d202f427..5685878521c6 100644
--- a/src/chrome/content/rules/MLSec_Project.org.xml
+++ b/src/chrome/content/rules/MLSec_Project.org.xml
@@ -16,7 +16,7 @@ Fetch error: http://mlsecproject.org/ => https://mlsecproject.org/: (28, 'Connec
 		- www.mlsecproject.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/MLno6.com.xml b/src/chrome/content/rules/MLno6.com.xml
index ff1b9c975040..91c49afd2f50 100644
--- a/src/chrome/content/rules/MLno6.com.xml
+++ b/src/chrome/content/rules/MLno6.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://www.mlno6.com/ => https://www.mlno6.com/: (60, 'SSL certific
 	Web bugs.
 
 -->
-
+
 
 	
 	
@@ -21,4 +21,4 @@ Fetch error: http://www.mlno6.com/ => https://www.mlno6.com/: (60, 'SSL certific
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MMAHQ.xml b/src/chrome/content/rules/MMAHQ.xml
index 6dd78db60b2d..139d945b4238 100644
--- a/src/chrome/content/rules/MMAHQ.xml
+++ b/src/chrome/content/rules/MMAHQ.xml
@@ -16,7 +16,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/MMOGA.xml b/src/chrome/content/rules/MMOGA.xml
index 21918256ef06..86c2b456fbf0 100644
--- a/src/chrome/content/rules/MMOGA.xml
+++ b/src/chrome/content/rules/MMOGA.xml
@@ -1,15 +1,16 @@
 
 
 	
-	
 	
-	
+	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MMO_Culture.xml b/src/chrome/content/rules/MMO_Culture.xml
index 138f336a3576..6197fcf50b6c 100644
--- a/src/chrome/content/rules/MMO_Culture.xml
+++ b/src/chrome/content/rules/MMO_Culture.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MOBIUS_Catalog.xml b/src/chrome/content/rules/MOBIUS_Catalog.xml
index 21a88b856440..222f9a896882 100644
--- a/src/chrome/content/rules/MOBIUS_Catalog.xml
+++ b/src/chrome/content/rules/MOBIUS_Catalog.xml
@@ -8,13 +8,11 @@
 
 
 	
-	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MORryde.com.xml b/src/chrome/content/rules/MORryde.com.xml
new file mode 100644
index 000000000000..14493b77260d
--- /dev/null
+++ b/src/chrome/content/rules/MORryde.com.xml
@@ -0,0 +1,18 @@
+
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/MPlayer.xml b/src/chrome/content/rules/MPlayer.xml
index 19eb377010af..c6b5f897261d 100644
--- a/src/chrome/content/rules/MPlayer.xml
+++ b/src/chrome/content/rules/MPlayer.xml
@@ -13,7 +13,7 @@ Fetch error: http://bugzilla.mplayerhq.hu/ => https://bugzilla.mplayerhq.hu/: (7
 	ʳ Refused
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/MQTT.org.xml b/src/chrome/content/rules/MQTT.org.xml
new file mode 100644
index 000000000000..d554eb894253
--- /dev/null
+++ b/src/chrome/content/rules/MQTT.org.xml
@@ -0,0 +1,12 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/MR_PORTER.xml b/src/chrome/content/rules/MR_PORTER.xml
index bd185a2881e7..b05feb243506 100644
--- a/src/chrome/content/rules/MR_PORTER.xml
+++ b/src/chrome/content/rules/MR_PORTER.xml
@@ -6,10 +6,12 @@ Non-2xx HTTP code: http://mrporter.com/ (200) => https://www.mrporter.com/ (403)
 	!www: cert only matches www.
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
 	
@@ -18,7 +20,6 @@ Non-2xx HTTP code: http://mrporter.com/ (200) => https://www.mrporter.com/ (403)
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/MSDN.xml b/src/chrome/content/rules/MSDN.xml
index 7286941380aa..c885ccd523b9 100644
--- a/src/chrome/content/rules/MSDN.xml
+++ b/src/chrome/content/rules/MSDN.xml
@@ -1,7 +1,5 @@
 
 
-
+
+
 
 	
+	
+	
 	
 
-	
 	
 
-	
-	
-	
-
-		
-		
-
-		
-		
-
-		
-
-			
-			
-
-			
-			
-
 
 	
@@ -97,20 +69,8 @@ Non-2xx HTTP code: http://public.create.msdn.com/assets/ (200) => https://www.cr
 			- blogs
 			- forums.create
 					-->
-	
-
-
-	
-	
-
-	
-	
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/MSF-Online.com.xml b/src/chrome/content/rules/MSF-Online.com.xml
new file mode 100644
index 000000000000..38ec445973c4
--- /dev/null
+++ b/src/chrome/content/rules/MSF-Online.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/MSN.xml b/src/chrome/content/rules/MSN.xml
index 340b732953a1..eb5b3a43bac8 100644
--- a/src/chrome/content/rules/MSN.xml
+++ b/src/chrome/content/rules/MSN.xml
@@ -234,7 +234,7 @@
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/MTAC.xml b/src/chrome/content/rules/MTAC.xml
index bddbf1c5207c..f7c6dab5c5f7 100644
--- a/src/chrome/content/rules/MTAC.xml
+++ b/src/chrome/content/rules/MTAC.xml
@@ -5,7 +5,7 @@ Fetch error: http://mtac.org/ => https://www.mtac.org/: Cycle detected - URL alr
 
 
 	
-	
+	
 
 	
diff --git a/src/chrome/content/rules/MTCCC.com.xml b/src/chrome/content/rules/MTCCC.com.xml
new file mode 100644
index 000000000000..68e5b0835c9d
--- /dev/null
+++ b/src/chrome/content/rules/MTCCC.com.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/MTS-Banka.xml b/src/chrome/content/rules/MTS-Banka.xml
new file mode 100644
index 000000000000..26145e428060
--- /dev/null
+++ b/src/chrome/content/rules/MTS-Banka.xml
@@ -0,0 +1,9 @@
+
+
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/MVG-mobil.de.xml b/src/chrome/content/rules/MVG-mobil.de.xml
index 107cdedcbe0f..3cb19401417e 100644
--- a/src/chrome/content/rules/MVG-mobil.de.xml
+++ b/src/chrome/content/rules/MVG-mobil.de.xml
@@ -13,7 +13,7 @@
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MVP_National_Title.xml b/src/chrome/content/rules/MVP_National_Title.xml
index ddaf1eec117f..e1041e95f808 100644
--- a/src/chrome/content/rules/MVP_National_Title.xml
+++ b/src/chrome/content/rules/MVP_National_Title.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MYEDDEBT.com.xml b/src/chrome/content/rules/MYEDDEBT.com.xml
deleted file mode 100644
index 17f08d086d03..000000000000
--- a/src/chrome/content/rules/MYEDDEBT.com.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/MYOB.com.xml b/src/chrome/content/rules/MYOB.com.xml
index 875d93123e4b..d45217932809 100644
--- a/src/chrome/content/rules/MYOB.com.xml
+++ b/src/chrome/content/rules/MYOB.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://myob.com/ => https://myob.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/MacArthur_Foundation.xml b/src/chrome/content/rules/MacArthur_Foundation.xml
index 0fc54d9de7e9..2d87b3528b2d 100644
--- a/src/chrome/content/rules/MacArthur_Foundation.xml
+++ b/src/chrome/content/rules/MacArthur_Foundation.xml
@@ -21,7 +21,7 @@ Fetch error: http://owa.macfound.org/ => https://owa.macfound.org/: (51, "SSL: n
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/MacPorts.org.xml b/src/chrome/content/rules/MacPorts.org.xml
index bda80e1a8d5d..eb20f1479ba1 100644
--- a/src/chrome/content/rules/MacPorts.org.xml
+++ b/src/chrome/content/rules/MacPorts.org.xml
@@ -1,29 +1,89 @@
 
 
-
-	
 	
+	
+	
+	
+	
 	
+	
+	
+	
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
+	
 	
-	
-
-
-	
-	
+	
+	
+	
 
 	
 
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/MacRuby.org.xml b/src/chrome/content/rules/MacRuby.org.xml
index 18a8fa8d785f..ec2b496df97c 100644
--- a/src/chrome/content/rules/MacRuby.org.xml
+++ b/src/chrome/content/rules/MacRuby.org.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.macruby.org/ => https://www.macruby.org/: (28, 'Connection timed out after 10000 milliseconds')
 Fetch error: http://macruby.org/ => https://www.macruby.org/: (28, 'Connection timed out after 10000 milliseconds')
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/MacWorld.com.au.xml b/src/chrome/content/rules/MacWorld.com.au.xml
deleted file mode 100644
index ee9cb4753253..000000000000
--- a/src/chrome/content/rules/MacWorld.com.au.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/MacaInfo.org.xml b/src/chrome/content/rules/MacaInfo.org.xml
index e09feeddcf9c..59282637ca4e 100644
--- a/src/chrome/content/rules/MacaInfo.org.xml
+++ b/src/chrome/content/rules/MacaInfo.org.xml
@@ -4,10 +4,10 @@
 		- ^	(times out)
 
 -->
-
+
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Macfarlane_Packaging.com.xml b/src/chrome/content/rules/Macfarlane_Packaging.com.xml
index 096e422e01bb..a604d5531d74 100644
--- a/src/chrome/content/rules/Macfarlane_Packaging.com.xml
+++ b/src/chrome/content/rules/Macfarlane_Packaging.com.xml
@@ -12,7 +12,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Macgamestore.com.xml b/src/chrome/content/rules/Macgamestore.com.xml
index 13ef74d27c35..3494a2776f96 100644
--- a/src/chrome/content/rules/Macgamestore.com.xml
+++ b/src/chrome/content/rules/Macgamestore.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://macgamestore.com/ => https://macgamestore.com/: (60, 'SSL ce
 Fetch error: http://www.macgamestore.com/ => https://www.macgamestore.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Machines_Like_Us.xml b/src/chrome/content/rules/Machines_Like_Us.xml
index 413064925b0a..1ecdd59a097f 100644
--- a/src/chrome/content/rules/Machines_Like_Us.xml
+++ b/src/chrome/content/rules/Machines_Like_Us.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.machineslikeus.com/ => https://machineslikeus.com/: (7,
 	Cert doesn't match www.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Mad_Mimi.com.xml b/src/chrome/content/rules/Mad_Mimi.com.xml
index 256f0e155975..12a667f16b75 100644
--- a/src/chrome/content/rules/Mad_Mimi.com.xml
+++ b/src/chrome/content/rules/Mad_Mimi.com.xml
@@ -36,7 +36,10 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/MadgexJB.com.xml b/src/chrome/content/rules/MadgexJB.com.xml
index f65cf4df4945..98897952f186 100644
--- a/src/chrome/content/rules/MadgexJB.com.xml
+++ b/src/chrome/content/rules/MadgexJB.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://ijobs-rs.madgexjb.com/ => https://ijobs-rs.madgexjb.com/: (5
 		- ijobs-rs.madgexjb.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Madison-Logic.xml b/src/chrome/content/rules/Madison-Logic.xml
index 546a76f591dd..e5eb441eb9fb 100644
--- a/src/chrome/content/rules/Madison-Logic.xml
+++ b/src/chrome/content/rules/Madison-Logic.xml
@@ -6,70 +6,27 @@
 
 	Problematic domains:
 
-		- (www.)dinclinx.com	(mismatched, CN: *.madisonlogic.com)
-
-		- (www.)madisonlogic.com
-
-			- Data differ
-			- $ redirects to Login.aspx
-			- css/ & graphics/ 404
-
-
-	Partially covered domains:
-
-		- (www.)madisonlogic.com
-
+		- (www|blog.)madisonlogic.com	SSL certificate problem: unable to get local issuer certificate
 
 	Fully covered domains:
 
-		- (www.)dinclinx.com	(→ clk.madisonlogic.com)
-
 		- madisonlogic.com subdomains:
 
-			- blog
 			- clk
-			- js-agent
 			- jsc
 			- st
 
-
-	Mixed content:
-
-		- Script on blog from blog *
-
-		- css:
-
-			- On blog from blog *
-			- On blog from fonts.googleapis.com **
-
-		- Images on blog from blog ***
-
-	* Secured by us, just a facebook widget
-	** Secured by us
-	*** Secured by us, doesn't trip MCB anyway
-
 -->
 
 
-	
-	
-	
-
-
-	
-	
-
-
-	
+	
+	
+	
 
-	
 
 	
-	
+	
 
 
diff --git a/src/chrome/content/rules/Mael_Soucaze.com.xml b/src/chrome/content/rules/Mael_Soucaze.com.xml
deleted file mode 100644
index 4ec322146a63..000000000000
--- a/src/chrome/content/rules/Mael_Soucaze.com.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Maemo.xml b/src/chrome/content/rules/Maemo.xml
index ab59e6249e32..153da98e51c1 100644
--- a/src/chrome/content/rules/Maemo.xml
+++ b/src/chrome/content/rules/Maemo.xml
@@ -28,7 +28,7 @@ Fetch error: http://static.maemo.org/ => https://maemo.org/midcom-static/: (60,
 		- wiki
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Magazin.io.xml b/src/chrome/content/rules/Magazin.io.xml
index 2e0b930adca7..dff60f5803d8 100644
--- a/src/chrome/content/rules/Magazin.io.xml
+++ b/src/chrome/content/rules/Magazin.io.xml
@@ -4,10 +4,10 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://magazin.io/ => https://magazin.io/: (7, 'Failed to connect to magazin.io port 443: Connection refused')
 Fetch error: http://www.magazin.io/ => https://magazin.io/: (7, 'Failed to connect to magazin.io port 443: Connection refused')
 
-	www.magazin.io: Expired, mismatched		- 
+	www.magazin.io: Expired, mismatched		-
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Magazinesdirect.com.xml b/src/chrome/content/rules/Magazinesdirect.com.xml
index 054206123b36..7767b0835f37 100644
--- a/src/chrome/content/rules/Magazinesdirect.com.xml
+++ b/src/chrome/content/rules/Magazinesdirect.com.xml
@@ -16,4 +16,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Mageia.xml b/src/chrome/content/rules/Mageia.xml
index 8068f96cf4c2..a59098c3c894 100644
--- a/src/chrome/content/rules/Mageia.xml
+++ b/src/chrome/content/rules/Mageia.xml
@@ -28,7 +28,7 @@ Non-2xx HTTP code: http://svn.mageia.org/ (200) => https://svnweb.mageia.org/ (4
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Magento_Go_images.xml b/src/chrome/content/rules/Magento_Go_images.xml
index 369f5ac1d5b4..abf8069415f0 100644
--- a/src/chrome/content/rules/Magento_Go_images.xml
+++ b/src/chrome/content/rules/Magento_Go_images.xml
@@ -10,4 +10,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Magic.fr.xml b/src/chrome/content/rules/Magic.fr.xml
index 23c1185751de..05e7dfb16c99 100644
--- a/src/chrome/content/rules/Magic.fr.xml
+++ b/src/chrome/content/rules/Magic.fr.xml
@@ -1,7 +1,6 @@
 
 
diff --git a/src/chrome/content/rules/Magnatune.xml b/src/chrome/content/rules/Magnatune.xml
deleted file mode 100644
index 30647a0c31f8..000000000000
--- a/src/chrome/content/rules/Magnatune.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Magnet.ie.xml b/src/chrome/content/rules/Magnet.ie.xml
index 14c6a09f712d..9fb778577ad3 100644
--- a/src/chrome/content/rules/Magnet.ie.xml
+++ b/src/chrome/content/rules/Magnet.ie.xml
@@ -16,7 +16,7 @@
 	
 	
 
-	
+	
 
 
 	
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Magyar_Telekom.xml b/src/chrome/content/rules/Magyar_Telekom.xml
index b6eca3a4b0c7..1b59341f63d4 100644
--- a/src/chrome/content/rules/Magyar_Telekom.xml
+++ b/src/chrome/content/rules/Magyar_Telekom.xml
@@ -6,7 +6,7 @@ Fetch error: http://pool.telekom.hu/ => https://pool.telekom.hu/: (28, 'Connecti
 	 - tudakozo.telekom.hu (cert mismatch, expired)
 	 - telefonkonyv.telekom.hu
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Mahomet_Citizen.xml b/src/chrome/content/rules/Mahomet_Citizen.xml
index e7b1d3524321..7f6ea220f19e 100644
--- a/src/chrome/content/rules/Mahomet_Citizen.xml
+++ b/src/chrome/content/rules/Mahomet_Citizen.xml
@@ -15,4 +15,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Mahran.net.xml b/src/chrome/content/rules/Mahran.net.xml
new file mode 100644
index 000000000000..e00476455091
--- /dev/null
+++ b/src/chrome/content/rules/Mahran.net.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/MailChimp.xml b/src/chrome/content/rules/MailChimp.xml
index 17d2dc159ed2..1d91c415d91e 100644
--- a/src/chrome/content/rules/MailChimp.xml
+++ b/src/chrome/content/rules/MailChimp.xml
@@ -159,10 +159,6 @@
 	
 
 
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/MailLift.com.xml b/src/chrome/content/rules/MailLift.com.xml
deleted file mode 100644
index e7b44c63a91d..000000000000
--- a/src/chrome/content/rules/MailLift.com.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/MailNull.com.xml b/src/chrome/content/rules/MailNull.com.xml
index d793834b06b6..689acb65c357 100644
--- a/src/chrome/content/rules/MailNull.com.xml
+++ b/src/chrome/content/rules/MailNull.com.xml
@@ -1,27 +1,13 @@
 
-
-
-	
+
 	
-
-	
 	
 
+	
 
-	
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/Mailgun.com.xml b/src/chrome/content/rules/Mailgun.com.xml
deleted file mode 100644
index 449d2eb8d706..000000000000
--- a/src/chrome/content/rules/Mailgun.com.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Mailigen.xml b/src/chrome/content/rules/Mailigen.xml
index fff36e40eb48..04d52f16c689 100644
--- a/src/chrome/content/rules/Mailigen.xml
+++ b/src/chrome/content/rules/Mailigen.xml
@@ -5,7 +5,7 @@ Fetch error: http://static-admin.mailigen.com/ => https://static-admin.mailigen.
 
 	CDN buckets:
 
-		- 500745869.r.cdn77.net 
+		- 500745869.r.cdn77.net
 
 			- static.mailigen.com
 
@@ -42,7 +42,7 @@ Fetch error: http://static-admin.mailigen.com/ => https://static-admin.mailigen.
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Mailout_Interactive.com.xml b/src/chrome/content/rules/Mailout_Interactive.com.xml
index 4f60dad6e42c..08e570c47bb7 100644
--- a/src/chrome/content/rules/Mailout_Interactive.com.xml
+++ b/src/chrome/content/rules/Mailout_Interactive.com.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.mailoutinteractive.com/ => https://mailoutinteractive.co
 		- www	(shows industrymailout.com)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Mailstation.de.xml b/src/chrome/content/rules/Mailstation.de.xml
deleted file mode 100644
index 30eef58265df..000000000000
--- a/src/chrome/content/rules/Mailstation.de.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Maine.gov.xml b/src/chrome/content/rules/Maine.gov.xml
index 4822f3a0c65c..77d8f021ded4 100644
--- a/src/chrome/content/rules/Maine.gov.xml
+++ b/src/chrome/content/rules/Maine.gov.xml
@@ -32,7 +32,7 @@ Non-2xx HTTP code: http://www.maine.gov/local/ (200) => https://www.maine.gov/lo
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Mainline_Hobby.net.xml b/src/chrome/content/rules/Mainline_Hobby.net.xml
deleted file mode 100644
index 6900eda0d844..000000000000
--- a/src/chrome/content/rules/Mainline_Hobby.net.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Make-A-Wish-Foundation-MI.xml b/src/chrome/content/rules/Make-A-Wish-Foundation-MI.xml
index 9a80a737cd1a..24e4f7d13008 100644
--- a/src/chrome/content/rules/Make-A-Wish-Foundation-MI.xml
+++ b/src/chrome/content/rules/Make-A-Wish-Foundation-MI.xml
@@ -8,9 +8,9 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://wishmich.org/ => https://www.wishmich.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.wishmich.org'")
 Fetch error: http://www.wishmich.org/ => https://www.wishmich.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.wishmich.org'")
 -->
-
+
 	
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Make-Projects.xml b/src/chrome/content/rules/Make-Projects.xml
deleted file mode 100644
index 9ff171526306..000000000000
--- a/src/chrome/content/rules/Make-Projects.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/MakeFrontendShitAgain.party.xml b/src/chrome/content/rules/MakeFrontendShitAgain.party.xml
new file mode 100644
index 000000000000..9499493eef9e
--- /dev/null
+++ b/src/chrome/content/rules/MakeFrontendShitAgain.party.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/MakeMyTrip.xml b/src/chrome/content/rules/MakeMyTrip.xml
index 6837e7c76df2..3f078b421337 100644
--- a/src/chrome/content/rules/MakeMyTrip.xml
+++ b/src/chrome/content/rules/MakeMyTrip.xml
@@ -1,9 +1,28 @@
+
+
 
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
-  
-  
+  
 
diff --git a/src/chrome/content/rules/MakeUseOf.com.xml b/src/chrome/content/rules/MakeUseOf.com.xml
new file mode 100644
index 000000000000..c3738bc4ff6e
--- /dev/null
+++ b/src/chrome/content/rules/MakeUseOf.com.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/MakeUseOf.xml b/src/chrome/content/rules/MakeUseOf.xml
deleted file mode 100644
index 5e7098271fd2..000000000000
--- a/src/chrome/content/rules/MakeUseOf.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Maker_Shed.xml b/src/chrome/content/rules/Maker_Shed.xml
index 6856ab810dec..7736af3af6d5 100644
--- a/src/chrome/content/rules/Maker_Shed.xml
+++ b/src/chrome/content/rules/Maker_Shed.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Makerbot.xml b/src/chrome/content/rules/Makerbot.xml
index 85a948860252..04eb8e525d41 100644
--- a/src/chrome/content/rules/Makerbot.xml
+++ b/src/chrome/content/rules/Makerbot.xml
@@ -41,16 +41,19 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Makes.org.xml b/src/chrome/content/rules/Makes.org.xml
index ca7cd654ffed..285c4fb8d2c7 100644
--- a/src/chrome/content/rules/Makes.org.xml
+++ b/src/chrome/content/rules/Makes.org.xml
@@ -16,7 +16,7 @@ Fetch error: http://gerv.makes.org/ => https://gerv.makes.org/: (60, 'SSL certif
 		- gerv
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/MakiBox.xml b/src/chrome/content/rules/MakiBox.xml
index 86f99837454a..2d76d19d7fec 100644
--- a/src/chrome/content/rules/MakiBox.xml
+++ b/src/chrome/content/rules/MakiBox.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://makibox.com/ => https://makibox.com/: (28, 'Connection timed out after 10001 milliseconds')
 Fetch error: http://www.makibox.com/ => https://www.makibox.com/: (28, 'Connection timed out after 10000 milliseconds')
 -->
-
+
 
 	
 	
@@ -19,4 +19,4 @@ Fetch error: http://www.makibox.com/ => https://www.makibox.com/: (28, 'Connecti
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Makrotex.hu.xml b/src/chrome/content/rules/Makrotex.hu.xml
index aa0d6b13c905..d64914c7e8f9 100644
--- a/src/chrome/content/rules/Makrotex.hu.xml
+++ b/src/chrome/content/rules/Makrotex.hu.xml
@@ -18,7 +18,7 @@
 	² Unsecurable <= plaintext reply
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Malcovery.com.xml b/src/chrome/content/rules/Malcovery.com.xml
index e8416e7b5ce8..56cd40bc894b 100644
--- a/src/chrome/content/rules/Malcovery.com.xml
+++ b/src/chrome/content/rules/Malcovery.com.xml
@@ -21,7 +21,7 @@ Fetch error: http://malcovery.com/ => https://www.malcovery.com/: (51, "SSL: no
 		- www.malcovery.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Malware-research.org.xml b/src/chrome/content/rules/Malware-research.org.xml
index eb5910510a29..463d34a54764 100644
--- a/src/chrome/content/rules/Malware-research.org.xml
+++ b/src/chrome/content/rules/Malware-research.org.xml
@@ -16,7 +16,7 @@ Fetch error: http://www.malware-research.org/ => https://www.malware-research.or
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Malware_Tracker.com.xml b/src/chrome/content/rules/Malware_Tracker.com.xml
index 6cead2acefe5..00b3af6e6a32 100644
--- a/src/chrome/content/rules/Malware_Tracker.com.xml
+++ b/src/chrome/content/rules/Malware_Tracker.com.xml
@@ -16,16 +16,16 @@
 
 
 	
-	
+	
+	
 		
 	
 	
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Mamba.xml b/src/chrome/content/rules/Mamba.xml
index 2036be5a94af..29b589130061 100644
--- a/src/chrome/content/rules/Mamba.xml
+++ b/src/chrome/content/rules/Mamba.xml
@@ -12,7 +12,6 @@
 
 	
 
-	
 	
 	
 	
diff --git a/src/chrome/content/rules/Mammut.xml b/src/chrome/content/rules/Mammut.xml
index c171bc2688cd..46c3e2d668f7 100644
--- a/src/chrome/content/rules/Mammut.xml
+++ b/src/chrome/content/rules/Mammut.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://mammut.ch/ => https://mammut.ch/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Man_Group.xml b/src/chrome/content/rules/Man_Group.xml
index 475b9586ecb0..2ad73bc753b2 100644
--- a/src/chrome/content/rules/Man_Group.xml
+++ b/src/chrome/content/rules/Man_Group.xml
@@ -2,7 +2,7 @@
     
     
 
-    
+    
 
     
diff --git a/src/chrome/content/rules/Managed_Forex_Program.com.xml b/src/chrome/content/rules/Managed_Forex_Program.com.xml
index e9db863f27e6..3eb0473eaeea 100644
--- a/src/chrome/content/rules/Managed_Forex_Program.com.xml
+++ b/src/chrome/content/rules/Managed_Forex_Program.com.xml
@@ -18,7 +18,7 @@ Fetch error: http://www.managedforexprogram.com/ => https://www.managedforexprog
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Manchester.gov.uk.xml b/src/chrome/content/rules/Manchester.gov.uk.xml
index 362845f0a7a1..f60d7526eea4 100644
--- a/src/chrome/content/rules/Manchester.gov.uk.xml
+++ b/src/chrome/content/rules/Manchester.gov.uk.xml
@@ -66,7 +66,7 @@ Fetch error: http://open.manchester.gov.uk/open => https://open.manchester.gov.u
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/MandS.xml b/src/chrome/content/rules/MandS.xml
index 4befc1f71e32..df033307d822 100644
--- a/src/chrome/content/rules/MandS.xml
+++ b/src/chrome/content/rules/MandS.xml
@@ -38,16 +38,23 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
-	
+	
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Manga.xml b/src/chrome/content/rules/Manga.xml
index 9c556f546b50..917ebf10e690 100644
--- a/src/chrome/content/rules/Manga.xml
+++ b/src/chrome/content/rules/Manga.xml
@@ -8,7 +8,7 @@ Fetch error: http://secure.manga.com/ => https://secure.manga.com/: (7, 'Failed
 		- (www.)	(shows secure; mismatched, CN: secure.manga.com
 
 -->
-
+
 	
 
 	
 
 
-	
+	
+	
 
 
 	
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Manhattanite.xml b/src/chrome/content/rules/Manhattanite.xml
index 26367ec05c95..2cedae23b3eb 100644
--- a/src/chrome/content/rules/Manhattanite.xml
+++ b/src/chrome/content/rules/Manhattanite.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Manhattanville_College.xml b/src/chrome/content/rules/Manhattanville_College.xml
index b735ce2b2958..25c79b22e70e 100644
--- a/src/chrome/content/rules/Manhattanville_College.xml
+++ b/src/chrome/content/rules/Manhattanville_College.xml
@@ -16,4 +16,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ManilaPrinciples.org.xml b/src/chrome/content/rules/ManilaPrinciples.org.xml
deleted file mode 100644
index d3003963d3e0..000000000000
--- a/src/chrome/content/rules/ManilaPrinciples.org.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Manitu.de.xml b/src/chrome/content/rules/Manitu.de.xml
index 19d09d2db9ef..c23ab5a8a39b 100644
--- a/src/chrome/content/rules/Manitu.de.xml
+++ b/src/chrome/content/rules/Manitu.de.xml
@@ -9,17 +9,17 @@
 
 
 	
-	
+	
+	
 	
 	
 
 
-	
 
 	
 	
 
+	
 
diff --git a/src/chrome/content/rules/Mankier.com.xml b/src/chrome/content/rules/Mankier.com.xml
deleted file mode 100644
index b2d2a54e76ec..000000000000
--- a/src/chrome/content/rules/Mankier.com.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Manlysealifesanctuary.com.au.xml b/src/chrome/content/rules/Manlysealifesanctuary.com.au.xml
index 66501947f475..55dcb379ace8 100644
--- a/src/chrome/content/rules/Manlysealifesanctuary.com.au.xml
+++ b/src/chrome/content/rules/Manlysealifesanctuary.com.au.xml
@@ -6,7 +6,7 @@ Fetch error: http://secure.manlysealifesanctuary.com.au/ => https://secure.manly
 	For other Merlin Entertainments coverage, see Merlin-Entertainments.xml.
 -->
 
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Manta.xml b/src/chrome/content/rules/Manta.xml
index 4e4d7ccfd855..471f6a5dbaf1 100644
--- a/src/chrome/content/rules/Manta.xml
+++ b/src/chrome/content/rules/Manta.xml
@@ -23,7 +23,7 @@ Fetch error: http://manta.com/ => https://manta.com/: (51, "SSL: no alternative
 	* Works; mismatched, CN: www.manta.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Manticore.xml b/src/chrome/content/rules/Manticore.xml
deleted file mode 100644
index e234ea5803ce..000000000000
--- a/src/chrome/content/rules/Manticore.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Manx_Computer_Bureau.xml b/src/chrome/content/rules/Manx_Computer_Bureau.xml
index a2e0e44261ea..58983c762aaf 100644
--- a/src/chrome/content/rules/Manx_Computer_Bureau.xml
+++ b/src/chrome/content/rules/Manx_Computer_Bureau.xml
@@ -6,7 +6,7 @@ Fetch error: http://mail.mcb.net/ => https://mail.mcb.net/: (7, 'Failed to conne
 Fetch error: http://www.mcb.net/ => https://www.mcb.net/: (28, 'Connection timed out after 20002 milliseconds')
 
 -->
-
+
 
 	
 	
@@ -15,4 +15,4 @@ Fetch error: http://www.mcb.net/ => https://www.mcb.net/: (28, 'Connection timed
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Mapillary.com.xml b/src/chrome/content/rules/Mapillary.com.xml
index 369da0b4fac2..875ba40936db 100644
--- a/src/chrome/content/rules/Mapillary.com.xml
+++ b/src/chrome/content/rules/Mapillary.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://elva.mapillary.com/ => https://elva.mapillary.com/: (6, 'Cou
 		^:    Refused
 		blog: Timeout
 		edu:  Mismatch
-		
+
 
 
 	Mixed content:
@@ -18,7 +18,7 @@ Fetch error: http://elva.mapillary.com/ => https://elva.mapillary.com/: (6, 'Cou
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Marathon_Bet.com.xml b/src/chrome/content/rules/Marathon_Bet.com.xml
index 231507f9995d..69966bb4b58e 100644
--- a/src/chrome/content/rules/Marathon_Bet.com.xml
+++ b/src/chrome/content/rules/Marathon_Bet.com.xml
@@ -39,7 +39,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -48,7 +49,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/March_for_Babies.org.xml b/src/chrome/content/rules/March_for_Babies.org.xml
index ab9b05342910..26797d933021 100644
--- a/src/chrome/content/rules/March_for_Babies.org.xml
+++ b/src/chrome/content/rules/March_for_Babies.org.xml
@@ -24,7 +24,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -33,7 +34,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Marchex.xml b/src/chrome/content/rules/Marchex.xml
index 771c9d67f032..c4a19dd149cf 100644
--- a/src/chrome/content/rules/Marchex.xml
+++ b/src/chrome/content/rules/Marchex.xml
@@ -63,7 +63,7 @@ Fetch error: http://c.enhance.com/ => https://c.enhance.com/: (60, 'SSL certific
 	² Not secured by us <= invalid cert
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Marcusoft.net.xml b/src/chrome/content/rules/Marcusoft.net.xml
new file mode 100644
index 000000000000..e563d54f7ae1
--- /dev/null
+++ b/src/chrome/content/rules/Marcusoft.net.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/MarginalRevolution.com.xml b/src/chrome/content/rules/MarginalRevolution.com.xml
new file mode 100644
index 000000000000..e90bb8666255
--- /dev/null
+++ b/src/chrome/content/rules/MarginalRevolution.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Marhab.xml b/src/chrome/content/rules/Marhab.xml
deleted file mode 100644
index 2bb8b8673e7b..000000000000
--- a/src/chrome/content/rules/Marhab.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/MariaDB.com.xml b/src/chrome/content/rules/MariaDB.com.xml
index 5c9d3f7d0631..ef14a713f8be 100644
--- a/src/chrome/content/rules/MariaDB.com.xml
+++ b/src/chrome/content/rules/MariaDB.com.xml
@@ -1,35 +1,42 @@
 
-
+
 
-	
 	
-	
-	
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/MariaDB.org.xml b/src/chrome/content/rules/MariaDB.org.xml
new file mode 100644
index 000000000000..513f0485f663
--- /dev/null
+++ b/src/chrome/content/rules/MariaDB.org.xml
@@ -0,0 +1,34 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/MariaDB.xml b/src/chrome/content/rules/MariaDB.xml
deleted file mode 100644
index 8e3459940db6..000000000000
--- a/src/chrome/content/rules/MariaDB.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Maricopa-Community-Colleges.xml b/src/chrome/content/rules/Maricopa-Community-Colleges.xml
index 3c56344ecfde..e212b0bb55c7 100644
--- a/src/chrome/content/rules/Maricopa-Community-Colleges.xml
+++ b/src/chrome/content/rules/Maricopa-Community-Colleges.xml
@@ -10,7 +10,14 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
 	
 
 
@@ -23,7 +30,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Marie_Claire.co.uk.xml b/src/chrome/content/rules/Marie_Claire.co.uk.xml
index b4b3979eeeb1..9f4f6d1648b0 100644
--- a/src/chrome/content/rules/Marie_Claire.co.uk.xml
+++ b/src/chrome/content/rules/Marie_Claire.co.uk.xml
@@ -34,4 +34,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Marijuana_Majority.xml b/src/chrome/content/rules/Marijuana_Majority.xml
deleted file mode 100644
index 40fe2a1fafa4..000000000000
--- a/src/chrome/content/rules/Marijuana_Majority.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Marin_Software.xml b/src/chrome/content/rules/Marin_Software.xml
index 7e7c6e148e01..c91cc848f969 100644
--- a/src/chrome/content/rules/Marin_Software.xml
+++ b/src/chrome/content/rules/Marin_Software.xml
@@ -26,7 +26,7 @@ Fetch error: http://rt.marinsoftware.com/ => https://rt.marinsoftware.com/: (51,
 		- www.marinsoftware.de		(works, mismatched, CN: *.marinsoftware.com)
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Marine_Depot.com.xml b/src/chrome/content/rules/Marine_Depot.com.xml
index 77d0b4f681c7..70d777292f35 100644
--- a/src/chrome/content/rules/Marine_Depot.com.xml
+++ b/src/chrome/content/rules/Marine_Depot.com.xml
@@ -16,7 +16,8 @@
 
 
 	
-	
+	
+	
 		
@@ -25,7 +26,7 @@
 			Exceptions:
 					-->
 		
-	
+
 
 	
diff --git a/src/chrome/content/rules/MarinellaRose.com.xml b/src/chrome/content/rules/MarinellaRose.com.xml
index 5368072fe7f7..20d6369f27a9 100644
--- a/src/chrome/content/rules/MarinellaRose.com.xml
+++ b/src/chrome/content/rules/MarinellaRose.com.xml
@@ -8,18 +8,17 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://bellareed.com/ => https://bellareed.com/: (7, 'Failed to connect to bellareed.com port 443: Connection refused')
 Fetch error: http://marinellarose.com/ => https://marinellarose.com/: (28, 'Operation timed out after 15001 milliseconds with 0 bytes received')
 -->
-
+
 
 	
-	
+	
 	
-	
+	
 
 
 	
 
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/MarioWiki.com.xml b/src/chrome/content/rules/MarioWiki.com.xml
deleted file mode 100644
index ceaaa04656e9..000000000000
--- a/src/chrome/content/rules/MarioWiki.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Marion_Star.xml b/src/chrome/content/rules/Marion_Star.xml
index 3a515a6bfb34..068000965113 100644
--- a/src/chrome/content/rules/Marion_Star.xml
+++ b/src/chrome/content/rules/Marion_Star.xml
@@ -11,7 +11,8 @@
 
 
 	
-	
+	
+	
 
 
 	
 
 	
-	
+	
+	
 
 
 	
@@ -23,7 +24,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/MarkMail.xml b/src/chrome/content/rules/MarkMail.xml
index 4cb3fdbb8dd2..9526ee1f77fa 100644
--- a/src/chrome/content/rules/MarkMail.xml
+++ b/src/chrome/content/rules/MarkMail.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MarkRuler.xml b/src/chrome/content/rules/MarkRuler.xml
index bbede6e47b43..15cdc31997dc 100644
--- a/src/chrome/content/rules/MarkRuler.xml
+++ b/src/chrome/content/rules/MarkRuler.xml
@@ -4,7 +4,7 @@
 	
 
 
-	
+	
 
 
 	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Mark_NG.co.uk.xml b/src/chrome/content/rules/Mark_NG.co.uk.xml
index b624947aba5a..88d74ad3b257 100644
--- a/src/chrome/content/rules/Mark_NG.co.uk.xml
+++ b/src/chrome/content/rules/Mark_NG.co.uk.xml
@@ -5,7 +5,7 @@ Fetch error: http://markng.co.uk/ => https://markng.co.uk/: (35, 'error:140770FC
 Fetch error: http://www.markng.co.uk/ => https://www.markng.co.uk/: (35, 'error:140770FC:SSL routines:SSL23_GET_SERVER_HELLO:unknown protocol')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Markee_Dragon.xml b/src/chrome/content/rules/Markee_Dragon.xml
index a2ef97a0851e..96618859f189 100644
--- a/src/chrome/content/rules/Markee_Dragon.xml
+++ b/src/chrome/content/rules/Markee_Dragon.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://markeedragon.com/ => https://markeedragon.com/: (51, "SSL: no alternative certificate subject name matches target host name 'markeedragon.com'")
 Fetch error: http://www.markeedragon.com/ => https://www.markeedragon.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.markeedragon.com'")
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.markeedragon.com/ => https://www.markeedragon.com/: (51,
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Market_Dojo.xml b/src/chrome/content/rules/Market_Dojo.xml
index e8b923bfe31b..db7e05f179ba 100644
--- a/src/chrome/content/rules/Market_Dojo.xml
+++ b/src/chrome/content/rules/Market_Dojo.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://community.marketdojo.com/ => https://community.marketdojo.com/: (51, "SSL: no alternative certificate subject name matches target host name 'community.marketdojo.com'")
 
 -->
-
+
 
 	
 	
@@ -12,9 +12,9 @@ Fetch error: http://community.marketdojo.com/ => https://community.marketdojo.co
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Marketing_G2.xml b/src/chrome/content/rules/Marketing_G2.xml
index a8f899bf4921..d2fd4c270d89 100644
--- a/src/chrome/content/rules/Marketing_G2.xml
+++ b/src/chrome/content/rules/Marketing_G2.xml
@@ -13,4 +13,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Marketing_Matters.xml b/src/chrome/content/rules/Marketing_Matters.xml
index 3c17acb4d807..7308486375f7 100644
--- a/src/chrome/content/rules/Marketing_Matters.xml
+++ b/src/chrome/content/rules/Marketing_Matters.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Marketing_Research.org.xml b/src/chrome/content/rules/Marketing_Research.org.xml
index 1366b9da2560..18e37d3e35cd 100644
--- a/src/chrome/content/rules/Marketing_Research.org.xml
+++ b/src/chrome/content/rules/Marketing_Research.org.xml
@@ -21,7 +21,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Marketplace.org.xml b/src/chrome/content/rules/Marketplace.org.xml
deleted file mode 100644
index 7a0268d1d150..000000000000
--- a/src/chrome/content/rules/Marketplace.org.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-	
-	
-	
-		
-	
-		
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Marketplace_Used.xml b/src/chrome/content/rules/Marketplace_Used.xml
deleted file mode 100644
index ec2a0a9f99b6..000000000000
--- a/src/chrome/content/rules/Marketplace_Used.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Marketstudio.net.xml b/src/chrome/content/rules/Marketstudio.net.xml
deleted file mode 100644
index 697040a9f667..000000000000
--- a/src/chrome/content/rules/Marketstudio.net.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Marketwatch.com.xml b/src/chrome/content/rules/Marketwatch.com.xml
index a7010dc3201e..a8e02c9f0c79 100644
--- a/src/chrome/content/rules/Marketwatch.com.xml
+++ b/src/chrome/content/rules/Marketwatch.com.xml
@@ -1,39 +1,41 @@
 
+
 
 	
 	
 	
 	
 	
-	
 	
 	
 	
@@ -42,8 +44,7 @@
 	
 
 	
+		to="https://www.marketwatch.com/" />
 
-	
+	
 
diff --git a/src/chrome/content/rules/Marketwire.com.xml b/src/chrome/content/rules/Marketwire.com.xml
deleted file mode 100644
index 7cb5d7dcc1f8..000000000000
--- a/src/chrome/content/rules/Marketwire.com.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Markit.xml b/src/chrome/content/rules/Markit.xml
index b7a70d7eafa6..bdbe4338ad4c 100644
--- a/src/chrome/content/rules/Markit.xml
+++ b/src/chrome/content/rules/Markit.xml
@@ -1,7 +1,6 @@
 
-
-
-	
-	
-	
-	
-
-
-	
-	
-
-
-	
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Marktplaats.com.xml b/src/chrome/content/rules/Marktplaats.com.xml
new file mode 100644
index 000000000000..9f36b0cae498
--- /dev/null
+++ b/src/chrome/content/rules/Marktplaats.com.xml
@@ -0,0 +1,35 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Marktplaats.nl.xml b/src/chrome/content/rules/Marktplaats.nl.xml
new file mode 100644
index 000000000000..b959988e1a07
--- /dev/null
+++ b/src/chrome/content/rules/Marktplaats.nl.xml
@@ -0,0 +1,139 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Marktplaats.xml b/src/chrome/content/rules/Marktplaats.xml
deleted file mode 100644
index 91b1e241f031..000000000000
--- a/src/chrome/content/rules/Marktplaats.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-	
-	
-		
-	
-	
-	
-	
-	
-	
-
-	
-	
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Marktplaatsperskamer.nl.xml b/src/chrome/content/rules/Marktplaatsperskamer.nl.xml
new file mode 100644
index 000000000000..aee48cb2dddf
--- /dev/null
+++ b/src/chrome/content/rules/Marktplaatsperskamer.nl.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Marsupi.org.xml b/src/chrome/content/rules/Marsupi.org.xml
index 5288edf0dbde..a834a2dfab6c 100644
--- a/src/chrome/content/rules/Marsupi.org.xml
+++ b/src/chrome/content/rules/Marsupi.org.xml
@@ -26,7 +26,7 @@
 
 
 	
-	
+	
 
 
 	
-	
 	
+	
+
 
 
 	
 
 
 	
-	
+	
 
 	
-	
+
 
 	
-	
+
 
 
diff --git a/src/chrome/content/rules/Martha-Stewart.xml b/src/chrome/content/rules/Martha-Stewart.xml
index 82fea4ec88d7..3e5f931a71ea 100644
--- a/src/chrome/content/rules/Martha-Stewart.xml
+++ b/src/chrome/content/rules/Martha-Stewart.xml
@@ -17,10 +17,16 @@
 
 
 	
-	
+	
+	
+	
+	
 	
-	
-	
+	
+	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Martus.xml b/src/chrome/content/rules/Martus.xml
index 1c6aef84b27c..27f560f78ea3 100644
--- a/src/chrome/content/rules/Martus.xml
+++ b/src/chrome/content/rules/Martus.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Marvel_Heroes.com.xml b/src/chrome/content/rules/Marvel_Heroes.com.xml
deleted file mode 100644
index 604a8d81fff8..000000000000
--- a/src/chrome/content/rules/Marvel_Heroes.com.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-	
-	
-		
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Marvel_Store.xml b/src/chrome/content/rules/Marvel_Store.xml
index f3c262e71a88..fa043d1d8a4e 100644
--- a/src/chrome/content/rules/Marvel_Store.xml
+++ b/src/chrome/content/rules/Marvel_Store.xml
@@ -27,7 +27,7 @@ Fetch error: http://cdn.static1.marvelstore.com/ => https://cdn.static1.marvelst
 		- www	(some pages redirect to http)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Marvell.xml b/src/chrome/content/rules/Marvell.xml
index 10a4a1f92dbe..cae1d49bab89 100644
--- a/src/chrome/content/rules/Marvell.xml
+++ b/src/chrome/content/rules/Marvell.xml
@@ -1,7 +1,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
@@ -11,7 +13,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Marxists.xml b/src/chrome/content/rules/Marxists.xml
deleted file mode 100644
index 0373541b1918..000000000000
--- a/src/chrome/content/rules/Marxists.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Maryland_Shooters.xml b/src/chrome/content/rules/Maryland_Shooters.xml
index a46cb1e98745..663d091e1190 100644
--- a/src/chrome/content/rules/Maryland_Shooters.xml
+++ b/src/chrome/content/rules/Maryland_Shooters.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Mashable.com.xml b/src/chrome/content/rules/Mashable.com.xml
new file mode 100644
index 000000000000..ffeab53ef08f
--- /dev/null
+++ b/src/chrome/content/rules/Mashable.com.xml
@@ -0,0 +1,28 @@
+
+
+
+	
+	
+	
+		
+	
+	
+		
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Mashape.com.xml b/src/chrome/content/rules/Mashape.com.xml
index 712f6beb7898..456776cc26dc 100644
--- a/src/chrome/content/rules/Mashape.com.xml
+++ b/src/chrome/content/rules/Mashape.com.xml
@@ -5,7 +5,6 @@ Fetch error: http://api.analytics.mashape.com/ => https://api.analytics.mashape.
 
 	Other Mashape rulesets:
 
-		- API_Analytics.com.xml
 
 
 	CDN buckets:
@@ -26,7 +25,7 @@ Fetch error: http://api.analytics.mashape.com/ => https://api.analytics.mashape.
 		- www.mashape.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Mashery.com.xml b/src/chrome/content/rules/Mashery.com.xml
new file mode 100644
index 000000000000..163d387adfb5
--- /dev/null
+++ b/src/chrome/content/rules/Mashery.com.xml
@@ -0,0 +1,33 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Mashery.xml b/src/chrome/content/rules/Mashery.xml
deleted file mode 100644
index 35f44a598e33..000000000000
--- a/src/chrome/content/rules/Mashery.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-
-		
-		
-
-			
-			
-			
-			
-
-			
-			
-			
-			
-			
-
-
-	
-	
-
-	
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/MassLive.com.xml b/src/chrome/content/rules/MassLive.com.xml
index 698dc4750d5b..6f66784d86da 100644
--- a/src/chrome/content/rules/MassLive.com.xml
+++ b/src/chrome/content/rules/MassLive.com.xml
@@ -58,7 +58,7 @@ Fetch error: http://marketingsolutions.masslive.com/ => https://marketingsolutio
 	* Secured by us
 
 -->
-
+
 
 	
 		
diff --git a/src/chrome/content/rules/Mass_Relevance.xml b/src/chrome/content/rules/Mass_Relevance.xml
index 35a8681bb5ed..460b4af4897a 100644
--- a/src/chrome/content/rules/Mass_Relevance.xml
+++ b/src/chrome/content/rules/Mass_Relevance.xml
@@ -23,21 +23,19 @@
 
 
 	
-	
+	
+	
+	
 	
-	
+	
+	
 
 
-	
 
-	
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/MassageMagazine.xml b/src/chrome/content/rules/MassageMagazine.xml
index 80d6ec48d97d..bca63eca3949 100644
--- a/src/chrome/content/rules/MassageMagazine.xml
+++ b/src/chrome/content/rules/MassageMagazine.xml
@@ -1,7 +1,7 @@
 
         
         
-        
+        
 
         
 
diff --git a/src/chrome/content/rules/Massengeschmack.tv.xml b/src/chrome/content/rules/Massengeschmack.tv.xml
index 3274eff000dd..a30c7b81cc07 100644
--- a/src/chrome/content/rules/Massengeschmack.tv.xml
+++ b/src/chrome/content/rules/Massengeschmack.tv.xml
@@ -17,7 +17,7 @@
 	
 	
 
-	    
+	
 
 	
 	
diff --git a/src/chrome/content/rules/MasterCard.xml b/src/chrome/content/rules/MasterCard.xml
index fa41a338648f..1aabc344d784 100644
--- a/src/chrome/content/rules/MasterCard.xml
+++ b/src/chrome/content/rules/MasterCard.xml
@@ -32,7 +32,7 @@ Fetch error: http://smetrics.mastercardintl.com/ => https://smetrics.mastercardi
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/MasterChan.org.xml b/src/chrome/content/rules/MasterChan.org.xml
index b5ef4fbc5a96..e677f308c68d 100644
--- a/src/chrome/content/rules/MasterChan.org.xml
+++ b/src/chrome/content/rules/MasterChan.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.masterchan.org/ => https://www.masterchan.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.masterchan.org'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/MasterNet.xml b/src/chrome/content/rules/MasterNet.xml
index cf2c21283d63..30e486358359 100644
--- a/src/chrome/content/rules/MasterNet.xml
+++ b/src/chrome/content/rules/MasterNet.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MasterXchange.com.xml b/src/chrome/content/rules/MasterXchange.com.xml
index 4afe7f7b2e5d..2e55054aa478 100644
--- a/src/chrome/content/rules/MasterXchange.com.xml
+++ b/src/chrome/content/rules/MasterXchange.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://masterxchange.com/ => https://masterxchange.com/: (60, 'SSL
 Fetch error: http://www.masterxchange.com/ => https://www.masterxchange.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Mastermind.xml b/src/chrome/content/rules/Mastermind.xml
index db643733181c..6f0d364f0d65 100644
--- a/src/chrome/content/rules/Mastermind.xml
+++ b/src/chrome/content/rules/Mastermind.xml
@@ -19,7 +19,7 @@ Fetch error: http://secure2.mastermindpro.com/ => https://secure2.mastermindpro.
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Masterminds_Digital.com.xml b/src/chrome/content/rules/Masterminds_Digital.com.xml
index 86886751140e..15aaf0c905cd 100644
--- a/src/chrome/content/rules/Masterminds_Digital.com.xml
+++ b/src/chrome/content/rules/Masterminds_Digital.com.xml
@@ -40,7 +40,7 @@ Fetch error: http://support.mastermindsdigital.com/ => https://support.mastermin
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Mastodon.cloud.xml b/src/chrome/content/rules/Mastodon.cloud.xml
new file mode 100644
index 000000000000..745716eca2ef
--- /dev/null
+++ b/src/chrome/content/rules/Mastodon.cloud.xml
@@ -0,0 +1,23 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Masty.nl.xml b/src/chrome/content/rules/Masty.nl.xml
deleted file mode 100644
index 9a4a3a3f7f05..000000000000
--- a/src/chrome/content/rules/Masty.nl.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Matatall.com.xml b/src/chrome/content/rules/Matatall.com.xml
deleted file mode 100644
index 4ba853af9c7d..000000000000
--- a/src/chrome/content/rules/Matatall.com.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Matcc.company.xml b/src/chrome/content/rules/Matcc.company.xml
new file mode 100644
index 000000000000..3142d7b61027
--- /dev/null
+++ b/src/chrome/content/rules/Matcc.company.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Match-Trade.xml b/src/chrome/content/rules/Match-Trade.xml
new file mode 100644
index 000000000000..7fd49271aab8
--- /dev/null
+++ b/src/chrome/content/rules/Match-Trade.xml
@@ -0,0 +1,37 @@
+
+
+
+	
+	
+	
+	
+
+
+	
+	
+
+
+	
+	
+	
+
+
+	
+	
+	
+
+	
+
+
+	
+
diff --git a/src/chrome/content/rules/MatchEnDirect.fr.xml b/src/chrome/content/rules/MatchEnDirect.fr.xml
new file mode 100644
index 000000000000..6a88154bfcef
--- /dev/null
+++ b/src/chrome/content/rules/MatchEnDirect.fr.xml
@@ -0,0 +1,14 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/MathematiquesFaciles.com.xml b/src/chrome/content/rules/MathematiquesFaciles.com.xml
new file mode 100644
index 000000000000..12b41e18cd1d
--- /dev/null
+++ b/src/chrome/content/rules/MathematiquesFaciles.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Matkahuolto.xml b/src/chrome/content/rules/Matkahuolto.xml
deleted file mode 100644
index 7d850108d9db..000000000000
--- a/src/chrome/content/rules/Matkahuolto.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-	
-
diff --git a/src/chrome/content/rules/Matomy-Media.xml b/src/chrome/content/rules/Matomy-Media.xml
index 4d493b5f5b76..cf8706b9618a 100644
--- a/src/chrome/content/rules/Matomy-Media.xml
+++ b/src/chrome/content/rules/Matomy-Media.xml
@@ -1,15 +1,3 @@
-
 
 
 	
diff --git a/src/chrome/content/rules/Matomy_Market.xml b/src/chrome/content/rules/Matomy_Market.xml
index 9458b78e4aa7..90c0dbb78f5e 100644
--- a/src/chrome/content/rules/Matomy_Market.xml
+++ b/src/chrome/content/rules/Matomy_Market.xml
@@ -1,21 +1,12 @@
-
 
 
-	
+	
+	
 
 
-	
+	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Matrix.org.xml b/src/chrome/content/rules/Matrix.org.xml
deleted file mode 100644
index 04b885e5134c..000000000000
--- a/src/chrome/content/rules/Matrix.org.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Matrix_Group.xml b/src/chrome/content/rules/Matrix_Group.xml
index eb066dd36def..a711a27db4e7 100644
--- a/src/chrome/content/rules/Matrix_Group.xml
+++ b/src/chrome/content/rules/Matrix_Group.xml
@@ -26,4 +26,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Matrox.xml b/src/chrome/content/rules/Matrox.xml
index ea9b6c7d2beb..94bcb7165757 100644
--- a/src/chrome/content/rules/Matrox.xml
+++ b/src/chrome/content/rules/Matrox.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Matt_Drollette.xml b/src/chrome/content/rules/Matt_Drollette.xml
deleted file mode 100644
index c22d205a8d4e..000000000000
--- a/src/chrome/content/rules/Matt_Drollette.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/MauivaAirCruise.com.xml b/src/chrome/content/rules/MauivaAirCruise.com.xml
index f7ecd4fa0180..2f721bda9b62 100644
--- a/src/chrome/content/rules/MauivaAirCruise.com.xml
+++ b/src/chrome/content/rules/MauivaAirCruise.com.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Maurus.net.xml b/src/chrome/content/rules/Maurus.net.xml
deleted file mode 100644
index 0c7b6dafe5c7..000000000000
--- a/src/chrome/content/rules/Maurus.net.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Maven.co.xml b/src/chrome/content/rules/Maven.co.xml
index 0e1d54b9059c..8a3e786967e2 100644
--- a/src/chrome/content/rules/Maven.co.xml
+++ b/src/chrome/content/rules/Maven.co.xml
@@ -17,7 +17,7 @@ Fetch error: http://help.maven.co/ => https://help.maven.co/: Too many redirects
 		- .maven.co
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Mawdoo3.com.xml b/src/chrome/content/rules/Mawdoo3.com.xml
new file mode 100644
index 000000000000..979baf937817
--- /dev/null
+++ b/src/chrome/content/rules/Mawdoo3.com.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Max-Planck-Institute-for-Software-Systems.xml b/src/chrome/content/rules/Max-Planck-Institute-for-Software-Systems.xml
index 0f744a58f17b..87a4ef1453be 100644
--- a/src/chrome/content/rules/Max-Planck-Institute-for-Software-Systems.xml
+++ b/src/chrome/content/rules/Max-Planck-Institute-for-Software-Systems.xml
@@ -10,14 +10,37 @@
 	
 	
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/MaxMaillots.org.xml b/src/chrome/content/rules/MaxMaillots.org.xml
new file mode 100644
index 000000000000..a03b06e1f2da
--- /dev/null
+++ b/src/chrome/content/rules/MaxMaillots.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/MaxSpeed_CDN.com.xml b/src/chrome/content/rules/MaxSpeed_CDN.com.xml
index f63cfd2cf137..60e99e5ec92c 100644
--- a/src/chrome/content/rules/MaxSpeed_CDN.com.xml
+++ b/src/chrome/content/rules/MaxSpeed_CDN.com.xml
@@ -27,4 +27,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Max_Kitap.com.xml b/src/chrome/content/rules/Max_Kitap.com.xml
index 5dd863377e4a..0ccfafd09114 100644
--- a/src/chrome/content/rules/Max_Kitap.com.xml
+++ b/src/chrome/content/rules/Max_Kitap.com.xml
@@ -11,7 +11,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://maxkitap.com/ => https://maxkitap.com/: (60, 'SSL certificate problem: self signed certificate')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Maxdome.de.xml b/src/chrome/content/rules/Maxdome.de.xml
index 63ba1990b9c0..6b49b0edb2e7 100644
--- a/src/chrome/content/rules/Maxdome.de.xml
+++ b/src/chrome/content/rules/Maxdome.de.xml
@@ -8,7 +8,7 @@
 	Mixed content:
 		- blog.maxdome.de
 		- community.maxdome.de
-	
+
 	Redirect to HTTP:
 		- faq.maxdome.de
 		- sony.maxdome.de
diff --git a/src/chrome/content/rules/Maxim-IC.com.xml b/src/chrome/content/rules/Maxim-IC.com.xml
index 43a4d4681b1a..0a6e171facac 100644
--- a/src/chrome/content/rules/Maxim-IC.com.xml
+++ b/src/chrome/content/rules/Maxim-IC.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://maxim-ic.com/ => https://www.maxim-ic.com/: (60, 'SSL certif
 	^maxim-ic.com: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Maxim_Integrated.com.xml b/src/chrome/content/rules/Maxim_Integrated.com.xml
index 456d6ea70b03..5a0007d7b5e3 100644
--- a/src/chrome/content/rules/Maxim_Integrated.com.xml
+++ b/src/chrome/content/rules/Maxim_Integrated.com.xml
@@ -26,7 +26,7 @@ Fetch error: http://search.maximintegrated.com/ => https://search.maximintegrate
 		- shop.maximintegrated.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Maxmind.xml b/src/chrome/content/rules/Maxmind.xml
deleted file mode 100644
index 070fa2d058a5..000000000000
--- a/src/chrome/content/rules/Maxmind.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Maxon.net.xml b/src/chrome/content/rules/Maxon.net.xml
index 2abd52256c87..cffdd3fb024f 100644
--- a/src/chrome/content/rules/Maxon.net.xml
+++ b/src/chrome/content/rules/Maxon.net.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://nimius.maxon.net/ => https://nimius.maxon.net/: (35, 'error:140770FC:SSL routines:SSL23_GET_SERVER_HELLO:unknown protocol')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Maxymiser.xml b/src/chrome/content/rules/Maxymiser.xml
index 6c09b4e58262..9cf85235b570 100644
--- a/src/chrome/content/rules/Maxymiser.xml
+++ b/src/chrome/content/rules/Maxymiser.xml
@@ -8,18 +8,18 @@ Fetch error: http://maxymiser.com/ => https://maxymiser.com/: Too many redirects
 		- maxymiser.hs.llnwd.net/o36/
 
 -->
-
+
 
 	
-	
+	
+	
+	
 	
 
 
 	
 
 
-	
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/MayFirstPeopleLink.xml b/src/chrome/content/rules/MayFirstPeopleLink.xml
index 74a085e5ecd0..ec4685542300 100644
--- a/src/chrome/content/rules/MayFirstPeopleLink.xml
+++ b/src/chrome/content/rules/MayFirstPeopleLink.xml
@@ -34,7 +34,7 @@
 					-->
 	
 
-	
+	
 
 	
 	 https://www.notesappstore.com/: (28, 'Connection timed out after 10000 milliseconds')
 Fetch error: http://www.notesappstore.com/ => https://www.notesappstore.com/: (28, 'Connection timed out after 10001 milliseconds')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Maybank-IB.com.xml b/src/chrome/content/rules/Maybank-IB.com.xml
new file mode 100644
index 000000000000..bbb76182a5b1
--- /dev/null
+++ b/src/chrome/content/rules/Maybank-IB.com.xml
@@ -0,0 +1,34 @@
+
+
+
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Maybank-KE.co.th.xml b/src/chrome/content/rules/Maybank-KE.co.th.xml
new file mode 100644
index 000000000000..c1c67ffac2e2
--- /dev/null
+++ b/src/chrome/content/rules/Maybank-KE.co.th.xml
@@ -0,0 +1,35 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Maybank-KE.com.xml b/src/chrome/content/rules/Maybank-KE.com.xml
new file mode 100644
index 000000000000..a52d726dd288
--- /dev/null
+++ b/src/chrome/content/rules/Maybank-KE.com.xml
@@ -0,0 +1,40 @@
+
+
+
+	
+	
+	
+	
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Maybank.co.id.xml b/src/chrome/content/rules/Maybank.co.id.xml
new file mode 100644
index 000000000000..dfa2ef171e06
--- /dev/null
+++ b/src/chrome/content/rules/Maybank.co.id.xml
@@ -0,0 +1,50 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Maybank.com.sg.xml b/src/chrome/content/rules/Maybank.com.sg.xml
new file mode 100644
index 000000000000..a1aeff4b4d74
--- /dev/null
+++ b/src/chrome/content/rules/Maybank.com.sg.xml
@@ -0,0 +1,39 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Maybank2e.com.xml b/src/chrome/content/rules/Maybank2e.com.xml
new file mode 100644
index 000000000000..f3f29d70cfd1
--- /dev/null
+++ b/src/chrome/content/rules/Maybank2e.com.xml
@@ -0,0 +1,12 @@
+
+
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Maybank2u.com.ph.xml b/src/chrome/content/rules/Maybank2u.com.ph.xml
new file mode 100644
index 000000000000..b1a1afc95db3
--- /dev/null
+++ b/src/chrome/content/rules/Maybank2u.com.ph.xml
@@ -0,0 +1,22 @@
+
+
+
+	
+	
+
+	
+
+	
+	
+
+	
+
+		
+		
+		
+
+
diff --git a/src/chrome/content/rules/Mayday.us.xml b/src/chrome/content/rules/Mayday.us.xml
index a506e0217e2f..fb5243666154 100644
--- a/src/chrome/content/rules/Mayday.us.xml
+++ b/src/chrome/content/rules/Mayday.us.xml
@@ -30,7 +30,7 @@ Fetch error: http://auth.mayday.us/ => https://auth.mayday.us/: (60, 'SSL certif
 		- .mayday.us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Mayo-Clinic.xml b/src/chrome/content/rules/Mayo-Clinic.xml
index a9d411620916..83ceab54bf64 100644
--- a/src/chrome/content/rules/Mayo-Clinic.xml
+++ b/src/chrome/content/rules/Mayo-Clinic.xml
@@ -1,38 +1,14 @@
-
-
-
-
+
 	
-	
-	
-	
-
-
-	
+	
+	
+	
+	
 
+	
+	
 
-	
-
-	
-
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/MazaCoin.org.xml b/src/chrome/content/rules/MazaCoin.org.xml
index e71710153391..4fd5a244e339 100644
--- a/src/chrome/content/rules/MazaCoin.org.xml
+++ b/src/chrome/content/rules/MazaCoin.org.xml
@@ -15,7 +15,7 @@ Fetch error: http://www.mazacoin.org/ => https://www.mazacoin.org/: (7, 'Failed
 		- www.mazacoin.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Mazacha.in.xml b/src/chrome/content/rules/Mazacha.in.xml
index b7488f8a9080..dc51d314f0e4 100644
--- a/src/chrome/content/rules/Mazacha.in.xml
+++ b/src/chrome/content/rules/Mazacha.in.xml
@@ -8,7 +8,7 @@ Fetch error: http://mazacha.in/ => https://mazacha.in/: (28, 'Connection timed o
 		- www.mazacha.in
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Mbed.org.xml b/src/chrome/content/rules/Mbed.org.xml
index 950df70b8419..80cc003c1b9c 100644
--- a/src/chrome/content/rules/Mbed.org.xml
+++ b/src/chrome/content/rules/Mbed.org.xml
@@ -46,7 +46,7 @@
 					-->
 	
-	
+
 		
 
 	
 
 	
-	
+	
+	
 	
 
 	
@@ -35,9 +36,6 @@
 		
 		
 
-	
-	
-
 	
 
diff --git a/src/chrome/content/rules/McAfee-Mobile-Security.xml b/src/chrome/content/rules/McAfee-Mobile-Security.xml
index 8911d9779677..af6139051d47 100644
--- a/src/chrome/content/rules/McAfee-Mobile-Security.xml
+++ b/src/chrome/content/rules/McAfee-Mobile-Security.xml
@@ -18,4 +18,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/McAfee-SECURE.xml b/src/chrome/content/rules/McAfee-SECURE.xml
index 09cb6caa3d0a..7188f2a8b850 100644
--- a/src/chrome/content/rules/McAfee-SECURE.xml
+++ b/src/chrome/content/rules/McAfee-SECURE.xml
@@ -13,7 +13,7 @@ Fetch error: http://www2.mcafeesecure.com/ => https://www2.mcafeesecure.com/: (6
 		Incomplete certificate chain
 			- blog.mcafeesecure.com
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/McAfee.xml b/src/chrome/content/rules/McAfee.xml
index f14e93384725..68e81656b3e2 100644
--- a/src/chrome/content/rules/McAfee.xml
+++ b/src/chrome/content/rules/McAfee.xml
@@ -44,7 +44,7 @@
 
 	Null response:
 		- ngfwlicenses
-	
+
 	403:
 		- app
 		- service-home
@@ -115,9 +115,9 @@
 
 	
-	
+
 	
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/McClatchy.com.xml b/src/chrome/content/rules/McClatchy.com.xml
index 606812e49fb9..72b54c3027b1 100644
--- a/src/chrome/content/rules/McClatchy.com.xml
+++ b/src/chrome/content/rules/McClatchy.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://subscriberservices.mcclatchy.com/ => https://subscriberservi
 		- (www.)	(works; mismatched, CN: media.mcclatchyinteractive.com)
 
 -->
-
+
 
 	
 
@@ -25,4 +25,4 @@ Fetch error: http://subscriberservices.mcclatchy.com/ => https://subscriberservi
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/McClatchy_Interactive.com.xml b/src/chrome/content/rules/McClatchy_Interactive.com.xml
deleted file mode 100644
index 7827d95b5d02..000000000000
--- a/src/chrome/content/rules/McClatchy_Interactive.com.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/McDelivery-Malaysia.xml b/src/chrome/content/rules/McDelivery-Malaysia.xml
index b16315c62173..151383f3cc53 100644
--- a/src/chrome/content/rules/McDelivery-Malaysia.xml
+++ b/src/chrome/content/rules/McDelivery-Malaysia.xml
@@ -6,7 +6,7 @@ Fetch error: http://mcdelivery.com.my/ => https://mcdelivery.com.my/: (35, 'Unkn
 	CDN bucket:
 		- d8x8n3ezc8rio.cloudfront.net
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/McEvoy-Group.xml b/src/chrome/content/rules/McEvoy-Group.xml
index e6a282bfe5bd..73930393911d 100644
--- a/src/chrome/content/rules/McEvoy-Group.xml
+++ b/src/chrome/content/rules/McEvoy-Group.xml
@@ -3,7 +3,7 @@
 	
 	
 
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/McMaster_University.xml b/src/chrome/content/rules/McMaster_University.xml
index 0bf2be6453c7..a398f4e92bb9 100644
--- a/src/chrome/content/rules/McMaster_University.xml
+++ b/src/chrome/content/rules/McMaster_University.xml
@@ -5,7 +5,7 @@ Fetch error: http://mcmaster.ca/ => https://mcmaster.ca/: (60, 'SSL certificate
 Fetch error: http://www.mcmaster.ca/ => https://www.mcmaster.ca/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Mcdee.com.au.xml b/src/chrome/content/rules/Mcdee.com.au.xml
index df0b38c6e5ef..957193717d8c 100644
--- a/src/chrome/content/rules/Mcdee.com.au.xml
+++ b/src/chrome/content/rules/Mcdee.com.au.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.mcdee.com.au/ => https://www.mcdee.com.au/: (7, 'Failed
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Mdm.ru.xml b/src/chrome/content/rules/Mdm.ru.xml
index 6394b6f264b6..95c13505adbb 100644
--- a/src/chrome/content/rules/Mdm.ru.xml
+++ b/src/chrome/content/rules/Mdm.ru.xml
@@ -9,7 +9,7 @@ business. timed out
 coins. timed out
 tehnosila. redirect
 distrib. expired-->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Me.bf.xml b/src/chrome/content/rules/Me.bf.xml
new file mode 100644
index 000000000000..0a0711d182b2
--- /dev/null
+++ b/src/chrome/content/rules/Me.bf.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Me.me.xml b/src/chrome/content/rules/Me.me.xml
new file mode 100644
index 000000000000..4b6f050b5bf2
--- /dev/null
+++ b/src/chrome/content/rules/Me.me.xml
@@ -0,0 +1,12 @@
+
+	
+	
+	
+	
+		
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/MeWe.com.xml b/src/chrome/content/rules/MeWe.com.xml
new file mode 100644
index 000000000000..1ac21c487e54
--- /dev/null
+++ b/src/chrome/content/rules/MeWe.com.xml
@@ -0,0 +1,27 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/MeXBT.com.xml b/src/chrome/content/rules/MeXBT.com.xml
index 40ffbc795cec..b87460347289 100644
--- a/src/chrome/content/rules/MeXBT.com.xml
+++ b/src/chrome/content/rules/MeXBT.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.mexbt.com/ => https://www.mexbt.com/: (28, 'Operation ti
 		- .mexbt.com
 
 -->
-
+
 
 	
@@ -21,7 +21,7 @@ Fetch error: http://www.mexbt.com/ => https://www.mexbt.com/: (28, 'Operation ti
 					-->
 	
 
-	
+	
 
 
 	 https://meanstinks.com/: (7, 'Failed to c
 		- 45192e03bdcc882f78f4-4b80efdc0c25f8535e19785674c1f42a.r22.cf1.rackcdn.com
 
 -->
-
+
 
 	
 	
@@ -22,4 +22,4 @@ Fetch error: http://meanstinks.com/ => https://meanstinks.com/: (7, 'Failed to c
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MeatandLivestockAustralia.xml b/src/chrome/content/rules/MeatandLivestockAustralia.xml
index af61a079ee52..cfabd6cee591 100644
--- a/src/chrome/content/rules/MeatandLivestockAustralia.xml
+++ b/src/chrome/content/rules/MeatandLivestockAustralia.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MedWatch.xml b/src/chrome/content/rules/MedWatch.xml
index c609b83e04b3..e8950e9e2e4c 100644
--- a/src/chrome/content/rules/MedWatch.xml
+++ b/src/chrome/content/rules/MedWatch.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.medwatch.dk/ => https://www.medwatch.dk/: (51, "SSL: no
     http://medwatch.dk/template/mwVer1-0/css/main.css?rev=35817
   is essential for the layout but is initially considered mixed content.
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Media-Storehouse.xml b/src/chrome/content/rules/Media-Storehouse.xml
index 6d995f74a9d3..ed99110b1fa2 100644
--- a/src/chrome/content/rules/Media-Storehouse.xml
+++ b/src/chrome/content/rules/Media-Storehouse.xml
@@ -1,34 +1,32 @@
 
 
-
+	
 	
-	
+	
+	
+	
+
+	
 	
 	
 
+	
 
-	
-
-
-	
-	
-
-	
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/Media-clic.com.xml b/src/chrome/content/rules/Media-clic.com.xml
deleted file mode 100644
index 5c77809f2b1e..000000000000
--- a/src/chrome/content/rules/Media-clic.com.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Media.net.xml b/src/chrome/content/rules/Media.net.xml
index 1d239948c729..e1a1cad34395 100644
--- a/src/chrome/content/rules/Media.net.xml
+++ b/src/chrome/content/rules/Media.net.xml
@@ -48,7 +48,10 @@
 -->
 
 
-	
+	
+	
+	
+	
 
 
 	
-
+
 
 	
diff --git a/src/chrome/content/rules/MediaFire.com.xml b/src/chrome/content/rules/MediaFire.com.xml
index 1b1cff6eded0..e9a7eae6dc8f 100644
--- a/src/chrome/content/rules/MediaFire.com.xml
+++ b/src/chrome/content/rules/MediaFire.com.xml
@@ -1,64 +1,26 @@
 
-
-
-	
-	
-		
-
-	
-		
-		
-		
-		
-		
-		
-
-	
-		
-		
-		
-		
-		
-		
-
-	
-		
-		
-		
-		
-		
-		
-
-	
+
 	
-
-	
-		
-		
-		
-		
-		
-
-	
-		
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
 	
 
diff --git a/src/chrome/content/rules/MediaGoblin.org.xml b/src/chrome/content/rules/MediaGoblin.org.xml
index 62cedbd7bf4a..53b9d2f4d901 100644
--- a/src/chrome/content/rules/MediaGoblin.org.xml
+++ b/src/chrome/content/rules/MediaGoblin.org.xml
@@ -25,4 +25,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MediaMath.xml b/src/chrome/content/rules/MediaMath.xml
index 31aa12672428..2955274a5ab7 100644
--- a/src/chrome/content/rules/MediaMath.xml
+++ b/src/chrome/content/rules/MediaMath.xml
@@ -41,7 +41,7 @@
 					-->
 	
 
-	
+	
 
 
 	
-
-
+
 	
-		
-		
-		
-		
-	
-	
 	
+	
+	
+	
 
+	
 
-	
-
-	
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/MediaMind.xml b/src/chrome/content/rules/MediaMind.xml
index 289835f8d673..533c504d9936 100644
--- a/src/chrome/content/rules/MediaMind.xml
+++ b/src/chrome/content/rules/MediaMind.xml
@@ -1,67 +1,22 @@
 
 
+	
+	
+	
 
-	
-	
-
-
-	
-
-
-	
-
-	
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/MediaNews-Group.xml b/src/chrome/content/rules/MediaNews-Group.xml
index c53251b1bf86..e4f8f804bdd1 100644
--- a/src/chrome/content/rules/MediaNews-Group.xml
+++ b/src/chrome/content/rules/MediaNews-Group.xml
@@ -9,7 +9,7 @@ Fetch error: http://weather.mercurynews.com/ => https://www.weatherunderground.c
 		- (origin.|www.)mercurynews.com	(www: Akamai, redirects back to http; !www: timeout)
 		- extras.mnginteractive.com	(Akamai, redirects to http://.../ with "Directory Listing Denied")
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/MediaPost.com.xml b/src/chrome/content/rules/MediaPost.com.xml
new file mode 100644
index 000000000000..9682181785bb
--- /dev/null
+++ b/src/chrome/content/rules/MediaPost.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/MediaPost.xml b/src/chrome/content/rules/MediaPost.xml
deleted file mode 100644
index 4316785beb99..000000000000
--- a/src/chrome/content/rules/MediaPost.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/MediaSpan.xml b/src/chrome/content/rules/MediaSpan.xml
deleted file mode 100644
index 231750d0ab87..000000000000
--- a/src/chrome/content/rules/MediaSpan.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/MediaTakeOut.com.xml b/src/chrome/content/rules/MediaTakeOut.com.xml
index ec1aac5d10bf..b0b8acc86494 100644
--- a/src/chrome/content/rules/MediaTakeOut.com.xml
+++ b/src/chrome/content/rules/MediaTakeOut.com.xml
@@ -19,7 +19,8 @@
 
 
 	
-	
+	
+	
 
 
 	 https://www.mediawatch.dk/: (51, "SSL:
   This renders poorly. The page requires two style sheets which are only
   served over http.
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/MediaWorks.xml b/src/chrome/content/rules/MediaWorks.xml
index c21638f88287..da162612e280 100644
--- a/src/chrome/content/rules/MediaWorks.xml
+++ b/src/chrome/content/rules/MediaWorks.xml
@@ -30,7 +30,7 @@
 
 	
-		
+
 	
 
diff --git a/src/chrome/content/rules/Media_Factory.xml b/src/chrome/content/rules/Media_Factory.xml
deleted file mode 100644
index 3d5fc24b0c97..000000000000
--- a/src/chrome/content/rules/Media_Factory.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Mediaarts-db.jp.xml b/src/chrome/content/rules/Mediaarts-db.jp.xml
deleted file mode 100644
index bbd914569fdb..000000000000
--- a/src/chrome/content/rules/Mediaarts-db.jp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Mediabistro.xml b/src/chrome/content/rules/Mediabistro.xml
index b045f3beda06..0018f605bf3a 100644
--- a/src/chrome/content/rules/Mediabistro.xml
+++ b/src/chrome/content/rules/Mediabistro.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://oxs.mediabistro.com/ => https://oxs.mediabistro.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 
 	
@@ -14,7 +14,7 @@ Fetch error: http://oxs.mediabistro.com/ => https://oxs.mediabistro.com/: (28, '
 	
 
 
-	
+	
 
 
 	 https://mediamir.medialand.ru/: (6
 	² 404; mismatched, CN: *.medialand.ru
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Mediamarkt.ru.xml b/src/chrome/content/rules/Mediamarkt.ru.xml
deleted file mode 100644
index e47b6a7270a3..000000000000
--- a/src/chrome/content/rules/Mediamarkt.ru.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Median.xml b/src/chrome/content/rules/Median.xml
index 88cba3c30292..90d8d42689cc 100644
--- a/src/chrome/content/rules/Median.xml
+++ b/src/chrome/content/rules/Median.xml
@@ -6,7 +6,7 @@ Fetch error: http://audit.median.hu/ => https://audit.median.hu/: (7, 'Failed to
 	(www.)?median.hu: Refused
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Mediant.xml b/src/chrome/content/rules/Mediant.xml
index 5c697d7da239..80e65d870b03 100644
--- a/src/chrome/content/rules/Mediant.xml
+++ b/src/chrome/content/rules/Mediant.xml
@@ -5,7 +5,7 @@ Fetch error: http://mandiant.net/ => https://mandiant.net/: (28, 'Operation time
 Fetch error: http://www.mandiant.net/ => https://www.mandiant.net/: (28, 'Operation timed out after 30002 milliseconds with 0 bytes received')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.mandiant.net/ => https://www.mandiant.net/: (28, 'Operat
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Mediaxus.com.xml b/src/chrome/content/rules/Mediaxus.com.xml
index d9a4ca5807b3..d6fbfecc6b1b 100644
--- a/src/chrome/content/rules/Mediaxus.com.xml
+++ b/src/chrome/content/rules/Mediaxus.com.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MedibankHealthSolutions.xml b/src/chrome/content/rules/MedibankHealthSolutions.xml
deleted file mode 100644
index 47be6c3e4b29..000000000000
--- a/src/chrome/content/rules/MedibankHealthSolutions.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-	
-
-	
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Medical_Jane.xml b/src/chrome/content/rules/Medical_Jane.xml
index 051a026b19e5..2dc35622b07d 100644
--- a/src/chrome/content/rules/Medical_Jane.xml
+++ b/src/chrome/content/rules/Medical_Jane.xml
@@ -6,7 +6,7 @@ Fetch error: http://medicaljane.com/ => https://medicaljane.com/: (7, 'Failed to
 Disabled by https-everywhere-checker because:
 Fetch error: http://medicaljane.com/ => https://medicaljane.com/: (51, "SSL: no alternative certificate subject name matches target host name 'medicaljane.com'")
 -->
-
+
 
 	
 	
@@ -17,4 +17,4 @@ Fetch error: http://medicaljane.com/ => https://medicaljane.com/: (51, "SSL: no
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Medical_Treatments_Management.xml b/src/chrome/content/rules/Medical_Treatments_Management.xml
index b18e96c7287e..bb38ef25f538 100644
--- a/src/chrome/content/rules/Medical_Treatments_Management.xml
+++ b/src/chrome/content/rules/Medical_Treatments_Management.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 	
 	
 	
@@ -18,7 +18,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Medici-manager.com.xml b/src/chrome/content/rules/Medici-manager.com.xml
index bc6adada0d26..944cf21dd4f1 100644
--- a/src/chrome/content/rules/Medici-manager.com.xml
+++ b/src/chrome/content/rules/Medici-manager.com.xml
@@ -17,7 +17,7 @@ Fetch error: http://www.medici-manager.com/ => https://www.medici-manager.com/:
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/MediciGlobal.com-falsemixed.xml b/src/chrome/content/rules/MediciGlobal.com-falsemixed.xml
deleted file mode 100644
index 95bd34dd8b6d..000000000000
--- a/src/chrome/content/rules/MediciGlobal.com-falsemixed.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/MediciGlobal.com.xml b/src/chrome/content/rules/MediciGlobal.com.xml
index 95855a3546fd..518704776c04 100644
--- a/src/chrome/content/rules/MediciGlobal.com.xml
+++ b/src/chrome/content/rules/MediciGlobal.com.xml
@@ -31,7 +31,7 @@ Fetch error: http://stats.mediciglobal.com/ => https://stats.mediciglobal.com/:
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Mediekompaniet.com.xml b/src/chrome/content/rules/Mediekompaniet.com.xml
index 466c41afde2c..1a34edbb94f4 100644
--- a/src/chrome/content/rules/Mediekompaniet.com.xml
+++ b/src/chrome/content/rules/Mediekompaniet.com.xml
@@ -8,11 +8,11 @@ Fetch error: http://nysk.mediekompaniet.com/ => https://nysk.mediekompaniet.com/
 		- (www.)	(refused)
 
 -->
-
+
 
 	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Medienstiftung-hsh.de.xml b/src/chrome/content/rules/Medienstiftung-hsh.de.xml
deleted file mode 100644
index fdf6047ebad2..000000000000
--- a/src/chrome/content/rules/Medienstiftung-hsh.de.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-    
-    
-
-    
-
-    
-
diff --git a/src/chrome/content/rules/Medius_Corp.com.xml b/src/chrome/content/rules/Medius_Corp.com.xml
deleted file mode 100644
index c8a6472c9e2a..000000000000
--- a/src/chrome/content/rules/Medius_Corp.com.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Medius_Viewer.com.xml b/src/chrome/content/rules/Medius_Viewer.com.xml
deleted file mode 100644
index 342c257ab2e3..000000000000
--- a/src/chrome/content/rules/Medius_Viewer.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Medscape.xml b/src/chrome/content/rules/Medscape.xml
index a117869d992f..0a319aa42a0c 100644
--- a/src/chrome/content/rules/Medscape.xml
+++ b/src/chrome/content/rules/Medscape.xml
@@ -23,7 +23,10 @@
 -->
 
 
-	
+	
+	
+	
+	
 
 
 	
-
+
 
 	
-	
+	
+	
+	
 
 
 	
@@ -26,7 +28,6 @@ Fetch error: http://meebo.com/ => https://www.meebo.com/: (51, "SSL: no alternat
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Meego.xml b/src/chrome/content/rules/Meego.xml
index 2b2f8c3fae33..a786103e6c25 100644
--- a/src/chrome/content/rules/Meego.xml
+++ b/src/chrome/content/rules/Meego.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.meego.com/ => https://www.meego.com/: (51, "SSL: no alte
 Disabled by https-everywhere-checker because:
 Fetch error: http://meego.com/ => https://meego.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/MeetInLeeds.xml b/src/chrome/content/rules/MeetInLeeds.xml
index 38769f402db5..88d5985f294c 100644
--- a/src/chrome/content/rules/MeetInLeeds.xml
+++ b/src/chrome/content/rules/MeetInLeeds.xml
@@ -10,4 +10,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MeetMe.xml b/src/chrome/content/rules/MeetMe.xml
index 6314e92df22e..aab520100772 100644
--- a/src/chrome/content/rules/MeetMe.xml
+++ b/src/chrome/content/rules/MeetMe.xml
@@ -34,7 +34,7 @@ Fetch error: http://vip.meetme.com/ => https://vip.meetme.com/: (51, "SSL: no al
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/MeetMe_Corp.xml b/src/chrome/content/rules/MeetMe_Corp.xml
index 07b11fa0ab0c..fe502bd8e6bb 100644
--- a/src/chrome/content/rules/MeetMe_Corp.xml
+++ b/src/chrome/content/rules/MeetMe_Corp.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Meetic-problematic.xml b/src/chrome/content/rules/Meetic-problematic.xml
index 96ad4f9c1b09..518c16b5cfdc 100644
--- a/src/chrome/content/rules/Meetic-problematic.xml
+++ b/src/chrome/content/rules/Meetic-problematic.xml
@@ -4,7 +4,8 @@
 -->
 
 
-	
+	
+	
 		
@@ -14,13 +15,10 @@
 	
 
 
-	
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Meetic.pt.xml b/src/chrome/content/rules/Meetic.pt.xml
index 7d98b3bab22c..7509a5c388be 100644
--- a/src/chrome/content/rules/Meetic.pt.xml
+++ b/src/chrome/content/rules/Meetic.pt.xml
@@ -2,6 +2,6 @@
   
   
   
-  
+
   
 
diff --git a/src/chrome/content/rules/Meetrics.xml b/src/chrome/content/rules/Meetrics.xml
index fa5439fe0dad..d6e9ea9ebf87 100644
--- a/src/chrome/content/rules/Meetrics.xml
+++ b/src/chrome/content/rules/Meetrics.xml
@@ -47,4 +47,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MegWorld.xml b/src/chrome/content/rules/MegWorld.xml
index 2c3a62afcc37..8d6c8d2d563d 100644
--- a/src/chrome/content/rules/MegWorld.xml
+++ b/src/chrome/content/rules/MegWorld.xml
@@ -8,10 +8,12 @@ Fetch error: http://megworld.co.uk/ => https://megworld.co.uk/: (60, 'SSL certif
 		- www		(http redirects to https://www; mismatched, CN: pump.megaworld.co.uk)
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
 	
@@ -20,4 +22,4 @@ Fetch error: http://megworld.co.uk/ => https://megworld.co.uk/: (60, 'SSL certif
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MegaBigPower.com.xml b/src/chrome/content/rules/MegaBigPower.com.xml
index 64308cedb409..bd43b6791c0f 100644
--- a/src/chrome/content/rules/MegaBigPower.com.xml
+++ b/src/chrome/content/rules/MegaBigPower.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://megabigpower.com/ => https://megabigpower.com/: (60, 'SSL ce
 Fetch error: http://www.megabigpower.com/ => https://www.megabigpower.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/MegaPath.xml b/src/chrome/content/rules/MegaPath.xml
index 833fab779bf6..5ab459f98beb 100644
--- a/src/chrome/content/rules/MegaPath.xml
+++ b/src/chrome/content/rules/MegaPath.xml
@@ -23,7 +23,7 @@ Fetch error: http://vp1-voiceportal.megapath.com/Login/ => https://vp1-voiceport
 		- www.megapath.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Megabus.com.xml b/src/chrome/content/rules/Megabus.com.xml
index da154e87ed00..ddeb870435bf 100644
--- a/src/chrome/content/rules/Megabus.com.xml
+++ b/src/chrome/content/rules/Megabus.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.megabusgold.com/ => https://www.megabusgold.com/: (60, '
 	Nonfunctional domains:
 		festivals.megabus.com (wrong domain for certificate)
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/MeiPian.xml b/src/chrome/content/rules/MeiPian.xml
index a60a0607d9fb..a83df1b535d1 100644
--- a/src/chrome/content/rules/MeiPian.xml
+++ b/src/chrome/content/rules/MeiPian.xml
@@ -1,22 +1,19 @@
 
-
 
-	
+	
+	
 	
+
+	
 	
 	
 
 	
-
 
diff --git a/src/chrome/content/rules/MeiTuan.com.xml b/src/chrome/content/rules/MeiTuan.com.xml
index ab3944e2ac4c..4c9be83c2210 100644
--- a/src/chrome/content/rules/MeiTuan.com.xml
+++ b/src/chrome/content/rules/MeiTuan.com.xml
@@ -3,57 +3,33 @@
 		MeiTuan.net.xml
 
 	Cities:
-		There are more and more cities: https://www.meituan.com/index/changecity/initiative
+		There are more and more cities: https://www.meituan.com/changecity/
 		While this ruleset be created on 28 May 2016, there were 886 cities.
 		On 20 Feb 2017, the number is 964.
+		On 13 June 2020, the number is more than 1k.
 		We get error from travis: “The job exceeded the maximum time limit for jobs, and has been terminated.”
 		To fix this issue, maybe exclusion is the best choise.
-		Use strict regex ^http://(\w+)\.meituan\.com/ to avoid redirects on 4th level subdomains (*.*.meituan.com)
-
-	Different http/https content:
-		^meituan.com
-		tech.meituan.com
-		union.meituan.com
-		zhao.meituan.com
+		Maybe we need strict regex ^http://(\w+)\.meituan\.com/ to avoid redirects on 4th level subdomains (*.*.meituan.com)
 
 	Invalid cert:
-		ck.dsp.meituan.com
 		api.mobile.meituan.com
-
-	MCB:
-		i.meituan.com/mobile/
-		waimai.meituan.com
 -->
-
 
-	
-		
-
-	
-		
-		
-		
-		
-		
+	
+	
 
-	
-	
-		
+	
+		
 
-	
+	
 		
 		
 		
 		
 
-	
+		
+		
 		
-	
 		
-	
-		
-
-	
+		
 
diff --git a/src/chrome/content/rules/Mekanist.xml b/src/chrome/content/rules/Mekanist.xml
index 800e9708ad0e..252ad3867a4c 100644
--- a/src/chrome/content/rules/Mekanist.xml
+++ b/src/chrome/content/rules/Mekanist.xml
@@ -5,7 +5,7 @@ Fetch error: http://www.mekanist.net/ => https://www.mekanist.net/: (60, 'SSL ce
 Fetch error: http://mekanist.net/ => https://www.mekanist.net/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Mellanox-problematic.xml b/src/chrome/content/rules/Mellanox-problematic.xml
index e3a564b9cb11..856dd35adf5d 100644
--- a/src/chrome/content/rules/Mellanox-problematic.xml
+++ b/src/chrome/content/rules/Mellanox-problematic.xml
@@ -16,4 +16,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Melonbooks.co.jp.xml b/src/chrome/content/rules/Melonbooks.co.jp.xml
index 31d812d7709b..02fafed3f6ae 100644
--- a/src/chrome/content/rules/Melonbooks.co.jp.xml
+++ b/src/chrome/content/rules/Melonbooks.co.jp.xml
@@ -1,4 +1,4 @@
-
-	
+	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Memberhealthplan.com.xml b/src/chrome/content/rules/Memberhealthplan.com.xml
new file mode 100644
index 000000000000..4d7a364154b3
--- /dev/null
+++ b/src/chrome/content/rules/Memberhealthplan.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/Meme_Center.xml b/src/chrome/content/rules/Meme_Center.xml
index ad733113c8d9..75e154f86d7f 100644
--- a/src/chrome/content/rules/Meme_Center.xml
+++ b/src/chrome/content/rules/Meme_Center.xml
@@ -6,18 +6,14 @@
 -->
 
 
-	
+	
 	
-	
+	
 
 
 	
 
 
-	
+	
 
-	
-
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Memo.tv.xml b/src/chrome/content/rules/Memo.tv.xml
new file mode 100644
index 000000000000..e2816759f67e
--- /dev/null
+++ b/src/chrome/content/rules/Memo.tv.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Memorial-University.xml b/src/chrome/content/rules/Memorial-University.xml
index 988bcb954e46..d0a76b343cda 100644
--- a/src/chrome/content/rules/Memorial-University.xml
+++ b/src/chrome/content/rules/Memorial-University.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.cs.mun.ca/courses/ => https://www.cs.mun.ca/courses/: (6
 
 	¹: Connection timeout
 -->
-
+
 	
 
 	
diff --git a/src/chrome/content/rules/Memory-Alpha.xml b/src/chrome/content/rules/Memory-Alpha.xml
index 8e44a31b68d1..3a084c78c848 100644
--- a/src/chrome/content/rules/Memory-Alpha.xml
+++ b/src/chrome/content/rules/Memory-Alpha.xml
@@ -22,13 +22,12 @@
 
 
 	
-	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Memorydealers.xml b/src/chrome/content/rules/Memorydealers.xml
deleted file mode 100644
index 097a11668c44..000000000000
--- a/src/chrome/content/rules/Memorydealers.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Memrise.xml b/src/chrome/content/rules/Memrise.xml
deleted file mode 100644
index bb1140cfde2b..000000000000
--- a/src/chrome/content/rules/Memrise.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-	
-	
-
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-
-
-	
-	
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Memset.xml b/src/chrome/content/rules/Memset.xml
index 3439bc01ec70..192e719e0cf9 100644
--- a/src/chrome/content/rules/Memset.xml
+++ b/src/chrome/content/rules/Memset.xml
@@ -21,7 +21,7 @@
 					-->
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Memtest.org.xml b/src/chrome/content/rules/Memtest.org.xml
new file mode 100644
index 000000000000..bde759dfde10
--- /dev/null
+++ b/src/chrome/content/rules/Memtest.org.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Mencap.org.uk.xml b/src/chrome/content/rules/Mencap.org.uk.xml
index 648918a952c6..3e6a40eb4495 100644
--- a/src/chrome/content/rules/Mencap.org.uk.xml
+++ b/src/chrome/content/rules/Mencap.org.uk.xml
@@ -41,7 +41,7 @@ Fetch error: http://www.jobs.mencap.org.uk/ => https://www.jobs.mencap.org.uk/:
 	for ^, donate, www, yournetwork
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/MeningitisTrust.org.xml b/src/chrome/content/rules/MeningitisTrust.org.xml
deleted file mode 100644
index caf15b61ecc6..000000000000
--- a/src/chrome/content/rules/MeningitisTrust.org.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/MentalHealthServicesinAustralia.xml b/src/chrome/content/rules/MentalHealthServicesinAustralia.xml
deleted file mode 100644
index 6db866ed7dcf..000000000000
--- a/src/chrome/content/rules/MentalHealthServicesinAustralia.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-	
-
-	
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Mentalfloss.com.xml b/src/chrome/content/rules/Mentalfloss.com.xml
new file mode 100644
index 000000000000..3b6773839e88
--- /dev/null
+++ b/src/chrome/content/rules/Mentalfloss.com.xml
@@ -0,0 +1,22 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/Mentalhealth.asn.au.xml b/src/chrome/content/rules/Mentalhealth.asn.au.xml
index 462706a02090..76c8a369085a 100644
--- a/src/chrome/content/rules/Mentalhealth.asn.au.xml
+++ b/src/chrome/content/rules/Mentalhealth.asn.au.xml
@@ -14,8 +14,8 @@
 -->
 
   
-  
+  
 
   
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Mentor-Graphics.xml b/src/chrome/content/rules/Mentor-Graphics.xml
deleted file mode 100644
index a73526327c97..000000000000
--- a/src/chrome/content/rules/Mentor-Graphics.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-	
-	
-	
-	
-		
-
-
-	
-
-
-	
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Mentor.com.xml b/src/chrome/content/rules/Mentor.com.xml
new file mode 100644
index 000000000000..8a2d0ae644b4
--- /dev/null
+++ b/src/chrome/content/rules/Mentor.com.xml
@@ -0,0 +1,36 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Mentoring_Central.xml b/src/chrome/content/rules/Mentoring_Central.xml
index d9bd052f2ced..a0eff0680785 100644
--- a/src/chrome/content/rules/Mentoring_Central.xml
+++ b/src/chrome/content/rules/Mentoring_Central.xml
@@ -8,16 +8,16 @@ Non-2xx HTTP code: http://www.mentoringcentral.net/ (200) => https://www.mentori
 Automatically by https-everywhere-checker because:
 Fetch error: http://mentoringcentral.net/ => https://mentoringcentral.net/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 -->
-
+
 
 	
 	
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Meo.pt.xml b/src/chrome/content/rules/Meo.pt.xml
index f1ba9de6b030..8cdb1b3c1b11 100644
--- a/src/chrome/content/rules/Meo.pt.xml
+++ b/src/chrome/content/rules/Meo.pt.xml
@@ -37,7 +37,7 @@ Fetch error: http://login.meo.pt/ => https://login.meo.pt/: (6, 'Could not resol
 	lojas.meo.pt
 -->
 
-
+
 	
 	
 	
@@ -52,6 +52,6 @@ Fetch error: http://login.meo.pt/ => https://login.meo.pt/: (6, 'Could not resol
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Mephi.ru.xml b/src/chrome/content/rules/Mephi.ru.xml
index 21dec071e208..9fb66ddb26d8 100644
--- a/src/chrome/content/rules/Mephi.ru.xml
+++ b/src/chrome/content/rules/Mephi.ru.xml
@@ -37,7 +37,11 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
 		
 
 
@@ -47,7 +51,6 @@
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Mequoda.com.xml b/src/chrome/content/rules/Mequoda.com.xml
index 5b4a87b340fe..430e4cb592eb 100644
--- a/src/chrome/content/rules/Mequoda.com.xml
+++ b/src/chrome/content/rules/Mequoda.com.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.mequoda.com/ => https://www.mequoda.com/: (60, 'SSL cert
 		- ^	(cert only matches www)
 
 -->
-
+
 
 	
 	
@@ -26,4 +26,4 @@ Fetch error: http://www.mequoda.com/ => https://www.mequoda.com/: (60, 'SSL cert
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MerNetwork.com.xml b/src/chrome/content/rules/MerNetwork.com.xml
new file mode 100644
index 000000000000..ea95f67bba33
--- /dev/null
+++ b/src/chrome/content/rules/MerNetwork.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/MerNetwork.xml b/src/chrome/content/rules/MerNetwork.xml
deleted file mode 100644
index 94b1afe9f0d0..000000000000
--- a/src/chrome/content/rules/MerNetwork.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-	
-	
-	
-	
-
diff --git a/src/chrome/content/rules/Meraki.xml b/src/chrome/content/rules/Meraki.xml
index 2c493caeed20..9ddb4c20ce91 100644
--- a/src/chrome/content/rules/Meraki.xml
+++ b/src/chrome/content/rules/Meraki.xml
@@ -14,4 +14,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MerchDirect.xml b/src/chrome/content/rules/MerchDirect.xml
index c8ea6f1e78ca..7bb96456f720 100644
--- a/src/chrome/content/rules/MerchDirect.xml
+++ b/src/chrome/content/rules/MerchDirect.xml
@@ -17,7 +17,7 @@ Fetch error: http://www.merchdirect.com/ => https://www.merchdirect.com/: (51, "
 	Some (most?) pages redirect to http
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Merchantquest.net.xml b/src/chrome/content/rules/Merchantquest.net.xml
index 951b1a813896..c875e4c995c5 100644
--- a/src/chrome/content/rules/Merchantquest.net.xml
+++ b/src/chrome/content/rules/Merchantquest.net.xml
@@ -4,10 +4,10 @@
 		
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Mercurial_SCM.xml b/src/chrome/content/rules/Mercurial_SCM.xml
index e9015b73ee6a..7e65907ba526 100644
--- a/src/chrome/content/rules/Mercurial_SCM.xml
+++ b/src/chrome/content/rules/Mercurial_SCM.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://mercurial.selenic.com/ => https://mercurial.selenic.com/: (6, 'Could not resolve host: mercurial.selenic.com')
 
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/Mercury_News.xml b/src/chrome/content/rules/Mercury_News.xml
index 867c40a881f6..a8dfc8100dfa 100644
--- a/src/chrome/content/rules/Mercury_News.xml
+++ b/src/chrome/content/rules/Mercury_News.xml
@@ -12,9 +12,9 @@
 			- .
 			- now
 					-->
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Meritrust_CU.org.xml b/src/chrome/content/rules/Meritrust_CU.org.xml
index 234a15eea369..72c711bbe051 100644
--- a/src/chrome/content/rules/Meritrust_CU.org.xml
+++ b/src/chrome/content/rules/Meritrust_CU.org.xml
@@ -8,7 +8,8 @@
 
 
 	
-	
+	
+	
 
 
 	
 
 
 
 	
-	
-	
-	
+	
+	
+	
+	
+	
 	
+	
 	
 	
 	
 	
+	
 
 	
 
 	
-	
+
+	
+
 	
 
 
diff --git a/src/chrome/content/rules/Merlin-Entertainments.xml b/src/chrome/content/rules/Merlin-Entertainments.xml
deleted file mode 100644
index ef8e7a6ead86..000000000000
--- a/src/chrome/content/rules/Merlin-Entertainments.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Merlinux.xml b/src/chrome/content/rules/Merlinux.xml
index c6aea3ae5105..7faa1e0590e9 100644
--- a/src/chrome/content/rules/Merlinux.xml
+++ b/src/chrome/content/rules/Merlinux.xml
@@ -1,19 +1,6 @@
-
-
-	
-	
-	
-	
-
-	
-
-	
-
-	
-
-	
-
+
+	
+	
+	
+	
 
diff --git a/src/chrome/content/rules/MesExercices.com.xml b/src/chrome/content/rules/MesExercices.com.xml
new file mode 100644
index 000000000000..22b104f93b7d
--- /dev/null
+++ b/src/chrome/content/rules/MesExercices.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/MesOutils.com.xml b/src/chrome/content/rules/MesOutils.com.xml
new file mode 100644
index 000000000000..341e7535394f
--- /dev/null
+++ b/src/chrome/content/rules/MesOutils.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Mesa3d.org.xml b/src/chrome/content/rules/Mesa3d.org.xml
new file mode 100644
index 000000000000..9e9d82a66b5d
--- /dev/null
+++ b/src/chrome/content/rules/Mesa3d.org.xml
@@ -0,0 +1,8 @@
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Mesh-Internet.xml b/src/chrome/content/rules/Mesh-Internet.xml
index dc3d4ce93a32..3ef0242846c5 100644
--- a/src/chrome/content/rules/Mesh-Internet.xml
+++ b/src/chrome/content/rules/Mesh-Internet.xml
@@ -8,13 +8,13 @@
 -->
 
 
-	
+	
+	
 
 
 	
 
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/MesonBuild.com.xml b/src/chrome/content/rules/MesonBuild.com.xml
new file mode 100644
index 000000000000..3cdf8c7fdb2c
--- /dev/null
+++ b/src/chrome/content/rules/MesonBuild.com.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Messagingengine.com.xml b/src/chrome/content/rules/Messagingengine.com.xml
deleted file mode 100644
index 906436ae2011..000000000000
--- a/src/chrome/content/rules/Messagingengine.com.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Messenger.com.xml b/src/chrome/content/rules/Messenger.com.xml
index 0fd7b626c574..6f49bb3b7496 100644
--- a/src/chrome/content/rules/Messenger.com.xml
+++ b/src/chrome/content/rules/Messenger.com.xml
@@ -1,27 +1,21 @@
 
-
-
-	
-	
 
+
+	
+	
 
-	
+	
 	
-
 	
 
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/Messer_Financial.xml b/src/chrome/content/rules/Messer_Financial.xml
index 057a6aab0e6c..83ef7c3369a7 100644
--- a/src/chrome/content/rules/Messer_Financial.xml
+++ b/src/chrome/content/rules/Messer_Financial.xml
@@ -4,9 +4,9 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MetaCPAN.xml b/src/chrome/content/rules/MetaCPAN.xml
index e357e813dbd9..c1db2f774423 100644
--- a/src/chrome/content/rules/MetaCPAN.xml
+++ b/src/chrome/content/rules/MetaCPAN.xml
@@ -8,7 +8,7 @@
 	
 
 
-	
+	
 
 
 	
 
 	
-	
+	
+	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Metaboli.co.uk.xml b/src/chrome/content/rules/Metaboli.co.uk.xml
index fb6657daa162..1935240d9dd6 100644
--- a/src/chrome/content/rules/Metaboli.co.uk.xml
+++ b/src/chrome/content/rules/Metaboli.co.uk.xml
@@ -17,7 +17,7 @@
 	* Secured by us
 
 -->
-
+
 
 	
@@ -33,7 +33,7 @@
 	
 	
 
-	
+	
 
 
 	 https://old.metal-detector-t
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Metasploit.xml b/src/chrome/content/rules/Metasploit.xml
index 03b661fee932..1e4a12eadd94 100644
--- a/src/chrome/content/rules/Metasploit.xml
+++ b/src/chrome/content/rules/Metasploit.xml
@@ -32,7 +32,7 @@ Fetch error: http://mail.metasploit.com/ => https://mail.metasploit.com/: (51, "
 		- www.metasploit.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Metcombank.ru.xml b/src/chrome/content/rules/Metcombank.ru.xml
index 132e33fc6cee..182b13014987 100644
--- a/src/chrome/content/rules/Metcombank.ru.xml
+++ b/src/chrome/content/rules/Metcombank.ru.xml
@@ -19,7 +19,7 @@ vklad.metcombank.ru ¹
 ¹ mismatch
 ³ timed out
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/MeteoCiel.fr.xml b/src/chrome/content/rules/MeteoCiel.fr.xml
index 40a523f6212e..df6ff646a88e 100644
--- a/src/chrome/content/rules/MeteoCiel.fr.xml
+++ b/src/chrome/content/rules/MeteoCiel.fr.xml
@@ -13,7 +13,7 @@
 
 	Unknown error:
 		modeles9.meteociel.fr
-	
+
 -->
 
 
diff --git a/src/chrome/content/rules/MeteoNews.xml b/src/chrome/content/rules/MeteoNews.xml
index 96e8061b6617..c1f086eaef93 100644
--- a/src/chrome/content/rules/MeteoNews.xml
+++ b/src/chrome/content/rules/MeteoNews.xml
@@ -33,4 +33,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Meteoalarm.eu.xml b/src/chrome/content/rules/Meteoalarm.eu.xml
new file mode 100644
index 000000000000..8b52f08e5066
--- /dev/null
+++ b/src/chrome/content/rules/Meteoalarm.eu.xml
@@ -0,0 +1,21 @@
+
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/MeteorHacks.com.xml b/src/chrome/content/rules/MeteorHacks.com.xml
index 7962cac76d22..12b64c843507 100644
--- a/src/chrome/content/rules/MeteorHacks.com.xml
+++ b/src/chrome/content/rules/MeteorHacks.com.xml
@@ -4,12 +4,12 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://meteorhacks.com/ => https://meteorhacks.com/: (51, "SSL: no alternative certificate subject name matches target host name 'meteorhacks.com'")
 Fetch error: http://www.meteorhacks.com/ => https://www.meteorhacks.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.meteorhacks.com'")
 
-	Insecure cookies are set for these 
+	Insecure cookies are set for these
 
 		- .meteorhacks.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Method_Acting_Strasberg.com.xml b/src/chrome/content/rules/Method_Acting_Strasberg.com.xml
deleted file mode 100644
index 5558da1ace4c..000000000000
--- a/src/chrome/content/rules/Method_Acting_Strasberg.com.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Metin2.co.nz.xml b/src/chrome/content/rules/Metin2.co.nz.xml
deleted file mode 100644
index 002cccd0d8df..000000000000
--- a/src/chrome/content/rules/Metin2.co.nz.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Metooo.io.xml b/src/chrome/content/rules/Metooo.io.xml
index 2789fd1bbf49..9ae8ee4286e3 100644
--- a/src/chrome/content/rules/Metooo.io.xml
+++ b/src/chrome/content/rules/Metooo.io.xml
@@ -13,7 +13,7 @@ Fetch error: http://test.metooo.io/ => https://test.metooo.io/: (6, 'Could not r
 		- .metooo.io
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Metrics34.com.xml b/src/chrome/content/rules/Metrics34.com.xml
deleted file mode 100644
index 188099010033..000000000000
--- a/src/chrome/content/rules/Metrics34.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Metro.Istanbul.xml b/src/chrome/content/rules/Metro.Istanbul.xml
new file mode 100644
index 000000000000..2873272473e7
--- /dev/null
+++ b/src/chrome/content/rules/Metro.Istanbul.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Metro.co.uk.xml b/src/chrome/content/rules/Metro.co.uk.xml
index df98156a9aee..4d93b9a87544 100644
--- a/src/chrome/content/rules/Metro.co.uk.xml
+++ b/src/chrome/content/rules/Metro.co.uk.xml
@@ -1,17 +1,15 @@
-
 
-
+
 
 	
 	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Metro.xml b/src/chrome/content/rules/Metro.xml
deleted file mode 100644
index bb2e97c61b6d..000000000000
--- a/src/chrome/content/rules/Metro.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Metro_Ethernet_Forum.com.xml b/src/chrome/content/rules/Metro_Ethernet_Forum.com.xml
deleted file mode 100644
index bb753da448d1..000000000000
--- a/src/chrome/content/rules/Metro_Ethernet_Forum.com.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Metropolnews.info.xml b/src/chrome/content/rules/Metropolnews.info.xml
new file mode 100644
index 000000000000..d27465076983
--- /dev/null
+++ b/src/chrome/content/rules/Metropolnews.info.xml
@@ -0,0 +1,19 @@
+
+
+
+	
+	
+
+	
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Mew.xml b/src/chrome/content/rules/Mew.xml
index 03180dbd8a7a..9c83f962930a 100644
--- a/src/chrome/content/rules/Mew.xml
+++ b/src/chrome/content/rules/Mew.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MewsNavigator.com.xml b/src/chrome/content/rules/MewsNavigator.com.xml
new file mode 100644
index 000000000000..065b8b7dfa41
--- /dev/null
+++ b/src/chrome/content/rules/MewsNavigator.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Mexicantears.ch.xml b/src/chrome/content/rules/Mexicantears.ch.xml
deleted file mode 100644
index eefceef00a6f..000000000000
--- a/src/chrome/content/rules/Mexicantears.ch.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/MeynConnect.xml b/src/chrome/content/rules/MeynConnect.xml
index 3350c231bbeb..f2753712ed99 100644
--- a/src/chrome/content/rules/MeynConnect.xml
+++ b/src/chrome/content/rules/MeynConnect.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.meynconnect.com/ => https://www.meynconnect.com/: (60, '
 	Cert only matches www
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/MiKTEX.org.xml b/src/chrome/content/rules/MiKTEX.org.xml
new file mode 100644
index 000000000000..b6a9417ed61c
--- /dev/null
+++ b/src/chrome/content/rules/MiKTEX.org.xml
@@ -0,0 +1,22 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Miaozhen.com.xml b/src/chrome/content/rules/Miaozhen.com.xml
deleted file mode 100644
index 1009ef8bca92..000000000000
--- a/src/chrome/content/rules/Miaozhen.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Mibbit.xml b/src/chrome/content/rules/Mibbit.xml
index 140a71367162..661a36ad133a 100644
--- a/src/chrome/content/rules/Mibbit.xml
+++ b/src/chrome/content/rules/Mibbit.xml
@@ -33,7 +33,7 @@
 		
 
 
-	
+	
 
 
 	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/MichelbergerMonkey.com.xml b/src/chrome/content/rules/MichelbergerMonkey.com.xml
new file mode 100644
index 000000000000..e273791b5741
--- /dev/null
+++ b/src/chrome/content/rules/MichelbergerMonkey.com.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Michelle-Bridges-12-Week-Body-Transformation.xml b/src/chrome/content/rules/Michelle-Bridges-12-Week-Body-Transformation.xml
deleted file mode 100644
index 4a62251e55a1..000000000000
--- a/src/chrome/content/rules/Michelle-Bridges-12-Week-Body-Transformation.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-	
-	
-		
-		
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Michigan_Campus_Compact.xml b/src/chrome/content/rules/Michigan_Campus_Compact.xml
index 8c69ed20cc3c..0062e12ee751 100644
--- a/src/chrome/content/rules/Michigan_Campus_Compact.xml
+++ b/src/chrome/content/rules/Michigan_Campus_Compact.xml
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Michigan_Nonprofit_Association.xml b/src/chrome/content/rules/Michigan_Nonprofit_Association.xml
index ce9f5749e8c6..b9a761ee22f0 100644
--- a/src/chrome/content/rules/Michigan_Nonprofit_Association.xml
+++ b/src/chrome/content/rules/Michigan_Nonprofit_Association.xml
@@ -1,13 +1,13 @@
 
 
 
 	
-	
+	
+	
 
 
 	
@@ -16,7 +16,9 @@
 	
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MicroAd.co.jp.xml b/src/chrome/content/rules/MicroAd.co.jp.xml
index 528a5d4d5946..1b12fca0ee3c 100644
--- a/src/chrome/content/rules/MicroAd.co.jp.xml
+++ b/src/chrome/content/rules/MicroAd.co.jp.xml
@@ -16,7 +16,7 @@ Fetch error: http://careers.microad.co.jp/ => https://careers.microad.co.jp/: (6
 		4xx client error:
 			 - app.microad.co.jp
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/MicroAd.net.xml b/src/chrome/content/rules/MicroAd.net.xml
index 2dc0ac8b44b1..945380b041aa 100644
--- a/src/chrome/content/rules/MicroAd.net.xml
+++ b/src/chrome/content/rules/MicroAd.net.xml
@@ -1,4 +1,4 @@
-
-
+
 
 	
diff --git a/src/chrome/content/rules/Microgaming.xml b/src/chrome/content/rules/Microgaming.xml
deleted file mode 100644
index 049bd4ea0d7e..000000000000
--- a/src/chrome/content/rules/Microgaming.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/MicropartsUSA.xml b/src/chrome/content/rules/MicropartsUSA.xml
index d6094e55ff7b..d1cb7e6e64fe 100644
--- a/src/chrome/content/rules/MicropartsUSA.xml
+++ b/src/chrome/content/rules/MicropartsUSA.xml
@@ -12,7 +12,7 @@ Fetch error: http://micropartsusa.com/ => https://micropartsusa.com/: (28, 'Oper
 Fetch error: http://www.micropartsusa.com/ => https://www.micropartsusa.com/: (28, 'Operation timed out after 0 milliseconds with 0 out of 0 bytes received')
 
 -->
-
+
 
 	
 	
@@ -20,4 +20,4 @@ Fetch error: http://www.micropartsusa.com/ => https://www.micropartsusa.com/: (2
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Microsoft-Atlas.xml b/src/chrome/content/rules/Microsoft-Atlas.xml
index 069692e37988..435fde8f1349 100644
--- a/src/chrome/content/rules/Microsoft-Atlas.xml
+++ b/src/chrome/content/rules/Microsoft-Atlas.xml
@@ -17,7 +17,7 @@ Non-2xx HTTP code: http://h.atdmt.com/ (200) => https://h.bing.com/ (403)
 		- atlasdmt.vo.msecnd.net
 
 			- cdn.atdmt.com
-	
+
 
 	Problematic hosts in *atdmt.com:
 
@@ -42,7 +42,7 @@ Non-2xx HTTP code: http://h.atdmt.com/ (200) => https://h.bing.com/ (403)
 	whichever domain it is loaded from.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Microsoft.xml b/src/chrome/content/rules/Microsoft.xml
index dad1e22f7efa..5af9697a22ab 100644
--- a/src/chrome/content/rules/Microsoft.xml
+++ b/src/chrome/content/rules/Microsoft.xml
@@ -1,9 +1,16 @@
+
 
@@ -296,14 +310,12 @@
 	
 	
-	
 	
 	
 	
 	
-	
 	
-	
+
 	
 	
 	
@@ -311,25 +323,19 @@
 	
 		
 	
-	
 	
 	
 	
-	
 	
-	
 	
 	
-	
-	
-	
+	
 	
 	
 	
 	
 
 	
-	
 	
 	
 	
@@ -339,9 +345,9 @@
 	
 	
 	
-	
 	
 	
+	
 	
 	
 	
@@ -352,15 +358,11 @@
 	
 	
 
-	
 	
-	
 	
 	
 
-	
 	
-	
 
 	
 	
@@ -372,24 +374,15 @@
 	
 	
 	
-	
-	
+	
 	
+	
+	
 	
 
-	
-	
-	
-	
-	
-
-	
 	
-		
-		
 	
-	
-	
+	
 	
 	
 	
@@ -403,16 +396,9 @@
 	
 	
 
-	
-	
-	
-
 	
 	
 
-	
-
-	
 	
 	
 	
@@ -427,15 +413,13 @@
 
 	
 	
-	
-	
 
 	
 	
 	
 	
 
-	
+	
 	
 
 	
@@ -445,69 +429,8 @@
 	
 	
 	
-	
-	
-
-		
-		
-			
-		
-
-		
-		
-
-		
-		
-
-			
-
-		
-		
-
-		
-		
-		
-		
-
-			
-			
-			
-			
-
-			
-			
-			
-
-		
-		
 
-			
-			
-			
-
-		
-
-			
-
-		
-		
-
-			
-			
-			
+	
 
 		
@@ -530,34 +453,9 @@
 			
 			
 
-		
-		
-
-		
-		
-
-			
-			
-			
-			
-			
-
-		
-
-			
-			
-			
-
 		
-		
-		
 		
 
 			
 	
 	
-	
 	
 	
 	
@@ -624,15 +521,9 @@
 		s_.+: Other tracking cookies
 						-->
 	
-	
+	
 	
 
-
-	
-
-		
-
 	
 	
-	
 
-		
-		
-		
-
 	
 
-	
-
 	
 
@@ -673,15 +557,6 @@
 
 		
 
-	
-	
-
-		
-		
-		
-
 	
 
diff --git a/src/chrome/content/rules/MicrosoftStudios.com.xml b/src/chrome/content/rules/MicrosoftStudios.com.xml
new file mode 100644
index 000000000000..53c8da88a65c
--- /dev/null
+++ b/src/chrome/content/rules/MicrosoftStudios.com.xml
@@ -0,0 +1,26 @@
+
+
+	
+	
+	
+	
+		
+	
+
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Microsoft_Store.xml b/src/chrome/content/rules/Microsoft_Store.xml
index 50361cef5e55..6f8bcc9ed203 100644
--- a/src/chrome/content/rules/Microsoft_Store.xml
+++ b/src/chrome/content/rules/Microsoft_Store.xml
@@ -1,91 +1,17 @@
 
-
-
-	
-	
-	
-	
-
-	
-	
 
-	
+
 	
+	
+	
+	
+	
+	
 
-		
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-
-
-	
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/Microsoft_Studios.com.xml b/src/chrome/content/rules/Microsoft_Studios.com.xml
deleted file mode 100644
index 01a608a845f7..000000000000
--- a/src/chrome/content/rules/Microsoft_Studios.com.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Microtech.xml b/src/chrome/content/rules/Microtech.xml
index 3a21504f2a79..abf3aa012f40 100644
--- a/src/chrome/content/rules/Microtech.xml
+++ b/src/chrome/content/rules/Microtech.xml
@@ -1,15 +1,29 @@
-
+
+
+
+	
 
-	
 	
 	
+	
+	
+	
+	
 
-	
+	
 
-	
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Microtronix.xml b/src/chrome/content/rules/Microtronix.xml
index 6745523deb96..8f465fff2148 100644
--- a/src/chrome/content/rules/Microtronix.xml
+++ b/src/chrome/content/rules/Microtronix.xml
@@ -28,4 +28,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Midphase.xml b/src/chrome/content/rules/Midphase.xml
index 829b923bda5c..96297a012f03 100644
--- a/src/chrome/content/rules/Midphase.xml
+++ b/src/chrome/content/rules/Midphase.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Mietek.io.xml b/src/chrome/content/rules/Mietek.io.xml
index 786fa60c380e..da469db2f59b 100644
--- a/src/chrome/content/rules/Mietek.io.xml
+++ b/src/chrome/content/rules/Mietek.io.xml
@@ -12,7 +12,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	 https://www.mightyupload.com/: (28,
 		- .mightyupload.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Migros-Kulturprozent.ch.xml b/src/chrome/content/rules/Migros-Kulturprozent.ch.xml
index 5a3fdd970f93..d05a4cd446f8 100644
--- a/src/chrome/content/rules/Migros-Kulturprozent.ch.xml
+++ b/src/chrome/content/rules/Migros-Kulturprozent.ch.xml
@@ -13,7 +13,7 @@ Fetch error: http://facebook.migros-kulturprozent.ch/ => https://facebook.migros
 	m: mismatch
 	r: refused
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Migros.xml b/src/chrome/content/rules/Migros.xml
index e13f77941429..016ff6fd7033 100644
--- a/src/chrome/content/rules/Migros.xml
+++ b/src/chrome/content/rules/Migros.xml
@@ -1,11 +1,21 @@
+
 
 	
 	
 	
-	
+	
 	
 	
 	
 	
-	
+	
 	
 	
 	
@@ -98,7 +108,7 @@
 	
 	
 	
-	
+	
 	
 	
 	
@@ -112,7 +122,7 @@
 	
 	
 	
-	
+	
 	
 	
 	
@@ -120,9 +130,9 @@
 	
 	
 
-	
-	
-	
+	
+	
+	
 
 	
 	
diff --git a/src/chrome/content/rules/Mike_Masin.xml b/src/chrome/content/rules/Mike_Masin.xml
deleted file mode 100644
index 0e1457a67e70..000000000000
--- a/src/chrome/content/rules/Mike_Masin.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-		
-		
-
-
diff --git a/src/chrome/content/rules/MikroTik.com.xml b/src/chrome/content/rules/MikroTik.com.xml
index 986405ec9c0f..d778d5525410 100644
--- a/src/chrome/content/rules/MikroTik.com.xml
+++ b/src/chrome/content/rules/MikroTik.com.xml
@@ -71,13 +71,11 @@
 	
 
 
-	
+	
 
 	
 
-	
+
 
 
diff --git a/src/chrome/content/rules/MilbenCheck.at.xml b/src/chrome/content/rules/MilbenCheck.at.xml
deleted file mode 100644
index 011e84a5512f..000000000000
--- a/src/chrome/content/rules/MilbenCheck.at.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Milepoint.xml b/src/chrome/content/rules/Milepoint.xml
deleted file mode 100644
index a8ae6b6a2b54..000000000000
--- a/src/chrome/content/rules/Milepoint.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-    
-    
-    
-
diff --git a/src/chrome/content/rules/MilitarySuper.xml b/src/chrome/content/rules/MilitarySuper.xml
index 74a8afc1f986..d46a02f5a292 100644
--- a/src/chrome/content/rules/MilitarySuper.xml
+++ b/src/chrome/content/rules/MilitarySuper.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Millennium_Seating.xml b/src/chrome/content/rules/Millennium_Seating.xml
index 228e06f85802..6fb5fc32aa4e 100644
--- a/src/chrome/content/rules/Millennium_Seating.xml
+++ b/src/chrome/content/rules/Millennium_Seating.xml
@@ -5,25 +5,19 @@
 
 			- static.millenniumseating.com
 
-
-	Nonfunctional subdomains:
-
-		- blog		(502)
-
-
-	Some pages redirect to http.
-
 -->
 
 
 	
 	
+	
 
-
-	
+		
+		
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/MillionShort.com.xml b/src/chrome/content/rules/MillionShort.com.xml
new file mode 100644
index 000000000000..276ceaaa9bbc
--- /dev/null
+++ b/src/chrome/content/rules/MillionShort.com.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Minacs.com.xml b/src/chrome/content/rules/Minacs.com.xml
deleted file mode 100644
index 2a56a674696e..000000000000
--- a/src/chrome/content/rules/Minacs.com.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Minalyzer.com.xml b/src/chrome/content/rules/Minalyzer.com.xml
deleted file mode 100644
index 203683b9d29f..000000000000
--- a/src/chrome/content/rules/Minalyzer.com.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/MindTouch.com.xml b/src/chrome/content/rules/MindTouch.com.xml
index 8912622acad8..181428e78d2e 100644
--- a/src/chrome/content/rules/MindTouch.com.xml
+++ b/src/chrome/content/rules/MindTouch.com.xml
@@ -23,7 +23,7 @@ Fetch error: http://f1.support.mindtouch.com/ => https://f1.support.mindtouch.co
 		- .mindtouch.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/MindTouch.us.xml b/src/chrome/content/rules/MindTouch.us.xml
index 0e393ec99ddc..4b4c2a7f7713 100644
--- a/src/chrome/content/rules/MindTouch.us.xml
+++ b/src/chrome/content/rules/MindTouch.us.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://help.mindtouch.us/ => https://help.mindtouch.us/: (51, "SSL: no alternative certificate subject name matches target host name 'help.mindtouch.us'")
 Fetch error: http://f1.help.mindtouch.us/ => https://f1.help.mindtouch.us/: (51, "SSL: no alternative certificate subject name matches target host name 'f1.help.mindtouch.us'")
 
-	For other MindTouch coverage, see MindTouch.com.xml.		- 
+	For other MindTouch coverage, see MindTouch.com.xml.		-
 
 
 	Fully covered hosts:
@@ -16,7 +16,7 @@ Fetch error: http://f1.help.mindtouch.us/ => https://f1.help.mindtouch.us/: (51,
 		- f1.sapseod
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/MindWeb.network.xml b/src/chrome/content/rules/MindWeb.network.xml
deleted file mode 100644
index e9e20eebcea5..000000000000
--- a/src/chrome/content/rules/MindWeb.network.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Mindfactory.de.xml b/src/chrome/content/rules/Mindfactory.de.xml
index 9878e10e038f..e7343eeda105 100644
--- a/src/chrome/content/rules/Mindfactory.de.xml
+++ b/src/chrome/content/rules/Mindfactory.de.xml
@@ -8,10 +8,10 @@ Fetch error: http://mobile.mindfactory.de/ => https://mobile.mindfactory.de/: (5
     - blog.mindfactory.de (different content)
     - user.mindfactory.de (invalid, CN=www6.kd-menue.de)
 -->
-
+
 	
 	
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Mindhealthconnect.xml b/src/chrome/content/rules/Mindhealthconnect.xml
deleted file mode 100644
index c1f6cd4e4ba0..000000000000
--- a/src/chrome/content/rules/Mindhealthconnect.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-	
-
-	
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/MineMyTraffic.com.xml b/src/chrome/content/rules/MineMyTraffic.com.xml
deleted file mode 100644
index a2a4ca72f351..000000000000
--- a/src/chrome/content/rules/MineMyTraffic.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Minetest.ru.xml b/src/chrome/content/rules/Minetest.ru.xml
index 7ef10f35b859..20877175a5eb 100644
--- a/src/chrome/content/rules/Minetest.ru.xml
+++ b/src/chrome/content/rules/Minetest.ru.xml
@@ -11,7 +11,7 @@ Fetch error: http://minetest.ru/ => https://minetest.ru/: (60, 'SSL certificate
 	* Shows ^ over https
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/MingPao.com.xml b/src/chrome/content/rules/MingPao.com.xml
index db4867108ef6..27b2c923e27a 100644
--- a/src/chrome/content/rules/MingPao.com.xml
+++ b/src/chrome/content/rules/MingPao.com.xml
@@ -6,8 +6,8 @@
 		- www.jump.mingpao.com
 		- www.life.mingpao.com
 
-	SSL error: 
-		- mobilenews.mingpao.com		
+	SSL error:
+		- mobilenews.mingpao.com
 		- premium.mingpao.com
 		- tssl.mingpao.com
 		- video.mingpao.com
diff --git a/src/chrome/content/rules/MiniLock.io.xml b/src/chrome/content/rules/MiniLock.io.xml
index 8241d03ad817..cc52a766df6e 100644
--- a/src/chrome/content/rules/MiniLock.io.xml
+++ b/src/chrome/content/rules/MiniLock.io.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.minilock.io/ => https://www.minilock.io/: (6, 'Could not
 		- .minilock.io
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/MiniMundos_online.com.xml b/src/chrome/content/rules/MiniMundos_online.com.xml
deleted file mode 100644
index efd865948aad..000000000000
--- a/src/chrome/content/rules/MiniMundos_online.com.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-	
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Miniand-Tech.xml b/src/chrome/content/rules/Miniand-Tech.xml
index a4872b34fca2..053f9e26af95 100644
--- a/src/chrome/content/rules/Miniand-Tech.xml
+++ b/src/chrome/content/rules/Miniand-Tech.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.miniand.com/ => https://www.miniand.com/: (6, 'Could not
 	dl serves images only.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Miniclip.com.xml b/src/chrome/content/rules/Miniclip.com.xml
deleted file mode 100644
index 13b39a45d926..000000000000
--- a/src/chrome/content/rules/Miniclip.com.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Miniclip_CDN.com.xml b/src/chrome/content/rules/Miniclip_CDN.com.xml
index 750bb157eec8..f7d2d4750b5d 100644
--- a/src/chrome/content/rules/Miniclip_CDN.com.xml
+++ b/src/chrome/content/rules/Miniclip_CDN.com.xml
@@ -1,6 +1,3 @@
-
 
 	
 	
diff --git a/src/chrome/content/rules/Mining.Bitcoin.cz.xml b/src/chrome/content/rules/Mining.Bitcoin.cz.xml
index e54d42cac0ff..f335fbe8fbb1 100644
--- a/src/chrome/content/rules/Mining.Bitcoin.cz.xml
+++ b/src/chrome/content/rules/Mining.Bitcoin.cz.xml
@@ -1,18 +1,19 @@
 
 
 	
-	
-	
 
-	
 	
 
diff --git a/src/chrome/content/rules/Minix3.org.xml b/src/chrome/content/rules/Minix3.org.xml
index 623384972adc..43ef5d0e2274 100644
--- a/src/chrome/content/rules/Minix3.org.xml
+++ b/src/chrome/content/rules/Minix3.org.xml
@@ -1,22 +1,24 @@
 
-
-
-	
-	
-
+
+	
+	
+	
+	
+	
+	
 
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/Minnesota-Public-Radio.xml b/src/chrome/content/rules/Minnesota-Public-Radio.xml
index bbdc239b8c20..5baec3cb3f42 100644
--- a/src/chrome/content/rules/Minnesota-Public-Radio.xml
+++ b/src/chrome/content/rules/Minnesota-Public-Radio.xml
@@ -12,7 +12,9 @@
 -->
 
 
-	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Mint.com.xml b/src/chrome/content/rules/Mint.com.xml
new file mode 100644
index 000000000000..48f0f348c513
--- /dev/null
+++ b/src/chrome/content/rules/Mint.com.xml
@@ -0,0 +1,14 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Mint.xml b/src/chrome/content/rules/Mint.xml
deleted file mode 100644
index 86654d771d9f..000000000000
--- a/src/chrome/content/rules/Mint.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-  
-  
-
-  
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Minted.xml b/src/chrome/content/rules/Minted.xml
index 3f67f5c64778..7224c9aec399 100644
--- a/src/chrome/content/rules/Minted.xml
+++ b/src/chrome/content/rules/Minted.xml
@@ -60,12 +60,12 @@
 		to="https://www.minted.com/" />
 
 	
+		to="https://cdn3.minted.com/" />
 
 	
+		to="https://cdn4.minted.com/" />
 
 	
+		to="https://cdn5.minted.com/" />
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Mipay.com.xml b/src/chrome/content/rules/Mipay.com.xml
index 426922bd2e65..84dbc1af1440 100644
--- a/src/chrome/content/rules/Mipay.com.xml
+++ b/src/chrome/content/rules/Mipay.com.xml
@@ -12,4 +12,4 @@
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MirBSD.xml b/src/chrome/content/rules/MirBSD.xml
deleted file mode 100644
index 937a612bdebc..000000000000
--- a/src/chrome/content/rules/MirBSD.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Mirakar.com.xml b/src/chrome/content/rules/Mirakar.com.xml
index d1932c68af15..ab346fa7e068 100644
--- a/src/chrome/content/rules/Mirakar.com.xml
+++ b/src/chrome/content/rules/Mirakar.com.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://mirakar.com/ => https://www.mirakar.com/: (60, 'SSL certificate problem: certificate has expired')
 Fetch error: http://www.mirakar.com/ => https://www.mirakar.com/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Miramax.com.xml b/src/chrome/content/rules/Miramax.com.xml
index 42f78917eb62..c2cb9c9b279f 100644
--- a/src/chrome/content/rules/Miramax.com.xml
+++ b/src/chrome/content/rules/Miramax.com.xml
@@ -7,7 +7,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://miramax.com/ => https://miramax.com/: Cycle detected - URL already encountered: https://miramax.com/
 Fetch error: http://www.miramax.com/ => https://www.miramax.com/: Cycle detected - URL already encountered: https://www.miramax.com/
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://www.miramax.com/ => https://www.miramax.com/: Cycle detected
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Miranda-IM.xml b/src/chrome/content/rules/Miranda-IM.xml
index 0ac1b777e0a6..251148354d34 100644
--- a/src/chrome/content/rules/Miranda-IM.xml
+++ b/src/chrome/content/rules/Miranda-IM.xml
@@ -27,7 +27,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Mirantis.com.xml b/src/chrome/content/rules/Mirantis.com.xml
index d55cfaa46fe2..6c8b7351b85f 100644
--- a/src/chrome/content/rules/Mirantis.com.xml
+++ b/src/chrome/content/rules/Mirantis.com.xml
@@ -18,7 +18,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
-
-	
-	
-	
-
-	
-	
-
diff --git a/src/chrome/content/rules/Mirror_Image_Internet.xml b/src/chrome/content/rules/Mirror_Image_Internet.xml
index eadf045cc0a9..3fbd81de8233 100644
--- a/src/chrome/content/rules/Mirror_Image_Internet.xml
+++ b/src/chrome/content/rules/Mirror_Image_Internet.xml
@@ -8,4 +8,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Mirrorcreator.com.xml b/src/chrome/content/rules/Mirrorcreator.com.xml
index 5aacc166cf61..d81a5c92b526 100644
--- a/src/chrome/content/rules/Mirrorcreator.com.xml
+++ b/src/chrome/content/rules/Mirrorcreator.com.xml
@@ -7,4 +7,4 @@
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Misco.co.uk.xml b/src/chrome/content/rules/Misco.co.uk.xml
index a59226c459eb..71d53ee6ee31 100644
--- a/src/chrome/content/rules/Misco.co.uk.xml
+++ b/src/chrome/content/rules/Misco.co.uk.xml
@@ -9,7 +9,7 @@
 
 
 	
-	
+	
 		
diff --git a/src/chrome/content/rules/Mit-dem-rad-zur-arbeit.de.xml b/src/chrome/content/rules/Mit-dem-rad-zur-arbeit.de.xml
deleted file mode 100644
index 9c9e8e314328..000000000000
--- a/src/chrome/content/rules/Mit-dem-rad-zur-arbeit.de.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-  
-
-  
-
diff --git a/src/chrome/content/rules/Mitro.co.xml b/src/chrome/content/rules/Mitro.co.xml
index 44f05fe4672a..d00b98bdac27 100644
--- a/src/chrome/content/rules/Mitro.co.xml
+++ b/src/chrome/content/rules/Mitro.co.xml
@@ -5,7 +5,7 @@ Fetch error: http://mitro.co/ => https://mitro.co/: (7, 'Failed to connect to mi
 Fetch error: http://www.mitro.co/ => https://www.mitro.co/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/MivaCentral.xml b/src/chrome/content/rules/MivaCentral.xml
deleted file mode 100644
index 7a724877eacf..000000000000
--- a/src/chrome/content/rules/MivaCentral.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Miva_Merchant.xml b/src/chrome/content/rules/Miva_Merchant.xml
index e766dfdb5e31..458ebd7318b1 100644
--- a/src/chrome/content/rules/Miva_Merchant.xml
+++ b/src/chrome/content/rules/Miva_Merchant.xml
@@ -9,7 +9,6 @@ Fetch error: http://mivamerchant.com/ => https://mivamerchant.com/: (51, "SSL: n
 Fetch error: http://www.mivamerchant.com/ => https://www.mivamerchant.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.mivamerchant.com'")
 	Other Miva Merchant rulesets:
 
-		- MivaCentral.xml
 
 
 	CDN buckets:
@@ -22,7 +21,7 @@ Fetch error: http://www.mivamerchant.com/ => https://www.mivamerchant.com/: (51,
 		- ^	(cert only matches www)
 
 -->
-
+
 
 	
 	
@@ -33,4 +32,4 @@ Fetch error: http://www.mivamerchant.com/ => https://www.mivamerchant.com/: (51,
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MixBit.com.xml b/src/chrome/content/rules/MixBit.com.xml
index 9138ef0c3728..6265b4aeab45 100644
--- a/src/chrome/content/rules/MixBit.com.xml
+++ b/src/chrome/content/rules/MixBit.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://api.mixbit.com/ => https://api.mixbit.com/: (6, 'Could not resolve host: api.mixbit.com')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Mixi.xml b/src/chrome/content/rules/Mixi.xml
index d1e5995b972b..13bb5b84d2cb 100644
--- a/src/chrome/content/rules/Mixi.xml
+++ b/src/chrome/content/rules/Mixi.xml
@@ -23,7 +23,9 @@
 					-->
 		
 	
-	
+	
+	
+	
 	
 
 
@@ -33,10 +35,7 @@
 	
 
-	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Mixpanel.xml b/src/chrome/content/rules/Mixpanel.xml
index 8e328435d3d4..8178cd10c9e9 100644
--- a/src/chrome/content/rules/Mixpanel.xml
+++ b/src/chrome/content/rules/Mixpanel.xml
@@ -28,7 +28,7 @@
 					-->
 	
 
-	
+	
 
 
 	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Mixx.com.xml b/src/chrome/content/rules/Mixx.com.xml
index b5f0ff7f48ca..f0985ebad051 100644
--- a/src/chrome/content/rules/Mixx.com.xml
+++ b/src/chrome/content/rules/Mixx.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.mixx.com/ => https://www.mixx.com/: (28, 'Connection tim
 
 
 
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Mixxx.org.xml b/src/chrome/content/rules/Mixxx.org.xml
index 08eb8936804f..c1db912c61d2 100644
--- a/src/chrome/content/rules/Mixxx.org.xml
+++ b/src/chrome/content/rules/Mixxx.org.xml
@@ -13,6 +13,7 @@
 
 	
 	
+	
 
 
 	
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Mmixr.com.xml b/src/chrome/content/rules/Mmixr.com.xml
index 64a358f6e07c..7f99f4951f51 100644
--- a/src/chrome/content/rules/Mmixr.com.xml
+++ b/src/chrome/content/rules/Mmixr.com.xml
@@ -10,10 +10,11 @@ Fetch error: http://mmixr.com/ => https://www.mmixr.com/: (28, 'Connection timed
 		- ^	(shows app)
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
@@ -22,7 +23,6 @@ Fetch error: http://mmixr.com/ => https://www.mmixr.com/: (28, 'Connection timed
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Mmstat.com.xml b/src/chrome/content/rules/Mmstat.com.xml
index 8d6c43f23a2a..c68035667cb1 100644
--- a/src/chrome/content/rules/Mmstat.com.xml
+++ b/src/chrome/content/rules/Mmstat.com.xml
@@ -3,7 +3,7 @@
 
 	Mismatch:
 		- ^(www.)?
-	
+
 	Insecure cookies are set for these domains:
 
 		- .mmstat.com
diff --git a/src/chrome/content/rules/MoAF.org.xml b/src/chrome/content/rules/MoAF.org.xml
deleted file mode 100644
index 344fb73e5277..000000000000
--- a/src/chrome/content/rules/MoAF.org.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-	
-
-
-	
-	
-	
-	
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Moana_Surfrider.xml b/src/chrome/content/rules/Moana_Surfrider.xml
index f9c158511b04..7f84fd8f9461 100644
--- a/src/chrome/content/rules/Moana_Surfrider.xml
+++ b/src/chrome/content/rules/Moana_Surfrider.xml
@@ -16,4 +16,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Moat_ads.com.xml b/src/chrome/content/rules/Moat_ads.com.xml
index 3fe3a06bd8eb..b8e6f66215f8 100644
--- a/src/chrome/content/rules/Moat_ads.com.xml
+++ b/src/chrome/content/rules/Moat_ads.com.xml
@@ -40,7 +40,7 @@
 	
 
 
-	
 	
@@ -53,7 +53,7 @@
 			
 			
 
-	
-					
+
 
diff --git a/src/chrome/content/rules/Moava.xml b/src/chrome/content/rules/Moava.xml
index 95723b0d4fec..6fe41a6ce1fc 100644
--- a/src/chrome/content/rules/Moava.xml
+++ b/src/chrome/content/rules/Moava.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MobStac.xml b/src/chrome/content/rules/MobStac.xml
index 379e473047f0..e35703e70e16 100644
--- a/src/chrome/content/rules/MobStac.xml
+++ b/src/chrome/content/rules/MobStac.xml
@@ -5,7 +5,8 @@
 
 
 	
-	
+	
+	
 
 
 	
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Mobify.xml b/src/chrome/content/rules/Mobify.xml
index 328a6e14328f..3b051cda852b 100644
--- a/src/chrome/content/rules/Mobify.xml
+++ b/src/chrome/content/rules/Mobify.xml
@@ -1,8 +1,13 @@
+
 
+	
 	
 	
 
diff --git a/src/chrome/content/rules/Mobile01.com.xml b/src/chrome/content/rules/Mobile01.com.xml
index 54ada9c3e7e3..429826be5e98 100644
--- a/src/chrome/content/rules/Mobile01.com.xml
+++ b/src/chrome/content/rules/Mobile01.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://mobile01.com/ => https://mobile01.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Mobile_Asia_Expo.xml b/src/chrome/content/rules/Mobile_Asia_Expo.xml
index 07a1dac2e1e2..34a3275fba53 100644
--- a/src/chrome/content/rules/Mobile_Asia_Expo.xml
+++ b/src/chrome/content/rules/Mobile_Asia_Expo.xml
@@ -19,4 +19,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Mobile_Enterprise_360.com.xml b/src/chrome/content/rules/Mobile_Enterprise_360.com.xml
index 5ee80c5eccf1..328a8fa64ff8 100644
--- a/src/chrome/content/rules/Mobile_Enterprise_360.com.xml
+++ b/src/chrome/content/rules/Mobile_Enterprise_360.com.xml
@@ -6,7 +6,7 @@
 
 
 	
-	
+	
 
 
 	
@@ -15,4 +15,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Mobile_Nations.xml b/src/chrome/content/rules/Mobile_Nations.xml
index f498dc2006ff..faf0e9897e34 100644
--- a/src/chrome/content/rules/Mobile_Nations.xml
+++ b/src/chrome/content/rules/Mobile_Nations.xml
@@ -1,10 +1,8 @@
 
 
 
-	
-		
-
-
-	
-
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/Mobile_Vikings.xml b/src/chrome/content/rules/Mobile_Vikings.xml
index f457d5bd4d23..6f96fdd62210 100644
--- a/src/chrome/content/rules/Mobile_Vikings.xml
+++ b/src/chrome/content/rules/Mobile_Vikings.xml
@@ -20,4 +20,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Mobio_INsider.xml b/src/chrome/content/rules/Mobio_INsider.xml
index fcbb70bdd8da..dcc667a812c7 100644
--- a/src/chrome/content/rules/Mobio_INsider.xml
+++ b/src/chrome/content/rules/Mobio_INsider.xml
@@ -6,7 +6,7 @@ Fetch error: http://stage-mobioinsider.com/ => https://stage-mobioinsider.com/:
 Fetch error: http://www.stage-mobioinsider.com/ => https://www.stage-mobioinsider.com/: (28, 'Operation timed out after 30001 milliseconds with 0 bytes received')
 
 -->
-
+
 
 	
 	
@@ -20,4 +20,4 @@ Fetch error: http://www.stage-mobioinsider.com/ => https://www.stage-mobioinside
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Mobypicture.xml b/src/chrome/content/rules/Mobypicture.xml
index 1b2053271bc2..2289ea9ecce8 100644
--- a/src/chrome/content/rules/Mobypicture.xml
+++ b/src/chrome/content/rules/Mobypicture.xml
@@ -64,7 +64,7 @@ Fetch error: http://mobypicture.com/ => https://mobypicture.com/: (60, 'SSL cert
 	* Secured by us
 
 -->
-
+
 
 	
 	
@@ -96,6 +96,6 @@ Fetch error: http://mobypicture.com/ => https://mobypicture.com/: (60, 'SSL cert
 		to="https://d3l076gtvxuom7.cloudfront.net/" />
 
 	
+		to="https://vid.mobypicture.com/" />
 
 
diff --git a/src/chrome/content/rules/Mochtu.de.xml b/src/chrome/content/rules/Mochtu.de.xml
index 220114161c49..4065a1e9b687 100644
--- a/src/chrome/content/rules/Mochtu.de.xml
+++ b/src/chrome/content/rules/Mochtu.de.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.mochtu.de/ => https://mochtu.de/: (51, "SSL: no alternat
 		- walla.mochtu.de
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/ModArchive.org.xml b/src/chrome/content/rules/ModArchive.org.xml
new file mode 100644
index 000000000000..93c54e9ca817
--- /dev/null
+++ b/src/chrome/content/rules/ModArchive.org.xml
@@ -0,0 +1,26 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ModMyPi.xml b/src/chrome/content/rules/ModMyPi.xml
index 68cd0713041c..a01c2c543484 100644
--- a/src/chrome/content/rules/ModMyPi.xml
+++ b/src/chrome/content/rules/ModMyPi.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ModTheSims.info.xml b/src/chrome/content/rules/ModTheSims.info.xml
new file mode 100644
index 000000000000..d80ae07e19b1
--- /dev/null
+++ b/src/chrome/content/rules/ModTheSims.info.xml
@@ -0,0 +1,28 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Mod_DB.com.xml b/src/chrome/content/rules/Mod_DB.com.xml
index 8985e1b42dbd..52a3cb2e82a3 100644
--- a/src/chrome/content/rules/Mod_DB.com.xml
+++ b/src/chrome/content/rules/Mod_DB.com.xml
@@ -20,10 +20,11 @@
 -->
 
 
-	
+	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Model_Mayhem-problematic.xml b/src/chrome/content/rules/Model_Mayhem-problematic.xml
index f54194f9366b..d6e827df2678 100644
--- a/src/chrome/content/rules/Model_Mayhem-problematic.xml
+++ b/src/chrome/content/rules/Model_Mayhem-problematic.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Model_Mayhem.xml b/src/chrome/content/rules/Model_Mayhem.xml
index 18148eb88f85..cbaa02afe65d 100644
--- a/src/chrome/content/rules/Model_Mayhem.xml
+++ b/src/chrome/content/rules/Model_Mayhem.xml
@@ -13,7 +13,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Modern.IE.xml b/src/chrome/content/rules/Modern.IE.xml
index 742dff41a795..d4e4bb7a01a0 100644
--- a/src/chrome/content/rules/Modern.IE.xml
+++ b/src/chrome/content/rules/Modern.IE.xml
@@ -30,7 +30,7 @@ Fetch error: http://remote.modern.ie/ => https://remote.modern.ie/: (6, 'Could n
 	* Secured by us
 
 -->
-
+
 
 	
@@ -48,8 +48,8 @@ Fetch error: http://remote.modern.ie/ => https://remote.modern.ie/: (6, 'Could n
 	
 
 	
-	
-	
+
+
 	
 
diff --git a/src/chrome/content/rules/Modern_Giver.xml b/src/chrome/content/rules/Modern_Giver.xml
index 39a78375659b..eabe3bd1f081 100644
--- a/src/chrome/content/rules/Modern_Giver.xml
+++ b/src/chrome/content/rules/Modern_Giver.xml
@@ -8,7 +8,7 @@
 
 
 	
-	
+	
 	
 	
 
diff --git a/src/chrome/content/rules/Modernus.xml b/src/chrome/content/rules/Modernus.xml
index f6418a61ca28..ba0b434dfa74 100644
--- a/src/chrome/content/rules/Modernus.xml
+++ b/src/chrome/content/rules/Modernus.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Modicine.ru.xml b/src/chrome/content/rules/Modicine.ru.xml
new file mode 100644
index 000000000000..18c68d5cae92
--- /dev/null
+++ b/src/chrome/content/rules/Modicine.ru.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Modoee.com.xml b/src/chrome/content/rules/Modoee.com.xml
new file mode 100644
index 000000000000..5cc20ffb593c
--- /dev/null
+++ b/src/chrome/content/rules/Modoee.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ModrsBook.com.xml b/src/chrome/content/rules/ModrsBook.com.xml
new file mode 100644
index 000000000000..1c6d47fd6b2e
--- /dev/null
+++ b/src/chrome/content/rules/ModrsBook.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Modulus.io.xml b/src/chrome/content/rules/Modulus.io.xml
index 1078ba68b6b1..096a4db939ee 100644
--- a/src/chrome/content/rules/Modulus.io.xml
+++ b/src/chrome/content/rules/Modulus.io.xml
@@ -33,7 +33,7 @@ Fetch error: http://www.modulus.io/ => https://modulus.io/: (28, 'Connection tim
 		- .modulus.io
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Mofobian.com.xml b/src/chrome/content/rules/Mofobian.com.xml
index 1898e534a45b..afeb08316ea1 100644
--- a/src/chrome/content/rules/Mofobian.com.xml
+++ b/src/chrome/content/rules/Mofobian.com.xml
@@ -1,14 +1,9 @@
-
-
+
 
 	
 	
 
+	
 
-	
-
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Moja.tatrabanka.sk.xml b/src/chrome/content/rules/Moja.tatrabanka.sk.xml
deleted file mode 100644
index 08b6699c27c9..000000000000
--- a/src/chrome/content/rules/Moja.tatrabanka.sk.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-  
-
-  
-
diff --git a/src/chrome/content/rules/MojoHaus.org.xml b/src/chrome/content/rules/MojoHaus.org.xml
new file mode 100644
index 000000000000..ca431159f954
--- /dev/null
+++ b/src/chrome/content/rules/MojoHaus.org.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+
+	
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Mollom.xml b/src/chrome/content/rules/Mollom.xml
index e3b0fdcbe525..32765046c99c 100644
--- a/src/chrome/content/rules/Mollom.xml
+++ b/src/chrome/content/rules/Mollom.xml
@@ -19,7 +19,7 @@ Fetch error: http://wdc-api04.mollom.com/ => https://wdc-api04.mollom.com/: (28,
 		- xmlrpc2
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/MomentusMedia.xml b/src/chrome/content/rules/MomentusMedia.xml
deleted file mode 100644
index d0fb085b2a08..000000000000
--- a/src/chrome/content/rules/MomentusMedia.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-
-	
-  
-  
-
-  
-
-  
-
-	
-
diff --git a/src/chrome/content/rules/Mommys_Little_Sunshine.com.xml b/src/chrome/content/rules/Mommys_Little_Sunshine.com.xml
deleted file mode 100644
index 8526ba88a068..000000000000
--- a/src/chrome/content/rules/Mommys_Little_Sunshine.com.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-	
-		
-		
-		
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Monarch.co.uk.xml b/src/chrome/content/rules/Monarch.co.uk.xml
index 0a3e5adb81a4..d54bfff89c49 100644
--- a/src/chrome/content/rules/Monarch.co.uk.xml
+++ b/src/chrome/content/rules/Monarch.co.uk.xml
@@ -5,10 +5,10 @@ Fetch error: http://monarch.co.uk/ => https://www.monarch.co.uk/: (60, 'SSL cert
 Fetch error: http://www.monarch.co.uk/ => https://www.monarch.co.uk/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
   
   
 
   
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Monash.edu.xml b/src/chrome/content/rules/Monash.edu.xml
index 597b048e75ec..8d99a635fd50 100644
--- a/src/chrome/content/rules/Monash.edu.xml
+++ b/src/chrome/content/rules/Monash.edu.xml
@@ -25,7 +25,7 @@ Non-2xx HTTP code: http://login.monash.edu/ (200) => https://login.monash.edu/ (
 		- Images on (www.)? from www.monash.edu.au
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Mondemp3.com.xml b/src/chrome/content/rules/Mondemp3.com.xml
index 472f332156ed..3e2d6f74284c 100644
--- a/src/chrome/content/rules/Mondemp3.com.xml
+++ b/src/chrome/content/rules/Mondemp3.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.mondemp3.com/ => https://www.mondemp3.com/: (51, "SSL: n
 Disabled by https-everywhere-checker because:
 Fetch error: http://mondemp3.com/ => https://mondemp3.com/: (60, 'SSL certificate problem: self signed certificate')
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://mondemp3.com/ => https://mondemp3.com/: (60, 'SSL certificat
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Monetate.xml b/src/chrome/content/rules/Monetate.xml
index 6ffc20326ab0..622e460c38b2 100644
--- a/src/chrome/content/rules/Monetate.xml
+++ b/src/chrome/content/rules/Monetate.xml
@@ -17,14 +17,21 @@
 -->
 
 
-	
-
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
 
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Monex.co.jp.xml b/src/chrome/content/rules/Monex.co.jp.xml
index 4db72ede9ee0..7ec0ff98f108 100644
--- a/src/chrome/content/rules/Monex.co.jp.xml
+++ b/src/chrome/content/rules/Monex.co.jp.xml
@@ -21,7 +21,7 @@ Fetch error: http://its2.monex.co.jp/ => https://its2.monex.co.jp/: (28, 'Connec
 
 -->
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Money.pl-falsemixed.xml b/src/chrome/content/rules/Money.pl-falsemixed.xml
index 9f6db888e632..93707b9568c1 100644
--- a/src/chrome/content/rules/Money.pl-falsemixed.xml
+++ b/src/chrome/content/rules/Money.pl-falsemixed.xml
@@ -6,7 +6,7 @@ Fetch error: http://przetargi.money.pl/ => https://przetargi.money.pl/: Too many
 	For rules not causing false/broken MCB, see Money.pl.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Money.pl.xml b/src/chrome/content/rules/Money.pl.xml
index 3771d1c05b7b..6236235aede9 100644
--- a/src/chrome/content/rules/Money.pl.xml
+++ b/src/chrome/content/rules/Money.pl.xml
@@ -127,7 +127,7 @@ Fetch error: http://www.money.pl/ => https://www.money.pl/: Too many redirects w
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Money_Saving_Expert.com.xml b/src/chrome/content/rules/Money_Saving_Expert.com.xml
index 20a65365964f..10a1d51b5c0d 100644
--- a/src/chrome/content/rules/Money_Saving_Expert.com.xml
+++ b/src/chrome/content/rules/Money_Saving_Expert.com.xml
@@ -42,4 +42,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Moneybookers.xml b/src/chrome/content/rules/Moneybookers.xml
index 892e49d32d77..510c7efc7333 100644
--- a/src/chrome/content/rules/Moneybookers.xml
+++ b/src/chrome/content/rules/Moneybookers.xml
@@ -23,18 +23,16 @@
 -->
 
 
-	
+	
+	
 	
-	
+	
 
 
 	
 
 
-	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Mongabay.com.xml b/src/chrome/content/rules/Mongabay.com.xml
index 2cb557b47d92..08986b5349ac 100644
--- a/src/chrome/content/rules/Mongabay.com.xml
+++ b/src/chrome/content/rules/Mongabay.com.xml
@@ -42,4 +42,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MongoDB.com.xml b/src/chrome/content/rules/MongoDB.com.xml
index 6a335a107614..3c2f51f76eb2 100644
--- a/src/chrome/content/rules/MongoDB.com.xml
+++ b/src/chrome/content/rules/MongoDB.com.xml
@@ -12,6 +12,7 @@
 	
 	
+	
 	
 	
 	
diff --git a/src/chrome/content/rules/Monitis.com.xml b/src/chrome/content/rules/Monitis.com.xml
index edb459ebb302..17bfa8c0a9b0 100644
--- a/src/chrome/content/rules/Monitis.com.xml
+++ b/src/chrome/content/rules/Monitis.com.xml
@@ -28,10 +28,12 @@ Fetch error: http://monitis.com/ => https://www.monitis.com/: Cycle detected - U
 		- portal
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
 	
@@ -40,7 +42,6 @@ Fetch error: http://monitis.com/ => https://www.monitis.com/: Cycle detected - U
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/MonkeyBroker.net.xml b/src/chrome/content/rules/MonkeyBroker.net.xml
deleted file mode 100644
index 54ee72c09254..000000000000
--- a/src/chrome/content/rules/MonkeyBroker.net.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Monkeyking.ch.xml b/src/chrome/content/rules/Monkeyking.ch.xml
deleted file mode 100644
index a6b1526e6437..000000000000
--- a/src/chrome/content/rules/Monkeyking.ch.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Monkeys-Audio.xml b/src/chrome/content/rules/Monkeys-Audio.xml
deleted file mode 100644
index 15a6ce3bb0f2..000000000000
--- a/src/chrome/content/rules/Monkeys-Audio.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-	
-	
-	
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/MonkeysAudio.com.xml b/src/chrome/content/rules/MonkeysAudio.com.xml
new file mode 100644
index 000000000000..122885ffc919
--- /dev/null
+++ b/src/chrome/content/rules/MonkeysAudio.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Monmouthshire.gov.uk.xml b/src/chrome/content/rules/Monmouthshire.gov.uk.xml
index 6db9b1b8f067..0cc3b3f4d110 100644
--- a/src/chrome/content/rules/Monmouthshire.gov.uk.xml
+++ b/src/chrome/content/rules/Monmouthshire.gov.uk.xml
@@ -39,7 +39,7 @@ Fetch error: http://www.monmouthshire.gov.uk/ => https://www.monmouthshire.gov.u
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Mono-project.xml b/src/chrome/content/rules/Mono-project.xml
new file mode 100644
index 000000000000..72ae0e3c3121
--- /dev/null
+++ b/src/chrome/content/rules/Mono-project.xml
@@ -0,0 +1,12 @@
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Monoprice.xml b/src/chrome/content/rules/Monoprice.xml
index 15f55d8fd26c..d05d020d9906 100644
--- a/src/chrome/content/rules/Monoprice.xml
+++ b/src/chrome/content/rules/Monoprice.xml
@@ -5,7 +5,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -14,7 +15,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Monotype-Imaging.xml b/src/chrome/content/rules/Monotype-Imaging.xml
index b174aa25c398..ed34a92281e1 100644
--- a/src/chrome/content/rules/Monotype-Imaging.xml
+++ b/src/chrome/content/rules/Monotype-Imaging.xml
@@ -1,7 +1,6 @@
 
 
 
-	
+	
+	
 
 
 	 https://cookie.monster.com/: (60, 'SSL certificate problem: certificate has expired')
+Fetch error: http://oas.monster.com/ => https://oas.monster.com/: (60, 'SSL certificate problem: certificate has expired')
+
 	Other Monster rulesets:
 
 		- Admissions.com.xml
-		- Art_Schools.com.xml
-		- Cooking_Schools.com.xml
 		- Fastweb.com.xml
-		- MyResumeAgent.com.xml
 		- Newjobs.com.xml
 
 	Invalid certificate:
-			- advertising 
-			- career-services 
-			- inside 
-			- jdn 
-			- my 
-			- partner 
-			- promotion 
-			- resume 
+			- advertising
+			- career-services
+			- inside
+			- jdn
+			- my
+			- partner
+			- promotion
+			- resume
 	Time out:
-			- chat 
-			- company 
-			- jobs 
-			- jobsearch 
+			- chat
+			- company
+			- jobs
+			- jobsearch
 	Redirect to http:
 			- ^
 			- answers
@@ -32,11 +35,11 @@
 
 	
 	
-	
+	
 	
 	
 	
-	
+	
 
 	
 	
diff --git a/src/chrome/content/rules/MonsterDivx.com.xml b/src/chrome/content/rules/MonsterDivx.com.xml
deleted file mode 100644
index 6f38a39d4039..000000000000
--- a/src/chrome/content/rules/MonsterDivx.com.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Monster_WoW.xml b/src/chrome/content/rules/Monster_WoW.xml
index b84a115de4f9..417b4a6ccbaf 100644
--- a/src/chrome/content/rules/Monster_WoW.xml
+++ b/src/chrome/content/rules/Monster_WoW.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://forum.monster-wow.com/ => https://forum.monster-wow.com/: Too many redirects while fetching 'https://forum.monster-wow.com/'
 
 -->
-
+
 
 	
 	
@@ -12,9 +12,9 @@ Fetch error: http://forum.monster-wow.com/ => https://forum.monster-wow.com/: To
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Monthly_Review.org.xml b/src/chrome/content/rules/Monthly_Review.org.xml
index abb6e08ec287..cfb91fb8d51e 100644
--- a/src/chrome/content/rules/Monthly_Review.org.xml
+++ b/src/chrome/content/rules/Monthly_Review.org.xml
@@ -21,7 +21,7 @@ Fetch error: http://mrzine.monthlyreview.org/ => https://mrzine.monthlyreview.or
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Monty_Program.xml b/src/chrome/content/rules/Monty_Program.xml
index 9fce947d2630..d9b68d7d02c3 100644
--- a/src/chrome/content/rules/Monty_Program.xml
+++ b/src/chrome/content/rules/Monty_Program.xml
@@ -5,7 +5,7 @@
 	Other Monty Program rulesets:
 
 		- AskMonty.xml
-		- MariaDB.xml
+		- MariaDB.org.xml
 
 
 	Problematic subdomains:
diff --git a/src/chrome/content/rules/MoodSmith.com.xml b/src/chrome/content/rules/MoodSmith.com.xml
index 5ced8fe16b0c..48194938915f 100644
--- a/src/chrome/content/rules/MoodSmith.com.xml
+++ b/src/chrome/content/rules/MoodSmith.com.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Moodle.net-problematic.xml b/src/chrome/content/rules/Moodle.net-problematic.xml
index 0421e5d7a966..2eb77107c9da 100644
--- a/src/chrome/content/rules/Moodle.net-problematic.xml
+++ b/src/chrome/content/rules/Moodle.net-problematic.xml
@@ -2,7 +2,7 @@
 	For rules that are on by default, see Moodle.net.xml.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/MoonScript.org.xml b/src/chrome/content/rules/MoonScript.org.xml
new file mode 100644
index 000000000000..6dec8de0df90
--- /dev/null
+++ b/src/chrome/content/rules/MoonScript.org.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Moonfruit.com.xml b/src/chrome/content/rules/Moonfruit.com.xml
index a98b7b7d2f47..36ae0324e75b 100644
--- a/src/chrome/content/rules/Moonfruit.com.xml
+++ b/src/chrome/content/rules/Moonfruit.com.xml
@@ -19,14 +19,14 @@
 
 
 	
-	
+	
+	
 		
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Mooshi.com.au.xml b/src/chrome/content/rules/Mooshi.com.au.xml
deleted file mode 100644
index 55bfd388bf3f..000000000000
--- a/src/chrome/content/rules/Mooshi.com.au.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Moot.it.xml b/src/chrome/content/rules/Moot.it.xml
index f99f3b6c6237..da5a5f80bad0 100644
--- a/src/chrome/content/rules/Moot.it.xml
+++ b/src/chrome/content/rules/Moot.it.xml
@@ -21,7 +21,10 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
@@ -33,4 +36,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MootiPass.com.xml b/src/chrome/content/rules/MootiPass.com.xml
deleted file mode 100644
index 45be926b9b43..000000000000
--- a/src/chrome/content/rules/MootiPass.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Moovweb.xml b/src/chrome/content/rules/Moovweb.xml
index fb87e4101537..be0af42a846b 100644
--- a/src/chrome/content/rules/Moovweb.xml
+++ b/src/chrome/content/rules/Moovweb.xml
@@ -23,8 +23,11 @@
 
 
 	
-	
-	
+	
+	
+	
+	
+	
 
 
 	
@@ -33,10 +36,7 @@
 	
 
-	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Moreal.co.xml b/src/chrome/content/rules/Moreal.co.xml
deleted file mode 100644
index bf13660ddd90..000000000000
--- a/src/chrome/content/rules/Moreal.co.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Moreover-Technologies.xml b/src/chrome/content/rules/Moreover-Technologies.xml
index 5d40df258279..953a3335397a 100644
--- a/src/chrome/content/rules/Moreover-Technologies.xml
+++ b/src/chrome/content/rules/Moreover-Technologies.xml
@@ -6,13 +6,12 @@
 -->
 
 
-	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Morning_Star_Online.co.uk.xml b/src/chrome/content/rules/Morning_Star_Online.co.uk.xml
index 77709788b5e3..c01e45c3c6f2 100644
--- a/src/chrome/content/rules/Morning_Star_Online.co.uk.xml
+++ b/src/chrome/content/rules/Morning_Star_Online.co.uk.xml
@@ -10,7 +10,7 @@ Fetch error: http://shop.morningstaronline.co.uk/ => https://shop.morningstaronl
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Moroccan-Bazaar.xml b/src/chrome/content/rules/Moroccan-Bazaar.xml
deleted file mode 100644
index d19f77e8bef3..000000000000
--- a/src/chrome/content/rules/Moroccan-Bazaar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Morphis.com.xml b/src/chrome/content/rules/Morphis.com.xml
index d7560a57d1cb..a07cfa979635 100644
--- a/src/chrome/content/rules/Morphis.com.xml
+++ b/src/chrome/content/rules/Morphis.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.morphis.com/ => https://morphis.com/: (51, "SSL: no alte
 	www.morphis.com: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Morrisons.xml b/src/chrome/content/rules/Morrisons.xml
index 44c89cf34705..d95974262029 100644
--- a/src/chrome/content/rules/Morrisons.xml
+++ b/src/chrome/content/rules/Morrisons.xml
@@ -50,9 +50,15 @@ Fetch error: http://morrisons.com/ => https://morrisons.com/: (60, 'SSL certific
 
 
 	
-	
+	
+	
+	
+	
 	
-	
+	
+	
+	
+	
 
 
 	
@@ -64,7 +70,6 @@ Fetch error: http://morrisons.com/ => https://morrisons.com/: (60, 'SSL certific
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Morrisons_Cellar.com.xml b/src/chrome/content/rules/Morrisons_Cellar.com.xml
index 5a83436dba53..1faeb8894500 100644
--- a/src/chrome/content/rules/Morrisons_Cellar.com.xml
+++ b/src/chrome/content/rules/Morrisons_Cellar.com.xml
@@ -18,11 +18,11 @@ Fetch error: http://morrisonscellar.com/ => https://morrisonscellar.com/webapp/w
 	* Secured by us
 
 -->
-
+
 
 	
 	
-		
+
 
 	
 
diff --git a/src/chrome/content/rules/Mosh.org.xml b/src/chrome/content/rules/Mosh.org.xml
new file mode 100644
index 000000000000..571203759165
--- /dev/null
+++ b/src/chrome/content/rules/Mosh.org.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Moshimonsters.com.xml b/src/chrome/content/rules/Moshimonsters.com.xml
new file mode 100644
index 000000000000..470a19b338b1
--- /dev/null
+++ b/src/chrome/content/rules/Moshimonsters.com.xml
@@ -0,0 +1,24 @@
+
+
+    
+    
+    
+
+    
+
+    
+
diff --git a/src/chrome/content/rules/Moswarat.com.xml b/src/chrome/content/rules/Moswarat.com.xml
new file mode 100644
index 000000000000..9e3da3cdc6dd
--- /dev/null
+++ b/src/chrome/content/rules/Moswarat.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/MotherJones.com.xml b/src/chrome/content/rules/MotherJones.com.xml
index 82112b74f093..38010bc5a8bc 100644
--- a/src/chrome/content/rules/MotherJones.com.xml
+++ b/src/chrome/content/rules/MotherJones.com.xml
@@ -1,35 +1,15 @@
 
-
-
+
 	
-	
-
-
-	
-	
-
-	
-
-	
-
-	
+	
+	
+	
+	
+	
 
+	
 
diff --git a/src/chrome/content/rules/Motherpipe.co.uk.xml b/src/chrome/content/rules/Motherpipe.co.uk.xml
index f63bc554269b..bd4a8a0fce3b 100644
--- a/src/chrome/content/rules/Motherpipe.co.uk.xml
+++ b/src/chrome/content/rules/Motherpipe.co.uk.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.motherpipe.co.uk/ => https://www.motherpipe.co.uk/: (28,
 		- Motherpipe.com.xml
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Motherpipe.com.xml b/src/chrome/content/rules/Motherpipe.com.xml
index 5565546526ec..1b28da2551f4 100644
--- a/src/chrome/content/rules/Motherpipe.com.xml
+++ b/src/chrome/content/rules/Motherpipe.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://search.motherpipe.com/ => https://search.motherpipe.com/: (2
 	(www.)?motherpipe.com: Refused
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Motley-Fool-Australia.xml b/src/chrome/content/rules/Motley-Fool-Australia.xml
new file mode 100644
index 000000000000..732ac8fc59bc
--- /dev/null
+++ b/src/chrome/content/rules/Motley-Fool-Australia.xml
@@ -0,0 +1,13 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Motley-Fool-Canada.xml b/src/chrome/content/rules/Motley-Fool-Canada.xml
new file mode 100644
index 000000000000..0f2910925785
--- /dev/null
+++ b/src/chrome/content/rules/Motley-Fool-Canada.xml
@@ -0,0 +1,13 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Motley-Fool-Germany.xml b/src/chrome/content/rules/Motley-Fool-Germany.xml
new file mode 100644
index 000000000000..014c1c853f46
--- /dev/null
+++ b/src/chrome/content/rules/Motley-Fool-Germany.xml
@@ -0,0 +1,13 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Motley-Fool-Singapore.xml b/src/chrome/content/rules/Motley-Fool-Singapore.xml
new file mode 100644
index 000000000000..33ef4fe9cc8f
--- /dev/null
+++ b/src/chrome/content/rules/Motley-Fool-Singapore.xml
@@ -0,0 +1,13 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Motley-Fool-UK.xml b/src/chrome/content/rules/Motley-Fool-UK.xml
new file mode 100644
index 000000000000..c911aa461732
--- /dev/null
+++ b/src/chrome/content/rules/Motley-Fool-UK.xml
@@ -0,0 +1,26 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Motley-Fool.xml b/src/chrome/content/rules/Motley-Fool.xml
index 61929f68b76d..db7d54a0886a 100644
--- a/src/chrome/content/rules/Motley-Fool.xml
+++ b/src/chrome/content/rules/Motley-Fool.xml
@@ -1,74 +1,73 @@
 
-
-
-	
-	
-	
-		
-		
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-
-
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
 
diff --git a/src/chrome/content/rules/Moto-G.com.xml b/src/chrome/content/rules/Moto-G.com.xml
index ae84e1432631..d05a2f0fc8ff 100644
--- a/src/chrome/content/rules/Moto-G.com.xml
+++ b/src/chrome/content/rules/Moto-G.com.xml
@@ -20,7 +20,7 @@ Fetch error: http://www.moto-g.com/ => https://www.moto-g.com/: (60, 'SSL certif
 		- ^	(dropped)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Motorola.xml b/src/chrome/content/rules/Motorola.xml
index 5371ca8cf749..96666e132ced 100644
--- a/src/chrome/content/rules/Motorola.xml
+++ b/src/chrome/content/rules/Motorola.xml
@@ -67,7 +67,7 @@ Non-2xx HTTP code: http://www.motorola.de/ (200) => https://www.motorola.de/ (40
 	* Secured by us
 
 -->
-
+
 
 	
 		
@@ -79,7 +79,7 @@ Non-2xx HTTP code: http://www.motorola.de/ (200) => https://www.motorola.de/ (40
 
 	
 	
-	
+
 	
 	
 
@@ -87,19 +87,19 @@ Non-2xx HTTP code: http://www.motorola.de/ (200) => https://www.motorola.de/ (40
 	
 	
 	
-	
+
 	
-	
+
 	
 	
 	
-	
+
 	
-	
+
 	
-		
+
 	
 
 	 https://www.mototradeup.com/: (60, 'SSL
 	!www: mismatched, CN: mac.fairbanksllc.com
 
 -->
-
+
 
 	
-	
+	
 
 
 	
@@ -23,4 +23,4 @@ Fetch error: http://mototradeup.com/ => https://www.mototradeup.com/: (60, 'SSL
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Motricity.xml b/src/chrome/content/rules/Motricity.xml
index 9d7656bc0b58..e6f314745c7d 100644
--- a/src/chrome/content/rules/Motricity.xml
+++ b/src/chrome/content/rules/Motricity.xml
@@ -12,7 +12,7 @@ Fetch error: http://webshared.mcore.com/ => https://webshared.mcore.com/: (6, 'C
 		- sry.it.mcore.com
 
 -->
-
+
 
 	
 	
@@ -20,4 +20,4 @@ Fetch error: http://webshared.mcore.com/ => https://webshared.mcore.com/: (6, 'C
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Mount_Sinai.org.xml b/src/chrome/content/rules/Mount_Sinai.org.xml
index 1c2c15cbfe7a..9cd932537ba9 100644
--- a/src/chrome/content/rules/Mount_Sinai.org.xml
+++ b/src/chrome/content/rules/Mount_Sinai.org.xml
@@ -30,13 +30,14 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/MountaineeringMethodology.com.xml b/src/chrome/content/rules/MountaineeringMethodology.com.xml
new file mode 100644
index 000000000000..d3dcce65694d
--- /dev/null
+++ b/src/chrome/content/rules/MountaineeringMethodology.com.xml
@@ -0,0 +1,12 @@
+
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Mountspace.com.xml b/src/chrome/content/rules/Mountspace.com.xml
deleted file mode 100644
index 9e866b341858..000000000000
--- a/src/chrome/content/rules/Mountspace.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-  
-  
-  
-
-
diff --git a/src/chrome/content/rules/Mountyhall.com.xml b/src/chrome/content/rules/Mountyhall.com.xml
index 3f0b998da86a..33ab7c429614 100644
--- a/src/chrome/content/rules/Mountyhall.com.xml
+++ b/src/chrome/content/rules/Mountyhall.com.xml
@@ -19,7 +19,7 @@
 		phpmyadmin.mountyhall.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Mouseflow.xml b/src/chrome/content/rules/Mouseflow.xml
index 74fa041ad403..8c87ef2f1b9c 100644
--- a/src/chrome/content/rules/Mouseflow.xml
+++ b/src/chrome/content/rules/Mouseflow.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.mouseflow.nl/ => https://www.mouseflow.nl/: (28, 'Connec
 	Mismtached:
 		- go.mouseflow.com
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Mov.ad.xml b/src/chrome/content/rules/Mov.ad.xml
index 96790563ce2b..10097e16fb39 100644
--- a/src/chrome/content/rules/Mov.ad.xml
+++ b/src/chrome/content/rules/Mov.ad.xml
@@ -17,14 +17,14 @@
 		- reptracy.movad.net
 		- dev.reptracy.movad.net
 	-->
- 
+
 
- 
+
 	
 	
  	
 
  	
- 
-
\ No newline at end of file
+
+
diff --git a/src/chrome/content/rules/MoveOn.org-falsemixed.xml b/src/chrome/content/rules/MoveOn.org-falsemixed.xml
index e98ee2356b56..8dee75777009 100644
--- a/src/chrome/content/rules/MoveOn.org-falsemixed.xml
+++ b/src/chrome/content/rules/MoveOn.org-falsemixed.xml
@@ -5,18 +5,12 @@
 
 
 	
-	
-	
 
 
 	
 	
 
 
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/MoveOn.org.xml b/src/chrome/content/rules/MoveOn.org.xml
new file mode 100644
index 000000000000..9a6a5b766511
--- /dev/null
+++ b/src/chrome/content/rules/MoveOn.org.xml
@@ -0,0 +1,86 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/MoveOn.xml b/src/chrome/content/rules/MoveOn.xml
deleted file mode 100644
index d0842b33f7ca..000000000000
--- a/src/chrome/content/rules/MoveOn.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-	
-	
-
-		
-		
-
-	
-
-
diff --git a/src/chrome/content/rules/Moverall.com.xml b/src/chrome/content/rules/Moverall.com.xml
index 92ea9479654e..d5b6e87cea64 100644
--- a/src/chrome/content/rules/Moverall.com.xml
+++ b/src/chrome/content/rules/Moverall.com.xml
@@ -6,10 +6,11 @@ Fetch error: http://www.moverall.com/ => https://www.moverall.com/: (60, 'SSL ce
 Fetch error: http://moverall.com/ => https://www.moverall.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
-	
+	
+	
 	
 
 	
@@ -18,7 +19,7 @@ Fetch error: http://moverall.com/ => https://www.moverall.com/: (60, 'SSL certif
 	
 
 	
-	
 	
 
+	
 
diff --git a/src/chrome/content/rules/Movie2k.tv.xml b/src/chrome/content/rules/Movie2k.tv.xml
index 0780747d78c3..fb6dc003b8ec 100644
--- a/src/chrome/content/rules/Movie2k.tv.xml
+++ b/src/chrome/content/rules/Movie2k.tv.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.movie2k.pe/ => https://www.movie2k.pe/: (51, "SSL: no al
 
 movie2k.tv is on sale
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/MovieTH.com.xml b/src/chrome/content/rules/MovieTH.com.xml
deleted file mode 100644
index 1ce8dfe96d59..000000000000
--- a/src/chrome/content/rules/MovieTH.com.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/MovieTickets.com.xml b/src/chrome/content/rules/MovieTickets.com.xml
index dfb6cbf9da85..dd0a58b9e788 100644
--- a/src/chrome/content/rules/MovieTickets.com.xml
+++ b/src/chrome/content/rules/MovieTickets.com.xml
@@ -12,7 +12,7 @@ Non-2xx HTTP code: http://movietickets.com/ (200) => https://movietickets.com/ (
 			- reviews.movietickets.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Moviease.com.xml b/src/chrome/content/rules/Moviease.com.xml
index 91c22fba18bc..5c529b432320 100644
--- a/src/chrome/content/rules/Moviease.com.xml
+++ b/src/chrome/content/rules/Moviease.com.xml
@@ -1,7 +1,7 @@
 
 
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Moviefone.xml b/src/chrome/content/rules/Moviefone.xml
index 2da44c03cb72..14de066450c0 100644
--- a/src/chrome/content/rules/Moviefone.xml
+++ b/src/chrome/content/rules/Moviefone.xml
@@ -1,27 +1,11 @@
 
-
-
-	
-	
+
 
-	
-	
 	
+	
 
-		
-		
-
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/Moviemagnet.net.xml b/src/chrome/content/rules/Moviemagnet.net.xml
index 944a27d52187..1052940dd4e2 100644
--- a/src/chrome/content/rules/Moviemagnet.net.xml
+++ b/src/chrome/content/rules/Moviemagnet.net.xml
@@ -5,7 +5,7 @@ Fetch error: http://moviemagnet.net/ => https://moviemagnet.net/: (35, 'Unknown
 Fetch error: http://www.moviemagnet.net/ => https://www.moviemagnet.net/: (35, 'Unknown SSL protocol error in connection to www.moviemagnet.net:443 ')
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Movieposter.com.xml b/src/chrome/content/rules/Movieposter.com.xml
index af10d8d01ef9..adc881ec97bf 100644
--- a/src/chrome/content/rules/Movieposter.com.xml
+++ b/src/chrome/content/rules/Movieposter.com.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Moxie_Soft.com.xml b/src/chrome/content/rules/Moxie_Soft.com.xml
index 81e7b395d6fc..3abef4a69726 100644
--- a/src/chrome/content/rules/Moxie_Soft.com.xml
+++ b/src/chrome/content/rules/Moxie_Soft.com.xml
@@ -23,12 +23,14 @@ Fetch error: http://moxiesoft.com/ => https://moxiesoft.com/: (60, 'SSL certific
 	* Secured by us
 
 -->
-
+
 
 	
-	
+	
+	
 	
-	
+	
+	
 
 
 	
-
-
-	
-	
-	
-		
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Mozdev_Group.com.xml b/src/chrome/content/rules/Mozdev_Group.com.xml
index 7e9eaba6c815..e4cd01ffe4d4 100644
--- a/src/chrome/content/rules/Mozdev_Group.com.xml
+++ b/src/chrome/content/rules/Mozdev_Group.com.xml
@@ -23,7 +23,14 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Mozgvya.com.xml b/src/chrome/content/rules/Mozgvya.com.xml
new file mode 100644
index 000000000000..c769577b1fd5
--- /dev/null
+++ b/src/chrome/content/rules/Mozgvya.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Mozilla-Russia.org.xml b/src/chrome/content/rules/Mozilla-Russia.org.xml
index 81a4893b99c9..d07eff5bb1e2 100644
--- a/src/chrome/content/rules/Mozilla-Russia.org.xml
+++ b/src/chrome/content/rules/Mozilla-Russia.org.xml
@@ -31,7 +31,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Mozilla.com.xml b/src/chrome/content/rules/Mozilla.com.xml
index d27a7d4bd3e8..172c11a4f656 100644
--- a/src/chrome/content/rules/Mozilla.com.xml
+++ b/src/chrome/content/rules/Mozilla.com.xml
@@ -1,143 +1,62 @@
-
 
-
+
 
 	
 	
 
-		
+		
 
-			
-			
 			
-			
-			
-			
-
-		
-
-			
-			
-			
 
 		
 		
 		
-		
 		
 		
 		
 		
-		
 		
 		
 		
+		
 		
-		
-		
+		
+		
 		
 		
+		
 		
 		
 
 		
+		
 		
-		
 
 
-	
+	
 
 
-	
+	
 
-		
-		
-
-	
-	
+	
 
-		
 	
 
diff --git a/src/chrome/content/rules/Mozilla.net.xml b/src/chrome/content/rules/Mozilla.net.xml
index c33a392b9e98..d48d84834427 100644
--- a/src/chrome/content/rules/Mozilla.net.xml
+++ b/src/chrome/content/rules/Mozilla.net.xml
@@ -8,56 +8,38 @@
 			- hardhat.mozilla.net
 
 	Problematic hosts in *mozilla.net:
-		- download.cdn ¹
 		- hardhat ²
-		- www ³
-	¹ 404; mismatched, CN: gp1.wac.edgecastcdn.net
 	² Works; mismatched, CN: gp1.wac.edgecastcdn.net
-	³ Prompts for LDAP login; mismatched, CN: static-san.mozilla.org
-
-	Observed hosts in *mozilla.net:
-		- static-cdn.addons
-		- static-ssl-cdn.addons
-		- in *cdn
-			- activations
-			- addons
-			- air
-			- code
-			- developer
-			- download		(→ ftp.mozilla.org)
-			- download-installer
-			- fhr
-			- marketplace
-			- mozorg
-			- support
-			- versioncheck
-		- videos-cdn
-		- www			(→ www.mozilla.org)
-
-	Mixed content:
-		- Images on hardhat.cdn.mozilla.net from www.mozilla.org *
-		- Ad on activations.cdn.mozilla.net from getpocket.com *
-	* Secured by us
 -->
-
+
 
 	
+		
 		
-		
-		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+		
 
 	
 	
 		
 
-	
-		
-
-	
-	
-		
+	
 
 	
 
diff --git a/src/chrome/content/rules/Mozilla.xml b/src/chrome/content/rules/Mozilla.xml
index 08978ddfd5d8..55908ba52d1c 100644
--- a/src/chrome/content/rules/Mozilla.xml
+++ b/src/chrome/content/rules/Mozilla.xml
@@ -1,28 +1,33 @@
 
 
 
@@ -222,48 +89,43 @@
 
 				https://mail1.eff.org/pipermail/https-everywhere-rules/2013-June/001635.html
 													-->
-		
+		
 
 			
 			
 			
 			
-			
-			
-			
-			
-			
-			
 			
-			
-			
-			
-			
-			
 
 		
-		
 		
 		
 		
 		
+		
 		
 		
-		
 		
 		
 		
+		
+		
 		
 		
 		
 		
+		
 		
 		
 		
 		
+		
 		
-		
 		
+		
+		
+		
+		
 		
 
 
@@ -276,15 +138,8 @@
 	
 	
 
-	
-
-
-	
-
-		
 
 	
diff --git a/src/chrome/content/rules/Mozillalabs.com.xml b/src/chrome/content/rules/Mozillalabs.com.xml
new file mode 100644
index 000000000000..e8e36741fb14
--- /dev/null
+++ b/src/chrome/content/rules/Mozillalabs.com.xml
@@ -0,0 +1,24 @@
+
+
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Mozio.com.xml b/src/chrome/content/rules/Mozio.com.xml
new file mode 100644
index 000000000000..ecacac3d5ae6
--- /dev/null
+++ b/src/chrome/content/rules/Mozio.com.xml
@@ -0,0 +1,82 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Moztw.org.xml b/src/chrome/content/rules/Moztw.org.xml
index 16002f266056..9383d5d4eafb 100644
--- a/src/chrome/content/rules/Moztw.org.xml
+++ b/src/chrome/content/rules/Moztw.org.xml
@@ -3,7 +3,7 @@
 
 	Timeout:
 		- mozlinks
-		
+
 	Refused:
 		www	( equal to ^ )
 -->
@@ -12,10 +12,10 @@
 
 	
 	
-	
+
 	
 
-	
+
 	
 	
 
diff --git a/src/chrome/content/rules/Mp3-Juices.com.xml b/src/chrome/content/rules/Mp3-Juices.com.xml
deleted file mode 100644
index 7fbbf197cfe0..000000000000
--- a/src/chrome/content/rules/Mp3-Juices.com.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Mp3eee.com.xml b/src/chrome/content/rules/Mp3eee.com.xml
deleted file mode 100644
index 1b7cc5359319..000000000000
--- a/src/chrome/content/rules/Mp3eee.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/MrMondialisation.org.xml b/src/chrome/content/rules/MrMondialisation.org.xml
new file mode 100644
index 000000000000..ad5491ddcb62
--- /dev/null
+++ b/src/chrome/content/rules/MrMondialisation.org.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Mr_cote.info.xml b/src/chrome/content/rules/Mr_cote.info.xml
index 6349b852bca5..5ac3b426dead 100644
--- a/src/chrome/content/rules/Mr_cote.info.xml
+++ b/src/chrome/content/rules/Mr_cote.info.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.mrcote.info/ => https://www.mrcote.info/: (60, 'SSL cert
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Mrakopedia.org.xml b/src/chrome/content/rules/Mrakopedia.org.xml
deleted file mode 100644
index 494fde4ecdfa..000000000000
--- a/src/chrome/content/rules/Mrakopedia.org.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Mrlocksmith.com.xml b/src/chrome/content/rules/Mrlocksmith.com.xml
new file mode 100644
index 000000000000..f149552f3fbc
--- /dev/null
+++ b/src/chrome/content/rules/Mrlocksmith.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Mrs_McNastys.xml b/src/chrome/content/rules/Mrs_McNastys.xml
index 3844fa54f9d0..ceab4bbdfc2b 100644
--- a/src/chrome/content/rules/Mrs_McNastys.xml
+++ b/src/chrome/content/rules/Mrs_McNastys.xml
@@ -7,15 +7,15 @@ Fetch error: http://www.mrsmcnastys.com/ => https://www.mrsmcnastys.com/: (7, 'F
 Disabled by https-everywhere-checker because:
 Fetch error: http://mrsmcnastys.com/ => https://mrsmcnastys.com/: (7, 'Failed to connect to mrsmcnastys.com port 443: Connection refused')
 -->
-
+
 
 	
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MtGox.xml b/src/chrome/content/rules/MtGox.xml
index f812cd122609..df091c9148cd 100644
--- a/src/chrome/content/rules/MtGox.xml
+++ b/src/chrome/content/rules/MtGox.xml
@@ -4,16 +4,20 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://mtgox.com/ => https://mtgox.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
+	
+	
 
 
-	
+	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Mtstatic.com.xml b/src/chrome/content/rules/Mtstatic.com.xml
index 0db8bc9f65a6..772b928abb9a 100644
--- a/src/chrome/content/rules/Mtstatic.com.xml
+++ b/src/chrome/content/rules/Mtstatic.com.xml
@@ -1,15 +1,11 @@
 
-
 
+
 	
-
 		
+	
 
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/MujBiz.cz.xml b/src/chrome/content/rules/MujBiz.cz.xml
index 5818174d2b68..35db5f7db281 100644
--- a/src/chrome/content/rules/MujBiz.cz.xml
+++ b/src/chrome/content/rules/MujBiz.cz.xml
@@ -15,4 +15,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MultiSeek.xml b/src/chrome/content/rules/MultiSeek.xml
index 05d96eb3d04c..4b3f0848f275 100644
--- a/src/chrome/content/rules/MultiSeek.xml
+++ b/src/chrome/content/rules/MultiSeek.xml
@@ -6,7 +6,7 @@ Fetch error: http://mail.multiseek.net/ => https://mail.multiseek.net/: (51, "SS
 	www.multiseek.net: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/MultiSoft.xml b/src/chrome/content/rules/MultiSoft.xml
index 9e84032155b0..b9b0df07505b 100644
--- a/src/chrome/content/rules/MultiSoft.xml
+++ b/src/chrome/content/rules/MultiSoft.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Multicast_Media.xml b/src/chrome/content/rules/Multicast_Media.xml
index 49e1290cc4f7..dd6065e287be 100644
--- a/src/chrome/content/rules/Multicast_Media.xml
+++ b/src/chrome/content/rules/Multicast_Media.xml
@@ -10,7 +10,7 @@ Fetch error: http://multicastmedia.com/ => https://www.kitd.com/multicast/: (51,
 		- (www.)	(mismatched, CN: *.kitd.com)
 
 -->
-
+
 
 	
 	
@@ -25,4 +25,4 @@ Fetch error: http://multicastmedia.com/ => https://www.kitd.com/multicast/: (51,
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Multicore-DevCon.com.xml b/src/chrome/content/rules/Multicore-DevCon.com.xml
index 6302dc0082b4..835fe0666228 100644
--- a/src/chrome/content/rules/Multicore-DevCon.com.xml
+++ b/src/chrome/content/rules/Multicore-DevCon.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://multicore-devcon.com/ => https://multicore-devcon.com/: (60,
 Fetch error: http://www.multicore-devcon.com/ => https://www.multicore-devcon.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Multinationales.org.xml b/src/chrome/content/rules/Multinationales.org.xml
new file mode 100644
index 000000000000..b50a4ec7a2a8
--- /dev/null
+++ b/src/chrome/content/rules/Multinationales.org.xml
@@ -0,0 +1,8 @@
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Multiply.xml b/src/chrome/content/rules/Multiply.xml
index a71c152e10d1..99a07d0e8b71 100644
--- a/src/chrome/content/rules/Multiply.xml
+++ b/src/chrome/content/rules/Multiply.xml
@@ -9,7 +9,7 @@ Fetch error: http://multiply.com/ => https://multiply.com/: (51, "SSL: no altern
 		- multiply	(ditto)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Mumzworld.com.xml b/src/chrome/content/rules/Mumzworld.com.xml
index 2239a687f7fc..597056bb6f81 100644
--- a/src/chrome/content/rules/Mumzworld.com.xml
+++ b/src/chrome/content/rules/Mumzworld.com.xml
@@ -22,7 +22,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Muni.cz.xml b/src/chrome/content/rules/Muni.cz.xml
index 21a66966eeb7..a97dcf50f705 100644
--- a/src/chrome/content/rules/Muni.cz.xml
+++ b/src/chrome/content/rules/Muni.cz.xml
@@ -9,13 +9,13 @@
 
 
 	Nonfunctional subdomains:
-	
+
 		- 95 ¹
 		- patat06 ²
 		- science ³
 		- (www.)veda ³
 		- www.video ⁴
-		
+
 	¹ Shows webserver.ics; mismatched, CN: webserver.ics.muni.cz
 	² Shows marach.ics; mismatched, CN: www.cerit.cz
 	³ Shows morwen2.rect; mismatched, CN: morwen2.rect.muni.cz
@@ -51,8 +51,8 @@
 		- (www.)kite *
 
 	* $ redirects to http
-	
-	
+
+
 	Fully covered subdomains:
 
 		- (www.)
@@ -88,7 +88,7 @@
 	Observed cookie domains:
 
 		- cic
-		- czs 
+		- czs
 		- em2il
 		- www.em2il
 		- idp2.ics
diff --git a/src/chrome/content/rules/Muqri.com.xml b/src/chrome/content/rules/Muqri.com.xml
new file mode 100644
index 000000000000..4cec05fbd39f
--- /dev/null
+++ b/src/chrome/content/rules/Muqri.com.xml
@@ -0,0 +1,36 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/MusaFurber.com.xml b/src/chrome/content/rules/MusaFurber.com.xml
new file mode 100644
index 000000000000..46e011b4f0cb
--- /dev/null
+++ b/src/chrome/content/rules/MusaFurber.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Muse.mu.xml b/src/chrome/content/rules/Muse.mu.xml
index 21d145aabb5d..02cb311d8c9b 100644
--- a/src/chrome/content/rules/Muse.mu.xml
+++ b/src/chrome/content/rules/Muse.mu.xml
@@ -34,7 +34,7 @@ Fetch error: http://muse-cdn.warnerartists.com/ => https://muse-cdn.warnerartist
 		- Images on preorder from wmiuk.edgeboss.net
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Muselive.com.xml b/src/chrome/content/rules/Muselive.com.xml
index 4f7f9770cdae..2a31bdc4ee9e 100644
--- a/src/chrome/content/rules/Muselive.com.xml
+++ b/src/chrome/content/rules/Muselive.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://community.muselive.com/ => https://community.muselive.com/:
 		- community.muselive.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Museodelprado.es.xml b/src/chrome/content/rules/Museodelprado.es.xml
index 03c3536ab3f3..80eb9810b248 100644
--- a/src/chrome/content/rules/Museodelprado.es.xml
+++ b/src/chrome/content/rules/Museodelprado.es.xml
@@ -9,12 +9,12 @@ Fetch error: http://static.museodelprado.es/ => https://static.museodelprado.es/
 Fetch error: http://museodelprado.es/ => https://museodelprado.es/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
 	
 	
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/MusicPD.org.xml b/src/chrome/content/rules/MusicPD.org.xml
new file mode 100644
index 000000000000..af1d7c6d25ef
--- /dev/null
+++ b/src/chrome/content/rules/MusicPD.org.xml
@@ -0,0 +1,22 @@
+
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Musicians_Friend.xml b/src/chrome/content/rules/Musicians_Friend.xml
index 5e7e4b9cbf5c..a06805b7509d 100644
--- a/src/chrome/content/rules/Musicians_Friend.xml
+++ b/src/chrome/content/rules/Musicians_Friend.xml
@@ -17,10 +17,12 @@ Non-2xx HTTP code: http://musiciansfriend.com/ (200) => http://musiciansfriend.c
 	At least some pages redirect to http.
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
 	
@@ -32,4 +34,4 @@ Non-2xx HTTP code: http://musiciansfriend.com/ (200) => http://musiciansfriend.c
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Musicmetric.xml b/src/chrome/content/rules/Musicmetric.xml
index bf11e4a964ce..0f0245264af1 100644
--- a/src/chrome/content/rules/Musicmetric.xml
+++ b/src/chrome/content/rules/Musicmetric.xml
@@ -19,7 +19,7 @@ Fetch error: http://knowledgebase.musicmetric.com/ => https://knowledgebase.musi
 		- knowledgebase.musicmetric.com
 
 -->
-
+
 
 	
@@ -31,7 +31,7 @@ Fetch error: http://knowledgebase.musicmetric.com/ => https://knowledgebase.musi
 					-->
 	
 
-	
+	
 
 
 	
 
 	
-	
+	
+	
+	
+	
+	
+	
 		
 
 
@@ -34,7 +39,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/MusikhusetAarhus.dk.xml b/src/chrome/content/rules/MusikhusetAarhus.dk.xml
new file mode 100644
index 000000000000..afd737ed635e
--- /dev/null
+++ b/src/chrome/content/rules/MusikhusetAarhus.dk.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Musl-libc.org.xml b/src/chrome/content/rules/Musl-libc.org.xml
index 52badceae5ed..ea7fa546cd75 100644
--- a/src/chrome/content/rules/Musl-libc.org.xml
+++ b/src/chrome/content/rules/Musl-libc.org.xml
@@ -1,21 +1,10 @@
-
-
-
+
+	
+	
+	
 	
 
-
-	
-	
-
+	
 
 	
-
 
diff --git a/src/chrome/content/rules/MuslimIssues.com.xml b/src/chrome/content/rules/MuslimIssues.com.xml
deleted file mode 100644
index 114ff918725e..000000000000
--- a/src/chrome/content/rules/MuslimIssues.com.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/MuslimsCondemn.com.xml b/src/chrome/content/rules/MuslimsCondemn.com.xml
deleted file mode 100644
index 0a244c0fa220..000000000000
--- a/src/chrome/content/rules/MuslimsCondemn.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/MuslimsDiscuss.com.xml b/src/chrome/content/rules/MuslimsDiscuss.com.xml
deleted file mode 100644
index 14b186bd88a2..000000000000
--- a/src/chrome/content/rules/MuslimsDiscuss.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-	
-
diff --git a/src/chrome/content/rules/Muspy.xml b/src/chrome/content/rules/Muspy.xml
index 75cdbd17b20f..f31f2ce4ea23 100644
--- a/src/chrome/content/rules/Muspy.xml
+++ b/src/chrome/content/rules/Muspy.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Mutoon.one.xml b/src/chrome/content/rules/Mutoon.one.xml
new file mode 100644
index 000000000000..744f0618b9b2
--- /dev/null
+++ b/src/chrome/content/rules/Mutoon.one.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Mutt.org.xml b/src/chrome/content/rules/Mutt.org.xml
deleted file mode 100644
index 85b09039e983..000000000000
--- a/src/chrome/content/rules/Mutt.org.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Mutterschaftsgeld.de.xml b/src/chrome/content/rules/Mutterschaftsgeld.de.xml
index 31c18b441755..f8aa6aa47bf6 100644
--- a/src/chrome/content/rules/Mutterschaftsgeld.de.xml
+++ b/src/chrome/content/rules/Mutterschaftsgeld.de.xml
@@ -1,8 +1,8 @@
-
+
 
 	
 	
-	
+
 	
 
 
diff --git a/src/chrome/content/rules/Mux.de.xml b/src/chrome/content/rules/Mux.de.xml
index 2f7515d3d13f..f71d953d4501 100644
--- a/src/chrome/content/rules/Mux.de.xml
+++ b/src/chrome/content/rules/Mux.de.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.mux.de/ => https://www.mux.de/: Too many redirects while
 	- reichenbachdelikatessen.mux.de
 	- bidjanbek.mux.de
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Mvnrepository.com.xml b/src/chrome/content/rules/Mvnrepository.com.xml
new file mode 100644
index 000000000000..58c8f35ddcd5
--- /dev/null
+++ b/src/chrome/content/rules/Mvnrepository.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Mwave.com.au.xml b/src/chrome/content/rules/Mwave.com.au.xml
new file mode 100644
index 000000000000..91e00d1c4e33
--- /dev/null
+++ b/src/chrome/content/rules/Mwave.com.au.xml
@@ -0,0 +1,17 @@
+
+
+
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Mwave.xml b/src/chrome/content/rules/Mwave.xml
deleted file mode 100644
index 0bbfd451619d..000000000000
--- a/src/chrome/content/rules/Mwave.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Mxptint.net.xml b/src/chrome/content/rules/Mxptint.net.xml
index 82345085fee9..6a73ba27b14e 100644
--- a/src/chrome/content/rules/Mxptint.net.xml
+++ b/src/chrome/content/rules/Mxptint.net.xml
@@ -1,31 +1,51 @@
 
 
 
 	
+
+	
+	
+	
+	
+	
+	
 	
+	
+	
+	
+	
 	
-
-
-	
-	
+	
+	
+	
+	
+	
+	
+	
+	
 
 	
 
-
 	
 
diff --git a/src/chrome/content/rules/My-Aime.net.xml b/src/chrome/content/rules/My-Aime.net.xml
new file mode 100644
index 000000000000..6f23c565d680
--- /dev/null
+++ b/src/chrome/content/rules/My-Aime.net.xml
@@ -0,0 +1,11 @@
+
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/My-Files.xml b/src/chrome/content/rules/My-Files.xml
index cd2629a090db..b4fa63340e6d 100644
--- a/src/chrome/content/rules/My-Files.xml
+++ b/src/chrome/content/rules/My-Files.xml
@@ -6,7 +6,7 @@ Fetch error: http://w01.my-files.de/ => https://w01.my-files.de/: (60, 'SSL cert
 Disabled by https-everywhere-checker because:
 Fetch error: http://w01.my-files.de/ => https://w01.my-files.de/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/My.com.xml b/src/chrome/content/rules/My.com.xml
index 1721aad6db13..ee17f7707d3f 100644
--- a/src/chrome/content/rules/My.com.xml
+++ b/src/chrome/content/rules/My.com.xml
@@ -14,8 +14,7 @@
 
     
     
-	
-	
+
 	
 	
 	
@@ -37,7 +36,6 @@
 	
 	
 	
-	
 	
 
     
diff --git a/src/chrome/content/rules/MyAMS.org.xml b/src/chrome/content/rules/MyAMS.org.xml
new file mode 100644
index 000000000000..cd2e15239513
--- /dev/null
+++ b/src/chrome/content/rules/MyAMS.org.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/MyBB_Central.xml b/src/chrome/content/rules/MyBB_Central.xml
index 3d501443db24..2b5ce5cb3624 100644
--- a/src/chrome/content/rules/MyBB_Central.xml
+++ b/src/chrome/content/rules/MyBB_Central.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MyBetter.com.xml b/src/chrome/content/rules/MyBetter.com.xml
index 40a9d1aada3f..6322855ef60c 100644
--- a/src/chrome/content/rules/MyBetter.com.xml
+++ b/src/chrome/content/rules/MyBetter.com.xml
@@ -15,19 +15,17 @@ Fetch error: http://mybetter.com/ => https://mybetter.com/: (60, 'SSL certificat
 		- server2...:2222
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
 
 
-	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/MyBuys.xml b/src/chrome/content/rules/MyBuys.xml
index 9ab1ca1c7f7b..781079adca73 100644
--- a/src/chrome/content/rules/MyBuys.xml
+++ b/src/chrome/content/rules/MyBuys.xml
@@ -51,7 +51,12 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/MyCalendar.xml b/src/chrome/content/rules/MyCalendar.xml
deleted file mode 100644
index 3ab4aad17076..000000000000
--- a/src/chrome/content/rules/MyCalendar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/MyCharity.ie.xml b/src/chrome/content/rules/MyCharity.ie.xml
index be7342991725..2add9da0b56b 100644
--- a/src/chrome/content/rules/MyCharity.ie.xml
+++ b/src/chrome/content/rules/MyCharity.ie.xml
@@ -5,7 +5,7 @@ Fetch error: http://mycharity.ie/ => https://www.mycharity.ie/: (7, 'Failed to c
 Fetch error: http://www.mycharity.ie/ => https://www.mycharity.ie/: (7, 'Failed to connect to www.mycharity.ie port 443: Connection refused')
 
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/MyChart.xml b/src/chrome/content/rules/MyChart.xml
index 42ecbd2d8564..04f201679b6f 100644
--- a/src/chrome/content/rules/MyChart.xml
+++ b/src/chrome/content/rules/MyChart.xml
@@ -1,10 +1,10 @@
 
 
 	
-	
+	
 
 
-	
+	
 
 
 	
@@ -9,12 +23,32 @@
 
 	
 	
-
-
-	
-
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
 
 
diff --git a/src/chrome/content/rules/MyEdAccount.Com.xml b/src/chrome/content/rules/MyEdAccount.Com.xml
deleted file mode 100644
index ec1940db73b6..000000000000
--- a/src/chrome/content/rules/MyEdAccount.Com.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/MyEtherWallet.com.xml b/src/chrome/content/rules/MyEtherWallet.com.xml
deleted file mode 100644
index 9f3aadb15326..000000000000
--- a/src/chrome/content/rules/MyEtherWallet.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/MyFBO.com.xml b/src/chrome/content/rules/MyFBO.com.xml
index e5205ca39968..d8d43095fcbd 100644
--- a/src/chrome/content/rules/MyFBO.com.xml
+++ b/src/chrome/content/rules/MyFBO.com.xml
@@ -19,7 +19,7 @@
 	
 	
 	
-	
+
 	
 
 	
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/MyFreeCopyright.com.xml b/src/chrome/content/rules/MyFreeCopyright.com.xml
deleted file mode 100644
index 916088d04991..000000000000
--- a/src/chrome/content/rules/MyFreeCopyright.com.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/MyGirlFund.xml b/src/chrome/content/rules/MyGirlFund.xml
index cd88e0ee0f95..174a96c78244 100644
--- a/src/chrome/content/rules/MyGirlFund.xml
+++ b/src/chrome/content/rules/MyGirlFund.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MyGoxClaim.com.xml b/src/chrome/content/rules/MyGoxClaim.com.xml
deleted file mode 100644
index 3ace003f066b..000000000000
--- a/src/chrome/content/rules/MyGoxClaim.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/MyInteriorDecorator.com.xml b/src/chrome/content/rules/MyInteriorDecorator.com.xml
index 169d91a77578..85f4725be6bc 100644
--- a/src/chrome/content/rules/MyInteriorDecorator.com.xml
+++ b/src/chrome/content/rules/MyInteriorDecorator.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.myinteriordecorator.com/ => https://www.myinteriordecora
 Disabled by https-everywhere-checker because:
 Fetch error: http://myinteriordecorator.com/ => https://myinteriordecorator.com/: (51, "SSL: no alternative certificate subject name matches target host name 'myinteriordecorator.com'")
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://myinteriordecorator.com/ => https://myinteriordecorator.com/
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MyLeague.xml b/src/chrome/content/rules/MyLeague.xml
index e50580b7b57e..422fafff115f 100644
--- a/src/chrome/content/rules/MyLeague.xml
+++ b/src/chrome/content/rules/MyLeague.xml
@@ -8,7 +8,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/MyLifetime.com.xml b/src/chrome/content/rules/MyLifetime.com.xml
index daba5f007c56..5a1b518b9340 100644
--- a/src/chrome/content/rules/MyLifetime.com.xml
+++ b/src/chrome/content/rules/MyLifetime.com.xml
@@ -64,7 +64,7 @@ Fetch error: http://ssos.mylifetime.com/ => https://ssos.mylifetime.com/: (6, 'C
 	* → akamai
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/MyLikes.xml b/src/chrome/content/rules/MyLikes.xml
index 618d8bd21180..cfbb9ada2c17 100644
--- a/src/chrome/content/rules/MyLikes.xml
+++ b/src/chrome/content/rules/MyLikes.xml
@@ -22,14 +22,15 @@ Fetch error: http://mlv-cdn.com/ => https://mylikes.com/: (28, 'Connection timed
 	- www.mlv-cdn.com doesn't exist
 
 -->
-
+
 
 	
 	
 	
 	
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/MyPlayDirect.xml b/src/chrome/content/rules/MyPlayDirect.xml
index cc436ffba7b3..52c717c99245 100644
--- a/src/chrome/content/rules/MyPlayDirect.xml
+++ b/src/chrome/content/rules/MyPlayDirect.xml
@@ -5,11 +5,11 @@ Fetch error: http://myplaydirect.com/ => https://www.myplaydirect.com/: (60, 'SS
 Fetch error: http://www.myplaydirect.com/ => https://www.myplaydirect.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/MyResumeAgent.com.xml b/src/chrome/content/rules/MyResumeAgent.com.xml
deleted file mode 100644
index f42f334a5c26..000000000000
--- a/src/chrome/content/rules/MyResumeAgent.com.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/MySQL.xml b/src/chrome/content/rules/MySQL.xml
index 05c940db822a..690226bd8e89 100644
--- a/src/chrome/content/rules/MySQL.xml
+++ b/src/chrome/content/rules/MySQL.xml
@@ -1,13 +1,5 @@
 
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/MySkreen.com.xml b/src/chrome/content/rules/MySkreen.com.xml
index b2550519a5f0..57145515ffb5 100644
--- a/src/chrome/content/rules/MySkreen.com.xml
+++ b/src/chrome/content/rules/MySkreen.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://medias.myskreen.com/ => https://medias.myskreen.com/: (60, '
 		- www	(redirects to http, valid cert)
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/MySociety.org.xml b/src/chrome/content/rules/MySociety.org.xml
index ea1d9fc9fb8d..06922e9f44b8 100644
--- a/src/chrome/content/rules/MySociety.org.xml
+++ b/src/chrome/content/rules/MySociety.org.xml
@@ -8,7 +8,7 @@ Fetch error: http://mysociety.org/ => https://mysociety.org/: (51, "SSL: no alte
 		- www.mysociety.org
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/MyStockOptions.com.xml b/src/chrome/content/rules/MyStockOptions.com.xml
index 1c2ae95e91c0..6d6def4fc041 100644
--- a/src/chrome/content/rules/MyStockOptions.com.xml
+++ b/src/chrome/content/rules/MyStockOptions.com.xml
@@ -7,7 +7,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/MyTextGraphics.com.xml b/src/chrome/content/rules/MyTextGraphics.com.xml
index 334f35797753..d49e8388a6b0 100644
--- a/src/chrome/content/rules/MyTextGraphics.com.xml
+++ b/src/chrome/content/rules/MyTextGraphics.com.xml
@@ -52,4 +52,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/MyWOT.xml b/src/chrome/content/rules/MyWOT.xml
index 85f6e3b5ac9d..6258d5df3070 100644
--- a/src/chrome/content/rules/MyWOT.xml
+++ b/src/chrome/content/rules/MyWOT.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.mywot.net/ => https://www.mywot.net/: (51, "SSL: no alte
 		- d203dmbd9wdx7j.cloudfront.net
 -->
 
-
+
 
 	
 	
@@ -17,7 +17,7 @@ Fetch error: http://www.mywot.net/ => https://www.mywot.net/: (51, "SSL: no alte
 	
 	
 	
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/MyWell-Being.com.xml b/src/chrome/content/rules/MyWell-Being.com.xml
index 49119f604b9a..662ca6c09c46 100644
--- a/src/chrome/content/rules/MyWell-Being.com.xml
+++ b/src/chrome/content/rules/MyWell-Being.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://www.mywell-being.com/ => https://www.mywell-being.com/: (28,
 
 
 -->
-
+
 
 	
 	
@@ -22,4 +22,4 @@ Fetch error: http://www.mywell-being.com/ => https://www.mywell-being.com/: (28,
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/My_Aloe_Cleanse.com.xml b/src/chrome/content/rules/My_Aloe_Cleanse.com.xml
deleted file mode 100644
index b083ceaa8e57..000000000000
--- a/src/chrome/content/rules/My_Aloe_Cleanse.com.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/My_Healthcare_Contacts.xml b/src/chrome/content/rules/My_Healthcare_Contacts.xml
deleted file mode 100644
index da98f12a52a7..000000000000
--- a/src/chrome/content/rules/My_Healthcare_Contacts.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/My_InMon.com.xml b/src/chrome/content/rules/My_InMon.com.xml
index bf946feb56be..54822c49020d 100644
--- a/src/chrome/content/rules/My_InMon.com.xml
+++ b/src/chrome/content/rules/My_InMon.com.xml
@@ -7,7 +7,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/My_OptPlus_secure.com.xml b/src/chrome/content/rules/My_OptPlus_secure.com.xml
index a95ed440b4e1..c2b4a6e87c3e 100644
--- a/src/chrome/content/rules/My_OptPlus_secure.com.xml
+++ b/src/chrome/content/rules/My_OptPlus_secure.com.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://myoptplussecure.com/ => https://myoptplussecure.com/: (7, 'Failed to connect to myoptplussecure.com port 80: Connection refused')
 Fetch error: http://www.myoptplussecure.com/ => https://www.myoptplussecure.com/: (7, 'Failed to connect to www.myoptplussecure.com port 80: Connection refused')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/My_OptimizerPlus.com.xml b/src/chrome/content/rules/My_OptimizerPlus.com.xml
index 9b762fcb0ac6..c798bd400522 100644
--- a/src/chrome/content/rules/My_OptimizerPlus.com.xml
+++ b/src/chrome/content/rules/My_OptimizerPlus.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://myoptimizerplus.com/ => https://myoptimizerplus.com/: (51, "
 Fetch error: http://www.myoptimizerplus.com/ => https://www.myoptimizerplus.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.myoptimizerplus.com'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/My_Radio_Creative.xml b/src/chrome/content/rules/My_Radio_Creative.xml
index 31e09ca5a4c6..cc019cf3ed32 100644
--- a/src/chrome/content/rules/My_Radio_Creative.xml
+++ b/src/chrome/content/rules/My_Radio_Creative.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://myradiocreative.com/ => https://myradiocreative.com/: (6, 'Could not resolve host: myradiocreative.com')
 
 -->
-
+
 
 	
 	
@@ -15,4 +15,4 @@ Fetch error: http://myradiocreative.com/ => https://myradiocreative.com/: (6, 'C
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/My_Shazam.com.xml b/src/chrome/content/rules/My_Shazam.com.xml
index 87f1c1824efb..ace0334bd44d 100644
--- a/src/chrome/content/rules/My_Shazam.com.xml
+++ b/src/chrome/content/rules/My_Shazam.com.xml
@@ -11,7 +11,7 @@
 		- myshazam.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/My_Virtual_Paper.xml b/src/chrome/content/rules/My_Virtual_Paper.xml
deleted file mode 100644
index fa9ae44102c4..000000000000
--- a/src/chrome/content/rules/My_Virtual_Paper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Mycoles.com.au.xml b/src/chrome/content/rules/Mycoles.com.au.xml
new file mode 100644
index 000000000000..9825ac5a498b
--- /dev/null
+++ b/src/chrome/content/rules/Mycoles.com.au.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Mydigipass.com.xml b/src/chrome/content/rules/Mydigipass.com.xml
deleted file mode 100644
index e12c91b35c96..000000000000
--- a/src/chrome/content/rules/Mydigipass.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Mydrive.ch.xml b/src/chrome/content/rules/Mydrive.ch.xml
new file mode 100644
index 000000000000..5d3eda70c86c
--- /dev/null
+++ b/src/chrome/content/rules/Mydrive.ch.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Mydrive.xml b/src/chrome/content/rules/Mydrive.xml
deleted file mode 100644
index b9507f596641..000000000000
--- a/src/chrome/content/rules/Mydrive.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  
-  
-  
-  
-  
-   
-   
-  
-
diff --git a/src/chrome/content/rules/Myfolder.xml b/src/chrome/content/rules/Myfolder.xml
index 32bda4fbc4c2..467fb78f64de 100644
--- a/src/chrome/content/rules/Myfolder.xml
+++ b/src/chrome/content/rules/Myfolder.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.myfolder.net/ => https://www.myfolder.net/: (28, 'Connec
 		- vaccine	(cert: www.myfolder.net; shows www's data)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Myftp.utechsoft.com.xml b/src/chrome/content/rules/Myftp.utechsoft.com.xml
deleted file mode 100644
index b81bd445a03f..000000000000
--- a/src/chrome/content/rules/Myftp.utechsoft.com.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-  
-  
-
-
diff --git a/src/chrome/content/rules/Myheritage.xml b/src/chrome/content/rules/Myheritage.xml
index 343a2a8a3669..de96498b69b2 100644
--- a/src/chrome/content/rules/Myheritage.xml
+++ b/src/chrome/content/rules/Myheritage.xml
@@ -18,17 +18,17 @@ Fetch error: http://myheritage.com.il/ => https://myheritage.com.il/: (6, 'Could
     Nonfunctional domains:
         - blog.myheritage.*          -> stupid error 29 by incapsula
         - helpcenter.myheritage.*    -> wrong cert (valid for nanorep.com)
-	
+
 	Mixed content:
 		- iframes on myheritage.* *
-	
+
 	* secured by us
 
     Other MyHeritage rulesets:
 	    - Mhcache.com
 	    - Myheritageimages.com
 -->
-
+
     
     
     
@@ -124,7 +124,7 @@ Fetch error: http://myheritage.com.il/ => https://myheritage.com.il/: (6, 'Could
 
     
     
-	
+
     
     
     
diff --git a/src/chrome/content/rules/Myitcv.org.uk.xml b/src/chrome/content/rules/Myitcv.org.uk.xml
index 120cadd9de03..dfeb9d6f7817 100644
--- a/src/chrome/content/rules/Myitcv.org.uk.xml
+++ b/src/chrome/content/rules/Myitcv.org.uk.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.myitcv.org.uk/ => https://www.myitcv.org.uk/: (7, 'Faile
 	* github
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Mynaweb.com.xml b/src/chrome/content/rules/Mynaweb.com.xml
index 99b076f9aea6..5e779842c391 100644
--- a/src/chrome/content/rules/Mynaweb.com.xml
+++ b/src/chrome/content/rules/Mynaweb.com.xml
@@ -27,19 +27,20 @@ Fetch error: http://mynaweb.com/ => https://mynaweb.com/: (51, "SSL: no alternat
 	api sets myna cookie on whichever domain it is loaded from
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
 
 	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Mynewsdesk.com.xml b/src/chrome/content/rules/Mynewsdesk.com.xml
index d2f3e4f46602..2975479440a9 100644
--- a/src/chrome/content/rules/Mynewsdesk.com.xml
+++ b/src/chrome/content/rules/Mynewsdesk.com.xml
@@ -32,7 +32,7 @@ Fetch error: http://get.mynewsdesk.com/ => https://get.mynewsdesk.com/: (60, 'SS
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Myregisteredsite.com.xml b/src/chrome/content/rules/Myregisteredsite.com.xml
index 52b8d0c7d504..561bd26d56fc 100644
--- a/src/chrome/content/rules/Myregisteredsite.com.xml
+++ b/src/chrome/content/rules/Myregisteredsite.com.xml
@@ -7,10 +7,10 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Myricom.com.xml b/src/chrome/content/rules/Myricom.com.xml
index 7654939df549..ad21f548b088 100644
--- a/src/chrome/content/rules/Myricom.com.xml
+++ b/src/chrome/content/rules/Myricom.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.myricom.com/ => https://www.myricom.com/: (51, "SSL: no
 		- www.myricom.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Mysitemyway.xml b/src/chrome/content/rules/Mysitemyway.xml
index 52c08a9973da..d7e0e9df346c 100644
--- a/src/chrome/content/rules/Mysitemyway.xml
+++ b/src/chrome/content/rules/Mysitemyway.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.mysitemyway.com/ => https://www.mysitemyway.com/: (60, '
 Disabled by https-everywhere-checker because:
 Fetch error: http://www.mysitemyway.com/ => https://www.mysitemyway.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.mysitemyway.com'")
 -->
-
+
 
 	
 	
@@ -15,4 +15,4 @@ Fetch error: http://www.mysitemyway.com/ => https://www.mysitemyway.com/: (51, "
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/N-2.org.xml b/src/chrome/content/rules/N-2.org.xml
index 73e22335ded2..1e41437a6fbf 100644
--- a/src/chrome/content/rules/N-2.org.xml
+++ b/src/chrome/content/rules/N-2.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.n-2.org/ => https://www.n-2.org/: (6, 'Could not resolve host: www.n-2.org')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/N-ERGIE.xml b/src/chrome/content/rules/N-ERGIE.xml
index 0e582ce29786..231739f5d612 100644
--- a/src/chrome/content/rules/N-ERGIE.xml
+++ b/src/chrome/content/rules/N-ERGIE.xml
@@ -3,6 +3,5 @@
 
 
 
-
 
 
diff --git a/src/chrome/content/rules/N-JOY.de.xml b/src/chrome/content/rules/N-JOY.de.xml
index f9e88700290c..0b5b1951a26b 100644
--- a/src/chrome/content/rules/N-JOY.de.xml
+++ b/src/chrome/content/rules/N-JOY.de.xml
@@ -15,7 +15,7 @@
 
     
     
-	
+
 	
 
      https://ehmlive.n-somerset.gov
 		- travelcardonline.n-somerset.gov.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/N-able.com.xml b/src/chrome/content/rules/N-able.com.xml
index e17ff8f432b2..ad754eaeb46d 100644
--- a/src/chrome/content/rules/N-able.com.xml
+++ b/src/chrome/content/rules/N-able.com.xml
@@ -17,4 +17,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/NAACP.org.xml b/src/chrome/content/rules/NAACP.org.xml
deleted file mode 100644
index 14590767212b..000000000000
--- a/src/chrome/content/rules/NAACP.org.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-	
-	
-		
-
-	
-
diff --git a/src/chrome/content/rules/NAB.com.au.xml b/src/chrome/content/rules/NAB.com.au.xml
index 451895222a24..50e80443d46e 100644
--- a/src/chrome/content/rules/NAB.com.au.xml
+++ b/src/chrome/content/rules/NAB.com.au.xml
@@ -80,14 +80,14 @@
 			- learn	(m)
 			- maint	(t)
 			- online	(m)
-	
+
 	e: expired certificate
 	h: http redirect
 	m: certificate mismatch
 	r: connection refused
 	s: self-signed certificate
 	t: timeout on https
-	
+
 -->
 
 
diff --git a/src/chrome/content/rules/NAB.org.xml b/src/chrome/content/rules/NAB.org.xml
index c21b185e1bc7..89cd23860de1 100644
--- a/src/chrome/content/rules/NAB.org.xml
+++ b/src/chrome/content/rules/NAB.org.xml
@@ -26,4 +26,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/NADAguides.xml b/src/chrome/content/rules/NADAguides.xml
index 052b71220ff7..9752e4536927 100644
--- a/src/chrome/content/rules/NADAguides.xml
+++ b/src/chrome/content/rules/NADAguides.xml
@@ -5,7 +5,9 @@ Fetch error: http://nadaguides.com/ => https://www.nadaguides.com/: Cycle detect
 
 
 	
-	
+	
+	
+	
 	
 	
 
diff --git a/src/chrome/content/rules/NARSOL.org.xml b/src/chrome/content/rules/NARSOL.org.xml
new file mode 100644
index 000000000000..99d375f60b4e
--- /dev/null
+++ b/src/chrome/content/rules/NARSOL.org.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/NASA.gov-falsemixed.xml b/src/chrome/content/rules/NASA.gov-falsemixed.xml
index 77b9f355198b..681319da547f 100644
--- a/src/chrome/content/rules/NASA.gov-falsemixed.xml
+++ b/src/chrome/content/rules/NASA.gov-falsemixed.xml
@@ -6,26 +6,9 @@
 
 	
-	
-	
 	
 	
 
-		
-
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-
 		
 
 			
-
+
 
 	
@@ -462,14 +434,12 @@ Non-2xx HTTP code: http://marsstaticcdn.jpl.nasa.gov/ (200) => https://d3r05mwud
 	
 	
 
-	
 	
 	
 	
 
 	
 	
-	
 
 	
 	
@@ -484,11 +454,9 @@ Non-2xx HTTP code: http://marsstaticcdn.jpl.nasa.gov/ (200) => https://d3r05mwud
 
 	
 	
-	
 	
 
 	
-	
 	
 	
 	
@@ -496,13 +464,12 @@ Non-2xx HTTP code: http://marsstaticcdn.jpl.nasa.gov/ (200) => https://d3r05mwud
 	
 	
 	
-	
+	
 	
-	
 	
 	
 	
-	
+	
 	
 	
 	
@@ -529,14 +496,14 @@ Non-2xx HTTP code: http://marsstaticcdn.jpl.nasa.gov/ (200) => https://d3r05mwud
 	
 	
 
-	
+	
 	
 	
 	
 
 	
 	
-	
+	
 	
 	
 	
@@ -545,12 +512,11 @@ Non-2xx HTTP code: http://marsstaticcdn.jpl.nasa.gov/ (200) => https://d3r05mwud
 	
 	
 	
-	
+	
 	
 	
 	
 	
-	
 	
 	
 	
@@ -558,7 +524,6 @@ Non-2xx HTTP code: http://marsstaticcdn.jpl.nasa.gov/ (200) => https://d3r05mwud
 	
 	
 	
-	
 	
 	
 	
@@ -573,7 +538,6 @@ Non-2xx HTTP code: http://marsstaticcdn.jpl.nasa.gov/ (200) => https://d3r05mwud
 	
 	
 	
-	
 	
 
 	
@@ -582,8 +546,6 @@ Non-2xx HTTP code: http://marsstaticcdn.jpl.nasa.gov/ (200) => https://d3r05mwud
 	
 	
 	
-	
-	
 	
 	
 	
@@ -592,8 +554,6 @@ Non-2xx HTTP code: http://marsstaticcdn.jpl.nasa.gov/ (200) => https://d3r05mwud
 	
 	
 	
-	
-	
 
 	
 	
@@ -606,10 +566,9 @@ Non-2xx HTTP code: http://marsstaticcdn.jpl.nasa.gov/ (200) => https://d3r05mwud
 	
 
 	
-	
 	
 	
-	
+	
 	
 	
 	
@@ -619,6 +578,7 @@ Non-2xx HTTP code: http://marsstaticcdn.jpl.nasa.gov/ (200) => https://d3r05mwud
 	
 	
 	
+	
 	
 	
 	
@@ -636,60 +596,22 @@ Non-2xx HTTP code: http://marsstaticcdn.jpl.nasa.gov/ (200) => https://d3r05mwud
 			
 			
 
-		
-		
-		
-
 	
-	
-
-	
 	
 	
 
 	
-	
 
 	
-	
-	
 
 	
 	
 	
 	
 	
-	
 	
 
-		
-		
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-
 		
 		
@@ -724,80 +646,13 @@ Non-2xx HTTP code: http://marsstaticcdn.jpl.nasa.gov/ (200) => https://d3r05mwud
 		
 
 
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-
-	
-
-	
-
-	
-	
-
-		
-		
-		
-
-	
-	
-
-	
-
-	
-	
-
-		
-
-	
-
-	
-
-	
+	
 
-	
-
-	
 
 	
-	
-
-	
+	
 
 	
@@ -806,14 +661,6 @@ Non-2xx HTTP code: http://marsstaticcdn.jpl.nasa.gov/ (200) => https://d3r05mwud
 
 		
 
-	
-	
-
-		
-
 	
 
diff --git a/src/chrome/content/rules/NASDAQ.xml b/src/chrome/content/rules/NASDAQ.xml
index 14dc97851183..13b16ab72eb0 100644
--- a/src/chrome/content/rules/NASDAQ.xml
+++ b/src/chrome/content/rules/NASDAQ.xml
@@ -25,7 +25,7 @@ Fetch error: http://secure.directorsdesk.com/ => https://secure.directorsdesk.co
 
 	
 	
-	
+	
 	
 
 
@@ -35,16 +35,6 @@ Fetch error: http://secure.directorsdesk.com/ => https://secure.directorsdesk.co
 	
 
 
-	
-
-	
-
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/NAVTEQ-problematic.xml b/src/chrome/content/rules/NAVTEQ-problematic.xml
index fc407154dcd1..dd49f70b421c 100644
--- a/src/chrome/content/rules/NAVTEQ-problematic.xml
+++ b/src/chrome/content/rules/NAVTEQ-problematic.xml
@@ -11,4 +11,4 @@
 					-->
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/NAVTEQ.xml b/src/chrome/content/rules/NAVTEQ.xml
index 50422bc4e4c3..6003c4b52b17 100644
--- a/src/chrome/content/rules/NAVTEQ.xml
+++ b/src/chrome/content/rules/NAVTEQ.xml
@@ -28,10 +28,13 @@ Fetch error: http://www.navteqmedia.com/ => https://primeplace.nokia.com/: (51,
 	* Mismatched, CN: mapreporter.navteq.com
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
 	
 	
 
diff --git a/src/chrome/content/rules/NAY.sk.xml b/src/chrome/content/rules/NAY.sk.xml
deleted file mode 100644
index 3155ae7d809a..000000000000
--- a/src/chrome/content/rules/NAY.sk.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/NBC-News.xml b/src/chrome/content/rules/NBC-News.xml
index ec9b444665ba..64f45afb252f 100644
--- a/src/chrome/content/rules/NBC-News.xml
+++ b/src/chrome/content/rules/NBC-News.xml
@@ -1,5 +1,5 @@
 
+
+
+	
+	
+	
+	
+		
+	
+	
+	
+		
+	
+		
+	
+	
+	
+	
+		
+	
+		
+
+	
+
+
diff --git a/src/chrome/content/rules/NBCUDigitalAdOps.com.xml b/src/chrome/content/rules/NBCUDigitalAdOps.com.xml
new file mode 100644
index 000000000000..c703e7676c28
--- /dev/null
+++ b/src/chrome/content/rules/NBCUDigitalAdOps.com.xml
@@ -0,0 +1,20 @@
+
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/NBCUniversal_Media.xml b/src/chrome/content/rules/NBCUniversal_Media.xml
deleted file mode 100644
index 67aee24fae49..000000000000
--- a/src/chrome/content/rules/NBCUniversal_Media.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-	
-	
-	
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/NBCWashington.com.xml b/src/chrome/content/rules/NBCWashington.com.xml
index 5f4018f39de3..d2fb81b198cb 100644
--- a/src/chrome/content/rules/NBCWashington.com.xml
+++ b/src/chrome/content/rules/NBCWashington.com.xml
@@ -34,6 +34,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/NCC_Group.com.xml b/src/chrome/content/rules/NCC_Group.com.xml
index a815d00a8f72..b5ce3333ba69 100644
--- a/src/chrome/content/rules/NCC_Group.com.xml
+++ b/src/chrome/content/rules/NCC_Group.com.xml
@@ -3,7 +3,6 @@
 
 		- Escrow_Live.net.xml
 		- NCC_Group.trust.xml
-		- NCC_Group_Domain_Services.com.xml
 		- Who_do_you.trust.xml
 
 -->
diff --git a/src/chrome/content/rules/NCC_Group_Domain_Services.com.xml b/src/chrome/content/rules/NCC_Group_Domain_Services.com.xml
deleted file mode 100644
index 458d252aa23d..000000000000
--- a/src/chrome/content/rules/NCC_Group_Domain_Services.com.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/NCISF.org.xml b/src/chrome/content/rules/NCISF.org.xml
index 7918ab8bf223..36de1a5a0647 100644
--- a/src/chrome/content/rules/NCISF.org.xml
+++ b/src/chrome/content/rules/NCISF.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://ncisf.org/ => https://ncisf.org/: (7, 'Failed to connect to
 Fetch error: http://www.ncisf.org/ => https://www.ncisf.org/: (7, 'Failed to connect to www.ncisf.org port 443: Connection refused')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/NCJRS.gov.xml b/src/chrome/content/rules/NCJRS.gov.xml
index eb8d772394f5..a5a56cf29895 100644
--- a/src/chrome/content/rules/NCJRS.gov.xml
+++ b/src/chrome/content/rules/NCJRS.gov.xml
@@ -7,7 +7,7 @@ Fetch error: http://ncjrs.gov/ => https://ncjrs.gov/: (51, "SSL: no alternative
 
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/NCL.ac.uk.xml b/src/chrome/content/rules/NCL.ac.uk.xml
index a6a2f194495f..16b10e72978b 100644
--- a/src/chrome/content/rules/NCL.ac.uk.xml
+++ b/src/chrome/content/rules/NCL.ac.uk.xml
@@ -11,7 +11,7 @@ Fetch error: http://saptraining.ncl.ac.uk/ => https://saptraining.ncl.ac.uk/: (6
 		- www.nhsn ᵖ
 
 	ᵖ Shows default page
-	
+
 
 
 	Problematic hosts in *ncl.ac.uk:
@@ -27,7 +27,7 @@ Fetch error: http://saptraining.ncl.ac.uk/ => https://saptraining.ncl.ac.uk/: (6
 		- Image on teaching from www.ncl.ac.uk
 
 -->
-
+
 
 	
 	
@@ -57,7 +57,7 @@ Fetch error: http://saptraining.ncl.ac.uk/ => https://saptraining.ncl.ac.uk/: (6
 	
 	
 	
-	
+
 		
 		
diff --git a/src/chrome/content/rules/NCRIC.xml b/src/chrome/content/rules/NCRIC.xml
index 6856106cbee8..11f34a4fadc6 100644
--- a/src/chrome/content/rules/NCRIC.xml
+++ b/src/chrome/content/rules/NCRIC.xml
@@ -19,4 +19,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/NCRegister.com.xml b/src/chrome/content/rules/NCRegister.com.xml
new file mode 100644
index 000000000000..eaf24a6f74f3
--- /dev/null
+++ b/src/chrome/content/rules/NCRegister.com.xml
@@ -0,0 +1,22 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/NCStateFair.org.xml b/src/chrome/content/rules/NCStateFair.org.xml
new file mode 100644
index 000000000000..262ca051435d
--- /dev/null
+++ b/src/chrome/content/rules/NCStateFair.org.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/NCsoft.com.xml b/src/chrome/content/rules/NCsoft.com.xml
index d24d3b7bf17b..83eeb60d4c66 100644
--- a/src/chrome/content/rules/NCsoft.com.xml
+++ b/src/chrome/content/rules/NCsoft.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://ncsoft.com/ => https://ncsoft.com/: (28, 'Operation timed ou
 		- WildStar-online.com.xml
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/NDCHost.com.xml b/src/chrome/content/rules/NDCHost.com.xml
index 6f05e8f52755..3fa61d25e0fb 100644
--- a/src/chrome/content/rules/NDCHost.com.xml
+++ b/src/chrome/content/rules/NDCHost.com.xml
@@ -9,13 +9,14 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/NDI.org.xml b/src/chrome/content/rules/NDI.org.xml
index a39ff585894f..5bb88cf74083 100644
--- a/src/chrome/content/rules/NDI.org.xml
+++ b/src/chrome/content/rules/NDI.org.xml
@@ -12,13 +12,15 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/NDN_media_services.com.xml b/src/chrome/content/rules/NDN_media_services.com.xml
deleted file mode 100644
index c7dd0d89024c..000000000000
--- a/src/chrome/content/rules/NDN_media_services.com.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/NEC_Display.com.xml b/src/chrome/content/rules/NEC_Display.com.xml
index acf020af6ab0..b52ed1f83cdb 100644
--- a/src/chrome/content/rules/NEC_Display.com.xml
+++ b/src/chrome/content/rules/NEC_Display.com.xml
@@ -15,7 +15,8 @@
 
 
 	
-	
+	
+	
 		
 
 
diff --git a/src/chrome/content/rules/NEDCC.org.xml b/src/chrome/content/rules/NEDCC.org.xml
deleted file mode 100644
index e6d0b92cf5ff..000000000000
--- a/src/chrome/content/rules/NEDCC.org.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/NEO-Direct.xml b/src/chrome/content/rules/NEO-Direct.xml
index 24e6fcaf5b84..87187110f3aa 100644
--- a/src/chrome/content/rules/NEO-Direct.xml
+++ b/src/chrome/content/rules/NEO-Direct.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://neo-direct.com/ => https://www.neo-direct.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.neo-direct.com'")
 Fetch error: http://www.neo-direct.com/ => https://www.neo-direct.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.neo-direct.com'")
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/NEOS.eu.xml b/src/chrome/content/rules/NEOS.eu.xml
index 0591e136d0dc..09dcd4b5e98f 100644
--- a/src/chrome/content/rules/NEOS.eu.xml
+++ b/src/chrome/content/rules/NEOS.eu.xml
@@ -33,7 +33,7 @@
 	
 	
 
-	
+	
 
 
 	
+
 	
 	
 
diff --git a/src/chrome/content/rules/NETZWELT.de.xml b/src/chrome/content/rules/NETZWELT.de.xml
new file mode 100644
index 000000000000..7b2ce4fa8b25
--- /dev/null
+++ b/src/chrome/content/rules/NETZWELT.de.xml
@@ -0,0 +1,43 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/NFARL.org.xml b/src/chrome/content/rules/NFARL.org.xml
new file mode 100644
index 000000000000..1be2c90bc3f0
--- /dev/null
+++ b/src/chrome/content/rules/NFARL.org.xml
@@ -0,0 +1,28 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/NFrance.xml b/src/chrome/content/rules/NFrance.xml
index 5f6195fbd0b8..72ae9946877b 100644
--- a/src/chrome/content/rules/NFrance.xml
+++ b/src/chrome/content/rules/NFrance.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/NGA_cn.xml b/src/chrome/content/rules/NGA_cn.xml
new file mode 100644
index 000000000000..4d3ca6fec3d7
--- /dev/null
+++ b/src/chrome/content/rules/NGA_cn.xml
@@ -0,0 +1,22 @@
+
+
+
+	
+	
+		
+	 
+
+	
+
+	
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/NGP-VAN.xml b/src/chrome/content/rules/NGP-VAN.xml
new file mode 100644
index 000000000000..db2538cea31d
--- /dev/null
+++ b/src/chrome/content/rules/NGP-VAN.xml
@@ -0,0 +1,43 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+	
+	
+		
+		
+		
+
+
+	
+
diff --git a/src/chrome/content/rules/NGP_VAN.xml b/src/chrome/content/rules/NGP_VAN.xml
deleted file mode 100644
index c6f43caea14e..000000000000
--- a/src/chrome/content/rules/NGP_VAN.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/NHM.ac.uk.xml b/src/chrome/content/rules/NHM.ac.uk.xml
deleted file mode 100644
index c08b370cacb4..000000000000
--- a/src/chrome/content/rules/NHM.ac.uk.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/NHN-Corporation.xml b/src/chrome/content/rules/NHN-Corporation.xml
deleted file mode 100644
index cb7e099aab95..000000000000
--- a/src/chrome/content/rules/NHN-Corporation.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/NHN_Next.org.xml b/src/chrome/content/rules/NHN_Next.org.xml
deleted file mode 100644
index 4ecdbb9d6ba5..000000000000
--- a/src/chrome/content/rules/NHN_Next.org.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/NHS-Direct.xml b/src/chrome/content/rules/NHS-Direct.xml
index 58156537d3ae..e24b0a0a3a59 100644
--- a/src/chrome/content/rules/NHS-Direct.xml
+++ b/src/chrome/content/rules/NHS-Direct.xml
@@ -6,7 +6,7 @@ Fetch error: http://nhsdirect.nhs.uk/ => https://www.nhsdirect.nhs.uk/: (60, 'SS
 Disabled by https-everywhere-checker because:
 Fetch error: http://nhsdirect.nhs.uk/ => https://www.nhsdirect.nhs.uk/: (6, 'Could not resolve host: nhsdirect.nhs.uk')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/NHS.xml b/src/chrome/content/rules/NHS.xml
index 75733da09047..0cf258cf86e0 100644
--- a/src/chrome/content/rules/NHS.xml
+++ b/src/chrome/content/rules/NHS.xml
@@ -32,7 +32,6 @@ Fetch error: http://www.noo.nhs.uk/ => https://www.noo.org.uk/: (51, "SSL: no al
 
 	Other NHS rulesets:
 
-		- mystar.org.uk.xml
 		- NHS_ePortfolios.org.xml
 
 
@@ -276,7 +275,7 @@ Fetch error: http://www.noo.nhs.uk/ => https://www.noo.org.uk/: (51, "SSL: no al
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/NIBC_Direct.nl.xml b/src/chrome/content/rules/NIBC_Direct.nl.xml
index 9fa70fc25bf9..089e92217f64 100644
--- a/src/chrome/content/rules/NIBC_Direct.nl.xml
+++ b/src/chrome/content/rules/NIBC_Direct.nl.xml
@@ -22,7 +22,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
@@ -31,7 +33,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/NIC.br.xml b/src/chrome/content/rules/NIC.br.xml
index dfeba744aa20..143c9c4b2133 100644
--- a/src/chrome/content/rules/NIC.br.xml
+++ b/src/chrome/content/rules/NIC.br.xml
@@ -26,7 +26,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
-
+
 
 	
diff --git a/src/chrome/content/rules/NIFC.gov.xml b/src/chrome/content/rules/NIFC.gov.xml
deleted file mode 100644
index 4125e30ac84c..000000000000
--- a/src/chrome/content/rules/NIFC.gov.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/NIFTY.xml b/src/chrome/content/rules/NIFTY.xml
deleted file mode 100644
index a083ecc3ec25..000000000000
--- a/src/chrome/content/rules/NIFTY.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-	
-	
-		
-		
-		
-
-
-	
-
-
-	
-	
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/NJ.com.xml b/src/chrome/content/rules/NJ.com.xml
index 7c60fde642f9..6dcb7f7ae0e5 100644
--- a/src/chrome/content/rules/NJ.com.xml
+++ b/src/chrome/content/rules/NJ.com.xml
@@ -82,7 +82,7 @@ Fetch error: http://signup.nj.com/ => https://signup.nj.com/: (28, 'Connection t
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/NJIT.edu.xml b/src/chrome/content/rules/NJIT.edu.xml
index 1b2d8bc4c92d..db40c1d4a047 100644
--- a/src/chrome/content/rules/NJIT.edu.xml
+++ b/src/chrome/content/rules/NJIT.edu.xml
@@ -90,7 +90,7 @@
 			Exceptions:
 					-->
 		
-		
+
 
 
 	
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/NMU.xml b/src/chrome/content/rules/NMU.xml
index f7a5bd914afa..fb7a0ecf7706 100644
--- a/src/chrome/content/rules/NMU.xml
+++ b/src/chrome/content/rules/NMU.xml
@@ -1,13 +1,15 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
-	
+	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/NNM-Club.xml b/src/chrome/content/rules/NNM-Club.xml
index 0c9e4f1e6e0c..3708ad8bcd8e 100644
--- a/src/chrome/content/rules/NNM-Club.xml
+++ b/src/chrome/content/rules/NNM-Club.xml
@@ -5,7 +5,7 @@ Fetch error: http://ipv6.nnm-club.me/ => https://ipv6.nnm-club.me/: (7, '')
 Fetch error: http://ipv6.nnmclub.to/ => https://ipv6.nnmclub.to/: (7, '')
 ipv4. mismatch
 tor. mismatch-->
-
+
 
 	
 	
@@ -15,11 +15,11 @@ tor. mismatch-->
 	
 	
 	
-	
+
 	
 	
 	
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/NOO.org.uk.xml b/src/chrome/content/rules/NOO.org.uk.xml
index 1d674a5b8288..1f226b1c81b8 100644
--- a/src/chrome/content/rules/NOO.org.uk.xml
+++ b/src/chrome/content/rules/NOO.org.uk.xml
@@ -7,7 +7,7 @@ Fetch error: http://noo.org.uk/ => https://www.noo.org.uk/: (51, "SSL: no altern
 	^noo.org.uk: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/NPAC.com.xml b/src/chrome/content/rules/NPAC.com.xml
index 2ad10b8cf991..debade23e1b0 100644
--- a/src/chrome/content/rules/NPAC.com.xml
+++ b/src/chrome/content/rules/NPAC.com.xml
@@ -14,7 +14,7 @@
 		- www.npac.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/NPD_Group.xml b/src/chrome/content/rules/NPD_Group.xml
index d3d0b6b20566..8feae1da0d9b 100644
--- a/src/chrome/content/rules/NPD_Group.xml
+++ b/src/chrome/content/rules/NPD_Group.xml
@@ -7,7 +7,10 @@
 
 
 	
-	
+	
+	
+	
+	
 	
 	
 
@@ -15,10 +18,7 @@
 	
 
 
-	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/NPR.org.xml b/src/chrome/content/rules/NPR.org.xml
index 8677bb3f36d1..0ea49ce93c98 100644
--- a/src/chrome/content/rules/NPR.org.xml
+++ b/src/chrome/content/rules/NPR.org.xml
@@ -1,69 +1,73 @@
 
 
-
-	
-	
 	
-	
-
-
-	
-	
-
-
-	
-	
-
-	
-
-	
-
-	
-
-  
-
-	
-
+	
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
 
-
diff --git a/src/chrome/content/rules/NPTEd.org.xml b/src/chrome/content/rules/NPTEd.org.xml
deleted file mode 100644
index d70fb14cf2d1..000000000000
--- a/src/chrome/content/rules/NPTEd.org.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/NPario.xml b/src/chrome/content/rules/NPario.xml
deleted file mode 100644
index 79ce120e2327..000000000000
--- a/src/chrome/content/rules/NPario.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/NQuran.com.xml b/src/chrome/content/rules/NQuran.com.xml
new file mode 100644
index 000000000000..0e99fd307875
--- /dev/null
+++ b/src/chrome/content/rules/NQuran.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/NSS_Labs.xml b/src/chrome/content/rules/NSS_Labs.xml
index 44478989097c..7ac18f1f09a1 100644
--- a/src/chrome/content/rules/NSS_Labs.xml
+++ b/src/chrome/content/rules/NSS_Labs.xml
@@ -5,7 +5,7 @@ Fetch error: http://nsslabs.com/ => https://nsslabs.com/: (28, 'Connection timed
 Fetch error: http://dev.nsslabs.com/ => https://dev.nsslabs.com/: (6, 'Could not resolve host: dev.nsslabs.com')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/NTNU.no.xml b/src/chrome/content/rules/NTNU.no.xml
index e0a7999905c8..0d3636572471 100644
--- a/src/chrome/content/rules/NTNU.no.xml
+++ b/src/chrome/content/rules/NTNU.no.xml
@@ -22,7 +22,7 @@ Fetch error: http://er.ntnu.no/ => https://er.ntnu.no/: (60, 'SSL certificate pr
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/NTP.org.xml b/src/chrome/content/rules/NTP.org.xml
index 2888603a4010..8f7ea48934b6 100644
--- a/src/chrome/content/rules/NTP.org.xml
+++ b/src/chrome/content/rules/NTP.org.xml
@@ -3,7 +3,7 @@
 Disabled by https-everywhere-checker because:
 Fetch error: http://lists.ntp.org/ => https://lists.ntp.org/: (60, 'SSL certificate problem: certificate has expired')
 
-	Remark: [0-9].*pool.ntp.org are completely omitted here. 
+	Remark: [0-9].*pool.ntp.org are completely omitted here.
 		*.pool.ntp.org are omitted if they do not give SSL error.
 
 	Non-functional hosts
@@ -74,7 +74,7 @@ Fetch error: http://lists.ntp.org/ => https://lists.ntp.org/: (60, 'SSL certific
 			 - support.ntp.org
 			 - twiki.ntp.org
 -->
-
+
 	
 
 	
diff --git a/src/chrome/content/rules/NTT.com.xml b/src/chrome/content/rules/NTT.com.xml
index 098bcdbf4986..7c544118760e 100644
--- a/src/chrome/content/rules/NTT.com.xml
+++ b/src/chrome/content/rules/NTT.com.xml
@@ -13,10 +13,11 @@ Fetch error: http://ntt.com/ => https://www.ntt.com/: Too many redirects while f
 	* Secured by us
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/NTU.edu.tw.xml b/src/chrome/content/rules/NTU.edu.tw.xml
index 754367a44163..f8161c8e38e0 100644
--- a/src/chrome/content/rules/NTU.edu.tw.xml
+++ b/src/chrome/content/rules/NTU.edu.tw.xml
@@ -108,7 +108,7 @@ Fetch error: http://galogin.ntu.edu.tw/ => https://galogin.ntu.edu.tw/: (60, 'SS
 	Mixed content:
 
 		- css, on:
-		
+
 			- epaper from $self ˢ
 			- galong from fonts.googleapis.com ˢ
 
@@ -126,7 +126,7 @@ Fetch error: http://galogin.ntu.edu.tw/ => https://galogin.ntu.edu.tw/: (60, 'SS
 	ˢ Secured by us
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/NTVSpor.xml b/src/chrome/content/rules/NTVSpor.xml
index b225436c2c5c..3b189f605c01 100644
--- a/src/chrome/content/rules/NTVSpor.xml
+++ b/src/chrome/content/rules/NTVSpor.xml
@@ -5,7 +5,7 @@ Fetch error: http://www.ntvspor.net/ => https://www.ntvspor.net/: Too many redir
 Fetch error: http://ntvspor.net/ => https://www.ntvspor.net/: Too many redirects while fetching 'https://www.ntvspor.net/'
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/NVMExpress.org.xml b/src/chrome/content/rules/NVMExpress.org.xml
new file mode 100644
index 000000000000..4cc0d250c399
--- /dev/null
+++ b/src/chrome/content/rules/NVMExpress.org.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/NVidia-mismatches.xml b/src/chrome/content/rules/NVidia-mismatches.xml
deleted file mode 100644
index 26580f2e8154..000000000000
--- a/src/chrome/content/rules/NVidia-mismatches.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/NVidia.co.uk.xml b/src/chrome/content/rules/NVidia.co.uk.xml
index 24a98f3e2af4..5e8f19408b3c 100644
--- a/src/chrome/content/rules/NVidia.co.uk.xml
+++ b/src/chrome/content/rules/NVidia.co.uk.xml
@@ -16,7 +16,7 @@ Non-2xx HTTP code: http://nvidia.co.uk/ (200) => https://www.nvidia.co.uk/ (504)
 	² Akamai
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/NVidia.eu.xml b/src/chrome/content/rules/NVidia.eu.xml
index 3339b4b83070..015a3f046e5d 100644
--- a/src/chrome/content/rules/NVidia.eu.xml
+++ b/src/chrome/content/rules/NVidia.eu.xml
@@ -14,7 +14,7 @@ Fetch error: http://partners.nvidia.eu/ => https://partners.nvidia.eu/: (60, 'SS
 	* Zendesk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/NVidia.ru.xml b/src/chrome/content/rules/NVidia.ru.xml
index 9a4712a9dfaf..de82be2f3eaf 100644
--- a/src/chrome/content/rules/NVidia.ru.xml
+++ b/src/chrome/content/rules/NVidia.ru.xml
@@ -23,7 +23,7 @@
 	
 
 	
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/NVidia.xml b/src/chrome/content/rules/NVidia.xml
index 15722a3048bb..593174afa66f 100644
--- a/src/chrome/content/rules/NVidia.xml
+++ b/src/chrome/content/rules/NVidia.xml
@@ -1,8 +1,5 @@
 
 	
+	
+	
 	
 	
 	
-	
-	
 	
 	
 	
-	
 	
 	
 	
 	
 	
-	
 	
 	
 	
 	
 	
-	
-	
-	
 	
 	
 	
 	
 	
 	
-	
+	
 	
 	
 	
@@ -150,11 +146,9 @@
 	
 	
-	
 
 	
 	
-	
 
 		
@@ -188,20 +182,15 @@
 
 	
 
-	
-	
-
-		
-		
+	
 
 	
 
-	
 
-	
+	
 
diff --git a/src/chrome/content/rules/NVisium.com.xml b/src/chrome/content/rules/NVisium.com.xml
index f6a81a87f14d..8f9a78ef40a8 100644
--- a/src/chrome/content/rules/NVisium.com.xml
+++ b/src/chrome/content/rules/NVisium.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://blog.nvisium.com/ => https://blog.nvisium.com/: (6, 'Could n
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/NXBus.co.uk.xml b/src/chrome/content/rules/NXBus.co.uk.xml
new file mode 100644
index 000000000000..3f36c07a4c8c
--- /dev/null
+++ b/src/chrome/content/rules/NXBus.co.uk.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/NYDailyNews.com-falsemixed.xml b/src/chrome/content/rules/NYDailyNews.com-falsemixed.xml
index 0097fcfaa072..4c93a2e949a5 100644
--- a/src/chrome/content/rules/NYDailyNews.com-falsemixed.xml
+++ b/src/chrome/content/rules/NYDailyNews.com-falsemixed.xml
@@ -1,13 +1,26 @@
 
+
 
 
 	
 	
 
+	
+
+	
+		
+		
+		
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/NYDailyNews.xml b/src/chrome/content/rules/NYDailyNews.xml
index 7bdbd6957de2..aaee3f6af7cf 100644
--- a/src/chrome/content/rules/NYDailyNews.xml
+++ b/src/chrome/content/rules/NYDailyNews.xml
@@ -1,6 +1,4 @@
 
-
-
-	
-	
-		
-		
-		
 
+
+	
+	
+	
 
 	
 
-
-	
-
-	
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/NYI.net-falsemixed.xml b/src/chrome/content/rules/NYI.net-falsemixed.xml
index 67fc5290b1f2..6d4f4c68a601 100644
--- a/src/chrome/content/rules/NYI.net-falsemixed.xml
+++ b/src/chrome/content/rules/NYI.net-falsemixed.xml
@@ -6,7 +6,7 @@ Fetch error: http://webmail.nyi.net/ => https://webmail.nyi.net/: (28, 'Connecti
 	For rules not causing broken MCB, see NYI.net.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/NYI.net.xml b/src/chrome/content/rules/NYI.net.xml
index dea7f2355427..9e44be313fb5 100644
--- a/src/chrome/content/rules/NYI.net.xml
+++ b/src/chrome/content/rules/NYI.net.xml
@@ -28,7 +28,7 @@ Fetch error: http://webmail.nyi.net/webmailimages/sm_logo_tp.png => https://webm
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/NYK_Europe.com-falsemixed.xml b/src/chrome/content/rules/NYK_Europe.com-falsemixed.xml
index 20140d430eb0..16d8d5bf31f7 100644
--- a/src/chrome/content/rules/NYK_Europe.com-falsemixed.xml
+++ b/src/chrome/content/rules/NYK_Europe.com-falsemixed.xml
@@ -12,7 +12,7 @@ Fetch error: http://nykeurope.com/ => https://nykeurope.com/: Too many redirects
 	For rules not causing mixed content, see NYK_Europe.com.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/NYMag.com.xml b/src/chrome/content/rules/NYMag.com.xml
new file mode 100644
index 000000000000..9b215b2a3b13
--- /dev/null
+++ b/src/chrome/content/rules/NYMag.com.xml
@@ -0,0 +1,17 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/NYSE_Euronext.xml b/src/chrome/content/rules/NYSE_Euronext.xml
index 1eb0f6366fab..858e33897eb4 100644
--- a/src/chrome/content/rules/NYSE_Euronext.xml
+++ b/src/chrome/content/rules/NYSE_Euronext.xml
@@ -32,10 +32,23 @@ Fetch error: http://nyx.com/ => https://www.nyx.com/: (28, 'Resolving timed out
 		- usequities
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
@@ -44,7 +57,6 @@ Fetch error: http://nyx.com/ => https://www.nyx.com/: (28, 'Resolving timed out
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/NYT_Co.com.xml b/src/chrome/content/rules/NYT_Co.com.xml
index b0ae60b22a7b..7b8a083bd965 100644
--- a/src/chrome/content/rules/NYT_Co.com.xml
+++ b/src/chrome/content/rules/NYT_Co.com.xml
@@ -1,5 +1,5 @@
 
-
-	
-	
-	
-		
-		
-		
-
-	
-	
-	
-		
-		
-
-	
-	
-	
-		
-
-	
-	
-	
-		
-
-	
-	
-
-	
-	
-		
-			
-			
-			
-	
-		
-		
-
-	
-	
-	
-		
-
-	
-
-	
-	
-	
-		
-		
-
-	
-	
-		
-
-	
-	
-	
-		
-		
-
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-
diff --git a/src/chrome/content/rules/NYTimes.xml b/src/chrome/content/rules/NYTimes.xml
index 660bb54678b7..feffd672a6ec 100644
--- a/src/chrome/content/rules/NYTimes.xml
+++ b/src/chrome/content/rules/NYTimes.xml
@@ -1,12 +1,8 @@
 
 
 	
-	
-		
-	
-		
-	
+	
+
+	
+	
+	
+	
+	
+
 	
+
 	
-	
 	
+	
+
 	
-	
+
 	
 		
 	
@@ -72,15 +68,28 @@
 		
 		
 		
+
 	
+
+	
+	
+
 	
 	
 	
 		
+	
+
+	
+	
+	
+
+	
 	
+
 	
+
 	
-	
 
 	
 
diff --git a/src/chrome/content/rules/NZBMatrix.xml b/src/chrome/content/rules/NZBMatrix.xml
index a9eb67a9fa0d..a270d730bd88 100644
--- a/src/chrome/content/rules/NZBMatrix.xml
+++ b/src/chrome/content/rules/NZBMatrix.xml
@@ -3,11 +3,13 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://nzbmatrix.com/ => https://nzbmatrix.com/: (28, 'Resolving timed out after 10519 milliseconds')
 -->
 
-  
+  
+  
+  
   
-  
+
   
-  
+
   
-  
+  
 
diff --git a/src/chrome/content/rules/NZF.org.uk.xml b/src/chrome/content/rules/NZF.org.uk.xml
new file mode 100644
index 000000000000..83f7ae3b5a42
--- /dev/null
+++ b/src/chrome/content/rules/NZF.org.uk.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/NZ_Herald.co.nz-problematic.xml b/src/chrome/content/rules/NZ_Herald.co.nz-problematic.xml
index b90cab728772..8e214e03773b 100644
--- a/src/chrome/content/rules/NZ_Herald.co.nz-problematic.xml
+++ b/src/chrome/content/rules/NZ_Herald.co.nz-problematic.xml
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Nabble.com.xml b/src/chrome/content/rules/Nabble.com.xml
new file mode 100644
index 000000000000..e5979a0eb428
--- /dev/null
+++ b/src/chrome/content/rules/Nabble.com.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Nadim.computer.xml b/src/chrome/content/rules/Nadim.computer.xml
deleted file mode 100644
index 3cf644dd01dd..000000000000
--- a/src/chrome/content/rules/Nadim.computer.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Nagios.com.xml b/src/chrome/content/rules/Nagios.com.xml
new file mode 100644
index 000000000000..3ee9ca2a5383
--- /dev/null
+++ b/src/chrome/content/rules/Nagios.com.xml
@@ -0,0 +1,34 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Nagios.org.xml b/src/chrome/content/rules/Nagios.org.xml
new file mode 100644
index 000000000000..8dfe84c39177
--- /dev/null
+++ b/src/chrome/content/rules/Nagios.org.xml
@@ -0,0 +1,25 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Nagra.com.xml b/src/chrome/content/rules/Nagra.com.xml
index e1beb3bf2374..e104d40778d0 100644
--- a/src/chrome/content/rules/Nagra.com.xml
+++ b/src/chrome/content/rules/Nagra.com.xml
@@ -17,13 +17,14 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/NakedCapitalism.com.xml b/src/chrome/content/rules/NakedCapitalism.com.xml
new file mode 100644
index 000000000000..6791fe4940a1
--- /dev/null
+++ b/src/chrome/content/rules/NakedCapitalism.com.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/NameCentr.al.xml b/src/chrome/content/rules/NameCentr.al.xml
index 1d97a9ee8b2e..53f67c7c61c1 100644
--- a/src/chrome/content/rules/NameCentr.al.xml
+++ b/src/chrome/content/rules/NameCentr.al.xml
@@ -13,12 +13,12 @@ Fetch error: http://namecentral.com/ => https://namecentral.com/: (6, 'Could not
 	² Mismatched, CN: namecentral.com
 
 -->
-
+
 
 	
-	
+	
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/NameMedia.xml b/src/chrome/content/rules/NameMedia.xml
index 1ddf6e79ff59..20180e9cc599 100644
--- a/src/chrome/content/rules/NameMedia.xml
+++ b/src/chrome/content/rules/NameMedia.xml
@@ -5,7 +5,8 @@
 
 
 	
-	
+	
+	
 
 	
 
@@ -13,7 +14,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/NameSilo.xml b/src/chrome/content/rules/NameSilo.xml
new file mode 100644
index 000000000000..ddb8f9901c94
--- /dev/null
+++ b/src/chrome/content/rules/NameSilo.xml
@@ -0,0 +1,22 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Names.xml b/src/chrome/content/rules/Names.xml
index 2814db74742b..c55c4da49a4c 100644
--- a/src/chrome/content/rules/Names.xml
+++ b/src/chrome/content/rules/Names.xml
@@ -33,7 +33,7 @@
 	
 	
 
-	
+	
 
 
 	
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Nanigans.xml b/src/chrome/content/rules/Nanigans.xml
index c920d1faa15f..3ed5003e51f2 100644
--- a/src/chrome/content/rules/Nanigans.xml
+++ b/src/chrome/content/rules/Nanigans.xml
@@ -16,7 +16,7 @@ Fetch error: http://lp.nanigans.com/ => https://lp.nanigans.com/: (28, 'Connecti
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Napoleon_Makeup_Academy.com.xml b/src/chrome/content/rules/Napoleon_Makeup_Academy.com.xml
index 33f2e14e027c..6922c766ec6c 100644
--- a/src/chrome/content/rules/Napoleon_Makeup_Academy.com.xml
+++ b/src/chrome/content/rules/Napoleon_Makeup_Academy.com.xml
@@ -4,18 +4,17 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://napoleonmakeupacademy.com/ => https://napoleonmakeupacademy.com/: (28, 'Operation timed out after 30001 milliseconds with 0 bytes received')
 
 -->
-
+
 
 	
-	
 	
-	
+	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Nartac.com.xml b/src/chrome/content/rules/Nartac.com.xml
index bfd6308e7791..640920c5c64a 100644
--- a/src/chrome/content/rules/Nartac.com.xml
+++ b/src/chrome/content/rules/Nartac.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://nartac.com/ => https://nartac.com/: (51, "SSL: no alternativ
 		- 2015.nartac.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/NatMonitor.com.xml b/src/chrome/content/rules/NatMonitor.com.xml
index 00562c9255cb..68236f3b1e30 100644
--- a/src/chrome/content/rules/NatMonitor.com.xml
+++ b/src/chrome/content/rules/NatMonitor.com.xml
@@ -1,31 +1,18 @@
 
-
-
+
 	
 	
-
-
-	
-
-
-	
-
+	
+	
+	
+	
+	
+	
+
+	
 
diff --git a/src/chrome/content/rules/NatalieJonckheere.com.xml b/src/chrome/content/rules/NatalieJonckheere.com.xml
new file mode 100644
index 000000000000..b5c0cf8102c8
--- /dev/null
+++ b/src/chrome/content/rules/NatalieJonckheere.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/National-Academies.xml b/src/chrome/content/rules/National-Academies.xml
index ae4623313d55..a8a44e68730d 100644
--- a/src/chrome/content/rules/National-Academies.xml
+++ b/src/chrome/content/rules/National-Academies.xml
@@ -25,13 +25,13 @@
 -->
 
 
-	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/National-Broadcasting-Company.xml b/src/chrome/content/rules/National-Broadcasting-Company.xml
index f573742119dd..a66c93d2318d 100644
--- a/src/chrome/content/rules/National-Broadcasting-Company.xml
+++ b/src/chrome/content/rules/National-Broadcasting-Company.xml
@@ -9,7 +9,7 @@
 	
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/National-Express.xml b/src/chrome/content/rules/National-Express.xml
index 15ad72121c00..a58ae03adc07 100644
--- a/src/chrome/content/rules/National-Express.xml
+++ b/src/chrome/content/rules/National-Express.xml
@@ -10,7 +10,9 @@ Fetch error: http://www.nationalexpress.jobs/ => https://www.nationalexpress.job
 
 
 	
-	
+	
+	
+	
 	
 	
 
@@ -30,4 +32,4 @@ Fetch error: http://www.nationalexpress.jobs/ => https://www.nationalexpress.job
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/National-Rail-Enquiries-mismatches.xml b/src/chrome/content/rules/National-Rail-Enquiries-mismatches.xml
index 5b8877c114a8..2608c44ec127 100644
--- a/src/chrome/content/rules/National-Rail-Enquiries-mismatches.xml
+++ b/src/chrome/content/rules/National-Rail-Enquiries-mismatches.xml
@@ -5,13 +5,11 @@
 
 
 	
-	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/National-Rail-Enquiries.xml b/src/chrome/content/rules/National-Rail-Enquiries.xml
index f937ad552b59..3ca358d0d493 100644
--- a/src/chrome/content/rules/National-Rail-Enquiries.xml
+++ b/src/chrome/content/rules/National-Rail-Enquiries.xml
@@ -18,7 +18,10 @@
 
 
 	
-	
+	
+	
+	
+	
 		
diff --git a/src/chrome/content/rules/National-Renewable-Energy-Laboratory.xml b/src/chrome/content/rules/National-Renewable-Energy-Laboratory.xml
index 6e85c3c854c1..5dbc974009a1 100644
--- a/src/chrome/content/rules/National-Renewable-Energy-Laboratory.xml
+++ b/src/chrome/content/rules/National-Renewable-Energy-Laboratory.xml
@@ -1,49 +1,24 @@
 
-
+	Time out:
+		pvwatts.nrel.gov
 
-	
-	
-	
+-->
+
 
-	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
-	
-	
+	
 
 
diff --git a/src/chrome/content/rules/National-Research-Council-Canada.xml b/src/chrome/content/rules/National-Research-Council-Canada.xml
index 630f92faab2e..f585ea1e4be2 100644
--- a/src/chrome/content/rules/National-Research-Council-Canada.xml
+++ b/src/chrome/content/rules/National-Research-Council-Canada.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://nrc-cnrc.gc.ca/ => https://nrc-cnrc.gc.ca/: Cycle detected - URL already encountered: https://www.nrc-cnrc.gc.ca/index.html
 Fetch error: http://www.nrc-cnrc.gc.ca/ => https://www.nrc-cnrc.gc.ca/: Cycle detected - URL already encountered: https://www.nrc-cnrc.gc.ca/index.html
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/National-Security-Agency.xml b/src/chrome/content/rules/National-Security-Agency.xml
index 384dc4ff3eb6..a5dd5292925c 100644
--- a/src/chrome/content/rules/National-Security-Agency.xml
+++ b/src/chrome/content/rules/National-Security-Agency.xml
@@ -1,4 +1,7 @@
 
diff --git a/src/chrome/content/rules/National-University-of-Ireland.xml b/src/chrome/content/rules/National-University-of-Ireland.xml
index 5d469867001b..44083893b631 100644
--- a/src/chrome/content/rules/National-University-of-Ireland.xml
+++ b/src/chrome/content/rules/National-University-of-Ireland.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.deri.ie/ => https://www.deri.ie/: (28, 'Operation timed
 	Mismatch:
 		- ^nuigalway.ie
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/NationalArchivesGovUK.xml b/src/chrome/content/rules/NationalArchivesGovUK.xml
index 1c877f8ac9f3..30798a4115d7 100644
--- a/src/chrome/content/rules/NationalArchivesGovUK.xml
+++ b/src/chrome/content/rules/NationalArchivesGovUK.xml
@@ -49,7 +49,7 @@ Fetch error: http://community.nationalarchives.gov.uk/ => https://community.nati
 	² Unsecurable
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/NationalCapitalAuthority.xml b/src/chrome/content/rules/NationalCapitalAuthority.xml
deleted file mode 100644
index 2186df81d455..000000000000
--- a/src/chrome/content/rules/NationalCapitalAuthority.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-	
-
-	
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/NationalE-HealthTransitionAuthority.xml b/src/chrome/content/rules/NationalE-HealthTransitionAuthority.xml
index 0ad06e82dab8..7fa7dea6fe83 100644
--- a/src/chrome/content/rules/NationalE-HealthTransitionAuthority.xml
+++ b/src/chrome/content/rules/NationalE-HealthTransitionAuthority.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/NationalEatingDisorders.org.xml b/src/chrome/content/rules/NationalEatingDisorders.org.xml
index acea6890e36c..170a15494dda 100644
--- a/src/chrome/content/rules/NationalEatingDisorders.org.xml
+++ b/src/chrome/content/rules/NationalEatingDisorders.org.xml
@@ -3,7 +3,7 @@
 		bp.nationaleatingdisorders.org
 
 	Wildcard DNS but without wildcard certificate.
-	
+
 	All other subdomains are mismatched.
 
 -->
diff --git a/src/chrome/content/rules/NationalEthicsApplicationForm.xml b/src/chrome/content/rules/NationalEthicsApplicationForm.xml
deleted file mode 100644
index 1b2b7fbbbd06..000000000000
--- a/src/chrome/content/rules/NationalEthicsApplicationForm.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/NationalHealthandMedicalResearchCouncil.xml b/src/chrome/content/rules/NationalHealthandMedicalResearchCouncil.xml
index 2b9ad3f95b33..3ec1b656746a 100644
--- a/src/chrome/content/rules/NationalHealthandMedicalResearchCouncil.xml
+++ b/src/chrome/content/rules/NationalHealthandMedicalResearchCouncil.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/NationalLibraryofAustralia.xml b/src/chrome/content/rules/NationalLibraryofAustralia.xml
index 2e4964daad93..15d12922f753 100644
--- a/src/chrome/content/rules/NationalLibraryofAustralia.xml
+++ b/src/chrome/content/rules/NationalLibraryofAustralia.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/NationalLottery.xml b/src/chrome/content/rules/NationalLottery.xml
deleted file mode 100644
index 802977befec4..000000000000
--- a/src/chrome/content/rules/NationalLottery.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-  
-  
-
-  
-
-  
-
diff --git a/src/chrome/content/rules/NationalRSOL.org.xml b/src/chrome/content/rules/NationalRSOL.org.xml
new file mode 100644
index 000000000000..7187c13e4c1b
--- /dev/null
+++ b/src/chrome/content/rules/NationalRSOL.org.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/NationalReview.com.xml b/src/chrome/content/rules/NationalReview.com.xml
index dc85c7a1f41c..ceadf9c40e58 100644
--- a/src/chrome/content/rules/NationalReview.com.xml
+++ b/src/chrome/content/rules/NationalReview.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://nr-media-01.nationalreview.com/ => https://nr-media-01.natio
 Disabled by https-everywhere-checker because:
 Fetch error: http://nr-media-01.nationalreview.com/ => https://nr-media-01.nationalreview.com/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/National_Academy_of_Engineering.xml b/src/chrome/content/rules/National_Academy_of_Engineering.xml
index ddadb1507411..7160feb47909 100644
--- a/src/chrome/content/rules/National_Academy_of_Engineering.xml
+++ b/src/chrome/content/rules/National_Academy_of_Engineering.xml
@@ -8,10 +8,10 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/National_Bureau_of_Economic_Research.xml b/src/chrome/content/rules/National_Bureau_of_Economic_Research.xml
index c085e1c13162..43b105be2da9 100644
--- a/src/chrome/content/rules/National_Bureau_of_Economic_Research.xml
+++ b/src/chrome/content/rules/National_Bureau_of_Economic_Research.xml
@@ -7,4 +7,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/National_Geographic.com.xml b/src/chrome/content/rules/National_Geographic.com.xml
index 3ccbc7a8c068..36a6fc440cf5 100644
--- a/src/chrome/content/rules/National_Geographic.com.xml
+++ b/src/chrome/content/rules/National_Geographic.com.xml
@@ -31,7 +31,7 @@
 
 	502 proxy error:
 		- images
-	
+
 	Mixed content:
 		- archive (Example: https://archive.nationalgeographic.com/?iid=133596#folio=CV1)
 		- news
@@ -47,7 +47,7 @@
 
 	No working URL known:
 		- media-yourshot
-	
+
 	Time out:
 		- nationalgeographic.com *
 
diff --git a/src/chrome/content/rules/National_Institute_for_Social_Media.xml b/src/chrome/content/rules/National_Institute_for_Social_Media.xml
index 588baac17939..fbd5a1c0e97f 100644
--- a/src/chrome/content/rules/National_Institute_for_Social_Media.xml
+++ b/src/chrome/content/rules/National_Institute_for_Social_Media.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/National_Oceanic_and_Atmospheric_Administration.xml b/src/chrome/content/rules/National_Oceanic_and_Atmospheric_Administration.xml
index 640c297f3129..7d64a673afb7 100644
--- a/src/chrome/content/rules/National_Oceanic_and_Atmospheric_Administration.xml
+++ b/src/chrome/content/rules/National_Oceanic_and_Atmospheric_Administration.xml
@@ -74,7 +74,7 @@ Fetch error: http://nes.ncdc.noaa.gov/ => https://nes.ncdc.noaa.gov/: (51, "SSL:
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/National_Park_Service.xml b/src/chrome/content/rules/National_Park_Service.xml
index d072055f794b..7739f773843c 100644
--- a/src/chrome/content/rules/National_Park_Service.xml
+++ b/src/chrome/content/rules/National_Park_Service.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.science.nature.nps.gov/ => https://www.science.nature.nps.gov/: (6, 'Could not resolve host: www.science.nature.nps.gov')
 Fetch error: http://www.npssa.nps.gov/ => https://www.npssa.nps.gov/: (6, 'Could not resolve host: www.npssa.nps.gov')
 
-	National Park Service 
+	National Park Service
 
 
 
@@ -48,7 +48,7 @@ Fetch error: http://www.npssa.nps.gov/ => https://www.npssa.nps.gov/: (6, 'Could
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/National_Transport_Safety_Board.xml b/src/chrome/content/rules/National_Transport_Safety_Board.xml
deleted file mode 100644
index 5eec66f6897c..000000000000
--- a/src/chrome/content/rules/National_Transport_Safety_Board.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/National_Travel_Health_Network_and_Centre.xml b/src/chrome/content/rules/National_Travel_Health_Network_and_Centre.xml
index 1289c1747572..36cb99eb3e6d 100644
--- a/src/chrome/content/rules/National_Travel_Health_Network_and_Centre.xml
+++ b/src/chrome/content/rules/National_Travel_Health_Network_and_Centre.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://nathnac.org/ => https://www.nathnac.org/: (35, 'Unknown SSL protocol error in connection to www.nathnac.org:443 ')
 
 -->
-
+
     
     
 
diff --git a/src/chrome/content/rules/National_Wildlife_Foundation.xml b/src/chrome/content/rules/National_Wildlife_Foundation.xml
index d136a9d2f542..b559c8e21d0e 100644
--- a/src/chrome/content/rules/National_Wildlife_Foundation.xml
+++ b/src/chrome/content/rules/National_Wildlife_Foundation.xml
@@ -57,7 +57,7 @@
 
 	
 	
-	
+
 	
 
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Nationalserviceresources.org.xml b/src/chrome/content/rules/Nationalserviceresources.org.xml
index 0f98875b5a24..c13a2957ec24 100644
--- a/src/chrome/content/rules/Nationalserviceresources.org.xml
+++ b/src/chrome/content/rules/Nationalserviceresources.org.xml
@@ -17,7 +17,7 @@ Fetch error: http://www.nationalserviceresources.org/ => https://www.nationalser
 	* Mismatched, CN: acquia-sites.com
 
 -->
-
+
 
 	
 	
@@ -28,4 +28,4 @@ Fetch error: http://www.nationalserviceresources.org/ => https://www.nationalser
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Nationwide.xml b/src/chrome/content/rules/Nationwide.xml
index 8b24af4af584..12e6a623ef9d 100644
--- a/src/chrome/content/rules/Nationwide.xml
+++ b/src/chrome/content/rules/Nationwide.xml
@@ -28,10 +28,13 @@ Fetch error: http://olb.nationwideuk.ie/ => https://olb.nationwideuk.ie/: (60, '
 		- nationwide-jobs.co.uk		(cert only matches www)
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
 	
 	
 	
@@ -47,19 +50,14 @@ Fetch error: http://olb.nationwideuk.ie/ => https://olb.nationwideuk.ie/: (60, '
 	
 
 
-	
 
 	
 
-	
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Nativo.net.xml b/src/chrome/content/rules/Nativo.net.xml
index 104b63503dfd..a8a3f104f803 100644
--- a/src/chrome/content/rules/Nativo.net.xml
+++ b/src/chrome/content/rules/Nativo.net.xml
@@ -18,7 +18,7 @@ Fetch error: http://beta.nativo.net/ => https://beta.nativo.net/: (6, 'Could not
 		- beta
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Natl-American-Arab-Nursing-Assn.xml b/src/chrome/content/rules/Natl-American-Arab-Nursing-Assn.xml
index 7692c455bfdb..de332b2ae2f4 100644
--- a/src/chrome/content/rules/Natl-American-Arab-Nursing-Assn.xml
+++ b/src/chrome/content/rules/Natl-American-Arab-Nursing-Assn.xml
@@ -1,16 +1,12 @@
-
 
-
+
 	
 	
 
-	
+	
 
diff --git a/src/chrome/content/rules/Natl-Childrens-Leukemia-Foundation.xml b/src/chrome/content/rules/Natl-Childrens-Leukemia-Foundation.xml
index ba7d15569feb..e79c56b7292e 100644
--- a/src/chrome/content/rules/Natl-Childrens-Leukemia-Foundation.xml
+++ b/src/chrome/content/rules/Natl-Childrens-Leukemia-Foundation.xml
@@ -12,7 +12,7 @@ Fetch error: http://leukemiafoundation.org/ => https://www.leukemiafoundation.or
 Fetch error: http://www.leukemiafoundation.org/ => https://www.leukemiafoundation.org/: (28, 'Connection timed out after 10001 milliseconds')
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Nattstad.se.xml b/src/chrome/content/rules/Nattstad.se.xml
index 481e97180768..577899251acb 100644
--- a/src/chrome/content/rules/Nattstad.se.xml
+++ b/src/chrome/content/rules/Nattstad.se.xml
@@ -5,7 +5,7 @@ Fetch error: http://nattstad.se/ => https://www.nattstad.se/: (51, "SSL: no alte
 Fetch error: http://www.nattstad.se/ => https://www.nattstad.se/: (51, "SSL: no alternative certificate subject name matches target host name 'www.nattstad.se'")
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Natural_Skin_Shop.xml b/src/chrome/content/rules/Natural_Skin_Shop.xml
index 19822bf4f9a3..cad0ad656f48 100644
--- a/src/chrome/content/rules/Natural_Skin_Shop.xml
+++ b/src/chrome/content/rules/Natural_Skin_Shop.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://store.naturalskinshop.com/ => https://store.naturalskinshop.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
 	
@@ -22,4 +22,4 @@ Fetch error: http://store.naturalskinshop.com/ => https://store.naturalskinshop.
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Nature.com.xml b/src/chrome/content/rules/Nature.com.xml
index df5536559c31..da81f92eaed8 100644
--- a/src/chrome/content/rules/Nature.com.xml
+++ b/src/chrome/content/rules/Nature.com.xml
@@ -89,7 +89,7 @@
 	
 	
 	
-	                                              
+	
 	
 	
 	
@@ -136,7 +136,7 @@
 
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Nature.org.xml b/src/chrome/content/rules/Nature.org.xml
index 550333ae3f85..a659f3087b36 100644
--- a/src/chrome/content/rules/Nature.org.xml
+++ b/src/chrome/content/rules/Nature.org.xml
@@ -21,7 +21,7 @@
 	Expired certificate:
 		future.nature.org
 		secure.nature.org (http redirects to www.nature.org)
-	
+
 	Broken chain cert:
 		nature.org
 		voice.nature.org
diff --git a/src/chrome/content/rules/NatureCast.org.xml b/src/chrome/content/rules/NatureCast.org.xml
new file mode 100644
index 000000000000..9ededa480c18
--- /dev/null
+++ b/src/chrome/content/rules/NatureCast.org.xml
@@ -0,0 +1,19 @@
+
+
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/NatureIndex.com.xml b/src/chrome/content/rules/NatureIndex.com.xml
new file mode 100644
index 000000000000..e0f0c8f2d64b
--- /dev/null
+++ b/src/chrome/content/rules/NatureIndex.com.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Nature_Shop.xml b/src/chrome/content/rules/Nature_Shop.xml
index 4347d3484300..b12f9699ca9e 100644
--- a/src/chrome/content/rules/Nature_Shop.xml
+++ b/src/chrome/content/rules/Nature_Shop.xml
@@ -13,4 +13,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Nau.ch.xml b/src/chrome/content/rules/Nau.ch.xml
index f43a0d991867..5b50f5f22b9b 100644
--- a/src/chrome/content/rules/Nau.ch.xml
+++ b/src/chrome/content/rules/Nau.ch.xml
@@ -1,13 +1,18 @@
+
+
 
 	
 	
-	
+	
 	
 	
+    
 	
 
-	
-	
-
 	
 
diff --git a/src/chrome/content/rules/Nautil.us.xml b/src/chrome/content/rules/Nautil.us.xml
index ece92666a8a4..f4a99fd98578 100644
--- a/src/chrome/content/rules/Nautil.us.xml
+++ b/src/chrome/content/rules/Nautil.us.xml
@@ -5,10 +5,6 @@
 
 			- static
 
-
-	(www.): refused
-
-
 	Mixed content:
 
 		- Images on shop from $self ¹
@@ -18,16 +14,18 @@
 	² Unsecurable <= refused
 
 -->
-
+
 
-	
+	
+	
+	
+	
 		
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Navdem.com.xml b/src/chrome/content/rules/Navdem.com.xml
index edbe9cbf8f1d..d636d27812ed 100644
--- a/src/chrome/content/rules/Navdem.com.xml
+++ b/src/chrome/content/rules/Navdem.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://navdem.com/ => https://navdem.com/: (35, 'error:14077438:SSL
 Fetch error: http://www.navdem.com/ => https://www.navdem.com/: (35, 'error:14077438:SSL routines:SSL23_GET_SERVER_HELLO:tlsv1 alert internal error')
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Naver.com.xml b/src/chrome/content/rules/Naver.com.xml
deleted file mode 100644
index 40e4ef0af004..000000000000
--- a/src/chrome/content/rules/Naver.com.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
-
-	
-		
-		
-		
-		
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Naver.net.xml b/src/chrome/content/rules/Naver.net.xml
index f5ffdf537232..c1bb584f4c5b 100644
--- a/src/chrome/content/rules/Naver.net.xml
+++ b/src/chrome/content/rules/Naver.net.xml
@@ -36,13 +36,14 @@
 -->
 
 
-	
+	
+	
+	
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Naver_Corp.com.xml b/src/chrome/content/rules/Naver_Corp.com.xml
index 38516699a3dd..7e567a053b41 100644
--- a/src/chrome/content/rules/Naver_Corp.com.xml
+++ b/src/chrome/content/rules/Naver_Corp.com.xml
@@ -1,9 +1,8 @@
 
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ncloud.dk.xml b/src/chrome/content/rules/Ncloud.dk.xml
index 88edb5627e08..4ce0b3aa1022 100644
--- a/src/chrome/content/rules/Ncloud.dk.xml
+++ b/src/chrome/content/rules/Ncloud.dk.xml
@@ -8,7 +8,7 @@ Fetch error: http://partner.ncloud.dk/ => https://partner.ncloud.dk/: (28, 'Conn
 	For other Netgroup coverage, see Netgroup.dk.xml.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Ndla.no.xml b/src/chrome/content/rules/Ndla.no.xml
index c1acd55cdb67..f38ef790ec86 100644
--- a/src/chrome/content/rules/Ndla.no.xml
+++ b/src/chrome/content/rules/Ndla.no.xml
@@ -4,7 +4,7 @@
 		- bak.ndla.no
 		- ndlap4prodadm01v.ndlap4.ndla.no
 		- ndlat4cm02v.ndlap4.ndla.no
-		
+
 	Mismatch:
 		- arkiv.ndla.no
 		- 2009.arkiv.ndla.no
@@ -25,12 +25,12 @@
 		- ndlat4vhosts01v.ndlap4.ndla.no
 		- ndlat4vhosts02v.ndlap4.ndla.no
 		- ndlat4vhosts03v.ndlap4.ndla.no
-		
-	
+
+
 	Different content:
 		- samskrive.ndla.no
 		- sti.ndla.no
-	
+
 	Timeout:
 		- nettskole.ndla.no
 		- www.nettskole.ndla.no
@@ -39,7 +39,7 @@
 	Redirects to HTTP:
 		- deling.ndla.no
 		- fyr.ndla.no
-	
+
 	Other HTTPS failure:
 		- ndlap4stream01v.ndlap4.ndla.no
 
@@ -58,6 +58,6 @@
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Ndr.de.xml b/src/chrome/content/rules/Ndr.de.xml
index a79a12eaa920..5c5eb37ed802 100644
--- a/src/chrome/content/rules/Ndr.de.xml
+++ b/src/chrome/content/rules/Ndr.de.xml
@@ -21,9 +21,9 @@
     
 	
     
-	
+
     
-	
+
     
 
diff --git a/src/chrome/content/rules/Nearbuysystems.com.xml b/src/chrome/content/rules/Nearbuysystems.com.xml
index 96ddbd5a576b..034daddfbbaa 100644
--- a/src/chrome/content/rules/Nearbuysystems.com.xml
+++ b/src/chrome/content/rules/Nearbuysystems.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://luneta.nearbuysystems.com/ => https://luneta.nearbuysystems.
 	-refused:
 		- (www.)
 -->
-
+
 	
 
 	
diff --git a/src/chrome/content/rules/NeatoShop.xml b/src/chrome/content/rules/NeatoShop.xml
index 15082ce28fca..6478b25ece2f 100644
--- a/src/chrome/content/rules/NeatoShop.xml
+++ b/src/chrome/content/rules/NeatoShop.xml
@@ -5,7 +5,8 @@
 
 
 	
-	
+	
+	
 
 	
diff --git a/src/chrome/content/rules/Nebezi.cz.xml b/src/chrome/content/rules/Nebezi.cz.xml
index 5f5c7fed0035..0b53ab3af689 100644
--- a/src/chrome/content/rules/Nebezi.cz.xml
+++ b/src/chrome/content/rules/Nebezi.cz.xml
@@ -8,7 +8,7 @@ Fetch error: http://ipv6.nebezi.cz/ => https://ipv6.nebezi.cz/: (7, '')
     Other Nebezi.cz rulesets:
         - DoesNotWork.eu.xml
 -->
-
+
     
     
     
diff --git a/src/chrome/content/rules/Nebrija.com.xml b/src/chrome/content/rules/Nebrija.com.xml
index a9b31c893e93..cbbc8a576104 100644
--- a/src/chrome/content/rules/Nebrija.com.xml
+++ b/src/chrome/content/rules/Nebrija.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://www.nebrija.com/ => https://www.nebrija.com/: (60, 'SSL cert
 		* mysql.nebrija.com
 		* webmail.nebrija.com
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Nebula.xml b/src/chrome/content/rules/Nebula.xml
index e236d9232cdd..23882f644d50 100644
--- a/src/chrome/content/rules/Nebula.xml
+++ b/src/chrome/content/rules/Nebula.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.nebula.com/ => https://www.nebula.com/: (7, 'Failed to c
 		- nebula-www.s3.amazonaws.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Neck2Neck.xml b/src/chrome/content/rules/Neck2Neck.xml
index b1c64597ca6b..c5f4a836e4e6 100644
--- a/src/chrome/content/rules/Neck2Neck.xml
+++ b/src/chrome/content/rules/Neck2Neck.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Necuhb.xml b/src/chrome/content/rules/Necuhb.xml
index c49c9b48fe04..fa653cc71fdb 100644
--- a/src/chrome/content/rules/Necuhb.xml
+++ b/src/chrome/content/rules/Necuhb.xml
@@ -1,12 +1,12 @@
 
-  
+  
   
   
-  
-
-  
 
-  
+  
 
diff --git a/src/chrome/content/rules/NedLinux.com.xml b/src/chrome/content/rules/NedLinux.com.xml
deleted file mode 100644
index c04b25becec4..000000000000
--- a/src/chrome/content/rules/NedLinux.com.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-	
-	
-	
-	
-	
-
-	
-
-	
-
-	
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Nederland.xml b/src/chrome/content/rules/Nederland.xml
index 970da6971995..357eb72046e8 100644
--- a/src/chrome/content/rules/Nederland.xml
+++ b/src/chrome/content/rules/Nederland.xml
@@ -97,7 +97,7 @@ Fetch error: http://www.zwijndrecht.nl/ => https://www.zwijndrecht.nl/: (51, "SS
 	* 404
 
 -->
-
+
   
-
+
 
 	
 	
@@ -22,4 +22,4 @@ Fetch error: http://negotiatingsalary.com/ => https://negotiatingsalary.com/: To
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Neil.brown.name.xml b/src/chrome/content/rules/Neil.brown.name.xml
new file mode 100644
index 000000000000..023f242b8fc3
--- /dev/null
+++ b/src/chrome/content/rules/Neil.brown.name.xml
@@ -0,0 +1,31 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Neis-One.org.xml b/src/chrome/content/rules/Neis-One.org.xml
new file mode 100644
index 000000000000..07491add0043
--- /dev/null
+++ b/src/chrome/content/rules/Neis-One.org.xml
@@ -0,0 +1,31 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Neis-One.org_mixedcontent.xml b/src/chrome/content/rules/Neis-One.org_mixedcontent.xml
new file mode 100644
index 000000000000..0e68cc40a21e
--- /dev/null
+++ b/src/chrome/content/rules/Neis-One.org_mixedcontent.xml
@@ -0,0 +1,9 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Nelonen.fi-mixedvideo.xml b/src/chrome/content/rules/Nelonen.fi-mixedvideo.xml
deleted file mode 100644
index dc5c18af7ce3..000000000000
--- a/src/chrome/content/rules/Nelonen.fi-mixedvideo.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-	
-	
-		
-		
-		
-		
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Nelonen.fi.xml b/src/chrome/content/rules/Nelonen.fi.xml
index 959237967b42..e5bd1acb1f13 100644
--- a/src/chrome/content/rules/Nelonen.fi.xml
+++ b/src/chrome/content/rules/Nelonen.fi.xml
@@ -1,108 +1,16 @@
-
 
-
+
 
 	
 	
-		
-		
-		
-		
-		
-		
-		
-		
-		
-
-
-	
-	
 
+	
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Nelonenmedia.fi.xml b/src/chrome/content/rules/Nelonenmedia.fi.xml
index 59614492d963..c3210d3e9556 100644
--- a/src/chrome/content/rules/Nelonenmedia.fi.xml
+++ b/src/chrome/content/rules/Nelonenmedia.fi.xml
@@ -19,7 +19,8 @@
 -->
 
 
-	
+	
+	
 		
@@ -29,7 +30,6 @@
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Neo-interactive.hu.xml b/src/chrome/content/rules/Neo-interactive.hu.xml
index 1f434ce32a0d..236a8912e3c3 100644
--- a/src/chrome/content/rules/Neo-interactive.hu.xml
+++ b/src/chrome/content/rules/Neo-interactive.hu.xml
@@ -6,7 +6,7 @@ Fetch error: http://neo-interactive.hu/ => https://neo-interactive.hu/: Too many
 Disabled by https-everywhere-checker because:
 Fetch error: http://neo-interactive.hu/ => https://neo-interactive.hu/: Cycle detected - URL already encountered: https://neo-interactive.hu/
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/NeoSmart.com.xml b/src/chrome/content/rules/NeoSmart.com.xml
index 8e1635cd9faf..f6b9f5592cf3 100644
--- a/src/chrome/content/rules/NeoSmart.com.xml
+++ b/src/chrome/content/rules/NeoSmart.com.xml
@@ -16,7 +16,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -25,7 +26,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/NeonMob.com.xml b/src/chrome/content/rules/NeonMob.com.xml
index 41ae0a06467c..4e0f603c44ef 100644
--- a/src/chrome/content/rules/NeonMob.com.xml
+++ b/src/chrome/content/rules/NeonMob.com.xml
@@ -10,7 +10,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Neos.io.xml b/src/chrome/content/rules/Neos.io.xml
index c52b0a0178aa..82b255e6e69e 100644
--- a/src/chrome/content/rules/Neos.io.xml
+++ b/src/chrome/content/rules/Neos.io.xml
@@ -24,7 +24,7 @@ Fetch error: http://jira.neos.io/ => https://jira.neos.io/: (28, 'Connection tim
 		- translate.neos.io
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Neoseeker.xml b/src/chrome/content/rules/Neoseeker.xml
index c9d558985902..443633810ddc 100644
--- a/src/chrome/content/rules/Neoseeker.xml
+++ b/src/chrome/content/rules/Neoseeker.xml
@@ -29,7 +29,7 @@ Fetch error: http://neoseeker.com/ => https://neoseeker.com/: (60, 'SSL certific
 
 		- cdn.staticneo.com
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Neowin.net.xml b/src/chrome/content/rules/Neowin.net.xml
deleted file mode 100644
index cf954c90a08e..000000000000
--- a/src/chrome/content/rules/Neowin.net.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	
-	
-	
-	
-		
-		
-	
-	
-
diff --git a/src/chrome/content/rules/Nerds_Nook.com.xml b/src/chrome/content/rules/Nerds_Nook.com.xml
index 2aeabf3fbc1b..5b47472b3524 100644
--- a/src/chrome/content/rules/Nerds_Nook.com.xml
+++ b/src/chrome/content/rules/Nerds_Nook.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.nerdsnook.com/ => https://www.nerdsnook.com/: (60, 'SSL
 		- .nerdsnook.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Nerf_NOW.xml b/src/chrome/content/rules/Nerf_NOW.xml
index 2e4822980bb1..6b31e68bde43 100644
--- a/src/chrome/content/rules/Nerf_NOW.xml
+++ b/src/chrome/content/rules/Nerf_NOW.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Nero.xml b/src/chrome/content/rules/Nero.xml
deleted file mode 100644
index 24a0799b838b..000000000000
--- a/src/chrome/content/rules/Nero.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Nervous.io.xml b/src/chrome/content/rules/Nervous.io.xml
deleted file mode 100644
index 13e2347b55f6..000000000000
--- a/src/chrome/content/rules/Nervous.io.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Net-A-Porter.com.xml b/src/chrome/content/rules/Net-A-Porter.com.xml
index ab1db6fd3f5e..6a9665226a3a 100644
--- a/src/chrome/content/rules/Net-A-Porter.com.xml
+++ b/src/chrome/content/rules/Net-A-Porter.com.xml
@@ -26,7 +26,7 @@ Fetch error: http://fashionfix.net-a-porter.com/ => https://fashionfix.net-a-por
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Net-Applications.xml b/src/chrome/content/rules/Net-Applications.xml
index 61efea061426..c51f9a565745 100644
--- a/src/chrome/content/rules/Net-Applications.xml
+++ b/src/chrome/content/rules/Net-Applications.xml
@@ -25,7 +25,7 @@
 	
 
 
-	
+	
 
 
 	 https://www.net-housting.de/: (51, "
 		- (www.)housting.de	(mismatched, CN: *.net-housting.de)
 
 -->
-
+
 
 	
 	
@@ -34,4 +34,4 @@ Fetch error: http://www.net-housting.de/ => https://www.net-housting.de/: (51, "
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Net-Results.xml b/src/chrome/content/rules/Net-Results.xml
index c52771005d7b..d9f347663eaa 100644
--- a/src/chrome/content/rules/Net-Results.xml
+++ b/src/chrome/content/rules/Net-Results.xml
@@ -8,23 +8,15 @@
 
 	
 	
-	
+	
+	
 	
 
 
 	
-	
-	
+					-->	
 
 
-	
+	
 
-	
-
-	
-
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Net-dns.org.xml b/src/chrome/content/rules/Net-dns.org.xml
new file mode 100644
index 000000000000..796fa6b2f812
--- /dev/null
+++ b/src/chrome/content/rules/Net-dns.org.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Net-metrix.ch.xml b/src/chrome/content/rules/Net-metrix.ch.xml
new file mode 100644
index 000000000000..f3306592b452
--- /dev/null
+++ b/src/chrome/content/rules/Net-metrix.ch.xml
@@ -0,0 +1,24 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/NetApp.xml b/src/chrome/content/rules/NetApp.xml
index 5e0dbfc70bbb..b29cebd1dc01 100644
--- a/src/chrome/content/rules/NetApp.xml
+++ b/src/chrome/content/rules/NetApp.xml
@@ -72,7 +72,7 @@ Fetch error: http://tech.netapp.com/ => https://tech.netapp.com/: (51, "SSL: no
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/NetBeans.xml b/src/chrome/content/rules/NetBeans.xml
index 087a5d7f47a6..77dde912ec2a 100644
--- a/src/chrome/content/rules/NetBeans.xml
+++ b/src/chrome/content/rules/NetBeans.xml
@@ -1,69 +1,50 @@
 
 
-
-	
 	
+	
 	
 	
 	
 	
+	
+	
+	
+	
+	
+	
 	
-	
-	
-
-	
-	
-
-		
-		
-
-
-	
-	
-	
-	
-
-	
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
 
 	
 
-	
-
+	
 
diff --git a/src/chrome/content/rules/NetBet.xml b/src/chrome/content/rules/NetBet.xml
index 55f661897fcf..1ded0396c07b 100644
--- a/src/chrome/content/rules/NetBet.xml
+++ b/src/chrome/content/rules/NetBet.xml
@@ -5,7 +5,7 @@ Fetch error: http://betnet.fr/ => https://betnet.fr/: (7, 'Failed to connect to
 Fetch error: http://www.betnet.fr/ => https://www.betnet.fr/: (7, 'Failed to connect to www.betnet.fr port 443: Connection refused')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/NetClean.com.xml b/src/chrome/content/rules/NetClean.com.xml
index b80fdf8544a0..ce727c48babc 100644
--- a/src/chrome/content/rules/NetClean.com.xml
+++ b/src/chrome/content/rules/NetClean.com.xml
@@ -20,7 +20,7 @@ Fetch error: http://netclean.com/ => https://netclean.com/: (28, 'Connection tim
 	² Not secured by us <= mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/NetCologne.xml b/src/chrome/content/rules/NetCologne.xml
index 28d6c0657db5..c15df6dc6ccf 100644
--- a/src/chrome/content/rules/NetCologne.xml
+++ b/src/chrome/content/rules/NetCologne.xml
@@ -33,7 +33,7 @@
 	Self-signed cert:
 		- cftp
 		- kftp
-		
+
 	Timeout:
 		- netty
 		- speedtest
diff --git a/src/chrome/content/rules/NetDNA.xml b/src/chrome/content/rules/NetDNA.xml
index 11b8a98296b2..0ef9e24de297 100644
--- a/src/chrome/content/rules/NetDNA.xml
+++ b/src/chrome/content/rules/NetDNA.xml
@@ -42,7 +42,7 @@ Fetch error: http://hddn.com/ => https://hddn.com/: (51, "SSL: no alternative ce
 	ʰ WP Engine / redirects to http
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/NetEase.com.xml b/src/chrome/content/rules/NetEase.com.xml
index ae9a3e0273dd..42580d3ab925 100644
--- a/src/chrome/content/rules/NetEase.com.xml
+++ b/src/chrome/content/rules/NetEase.com.xml
@@ -9,10 +9,10 @@
 		dtws.netease.com
 		dtws2.netease.com
 		g5.gdl.netease.com
-		ma3.gdl.netease.com	https://ma3.gdl.netease.com/ninja2_101_netease.apk
+		ma3.gdl.netease.com		https://ma3.gdl.netease.com/ninja2_101_netease.apk
 		f.mgame.netease.com
 		f.my.netease.com
-		res.nie.netease.com	https://res.nie.netease.com/comm/NIE_copyRight/images/nie.2.png
+		res.nie.netease.com		https://res.nie.netease.com/comm/NIE_copyRight/images/nie.2.png
 		api.perf.netease.com
 		qn2.netease.com
 		app-down.x.netease.com	https://app-down.x.netease.com/download/game/yzr/channel/gw
@@ -31,6 +31,8 @@
 	
 	
 	
+	
+		
 	
 		
 		
@@ -65,7 +67,7 @@
 	
 	
 
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/NetFronts-mismatches.xml b/src/chrome/content/rules/NetFronts-mismatches.xml
index 1f72b84b6f70..7c3f777cba94 100644
--- a/src/chrome/content/rules/NetFronts-mismatches.xml
+++ b/src/chrome/content/rules/NetFronts-mismatches.xml
@@ -6,7 +6,8 @@
 
 	
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/NetFronts.xml b/src/chrome/content/rules/NetFronts.xml
index a34c29432854..42aa6ec42071 100644
--- a/src/chrome/content/rules/NetFronts.xml
+++ b/src/chrome/content/rules/NetFronts.xml
@@ -18,7 +18,7 @@ Fetch error: http://hosting-advantage.com/ => https://hosting-advantage.com/: (6
 		- (www.)web-hsoting.com	(ditto)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/NetHack.org.xml b/src/chrome/content/rules/NetHack.org.xml
new file mode 100644
index 000000000000..cdf6ebe2f35e
--- /dev/null
+++ b/src/chrome/content/rules/NetHack.org.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/NetMediaEurope.xml b/src/chrome/content/rules/NetMediaEurope.xml
index 885abe18a659..a5350c6479c7 100644
--- a/src/chrome/content/rules/NetMediaEurope.xml
+++ b/src/chrome/content/rules/NetMediaEurope.xml
@@ -17,13 +17,14 @@
 		techweekeurope.co.uk			(plesk default page)
 		www.techweekeurope.co.uk		(reset)
 		theinquirer.fr				(cert: plesk; pages redirect to www)
-		
+
 
 -->
 
 	
 	
-	
+	
+	
 	
 	
 	
@@ -61,4 +62,4 @@
 		to="https://techweekeurope.fr/"/>
 
 
-		
+
diff --git a/src/chrome/content/rules/NetMile.co.jp.xml b/src/chrome/content/rules/NetMile.co.jp.xml
index 355a61c8fcad..90da3a79dfe9 100644
--- a/src/chrome/content/rules/NetMile.co.jp.xml
+++ b/src/chrome/content/rules/NetMile.co.jp.xml
@@ -8,7 +8,7 @@ Fetch error: http://www.netmile.co.jp/ => https://www.netmile.co.jp/: (28, 'Oper
 	^netmile.co.jp doesn't exist.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/NetNow.co.xml b/src/chrome/content/rules/NetNow.co.xml
deleted file mode 100644
index 999f079da0f7..000000000000
--- a/src/chrome/content/rules/NetNow.co.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-
-	
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/NetSeer.xml b/src/chrome/content/rules/NetSeer.xml
deleted file mode 100644
index 0ba558c7e298..000000000000
--- a/src/chrome/content/rules/NetSeer.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/NetShelter.xml b/src/chrome/content/rules/NetShelter.xml
index 30da2884d5d5..556e7202b3e8 100644
--- a/src/chrome/content/rules/NetShelter.xml
+++ b/src/chrome/content/rules/NetShelter.xml
@@ -17,7 +17,7 @@ Fetch error: http://ad.netshelter.net/ => https://ad.netshelter.net/: (6, 'Could
 		- (www.)netshelter.net
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/NetWorks_Group.com.xml b/src/chrome/content/rules/NetWorks_Group.com.xml
deleted file mode 100644
index c0d1b9a357bf..000000000000
--- a/src/chrome/content/rules/NetWorks_Group.com.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Net_Index.xml b/src/chrome/content/rules/Net_Index.xml
index 9aa7f82c85e1..f9aeccc0e42d 100644
--- a/src/chrome/content/rules/Net_Index.xml
+++ b/src/chrome/content/rules/Net_Index.xml
@@ -11,10 +11,11 @@
 
 
 	
-	
+	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Net_Mobile.xml b/src/chrome/content/rules/Net_Mobile.xml
index 03fc9023c355..24c8bfdb478c 100644
--- a/src/chrome/content/rules/Net_Mobile.xml
+++ b/src/chrome/content/rules/Net_Mobile.xml
@@ -5,4 +5,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Net_Mundial.net.xml b/src/chrome/content/rules/Net_Mundial.net.xml
index 4d8b93955a21..390f7a8cd39e 100644
--- a/src/chrome/content/rules/Net_Mundial.net.xml
+++ b/src/chrome/content/rules/Net_Mundial.net.xml
@@ -12,7 +12,7 @@ Fetch error: http://netmundial.net/ => https://netmundial.net/: (6, 'Could not r
 Fetch error: http://www.netmundial.net/ => https://www.netmundial.net/: (6, 'Could not resolve host: www.netmundial.net')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Netcloude.cz.xml b/src/chrome/content/rules/Netcloude.cz.xml
index 622cd6341c49..f4c771268eae 100644
--- a/src/chrome/content/rules/Netcloude.cz.xml
+++ b/src/chrome/content/rules/Netcloude.cz.xml
@@ -5,7 +5,7 @@ Fetch error: http://netcloude.cz/ => https://netcloude.cz/: (60, 'SSL certificat
 Fetch error: http://www.netcloude.cz/ => https://www.netcloude.cz/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
     
     
 
diff --git a/src/chrome/content/rules/Netdialog.se.xml b/src/chrome/content/rules/Netdialog.se.xml
index c175aa10c414..917eb0e507d7 100644
--- a/src/chrome/content/rules/Netdialog.se.xml
+++ b/src/chrome/content/rules/Netdialog.se.xml
@@ -1,7 +1,7 @@
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Netfilter.org.xml b/src/chrome/content/rules/Netfilter.org.xml
index f9d6afbc27a9..f294bd793ee4 100644
--- a/src/chrome/content/rules/Netfilter.org.xml
+++ b/src/chrome/content/rules/Netfilter.org.xml
@@ -2,7 +2,6 @@
 	Nonfunctional subdomains:
 
 		- ftp *
-		- ipset *
 		- planet
 	* Shows bugzilla.netfilter.org
 
@@ -28,25 +27,11 @@
 	
 	
 	
-	
+	
 	
-	
+	
 	
-
-	
-	
-	
-	
-
-		
-		
-
-			
-			
-			
-			
+	
 
 
 	
-	
-
-		
-		
-
-	
-
 	
 
diff --git a/src/chrome/content/rules/Netfirms.xml b/src/chrome/content/rules/Netfirms.xml
index 8cb9e8a88f7c..92fcb634dda7 100644
--- a/src/chrome/content/rules/Netfirms.xml
+++ b/src/chrome/content/rules/Netfirms.xml
@@ -1,13 +1,15 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Netflame.cc.xml b/src/chrome/content/rules/Netflame.cc.xml
index 72bc664827b8..52dd9676f31c 100644
--- a/src/chrome/content/rules/Netflame.cc.xml
+++ b/src/chrome/content/rules/Netflame.cc.xml
@@ -20,7 +20,7 @@ Fetch error: http://ssl-hints.netflame.cc/ => https://ssl-hints.netflame.cc/: (5
 		- fcR
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Netfox.ru.xml b/src/chrome/content/rules/Netfox.ru.xml
index 87438a5d60e4..13dd4e9f73f9 100644
--- a/src/chrome/content/rules/Netfox.ru.xml
+++ b/src/chrome/content/rules/Netfox.ru.xml
@@ -3,7 +3,7 @@
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Netguava.xml b/src/chrome/content/rules/Netguava.xml
index 4870a77e4e5e..4d85b2ccaca9 100644
--- a/src/chrome/content/rules/Netguava.xml
+++ b/src/chrome/content/rules/Netguava.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Netistrar.com.xml b/src/chrome/content/rules/Netistrar.com.xml
index c7758175a00b..0fba07c9d74e 100644
--- a/src/chrome/content/rules/Netistrar.com.xml
+++ b/src/chrome/content/rules/Netistrar.com.xml
@@ -22,7 +22,7 @@ Fetch error: http://secure.netistrar.com/ => https://secure.netistrar.com/: (7,
 		- www.netistrar.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Netlib.org.xml b/src/chrome/content/rules/Netlib.org.xml
new file mode 100644
index 000000000000..29b615659786
--- /dev/null
+++ b/src/chrome/content/rules/Netlib.org.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Netlify.com.xml b/src/chrome/content/rules/Netlify.com.xml
deleted file mode 100644
index db2ce76a1a5f..000000000000
--- a/src/chrome/content/rules/Netlify.com.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Netline.com.xml b/src/chrome/content/rules/Netline.com.xml
deleted file mode 100644
index 484b52f3ff63..000000000000
--- a/src/chrome/content/rules/Netline.com.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-	
-
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Netload.xml b/src/chrome/content/rules/Netload.xml
index 8a02344a8ec3..4403f2573a15 100644
--- a/src/chrome/content/rules/Netload.xml
+++ b/src/chrome/content/rules/Netload.xml
@@ -5,7 +5,7 @@ Fetch error: http://netload.in/ => https://netload.in/: (6, 'Could not resolve h
 Fetch error: http://www.netload.in/ => https://www.netload.in/: (6, 'Could not resolve host: www.netload.in')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Netmarble.xml b/src/chrome/content/rules/Netmarble.xml
index 17e44f0e1a73..6dc13a48d0fd 100644
--- a/src/chrome/content/rules/Netmarble.xml
+++ b/src/chrome/content/rules/Netmarble.xml
@@ -49,7 +49,14 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
@@ -58,10 +65,9 @@
 	
 
-	
 
 	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Netmeister.org.xml b/src/chrome/content/rules/Netmeister.org.xml
deleted file mode 100644
index 9fc537b90e40..000000000000
--- a/src/chrome/content/rules/Netmeister.org.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Netnea.com.xml b/src/chrome/content/rules/Netnea.com.xml
deleted file mode 100644
index 2682d25ba0ad..000000000000
--- a/src/chrome/content/rules/Netnea.com.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-	
-
-		
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Netnod.se.xml b/src/chrome/content/rules/Netnod.se.xml
index 2ba1a08d5104..ae4cb995612d 100644
--- a/src/chrome/content/rules/Netnod.se.xml
+++ b/src/chrome/content/rules/Netnod.se.xml
@@ -12,7 +12,7 @@
 
 
 	
-	
+	
 
 
 	
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Netscape.com.xml b/src/chrome/content/rules/Netscape.com.xml
index 7a5b27d16df4..e391d6f5e548 100644
--- a/src/chrome/content/rules/Netscape.com.xml
+++ b/src/chrome/content/rules/Netscape.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://www.netscape.com/ => https://netscape.aol.com/: (7, 'Failed
 	For other AOL coverage, see AOL.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Netsekure.org.xml b/src/chrome/content/rules/Netsekure.org.xml
index 634999c03b0d..a98b9019bf34 100644
--- a/src/chrome/content/rules/Netsekure.org.xml
+++ b/src/chrome/content/rules/Netsekure.org.xml
@@ -14,7 +14,7 @@ Fetch error: http://netsekure.org/ => https://netsekure.org/: (60, 'SSL certific
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Netsparker.com.xml b/src/chrome/content/rules/Netsparker.com.xml
deleted file mode 100644
index f04b4aa8a242..000000000000
--- a/src/chrome/content/rules/Netsparker.com.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Netswarm.net.xml b/src/chrome/content/rules/Netswarm.net.xml
index 12a3fee6c80b..b8ba9ed89b09 100644
--- a/src/chrome/content/rules/Netswarm.net.xml
+++ b/src/chrome/content/rules/Netswarm.net.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Nettica.xml b/src/chrome/content/rules/Nettica.xml
index 158d22ef16f4..e34297a6c445 100644
--- a/src/chrome/content/rules/Nettica.xml
+++ b/src/chrome/content/rules/Nettica.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://nettica.com/ => https://www.nettica.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Nettitude.co.uk.xml b/src/chrome/content/rules/Nettitude.co.uk.xml
deleted file mode 100644
index db29ef64fbe8..000000000000
--- a/src/chrome/content/rules/Nettitude.co.uk.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-	
-	
-
-		
-		
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Nettitude.com.xml b/src/chrome/content/rules/Nettitude.com.xml
deleted file mode 100644
index 8e7c38d116a9..000000000000
--- a/src/chrome/content/rules/Nettitude.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Nettog.dk.xml b/src/chrome/content/rules/Nettog.dk.xml
new file mode 100644
index 000000000000..b27770d96335
--- /dev/null
+++ b/src/chrome/content/rules/Nettog.dk.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Netverify.xml b/src/chrome/content/rules/Netverify.xml
index 2515da4b70cd..bd022954829b 100644
--- a/src/chrome/content/rules/Netverify.xml
+++ b/src/chrome/content/rules/Netverify.xml
@@ -14,4 +14,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Netviewer.com.xml b/src/chrome/content/rules/Netviewer.com.xml
index 65e4c100bb58..dc6399fa4b34 100644
--- a/src/chrome/content/rules/Netviewer.com.xml
+++ b/src/chrome/content/rules/Netviewer.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://my.netviewer.com/ => https://my.netviewer.com/: (28, 'Connec
 		- www.netviewer.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Network-Depot.xml b/src/chrome/content/rules/Network-Depot.xml
index f37a5b32fb3b..83323a7435d4 100644
--- a/src/chrome/content/rules/Network-Depot.xml
+++ b/src/chrome/content/rules/Network-Depot.xml
@@ -1,24 +1,12 @@
 
 
+	
+	
+	
 
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/NetworkWorld.xml b/src/chrome/content/rules/NetworkWorld.xml
index 7ac34571a173..a1c6ea5e10d6 100644
--- a/src/chrome/content/rules/NetworkWorld.xml
+++ b/src/chrome/content/rules/NetworkWorld.xml
@@ -61,15 +61,17 @@ Fetch error: http://subscribenww.com/ => https://subscribenww.com/: (60, 'SSL ce
 	* Secured by us
 
 -->
-
+
 
 	
-	
+	
+	
+	
 	
-	
+	
 
 
-	
+	
 
 
 	
 
 	
-	
+	
 
 
 	
@@ -22,4 +22,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Network_Maker.xml b/src/chrome/content/rules/Network_Maker.xml
deleted file mode 100644
index 69703b2322c2..000000000000
--- a/src/chrome/content/rules/Network_Maker.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/NetworkedBlogs.xml b/src/chrome/content/rules/NetworkedBlogs.xml
index 050ef19e3e33..131a0c2197dc 100644
--- a/src/chrome/content/rules/NetworkedBlogs.xml
+++ b/src/chrome/content/rules/NetworkedBlogs.xml
@@ -15,7 +15,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Networkhm.com.xml b/src/chrome/content/rules/Networkhm.com.xml
deleted file mode 100644
index 92053901014c..000000000000
--- a/src/chrome/content/rules/Networkhm.com.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Networking4all.com.xml b/src/chrome/content/rules/Networking4all.com.xml
deleted file mode 100644
index a712b4ddce30..000000000000
--- a/src/chrome/content/rules/Networking4all.com.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Netzguerilla.net.xml b/src/chrome/content/rules/Netzguerilla.net.xml
index 9a37ce4d2dbb..2afff47a1830 100644
--- a/src/chrome/content/rules/Netzguerilla.net.xml
+++ b/src/chrome/content/rules/Netzguerilla.net.xml
@@ -5,7 +5,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Netzpolitik.xml b/src/chrome/content/rules/Netzpolitik.xml
index f71baa6dff2f..d8233407b70c 100644
--- a/src/chrome/content/rules/Netzpolitik.xml
+++ b/src/chrome/content/rules/Netzpolitik.xml
@@ -1,10 +1,30 @@
+
 
 
-	
   
   
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
 
-	
 
diff --git a/src/chrome/content/rules/NeuStar.xml b/src/chrome/content/rules/NeuStar.xml
index c53ea1a39e2b..82e703af2485 100644
--- a/src/chrome/content/rules/NeuStar.xml
+++ b/src/chrome/content/rules/NeuStar.xml
@@ -11,7 +11,6 @@ Fetch error: http://registry.neustar.biz/ => https://registry.neustar.biz/: (60,
 		- NPAC.com.xml
 		- Neustar_Localeze.biz.xml
 		- Neuweb.biz.xml
-		- TCPA_Compliance.us.xml
 		- UltraDNS.xml
 		- Webmetrics.com.xml
 		- Neustar.com.xml
@@ -76,7 +75,7 @@ Fetch error: http://registry.neustar.biz/ => https://registry.neustar.biz/: (60,
 		- static.wpm.neustar.biz
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Neudesic-Media-Group.xml b/src/chrome/content/rules/Neudesic-Media-Group.xml
index 9445422cb287..a4b1fc591717 100644
--- a/src/chrome/content/rules/Neudesic-Media-Group.xml
+++ b/src/chrome/content/rules/Neudesic-Media-Group.xml
@@ -6,14 +6,12 @@ Fetch error: http://ads.neudesicmediagroup.com/ => https://ads.neudesicmediagrou
 Disabled by https-everywhere-checker because:
 Fetch error: http://ads.neudesicmediagroup.com/ => https://ads.neudesicmediagroup.com/: (28, 'Connection timed out after 10001 milliseconds')
 -->
-
+
 
-	
-	
+	
 
-	
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Neustar.com.xml b/src/chrome/content/rules/Neustar.com.xml
index 1f9d7c6d3cfb..9c7e89a52a83 100644
--- a/src/chrome/content/rules/Neustar.com.xml
+++ b/src/chrome/content/rules/Neustar.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://payment.neustar.com/ => https://payment.neustar.com/: (51, "
 	For other NeuStar coverage, see NeuStar.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Neustar_Localeze.biz.xml b/src/chrome/content/rules/Neustar_Localeze.biz.xml
index d8d6710d5264..35a7807053b9 100644
--- a/src/chrome/content/rules/Neustar_Localeze.biz.xml
+++ b/src/chrome/content/rules/Neustar_Localeze.biz.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.neustarlocaleze.biz/ => https://www.neustarlocaleze.biz/
 	For other NeuStar coverage, see NeuStar.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/NeverDDoS.com.xml b/src/chrome/content/rules/NeverDDoS.com.xml
deleted file mode 100644
index c4ec4b02c9c9..000000000000
--- a/src/chrome/content/rules/NeverDDoS.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Nevill_Holt_Opera.xml b/src/chrome/content/rules/Nevill_Holt_Opera.xml
index 10dbbe0cd668..ce0bb40c5f04 100644
--- a/src/chrome/content/rules/Nevill_Holt_Opera.xml
+++ b/src/chrome/content/rules/Nevill_Holt_Opera.xml
@@ -10,10 +10,10 @@ Fetch error: http://nevillholtopera.net/ => https://www.nevillholtopera.net/: (6
 		- ^	("Error"; mismatched, CN: *.eurodiet.co.uk)
 
 -->
-
+
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Nevistas_Health.com.xml b/src/chrome/content/rules/Nevistas_Health.com.xml
index 381a3493756b..41f7c2cfb491 100644
--- a/src/chrome/content/rules/Nevistas_Health.com.xml
+++ b/src/chrome/content/rules/Nevistas_Health.com.xml
@@ -16,7 +16,7 @@ Fetch error: http://www.nevistashealth.com/ => https://www.nevistashealth.com/:
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/New-Dream-Network.xml b/src/chrome/content/rules/New-Dream-Network.xml
index 5c6490a33a36..9eeb77ae804d 100644
--- a/src/chrome/content/rules/New-Dream-Network.xml
+++ b/src/chrome/content/rules/New-Dream-Network.xml
@@ -8,10 +8,11 @@ Fetch error: http://newdream.net/ => https://newdream.net/: (60, 'SSL certificat
 		- DreamHost.xml
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/New-York-City.xml b/src/chrome/content/rules/New-York-City.xml
index 81af6d792123..33905fd86be3 100644
--- a/src/chrome/content/rules/New-York-City.xml
+++ b/src/chrome/content/rules/New-York-City.xml
@@ -38,7 +38,7 @@ Fetch error: http://a856-citystore.nyc.gov/ => https://a856-citystore.nyc.gov/:
 		- portal/site/nycgov/menuitem.beb0d8fdaa9e1607a62fa24601c789a0/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/New-York-University.xml b/src/chrome/content/rules/New-York-University.xml
index 0c38328c7ea0..b7c42491c26f 100644
--- a/src/chrome/content/rules/New-York-University.xml
+++ b/src/chrome/content/rules/New-York-University.xml
@@ -100,7 +100,42 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 		
@@ -131,8 +166,6 @@
 	
 
 
-	
 
 	
@@ -145,7 +178,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/NewIT.xml b/src/chrome/content/rules/NewIT.xml
index 312f48720cef..67aefa673adf 100644
--- a/src/chrome/content/rules/NewIT.xml
+++ b/src/chrome/content/rules/NewIT.xml
@@ -2,7 +2,7 @@
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/NewMuslimVoice.com.xml b/src/chrome/content/rules/NewMuslimVoice.com.xml
deleted file mode 100644
index 82dd52448d4b..000000000000
--- a/src/chrome/content/rules/NewMuslimVoice.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/NewScientist_Subscriptions.com.xml b/src/chrome/content/rules/NewScientist_Subscriptions.com.xml
index 92a669f455a6..232ec1644539 100644
--- a/src/chrome/content/rules/NewScientist_Subscriptions.com.xml
+++ b/src/chrome/content/rules/NewScientist_Subscriptions.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.newscientistsubscriptions.com/ => https://www.newscienti
 	For other NewScientist coverage, see NewScientist.com.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/NewYorkVocalCoaching.xml b/src/chrome/content/rules/NewYorkVocalCoaching.xml
index a1c356667b76..fe3ccbd80ab4 100644
--- a/src/chrome/content/rules/NewYorkVocalCoaching.xml
+++ b/src/chrome/content/rules/NewYorkVocalCoaching.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.theapp.voicelessonstotheworld.com/ => https://www.theapp.voicelessonstotheworld.com/: (6, 'Could not resolve host: www.theapp.voicelessonstotheworld.com')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/New_England_Journal_of_Medicine.xml b/src/chrome/content/rules/New_England_Journal_of_Medicine.xml
index 9191d292dae7..b4ca4769d53a 100644
--- a/src/chrome/content/rules/New_England_Journal_of_Medicine.xml
+++ b/src/chrome/content/rules/New_England_Journal_of_Medicine.xml
@@ -18,7 +18,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/New_Flag.xml b/src/chrome/content/rules/New_Flag.xml
deleted file mode 100644
index 0872098e4f9c..000000000000
--- a/src/chrome/content/rules/New_Flag.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/New_York_Needs_You.com.xml b/src/chrome/content/rules/New_York_Needs_You.com.xml
index fd38fdd53ab1..1e85744ce198 100644
--- a/src/chrome/content/rules/New_York_Needs_You.com.xml
+++ b/src/chrome/content/rules/New_York_Needs_You.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.newyorkneedsyou.org/ => https://www.newyorkneedsyou.org/
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Newegg.com.xml b/src/chrome/content/rules/Newegg.com.xml
index 4b23dfb2efab..88a64cf08ef7 100644
--- a/src/chrome/content/rules/Newegg.com.xml
+++ b/src/chrome/content/rules/Newegg.com.xml
@@ -141,7 +141,7 @@
 	
 	
 		
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Newport_Motorsports.xml b/src/chrome/content/rules/Newport_Motorsports.xml
index ccaef90f8dc8..55dd0354ab9b 100644
--- a/src/chrome/content/rules/Newport_Motorsports.xml
+++ b/src/chrome/content/rules/Newport_Motorsports.xml
@@ -7,15 +7,15 @@ Fetch error: http://www.newportmotorsports.com/ => https://www.newportmotorsport
 Disabled by https-everywhere-checker because:
 Fetch error: http://newportmotorsports.com/ => https://newportmotorsports.com/: (51, "SSL: no alternative certificate subject name matches target host name 'newportmotorsports.com'")
 -->
-
+
 
 	
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/News-Corporation-mismatches.xml b/src/chrome/content/rules/News-Corporation-mismatches.xml
index 2ad858aa6f6b..e312feb41152 100644
--- a/src/chrome/content/rules/News-Corporation-mismatches.xml
+++ b/src/chrome/content/rules/News-Corporation-mismatches.xml
@@ -8,61 +8,26 @@
 			(www.)edgesuite.net/404.fox(business|news).com/
 
 -->
+
 
 
 	
-	
 	
 	
-	
-		
-		
+	
 	
 	
-	
-		
-		
-	
-	
-	
-
-
-	
-	
-
-
-	
-
-	
-	
 
 	
-	
 
-	
-
-	
 
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/News-Corporation.xml b/src/chrome/content/rules/News-Corporation.xml
deleted file mode 100644
index d272b8a2b374..000000000000
--- a/src/chrome/content/rules/News-Corporation.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-	
-	
-	
-
-	
-
-	
-
-	
-
-	
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/News-Gazette.xml b/src/chrome/content/rules/News-Gazette.xml
index d0145568d3a8..ee32e8defbb1 100644
--- a/src/chrome/content/rules/News-Gazette.xml
+++ b/src/chrome/content/rules/News-Gazette.xml
@@ -1,10 +1,20 @@
+
+
+
 
+	
+	
+	
 
-	
+  
 
 
diff --git a/src/chrome/content/rules/News-Limited.xml b/src/chrome/content/rules/News-Limited.xml
new file mode 100644
index 000000000000..c9fb31bc8230
--- /dev/null
+++ b/src/chrome/content/rules/News-Limited.xml
@@ -0,0 +1,36 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/News-Registry.xml b/src/chrome/content/rules/News-Registry.xml
index 727b18754b03..d69a196ac90f 100644
--- a/src/chrome/content/rules/News-Registry.xml
+++ b/src/chrome/content/rules/News-Registry.xml
@@ -18,7 +18,7 @@ Fetch error: http://www.newsregistry.com/ => https://www.newsregistry.com/: (6,
 		- marketing.newsregistry.com	(times out)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/News.com.xml b/src/chrome/content/rules/News.com.xml
new file mode 100644
index 000000000000..aea3022a4330
--- /dev/null
+++ b/src/chrome/content/rules/News.com.xml
@@ -0,0 +1,23 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/News9daily.org.xml b/src/chrome/content/rules/News9daily.org.xml
deleted file mode 100644
index e189c81b5597..000000000000
--- a/src/chrome/content/rules/News9daily.org.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/NewsBlur.com.xml b/src/chrome/content/rules/NewsBlur.com.xml
index d1f448d67608..19c50571c086 100644
--- a/src/chrome/content/rules/NewsBlur.com.xml
+++ b/src/chrome/content/rules/NewsBlur.com.xml
@@ -1,22 +1,17 @@
 
-
 
 	
 	
+	
 	
 	
-
-	
-	
-	
-		
+	
 
 	
 
diff --git a/src/chrome/content/rules/NewsCred.com.xml b/src/chrome/content/rules/NewsCred.com.xml
index 0508397a065e..ffa63120ce59 100644
--- a/src/chrome/content/rules/NewsCred.com.xml
+++ b/src/chrome/content/rules/NewsCred.com.xml
@@ -37,7 +37,11 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
 
 
 	 https://www.newsdaily.com/: (28, 'Conn
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/NewsGator.xml b/src/chrome/content/rules/NewsGator.xml
index 1cd9100b6fe4..c120735019b0 100644
--- a/src/chrome/content/rules/NewsGator.xml
+++ b/src/chrome/content/rules/NewsGator.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://newsgator.com/ => https://www.newsgator.com/: (7, 'Failed to connect to www.newsgator.com port 443: Connection refused')
 Fetch error: http://www.newsgator.com/ => https://www.newsgator.com/: (7, 'Failed to connect to www.newsgator.com port 443: Connection refused')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/NewsLook.xml b/src/chrome/content/rules/NewsLook.xml
index bb09bd770340..911e2d0d36f7 100644
--- a/src/chrome/content/rules/NewsLook.xml
+++ b/src/chrome/content/rules/NewsLook.xml
@@ -1,44 +1,17 @@
 
-
-
+
 	
-	
-
-
-	
-
-	
-
-	
-
-	
-
+	
+	
+	
+	
+	
 
diff --git a/src/chrome/content/rules/NewsNetz.ch.xml b/src/chrome/content/rules/NewsNetz.ch.xml
index 08d2809a7e1a..b7abee97a7fc 100644
--- a/src/chrome/content/rules/NewsNetz.ch.xml
+++ b/src/chrome/content/rules/NewsNetz.ch.xml
@@ -1,4 +1,4 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/News_Distribution_Network.xml b/src/chrome/content/rules/News_Distribution_Network.xml
deleted file mode 100644
index 4908ae190d33..000000000000
--- a/src/chrome/content/rules/News_Distribution_Network.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/News_Funnel.xml b/src/chrome/content/rules/News_Funnel.xml
index 405b7170f786..1b3b026b60d2 100644
--- a/src/chrome/content/rules/News_Funnel.xml
+++ b/src/chrome/content/rules/News_Funnel.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/News_Limited.xml b/src/chrome/content/rules/News_Limited.xml
deleted file mode 100644
index 04f30c728ae9..000000000000
--- a/src/chrome/content/rules/News_Limited.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Newsday.com.xml b/src/chrome/content/rules/Newsday.com.xml
index 00d339253cf1..92b547bc787d 100644
--- a/src/chrome/content/rules/Newsday.com.xml
+++ b/src/chrome/content/rules/Newsday.com.xml
@@ -35,14 +35,14 @@
 
 
 	
-	
+	
+	
 		
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Newsmax_Health.com.xml b/src/chrome/content/rules/Newsmax_Health.com.xml
index 559c200c5072..63aa27d7a5e1 100644
--- a/src/chrome/content/rules/Newsmax_Health.com.xml
+++ b/src/chrome/content/rules/Newsmax_Health.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://newsmaxhealth.com/ => https://www.newsmaxhealth.com/: (28, '
 	^newsmaxhealth.com: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/NewspaperDirect-mismatches.xml b/src/chrome/content/rules/NewspaperDirect-mismatches.xml
deleted file mode 100644
index b0d3cabc27c3..000000000000
--- a/src/chrome/content/rules/NewspaperDirect-mismatches.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-		
-		
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/NewspaperDirect.xml b/src/chrome/content/rules/NewspaperDirect.xml
index b9c712aaccba..151ad530a1f0 100644
--- a/src/chrome/content/rules/NewspaperDirect.xml
+++ b/src/chrome/content/rules/NewspaperDirect.xml
@@ -1,38 +1,17 @@
 
 
 
-	
 	
-	
-
-		
-		
-
-
-	
 
+	
 
 	
 
diff --git a/src/chrome/content/rules/Newsvine.com.xml b/src/chrome/content/rules/Newsvine.com.xml
index ad5f9a47183a..010b9696e86f 100644
--- a/src/chrome/content/rules/Newsvine.com.xml
+++ b/src/chrome/content/rules/Newsvine.com.xml
@@ -21,7 +21,7 @@
 		- .newsvine.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Newyorkcasual.com.xml b/src/chrome/content/rules/Newyorkcasual.com.xml
deleted file mode 100644
index ff41a755af42..000000000000
--- a/src/chrome/content/rules/Newyorkcasual.com.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-	
-	
-	
-
-
diff --git a/src/chrome/content/rules/Newzbin.xml b/src/chrome/content/rules/Newzbin.xml
index e69983a9186d..b4ca9fb0185d 100644
--- a/src/chrome/content/rules/Newzbin.xml
+++ b/src/chrome/content/rules/Newzbin.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://newzbin.com/ => https://www.newzbin2.es/: (7, 'Failed to connect to www.newzbin2.es port 443: Connection refused')
 Fetch error: http://newzbin2.es/ => https://www.newzbin2.es/: (7, 'Failed to connect to www.newzbin2.es port 443: Connection refused')
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/Newzsec.com.xml b/src/chrome/content/rules/Newzsec.com.xml
index d0c82dfd52f8..b4ef776c54cd 100644
--- a/src/chrome/content/rules/Newzsec.com.xml
+++ b/src/chrome/content/rules/Newzsec.com.xml
@@ -7,7 +7,7 @@ Non-2xx HTTP code: http://www.newzsec.com/ (200) => https://saltysailor.github.i
 	(www.)?newzsec.com: Some paths 404
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Nexac.com.xml b/src/chrome/content/rules/Nexac.com.xml
index 171ceead6118..49b75516ebec 100644
--- a/src/chrome/content/rules/Nexac.com.xml
+++ b/src/chrome/content/rules/Nexac.com.xml
@@ -27,7 +27,7 @@ Fetch error: http://nexac.com/ => https://www.datalogix.com/index.php?id=19: Too
 	Web bugs.
 
 -->
-
+
 
 	
 	
@@ -46,4 +46,4 @@ Fetch error: http://nexac.com/ => https://www.datalogix.com/index.php?id=19: Too
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Nexaway.xml b/src/chrome/content/rules/Nexaway.xml
deleted file mode 100644
index 8924ae2c1d68..000000000000
--- a/src/chrome/content/rules/Nexaway.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Next.xml b/src/chrome/content/rules/Next.xml
index ccb4f483620e..50ace319a712 100644
--- a/src/chrome/content/rules/Next.xml
+++ b/src/chrome/content/rules/Next.xml
@@ -75,7 +75,7 @@ Fetch error: http://m.next.co.uk/ => https://m.next.co.uk/: (28, 'Connection tim
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/NextRegister.com.xml b/src/chrome/content/rules/NextRegister.com.xml
index 80f3c7a858f7..33708c10e21f 100644
--- a/src/chrome/content/rules/NextRegister.com.xml
+++ b/src/chrome/content/rules/NextRegister.com.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Nextbit.com.xml b/src/chrome/content/rules/Nextbit.com.xml
deleted file mode 100644
index ceab94e1f338..000000000000
--- a/src/chrome/content/rules/Nextbit.com.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Nextiva.xml b/src/chrome/content/rules/Nextiva.xml
deleted file mode 100644
index 9cf1440fc629..000000000000
--- a/src/chrome/content/rules/Nextiva.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Nextpowerup.com.xml b/src/chrome/content/rules/Nextpowerup.com.xml
deleted file mode 100644
index a1b0a3fbea2d..000000000000
--- a/src/chrome/content/rules/Nextpowerup.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-  
-  
-
-  
-
diff --git a/src/chrome/content/rules/Nexway.com.xml b/src/chrome/content/rules/Nexway.com.xml
new file mode 100644
index 000000000000..99163a36c59f
--- /dev/null
+++ b/src/chrome/content/rules/Nexway.com.xml
@@ -0,0 +1,9 @@
+
+
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Ngage_ICS.xml b/src/chrome/content/rules/Ngage_ICS.xml
index c3f8937a7423..80e98a56edfc 100644
--- a/src/chrome/content/rules/Ngage_ICS.xml
+++ b/src/chrome/content/rules/Ngage_ICS.xml
@@ -17,4 +17,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Nginx.org.xml b/src/chrome/content/rules/Nginx.org.xml
index c2fb3324356e..5ab8d317c4ba 100644
--- a/src/chrome/content/rules/Nginx.org.xml
+++ b/src/chrome/content/rules/Nginx.org.xml
@@ -1,34 +1,14 @@
-
 
 
-	
 	
+	
 	
+	
+	
 	
-	
-
-	
+	
 	
 
-
-	
-	
-
-		
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Ngrok.com.xml b/src/chrome/content/rules/Ngrok.com.xml
index f3a079e6d086..057db72129b2 100644
--- a/src/chrome/content/rules/Ngrok.com.xml
+++ b/src/chrome/content/rules/Ngrok.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://dl.ngrok.com/ => https://dl.ngrok.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Ngx.cc.xml b/src/chrome/content/rules/Ngx.cc.xml
index d61a6cf70844..9343403f5e79 100644
--- a/src/chrome/content/rules/Ngx.cc.xml
+++ b/src/chrome/content/rules/Ngx.cc.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://b.ngx.cc/ => https://b.ngx.cc/: (6, 'Could not resolve host: b.ngx.cc')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/NiKec_Solutions.xml b/src/chrome/content/rules/NiKec_Solutions.xml
index a83196076729..25fe77af5d1e 100644
--- a/src/chrome/content/rules/NiKec_Solutions.xml
+++ b/src/chrome/content/rules/NiKec_Solutions.xml
@@ -19,4 +19,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Nianet.dk.xml b/src/chrome/content/rules/Nianet.dk.xml
new file mode 100644
index 000000000000..198daab6c651
--- /dev/null
+++ b/src/chrome/content/rules/Nianet.dk.xml
@@ -0,0 +1,31 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Nic.bc.ca.xml b/src/chrome/content/rules/Nic.bc.ca.xml
new file mode 100644
index 000000000000..686700ebc934
--- /dev/null
+++ b/src/chrome/content/rules/Nic.bc.ca.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Nic.ir.xml b/src/chrome/content/rules/Nic.ir.xml
new file mode 100644
index 000000000000..5bcc89a1eae6
--- /dev/null
+++ b/src/chrome/content/rules/Nic.ir.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/NicAc.xml b/src/chrome/content/rules/NicAc.xml
index 32aa6d697f48..d5844c1261f9 100644
--- a/src/chrome/content/rules/NicAc.xml
+++ b/src/chrome/content/rules/NicAc.xml
@@ -2,7 +2,7 @@
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/NicIo.xml b/src/chrome/content/rules/NicIo.xml
index d28f8f7478fa..2571f95f8273 100644
--- a/src/chrome/content/rules/NicIo.xml
+++ b/src/chrome/content/rules/NicIo.xml
@@ -2,7 +2,7 @@
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/Nice_n_Naughty.xml b/src/chrome/content/rules/Nice_n_Naughty.xml
index 6953a1c99647..1420b6b9572d 100644
--- a/src/chrome/content/rules/Nice_n_Naughty.xml
+++ b/src/chrome/content/rules/Nice_n_Naughty.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Nicholas_Ranallo.xml b/src/chrome/content/rules/Nicholas_Ranallo.xml
deleted file mode 100644
index ea5d6a3abe10..000000000000
--- a/src/chrome/content/rules/Nicholas_Ranallo.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/NickyHager.info.xml b/src/chrome/content/rules/NickyHager.info.xml
new file mode 100644
index 000000000000..d694b7cbba55
--- /dev/null
+++ b/src/chrome/content/rules/NickyHager.info.xml
@@ -0,0 +1,9 @@
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Nicky_Hager.xml b/src/chrome/content/rules/Nicky_Hager.xml
deleted file mode 100644
index 4886927ab1ed..000000000000
--- a/src/chrome/content/rules/Nicky_Hager.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Nicotine-Anonymous.xml b/src/chrome/content/rules/Nicotine-Anonymous.xml
index b16246f845ba..f755e532e732 100644
--- a/src/chrome/content/rules/Nicotine-Anonymous.xml
+++ b/src/chrome/content/rules/Nicotine-Anonymous.xml
@@ -8,4 +8,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Nicovideo.jp.xml b/src/chrome/content/rules/Nicovideo.jp.xml
index 4d7118edf573..53d21e590f28 100644
--- a/src/chrome/content/rules/Nicovideo.jp.xml
+++ b/src/chrome/content/rules/Nicovideo.jp.xml
@@ -3,47 +3,49 @@
 
 		- Friends.nico.xml
 		- Nimg.jp.xml
-		- Simg.jp.xml
 
 	Nonfunctional subdomains:
 
-		- (www.) ¹
 		- bbs ¹
-		- blog ¹
-		- ch ¹
-		- ex ¹
-		- help ¹
-		- info ²
-		- live ¹
-		- rd ¹
-		- seiga ¹
+		- ex ²
+		- jk ¹
 
 	¹ Dropped
 	² Refused
 
-
 	Problematic subdomains:
 
 		- sales.ads *
+		- help *
 
 	* Mismatched
 
-
-	Fully covered subdomains:
-
-		- ads
-		- account
-		- secure.ch
-		- secure
-
 -->
 
 
-	
+	
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
 	
-
+	
+	
 
 	
diff --git a/src/chrome/content/rules/Nie-wieder-VDS.de.xml b/src/chrome/content/rules/Nie-wieder-VDS.de.xml
index 640fb4842f04..0cdb312f6755 100644
--- a/src/chrome/content/rules/Nie-wieder-VDS.de.xml
+++ b/src/chrome/content/rules/Nie-wieder-VDS.de.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.nie-wieder-vds.de/ => https://nie-wieder-vds.de/: (7, 'F
 		- nie-wieder-vds.de
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Nifty.com.xml b/src/chrome/content/rules/Nifty.com.xml
new file mode 100644
index 000000000000..d6756c8a6cba
--- /dev/null
+++ b/src/chrome/content/rules/Nifty.com.xml
@@ -0,0 +1,34 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/NightDev.com.xml b/src/chrome/content/rules/NightDev.com.xml
index 1ca01958c6ee..dd4c84d62353 100644
--- a/src/chrome/content/rules/NightDev.com.xml
+++ b/src/chrome/content/rules/NightDev.com.xml
@@ -1,7 +1,6 @@
 
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://nightlove.me/ => https://nightlove.me/: (6, 'Could not resol
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Nightcode.info.xml b/src/chrome/content/rules/Nightcode.info.xml
index 673de5edb766..ed9d495c0580 100644
--- a/src/chrome/content/rules/Nightcode.info.xml
+++ b/src/chrome/content/rules/Nightcode.info.xml
@@ -12,7 +12,7 @@ Fetch error: http://nightcode.info/ => https://nightcode.info/: (28, 'Connection
 	www.nightcode.info doesn't exist.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Nightmarish-Dream.ru.xml b/src/chrome/content/rules/Nightmarish-Dream.ru.xml
new file mode 100644
index 000000000000..dd45d8d8d338
--- /dev/null
+++ b/src/chrome/content/rules/Nightmarish-Dream.ru.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Nightweb.net.xml b/src/chrome/content/rules/Nightweb.net.xml
index 8131d1205dc4..bf1f7ee38276 100644
--- a/src/chrome/content/rules/Nightweb.net.xml
+++ b/src/chrome/content/rules/Nightweb.net.xml
@@ -12,7 +12,7 @@ Fetch error: http://nightweb.net/ => https://nightweb.net/: (28, 'Connection tim
 	www.nightweb.net doesn't exist.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Nijyuyon-Bimuunzu.xml b/src/chrome/content/rules/Nijyuyon-Bimuunzu.xml
index 4360250acd24..939b7215e39c 100644
--- a/src/chrome/content/rules/Nijyuyon-Bimuunzu.xml
+++ b/src/chrome/content/rules/Nijyuyon-Bimuunzu.xml
@@ -1,19 +1,11 @@
-
 
 
 	
 	
+	
 
 
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Nik_Cub.com.xml b/src/chrome/content/rules/Nik_Cub.com.xml
index 68403c188cf1..55eaf894fe46 100644
--- a/src/chrome/content/rules/Nik_Cub.com.xml
+++ b/src/chrome/content/rules/Nik_Cub.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://nikcub.com/ => https://nikcub.com/: (28, 'Operation timed ou
 Fetch error: http://www.nikcub.com/ => https://www.nikcub.com/: (28, 'Operation timed out after 30001 milliseconds with 0 bytes received')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Nik_Software.xml b/src/chrome/content/rules/Nik_Software.xml
index c5bc9185ee88..ce9e29b33271 100644
--- a/src/chrome/content/rules/Nik_Software.xml
+++ b/src/chrome/content/rules/Nik_Software.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://shop.niksoftware.com/ => https://shop.niksoftware.com/: (28, 'Connection timed out after 20000 milliseconds')
 
 -->
-
+
 
 	
 
@@ -14,4 +14,4 @@ Fetch error: http://shop.niksoftware.com/ => https://shop.niksoftware.com/: (28,
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Nikhef.nl.xml b/src/chrome/content/rules/Nikhef.nl.xml
index 9480e99ddf59..ecc6d4377aa6 100644
--- a/src/chrome/content/rules/Nikhef.nl.xml
+++ b/src/chrome/content/rules/Nikhef.nl.xml
@@ -12,7 +12,7 @@ Fetch error: http://teams.nikhef.nl/ => https://teams.nikhef.nl/: (6, 'Could not
 		- www.nikhef.nl
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Nikkei.com.xml b/src/chrome/content/rules/Nikkei.com.xml
index f7709e429c56..cd089a225328 100644
--- a/src/chrome/content/rules/Nikkei.com.xml
+++ b/src/chrome/content/rules/Nikkei.com.xml
@@ -1,15 +1,11 @@
-
 
 
-
+
+	
+	
 	
-	
 	
 	
 	
 	
 	
 	
+	
 	
-	
 	
+	
 	
 	
 
+	
+
 	
 
diff --git a/src/chrome/content/rules/Nikon-Lenswear.com.xml b/src/chrome/content/rules/Nikon-Lenswear.com.xml
deleted file mode 100644
index 3eb443f48e6e..000000000000
--- a/src/chrome/content/rules/Nikon-Lenswear.com.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Nikonrumors.com.xml b/src/chrome/content/rules/Nikonrumors.com.xml
new file mode 100644
index 000000000000..667343db86dd
--- /dev/null
+++ b/src/chrome/content/rules/Nikonrumors.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Nikos_Dano.com.xml b/src/chrome/content/rules/Nikos_Dano.com.xml
index e545efb538d8..7f75b4209274 100644
--- a/src/chrome/content/rules/Nikos_Dano.com.xml
+++ b/src/chrome/content/rules/Nikos_Dano.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://nikosdano.com/ => https://nikosdano.com/: (7, 'Failed to con
 Fetch error: http://www.nikosdano.com/ => https://www.nikosdano.com/: (7, 'Failed to connect to www.nikosdano.com port 443: Connection refused')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Nimbus_Hosting.xml b/src/chrome/content/rules/Nimbus_Hosting.xml
index 9a144b88f47f..f177b34ffa83 100644
--- a/src/chrome/content/rules/Nimbus_Hosting.xml
+++ b/src/chrome/content/rules/Nimbus_Hosting.xml
@@ -7,7 +7,8 @@
 
 
 	
-	
+	
+	
 		
@@ -23,4 +24,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Nimg.jp.xml b/src/chrome/content/rules/Nimg.jp.xml
index 831888836d90..4b391cf6f396 100644
--- a/src/chrome/content/rules/Nimg.jp.xml
+++ b/src/chrome/content/rules/Nimg.jp.xml
@@ -22,6 +22,9 @@
 			 - sp.ch.res.dev.nimg.jp
 
 		SSL peer certificate was not OK:
+			 - icons.nimg.jp
+			 - res.nimg.jp
+			 - uni.res.nimg.jp
 			 - usericon.nimg.jp
 
 		4xx client error:
@@ -36,29 +39,26 @@
 	
 
 	
-	 
-	
-	
-	
-	
-	
+		 
+			
+			
+			
+			
+			
+		 
+			
+			
 
 	
 	
 
 	
-	
 
 	
 	
 
-	
-	
-
 	
 	
-	
-	
 
 	
 
diff --git a/src/chrome/content/rules/NimporteQui.com.xml b/src/chrome/content/rules/NimporteQui.com.xml
new file mode 100644
index 000000000000..5fb65284bb12
--- /dev/null
+++ b/src/chrome/content/rules/NimporteQui.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ninja-Build.org.xml b/src/chrome/content/rules/Ninja-Build.org.xml
new file mode 100644
index 000000000000..9226d4c36127
--- /dev/null
+++ b/src/chrome/content/rules/Ninja-Build.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Nintendo_World_Report.xml b/src/chrome/content/rules/Nintendo_World_Report.xml
index 776b639e31ce..e96857416afc 100644
--- a/src/chrome/content/rules/Nintendo_World_Report.xml
+++ b/src/chrome/content/rules/Nintendo_World_Report.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Nintendolife.com.xml b/src/chrome/content/rules/Nintendolife.com.xml
new file mode 100644
index 000000000000..945a1ee157de
--- /dev/null
+++ b/src/chrome/content/rules/Nintendolife.com.xml
@@ -0,0 +1,21 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/NiteTimeToys.com.xml b/src/chrome/content/rules/NiteTimeToys.com.xml
index 4bc26dd4087d..d22d02141181 100644
--- a/src/chrome/content/rules/NiteTimeToys.com.xml
+++ b/src/chrome/content/rules/NiteTimeToys.com.xml
@@ -24,7 +24,7 @@ Fetch error: http://affiliates.nitetimetoys.com/ => https://affiliates.nitetimet
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Njal.la.xml b/src/chrome/content/rules/Njal.la.xml
new file mode 100644
index 000000000000..d4f9853850ea
--- /dev/null
+++ b/src/chrome/content/rules/Njal.la.xml
@@ -0,0 +1,26 @@
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Nnetworks.xml b/src/chrome/content/rules/Nnetworks.xml
deleted file mode 100644
index 844406cc4e02..000000000000
--- a/src/chrome/content/rules/Nnetworks.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/No-DPI-campaign.xml b/src/chrome/content/rules/No-DPI-campaign.xml
deleted file mode 100644
index dacce861536e..000000000000
--- a/src/chrome/content/rules/No-DPI-campaign.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/No-Thank-You.de.xml b/src/chrome/content/rules/No-Thank-You.de.xml
new file mode 100644
index 000000000000..e8b2f535c040
--- /dev/null
+++ b/src/chrome/content/rules/No-Thank-You.de.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/No_1366.org.xml b/src/chrome/content/rules/No_1366.org.xml
index afe4e84f8e06..d1990b5fcd9d 100644
--- a/src/chrome/content/rules/No_1366.org.xml
+++ b/src/chrome/content/rules/No_1366.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://no1366.org/ => https://no1366.org/: (60, 'SSL certificate pr
 Fetch error: http://www.no1366.org/ => https://www.no1366.org/: (60, 'SSL certificate problem: self signed certificate')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/No_Bitcoin_License.org.xml b/src/chrome/content/rules/No_Bitcoin_License.org.xml
deleted file mode 100644
index 835cda2485b3..000000000000
--- a/src/chrome/content/rules/No_Bitcoin_License.org.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/No_Starch_Press.xml b/src/chrome/content/rules/No_Starch_Press.xml
index 8f8300c1d3ad..e3594a66aac3 100644
--- a/src/chrome/content/rules/No_Starch_Press.xml
+++ b/src/chrome/content/rules/No_Starch_Press.xml
@@ -31,7 +31,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
-
+
 
 	
diff --git a/src/chrome/content/rules/Nodejitsu.com.xml b/src/chrome/content/rules/Nodejitsu.com.xml
index 248f47afcf21..f53c1d4d74bb 100644
--- a/src/chrome/content/rules/Nodejitsu.com.xml
+++ b/src/chrome/content/rules/Nodejitsu.com.xml
@@ -26,7 +26,7 @@ Fetch error: http://www.legal.nodejitsu.com/ => https://legal.nodejitsu.com/: (7
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/NoelShack.com.xml b/src/chrome/content/rules/NoelShack.com.xml
new file mode 100644
index 000000000000..96538f6a2c9b
--- /dev/null
+++ b/src/chrome/content/rules/NoelShack.com.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Noelia.xml b/src/chrome/content/rules/Noelia.xml
index cd14baf9930c..6058fc8d7107 100644
--- a/src/chrome/content/rules/Noelia.xml
+++ b/src/chrome/content/rules/Noelia.xml
@@ -5,7 +5,7 @@ Fetch error: http://noelia.fi/ => https://noelia.fi/: (60, 'SSL certificate prob
 Fetch error: http://www.noelia.fi/ => https://www.noelia.fi/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.noelia.fi/ => https://www.noelia.fi/: (60, 'SSL certific
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Noembed.com.xml b/src/chrome/content/rules/Noembed.com.xml
index ce59e35a4787..53c6573ead4f 100644
--- a/src/chrome/content/rules/Noembed.com.xml
+++ b/src/chrome/content/rules/Noembed.com.xml
@@ -1,18 +1,7 @@
-
-
-
-
+
 	
-	
-
-
-	
 
+	
 
 	
-
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/NoiseProtocol.org.xml b/src/chrome/content/rules/NoiseProtocol.org.xml
new file mode 100644
index 000000000000..568e2a45ea45
--- /dev/null
+++ b/src/chrome/content/rules/NoiseProtocol.org.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/NoiseTrade.xml b/src/chrome/content/rules/NoiseTrade.xml
index 8b31cdb799a5..c6ddcf4da38b 100644
--- a/src/chrome/content/rules/NoiseTrade.xml
+++ b/src/chrome/content/rules/NoiseTrade.xml
@@ -11,7 +11,7 @@
 
 -->
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Nokia.xml b/src/chrome/content/rules/Nokia.xml
index f2a8fb692bf5..2bd6c281d754 100644
--- a/src/chrome/content/rules/Nokia.xml
+++ b/src/chrome/content/rules/Nokia.xml
@@ -1,8 +1,13 @@
+
 
+	
 	
 	
 	
diff --git a/src/chrome/content/rules/Nokia_Siemens_Networks.xml b/src/chrome/content/rules/Nokia_Siemens_Networks.xml
index 9a3ffbb872f5..304fcbf82b18 100644
--- a/src/chrome/content/rules/Nokia_Siemens_Networks.xml
+++ b/src/chrome/content/rules/Nokia_Siemens_Networks.xml
@@ -17,7 +17,11 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 	
 	
 
@@ -37,4 +41,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Nomadesk.xml b/src/chrome/content/rules/Nomadesk.xml
index 912b40b1e3f8..b65165387ebe 100644
--- a/src/chrome/content/rules/Nomadesk.xml
+++ b/src/chrome/content/rules/Nomadesk.xml
@@ -17,7 +17,8 @@ Fetch error: http://nomadesk.com/ => https://www.nomadesk.com/: (28, 'Connection
 	
 	
 	
-	
+	
+	
 
 
 	
@@ -29,7 +30,6 @@ Fetch error: http://nomadesk.com/ => https://www.nomadesk.com/: (28, 'Connection
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Nomovok.com.xml b/src/chrome/content/rules/Nomovok.com.xml
deleted file mode 100644
index feff028f3068..000000000000
--- a/src/chrome/content/rules/Nomovok.com.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Nonexiste.net.xml b/src/chrome/content/rules/Nonexiste.net.xml
deleted file mode 100644
index 75aac575e093..000000000000
--- a/src/chrome/content/rules/Nonexiste.net.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Nootriment.xml b/src/chrome/content/rules/Nootriment.xml
index 0971ee23c242..2c3b7d5aa3f8 100644
--- a/src/chrome/content/rules/Nootriment.xml
+++ b/src/chrome/content/rules/Nootriment.xml
@@ -1,8 +1,8 @@
-
 
 
diff --git a/src/chrome/content/rules/NordVPN.com.xml b/src/chrome/content/rules/NordVPN.com.xml
deleted file mode 100644
index adf04af54808..000000000000
--- a/src/chrome/content/rules/NordVPN.com.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/NordicHardware.xml b/src/chrome/content/rules/NordicHardware.xml
index b0216ff5bea9..1b485d26c112 100644
--- a/src/chrome/content/rules/NordicHardware.xml
+++ b/src/chrome/content/rules/NordicHardware.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.nordichardware.com/ => https://www.nordichardware.com/:
 Fetch error: http://nordichardware.se/ => https://www.nordichardware.se/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 Fetch error: http://www.nordichardware.se/ => https://www.nordichardware.se/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
-  www.nordichardware.com , nordichardware.se , www.nordichardware.se , nordichardware.com , admin.nordichardware.se , admin.nordichardware.com  
+  www.nordichardware.com , nordichardware.se , www.nordichardware.se , nordichardware.com , admin.nordichardware.se , admin.nordichardware.com
 
 
 	Problematic domains:
@@ -26,7 +26,7 @@ Fetch error: http://www.nordichardware.se/ => https://www.nordichardware.se/: (6
 		- ads.nordichardware.com	(CN: www.nordichardware.com; 404)
 
 -->
-
+
 
 
 
diff --git a/src/chrome/content/rules/Nordic_Academy.no.xml b/src/chrome/content/rules/Nordic_Academy.no.xml
index e48e99e002b9..da09732520d3 100644
--- a/src/chrome/content/rules/Nordic_Academy.no.xml
+++ b/src/chrome/content/rules/Nordic_Academy.no.xml
@@ -10,7 +10,7 @@ Fetch error: http://vpn.nordicacademy.no/ => https://vpn.nordicacademy.no/: (60,
 		- (www.)	(http reply)
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Nordkurier.xml b/src/chrome/content/rules/Nordkurier.xml
index f805806dd2fa..d655f8535ea6 100644
--- a/src/chrome/content/rules/Nordkurier.xml
+++ b/src/chrome/content/rules/Nordkurier.xml
@@ -25,5 +25,5 @@
 
 	
-		
+
 
diff --git a/src/chrome/content/rules/Norge.no.xml b/src/chrome/content/rules/Norge.no.xml
index 6440664853bc..62270acf89b0 100644
--- a/src/chrome/content/rules/Norge.no.xml
+++ b/src/chrome/content/rules/Norge.no.xml
@@ -3,7 +3,7 @@
 	Timeout:
 		- psi.norge.no
 		- www2.norge.no
-	
+
 	Mismatch:
 		- test.norge.no
 
diff --git a/src/chrome/content/rules/Norid.no.xml b/src/chrome/content/rules/Norid.no.xml
index 3ac8e232e877..3e9eeba773c2 100644
--- a/src/chrome/content/rules/Norid.no.xml
+++ b/src/chrome/content/rules/Norid.no.xml
@@ -11,13 +11,13 @@
 
 
 	
-	
+	
+	
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Noris.org.xml b/src/chrome/content/rules/Noris.org.xml
index 0c9736721770..8d2975f0ea81 100644
--- a/src/chrome/content/rules/Noris.org.xml
+++ b/src/chrome/content/rules/Noris.org.xml
@@ -1,7 +1,10 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	 https://www.norman.com/: (51, "SSL: no al
 	* Unsecurable <= refused
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Norrgruppen.se.xml b/src/chrome/content/rules/Norrgruppen.se.xml
deleted file mode 100644
index e5e3c808ce8a..000000000000
--- a/src/chrome/content/rules/Norrgruppen.se.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/North-American-Network-Operators-Group.xml b/src/chrome/content/rules/North-American-Network-Operators-Group.xml
index 738314d4491e..812ccd5026b0 100644
--- a/src/chrome/content/rules/North-American-Network-Operators-Group.xml
+++ b/src/chrome/content/rules/North-American-Network-Operators-Group.xml
@@ -31,7 +31,7 @@ Fetch error: http://text.nanog.org/ => https://text.nanog.org/: (28, 'Connection
 		- css on bcop from $self
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/North-Carolina-State-University-problematic.xml b/src/chrome/content/rules/North-Carolina-State-University-problematic.xml
index faf60e17c496..91e6f016a081 100644
--- a/src/chrome/content/rules/North-Carolina-State-University-problematic.xml
+++ b/src/chrome/content/rules/North-Carolina-State-University-problematic.xml
@@ -2,7 +2,7 @@
 	For rules that are on by default, see North-Carolina-State-University.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/North-Carolina-State-University.xml b/src/chrome/content/rules/North-Carolina-State-University.xml
index 4f547380bf5e..48575eb519f8 100644
--- a/src/chrome/content/rules/North-Carolina-State-University.xml
+++ b/src/chrome/content/rules/North-Carolina-State-University.xml
@@ -94,7 +94,7 @@ Fetch error: http://my.lib.ncsu.edu/ => https://my.lib.ncsu.edu/: (6, 'Could not
 	² Unsecurable
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/North-Herts.gov.uk.xml b/src/chrome/content/rules/North-Herts.gov.uk.xml
index 7b073c498be7..fda9281ac1f3 100644
--- a/src/chrome/content/rules/North-Herts.gov.uk.xml
+++ b/src/chrome/content/rules/North-Herts.gov.uk.xml
@@ -28,7 +28,7 @@
 			- web from www.north-herts.gov.uk
 			- www from northherts-cms.cms-dev.firmstep.com
 			- www from $self
-	
+
 	ˢ Secured by us
 
 -->
diff --git a/src/chrome/content/rules/NorthClicks.xml b/src/chrome/content/rules/NorthClicks.xml
deleted file mode 100644
index 0a849c5c7a9a..000000000000
--- a/src/chrome/content/rules/NorthClicks.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/North_Norfolk.org.xml b/src/chrome/content/rules/North_Norfolk.org.xml
deleted file mode 100644
index 3e12af182fbc..000000000000
--- a/src/chrome/content/rules/North_Norfolk.org.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Northern_Tool.com.xml b/src/chrome/content/rules/Northern_Tool.com.xml
index d3030171c469..c592412e0f00 100644
--- a/src/chrome/content/rules/Northern_Tool.com.xml
+++ b/src/chrome/content/rules/Northern_Tool.com.xml
@@ -25,7 +25,10 @@
 
 	
 	
-	
+	
+	
+	
+	
 		
diff --git a/src/chrome/content/rules/Northpole.fi.xml b/src/chrome/content/rules/Northpole.fi.xml
index bfb24fbafdb8..f680a6247e35 100644
--- a/src/chrome/content/rules/Northpole.fi.xml
+++ b/src/chrome/content/rules/Northpole.fi.xml
@@ -1,8 +1,8 @@
 
   
   
-  
+
   
-  
+
   
 
diff --git a/src/chrome/content/rules/Northwest_Swim_Shop.xml b/src/chrome/content/rules/Northwest_Swim_Shop.xml
deleted file mode 100644
index 027902603c57..000000000000
--- a/src/chrome/content/rules/Northwest_Swim_Shop.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Northwestern_University.xml b/src/chrome/content/rules/Northwestern_University.xml
index 3bbf35a52376..3bf8acbb9770 100644
--- a/src/chrome/content/rules/Northwestern_University.xml
+++ b/src/chrome/content/rules/Northwestern_University.xml
@@ -101,7 +101,55 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 		
 
 
@@ -110,8 +158,6 @@
 	
 
 
-	
 
 	
@@ -122,4 +168,5 @@
 	
 
+	
 
diff --git a/src/chrome/content/rules/Norton.xml b/src/chrome/content/rules/Norton.xml
index 5999e58403a0..0ba38ae869ab 100644
--- a/src/chrome/content/rules/Norton.xml
+++ b/src/chrome/content/rules/Norton.xml
@@ -73,7 +73,7 @@
 	
 	
 	
-	
+
 	
 	
 	
@@ -96,7 +96,7 @@
 	
 	
 	
-		
+	
 	
 	
 	
@@ -129,7 +129,7 @@
 	
 	
 	
-	
+
 	
 	
 
@@ -147,7 +147,7 @@
 		
 		
-	
+
 
 	
@@ -185,5 +185,5 @@
 
 	
-	
+
 
diff --git a/src/chrome/content/rules/Norton_Online_Backup.xml b/src/chrome/content/rules/Norton_Online_Backup.xml
index 1529813445ad..cc53001eaf45 100644
--- a/src/chrome/content/rules/Norton_Online_Backup.xml
+++ b/src/chrome/content/rules/Norton_Online_Backup.xml
@@ -11,7 +11,16 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
@@ -23,7 +32,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Norwalk_Reflector.xml b/src/chrome/content/rules/Norwalk_Reflector.xml
index 4420d7eef744..59b587413b90 100644
--- a/src/chrome/content/rules/Norwalk_Reflector.xml
+++ b/src/chrome/content/rules/Norwalk_Reflector.xml
@@ -12,4 +12,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/NosCommunes.ca.xml b/src/chrome/content/rules/NosCommunes.ca.xml
new file mode 100644
index 000000000000..9bd614305c3d
--- /dev/null
+++ b/src/chrome/content/rules/NosCommunes.ca.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/NotAlwaysFriendly.com.xml b/src/chrome/content/rules/NotAlwaysFriendly.com.xml
new file mode 100644
index 000000000000..31be8895efce
--- /dev/null
+++ b/src/chrome/content/rules/NotAlwaysFriendly.com.xml
@@ -0,0 +1,18 @@
+
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/NotAlwaysHopeless.com.xml b/src/chrome/content/rules/NotAlwaysHopeless.com.xml
new file mode 100644
index 000000000000..f197e5d6230e
--- /dev/null
+++ b/src/chrome/content/rules/NotAlwaysHopeless.com.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/NotAlwaysRight.com.xml b/src/chrome/content/rules/NotAlwaysRight.com.xml
new file mode 100644
index 000000000000..69e037d735af
--- /dev/null
+++ b/src/chrome/content/rules/NotAlwaysRight.com.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/NotAlwaysWorking.com.xml b/src/chrome/content/rules/NotAlwaysWorking.com.xml
new file mode 100644
index 000000000000..19ac67ae6b8f
--- /dev/null
+++ b/src/chrome/content/rules/NotAlwaysWorking.com.xml
@@ -0,0 +1,18 @@
+
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/NotBackingDownUMass.org.xml b/src/chrome/content/rules/NotBackingDownUMass.org.xml
new file mode 100644
index 000000000000..6ae63bd38ed3
--- /dev/null
+++ b/src/chrome/content/rules/NotBackingDownUMass.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Not_Alone.gov.xml b/src/chrome/content/rules/Not_Alone.gov.xml
deleted file mode 100644
index b138adf9d460..000000000000
--- a/src/chrome/content/rules/Not_Alone.gov.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Not_Enough_Shaders.com.xml b/src/chrome/content/rules/Not_Enough_Shaders.com.xml
index 76525d86dfd8..367dfd8666ef 100644
--- a/src/chrome/content/rules/Not_Enough_Shaders.com.xml
+++ b/src/chrome/content/rules/Not_Enough_Shaders.com.xml
@@ -25,7 +25,7 @@ Fetch error: http://www.notenoughshaders.com/ => https://www.notenoughshaders.co
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/NotaNet.com.br.xml b/src/chrome/content/rules/NotaNet.com.br.xml
index 0ae9dc895868..6cdb521c6409 100644
--- a/src/chrome/content/rules/NotaNet.com.br.xml
+++ b/src/chrome/content/rules/NotaNet.com.br.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.notanet.com.br/ => https://www.notanet.com.br/: (60, 'SS
 	^: Cert only matches www
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Notabug.io.xml b/src/chrome/content/rules/Notabug.io.xml
new file mode 100644
index 000000000000..24492ace788c
--- /dev/null
+++ b/src/chrome/content/rules/Notabug.io.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Notacon.org.xml b/src/chrome/content/rules/Notacon.org.xml
index 14abbd430e0e..089a3538d2cc 100644
--- a/src/chrome/content/rules/Notacon.org.xml
+++ b/src/chrome/content/rules/Notacon.org.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://notacon.org/ => https://notacon.org/: (51, "SSL: no alternative certificate subject name matches target host name 'notacon.org'")
 Fetch error: http://www.notacon.org/ => https://www.notacon.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.notacon.org'")
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/NoteFly.xml b/src/chrome/content/rules/NoteFly.xml
index 8d39427803c8..88010b270b86 100644
--- a/src/chrome/content/rules/NoteFly.xml
+++ b/src/chrome/content/rules/NoteFly.xml
@@ -3,7 +3,6 @@
 	
 	
 
-	
 	
 
 	 https://www.noteapp.com/: (56, 'SSL read
 		* git.noteapp.com
 		* rtc.noteapp.com
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Noted_Code.com.xml b/src/chrome/content/rules/Noted_Code.com.xml
deleted file mode 100644
index 48c9da485a07..000000000000
--- a/src/chrome/content/rules/Noted_Code.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Notepad++.xml b/src/chrome/content/rules/Notepad++.xml
index a2d80da5117d..87d74188e201 100644
--- a/src/chrome/content/rules/Notepad++.xml
+++ b/src/chrome/content/rules/Notepad++.xml
@@ -1,24 +1,15 @@
 
 
 
-	
+	
 	
+	
 
+	
 
-	
-
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/NottinghamAC.xml b/src/chrome/content/rules/NottinghamAC.xml
index a5636e85b4ea..fa8b56815d0f 100644
--- a/src/chrome/content/rules/NottinghamAC.xml
+++ b/src/chrome/content/rules/NottinghamAC.xml
@@ -96,7 +96,7 @@ Fetch error: http://selfservice.nottingham.ac.uk/ => https://selfservice.notting
 	ˢ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Nova.fr.xml b/src/chrome/content/rules/Nova.fr.xml
new file mode 100644
index 000000000000..537f2d498e54
--- /dev/null
+++ b/src/chrome/content/rules/Nova.fr.xml
@@ -0,0 +1,16 @@
+
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Novartisart.com.xml b/src/chrome/content/rules/Novartisart.com.xml
index 66695c2287bd..c0784e7e97a1 100644
--- a/src/chrome/content/rules/Novartisart.com.xml
+++ b/src/chrome/content/rules/Novartisart.com.xml
@@ -12,4 +12,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Novell.xml b/src/chrome/content/rules/Novell.xml
index 65a16f213c16..54d9dfb6277f 100644
--- a/src/chrome/content/rules/Novell.xml
+++ b/src/chrome/content/rules/Novell.xml
@@ -22,7 +22,7 @@ Fetch error: http://shop.novell.com/ => https://shop.novell.com/: (51, "SSL: no
 	² Dropped
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Novosoft.net.xml b/src/chrome/content/rules/Novosoft.net.xml
index b18a1352c75a..249bc48e4b67 100644
--- a/src/chrome/content/rules/Novosoft.net.xml
+++ b/src/chrome/content/rules/Novosoft.net.xml
@@ -5,7 +5,7 @@ Fetch error: http://novosoft.net/ => https://novosoft.net/: (51, "SSL: no altern
 Fetch error: http://www.novosoft.net/ => https://www.novosoft.net/: (51, "SSL: no alternative certificate subject name matches target host name 'www.novosoft.net'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Nowy_BIP.xml b/src/chrome/content/rules/Nowy_BIP.xml
deleted file mode 100644
index 4964cd8f1086..000000000000
--- a/src/chrome/content/rules/Nowy_BIP.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Noxsolutions.com.xml b/src/chrome/content/rules/Noxsolutions.com.xml
new file mode 100644
index 000000000000..cb91478c433e
--- /dev/null
+++ b/src/chrome/content/rules/Noxsolutions.com.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Np-Edv.at.xml b/src/chrome/content/rules/Np-Edv.at.xml
deleted file mode 100644
index c3d059f66452..000000000000
--- a/src/chrome/content/rules/Np-Edv.at.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-		
-
-
-	
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Npower.xml b/src/chrome/content/rules/Npower.xml
index 07d6c6cd156e..5a3c5d495d1f 100644
--- a/src/chrome/content/rules/Npower.xml
+++ b/src/chrome/content/rules/Npower.xml
@@ -21,4 +21,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Nrelate.xml b/src/chrome/content/rules/Nrelate.xml
deleted file mode 100644
index 8f81c415511b..000000000000
--- a/src/chrome/content/rules/Nrelate.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Nrk.no.xml b/src/chrome/content/rules/Nrk.no.xml
index 5dbd09f11b7d..10df680234ef 100644
--- a/src/chrome/content/rules/Nrk.no.xml
+++ b/src/chrome/content/rules/Nrk.no.xml
@@ -51,7 +51,7 @@ Fetch error: http://fil.nrk.no/ => https://fil.nrk.no/: (56, 'SSL read: error:00
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Nserver.Ru.xml b/src/chrome/content/rules/Nserver.Ru.xml
index 25720eb56c4b..b4803156f1f5 100644
--- a/src/chrome/content/rules/Nserver.Ru.xml
+++ b/src/chrome/content/rules/Nserver.Ru.xml
@@ -8,7 +8,7 @@ Fetch error: http://ovh.nserver.ru/ => https://ovh.nserver.ru/: (7, 'Failed to c
 		- .gpt.nserver.ru
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Nstatic.com.xml b/src/chrome/content/rules/Nstatic.com.xml
new file mode 100644
index 000000000000..4eed269ddb73
--- /dev/null
+++ b/src/chrome/content/rules/Nstatic.com.xml
@@ -0,0 +1,7 @@
+
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Ntmx.de.xml b/src/chrome/content/rules/Ntmx.de.xml
index ef892f22c3a2..ffd406fde61e 100644
--- a/src/chrome/content/rules/Ntmx.de.xml
+++ b/src/chrome/content/rules/Ntmx.de.xml
@@ -14,7 +14,7 @@ Non-2xx HTTP code: http://www.ntmx.de/ (200) => https://ntmx.de/ (403)
 		- mail
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/NuBlue.xml b/src/chrome/content/rules/NuBlue.xml
index 731100daf8fb..e14461d5a14a 100644
--- a/src/chrome/content/rules/NuBlue.xml
+++ b/src/chrome/content/rules/NuBlue.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/NuStarz.com.xml b/src/chrome/content/rules/NuStarz.com.xml
index c6be4a19bf1a..33dea4ec684f 100644
--- a/src/chrome/content/rules/NuStarz.com.xml
+++ b/src/chrome/content/rules/NuStarz.com.xml
@@ -26,7 +26,7 @@ Fetch error: http://customz.nustarz.com/ => https://customz.nustarz.com/: (51, "
 	* Secured by us
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Nu_Image_Medical.xml b/src/chrome/content/rules/Nu_Image_Medical.xml
index 50efc198e29f..1fff890fd4b1 100644
--- a/src/chrome/content/rules/Nu_Image_Medical.xml
+++ b/src/chrome/content/rules/Nu_Image_Medical.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Nuand.com.xml b/src/chrome/content/rules/Nuand.com.xml
index c3a62b98a4df..848a4cec569a 100644
--- a/src/chrome/content/rules/Nuand.com.xml
+++ b/src/chrome/content/rules/Nuand.com.xml
@@ -1,10 +1,10 @@
 
@@ -27,16 +29,8 @@
 							-->
 		
 
-
-	
-	
-	
-
 	
 
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Nudevista.com.xml b/src/chrome/content/rules/Nudevista.com.xml
index 2fb7330486e9..3d9a7651178e 100644
--- a/src/chrome/content/rules/Nudevista.com.xml
+++ b/src/chrome/content/rules/Nudevista.com.xml
@@ -4,7 +4,9 @@
 -->
 
 
-	
+	
+	
+	
 
 
 	 https://71.nuggad.net/: (6, 'Could not res
 Fetch error: http://mtm.nuggad.net/ => https://mtm.nuggad.net/: Too many redirects while fetching 'https://mtm.nuggad.net/'
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Nuitka.net.xml b/src/chrome/content/rules/Nuitka.net.xml
new file mode 100644
index 000000000000..4d238b30d72a
--- /dev/null
+++ b/src/chrome/content/rules/Nuitka.net.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Nulab-Inc.com.xml b/src/chrome/content/rules/Nulab-Inc.com.xml
index 2ed86470aac3..b3f9dbf8350c 100644
--- a/src/chrome/content/rules/Nulab-Inc.com.xml
+++ b/src/chrome/content/rules/Nulab-Inc.com.xml
@@ -5,7 +5,8 @@
 
 
 	
-	
+	
+	
 
 
 	
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Numa.paris.xml b/src/chrome/content/rules/Numa.paris.xml
index 9cb4b9fbb7af..e9f5bc3c67b9 100644
--- a/src/chrome/content/rules/Numa.paris.xml
+++ b/src/chrome/content/rules/Numa.paris.xml
@@ -42,7 +42,7 @@ Fetch error: http://numa.paris/ => https://www.numa.paris/: (60, 'SSL certificat
 	² Not secured by us <= mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/NumbersUSA.xml b/src/chrome/content/rules/NumbersUSA.xml
index 14ab163c530e..5d9e08eb546b 100644
--- a/src/chrome/content/rules/NumbersUSA.xml
+++ b/src/chrome/content/rules/NumbersUSA.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Nuqayah.com.xml b/src/chrome/content/rules/Nuqayah.com.xml
new file mode 100644
index 000000000000..91de689f471a
--- /dev/null
+++ b/src/chrome/content/rules/Nuqayah.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Nurago.xml b/src/chrome/content/rules/Nurago.xml
index ea100f70bffa..ae34cf6f6cb8 100644
--- a/src/chrome/content/rules/Nurago.xml
+++ b/src/chrome/content/rules/Nurago.xml
@@ -9,8 +9,5 @@
 	
 
-	
-	
-	
 
 
diff --git a/src/chrome/content/rules/NutriCentre.xml b/src/chrome/content/rules/NutriCentre.xml
index 34b67a6e5ae8..f3ee3e753817 100644
--- a/src/chrome/content/rules/NutriCentre.xml
+++ b/src/chrome/content/rules/NutriCentre.xml
@@ -5,11 +5,11 @@ Fetch error: http://nutricentre.com/ => https://www.nutricentre.com/: (28, 'Conn
 Fetch error: http://www.nutricentre.com/ => https://www.nutricentre.com/: (7, 'Failed to connect to www.nutricentre.com port 443: Connection refused')
 
 -->
-
+
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/Nutrition.gov.xml b/src/chrome/content/rules/Nutrition.gov.xml
deleted file mode 100644
index ef718a636a77..000000000000
--- a/src/chrome/content/rules/Nutrition.gov.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Nutritiondata.self.com.xml b/src/chrome/content/rules/Nutritiondata.self.com.xml
index 73913f7c5ead..8643e33ad33d 100644
--- a/src/chrome/content/rules/Nutritiondata.self.com.xml
+++ b/src/chrome/content/rules/Nutritiondata.self.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.nutritiondata.self.com/ => https://www.nutritiondata.self.com/: (6, 'Could not resolve host: www.nutritiondata.self.com')
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Nuttcp.net.xml b/src/chrome/content/rules/Nuttcp.net.xml
new file mode 100644
index 000000000000..94d297746593
--- /dev/null
+++ b/src/chrome/content/rules/Nuttcp.net.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Nuuvem.com.xml b/src/chrome/content/rules/Nuuvem.com.xml
index 26a4d970d43d..f23d864c0d86 100644
--- a/src/chrome/content/rules/Nuuvem.com.xml
+++ b/src/chrome/content/rules/Nuuvem.com.xml
@@ -1,6 +1,6 @@
 
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.nuwear.com/ => https://www.nuwear.com/: (60, 'SSL certif
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Nvcc.edu.xml b/src/chrome/content/rules/Nvcc.edu.xml
index de9dd1734b08..44a96978c845 100644
--- a/src/chrome/content/rules/Nvcc.edu.xml
+++ b/src/chrome/content/rules/Nvcc.edu.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.student.nvcc.edu/ => https://www.student.nvcc.edu/: (28,
 	Refused:
 		novastartalk.nvcc.edu
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Nxt_Forum.org.xml b/src/chrome/content/rules/Nxt_Forum.org.xml
index 0c1abcf6b3b7..f8c613c1df99 100644
--- a/src/chrome/content/rules/Nxt_Forum.org.xml
+++ b/src/chrome/content/rules/Nxt_Forum.org.xml
@@ -1,4 +1,12 @@
+
 
 
 
-	
-	
-
 	
 	
 
-
-	
-	
-
 	
 
-
-	
-	
-
-		
-
 	
 
diff --git a/src/chrome/content/rules/Nxtck.com.xml b/src/chrome/content/rules/Nxtck.com.xml
index da2027811576..be9eddc5b81f 100644
--- a/src/chrome/content/rules/Nxtck.com.xml
+++ b/src/chrome/content/rules/Nxtck.com.xml
@@ -12,4 +12,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Nyaa.eu.xml b/src/chrome/content/rules/Nyaa.eu.xml
index d0424550a7db..06ce57927f9a 100644
--- a/src/chrome/content/rules/Nyaa.eu.xml
+++ b/src/chrome/content/rules/Nyaa.eu.xml
@@ -9,7 +9,7 @@ Fetch error: http://sukebei.nyaa.eu/ => https://sukebei.nyaa.eu/: (6, 'Could not
 	Self-signed, mismatch:
 		- cthuko.nyaa.eu
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Nyx.cz.xml b/src/chrome/content/rules/Nyx.cz.xml
index 0cf33d7826a0..440e223dc8bf 100644
--- a/src/chrome/content/rules/Nyx.cz.xml
+++ b/src/chrome/content/rules/Nyx.cz.xml
@@ -1,15 +1,21 @@
 
 
+
 	
+	
 	
 	
-	
-
-	
+		
 
 	
+
 	
+
 
diff --git a/src/chrome/content/rules/Nzbplanet.net.xml b/src/chrome/content/rules/Nzbplanet.net.xml
index 80b08823a158..c4f73de4f56d 100644
--- a/src/chrome/content/rules/Nzbplanet.net.xml
+++ b/src/chrome/content/rules/Nzbplanet.net.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/O2_online.de.xml b/src/chrome/content/rules/O2_online.de.xml
index c1bda44b8dfa..f7c542d3e7f7 100644
--- a/src/chrome/content/rules/O2_online.de.xml
+++ b/src/chrome/content/rules/O2_online.de.xml
@@ -61,7 +61,16 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 	
 
-	
+	
 
 
 	
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/OADOI.org.xml b/src/chrome/content/rules/OADOI.org.xml
new file mode 100644
index 000000000000..468a212e9000
--- /dev/null
+++ b/src/chrome/content/rules/OADOI.org.xml
@@ -0,0 +1,13 @@
+
+
+
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/OASIS_Open.org.xml b/src/chrome/content/rules/OASIS_Open.org.xml
index 72681149cf07..4234aaf170a0 100644
--- a/src/chrome/content/rules/OASIS_Open.org.xml
+++ b/src/chrome/content/rules/OASIS_Open.org.xml
@@ -1,56 +1,25 @@
-
 
-
+
 
-	
 	
-	
+	
 	
 	
 	
-	
+	
 	
 	
-	
-
-
-	
-	
-	
 
 	
 
diff --git a/src/chrome/content/rules/OCCRP.org.xml b/src/chrome/content/rules/OCCRP.org.xml
index c63ebbd274ed..e18b1a2e11dd 100644
--- a/src/chrome/content/rules/OCCRP.org.xml
+++ b/src/chrome/content/rules/OCCRP.org.xml
@@ -24,7 +24,7 @@ Fetch error: http://www.vis.occrp.org/ => https://www.vis.occrp.org/: (6, 'Could
 		- www.occrp.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/OCamlCore.org.xml b/src/chrome/content/rules/OCamlCore.org.xml
index 275a0362faf9..c956edfc0920 100644
--- a/src/chrome/content/rules/OCamlCore.org.xml
+++ b/src/chrome/content/rules/OCamlCore.org.xml
@@ -16,7 +16,7 @@ Fetch error: http://static.ocamlcore.org/ => https://static.ocamlcore.org/: (60,
 	* Shows lists.ocamlcore.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/OD.org.xml b/src/chrome/content/rules/OD.org.xml
deleted file mode 100644
index b78e310099c2..000000000000
--- a/src/chrome/content/rules/OD.org.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/OECD.xml b/src/chrome/content/rules/OECD.xml
index 26f0979290fe..5e0a9bb3c3e6 100644
--- a/src/chrome/content/rules/OECD.xml
+++ b/src/chrome/content/rules/OECD.xml
@@ -7,4 +7,4 @@
 					-->
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/OEPNVKarte.xml b/src/chrome/content/rules/OEPNVKarte.xml
new file mode 100644
index 000000000000..755ce487906b
--- /dev/null
+++ b/src/chrome/content/rules/OEPNVKarte.xml
@@ -0,0 +1,13 @@
+
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/OFB.xml b/src/chrome/content/rules/OFB.xml
index 22bf13b9c24b..4ac662f066dc 100644
--- a/src/chrome/content/rules/OFB.xml
+++ b/src/chrome/content/rules/OFB.xml
@@ -10,10 +10,11 @@ Fetch error: http://ofb.net/ => https://ofb.net/: (60, 'SSL certificate problem:
 		- lists		(cert: ofb.net; 302s to ofb.net/wp-signup.php?new=lists)
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/OFFLINE.ee.xml b/src/chrome/content/rules/OFFLINE.ee.xml
index cbf6b9127179..547555dbc46d 100644
--- a/src/chrome/content/rules/OFFLINE.ee.xml
+++ b/src/chrome/content/rules/OFFLINE.ee.xml
@@ -14,4 +14,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/OFX.com.xml b/src/chrome/content/rules/OFX.com.xml
new file mode 100644
index 000000000000..c98f3da65713
--- /dev/null
+++ b/src/chrome/content/rules/OFX.com.xml
@@ -0,0 +1,70 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/OHM2013.org.xml b/src/chrome/content/rules/OHM2013.org.xml
deleted file mode 100644
index 9f5b4d6bab06..000000000000
--- a/src/chrome/content/rules/OHM2013.org.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/OHeffernan.xml b/src/chrome/content/rules/OHeffernan.xml
index 623579310536..c939f4b597cf 100644
--- a/src/chrome/content/rules/OHeffernan.xml
+++ b/src/chrome/content/rules/OHeffernan.xml
@@ -3,7 +3,7 @@
 	
 	
 
-	
 
 
diff --git a/src/chrome/content/rules/OKCoin.cn.xml b/src/chrome/content/rules/OKCoin.cn.xml
index d865303aac60..b850ec232e99 100644
--- a/src/chrome/content/rules/OKCoin.cn.xml
+++ b/src/chrome/content/rules/OKCoin.cn.xml
@@ -25,7 +25,7 @@ Fetch error: http://img.okcoin.cn/ => https://img.okcoin.cn/: (6, 'Could not res
 		- www.okcoin.cn
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/OKCoin.com.xml b/src/chrome/content/rules/OKCoin.com.xml
index 0568fa3b466a..a92abf21aff7 100644
--- a/src/chrome/content/rules/OKCoin.com.xml
+++ b/src/chrome/content/rules/OKCoin.com.xml
@@ -16,7 +16,7 @@ Fetch error: http://img.okcoin.com/ => https://img.okcoin.com/: (6, 'Could not r
 		- www.okcoin.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/OKPAY.com.xml b/src/chrome/content/rules/OKPAY.com.xml
deleted file mode 100644
index 53dc5b1dea4e..000000000000
--- a/src/chrome/content/rules/OKPAY.com.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/OLPC.xml b/src/chrome/content/rules/OLPC.xml
index a4ef2b91f92e..b2aff2bfff68 100644
--- a/src/chrome/content/rules/OLPC.xml
+++ b/src/chrome/content/rules/OLPC.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://dev.laptop.org/ => https://dev.laptop.org/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/OMC.net.xml b/src/chrome/content/rules/OMC.net.xml
new file mode 100644
index 000000000000..c895bb006879
--- /dev/null
+++ b/src/chrome/content/rules/OMC.net.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/OMG_uk.com.xml b/src/chrome/content/rules/OMG_uk.com.xml
deleted file mode 100644
index 101eeb1c0453..000000000000
--- a/src/chrome/content/rules/OMG_uk.com.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-		
-		
-
-
-	
-	
-
-	
-
-
-	
-	
-
-		
-
-	
-
-
diff --git a/src/chrome/content/rules/OMS.eu.xml b/src/chrome/content/rules/OMS.eu.xml
index cbd9f4d89866..9472a0607cd7 100644
--- a/src/chrome/content/rules/OMS.eu.xml
+++ b/src/chrome/content/rules/OMS.eu.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://coyote.srv1.oms.eu/ => https://coyote.srv1.oms.eu/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
@@ -12,7 +12,7 @@ Fetch error: http://coyote.srv1.oms.eu/ => https://coyote.srv1.oms.eu/: (60, 'SS
 	
 
 	
diff --git a/src/chrome/content/rules/ON24.xml b/src/chrome/content/rules/ON24.xml
index 9152ad2a81c7..959921f3c30f 100644
--- a/src/chrome/content/rules/ON24.xml
+++ b/src/chrome/content/rules/ON24.xml
@@ -15,7 +15,10 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
 
 
-	
+	
+	
+	
 
 
 	
 
 
-	
 
 	
 	
 
+	
 
diff --git a/src/chrome/content/rules/ONEweb.xml b/src/chrome/content/rules/ONEweb.xml
index b3933dfe462f..77350171057c 100644
--- a/src/chrome/content/rules/ONEweb.xml
+++ b/src/chrome/content/rules/ONEweb.xml
@@ -20,4 +20,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ONOrobot.org.xml b/src/chrome/content/rules/ONOrobot.org.xml
index 6b58c7f1fe14..13639039a86d 100644
--- a/src/chrome/content/rules/ONOrobot.org.xml
+++ b/src/chrome/content/rules/ONOrobot.org.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.onorobot.org/ => https://www.onorobot.org/: (28, 'Connec
 	For other Tactical Technology coverage, see Tactical_Tech.org.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/OODA.com.xml b/src/chrome/content/rules/OODA.com.xml
index a7a004a19903..76444cab1c60 100644
--- a/src/chrome/content/rules/OODA.com.xml
+++ b/src/chrome/content/rules/OODA.com.xml
@@ -29,4 +29,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/OODA_Loop.com.xml b/src/chrome/content/rules/OODA_Loop.com.xml
index 0802414ea563..2ae58d4c2989 100644
--- a/src/chrome/content/rules/OODA_Loop.com.xml
+++ b/src/chrome/content/rules/OODA_Loop.com.xml
@@ -31,4 +31,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/OPML.xml b/src/chrome/content/rules/OPML.xml
deleted file mode 100644
index d6eaa1578216..000000000000
--- a/src/chrome/content/rules/OPML.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/ORA.xml b/src/chrome/content/rules/ORA.xml
index d0b98773603b..4404f08662a4 100644
--- a/src/chrome/content/rules/ORA.xml
+++ b/src/chrome/content/rules/ORA.xml
@@ -5,7 +5,7 @@ Fetch error: http://orafarm.com/ => https://orafarm.com/: Too many redirects whi
 Fetch error: http://www.orafarm.com/ => https://www.orafarm.com/: Too many redirects while fetching 'https://www.orafarm.com/'
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.orafarm.com/ => https://www.orafarm.com/: Too many redir
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ORF.at.xml b/src/chrome/content/rules/ORF.at.xml
index be09d338452d..a70413afa08e 100644
--- a/src/chrome/content/rules/ORF.at.xml
+++ b/src/chrome/content/rules/ORF.at.xml
@@ -23,9 +23,10 @@
 		- vorarlberg.orf.at
 		- voting.orf.at
 		- wien.orf.at
-		
+
 	Cert expired:
 		- oe3verkehr.orf.at
+		- content.orf.at
 
 	Cert mismatch:
 		- burgenlandkalender.orf.at
@@ -58,15 +59,24 @@
 		- api-tvthek
 		- averell
 		- backstage
+		- bernard
+		- bianca
+		- brain
 		- brava
+		- clyde
 		- cook
 		- dalton
+		- dancingstars
 		- der
+		- drei
+		- echtjetzt
 		- extra
 		- files
 		- files2
 		- fm4
 		- go
+		- gutenmorgen
+		- help
 		- insider
 		- iptv
 		- jack
@@ -83,6 +93,7 @@
 		- oe3
 		- oe3dabei
 		- onepager
+		- pinky
 		- publikumsrat
 		- songcontest
 		- sport
@@ -91,9 +102,12 @@
 		- suche
 		- tonga
 		- totoya
+		- tube
+		- tv
 		- tv-thek
 		- tvportal
 		- tvthek
+		- unterwegs
 		- video
 		- webport7
 		- werbung
@@ -118,9 +132,7 @@
 	
 	
 	
-	
 	
-	
 	
 	
 	
@@ -128,23 +140,17 @@
 	
 	
 	
-	
 	
 	
-	
-	
 	
 	
 	
 	
-	
 	
 	
 	
 	
 	
-	
-	
 	
 	
 	
@@ -160,9 +166,7 @@
 	
 	
 	
-	
 	
-	
 	
 	
 	
@@ -190,7 +194,6 @@
 	
 	
 	
-	
 	
 	
 	
@@ -212,16 +215,14 @@
 	
 	
 	
+	
 	
 	
 	
 	
 	
 	
-	
 	
-	
-	
 	
 	
 	
diff --git a/src/chrome/content/rules/OReilly-Media-mismatches.xml b/src/chrome/content/rules/OReilly-Media-mismatches.xml
deleted file mode 100644
index b016ef788699..000000000000
--- a/src/chrome/content/rules/OReilly-Media-mismatches.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/OReilly-Media.xml b/src/chrome/content/rules/OReilly-Media.xml
deleted file mode 100644
index 8a0a6eeb347b..000000000000
--- a/src/chrome/content/rules/OReilly-Media.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-	
-	
-	
-	
-		
-		
-		
-		
-		
-		
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/OReilly.com.xml b/src/chrome/content/rules/OReilly.com.xml
new file mode 100644
index 000000000000..e98f96959caf
--- /dev/null
+++ b/src/chrome/content/rules/OReilly.com.xml
@@ -0,0 +1,24 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/OSChina.net.xml b/src/chrome/content/rules/OSChina.net.xml
index a4f777835594..ba21e54bddac 100644
--- a/src/chrome/content/rules/OSChina.net.xml
+++ b/src/chrome/content/rules/OSChina.net.xml
@@ -1,33 +1,15 @@
-
-
-
-
+
 	
-	
-
 	
 	
 	
-	
 	
 	
 	
-	
 	
 	
+	
+	
 	
 
 	
diff --git a/src/chrome/content/rules/OSDC.com.au.xml b/src/chrome/content/rules/OSDC.com.au.xml
index c2b01ac1111a..8ff15ffdb951 100644
--- a/src/chrome/content/rules/OSDC.com.au.xml
+++ b/src/chrome/content/rules/OSDC.com.au.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.osdc.com.au/ => https://2015.osdc.com.au/: (60, 'SSL cer
 		- 2015.osdc.com.au
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/OSDir.com.xml b/src/chrome/content/rules/OSDir.com.xml
deleted file mode 100644
index fcf242741935..000000000000
--- a/src/chrome/content/rules/OSDir.com.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/OSGeo.org.xml b/src/chrome/content/rules/OSGeo.org.xml
index dba4aedda82e..450f71b365b5 100644
--- a/src/chrome/content/rules/OSGeo.org.xml
+++ b/src/chrome/content/rules/OSGeo.org.xml
@@ -1,108 +1,79 @@
 
-
-
-	
-	
+
+	
+	
+	
 	
+	
+	
+	
+	
 	
+	
+	
+	
 	
+	
+	
+	
 	
 	
 	
 	
-	
-
-	
-	
-
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-			
-			
-
-		
-		
-
-
-	
-	
-	
-	
-	
-
-	
-	
-
-
-	
-
-		
+	
 
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/OSI_Codes.xml b/src/chrome/content/rules/OSI_Codes.xml
index c5d8bd563948..1b78b115faa4 100644
--- a/src/chrome/content/rules/OSI_Codes.xml
+++ b/src/chrome/content/rules/OSI_Codes.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://osicodesinc.com/ => https://osicodesinc.com/: (51, "SSL: no alternative certificate subject name matches target host name 'osicodesinc.com'")
 
 -->
-
+
 
 	
 	
@@ -12,4 +12,4 @@ Fetch error: http://osicodesinc.com/ => https://osicodesinc.com/: (51, "SSL: no
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/OSM_Group.xml b/src/chrome/content/rules/OSM_Group.xml
index 8b163908c07a..6783a2d11703 100644
--- a/src/chrome/content/rules/OSM_Group.xml
+++ b/src/chrome/content/rules/OSM_Group.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.osmglobal.com/ => https://www.osmglobal.com/: (35, 'erro
 		- ^	(mismatched, CN: sip.osmglobal.com)
 
 -->
-
+
 
 	
 	
@@ -21,4 +21,4 @@ Fetch error: http://www.osmglobal.com/ => https://www.osmglobal.com/: (35, 'erro
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/OSR_Foundation.org-problematic.xml b/src/chrome/content/rules/OSR_Foundation.org-problematic.xml
index 3da4234a4bc0..4b2df931638c 100644
--- a/src/chrome/content/rules/OSR_Foundation.org-problematic.xml
+++ b/src/chrome/content/rules/OSR_Foundation.org-problematic.xml
@@ -1,5 +1,5 @@
 
 
diff --git a/src/chrome/content/rules/OSU.edu-falsemixed.xml b/src/chrome/content/rules/OSU.edu-falsemixed.xml
index 29362b0bc512..8c1912f9a71e 100644
--- a/src/chrome/content/rules/OSU.edu-falsemixed.xml
+++ b/src/chrome/content/rules/OSU.edu-falsemixed.xml
@@ -6,7 +6,7 @@ Fetch error: http://footprint.osu.edu/ => https://footprint.osu.edu/: (51, "SSL:
 	For rules not causing false/broken MCB, see Ohio-State-University.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/OSVDB.org.xml b/src/chrome/content/rules/OSVDB.org.xml
deleted file mode 100644
index 030f97264c8e..000000000000
--- a/src/chrome/content/rules/OSVDB.org.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-		
-
-
-	
-
-
-	
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/OSWash.org.xml b/src/chrome/content/rules/OSWash.org.xml
deleted file mode 100644
index 2870e9e66a23..000000000000
--- a/src/chrome/content/rules/OSWash.org.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/OS_Systems.xml b/src/chrome/content/rules/OS_Systems.xml
index bf1fb672c293..85d3a3898ae2 100644
--- a/src/chrome/content/rules/OS_Systems.xml
+++ b/src/chrome/content/rules/OS_Systems.xml
@@ -14,4 +14,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/OU.edu.xml b/src/chrome/content/rules/OU.edu.xml
index ded9bc3c4f4e..1f5b3a21689c 100644
--- a/src/chrome/content/rules/OU.edu.xml
+++ b/src/chrome/content/rules/OU.edu.xml
@@ -1,82 +1,35 @@
 
 
-
-	
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-
-
-	
-
-	
-
-	
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
 
diff --git a/src/chrome/content/rules/OUYA.xml b/src/chrome/content/rules/OUYA.xml
deleted file mode 100644
index a0ad96bd362d..000000000000
--- a/src/chrome/content/rules/OUYA.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-		
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/OVH.us.xml b/src/chrome/content/rules/OVH.us.xml
index 2a0321bd6b4f..7be032785227 100644
--- a/src/chrome/content/rules/OVH.us.xml
+++ b/src/chrome/content/rules/OVH.us.xml
@@ -14,7 +14,7 @@ Fetch error: http://forum.ovh.us/ => https://forum.ovh.us/: (60, 'SSL certificat
 		- forum.ovh.us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/OVPN.xml b/src/chrome/content/rules/OVPN.xml
index 105b9d7ab43e..066143b09282 100644
--- a/src/chrome/content/rules/OVPN.xml
+++ b/src/chrome/content/rules/OVPN.xml
@@ -10,7 +10,7 @@
 			- board
 			- cp
 				-->
-	
+	
 
 
 	
-
-
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Oak-Ridge-National-Laboratory.xml b/src/chrome/content/rules/Oak-Ridge-National-Laboratory.xml
index 91c22d8e981d..a2467ac1040d 100644
--- a/src/chrome/content/rules/Oak-Ridge-National-Laboratory.xml
+++ b/src/chrome/content/rules/Oak-Ridge-National-Laboratory.xml
@@ -158,7 +158,7 @@ Fetch error: http://sustainability-ornl.org/ => https://sustainability-ornl.org/
 	ˢ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Oaklandish.xml b/src/chrome/content/rules/Oaklandish.xml
index ddbb6097e5af..c4b8e0b35672 100644
--- a/src/chrome/content/rules/Oaklandish.xml
+++ b/src/chrome/content/rules/Oaklandish.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ObDev.at.xml b/src/chrome/content/rules/ObDev.at.xml
index f0f80a5ede09..edb41b172b34 100644
--- a/src/chrome/content/rules/ObDev.at.xml
+++ b/src/chrome/content/rules/ObDev.at.xml
@@ -21,7 +21,7 @@
 	
 	
 
-	
+	
 
 
 	 https://oncampus.csr.oberlin.ed
 		- oncampus
 
 -->
-
+
 
-	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
-	
+	
 
 
-	
 
 	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/OboeInsight.com.xml b/src/chrome/content/rules/OboeInsight.com.xml
new file mode 100644
index 000000000000..71bfb1f9c856
--- /dev/null
+++ b/src/chrome/content/rules/OboeInsight.com.xml
@@ -0,0 +1,17 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ObsPol.be.xml b/src/chrome/content/rules/ObsPol.be.xml
new file mode 100644
index 000000000000..759538e61f62
--- /dev/null
+++ b/src/chrome/content/rules/ObsPol.be.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Occupywallst.org.xml b/src/chrome/content/rules/Occupywallst.org.xml
deleted file mode 100644
index a30e7ce490bf..000000000000
--- a/src/chrome/content/rules/Occupywallst.org.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-  
-  
-
-  
-
diff --git a/src/chrome/content/rules/OceaniaBedCollection.com.xml b/src/chrome/content/rules/OceaniaBedCollection.com.xml
new file mode 100644
index 000000000000..e82772487281
--- /dev/null
+++ b/src/chrome/content/rules/OceaniaBedCollection.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/OceaniaCruises.com.xml b/src/chrome/content/rules/OceaniaCruises.com.xml
new file mode 100644
index 000000000000..0aef6c30f203
--- /dev/null
+++ b/src/chrome/content/rules/OceaniaCruises.com.xml
@@ -0,0 +1,39 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Octopoos.com.xml b/src/chrome/content/rules/Octopoos.com.xml
deleted file mode 100644
index c9c2f408c807..000000000000
--- a/src/chrome/content/rules/Octopoos.com.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-		
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Octopuspop.com.xml b/src/chrome/content/rules/Octopuspop.com.xml
index 1e5743c8c6c5..b86db8b85558 100644
--- a/src/chrome/content/rules/Octopuspop.com.xml
+++ b/src/chrome/content/rules/Octopuspop.com.xml
@@ -18,7 +18,7 @@ Fetch error: http://kuki.js.test.octopuspop.com/ => https://kuki.js.test.octopus
 	²: Invalid certificate
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Oculu.com.xml b/src/chrome/content/rules/Oculu.com.xml
index fd8f1704c14b..53e4dc5c1051 100644
--- a/src/chrome/content/rules/Oculu.com.xml
+++ b/src/chrome/content/rules/Oculu.com.xml
@@ -34,7 +34,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -43,4 +44,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Oculus.com.xml b/src/chrome/content/rules/Oculus.com.xml
deleted file mode 100644
index 2bfc4d863376..000000000000
--- a/src/chrome/content/rules/Oculus.com.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-	
-	
-
-		
-		
-		
-		
-		
-		
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/OculusVR.com.xml b/src/chrome/content/rules/OculusVR.com.xml
new file mode 100644
index 000000000000..bd9b0c819d2a
--- /dev/null
+++ b/src/chrome/content/rules/OculusVR.com.xml
@@ -0,0 +1,19 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Oculus_VR.xml b/src/chrome/content/rules/Oculus_VR.xml
deleted file mode 100644
index 85a588373468..000000000000
--- a/src/chrome/content/rules/Oculus_VR.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-
-
-	
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Odesk.by.xml b/src/chrome/content/rules/Odesk.by.xml
index 4274960558da..b6f2b2cc98a7 100644
--- a/src/chrome/content/rules/Odesk.by.xml
+++ b/src/chrome/content/rules/Odesk.by.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.odesk.by/ => https://odesk.by/: (7, 'Failed to connect t
 	www: mismatched
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Odoo.com.xml b/src/chrome/content/rules/Odoo.com.xml
index 72d8ef9c6a54..f99c32c72ba5 100644
--- a/src/chrome/content/rules/Odoo.com.xml
+++ b/src/chrome/content/rules/Odoo.com.xml
@@ -26,7 +26,7 @@ Fetch error: http://demo1.odoo.com/ => https://demo1.odoo.com/: (60, 'SSL certif
 		- www.odoo.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Oeticket.xml b/src/chrome/content/rules/Oeticket.xml
index 26033b3870ac..26965f6663d0 100644
--- a/src/chrome/content/rules/Oeticket.xml
+++ b/src/chrome/content/rules/Oeticket.xml
@@ -1,5 +1,5 @@
 
-
+
 
 	
diff --git a/src/chrome/content/rules/Offerpop.com.xml b/src/chrome/content/rules/Offerpop.com.xml
index 162915c9fb70..f31556fbca9d 100644
--- a/src/chrome/content/rules/Offerpop.com.xml
+++ b/src/chrome/content/rules/Offerpop.com.xml
@@ -25,7 +25,7 @@ Fetch error: http://images.offerpop.com/ => https://d3nxc88n0lpo37.cloudfront.ne
 		- community.offerpop.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Offers_CDN.net.xml b/src/chrome/content/rules/Offers_CDN.net.xml
deleted file mode 100644
index 5c93bc469433..000000000000
--- a/src/chrome/content/rules/Offers_CDN.net.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Office-of-the-Commissioner-of-Lobbying-of-Canada.xml b/src/chrome/content/rules/Office-of-the-Commissioner-of-Lobbying-of-Canada.xml
index 8011e98022e3..5f912d29174a 100644
--- a/src/chrome/content/rules/Office-of-the-Commissioner-of-Lobbying-of-Canada.xml
+++ b/src/chrome/content/rules/Office-of-the-Commissioner-of-Lobbying-of-Canada.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://ocl-cal.gc.ca/ => https://ocl-cal.gc.ca/eic/site/012.nsf/Intro: (51, "SSL: no alternative certificate subject name matches target host name 'ocl-cal.gc.ca'")
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Office.co.uk.xml b/src/chrome/content/rules/Office.co.uk.xml
index d18abf9ce11f..1cc1baa2ca3c 100644
--- a/src/chrome/content/rules/Office.co.uk.xml
+++ b/src/chrome/content/rules/Office.co.uk.xml
@@ -6,7 +6,7 @@ Fetch error: http://media.office.co.uk/ => https://media.office.co.uk/: Too many
 	^office.co.uk: Dropped
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/OfficeLeaks.com.xml b/src/chrome/content/rules/OfficeLeaks.com.xml
index 380f84a96a62..216b8e5e03ef 100644
--- a/src/chrome/content/rules/OfficeLeaks.com.xml
+++ b/src/chrome/content/rules/OfficeLeaks.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://secure.officeleaks.com/ => https://secure.officeleaks.com/:
 	www: Redirects to http
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Office_Depot.xml b/src/chrome/content/rules/Office_Depot.xml
index 1dbba6a29e76..9b4be5b34a92 100644
--- a/src/chrome/content/rules/Office_Depot.xml
+++ b/src/chrome/content/rules/Office_Depot.xml
@@ -59,4 +59,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/OfficeofNationalAssessments.xml b/src/chrome/content/rules/OfficeofNationalAssessments.xml
deleted file mode 100644
index e8351d6a6158..000000000000
--- a/src/chrome/content/rules/OfficeofNationalAssessments.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-	
-
-	
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/OfficeofParliamentaryCounsel.xml b/src/chrome/content/rules/OfficeofParliamentaryCounsel.xml
index a544b7d21770..6b06f343957f 100644
--- a/src/chrome/content/rules/OfficeofParliamentaryCounsel.xml
+++ b/src/chrome/content/rules/OfficeofParliamentaryCounsel.xml
@@ -4,10 +4,10 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://opc.gov.au/ => https://www.opc.gov.au/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/OfficeoftheMigrationAgentsRegistrationAuthority.xml b/src/chrome/content/rules/OfficeoftheMigrationAgentsRegistrationAuthority.xml
index 8d8fc67b7ef5..d889d827e975 100644
--- a/src/chrome/content/rules/OfficeoftheMigrationAgentsRegistrationAuthority.xml
+++ b/src/chrome/content/rules/OfficeoftheMigrationAgentsRegistrationAuthority.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Officer_Down_Memorial_Page.xml b/src/chrome/content/rules/Officer_Down_Memorial_Page.xml
index 83fc403d5e9f..de88ca6d4834 100644
--- a/src/chrome/content/rules/Officer_Down_Memorial_Page.xml
+++ b/src/chrome/content/rules/Officer_Down_Memorial_Page.xml
@@ -14,7 +14,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Officeworks.com.au.xml b/src/chrome/content/rules/Officeworks.com.au.xml
new file mode 100644
index 000000000000..88a0388e806f
--- /dev/null
+++ b/src/chrome/content/rules/Officeworks.com.au.xml
@@ -0,0 +1,70 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Officeworks.xml b/src/chrome/content/rules/Officeworks.xml
deleted file mode 100644
index df71f9c8ae15..000000000000
--- a/src/chrome/content/rules/Officeworks.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Offlineimap.org.xml b/src/chrome/content/rules/Offlineimap.org.xml
new file mode 100644
index 000000000000..e5fe609fb55c
--- /dev/null
+++ b/src/chrome/content/rules/Offlineimap.org.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Ohio-State-University.xml b/src/chrome/content/rules/Ohio-State-University.xml
index adbaed328267..6d06fe575746 100644
--- a/src/chrome/content/rules/Ohio-State-University.xml
+++ b/src/chrome/content/rules/Ohio-State-University.xml
@@ -307,7 +307,7 @@ Fetch error: http://www.mansfield.osu.edu/ => https://www.mansfield.osu.edu/: (5
 	ˢ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Ohio-State.edu.xml b/src/chrome/content/rules/Ohio-State.edu.xml
index 0e4061aeab6b..48346920ae92 100644
--- a/src/chrome/content/rules/Ohio-State.edu.xml
+++ b/src/chrome/content/rules/Ohio-State.edu.xml
@@ -86,7 +86,7 @@ Fetch error: http://newman.uts.ohio-state.edu/ => https://upem.it.ohio-state.edu
 		- css on www.gradsch from www.osu.edu * ˢ
 
 		- Images, on:
-		
+
 			- nucleus.con from silverlight.dlservice.microsoft.com
 			- nucleus.con from go2.microsoft.com
 			- studentweb.con from nursing.osu.edu ˢ
@@ -96,7 +96,7 @@ Fetch error: http://newman.uts.ohio-state.edu/ => https://upem.it.ohio-state.edu
 	ˢ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/OhioLINK.edu.xml b/src/chrome/content/rules/OhioLINK.edu.xml
index cc82773ddb8c..b9611168037f 100644
--- a/src/chrome/content/rules/OhioLINK.edu.xml
+++ b/src/chrome/content/rules/OhioLINK.edu.xml
@@ -31,7 +31,7 @@ Fetch error: http://proxy.ohiolink.edu/ => https://proxy.ohiolink.edu/: (7, 'Fai
 		- www.ohiolink.edu
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Ohloh.xml b/src/chrome/content/rules/Ohloh.xml
deleted file mode 100644
index df421ea31ff8..000000000000
--- a/src/chrome/content/rules/Ohloh.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-  
-  
-  
-  
-  
-  
-
-  
-
-  
-
-	
-
-
diff --git a/src/chrome/content/rules/Ohnward.com.xml b/src/chrome/content/rules/Ohnward.com.xml
index f4c5a0a9f770..ecb73fda46d5 100644
--- a/src/chrome/content/rules/Ohnward.com.xml
+++ b/src/chrome/content/rules/Ohnward.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://fas.ohnward.com/ => https://fas.ohnward.com/: (28, 'Connecti
 		- www.fas.ohnward.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Ok.ru.xml b/src/chrome/content/rules/Ok.ru.xml
index c68db2b66908..a56f18995a42 100644
--- a/src/chrome/content/rules/Ok.ru.xml
+++ b/src/chrome/content/rules/Ok.ru.xml
@@ -6,15 +6,6 @@
 -->
 
 
-	
-	
-	
-	
-	
-	
-	
-	
-	
 
 	
 	
diff --git a/src/chrome/content/rules/OkCimg.com.xml b/src/chrome/content/rules/OkCimg.com.xml
index 7577f3adce62..5150546df971 100644
--- a/src/chrome/content/rules/OkCimg.com.xml
+++ b/src/chrome/content/rules/OkCimg.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://ads.okcimg.com/ => https://ads.okcimg.com/: (28, 'Operation
 		- .okcimg.com
 
 -->
-
+
 
 	
 	
@@ -30,7 +30,7 @@ Fetch error: http://ads.okcimg.com/ => https://ads.okcimg.com/: (28, 'Operation
 
 	
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Okaz.com.sa.xml b/src/chrome/content/rules/Okaz.com.sa.xml
new file mode 100644
index 000000000000..78664b98be20
--- /dev/null
+++ b/src/chrome/content/rules/Okaz.com.sa.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Okoun.cz.xml b/src/chrome/content/rules/Okoun.cz.xml
index 5280de9e2551..20548a066dcd 100644
--- a/src/chrome/content/rules/Okoun.cz.xml
+++ b/src/chrome/content/rules/Okoun.cz.xml
@@ -8,5 +8,4 @@
 
 	
 
-	
 
diff --git a/src/chrome/content/rules/Okta.com.xml b/src/chrome/content/rules/Okta.com.xml
index d6b1b2ca6c82..4f03efe73fd0 100644
--- a/src/chrome/content/rules/Okta.com.xml
+++ b/src/chrome/content/rules/Okta.com.xml
@@ -1,23 +1,15 @@
-
 
-
+
 
 	
 	
-	
+	
 	
 	
 
@@ -42,16 +34,7 @@ Fetch error: http://community.okta.com/ => https://community.okta.com/: (60, 'SS
 				-->
 	
 
-
-	
-	
-	
-	
-	
-
-	
-
+	
 
 	
diff --git a/src/chrome/content/rules/Olark.xml b/src/chrome/content/rules/Olark.xml
index d45413363ee2..838de8fba91d 100644
--- a/src/chrome/content/rules/Olark.xml
+++ b/src/chrome/content/rules/Olark.xml
@@ -31,7 +31,7 @@
 					-->
 	
 
-	
+	
 
 
 	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Olioboard.com.xml b/src/chrome/content/rules/Olioboard.com.xml
deleted file mode 100644
index 9b092748a68e..000000000000
--- a/src/chrome/content/rules/Olioboard.com.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Ology.com-problematic.xml b/src/chrome/content/rules/Ology.com-problematic.xml
index a68030d47846..c14f97601022 100644
--- a/src/chrome/content/rules/Ology.com-problematic.xml
+++ b/src/chrome/content/rules/Ology.com-problematic.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ology.com.xml b/src/chrome/content/rules/Ology.com.xml
deleted file mode 100644
index f6491b59b140..000000000000
--- a/src/chrome/content/rules/Ology.com.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Olx.pt.xml b/src/chrome/content/rules/Olx.pt.xml
index 698472a904d0..b19f4fb2d4b6 100644
--- a/src/chrome/content/rules/Olx.pt.xml
+++ b/src/chrome/content/rules/Olx.pt.xml
@@ -1,7 +1,7 @@
 
diff --git a/src/chrome/content/rules/Omaha.com.xml b/src/chrome/content/rules/Omaha.com.xml
new file mode 100644
index 000000000000..b72fd4468f47
--- /dev/null
+++ b/src/chrome/content/rules/Omaha.com.xml
@@ -0,0 +1,19 @@
+
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/OmakaseWeb.com.xml b/src/chrome/content/rules/OmakaseWeb.com.xml
index 2bed54c84ac0..1a429a0be70c 100644
--- a/src/chrome/content/rules/OmakaseWeb.com.xml
+++ b/src/chrome/content/rules/OmakaseWeb.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.omakaseweb.com/ => https://www.omakaseweb.com/: (28, 'Co
 	For other GMO coverage, see GMO_Internet.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Omeda.xml b/src/chrome/content/rules/Omeda.xml
index fbb7306ff64e..05eef76d3011 100644
--- a/src/chrome/content/rules/Omeda.xml
+++ b/src/chrome/content/rules/Omeda.xml
@@ -4,7 +4,7 @@
 		
 		
 
-	
+	
 
 
 	
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/OmniTI.com.xml b/src/chrome/content/rules/OmniTI.com.xml
deleted file mode 100644
index c927eb690669..000000000000
--- a/src/chrome/content/rules/OmniTI.com.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/OmniTI.net.xml b/src/chrome/content/rules/OmniTI.net.xml
deleted file mode 100644
index e9598a1478bb..000000000000
--- a/src/chrome/content/rules/OmniTI.net.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/OmniUpdate.com.xml b/src/chrome/content/rules/OmniUpdate.com.xml
index 00d365d53992..8a2fcb00a828 100644
--- a/src/chrome/content/rules/OmniUpdate.com.xml
+++ b/src/chrome/content/rules/OmniUpdate.com.xml
@@ -18,13 +18,15 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Omniref.com.xml b/src/chrome/content/rules/Omniref.com.xml
index 4b91868bf67b..99eebd43c747 100644
--- a/src/chrome/content/rules/Omniref.com.xml
+++ b/src/chrome/content/rules/Omniref.com.xml
@@ -11,7 +11,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://omniref.com/ => https://omniref.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Omnirom.org.xml b/src/chrome/content/rules/Omnirom.org.xml
index 58f85d7d0689..673bd965a6c9 100644
--- a/src/chrome/content/rules/Omnirom.org.xml
+++ b/src/chrome/content/rules/Omnirom.org.xml
@@ -1,6 +1,18 @@
+
 
-
-
-
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+
+	
 
- 
diff --git a/src/chrome/content/rules/Omnitec_Inc.com.xml b/src/chrome/content/rules/Omnitec_Inc.com.xml
deleted file mode 100644
index e7be7e8a5c38..000000000000
--- a/src/chrome/content/rules/Omnitec_Inc.com.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Omniture.com.xml b/src/chrome/content/rules/Omniture.com.xml
index 42bf9668ab05..b9e8d6b5dcaa 100644
--- a/src/chrome/content/rules/Omniture.com.xml
+++ b/src/chrome/content/rules/Omniture.com.xml
@@ -42,7 +42,7 @@
 					-->
 	
 
-	
+	
 
 
 	
 
 
-	
+	
 
 
 	 https://on-disk.com/: (60, 'SSL certificate
 	Cert only matches ^on-disk.com
 
 -->
-
+
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/On-web.fr.xml b/src/chrome/content/rules/On-web.fr.xml
index 6148f9680538..019fac33c5c9 100644
--- a/src/chrome/content/rules/On-web.fr.xml
+++ b/src/chrome/content/rules/On-web.fr.xml
@@ -27,4 +27,4 @@ Fetch error: http://on-web.fr/ => https://www.planet-work.com/: (28, 'Operation
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/OnLive.com.xml b/src/chrome/content/rules/OnLive.com.xml
index 5f84bf63abcb..ee79c03f2075 100644
--- a/src/chrome/content/rules/OnLive.com.xml
+++ b/src/chrome/content/rules/OnLive.com.xml
@@ -18,7 +18,7 @@ Fetch error: http://blog.onlive.com/ => https://blog.onlive.com/: (51, "SSL: no
 	* Mismatched
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/OnSecure.xml b/src/chrome/content/rules/OnSecure.xml
index e8e86b614638..ad207bd92c71 100644
--- a/src/chrome/content/rules/OnSecure.xml
+++ b/src/chrome/content/rules/OnSecure.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Onamae.com.xml b/src/chrome/content/rules/Onamae.com.xml
index 7dea22daeab4..3664b47cfc55 100644
--- a/src/chrome/content/rules/Onamae.com.xml
+++ b/src/chrome/content/rules/Onamae.com.xml
@@ -1,33 +1,18 @@
 
 
 
 	
-	
-		
-		
-		
-		
-
-
-	
-	
-	
-
-	
+	
+	
 
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Onarbor.com.xml b/src/chrome/content/rules/Onarbor.com.xml
index 4717071e2923..6870a82887dd 100644
--- a/src/chrome/content/rules/Onarbor.com.xml
+++ b/src/chrome/content/rules/Onarbor.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://onarbor.com/ => https://onarbor.com/: (7, 'Failed to connect
 Fetch error: http://www.onarbor.com/ => https://www.onarbor.com/: (7, 'Failed to connect to www.onarbor.com port 443: Connection refused')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/OnboardKit.com.xml b/src/chrome/content/rules/OnboardKit.com.xml
deleted file mode 100644
index ff85203253b4..000000000000
--- a/src/chrome/content/rules/OnboardKit.com.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/One-Good-Driver.xml b/src/chrome/content/rules/One-Good-Driver.xml
deleted file mode 100644
index 0b891ef812c2..000000000000
--- a/src/chrome/content/rules/One-Good-Driver.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/One2Buy.xml b/src/chrome/content/rules/One2Buy.xml
index 7d0278a70123..0b2fe760929c 100644
--- a/src/chrome/content/rules/One2Buy.xml
+++ b/src/chrome/content/rules/One2Buy.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/OneCloudSecurity.com.xml b/src/chrome/content/rules/OneCloudSecurity.com.xml
index e3dcd135488f..60b73579a31b 100644
--- a/src/chrome/content/rules/OneCloudSecurity.com.xml
+++ b/src/chrome/content/rules/OneCloudSecurity.com.xml
@@ -11,7 +11,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://onecloudsecurity.com/ => https://onecloudsecurity.com/: Too many redirects while fetching 'https://onecloudsecurity.com/'
 
 -->
-
+
 
 	
 	
@@ -22,4 +22,4 @@ Fetch error: http://onecloudsecurity.com/ => https://onecloudsecurity.com/: Too
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/OneExchange.xml b/src/chrome/content/rules/OneExchange.xml
index 0d73ab68aaf6..1484378a0979 100644
--- a/src/chrome/content/rules/OneExchange.xml
+++ b/src/chrome/content/rules/OneExchange.xml
@@ -6,4 +6,4 @@
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/OneMathematicalCat.org.xml b/src/chrome/content/rules/OneMathematicalCat.org.xml
new file mode 100644
index 000000000000..5cfd0e2c6d10
--- /dev/null
+++ b/src/chrome/content/rules/OneMathematicalCat.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/OneNetworkDirect.xml b/src/chrome/content/rules/OneNetworkDirect.xml
index bbfade497558..c5c812456205 100644
--- a/src/chrome/content/rules/OneNetworkDirect.xml
+++ b/src/chrome/content/rules/OneNetworkDirect.xml
@@ -14,4 +14,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/OneScreen.xml b/src/chrome/content/rules/OneScreen.xml
index 096219488a02..1d38c2769f33 100644
--- a/src/chrome/content/rules/OneScreen.xml
+++ b/src/chrome/content/rules/OneScreen.xml
@@ -22,7 +22,8 @@
 
 	
 	
-	
+	
+	
 
 
 	
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.onemancan.org/ => https://www.onemancan.org/: (51, "SSL:
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/One_Month.com.xml b/src/chrome/content/rules/One_Month.com.xml
index f91c00f8d6e6..dc6ed777ef2d 100644
--- a/src/chrome/content/rules/One_Month.com.xml
+++ b/src/chrome/content/rules/One_Month.com.xml
@@ -43,7 +43,7 @@ Fetch error: http://refer.onemonth.com/ => https://refer.onemonth.com/: (60, 'SS
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/One_in_3_Campaign.xml b/src/chrome/content/rules/One_in_3_Campaign.xml
index 940733e85f88..e7a204ab164a 100644
--- a/src/chrome/content/rules/One_in_3_Campaign.xml
+++ b/src/chrome/content/rules/One_in_3_Campaign.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Onebillion.org.uk.xml b/src/chrome/content/rules/Onebillion.org.uk.xml
index c6cf5acb1256..836de864ea78 100644
--- a/src/chrome/content/rules/Onebillion.org.uk.xml
+++ b/src/chrome/content/rules/Onebillion.org.uk.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.onebillion.org.uk/ => https://www.onebillion.org.uk/: (51, "SSL: no alternative certificate subject name matches target host name 'www.onebillion.org.uk'")
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Onebitbug.me.xml b/src/chrome/content/rules/Onebitbug.me.xml
index bff911ebd95e..152d083ceabc 100644
--- a/src/chrome/content/rules/Onebitbug.me.xml
+++ b/src/chrome/content/rules/Onebitbug.me.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.onebitbug.me/ => https://www.onebitbug.me/: (51, "SSL: no alternative certificate subject name matches target host name 'www.onebitbug.me'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Onepager.xml b/src/chrome/content/rules/Onepager.xml
index b97ea74e835b..00f2fa728fda 100644
--- a/src/chrome/content/rules/Onepager.xml
+++ b/src/chrome/content/rules/Onepager.xml
@@ -16,4 +16,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Oneworld-Publications.com.xml b/src/chrome/content/rules/Oneworld-Publications.com.xml
new file mode 100644
index 000000000000..742ae8197850
--- /dev/null
+++ b/src/chrome/content/rules/Oneworld-Publications.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Onion.to.xml b/src/chrome/content/rules/Onion.to.xml
index 5363b0efe1e5..bd206738d303 100644
--- a/src/chrome/content/rules/Onion.to.xml
+++ b/src/chrome/content/rules/Onion.to.xml
@@ -15,5 +15,5 @@
 	
 	
 	
-	
+
 
diff --git a/src/chrome/content/rules/Onion.xml b/src/chrome/content/rules/Onion.xml
deleted file mode 100644
index d8b0bf799b4c..000000000000
--- a/src/chrome/content/rules/Onion.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/OnionCat.org.xml b/src/chrome/content/rules/OnionCat.org.xml
index 29f49206b072..ec9425c5d26e 100644
--- a/src/chrome/content/rules/OnionCat.org.xml
+++ b/src/chrome/content/rules/OnionCat.org.xml
@@ -5,7 +5,7 @@
 	^onioncat.org: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/OnionGit.eu.xml b/src/chrome/content/rules/OnionGit.eu.xml
deleted file mode 100644
index c560893d8e34..000000000000
--- a/src/chrome/content/rules/OnionGit.eu.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/OnionTip.com.xml b/src/chrome/content/rules/OnionTip.com.xml
index d96d0b75a1de..3b5a55d7a948 100644
--- a/src/chrome/content/rules/OnionTip.com.xml
+++ b/src/chrome/content/rules/OnionTip.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://oniontip.com/ => https://oniontip.com/: (7, 'Failed to conne
 Fetch error: http://www.oniontip.com/ => https://www.oniontip.com/: (7, 'Failed to connect to www.oniontip.com port 443: No route to host')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Online-Mahnantrag.de.xml b/src/chrome/content/rules/Online-Mahnantrag.de.xml
index 349cebce3e92..e1ae3eb1668d 100644
--- a/src/chrome/content/rules/Online-Mahnantrag.de.xml
+++ b/src/chrome/content/rules/Online-Mahnantrag.de.xml
@@ -1,9 +1,17 @@
+
+
 
 	
-	
+	
 
-	
 	
 
diff --git a/src/chrome/content/rules/Online-convert.com.xml b/src/chrome/content/rules/Online-convert.com.xml
index 9acbfbb513de..1c225e76e0d5 100644
--- a/src/chrome/content/rules/Online-convert.com.xml
+++ b/src/chrome/content/rules/Online-convert.com.xml
@@ -20,4 +20,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Online.nl.xml b/src/chrome/content/rules/Online.nl.xml
index d05768250457..6e76c6072dc2 100644
--- a/src/chrome/content/rules/Online.nl.xml
+++ b/src/chrome/content/rules/Online.nl.xml
@@ -1,6 +1,15 @@
+
 
-  
+	
+	
+	
+	
+	
+	
 
-  
-  
+	
 
diff --git a/src/chrome/content/rules/OnlineShoes.com.xml b/src/chrome/content/rules/OnlineShoes.com.xml
index b904a7528404..7aff1d87d490 100644
--- a/src/chrome/content/rules/OnlineShoes.com.xml
+++ b/src/chrome/content/rules/OnlineShoes.com.xml
@@ -8,10 +8,11 @@ Fetch error: http://onlineshoes.com/ => https://www.onlineshoes.com/: (6, 'Could
 		- ^	(reset)
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
@@ -20,7 +21,6 @@ Fetch error: http://onlineshoes.com/ => https://www.onlineshoes.com/: (6, 'Could
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Online_EMR.xml b/src/chrome/content/rules/Online_EMR.xml
index 9da664051add..c57465fd4243 100644
--- a/src/chrome/content/rules/Online_EMR.xml
+++ b/src/chrome/content/rules/Online_EMR.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Online_Wellness_Association.xml b/src/chrome/content/rules/Online_Wellness_Association.xml
deleted file mode 100644
index d3d01ed9cd39..000000000000
--- a/src/chrome/content/rules/Online_Wellness_Association.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Onlychange.com.xml b/src/chrome/content/rules/Onlychange.com.xml
index ef5d3e9a80d2..13dc45e750df 100644
--- a/src/chrome/content/rules/Onlychange.com.xml
+++ b/src/chrome/content/rules/Onlychange.com.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Onlyoffice.com.xml b/src/chrome/content/rules/Onlyoffice.com.xml
new file mode 100644
index 000000000000..53f8c56a8751
--- /dev/null
+++ b/src/chrome/content/rules/Onlyoffice.com.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Onlyoffice.org.xml b/src/chrome/content/rules/Onlyoffice.org.xml
new file mode 100644
index 000000000000..c5a161ec5489
--- /dev/null
+++ b/src/chrome/content/rules/Onlyoffice.org.xml
@@ -0,0 +1,28 @@
+
+
+
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Ono.xml b/src/chrome/content/rules/Ono.xml
index e032b45ad8bc..d745ed0bbe6c 100644
--- a/src/chrome/content/rules/Ono.xml
+++ b/src/chrome/content/rules/Ono.xml
@@ -11,4 +11,4 @@
 					-->
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Onpage.org.xml b/src/chrome/content/rules/Onpage.org.xml
index 248d765f7b63..279ed74d38f7 100644
--- a/src/chrome/content/rules/Onpage.org.xml
+++ b/src/chrome/content/rules/Onpage.org.xml
@@ -3,7 +3,7 @@
 		- indexability.yoast.onpage.org
 
 	Cert mismatch:
-		- 
+		-
 	Connection refused:
 		- lb.onpage.org
 
diff --git a/src/chrome/content/rules/Onsalesit.com.xml b/src/chrome/content/rules/Onsalesit.com.xml
index c419d51584be..adb28b53ef28 100644
--- a/src/chrome/content/rules/Onsalesit.com.xml
+++ b/src/chrome/content/rules/Onsalesit.com.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Onswipe.com.xml b/src/chrome/content/rules/Onswipe.com.xml
new file mode 100644
index 000000000000..bcc19eb84d92
--- /dev/null
+++ b/src/chrome/content/rules/Onswipe.com.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Onswipe.xml b/src/chrome/content/rules/Onswipe.xml
deleted file mode 100644
index fab6747fdde1..000000000000
--- a/src/chrome/content/rules/Onswipe.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Ontario_Minor_Hockey_Association.xml b/src/chrome/content/rules/Ontario_Minor_Hockey_Association.xml
index c74751da19e4..079d81e867a3 100644
--- a/src/chrome/content/rules/Ontario_Minor_Hockey_Association.xml
+++ b/src/chrome/content/rules/Ontario_Minor_Hockey_Association.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.omha.net/ => https://www.omha.net/: (51, "SSL: no altern
 Disabled by https-everywhere-checker because:
 Fetch error: http://omha.net/ => https://omha.net/: (51, "SSL: no alternative certificate subject name matches target host name 'omha.net'")
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://omha.net/ => https://omha.net/: (51, "SSL: no alternative ce
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Onthe.io.xml b/src/chrome/content/rules/Onthe.io.xml
index c38182fe66ef..995e5e61610f 100644
--- a/src/chrome/content/rules/Onthe.io.xml
+++ b/src/chrome/content/rules/Onthe.io.xml
@@ -24,7 +24,7 @@
 					-->
 	
 
-	
+	
 
 
 	 https://dl2.oo-software.
 
     Active mixed content:
 	    - corp*
-	
+
 	* Secured by us
 
     More O&O rulesets:
 	    - Syspectr.com
 -->
-
+
     
     
     
diff --git a/src/chrome/content/rules/Oops.org.xml b/src/chrome/content/rules/Oops.org.xml
index 0198485b2f1f..3ca3d832d1e1 100644
--- a/src/chrome/content/rules/Oops.org.xml
+++ b/src/chrome/content/rules/Oops.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://www.oops.org/ => https://www.oops.org/: (51, "SSL: no altern
 
 mirror.kr1.oops.org refused
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Ooyala.xml b/src/chrome/content/rules/Ooyala.xml
index f1213d63d2a4..0dc7450889c3 100644
--- a/src/chrome/content/rules/Ooyala.xml
+++ b/src/chrome/content/rules/Ooyala.xml
@@ -56,7 +56,7 @@
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Opa.xml b/src/chrome/content/rules/Opa.xml
index a9e4b28f4607..4816d9c4d438 100644
--- a/src/chrome/content/rules/Opa.xml
+++ b/src/chrome/content/rules/Opa.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.opalang.org/ => https://www.opalang.org/: (28, 'Connecti
 		- forum	(ditto)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Open-Invention-Network.xml b/src/chrome/content/rules/Open-Invention-Network.xml
deleted file mode 100644
index 8483e753f07a..000000000000
--- a/src/chrome/content/rules/Open-Invention-Network.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Open-Source-Robotics-Foundation.xml b/src/chrome/content/rules/Open-Source-Robotics-Foundation.xml
deleted file mode 100644
index 9a080acdc790..000000000000
--- a/src/chrome/content/rules/Open-Source-Robotics-Foundation.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Open.ac.uk.xml b/src/chrome/content/rules/Open.ac.uk.xml
index 6d3235b6a4e1..ef936c2f6a0a 100644
--- a/src/chrome/content/rules/Open.ac.uk.xml
+++ b/src/chrome/content/rules/Open.ac.uk.xml
@@ -48,6 +48,13 @@
 	
 
-	
+
+	
+
+	
+	
+	
+	
 
diff --git a/src/chrome/content/rules/OpenAdultDirectory.com.xml b/src/chrome/content/rules/OpenAdultDirectory.com.xml
index 3fc177658d5a..fb657bc8a583 100644
--- a/src/chrome/content/rules/OpenAdultDirectory.com.xml
+++ b/src/chrome/content/rules/OpenAdultDirectory.com.xml
@@ -14,4 +14,4 @@ Fetch error: http://www.openadultdirectory.com/ => http://www.openadultdirectory
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/OpenAthens.xml b/src/chrome/content/rules/OpenAthens.xml
deleted file mode 100644
index e1b08b61c656..000000000000
--- a/src/chrome/content/rules/OpenAthens.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/OpenBL.org.xml b/src/chrome/content/rules/OpenBL.org.xml
deleted file mode 100644
index 09b2dc64c166..000000000000
--- a/src/chrome/content/rules/OpenBL.org.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/OpenBSD.org.xml b/src/chrome/content/rules/OpenBSD.org.xml
index 183887da3e8c..dc5b473d84da 100644
--- a/src/chrome/content/rules/OpenBSD.org.xml
+++ b/src/chrome/content/rules/OpenBSD.org.xml
@@ -1,4 +1,4 @@
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/OpenCCC.xml b/src/chrome/content/rules/OpenCCC.xml
index 4c112d04ada4..261f0eeafb53 100644
--- a/src/chrome/content/rules/OpenCCC.xml
+++ b/src/chrome/content/rules/OpenCCC.xml
@@ -22,4 +22,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/OpenCSW.org.xml b/src/chrome/content/rules/OpenCSW.org.xml
index 224158aa7d47..87c7171057d5 100644
--- a/src/chrome/content/rules/OpenCSW.org.xml
+++ b/src/chrome/content/rules/OpenCSW.org.xml
@@ -10,7 +10,7 @@ Fetch error: http://opencsw.org/ => https://opencsw.org/: (51, "SSL: no alternat
 	* Redirects to http
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/OpenCV.org.xml b/src/chrome/content/rules/OpenCV.org.xml
new file mode 100644
index 000000000000..2c532ae70cff
--- /dev/null
+++ b/src/chrome/content/rules/OpenCV.org.xml
@@ -0,0 +1,26 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/OpenClassrooms.xml b/src/chrome/content/rules/OpenClassrooms.xml
index 5a9178556618..34ef978b83d9 100644
--- a/src/chrome/content/rules/OpenClassrooms.xml
+++ b/src/chrome/content/rules/OpenClassrooms.xml
@@ -26,7 +26,7 @@
 	
 	
 
-	
+	
 
 
 	 https://support.opencorporate
 		- www.opencorporates.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/OpenDefinition.org.xml b/src/chrome/content/rules/OpenDefinition.org.xml
new file mode 100644
index 000000000000..2ea9fc7dcfab
--- /dev/null
+++ b/src/chrome/content/rules/OpenDefinition.org.xml
@@ -0,0 +1,9 @@
+
+
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/OpenF2.org.xml b/src/chrome/content/rules/OpenF2.org.xml
index 5270501543fa..f1ade5984003 100644
--- a/src/chrome/content/rules/OpenF2.org.xml
+++ b/src/chrome/content/rules/OpenF2.org.xml
@@ -60,9 +60,15 @@
 -->
 
 
-	
+	
+	
 	
-	
+	
+	
+	
+	
+	
+	
 
 
 	
@@ -72,10 +78,7 @@
 	
 
-	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/OpenFoundry.org.xml b/src/chrome/content/rules/OpenFoundry.org.xml
deleted file mode 100644
index 046ddb9c210e..000000000000
--- a/src/chrome/content/rules/OpenFoundry.org.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-	
-
-		
-
-	
-
-
diff --git a/src/chrome/content/rules/OpenGroup.org.xml b/src/chrome/content/rules/OpenGroup.org.xml
new file mode 100644
index 000000000000..949336b119f5
--- /dev/null
+++ b/src/chrome/content/rules/OpenGroup.org.xml
@@ -0,0 +1,104 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/OpenIT.xml b/src/chrome/content/rules/OpenIT.xml
index d765413cae45..593399287f47 100644
--- a/src/chrome/content/rules/OpenIT.xml
+++ b/src/chrome/content/rules/OpenIT.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.openit.de/ => https://www.openit.de/: (60, 'SSL certific
 	Cert only matches www.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/OpenITC.co.uk.xml b/src/chrome/content/rules/OpenITC.co.uk.xml
index 35caecad9b4a..55907b5c0877 100644
--- a/src/chrome/content/rules/OpenITC.co.uk.xml
+++ b/src/chrome/content/rules/OpenITC.co.uk.xml
@@ -11,7 +11,7 @@ Fetch error: http://forums.openitc.co.uk/ => https://forums.openitc.co.uk/: (7,
 		- forums.openitc.co.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/OpenITP.org.xml b/src/chrome/content/rules/OpenITP.org.xml
index 24eb50ed4605..7a5b37c794b5 100644
--- a/src/chrome/content/rules/OpenITP.org.xml
+++ b/src/chrome/content/rules/OpenITP.org.xml
@@ -30,7 +30,7 @@ Fetch error: http://www.openitp.org/ => https://www.openitp.org/: (28, 'Connecti
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
@@ -41,7 +41,7 @@ Fetch error: http://www.openitp.org/ => https://www.openitp.org/: (28, 'Connecti
 	
 
 
-	
+	
 
 
 	
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/OpenLayers.org.xml b/src/chrome/content/rules/OpenLayers.org.xml
new file mode 100644
index 000000000000..90d31d98ca5b
--- /dev/null
+++ b/src/chrome/content/rules/OpenLayers.org.xml
@@ -0,0 +1,20 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/OpenMPT.xml b/src/chrome/content/rules/OpenMPT.xml
index 816f1b8042e9..83cda6d56103 100644
--- a/src/chrome/content/rules/OpenMPT.xml
+++ b/src/chrome/content/rules/OpenMPT.xml
@@ -11,11 +11,11 @@
 	
 	
 	
-	
+
 	
-		
+
 	
-		
+
 
diff --git a/src/chrome/content/rules/OpenMW.xml b/src/chrome/content/rules/OpenMW.xml
index bd5b0c6a5759..3e374bd06ca0 100644
--- a/src/chrome/content/rules/OpenMW.xml
+++ b/src/chrome/content/rules/OpenMW.xml
@@ -27,7 +27,7 @@
 	
 	
 
-	
+	
 
 
 	
-
-	
-	
-	
-
-	
-		
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/OpenMandriva.org.xml b/src/chrome/content/rules/OpenMandriva.org.xml
index 9dbd05ccceae..d015929f3db2 100644
--- a/src/chrome/content/rules/OpenMandriva.org.xml
+++ b/src/chrome/content/rules/OpenMandriva.org.xml
@@ -26,7 +26,7 @@ Fetch error: http://archives.forums.openmandriva.org/ => https://archives.forums
 		www-static.openmandriva.org
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/OpenNIC.org.xml b/src/chrome/content/rules/OpenNIC.org.xml
index 664771c20f39..e83e4f271d0c 100644
--- a/src/chrome/content/rules/OpenNIC.org.xml
+++ b/src/chrome/content/rules/OpenNIC.org.xml
@@ -29,6 +29,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/OpenSC-Project.xml b/src/chrome/content/rules/OpenSC-Project.xml
index 521811ffbeef..dad05979a6c6 100644
--- a/src/chrome/content/rules/OpenSC-Project.xml
+++ b/src/chrome/content/rules/OpenSC-Project.xml
@@ -10,7 +10,7 @@
 		 - www.opensc-project.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/OpenSLR.org.xml b/src/chrome/content/rules/OpenSLR.org.xml
new file mode 100644
index 000000000000..17d6b5768fda
--- /dev/null
+++ b/src/chrome/content/rules/OpenSLR.org.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/OpenSMTPD.org.xml b/src/chrome/content/rules/OpenSMTPD.org.xml
new file mode 100644
index 000000000000..2fef7b2fe06f
--- /dev/null
+++ b/src/chrome/content/rules/OpenSMTPD.org.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/OpenSRS.com.xml b/src/chrome/content/rules/OpenSRS.com.xml
index 552ab6a3a339..6953c006ce00 100644
--- a/src/chrome/content/rules/OpenSRS.com.xml
+++ b/src/chrome/content/rules/OpenSRS.com.xml
@@ -7,13 +7,16 @@
 
 
 	
-	
+	
+	
 		
 		
 	
-	
+	
+	
+	
 
 
 	
@@ -22,7 +25,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/OpenSecrets.org.xml b/src/chrome/content/rules/OpenSecrets.org.xml
new file mode 100644
index 000000000000..a4f078a44299
--- /dev/null
+++ b/src/chrome/content/rules/OpenSecrets.org.xml
@@ -0,0 +1,26 @@
+
+
+	
+	
+	
+		
+		
+	
+	
+	
+	
+		
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/OpenSignal.com.xml b/src/chrome/content/rules/OpenSignal.com.xml
index 55ded4706c9c..87763f112a9b 100644
--- a/src/chrome/content/rules/OpenSignal.com.xml
+++ b/src/chrome/content/rules/OpenSignal.com.xml
@@ -1,19 +1,27 @@
-
 
-
-
-	
+
 	
-	
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/OpenSnowMap.org.xml b/src/chrome/content/rules/OpenSnowMap.org.xml
new file mode 100644
index 000000000000..0901fc80b3d9
--- /dev/null
+++ b/src/chrome/content/rules/OpenSnowMap.org.xml
@@ -0,0 +1,23 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/OpenSocietyFoundations.org.xml b/src/chrome/content/rules/OpenSocietyFoundations.org.xml
new file mode 100644
index 000000000000..201f40b904fd
--- /dev/null
+++ b/src/chrome/content/rules/OpenSocietyFoundations.org.xml
@@ -0,0 +1,51 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/OpenStreetMap.de.xml b/src/chrome/content/rules/OpenStreetMap.de.xml
index b039525ebaa0..4b184a523f7a 100644
--- a/src/chrome/content/rules/OpenStreetMap.de.xml
+++ b/src/chrome/content/rules/OpenStreetMap.de.xml
@@ -1,17 +1,40 @@
 
 
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
-	
-	
-
\ No newline at end of file
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/OpenStreetMap.org.xml b/src/chrome/content/rules/OpenStreetMap.org.xml
deleted file mode 100644
index e7f9b980f844..000000000000
--- a/src/chrome/content/rules/OpenStreetMap.org.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-	
-	
-	
-	
-		
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	 
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/OpenTPX.org.xml b/src/chrome/content/rules/OpenTPX.org.xml
deleted file mode 100644
index f4207a8a388a..000000000000
--- a/src/chrome/content/rules/OpenTPX.org.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/OpenTTD-expired.xml b/src/chrome/content/rules/OpenTTD-expired.xml
deleted file mode 100644
index 9a31798945c1..000000000000
--- a/src/chrome/content/rules/OpenTTD-expired.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/OpenTTD.xml b/src/chrome/content/rules/OpenTTD.xml
index 8814490cf68c..ab5876333eef 100644
--- a/src/chrome/content/rules/OpenTTD.xml
+++ b/src/chrome/content/rules/OpenTTD.xml
@@ -1,35 +1,45 @@
-
-
-	
-	
-		
-		
-	
-	
-	
-	
-	
-
-
-	
-	
-
-
-	
 
+
 
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+
+	
+
+	
 
 
diff --git a/src/chrome/content/rules/OpenTopoMap.org.xml b/src/chrome/content/rules/OpenTopoMap.org.xml
new file mode 100644
index 000000000000..745428fbc31a
--- /dev/null
+++ b/src/chrome/content/rules/OpenTopoMap.org.xml
@@ -0,0 +1,21 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/OpenVAS.org.xml b/src/chrome/content/rules/OpenVAS.org.xml
deleted file mode 100644
index b2e9b23caee5..000000000000
--- a/src/chrome/content/rules/OpenVAS.org.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/OpenVPN.xml b/src/chrome/content/rules/OpenVPN.xml
index 944ea9d3fbd0..c5a92a4f5098 100644
--- a/src/chrome/content/rules/OpenVPN.xml
+++ b/src/chrome/content/rules/OpenVPN.xml
@@ -1,14 +1,139 @@
-
+
+
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
 	
 	
-	
-
-	
-
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
+	
 
diff --git a/src/chrome/content/rules/OpenVim.com.xml b/src/chrome/content/rules/OpenVim.com.xml
new file mode 100644
index 000000000000..900eed74248f
--- /dev/null
+++ b/src/chrome/content/rules/OpenVim.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/OpenWRT.xml b/src/chrome/content/rules/OpenWRT.xml
index 9846c0185f56..3cc002659093 100644
--- a/src/chrome/content/rules/OpenWRT.xml
+++ b/src/chrome/content/rules/OpenWRT.xml
@@ -19,6 +19,9 @@
 	
 	
+	
+	
+	
 	
 	
 	
@@ -26,7 +29,6 @@
 	
 	
 	
-	
 
 
 	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/OpenX.org.xml b/src/chrome/content/rules/OpenX.org.xml
deleted file mode 100644
index 46782c0ebece..000000000000
--- a/src/chrome/content/rules/OpenX.org.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/OpenX.xml b/src/chrome/content/rules/OpenX.xml
index 454bde8b4081..62763e7840cd 100644
--- a/src/chrome/content/rules/OpenX.xml
+++ b/src/chrome/content/rules/OpenX.xml
@@ -1,15 +1,27 @@
+
+
+
 
 	
 	
-	
+	
 	
-	
+	
 	
-	
+	
 	
 	
 	
-	
+	
 
-	
 
-	
 
diff --git a/src/chrome/content/rules/OpenXMPP.com.xml b/src/chrome/content/rules/OpenXMPP.com.xml
index 5b9da6c71f39..c5c62fcb0869 100644
--- a/src/chrome/content/rules/OpenXMPP.com.xml
+++ b/src/chrome/content/rules/OpenXMPP.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://openxmpp.com/ => https://openxmpp.com/: (7, 'Failed to conne
 		- www.openxmpp.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/OpenXMarket.jp.xml b/src/chrome/content/rules/OpenXMarket.jp.xml
deleted file mode 100644
index 79ab398a50c6..000000000000
--- a/src/chrome/content/rules/OpenXMarket.jp.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/OpenX_Enterprise.com.xml b/src/chrome/content/rules/OpenX_Enterprise.com.xml
deleted file mode 100644
index 5c94f78ffe92..000000000000
--- a/src/chrome/content/rules/OpenX_Enterprise.com.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-	
-
-		
-		
-
-
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Open_Badges.xml b/src/chrome/content/rules/Open_Badges.xml
index 44ff3a61b4e6..d68aa37d51ad 100644
--- a/src/chrome/content/rules/Open_Badges.xml
+++ b/src/chrome/content/rules/Open_Badges.xml
@@ -43,7 +43,7 @@
 					-->
 	
 
-	
+	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Open_Doors.org.xml b/src/chrome/content/rules/Open_Doors.org.xml
index fb3ab5234acf..9e93d00abace 100644
--- a/src/chrome/content/rules/Open_Doors.org.xml
+++ b/src/chrome/content/rules/Open_Doors.org.xml
@@ -1,7 +1,6 @@
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Open_InfoSec_Foundation.org-problematic.xml b/src/chrome/content/rules/Open_InfoSec_Foundation.org-problematic.xml
index 96c9fb25b774..ebadc3247b57 100644
--- a/src/chrome/content/rules/Open_InfoSec_Foundation.org-problematic.xml
+++ b/src/chrome/content/rules/Open_InfoSec_Foundation.org-problematic.xml
@@ -7,7 +7,7 @@
 	* See https://whatsmychaincert.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Open_Library.org.xml b/src/chrome/content/rules/Open_Library.org.xml
index 70262ef88059..9625a44dcab6 100644
--- a/src/chrome/content/rules/Open_Library.org.xml
+++ b/src/chrome/content/rules/Open_Library.org.xml
@@ -14,7 +14,9 @@
 	
 	
 	
-
+	
+	
+	
 
 	
diff --git a/src/chrome/content/rules/Open_Listings.co.xml b/src/chrome/content/rules/Open_Listings.co.xml
deleted file mode 100644
index 44faa50c4363..000000000000
--- a/src/chrome/content/rules/Open_Listings.co.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Open_Objects.com.xml b/src/chrome/content/rules/Open_Objects.com.xml
index 5a43bdfa5dcf..da985c329d83 100644
--- a/src/chrome/content/rules/Open_Objects.com.xml
+++ b/src/chrome/content/rules/Open_Objects.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://apps.openobjects.com/ => https://apps.openobjects.com/: (52,
 	(www.)?obenobjects.com: refused
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Open_Rights_Group.xml b/src/chrome/content/rules/Open_Rights_Group.xml
index e507d400a809..916065517474 100644
--- a/src/chrome/content/rules/Open_Rights_Group.xml
+++ b/src/chrome/content/rules/Open_Rights_Group.xml
@@ -3,37 +3,25 @@
 
 		- Blocked.org.uk.xml
 
-
-	Insecure cookies are set for these domains:
-
-		- .openrightsgroup.org
+	Widcard matching cannot be used since some subdomains point at third-party services
+	(without matching https certificates) such as news.openrightsgroup.org or gowers.openrightsgroup.org
 
 -->
 
 
 	
-	
-
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-
-
-	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 	
 
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/Open_Source.org-problematic.xml b/src/chrome/content/rules/Open_Source.org-problematic.xml
deleted file mode 100644
index 945f77708664..000000000000
--- a/src/chrome/content/rules/Open_Source.org-problematic.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Open_Source.org.xml b/src/chrome/content/rules/Open_Source.org.xml
index 2e6fec1f15ea..fc51c4603f99 100644
--- a/src/chrome/content/rules/Open_Source.org.xml
+++ b/src/chrome/content/rules/Open_Source.org.xml
@@ -1,10 +1,8 @@
-
-
 
 
 	
+	
+	
 
 	
diff --git a/src/chrome/content/rules/Open_Source_Hacker.com.xml b/src/chrome/content/rules/Open_Source_Hacker.com.xml
deleted file mode 100644
index 547e40fe9d31..000000000000
--- a/src/chrome/content/rules/Open_Source_Hacker.com.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Open_Virtualization_Alliance.org.xml b/src/chrome/content/rules/Open_Virtualization_Alliance.org.xml
deleted file mode 100644
index fba2e44bbc27..000000000000
--- a/src/chrome/content/rules/Open_Virtualization_Alliance.org.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Open_Web.or.kr.xml b/src/chrome/content/rules/Open_Web.or.kr.xml
deleted file mode 100644
index c4084ddfb04f..000000000000
--- a/src/chrome/content/rules/Open_Web.or.kr.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Openas.org.xml b/src/chrome/content/rules/Openas.org.xml
deleted file mode 100644
index df6f18873450..000000000000
--- a/src/chrome/content/rules/Openas.org.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-	
-	
-	
-
diff --git a/src/chrome/content/rules/Openbaar_Ministerie.xml b/src/chrome/content/rules/Openbaar_Ministerie.xml
index db01d16917e0..3589b08024f1 100644
--- a/src/chrome/content/rules/Openbaar_Ministerie.xml
+++ b/src/chrome/content/rules/Openbaar_Ministerie.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/OpenfMRI.xml b/src/chrome/content/rules/OpenfMRI.xml
index 0c31b1887a35..1bdc4fb1fe5e 100644
--- a/src/chrome/content/rules/OpenfMRI.xml
+++ b/src/chrome/content/rules/OpenfMRI.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.openfmri.org/ => https://www.openfmri.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.openfmri.org'")
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Openfiler.xml b/src/chrome/content/rules/Openfiler.xml
index 034d3f09f426..ca2b3e3333fe 100644
--- a/src/chrome/content/rules/Openfiler.xml
+++ b/src/chrome/content/rules/Openfiler.xml
@@ -20,7 +20,7 @@ Fetch error: http://store.openfiler.com/ => https://store.openfiler.com/: (7, 'F
 		- store
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Opengarden.com.xml b/src/chrome/content/rules/Opengarden.com.xml
index 1c6bb1000ad5..177a47f14520 100644
--- a/src/chrome/content/rules/Opengarden.com.xml
+++ b/src/chrome/content/rules/Opengarden.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://www.opengarden.com/ => https://opengarden.com/: (51, "SSL: n
 	* Works, cert only matches ^opengarden.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Openhost.xml b/src/chrome/content/rules/Openhost.xml
index 283959921120..834cb81cccdc 100644
--- a/src/chrome/content/rules/Openhost.xml
+++ b/src/chrome/content/rules/Openhost.xml
@@ -12,7 +12,7 @@ Non-2xx HTTP code: http://www.mycp.co.nz/ (200) => https://hspc.openhost.net.nz/
 
 	* Secured by us
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Openid.org.cn.xml b/src/chrome/content/rules/Openid.org.cn.xml
new file mode 100644
index 000000000000..b531cc7e3800
--- /dev/null
+++ b/src/chrome/content/rules/Openid.org.cn.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+  
diff --git a/src/chrome/content/rules/Openjpeg.org.xml b/src/chrome/content/rules/Openjpeg.org.xml
new file mode 100644
index 000000000000..b2a47934ce7a
--- /dev/null
+++ b/src/chrome/content/rules/Openjpeg.org.xml
@@ -0,0 +1,7 @@
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Openload.xml b/src/chrome/content/rules/Openload.xml
index 19f651d18a07..86a8edbd2907 100644
--- a/src/chrome/content/rules/Openload.xml
+++ b/src/chrome/content/rules/Openload.xml
@@ -32,7 +32,7 @@
 		
 		
 		
-	
+
 	
 	
 	
@@ -43,7 +43,7 @@
 		
 	
 	
-	
+
 	
 
 	
diff --git a/src/chrome/content/rules/Openpgpkey.info.xml b/src/chrome/content/rules/Openpgpkey.info.xml
index 507204c28d08..368f6a873bf6 100644
--- a/src/chrome/content/rules/Openpgpkey.info.xml
+++ b/src/chrome/content/rules/Openpgpkey.info.xml
@@ -5,7 +5,7 @@ Fetch error: http://www.openpgpkey.info/ => https://www.openpgpkey.info/: (51, "
 
 
 -->
-
+
     
     
 
diff --git a/src/chrome/content/rules/Openstreetmap.fr.xml b/src/chrome/content/rules/Openstreetmap.fr.xml
index 6f1ddfab28d2..b6ad6c7cac20 100644
--- a/src/chrome/content/rules/Openstreetmap.fr.xml
+++ b/src/chrome/content/rules/Openstreetmap.fr.xml
@@ -1,45 +1,111 @@
-
 
-
+
+
     
     
-    
-    
-    
-    
     
-    
+    
+    
+    
+    
     
+    
+    
+    
     
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+    
 
-    
+    
 
-    
 
diff --git a/src/chrome/content/rules/Openttdcoop.org.xml b/src/chrome/content/rules/Openttdcoop.org.xml
new file mode 100644
index 000000000000..b974acef3308
--- /dev/null
+++ b/src/chrome/content/rules/Openttdcoop.org.xml
@@ -0,0 +1,36 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+
+
diff --git a/src/chrome/content/rules/Operation-Fabulous.xml b/src/chrome/content/rules/Operation-Fabulous.xml
index 53f2d2f85917..d1bca4ce579d 100644
--- a/src/chrome/content/rules/Operation-Fabulous.xml
+++ b/src/chrome/content/rules/Operation-Fabulous.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://operationfabulous.com/ => https://operationfabulous.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 Fetch error: http://www.operationfabulous.com/ => https://www.operationfabulous.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Opg.tv.xml b/src/chrome/content/rules/Opg.tv.xml
new file mode 100644
index 000000000000..dc208a2cf31b
--- /dev/null
+++ b/src/chrome/content/rules/Opg.tv.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Opinionmeter.xml b/src/chrome/content/rules/Opinionmeter.xml
deleted file mode 100644
index 592f2c0e4b41..000000000000
--- a/src/chrome/content/rules/Opinionmeter.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Opintoluotsi.xml b/src/chrome/content/rules/Opintoluotsi.xml
index 22e19c017c43..15f39ca87d3a 100644
--- a/src/chrome/content/rules/Opintoluotsi.xml
+++ b/src/chrome/content/rules/Opintoluotsi.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://opintoluotsi.fi/ => https://opintoluotsi.fi/: (51, "SSL: no alternative certificate subject name matches target host name 'opintoluotsi.fi'")
 Fetch error: http://www.opintoluotsi.fi/ => https://www.opintoluotsi.fi/: (51, "SSL: no alternative certificate subject name matches target host name 'www.opintoluotsi.fi'")
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Oplata.info.xml b/src/chrome/content/rules/Oplata.info.xml
index 4308f3e7b108..53d7cf7c2e27 100644
--- a/src/chrome/content/rules/Oplata.info.xml
+++ b/src/chrome/content/rules/Oplata.info.xml
@@ -13,4 +13,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Oppelt.com.xml b/src/chrome/content/rules/Oppelt.com.xml
index 671df3a71272..feab762ca5c0 100644
--- a/src/chrome/content/rules/Oppelt.com.xml
+++ b/src/chrome/content/rules/Oppelt.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.oppelt.com/ => https://www.oppelt.com/: (60, 'SSL certif
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Oprah.com.xml b/src/chrome/content/rules/Oprah.com.xml
new file mode 100644
index 000000000000..65b52abc50a1
--- /dev/null
+++ b/src/chrome/content/rules/Oprah.com.xml
@@ -0,0 +1,9 @@
+
+
+
+	
+	
+
diff --git a/src/chrome/content/rules/Optical-Society-of-America.xml b/src/chrome/content/rules/Optical-Society-of-America.xml
index fd136436771e..d076cee20ad1 100644
--- a/src/chrome/content/rules/Optical-Society-of-America.xml
+++ b/src/chrome/content/rules/Optical-Society-of-America.xml
@@ -14,12 +14,14 @@ Fetch error: http://www.opticsinfobase.org/ => https://www.opticsinfobase.org/:
 	!functional:
 		- (www.)osa-opn.org	(www: interrupted; doesn't translate directly to osa.org)
 -->
-
+
 
 	
 	
 	
-	
+	
+	
+	
 		
 		
 
@@ -33,10 +35,7 @@ Fetch error: http://www.opticsinfobase.org/ => https://www.opticsinfobase.org/:
 	
 
-	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Opticallimits.com.xml b/src/chrome/content/rules/Opticallimits.com.xml
new file mode 100644
index 000000000000..7931d1120176
--- /dev/null
+++ b/src/chrome/content/rules/Opticallimits.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Optimal-Payments.xml b/src/chrome/content/rules/Optimal-Payments.xml
index 2a4d85f39e7c..c0d0e3932ac5 100644
--- a/src/chrome/content/rules/Optimal-Payments.xml
+++ b/src/chrome/content/rules/Optimal-Payments.xml
@@ -12,10 +12,13 @@ Fetch error: http://www.neteller-group.com/ => https://www.optimalpayments.com/:
 Fetch error: http://optimalpayments.com/ => https://www.optimalpayments.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.optimalpayments.com'")	!functional:
 		www1.netbanx.com
 -->
-
+
 
 	
-	
+	
+	
+	
+	
 	
 	
 	
diff --git a/src/chrome/content/rules/Optimatic.xml b/src/chrome/content/rules/Optimatic.xml
deleted file mode 100644
index 05be4cb152ba..000000000000
--- a/src/chrome/content/rules/Optimatic.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Optimise_Media.com.xml b/src/chrome/content/rules/Optimise_Media.com.xml
index 905aa052c036..220474bd1837 100644
--- a/src/chrome/content/rules/Optimise_Media.com.xml
+++ b/src/chrome/content/rules/Optimise_Media.com.xml
@@ -1,7 +1,6 @@
 
diff --git a/src/chrome/content/rules/Optimost.xml b/src/chrome/content/rules/Optimost.xml
index 48d01f7ec7b7..774f6bdfdaa7 100644
--- a/src/chrome/content/rules/Optimost.xml
+++ b/src/chrome/content/rules/Optimost.xml
@@ -13,7 +13,8 @@
 -->
 
 
-	
+	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/OptionsAnimal.com.xml b/src/chrome/content/rules/OptionsAnimal.com.xml
index a58671526eeb..eccd5c868206 100644
--- a/src/chrome/content/rules/OptionsAnimal.com.xml
+++ b/src/chrome/content/rules/OptionsAnimal.com.xml
@@ -21,19 +21,19 @@ Non-2xx HTTP code: http://optionsanimal.com/ (200) => https://optionsanimal.com/
 	* Secured by us
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Optorb.com.xml b/src/chrome/content/rules/Optorb.com.xml
deleted file mode 100644
index 0a9f5fe95e7c..000000000000
--- a/src/chrome/content/rules/Optorb.com.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Opus-codec.org.xml b/src/chrome/content/rules/Opus-codec.org.xml
index a3453bce33ed..8c99d940028d 100644
--- a/src/chrome/content/rules/Opus-codec.org.xml
+++ b/src/chrome/content/rules/Opus-codec.org.xml
@@ -5,6 +5,6 @@ cert is not valid for https://git.opus-codec.org/
 
   
   
- 
+
   
 
diff --git a/src/chrome/content/rules/Oracle-mismatches.xml b/src/chrome/content/rules/Oracle-mismatches.xml
deleted file mode 100644
index 403b51bf5fa4..000000000000
--- a/src/chrome/content/rules/Oracle-mismatches.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Oracle.xml b/src/chrome/content/rules/Oracle.xml
index c59e9a73554c..e02b661e3c4d 100644
--- a/src/chrome/content/rules/Oracle.xml
+++ b/src/chrome/content/rules/Oracle.xml
@@ -1,49 +1,32 @@
 
 
+
+
-
 
-	
+
+
+	
 	
 	
 	
 	
 	
 	
-	
+	
+	
 	
-	
-	
+	
 	
 
 	
-	
-	
-	
 
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
 	
 	
+	
 	
+	
 	
 	
 	
+	
 	
 	
 	
 	
-	
 	
 	
+	
 
 	
 	
 	
 
-	
-	
 	
 
 	
@@ -346,24 +175,28 @@ Fetch error: http://oracleimg.com/ => https://www.oracleimg.com/: Too many redir
 	
 
 	
-	
 	
+	
 	
 	
-	
+	
 	
 	
+	
+	
+	
+	
+	
 	
-	
+	
 	
-	
 	
 	
 	
-	
 	
 	
 	
+	
 	
 	
 	
@@ -375,37 +208,23 @@ Fetch error: http://oracleimg.com/ => https://www.oracleimg.com/: Too many redir
 	
 	
 	
+	
+	
 	
 	
-	
 	
 	
-	
 	
+	
 
-	
-
-	
+	
 	
-	
-	
-
+	
 	
+	
 
-		
-		
-		
-		
-		
-
-			
+		
+			
 			
 			
 			
@@ -424,8 +243,7 @@ Fetch error: http://oracleimg.com/ => https://www.oracleimg.com/: Too many redir
 			
 			
 
-			
+			
 			
 			
 			
@@ -434,35 +252,18 @@ Fetch error: http://oracleimg.com/ => https://www.oracleimg.com/: Too many redir
 			
 			
 
-
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
+	
+	
 	
-	
-	
-
-
-	
+	
+	
 
+	
 			
 			
 			
 			
-
 			
 			
 			
@@ -472,15 +273,5 @@ Fetch error: http://oracleimg.com/ => https://www.oracleimg.com/: Too many redir
 	
 
-	
-
-	
-	
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/Orange.xml b/src/chrome/content/rules/Orange.xml
index 806ae112f782..abf60fa5dfb9 100644
--- a/src/chrome/content/rules/Orange.xml
+++ b/src/chrome/content/rules/Orange.xml
@@ -39,13 +39,23 @@ Fetch error: http://orange.ch/ => https://www.orange.ch/: (7, 'Failed to connect
 			- connection failed
 
 -->
-
+
 
 	
 	
-	
+	
+	
+	
+	
+	
 	
-	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
@@ -54,13 +64,10 @@ Fetch error: http://orange.ch/ => https://www.orange.ch/: (7, 'Failed to connect
 	
 
-	
-		
+
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/OrangeNaturals.com.xml b/src/chrome/content/rules/OrangeNaturals.com.xml
new file mode 100644
index 000000000000..69376b766bfd
--- /dev/null
+++ b/src/chrome/content/rules/OrangeNaturals.com.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/OrangeWebsite.com.xml b/src/chrome/content/rules/OrangeWebsite.com.xml
index d86a6e9282df..29e7bf9cc75f 100644
--- a/src/chrome/content/rules/OrangeWebsite.com.xml
+++ b/src/chrome/content/rules/OrangeWebsite.com.xml
@@ -21,4 +21,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Orange_Geek.xml b/src/chrome/content/rules/Orange_Geek.xml
index dd8e684c4753..53e4f00e93e8 100644
--- a/src/chrome/content/rules/Orange_Geek.xml
+++ b/src/chrome/content/rules/Orange_Geek.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Orbital_Sciences.xml b/src/chrome/content/rules/Orbital_Sciences.xml
index 08290c06d90f..03aaca78a6be 100644
--- a/src/chrome/content/rules/Orbital_Sciences.xml
+++ b/src/chrome/content/rules/Orbital_Sciences.xml
@@ -12,7 +12,7 @@ Fetch error: http://orbital.com/ => https://orbital.com/: (51, "SSL: no alternat
 Fetch error: http://www.orbital.com/ => https://www.orbital.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.orbital.com'")
 
 -->
-
+
 
 	
 	
@@ -23,4 +23,4 @@ Fetch error: http://www.orbital.com/ => https://www.orbital.com/: (51, "SSL: no
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Orchid_Diva.xml b/src/chrome/content/rules/Orchid_Diva.xml
index 9cf42b67cbce..6a695af3a747 100644
--- a/src/chrome/content/rules/Orchid_Diva.xml
+++ b/src/chrome/content/rules/Orchid_Diva.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/OrderBook.net.xml b/src/chrome/content/rules/OrderBook.net.xml
index 695f51759dd7..dc5aa052a065 100644
--- a/src/chrome/content/rules/OrderBook.net.xml
+++ b/src/chrome/content/rules/OrderBook.net.xml
@@ -5,7 +5,7 @@ Fetch error: http://orderbook.net/ => https://orderbook.net/: (7, 'Failed to con
 Fetch error: http://www.orderbook.net/ => https://www.orderbook.net/: (7, 'Failed to connect to www.orderbook.net port 443: Connection refused')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Oregon-State-University.xml b/src/chrome/content/rules/Oregon-State-University.xml
index 1f96f5e1f99c..fdc2ebae34d4 100644
--- a/src/chrome/content/rules/Oregon-State-University.xml
+++ b/src/chrome/content/rules/Oregon-State-University.xml
@@ -1,8 +1,5 @@
 
 
-
+
 
 	
 	
 	
 	
+	
+	
+	
 	
 
 	
 
 	
-	
+
 	
 
 	
diff --git a/src/chrome/content/rules/Organization_of_American_States.xml b/src/chrome/content/rules/Organization_of_American_States.xml
deleted file mode 100644
index 9033fa0dec2c..000000000000
--- a/src/chrome/content/rules/Organization_of_American_States.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Orgmode.org.xml b/src/chrome/content/rules/Orgmode.org.xml
new file mode 100644
index 000000000000..3176dea99a11
--- /dev/null
+++ b/src/chrome/content/rules/Orgmode.org.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Orgreen_Optics.com.xml b/src/chrome/content/rules/Orgreen_Optics.com.xml
index 20b4f801a5df..60945b3da64a 100644
--- a/src/chrome/content/rules/Orgreen_Optics.com.xml
+++ b/src/chrome/content/rules/Orgreen_Optics.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.orgreenoptics.com/ => https://orgreenoptics.com/: (60, '
 	www: cert only matches ^orgreenoptics.com.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Originar.io.xml b/src/chrome/content/rules/Originar.io.xml
new file mode 100644
index 000000000000..4c07c004a334
--- /dev/null
+++ b/src/chrome/content/rules/Originar.io.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Orion.xml b/src/chrome/content/rules/Orion.xml
deleted file mode 100644
index 06a38aeefd60..000000000000
--- a/src/chrome/content/rules/Orion.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Orion_Magazine.org.xml b/src/chrome/content/rules/Orion_Magazine.org.xml
index abd61c226a36..f38bde1db6df 100644
--- a/src/chrome/content/rules/Orion_Magazine.org.xml
+++ b/src/chrome/content/rules/Orion_Magazine.org.xml
@@ -4,7 +4,7 @@
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Orion_Systems_Integrators.xml b/src/chrome/content/rules/Orion_Systems_Integrators.xml
index ec01012a1e28..4b50ae0ccebc 100644
--- a/src/chrome/content/rules/Orion_Systems_Integrators.xml
+++ b/src/chrome/content/rules/Orion_Systems_Integrators.xml
@@ -5,7 +5,7 @@ Fetch error: http://orioninc.com/ => https://orioninc.com/: (51, "SSL: no altern
 Fetch error: http://time.orioninc.com/ => https://time.orioninc.com/: (6, 'Could not resolve host: time.orioninc.com')
 
 -->
-
+
 
 	
 	
@@ -17,4 +17,4 @@ Fetch error: http://time.orioninc.com/ => https://time.orioninc.com/: (6, 'Could
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Orkut.xml b/src/chrome/content/rules/Orkut.xml
index 81c8f10394df..ae2ab06f71c2 100644
--- a/src/chrome/content/rules/Orkut.xml
+++ b/src/chrome/content/rules/Orkut.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.orkut.com.br/ => https://www.orkut.com.br/: (6, 'Could n
 	For other Google coverage, see GoogleServices.xml.
 
 -->
-
+
 
 	
 	
@@ -31,4 +31,4 @@ Fetch error: http://www.orkut.com.br/ => https://www.orkut.com.br/: (6, 'Could n
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Orkz.net.xml b/src/chrome/content/rules/Orkz.net.xml
index ee48829accf2..3df382677ca4 100644
--- a/src/chrome/content/rules/Orkz.net.xml
+++ b/src/chrome/content/rules/Orkz.net.xml
@@ -10,7 +10,7 @@
 	Problematic hosts in *orkz.net:
 
 		- webmail *
-		
+
 	* Handshake fails
 
 -->
diff --git a/src/chrome/content/rules/OrlandoCriminalDefenseAttorneyBlog.com.xml b/src/chrome/content/rules/OrlandoCriminalDefenseAttorneyBlog.com.xml
new file mode 100644
index 000000000000..e0167895854c
--- /dev/null
+++ b/src/chrome/content/rules/OrlandoCriminalDefenseAttorneyBlog.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Oron.xml b/src/chrome/content/rules/Oron.xml
index 47c78c2efcc3..689d22bf0ad5 100644
--- a/src/chrome/content/rules/Oron.xml
+++ b/src/chrome/content/rules/Oron.xml
@@ -6,7 +6,7 @@ Fetch error: http://secure.oron.com/ => https://secure.oron.com/: (7, 'Failed to
 Disabled by https-everywhere-checker because:
 Fetch error: http://secure.oron.com/ => https://secure.oron.com/: (7, 'Failed to connect to secure.oron.com port 443: Connection refused')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/OrthogonalPublishing.com.xml b/src/chrome/content/rules/OrthogonalPublishing.com.xml
new file mode 100644
index 000000000000..e3be8780997e
--- /dev/null
+++ b/src/chrome/content/rules/OrthogonalPublishing.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Orxrdr.com.xml b/src/chrome/content/rules/Orxrdr.com.xml
index 3ee3630e5fee..79e1c16c0cac 100644
--- a/src/chrome/content/rules/Orxrdr.com.xml
+++ b/src/chrome/content/rules/Orxrdr.com.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Os-cillation-mismatches.xml b/src/chrome/content/rules/Os-cillation-mismatches.xml
index 27898a68ecf7..5944dc245ada 100644
--- a/src/chrome/content/rules/Os-cillation-mismatches.xml
+++ b/src/chrome/content/rules/Os-cillation-mismatches.xml
@@ -15,7 +15,7 @@
 		- anfrage.os-cillation.de
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Os-cillation.xml b/src/chrome/content/rules/Os-cillation.xml
index 3f702a0f4873..4d7536513b33 100644
--- a/src/chrome/content/rules/Os-cillation.xml
+++ b/src/chrome/content/rules/Os-cillation.xml
@@ -9,7 +9,7 @@ Fetch error: http://schweissgut.net/ => https://schweissgut.net/: (60, 'SSL cert
 Fetch error: http://www.schweissgut.net/ => https://schweissgut.net/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 	See Os-cillation-mismatches.xml for problematic rules.
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Oseems.com.xml b/src/chrome/content/rules/Oseems.com.xml
index 0b230b0f9a64..af02b17952f6 100644
--- a/src/chrome/content/rules/Oseems.com.xml
+++ b/src/chrome/content/rules/Oseems.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://oseems.com/ => https://oseems.com/: Too many redirects while
 Fetch error: http://apps.oseems.com/ => https://apps.oseems.com/: Too many redirects while fetching 'https://apps.oseems.com/'
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/OshkoshAirport.com.xml b/src/chrome/content/rules/OshkoshAirport.com.xml
new file mode 100644
index 000000000000..5fda2c0c9744
--- /dev/null
+++ b/src/chrome/content/rules/OshkoshAirport.com.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Osmo.xml b/src/chrome/content/rules/Osmo.xml
index 7b810a7be1e1..d7bdc8695d49 100644
--- a/src/chrome/content/rules/Osmo.xml
+++ b/src/chrome/content/rules/Osmo.xml
@@ -8,7 +8,7 @@
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Ossec.net.xml b/src/chrome/content/rules/Ossec.net.xml
new file mode 100644
index 000000000000..6d2f10bd3370
--- /dev/null
+++ b/src/chrome/content/rules/Ossec.net.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Ostagram.ru.xml b/src/chrome/content/rules/Ostagram.ru.xml
index 1f79bbb70cc5..c2eb1fb17675 100644
--- a/src/chrome/content/rules/Ostagram.ru.xml
+++ b/src/chrome/content/rules/Ostagram.ru.xml
@@ -3,7 +3,7 @@
 	
 	
 	
-	
+
 	
 
 
diff --git a/src/chrome/content/rules/Ostel.co.xml b/src/chrome/content/rules/Ostel.co.xml
deleted file mode 100644
index a14d9b01a559..000000000000
--- a/src/chrome/content/rules/Ostel.co.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Otavamedia.xml b/src/chrome/content/rules/Otavamedia.xml
index 2eea901e2098..763cfa427bde 100644
--- a/src/chrome/content/rules/Otavamedia.xml
+++ b/src/chrome/content/rules/Otavamedia.xml
@@ -27,7 +27,7 @@ Fetch error: http://www.plazakauppa.fi/ => https://www.plazakauppa.fi/: (28, 'Co
 		- (www.)plaza.fi		(ditto)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Ote.xml b/src/chrome/content/rules/Ote.xml
index 142acd6139d0..ee5500e10286 100644
--- a/src/chrome/content/rules/Ote.xml
+++ b/src/chrome/content/rules/Ote.xml
@@ -8,7 +8,7 @@ Fetch error: http://adman.otenet.gr/ => https://adman.otenet.gr/: (7, 'Failed to
 Fetch error: http://ote.gr/ => https://ote.gr/: (51, "SSL: no alternative certificate subject name matches target host name 'ote.gr'") This ruleset is experimental. If you experience problems please
 	 open an issue at https://github.com/kargig/https-everywhere-greek-rules -->
 
-
+
   
   
   
@@ -19,9 +19,7 @@ Fetch error: http://ote.gr/ => https://ote.gr/: (51, "SSL: no alternative certif
   
   
   
-
-	
-	
+	
 
   
   
diff --git a/src/chrome/content/rules/Otpdirekt.sk.xml b/src/chrome/content/rules/Otpdirekt.sk.xml
index 48a163f0aa4b..eeb0ecc0a9a1 100644
--- a/src/chrome/content/rules/Otpdirekt.sk.xml
+++ b/src/chrome/content/rules/Otpdirekt.sk.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://otpdirekt.sk/ => https://www.otpdirekt.sk/: (6, 'Could not resolve host: otpdirekt.sk')
 Fetch error: http://www.otpdirekt.sk/ => https://www.otpdirekt.sk/: (51, "SSL: no alternative certificate subject name matches target host name 'www.otpdirekt.sk'")
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Otrojah.org.xml b/src/chrome/content/rules/Otrojah.org.xml
new file mode 100644
index 000000000000..889671072f18
--- /dev/null
+++ b/src/chrome/content/rules/Otrojah.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Otrs.com.xml b/src/chrome/content/rules/Otrs.com.xml
new file mode 100644
index 000000000000..8d524e3106a8
--- /dev/null
+++ b/src/chrome/content/rules/Otrs.com.xml
@@ -0,0 +1,32 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Otrs.org.xml b/src/chrome/content/rules/Otrs.org.xml
new file mode 100644
index 000000000000..1a48d8d39c56
--- /dev/null
+++ b/src/chrome/content/rules/Otrs.org.xml
@@ -0,0 +1,24 @@
+
+
+	
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Otsuka-shokai.co.jp.xml b/src/chrome/content/rules/Otsuka-shokai.co.jp.xml
index 911c888d1074..72d0ea7eb858 100644
--- a/src/chrome/content/rules/Otsuka-shokai.co.jp.xml
+++ b/src/chrome/content/rules/Otsuka-shokai.co.jp.xml
@@ -22,13 +22,14 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Otto.de.xml b/src/chrome/content/rules/Otto.de.xml
index d0885c991d3e..bd4b30c2cbff 100644
--- a/src/chrome/content/rules/Otto.de.xml
+++ b/src/chrome/content/rules/Otto.de.xml
@@ -7,7 +7,7 @@ Fetch error: http://pxc.otto.de/ => https://pxc.otto.de/: Pycurl fetch failed fo
 		- affiliate.otto.de
 		- rot4.otto.de
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Otumm.com.xml b/src/chrome/content/rules/Otumm.com.xml
index 5b3e30ec8561..c47e01a96aa8 100644
--- a/src/chrome/content/rules/Otumm.com.xml
+++ b/src/chrome/content/rules/Otumm.com.xml
@@ -19,7 +19,7 @@ Fetch error: http://www.otumm.com/ => https://otumm.com/: (60, 'SSL certificate
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Ouo.xml b/src/chrome/content/rules/Ouo.xml
new file mode 100644
index 000000000000..01c56987bf6d
--- /dev/null
+++ b/src/chrome/content/rules/Ouo.xml
@@ -0,0 +1,12 @@
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Our-Hometown.xml b/src/chrome/content/rules/Our-Hometown.xml
index 74d7677acb95..a19c18483981 100644
--- a/src/chrome/content/rules/Our-Hometown.xml
+++ b/src/chrome/content/rules/Our-Hometown.xml
@@ -6,10 +6,10 @@ Non-2xx HTTP code: http://our-hometown.com/ (200) => https://www.our-hometown.co
 Disabled by https-everywhere-checker because:
 Non-2xx HTTP code: http://our-hometown.com/ (200) => https://www.our-hometown.com/ (401)
 -->
-
+
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/OurCommonPlace.xml b/src/chrome/content/rules/OurCommonPlace.xml
index f749d8b958be..ddf47fdb1c66 100644
--- a/src/chrome/content/rules/OurCommonPlace.xml
+++ b/src/chrome/content/rules/OurCommonPlace.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.ourcommonplace.com/ => https://www.ourcommonplace.com/:
 	^ourcommonplace.com: 522 over http & https
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/OurCommons.ca.xml b/src/chrome/content/rules/OurCommons.ca.xml
new file mode 100644
index 000000000000..8b6746a4f174
--- /dev/null
+++ b/src/chrome/content/rules/OurCommons.ca.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/OurWorldOfText.com.xml b/src/chrome/content/rules/OurWorldOfText.com.xml
new file mode 100644
index 000000000000..e1c7e611945d
--- /dev/null
+++ b/src/chrome/content/rules/OurWorldOfText.com.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/OutWit.com.xml b/src/chrome/content/rules/OutWit.com.xml
index af9c50bad953..2532e7c6897f 100644
--- a/src/chrome/content/rules/OutWit.com.xml
+++ b/src/chrome/content/rules/OutWit.com.xml
@@ -12,7 +12,7 @@
 
 
 	
-	
+	
 
 
 	
-
-
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Outspark.xml b/src/chrome/content/rules/Outspark.xml
index 5cb83e5096fa..2c574e7d018e 100644
--- a/src/chrome/content/rules/Outspark.xml
+++ b/src/chrome/content/rules/Outspark.xml
@@ -18,7 +18,7 @@
 	
 
 
-	
+	
 
 
 	
 	
-	
+
 		
 
 		
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Overclock.net.xml b/src/chrome/content/rules/Overclock.net.xml
index 599701322ac7..c25a7296b356 100644
--- a/src/chrome/content/rules/Overclock.net.xml
+++ b/src/chrome/content/rules/Overclock.net.xml
@@ -1,35 +1,12 @@
 
-
-
+
+	
+	
 	
 
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/Overclockers.at.xml b/src/chrome/content/rules/Overclockers.at.xml
index 26a85576f20c..cd048515e095 100644
--- a/src/chrome/content/rules/Overclockers.at.xml
+++ b/src/chrome/content/rules/Overclockers.at.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://bitte.overclockers.at/ => https://bitte.overclockers.at/: (6, 'Could not resolve host: bitte.overclockers.at')
 
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/Overclockers.com.xml b/src/chrome/content/rules/Overclockers.com.xml
index ffaeb836bc68..3be70950dd71 100644
--- a/src/chrome/content/rules/Overclockers.com.xml
+++ b/src/chrome/content/rules/Overclockers.com.xml
@@ -3,49 +3,16 @@
 
 		- INet-Interactive.xml
 
-
-	Expired 2014-07-20
-
-
-	Mixed content:
-
-		- css from $self *
-
-		- Images from $self *
-
-		- favicon  from $self *
-
-		- Bug from s.skimresources.com *
-
-	* Secured by us
-
 -->
-
+
 
 	
 	
 	
-	
-
-
-	
-	
-	
-	
-
-	
-
+	
 
-	
-	
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Overlake-Hospital.xml b/src/chrome/content/rules/Overlake-Hospital.xml
index e856d5dab6d4..ba39f3b9d7ae 100644
--- a/src/chrome/content/rules/Overlake-Hospital.xml
+++ b/src/chrome/content/rules/Overlake-Hospital.xml
@@ -1,10 +1,10 @@
 
 
 	
-	
+	
 
 
-	
+	
 
 
 	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Oversee.xml b/src/chrome/content/rules/Oversee.xml
index 0e92c2f41ed3..5c9e54591b20 100644
--- a/src/chrome/content/rules/Oversee.xml
+++ b/src/chrome/content/rules/Oversee.xml
@@ -1,50 +1,22 @@
-
 
-
+	Non-functional hosts
+		Couldn't connect to server:
+		- domainfest.com
+		- www.domainfest.com
 
+		SSL peer certificate was not OK:
+		- oversee.net
+		- www.oversee.net
+-->
+
 	
 	
-	
-	
-	
-	
-	
-
-
-	
-	
-	
-
-
-	
-
-	
-
-	
-
-	
 
+	
 
diff --git a/src/chrome/content/rules/OvershootDay.org.xml b/src/chrome/content/rules/OvershootDay.org.xml
new file mode 100644
index 000000000000..1a1d2a57ad8f
--- /dev/null
+++ b/src/chrome/content/rules/OvershootDay.org.xml
@@ -0,0 +1,8 @@
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Overstock.com.xml b/src/chrome/content/rules/Overstock.com.xml
index c2438bf08d05..291305fcfe01 100644
--- a/src/chrome/content/rules/Overstock.com.xml
+++ b/src/chrome/content/rules/Overstock.com.xml
@@ -50,9 +50,14 @@
 -->
 
 
-	
+	
+	
+	
 	
-	
+	
+	
+	
+	
 		
diff --git a/src/chrome/content/rules/Overview_Project.org.xml b/src/chrome/content/rules/Overview_Project.org.xml
index 27ceed9f37ae..66463de010eb 100644
--- a/src/chrome/content/rules/Overview_Project.org.xml
+++ b/src/chrome/content/rules/Overview_Project.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://overviewproject.org/ => https://overviewproject.org/: (60, '
 Fetch error: http://www.overviewproject.org/ => https://www.overviewproject.org/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Ovi.com.xml b/src/chrome/content/rules/Ovi.com.xml
deleted file mode 100644
index 406c67688b32..000000000000
--- a/src/chrome/content/rules/Ovi.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Ovid.xml b/src/chrome/content/rules/Ovid.xml
index b73b4f878cbb..a0b1a4871f04 100644
--- a/src/chrome/content/rules/Ovid.xml
+++ b/src/chrome/content/rules/Ovid.xml
@@ -16,4 +16,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ovscruise.com.xml b/src/chrome/content/rules/Ovscruise.com.xml
index 300197e5316e..625f472eebbe 100644
--- a/src/chrome/content/rules/Ovscruise.com.xml
+++ b/src/chrome/content/rules/Ovscruise.com.xml
@@ -1,5 +1,5 @@
 
 
 
 	
 
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Own.ag.xml b/src/chrome/content/rules/Own.ag.xml
new file mode 100644
index 000000000000..960a88ecc5b9
--- /dev/null
+++ b/src/chrome/content/rules/Own.ag.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/OwnCloud.com.xml b/src/chrome/content/rules/OwnCloud.com.xml
index f1f8bdf00e34..45d6480507e0 100644
--- a/src/chrome/content/rules/OwnCloud.com.xml
+++ b/src/chrome/content/rules/OwnCloud.com.xml
@@ -30,7 +30,7 @@ Fetch error: http://static.owncloud.com/ => https://opendesktop.org/: Too many r
 	Not secured by us <= mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/OwnedCore.com.xml b/src/chrome/content/rules/OwnedCore.com.xml
index c88adc06b9d4..757862483914 100644
--- a/src/chrome/content/rules/OwnedCore.com.xml
+++ b/src/chrome/content/rules/OwnedCore.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.ownedcore.com/ => https://www.ownedcore.com/: Too many r
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/OxfordJournals.org.xml b/src/chrome/content/rules/OxfordJournals.org.xml
index 98a3e1521f7b..10626a2023d1 100644
--- a/src/chrome/content/rules/OxfordJournals.org.xml
+++ b/src/chrome/content/rules/OxfordJournals.org.xml
@@ -1,10 +1,10 @@
 
-
-
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/PACW.org.xml b/src/chrome/content/rules/PACW.org.xml
deleted file mode 100644
index bc73c4fedac6..000000000000
--- a/src/chrome/content/rules/PACW.org.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/PBHS.xml b/src/chrome/content/rules/PBHS.xml
index 2603a28810c8..fefa606ea24a 100644
--- a/src/chrome/content/rules/PBHS.xml
+++ b/src/chrome/content/rules/PBHS.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/PBS.org.xml b/src/chrome/content/rules/PBS.org.xml
new file mode 100644
index 000000000000..0af714155691
--- /dev/null
+++ b/src/chrome/content/rules/PBS.org.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/PBS.xml b/src/chrome/content/rules/PBS.xml
deleted file mode 100644
index 75f4371db688..000000000000
--- a/src/chrome/content/rules/PBS.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/PBSKids.org.xml b/src/chrome/content/rules/PBSKids.org.xml
new file mode 100644
index 000000000000..21dea9a13bda
--- /dev/null
+++ b/src/chrome/content/rules/PBSKids.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/PB_Web_Dev.com.xml b/src/chrome/content/rules/PB_Web_Dev.com.xml
deleted file mode 100644
index 63296c4f9767..000000000000
--- a/src/chrome/content/rules/PB_Web_Dev.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/PBase.xml b/src/chrome/content/rules/PBase.xml
index 06847d92144d..897dbe7a2cb9 100644
--- a/src/chrome/content/rules/PBase.xml
+++ b/src/chrome/content/rules/PBase.xml
@@ -18,13 +18,14 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/PBeBank.com.xml b/src/chrome/content/rules/PBeBank.com.xml
deleted file mode 100644
index 093911bf477a..000000000000
--- a/src/chrome/content/rules/PBeBank.com.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-
-  	
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/PBwiki.xml b/src/chrome/content/rules/PBwiki.xml
deleted file mode 100644
index 0c2180ca235e..000000000000
--- a/src/chrome/content/rules/PBwiki.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/PBworks.com.xml b/src/chrome/content/rules/PBworks.com.xml
new file mode 100644
index 000000000000..1ad92195861f
--- /dev/null
+++ b/src/chrome/content/rules/PBworks.com.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/PBworks.xml b/src/chrome/content/rules/PBworks.xml
index 565d21a6177e..72742ef0d361 100644
--- a/src/chrome/content/rules/PBworks.xml
+++ b/src/chrome/content/rules/PBworks.xml
@@ -3,7 +3,7 @@
 	
 
 
-	
+	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/PCCArx.ca.xml b/src/chrome/content/rules/PCCArx.ca.xml
new file mode 100644
index 000000000000..1b5bfa852f89
--- /dev/null
+++ b/src/chrome/content/rules/PCCArx.ca.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/PCGamer.com.xml b/src/chrome/content/rules/PCGamer.com.xml
index 8cb7eb4c25a3..beb0457a33ce 100644
--- a/src/chrome/content/rules/PCGamer.com.xml
+++ b/src/chrome/content/rules/PCGamer.com.xml
@@ -1,6 +1,6 @@
 
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/PCI-Security-Standards-Council.xml b/src/chrome/content/rules/PCI-Security-Standards-Council.xml
deleted file mode 100644
index ac29d125ec7b..000000000000
--- a/src/chrome/content/rules/PCI-Security-Standards-Council.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-	
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/PCPro.co.uk.xml b/src/chrome/content/rules/PCPro.co.uk.xml
index 013d71db4a8d..620a6300d6a9 100644
--- a/src/chrome/content/rules/PCPro.co.uk.xml
+++ b/src/chrome/content/rules/PCPro.co.uk.xml
@@ -10,7 +10,7 @@ Fetch error: http://sprites.pcpro.co.uk/ => https://desawk404a9v3.cloudfront.net
 	pcpro.s3.amazonaws.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/PC_Booster.xml b/src/chrome/content/rules/PC_Booster.xml
index ed30e91907f1..75419906b130 100644
--- a/src/chrome/content/rules/PC_Booster.xml
+++ b/src/chrome/content/rules/PC_Booster.xml
@@ -9,16 +9,13 @@
 
 
 	
-	
+	
+	
 
 
 	
 
 
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/PConline.xml b/src/chrome/content/rules/PConline.xml
index a3fd16677e9c..fadda50725a5 100644
--- a/src/chrome/content/rules/PConline.xml
+++ b/src/chrome/content/rules/PConline.xml
@@ -1,21 +1,18 @@
 
 
+	
+	
+	
+	
+	
 	
+	
+	
+	
+	
 	
 		
 	
@@ -34,9 +31,11 @@
 	
 	
 	
+	
 	
-	
-	
+	
+	
+	
 	
 
 	
diff --git a/src/chrome/content/rules/PDE.cc.xml b/src/chrome/content/rules/PDE.cc.xml
new file mode 100644
index 000000000000..2f0fffbdb380
--- /dev/null
+++ b/src/chrome/content/rules/PDE.cc.xml
@@ -0,0 +1,9 @@
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/PDFMerge.com.xml b/src/chrome/content/rules/PDFMerge.com.xml
index 9c0ff782ea55..a3aff571b0e3 100644
--- a/src/chrome/content/rules/PDFMerge.com.xml
+++ b/src/chrome/content/rules/PDFMerge.com.xml
@@ -5,6 +5,6 @@
 	
 	
 
-	
 
diff --git a/src/chrome/content/rules/PEP-project.org.xml b/src/chrome/content/rules/PEP-project.org.xml
index 33331639d4f2..8bbee5a12c53 100644
--- a/src/chrome/content/rules/PEP-project.org.xml
+++ b/src/chrome/content/rules/PEP-project.org.xml
@@ -1,5 +1,5 @@
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/PGi-problematic.xml b/src/chrome/content/rules/PGi-problematic.xml
index 5f6a815b0db4..ef83e4825164 100644
--- a/src/chrome/content/rules/PGi-problematic.xml
+++ b/src/chrome/content/rules/PGi-problematic.xml
@@ -4,13 +4,14 @@
 -->
 
 
-	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/PHP.xml b/src/chrome/content/rules/PHP.xml
index aad97287b083..b16fbcce5828 100644
--- a/src/chrome/content/rules/PHP.xml
+++ b/src/chrome/content/rules/PHP.xml
@@ -6,11 +6,9 @@
 		- gcov ²
 		- gtk ³
 		- lxr ¹
-		- museum ¹
 		- news ¹
 		- snaps ¹
 		- talks ³
-		- windows ¹
 		- www ⁴
 
 	¹ Refused
@@ -46,6 +44,7 @@
 	
 	
 	
+	
 	
 	
 	
@@ -56,6 +55,7 @@
 	
 	
 	
+	
 
 	
 
diff --git a/src/chrome/content/rules/PHP_magazin.xml b/src/chrome/content/rules/PHP_magazin.xml
index 8cd77957333b..e9f8d03dde9c 100644
--- a/src/chrome/content/rules/PHP_magazin.xml
+++ b/src/chrome/content/rules/PHP_magazin.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/PH_Cheats.xml b/src/chrome/content/rules/PH_Cheats.xml
index 623e6accc2e0..5d3b2145ed9b 100644
--- a/src/chrome/content/rules/PH_Cheats.xml
+++ b/src/chrome/content/rules/PH_Cheats.xml
@@ -9,7 +9,7 @@ Fetch error: http://phcheats.com/ => https://phcheats.com/: Cycle detected - URL
 	Mixed image from levelrapido.com
 
 -->
-
+
 
 	
 	
@@ -20,4 +20,4 @@ Fetch error: http://phcheats.com/ => https://phcheats.com/: Cycle detected - URL
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/PICMET.org.xml b/src/chrome/content/rules/PICMET.org.xml
index adec65c18e91..c1b02a56227d 100644
--- a/src/chrome/content/rules/PICMET.org.xml
+++ b/src/chrome/content/rules/PICMET.org.xml
@@ -1,19 +1,8 @@
-
-
-
-
-	
+
+	
 	
 
+	
 
-	
-
+	
 
diff --git a/src/chrome/content/rules/PIPNI.cz.xml b/src/chrome/content/rules/PIPNI.cz.xml
index 4541283a0aa7..9511bdb44532 100644
--- a/src/chrome/content/rules/PIPNI.cz.xml
+++ b/src/chrome/content/rules/PIPNI.cz.xml
@@ -37,7 +37,7 @@ Fetch error: http://www20.pipni.cz/ => https://www20.pipni.cz/: (28, 'Connection
 		- www5.pipni.cz
 		- www9.pipni.cz
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/PIXinsight.com.tw.xml b/src/chrome/content/rules/PIXinsight.com.tw.xml
index b2f14897d2dc..b2cb3e17316a 100644
--- a/src/chrome/content/rules/PIXinsight.com.tw.xml
+++ b/src/chrome/content/rules/PIXinsight.com.tw.xml
@@ -10,17 +10,14 @@
 -->
 
 
-	
+	
 
 
 	
 	
 
-	
 
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/PJTV.com.xml b/src/chrome/content/rules/PJTV.com.xml
deleted file mode 100644
index 30d3d4eb0318..000000000000
--- a/src/chrome/content/rules/PJTV.com.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/PJ_Media.xml b/src/chrome/content/rules/PJ_Media.xml
index 182a2226d380..5c6bd70d8c03 100644
--- a/src/chrome/content/rules/PJ_Media.xml
+++ b/src/chrome/content/rules/PJ_Media.xml
@@ -1,7 +1,6 @@
 
 	
diff --git a/src/chrome/content/rules/PKWARE.com.xml b/src/chrome/content/rules/PKWARE.com.xml
index 5681cc3c4d7d..be4266660bff 100644
--- a/src/chrome/content/rules/PKWARE.com.xml
+++ b/src/chrome/content/rules/PKWARE.com.xml
@@ -9,7 +9,8 @@ Fetch error: http://pkware.com/ => https://pkware.com/: (35, 'error:14094410:SSL
 
 
 	
-	
+	
+	
 
 
 	
@@ -21,4 +22,4 @@ Fetch error: http://pkware.com/ => https://pkware.com/: (35, 'error:14094410:SSL
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/PNAS_First_Look.xml b/src/chrome/content/rules/PNAS_First_Look.xml
deleted file mode 100644
index 737d39643a75..000000000000
--- a/src/chrome/content/rules/PNAS_First_Look.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/PNC.xml b/src/chrome/content/rules/PNC.xml
deleted file mode 100644
index a0a57300649d..000000000000
--- a/src/chrome/content/rules/PNC.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-  
-  
-
-  
-  
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/POLi-Payments.xml b/src/chrome/content/rules/POLi-Payments.xml
new file mode 100644
index 000000000000..69e6fe808e5a
--- /dev/null
+++ b/src/chrome/content/rules/POLi-Payments.xml
@@ -0,0 +1,84 @@
+
+
+
+	
+	
+
+	
+	
+
+	
+	
+	
+	
+	
+		
+	
+	
+		
+	
+	
+		
+	
+	
+	
+	
+	
+
+	
+	
+
+	
+	
+	
+	
+
+	
+	
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/POLi_Payments.com.xml b/src/chrome/content/rules/POLi_Payments.com.xml
deleted file mode 100644
index 982b36d200a3..000000000000
--- a/src/chrome/content/rules/POLi_Payments.com.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/POODLE_Test.com.xml b/src/chrome/content/rules/POODLE_Test.com.xml
index a9bc537a24ad..de2463332e45 100644
--- a/src/chrome/content/rules/POODLE_Test.com.xml
+++ b/src/chrome/content/rules/POODLE_Test.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://poodletest.com/ => https://poodletest.com/: (28, 'Connection
 Fetch error: http://www.poodletest.com/ => https://www.poodletest.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/PORTAL_Masq.com.xml b/src/chrome/content/rules/PORTAL_Masq.com.xml
index 65c938538ebe..0e158bc278fd 100644
--- a/src/chrome/content/rules/PORTAL_Masq.com.xml
+++ b/src/chrome/content/rules/PORTAL_Masq.com.xml
@@ -24,7 +24,7 @@ Fetch error: http://www.portalmasq.com/ => https://www.portalmasq.com/: (28, 'Op
 		- .portalmasq.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/POS_Portal.com.xml b/src/chrome/content/rules/POS_Portal.com.xml
index baae97901387..9a4a98b36ca8 100644
--- a/src/chrome/content/rules/POS_Portal.com.xml
+++ b/src/chrome/content/rules/POS_Portal.com.xml
@@ -17,7 +17,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/PPCoin.xml b/src/chrome/content/rules/PPCoin.xml
index c6af04cbd91a..013e0514f9ae 100644
--- a/src/chrome/content/rules/PPCoin.xml
+++ b/src/chrome/content/rules/PPCoin.xml
@@ -20,4 +20,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/PPS.xml b/src/chrome/content/rules/PPS.xml
index 796377c42735..948decc90e20 100644
--- a/src/chrome/content/rules/PPS.xml
+++ b/src/chrome/content/rules/PPS.xml
@@ -57,7 +57,7 @@ Fetch error: http://tg.piratenpartei.ch/ => https://tg.piratenpartei.ch/: (51, "
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/PPSSPP.org.xml b/src/chrome/content/rules/PPSSPP.org.xml
new file mode 100644
index 000000000000..5be4ffac4e4d
--- /dev/null
+++ b/src/chrome/content/rules/PPSSPP.org.xml
@@ -0,0 +1,16 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/PQ_Archiver.com.xml b/src/chrome/content/rules/PQ_Archiver.com.xml
deleted file mode 100644
index 0ca5b9c23b78..000000000000
--- a/src/chrome/content/rules/PQ_Archiver.com.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/PR-Newswire.xml b/src/chrome/content/rules/PR-Newswire.xml
index ac18b5999c75..1c29a9029679 100644
--- a/src/chrome/content/rules/PR-Newswire.xml
+++ b/src/chrome/content/rules/PR-Newswire.xml
@@ -1,45 +1,21 @@
-
 
-
+
 
-	
-	
+	
+	
 	
 	
 
 
-	
-
-
-	
-
-	
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/PRQ.se.xml b/src/chrome/content/rules/PRQ.se.xml
index b99acd8aa40e..ade95bd8a77b 100644
--- a/src/chrome/content/rules/PRQ.se.xml
+++ b/src/chrome/content/rules/PRQ.se.xml
@@ -1,11 +1,27 @@
-
+
+	Timeout was reached:
+		- admin
+
+	HTTP authentication required:
+		- mgmt
+
+	Customer subdomains:
+		- host-*.cust.prq.se
+-->
+
+	
+	
+	
+	
 	
 	
 
-	
+	
 
-
diff --git a/src/chrome/content/rules/PRV.se.xml b/src/chrome/content/rules/PRV.se.xml
index 8a27ebc9b34f..5130e0f47f50 100644
--- a/src/chrome/content/rules/PRV.se.xml
+++ b/src/chrome/content/rules/PRV.se.xml
@@ -1,7 +1,13 @@
-
+
 	
 	
-	
-	
-
+	
+	
+	
+		
+	
+
+	
 
+	
+
diff --git a/src/chrome/content/rules/PRX.xml b/src/chrome/content/rules/PRX.xml
index 086fc3f07882..6ce69a5046f9 100644
--- a/src/chrome/content/rules/PRX.xml
+++ b/src/chrome/content/rules/PRX.xml
@@ -18,16 +18,13 @@
 
 
 	
-	
+	
+	
 
 
 	
 
 
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/PS-Webhosting-Webmail.xml b/src/chrome/content/rules/PS-Webhosting-Webmail.xml
deleted file mode 100644
index 32356e3bdf93..000000000000
--- a/src/chrome/content/rules/PS-Webhosting-Webmail.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-  
-  
-
-  
-
diff --git a/src/chrome/content/rules/PS3Crunch.xml b/src/chrome/content/rules/PS3Crunch.xml
index 85a91ab1e259..84757c948325 100644
--- a/src/chrome/content/rules/PS3Crunch.xml
+++ b/src/chrome/content/rules/PS3Crunch.xml
@@ -12,4 +12,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/PSC.edu.xml b/src/chrome/content/rules/PSC.edu.xml
index aceaeb0104c8..3f26dda2aa77 100644
--- a/src/chrome/content/rules/PSC.edu.xml
+++ b/src/chrome/content/rules/PSC.edu.xml
@@ -19,16 +19,16 @@ Fetch error: http://delicate.psc.edu/ => https://delicate.psc.edu/: (28, 'Connec
 		- www
 
 -->
-
+
 
 	
 	
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/PSX-Extreme.xml b/src/chrome/content/rules/PSX-Extreme.xml
index 6566219e071f..68c7e2923cf2 100644
--- a/src/chrome/content/rules/PSX-Extreme.xml
+++ b/src/chrome/content/rules/PSX-Extreme.xml
@@ -10,7 +10,6 @@
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/PTE.xml b/src/chrome/content/rules/PTE.xml
index 2d14bcbea3a7..11df7a04d821 100644
--- a/src/chrome/content/rules/PTE.xml
+++ b/src/chrome/content/rules/PTE.xml
@@ -1,5 +1,5 @@
 
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/PTT.br.xml b/src/chrome/content/rules/PTT.br.xml
index c56b16745252..f03aa5fa7380 100644
--- a/src/chrome/content/rules/PTT.br.xml
+++ b/src/chrome/content/rules/PTT.br.xml
@@ -15,7 +15,7 @@ Fetch error: http://ptt.br/ => https://ptt.br/: (60, 'SSL certificate problem: u
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Pabo.xml b/src/chrome/content/rules/Pabo.xml
index 25d57d5094b1..9c02296b03e6 100644
--- a/src/chrome/content/rules/Pabo.xml
+++ b/src/chrome/content/rules/Pabo.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/PacBSD.org.xml b/src/chrome/content/rules/PacBSD.org.xml
index ec474e44e28b..0179dd977333 100644
--- a/src/chrome/content/rules/PacBSD.org.xml
+++ b/src/chrome/content/rules/PacBSD.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://aur.pacbsd.org/ => https://aur.pacbsd.org/: (6, 'Could not resolve host: aur.pacbsd.org')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Pace2Race.xml b/src/chrome/content/rules/Pace2Race.xml
index 1d13ae8175d9..5e2c9c59b2aa 100644
--- a/src/chrome/content/rules/Pace2Race.xml
+++ b/src/chrome/content/rules/Pace2Race.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Pace_Bus.com.xml b/src/chrome/content/rules/Pace_Bus.com.xml
deleted file mode 100644
index 0d63d2e4b2ed..000000000000
--- a/src/chrome/content/rules/Pace_Bus.com.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Pachube.com.xml b/src/chrome/content/rules/Pachube.com.xml
deleted file mode 100644
index 8f999ea61ca3..000000000000
--- a/src/chrome/content/rules/Pachube.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Package_Lab.com.xml b/src/chrome/content/rules/Package_Lab.com.xml
index 04c18912891a..742bbd4e888a 100644
--- a/src/chrome/content/rules/Package_Lab.com.xml
+++ b/src/chrome/content/rules/Package_Lab.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://static.packagelab.com/ => https://static.packagelab.com/: (6
 Fetch error: http://www.packagelab.com/ => https://www.packagelab.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Packet_Storm_Security.com.xml b/src/chrome/content/rules/Packet_Storm_Security.com.xml
index 4f96ebb60194..c2883cf3be8a 100644
--- a/src/chrome/content/rules/Packet_Storm_Security.com.xml
+++ b/src/chrome/content/rules/Packet_Storm_Security.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://packetstatic.com/ => https://packetstatic.com/: (51, "SSL: n
 	www.packetstatic.com: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Packt_Publishing-problematic.xml b/src/chrome/content/rules/Packt_Publishing-problematic.xml
index 759a3580c564..06abc9f3a780 100644
--- a/src/chrome/content/rules/Packt_Publishing-problematic.xml
+++ b/src/chrome/content/rules/Packt_Publishing-problematic.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Packt_Publishing.xml b/src/chrome/content/rules/Packt_Publishing.xml
index 4ba2aa0f3fe3..5e18f02f6005 100644
--- a/src/chrome/content/rules/Packt_Publishing.xml
+++ b/src/chrome/content/rules/Packt_Publishing.xml
@@ -25,13 +25,15 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
 
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Pacnet.xml b/src/chrome/content/rules/Pacnet.xml
deleted file mode 100644
index 0821c2dd676e..000000000000
--- a/src/chrome/content/rules/Pacnet.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/PagPop.xml b/src/chrome/content/rules/PagPop.xml
index f237ddd93502..52c14af8389f 100644
--- a/src/chrome/content/rules/PagPop.xml
+++ b/src/chrome/content/rules/PagPop.xml
@@ -6,18 +6,17 @@ Fetch error: http://vitalcred.com.br/ => https://vitalcred.com.br/: (6, 'Could n
 Disabled by https-everywhere-checker because:
 Fetch error: http://pagpop.com.br/ => https://pagpop.com.br/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
 
 	
-	
 	
-	
+	
+	
 
 
-	
+	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/PageAbode.com.xml b/src/chrome/content/rules/PageAbode.com.xml
new file mode 100644
index 000000000000..134c2c24956f
--- /dev/null
+++ b/src/chrome/content/rules/PageAbode.com.xml
@@ -0,0 +1,23 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/PageKite.xml b/src/chrome/content/rules/PageKite.xml
index 83a970bbbb21..b0dcb1e866dd 100644
--- a/src/chrome/content/rules/PageKite.xml
+++ b/src/chrome/content/rules/PageKite.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://g1-bre.pagekite.net/ => https://g1-bre.pagekite.net/: (6, 'Could not resolve host: g1-bre.pagekite.net')
 
 -->
-
+
   
 	
 	
diff --git a/src/chrome/content/rules/Pagely.xml b/src/chrome/content/rules/Pagely.xml
index 1bfa9e1e6aa4..cdd7f535c3a8 100644
--- a/src/chrome/content/rules/Pagely.xml
+++ b/src/chrome/content/rules/Pagely.xml
@@ -1,4 +1,4 @@
-
-
-
-	
-	
-	
-	
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Pagina_Zero.xml b/src/chrome/content/rules/Pagina_Zero.xml
index b5180a2f7b1c..6ff30b89f3d0 100644
--- a/src/chrome/content/rules/Pagina_Zero.xml
+++ b/src/chrome/content/rules/Pagina_Zero.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.paginazero.com.br/ => https://www.paginazero.com.br/: (5
 Disabled by https-everywhere-checker because:
 Fetch error: http://paginazero.com.br/ => https://paginazero.com.br/: (51, "SSL: no alternative certificate subject name matches target host name 'paginazero.com.br'")
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://paginazero.com.br/ => https://paginazero.com.br/: (51, "SSL:
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Paglen.com.xml b/src/chrome/content/rules/Paglen.com.xml
new file mode 100644
index 000000000000..03530fe35dc8
--- /dev/null
+++ b/src/chrome/content/rules/Paglen.com.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Pagoda_Box.xml b/src/chrome/content/rules/Pagoda_Box.xml
index 0f395f123d2f..6d985e7f7c32 100644
--- a/src/chrome/content/rules/Pagoda_Box.xml
+++ b/src/chrome/content/rules/Pagoda_Box.xml
@@ -20,12 +20,15 @@ Fetch error: http://pagodabox.com/ => https://pagodabox.com/: (60, 'SSL certific
 		- help		(redirects to http; mismatched, CN: *.assistly.com)
 
 -->
-
+
 
 	
 	
 	
-	
+	
+	
+	
+	
 
 
 	
@@ -35,7 +38,6 @@ Fetch error: http://pagodabox.com/ => https://pagodabox.com/: (60, 'SSL certific
 	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Pair-Networks.xml b/src/chrome/content/rules/Pair-Networks.xml
index b0164bf55649..8494d5420bce 100644
--- a/src/chrome/content/rules/Pair-Networks.xml
+++ b/src/chrome/content/rules/Pair-Networks.xml
@@ -7,45 +7,25 @@
 		- blog.pairnic.com		(cert: *.pair.com; redirects there)
 		- (www.)pairvps.com
 		- (www.)quickserve.com		(ditto)
-
 -->
 
 
-	
-	
 	
 	
+		
+		
+		
 	
-	
 	
 	
-		
-
+		
+		
+		
+	
+	
 
 	
 
-
-	
-	
-
-	
-	
-
-	
-
-	
-
-	
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/PalSolidarity.org.xml b/src/chrome/content/rules/PalSolidarity.org.xml
index 23328deec770..7ce7815e0e33 100644
--- a/src/chrome/content/rules/PalSolidarity.org.xml
+++ b/src/chrome/content/rules/PalSolidarity.org.xml
@@ -3,7 +3,7 @@
 
 		- iframe from www.youtube.com *
 		- css on ^, spain from $self *
-		
+
 		- Images, on:
 
 			- ^, spain from $self *
diff --git a/src/chrome/content/rules/Palbin.com.xml b/src/chrome/content/rules/Palbin.com.xml
index c0a1c3266abd..307ec3afaa5e 100644
--- a/src/chrome/content/rules/Palbin.com.xml
+++ b/src/chrome/content/rules/Palbin.com.xml
@@ -9,7 +9,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -21,7 +22,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Palm.com.xml b/src/chrome/content/rules/Palm.com.xml
index 49361e28475f..4d7e418843c5 100644
--- a/src/chrome/content/rules/Palm.com.xml
+++ b/src/chrome/content/rules/Palm.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://developer.palm.com/ => https://developer.palm.com/: (28, 'Co
 	For other Hewlett Packard coverage, see Hewlett-Packard.xml.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Palmetto.com.xml b/src/chrome/content/rules/Palmetto.com.xml
index b9590af4b7cf..0a2325ee825b 100644
--- a/src/chrome/content/rules/Palmetto.com.xml
+++ b/src/chrome/content/rules/Palmetto.com.xml
@@ -13,4 +13,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Palo_Alto_Networks.com.xml b/src/chrome/content/rules/Palo_Alto_Networks.com.xml
index c2d2687ade1f..1f42a80acf43 100644
--- a/src/chrome/content/rules/Palo_Alto_Networks.com.xml
+++ b/src/chrome/content/rules/Palo_Alto_Networks.com.xml
@@ -27,7 +27,7 @@ Fetch error: http://portal3.wildfire.paloaltonetworks.com/ => https://portal3.wi
 		- portal3.wildfire.paloaltonetworks.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Palo_Alto_Research_Center.xml b/src/chrome/content/rules/Palo_Alto_Research_Center.xml
index 66d2e96fa9da..6a689ce3e437 100644
--- a/src/chrome/content/rules/Palo_Alto_Research_Center.xml
+++ b/src/chrome/content/rules/Palo_Alto_Research_Center.xml
@@ -11,4 +11,4 @@
 					-->
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Pan-Islamic_Malaysian_Party.xml b/src/chrome/content/rules/Pan-Islamic_Malaysian_Party.xml
index 06f88c9dab73..8ec290f6dd9a 100644
--- a/src/chrome/content/rules/Pan-Islamic_Malaysian_Party.xml
+++ b/src/chrome/content/rules/Pan-Islamic_Malaysian_Party.xml
@@ -15,4 +15,4 @@ Fetch error: http://pas.org.my/ => https://pas.org.my/: (60, 'SSL certificate pr
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Panasonic.com.xml b/src/chrome/content/rules/Panasonic.com.xml
index 3c1acb14dcde..8058b5b37468 100644
--- a/src/chrome/content/rules/Panasonic.com.xml
+++ b/src/chrome/content/rules/Panasonic.com.xml
@@ -1,38 +1,57 @@
 
 
 
-	
-
-
-	
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
 
 	
 
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Panax.xml b/src/chrome/content/rules/Panax.xml
index 70c2b853513b..9bc36949d220 100644
--- a/src/chrome/content/rules/Panax.xml
+++ b/src/chrome/content/rules/Panax.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Panda-Express.xml b/src/chrome/content/rules/Panda-Express.xml
index a2c6ab0ca0dc..9063d3c78fae 100644
--- a/src/chrome/content/rules/Panda-Express.xml
+++ b/src/chrome/content/rules/Panda-Express.xml
@@ -32,4 +32,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/PandaWhale.xml b/src/chrome/content/rules/PandaWhale.xml
index 6323547bcddb..73232d1b76d9 100644
--- a/src/chrome/content/rules/PandaWhale.xml
+++ b/src/chrome/content/rules/PandaWhale.xml
@@ -11,10 +11,10 @@ Fetch error: http://pandawhale.com/ => https://pandawhale.com/: (35, 'error:1407
 	Cert only matches ^.
 
 -->
-
+
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Pando.xml b/src/chrome/content/rules/Pando.xml
index d6a54ea8df4a..fc5e6db3be66 100644
--- a/src/chrome/content/rules/Pando.xml
+++ b/src/chrome/content/rules/Pando.xml
@@ -12,9 +12,9 @@
 
 	
-	
+	
 
-	
+	
 
 
 	
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Panic_Button.io.xml b/src/chrome/content/rules/Panic_Button.io.xml
deleted file mode 100644
index ae644a53acad..000000000000
--- a/src/chrome/content/rules/Panic_Button.io.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Panli.com.xml b/src/chrome/content/rules/Panli.com.xml
new file mode 100644
index 000000000000..9f443e35c270
--- /dev/null
+++ b/src/chrome/content/rules/Panli.com.xml
@@ -0,0 +1,40 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Panopticlick.com.xml b/src/chrome/content/rules/Panopticlick.com.xml
index 5a6f85d9e78c..446759515cfa 100644
--- a/src/chrome/content/rules/Panopticlick.com.xml
+++ b/src/chrome/content/rules/Panopticlick.com.xml
@@ -1,8 +1,7 @@
 
 
 
@@ -11,6 +10,5 @@
 
 	
 
-	
 	
 
diff --git a/src/chrome/content/rules/Panopto.com.xml b/src/chrome/content/rules/Panopto.com.xml
index 4ea69031513c..81c03582aa19 100644
--- a/src/chrome/content/rules/Panopto.com.xml
+++ b/src/chrome/content/rules/Panopto.com.xml
@@ -28,7 +28,7 @@ Fetch error: http://helpdesk.panopto.com/ => https://helpdesk.panopto.com/: (6,
 	ˢ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Panoptykon.org.xml b/src/chrome/content/rules/Panoptykon.org.xml
index 26334a08d9fe..7947fb6fcb6a 100644
--- a/src/chrome/content/rules/Panoptykon.org.xml
+++ b/src/chrome/content/rules/Panoptykon.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://memopol.panoptykon.org/ => https://memopol.panoptykon.org/: (6, 'Could not resolve host: memopol.panoptykon.org')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Panoramio.com.xml b/src/chrome/content/rules/Panoramio.com.xml
index 75c4ce987bdf..b30fd173296b 100644
--- a/src/chrome/content/rules/Panoramio.com.xml
+++ b/src/chrome/content/rules/Panoramio.com.xml
@@ -15,6 +15,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/Panthema.net.xml b/src/chrome/content/rules/Panthema.net.xml
new file mode 100644
index 000000000000..bad85424a9de
--- /dev/null
+++ b/src/chrome/content/rules/Panthema.net.xml
@@ -0,0 +1,13 @@
+
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Pao-pao.net.xml b/src/chrome/content/rules/Pao-pao.net.xml
index 22b072ba360c..a8b9c0ba3c14 100644
--- a/src/chrome/content/rules/Pao-pao.net.xml
+++ b/src/chrome/content/rules/Pao-pao.net.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.pao-pao.net/ => https://www.pao-pao.net/: (7, 'Failed to connect to www.pao-pao.net port 443: Connection refused')
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/PaoDelicia.com.xml b/src/chrome/content/rules/PaoDelicia.com.xml
index 9166197d97ad..cf95e6313237 100644
--- a/src/chrome/content/rules/PaoDelicia.com.xml
+++ b/src/chrome/content/rules/PaoDelicia.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://paodelicia.com/ => https://paodelicia.com/: (51, "SSL: no al
 Fetch error: http://www.paodelicia.com/ => https://www.paodelicia.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.paodelicia.com'")
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.paodelicia.com/ => https://www.paodelicia.com/: (51, "SS
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ParaPoupar.com.xml b/src/chrome/content/rules/ParaPoupar.com.xml
index b234c8a238ca..6eb91cb75def 100644
--- a/src/chrome/content/rules/ParaPoupar.com.xml
+++ b/src/chrome/content/rules/ParaPoupar.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.parapoupar.com/ => https://www.parapoupar.com/: (51, "SS
 Disabled by https-everywhere-checker because:
 Fetch error: http://parapoupar.com/ => https://parapoupar.com/: (51, "SSL: no alternative certificate subject name matches target host name 'parapoupar.com'")
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Parabola.nu.xml b/src/chrome/content/rules/Parabola.nu.xml
index 2231f581c6d1..05abee485474 100644
--- a/src/chrome/content/rules/Parabola.nu.xml
+++ b/src/chrome/content/rules/Parabola.nu.xml
@@ -21,6 +21,6 @@
 	
 
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Paradysz.xml b/src/chrome/content/rules/Paradysz.xml
index 0bc3d8fb7725..13f19a206570 100644
--- a/src/chrome/content/rules/Paradysz.xml
+++ b/src/chrome/content/rules/Paradysz.xml
@@ -11,13 +11,13 @@
 
 
 	
-	
+	
+	
 
 
-	
+	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Paragon_IE.com.xml b/src/chrome/content/rules/Paragon_IE.com.xml
index 0b206fb87d96..d89458b375ab 100644
--- a/src/chrome/content/rules/Paragon_IE.com.xml
+++ b/src/chrome/content/rules/Paragon_IE.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://asgard.paragonie.com/ => https://asgard.paragonie.com/: (6,
 		- .paragonie.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Parama.ca.xml b/src/chrome/content/rules/Parama.ca.xml
new file mode 100644
index 000000000000..531d86c355d9
--- /dev/null
+++ b/src/chrome/content/rules/Parama.ca.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Paranoidsecurity.nl.xml b/src/chrome/content/rules/Paranoidsecurity.nl.xml
deleted file mode 100644
index 335471c218fd..000000000000
--- a/src/chrome/content/rules/Paranoidsecurity.nl.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Parature.com.xml b/src/chrome/content/rules/Parature.com.xml
index 9afe48fb2ac1..8722fac0907f 100644
--- a/src/chrome/content/rules/Parature.com.xml
+++ b/src/chrome/content/rules/Parature.com.xml
@@ -18,7 +18,7 @@ Fetch error: http://shareideas.parature.com/ => https://shareideas.parature.com/
 		- favicon on shareideas from www.parature.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ParcelPoint.com.au.xml b/src/chrome/content/rules/ParcelPoint.com.au.xml
new file mode 100644
index 000000000000..c7657ed13948
--- /dev/null
+++ b/src/chrome/content/rules/ParcelPoint.com.au.xml
@@ -0,0 +1,48 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Parcelforce.xml b/src/chrome/content/rules/Parcelforce.xml
deleted file mode 100644
index d79cc2a3ad0f..000000000000
--- a/src/chrome/content/rules/Parcelforce.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Pardot.xml b/src/chrome/content/rules/Pardot.xml
index d1f62a32afb7..7bc562ed9436 100644
--- a/src/chrome/content/rules/Pardot.xml
+++ b/src/chrome/content/rules/Pardot.xml
@@ -50,7 +50,7 @@ Fetch error: http://help.pardot.com/ => https://help.pardot.com/: (51, "SSL: no
 	loaded from.
 
 -->
-
+
 
 	
@@ -86,9 +86,6 @@ Fetch error: http://help.pardot.com/ => https://help.pardot.com/: (51, "SSL: no
 	
 
-	
-
 	
 
diff --git a/src/chrome/content/rules/Paris_Diderot_University.xml b/src/chrome/content/rules/Paris_Diderot_University.xml
index 041647969a77..38985c932d53 100644
--- a/src/chrome/content/rules/Paris_Diderot_University.xml
+++ b/src/chrome/content/rules/Paris_Diderot_University.xml
@@ -20,4 +20,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Park_Models_Direct.xml b/src/chrome/content/rules/Park_Models_Direct.xml
index 47bfad78551a..18032e726abb 100644
--- a/src/chrome/content/rules/Park_Models_Direct.xml
+++ b/src/chrome/content/rules/Park_Models_Direct.xml
@@ -8,9 +8,9 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ParkerLab.com.xml b/src/chrome/content/rules/ParkerLab.com.xml
new file mode 100644
index 000000000000..d2ab8dc17a26
--- /dev/null
+++ b/src/chrome/content/rules/ParkerLab.com.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ParkerLabs.com.xml b/src/chrome/content/rules/ParkerLabs.com.xml
new file mode 100644
index 000000000000..3e49764bb396
--- /dev/null
+++ b/src/chrome/content/rules/ParkerLabs.com.xml
@@ -0,0 +1,16 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Parkerpen.com.xml b/src/chrome/content/rules/Parkerpen.com.xml
index e97e45526936..f389cdc16c3f 100644
--- a/src/chrome/content/rules/Parkerpen.com.xml
+++ b/src/chrome/content/rules/Parkerpen.com.xml
@@ -1,6 +1,6 @@
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Parrot.xml b/src/chrome/content/rules/Parrot.xml
index c1a924ce5e51..c7655d3b9e24 100644
--- a/src/chrome/content/rules/Parrot.xml
+++ b/src/chrome/content/rules/Parrot.xml
@@ -17,4 +17,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ParseCDN.com.xml b/src/chrome/content/rules/ParseCDN.com.xml
index 490ede6e43d2..b34a8ac411b8 100644
--- a/src/chrome/content/rules/ParseCDN.com.xml
+++ b/src/chrome/content/rules/ParseCDN.com.xml
@@ -16,7 +16,7 @@ Fetch error: http://www.parsecdn.com/js/parse-1.2.19.min.js => https://www.parse
 	^parsecdn.com doesn't exist.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Part_Spider.com.xml b/src/chrome/content/rules/Part_Spider.com.xml
index cd80a54b0984..6ab483092a06 100644
--- a/src/chrome/content/rules/Part_Spider.com.xml
+++ b/src/chrome/content/rules/Part_Spider.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://www.partspider.com/ => https://partspider.com/: (28, 'Connec
 		- partspider.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Parter.ru.xml b/src/chrome/content/rules/Parter.ru.xml
index c02ad74c3bb1..d1533038b972 100644
--- a/src/chrome/content/rules/Parter.ru.xml
+++ b/src/chrome/content/rules/Parter.ru.xml
@@ -1,5 +1,5 @@
 
-
+
 
 	
diff --git a/src/chrome/content/rules/PasportaServo.org.xml b/src/chrome/content/rules/PasportaServo.org.xml
deleted file mode 100644
index c8b8e6441599..000000000000
--- a/src/chrome/content/rules/PasportaServo.org.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/PassSource.xml b/src/chrome/content/rules/PassSource.xml
index 8af3320b9fc7..40b27d33ce36 100644
--- a/src/chrome/content/rules/PassSource.xml
+++ b/src/chrome/content/rules/PassSource.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/PassageBank.xml b/src/chrome/content/rules/PassageBank.xml
index 134dde8daadc..338537302da5 100644
--- a/src/chrome/content/rules/PassageBank.xml
+++ b/src/chrome/content/rules/PassageBank.xml
@@ -17,4 +17,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Passed.cc.xml b/src/chrome/content/rules/Passed.cc.xml
index 773663db134d..0185b566239c 100644
--- a/src/chrome/content/rules/Passed.cc.xml
+++ b/src/chrome/content/rules/Passed.cc.xml
@@ -5,7 +5,7 @@ Fetch error: http://passed.cc/ => https://passed.cc/: (35, 'Unknown SSL protocol
 Fetch error: http://www.passed.cc/ => https://www.passed.cc/: (35, 'Unknown SSL protocol error in connection to www.passed.cc:443 ')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.passed.cc/ => https://www.passed.cc/: (35, 'Unknown SSL
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Passionfruit_Ads.com.xml b/src/chrome/content/rules/Passionfruit_Ads.com.xml
index 3c035bc3907b..8429536681f3 100644
--- a/src/chrome/content/rules/Passionfruit_Ads.com.xml
+++ b/src/chrome/content/rules/Passionfruit_Ads.com.xml
@@ -33,10 +33,12 @@ Fetch error: http://passionfruitads.com/ => https://app.passionfruitads.com/: (7
 		- load		(→ passionfruit.herokuapp.com)
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
 	
@@ -50,4 +52,4 @@ Fetch error: http://passionfruitads.com/ => https://app.passionfruitads.com/: (7
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Passwd.hu.xml b/src/chrome/content/rules/Passwd.hu.xml
index e4208c93e66c..8bc91b926e5d 100644
--- a/src/chrome/content/rules/Passwd.hu.xml
+++ b/src/chrome/content/rules/Passwd.hu.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/PasswordBox.com.xml b/src/chrome/content/rules/PasswordBox.com.xml
index 516667907b06..6d80787421b5 100644
--- a/src/chrome/content/rules/PasswordBox.com.xml
+++ b/src/chrome/content/rules/PasswordBox.com.xml
@@ -17,22 +17,22 @@ Fetch error: http://psswrdbx.com/ => https://psswrdbx.com/: (28, 'Operation time
 			- extensions
 
 -->
-
+
 
 	
-	
+	
+	
 	
-	
+	
+	
+	
 
 
 	
 	
 
 
-	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Paste.ee.xml b/src/chrome/content/rules/Paste.ee.xml
index bcf9540a05b9..c11803388e6e 100644
--- a/src/chrome/content/rules/Paste.ee.xml
+++ b/src/chrome/content/rules/Paste.ee.xml
@@ -15,7 +15,7 @@ Non-2xx HTTP code: http://www.paste.ee/ (200) => https://www.paste.ee/ (404)
 		- www.paste.ee
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Pastebin.ca.xml b/src/chrome/content/rules/Pastebin.ca.xml
index 13201eedca26..197317effefd 100644
--- a/src/chrome/content/rules/Pastebin.ca.xml
+++ b/src/chrome/content/rules/Pastebin.ca.xml
@@ -16,7 +16,7 @@
 	
 	
 	
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Patches-Scrolls.com.xml b/src/chrome/content/rules/Patches-Scrolls.com.xml
new file mode 100644
index 000000000000..27eb0c21b2d1
--- /dev/null
+++ b/src/chrome/content/rules/Patches-Scrolls.com.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Patches-Scrolls.de.xml b/src/chrome/content/rules/Patches-Scrolls.de.xml
new file mode 100644
index 000000000000..ab7137003643
--- /dev/null
+++ b/src/chrome/content/rules/Patches-Scrolls.de.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/PathDefender.com.xml b/src/chrome/content/rules/PathDefender.com.xml
deleted file mode 100644
index 2a4228ad153e..000000000000
--- a/src/chrome/content/rules/PathDefender.com.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Path_of_Exile.com.xml b/src/chrome/content/rules/Path_of_Exile.com.xml
index a4d7c3d60ef9..05160eef75cb 100644
--- a/src/chrome/content/rules/Path_of_Exile.com.xml
+++ b/src/chrome/content/rules/Path_of_Exile.com.xml
@@ -16,19 +16,18 @@
 
 
 	
-	
+	
+	
 
 
 	
 
-	
 	
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Pathways2gsfa.org.xml b/src/chrome/content/rules/Pathways2gsfa.org.xml
index f4e443faf7de..280c7e5d632b 100644
--- a/src/chrome/content/rules/Pathways2gsfa.org.xml
+++ b/src/chrome/content/rules/Pathways2gsfa.org.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.pathways2gsfa.org/ => https://www.pathways2gsfa.org/: (6
 	^: cert only matches www
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/PatientsLikeMe.com.xml b/src/chrome/content/rules/PatientsLikeMe.com.xml
index 0ef639f7d3d1..f3857d6fd12a 100644
--- a/src/chrome/content/rules/PatientsLikeMe.com.xml
+++ b/src/chrome/content/rules/PatientsLikeMe.com.xml
@@ -43,7 +43,9 @@
 
 
 	
-	
+	
+	
+	
 		
diff --git a/src/chrome/content/rules/Patreon.com.xml b/src/chrome/content/rules/Patreon.com.xml
index d98f33e88145..54078db8ce92 100644
--- a/src/chrome/content/rules/Patreon.com.xml
+++ b/src/chrome/content/rules/Patreon.com.xml
@@ -20,7 +20,7 @@
 
 
 	
-	
+	
 		
diff --git a/src/chrome/content/rules/PatriotPost.com.xml b/src/chrome/content/rules/PatriotPost.com.xml
new file mode 100644
index 000000000000..7eeafb8d2d84
--- /dev/null
+++ b/src/chrome/content/rules/PatriotPost.com.xml
@@ -0,0 +1,9 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/PatriotPost.us.xml b/src/chrome/content/rules/PatriotPost.us.xml
new file mode 100644
index 000000000000..f693dfa80e73
--- /dev/null
+++ b/src/chrome/content/rules/PatriotPost.us.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Patriotgaming.com.xml b/src/chrome/content/rules/Patriotgaming.com.xml
new file mode 100644
index 000000000000..91322e76dc2e
--- /dev/null
+++ b/src/chrome/content/rules/Patriotgaming.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Patriotsuperbowl.us.xml b/src/chrome/content/rules/Patriotsuperbowl.us.xml
deleted file mode 100644
index 45d82032c06c..000000000000
--- a/src/chrome/content/rules/Patriotsuperbowl.us.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/PaulDotCom.com.xml b/src/chrome/content/rules/PaulDotCom.com.xml
index 67dc7b62b083..7e48ad07db64 100644
--- a/src/chrome/content/rules/PaulDotCom.com.xml
+++ b/src/chrome/content/rules/PaulDotCom.com.xml
@@ -23,7 +23,7 @@ Fetch error: http://www.pauldotcom.com/ => https://www.pauldotcom.com/: (60, 'SS
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Paxton_Record.xml b/src/chrome/content/rules/Paxton_Record.xml
index 776013ab18d0..74c3a73bb0af 100644
--- a/src/chrome/content/rules/Paxton_Record.xml
+++ b/src/chrome/content/rules/Paxton_Record.xml
@@ -15,4 +15,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Pay.gov.xml b/src/chrome/content/rules/Pay.gov.xml
deleted file mode 100644
index 096c2d8b6a3d..000000000000
--- a/src/chrome/content/rules/Pay.gov.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/PayGarden.com.xml b/src/chrome/content/rules/PayGarden.com.xml
index 61c1be7ec291..2c493e90140d 100644
--- a/src/chrome/content/rules/PayGarden.com.xml
+++ b/src/chrome/content/rules/PayGarden.com.xml
@@ -6,7 +6,7 @@
 	
 	
 
-  	
+  	
 
 	
diff --git a/src/chrome/content/rules/PayPal-Gifts.com.xml b/src/chrome/content/rules/PayPal-Gifts.com.xml
new file mode 100644
index 000000000000..54e2b8f32715
--- /dev/null
+++ b/src/chrome/content/rules/PayPal-Gifts.com.xml
@@ -0,0 +1,28 @@
+
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/PayPal.co.uk.xml b/src/chrome/content/rules/PayPal.co.uk.xml
index 8bb3838ff11c..9b758ffadbf0 100644
--- a/src/chrome/content/rules/PayPal.co.uk.xml
+++ b/src/chrome/content/rules/PayPal.co.uk.xml
@@ -1,11 +1,27 @@
 
 
+
 	
 	
+	
+	
 
 	
 
-	
+	
 
diff --git a/src/chrome/content/rules/PayPal.me.xml b/src/chrome/content/rules/PayPal.me.xml
new file mode 100644
index 000000000000..6d3f6b61bc4f
--- /dev/null
+++ b/src/chrome/content/rules/PayPal.me.xml
@@ -0,0 +1,27 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/PayPal.xml b/src/chrome/content/rules/PayPal.xml
index d7a8746695f1..3f675e1a3cb0 100644
--- a/src/chrome/content/rules/PayPal.xml
+++ b/src/chrome/content/rules/PayPal.xml
@@ -2,7 +2,6 @@
 	Other PayPal rulesets:
 
 		- PayPal_Forward.xml
-		- paypalobjects.com.xml
 		- Where.com.xml
 		- PayPal.co.uk.xml
 
diff --git a/src/chrome/content/rules/PayPal_Forward.xml b/src/chrome/content/rules/PayPal_Forward.xml
index 31d9412b82d3..1006ddc0b04c 100644
--- a/src/chrome/content/rules/PayPal_Forward.xml
+++ b/src/chrome/content/rules/PayPal_Forward.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.paypal-forward.com/ => https://www.paypal-forward.com/:
 	For other PayPal coverage, see PayPal.xml.
 
 -->
-
+
 
 	
 	
@@ -15,4 +15,4 @@ Fetch error: http://www.paypal-forward.com/ => https://www.paypal-forward.com/:
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/PayPalobjects.com.xml b/src/chrome/content/rules/PayPalobjects.com.xml
new file mode 100644
index 000000000000..bf700e0957c9
--- /dev/null
+++ b/src/chrome/content/rules/PayPalobjects.com.xml
@@ -0,0 +1,25 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/PaySmart.com.au.xml b/src/chrome/content/rules/PaySmart.com.au.xml
new file mode 100644
index 000000000000..cb58ceb7a53c
--- /dev/null
+++ b/src/chrome/content/rules/PaySmart.com.au.xml
@@ -0,0 +1,32 @@
+
+
+
+	
+	
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/PayTrust.com.xml b/src/chrome/content/rules/PayTrust.com.xml
new file mode 100644
index 000000000000..ed13141ec2e4
--- /dev/null
+++ b/src/chrome/content/rules/PayTrust.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/PaymentsSource.com.xml b/src/chrome/content/rules/PaymentsSource.com.xml
index 3ab6f84f99df..c138ed7ce3c3 100644
--- a/src/chrome/content/rules/PaymentsSource.com.xml
+++ b/src/chrome/content/rules/PaymentsSource.com.xml
@@ -8,10 +8,11 @@
 
 
 	
-	
+	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Payoneer.com.xml b/src/chrome/content/rules/Payoneer.com.xml
index e8e031232313..6e01494527ae 100644
--- a/src/chrome/content/rules/Payoneer.com.xml
+++ b/src/chrome/content/rules/Payoneer.com.xml
@@ -1,18 +1,29 @@
-
 
-
-
-	
+
 	
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
+	
 
-	
-
+	
 
diff --git a/src/chrome/content/rules/Payonline.ru.xml b/src/chrome/content/rules/Payonline.ru.xml
index caf9b3363b2b..847255a3add9 100644
--- a/src/chrome/content/rules/Payonline.ru.xml
+++ b/src/chrome/content/rules/Payonline.ru.xml
@@ -5,7 +5,7 @@ smasol. mismatch-->
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Paypal_Giving_Fund.org.xml b/src/chrome/content/rules/Paypal_Giving_Fund.org.xml
index 04312d3bdf12..041c3314d9c8 100644
--- a/src/chrome/content/rules/Paypal_Giving_Fund.org.xml
+++ b/src/chrome/content/rules/Paypal_Giving_Fund.org.xml
@@ -27,7 +27,7 @@ Fetch error: http://paypalgivingfund.org/ => https://paypalgivingfund.org/: (51,
 		- Bug from www.facebook.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Paysafecard.com.xml b/src/chrome/content/rules/Paysafecard.com.xml
index 036a23afdbc9..1dfe1154ee13 100644
--- a/src/chrome/content/rules/Paysafecard.com.xml
+++ b/src/chrome/content/rules/Paysafecard.com.xml
@@ -14,7 +14,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
@@ -23,7 +25,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Paysol.se.xml b/src/chrome/content/rules/Paysol.se.xml
index b1efe595cd2e..675070fbbadd 100644
--- a/src/chrome/content/rules/Paysol.se.xml
+++ b/src/chrome/content/rules/Paysol.se.xml
@@ -6,7 +6,7 @@ Fetch error: http://secure.paysol.se/ => https://secure.paysol.se/: (60, 'SSL ce
 Disabled by https-everywhere-checker because:
 Fetch error: http://secure.paysol.se/ => https://secure.paysol.se/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
   
 
   
diff --git a/src/chrome/content/rules/Payson.xml b/src/chrome/content/rules/Payson.xml
index a78bdea308c2..29f7c29f5867 100644
--- a/src/chrome/content/rules/Payson.xml
+++ b/src/chrome/content/rules/Payson.xml
@@ -1,18 +1,29 @@
-
-
-	
-	
+
-	
+	404 on HTTPS:
 
-	
+		- test-mobileapi.payson.se
+-->
+
 
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
-	
-	
+	
 
 
diff --git a/src/chrome/content/rules/Paytoll.xml b/src/chrome/content/rules/Paytoll.xml
index 0f532588707a..654e83835de6 100644
--- a/src/chrome/content/rules/Paytoll.xml
+++ b/src/chrome/content/rules/Paytoll.xml
@@ -3,10 +3,10 @@
 Disabled by https-everywhere-checker because:
 Non-2xx HTTP code: http://secure.paytoll.eu/ (200) => https://secure.paytoll.eu/ (403)
 
-	For other Eventim coverage, see Eventim.xml.
+	For other Eventim coverage, see Eventim.com.xml.
 
 -->
-
+
 
 	
 
@@ -16,4 +16,4 @@ Non-2xx HTTP code: http://secure.paytoll.eu/ (200) => https://secure.paytoll.eu/
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Payza.xml b/src/chrome/content/rules/Payza.xml
deleted file mode 100644
index d85025533fea..000000000000
--- a/src/chrome/content/rules/Payza.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Pbsrc.com.xml b/src/chrome/content/rules/Pbsrc.com.xml
index a0f3dd492a6b..f48e4d024c69 100644
--- a/src/chrome/content/rules/Pbsrc.com.xml
+++ b/src/chrome/content/rules/Pbsrc.com.xml
@@ -51,7 +51,7 @@
 
 -->
 
-	
+
 	
 	
 	
@@ -80,7 +80,7 @@
 
 		
 
-	
+
 	
 
diff --git a/src/chrome/content/rules/Pcengines.ch.xml b/src/chrome/content/rules/Pcengines.ch.xml
new file mode 100644
index 000000000000..d16c2602653f
--- /dev/null
+++ b/src/chrome/content/rules/Pcengines.ch.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/PeKwm.org.xml b/src/chrome/content/rules/PeKwm.org.xml
deleted file mode 100644
index df9c32c01d7a..000000000000
--- a/src/chrome/content/rules/PeKwm.org.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Peace_Center_for_the_Performing_Arts.xml b/src/chrome/content/rules/Peace_Center_for_the_Performing_Arts.xml
index 960b66e34d33..69ce2e49efa9 100644
--- a/src/chrome/content/rules/Peace_Center_for_the_Performing_Arts.xml
+++ b/src/chrome/content/rules/Peace_Center_for_the_Performing_Arts.xml
@@ -11,4 +11,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Pearson.xml b/src/chrome/content/rules/Pearson.xml
index f17e778e33fd..a0cf4097a0c8 100644
--- a/src/chrome/content/rules/Pearson.xml
+++ b/src/chrome/content/rules/Pearson.xml
@@ -1,59 +1,42 @@
 
-
-
-	
+
+	
+	
+	
+	
+	
+
+	
 	
-	
-	
-	
-	
-
+		
 
-	
-	
-	
-
-
-	
+	
+	
+	
+	
 
-	
+	
 
-	
-	
+	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Pebble.xml b/src/chrome/content/rules/Pebble.xml
index 805098e0bf4e..3fc0ea27d093 100644
--- a/src/chrome/content/rules/Pebble.xml
+++ b/src/chrome/content/rules/Pebble.xml
@@ -9,7 +9,10 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Peer1.ca.xml b/src/chrome/content/rules/Peer1.ca.xml
deleted file mode 100644
index 0e750238709b..000000000000
--- a/src/chrome/content/rules/Peer1.ca.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/PeerLibrary.org.xml b/src/chrome/content/rules/PeerLibrary.org.xml
index c1dc1ee657bf..841b06c988f0 100644
--- a/src/chrome/content/rules/PeerLibrary.org.xml
+++ b/src/chrome/content/rules/PeerLibrary.org.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.peerlibrary.org/ => https://www.peerlibrary.org/: (51, "
 	* Tumblr
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/PeerTransfer.com.xml b/src/chrome/content/rules/PeerTransfer.com.xml
index 6a42f0408bf8..5c1ef2822ad9 100644
--- a/src/chrome/content/rules/PeerTransfer.com.xml
+++ b/src/chrome/content/rules/PeerTransfer.com.xml
@@ -5,7 +5,7 @@ Non-2xx HTTP code: http://info.peertransfer.com/css/mktLPSupport.css (200) => ht
 Non-2xx HTTP code: http://info.peertransfer.com/rs/857-SYJ-051/images/ptflywirelogo.png (200) => https://na-abm.marketo.com/rs/857-SYJ-051/images/ptflywirelogo.png (403)
 
 	Nonfunctional hosts in *peertransfer.com:
-	
+
 		- info *
 
 	* Marketo
@@ -27,7 +27,7 @@ Non-2xx HTTP code: http://info.peertransfer.com/rs/857-SYJ-051/images/ptflywirel
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Peerio.com.xml b/src/chrome/content/rules/Peerio.com.xml
deleted file mode 100644
index e6814b7d8b87..000000000000
--- a/src/chrome/content/rules/Peerio.com.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Peerius.com-problematic.xml b/src/chrome/content/rules/Peerius.com-problematic.xml
index 67f274da85d2..3fa7d15ba4be 100644
--- a/src/chrome/content/rules/Peerius.com-problematic.xml
+++ b/src/chrome/content/rules/Peerius.com-problematic.xml
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Peerius.com.xml b/src/chrome/content/rules/Peerius.com.xml
index 6906660ed632..d8a587747584 100644
--- a/src/chrome/content/rules/Peerius.com.xml
+++ b/src/chrome/content/rules/Peerius.com.xml
@@ -32,4 +32,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Peertech.org.xml b/src/chrome/content/rules/Peertech.org.xml
index 70add45016e0..6f1e9f61b5ae 100644
--- a/src/chrome/content/rules/Peertech.org.xml
+++ b/src/chrome/content/rules/Peertech.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://peertech.org/ => https://peertech.org/: (28, 'Connection tim
 Fetch error: http://www.peertech.org/ => https://www.peertech.org/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Peff.net.xml b/src/chrome/content/rules/Peff.net.xml
new file mode 100644
index 000000000000..5edb28d58d18
--- /dev/null
+++ b/src/chrome/content/rules/Peff.net.xml
@@ -0,0 +1,16 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Pega.xml b/src/chrome/content/rules/Pega.xml
index 66764abecb8f..942ba7dda9ec 100644
--- a/src/chrome/content/rules/Pega.xml
+++ b/src/chrome/content/rules/Pega.xml
@@ -1,4 +1,9 @@
+
 
 
+  
 
diff --git a/src/chrome/content/rules/Pegaz_Hosting.com.xml b/src/chrome/content/rules/Pegaz_Hosting.com.xml
index f936779c70a7..51ff94745e56 100644
--- a/src/chrome/content/rules/Pegaz_Hosting.com.xml
+++ b/src/chrome/content/rules/Pegaz_Hosting.com.xml
@@ -14,4 +14,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Penango.xml b/src/chrome/content/rules/Penango.xml
deleted file mode 100644
index 46af4649cd7e..000000000000
--- a/src/chrome/content/rules/Penango.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Pendle.gov.uk.xml b/src/chrome/content/rules/Pendle.gov.uk.xml
index 519847af7e1a..ee21c255a077 100644
--- a/src/chrome/content/rules/Pendle.gov.uk.xml
+++ b/src/chrome/content/rules/Pendle.gov.uk.xml
@@ -21,7 +21,7 @@
 		- .www.pendle.gov.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Penfold_Golf.xml b/src/chrome/content/rules/Penfold_Golf.xml
index dda94aa70f45..a45fa1b77455 100644
--- a/src/chrome/content/rules/Penfold_Golf.xml
+++ b/src/chrome/content/rules/Penfold_Golf.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/PengPod.com.xml b/src/chrome/content/rules/PengPod.com.xml
index e4d1441bb367..f0964c952ed4 100644
--- a/src/chrome/content/rules/PengPod.com.xml
+++ b/src/chrome/content/rules/PengPod.com.xml
@@ -8,7 +8,7 @@
 	
 
 
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/PenguinWebHosting.xml b/src/chrome/content/rules/PenguinWebHosting.xml
index 911d89d42b32..9923b619633e 100644
--- a/src/chrome/content/rules/PenguinWebHosting.xml
+++ b/src/chrome/content/rules/PenguinWebHosting.xml
@@ -5,20 +5,17 @@ Fetch error: http://pcicomplianthosting.com/ => https://pcicomplianthosting.com/
 Fetch error: http://penguinwebhosting.com/ => https://www.pcicomplianthosting.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.pcicomplianthosting.com'")
 
 -->
-
+
 
 	
-	
+	
 	
 	
-	
+	
+	
 
 
-	
 
-	
 
 	
 
 
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 		
 		
 	
@@ -81,7 +103,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Pentest_Geek.com.xml b/src/chrome/content/rules/Pentest_Geek.com.xml
index fd19e60ea638..4da345a5d816 100644
--- a/src/chrome/content/rules/Pentest_Geek.com.xml
+++ b/src/chrome/content/rules/Pentest_Geek.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://pentestgeek.com/ => https://pentestgeek.com/: (51, "SSL: no
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Penton_Media.xml b/src/chrome/content/rules/Penton_Media.xml
index f393886c44c6..1244e2f8a984 100644
--- a/src/chrome/content/rules/Penton_Media.xml
+++ b/src/chrome/content/rules/Penton_Media.xml
@@ -1,7 +1,6 @@
 
-
-
-	
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/People.com.xml b/src/chrome/content/rules/People.com.xml
index 03a5dab15b29..445234e205c0 100644
--- a/src/chrome/content/rules/People.com.xml
+++ b/src/chrome/content/rules/People.com.xml
@@ -1,54 +1,14 @@
 
 
-
+	
+	
 	
 	
-	
 
+	
 
diff --git a/src/chrome/content/rules/Peoples_Choice_Awards.xml b/src/chrome/content/rules/Peoples_Choice_Awards.xml
index 1b3b3fb210fc..a3751970a902 100644
--- a/src/chrome/content/rules/Peoples_Choice_Awards.xml
+++ b/src/chrome/content/rules/Peoples_Choice_Awards.xml
@@ -15,7 +15,8 @@
 
 
 	
-	
+	
+	
 		
 
 
diff --git a/src/chrome/content/rules/PepperJam_Exchange.xml b/src/chrome/content/rules/PepperJam_Exchange.xml
index 5148dbf9a21b..dbe04d8f3e6c 100644
--- a/src/chrome/content/rules/PepperJam_Exchange.xml
+++ b/src/chrome/content/rules/PepperJam_Exchange.xml
@@ -15,16 +15,13 @@
 
 
 	
-	
+	
+	
 
 
 	
 
 
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Pepperfish.xml b/src/chrome/content/rules/Pepperfish.xml
index bf29a16daaf2..6f0e321a5f36 100644
--- a/src/chrome/content/rules/Pepperfish.xml
+++ b/src/chrome/content/rules/Pepperfish.xml
@@ -14,11 +14,11 @@ Fetch error: http://secure.pepperfish.net/ => https://secure.pepperfish.net/: (2
 		- (www.)	(400; mismatched, CN: secure.pepperfish.net)
 
 -->
-
+
 
 	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Perceptive-Pixel.xml b/src/chrome/content/rules/Perceptive-Pixel.xml
index a73e9435c5a6..cb99921b190d 100644
--- a/src/chrome/content/rules/Perceptive-Pixel.xml
+++ b/src/chrome/content/rules/Perceptive-Pixel.xml
@@ -3,7 +3,7 @@
 	
 	
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Percona.xml b/src/chrome/content/rules/Percona.xml
index ca783527226e..a991b949bd00 100644
--- a/src/chrome/content/rules/Percona.xml
+++ b/src/chrome/content/rules/Percona.xml
@@ -19,7 +19,7 @@ Fetch error: http://customers.percona.com/ => https://customers.percona.com/: To
 		- www.percona.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Perfect-Privacy.com.xml b/src/chrome/content/rules/Perfect-Privacy.com.xml
deleted file mode 100644
index aa0f6e93638f..000000000000
--- a/src/chrome/content/rules/Perfect-Privacy.com.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Perfect_Audience.xml b/src/chrome/content/rules/Perfect_Audience.xml
index d2246cd288d2..03c9d17e7fa0 100644
--- a/src/chrome/content/rules/Perfect_Audience.xml
+++ b/src/chrome/content/rules/Perfect_Audience.xml
@@ -41,25 +41,12 @@
 	
 	
-	
-
 
 	
 
-
 	
 
-	
-	
-
-		
-
 	
-
-
 
diff --git a/src/chrome/content/rules/Perfect_Market.com-problematic.xml b/src/chrome/content/rules/Perfect_Market.com-problematic.xml
index 9bc8c288b92a..7a655f9c4e6f 100644
--- a/src/chrome/content/rules/Perfect_Market.com-problematic.xml
+++ b/src/chrome/content/rules/Perfect_Market.com-problematic.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Perfect_Market.com.xml b/src/chrome/content/rules/Perfect_Market.com.xml
index 4761752117bb..fd9f304fef60 100644
--- a/src/chrome/content/rules/Perfect_Market.com.xml
+++ b/src/chrome/content/rules/Perfect_Market.com.xml
@@ -21,4 +21,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Perfect_Money.xml b/src/chrome/content/rules/Perfect_Money.xml
index aa32de06d9db..54aa1da94ce3 100644
--- a/src/chrome/content/rules/Perfect_Money.xml
+++ b/src/chrome/content/rules/Perfect_Money.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Perfect_Sense_Digital.xml b/src/chrome/content/rules/Perfect_Sense_Digital.xml
index 48b1bda9c3b9..8fe7ebd2e71c 100644
--- a/src/chrome/content/rules/Perfect_Sense_Digital.xml
+++ b/src/chrome/content/rules/Perfect_Sense_Digital.xml
@@ -19,4 +19,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Performable.com.xml b/src/chrome/content/rules/Performable.com.xml
index adee78c31c49..bd8dd0418c4f 100644
--- a/src/chrome/content/rules/Performable.com.xml
+++ b/src/chrome/content/rules/Performable.com.xml
@@ -13,11 +13,11 @@ Fetch error: http://analytics.performable.com/ => https://analytics.performable.
 	Web bugs.
 
 -->
-
+
 
 	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Performance-Horizon-Group.xml b/src/chrome/content/rules/Performance-Horizon-Group.xml
index de28a84865a4..494ef2335ed7 100644
--- a/src/chrome/content/rules/Performance-Horizon-Group.xml
+++ b/src/chrome/content/rules/Performance-Horizon-Group.xml
@@ -4,18 +4,17 @@
 	
 	
 	
-	
+	
 
 
 	
 
 
-	
 
 	
 	
 
+	
 
diff --git a/src/chrome/content/rules/Performance-PCs.com.xml b/src/chrome/content/rules/Performance-PCs.com.xml
new file mode 100644
index 000000000000..6f6f2fb0b579
--- /dev/null
+++ b/src/chrome/content/rules/Performance-PCs.com.xml
@@ -0,0 +1,18 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Performance_Wheel_and_Tire_Warehouse.xml b/src/chrome/content/rules/Performance_Wheel_and_Tire_Warehouse.xml
index 41f6aabd8d63..e1a050973976 100644
--- a/src/chrome/content/rules/Performance_Wheel_and_Tire_Warehouse.xml
+++ b/src/chrome/content/rules/Performance_Wheel_and_Tire_Warehouse.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://performancewheel.com/ => https://performancewheel.com/: (51, "SSL: no alternative certificate subject name matches target host name 'performancewheel.com'")
 Fetch error: http://www.performancewheel.com/ => https://www.performancewheel.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.performancewheel.com'")
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.performancewheel.com/ => https://www.performancewheel.co
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Perl.org.xml b/src/chrome/content/rules/Perl.org.xml
index ce4316fa5eb3..3dc42b2b7b39 100644
--- a/src/chrome/content/rules/Perl.org.xml
+++ b/src/chrome/content/rules/Perl.org.xml
@@ -6,36 +6,15 @@
 			- st.pimg.net
 
 
-	Problematic domains:
-
-		- ^ ¹
-		- perldoc		(works; mismatched, CN: *.a.ssl.fastly.net)
-		- svn.perl.org		(works, self-signed)
-
-	¹ Refused
-
-
 	Nonfunctional perl.org subdomains:
 
-		- blob *
 		- blogs *
-		- books *
-		- cpan *
-		- cpanratings *
 		- cpansearch	(times out)
-		- dbi *
-		- dev *
-		- perl5.git *
 		- history *
 		- irc		(http reply)
-		- www.irc *
-		- jobs *
-		- learn *
-		- lists *
-		- log		(blogspot)
-		- noc *
 		- pdl *
 		- use *
+		- svn		(times out)
 
 	* Refused
 
@@ -43,22 +22,29 @@
 	Mixed image from www on rt
 
 -->
-
+
 
 	
-	
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 	
 
-
-	
-
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Personal_Data_Ecosystem_Consortium.xml b/src/chrome/content/rules/Personal_Data_Ecosystem_Consortium.xml
deleted file mode 100644
index a6ec77010bc7..000000000000
--- a/src/chrome/content/rules/Personal_Data_Ecosystem_Consortium.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Personal_Democracy_Forum.xml b/src/chrome/content/rules/Personal_Democracy_Forum.xml
index fed94001450f..e1a9d58d652a 100644
--- a/src/chrome/content/rules/Personal_Democracy_Forum.xml
+++ b/src/chrome/content/rules/Personal_Democracy_Forum.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Personalausweisportal.de.xml b/src/chrome/content/rules/Personalausweisportal.de.xml
index e346ea0ef76c..622ef2da77b8 100644
--- a/src/chrome/content/rules/Personalausweisportal.de.xml
+++ b/src/chrome/content/rules/Personalausweisportal.de.xml
@@ -1,7 +1,7 @@
 
   
   
-  
+
   
 
   
diff --git a/src/chrome/content/rules/PersonalityPage.com.xml b/src/chrome/content/rules/PersonalityPage.com.xml
index 2b905b1fcd4e..e8b32ba6fdfb 100644
--- a/src/chrome/content/rules/PersonalityPage.com.xml
+++ b/src/chrome/content/rules/PersonalityPage.com.xml
@@ -1,4 +1,4 @@
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Personforce.xml b/src/chrome/content/rules/Personforce.xml
index f4d783da4a57..dc10e46a62b6 100644
--- a/src/chrome/content/rules/Personforce.xml
+++ b/src/chrome/content/rules/Personforce.xml
@@ -1,7 +1,8 @@
 
 
 	
-	
+	
+	
 
 
 	
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/PetTravel.com.xml b/src/chrome/content/rules/PetTravel.com.xml
new file mode 100644
index 000000000000..92a170e3a630
--- /dev/null
+++ b/src/chrome/content/rules/PetTravel.com.xml
@@ -0,0 +1,7 @@
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Pet_Nanny.xml b/src/chrome/content/rules/Pet_Nanny.xml
index be2e54527cf6..d3df98c6e0b6 100644
--- a/src/chrome/content/rules/Pet_Nanny.xml
+++ b/src/chrome/content/rules/Pet_Nanny.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Petapixel.com.xml b/src/chrome/content/rules/Petapixel.com.xml
new file mode 100644
index 000000000000..d18972b436b4
--- /dev/null
+++ b/src/chrome/content/rules/Petapixel.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Peter_Aba.com.xml b/src/chrome/content/rules/Peter_Aba.com.xml
index 58658f949f26..d139e9016f29 100644
--- a/src/chrome/content/rules/Peter_Aba.com.xml
+++ b/src/chrome/content/rules/Peter_Aba.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://dimebag.peteraba.com/ => https://dimebag.peteraba.com/: (51,
 	www.peteraba.com: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Peterborough.gov.uk.xml b/src/chrome/content/rules/Peterborough.gov.uk.xml
index 78c04958bb64..7dbbc5d28c83 100644
--- a/src/chrome/content/rules/Peterborough.gov.uk.xml
+++ b/src/chrome/content/rules/Peterborough.gov.uk.xml
@@ -62,7 +62,7 @@ Fetch error: http://consult.peterborough.gov.uk/ => https://peterborough.objecti
 		- consult.peterborough.gov.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Petridish-mismatches.xml b/src/chrome/content/rules/Petridish-mismatches.xml
deleted file mode 100644
index 7fae6ee3e806..000000000000
--- a/src/chrome/content/rules/Petridish-mismatches.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Petridish.org.xml b/src/chrome/content/rules/Petridish.org.xml
new file mode 100644
index 000000000000..3e083bbdfa61
--- /dev/null
+++ b/src/chrome/content/rules/Petridish.org.xml
@@ -0,0 +1,14 @@
+
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Petridish.xml b/src/chrome/content/rules/Petridish.xml
deleted file mode 100644
index 5cf2f8750ab0..000000000000
--- a/src/chrome/content/rules/Petridish.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Petstore.com.xml b/src/chrome/content/rules/Petstore.com.xml
index 7434866c22ed..7c5105ed5944 100644
--- a/src/chrome/content/rules/Petstore.com.xml
+++ b/src/chrome/content/rules/Petstore.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.petstore.com/ => https://www.petstore.com/: Too many red
 	^: expired 2013-12-02
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Petteri-Raty.xml b/src/chrome/content/rules/Petteri-Raty.xml
index 686962a5b6c1..fc743fceec88 100644
--- a/src/chrome/content/rules/Petteri-Raty.xml
+++ b/src/chrome/content/rules/Petteri-Raty.xml
@@ -5,7 +5,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/PewDiePie.net.xml b/src/chrome/content/rules/PewDiePie.net.xml
deleted file mode 100644
index 013cdfd7f81f..000000000000
--- a/src/chrome/content/rules/PewDiePie.net.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/PfSense.org.xml b/src/chrome/content/rules/PfSense.org.xml
index f532f54337b5..784fefb8e98e 100644
--- a/src/chrome/content/rules/PfSense.org.xml
+++ b/src/chrome/content/rules/PfSense.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://devwiki.pfsense.org/ => https://devwiki.pfsense.org/: (60, '
 
 	Nonfunctional subdomains:
 
-		- various downloads URLs not listed below 
+		- various downloads URLs not listed below
 
 
 	Fully covered subdomains:
@@ -37,7 +37,7 @@ Fetch error: http://devwiki.pfsense.org/ => https://devwiki.pfsense.org/: (60, '
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Pfefferkoerner.de.xml b/src/chrome/content/rules/Pfefferkoerner.de.xml
index 703c75cf7ee9..5c0ce27f3366 100644
--- a/src/chrome/content/rules/Pfefferkoerner.de.xml
+++ b/src/chrome/content/rules/Pfefferkoerner.de.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.pfefferkoerner.de/ => https://www.pfefferkoerner.de/: (5
 
 	redirects to https://www.ndr.de/fernsehen/sendungen/pfefferkoerner/
 -->
-
+
     
     
 
diff --git a/src/chrome/content/rules/Pfennigparade.de.xml b/src/chrome/content/rules/Pfennigparade.de.xml
new file mode 100644
index 000000000000..676f8634b6cf
--- /dev/null
+++ b/src/chrome/content/rules/Pfennigparade.de.xml
@@ -0,0 +1,8 @@
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Pfennigparade.xml b/src/chrome/content/rules/Pfennigparade.xml
deleted file mode 100644
index f7da08d607b3..000000000000
--- a/src/chrome/content/rules/Pfennigparade.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Pfizer.xml b/src/chrome/content/rules/Pfizer.xml
index 556dcd9f492b..6e6176ad4579 100644
--- a/src/chrome/content/rules/Pfizer.xml
+++ b/src/chrome/content/rules/Pfizer.xml
@@ -3,7 +3,6 @@
 
 		- Pfizer_helpful_answers.com.xml
 		- Pfizer_pro.com.xml
-		- ZYVOXassist.com.xml
 
 
 	Problematic hosts in *pfizer.com:
diff --git a/src/chrome/content/rules/Pfizer_pro.com.xml b/src/chrome/content/rules/Pfizer_pro.com.xml
index fe528dee42e6..7d4b95307307 100644
--- a/src/chrome/content/rules/Pfizer_pro.com.xml
+++ b/src/chrome/content/rules/Pfizer_pro.com.xml
@@ -41,7 +41,7 @@
 					-->
 	
 
-	
+	
 
 
 	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/PhantaFriends.de.xml b/src/chrome/content/rules/PhantaFriends.de.xml
new file mode 100644
index 000000000000..96344ec02dcb
--- /dev/null
+++ b/src/chrome/content/rules/PhantaFriends.de.xml
@@ -0,0 +1,29 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Pheedcontent.com.xml b/src/chrome/content/rules/Pheedcontent.com.xml
index 38a1749bd8a3..9b15fad6f5bf 100644
--- a/src/chrome/content/rules/Pheedcontent.com.xml
+++ b/src/chrome/content/rules/Pheedcontent.com.xml
@@ -25,4 +25,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Pheedo.com.xml b/src/chrome/content/rules/Pheedo.com.xml
index 80b91b62054a..71414666d6c6 100644
--- a/src/chrome/content/rules/Pheedo.com.xml
+++ b/src/chrome/content/rules/Pheedo.com.xml
@@ -38,7 +38,11 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 
 
 	
-
+
 
 	
diff --git a/src/chrome/content/rules/Phillips_Academy_Andover.xml b/src/chrome/content/rules/Phillips_Academy_Andover.xml
index 781cddc5f309..bd6944241faf 100644
--- a/src/chrome/content/rules/Phillips_Academy_Andover.xml
+++ b/src/chrome/content/rules/Phillips_Academy_Andover.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://colwizlive.andover.edu/ => https://colwizlive.andover.edu/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 
 	
 	
@@ -13,30 +13,30 @@ Fetch error: http://colwizlive.andover.edu/ => https://colwizlive.andover.edu/:
 	
 	
 	
-	
-	
+
+
 	
 	
-	
+
 	
 	
-	
+
 	
-	 
+
 	
-	
+
 	
 	
-	
-	
+
+
 	
 	
diff --git a/src/chrome/content/rules/Philosophy-Documentation-Center.xml b/src/chrome/content/rules/Philosophy-Documentation-Center.xml
index 05ff883ea761..dec0104e7ccc 100644
--- a/src/chrome/content/rules/Philosophy-Documentation-Center.xml
+++ b/src/chrome/content/rules/Philosophy-Documentation-Center.xml
@@ -21,7 +21,7 @@ Fetch error: http://secure.pdcnet.org/ => https://secure.pdcnet.org/: (60, 'SSL
 		- www.secure.pdcnet.org
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Philosophy.lgbt.xml b/src/chrome/content/rules/Philosophy.lgbt.xml
deleted file mode 100644
index 18fc5f4f8ccd..000000000000
--- a/src/chrome/content/rules/Philosophy.lgbt.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/PhishTank.xml b/src/chrome/content/rules/PhishTank.xml
index 52e1a6dc7d2a..d52488665c24 100644
--- a/src/chrome/content/rules/PhishTank.xml
+++ b/src/chrome/content/rules/PhishTank.xml
@@ -3,7 +3,7 @@
 
 
 
-   
+
 
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Phoenix.com.xml b/src/chrome/content/rules/Phoenix.com.xml
deleted file mode 100644
index 267ba4b34dc1..000000000000
--- a/src/chrome/content/rules/Phoenix.com.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Phoenix.edu.xml b/src/chrome/content/rules/Phoenix.edu.xml
index cedb1960bade..295ba4e94b2f 100644
--- a/src/chrome/content/rules/Phoenix.edu.xml
+++ b/src/chrome/content/rules/Phoenix.edu.xml
@@ -27,7 +27,14 @@ Fetch error: http://phoenix.edu/ => https://phoenix.edu/: (60, 'SSL certificate
 
 	
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
 	
 
 
@@ -40,16 +47,11 @@ Fetch error: http://phoenix.edu/ => https://phoenix.edu/: (60, 'SSL certificate
 	
 
 
-	
 
-	
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Phone-analytics.com.xml b/src/chrome/content/rules/Phone-analytics.com.xml
index 877f6f174f04..3cf28ee5a319 100644
--- a/src/chrome/content/rules/Phone-analytics.com.xml
+++ b/src/chrome/content/rules/Phone-analytics.com.xml
@@ -10,16 +10,17 @@ Fetch error: http://phone-analytics.com/ => https://ssl.phone-analytics.com/: (2
 		- (www.)	(cert only matches ssl)
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Phone_House.com.xml b/src/chrome/content/rules/Phone_House.com.xml
deleted file mode 100644
index 2d2f22854844..000000000000
--- a/src/chrome/content/rules/Phone_House.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/PhotoBTC.com.xml b/src/chrome/content/rules/PhotoBTC.com.xml
deleted file mode 100644
index 9ef7cc595ce5..000000000000
--- a/src/chrome/content/rules/PhotoBTC.com.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/PhotoBlab.xml b/src/chrome/content/rules/PhotoBlab.xml
index ad5d5bb70355..aa1158a9668d 100644
--- a/src/chrome/content/rules/PhotoBlab.xml
+++ b/src/chrome/content/rules/PhotoBlab.xml
@@ -17,7 +17,7 @@ Fetch error: http://photoblab.com/ => https://photoblab.herokuapp.com/: (6, 'Cou
 		- (www.)photoblab.com	(mismatched, CN: *.herokuapp.com)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/PhotoPea.com.xml b/src/chrome/content/rules/PhotoPea.com.xml
new file mode 100644
index 000000000000..3a9fbc82ef15
--- /dev/null
+++ b/src/chrome/content/rules/PhotoPea.com.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/PhotoShelter.xml b/src/chrome/content/rules/PhotoShelter.xml
index 06c521adaa12..d9e662b95e5b 100644
--- a/src/chrome/content/rules/PhotoShelter.xml
+++ b/src/chrome/content/rules/PhotoShelter.xml
@@ -1,43 +1,33 @@
 
-
 
+
 	
 	
-		
-		
-
+		
+			
 
-	
-
-	
+		
+		
 
-	
-
+		
+		
+		
+		
 
diff --git a/src/chrome/content/rules/PhotoSugar.com.xml b/src/chrome/content/rules/PhotoSugar.com.xml
deleted file mode 100644
index 7e4163ba1471..000000000000
--- a/src/chrome/content/rules/PhotoSugar.com.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Photobucket.xml b/src/chrome/content/rules/Photobucket.xml
index 7b78dfcd3c5e..1a3412963d24 100644
--- a/src/chrome/content/rules/Photobucket.xml
+++ b/src/chrome/content/rules/Photobucket.xml
@@ -19,7 +19,7 @@
 
 		- wac.3B49.edgecastcdn.net
 
-			- static.pbsrc.com	
+			- static.pbsrc.com
 
 		- cdn.photobucket.com.c.footprint.net
 
diff --git a/src/chrome/content/rules/Photographer.io.xml b/src/chrome/content/rules/Photographer.io.xml
index a62dfcfb41d2..e304a4a4ad71 100644
--- a/src/chrome/content/rules/Photographer.io.xml
+++ b/src/chrome/content/rules/Photographer.io.xml
@@ -11,7 +11,7 @@ Fetch error: http://photographer.io/ => https://photographer.io/: (7, 'Failed to
 		- blog	(503, valid cert)
 
 -->
-
+
 
 	
 	
@@ -22,4 +22,4 @@ Fetch error: http://photographer.io/ => https://photographer.io/: (7, 'Failed to
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Photographylife.com.xml b/src/chrome/content/rules/Photographylife.com.xml
new file mode 100644
index 000000000000..e85e8f7b7cad
--- /dev/null
+++ b/src/chrome/content/rules/Photographylife.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/PhotonConsulting.xml b/src/chrome/content/rules/PhotonConsulting.xml
deleted file mode 100644
index 1ae2f270d5e5..000000000000
--- a/src/chrome/content/rules/PhotonConsulting.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-  
-  
-
-  
-
diff --git a/src/chrome/content/rules/Photoprintit.com.xml b/src/chrome/content/rules/Photoprintit.com.xml
index 8edd8b72e369..5d4b5a522256 100644
--- a/src/chrome/content/rules/Photoprintit.com.xml
+++ b/src/chrome/content/rules/Photoprintit.com.xml
@@ -1,15 +1,13 @@
 
 
-	
+	
+	
 
 
 	
-	
-	
+					-->	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Photosynth.xml b/src/chrome/content/rules/Photosynth.xml
index 94160088fee1..da47218da5ee 100644
--- a/src/chrome/content/rules/Photosynth.xml
+++ b/src/chrome/content/rules/Photosynth.xml
@@ -7,7 +7,7 @@ Fetch error: http://cdn.photosynth.net/ => https://cdn.photosynth.net/: (6, 'Cou
 
 	For other Microsoft coverage, see Microsoft.xml.
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/PhpBB.xml b/src/chrome/content/rules/PhpBB.xml
index ba94654d7544..a1f35c90d98e 100644
--- a/src/chrome/content/rules/PhpBB.xml
+++ b/src/chrome/content/rules/PhpBB.xml
@@ -38,14 +38,20 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
 		
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Phparchitect.xml b/src/chrome/content/rules/Phparchitect.xml
index 354beb75c909..9f447711f0ed 100644
--- a/src/chrome/content/rules/Phparchitect.xml
+++ b/src/chrome/content/rules/Phparchitect.xml
@@ -5,7 +5,11 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 		
 
 
@@ -18,4 +22,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Phpclasses.org.xml b/src/chrome/content/rules/Phpclasses.org.xml
index 583a8b6cc5c8..5841140342a2 100644
--- a/src/chrome/content/rules/Phpclasses.org.xml
+++ b/src/chrome/content/rules/Phpclasses.org.xml
@@ -7,7 +7,7 @@ ww.phpclasses.net mismatch-->
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Phpdoc.org.xml b/src/chrome/content/rules/Phpdoc.org.xml
index 63771c6d9daa..48450dc15c42 100644
--- a/src/chrome/content/rules/Phpdoc.org.xml
+++ b/src/chrome/content/rules/Phpdoc.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://qa.phpdoc.org/ => https://qa.phpdoc.org/: (6, 'Could not res
 
 
 -->
-
+
     
     
     
@@ -14,7 +14,7 @@ Fetch error: http://qa.phpdoc.org/ => https://qa.phpdoc.org/: (6, 'Could not res
     
 
     
-	
+
     
 
diff --git a/src/chrome/content/rules/Phygee.com.xml b/src/chrome/content/rules/Phygee.com.xml
deleted file mode 100644
index 771e1cce775e..000000000000
--- a/src/chrome/content/rules/Phygee.com.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/PhysicsOverflow.org.xml b/src/chrome/content/rules/PhysicsOverflow.org.xml
new file mode 100644
index 000000000000..9965abffb4b3
--- /dev/null
+++ b/src/chrome/content/rules/PhysicsOverflow.org.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/PhysicsTravelGuide.com.xml b/src/chrome/content/rules/PhysicsTravelGuide.com.xml
new file mode 100644
index 000000000000..f6f6ee777349
--- /dev/null
+++ b/src/chrome/content/rules/PhysicsTravelGuide.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/PiStar.uk.xml b/src/chrome/content/rules/PiStar.uk.xml
new file mode 100644
index 000000000000..9f476471384b
--- /dev/null
+++ b/src/chrome/content/rules/PiStar.uk.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/PiaoHua.com.xml b/src/chrome/content/rules/PiaoHua.com.xml
new file mode 100644
index 000000000000..68371977ddc7
--- /dev/null
+++ b/src/chrome/content/rules/PiaoHua.com.xml
@@ -0,0 +1,30 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Piatnik.de.xml b/src/chrome/content/rules/Piatnik.de.xml
deleted file mode 100644
index 15de91972ff1..000000000000
--- a/src/chrome/content/rules/Piatnik.de.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Piatt_County_Journal-Republican.xml b/src/chrome/content/rules/Piatt_County_Journal-Republican.xml
index d34fee81ef56..5492b09eb124 100644
--- a/src/chrome/content/rules/Piatt_County_Journal-Republican.xml
+++ b/src/chrome/content/rules/Piatt_County_Journal-Republican.xml
@@ -15,4 +15,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Picatcha.xml b/src/chrome/content/rules/Picatcha.xml
index e4e2c939e2d6..3a782f55e15c 100644
--- a/src/chrome/content/rules/Picatcha.xml
+++ b/src/chrome/content/rules/Picatcha.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.api.picatcha.com/ => https://www.api.picatcha.com/: (60,
 	(www.)api serves captchas on 3rd-party websites.
 
 -->
-
+
 
 	
 	
@@ -20,4 +20,4 @@ Fetch error: http://www.api.picatcha.com/ => https://www.api.picatcha.com/: (60,
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Pickaweb.xml b/src/chrome/content/rules/Pickaweb.xml
index adf6b5e115ef..f434de87f798 100644
--- a/src/chrome/content/rules/Pickaweb.xml
+++ b/src/chrome/content/rules/Pickaweb.xml
@@ -27,4 +27,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/PicoMoney.xml b/src/chrome/content/rules/PicoMoney.xml
index ec9d782a33fa..4bbbc4d06a24 100644
--- a/src/chrome/content/rules/PicoMoney.xml
+++ b/src/chrome/content/rules/PicoMoney.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.picomoney.com/ => https://www.picomoney.com/: (7, 'Faile
 Disabled by https-everywhere-checker because:
 Fetch error: http://picomoney.com/ => https://picomoney.com/: Cycle detected - URL already encountered: http://www.picomoney.com/
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://picomoney.com/ => https://picomoney.com/: Cycle detected - U
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Picsters.tv.xml b/src/chrome/content/rules/Picsters.tv.xml
deleted file mode 100644
index 1d6bea095b2a..000000000000
--- a/src/chrome/content/rules/Picsters.tv.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Pidg.in.xml b/src/chrome/content/rules/Pidg.in.xml
index d10491437113..be13516f4d40 100644
--- a/src/chrome/content/rules/Pidg.in.xml
+++ b/src/chrome/content/rules/Pidg.in.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.pidg.in/ => https://www.pidg.in/: (51, "SSL: no alternat
 	For other Pidgin coverage, see Pidgin.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Pidgin.xml b/src/chrome/content/rules/Pidgin.xml
index 5c17f688e66c..91fc43bebaab 100644
--- a/src/chrome/content/rules/Pidgin.xml
+++ b/src/chrome/content/rules/Pidgin.xml
@@ -1,44 +1,36 @@
-
 
-
+
 
 	
-	
-
-		
-		
-		
-		
-		
-		
-		
-
-
-	
-
-
-	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
 
 
diff --git a/src/chrome/content/rules/Pikabu.ru.xml b/src/chrome/content/rules/Pikabu.ru.xml
index 7275edbcaa63..4d37249fe997 100644
--- a/src/chrome/content/rules/Pikabu.ru.xml
+++ b/src/chrome/content/rules/Pikabu.ru.xml
@@ -1,15 +1,28 @@
 
+	Invalid certificate:
+		tickets.pikabu.ru
+
+	Non-2xx HTTP code:
+		new.pikabu.ru
+		m.pikabu.ru
+		ws.pikabu.ru
 
-
+	Time out:
+		bastion.pikabu.ru
+		bastion1.pikabu.ru
+		bastion2.pikabu.ru
+-->
+
 	
 	
+	
 	
+	
 	
+	
+	
+	
+	
 	
 	
 	
@@ -18,21 +31,29 @@
 	
 	
 	
-	
-	
-	
-	
-	
-	
+	
+	
+	
+	
+	
 	
-	
-	
-	
-	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
+	
+	
 
-	
-
+	
 	
 
diff --git a/src/chrome/content/rules/Pillow.xml b/src/chrome/content/rules/Pillow.xml
index 86ac918c2cff..a74d21bd5227 100644
--- a/src/chrome/content/rules/Pillow.xml
+++ b/src/chrome/content/rules/Pillow.xml
@@ -4,5 +4,5 @@
 		
 
 		
-		
+
 
diff --git a/src/chrome/content/rules/Pimienta.org.xml b/src/chrome/content/rules/Pimienta.org.xml
new file mode 100644
index 000000000000..9562e40f9126
--- /dev/null
+++ b/src/chrome/content/rules/Pimienta.org.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Pinboard.in.xml b/src/chrome/content/rules/Pinboard.in.xml
new file mode 100644
index 000000000000..1349656d03c0
--- /dev/null
+++ b/src/chrome/content/rules/Pinboard.in.xml
@@ -0,0 +1,34 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Pinboard.xml b/src/chrome/content/rules/Pinboard.xml
deleted file mode 100644
index c391b5b0e356..000000000000
--- a/src/chrome/content/rules/Pinboard.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/PinchOfNom.com.xml b/src/chrome/content/rules/PinchOfNom.com.xml
new file mode 100644
index 000000000000..57ba60506b50
--- /dev/null
+++ b/src/chrome/content/rules/PinchOfNom.com.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Pine64.com.xml b/src/chrome/content/rules/Pine64.com.xml
index f1b6f6e617e6..5889cb019653 100644
--- a/src/chrome/content/rules/Pine64.com.xml
+++ b/src/chrome/content/rules/Pine64.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.pine64.com/ => https://www.pine64.com/: (51, "SSL: no al
 	holiday.pine64.com
 -->
 
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/PineappleFund.org.xml b/src/chrome/content/rules/PineappleFund.org.xml
deleted file mode 100644
index f85544346acf..000000000000
--- a/src/chrome/content/rules/PineappleFund.org.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Pinescharter.net.xml b/src/chrome/content/rules/Pinescharter.net.xml
index 441fcffb376a..79bfcd0c9c93 100644
--- a/src/chrome/content/rules/Pinescharter.net.xml
+++ b/src/chrome/content/rules/Pinescharter.net.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ping.pe.xml b/src/chrome/content/rules/Ping.pe.xml
new file mode 100644
index 000000000000..2de5389f0d21
--- /dev/null
+++ b/src/chrome/content/rules/Ping.pe.xml
@@ -0,0 +1,21 @@
+
+	
+	
+		
+
+	
+		
+
+	
+		
+
+	
+		
+
+	
+		
+		
+		
+
+	
+
diff --git a/src/chrome/content/rules/PingOne.xml b/src/chrome/content/rules/PingOne.xml
index db582fcfff3f..a2dc2c45a1e4 100644
--- a/src/chrome/content/rules/PingOne.xml
+++ b/src/chrome/content/rules/PingOne.xml
@@ -20,4 +20,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ping_Identity.xml b/src/chrome/content/rules/Ping_Identity.xml
index 3636f1385071..8db498d9fcd2 100644
--- a/src/chrome/content/rules/Ping_Identity.xml
+++ b/src/chrome/content/rules/Ping_Identity.xml
@@ -13,7 +13,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -22,7 +23,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Pingless.xml b/src/chrome/content/rules/Pingless.xml
index 748ae6f0b513..d9cffd2b8379 100644
--- a/src/chrome/content/rules/Pingless.xml
+++ b/src/chrome/content/rules/Pingless.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/PinkNews.co.uk.xml b/src/chrome/content/rules/PinkNews.co.uk.xml
index 292a00c635c0..f2de26e43da6 100644
--- a/src/chrome/content/rules/PinkNews.co.uk.xml
+++ b/src/chrome/content/rules/PinkNews.co.uk.xml
@@ -16,7 +16,7 @@ Fetch error: http://www.pinknews.co.uk/ => https://www.pinknews.co.uk/: Too many
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Pinocc.io.xml b/src/chrome/content/rules/Pinocc.io.xml
index 192dffe01879..9a2e87020962 100644
--- a/src/chrome/content/rules/Pinocc.io.xml
+++ b/src/chrome/content/rules/Pinocc.io.xml
@@ -23,7 +23,7 @@ Fetch error: http://www.pinocc.io/ => https://pinocc.io/: (60, 'SSL certificate
 		- www.pinocc.io
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Pinsent_Masons.xml b/src/chrome/content/rules/Pinsent_Masons.xml
index aded35bc9f6c..882ca090c288 100644
--- a/src/chrome/content/rules/Pinsent_Masons.xml
+++ b/src/chrome/content/rules/Pinsent_Masons.xml
@@ -4,11 +4,11 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://extranets.pinsentmasons.com/ => https://extranets.pinsentmasons.com/: (7, 'Failed to connect to extranets.pinsentmasons.com port 443: Connection refused')
 
 -->
-
+
 
 	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Pinta-Outlet.fi.xml b/src/chrome/content/rules/Pinta-Outlet.fi.xml
index aa7b1f12a977..942f594f166d 100644
--- a/src/chrome/content/rules/Pinta-Outlet.fi.xml
+++ b/src/chrome/content/rules/Pinta-Outlet.fi.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.pinta-outlet.fi/ => https://pinta-outlet.fi/: (60, 'SSL
 		- www	(cert only matches ^pinta-outlet.fi)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Pipedot.org.xml b/src/chrome/content/rules/Pipedot.org.xml
index a304b46c47f7..41f5f64250fb 100644
--- a/src/chrome/content/rules/Pipedot.org.xml
+++ b/src/chrome/content/rules/Pipedot.org.xml
@@ -18,7 +18,7 @@ Fetch error: http://bugs.pipedot.org/ => https://bugs.pipedot.org/: (60, 'SSL ce
 		- .pipedot.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Piquadro.xml b/src/chrome/content/rules/Piquadro.xml
index 951e7ef4dd92..174507b21fdc 100644
--- a/src/chrome/content/rules/Piquadro.xml
+++ b/src/chrome/content/rules/Piquadro.xml
@@ -1,15 +1,15 @@
 
-	
+
 
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Pirata.cat.xml b/src/chrome/content/rules/Pirata.cat.xml
new file mode 100644
index 000000000000..caddbd5dc166
--- /dev/null
+++ b/src/chrome/content/rules/Pirata.cat.xml
@@ -0,0 +1,36 @@
+
+
+
+	
+
+		
+		
+
+
+	
+	
+	
+
+	
+
+
+	
+
+
diff --git a/src/chrome/content/rules/PirateHD.com.xml b/src/chrome/content/rules/PirateHD.com.xml
index 13668a1da748..07376d142220 100644
--- a/src/chrome/content/rules/PirateHD.com.xml
+++ b/src/chrome/content/rules/PirateHD.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://piratehd.com/ => https://piratehd.com/: (28, 'Connection tim
 		- .piratehd.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/PirateParty.xml b/src/chrome/content/rules/PirateParty.xml
index 993370c81359..aa962bb9701d 100644
--- a/src/chrome/content/rules/PirateParty.xml
+++ b/src/chrome/content/rules/PirateParty.xml
@@ -1,4 +1,18 @@
+
+
+
 
 	
-	
-	
+	
+	
 	
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Pirate_Party.ca.xml b/src/chrome/content/rules/Pirate_Party.ca.xml
deleted file mode 100644
index c53bf421d801..000000000000
--- a/src/chrome/content/rules/Pirate_Party.ca.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Pirate_Party.org.uk.xml b/src/chrome/content/rules/Pirate_Party.org.uk.xml
deleted file mode 100644
index d9eef42a2948..000000000000
--- a/src/chrome/content/rules/Pirate_Party.org.uk.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Piraten-Schwaben.de.xml b/src/chrome/content/rules/Piraten-Schwaben.de.xml
index f6a253cd2194..5b24c66b5009 100644
--- a/src/chrome/content/rules/Piraten-Schwaben.de.xml
+++ b/src/chrome/content/rules/Piraten-Schwaben.de.xml
@@ -20,7 +20,7 @@
 	
 
 
-	
+	
 
 
 	 https://www.piraten-ufr.de/: (60, 'SS
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Piratenpartei-bayern.de.xml b/src/chrome/content/rules/Piratenpartei-bayern.de.xml
index a054e8a06490..4eb46665d5fd 100644
--- a/src/chrome/content/rules/Piratenpartei-bayern.de.xml
+++ b/src/chrome/content/rules/Piratenpartei-bayern.de.xml
@@ -20,7 +20,7 @@
 	
 
 
-	
+	
 
 
 	 https://w.piratenpartei.at/: (51, "SS
 	For other Pirate Party coverage, see PirateParty.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Piratenpartei.de.xml b/src/chrome/content/rules/Piratenpartei.de.xml
index 7184cebfaee5..644db7cb03a7 100644
--- a/src/chrome/content/rules/Piratenpartei.de.xml
+++ b/src/chrome/content/rules/Piratenpartei.de.xml
@@ -40,7 +40,7 @@ Fetch error: http://pshop.piratenpartei.de/ => https://pshop.piratenpartei.de/:
 		- .shop.piratenpartei.de
 
 -->
-
+
 
 	
@@ -69,7 +69,7 @@ Fetch error: http://pshop.piratenpartei.de/ => https://pshop.piratenpartei.de/:
 	
 	
 
-	
+	
 
 
 	 https://www.www.pirati.cz/: (6, 'Could
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Piratpartiet.se.xml b/src/chrome/content/rules/Piratpartiet.se.xml
index 5a9a11fd70bc..d10cb78d9b8b 100644
--- a/src/chrome/content/rules/Piratpartiet.se.xml
+++ b/src/chrome/content/rules/Piratpartiet.se.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.piratpartiet.se/ => https://www.piratpartiet.se/: (60, '
 	For other Pirate Party coverage, see PirateParty.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Piratpartiet.xml b/src/chrome/content/rules/Piratpartiet.xml
index 5f89c2c2e751..04bcceb8457b 100644
--- a/src/chrome/content/rules/Piratpartiet.xml
+++ b/src/chrome/content/rules/Piratpartiet.xml
@@ -6,7 +6,7 @@ Fetch error: http://arbeidskontoret.piratpartiet.no/ => https://arbeidskontoret.
 	Non-functional domain:
 		- piratpartiet.no	(hostname mismatch, CN: *.piratpartiet.no)
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Piriform.xml b/src/chrome/content/rules/Piriform.xml
index 1a5737991308..eb7ed0b38fc8 100644
--- a/src/chrome/content/rules/Piriform.xml
+++ b/src/chrome/content/rules/Piriform.xml
@@ -66,20 +66,24 @@
 
 	
 	
-	
+	
+	
+	
+	
+	
 
 
 	
 
 
 	
+		to="https://s1.pir.fm/" />
 
 	
 
 	
+		to="https://download.piriform.com/" />
 
 	
diff --git a/src/chrome/content/rules/Piscatus.se.xml b/src/chrome/content/rules/Piscatus.se.xml
index 212fcec23403..21025962ecec 100644
--- a/src/chrome/content/rules/Piscatus.se.xml
+++ b/src/chrome/content/rules/Piscatus.se.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://piscatus.se/ => https://piscatus.se/: (7, 'Failed to connect to piscatus.se port 443: Connection refused')
 Fetch error: http://www.piscatus.se/ => https://www.piscatus.se/: (7, 'Failed to connect to www.piscatus.se port 443: Connection refused')
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Piston_Cloud_Computing.xml b/src/chrome/content/rules/Piston_Cloud_Computing.xml
index fe666fa8488e..a91a42904095 100644
--- a/src/chrome/content/rules/Piston_Cloud_Computing.xml
+++ b/src/chrome/content/rules/Piston_Cloud_Computing.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.pistoncloud.com/ => https://www.pistoncloud.com/: (51, "
 	Cert only matches www.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/PittsburghZoo.org.xml b/src/chrome/content/rules/PittsburghZoo.org.xml
index 311af97a9ef5..cc51d1aa3323 100644
--- a/src/chrome/content/rules/PittsburghZoo.org.xml
+++ b/src/chrome/content/rules/PittsburghZoo.org.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.pittsburghzoo.org/ => https://www.pittsburghzoo.org/: (3
 	Invalid certificate:
 		staging.pittsburghzoo.org
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Pittsburgh_Massage_and_Wellness.com.xml b/src/chrome/content/rules/Pittsburgh_Massage_and_Wellness.com.xml
deleted file mode 100644
index 7ba5ab03b910..000000000000
--- a/src/chrome/content/rules/Pittsburgh_Massage_and_Wellness.com.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Pivotal_Labs.xml b/src/chrome/content/rules/Pivotal_Labs.xml
deleted file mode 100644
index c26c3f218d54..000000000000
--- a/src/chrome/content/rules/Pivotal_Labs.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Piwigo.com.xml b/src/chrome/content/rules/Piwigo.com.xml
new file mode 100644
index 000000000000..c6ddfb782f1f
--- /dev/null
+++ b/src/chrome/content/rules/Piwigo.com.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Piwigo.org.xml b/src/chrome/content/rules/Piwigo.org.xml
new file mode 100644
index 000000000000..9acf770ccf4d
--- /dev/null
+++ b/src/chrome/content/rules/Piwigo.org.xml
@@ -0,0 +1,22 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Piwik.org.xml b/src/chrome/content/rules/Piwik.org.xml
index caa14abb6243..49c93b333460 100644
--- a/src/chrome/content/rules/Piwik.org.xml
+++ b/src/chrome/content/rules/Piwik.org.xml
@@ -35,7 +35,7 @@
 
 	
 
-	
+	
 
 
 	
 
 
-	
+	
+	
 
 
 	 https://pixelh8.co.uk/: (51, "SSL: no alternative certificate subject name matches target host name 'pixelh8.co.uk'")
 Fetch error: http://www.pixelh8.co.uk/ => https://www.pixelh8.co.uk/: (51, "SSL: no alternative certificate subject name matches target host name 'www.pixelh8.co.uk'")
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.pixelh8.co.uk/ => https://www.pixelh8.co.uk/: (51, "SSL:
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Pixiq.xml b/src/chrome/content/rules/Pixiq.xml
deleted file mode 100644
index 8416a80b5e8d..000000000000
--- a/src/chrome/content/rules/Pixiq.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Pixlr.com.xml b/src/chrome/content/rules/Pixlr.com.xml
new file mode 100644
index 000000000000..b6a5d51b88ee
--- /dev/null
+++ b/src/chrome/content/rules/Pixlr.com.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Pixlr.xml b/src/chrome/content/rules/Pixlr.xml
deleted file mode 100644
index 4382f81b120e..000000000000
--- a/src/chrome/content/rules/Pixlr.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-	
-	
-
-	
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Pixnet.cc.xml b/src/chrome/content/rules/Pixnet.cc.xml
index 401f70fde9e5..274ae8229f07 100644
--- a/src/chrome/content/rules/Pixnet.cc.xml
+++ b/src/chrome/content/rules/Pixnet.cc.xml
@@ -11,7 +11,7 @@
 -->
 
 
-	
+	
 
 
 	
-
+
 
 	
diff --git a/src/chrome/content/rules/Pizzahut.xml b/src/chrome/content/rules/Pizzahut.xml
index 432a786ed386..466733c3bf33 100644
--- a/src/chrome/content/rules/Pizzahut.xml
+++ b/src/chrome/content/rules/Pizzahut.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://delivery.pizzahut.co.uk/ => https://delivery.pizzahut.co.uk/: (51, "SSL: no alternative certificate subject name matches target host name 'delivery.pizzahut.co.uk'")
 
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/Pkcell.com.xml b/src/chrome/content/rules/Pkcell.com.xml
new file mode 100644
index 000000000000..a26b9dee4107
--- /dev/null
+++ b/src/chrome/content/rules/Pkcell.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Pkr.com.xml b/src/chrome/content/rules/Pkr.com.xml
index cc953e6057c3..0f140681c875 100644
--- a/src/chrome/content/rules/Pkr.com.xml
+++ b/src/chrome/content/rules/Pkr.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://pkr.com/ => https://pkr.com/: (28, 'Connection timed out aft
 Fetch error: http://www.pkr.com/ => https://www.pkr.com/: (7, 'Failed to connect to www.pkr.com port 443: Connection refused')
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Pl.vc.xml b/src/chrome/content/rules/Pl.vc.xml
deleted file mode 100644
index 4f5bfa16934a..000000000000
--- a/src/chrome/content/rules/Pl.vc.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Placehold.it.xml b/src/chrome/content/rules/Placehold.it.xml
deleted file mode 100644
index 2d8822b22266..000000000000
--- a/src/chrome/content/rules/Placehold.it.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Planet-Source-Code.com.xml b/src/chrome/content/rules/Planet-Source-Code.com.xml
deleted file mode 100644
index 98660dcf7090..000000000000
--- a/src/chrome/content/rules/Planet-Source-Code.com.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/PlanetLab.org.xml b/src/chrome/content/rules/PlanetLab.org.xml
index 071903e4f624..f51e889416fa 100644
--- a/src/chrome/content/rules/PlanetLab.org.xml
+++ b/src/chrome/content/rules/PlanetLab.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://svn.planet-lab.org/ => https://svn.planet-lab.org/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/PlanetRomeo.xml b/src/chrome/content/rules/PlanetRomeo.xml
deleted file mode 100644
index aa48fea14b61..000000000000
--- a/src/chrome/content/rules/PlanetRomeo.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-  
-  
-  
-  
-
-  
-
diff --git a/src/chrome/content/rules/Planet_Emu.net.xml b/src/chrome/content/rules/Planet_Emu.net.xml
index e30de2ecac85..53de27588c52 100644
--- a/src/chrome/content/rules/Planet_Emu.net.xml
+++ b/src/chrome/content/rules/Planet_Emu.net.xml
@@ -9,7 +9,8 @@
 
 
 	
-	
+	
+	
 
 
 	
 
 
-	
+	
+	
 
 
 	 https://www.plantcommunity.de/: (5
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/PlantOGram.com.xml b/src/chrome/content/rules/PlantOGram.com.xml
new file mode 100644
index 000000000000..f5593ced285e
--- /dev/null
+++ b/src/chrome/content/rules/PlantOGram.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/PlantSolution.de.xml b/src/chrome/content/rules/PlantSolution.de.xml
deleted file mode 100644
index c47505be2326..000000000000
--- a/src/chrome/content/rules/PlantSolution.de.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-		
-
-
diff --git a/src/chrome/content/rules/Plastic-Bin.com.xml b/src/chrome/content/rules/Plastic-Bin.com.xml
deleted file mode 100644
index 200f467a2cc6..000000000000
--- a/src/chrome/content/rules/Plastic-Bin.com.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Plati.ru.xml b/src/chrome/content/rules/Plati.ru.xml
index 24ed9b7ba346..09311a16500f 100644
--- a/src/chrome/content/rules/Plati.ru.xml
+++ b/src/chrome/content/rules/Plati.ru.xml
@@ -19,4 +19,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/PlayStation.net.xml b/src/chrome/content/rules/PlayStation.net.xml
index 270390626480..de743bf0e854 100644
--- a/src/chrome/content/rules/PlayStation.net.xml
+++ b/src/chrome/content/rules/PlayStation.net.xml
@@ -6,7 +6,7 @@ Fetch error: http://en-support.psm.playstation.net/ => https://en-support.psm.pl
 	For other Sony coverage, see Sony.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/PlayStation.xml b/src/chrome/content/rules/PlayStation.xml
index 942a16580f0d..d13721ab0e61 100644
--- a/src/chrome/content/rules/PlayStation.xml
+++ b/src/chrome/content/rules/PlayStation.xml
@@ -1,10 +1,4 @@
-
 
-
+
 
 	
 	
 	
+	
+	
 	
 
 	
@@ -88,15 +85,15 @@ Fetch error: http://support.us.playstation.com/ => https://support.us.playstatio
 	
 
 	
+	
 	
 	
 	
 	
 
+	
 	
 	
-	
-	
 	
 	
 	
@@ -106,72 +103,16 @@ Fetch error: http://support.us.playstation.com/ => https://support.us.playstatio
 	
 	
-	
-	
 	
-	
-
-		
-		
-		
-		
-
-			
-			
-			
-
-			
-			
 
+	
 
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-
+	
 
 	
 
-	
-
-	
-
-	
-
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-
 	
 
diff --git a/src/chrome/content/rules/Playboy_Store.com.xml b/src/chrome/content/rules/Playboy_Store.com.xml
index 42cfeba0bb39..2e7100bbb5d1 100644
--- a/src/chrome/content/rules/Playboy_Store.com.xml
+++ b/src/chrome/content/rules/Playboy_Store.com.xml
@@ -10,7 +10,7 @@
 		- .www.playboystore.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/PlayerAuctions.com.xml b/src/chrome/content/rules/PlayerAuctions.com.xml
index 79cda96596f0..93fd909aee81 100644
--- a/src/chrome/content/rules/PlayerAuctions.com.xml
+++ b/src/chrome/content/rules/PlayerAuctions.com.xml
@@ -18,7 +18,7 @@ Fetch error: http://kimage.playerauctions.com/ => https://kimage.playerauctions.
 
 		- (s)cdn01		(works; mismatched, CN: edgecastcdn.net)
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Playfire.com.xml b/src/chrome/content/rules/Playfire.com.xml
index 0ebdc985c7c4..e6c3bcd44a3f 100644
--- a/src/chrome/content/rules/Playfire.com.xml
+++ b/src/chrome/content/rules/Playfire.com.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://forums.playfire.com/ => https://www.forums.playfire.com/: (6, 'Could not resolve host: www.forums.playfire.com')
 Fetch error: http://www.forums.playfire.com/ => https://www.forums.playfire.com/: (6, 'Could not resolve host: www.forums.playfire.com')
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/Playgrub.com.xml b/src/chrome/content/rules/Playgrub.com.xml
deleted file mode 100644
index ec92cf50a495..000000000000
--- a/src/chrome/content/rules/Playgrub.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Playwire.xml b/src/chrome/content/rules/Playwire.xml
index b005e9c6ce1f..7acbdd98773d 100644
--- a/src/chrome/content/rules/Playwire.xml
+++ b/src/chrome/content/rules/Playwire.xml
@@ -32,7 +32,7 @@ Fetch error: http://support.playwire.com/ => https://www.playwiresupport.com/: (
 	* Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Please_Ignore.com.xml b/src/chrome/content/rules/Please_Ignore.com.xml
index 49031570205e..099e2a0a234c 100644
--- a/src/chrome/content/rules/Please_Ignore.com.xml
+++ b/src/chrome/content/rules/Please_Ignore.com.xml
@@ -1,7 +1,10 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Pliktverket.se.xml b/src/chrome/content/rules/Pliktverket.se.xml
index 7ccf9d88fe3b..e551b1b15134 100644
--- a/src/chrome/content/rules/Pliktverket.se.xml
+++ b/src/chrome/content/rules/Pliktverket.se.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://pliktverket.se/ => https://pliktverket.se/: (60, 'SSL certificate problem: certificate has expired')
 Fetch error: http://www.pliktverket.se/ => https://www.pliktverket.se/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Plimus.com.xml b/src/chrome/content/rules/Plimus.com.xml
deleted file mode 100644
index 9b55c1ada2aa..000000000000
--- a/src/chrome/content/rules/Plimus.com.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Plone.org.xml b/src/chrome/content/rules/Plone.org.xml
index a3648e795d8b..1ca6b6d78c97 100644
--- a/src/chrome/content/rules/Plone.org.xml
+++ b/src/chrome/content/rules/Plone.org.xml
@@ -26,7 +26,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Plus.xml b/src/chrome/content/rules/Plus.xml
index b040e6cb1d84..4e1ad29ac3a0 100644
--- a/src/chrome/content/rules/Plus.xml
+++ b/src/chrome/content/rules/Plus.xml
@@ -34,7 +34,11 @@ Fetch error: http://plus.net/ => https://www.plus.net/: Redirect for 'http://www
 
 
 	
-	
+	
+	
+	
+	
+	
 
 
 	
@@ -46,7 +50,6 @@ Fetch error: http://plus.net/ => https://www.plus.net/: Redirect for 'http://www
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Plusgirot.se.xml b/src/chrome/content/rules/Plusgirot.se.xml
index 3398abb1ef1c..3c23c875266b 100644
--- a/src/chrome/content/rules/Plusgirot.se.xml
+++ b/src/chrome/content/rules/Plusgirot.se.xml
@@ -5,7 +5,7 @@ Fetch error: http://plusgirot.se/ => https://www.plusgirot.se/: (35, 'error:1407
 Fetch error: http://www.plusgirot.se/ => https://www.plusgirot.se/: (35, 'error:14077458:SSL routines:SSL23_GET_SERVER_HELLO:tlsv1 unrecognized name')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Plymouth-University.xml b/src/chrome/content/rules/Plymouth-University.xml
deleted file mode 100644
index 87f30a279e88..000000000000
--- a/src/chrome/content/rules/Plymouth-University.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-
-		
-		
-
-
-	
-	
-
-	
-	
-
-
-	
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Po.st.xml b/src/chrome/content/rules/Po.st.xml
deleted file mode 100644
index a45c7e001077..000000000000
--- a/src/chrome/content/rules/Po.st.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-	
-
-
-
diff --git a/src/chrome/content/rules/Poal.me.xml b/src/chrome/content/rules/Poal.me.xml
new file mode 100644
index 000000000000..c09b82df572a
--- /dev/null
+++ b/src/chrome/content/rules/Poal.me.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Pobox.xml b/src/chrome/content/rules/Pobox.xml
index 930c08a1e1eb..cf2d68875680 100644
--- a/src/chrome/content/rules/Pobox.xml
+++ b/src/chrome/content/rules/Pobox.xml
@@ -1,19 +1,24 @@
 
+
 
 
 	
-	
 	
 
+	
+	
+	
+	
 
 	
 
-
 	
-
+	
 
diff --git a/src/chrome/content/rules/PocketMatrix.com.xml b/src/chrome/content/rules/PocketMatrix.com.xml
index 98f2032047a2..98f5e5ea1cae 100644
--- a/src/chrome/content/rules/PocketMatrix.com.xml
+++ b/src/chrome/content/rules/PocketMatrix.com.xml
@@ -1,28 +1,15 @@
 
-
-
+
 	
-	
-
-
-	
-	
-
-	
-
-
-	
+	
 
+	 
+	
 
diff --git a/src/chrome/content/rules/Pocketgamer.biz.xml b/src/chrome/content/rules/Pocketgamer.biz.xml
index f8b7cbbe3875..a9756e2b4afb 100644
--- a/src/chrome/content/rules/Pocketgamer.biz.xml
+++ b/src/chrome/content/rules/Pocketgamer.biz.xml
@@ -1,9 +1,9 @@
 
-
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-
diff --git a/src/chrome/content/rules/PoderPDA.xml b/src/chrome/content/rules/PoderPDA.xml
index 63c1575566d9..b5b6856236e6 100644
--- a/src/chrome/content/rules/PoderPDA.xml
+++ b/src/chrome/content/rules/PoderPDA.xml
@@ -5,7 +5,7 @@ Fetch error: http://poderpda.com/ => https://poderpda.com/: Too many redirects w
 Fetch error: http://www.poderpda.com/ => https://www.poderpda.com/: Too many redirects while fetching 'https://www.poderpda.com/'
 
 -->
-
+
 
 	
 	
@@ -17,4 +17,4 @@ Fetch error: http://www.poderpda.com/ => https://www.poderpda.com/: Too many red
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Podhurl.com.xml b/src/chrome/content/rules/Podhurl.com.xml
new file mode 100644
index 000000000000..13184fa32433
--- /dev/null
+++ b/src/chrome/content/rules/Podhurl.com.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Podseed.org.xml b/src/chrome/content/rules/Podseed.org.xml
index 18f0244f1db1..a4ea83a87e67 100644
--- a/src/chrome/content/rules/Podseed.org.xml
+++ b/src/chrome/content/rules/Podseed.org.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.podseed.org/ => https://www.podseed.org/: (60, 'SSL cert
 Fetch error: http://cache.podseed.org/ => https://cache.podseed.org/: (7, 'Failed to connect to cache.podseed.org port 443: No route to host')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Poesie-Francaise.fr.xml b/src/chrome/content/rules/Poesie-Francaise.fr.xml
new file mode 100644
index 000000000000..112fea8a5aa2
--- /dev/null
+++ b/src/chrome/content/rules/Poesie-Francaise.fr.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Pogo.xml b/src/chrome/content/rules/Pogo.xml
index 2f0ab41d8818..8c10e64fb84e 100644
--- a/src/chrome/content/rules/Pogo.xml
+++ b/src/chrome/content/rules/Pogo.xml
@@ -1,13 +1,15 @@
 
   
-  
+  
+  
+  
 
   
 
   
-  
 
 	
 
+  
 
diff --git a/src/chrome/content/rules/Pogoplug.com.xml b/src/chrome/content/rules/Pogoplug.com.xml
deleted file mode 100644
index d749148b7600..000000000000
--- a/src/chrome/content/rules/Pogoplug.com.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-	
-
-		
-
-			
-			
-			
-			
-
-			
-			
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Point.im.xml b/src/chrome/content/rules/Point.im.xml
index 635a3f562e03..f9d8baba4c09 100644
--- a/src/chrome/content/rules/Point.im.xml
+++ b/src/chrome/content/rules/Point.im.xml
@@ -6,7 +6,7 @@
 	
 	
 
-	
 
 
diff --git a/src/chrome/content/rules/Pointroll.xml b/src/chrome/content/rules/Pointroll.xml
index 55c64f6201b3..5c6611fe46a2 100644
--- a/src/chrome/content/rules/Pointroll.xml
+++ b/src/chrome/content/rules/Pointroll.xml
@@ -12,10 +12,16 @@ Fetch error: http://pointroll.com/ => https://pointroll.com/: (7, 'Failed to con
 		- t
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/PokeCommunity.com.xml b/src/chrome/content/rules/PokeCommunity.com.xml
new file mode 100644
index 000000000000..71a73fdc04e2
--- /dev/null
+++ b/src/chrome/content/rules/PokeCommunity.com.xml
@@ -0,0 +1,42 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Pokemon_World_Online.xml b/src/chrome/content/rules/Pokemon_World_Online.xml
index f1187932f9c4..a321c4fe0017 100644
--- a/src/chrome/content/rules/Pokemon_World_Online.xml
+++ b/src/chrome/content/rules/Pokemon_World_Online.xml
@@ -8,7 +8,7 @@ Fetch error: http://www.pokemon-world-online.net/ => https://www.pokemon-world-o
 Disabled by https-everywhere-checker because:
 Fetch error: http://pokemon-world-online.net/ => https://pokemon-world-online.net/: (28, 'Connection timed out after 10001 milliseconds')
 -->
-
+
 
 	
 	
@@ -20,4 +20,4 @@ Fetch error: http://pokemon-world-online.net/ => https://pokemon-world-online.ne
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Poky.xml b/src/chrome/content/rules/Poky.xml
index 6442e18fc094..0a73e979a97e 100644
--- a/src/chrome/content/rules/Poky.xml
+++ b/src/chrome/content/rules/Poky.xml
@@ -8,7 +8,7 @@ Fetch error: http://pokylinux.org/ => https://pokylinux.org/: (51, "SSL: no alte
 	For other Linux Foundation coverage, see LinuxFoundation.xml.
 
 -->
-
+
 
 	
 	
@@ -20,4 +20,4 @@ Fetch error: http://pokylinux.org/ => https://pokylinux.org/: (51, "SSL: no alte
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Police_Mutual.xml b/src/chrome/content/rules/Police_Mutual.xml
index a7d7efaa8c94..fbddbba64d79 100644
--- a/src/chrome/content/rules/Police_Mutual.xml
+++ b/src/chrome/content/rules/Police_Mutual.xml
@@ -6,7 +6,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -18,4 +19,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/PolicyMic.xml b/src/chrome/content/rules/PolicyMic.xml
index 4e944c9510df..8acf7f4322d5 100644
--- a/src/chrome/content/rules/PolicyMic.xml
+++ b/src/chrome/content/rules/PolicyMic.xml
@@ -25,17 +25,19 @@ Fetch error: http://policymic.com/ => https://policymic.com/: (7, 'Failed to con
 	* Secured by us
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
 
 	
@@ -43,4 +45,5 @@ Fetch error: http://policymic.com/ => https://policymic.com/: (7, 'Failed to con
 	
 
+	
 
diff --git a/src/chrome/content/rules/Polisen.se.xml b/src/chrome/content/rules/Polisen.se.xml
new file mode 100644
index 000000000000..d7ca648c65c8
--- /dev/null
+++ b/src/chrome/content/rules/Polisen.se.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Polit.ru.xml b/src/chrome/content/rules/Polit.ru.xml
index e4647e7faedf..39c51dab8e1c 100644
--- a/src/chrome/content/rules/Polit.ru.xml
+++ b/src/chrome/content/rules/Polit.ru.xml
@@ -5,10 +5,10 @@ Fetch error: http://polit.ru/ => https://polit.ru/: (60, 'SSL certificate proble
 Fetch error: http://www.polit.ru/ => https://polit.ru/: (60, 'SSL certificate problem: certificate has expired')
 www. mismatch
 admin. mismatch-->
-
+
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/PolitiFact.xml b/src/chrome/content/rules/PolitiFact.xml
index 801dd7a348a3..a04d11d5c6bf 100644
--- a/src/chrome/content/rules/PolitiFact.xml
+++ b/src/chrome/content/rules/PolitiFact.xml
@@ -1,27 +1,10 @@
-
 
 
-	
-
-
-
-	
-
-
-	
+	
+	
+	
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Political_Wire.com.xml b/src/chrome/content/rules/Political_Wire.com.xml
index ec152c6243e6..013375a9e358 100644
--- a/src/chrome/content/rules/Political_Wire.com.xml
+++ b/src/chrome/content/rules/Political_Wire.com.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Politico.xml b/src/chrome/content/rules/Politico.xml
index 8d9d38cda8b8..93cc3dff1cb1 100644
--- a/src/chrome/content/rules/Politico.xml
+++ b/src/chrome/content/rules/Politico.xml
@@ -1,106 +1,34 @@
 
-
-
-	
-	
-	
-	
-
-		
-		
-		
-
-
-	
+
 	
-	
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
-		
-
-	
-	
-
-	
-		
-
-	
-		
-		
-
-	
-		
-		
-
-	
-		
-		
-
-	
-		
-		
-		
-
-	
-	
-		
-
-	
-	
-
-	 
-
-	 
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/Politiken.dk.xml b/src/chrome/content/rules/Politiken.dk.xml
index 528bb8673c3e..a0ea3405adac 100644
--- a/src/chrome/content/rules/Politiken.dk.xml
+++ b/src/chrome/content/rules/Politiken.dk.xml
@@ -56,7 +56,7 @@ Fetch error: http://www.politiken.dk/ => https://www.politiken.dk/: Too many red
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Polity.co.uk.xml b/src/chrome/content/rules/Polity.co.uk.xml
index b6441601e160..dd8c7fa1ae61 100644
--- a/src/chrome/content/rules/Polity.co.uk.xml
+++ b/src/chrome/content/rules/Polity.co.uk.xml
@@ -8,7 +8,7 @@ Fetch error: http://www.polity.co.uk/ => https://www.polity.co.uk/: (51, "SSL: n
 		- www.polity.co.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Polk.xml b/src/chrome/content/rules/Polk.xml
index e02b57747c4e..6f21575f5f2c 100644
--- a/src/chrome/content/rules/Polk.xml
+++ b/src/chrome/content/rules/Polk.xml
@@ -8,12 +8,12 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://polk.com/ => https://www.polk.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 Fetch error: http://www.polk.com/ => https://www.polk.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 -->
-
+
 
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Poll_Everywhere.com.xml b/src/chrome/content/rules/Poll_Everywhere.com.xml
deleted file mode 100644
index e19647f661e6..000000000000
--- a/src/chrome/content/rules/Poll_Everywhere.com.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Polskie_Radio.pl.xml b/src/chrome/content/rules/Polskie_Radio.pl.xml
index 88838a8a6632..21deba8923ce 100644
--- a/src/chrome/content/rules/Polskie_Radio.pl.xml
+++ b/src/chrome/content/rules/Polskie_Radio.pl.xml
@@ -42,7 +42,7 @@
 			- redaktorext, sklep from $self ˢ
 
 		- Bugs, on:
-		
+
 			- redaktorext from www.facebook.com ˢ
 			- redaktorext from diff3.smartadserver.com ˢ
 
diff --git a/src/chrome/content/rules/PolyBrowser.com.xml b/src/chrome/content/rules/PolyBrowser.com.xml
index 6da27e8fe456..46443fd84a6c 100644
--- a/src/chrome/content/rules/PolyBrowser.com.xml
+++ b/src/chrome/content/rules/PolyBrowser.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.polybrowser.com/ => https://www.polybrowser.com/: (28, '
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/PolyGrant.com.xml b/src/chrome/content/rules/PolyGrant.com.xml
index dd730262e62f..6ae08576d798 100644
--- a/src/chrome/content/rules/PolyGrant.com.xml
+++ b/src/chrome/content/rules/PolyGrant.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.polygrant.com/ => https://www.polygrant.com/: (7, 'Faile
 		- www.polygrant.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/PolyU.edu.hk.xml b/src/chrome/content/rules/PolyU.edu.hk.xml
index d071d089cb46..1ad8e3946716 100644
--- a/src/chrome/content/rules/PolyU.edu.hk.xml
+++ b/src/chrome/content/rules/PolyU.edu.hk.xml
@@ -20,7 +20,7 @@
 
     
-        
+
         
 
     
diff --git a/src/chrome/content/rules/Polygon.com.xml b/src/chrome/content/rules/Polygon.com.xml
index 29f33e003e9b..8b6e399d3614 100644
--- a/src/chrome/content/rules/Polygon.com.xml
+++ b/src/chrome/content/rules/Polygon.com.xml
@@ -1,79 +1,10 @@
 
-
-
-	
-	
+
 
-	
 	
-
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-		
-		
-		
-		
-
-	
-	
-	
-	
-
-	
-	
-
-
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Polytechnic-University-of-Catalonia-mismatches.xml b/src/chrome/content/rules/Polytechnic-University-of-Catalonia-mismatches.xml
deleted file mode 100644
index 46439175b0e8..000000000000
--- a/src/chrome/content/rules/Polytechnic-University-of-Catalonia-mismatches.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Polytechnic-University-of-Catalonia.xml b/src/chrome/content/rules/Polytechnic-University-of-Catalonia.xml
deleted file mode 100644
index f9362b0aa90f..000000000000
--- a/src/chrome/content/rules/Polytechnic-University-of-Catalonia.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-	
-	
-	
-	
-
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Ponderwall.com.xml b/src/chrome/content/rules/Ponderwall.com.xml
index a2d10ffdc63f..7047e71317fe 100644
--- a/src/chrome/content/rules/Ponderwall.com.xml
+++ b/src/chrome/content/rules/Ponderwall.com.xml
@@ -1,6 +1,6 @@
 
 
 
diff --git a/src/chrome/content/rules/Ponemon.xml b/src/chrome/content/rules/Ponemon.xml
index 4faa7c673809..fca9df128ad2 100644
--- a/src/chrome/content/rules/Ponemon.xml
+++ b/src/chrome/content/rules/Ponemon.xml
@@ -8,7 +8,7 @@ Fetch error: http://rim.ponemon.org/ => https://rim.ponemon.org/: (60, 'SSL cert
 		- (www.)	(redirects to rim, CN: rim.ponemon.org)
 
 -->
-
+
 
 	
 
@@ -18,4 +18,4 @@ Fetch error: http://rim.ponemon.org/ => https://rim.ponemon.org/: (60, 'SSL cert
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Pony.fm.xml b/src/chrome/content/rules/Pony.fm.xml
index c5f5d0911854..28ee4ee384fa 100644
--- a/src/chrome/content/rules/Pony.fm.xml
+++ b/src/chrome/content/rules/Pony.fm.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://s.pony.fm/ => https://s.pony.fm/: (51, "SSL: no alternative certificate subject name matches target host name 's.pony.fm'")
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://s.pony.fm/ => https://s.pony.fm/: (51, "SSL: no alternative
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/PonyChat.net.xml b/src/chrome/content/rules/PonyChat.net.xml
deleted file mode 100644
index ba8d566921e1..000000000000
--- a/src/chrome/content/rules/PonyChat.net.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Poo.solutions.xml b/src/chrome/content/rules/Poo.solutions.xml
deleted file mode 100644
index 0cc6d5d0e080..000000000000
--- a/src/chrome/content/rules/Poo.solutions.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Poolp.org.xml b/src/chrome/content/rules/Poolp.org.xml
index 8f2407e28133..f64668dbbfd8 100644
--- a/src/chrome/content/rules/Poolp.org.xml
+++ b/src/chrome/content/rules/Poolp.org.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Poor_Man_Motorsports.xml b/src/chrome/content/rules/Poor_Man_Motorsports.xml
index 3c58a01f00fb..3b089bf2fc32 100644
--- a/src/chrome/content/rules/Poor_Man_Motorsports.xml
+++ b/src/chrome/content/rules/Poor_Man_Motorsports.xml
@@ -4,9 +4,9 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Pop2imap.com.xml b/src/chrome/content/rules/Pop2imap.com.xml
new file mode 100644
index 000000000000..4db03846d0e9
--- /dev/null
+++ b/src/chrome/content/rules/Pop2imap.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/PopAtomic.xml b/src/chrome/content/rules/PopAtomic.xml
deleted file mode 100644
index 589de7462ce6..000000000000
--- a/src/chrome/content/rules/PopAtomic.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/PopCash.net.xml b/src/chrome/content/rules/PopCash.net.xml
index 8112d6a68fe5..c9017e3bac5c 100644
--- a/src/chrome/content/rules/PopCash.net.xml
+++ b/src/chrome/content/rules/PopCash.net.xml
@@ -4,6 +4,6 @@
 	
 
 	
-				  
+
 	
 
diff --git a/src/chrome/content/rules/PopCrunch.com.xml b/src/chrome/content/rules/PopCrunch.com.xml
deleted file mode 100644
index 8094c32832df..000000000000
--- a/src/chrome/content/rules/PopCrunch.com.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/PopSci.com.xml b/src/chrome/content/rules/PopSci.com.xml
index 4009e72af4f3..2f87d2c98eac 100644
--- a/src/chrome/content/rules/PopSci.com.xml
+++ b/src/chrome/content/rules/PopSci.com.xml
@@ -15,6 +15,6 @@
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Pop_Goes_the_Week.xml b/src/chrome/content/rules/Pop_Goes_the_Week.xml
index 417b20516819..b3afe3fa9277 100644
--- a/src/chrome/content/rules/Pop_Goes_the_Week.xml
+++ b/src/chrome/content/rules/Pop_Goes_the_Week.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Popehat.com.xml b/src/chrome/content/rules/Popehat.com.xml
index d2469fd9b701..7356deb7d528 100644
--- a/src/chrome/content/rules/Popehat.com.xml
+++ b/src/chrome/content/rules/Popehat.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://webdisk.popehat.com/ => https://webdisk.popehat.com/: (51, "
 Fetch error: http://webmail.popehat.com/ => https://webmail.popehat.com/: (51, "SSL: no alternative certificate subject name matches target host name 'webmail.popehat.com'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Poppy-Sports.xml b/src/chrome/content/rules/Poppy-Sports.xml
index 2c5ecaed8932..69c3d004e359 100644
--- a/src/chrome/content/rules/Poppy-Sports.xml
+++ b/src/chrome/content/rules/Poppy-Sports.xml
@@ -4,10 +4,10 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://poppysports.com/ => https://www.poppysports.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.poppysports.com'")
 
 -->
-
+
 
 	
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Pops.co.xml b/src/chrome/content/rules/Pops.co.xml
index ed1ece933c2d..b816f48cb79c 100644
--- a/src/chrome/content/rules/Pops.co.xml
+++ b/src/chrome/content/rules/Pops.co.xml
@@ -1,11 +1,11 @@
-
-
-	
-	
-
-	
-
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Popular.com.tw.xml b/src/chrome/content/rules/Popular.com.tw.xml
deleted file mode 100644
index 3140f4b8b2f7..000000000000
--- a/src/chrome/content/rules/Popular.com.tw.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Popular_Photography.xml b/src/chrome/content/rules/Popular_Photography.xml
index 4013d35cd8d5..62ed432387ed 100644
--- a/src/chrome/content/rules/Popular_Photography.xml
+++ b/src/chrome/content/rules/Popular_Photography.xml
@@ -19,7 +19,8 @@ Fetch error: http://popphoto.com/ => https://www.popphoto.com/: Cycle detected -
 
 
 	
-	
+	
+	
 
 
 	
-
-
-	
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/PopupCheck.com.xml b/src/chrome/content/rules/PopupCheck.com.xml
new file mode 100644
index 000000000000..20a574c6ff20
--- /dev/null
+++ b/src/chrome/content/rules/PopupCheck.com.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Porlaputa.com.xml b/src/chrome/content/rules/Porlaputa.com.xml
index 4329d3970370..58ecf9a18a85 100644
--- a/src/chrome/content/rules/Porlaputa.com.xml
+++ b/src/chrome/content/rules/Porlaputa.com.xml
@@ -16,7 +16,7 @@
 
 
 	
-	
+	
 
 
 	
@@ -25,4 +25,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Porn-W.xml b/src/chrome/content/rules/Porn-W.xml
index 0c5704ce6262..3c554e1fe207 100644
--- a/src/chrome/content/rules/Porn-W.xml
+++ b/src/chrome/content/rules/Porn-W.xml
@@ -3,7 +3,7 @@
 	
 	
 	
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Porn_Worms.com-falsemixed.xml b/src/chrome/content/rules/Porn_Worms.com-falsemixed.xml
index 4569e8da19a7..2668f42e9d64 100644
--- a/src/chrome/content/rules/Porn_Worms.com-falsemixed.xml
+++ b/src/chrome/content/rules/Porn_Worms.com-falsemixed.xml
@@ -27,7 +27,7 @@ Fetch error: http://www.pornworms.com/ => https://www.pornworms.com/: (60, 'SSL
 		- www
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Porn_Worms.com.xml b/src/chrome/content/rules/Porn_Worms.com.xml
index ffe9beebd8dc..b994c82c83b0 100644
--- a/src/chrome/content/rules/Porn_Worms.com.xml
+++ b/src/chrome/content/rules/Porn_Worms.com.xml
@@ -62,7 +62,7 @@ Fetch error: http://pornworms.com/ => https://pornworms.com/: (60, 'SSL certific
 			- adserver.juicyads.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Pornwikileaks.com.xml b/src/chrome/content/rules/Pornwikileaks.com.xml
new file mode 100644
index 000000000000..a837539cac19
--- /dev/null
+++ b/src/chrome/content/rules/Pornwikileaks.com.xml
@@ -0,0 +1,10 @@
+
+    
+    
+    
+    
+
+    
+
+    
+
diff --git a/src/chrome/content/rules/PortForward.com.xml b/src/chrome/content/rules/PortForward.com.xml
index 62c1d97b5204..d2e5ce38cdb6 100644
--- a/src/chrome/content/rules/PortForward.com.xml
+++ b/src/chrome/content/rules/PortForward.com.xml
@@ -1,22 +1,26 @@
 
-
+	Timeout:
+		- forum
+		- mail
 
+	Expired:
+		- screenshots
+-->
+
 	
-	
-
-
-	
-	
-
-	
+	
+	
+	
 
+	
 
diff --git a/src/chrome/content/rules/PortableApps.com.xml b/src/chrome/content/rules/PortableApps.com.xml
index a806da544298..af71b8eb529e 100644
--- a/src/chrome/content/rules/PortableApps.com.xml
+++ b/src/chrome/content/rules/PortableApps.com.xml
@@ -1,7 +1,16 @@
+
+
 
 	
 	
 	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Portadi.com.xml b/src/chrome/content/rules/Portadi.com.xml
deleted file mode 100644
index 5b93cd5464ac..000000000000
--- a/src/chrome/content/rules/Portadi.com.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Portland_Mercury.com.xml b/src/chrome/content/rules/Portland_Mercury.com.xml
index 8b8ca2a464f4..80fa471221e2 100644
--- a/src/chrome/content/rules/Portland_Mercury.com.xml
+++ b/src/chrome/content/rules/Portland_Mercury.com.xml
@@ -1,6 +1,17 @@
+
 
 
 
 	
+  
 	
-	
-	
+	
+	
 	
-	
-		
-		
-		
-
 
 	
 
diff --git a/src/chrome/content/rules/Portland_State_University-falsemixed.xml b/src/chrome/content/rules/Portland_State_University-falsemixed.xml
deleted file mode 100644
index 13a9070fcee7..000000000000
--- a/src/chrome/content/rules/Portland_State_University-falsemixed.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-	
-	
-	
-		
-		
- 		
-		
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Portland_State_University.xml b/src/chrome/content/rules/Portland_State_University.xml
index db0dadfcd841..c3272b0abb62 100644
--- a/src/chrome/content/rules/Portland_State_University.xml
+++ b/src/chrome/content/rules/Portland_State_University.xml
@@ -1,143 +1,51 @@
 
 
-
-	
-	
-		
-		
-		
-		
-		
-		
-		
-
-
-	
-	
-	
-	
-	
-
-
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-
\ No newline at end of file
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/Porton_CV.gov.cv.xml b/src/chrome/content/rules/Porton_CV.gov.cv.xml
index 82dd2368905a..ff2ea72a5675 100644
--- a/src/chrome/content/rules/Porton_CV.gov.cv.xml
+++ b/src/chrome/content/rules/Porton_CV.gov.cv.xml
@@ -6,7 +6,7 @@ Fetch error: http://portoncv.gov.cv/ => https://portoncv.gov.cv/: (28, 'Connecti
 	www doesn't exist.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Portsmouth.gov.uk.xml b/src/chrome/content/rules/Portsmouth.gov.uk.xml
index 89a4f7493145..e33666500893 100644
--- a/src/chrome/content/rules/Portsmouth.gov.uk.xml
+++ b/src/chrome/content/rules/Portsmouth.gov.uk.xml
@@ -1,4 +1,14 @@
+
 
 
 	
 	
 	
-	
-	
-	
-	
-	
-	
-	
-	
+	
+	
+	
+	
+	
 	
-	
+	
 	
 	
 
-	
-
-	
-
-	
 
diff --git a/src/chrome/content/rules/PoshLiving.xml b/src/chrome/content/rules/PoshLiving.xml
deleted file mode 100644
index 591bef39513a..000000000000
--- a/src/chrome/content/rules/PoshLiving.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Positive-Software.xml b/src/chrome/content/rules/Positive-Software.xml
index e06a105b7c67..c568decbcba1 100644
--- a/src/chrome/content/rules/Positive-Software.xml
+++ b/src/chrome/content/rules/Positive-Software.xml
@@ -11,7 +11,7 @@ Fetch error: http://license.psoft.net/ => https://license.psoft.net/: (60, 'SSL
 	(www.)?psoft.net: Refused
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/PositiveSSL.xml b/src/chrome/content/rules/PositiveSSL.xml
index f50fbd6da0be..915656e38a98 100644
--- a/src/chrome/content/rules/PositiveSSL.xml
+++ b/src/chrome/content/rules/PositiveSSL.xml
@@ -8,7 +8,7 @@
 				-->
  
  
- 
+
 	
 
diff --git a/src/chrome/content/rules/Post.at.xml b/src/chrome/content/rules/Post.at.xml
index c6a08ef8bc8f..689a8113d290 100644
--- a/src/chrome/content/rules/Post.at.xml
+++ b/src/chrome/content/rules/Post.at.xml
@@ -19,7 +19,6 @@
 	
 	
 	
-	
 	
 
 	
diff --git a/src/chrome/content/rules/Post.ch.xml b/src/chrome/content/rules/Post.ch.xml
index a58e6ff49e35..712b7b815b8f 100644
--- a/src/chrome/content/rules/Post.ch.xml
+++ b/src/chrome/content/rules/Post.ch.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.mypostbusiness.ch/ => https://www.mypostbusiness.ch/: (6
 	* Refused
 
 -->
-
+
     
     
     
@@ -30,8 +30,6 @@ Fetch error: http://www.mypostbusiness.ch/ => https://www.mypostbusiness.ch/: (6
     
     
     
-    
-    
     
     
     
@@ -41,7 +39,6 @@ Fetch error: http://www.mypostbusiness.ch/ => https://www.mypostbusiness.ch/: (6
     
     
     
-    
     
     
 
diff --git a/src/chrome/content/rules/PostImage.xml b/src/chrome/content/rules/PostImage.xml
index 283e7e629e33..725b2e1580c4 100644
--- a/src/chrome/content/rules/PostImage.xml
+++ b/src/chrome/content/rules/PostImage.xml
@@ -1,7 +1,5 @@
 
-	
-	
-
+	
 	
 	
 	
@@ -38,61 +36,14 @@
 	
 	
 
+	
 	
 	
 
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
+	
 	
 	
 	
-	
 	
 	
 	
@@ -129,11 +80,11 @@
 	
 	
 
-	
-	
+	
+	
+	
 
 	
 
-	
 	
 
diff --git a/src/chrome/content/rules/PostPoints_Rewards.com.xml b/src/chrome/content/rules/PostPoints_Rewards.com.xml
deleted file mode 100644
index 3111228f547c..000000000000
--- a/src/chrome/content/rules/PostPoints_Rewards.com.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Posta.sk.xml b/src/chrome/content/rules/Posta.sk.xml
new file mode 100644
index 000000000000..9a9062587c5b
--- /dev/null
+++ b/src/chrome/content/rules/Posta.sk.xml
@@ -0,0 +1,30 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Postal_Heritage.org.uk.xml b/src/chrome/content/rules/Postal_Heritage.org.uk.xml
index 53b1971170a2..1b2bc046f062 100644
--- a/src/chrome/content/rules/Postal_Heritage.org.uk.xml
+++ b/src/chrome/content/rules/Postal_Heritage.org.uk.xml
@@ -6,7 +6,7 @@ Fetch error: http://assets1.postalheritage.org.uk/ => https://assets1.postalheri
 	At least some pages redirect to http.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Poste-Impresa.it.xml b/src/chrome/content/rules/Poste-Impresa.it.xml
deleted file mode 100644
index 4b0c17e598d8..000000000000
--- a/src/chrome/content/rules/Poste-Impresa.it.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Poste.it.xml b/src/chrome/content/rules/Poste.it.xml
index 266b59956f7e..b000f8a3ddef 100644
--- a/src/chrome/content/rules/Poste.it.xml
+++ b/src/chrome/content/rules/Poste.it.xml
@@ -12,10 +12,8 @@ Fetch error: http://myposteimpresa.poste.it/ => https://myposteimpresa.poste.it/
 		- Kipoint.it.xml
 		- PI_CERT.it.xml
 		- Posta-Online.it.xml
-		- Poste-Impresa.it.xml
 		- PosteShop.it.xml
 		- Postel.it.xml
-		- Risparmio_Postale.it.xml
 		- SDA.it.xml
 
 
@@ -42,7 +40,7 @@ Fetch error: http://myposteimpresa.poste.it/ => https://myposteimpresa.poste.it/
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/PosteShop.it.xml b/src/chrome/content/rules/PosteShop.it.xml
index 84d153dcbf9a..0ae2070eaa55 100644
--- a/src/chrome/content/rules/PosteShop.it.xml
+++ b/src/chrome/content/rules/PosteShop.it.xml
@@ -10,7 +10,7 @@ Fetch error: http://posteshop.it/ => https://www.posteshop.it/: (6, 'Could not r
 	^posteshop.it: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Posteo.xml b/src/chrome/content/rules/Posteo.xml
deleted file mode 100644
index 0fa03ab22c69..000000000000
--- a/src/chrome/content/rules/Posteo.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-    
-    
-    
-    
-    
-    
-    
-
-    
-
-    
-
diff --git a/src/chrome/content/rules/PostgreSQL-self-signed.xml b/src/chrome/content/rules/PostgreSQL-self-signed.xml
deleted file mode 100644
index bac81b5886e0..000000000000
--- a/src/chrome/content/rules/PostgreSQL-self-signed.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/PostgreSQL.xml b/src/chrome/content/rules/PostgreSQL.xml
deleted file mode 100644
index 9ca7a3da94e7..000000000000
--- a/src/chrome/content/rules/PostgreSQL.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-
-
-	
-	
-	
-	
-
-
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Postgresql.eu.xml b/src/chrome/content/rules/Postgresql.eu.xml
new file mode 100644
index 000000000000..7ba6685c29f2
--- /dev/null
+++ b/src/chrome/content/rules/Postgresql.eu.xml
@@ -0,0 +1,9 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Postgresql.fr.xml b/src/chrome/content/rules/Postgresql.fr.xml
new file mode 100644
index 000000000000..f78230527fbd
--- /dev/null
+++ b/src/chrome/content/rules/Postgresql.fr.xml
@@ -0,0 +1,23 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Postgresql.org.xml b/src/chrome/content/rules/Postgresql.org.xml
new file mode 100644
index 000000000000..e9380378d289
--- /dev/null
+++ b/src/chrome/content/rules/Postgresql.org.xml
@@ -0,0 +1,52 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+	
+	
+
+
+	
+	
+	
+
+
+	
+
+
diff --git a/src/chrome/content/rules/Postgresql.us.xml b/src/chrome/content/rules/Postgresql.us.xml
new file mode 100644
index 000000000000..d64d40b119e9
--- /dev/null
+++ b/src/chrome/content/rules/Postgresql.us.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Posthaven.com-problematic.xml b/src/chrome/content/rules/Posthaven.com-problematic.xml
deleted file mode 100644
index a4bd396ed943..000000000000
--- a/src/chrome/content/rules/Posthaven.com-problematic.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-		
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Posthaven.com.xml b/src/chrome/content/rules/Posthaven.com.xml
index cf93fb49a1da..0b1ad7e68502 100644
--- a/src/chrome/content/rules/Posthaven.com.xml
+++ b/src/chrome/content/rules/Posthaven.com.xml
@@ -1,31 +1,20 @@
 
-
 
+
 	
-	
-
+	
+		
+		
+		
+		
 
 	
 
-
-	
-
+	
+	
+	
 
diff --git a/src/chrome/content/rules/Postini.xml b/src/chrome/content/rules/Postini.xml
deleted file mode 100644
index 192597dc7cf8..000000000000
--- a/src/chrome/content/rules/Postini.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Postlapsaria.xml b/src/chrome/content/rules/Postlapsaria.xml
index d23cfd0b698e..6b42d7148e45 100644
--- a/src/chrome/content/rules/Postlapsaria.xml
+++ b/src/chrome/content/rules/Postlapsaria.xml
@@ -15,4 +15,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Postnewsads.com.xml b/src/chrome/content/rules/Postnewsads.com.xml
index f7d48a9fd0a5..2f2da0375b84 100644
--- a/src/chrome/content/rules/Postnewsads.com.xml
+++ b/src/chrome/content/rules/Postnewsads.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://www.postnewsads.com/ => https://postnewsads.com/: (35, 'Unkn
 	www.postnewsads.com: 404
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Postscapes.com.xml b/src/chrome/content/rules/Postscapes.com.xml
index dd42653a9720..8197e998c6de 100644
--- a/src/chrome/content/rules/Postscapes.com.xml
+++ b/src/chrome/content/rules/Postscapes.com.xml
@@ -6,7 +6,7 @@
 
 	Time out:
 		about.postscapes.com
-	
+
 	No working URL known:
 		clips.postscapes.com
 		iotawards.postscapes.com
diff --git a/src/chrome/content/rules/Potager.org.xml b/src/chrome/content/rules/Potager.org.xml
index 0a25dc1cbeb6..a45711e0b72c 100644
--- a/src/chrome/content/rules/Potager.org.xml
+++ b/src/chrome/content/rules/Potager.org.xml
@@ -1,44 +1,28 @@
 
-
-
-	
-	
-	
-	
+
 	
-	
-	
-	
-
-
-	
-
-
-	
-
-	
-
-	
-
-	
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
 
diff --git a/src/chrome/content/rules/PowNed.xml b/src/chrome/content/rules/PowNed.xml
index f50f3177052c..a3e32ed12063 100644
--- a/src/chrome/content/rules/PowNed.xml
+++ b/src/chrome/content/rules/PowNed.xml
@@ -6,7 +6,7 @@ Fetch error: http://registratie.powned.tv/ => https://registratie.powned.tv/: (2
 	!functional:
 		- (www.)powned.tv
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/PowWeb.xml b/src/chrome/content/rules/PowWeb.xml
index a9039d6ee712..5be795d29092 100644
--- a/src/chrome/content/rules/PowWeb.xml
+++ b/src/chrome/content/rules/PowWeb.xml
@@ -1,13 +1,16 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Powells.com.xml b/src/chrome/content/rules/Powells.com.xml
index 3fa70e9ff0d8..3e9c07c0a4cb 100644
--- a/src/chrome/content/rules/Powells.com.xml
+++ b/src/chrome/content/rules/Powells.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://powells.com/ => https://www.powells.com/: Too many redirects while fetching 'https://www.powells.com/'
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/PowerDNS.com.xml b/src/chrome/content/rules/PowerDNS.com.xml
index 45c2472bc9bf..36d9bf0f1f47 100644
--- a/src/chrome/content/rules/PowerDNS.com.xml
+++ b/src/chrome/content/rules/PowerDNS.com.xml
@@ -1,21 +1,28 @@
-
 
-
+
 
 	
+	
+	
+	
 	
+	
 	
-	
-	
-	
+	
+	
+	
+	
+	
 
 
-	
+	
 
 
 	 https://app.powerpay.biz/: (56, 'OpenSSL SSL_read: SSL_ERROR_SYSCALL, errno 104')
+Fetch error: http://merchantcenter.powerpay.biz/ => https://merchantcenter.powerpay.biz/: (56, 'OpenSSL SSL_read: SSL_ERROR_SYSCALL, errno 104')
+
 	Other PowerPay rulesets:
 
-		- E-onlinedata.com.xml
 
 
 	(www.): 404; mismatched, CN: www.e-onlinedata.com
@@ -9,8 +14,8 @@
 -->
 
 
-	
-	
+	
+	
 	
 
 
diff --git a/src/chrome/content/rules/PowerTech.no-problematic.xml b/src/chrome/content/rules/PowerTech.no-problematic.xml
index e06985641c32..66ded7654e63 100644
--- a/src/chrome/content/rules/PowerTech.no-problematic.xml
+++ b/src/chrome/content/rules/PowerTech.no-problematic.xml
@@ -2,7 +2,7 @@
 	For rules that are on by default, see PowerTech.no.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/PowerTech.no.xml b/src/chrome/content/rules/PowerTech.no.xml
deleted file mode 100644
index 30cfdea2a2cb..000000000000
--- a/src/chrome/content/rules/PowerTech.no.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Power_Speaking.com.xml b/src/chrome/content/rules/Power_Speaking.com.xml
deleted file mode 100644
index 67709f9cd006..000000000000
--- a/src/chrome/content/rules/Power_Speaking.com.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Power_to_the_Pooch.xml b/src/chrome/content/rules/Power_to_the_Pooch.xml
index 7a09822725cf..6fb0ac8c8179 100644
--- a/src/chrome/content/rules/Power_to_the_Pooch.xml
+++ b/src/chrome/content/rules/Power_to_the_Pooch.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.powertothepooch.com/ => https://www.powertothepooch.com/
 Disabled by https-everywhere-checker because:
 Fetch error: http://powertothepooch.com/ => https://powertothepooch.com/: (28, 'Connection timed out after 10001 milliseconds')
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://powertothepooch.com/ => https://powertothepooch.com/: (28, '
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Powered_by_Paquin.xml b/src/chrome/content/rules/Powered_by_Paquin.xml
index 3e9337695b2a..71e18aa349ed 100644
--- a/src/chrome/content/rules/Powered_by_Paquin.xml
+++ b/src/chrome/content/rules/Powered_by_Paquin.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.poweredbypaquin.com/ => https://www.poweredbypaquin.com/
 Disabled by https-everywhere-checker because:
 Fetch error: http://poweredbypaquin.com/ => https://poweredbypaquin.com/: (28, 'Connection timed out after 10000 milliseconds')
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://poweredbypaquin.com/ => https://poweredbypaquin.com/: (28, '
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Powerhosting.dk.xml b/src/chrome/content/rules/Powerhosting.dk.xml
index 650eb3dfed5e..5b69b2c57957 100644
--- a/src/chrome/content/rules/Powerhosting.dk.xml
+++ b/src/chrome/content/rules/Powerhosting.dk.xml
@@ -20,7 +20,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Powernotebooks.com.xml b/src/chrome/content/rules/Powernotebooks.com.xml
index 1e80eed6a9ca..103a2482d52d 100644
--- a/src/chrome/content/rules/Powernotebooks.com.xml
+++ b/src/chrome/content/rules/Powernotebooks.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://powernotebooks.com/ => https://powernotebooks.com/: (60, 'SS
 Fetch error: http://www.powernotebooks.com/ => https://www.powernotebooks.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Poynton.ca.xml b/src/chrome/content/rules/Poynton.ca.xml
new file mode 100644
index 000000000000..c0f224f5049c
--- /dev/null
+++ b/src/chrome/content/rules/Poynton.ca.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/PracticeBusiness.co.uk.xml b/src/chrome/content/rules/PracticeBusiness.co.uk.xml
new file mode 100644
index 000000000000..e32e3ee2d57a
--- /dev/null
+++ b/src/chrome/content/rules/PracticeBusiness.co.uk.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/PragmaticMarketing.com.xml b/src/chrome/content/rules/PragmaticMarketing.com.xml
new file mode 100644
index 000000000000..4cccd8f55ec8
--- /dev/null
+++ b/src/chrome/content/rules/PragmaticMarketing.com.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Pragmatic_Marketing.com.xml b/src/chrome/content/rules/Pragmatic_Marketing.com.xml
deleted file mode 100644
index 94133f72923b..000000000000
--- a/src/chrome/content/rules/Pragmatic_Marketing.com.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-	
-	
-		
-		
-
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Pragmatic_Studio.com.xml b/src/chrome/content/rules/Pragmatic_Studio.com.xml
index 59334f7875bb..0e5d9122bcbf 100644
--- a/src/chrome/content/rules/Pragmatic_Studio.com.xml
+++ b/src/chrome/content/rules/Pragmatic_Studio.com.xml
@@ -16,7 +16,7 @@ Fetch error: http://alumni.pragmaticstudio.com/ => https://alumni.pragmaticstudi
 		- online
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Pravduh.com.xml b/src/chrome/content/rules/Pravduh.com.xml
new file mode 100644
index 000000000000..8dc0872091fa
--- /dev/null
+++ b/src/chrome/content/rules/Pravduh.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/PravyDiplom.cz.xml b/src/chrome/content/rules/PravyDiplom.cz.xml
index 0fe773e88f04..544c09ea99bb 100644
--- a/src/chrome/content/rules/PravyDiplom.cz.xml
+++ b/src/chrome/content/rules/PravyDiplom.cz.xml
@@ -11,7 +11,6 @@
 	
 	
 
-	
 
 	
 	
diff --git a/src/chrome/content/rules/PrayerTimes.date.xml b/src/chrome/content/rules/PrayerTimes.date.xml
new file mode 100644
index 000000000000..5d04051b9438
--- /dev/null
+++ b/src/chrome/content/rules/PrayerTimes.date.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/PreCharge.net.xml b/src/chrome/content/rules/PreCharge.net.xml
index 6ef0b04e3f95..0149b52efdf2 100644
--- a/src/chrome/content/rules/PreCharge.net.xml
+++ b/src/chrome/content/rules/PreCharge.net.xml
@@ -36,7 +36,8 @@
 -->
 
 
-	
+	
+	
 
 
 	
-
+
 
 	
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Prediction.IO.xml b/src/chrome/content/rules/Prediction.IO.xml
index 1ba7eb3ca47d..8fd11abd9f7c 100644
--- a/src/chrome/content/rules/Prediction.IO.xml
+++ b/src/chrome/content/rules/Prediction.IO.xml
@@ -46,7 +46,7 @@ Fetch error: http://static.prediction.io/ => https://static.prediction.io/: (6,
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Preferred_Reservations.xml b/src/chrome/content/rules/Preferred_Reservations.xml
index 340753aa2144..419a974ca6dd 100644
--- a/src/chrome/content/rules/Preferred_Reservations.xml
+++ b/src/chrome/content/rules/Preferred_Reservations.xml
@@ -8,7 +8,7 @@ Fetch error: http://vr.preferred-reservations.com/ => https://vr.preferred-reser
 		- www		(works; mismatched, CN: vr.preferred-reservations.com)
 
 -->
-
+
 
 	
 
@@ -18,4 +18,4 @@ Fetch error: http://vr.preferred-reservations.com/ => https://vr.preferred-reser
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/PremierLiga.ru.xml b/src/chrome/content/rules/PremierLiga.ru.xml
new file mode 100644
index 000000000000..4d7e8efec328
--- /dev/null
+++ b/src/chrome/content/rules/PremierLiga.ru.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/PressDisplay.com.xml b/src/chrome/content/rules/PressDisplay.com.xml
new file mode 100644
index 000000000000..1f79552296b6
--- /dev/null
+++ b/src/chrome/content/rules/PressDisplay.com.xml
@@ -0,0 +1,26 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/PressLabs_SSL.xml b/src/chrome/content/rules/PressLabs_SSL.xml
index b8f1b9434f29..5a49ab6782c7 100644
--- a/src/chrome/content/rules/PressLabs_SSL.xml
+++ b/src/chrome/content/rules/PressLabs_SSL.xml
@@ -9,7 +9,7 @@ Fetch error: http://plssl.com/ => https://plssl.com/: (7, 'Failed to connect to
 	Clients have unique subdomains.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/PressPage.com.xml b/src/chrome/content/rules/PressPage.com.xml
index c7097b543179..ac036246ed2e 100644
--- a/src/chrome/content/rules/PressPage.com.xml
+++ b/src/chrome/content/rules/PressPage.com.xml
@@ -19,7 +19,7 @@ Fetch error: http://client.presspage.com/ => https://client.presspage.com/: (60,
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/PressPlay.co.xml b/src/chrome/content/rules/PressPlay.co.xml
new file mode 100644
index 000000000000..3978cce52733
--- /dev/null
+++ b/src/chrome/content/rules/PressPlay.co.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/PressPlus.xml b/src/chrome/content/rules/PressPlus.xml
index b782e8813c53..b9abcb52ae72 100644
--- a/src/chrome/content/rules/PressPlus.xml
+++ b/src/chrome/content/rules/PressPlus.xml
@@ -1,15 +1,12 @@
 
-
+
 
 	
-	
-	
+	
 	
 
-
-	
-	
-
-
-	
-
-	
-
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/PressReader.com.xml b/src/chrome/content/rules/PressReader.com.xml
index 626f4fc36203..6bf655417fe5 100644
--- a/src/chrome/content/rules/PressReader.com.xml
+++ b/src/chrome/content/rules/PressReader.com.xml
@@ -33,7 +33,7 @@ Fetch error: http://cache3-res.pressreader.com/ => https://cache3-res.pressreade
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Pressable.com.xml b/src/chrome/content/rules/Pressable.com.xml
index 257f6a1f0480..aa146713efb6 100644
--- a/src/chrome/content/rules/Pressable.com.xml
+++ b/src/chrome/content/rules/Pressable.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://static.pressable.com/ => https://static.pressable.com/: (6,
 		- help.pressable.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Presseportal.de.xml b/src/chrome/content/rules/Presseportal.de.xml
new file mode 100644
index 000000000000..9bd2bbc7ca97
--- /dev/null
+++ b/src/chrome/content/rules/Presseportal.de.xml
@@ -0,0 +1,30 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Pressflex.xml b/src/chrome/content/rules/Pressflex.xml
index d403db763b3d..f11ec7727bc8 100644
--- a/src/chrome/content/rules/Pressflex.xml
+++ b/src/chrome/content/rules/Pressflex.xml
@@ -18,10 +18,11 @@ Fetch error: http://blogads.com/ => https://web.blogads.com/: (60, 'SSL certific
 		- adserver.pressflex.com	(self-signed; 404)
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Pretty-in-Cash.xml b/src/chrome/content/rules/Pretty-in-Cash.xml
index b0f456536dca..e8117056dbce 100644
--- a/src/chrome/content/rules/Pretty-in-Cash.xml
+++ b/src/chrome/content/rules/Pretty-in-Cash.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://exgf.teenbff.com/ => https://exgf.teenbff.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/PrettyLightsMusic.com.xml b/src/chrome/content/rules/PrettyLightsMusic.com.xml
new file mode 100644
index 000000000000..9fa051f528f9
--- /dev/null
+++ b/src/chrome/content/rules/PrettyLightsMusic.com.xml
@@ -0,0 +1,17 @@
+
+
+
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/PrettyLightsMusic.xml b/src/chrome/content/rules/PrettyLightsMusic.xml
deleted file mode 100644
index 9571916d339e..000000000000
--- a/src/chrome/content/rules/PrettyLightsMusic.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/PrettyLittleThing.com.xml b/src/chrome/content/rules/PrettyLittleThing.com.xml
index b47190947cca..f4e1bd49d35d 100644
--- a/src/chrome/content/rules/PrettyLittleThing.com.xml
+++ b/src/chrome/content/rules/PrettyLittleThing.com.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Prgmr.com.xml b/src/chrome/content/rules/Prgmr.com.xml
index a4ea4e96469a..14af28204504 100644
--- a/src/chrome/content/rules/Prgmr.com.xml
+++ b/src/chrome/content/rules/Prgmr.com.xml
@@ -15,7 +15,7 @@
 				-->
 	
 	
-	
+
 	
 	
diff --git a/src/chrome/content/rules/PriceGrabber-clients.xml b/src/chrome/content/rules/PriceGrabber-clients.xml
index 851a2e545c26..d060ec604bf5 100644
--- a/src/chrome/content/rules/PriceGrabber-clients.xml
+++ b/src/chrome/content/rules/PriceGrabber-clients.xml
@@ -9,7 +9,7 @@ Fetch error: http://hothardware.pricegrabber.com/ => https://hothardware.pricegr
 	otherwise have no rules off by default.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/PriceGrabber.xml b/src/chrome/content/rules/PriceGrabber.xml
index d784f2734c4e..77f80f7bbfae 100644
--- a/src/chrome/content/rules/PriceGrabber.xml
+++ b/src/chrome/content/rules/PriceGrabber.xml
@@ -51,7 +51,7 @@ Fetch error: http://partners.pricegrabber.com/ => https://partner.pricegrabber.c
 		- Ads on www from $self
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/PriceRunner.xml b/src/chrome/content/rules/PriceRunner.xml
index f54d32c6c63a..1710fa4d1475 100644
--- a/src/chrome/content/rules/PriceRunner.xml
+++ b/src/chrome/content/rules/PriceRunner.xml
@@ -14,9 +14,11 @@
 
 
 	
-	
+	
+	
+	
 	
-	
+	
 
 
 	
@@ -28,4 +30,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/PriceZombie.com.xml b/src/chrome/content/rules/PriceZombie.com.xml
deleted file mode 100644
index 0127dd05f5b5..000000000000
--- a/src/chrome/content/rules/PriceZombie.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/PrimeCaster.net.xml b/src/chrome/content/rules/PrimeCaster.net.xml
new file mode 100644
index 000000000000..d4b885e241b2
--- /dev/null
+++ b/src/chrome/content/rules/PrimeCaster.net.xml
@@ -0,0 +1,10 @@
+
+
+	
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/PrimeHost.ca.xml b/src/chrome/content/rules/PrimeHost.ca.xml
new file mode 100644
index 000000000000..993d9d2d3433
--- /dev/null
+++ b/src/chrome/content/rules/PrimeHost.ca.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Primes_Eco_Energie.com.xml b/src/chrome/content/rules/Primes_Eco_Energie.com.xml
deleted file mode 100644
index face40f4242e..000000000000
--- a/src/chrome/content/rules/Primes_Eco_Energie.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Primus.com.xml b/src/chrome/content/rules/Primus.com.xml
index 950b3f3a76fe..974fe19a2db6 100644
--- a/src/chrome/content/rules/Primus.com.xml
+++ b/src/chrome/content/rules/Primus.com.xml
@@ -6,17 +6,19 @@ Fetch error: http://primus.com/ => https://www.primus.com/: (60, 'SSL certificat
 Disabled by https-everywhere-checker because:
 Fetch error: http://primus.com/ => https://www.primus.com/: (6, 'Could not resolve host: primus.com')
 -->
-
+
 
 	
-	
+	
+	
+	
+	
 
-	
+	
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Primus_Canada.xml b/src/chrome/content/rules/Primus_Canada.xml
index 940503c8d483..4327bffaf6dc 100644
--- a/src/chrome/content/rules/Primus_Canada.xml
+++ b/src/chrome/content/rules/Primus_Canada.xml
@@ -49,7 +49,7 @@ Fetch error: http://monotelephone.primus.ca/ => https://monotelephone.primus.ca/
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Princeton.edu.xml b/src/chrome/content/rules/Princeton.edu.xml
index f02da2d624dd..15154e5855ec 100644
--- a/src/chrome/content/rules/Princeton.edu.xml
+++ b/src/chrome/content/rules/Princeton.edu.xml
@@ -1,48 +1,37 @@
 
-
 
+
 	
 	
+	
 	
 	
 	
 	
+	
+	
+	
+	
+	
+	
 	
+	
 	
+	
 	
 	
-	
+	
+	
 
-	
+	
 
 	
+
 
diff --git a/src/chrome/content/rules/PrintMojo.xml b/src/chrome/content/rules/PrintMojo.xml
deleted file mode 100644
index 737c2703ba0f..000000000000
--- a/src/chrome/content/rules/PrintMojo.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Pritunl.com.xml b/src/chrome/content/rules/Pritunl.com.xml
index ed82060e1191..1d38fce06b09 100644
--- a/src/chrome/content/rules/Pritunl.com.xml
+++ b/src/chrome/content/rules/Pritunl.com.xml
@@ -5,7 +5,7 @@
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Priv.gc.ca.xml b/src/chrome/content/rules/Priv.gc.ca.xml
deleted file mode 100644
index daaca5a05025..000000000000
--- a/src/chrome/content/rules/Priv.gc.ca.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/PrivacyChoice.xml b/src/chrome/content/rules/PrivacyChoice.xml
index 52ee4c3b830b..b97eaed3a2c8 100644
--- a/src/chrome/content/rules/PrivacyChoice.xml
+++ b/src/chrome/content/rules/PrivacyChoice.xml
@@ -43,7 +43,7 @@ Fetch error: http://www.privacychoice.org/ => https://www.privacychoice.org/: (6
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Privacy_Solutions.no.xml b/src/chrome/content/rules/Privacy_Solutions.no.xml
index 7bc8f2cb515e..15f10061c7fe 100644
--- a/src/chrome/content/rules/Privacy_Solutions.no.xml
+++ b/src/chrome/content/rules/Privacy_Solutions.no.xml
@@ -17,20 +17,21 @@ Fetch error: http://privacysolutions.no/ => https://privacysolutions.no/: (60, '
 	* Secured by us
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
 	
 	
 
-	
+	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Privacy_tools.io.xml b/src/chrome/content/rules/Privacy_tools.io.xml
deleted file mode 100644
index d47dcf48d42d..000000000000
--- a/src/chrome/content/rules/Privacy_tools.io.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Privacyfix.xml b/src/chrome/content/rules/Privacyfix.xml
index ceac649a14c0..98d5eee47a04 100644
--- a/src/chrome/content/rules/Privacyfix.xml
+++ b/src/chrome/content/rules/Privacyfix.xml
@@ -8,7 +8,7 @@ Fetch error: http://www.privacyfix.com/ => https://www.privacyfix.com/: (28, 'Co
 	For other PrivacyChoice coverage, see PrivacyChoice.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/PrivatVPN.xml b/src/chrome/content/rules/PrivatVPN.xml
index 449dd6e71d44..534663d45c4d 100644
--- a/src/chrome/content/rules/PrivatVPN.xml
+++ b/src/chrome/content/rules/PrivatVPN.xml
@@ -3,4 +3,4 @@
   
 
   
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Private-Layer.xml b/src/chrome/content/rules/Private-Layer.xml
index 4673ba7e279a..69eade919fa0 100644
--- a/src/chrome/content/rules/Private-Layer.xml
+++ b/src/chrome/content/rules/Private-Layer.xml
@@ -5,7 +5,7 @@ Fetch error: http://privatelayer.com/ => https://privatelayer.com/: (60, 'SSL ce
 Fetch error: http://www.privatelayer.com/ => https://www.privatelayer.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/PrivateInvestigator.lgbt.xml b/src/chrome/content/rules/PrivateInvestigator.lgbt.xml
deleted file mode 100644
index 77adf3f49e2d..000000000000
--- a/src/chrome/content/rules/PrivateInvestigator.lgbt.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/PrivatePaste.xml b/src/chrome/content/rules/PrivatePaste.xml
index 9dc4a658da37..2b70d2e7698a 100644
--- a/src/chrome/content/rules/PrivatePaste.xml
+++ b/src/chrome/content/rules/PrivatePaste.xml
@@ -10,7 +10,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://privatepaste.com/ => https://privatepaste.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/PrivateWifi.xml b/src/chrome/content/rules/PrivateWifi.xml
index c0176195df87..c78a4694c1af 100644
--- a/src/chrome/content/rules/PrivateWifi.xml
+++ b/src/chrome/content/rules/PrivateWifi.xml
@@ -30,7 +30,7 @@
 	
 	
-	
+	
 
 
 	
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Privatesearch.io.xml b/src/chrome/content/rules/Privatesearch.io.xml
index d4df422becdd..b5c038f30964 100644
--- a/src/chrome/content/rules/Privatesearch.io.xml
+++ b/src/chrome/content/rules/Privatesearch.io.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.privatesearch.io/ => https://www.privatesearch.io/: (6,
 		- .privatesearch.io
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Privoxy.org.xml b/src/chrome/content/rules/Privoxy.org.xml
new file mode 100644
index 000000000000..42d17ebe4969
--- /dev/null
+++ b/src/chrome/content/rules/Privoxy.org.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Pro-Linux.de.xml b/src/chrome/content/rules/Pro-Linux.de.xml
index f5e0d1186d5d..c10da306cde5 100644
--- a/src/chrome/content/rules/Pro-Linux.de.xml
+++ b/src/chrome/content/rules/Pro-Linux.de.xml
@@ -20,8 +20,8 @@
 		Mixed content blocking (MCB) tiggered:
 			 - pro-linux.de
 			 - www.pro-linux.de
-			 
-		Timeout: 
+
+		Timeout:
 		-	 demon.pro-linux.de
 
 -->
diff --git a/src/chrome/content/rules/Pro-Managed.xml b/src/chrome/content/rules/Pro-Managed.xml
index a20284b743ef..0bcc2a9b00f2 100644
--- a/src/chrome/content/rules/Pro-Managed.xml
+++ b/src/chrome/content/rules/Pro-Managed.xml
@@ -10,4 +10,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ProPublica.org.xml b/src/chrome/content/rules/ProPublica.org.xml
index 2904d2b13a22..761358391778 100644
--- a/src/chrome/content/rules/ProPublica.org.xml
+++ b/src/chrome/content/rules/ProPublica.org.xml
@@ -1,60 +1,36 @@
 
 
-
-	
-	
 	
-	
-
-
-	
-	
-
-	
-
-
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
 
-	
-
-	
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/ProQuest.xml b/src/chrome/content/rules/ProQuest.xml
index 5df1a7f399c4..0c8700566b77 100644
--- a/src/chrome/content/rules/ProQuest.xml
+++ b/src/chrome/content/rules/ProQuest.xml
@@ -22,7 +22,7 @@ Fetch error: http://pqshibboleth.proquest.com/ => https://pqshibboleth.proquest.
 	* 504, akamai
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ProVenue.net.xml b/src/chrome/content/rules/ProVenue.net.xml
deleted file mode 100644
index 1867bf72d7ed..000000000000
--- a/src/chrome/content/rules/ProVenue.net.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Probios.sk.xml b/src/chrome/content/rules/Probios.sk.xml
new file mode 100644
index 000000000000..1018a5944f9b
--- /dev/null
+++ b/src/chrome/content/rules/Probios.sk.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Process-One.net.xml b/src/chrome/content/rules/Process-One.net.xml
index c0e7297f5dfb..1ef41695b6bd 100644
--- a/src/chrome/content/rules/Process-One.net.xml
+++ b/src/chrome/content/rules/Process-One.net.xml
@@ -25,7 +25,10 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
-
+
 
 	
 	
 	
 	
 	
-	
+	
+	
 	
 	
 	
-	
+	
+	
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/ProductSafetyRecallsAustralia.xml b/src/chrome/content/rules/ProductSafetyRecallsAustralia.xml
index 50a1e4b27419..2a114dc889bd 100644
--- a/src/chrome/content/rules/ProductSafetyRecallsAustralia.xml
+++ b/src/chrome/content/rules/ProductSafetyRecallsAustralia.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Product_Safety.gov.au.xml b/src/chrome/content/rules/Product_Safety.gov.au.xml
index 5054ab95dbf5..22b6cdb74bf6 100644
--- a/src/chrome/content/rules/Product_Safety.gov.au.xml
+++ b/src/chrome/content/rules/Product_Safety.gov.au.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Programvareverkstedet.xml b/src/chrome/content/rules/Programvareverkstedet.xml
new file mode 100644
index 000000000000..474185c02e29
--- /dev/null
+++ b/src/chrome/content/rules/Programvareverkstedet.xml
@@ -0,0 +1,37 @@
+
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Progress.com.xml b/src/chrome/content/rules/Progress.com.xml
index 308a0d342bd5..fa298871bebe 100644
--- a/src/chrome/content/rules/Progress.com.xml
+++ b/src/chrome/content/rules/Progress.com.xml
@@ -66,7 +66,7 @@ Fetch error: http://origin-www.progress.com/ => https://origin-www.progress.com/
 	² Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Progressive.hu.xml b/src/chrome/content/rules/Progressive.hu.xml
deleted file mode 100644
index 751584934228..000000000000
--- a/src/chrome/content/rules/Progressive.hu.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-
-	
-	
-
diff --git a/src/chrome/content/rules/Project-diva-ac.net.xml b/src/chrome/content/rules/Project-diva-ac.net.xml
new file mode 100644
index 000000000000..743d3e183ada
--- /dev/null
+++ b/src/chrome/content/rules/Project-diva-ac.net.xml
@@ -0,0 +1,7 @@
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ProjectSeahorse.org.xml b/src/chrome/content/rules/ProjectSeahorse.org.xml
new file mode 100644
index 000000000000..2748f5021042
--- /dev/null
+++ b/src/chrome/content/rules/ProjectSeahorse.org.xml
@@ -0,0 +1,8 @@
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Project_Meshnet.xml b/src/chrome/content/rules/Project_Meshnet.xml
index 5823fad00a60..c1b38290ffe7 100644
--- a/src/chrome/content/rules/Project_Meshnet.xml
+++ b/src/chrome/content/rules/Project_Meshnet.xml
@@ -8,7 +8,7 @@ Fetch error: http://wiki.projectmeshnet.org/ => https://wiki.projectmeshnet.org/
 		- map
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Project_Vote_Smart.xml b/src/chrome/content/rules/Project_Vote_Smart.xml
index 02b76050c5db..c8517e51d818 100644
--- a/src/chrome/content/rules/Project_Vote_Smart.xml
+++ b/src/chrome/content/rules/Project_Vote_Smart.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Project_Wonderful.xml b/src/chrome/content/rules/Project_Wonderful.xml
deleted file mode 100644
index a7deffa1f72d..000000000000
--- a/src/chrome/content/rules/Project_Wonderful.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Prolexic.xml b/src/chrome/content/rules/Prolexic.xml
index e80817443210..16c9efeb4118 100644
--- a/src/chrome/content/rules/Prolexic.xml
+++ b/src/chrome/content/rules/Prolexic.xml
@@ -10,7 +10,7 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Prometheus_Global.xml b/src/chrome/content/rules/Prometheus_Global.xml
deleted file mode 100644
index b801201fc3b4..000000000000
--- a/src/chrome/content/rules/Prometheus_Global.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Prometric.xml b/src/chrome/content/rules/Prometric.xml
index 6da03011785c..923fc5eda923 100644
--- a/src/chrome/content/rules/Prometric.xml
+++ b/src/chrome/content/rules/Prometric.xml
@@ -2,7 +2,7 @@
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/Proofpoint.xml b/src/chrome/content/rules/Proofpoint.xml
index 6fe896f2a043..331d76fdfece 100644
--- a/src/chrome/content/rules/Proofpoint.xml
+++ b/src/chrome/content/rules/Proofpoint.xml
@@ -11,7 +11,10 @@
 
 
 	
-	
+	
+	
+	
+	
 		
diff --git a/src/chrome/content/rules/PropellerAds.xml b/src/chrome/content/rules/PropellerAds.xml
index 8c0a25d37d18..7f3798a2753d 100644
--- a/src/chrome/content/rules/PropellerAds.xml
+++ b/src/chrome/content/rules/PropellerAds.xml
@@ -13,13 +13,6 @@
 
 		- (www.)propellerads.com	(rx_record_too_long)
 
-
-	Problematic hosts in *propellerads.com:
-
-		- img ᵐ
-
-	ᵐ Mismatched
-
 -->
 
 
@@ -27,19 +20,10 @@
 				-->
 	
 
-	
-	
-
 
 	
 
 
-	
-		
-	
-
 	
 
diff --git a/src/chrome/content/rules/Prosody.im.xml b/src/chrome/content/rules/Prosody.im.xml
index bb11188338f3..59ab3488037b 100644
--- a/src/chrome/content/rules/Prosody.im.xml
+++ b/src/chrome/content/rules/Prosody.im.xml
@@ -1,34 +1,10 @@
-
 
 
-	
 	
-	
-
-	
 	
-
-
-	
+	
+	
+	
 
 	
diff --git a/src/chrome/content/rules/Prospect-Magazine.xml b/src/chrome/content/rules/Prospect-Magazine.xml
deleted file mode 100644
index 59d63ac2fc45..000000000000
--- a/src/chrome/content/rules/Prospect-Magazine.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/ProspectEye.com.xml b/src/chrome/content/rules/ProspectEye.com.xml
index 38c0d103b09d..812e3a64cc6a 100644
--- a/src/chrome/content/rules/ProspectEye.com.xml
+++ b/src/chrome/content/rules/ProspectEye.com.xml
@@ -30,7 +30,7 @@ Fetch error: http://prospecteye.com/ => https://prospecteye.com/: (51, "SSL: no
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/ProspectMagazine.co.uk.xml b/src/chrome/content/rules/ProspectMagazine.co.uk.xml
new file mode 100644
index 000000000000..210c87ffb6a2
--- /dev/null
+++ b/src/chrome/content/rules/ProspectMagazine.co.uk.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Prospectparkzoo.com.xml b/src/chrome/content/rules/Prospectparkzoo.com.xml
new file mode 100644
index 000000000000..f8967a60ec26
--- /dev/null
+++ b/src/chrome/content/rules/Prospectparkzoo.com.xml
@@ -0,0 +1,12 @@
+
+
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ProstoVPN.org.xml b/src/chrome/content/rules/ProstoVPN.org.xml
new file mode 100644
index 000000000000..366f6814f1a6
--- /dev/null
+++ b/src/chrome/content/rules/ProstoVPN.org.xml
@@ -0,0 +1,18 @@
+
+
+
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Prosystemfx.com.xml b/src/chrome/content/rules/Prosystemfx.com.xml
index d1383a218f71..b5e9d22d67a5 100644
--- a/src/chrome/content/rules/Prosystemfx.com.xml
+++ b/src/chrome/content/rules/Prosystemfx.com.xml
@@ -10,16 +10,17 @@ Fetch error: http://prosystemfx.com/ => https://www.prosystemfx.com/: (56, 'SSL
 
 
 	
-	
+	
+	
+	
 
 
-	
+	
 
 
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/ProtectWise.com.xml b/src/chrome/content/rules/ProtectWise.com.xml
deleted file mode 100644
index 63cf3798dfeb..000000000000
--- a/src/chrome/content/rules/ProtectWise.com.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Protect_Network.xml b/src/chrome/content/rules/Protect_Network.xml
index a93b81181401..886c6d212d5e 100644
--- a/src/chrome/content/rules/Protect_Network.xml
+++ b/src/chrome/content/rules/Protect_Network.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://protectnetwork.org/ => https://protectnetwork.org/: (6, 'Could not resolve host: protectnetwork.org')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://protectnetwork.org/ => https://protectnetwork.org/: (6, 'Cou
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Protonirockerxow.onion.xml b/src/chrome/content/rules/Protonirockerxow.onion.xml
index 0e1f756a18a5..bd46642578c8 100644
--- a/src/chrome/content/rules/Protonirockerxow.onion.xml
+++ b/src/chrome/content/rules/Protonirockerxow.onion.xml
@@ -2,9 +2,9 @@
 	Invalid certificates:
 		- *.protonirockerxow.onion
 
-	This ruleset covers ProtonMail hidden services on Tor.
+	This ruleset covers ProtonMail onion services on Tor.
 -->
-
+
 	
 
 	
diff --git a/src/chrome/content/rules/Provantage.xml b/src/chrome/content/rules/Provantage.xml
index b3cc997332bb..472cbd9c9b1e 100644
--- a/src/chrome/content/rules/Provantage.xml
+++ b/src/chrome/content/rules/Provantage.xml
@@ -1,9 +1,9 @@
 
 
 	
-	
+	
 
-	
+	
 
 	
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Proxer.me.xml b/src/chrome/content/rules/Proxer.me.xml
index 93a6070e13ff..e3403a12248d 100644
--- a/src/chrome/content/rules/Proxer.me.xml
+++ b/src/chrome/content/rules/Proxer.me.xml
@@ -11,7 +11,7 @@
 	
 	
+									-->
 	
 
 	
diff --git a/src/chrome/content/rules/Proxery.com.xml b/src/chrome/content/rules/Proxery.com.xml
deleted file mode 100644
index 81899e5d194b..000000000000
--- a/src/chrome/content/rules/Proxery.com.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Proxifier.com.xml b/src/chrome/content/rules/Proxifier.com.xml
new file mode 100644
index 000000000000..bdce853f5bc1
--- /dev/null
+++ b/src/chrome/content/rules/Proxifier.com.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Proxify.xml b/src/chrome/content/rules/Proxify.xml
index 0775f7529560..954795fbd1bc 100644
--- a/src/chrome/content/rules/Proxify.xml
+++ b/src/chrome/content/rules/Proxify.xml
@@ -3,7 +3,7 @@
 	
 	
 
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Proxmox.com.xml b/src/chrome/content/rules/Proxmox.com.xml
index c761c1d18a41..dd08d2b2d631 100644
--- a/src/chrome/content/rules/Proxmox.com.xml
+++ b/src/chrome/content/rules/Proxmox.com.xml
@@ -4,10 +4,12 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://proxmox.com/ => https://proxmox.com/: (51, "SSL: no alternative certificate subject name matches target host name 'proxmox.com'")
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
 	
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Prxy.com.xml b/src/chrome/content/rules/Prxy.com.xml
index f27b974d3ddc..20cf9ad43ae9 100644
--- a/src/chrome/content/rules/Prxy.com.xml
+++ b/src/chrome/content/rules/Prxy.com.xml
@@ -13,11 +13,11 @@
 		- .prxy.com
 
 -->
-
+
 
 	
 
-	
+	
 
 
 	
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/PubMatic.xml b/src/chrome/content/rules/PubMatic.xml
index 6fca761a8e01..d8da7ffbe549 100644
--- a/src/chrome/content/rules/PubMatic.xml
+++ b/src/chrome/content/rules/PubMatic.xml
@@ -45,7 +45,7 @@
 					-->
 	
 
-	
+	
 
 
 	
-
-
-	
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/PubNub.xml b/src/chrome/content/rules/PubNub.xml
index 9c774270d1d5..9e6767ba3446 100644
--- a/src/chrome/content/rules/PubNub.xml
+++ b/src/chrome/content/rules/PubNub.xml
@@ -45,4 +45,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/PubSoft.org.xml b/src/chrome/content/rules/PubSoft.org.xml
index 16b2d82d4987..ae064ac2fe49 100644
--- a/src/chrome/content/rules/PubSoft.org.xml
+++ b/src/chrome/content/rules/PubSoft.org.xml
@@ -1,4 +1,4 @@
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Pubdirecte.com.xml b/src/chrome/content/rules/Pubdirecte.com.xml
deleted file mode 100644
index 901583a54000..000000000000
--- a/src/chrome/content/rules/Pubdirecte.com.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Public-Idees.xml b/src/chrome/content/rules/Public-Idees.xml
index b5496a51c37c..315bbe90272c 100644
--- a/src/chrome/content/rules/Public-Idees.xml
+++ b/src/chrome/content/rules/Public-Idees.xml
@@ -12,4 +12,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Public.Resource.Org.xml b/src/chrome/content/rules/Public.Resource.Org.xml
index 722aeabd3567..a25b6f9905e6 100644
--- a/src/chrome/content/rules/Public.Resource.Org.xml
+++ b/src/chrome/content/rules/Public.Resource.Org.xml
@@ -21,7 +21,7 @@ Fetch error: http://wwlbd.org/ => https://wwlbd.org/: (28, 'Connection timed out
 	* Cert name mismatch
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/PublicBank.com.hk.xml b/src/chrome/content/rules/PublicBank.com.hk.xml
index 0c8da04d17a2..2b504da043ba 100644
--- a/src/chrome/content/rules/PublicBank.com.hk.xml
+++ b/src/chrome/content/rules/PublicBank.com.hk.xml
@@ -23,7 +23,7 @@
 
   	
 
-	
 
 
diff --git a/src/chrome/content/rules/PublicBank.com.vn.xml b/src/chrome/content/rules/PublicBank.com.vn.xml
deleted file mode 100644
index 08970d6f2408..000000000000
--- a/src/chrome/content/rules/PublicBank.com.vn.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-
-  	
-
-	
-
-
diff --git a/src/chrome/content/rules/PublicCitizen.xml b/src/chrome/content/rules/PublicCitizen.xml
index e904d14bbf32..4b9793b3dc3d 100644
--- a/src/chrome/content/rules/PublicCitizen.xml
+++ b/src/chrome/content/rules/PublicCitizen.xml
@@ -21,7 +21,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
@@ -30,7 +32,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/PublicInsightNetwork.org.xml b/src/chrome/content/rules/PublicInsightNetwork.org.xml
index 341372d80b3a..df15806922b3 100644
--- a/src/chrome/content/rules/PublicInsightNetwork.org.xml
+++ b/src/chrome/content/rules/PublicInsightNetwork.org.xml
@@ -6,7 +6,7 @@ Non-2xx HTTP code: http://publicinsightnetwork.org/ (200) => https://publicinsig
 Disabled by https-everywhere-checker because:
 Non-2xx HTTP code: http://publicinsightnetwork.org/ (200) => https://publicinsightnetwork.org/ (403)
 -->
-
+
 
 	
 	
@@ -17,4 +17,4 @@ Non-2xx HTTP code: http://publicinsightnetwork.org/ (200) => https://publicinsig
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/PublicInvestBank.com.xml b/src/chrome/content/rules/PublicInvestBank.com.xml
deleted file mode 100644
index 25615dd2ba4e..000000000000
--- a/src/chrome/content/rules/PublicInvestBank.com.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-	
-
-  	
-
-	
-
-
diff --git a/src/chrome/content/rules/PublicIslamicBank.xml b/src/chrome/content/rules/PublicIslamicBank.xml
deleted file mode 100644
index 6661b8eb4c0a..000000000000
--- a/src/chrome/content/rules/PublicIslamicBank.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-	
-
-  	
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/PublicMutual.xml b/src/chrome/content/rules/PublicMutual.xml
index 0e25781ce663..400c33c1fe77 100644
--- a/src/chrome/content/rules/PublicMutual.xml
+++ b/src/chrome/content/rules/PublicMutual.xml
@@ -27,7 +27,7 @@
 	
 
-	
 
 
diff --git a/src/chrome/content/rules/PublicSectorManagementProgram.xml b/src/chrome/content/rules/PublicSectorManagementProgram.xml
index 99adf8ea2bd7..fc5a18c5842c 100644
--- a/src/chrome/content/rules/PublicSectorManagementProgram.xml
+++ b/src/chrome/content/rules/PublicSectorManagementProgram.xml
@@ -10,10 +10,10 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://psmprogram.gov.au/ => https://www.psmprogram.gov.au/: Too many redirects while fetching 'https://www.psmprogram.gov.au/'
 
 -->
-
+
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/PublicSectorSuperannuationAccumulationPlan.xml b/src/chrome/content/rules/PublicSectorSuperannuationAccumulationPlan.xml
index 044fb0920c3e..ac50267921a9 100644
--- a/src/chrome/content/rules/PublicSectorSuperannuationAccumulationPlan.xml
+++ b/src/chrome/content/rules/PublicSectorSuperannuationAccumulationPlan.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/PublicSectorSuperannuationScheme.xml b/src/chrome/content/rules/PublicSectorSuperannuationScheme.xml
index bce28c73a7de..ec273014aa47 100644
--- a/src/chrome/content/rules/PublicSectorSuperannuationScheme.xml
+++ b/src/chrome/content/rules/PublicSectorSuperannuationScheme.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/PublicWWW.com.xml b/src/chrome/content/rules/PublicWWW.com.xml
new file mode 100644
index 000000000000..a84e45b78ba9
--- /dev/null
+++ b/src/chrome/content/rules/PublicWWW.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Public_Whip.xml b/src/chrome/content/rules/Public_Whip.xml
index c9def4e07bad..866a648febd2 100644
--- a/src/chrome/content/rules/Public_Whip.xml
+++ b/src/chrome/content/rules/Public_Whip.xml
@@ -8,10 +8,10 @@ Fetch error: http://publicwhip.org.uk/ => https://www.publicwhip.org.uk/: (51, "
 	!www doesn't work.
 
 -->
-
+
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Publiekeomroep.nl.xml b/src/chrome/content/rules/Publiekeomroep.nl.xml
index 2fb61c806521..d2fe2aed754f 100644
--- a/src/chrome/content/rules/Publiekeomroep.nl.xml
+++ b/src/chrome/content/rules/Publiekeomroep.nl.xml
@@ -9,7 +9,7 @@
 -->
 
 
-	
+	
 
 
 	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/PublikDemand.xml b/src/chrome/content/rules/PublikDemand.xml
index d43c808f3b88..300370d9f6d5 100644
--- a/src/chrome/content/rules/PublikDemand.xml
+++ b/src/chrome/content/rules/PublikDemand.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://publikdemand.com/ => https://publikdemand.com/: (6, 'Could not resolve host: publikdemand.com')
 Fetch error: http://www.publikdemand.com/ => https://www.publikdemand.com/: (6, 'Could not resolve host: www.publikdemand.com')
 -->
-
+
 
 	
 	
@@ -19,4 +19,4 @@ Fetch error: http://www.publikdemand.com/ => https://www.publikdemand.com/: (6,
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Puhkaeestis.ee.xml b/src/chrome/content/rules/Puhkaeestis.ee.xml
index 8b2211ff86f7..1309e09b9f61 100644
--- a/src/chrome/content/rules/Puhkaeestis.ee.xml
+++ b/src/chrome/content/rules/Puhkaeestis.ee.xml
@@ -16,13 +16,13 @@
 
 
 	
-	
+	
+	
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Pulpix.co.xml b/src/chrome/content/rules/Pulpix.co.xml
index 60d4b92c237f..30f2f6de614d 100644
--- a/src/chrome/content/rules/Pulpix.co.xml
+++ b/src/chrome/content/rules/Pulpix.co.xml
@@ -25,7 +25,7 @@ Fetch error: http://pulpix.co/ => https://www.pulpix.co/: (7, 'Failed to connect
 		- www.pulpix.co
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Pulse.me.xml b/src/chrome/content/rules/Pulse.me.xml
index e22950cd76cf..6b33a30ae1c5 100644
--- a/src/chrome/content/rules/Pulse.me.xml
+++ b/src/chrome/content/rules/Pulse.me.xml
@@ -5,7 +5,7 @@ Fetch error: http://www.pulse.me/ => https://www.pulse.me/: (60, 'SSL certificat
 Fetch error: http://pulse.me/ => https://www.pulse.me/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/PulsePoint.xml b/src/chrome/content/rules/PulsePoint.xml
index 94c5df1d8939..5f13c0b16c1a 100644
--- a/src/chrome/content/rules/PulsePoint.xml
+++ b/src/chrome/content/rules/PulsePoint.xml
@@ -12,7 +12,6 @@ Fetch error: http://www.apertureinsight.com/ => https://www.apertureinsight.com/
 	Other PulsePoint rulesets:
 
 		- Contextweb.com.xml
-		- Displaymarketplace.com.xml
 
 
 	Nonfunctional domains:
@@ -38,7 +37,7 @@ Fetch error: http://www.apertureinsight.com/ => https://www.apertureinsight.com/
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Puma.com.xml b/src/chrome/content/rules/Puma.com.xml
index 03f62ec39ff8..4d5b723ea8ae 100644
--- a/src/chrome/content/rules/Puma.com.xml
+++ b/src/chrome/content/rules/Puma.com.xml
@@ -10,7 +10,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.puma.com/ => https://www.puma.com/: (60, 'SSL certificate problem: certificate has expired')
 Fetch error: http://puma.com/ => https://www.puma.com/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/Pumo.com.tw-falsemixed.xml b/src/chrome/content/rules/Pumo.com.tw-falsemixed.xml
index e337aab5e40b..83d522a8a63a 100644
--- a/src/chrome/content/rules/Pumo.com.tw-falsemixed.xml
+++ b/src/chrome/content/rules/Pumo.com.tw-falsemixed.xml
@@ -4,13 +4,12 @@
 -->
 
 
-	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Punterlink.xml b/src/chrome/content/rules/Punterlink.xml
index 2a9ffc754312..cce2d7e7739a 100644
--- a/src/chrome/content/rules/Punterlink.xml
+++ b/src/chrome/content/rules/Punterlink.xml
@@ -21,7 +21,7 @@ Fetch error: http://cdn.punterlink.co.uk/ => https://3026-iamnoonesolution.netdn
 			- Mismatched, CN: *.trappedinsidethecomputer.net
 
 -->
-
+
 
 	
 
@@ -29,4 +29,4 @@ Fetch error: http://cdn.punterlink.co.uk/ => https://3026-iamnoonesolution.netdn
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Punycoder.com.xml b/src/chrome/content/rules/Punycoder.com.xml
new file mode 100644
index 000000000000..452084dfe6f8
--- /dev/null
+++ b/src/chrome/content/rules/Punycoder.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Puppet_Labs.xml b/src/chrome/content/rules/Puppet_Labs.xml
index cd471ae74bf4..ce5920f331b7 100644
--- a/src/chrome/content/rules/Puppet_Labs.xml
+++ b/src/chrome/content/rules/Puppet_Labs.xml
@@ -11,7 +11,7 @@ Fetch error: http://forgestagingapi.puppetlabs.com/ => https://forgestagingapi.p
 	* Marketo
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Purdue_Alumni_Association.xml b/src/chrome/content/rules/Purdue_Alumni_Association.xml
index ba525fc986dc..5af5cc3d422a 100644
--- a/src/chrome/content/rules/Purdue_Alumni_Association.xml
+++ b/src/chrome/content/rules/Purdue_Alumni_Association.xml
@@ -17,7 +17,7 @@ Fetch error: http://www.purduealumni.org/ => https://www.purduealumni.org/: (60,
 	Certs only match www.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Purdue_Plant_Doctor.xml b/src/chrome/content/rules/Purdue_Plant_Doctor.xml
index 1d630b0c1050..7566651f9a05 100644
--- a/src/chrome/content/rules/Purdue_Plant_Doctor.xml
+++ b/src/chrome/content/rules/Purdue_Plant_Doctor.xml
@@ -13,4 +13,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Purdue_University.xml b/src/chrome/content/rules/Purdue_University.xml
index e09de341ead5..8a5d9b13ae0b 100644
--- a/src/chrome/content/rules/Purdue_University.xml
+++ b/src/chrome/content/rules/Purdue_University.xml
@@ -79,7 +79,7 @@
 	² Redirects to gweb; mismatched, CN: gweb.genomics.purdue.edu
 	³ Shows www.pharmacy; mismatched, CN: www.pharmacy.purdue.edu
 	⁴ Shows web02p.lib; mismatched, CN: web02p.lib.purdue.edu
-	⁵ Shows api01p.lib; expired 2012-03-31, self-signed, CN: api01p.lib.purdue.edu	
+	⁵ Shows api01p.lib; expired 2012-03-31, self-signed, CN: api01p.lib.purdue.edu
 	⁶ Shows www.math; mismatched, CN: www.math.purdue.edu
 
 
diff --git a/src/chrome/content/rules/Pure-Auto.xml b/src/chrome/content/rules/Pure-Auto.xml
index 4216e6efe45f..5bb1b2d9b3f9 100644
--- a/src/chrome/content/rules/Pure-Auto.xml
+++ b/src/chrome/content/rules/Pure-Auto.xml
@@ -4,7 +4,7 @@
 	
 
 	
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Pure-privacy.org.xml b/src/chrome/content/rules/Pure-privacy.org.xml
index 991ce79bbf13..2f963b8ef1a7 100644
--- a/src/chrome/content/rules/Pure-privacy.org.xml
+++ b/src/chrome/content/rules/Pure-privacy.org.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.pure-privacy.org/ => https://pure-privacy.org/: (60, 'SS
 	www: mismatched, CN: download.truecrypt.ch
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/PureHacking.xml b/src/chrome/content/rules/PureHacking.xml
deleted file mode 100644
index dface9c2c71a..000000000000
--- a/src/chrome/content/rules/PureHacking.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
- 
- 
-
- 
-
diff --git a/src/chrome/content/rules/PureInfo.xml b/src/chrome/content/rules/PureInfo.xml
index 975e804f21dd..2a7842725a92 100644
--- a/src/chrome/content/rules/PureInfo.xml
+++ b/src/chrome/content/rules/PureInfo.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Pure_Cambogia.com.xml b/src/chrome/content/rules/Pure_Cambogia.com.xml
deleted file mode 100644
index 8c3c6fd59a5c..000000000000
--- a/src/chrome/content/rules/Pure_Cambogia.com.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Pureloto.com.xml b/src/chrome/content/rules/Pureloto.com.xml
deleted file mode 100644
index 524788f2f94a..000000000000
--- a/src/chrome/content/rules/Pureloto.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Pururin.io.xml b/src/chrome/content/rules/Pururin.io.xml
new file mode 100644
index 000000000000..5e1b6022991d
--- /dev/null
+++ b/src/chrome/content/rules/Pururin.io.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Pururin.us.xml b/src/chrome/content/rules/Pururin.us.xml
deleted file mode 100644
index 9087fc47886a..000000000000
--- a/src/chrome/content/rules/Pururin.us.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-	
-	
-	
-		
-		
-		
-		
-
-	
-	
-
diff --git a/src/chrome/content/rules/Push.IO.xml b/src/chrome/content/rules/Push.IO.xml
deleted file mode 100644
index 8191f73c9c90..000000000000
--- a/src/chrome/content/rules/Push.IO.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/PushPlay.xml b/src/chrome/content/rules/PushPlay.xml
index 53347c222de1..422fcdeb7ec8 100644
--- a/src/chrome/content/rules/PushPlay.xml
+++ b/src/chrome/content/rules/PushPlay.xml
@@ -20,4 +20,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Pusher.com.xml b/src/chrome/content/rules/Pusher.com.xml
index 7756105aa0a4..6de43d03a166 100644
--- a/src/chrome/content/rules/Pusher.com.xml
+++ b/src/chrome/content/rules/Pusher.com.xml
@@ -1,7 +1,7 @@
 
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/PusherApp.com.xml b/src/chrome/content/rules/PusherApp.com.xml
new file mode 100644
index 000000000000..8673bc0f6113
--- /dev/null
+++ b/src/chrome/content/rules/PusherApp.com.xml
@@ -0,0 +1,21 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Pushsquare.com.xml b/src/chrome/content/rules/Pushsquare.com.xml
new file mode 100644
index 000000000000..bc28b44010ee
--- /dev/null
+++ b/src/chrome/content/rules/Pushsquare.com.xml
@@ -0,0 +1,12 @@
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/PutLocker.xml b/src/chrome/content/rules/PutLocker.xml
index 8cc6d1154080..ccee0e5ece64 100644
--- a/src/chrome/content/rules/PutLocker.xml
+++ b/src/chrome/content/rules/PutLocker.xml
@@ -23,7 +23,9 @@
 
 	
 	
-	
+	
+	
+	
 
 
 	
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/PwdHash.com.xml b/src/chrome/content/rules/PwdHash.com.xml
index 55ce8652180a..3a7aa2092ff6 100644
--- a/src/chrome/content/rules/PwdHash.com.xml
+++ b/src/chrome/content/rules/PwdHash.com.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/PyCon.org.xml b/src/chrome/content/rules/PyCon.org.xml
index 6f9c9d45918f..06dada7a4c66 100644
--- a/src/chrome/content/rules/PyCon.org.xml
+++ b/src/chrome/content/rules/PyCon.org.xml
@@ -36,7 +36,7 @@ Fetch error: http://2013.de.pycon.org/ => https://2013.de.pycon.org/: (60, 'SSL
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/PyData.org.xml b/src/chrome/content/rules/PyData.org.xml
index 7ceffeef17f6..03c5730e0bf1 100644
--- a/src/chrome/content/rules/PyData.org.xml
+++ b/src/chrome/content/rules/PyData.org.xml
@@ -1,13 +1,7 @@
 
+
+
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Python-RQ.org.xml b/src/chrome/content/rules/Python-RQ.org.xml
new file mode 100644
index 000000000000..e5666f74baee
--- /dev/null
+++ b/src/chrome/content/rules/Python-RQ.org.xml
@@ -0,0 +1,5 @@
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Python.org.xml b/src/chrome/content/rules/Python.org.xml
index f1fbf0a2ab7a..6b6025aaa444 100644
--- a/src/chrome/content/rules/Python.org.xml
+++ b/src/chrome/content/rules/Python.org.xml
@@ -1,12 +1,10 @@
 
 
 
-	
-	
 	
+	
 	
+	
 	
 	
 	
 	
 	
+	
+	
 	
 	
 	
 	
 	
+	
 	
 	
 	
 	
-	
 	
 	
 	
@@ -65,7 +59,6 @@
 	
 	
 	
-	
 	
 	
 	
diff --git a/src/chrome/content/rules/PythonTutor.ru.xml b/src/chrome/content/rules/PythonTutor.ru.xml
new file mode 100644
index 000000000000..405e187ab26b
--- /dev/null
+++ b/src/chrome/content/rules/PythonTutor.ru.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Pythonclock.org.xml b/src/chrome/content/rules/Pythonclock.org.xml
index 9a876f0e04f6..7e70bd4a8c13 100644
--- a/src/chrome/content/rules/Pythonclock.org.xml
+++ b/src/chrome/content/rules/Pythonclock.org.xml
@@ -2,7 +2,7 @@
 
 	
 	
-	
+
 	
 
 
diff --git a/src/chrome/content/rules/Pythonhosted.org.xml b/src/chrome/content/rules/Pythonhosted.org.xml
deleted file mode 100644
index d44a057d3fc5..000000000000
--- a/src/chrome/content/rules/Pythonhosted.org.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Q3k.org.xml b/src/chrome/content/rules/Q3k.org.xml
index a10a61184c3c..b4741345a5f3 100644
--- a/src/chrome/content/rules/Q3k.org.xml
+++ b/src/chrome/content/rules/Q3k.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.q3k.org/ => https://www.q3k.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.q3k.org'")
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Q8Car.xml b/src/chrome/content/rules/Q8Car.xml
index 5df91d18734c..697ae0032054 100644
--- a/src/chrome/content/rules/Q8Car.xml
+++ b/src/chrome/content/rules/Q8Car.xml
@@ -15,7 +15,7 @@ Fetch error: http://images3.q8car.com/ => https://images3.q8car.com/: (6, 'Could
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/QBE-Europe.com.xml b/src/chrome/content/rules/QBE-Europe.com.xml
new file mode 100644
index 000000000000..6e11b9fa318c
--- /dev/null
+++ b/src/chrome/content/rules/QBE-Europe.com.xml
@@ -0,0 +1,63 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/QBE-Re.com.xml b/src/chrome/content/rules/QBE-Re.com.xml
new file mode 100644
index 000000000000..64dbab06a805
--- /dev/null
+++ b/src/chrome/content/rules/QBE-Re.com.xml
@@ -0,0 +1,26 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/QBE.com.au.xml b/src/chrome/content/rules/QBE.com.au.xml
new file mode 100644
index 000000000000..6c435e1ecea5
--- /dev/null
+++ b/src/chrome/content/rules/QBE.com.au.xml
@@ -0,0 +1,46 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/QCon_SF.com.xml b/src/chrome/content/rules/QCon_SF.com.xml
index 43fd266fa478..ddc01ad44eee 100644
--- a/src/chrome/content/rules/QCon_SF.com.xml
+++ b/src/chrome/content/rules/QCon_SF.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.qconsf.com/ => https://www.qconsf.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.qconsf.com'")
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/QLCrew.com.xml b/src/chrome/content/rules/QLCrew.com.xml
index 4bfe2ddd4906..d673d4204d52 100644
--- a/src/chrome/content/rules/QLCrew.com.xml
+++ b/src/chrome/content/rules/QLCrew.com.xml
@@ -3,9 +3,9 @@
 	
 	
 	
-	
+
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/QQ.com-Problematic.xml b/src/chrome/content/rules/QQ.com-Problematic.xml
deleted file mode 100644
index ed297af41080..000000000000
--- a/src/chrome/content/rules/QQ.com-Problematic.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-	
-	
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/QQ.com-mixedcontent.xml b/src/chrome/content/rules/QQ.com-mixedcontent.xml
index d143510b70cb..b73d0c41523f 100644
--- a/src/chrome/content/rules/QQ.com-mixedcontent.xml
+++ b/src/chrome/content/rules/QQ.com-mixedcontent.xml
@@ -2,13 +2,12 @@
 	For rules not causing MCB, see QQ.xml.
 -->
 
-	
-	
-	
-	
+	
+		
 	
+		
 
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/QQ.xml b/src/chrome/content/rules/QQ.xml
index 237c5fc26ad2..dc88cba15a5e 100644
--- a/src/chrome/content/rules/QQ.xml
+++ b/src/chrome/content/rules/QQ.xml
@@ -1,203 +1,79 @@
 
 
-	
-	
-	
-		
-		
-		
-		
-		
-		
-		
-		
-
-	
-	
-	
-	
-	
-	
-		
-		
-		
-		
-
-	
+	
+	
+	
+	
 	
+	
+	
+	
 	
 	
 	
@@ -205,36 +81,77 @@
 		
 	
 		
+	
+	
 	
+	
+	
 	
+	
+	
+	
+	
+	
+		
 	
+	
+	
+	
 	
 	
-	
+	
+	
+	
+		
 	
 	
+	
 		
+	
+	
+	
+	
+	
 	
+	
 	
-	
+	
+	
+		
+	
+	
+	
+	
 	
+	
 	
 		
+	
+	
+		
 	
 	
 	
 		
+	
+		
+	
+	
 	
 		
 	
+	
+		
+		
+		
+		
 	
+	
 	
 		
+	
 	
-	
-		
-		
-	
 	
 	
 	
@@ -242,74 +159,101 @@
 	
 	
 	
+	
+	
+	
+	
+	
 	
-		
-		
-		
-		
-		
 	
 	
 	
 	
+	
 	
-	
-	
+	
+	
+		
 	
 	
+	
+	
+	
 	
 	
 	
 	
+	
 	
-		
-		
 		
 	
 	
 	
 		
 	
+		
 		
 		
 	
+	
 	
 	
 	
 	
 	
+	
+	
 	
+	
+	
 	
 	
+	
 	
+		
+		
 	
 	
 	
+	
+	
+		
+	
+		
+	
+	
+	
+	
 	
+	
+	
 	
 		
 	
 	
 	
 	
-	
 	
+	
+		
+	
 	
 	
+		
 	
-		
-		
-		
 	
 		
 	
-		
 		
 		
 	
 		
 	
 		
+	
+	
+		
+	
 	
 	
 		
@@ -320,10 +264,12 @@
 	
 	
 	
+	
+		
+	
+	
+	
 	
-	
-	
-	
 	
 	
 	
@@ -332,26 +278,45 @@
 	
 	
 	
+	
+	
+	
+	
+	
 	
+	
 	
 		
+	
 	
 	
+		
 	
 	
 	
 	
 	
 	
+	
 	
+	
 	
-		
-		
+	
 	
 	
 	
+	
+
+	
 
-	
+	
+	
+	
+		
+		
+		
+		
+		
 
 	
 
diff --git a/src/chrome/content/rules/QStack.com.xml b/src/chrome/content/rules/QStack.com.xml
deleted file mode 100644
index 97c5d82b3a13..000000000000
--- a/src/chrome/content/rules/QStack.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/QTH.com.xml b/src/chrome/content/rules/QTH.com.xml
index 2f4101874319..0809dc787715 100644
--- a/src/chrome/content/rules/QTH.com.xml
+++ b/src/chrome/content/rules/QTH.com.xml
@@ -7,14 +7,14 @@
 		- domains *
 		- hosting *
 		- swap *
-		
+
 	* Shows www12.qth.com
 
 
 	Problematic hosts in *qth.com:
 
 		- ssl *
-	
+
 	* Mismatched
 
 
@@ -39,7 +39,7 @@
 	
 	
 
-	
+	
 
 
 	
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/QUADAtYork.ca.xml b/src/chrome/content/rules/QUADAtYork.ca.xml
new file mode 100644
index 000000000000..f2d093ee832a
--- /dev/null
+++ b/src/chrome/content/rules/QUADAtYork.ca.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/QWK.net.xml b/src/chrome/content/rules/QWK.net.xml
deleted file mode 100644
index 9b313c548c2c..000000000000
--- a/src/chrome/content/rules/QWK.net.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/QXL.dk.xml b/src/chrome/content/rules/QXL.dk.xml
index f0569eec7043..29e19eba54a1 100644
--- a/src/chrome/content/rules/QXL.dk.xml
+++ b/src/chrome/content/rules/QXL.dk.xml
@@ -5,7 +5,7 @@
 	Nonfunctional hosts in qxl.dk:
 
 		- hjaelp *
-		
+
 	* Handshake fails
 
 -->
diff --git a/src/chrome/content/rules/Qabel.xml b/src/chrome/content/rules/Qabel.xml
deleted file mode 100644
index 281badbd6060..000000000000
--- a/src/chrome/content/rules/Qabel.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Qari.one.xml b/src/chrome/content/rules/Qari.one.xml
new file mode 100644
index 000000000000..10c2b2abdeb7
--- /dev/null
+++ b/src/chrome/content/rules/Qari.one.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Qbox.me.xml b/src/chrome/content/rules/Qbox.me.xml
index 682491c70506..8b7b4f5ebddd 100644
--- a/src/chrome/content/rules/Qbox.me.xml
+++ b/src/chrome/content/rules/Qbox.me.xml
@@ -34,6 +34,6 @@
 	
 	
 	
-	
-	
+
+
 
diff --git a/src/chrome/content/rules/Qbrick.com.xml b/src/chrome/content/rules/Qbrick.com.xml
index 1f013f5b471b..4044c2aa49de 100644
--- a/src/chrome/content/rules/Qbrick.com.xml
+++ b/src/chrome/content/rules/Qbrick.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://vms.admin.qbrick.com/ => https://vms.admin.qbrick.com/: (6,
 	(www.)?qbrick.com: Blank page
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Qcloud.com.xml b/src/chrome/content/rules/Qcloud.com.xml
index c356aa59b604..e1baa493ccc0 100644
--- a/src/chrome/content/rules/Qcloud.com.xml
+++ b/src/chrome/content/rules/Qcloud.com.xml
@@ -19,12 +19,12 @@ Fetch error: http://wiki.qcloud.com/ => https://wiki.qcloud.com/: (28, 'Connecti
 		- o.qcloud.com
 
 	Timeout:
-		- app.qcloud.com 
+		- app.qcloud.com
 		- bbs.qcloud.com
 		- legu.qcloud.com
 		- yun.weixin.qcloud.com
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Qemu.org.xml b/src/chrome/content/rules/Qemu.org.xml
new file mode 100644
index 000000000000..ad3b81f8db2b
--- /dev/null
+++ b/src/chrome/content/rules/Qemu.org.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Qihu_CDN.com.xml b/src/chrome/content/rules/Qihu_CDN.com.xml
index 9023d6ed0e7b..effd20ea65d3 100644
--- a/src/chrome/content/rules/Qihu_CDN.com.xml
+++ b/src/chrome/content/rules/Qihu_CDN.com.xml
@@ -6,7 +6,7 @@ Non-2xx HTTP code: http://shouji.ssl.qihucdn.com/ (200) => https://shouji.ssl.qi
 	For other Qihoo 360 Technology coverage, see 360.cn.xml.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Qnetp.net.xml b/src/chrome/content/rules/Qnetp.net.xml
index ca2c6cdfccf0..900a533abaa1 100644
--- a/src/chrome/content/rules/Qnetp.net.xml
+++ b/src/chrome/content/rules/Qnetp.net.xml
@@ -7,7 +7,7 @@ Fetch error: http://booster.qnetp.net/ => https://booster.qnetp.net/: (51, "SSL:
 	www.qnetp.net: shows default page, valid cert
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Qoo10.cn.xml b/src/chrome/content/rules/Qoo10.cn.xml
index 0c836539f8ae..5c1102461781 100644
--- a/src/chrome/content/rules/Qoo10.cn.xml
+++ b/src/chrome/content/rules/Qoo10.cn.xml
@@ -41,8 +41,12 @@
 -->
 
 
-	
-	
+	
+	
+	
+	
+	
+	
 
 
 	
@@ -51,7 +55,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Qoo10.com.xml b/src/chrome/content/rules/Qoo10.com.xml
index 82206dea9711..739670a05225 100644
--- a/src/chrome/content/rules/Qoo10.com.xml
+++ b/src/chrome/content/rules/Qoo10.com.xml
@@ -43,8 +43,14 @@
 -->
 
 
-	
-	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
@@ -56,7 +62,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Qpic.cn.xml b/src/chrome/content/rules/Qpic.cn.xml
index 135874f7994f..2ec55d5024fb 100644
--- a/src/chrome/content/rules/Qpic.cn.xml
+++ b/src/chrome/content/rules/Qpic.cn.xml
@@ -1,9 +1,4 @@
-
-
+
 	
 	
 	
@@ -21,8 +16,14 @@
 		
 	
 		
+	
+		
+	
+	
+	
+		
 
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Qrobe.it.xml b/src/chrome/content/rules/Qrobe.it.xml
deleted file mode 100644
index b91c3d8e1b50..000000000000
--- a/src/chrome/content/rules/Qrobe.it.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-
-		
-		
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Qt-project.org.xml b/src/chrome/content/rules/Qt-project.org.xml
index d16b951e69f4..ac81e4e6eb28 100644
--- a/src/chrome/content/rules/Qt-project.org.xml
+++ b/src/chrome/content/rules/Qt-project.org.xml
@@ -24,7 +24,7 @@ Fetch error: http://releases.qt-project.org/ => https://releases.qt-project.org/
 	* Expired
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Qt.io.xml b/src/chrome/content/rules/Qt.io.xml
index c5666808476d..36bbdb01b004 100644
--- a/src/chrome/content/rules/Qt.io.xml
+++ b/src/chrome/content/rules/Qt.io.xml
@@ -20,7 +20,7 @@
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Qt_Cloud_Services.com.xml b/src/chrome/content/rules/Qt_Cloud_Services.com.xml
index bf7cc0787eda..6c428b3680c3 100644
--- a/src/chrome/content/rules/Qt_Cloud_Services.com.xml
+++ b/src/chrome/content/rules/Qt_Cloud_Services.com.xml
@@ -16,7 +16,7 @@ Fetch error: http://www.qtcloudservices.com/ => https://www.qtcloudservices.com/
 	*StatusPage.io
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/QuKuai.com.xml b/src/chrome/content/rules/QuKuai.com.xml
deleted file mode 100644
index 2d1e12f8ae70..000000000000
--- a/src/chrome/content/rules/QuKuai.com.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Quackquackgo.nl.xml b/src/chrome/content/rules/Quackquackgo.nl.xml
index a942bcfdd15c..d8841cc7ec06 100644
--- a/src/chrome/content/rules/Quackquackgo.nl.xml
+++ b/src/chrome/content/rules/Quackquackgo.nl.xml
@@ -5,7 +5,7 @@ Fetch error: http://quackquackgo.nl/ => https://quackquackgo.nl/: (51, "SSL: no
 Fetch error: http://www.quackquackgo.nl/ => https://www.quackquackgo.nl/: (51, "SSL: no alternative certificate subject name matches target host name 'www.quackquackgo.nl'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Qualcomm.xml b/src/chrome/content/rules/Qualcomm.xml
index da3dd780c21a..3c084af7c0d3 100644
--- a/src/chrome/content/rules/Qualcomm.xml
+++ b/src/chrome/content/rules/Qualcomm.xml
@@ -5,7 +5,6 @@ Fetch error: http://pages.qualcomm.com/ => https://pages.qualcomm.com/: (6, 'Cou
 
 	Other Qualcomm rulesets:
 
-		- AllJoyn.org.xml
 
 
 	Nonfunctional hosts in *qualcomm.com:
@@ -27,7 +26,7 @@ Fetch error: http://pages.qualcomm.com/ => https://pages.qualcomm.com/: (6, 'Cou
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/QualityAgent.xml b/src/chrome/content/rules/QualityAgent.xml
index cbe3845bf84b..629a94cee5f7 100644
--- a/src/chrome/content/rules/QualityAgent.xml
+++ b/src/chrome/content/rules/QualityAgent.xml
@@ -22,7 +22,7 @@
 	
 
 
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/QuantCount.xml b/src/chrome/content/rules/QuantCount.xml
new file mode 100644
index 000000000000..34bc3ec6699f
--- /dev/null
+++ b/src/chrome/content/rules/QuantCount.xml
@@ -0,0 +1,34 @@
+
+
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Quantcast.xml b/src/chrome/content/rules/Quantcast.xml
index db517d19c1ef..70d696a6f5cd 100644
--- a/src/chrome/content/rules/Quantcast.xml
+++ b/src/chrome/content/rules/Quantcast.xml
@@ -2,18 +2,61 @@
 	Other Quantcast rulesets:
 
 		- Quantserve.com.xml
+		- QuantCount.xml
 
+	Redirect to plain:
+		- edirect.qapi.quantcast.com
+		- onedrive.redirect.qapi.quantcast.com
+		- outlook-calendar.redirect.qapi.quantcast.com
+		- outlook-mail.redirect.qapi.quantcast.com
+		- outlook-people.redirect.qapi.quantcast.com
+		- outlook-tasks.redirect.qapi.quantcast.com
+		- test.redirect.qapi.quantcast.com
+
+	Connection refused:
+		- adtest-raw.quantcast.com
+		- adtest.quantcast.com
+		- autodiscover.quantcast.com
+
+	Cert mismatch:
+		- branding.quantcast.com
+		- developer.quantcast.com
+		- em.quantcast.com
+		- go.quantcast.com
+		- help.quantcast.com
+
+	Timeout:
+		- obm.quantcast.com
 -->
 
 
 	
 	
+	
+
 	
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
-	
-
+	
+	
+	
 
 	
 
diff --git a/src/chrome/content/rules/QuantifiedCode.com.xml b/src/chrome/content/rules/QuantifiedCode.com.xml
deleted file mode 100644
index 81c1ff8517b9..000000000000
--- a/src/chrome/content/rules/QuantifiedCode.com.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Quantix.xml b/src/chrome/content/rules/Quantix.xml
deleted file mode 100644
index 144fa64cbcbc..000000000000
--- a/src/chrome/content/rules/Quantix.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Quantlib.org.xml b/src/chrome/content/rules/Quantlib.org.xml
new file mode 100644
index 000000000000..5e62d7988492
--- /dev/null
+++ b/src/chrome/content/rules/Quantlib.org.xml
@@ -0,0 +1,17 @@
+
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Quantserve.com.xml b/src/chrome/content/rules/Quantserve.com.xml
index 3e8e287b1623..4677a9714d4b 100644
--- a/src/chrome/content/rules/Quantserve.com.xml
+++ b/src/chrome/content/rules/Quantserve.com.xml
@@ -1,5 +1,5 @@
 
 
 	
diff --git a/src/chrome/content/rules/QuantumComputingReport.com.xml b/src/chrome/content/rules/QuantumComputingReport.com.xml
new file mode 100644
index 000000000000..aa79d9b67770
--- /dev/null
+++ b/src/chrome/content/rules/QuantumComputingReport.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/QuantumMAN.xml b/src/chrome/content/rules/QuantumMAN.xml
deleted file mode 100644
index c06111c0caf3..000000000000
--- a/src/chrome/content/rules/QuantumMAN.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Quassel-irc.org.xml b/src/chrome/content/rules/Quassel-irc.org.xml
new file mode 100644
index 000000000000..d45141eddcf2
--- /dev/null
+++ b/src/chrome/content/rules/Quassel-irc.org.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Quattroplay.com.xml b/src/chrome/content/rules/Quattroplay.com.xml
index 8040a000ab26..1a6e5d23a874 100644
--- a/src/chrome/content/rules/Quattroplay.com.xml
+++ b/src/chrome/content/rules/Quattroplay.com.xml
@@ -4,10 +4,10 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Qubit_products.com.xml b/src/chrome/content/rules/Qubit_products.com.xml
index 7eb6a6c6f2b6..78de135bb5be 100644
--- a/src/chrome/content/rules/Qubit_products.com.xml
+++ b/src/chrome/content/rules/Qubit_products.com.xml
@@ -21,7 +21,7 @@ Fetch error: http://pong.qubitproducts.com/ => https://pong.qubitproducts.com/:
 	³ Desk.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Queenszoo.com.xml b/src/chrome/content/rules/Queenszoo.com.xml
new file mode 100644
index 000000000000..ba83d41c14b2
--- /dev/null
+++ b/src/chrome/content/rules/Queenszoo.com.xml
@@ -0,0 +1,12 @@
+
+
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Queer.de.xml b/src/chrome/content/rules/Queer.de.xml
index d3b2be96d4ae..e8fab5363a29 100644
--- a/src/chrome/content/rules/Queer.de.xml
+++ b/src/chrome/content/rules/Queer.de.xml
@@ -1,4 +1,4 @@
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Questionmarket.com.xml b/src/chrome/content/rules/Questionmarket.com.xml
index ef9037965deb..9f9a76e0a2c2 100644
--- a/src/chrome/content/rules/Questionmarket.com.xml
+++ b/src/chrome/content/rules/Questionmarket.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.questionmarket.com/ => https://www.questionmarket.com/:
 	^questionmarket.com doesn't exist.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/QuickBase.com.xml b/src/chrome/content/rules/QuickBase.com.xml
new file mode 100644
index 000000000000..c8c8b7d9efe4
--- /dev/null
+++ b/src/chrome/content/rules/QuickBase.com.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/QuickHash.com.xml b/src/chrome/content/rules/QuickHash.com.xml
index cd6d01f209b6..482588dda8be 100644
--- a/src/chrome/content/rules/QuickHash.com.xml
+++ b/src/chrome/content/rules/QuickHash.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.quickhash.com/ => https://www.quickhash.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.quickhash.com'")
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/QuickSilverMail.net.xml b/src/chrome/content/rules/QuickSilverMail.net.xml
new file mode 100644
index 000000000000..7f0e8444e132
--- /dev/null
+++ b/src/chrome/content/rules/QuickSilverMail.net.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Quick_Shopping_Cart.xml b/src/chrome/content/rules/Quick_Shopping_Cart.xml
index 5b169e168b0e..8de97bf3b27b 100644
--- a/src/chrome/content/rules/Quick_Shopping_Cart.xml
+++ b/src/chrome/content/rules/Quick_Shopping_Cart.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.fastshoppingcart.com/ => https://www.fastshoppingcart.co
 	^fastshoppingcart.com: Redirects to app over http
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/QuizAction.de.xml b/src/chrome/content/rules/QuizAction.de.xml
index e2e561362aa1..a459c09bca01 100644
--- a/src/chrome/content/rules/QuizAction.de.xml
+++ b/src/chrome/content/rules/QuizAction.de.xml
@@ -5,7 +5,9 @@
 
 
 	
-	
+	
+	
+	
 		
diff --git a/src/chrome/content/rules/Quizsnack.com.xml b/src/chrome/content/rules/Quizsnack.com.xml
deleted file mode 100644
index 4aec6cf840c7..000000000000
--- a/src/chrome/content/rules/Quizsnack.com.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Qune.kuluttajavirasto.fi.xml b/src/chrome/content/rules/Qune.kuluttajavirasto.fi.xml
index 221fd8e56a1a..0c50a7b77b8e 100644
--- a/src/chrome/content/rules/Qune.kuluttajavirasto.fi.xml
+++ b/src/chrome/content/rules/Qune.kuluttajavirasto.fi.xml
@@ -6,8 +6,8 @@ Fetch error: http://qune.kuluttajavirasto.fi/ => https://qune.kuluttajavirasto.f
 Disabled by https-everywhere-checker because:
 Fetch error: http://qune.kuluttajavirasto.fi/ => https://qune.kuluttajavirasto.fi/: (6, 'Could not resolve host: qune.kuluttajavirasto.fi')
 -->
-
+
   
   
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Quora.xml b/src/chrome/content/rules/Quora.xml
deleted file mode 100644
index a3596749c6db..000000000000
--- a/src/chrome/content/rules/Quora.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/QupZilla.com.xml b/src/chrome/content/rules/QupZilla.com.xml
deleted file mode 100644
index 527be886bc71..000000000000
--- a/src/chrome/content/rules/QupZilla.com.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/QuranCore.com.xml b/src/chrome/content/rules/QuranCore.com.xml
new file mode 100644
index 000000000000..759579981409
--- /dev/null
+++ b/src/chrome/content/rules/QuranCore.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/QuranicAudio.com.xml b/src/chrome/content/rules/QuranicAudio.com.xml
index 7c8e1035f0b5..958980dcd1f0 100644
--- a/src/chrome/content/rules/QuranicAudio.com.xml
+++ b/src/chrome/content/rules/QuranicAudio.com.xml
@@ -4,7 +4,6 @@
 	- Sunnah.com.xml
 
 	Invalid certificate:
-	- www.quranicaudio.com
 	- download2.quranicaudio.com
 	- madinah.quranicaudio.com
 	- makkah.quranicaudio.com
@@ -13,6 +12,7 @@
 -->
 
 	
+	
 	
 	
 
diff --git a/src/chrome/content/rules/Quto.ru.xml b/src/chrome/content/rules/Quto.ru.xml
index f5e91cf55514..5e243957ad84 100644
--- a/src/chrome/content/rules/Quto.ru.xml
+++ b/src/chrome/content/rules/Quto.ru.xml
@@ -9,7 +9,7 @@
 	* Server sends no certificate chain, see https://whatsmychaincert.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Quup.com.xml b/src/chrome/content/rules/Quup.com.xml
index ac78c77ef08c..51917a1e1a2f 100644
--- a/src/chrome/content/rules/Quup.com.xml
+++ b/src/chrome/content/rules/Quup.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.quup.com/ => https://quup.com/: (60, 'SSL certificate pr
 	www.quup.com: Cert only matches ^quup.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Qweery.xml b/src/chrome/content/rules/Qweery.xml
index 51ad3a20d710..946e22ad88f7 100644
--- a/src/chrome/content/rules/Qweery.xml
+++ b/src/chrome/content/rules/Qweery.xml
@@ -7,7 +7,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://box.qweery.nl/ => https://box.qweery.nl/: (6, 'Could not resolve host: box.qweery.nl')	!functional:
 		- (www.)qweery.nl
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/R-HPC.xml b/src/chrome/content/rules/R-HPC.xml
index 3ed9253b2d6f..c13d173cf13c 100644
--- a/src/chrome/content/rules/R-HPC.xml
+++ b/src/chrome/content/rules/R-HPC.xml
@@ -5,7 +5,7 @@ Fetch error: http://r-hpc.com/ => https://r-hpc.com/: (28, 'Connection timed out
 Fetch error: http://www.r-hpc.com/ => https://www.r-hpc.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/R-kom.xml b/src/chrome/content/rules/R-kom.xml
index b8a478355711..919efe1aa0a8 100644
--- a/src/chrome/content/rules/R-kom.xml
+++ b/src/chrome/content/rules/R-kom.xml
@@ -5,7 +5,5 @@
 
 
 
-
-
 
 
diff --git a/src/chrome/content/rules/R-phylo.org.xml b/src/chrome/content/rules/R-phylo.org.xml
new file mode 100644
index 000000000000..f6056cd89e18
--- /dev/null
+++ b/src/chrome/content/rules/R-phylo.org.xml
@@ -0,0 +1,8 @@
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/R-project.org.xml b/src/chrome/content/rules/R-project.org.xml
index 858115f0fc68..20504cf7362a 100644
--- a/src/chrome/content/rules/R-project.org.xml
+++ b/src/chrome/content/rules/R-project.org.xml
@@ -12,7 +12,7 @@
 		translation.r-project.org
 
 -->
-
+
 
 	
 	
@@ -25,9 +25,17 @@
 	
 	
 	
+	
 	
 	
 
+	
+
+		
+		
+		
+
 	
 
diff --git a/src/chrome/content/rules/R01.xml b/src/chrome/content/rules/R01.xml
index c2ce92216bed..e0e643dca5d1 100644
--- a/src/chrome/content/rules/R01.xml
+++ b/src/chrome/content/rules/R01.xml
@@ -10,13 +10,12 @@
 -->
 
 
-	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/R66T.xml b/src/chrome/content/rules/R66T.xml
index 4036ccf7e210..8890155bb802 100644
--- a/src/chrome/content/rules/R66T.xml
+++ b/src/chrome/content/rules/R66T.xml
@@ -16,7 +16,7 @@ Fetch error: http://www.r66t.com/ => https://www.onsiteconcierge.com/: (51, "SSL
 		- (www.)r66t.com	(mismatched, CN: *.onsiteconcierge.com)
 
 -->
-
+
 
 	
 	
@@ -30,4 +30,4 @@ Fetch error: http://www.r66t.com/ => https://www.onsiteconcierge.com/: (51, "SSL
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/RAC.xml b/src/chrome/content/rules/RAC.xml
index 4bc352b1d9c2..fef0c20c7e62 100644
--- a/src/chrome/content/rules/RAC.xml
+++ b/src/chrome/content/rules/RAC.xml
@@ -2,7 +2,7 @@
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/RAINN.org.xml b/src/chrome/content/rules/RAINN.org.xml
index 9ea0723348eb..0f484c96153d 100644
--- a/src/chrome/content/rules/RAINN.org.xml
+++ b/src/chrome/content/rules/RAINN.org.xml
@@ -29,7 +29,11 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 
 
 	
@@ -39,7 +43,6 @@
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/RAM_Host.us.xml b/src/chrome/content/rules/RAM_Host.us.xml
index 6fd1afcdf312..a3b1276d327f 100644
--- a/src/chrome/content/rules/RAM_Host.us.xml
+++ b/src/chrome/content/rules/RAM_Host.us.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://forum.ramhost.us/ => https://forum.ramhost.us/: Too many redirects while fetching 'https://forum.ramhost.us/'
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/RAND.xml b/src/chrome/content/rules/RAND.xml
index 46c63fd82873..59ad4e41f8ba 100644
--- a/src/chrome/content/rules/RAND.xml
+++ b/src/chrome/content/rules/RAND.xml
@@ -15,7 +15,7 @@
 
 
 	
-	
+	
 
 
 	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/RC24.xyz.xml b/src/chrome/content/rules/RC24.xyz.xml
new file mode 100644
index 000000000000..6d32411cc7ec
--- /dev/null
+++ b/src/chrome/content/rules/RC24.xyz.xml
@@ -0,0 +1,38 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/RCI.com.xml b/src/chrome/content/rules/RCI.com.xml
index ab50170e9a04..cce2efef0af8 100644
--- a/src/chrome/content/rules/RCI.com.xml
+++ b/src/chrome/content/rules/RCI.com.xml
@@ -30,7 +30,7 @@
 
 	
-	
-	
 
diff --git a/src/chrome/content/rules/RCITravelStore.co.uk.xml b/src/chrome/content/rules/RCITravelStore.co.uk.xml
deleted file mode 100644
index bf0a985d3b4f..000000000000
--- a/src/chrome/content/rules/RCITravelStore.co.uk.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/RCUK.ac.uk.xml b/src/chrome/content/rules/RCUK.ac.uk.xml
index 095cee95b4c5..cda38a59e01d 100644
--- a/src/chrome/content/rules/RCUK.ac.uk.xml
+++ b/src/chrome/content/rules/RCUK.ac.uk.xml
@@ -1,7 +1,7 @@
 
 
 
diff --git a/src/chrome/content/rules/RECRegistry.xml b/src/chrome/content/rules/RECRegistry.xml
index 1db8d5086bb3..8bae0b6bbca9 100644
--- a/src/chrome/content/rules/RECRegistry.xml
+++ b/src/chrome/content/rules/RECRegistry.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/REWAG.xml b/src/chrome/content/rules/REWAG.xml
index 7761a6c30874..37790c9bbff2 100644
--- a/src/chrome/content/rules/REWAG.xml
+++ b/src/chrome/content/rules/REWAG.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.rewag.de/ => https://www.rewag.de/: (60, 'SSL certificat
 	Regensburger Energie- und Wasserversorgung AG
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/RFC_Express.xml b/src/chrome/content/rules/RFC_Express.xml
index 00dc8ba7f361..a3c651a432f2 100644
--- a/src/chrome/content/rules/RFC_Express.xml
+++ b/src/chrome/content/rules/RFC_Express.xml
@@ -5,7 +5,7 @@ Fetch error: http://rfcexpress.com/ => https://rfcexpress.com/: (28, 'Connection
 Fetch error: http://www.rfcexpress.com/ => https://www.rfcexpress.com/: (28, 'Connection timed out after 20002 milliseconds')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.rfcexpress.com/ => https://www.rfcexpress.com/: (28, 'Co
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/RHUL.ac.uk.xml b/src/chrome/content/rules/RHUL.ac.uk.xml
index 85ccf0e9f9e9..1b41c7806d90 100644
--- a/src/chrome/content/rules/RHUL.ac.uk.xml
+++ b/src/chrome/content/rules/RHUL.ac.uk.xml
@@ -40,7 +40,11 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 		
 		
 
@@ -57,7 +61,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/RIA.com.xml b/src/chrome/content/rules/RIA.com.xml
index 9fe513d331cd..e3ab3e703493 100644
--- a/src/chrome/content/rules/RIA.com.xml
+++ b/src/chrome/content/rules/RIA.com.xml
@@ -1,7 +1,6 @@
 
-
-
-	
-	
-	
-
-		
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/RIAA.com.xml b/src/chrome/content/rules/RIAA.com.xml
new file mode 100644
index 000000000000..a904746e1002
--- /dev/null
+++ b/src/chrome/content/rules/RIAA.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/RIAA.xml b/src/chrome/content/rules/RIAA.xml
deleted file mode 100644
index 821213f9157c..000000000000
--- a/src/chrome/content/rules/RIAA.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-  
-  
-
-  
-
diff --git a/src/chrome/content/rules/RIKEN.jp.xml b/src/chrome/content/rules/RIKEN.jp.xml
index 0b6523e74036..d8d3fd944586 100644
--- a/src/chrome/content/rules/RIKEN.jp.xml
+++ b/src/chrome/content/rules/RIKEN.jp.xml
@@ -3,6 +3,7 @@
 
 		- (www.)? ¹
 		- 100th ¹
+		- hpci-tech.aics (timeout)
 
 		- brainatlas.brain ¹
 		- bsi-ni.brain ¹
@@ -40,7 +41,6 @@
 
 	
-	
 	
 	
 	
@@ -73,7 +73,7 @@
 	
 	
 
-	
+	
 
 
 	 https://ntid.rit.edu/: (51, "SSL: no altern
 		- favicon on artoncampus from $self
 
 -->
-
+
 
 	
@@ -119,6 +119,7 @@ Fetch error: http://ntid.rit.edu/ => https://ntid.rit.edu/: (51, "SSL: no altern
 	
 	
 	
+	
 	
 	
 	
diff --git a/src/chrome/content/rules/RL_Rose.xml b/src/chrome/content/rules/RL_Rose.xml
index e1123264ae6d..2f621868c4b5 100644
--- a/src/chrome/content/rules/RL_Rose.xml
+++ b/src/chrome/content/rules/RL_Rose.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/RMF.pl.xml b/src/chrome/content/rules/RMF.pl.xml
new file mode 100644
index 000000000000..e8cf5a793ad5
--- /dev/null
+++ b/src/chrome/content/rules/RMF.pl.xml
@@ -0,0 +1,76 @@
+
+
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/RNR_Wheels_and_Tires.xml b/src/chrome/content/rules/RNR_Wheels_and_Tires.xml
index bbb1cf2ea099..d92b1b87d2c7 100644
--- a/src/chrome/content/rules/RNR_Wheels_and_Tires.xml
+++ b/src/chrome/content/rules/RNR_Wheels_and_Tires.xml
@@ -11,10 +11,11 @@ Fetch error: http://rnrwheels.com/ => https://www.rnrwheels.com/: (35, 'error:14
 	mixedcontent due to css served from static.ning.com
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/RNW.nl.xml b/src/chrome/content/rules/RNW.nl.xml
index 76f0ce5eb5b1..1ef5f9868686 100644
--- a/src/chrome/content/rules/RNW.nl.xml
+++ b/src/chrome/content/rules/RNW.nl.xml
@@ -10,18 +10,6 @@
 
 	* Refused
 
-
-	Fully covered subdomains:
-
-		- intranet
-		- ocs
-		- rvt-docs
-		- sites
-		- vpn
-		- webmail
-		- webtier
-
-
 	Observed cookie domains:
 
 		- .
@@ -37,16 +25,14 @@
 		- .www
 
 -->
-
+
 
-	
-		
+	
 
 
-	
+	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/RNZ.de.xml b/src/chrome/content/rules/RNZ.de.xml
index caa26dce7d6f..9a790316d929 100644
--- a/src/chrome/content/rules/RNZ.de.xml
+++ b/src/chrome/content/rules/RNZ.de.xml
@@ -4,7 +4,7 @@
 		sportwahl.rnz.de
 		www.sportwahl.rnz.de
 		seniorenportal.rnz.de
-		
+
 	Time-Out:
 		adcept.rnz.de
 		osc.rnz.de
diff --git a/src/chrome/content/rules/ROBEHA.de.xml b/src/chrome/content/rules/ROBEHA.de.xml
new file mode 100644
index 000000000000..fd796845df43
--- /dev/null
+++ b/src/chrome/content/rules/ROBEHA.de.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/ROBOXchange.xml b/src/chrome/content/rules/ROBOXchange.xml
deleted file mode 100644
index fa8f61c19206..000000000000
--- a/src/chrome/content/rules/ROBOXchange.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-	
-  
-
-	
-  
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/ROCKZi.com.xml b/src/chrome/content/rules/ROCKZi.com.xml
index 22eec381f2e7..f19fadd05c92 100644
--- a/src/chrome/content/rules/ROCKZi.com.xml
+++ b/src/chrome/content/rules/ROCKZi.com.xml
@@ -18,7 +18,7 @@ Fetch error: http://rockzi.com/ => https://rockzi.com/: Too many redirects while
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ROHC-lib.org.xml b/src/chrome/content/rules/ROHC-lib.org.xml
index 1f4758696191..32c6909c27c2 100644
--- a/src/chrome/content/rules/ROHC-lib.org.xml
+++ b/src/chrome/content/rules/ROHC-lib.org.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.rohc-lib.org/ => https://www.rohc-lib.org/: (60, 'SSL ce
 	www: Mismatched
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ROI.ru.xml b/src/chrome/content/rules/ROI.ru.xml
index cbbd2fdcbee2..8732ee6065e3 100644
--- a/src/chrome/content/rules/ROI.ru.xml
+++ b/src/chrome/content/rules/ROI.ru.xml
@@ -12,13 +12,14 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ROI_Solutions.xml b/src/chrome/content/rules/ROI_Solutions.xml
index 5a0d9515706b..44e5d6ceda3d 100644
--- a/src/chrome/content/rules/ROI_Solutions.xml
+++ b/src/chrome/content/rules/ROI_Solutions.xml
@@ -8,4 +8,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/RPGRussia.com.xml b/src/chrome/content/rules/RPGRussia.com.xml
new file mode 100644
index 000000000000..63f84bfb6d37
--- /dev/null
+++ b/src/chrome/content/rules/RPGRussia.com.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/RPXCorp.com.xml b/src/chrome/content/rules/RPXCorp.com.xml
index a536771ad42b..f8db44b0e6aa 100644
--- a/src/chrome/content/rules/RPXCorp.com.xml
+++ b/src/chrome/content/rules/RPXCorp.com.xml
@@ -31,6 +31,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/RPXNow.com.xml b/src/chrome/content/rules/RPXNow.com.xml
index e8e6d497089c..2dd66d8cee2e 100644
--- a/src/chrome/content/rules/RPXNow.com.xml
+++ b/src/chrome/content/rules/RPXNow.com.xml
@@ -1,52 +1,16 @@
 
-
-
+
 	
-	
-
-		
-
-			
-			
-			
-
-		
-		
-		
-
-		
-		
-		
-
-
-	
-
-
-	
-
-		
-
-	
+	
+	
+	
+	
+	
 
+	
 
diff --git a/src/chrome/content/rules/RRTS.com.xml b/src/chrome/content/rules/RRTS.com.xml
index 59bf8871a20b..26af6c7da70a 100644
--- a/src/chrome/content/rules/RRTS.com.xml
+++ b/src/chrome/content/rules/RRTS.com.xml
@@ -21,7 +21,10 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/RSA.xml b/src/chrome/content/rules/RSA.xml
index 26fdd61be37c..b2c416046b36 100644
--- a/src/chrome/content/rules/RSA.xml
+++ b/src/chrome/content/rules/RSA.xml
@@ -19,7 +19,8 @@
 -->
 
   
-  
+  
+  
 
 
 	
@@ -28,7 +29,6 @@
 
   
 
-	
 
+  
 
diff --git a/src/chrome/content/rules/RSA_Conference.xml b/src/chrome/content/rules/RSA_Conference.xml
index 78187a8d8e17..ef013691c8c5 100644
--- a/src/chrome/content/rules/RSA_Conference.xml
+++ b/src/chrome/content/rules/RSA_Conference.xml
@@ -11,7 +11,7 @@ Fetch error: http://dev.rsaconference.com/ => https://dev.rsaconference.com/: (6
 			- a127.g.akamai.net
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/RSC.org.uk.xml b/src/chrome/content/rules/RSC.org.uk.xml
index d0f88730fa5b..1478df58b0f0 100644
--- a/src/chrome/content/rules/RSC.org.uk.xml
+++ b/src/chrome/content/rules/RSC.org.uk.xml
@@ -22,7 +22,7 @@ Non-2xx HTTP code: http://mail.rsc.org.uk/ (200) => https://mail.rsc.org.uk/ (40
 		- www.rsc.org.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/RSOLConference.org.xml b/src/chrome/content/rules/RSOLConference.org.xml
new file mode 100644
index 000000000000..d662d0bf9d3a
--- /dev/null
+++ b/src/chrome/content/rules/RSOLConference.org.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/RSPCA_shop.co.uk.xml b/src/chrome/content/rules/RSPCA_shop.co.uk.xml
index 414c12b2a509..0b273630731f 100644
--- a/src/chrome/content/rules/RSPCA_shop.co.uk.xml
+++ b/src/chrome/content/rules/RSPCA_shop.co.uk.xml
@@ -13,13 +13,13 @@ Fetch error: http://rspcashop.co.uk/ => https://rspcashop.co.uk/: (7, 'Failed to
 	For other RSPCA coverage, see RSPCA.xml.
 
 -->
-
+
 
 	
 	
 
 
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/RSSinclude.xml b/src/chrome/content/rules/RSSinclude.xml
index dce0bf803963..afdb785d118b 100644
--- a/src/chrome/content/rules/RSSinclude.xml
+++ b/src/chrome/content/rules/RSSinclude.xml
@@ -7,4 +7,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/RSSing.com.xml b/src/chrome/content/rules/RSSing.com.xml
index 373fb9eca2cb..45766bb8326b 100644
--- a/src/chrome/content/rules/RSSing.com.xml
+++ b/src/chrome/content/rules/RSSing.com.xml
@@ -11,7 +11,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/RST_forums.com.xml b/src/chrome/content/rules/RST_forums.com.xml
index 00f9badd68c0..47da661bddf8 100644
--- a/src/chrome/content/rules/RST_forums.com.xml
+++ b/src/chrome/content/rules/RST_forums.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://www.rstforums.com/ => https://www.rstforums.com/: (51, "SSL:
 		- .rstforums.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/RSVP.xml b/src/chrome/content/rules/RSVP.xml
index a9afb5ba9841..21369c9282ee 100644
--- a/src/chrome/content/rules/RSVP.xml
+++ b/src/chrome/content/rules/RSVP.xml
@@ -9,7 +9,9 @@
 
 
 	
-	
+	
+	
+	
 
 	
diff --git a/src/chrome/content/rules/RStudio.com.xml b/src/chrome/content/rules/RStudio.com.xml
index dc9b02737314..e32e843a1e94 100644
--- a/src/chrome/content/rules/RStudio.com.xml
+++ b/src/chrome/content/rules/RStudio.com.xml
@@ -20,7 +20,7 @@
 	
 
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/RT.com.xml b/src/chrome/content/rules/RT.com.xml
index a0e54dfdd41b..0762e7ce3a82 100644
--- a/src/chrome/content/rules/RT.com.xml
+++ b/src/chrome/content/rules/RT.com.xml
@@ -1,100 +1,41 @@
-
 
-
-
-	
+
 	
 	
 	
 	
 	
 	
+	
+	
 	
 	
 	
 	
+	
 	
 	
 	
 	
-	
+	
 	
 	
 	
 	
-	
+	
+	
 	
 	
 
-	
-	
-
-		
-		
-		
-		
-
-
 	
 
-
-	
-	
-
-		
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/RTE.xml b/src/chrome/content/rules/RTE.xml
index cbb092d2ec15..e56a6c373df7 100644
--- a/src/chrome/content/rules/RTE.xml
+++ b/src/chrome/content/rules/RTE.xml
@@ -1,9 +1,4 @@
 
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/RTHK.hk.xml b/src/chrome/content/rules/RTHK.hk.xml
new file mode 100644
index 000000000000..2da74c285fc4
--- /dev/null
+++ b/src/chrome/content/rules/RTHK.hk.xml
@@ -0,0 +1,56 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+		
+	
+	
+		
+		
+		
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/RTHK.org.hk.xml b/src/chrome/content/rules/RTHK.org.hk.xml
new file mode 100644
index 000000000000..ddbbc30f6c53
--- /dev/null
+++ b/src/chrome/content/rules/RTHK.org.hk.xml
@@ -0,0 +1,28 @@
+
+
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/RTL.de.xml b/src/chrome/content/rules/RTL.de.xml
deleted file mode 100644
index 34ce36d28c5a..000000000000
--- a/src/chrome/content/rules/RTL.de.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-	
-
diff --git a/src/chrome/content/rules/RTP.vc.xml b/src/chrome/content/rules/RTP.vc.xml
index 59acf3805612..fe131b0b06ee 100644
--- a/src/chrome/content/rules/RTP.vc.xml
+++ b/src/chrome/content/rules/RTP.vc.xml
@@ -6,7 +6,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/RTS-Planeta.xml b/src/chrome/content/rules/RTS-Planeta.xml
new file mode 100644
index 000000000000..126a2415338f
--- /dev/null
+++ b/src/chrome/content/rules/RTS-Planeta.xml
@@ -0,0 +1,9 @@
+
+
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/RT_Tire.xml b/src/chrome/content/rules/RT_Tire.xml
index f6619a3e4751..4a21c6607bdd 100644
--- a/src/chrome/content/rules/RT_Tire.xml
+++ b/src/chrome/content/rules/RT_Tire.xml
@@ -5,7 +5,7 @@ Fetch error: http://rttire.com/ => https://rttire.com/: (51, "SSL: no alternativ
 Fetch error: http://www.rttire.com/ => https://www.rttire.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.rttire.com'")
 
 -->
-
+
 
 	
 	
@@ -13,4 +13,4 @@ Fetch error: http://www.rttire.com/ => https://www.rttire.com/: (51, "SSL: no al
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/RU-Golos.xml b/src/chrome/content/rules/RU-Golos.xml
index 28492db510bf..5892ea98da73 100644
--- a/src/chrome/content/rules/RU-Golos.xml
+++ b/src/chrome/content/rules/RU-Golos.xml
@@ -10,4 +10,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/RUDI.net.xml b/src/chrome/content/rules/RUDI.net.xml
index 8c5415c5fcc5..6db8a360446b 100644
--- a/src/chrome/content/rules/RUDI.net.xml
+++ b/src/chrome/content/rules/RUDI.net.xml
@@ -15,7 +15,7 @@
 
 
 	
-	
+	
 
 
 	
@@ -24,4 +24,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/RYOT.xml b/src/chrome/content/rules/RYOT.xml
index 04fafa05fc58..4ae7eafd9a07 100644
--- a/src/chrome/content/rules/RYOT.xml
+++ b/src/chrome/content/rules/RYOT.xml
@@ -12,7 +12,7 @@
 	* See https://whatsmychaincert.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/RaKdigital.xml b/src/chrome/content/rules/RaKdigital.xml
index 90e86b06f453..918b1077ae22 100644
--- a/src/chrome/content/rules/RaKdigital.xml
+++ b/src/chrome/content/rules/RaKdigital.xml
@@ -7,13 +7,13 @@
 -->
 
 
-	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Raam.org.xml b/src/chrome/content/rules/Raam.org.xml
index 58e4b56d1256..69eb2494faeb 100644
--- a/src/chrome/content/rules/Raam.org.xml
+++ b/src/chrome/content/rules/Raam.org.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.raam.org/ => https://raam.org/: (60, 'SSL certificate pr
 	www.raam.org: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/RaceForward.org.xml b/src/chrome/content/rules/RaceForward.org.xml
new file mode 100644
index 000000000000..8d23405768d4
--- /dev/null
+++ b/src/chrome/content/rules/RaceForward.org.xml
@@ -0,0 +1,21 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Race_Forward.org.xml b/src/chrome/content/rules/Race_Forward.org.xml
deleted file mode 100644
index 05d8a2ef10c3..000000000000
--- a/src/chrome/content/rules/Race_Forward.org.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-	
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Rack911.xml b/src/chrome/content/rules/Rack911.xml
index 609ec0e44ded..907a97c2570e 100644
--- a/src/chrome/content/rules/Rack911.xml
+++ b/src/chrome/content/rules/Rack911.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Racketboy.com.xml b/src/chrome/content/rules/Racketboy.com.xml
new file mode 100644
index 000000000000..9f235d49cceb
--- /dev/null
+++ b/src/chrome/content/rules/Racketboy.com.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Rackspace.co.uk.xml b/src/chrome/content/rules/Rackspace.co.uk.xml
index 8ecf1cbb5c07..c8e8351237d2 100644
--- a/src/chrome/content/rules/Rackspace.co.uk.xml
+++ b/src/chrome/content/rules/Rackspace.co.uk.xml
@@ -40,7 +40,7 @@ Fetch error: http://buyonline.rackspace.co.uk/ => https://buyonline.rackspace.co
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Rackspace.co.za.xml b/src/chrome/content/rules/Rackspace.co.za.xml
index 0884040c49bb..6b51c731cc3d 100644
--- a/src/chrome/content/rules/Rackspace.co.za.xml
+++ b/src/chrome/content/rules/Rackspace.co.za.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.rackspace.co.za/ => https://www.rackspace.co.za/: (60, '
 	For other Rackspace coverage, see Rackspace.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Rackspace.dk.xml b/src/chrome/content/rules/Rackspace.dk.xml
index 9bdeae08f7b3..b4abf73fa915 100644
--- a/src/chrome/content/rules/Rackspace.dk.xml
+++ b/src/chrome/content/rules/Rackspace.dk.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.rackspace.dk/ => https://www.rackspace.dk/: (60, 'SSL ce
 	For other Rackspace coverage, see Rackspace.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Rackspace.hk.xml b/src/chrome/content/rules/Rackspace.hk.xml
index ce065efd8405..2f0c9a32d776 100644
--- a/src/chrome/content/rules/Rackspace.hk.xml
+++ b/src/chrome/content/rules/Rackspace.hk.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.rackspace.hk/ => https://www.rackspace.hk/: (51, "SSL: n
 	For other Rackspace coverage, see Rackspace.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Rackspace.xml b/src/chrome/content/rules/Rackspace.xml
index 2c59589c8585..8a6fb1b611b0 100644
--- a/src/chrome/content/rules/Rackspace.xml
+++ b/src/chrome/content/rules/Rackspace.xml
@@ -12,7 +12,6 @@ Fetch error: http://stories.rackspace.com/ => https://stories.rackspace.com/: (5
 
 	Other Rackspace rulesets:
 
-		- Mailgun.com.xml
 		- Mailgun.net.xml
 		- Mosso.com.xml
 		- RackCDN.com.xml
@@ -93,7 +92,7 @@ Fetch error: http://stories.rackspace.com/ => https://stories.rackspace.com/: (5
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Radare.org.xml b/src/chrome/content/rules/Radare.org.xml
new file mode 100644
index 000000000000..7ae5fbc321cd
--- /dev/null
+++ b/src/chrome/content/rules/Radare.org.xml
@@ -0,0 +1,16 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Radboud-University-Nijmegen.xml b/src/chrome/content/rules/Radboud-University-Nijmegen.xml
index 8cd33190bc02..de86948d19c5 100644
--- a/src/chrome/content/rules/Radboud-University-Nijmegen.xml
+++ b/src/chrome/content/rules/Radboud-University-Nijmegen.xml
@@ -11,11 +11,33 @@ Fetch error: http://ru.nl/ => https://www.ru.nl/: Cycle detected - URL already e
 		- www2.cmbi.ru.nl	(cert: www.cmbi.ru.nl; redirects to http)
 
 -->
-
+
 
-	
+	
+	
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
 
 
@@ -23,15 +45,12 @@ Fetch error: http://ru.nl/ => https://www.ru.nl/: Cycle detected - URL already e
 	
 
 
-	
 
 	
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Raddle.me.xml b/src/chrome/content/rules/Raddle.me.xml
index e7f74bf7f523..ef5bd387ffe8 100644
--- a/src/chrome/content/rules/Raddle.me.xml
+++ b/src/chrome/content/rules/Raddle.me.xml
@@ -1,6 +1,4 @@
 
-	
-	
 
 	
 	
diff --git a/src/chrome/content/rules/Radentscheid-frankfurt.de.xml b/src/chrome/content/rules/Radentscheid-frankfurt.de.xml
new file mode 100644
index 000000000000..8cb7cc10f080
--- /dev/null
+++ b/src/chrome/content/rules/Radentscheid-frankfurt.de.xml
@@ -0,0 +1,14 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Radical_Designs.xml b/src/chrome/content/rules/Radical_Designs.xml
deleted file mode 100644
index 802eced92d1a..000000000000
--- a/src/chrome/content/rules/Radical_Designs.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Radikal.com.tr.xml b/src/chrome/content/rules/Radikal.com.tr.xml
deleted file mode 100644
index b625b7519283..000000000000
--- a/src/chrome/content/rules/Radikal.com.tr.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/RadioLab.org.xml b/src/chrome/content/rules/RadioLab.org.xml
deleted file mode 100644
index d46f43c50d99..000000000000
--- a/src/chrome/content/rules/RadioLab.org.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/RadioShack.xml b/src/chrome/content/rules/RadioShack.xml
index 5623b6f350e2..65317dce5f29 100644
--- a/src/chrome/content/rules/RadioShack.xml
+++ b/src/chrome/content/rules/RadioShack.xml
@@ -30,13 +30,14 @@ Fetch error: http://www.radioshackwireless.com/ => https://radioshackwireless.co
 		- www.radioshackcorporation.com	(self-signed; shows blank page)
 
 -->
-
+
 
 	
 	
 	
 	
-	
+	
+	
 		
 	
 	
@@ -84,18 +85,17 @@ Fetch error: http://www.radioshackwireless.com/ => https://radioshackwireless.co
 
 
 		Cert only matches www.
-					
+
 	
 
 	
 
-	
 
 	
 	
 
+	
 
diff --git a/src/chrome/content/rules/Radio_Woodstock.com.xml b/src/chrome/content/rules/Radio_Woodstock.com.xml
deleted file mode 100644
index c405b99e0459..000000000000
--- a/src/chrome/content/rules/Radio_Woodstock.com.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Radiological_Society_of_North_America.xml b/src/chrome/content/rules/Radiological_Society_of_North_America.xml
index 0b89e5e9b84d..2922c083c5fb 100644
--- a/src/chrome/content/rules/Radiological_Society_of_North_America.xml
+++ b/src/chrome/content/rules/Radiological_Society_of_North_America.xml
@@ -9,13 +9,14 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Radioreference.com.xml b/src/chrome/content/rules/Radioreference.com.xml
new file mode 100644
index 000000000000..caea01993746
--- /dev/null
+++ b/src/chrome/content/rules/Radioreference.com.xml
@@ -0,0 +1,14 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/RadiumOne.xml b/src/chrome/content/rules/RadiumOne.xml
index d1b158d520da..c3d49b0be7ec 100644
--- a/src/chrome/content/rules/RadiumOne.xml
+++ b/src/chrome/content/rules/RadiumOne.xml
@@ -1,35 +1,149 @@
+
+
+
 
 
 
-	
-	
-	
+	
+	
 
+	
+	
+	
+	
+	
+	
 
-	
-	
-	
+	
+	
 
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
+	
 
 	
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Raiffeisen.ch.xml b/src/chrome/content/rules/Raiffeisen.ch.xml
index c0f2adf7cd95..ddf3b3864c73 100644
--- a/src/chrome/content/rules/Raiffeisen.ch.xml
+++ b/src/chrome/content/rules/Raiffeisen.ch.xml
@@ -17,8 +17,6 @@
 	
 	
 	
-	
-	
 	
 	
 		
diff --git a/src/chrome/content/rules/Raiffeisen.ru.xml b/src/chrome/content/rules/Raiffeisen.ru.xml
index 39813ec3ebce..c6c7f8a763bf 100644
--- a/src/chrome/content/rules/Raiffeisen.ru.xml
+++ b/src/chrome/content/rules/Raiffeisen.ru.xml
@@ -118,7 +118,7 @@ ielba.raiffeisen.ru different content
 ⁶ redirect
 ⁷ protocol error
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Railsbox.io.xml b/src/chrome/content/rules/Railsbox.io.xml
deleted file mode 100644
index 8242fc3f4afa..000000000000
--- a/src/chrome/content/rules/Railsbox.io.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Rally_Congress.xml b/src/chrome/content/rules/Rally_Congress.xml
index e1903ec85ede..5da180e08f76 100644
--- a/src/chrome/content/rules/Rally_Congress.xml
+++ b/src/chrome/content/rules/Rally_Congress.xml
@@ -8,11 +8,11 @@ Fetch error: http://secure.rallycongress.com/ => https://secure.rallycongress.co
 		- (www.)	(shows secure; mismatched, CN: secure.rallycongress.com)
 
 -->
-
+
 
 	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Rally_Dev.com.xml b/src/chrome/content/rules/Rally_Dev.com.xml
index 6491236861ca..8d57f28a0829 100644
--- a/src/chrome/content/rules/Rally_Dev.com.xml
+++ b/src/chrome/content/rules/Rally_Dev.com.xml
@@ -16,7 +16,7 @@ Fetch error: http://community.rallydev.com/ => https://community.rallydev.com/:
 		- us1.rallydev.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/RamNode.com.xml b/src/chrome/content/rules/RamNode.com.xml
index 0dda32d7fabf..4f7e9f663e6e 100644
--- a/src/chrome/content/rules/RamNode.com.xml
+++ b/src/chrome/content/rules/RamNode.com.xml
@@ -30,7 +30,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
-
+
 	
-	
 	
-	
 	
 	
-	
-	
-	
-	
-	
 	
 	
 	
@@ -79,73 +40,35 @@ Refused connection:
 	
 	
 	
-	
-	
-	
 	
 	
 	
-	
 	
 	
 	
 	
 	
+	
 	
-	
 	
 	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-		
 	
-	
-	
-	
+	
 	
-	
+	
 	
 	
 	
-	
-	
-	
-	
 	
+	
 	
 	
-	
 	
 	
 	
 	
+	
+	
 
-	
-	
 	
 
diff --git a/src/chrome/content/rules/RanalloLawOffice.com.xml b/src/chrome/content/rules/RanalloLawOffice.com.xml
new file mode 100644
index 000000000000..99b104245539
--- /dev/null
+++ b/src/chrome/content/rules/RanalloLawOffice.com.xml
@@ -0,0 +1,9 @@
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Randaris-Anime.net.xml b/src/chrome/content/rules/Randaris-Anime.net.xml
new file mode 100644
index 000000000000..6046bcba9c78
--- /dev/null
+++ b/src/chrome/content/rules/Randaris-Anime.net.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Randischumann.dk.xml b/src/chrome/content/rules/Randischumann.dk.xml
index 365cd3e57208..7b7fa280e743 100644
--- a/src/chrome/content/rules/Randischumann.dk.xml
+++ b/src/chrome/content/rules/Randischumann.dk.xml
@@ -5,7 +5,7 @@ Fetch error: http://psykologteam.dk/ => https://psykologteam.dk/: (6, 'Could not
 Fetch error: http://www.psykologteam.dk/ => https://www.psykologteam.dk/: (6, 'Could not resolve host: www.psykologteam.dk')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/RandomOrg.xml b/src/chrome/content/rules/RandomOrg.xml
deleted file mode 100644
index 505a580e594c..000000000000
--- a/src/chrome/content/rules/RandomOrg.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Range_Networks.com.xml b/src/chrome/content/rules/Range_Networks.com.xml
index 7a028de4ffa8..e0cd1b0cf21b 100644
--- a/src/chrome/content/rules/Range_Networks.com.xml
+++ b/src/chrome/content/rules/Range_Networks.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://support.rangenetworks.com/ => https://support.rangenetworks.
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Rantoul_Press.xml b/src/chrome/content/rules/Rantoul_Press.xml
index ae43613a686e..3c9b959e5220 100644
--- a/src/chrome/content/rules/Rantoul_Press.xml
+++ b/src/chrome/content/rules/Rantoul_Press.xml
@@ -15,4 +15,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Rantsports.com.xml b/src/chrome/content/rules/Rantsports.com.xml
new file mode 100644
index 000000000000..8eab6dd00d0e
--- /dev/null
+++ b/src/chrome/content/rules/Rantsports.com.xml
@@ -0,0 +1,10 @@
+
+
+    
+    
+    
+
+    
+
+    
+
diff --git a/src/chrome/content/rules/Raphael-Hertzog.xml b/src/chrome/content/rules/Raphael-Hertzog.xml
index df063930f422..f81f8373e810 100644
--- a/src/chrome/content/rules/Raphael-Hertzog.xml
+++ b/src/chrome/content/rules/Raphael-Hertzog.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.raphaelhertzog.com/ => https://www.raphaelhertzog.com/:
 	Raphaël Hertzog
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Rapid7.xml b/src/chrome/content/rules/Rapid7.xml
index 6e16737d250f..d0eea669762a 100644
--- a/src/chrome/content/rules/Rapid7.xml
+++ b/src/chrome/content/rules/Rapid7.xml
@@ -18,7 +18,7 @@ Fetch error: http://browsercan.rapid7.com/ => https://browsercan.rapid7.com/: (6
 		- www.community.rapid7.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/RapidBuyr-problematic.xml b/src/chrome/content/rules/RapidBuyr-problematic.xml
index c16fb9229887..f5f1b051ae6c 100644
--- a/src/chrome/content/rules/RapidBuyr-problematic.xml
+++ b/src/chrome/content/rules/RapidBuyr-problematic.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/RapidBuyr.xml b/src/chrome/content/rules/RapidBuyr.xml
index d418a5373ebc..6393f96b267b 100644
--- a/src/chrome/content/rules/RapidBuyr.xml
+++ b/src/chrome/content/rules/RapidBuyr.xml
@@ -15,7 +15,8 @@
 
 	
 	
-	
+	
+	
 		
-
+
 
 	
 	
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Rapida.ru.xml b/src/chrome/content/rules/Rapida.ru.xml
index 0aa1b7b69567..0009a94f795d 100644
--- a/src/chrome/content/rules/Rapida.ru.xml
+++ b/src/chrome/content/rules/Rapida.ru.xml
@@ -35,7 +35,7 @@ webmail.rapida.ru ³
 ⁴ self signed
 ⁵ expired
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Rapidgator.net.xml b/src/chrome/content/rules/Rapidgator.net.xml
deleted file mode 100644
index fdf9be095172..000000000000
--- a/src/chrome/content/rules/Rapidgator.net.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
-	
-	
-
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-			
-			
-			
-			
-
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Raptr.com.xml b/src/chrome/content/rules/Raptr.com.xml
index e082f256196e..f92a159e1162 100644
--- a/src/chrome/content/rules/Raptr.com.xml
+++ b/src/chrome/content/rules/Raptr.com.xml
@@ -1,50 +1,12 @@
 
-
-
+
 	
-	
 	
 
-		
-
-
-	
-	
-
-	
-
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/Rapture_Ready.xml b/src/chrome/content/rules/Rapture_Ready.xml
index 69fbaca5d8e0..11b1936876d9 100644
--- a/src/chrome/content/rules/Rapture_Ready.xml
+++ b/src/chrome/content/rules/Rapture_Ready.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Rare.us.xml b/src/chrome/content/rules/Rare.us.xml
index 7488f42ae200..e40d24a1f520 100644
--- a/src/chrome/content/rules/Rare.us.xml
+++ b/src/chrome/content/rules/Rare.us.xml
@@ -5,7 +5,7 @@ Fetch error: http://rare.us/ => https://rare.us/: Too many redirects while fetch
 Fetch error: http://www.rare.us/ => https://www.rare.us/: Too many redirects while fetching 'https://www.rare.us/'
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/RareConnect.xml b/src/chrome/content/rules/RareConnect.xml
index 1139e0107cc7..4c72480ade5b 100644
--- a/src/chrome/content/rules/RareConnect.xml
+++ b/src/chrome/content/rules/RareConnect.xml
@@ -8,4 +8,4 @@
 		to="https://www.rareconnect.org/" />
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Rasset.ie.xml b/src/chrome/content/rules/Rasset.ie.xml
deleted file mode 100644
index bb43ac647362..000000000000
--- a/src/chrome/content/rules/Rasset.ie.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Rateip.com.xml b/src/chrome/content/rules/Rateip.com.xml
index f4f8cc09ad10..4aee5dc8ef6d 100644
--- a/src/chrome/content/rules/Rateip.com.xml
+++ b/src/chrome/content/rules/Rateip.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.rateip.com/ => https://www.rateip.com/: (28, 'Connection
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/RatfishOil.com-falsemixed.xml b/src/chrome/content/rules/RatfishOil.com-falsemixed.xml
index dd06b8b33ea6..49c5b4279ef7 100644
--- a/src/chrome/content/rules/RatfishOil.com-falsemixed.xml
+++ b/src/chrome/content/rules/RatfishOil.com-falsemixed.xml
@@ -4,7 +4,7 @@
 -->
 
 
-	
+	
 
 
 	
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Raven_Software.xml b/src/chrome/content/rules/Raven_Software.xml
index bce2c20e1688..9876cfd92ff5 100644
--- a/src/chrome/content/rules/Raven_Software.xml
+++ b/src/chrome/content/rules/Raven_Software.xml
@@ -9,7 +9,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Ravenjs.com.xml b/src/chrome/content/rules/Ravenjs.com.xml
new file mode 100644
index 000000000000..6a3710f1c26b
--- /dev/null
+++ b/src/chrome/content/rules/Ravenjs.com.xml
@@ -0,0 +1,23 @@
+
+
+
+	
+	
+	
+		
+
+
+	
+
+
+	
+	
+
+	
+	
+
+
diff --git a/src/chrome/content/rules/RawGit2.com.xml b/src/chrome/content/rules/RawGit2.com.xml
new file mode 100644
index 000000000000..3d9400de2cfb
--- /dev/null
+++ b/src/chrome/content/rules/RawGit2.com.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Raymond.CC.xml b/src/chrome/content/rules/Raymond.CC.xml
index 8962d7b618d8..c01d85716d63 100644
--- a/src/chrome/content/rules/Raymond.CC.xml
+++ b/src/chrome/content/rules/Raymond.CC.xml
@@ -4,7 +4,7 @@
 	
 	
 
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Razor_Servers.xml b/src/chrome/content/rules/Razor_Servers.xml
index 8e795686a322..890b9d798af1 100644
--- a/src/chrome/content/rules/Razor_Servers.xml
+++ b/src/chrome/content/rules/Razor_Servers.xml
@@ -4,15 +4,15 @@
 		- (www.)	(times out)
 
 -->
-
+
 
-	
+	
+	
 
 
-	
+	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Razzies.com.xml b/src/chrome/content/rules/Razzies.com.xml
new file mode 100644
index 000000000000..f9e5224edc46
--- /dev/null
+++ b/src/chrome/content/rules/Razzies.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Rdio.xml b/src/chrome/content/rules/Rdio.xml
deleted file mode 100644
index 208781e59e75..000000000000
--- a/src/chrome/content/rules/Rdio.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-	
-	
-
-	
-	
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Re-publica.de.xml b/src/chrome/content/rules/Re-publica.de.xml
index e38440095f1a..e25c536a6803 100644
--- a/src/chrome/content/rules/Re-publica.de.xml
+++ b/src/chrome/content/rules/Re-publica.de.xml
@@ -17,7 +17,7 @@ Non-2xx HTTP code: http://mail.re-publica.de/ (200) => https://ntmx.de/ (403)
 		- mail		(→ ntmx.de)
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/ReTargeter.xml b/src/chrome/content/rules/ReTargeter.xml
index aeadb824c80b..47a434b03d8f 100644
--- a/src/chrome/content/rules/ReTargeter.xml
+++ b/src/chrome/content/rules/ReTargeter.xml
@@ -19,7 +19,7 @@ Fetch error: http://v2.retargeter.com/ => https://v2.retargeter.com/: (28, 'Conn
 		- cdn		(cert: *.netdna-ssl.com; 404)
 
 -->
-
+
 
 	
@@ -30,7 +30,7 @@ Fetch error: http://v2.retargeter.com/ => https://v2.retargeter.com/: (28, 'Conn
 	
 
 
-	
+	
 
 
 	
 
 	
-	
+	
+	
+	
+	
 		
@@ -54,7 +57,6 @@
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Reactiongifs.com.xml b/src/chrome/content/rules/Reactiongifs.com.xml
new file mode 100644
index 000000000000..3664c81e1a9e
--- /dev/null
+++ b/src/chrome/content/rules/Reactiongifs.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ReadSpeaker.xml b/src/chrome/content/rules/ReadSpeaker.xml
index 80b723f725b9..4fc5eca39733 100644
--- a/src/chrome/content/rules/ReadSpeaker.xml
+++ b/src/chrome/content/rules/ReadSpeaker.xml
@@ -14,7 +14,7 @@ Fetch error: http://asp.readspeaker.net/ => https://asp.readspeaker.net/: (60, '
 	ᵐ Mismatched
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ReadTheDocs.xml b/src/chrome/content/rules/ReadTheDocs.xml
index c2aa837cf64d..37229f1a3948 100644
--- a/src/chrome/content/rules/ReadTheDocs.xml
+++ b/src/chrome/content/rules/ReadTheDocs.xml
@@ -1,6 +1,6 @@
 
 
@@ -12,14 +12,14 @@
 
 	
 	
-	
+
 	
 	
-	
+
 	
 	
 	
-	
+
 	
 	
 	
@@ -33,7 +33,7 @@
 	
 
 	
-	
+
 	
 	
 
diff --git a/src/chrome/content/rules/ReadWriteWeb.xml b/src/chrome/content/rules/ReadWriteWeb.xml
index 40828e78a1b5..4f8fcf8c093a 100644
--- a/src/chrome/content/rules/ReadWriteWeb.xml
+++ b/src/chrome/content/rules/ReadWriteWeb.xml
@@ -10,7 +10,7 @@
 -->
 
   
-  
+  
   
 
diff --git a/src/chrome/content/rules/Readability.com.xml b/src/chrome/content/rules/Readability.com.xml
deleted file mode 100644
index 706709b17872..000000000000
--- a/src/chrome/content/rules/Readability.com.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Readers_Digest.com.xml b/src/chrome/content/rules/Readers_Digest.com.xml
index 43382618a099..b0a84ac23e50 100644
--- a/src/chrome/content/rules/Readers_Digest.com.xml
+++ b/src/chrome/content/rules/Readers_Digest.com.xml
@@ -10,7 +10,7 @@
 	Nonfunctional domains:
 
 		- rd.com
-		- media.rd.com	(404; mismatched, CN: 
+		- media.rd.com	(404; mismatched, CN:
 		- www.rd.com	(redirects to http, valid cert)
 
 
@@ -24,20 +24,12 @@
 -->
 
 
-	
-	
+	
+	
 
+		
 
-	
-	
-	
-	
 
+	
 
-	
-
-	
-
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ReadrBoard.com.xml b/src/chrome/content/rules/ReadrBoard.com.xml
index 561aa1b1ad6c..c9ef5e65e34a 100644
--- a/src/chrome/content/rules/ReadrBoard.com.xml
+++ b/src/chrome/content/rules/ReadrBoard.com.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://readrboard.com/ => https://readrboard.com/: (51, "SSL: no alternative certificate subject name matches target host name 'readrboard.com'")
 Fetch error: http://www.readrboard.com/ => https://www.readrboard.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.readrboard.com'")
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ReadyHosting.com.xml b/src/chrome/content/rules/ReadyHosting.com.xml
index 42f812d9db36..b3ddce4aad54 100644
--- a/src/chrome/content/rules/ReadyHosting.com.xml
+++ b/src/chrome/content/rules/ReadyHosting.com.xml
@@ -1,7 +1,8 @@
 
 
 	
-	
+	
+	
 
 
 	
-
-
-    
-    
-
-    
-
-
diff --git a/src/chrome/content/rules/Real-Networks.xml b/src/chrome/content/rules/Real-Networks.xml
index 91ba88c4cbed..d8dd094ff442 100644
--- a/src/chrome/content/rules/Real-Networks.xml
+++ b/src/chrome/content/rules/Real-Networks.xml
@@ -19,21 +19,18 @@ Fetch error: http://www.realone.com/ => https://www.real.com/: Cycle detected -
 		- stats.rnhh.de
 
 -->
-
+
 
 	
-	
+	
+	
 	
 
 
 	
 
 
-	
 
-	
 
 	
 	 https://www.real.com/: Cycle detected -
 	
 
+	
 
diff --git a/src/chrome/content/rules/RealClearPolitics.com.xml b/src/chrome/content/rules/RealClearPolitics.com.xml
index ed3b27380e11..afbd60d87ad6 100644
--- a/src/chrome/content/rules/RealClearPolitics.com.xml
+++ b/src/chrome/content/rules/RealClearPolitics.com.xml
@@ -1,22 +1,13 @@
 
 
 
 	
+	
 
+	
 
-	
-
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/RealMatch.com.xml b/src/chrome/content/rules/RealMatch.com.xml
index 50bc5b010f4f..7a5d04aad54e 100644
--- a/src/chrome/content/rules/RealMatch.com.xml
+++ b/src/chrome/content/rules/RealMatch.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://realmatch.com/ => https://realmatch.com/: (51, "SSL: no alte
 		- blog	(http reply)
 
 -->
-
+
 
 	
 	
@@ -22,4 +22,4 @@ Fetch error: http://realmatch.com/ => https://realmatch.com/: (51, "SSL: no alte
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/RealTimeStatistics.net.xml b/src/chrome/content/rules/RealTimeStatistics.net.xml
new file mode 100644
index 000000000000..37517b8f4276
--- /dev/null
+++ b/src/chrome/content/rules/RealTimeStatistics.net.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/RealVNC.com.xml b/src/chrome/content/rules/RealVNC.com.xml
index ee3c3aa51806..2571bf5969d7 100644
--- a/src/chrome/content/rules/RealVNC.com.xml
+++ b/src/chrome/content/rules/RealVNC.com.xml
@@ -16,7 +16,7 @@
 					-->
 	
 
-	
+	
 
 
 	 https://realrobothigh.com/: (28, 'Conn
 	www: mismatched
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Real_World_OCaml.org.xml b/src/chrome/content/rules/Real_World_OCaml.org.xml
index 7facf2efb9b5..784cbde09548 100644
--- a/src/chrome/content/rules/Real_World_OCaml.org.xml
+++ b/src/chrome/content/rules/Real_World_OCaml.org.xml
@@ -1,15 +1,13 @@
-
 
-
 
-	
+
+
 	
-	
+	
+	
 
 
 	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Realtidbits.xml b/src/chrome/content/rules/Realtidbits.xml
index 42d46500caa8..8103313fe53e 100644
--- a/src/chrome/content/rules/Realtidbits.xml
+++ b/src/chrome/content/rules/Realtidbits.xml
@@ -19,13 +19,15 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Realview_Digital.com.xml b/src/chrome/content/rules/Realview_Digital.com.xml
index 6e5f7086e6c4..f43eefdc5471 100644
--- a/src/chrome/content/rules/Realview_Digital.com.xml
+++ b/src/chrome/content/rules/Realview_Digital.com.xml
@@ -20,7 +20,7 @@
 
 		- blog ¹
 		- $client_vhosts ²
-		
+
 	¹ Hubspot/mismatched
 	² Mixed css
 
diff --git a/src/chrome/content/rules/RebelMouse.com.xml b/src/chrome/content/rules/RebelMouse.com.xml
index 158b35c9dfd1..2efe45e1975e 100644
--- a/src/chrome/content/rules/RebelMouse.com.xml
+++ b/src/chrome/content/rules/RebelMouse.com.xml
@@ -40,26 +40,16 @@
 -->
 
 
+	
 	
-	
+	
+	
+	
 
-		
-		
-		
-		
 
+	
 
-	
-	
 
-	
-
-
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Rebel_Torrent.net.xml b/src/chrome/content/rules/Rebel_Torrent.net.xml
deleted file mode 100644
index 513b116d0f2f..000000000000
--- a/src/chrome/content/rules/Rebel_Torrent.net.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Recalll.co.xml b/src/chrome/content/rules/Recalll.co.xml
index e19ab6902f62..5a5498b3b901 100644
--- a/src/chrome/content/rules/Recalll.co.xml
+++ b/src/chrome/content/rules/Recalll.co.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.recalll.co/ => https://www.recalll.co/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Recap_the_Law.xml b/src/chrome/content/rules/Recap_the_Law.xml
deleted file mode 100644
index e8da6176943f..000000000000
--- a/src/chrome/content/rules/Recap_the_Law.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Reclaim-Your-Privacy.com.xml b/src/chrome/content/rules/Reclaim-Your-Privacy.com.xml
deleted file mode 100644
index 370d8898a339..000000000000
--- a/src/chrome/content/rules/Reclaim-Your-Privacy.com.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Reclam.de.xml b/src/chrome/content/rules/Reclam.de.xml
new file mode 100644
index 000000000000..d5d3dcae1796
--- /dev/null
+++ b/src/chrome/content/rules/Reclam.de.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Red-Aril.xml b/src/chrome/content/rules/Red-Aril.xml
index 4b8e4e068326..b1dd89176de8 100644
--- a/src/chrome/content/rules/Red-Aril.xml
+++ b/src/chrome/content/rules/Red-Aril.xml
@@ -22,7 +22,7 @@ Fetch error: http://p9.raasnet.com/ => https://p9.raasnet.com/: (60, 'SSL certif
 	p\d?.raasnet.com: Included on 3rd-party websites.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Red.es.xml b/src/chrome/content/rules/Red.es.xml
index 27662fb8ed25..16acef7280b5 100644
--- a/src/chrome/content/rules/Red.es.xml
+++ b/src/chrome/content/rules/Red.es.xml
@@ -12,7 +12,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/RedFerret.net.xml b/src/chrome/content/rules/RedFerret.net.xml
new file mode 100644
index 000000000000..9683fb548119
--- /dev/null
+++ b/src/chrome/content/rules/RedFerret.net.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/RedState.xml b/src/chrome/content/rules/RedState.xml
index bfc8ec08302c..cda121a5c23a 100644
--- a/src/chrome/content/rules/RedState.xml
+++ b/src/chrome/content/rules/RedState.xml
@@ -16,4 +16,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Red_Bull_Content_Pool.xml b/src/chrome/content/rules/Red_Bull_Content_Pool.xml
index aeaae9c769f8..5064409be43a 100644
--- a/src/chrome/content/rules/Red_Bull_Content_Pool.xml
+++ b/src/chrome/content/rules/Red_Bull_Content_Pool.xml
@@ -26,7 +26,16 @@ Fetch error: http://redbullcontentpool.com/ => https://www.redbullcontentpool.co
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
@@ -35,7 +44,6 @@ Fetch error: http://redbullcontentpool.com/ => https://www.redbullcontentpool.co
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Red_Bull_Media_House.xml b/src/chrome/content/rules/Red_Bull_Media_House.xml
index 1eadf93307e4..31a150146549 100644
--- a/src/chrome/content/rules/Red_Bull_Media_House.xml
+++ b/src/chrome/content/rules/Red_Bull_Media_House.xml
@@ -23,13 +23,19 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Red_Bull_Mobile-falsemixed.xml b/src/chrome/content/rules/Red_Bull_Mobile-falsemixed.xml
index ab40591c3f23..701b7c03de69 100644
--- a/src/chrome/content/rules/Red_Bull_Mobile-falsemixed.xml
+++ b/src/chrome/content/rules/Red_Bull_Mobile-falsemixed.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 		
diff --git a/src/chrome/content/rules/Red_Bull_Mobile.xml b/src/chrome/content/rules/Red_Bull_Mobile.xml
index 7a375e249768..a541e8ae76f4 100644
--- a/src/chrome/content/rules/Red_Bull_Mobile.xml
+++ b/src/chrome/content/rules/Red_Bull_Mobile.xml
@@ -80,7 +80,7 @@ Fetch error: http://redbullmobile.com.au/ => https://redbullmobile.com.au/: (51,
 	-falsemixed should be merged for Ffx 24.
 
 -->
-
+
 
 	
 	
@@ -88,9 +88,15 @@ Fetch error: http://redbullmobile.com.au/ => https://redbullmobile.com.au/: (51,
 			Avoid false/broken MCB:
 							-->
 		
-	
+	
+	
+	
+	
+	
 	
-	
+	
+	
+	
 
 
 	
@@ -109,4 +115,4 @@ Fetch error: http://redbullmobile.com.au/ => https://redbullmobile.com.au/: (51,
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Red_Bull_TV.xml b/src/chrome/content/rules/Red_Bull_TV.xml
index b6103330300b..e41e99b718f8 100644
--- a/src/chrome/content/rules/Red_Bull_TV.xml
+++ b/src/chrome/content/rules/Red_Bull_TV.xml
@@ -13,13 +13,12 @@
 -->
 
 
-	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Red_Ferret.xml b/src/chrome/content/rules/Red_Ferret.xml
deleted file mode 100644
index 22c24e6ae42d..000000000000
--- a/src/chrome/content/rules/Red_Ferret.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Red_Flush_Casino.xml b/src/chrome/content/rules/Red_Flush_Casino.xml
index e838148736f1..3b3e2a34c931 100644
--- a/src/chrome/content/rules/Red_Flush_Casino.xml
+++ b/src/chrome/content/rules/Red_Flush_Casino.xml
@@ -9,11 +9,11 @@ Fetch error: http://secure.redflush.com/ => https://secure.redflush.com/: (28, '
 		- (www.)redflushcasino.eu	(no https)
 
 -->
-
+
 
 	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Red_Hat.xml b/src/chrome/content/rules/Red_Hat.xml
index b12e892d8c3c..0e0a8ef89abf 100644
--- a/src/chrome/content/rules/Red_Hat.xml
+++ b/src/chrome/content/rules/Red_Hat.xml
@@ -10,7 +10,6 @@
 		- JBoss.xml
 		- Opensource.com.xml
 		- OpenShift.xml
-		- OVirt.org.xml
 		- RDO_project.org.xml
 		- RH_Cloud.com.xml
 		- Spice-space.org.xml
diff --git a/src/chrome/content/rules/Redcats.xml b/src/chrome/content/rules/Redcats.xml
deleted file mode 100644
index a78c2d9d3d1e..000000000000
--- a/src/chrome/content/rules/Redcats.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Redcoon.pt.xml b/src/chrome/content/rules/Redcoon.pt.xml
index eaed55a7046c..23271299cc5b 100644
--- a/src/chrome/content/rules/Redcoon.pt.xml
+++ b/src/chrome/content/rules/Redcoon.pt.xml
@@ -14,7 +14,7 @@ Fetch error: http://redcoon.pt/ => https://www.redcoon.pt/: (60, 'SSL certificat
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/RedditSearch.io.xml b/src/chrome/content/rules/RedditSearch.io.xml
new file mode 100644
index 000000000000..bd993622bcad
--- /dev/null
+++ b/src/chrome/content/rules/RedditSearch.io.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Redmine.org.xml b/src/chrome/content/rules/Redmine.org.xml
index f9695254b579..258353c57374 100644
--- a/src/chrome/content/rules/Redmine.org.xml
+++ b/src/chrome/content/rules/Redmine.org.xml
@@ -1,11 +1,4 @@
 
-
+
 
-	
 	
-	
 	
+	
 
 
 	
 	
 
-	
+	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Rednerd.com.xml b/src/chrome/content/rules/Rednerd.com.xml
deleted file mode 100644
index 43f8f7726114..000000000000
--- a/src/chrome/content/rules/Rednerd.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Redpill-Linpro.xml b/src/chrome/content/rules/Redpill-Linpro.xml
index 1ebe54df36c5..d6d45d5f9c28 100644
--- a/src/chrome/content/rules/Redpill-Linpro.xml
+++ b/src/chrome/content/rules/Redpill-Linpro.xml
@@ -6,7 +6,7 @@
 		- (www.)redpill-linpro.se
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Redports.org.xml b/src/chrome/content/rules/Redports.org.xml
index 186bed5d3d4e..ce2454854b87 100644
--- a/src/chrome/content/rules/Redports.org.xml
+++ b/src/chrome/content/rules/Redports.org.xml
@@ -7,7 +7,7 @@ Fetch error: http://redports.org/ => https://www.redports.org/: (28, 'Connection
 	^redports.org: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Reebok.ca.xml b/src/chrome/content/rules/Reebok.ca.xml
new file mode 100644
index 000000000000..6b76e2ae7f02
--- /dev/null
+++ b/src/chrome/content/rules/Reebok.ca.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+	
+	
+		
+		
+	
+	
+	
+
diff --git a/src/chrome/content/rules/Reed_Business.net.xml b/src/chrome/content/rules/Reed_Business.net.xml
index c6cb0711770a..04f757cb4a22 100644
--- a/src/chrome/content/rules/Reed_Business.net.xml
+++ b/src/chrome/content/rules/Reed_Business.net.xml
@@ -16,4 +16,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Reef_Builders.xml b/src/chrome/content/rules/Reef_Builders.xml
index 7214e278cae2..1f1e50f70d7c 100644
--- a/src/chrome/content/rules/Reef_Builders.xml
+++ b/src/chrome/content/rules/Reef_Builders.xml
@@ -13,7 +13,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
@@ -28,4 +30,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ReelHD.com.xml b/src/chrome/content/rules/ReelHD.com.xml
index 9ca6a7e90ef3..cb2c5f15599e 100644
--- a/src/chrome/content/rules/ReelHD.com.xml
+++ b/src/chrome/content/rules/ReelHD.com.xml
@@ -1,7 +1,7 @@
 
 
@@ -6,10 +12,8 @@
 	
 	
 	
-	
-		
-	
-
+	
+	
 
 	
 
diff --git a/src/chrome/content/rules/ReferMe.to.xml b/src/chrome/content/rules/ReferMe.to.xml
new file mode 100644
index 000000000000..84f49f43f1ec
--- /dev/null
+++ b/src/chrome/content/rules/ReferMe.to.xml
@@ -0,0 +1,10 @@
+
+
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/RefinedGuy.com.xml b/src/chrome/content/rules/RefinedGuy.com.xml
new file mode 100644
index 000000000000..8b5db3ed9818
--- /dev/null
+++ b/src/chrome/content/rules/RefinedGuy.com.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Refinitiv.com.xml b/src/chrome/content/rules/Refinitiv.com.xml
new file mode 100644
index 000000000000..d33e70794cea
--- /dev/null
+++ b/src/chrome/content/rules/Refinitiv.com.xml
@@ -0,0 +1,27 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ReflexPhoto.xml b/src/chrome/content/rules/ReflexPhoto.xml
index d93b0f276aa0..892e8266bcbc 100644
--- a/src/chrome/content/rules/ReflexPhoto.xml
+++ b/src/chrome/content/rules/ReflexPhoto.xml
@@ -1,5 +1,5 @@
-
-        
-        
-        
-
\ No newline at end of file
+
+        
+        
+        
+
diff --git a/src/chrome/content/rules/Reformal.xml b/src/chrome/content/rules/Reformal.xml
index 1ccdf7cc78cf..2c75a87c054c 100644
--- a/src/chrome/content/rules/Reformal.xml
+++ b/src/chrome/content/rules/Reformal.xml
@@ -19,4 +19,4 @@ Fetch error: http://reformal.ru/ => https://reformal.ru/: (60, 'SSL certificate
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Refunite.org.xml b/src/chrome/content/rules/Refunite.org.xml
new file mode 100644
index 000000000000..c15a557faaca
--- /dev/null
+++ b/src/chrome/content/rules/Refunite.org.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Reg.ru.xml b/src/chrome/content/rules/Reg.ru.xml
index b8286466946c..3ae4cad4c0bd 100644
--- a/src/chrome/content/rules/Reg.ru.xml
+++ b/src/chrome/content/rules/Reg.ru.xml
@@ -11,13 +11,14 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Regex101.xml b/src/chrome/content/rules/Regex101.xml
index 032ea413fc31..0d220172924a 100644
--- a/src/chrome/content/rules/Regex101.xml
+++ b/src/chrome/content/rules/Regex101.xml
@@ -14,4 +14,4 @@
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/RegioBank_Adviseurs.nl.xml b/src/chrome/content/rules/RegioBank_Adviseurs.nl.xml
deleted file mode 100644
index 44f74d28fd93..000000000000
--- a/src/chrome/content/rules/RegioBank_Adviseurs.nl.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Regjeringen.no.xml b/src/chrome/content/rules/Regjeringen.no.xml
index 7af441fc897c..1100261a016a 100644
--- a/src/chrome/content/rules/Regjeringen.no.xml
+++ b/src/chrome/content/rules/Regjeringen.no.xml
@@ -17,7 +17,7 @@ Fetch error: http://ny.regjeringen.no/ => https://ny.regjeringen.no/: (6, 'Could
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Regruhosting.ru.xml b/src/chrome/content/rules/Regruhosting.ru.xml
index 81e46d30f0e4..9ce28bdffa39 100644
--- a/src/chrome/content/rules/Regruhosting.ru.xml
+++ b/src/chrome/content/rules/Regruhosting.ru.xml
@@ -11,7 +11,7 @@ Fetch error: http://sync.security.pp.regruhosting.ru/ => https://sync.security.p
 		- .security.pp.regruhosting.ru
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Reichelt.de.xml b/src/chrome/content/rules/Reichelt.de.xml
index 41b7c6c7d50f..4b2a436b7de2 100644
--- a/src/chrome/content/rules/Reichelt.de.xml
+++ b/src/chrome/content/rules/Reichelt.de.xml
@@ -8,22 +8,22 @@
 	
 	
 	
-	
+
 	
 	
 	
 	
-	
+
 	
 	
 	
 	
-	
+
 	
 	
 	
 	
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Reifman.org.xml b/src/chrome/content/rules/Reifman.org.xml
deleted file mode 100644
index 82b02ea69e1b..000000000000
--- a/src/chrome/content/rules/Reifman.org.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Reimanpub.com.xml b/src/chrome/content/rules/Reimanpub.com.xml
index 9b3d6b25ad41..51f4f901dafe 100644
--- a/src/chrome/content/rules/Reimanpub.com.xml
+++ b/src/chrome/content/rules/Reimanpub.com.xml
@@ -9,13 +9,14 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Reiner-SCT.com.xml b/src/chrome/content/rules/Reiner-SCT.com.xml
index 5a150d9b061a..f6b637888771 100644
--- a/src/chrome/content/rules/Reiner-SCT.com.xml
+++ b/src/chrome/content/rules/Reiner-SCT.com.xml
@@ -16,7 +16,7 @@ Fetch error: http://tracking.reiner-sct.com/ => https://tracking.reiner-sct.com/
 	* Secured by us
 
 -->
-
+
 
 	
 	
@@ -28,4 +28,4 @@ Fetch error: http://tracking.reiner-sct.com/ => https://tracking.reiner-sct.com/
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Rejected.us.xml b/src/chrome/content/rules/Rejected.us.xml
new file mode 100644
index 000000000000..f5458609839f
--- /dev/null
+++ b/src/chrome/content/rules/Rejected.us.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Reklamport.com.xml b/src/chrome/content/rules/Reklamport.com.xml
deleted file mode 100644
index 6016d9ec1f3f..000000000000
--- a/src/chrome/content/rules/Reklamport.com.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Relate.org.uk.xml b/src/chrome/content/rules/Relate.org.uk.xml
index e71fab16bef2..21b7ebadc468 100644
--- a/src/chrome/content/rules/Relate.org.uk.xml
+++ b/src/chrome/content/rules/Relate.org.uk.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Relcom.host.xml b/src/chrome/content/rules/Relcom.host.xml
index 657e4f3537ce..6d107d9a3e46 100644
--- a/src/chrome/content/rules/Relcom.host.xml
+++ b/src/chrome/content/rules/Relcom.host.xml
@@ -6,7 +6,7 @@ www.relcomhost.ru mismatch
 	
 	
 	
-	
+
 	
 	
 	
@@ -15,7 +15,7 @@ www.relcomhost.ru mismatch
 	
 	
 	
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/ReligMag.com.xml b/src/chrome/content/rules/ReligMag.com.xml
deleted file mode 100644
index 3064aad6b179..000000000000
--- a/src/chrome/content/rules/ReligMag.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Religion_News.com.xml b/src/chrome/content/rules/Religion_News.com.xml
index f0acd7262e76..d928fe8c8cd6 100644
--- a/src/chrome/content/rules/Religion_News.com.xml
+++ b/src/chrome/content/rules/Religion_News.com.xml
@@ -23,14 +23,23 @@ Fetch error: http://religionnews.com/ => https://religionnews.com/: (60, 'SSL ce
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 		
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Remedy_Entertainment.xml b/src/chrome/content/rules/Remedy_Entertainment.xml
index 073e41c3a28d..5457df14c976 100644
--- a/src/chrome/content/rules/Remedy_Entertainment.xml
+++ b/src/chrome/content/rules/Remedy_Entertainment.xml
@@ -14,4 +14,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/RememberTheMilk.xml b/src/chrome/content/rules/RememberTheMilk.xml
index 24e8f84ce98a..f87e6bbdbfd2 100644
--- a/src/chrome/content/rules/RememberTheMilk.xml
+++ b/src/chrome/content/rules/RememberTheMilk.xml
@@ -1,5 +1,5 @@
 
 
-
 	
-	
+	
 	
 	
-	
-
+	
+	
+	
+	
 
 	
 
-
-	
-	
-
-	
-
-	
-
+	
 
 
diff --git a/src/chrome/content/rules/Remmina.org.xml b/src/chrome/content/rules/Remmina.org.xml
new file mode 100644
index 000000000000..cb11b0b90f68
--- /dev/null
+++ b/src/chrome/content/rules/Remmina.org.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/RemoteCoder.io.xml b/src/chrome/content/rules/RemoteCoder.io.xml
index 09150bd002ff..99422c613ebb 100644
--- a/src/chrome/content/rules/RemoteCoder.io.xml
+++ b/src/chrome/content/rules/RemoteCoder.io.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.remotecoder.io/ => https://www.remotecoder.io/: (51, "SSL: no alternative certificate subject name matches target host name 'www.remotecoder.io'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/RemoteStorage.io.xml b/src/chrome/content/rules/RemoteStorage.io.xml
index 761958cc8b19..9b11924eb04f 100644
--- a/src/chrome/content/rules/RemoteStorage.io.xml
+++ b/src/chrome/content/rules/RemoteStorage.io.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.remotestorage.io/ => https://www.remotestorage.io/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Remus_Exhaust_Store.com.xml b/src/chrome/content/rules/Remus_Exhaust_Store.com.xml
deleted file mode 100644
index b9060b0c62b1..000000000000
--- a/src/chrome/content/rules/Remus_Exhaust_Store.com.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/RenderFarming.net.xml b/src/chrome/content/rules/RenderFarming.net.xml
index f575fbb15b4f..2d9a3449d048 100644
--- a/src/chrome/content/rules/RenderFarming.net.xml
+++ b/src/chrome/content/rules/RenderFarming.net.xml
@@ -12,7 +12,7 @@ Fetch error: http://renderfarming.net/ => https://renderfarming.net/: (51, "SSL:
 	- www.renderfarming.net
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Reno_Gazette-Journal.xml b/src/chrome/content/rules/Reno_Gazette-Journal.xml
index b6d7e145b901..7cd97fe58fee 100644
--- a/src/chrome/content/rules/Reno_Gazette-Journal.xml
+++ b/src/chrome/content/rules/Reno_Gazette-Journal.xml
@@ -25,7 +25,9 @@ Fetch error: http://rgj.com/ => https://www.rgj.com/: (51, "SSL: no alternative
 
 
 	
-	
+	
+	
+	
 
 
 	
@@ -37,4 +39,4 @@ Fetch error: http://rgj.com/ => https://www.rgj.com/: (51, "SSL: no alternative
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Renovation_Experts.xml b/src/chrome/content/rules/Renovation_Experts.xml
deleted file mode 100644
index c5b5b15ee718..000000000000
--- a/src/chrome/content/rules/Renovation_Experts.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Renren.com.xml b/src/chrome/content/rules/Renren.com.xml
index be7a47bd1fa8..4b66e8100366 100644
--- a/src/chrome/content/rules/Renren.com.xml
+++ b/src/chrome/content/rules/Renren.com.xml
@@ -31,7 +31,7 @@
 	Mixed content:
 
 		- Image on licai from fmn.rrfmn.com ³
-	
+
 	³ Unsecurable <= 403
 
 -->
diff --git a/src/chrome/content/rules/Renrencaopan.com.xml b/src/chrome/content/rules/Renrencaopan.com.xml
index 4cc26c9e320d..877b40645cd1 100644
--- a/src/chrome/content/rules/Renrencaopan.com.xml
+++ b/src/chrome/content/rules/Renrencaopan.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.renrencaopan.com/ => https://www.renrencaopan.com/: (6,
 		- www.renrencaopan.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Rent_the_Runway.xml b/src/chrome/content/rules/Rent_the_Runway.xml
index 364375ab04d8..2f81359d88b1 100644
--- a/src/chrome/content/rules/Rent_the_Runway.xml
+++ b/src/chrome/content/rules/Rent_the_Runway.xml
@@ -30,8 +30,11 @@
 
 
 	
-	
-	
+	
+	
+	
+	
+	
 
 
 	
-
+
 
 	
diff --git a/src/chrome/content/rules/Rephial.org.xml b/src/chrome/content/rules/Rephial.org.xml
new file mode 100644
index 000000000000..b713abe915c4
--- /dev/null
+++ b/src/chrome/content/rules/Rephial.org.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Replica_Perfection.xml b/src/chrome/content/rules/Replica_Perfection.xml
index 50d103f3c514..8f247c6928f6 100644
--- a/src/chrome/content/rules/Replica_Perfection.xml
+++ b/src/chrome/content/rules/Replica_Perfection.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ReportLab.xml b/src/chrome/content/rules/ReportLab.xml
index 38884caf071c..f0d99606cdfe 100644
--- a/src/chrome/content/rules/ReportLab.xml
+++ b/src/chrome/content/rules/ReportLab.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Represent.Us.xml b/src/chrome/content/rules/Represent.Us.xml
index 50ab333e3961..9881c264824a 100644
--- a/src/chrome/content/rules/Represent.Us.xml
+++ b/src/chrome/content/rules/Represent.Us.xml
@@ -24,4 +24,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Republik.ch.xml b/src/chrome/content/rules/Republik.ch.xml
index 6f16d2ccea2f..064bad80c9d3 100644
--- a/src/chrome/content/rules/Republik.ch.xml
+++ b/src/chrome/content/rules/Republik.ch.xml
@@ -5,7 +5,7 @@
 	Connection refused:
 		- sandstorm.republik.ch
 		- runner-0.git.project-r.construction
-		
+
 	Timeout:
 		- email.project-r.construction
 -->
diff --git a/src/chrome/content/rules/RequireJS.org.xml b/src/chrome/content/rules/RequireJS.org.xml
new file mode 100644
index 000000000000..0d86a958c245
--- /dev/null
+++ b/src/chrome/content/rules/RequireJS.org.xml
@@ -0,0 +1,23 @@
+
+
+
+	
+	
+
+	
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Research-Media-and-Cybernetics.xml b/src/chrome/content/rules/Research-Media-and-Cybernetics.xml
index 5d404e10f99c..23fe2935764f 100644
--- a/src/chrome/content/rules/Research-Media-and-Cybernetics.xml
+++ b/src/chrome/content/rules/Research-Media-and-Cybernetics.xml
@@ -5,7 +5,7 @@
 	
-	
+
 
 
 	
diff --git a/src/chrome/content/rules/Research_Results.com.xml b/src/chrome/content/rules/Research_Results.com.xml
index ffd6a7b55623..d50e63120ccb 100644
--- a/src/chrome/content/rules/Research_Results.com.xml
+++ b/src/chrome/content/rules/Research_Results.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://surveys.researchresults.com/ => https://surveys.researchresu
 	ᵉ Expired
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ResearcherID.com.xml b/src/chrome/content/rules/ResearcherID.com.xml
new file mode 100644
index 000000000000..6dfd64ad10f3
--- /dev/null
+++ b/src/chrome/content/rules/ResearcherID.com.xml
@@ -0,0 +1,29 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ResellerRatings.xml b/src/chrome/content/rules/ResellerRatings.xml
index 4a28940752e3..f7b132c80765 100644
--- a/src/chrome/content/rules/ResellerRatings.xml
+++ b/src/chrome/content/rules/ResellerRatings.xml
@@ -48,6 +48,6 @@ Fetch error: http://resellerratings.com/ => https://resellerratings.com/: (60, '
 		to="https://d3cb52u6zfmv02.cloudfront.net/" />
 
 	
+		to="https://images.resellerratings.com/" />
 
 
diff --git a/src/chrome/content/rules/Reservation-Desk.com.xml b/src/chrome/content/rules/Reservation-Desk.com.xml
deleted file mode 100644
index 8ea4f2fafb6f..000000000000
--- a/src/chrome/content/rules/Reservation-Desk.com.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-	
-		
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/ResidueTheorem.com.xml b/src/chrome/content/rules/ResidueTheorem.com.xml
new file mode 100644
index 000000000000..31b8d6e3ec5b
--- /dev/null
+++ b/src/chrome/content/rules/ResidueTheorem.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Resinfo.org.xml b/src/chrome/content/rules/Resinfo.org.xml
index f648b3097bce..5ac266667cdd 100644
--- a/src/chrome/content/rules/Resinfo.org.xml
+++ b/src/chrome/content/rules/Resinfo.org.xml
@@ -9,7 +9,7 @@
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Resist_Surveillance.org.xml b/src/chrome/content/rules/Resist_Surveillance.org.xml
index ebe20bfc1af8..1fd5934c5bde 100644
--- a/src/chrome/content/rules/Resist_Surveillance.org.xml
+++ b/src/chrome/content/rules/Resist_Surveillance.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://resistsurveillance.org/ => https://resistsurveillance.org/:
 Fetch error: http://www.resistsurveillance.org/ => https://www.resistsurveillance.org/: (7, 'Failed to connect to www.resistsurveillance.org port 443: Connection refused')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ResistanceReport.com.xml b/src/chrome/content/rules/ResistanceReport.com.xml
deleted file mode 100644
index 35814aaa53d8..000000000000
--- a/src/chrome/content/rules/ResistanceReport.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Resonant.org.xml b/src/chrome/content/rules/Resonant.org.xml
deleted file mode 100644
index 54f1b9142951..000000000000
--- a/src/chrome/content/rules/Resonant.org.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Respect_Network.com.xml b/src/chrome/content/rules/Respect_Network.com.xml
deleted file mode 100644
index ae50def57349..000000000000
--- a/src/chrome/content/rules/Respect_Network.com.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Respect_our_privacy.com.xml b/src/chrome/content/rules/Respect_our_privacy.com.xml
index 8e6df414833d..6ffe1c4132d4 100644
--- a/src/chrome/content/rules/Respect_our_privacy.com.xml
+++ b/src/chrome/content/rules/Respect_our_privacy.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.respectourprivacy.com/ => https://www.respectourprivacy.
 		- www.respectourprivacy.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Responsys.com.xml b/src/chrome/content/rules/Responsys.com.xml
index 47e9dc2d3e63..00094e16b1d9 100644
--- a/src/chrome/content/rules/Responsys.com.xml
+++ b/src/chrome/content/rules/Responsys.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.responsys.com/ => https://www.oracle.com/marketingcloud/
 	www.responsys.com: Redirects to http
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Restcountries.eu.xml b/src/chrome/content/rules/Restcountries.eu.xml
new file mode 100644
index 000000000000..a9e240a6c3a9
--- /dev/null
+++ b/src/chrome/content/rules/Restcountries.eu.xml
@@ -0,0 +1,5 @@
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/Restore_the_Fourth.xml b/src/chrome/content/rules/Restore_the_Fourth.xml
index 6b00aa134fef..3a96bb23f58c 100644
--- a/src/chrome/content/rules/Restore_the_Fourth.xml
+++ b/src/chrome/content/rules/Restore_the_Fourth.xml
@@ -11,7 +11,7 @@ Fetch error: http://restorethefourth.net/ => https://restorethefourth.net/: (51,
 		- restorethefourth.s3.amazonaws.com
 
 -->
-
+
 
 	
 	
@@ -22,4 +22,4 @@ Fetch error: http://restorethefourth.net/ => https://restorethefourth.net/: (51,
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Retail-Link.gr.xml b/src/chrome/content/rules/Retail-Link.gr.xml
index b01fc62cdd89..a45116386467 100644
--- a/src/chrome/content/rules/Retail-Link.gr.xml
+++ b/src/chrome/content/rules/Retail-Link.gr.xml
@@ -11,13 +11,13 @@
 
 
 	
-	
+	
+	
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Retail_Sails.xml b/src/chrome/content/rules/Retail_Sails.xml
index 07f5910afa57..9b7e0b8c6b23 100644
--- a/src/chrome/content/rules/Retail_Sails.xml
+++ b/src/chrome/content/rules/Retail_Sails.xml
@@ -8,7 +8,7 @@ Fetch error: http://www.retailsails.com/ => https://retailsails.com/: (7, 'Faile
 	- www.retailsails.com
 	- blog.retailsails.com
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Retravision.com.au.xml b/src/chrome/content/rules/Retravision.com.au.xml
new file mode 100644
index 000000000000..0335c1421ebd
--- /dev/null
+++ b/src/chrome/content/rules/Retravision.com.au.xml
@@ -0,0 +1,24 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Retreat.lgbt.xml b/src/chrome/content/rules/Retreat.lgbt.xml
deleted file mode 100644
index 7699f5d36170..000000000000
--- a/src/chrome/content/rules/Retreat.lgbt.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/RetroFestive.ca.xml b/src/chrome/content/rules/RetroFestive.ca.xml
index ddbb7b3246a4..aae042f85b2e 100644
--- a/src/chrome/content/rules/RetroFestive.ca.xml
+++ b/src/chrome/content/rules/RetroFestive.ca.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Rettighedsalliancen.dk.xml b/src/chrome/content/rules/Rettighedsalliancen.dk.xml
index 9575930cf27d..24786aaddac5 100644
--- a/src/chrome/content/rules/Rettighedsalliancen.dk.xml
+++ b/src/chrome/content/rules/Rettighedsalliancen.dk.xml
@@ -1,20 +1,9 @@
-
-
-
+
 
 	
 	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Return-to-the-Roots.xml b/src/chrome/content/rules/Return-to-the-Roots.xml
index b7f1e723ae8a..f77e82a5a9ce 100644
--- a/src/chrome/content/rules/Return-to-the-Roots.xml
+++ b/src/chrome/content/rules/Return-to-the-Roots.xml
@@ -21,7 +21,7 @@ Fetch error: http://packages.siedler25.org/ => https://packages.siedler25.org/:
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Return_Path.com.xml b/src/chrome/content/rules/Return_Path.com.xml
deleted file mode 100644
index 169b5f8896eb..000000000000
--- a/src/chrome/content/rules/Return_Path.com.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Return_Path.net.xml b/src/chrome/content/rules/Return_Path.net.xml
index 689d8705cb9e..6d5410859a08 100644
--- a/src/chrome/content/rules/Return_Path.net.xml
+++ b/src/chrome/content/rules/Return_Path.net.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.returnpath.net/ => https://www.returnpath.net/: (51, "SSL: no alternative certificate subject name matches target host name 'www.returnpath.net'")
 Fetch error: http://returnpath.net/ => https://www.returnpath.net/: (51, "SSL: no alternative certificate subject name matches target host name 'www.returnpath.net'")
 
-	For other Return Path coverage, see Return_Path.com.xml.
+	For other Return Path coverage, see SenderScore.org.xml
 
 
 	^returnpath.net: Mismatched
@@ -17,7 +17,7 @@ Fetch error: http://returnpath.net/ => https://www.returnpath.net/: (51, "SSL: n
 		- monitor2.returnpath.net
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Reussissonsensemble.fr.xml b/src/chrome/content/rules/Reussissonsensemble.fr.xml
deleted file mode 100644
index 4cd9ffe85fe5..000000000000
--- a/src/chrome/content/rules/Reussissonsensemble.fr.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Rev2pub.com.xml b/src/chrome/content/rules/Rev2pub.com.xml
deleted file mode 100644
index ced3e543734a..000000000000
--- a/src/chrome/content/rules/Rev2pub.com.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/RevResponse.com.xml b/src/chrome/content/rules/RevResponse.com.xml
index 0c04a57bfd93..dae5a2d54737 100644
--- a/src/chrome/content/rules/RevResponse.com.xml
+++ b/src/chrome/content/rules/RevResponse.com.xml
@@ -7,7 +7,7 @@
 	Cert only matches *.revresponse.com
 		- img ²
 
-	² Mismatched, CN: *.tradepub.com 
+	² Mismatched, CN: *.tradepub.com
 
 
 
diff --git a/src/chrome/content/rules/RevSci.net.xml b/src/chrome/content/rules/RevSci.net.xml
deleted file mode 100644
index e29f10a69d4b..000000000000
--- a/src/chrome/content/rules/RevSci.net.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/RevenuQuebec.ca.xml b/src/chrome/content/rules/RevenuQuebec.ca.xml
new file mode 100644
index 000000000000..09f759fb0a4e
--- /dev/null
+++ b/src/chrome/content/rules/RevenuQuebec.ca.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/ReverePress.com.xml b/src/chrome/content/rules/ReverePress.com.xml
deleted file mode 100644
index f2685035a15b..000000000000
--- a/src/chrome/content/rules/ReverePress.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Reviewing_Comics.xml b/src/chrome/content/rules/Reviewing_Comics.xml
index eb8f8f357c0a..894ad1c4ecbd 100644
--- a/src/chrome/content/rules/Reviewing_Comics.xml
+++ b/src/chrome/content/rules/Reviewing_Comics.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Revision3.xml b/src/chrome/content/rules/Revision3.xml
deleted file mode 100644
index b7a03f1bd011..000000000000
--- a/src/chrome/content/rules/Revision3.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Revolet.xml b/src/chrome/content/rules/Revolet.xml
index 9d5d16a9b2cf..cbe3a196e1ad 100644
--- a/src/chrome/content/rules/Revolet.xml
+++ b/src/chrome/content/rules/Revolet.xml
@@ -6,7 +6,7 @@
 	
 
 
-	
+	
 
 
 	 https://www.revoltgames.com/: Too many r
 		- ^	(shows blank page)
 
 -->
-
+
 
 	
-	
+	
 
 
 	
@@ -31,4 +31,4 @@ Fetch error: http://revoltgames.com/ => https://www.revoltgames.com/: Too many r
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Revolutionwifi.net.xml b/src/chrome/content/rules/Revolutionwifi.net.xml
new file mode 100644
index 000000000000..60491aa95871
--- /dev/null
+++ b/src/chrome/content/rules/Revolutionwifi.net.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Revosec.ch.xml b/src/chrome/content/rules/Revosec.ch.xml
deleted file mode 100644
index 2d791a917844..000000000000
--- a/src/chrome/content/rules/Revosec.ch.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/RhB.xml b/src/chrome/content/rules/RhB.xml
index 8a4078537b4e..14e95c930280 100644
--- a/src/chrome/content/rules/RhB.xml
+++ b/src/chrome/content/rules/RhB.xml
@@ -18,7 +18,7 @@
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Rhapsody.xml b/src/chrome/content/rules/Rhapsody.xml
index 10e462554ac8..28457bf26a3a 100644
--- a/src/chrome/content/rules/Rhapsody.xml
+++ b/src/chrome/content/rules/Rhapsody.xml
@@ -17,7 +17,7 @@
 	
 	
 
-    
+
 	
 
diff --git a/src/chrome/content/rules/Rheinpfalz.de.xml b/src/chrome/content/rules/Rheinpfalz.de.xml
index f9754ab45526..3d80582509ac 100644
--- a/src/chrome/content/rules/Rheinpfalz.de.xml
+++ b/src/chrome/content/rules/Rheinpfalz.de.xml
@@ -1,7 +1,7 @@
 
 
 
@@ -18,6 +18,6 @@
 	
 
 	
-  
+
   
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Rhino-Software.xml b/src/chrome/content/rules/Rhino-Software.xml
index 7f88c2b7518f..1a1adfa7bedc 100644
--- a/src/chrome/content/rules/Rhino-Software.xml
+++ b/src/chrome/content/rules/Rhino-Software.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.rhinosoft.com/ => https://www.rhinosoft.com/: (60, 'SSL
 		- (www.)ftpvoyager.com		(cert: rhinosoft.com; shows that domain's data)
 		- (www.)serv-u.com		(ditto)
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Rhizome.xml b/src/chrome/content/rules/Rhizome.xml
index c861147e6736..0f8187157883 100644
--- a/src/chrome/content/rules/Rhizome.xml
+++ b/src/chrome/content/rules/Rhizome.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ricardo.ch.xml b/src/chrome/content/rules/Ricardo.ch.xml
index 67cbeab320c0..a34b2fe5d816 100644
--- a/src/chrome/content/rules/Ricardo.ch.xml
+++ b/src/chrome/content/rules/Ricardo.ch.xml
@@ -21,7 +21,7 @@ Fetch error: http://fr.ricardo.ch/ => https://fr.ricardo.ch/: (51, "SSL: no alte
 		- www.schnellverkaufen.ricardo.ch
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Ricardoshops.ch.xml b/src/chrome/content/rules/Ricardoshops.ch.xml
index 034af465b27f..8674600a2ae6 100644
--- a/src/chrome/content/rules/Ricardoshops.ch.xml
+++ b/src/chrome/content/rules/Ricardoshops.ch.xml
@@ -6,7 +6,7 @@ Fetch error: http://ricardoshops.ch/ => https://ricardoshops.ch/: (51, "SSL: no
 	For other ricardo coverage, see Ricardo.ch.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/RichRelevance.xml b/src/chrome/content/rules/RichRelevance.xml
index 0f00b19942f7..7a975a04a5cf 100644
--- a/src/chrome/content/rules/RichRelevance.xml
+++ b/src/chrome/content/rules/RichRelevance.xml
@@ -39,7 +39,7 @@ Non-2xx HTTP code: http://rm.recs.richrelevance.com/rrmail/rmclick?a=8791bbd7654
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Richard_Dawkins_Foundation-problematic.xml b/src/chrome/content/rules/Richard_Dawkins_Foundation-problematic.xml
index 5d80be981670..b72c6a7c973c 100644
--- a/src/chrome/content/rules/Richard_Dawkins_Foundation-problematic.xml
+++ b/src/chrome/content/rules/Richard_Dawkins_Foundation-problematic.xml
@@ -4,7 +4,9 @@
 -->
 
 
-	
+	
+	
+	
 	
 	
 
@@ -12,10 +14,9 @@
 	
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Richard_and_Judy_Book_Club.xml b/src/chrome/content/rules/Richard_and_Judy_Book_Club.xml
index aa60a1b2a8c2..ca8b1cb725f0 100644
--- a/src/chrome/content/rules/Richard_and_Judy_Book_Club.xml
+++ b/src/chrome/content/rules/Richard_and_Judy_Book_Club.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Richmond_Tea_Party.xml b/src/chrome/content/rules/Richmond_Tea_Party.xml
index fe41545d3fae..22e2c4cd5ba5 100644
--- a/src/chrome/content/rules/Richmond_Tea_Party.xml
+++ b/src/chrome/content/rules/Richmond_Tea_Party.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/RickyGervais.com.xml b/src/chrome/content/rules/RickyGervais.com.xml
new file mode 100644
index 000000000000..dced26ed268c
--- /dev/null
+++ b/src/chrome/content/rules/RickyGervais.com.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ricoh.xml b/src/chrome/content/rules/Ricoh.xml
index e670ca75a46d..e0ab3e5b4e0c 100644
--- a/src/chrome/content/rules/Ricoh.xml
+++ b/src/chrome/content/rules/Ricoh.xml
@@ -1,41 +1,32 @@
-
 
-
+
+	
+	
 
 	
 	
-	
-	
-	
-	
-	
-	
-	
 
-	
+	
+	
+
+	
 
-	
+	
 
-	
+	
 
-	
+	
 
-	
+	
 
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/Riga.xml b/src/chrome/content/rules/Riga.xml
index 08af11be5b10..88da94ef5128 100644
--- a/src/chrome/content/rules/Riga.xml
+++ b/src/chrome/content/rules/Riga.xml
@@ -6,7 +6,7 @@ Non-2xx HTTP code: http://eriga.lv/ (200) => https://eriga.lv/ (404)
 Disabled by https-everywhere-checker because:
 Non-2xx HTTP code: http://eriga.lv/ (200) => https://eriga.lv/ (404)
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/Right-Media.xml b/src/chrome/content/rules/Right-Media.xml
index 80cb1ef698b8..7133ee8a98b5 100644
--- a/src/chrome/content/rules/Right-Media.xml
+++ b/src/chrome/content/rules/Right-Media.xml
@@ -48,7 +48,7 @@ Fetch error: http://my.yieldmanager.com/ => https://my.yieldmanager.com/: (7, 'F
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/RightNow-clients.xml b/src/chrome/content/rules/RightNow-clients.xml
deleted file mode 100644
index 533363508251..000000000000
--- a/src/chrome/content/rules/RightNow-clients.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/RightNow.xml b/src/chrome/content/rules/RightNow.xml
index 7b5c1a2b90d3..2d295e4aa8ef 100644
--- a/src/chrome/content/rules/RightNow.xml
+++ b/src/chrome/content/rules/RightNow.xml
@@ -1,21 +1,37 @@
-
 
-
 
+
 	
 	
-
-
-	
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
 
diff --git a/src/chrome/content/rules/RightScale.com.xml b/src/chrome/content/rules/RightScale.com.xml
index 0767e6e9e10b..89c07f96703b 100644
--- a/src/chrome/content/rules/RightScale.com.xml
+++ b/src/chrome/content/rules/RightScale.com.xml
@@ -5,6 +5,11 @@
 
 			- assets
 
+	Non-functional hosts:
+		Self-signed certificate:
+		- forums.rightscale.com
+		- www.forums.rightscale.com
+
 
 	Fully covered subdomains:
 
@@ -31,18 +36,18 @@
 -->
 
 
+	
 	
-	
+	
+	
+	
+	
 		
 		
 
 
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Righthaven.xml b/src/chrome/content/rules/Righthaven.xml
index 21168d96e31a..36895ff09ae8 100644
--- a/src/chrome/content/rules/Righthaven.xml
+++ b/src/chrome/content/rules/Righthaven.xml
@@ -6,7 +6,7 @@ Fetch error: http://righthaven.com/ => https://righthaven.com/: (7, 'Failed to c
 Disabled by https-everywhere-checker because:
 Fetch error: http://righthaven.com/ => https://righthaven.com/: (28, 'Connection timed out after 10001 milliseconds')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Rightmove.co.uk.xml b/src/chrome/content/rules/Rightmove.co.uk.xml
index b2c6a1e69297..e1502897820e 100644
--- a/src/chrome/content/rules/Rightmove.co.uk.xml
+++ b/src/chrome/content/rules/Rightmove.co.uk.xml
@@ -2,7 +2,7 @@
 	Problematic hosts in *rightmove.co.uk:
 
 		- plc *
-		
+
 	* Cloudfront/mismatched
 
 
diff --git a/src/chrome/content/rules/Rigzone.xml b/src/chrome/content/rules/Rigzone.xml
index f3a7363a3c8f..82183d70cc63 100644
--- a/src/chrome/content/rules/Rigzone.xml
+++ b/src/chrome/content/rules/Rigzone.xml
@@ -29,17 +29,17 @@ Fetch error: http://rigzone.com/ => https://rigzone.com/: Too many redirects whi
 		- www
 
 -->
-
+
 
 	
 	
 		
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Riksgalden.se.xml b/src/chrome/content/rules/Riksgalden.se.xml
index 26121972f206..3c2884e420c9 100644
--- a/src/chrome/content/rules/Riksgalden.se.xml
+++ b/src/chrome/content/rules/Riksgalden.se.xml
@@ -1,8 +1,26 @@
-
+
 
 	
 	
-	
-	
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
+	
+
diff --git a/src/chrome/content/rules/RingForce.org.xml b/src/chrome/content/rules/RingForce.org.xml
deleted file mode 100644
index a429c059712b..000000000000
--- a/src/chrome/content/rules/RingForce.org.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Ringinout.com.xml b/src/chrome/content/rules/Ringinout.com.xml
deleted file mode 100644
index 3c776326a6f7..000000000000
--- a/src/chrome/content/rules/Ringinout.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Ripoff_Report.xml b/src/chrome/content/rules/Ripoff_Report.xml
index 3416301c2f4a..0c84d11a24c4 100644
--- a/src/chrome/content/rules/Ripoff_Report.xml
+++ b/src/chrome/content/rules/Ripoff_Report.xml
@@ -7,23 +7,21 @@ Fetch error: http://ripoffreport.com/ => https://www.ripoffreport.com/: Too many
 	!www: mismatched
 
 -->
-
+
 
 	
 	
-	
+	
+	
 
 
 	
 
 
-	
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Risala.org.xml b/src/chrome/content/rules/Risala.org.xml
new file mode 100644
index 000000000000..6e5b4884dc81
--- /dev/null
+++ b/src/chrome/content/rules/Risala.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Risc_OS_Open.xml b/src/chrome/content/rules/Risc_OS_Open.xml
index bb283efcd8e6..2be6bd54b299 100644
--- a/src/chrome/content/rules/Risc_OS_Open.xml
+++ b/src/chrome/content/rules/Risc_OS_Open.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Risparmio_Postale.it.xml b/src/chrome/content/rules/Risparmio_Postale.it.xml
deleted file mode 100644
index b1c22e957477..000000000000
--- a/src/chrome/content/rules/Risparmio_Postale.it.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Ritter.vg.xml b/src/chrome/content/rules/Ritter.vg.xml
index 949a6793c556..cd42c84d93a9 100644
--- a/src/chrome/content/rules/Ritter.vg.xml
+++ b/src/chrome/content/rules/Ritter.vg.xml
@@ -1,13 +1,30 @@
 
-
+	Timeout:
+		- cloud1
+		- cloud2
+
+	Refused:
+		- cloud9
+
+	Mismatched:
+		- www (fixed by this ruleset)
+		- ec2
+		- ipv4
+		- ipv6
+		- mail
+		- vconf
 
+	Self-signed:
+		- cloud8
+-->
+
 	
 	
+	
+	
 
-	
-
+	
+	
 
diff --git a/src/chrome/content/rules/Rivalseek.com.xml b/src/chrome/content/rules/Rivalseek.com.xml
index 18ddaa6a87ab..0e80a78510d6 100644
--- a/src/chrome/content/rules/Rivalseek.com.xml
+++ b/src/chrome/content/rules/Rivalseek.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.rivalseek.com/ => https://www.rivalseek.com/: (28, 'Conn
 		- www.rivalseek.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/River_Island.xml b/src/chrome/content/rules/River_Island.xml
index bb3d51b5f34c..e1170100f43b 100644
--- a/src/chrome/content/rules/River_Island.xml
+++ b/src/chrome/content/rules/River_Island.xml
@@ -39,14 +39,22 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
 		
 		
 		
 	
-	
+	
+	
 
 
 	
-
+
 
 	
 	
 
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Riyadonline.com.xml b/src/chrome/content/rules/Riyadonline.com.xml
index e0104015d2d4..04f79491a13a 100644
--- a/src/chrome/content/rules/Riyadonline.com.xml
+++ b/src/chrome/content/rules/Riyadonline.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://corp.riyadonline.com/ => https://corp.riyadonline.com/: Cycl
 	Riyad Bank
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Rkn.gov.ru.xml b/src/chrome/content/rules/Rkn.gov.ru.xml
index 0d792ed665a6..f79df3503edf 100644
--- a/src/chrome/content/rules/Rkn.gov.ru.xml
+++ b/src/chrome/content/rules/Rkn.gov.ru.xml
@@ -23,7 +23,7 @@ test.rkn.gov.ru different content
 ¹ mismatch
 ³ timed out
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Rl0.ru.xml b/src/chrome/content/rules/Rl0.ru.xml
index 7699bcdcfea5..6fd87bc3e73b 100644
--- a/src/chrome/content/rules/Rl0.ru.xml
+++ b/src/chrome/content/rules/Rl0.ru.xml
@@ -30,7 +30,7 @@ Fetch error: http://rimg09.rl0.ru/ => https://rimg09.rl0.ru/: (51, "SSL: no alte
 	² 504
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/RoadRunner.xml b/src/chrome/content/rules/RoadRunner.xml
deleted file mode 100644
index babf099fb162..000000000000
--- a/src/chrome/content/rules/RoadRunner.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-  
-  
-  
-
-  
-  
-
diff --git a/src/chrome/content/rules/Roam_Mobility.xml b/src/chrome/content/rules/Roam_Mobility.xml
index e2b701d943e3..9c7479fad6e0 100644
--- a/src/chrome/content/rules/Roam_Mobility.xml
+++ b/src/chrome/content/rules/Roam_Mobility.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Robert.ca.xml b/src/chrome/content/rules/Robert.ca.xml
new file mode 100644
index 000000000000..ab1287b28477
--- /dev/null
+++ b/src/chrome/content/rules/Robert.ca.xml
@@ -0,0 +1,68 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Roberts_Space_Industries.com.xml b/src/chrome/content/rules/Roberts_Space_Industries.com.xml
index d7fada35b865..088d1d401f03 100644
--- a/src/chrome/content/rules/Roberts_Space_Industries.com.xml
+++ b/src/chrome/content/rules/Roberts_Space_Industries.com.xml
@@ -8,7 +8,7 @@ Non-2xx HTTP code: http://forums.robertsspaceindustries.com/ (200) => https://fo
 		- .robertsspaceindustries.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Robin_Rabard.xml b/src/chrome/content/rules/Robin_Rabard.xml
deleted file mode 100644
index ff6cf8fefe65..000000000000
--- a/src/chrome/content/rules/Robin_Rabard.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Roblox.xml b/src/chrome/content/rules/Roblox.xml
index f15d2a9b3afc..7df5e501e939 100644
--- a/src/chrome/content/rules/Roblox.xml
+++ b/src/chrome/content/rules/Roblox.xml
@@ -1,85 +1,106 @@
-
-	
-
+-->
+
 	
+	
 	
+	
 	
 	
-	
+	
+	
+	
+	
 	
 	
 	
+	
 	
 	
-	
 	
-	
 	
 	
 	
 	
+	
+	
 	
 	
+	
 	
 	
+	
+	
 	
 	
-	
 	
 	
 	
 	
 	
 	
-	
+	
 	
 	
 	
 	
 	
 	
-	
+	
+
 	
 	
 
 	
+	
 	
 	
-	
 	
-	
 	
 	
 	
 	
-	
-	
 
-	
 	
 	
 	
@@ -100,7 +121,6 @@
 	
 	
 
-	
 	
 	
 	
diff --git a/src/chrome/content/rules/RobotShop.xml b/src/chrome/content/rules/RobotShop.xml
index 42216620575a..e0e0a6815542 100644
--- a/src/chrome/content/rules/RobotShop.xml
+++ b/src/chrome/content/rules/RobotShop.xml
@@ -5,7 +5,7 @@
 	
 
 
-	
+	
 
 
 	 https://www.roccat.org/: Redirect for 'ht
 	mixedcontent due to css on www from www.
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Rochford.gov.uk.xml b/src/chrome/content/rules/Rochford.gov.uk.xml
index 7976125215ca..7177fcd8719e 100644
--- a/src/chrome/content/rules/Rochford.gov.uk.xml
+++ b/src/chrome/content/rules/Rochford.gov.uk.xml
@@ -44,7 +44,7 @@
 			- www from $self ᵐ
 
 		- Images, on:
-		
+
 			- www from fs-drupal-rochford.s3.amazonaws.com
 			- www from $self ᵐ
 
diff --git a/src/chrome/content/rules/Rock_Creek_Outfitters.xml b/src/chrome/content/rules/Rock_Creek_Outfitters.xml
index 278c6f5bf584..5c4cbd8e1ac5 100644
--- a/src/chrome/content/rules/Rock_Creek_Outfitters.xml
+++ b/src/chrome/content/rules/Rock_Creek_Outfitters.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Rock_Paper_Photo.com.xml b/src/chrome/content/rules/Rock_Paper_Photo.com.xml
index 5cbb20634041..bd1cdcca33a6 100644
--- a/src/chrome/content/rules/Rock_Paper_Photo.com.xml
+++ b/src/chrome/content/rules/Rock_Paper_Photo.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://rockpaperphoto.com/ => https://rockpaperphoto.com/: (7, 'Failed to connect to rockpaperphoto.com port 443: Connection refused')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Rockman-Corner.com.xml b/src/chrome/content/rules/Rockman-Corner.com.xml
new file mode 100644
index 000000000000..82b3ca281bd6
--- /dev/null
+++ b/src/chrome/content/rules/Rockman-Corner.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Roe.ch.xml b/src/chrome/content/rules/Roe.ch.xml
index e0408df51a19..fda977c515ea 100644
--- a/src/chrome/content/rules/Roe.ch.xml
+++ b/src/chrome/content/rules/Roe.ch.xml
@@ -1,7 +1,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Rogers-Bank.xml b/src/chrome/content/rules/Rogers-Bank.xml
new file mode 100644
index 000000000000..75d2f1a9b918
--- /dev/null
+++ b/src/chrome/content/rules/Rogers-Bank.xml
@@ -0,0 +1,18 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Roiservice.com.xml b/src/chrome/content/rules/Roiservice.com.xml
index edb723e048a3..d7de13310571 100644
--- a/src/chrome/content/rules/Roiservice.com.xml
+++ b/src/chrome/content/rules/Roiservice.com.xml
@@ -6,8 +6,8 @@ Fetch error: http://track.roiservice.com/ => https://track.roiservice.com/: (6,
 Disabled by https-everywhere-checker because:
 Fetch error: http://track.roiservice.com/ => https://track.roiservice.com/: (6, 'Could not resolve host: track.roiservice.com')
 -->
-
+
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Roku.com.xml b/src/chrome/content/rules/Roku.com.xml
index 2875baa506c4..bcd34eab2dc5 100644
--- a/src/chrome/content/rules/Roku.com.xml
+++ b/src/chrome/content/rules/Roku.com.xml
@@ -11,7 +11,10 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	 https://www.roleplaychat.org/: (7,
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Roll_Call.com.xml b/src/chrome/content/rules/Roll_Call.com.xml
index 627a3318e9d0..e035c4429456 100644
--- a/src/chrome/content/rules/Roll_Call.com.xml
+++ b/src/chrome/content/rules/Roll_Call.com.xml
@@ -48,10 +48,12 @@ Fetch error: http://rollcall.com/ => https://secure.rollcall.com/: (6, 'Could no
 	platform should be removed with Ffx 24.
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
 	
@@ -60,4 +62,4 @@ Fetch error: http://rollcall.com/ => https://secure.rollcall.com/: (6, 'Could no
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Rollbar.xml b/src/chrome/content/rules/Rollbar.xml
index f81248002b62..516a70a38af2 100644
--- a/src/chrome/content/rules/Rollbar.xml
+++ b/src/chrome/content/rules/Rollbar.xml
@@ -16,4 +16,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Rolling_Stone.com.xml b/src/chrome/content/rules/Rolling_Stone.com.xml
index ec61296d1322..5040c9fc8d20 100644
--- a/src/chrome/content/rules/Rolling_Stone.com.xml
+++ b/src/chrome/content/rules/Rolling_Stone.com.xml
@@ -55,7 +55,10 @@ Fetch error: http://rollingstone.com/ => https://rollingstone.com/: (7, 'Failed
 
 
 	
-	
+	
+	
+	
+	
 		
@@ -76,7 +79,6 @@ Fetch error: http://rollingstone.com/ => https://rollingstone.com/: (7, 'Failed
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Rolling_Stone_Subscriptions.com.xml b/src/chrome/content/rules/Rolling_Stone_Subscriptions.com.xml
index f3c778dbe3eb..d2710c78f145 100644
--- a/src/chrome/content/rules/Rolling_Stone_Subscriptions.com.xml
+++ b/src/chrome/content/rules/Rolling_Stone_Subscriptions.com.xml
@@ -10,7 +10,7 @@
 
 
 	
-	
+	
 
 
 	
@@ -19,4 +19,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Roloil.xml b/src/chrome/content/rules/Roloil.xml
index e06fbec590cf..da81f24f84a1 100644
--- a/src/chrome/content/rules/Roloil.xml
+++ b/src/chrome/content/rules/Roloil.xml
@@ -4,13 +4,10 @@
 -->
 
 
-	
+	
 
 
-	
 
+	
 
-	
-
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/RomStation.fr.xml b/src/chrome/content/rules/RomStation.fr.xml
new file mode 100644
index 000000000000..444901aeedd7
--- /dev/null
+++ b/src/chrome/content/rules/RomStation.fr.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Romab.se.xml b/src/chrome/content/rules/Romab.se.xml
index d79f73677921..95a7a6eedc42 100644
--- a/src/chrome/content/rules/Romab.se.xml
+++ b/src/chrome/content/rules/Romab.se.xml
@@ -1,7 +1,7 @@
 
diff --git a/src/chrome/content/rules/Romhacking.net.xml b/src/chrome/content/rules/Romhacking.net.xml
new file mode 100644
index 000000000000..1ceba9fc892d
--- /dev/null
+++ b/src/chrome/content/rules/Romhacking.net.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+	
+	
+  
+  
+
diff --git a/src/chrome/content/rules/RoosterTeeth.com.xml b/src/chrome/content/rules/RoosterTeeth.com.xml
new file mode 100644
index 000000000000..4159b657ca81
--- /dev/null
+++ b/src/chrome/content/rules/RoosterTeeth.com.xml
@@ -0,0 +1,7 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Root.cz.xml b/src/chrome/content/rules/Root.cz.xml
deleted file mode 100644
index 9cc907eee19e..000000000000
--- a/src/chrome/content/rules/Root.cz.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/RootBSD.net.xml b/src/chrome/content/rules/RootBSD.net.xml
index 865e238e29c2..b5287654fc5b 100644
--- a/src/chrome/content/rules/RootBSD.net.xml
+++ b/src/chrome/content/rules/RootBSD.net.xml
@@ -1,13 +1,14 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/RoseHosting.com.xml b/src/chrome/content/rules/RoseHosting.com.xml
index 07865923f4ff..4318f23b3f1a 100644
--- a/src/chrome/content/rules/RoseHosting.com.xml
+++ b/src/chrome/content/rules/RoseHosting.com.xml
@@ -1,12 +1,10 @@
 
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Roskilde_University.xml b/src/chrome/content/rules/Roskilde_University.xml
index 26e688766366..c4a937fb1402 100644
--- a/src/chrome/content/rules/Roskilde_University.xml
+++ b/src/chrome/content/rules/Roskilde_University.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.ruc.dk/ => https://www.ruc.dk/: (60, 'SSL certificate pr
 		- ^	(404, valid cert)
 
 -->
-
+
 
 	
 	
@@ -21,4 +21,4 @@ Fetch error: http://www.ruc.dk/ => https://www.ruc.dk/: (60, 'SSL certificate pr
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ross_Ulbricht.org.xml b/src/chrome/content/rules/Ross_Ulbricht.org.xml
index e4275ec19484..9c32856ef0a2 100644
--- a/src/chrome/content/rules/Ross_Ulbricht.org.xml
+++ b/src/chrome/content/rules/Ross_Ulbricht.org.xml
@@ -1,4 +1,4 @@
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Rossia.org.xml b/src/chrome/content/rules/Rossia.org.xml
index 0ab5c2be4106..72f45f8355f7 100644
--- a/src/chrome/content/rules/Rossia.org.xml
+++ b/src/chrome/content/rules/Rossia.org.xml
@@ -9,4 +9,4 @@
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Roster-Teeth.xml b/src/chrome/content/rules/Roster-Teeth.xml
deleted file mode 100644
index 6575dd8b74ed..000000000000
--- a/src/chrome/content/rules/Roster-Teeth.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/RotaryView.com.xml b/src/chrome/content/rules/RotaryView.com.xml
index 7aa6ba39e022..a1fa011a8dfe 100644
--- a/src/chrome/content/rules/RotaryView.com.xml
+++ b/src/chrome/content/rules/RotaryView.com.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Rother.gov.uk-falsemixed.xml b/src/chrome/content/rules/Rother.gov.uk-falsemixed.xml
deleted file mode 100644
index acc7244703a3..000000000000
--- a/src/chrome/content/rules/Rother.gov.uk-falsemixed.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Rotherham.gov.uk.xml b/src/chrome/content/rules/Rotherham.gov.uk.xml
index 53ac7317e449..a1dcf77f8fd3 100644
--- a/src/chrome/content/rules/Rotherham.gov.uk.xml
+++ b/src/chrome/content/rules/Rotherham.gov.uk.xml
@@ -43,7 +43,7 @@ Fetch error: http://myaccount.rotherham.gov.uk/ => https://myaccount.rotherham.g
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Rotlogix.com.xml b/src/chrome/content/rules/Rotlogix.com.xml
deleted file mode 100644
index b42527ae5e81..000000000000
--- a/src/chrome/content/rules/Rotlogix.com.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Rottenecards.xml b/src/chrome/content/rules/Rottenecards.xml
index 06571c4fbcd8..5ffbf12b62e7 100644
--- a/src/chrome/content/rules/Rottenecards.xml
+++ b/src/chrome/content/rules/Rottenecards.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://rottenecards.com/ => https://rottenecards.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 Fetch error: http://www.rottenecards.com/ => https://www.rottenecards.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 -->
-
+
 
 	
 	
@@ -19,4 +19,4 @@ Fetch error: http://www.rottenecards.com/ => https://www.rottenecards.com/: (60,
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Rough_Trade_Gear.xml b/src/chrome/content/rules/Rough_Trade_Gear.xml
index 922ef41480a6..49d2727e6074 100644
--- a/src/chrome/content/rules/Rough_Trade_Gear.xml
+++ b/src/chrome/content/rules/Rough_Trade_Gear.xml
@@ -12,7 +12,7 @@
 	
 
 
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Roundhouse.org.uk.xml b/src/chrome/content/rules/Roundhouse.org.uk.xml
new file mode 100644
index 000000000000..73538a27981d
--- /dev/null
+++ b/src/chrome/content/rules/Roundhouse.org.uk.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Roundhouse.xml b/src/chrome/content/rules/Roundhouse.xml
deleted file mode 100644
index 5b9bd038e5bb..000000000000
--- a/src/chrome/content/rules/Roundhouse.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-	
-	
-	
-		
-	
-
-
-	
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Rovio.com.xml b/src/chrome/content/rules/Rovio.com.xml
index fceceeb839b0..a737aaf3aa47 100644
--- a/src/chrome/content/rules/Rovio.com.xml
+++ b/src/chrome/content/rules/Rovio.com.xml
@@ -64,9 +64,6 @@
 
 		
 
-	
-
 		
 
 	
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Royal-Academy-of-Engineering.xml b/src/chrome/content/rules/Royal-Academy-of-Engineering.xml
index 11ba23dcfb57..b4dca747688d 100644
--- a/src/chrome/content/rules/Royal-Academy-of-Engineering.xml
+++ b/src/chrome/content/rules/Royal-Academy-of-Engineering.xml
@@ -6,10 +6,11 @@ Fetch error: http://raeng.org.uk/ => https://www.raeng.org.uk/: Too many redirec
 Disabled by https-everywhere-checker because:
 Fetch error: http://raeng.org.uk/ => https://www.raeng.org.uk/: Cycle detected - URL already encountered: https://www.raeng.org.uk/
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
@@ -20,7 +21,6 @@ Fetch error: http://raeng.org.uk/ => https://www.raeng.org.uk/: Cycle detected -
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Royal-Society-of-Chemistry-mismatches.xml b/src/chrome/content/rules/Royal-Society-of-Chemistry-mismatches.xml
deleted file mode 100644
index 4407ef128a74..000000000000
--- a/src/chrome/content/rules/Royal-Society-of-Chemistry-mismatches.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Royal-Society-of-Chemistry.xml b/src/chrome/content/rules/Royal-Society-of-Chemistry.xml
index 293bcb2f8d15..b58ac81978e7 100644
--- a/src/chrome/content/rules/Royal-Society-of-Chemistry.xml
+++ b/src/chrome/content/rules/Royal-Society-of-Chemistry.xml
@@ -1,31 +1,33 @@
-
-
-
-	
-	
-	
-	
-	
-	
-
-	
-	
-
-	
-
-	
 
-	
+
+	
+	
 
+	
 
diff --git a/src/chrome/content/rules/RoyalAustralianNavy.xml b/src/chrome/content/rules/RoyalAustralianNavy.xml
index de2b907228a9..03d082a6f635 100644
--- a/src/chrome/content/rules/RoyalAustralianNavy.xml
+++ b/src/chrome/content/rules/RoyalAustralianNavy.xml
@@ -6,10 +6,10 @@ Fetch error: http://navy.gov.au/ => https://www.navy.gov.au/: (7, 'Failed to con
 Disabled by https-everywhere-checker because:
 Fetch error: http://navy.gov.au/ => https://www.navy.gov.au/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 -->
-
+
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/RoyalGovUK.xml b/src/chrome/content/rules/RoyalGovUK.xml
index bfd3307b739c..c16dce724a8c 100644
--- a/src/chrome/content/rules/RoyalGovUK.xml
+++ b/src/chrome/content/rules/RoyalGovUK.xml
@@ -5,11 +5,11 @@ Fetch error: http://royal.gov.uk/ => https://www.royal.gov.uk/: (60, 'SSL certif
 Fetch error: http://www.royal.gov.uk/ => https://www.royal.gov.uk/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/RoyalLib.com.xml b/src/chrome/content/rules/RoyalLib.com.xml
new file mode 100644
index 000000000000..b9684ebb9614
--- /dev/null
+++ b/src/chrome/content/rules/RoyalLib.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Royal_Mail.xml b/src/chrome/content/rules/Royal_Mail.xml
index 6546ab1e9bdb..14cbed1c085f 100644
--- a/src/chrome/content/rules/Royal_Mail.xml
+++ b/src/chrome/content/rules/Royal_Mail.xml
@@ -9,7 +9,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Royal_Mail_Group.xml b/src/chrome/content/rules/Royal_Mail_Group.xml
deleted file mode 100644
index ecd96b4431e0..000000000000
--- a/src/chrome/content/rules/Royal_Mail_Group.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Rpw.sh.xml b/src/chrome/content/rules/Rpw.sh.xml
index 8e4260f32e18..a8dce746ee9a 100644
--- a/src/chrome/content/rules/Rpw.sh.xml
+++ b/src/chrome/content/rules/Rpw.sh.xml
@@ -5,7 +5,7 @@ Fetch error: http://rpw.sh/ => https://rpw.sh/: (60, 'SSL certificate problem: c
 Fetch error: http://www.rpw.sh/ => https://www.rpw.sh/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Rsyslog.com.xml b/src/chrome/content/rules/Rsyslog.com.xml
new file mode 100644
index 000000000000..3385fa32af2e
--- /dev/null
+++ b/src/chrome/content/rules/Rsyslog.com.xml
@@ -0,0 +1,23 @@
+
+
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Rtbf.be.xml b/src/chrome/content/rules/Rtbf.be.xml
index 6a6757d9ecfb..e64b7a2b8cc6 100644
--- a/src/chrome/content/rules/Rtbf.be.xml
+++ b/src/chrome/content/rules/Rtbf.be.xml
@@ -22,7 +22,7 @@ Fetch error: http://www.static.rtbf.be/ => https://ssl-www.static.rtbf.be/: (51,
 		- www.rtbf.be
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Rtcquebec.ca.xml b/src/chrome/content/rules/Rtcquebec.ca.xml
new file mode 100644
index 000000000000..23feda82880d
--- /dev/null
+++ b/src/chrome/content/rules/Rtcquebec.ca.xml
@@ -0,0 +1,12 @@
+
+
+
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/Ru4.com.xml b/src/chrome/content/rules/Ru4.com.xml
deleted file mode 100644
index 369fe42e7f1a..000000000000
--- a/src/chrome/content/rules/Ru4.com.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-	
-
-		
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Rubicon-Project.xml b/src/chrome/content/rules/Rubicon-Project.xml
index 8bfff1f0a623..60d4f6740984 100644
--- a/src/chrome/content/rules/Rubicon-Project.xml
+++ b/src/chrome/content/rules/Rubicon-Project.xml
@@ -15,53 +15,141 @@
 	* Plaintext reply
 
 
-	Insecure cookies are set for these domains:
-
-		- .rubiconproject.com
-
+	Timeout:
+		- 204.rubiconproject.com
+		- arsenal.rubiconproject.com
+		- arws.rubiconproject.com
+		- bcbb-hfc2.rubiconproject.com
+		- bcbb-iad2.rubiconproject.com
+		- boxy-bea-iad2.rubiconproject.com
+		- content.rubiconproject.com
+		- pas-api.rubiconproject.com
+		- vpn-it.rubiconproject.com
+
+	Cert expired:
+		- gobuyersupport.rubiconproject.com
+		- sonic.rubiconproject.com
+
+	Chain issues:
+		- vpn-dc.rubiconproject.com
+		- vpn-eng.rubiconproject.com
+		- vpn-test.rubiconproject.com
+		- vpn.rubiconproject.com
+
+	Connection refused:
+		- rfm.rubiconproject.com
+
+	Cert mismatch:
+		- awsm.rubiconproject.com
+		- dsp-token.aws.rubiconproject.com
+		- assets.rubiconproject.com
+		- assets2.rubiconproject.com
+		- cdn.rubiconproject.com
+		- email.rubiconproject.com
+		- garagestaging.rubiconproject.com
+		- go.rubiconproject.com
+		- investor.rubiconproject.com
+		- labs2.rubiconproject.com
+		- messages.rubiconproject.com
+		- assets.rfm.rubiconproject.com
+		- rubibid.rubiconproject.com
+		- stats.rubiconproject.com
+		- status.rubiconproject.com
+		- tap-cdn.rubiconproject.com
+
+	Non-200 status code:
+		- tap2-cdn.rubiconproject.com
+
+	TLS Error:
+		- ebsdrdmz.cs.rubiconproject.com
 -->
 
 
-	
-	
+	
+	
+
+	
 	
-	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
+	
+	
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
+	
+	
+	
+	
+	
+	
+	
 	
+	
+	
+	
+	
+	
+	
+	
 	
+	
+	
+	
+	
+	
+	
+	
 	
+	
+	
+	
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
 	
+	
 	
+	
+	
+	
+	
 	
-	
+	
 	
+	
+	
+	
 	
-
-	
-	
-	
-
-		
-
-
-	
-	
+	
+	
+	
 
 	
 
-
-	
-
 	
 
diff --git a/src/chrome/content/rules/Ruby-China.org.xml b/src/chrome/content/rules/Ruby-China.org.xml
index abcba337afd3..4c5de44a95a6 100644
--- a/src/chrome/content/rules/Ruby-China.org.xml
+++ b/src/chrome/content/rules/Ruby-China.org.xml
@@ -1,19 +1,13 @@
 
-
 
-
-	
-	
-	
 	
-	
+	
 	
 
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Rudix.org.xml b/src/chrome/content/rules/Rudix.org.xml
new file mode 100644
index 000000000000..9bcd75d74d16
--- /dev/null
+++ b/src/chrome/content/rules/Rudix.org.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Rudloff.pro.xml b/src/chrome/content/rules/Rudloff.pro.xml
deleted file mode 100644
index c1cb927fc0e7..000000000000
--- a/src/chrome/content/rules/Rudloff.pro.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-  
-  
-
-  
-
diff --git a/src/chrome/content/rules/Rue_La_La.com.xml b/src/chrome/content/rules/Rue_La_La.com.xml
index 2be81ff47b87..697102018c08 100644
--- a/src/chrome/content/rules/Rue_La_La.com.xml
+++ b/src/chrome/content/rules/Rue_La_La.com.xml
@@ -16,4 +16,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Rufus.xml b/src/chrome/content/rules/Rufus.xml
index 9731043ee504..69fa7a71a6a7 100644
--- a/src/chrome/content/rules/Rufus.xml
+++ b/src/chrome/content/rules/Rufus.xml
@@ -1,7 +1,7 @@
 
 
 	
-	
+
 	
 
 
diff --git a/src/chrome/content/rules/RugStudio.xml b/src/chrome/content/rules/RugStudio.xml
index 6df923ef3d2b..652e29886848 100644
--- a/src/chrome/content/rules/RugStudio.xml
+++ b/src/chrome/content/rules/RugStudio.xml
@@ -11,7 +11,8 @@
 
 
 	
-	
+	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/RukometniTrener.com.xml b/src/chrome/content/rules/RukometniTrener.com.xml
new file mode 100644
index 000000000000..f40e31f2581f
--- /dev/null
+++ b/src/chrome/content/rules/RukometniTrener.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ruliweb.com.xml b/src/chrome/content/rules/Ruliweb.com.xml
new file mode 100644
index 000000000000..b2ddf9655b9a
--- /dev/null
+++ b/src/chrome/content/rules/Ruliweb.com.xml
@@ -0,0 +1,17 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/RunAbove.xml b/src/chrome/content/rules/RunAbove.xml
index 299612de7eae..4cf304a8b4b4 100644
--- a/src/chrome/content/rules/RunAbove.xml
+++ b/src/chrome/content/rules/RunAbove.xml
@@ -6,7 +6,7 @@ Fetch error: http://status.runabove.com/ => https://status.runabove.com/: (6, 'C
 	For other OVH Group coverage, see Ovh.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/RunRepeat.com.xml b/src/chrome/content/rules/RunRepeat.com.xml
new file mode 100644
index 000000000000..8787fb1c1294
--- /dev/null
+++ b/src/chrome/content/rules/RunRepeat.com.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/RunSafe.xml b/src/chrome/content/rules/RunSafe.xml
index b57bdb9ac482..bfcfd0e4f36c 100644
--- a/src/chrome/content/rules/RunSafe.xml
+++ b/src/chrome/content/rules/RunSafe.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Runbook.io.xml b/src/chrome/content/rules/Runbook.io.xml
index 313673b47f27..d12632e5a98c 100644
--- a/src/chrome/content/rules/Runbook.io.xml
+++ b/src/chrome/content/rules/Runbook.io.xml
@@ -6,7 +6,7 @@ Fetch error: http://dash.runbook.io/ => https://dash.runbook.io/: (6, 'Could not
 	For other Assembly coverage, see Assembly.com.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/RushMyPassport.com.xml b/src/chrome/content/rules/RushMyPassport.com.xml
index f0a63a02039d..36e393b72ec6 100644
--- a/src/chrome/content/rules/RushMyPassport.com.xml
+++ b/src/chrome/content/rules/RushMyPassport.com.xml
@@ -14,4 +14,4 @@
 
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Russia.ru.xml b/src/chrome/content/rules/Russia.ru.xml
deleted file mode 100644
index adc5c4695cfc..000000000000
--- a/src/chrome/content/rules/Russia.ru.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Russian_American_Company.xml b/src/chrome/content/rules/Russian_American_Company.xml
index 02d05703a3c7..397737343ff2 100644
--- a/src/chrome/content/rules/Russian_American_Company.xml
+++ b/src/chrome/content/rules/Russian_American_Company.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Rust-Lang.org.xml b/src/chrome/content/rules/Rust-Lang.org.xml
index c0bc4413f10f..aad60653dffb 100644
--- a/src/chrome/content/rules/Rust-Lang.org.xml
+++ b/src/chrome/content/rules/Rust-Lang.org.xml
@@ -1,6 +1,5 @@
 
 
 	
@@ -8,12 +7,11 @@
 	
 	
 	
+	
 	
 	
 
 	
 
-	
-
 	
 
diff --git a/src/chrome/content/rules/RustFest.eu.xml b/src/chrome/content/rules/RustFest.eu.xml
new file mode 100644
index 000000000000..0d14eb45a508
--- /dev/null
+++ b/src/chrome/content/rules/RustFest.eu.xml
@@ -0,0 +1,21 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ruxcon_Breakpoint.com.xml b/src/chrome/content/rules/Ruxcon_Breakpoint.com.xml
index 6fa475eed425..7dfe30c9d12b 100644
--- a/src/chrome/content/rules/Ruxcon_Breakpoint.com.xml
+++ b/src/chrome/content/rules/Ruxcon_Breakpoint.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://ruxconbreakpoint.com/ => https://ruxconbreakpoint.com/: (60,
 Fetch error: http://www.ruxconbreakpoint.com/ => https://www.ruxconbreakpoint.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
@@ -13,4 +13,4 @@ Fetch error: http://www.ruxconbreakpoint.com/ => https://www.ruxconbreakpoint.co
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Rxpharmacyusa.com.xml b/src/chrome/content/rules/Rxpharmacyusa.com.xml
index fcc4c45252df..a27667704d9f 100644
--- a/src/chrome/content/rules/Rxpharmacyusa.com.xml
+++ b/src/chrome/content/rules/Rxpharmacyusa.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://rxpharmacyusa.com/ => https://rxpharmacyusa.com/: (28, 'Conn
 Fetch error: http://www.rxpharmacyusa.com/ => https://www.rxpharmacyusa.com/: (28, 'Connection timed out after 20000 milliseconds')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.rxpharmacyusa.com/ => https://www.rxpharmacyusa.com/: (2
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ryanair.com.xml b/src/chrome/content/rules/Ryanair.com.xml
index e33ca58c7b17..8510d953b290 100644
--- a/src/chrome/content/rules/Ryanair.com.xml
+++ b/src/chrome/content/rules/Ryanair.com.xml
@@ -1,5 +1,5 @@
 
-  
+  
   
 
 
@@ -11,7 +11,7 @@
 	
 
 
-  
   
+  
 
 
diff --git a/src/chrome/content/rules/S-3.com.xml b/src/chrome/content/rules/S-3.com.xml
index c7d6f8e7d458..e947e28d8c8f 100644
--- a/src/chrome/content/rules/S-3.com.xml
+++ b/src/chrome/content/rules/S-3.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://s-3.com/ => https://s-3.com/: (60, 'SSL certificate problem:
 Fetch error: http://www.s-3.com/ => https://www.s-3.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/S-msn.com.xml b/src/chrome/content/rules/S-msn.com.xml
index 74f23a1a2800..dd2b0944b9fc 100644
--- a/src/chrome/content/rules/S-msn.com.xml
+++ b/src/chrome/content/rules/S-msn.com.xml
@@ -106,7 +106,7 @@ Fetch error: http://wst.s-msn.com/ => https://wst.s-msn.com/: (28, 'Operation ti
 	** CN: *.sharepointonline.com; works
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/S.to.xml b/src/chrome/content/rules/S.to.xml
new file mode 100644
index 000000000000..8d21909f7a3a
--- /dev/null
+++ b/src/chrome/content/rules/S.to.xml
@@ -0,0 +1,14 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/S2-Games.xml b/src/chrome/content/rules/S2-Games.xml
index 5a48a27b5dc9..d51493adf3d3 100644
--- a/src/chrome/content/rules/S2-Games.xml
+++ b/src/chrome/content/rules/S2-Games.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://savage2.com/ => https://savage2.com/: Redirect for 'http://savage2.com/en/' missing Location
 Fetch error: http://www.savage2.com/ => https://savage2.com/: Redirect for 'http://www.savage2.com/en/' missing Location
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/SACNAS.xml b/src/chrome/content/rules/SACNAS.xml
index adb67b030139..526ec2beb0e2 100644
--- a/src/chrome/content/rules/SACNAS.xml
+++ b/src/chrome/content/rules/SACNAS.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://sacnas.org/ => https://sacnas.org/: Too many redirects while fetching 'https://sacnas.org/'
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/SAMBA.xml b/src/chrome/content/rules/SAMBA.xml
index 220032f18012..348eb770e2ec 100644
--- a/src/chrome/content/rules/SAMBA.xml
+++ b/src/chrome/content/rules/SAMBA.xml
@@ -4,10 +4,12 @@ Fetch error: http://samba.com/ => https://www.samba.com/: (35, 'Unknown SSL prot
 -->
 
   
-  
+  
+  
+  
+  
 
   
-  
+  
 
diff --git a/src/chrome/content/rules/SANS.org.xml b/src/chrome/content/rules/SANS.org.xml
index 435745a9f4e6..a469d9674392 100644
--- a/src/chrome/content/rules/SANS.org.xml
+++ b/src/chrome/content/rules/SANS.org.xml
@@ -9,8 +9,6 @@ Fetch error: http://spam.sans.org/ => https://spam.sans.org/: (7, 'Failed to con
 
 	Other SANS Institute rulesets:
 
-		- DShield.org.xml
-		- GIAC.org.xml
 		- SANS.edu.xml
 		- Securing_the_Human.org.xml
 
@@ -22,7 +20,7 @@ Fetch error: http://spam.sans.org/ => https://spam.sans.org/: (7, 'Failed to con
 	* Secured by us
 
 -->
-
+
 
 	
@@ -33,7 +31,7 @@ Fetch error: http://spam.sans.org/ => https://spam.sans.org/: (7, 'Failed to con
 	
 	
 	
-		
+	
 	
 	
 	
diff --git a/src/chrome/content/rules/SAP.xml b/src/chrome/content/rules/SAP.xml
index 3f003c3f63e5..1166c63a64b3 100644
--- a/src/chrome/content/rules/SAP.xml
+++ b/src/chrome/content/rules/SAP.xml
@@ -63,7 +63,7 @@ DNS Name: autodiscovery.sap.com
 
 
 -->
-
+
 
 	
 	
@@ -89,4 +89,4 @@ DNS Name: autodiscovery.sap.com
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SAS_Institute.xml b/src/chrome/content/rules/SAS_Institute.xml
index 0b88ee85cb34..5df0f2fbcf39 100644
--- a/src/chrome/content/rules/SAS_Institute.xml
+++ b/src/chrome/content/rules/SAS_Institute.xml
@@ -45,7 +45,7 @@
 			- .
 			- login
 				-->
-	
+	
 
 
 	 https://www.sata-io.org/: (60, 'SSL certific
 Fetch error: http://www.sata-io.org/ => https://www.sata-io.org/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/SAT_symposium.org.xml b/src/chrome/content/rules/SAT_symposium.org.xml
index f1c4537eb6dd..da97b4fbc286 100644
--- a/src/chrome/content/rules/SAT_symposium.org.xml
+++ b/src/chrome/content/rules/SAT_symposium.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://satsymposium.org/ => https://satsymposium.org/: (60, 'SSL ce
 Fetch error: http://www.satsymposium.org/ => https://www.satsymposium.org/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/SAnet.cd.xml b/src/chrome/content/rules/SAnet.cd.xml
index b1f86ed5b510..338ba409bd3f 100644
--- a/src/chrome/content/rules/SAnet.cd.xml
+++ b/src/chrome/content/rules/SAnet.cd.xml
@@ -11,4 +11,4 @@
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SB-Innovation.de.xml b/src/chrome/content/rules/SB-Innovation.de.xml
index 325fde9eb2ad..a007555f5c01 100644
--- a/src/chrome/content/rules/SB-Innovation.de.xml
+++ b/src/chrome/content/rules/SB-Innovation.de.xml
@@ -4,7 +4,7 @@
 	
 
 
-	
+	
 
 
 	
 	
 
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/SBI.xml b/src/chrome/content/rules/SBI.xml
index 343e38d017fa..bb462be14608 100644
--- a/src/chrome/content/rules/SBI.xml
+++ b/src/chrome/content/rules/SBI.xml
@@ -29,7 +29,7 @@ Fetch error: http://sbiforsme.sbi.co.in/ => https://sbiforsme.sbi.co.in/: (60, '
 		- vijaypath
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/SBNdev.net.xml b/src/chrome/content/rules/SBNdev.net.xml
deleted file mode 100644
index ed21a7027659..000000000000
--- a/src/chrome/content/rules/SBNdev.net.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/SBV_Improver.com.xml b/src/chrome/content/rules/SBV_Improver.com.xml
index 2b9de715f9ee..895154180058 100644
--- a/src/chrome/content/rules/SBV_Improver.com.xml
+++ b/src/chrome/content/rules/SBV_Improver.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://sbvimprover.com/ => https://sbvimprover.com/: (7, 'Failed to connect to sbvimprover.com port 443: Connection timed out')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/SCAP_Sync.com.xml b/src/chrome/content/rules/SCAP_Sync.com.xml
index 305f49fadf45..c542195aac49 100644
--- a/src/chrome/content/rules/SCAP_Sync.com.xml
+++ b/src/chrome/content/rules/SCAP_Sync.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.scapsync.com/ => https://www.scapsync.com/: (28, 'Connec
 	For other Lunarline coverage, see Lunarline.com.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/SDA.it.xml b/src/chrome/content/rules/SDA.it.xml
index 92402c3ee007..7ca3d24fdf09 100644
--- a/src/chrome/content/rules/SDA.it.xml
+++ b/src/chrome/content/rules/SDA.it.xml
@@ -9,14 +9,14 @@ Fetch error: http://www.sda.it/ => https://www.sda.it/: (60, 'SSL certificate pr
 	Nonfunctional hosts in *sda.it:
 
 		- m *
-		
+
 	* Dropped
 
 
 	^sda.it doesn't exist.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/SDI-Tool.org.xml b/src/chrome/content/rules/SDI-Tool.org.xml
index 0fc8e084f509..2866803b2d7d 100644
--- a/src/chrome/content/rules/SDI-Tool.org.xml
+++ b/src/chrome/content/rules/SDI-Tool.org.xml
@@ -1,8 +1,13 @@
+
 
 	
 	
 
 	
 
+	
 	
 
diff --git a/src/chrome/content/rules/SEMABUZZ.COM.xml b/src/chrome/content/rules/SEMABUZZ.COM.xml
index 3d3486aeb47b..776755a611f0 100644
--- a/src/chrome/content/rules/SEMABUZZ.COM.xml
+++ b/src/chrome/content/rules/SEMABUZZ.COM.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://semabuzz.com/ => https://semabuzz.com/: (28, 'Operation timed out after 0 milliseconds with 0 out of 0 bytes received')
 Fetch error: http://www.semabuzz.com/ => https://www.semabuzz.com/: (28, 'Operation timed out after 0 milliseconds with 0 out of 0 bytes received')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/SEO_Training_Toronto.xml b/src/chrome/content/rules/SEO_Training_Toronto.xml
index 12b35086382b..59aa1b712af5 100644
--- a/src/chrome/content/rules/SEO_Training_Toronto.xml
+++ b/src/chrome/content/rules/SEO_Training_Toronto.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SEScoops.xml b/src/chrome/content/rules/SEScoops.xml
index 046623a5715b..ae0815d7e8b3 100644
--- a/src/chrome/content/rules/SEScoops.xml
+++ b/src/chrome/content/rules/SEScoops.xml
@@ -24,4 +24,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SEstatic.fi.xml b/src/chrome/content/rules/SEstatic.fi.xml
deleted file mode 100644
index a71712c2669e..000000000000
--- a/src/chrome/content/rules/SEstatic.fi.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/SF-Mail.de.xml b/src/chrome/content/rules/SF-Mail.de.xml
index 0094e52f32ba..36db14ff1f72 100644
--- a/src/chrome/content/rules/SF-Mail.de.xml
+++ b/src/chrome/content/rules/SF-Mail.de.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://webmail.sf-mail.de/ => https://webmail.sf-mail.de/: (60, 'SSL certificate problem: self signed certificate in certificate chain')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/SF.net.xml b/src/chrome/content/rules/SF.net.xml
index 47015e7ca819..0ef3c740834d 100644
--- a/src/chrome/content/rules/SF.net.xml
+++ b/src/chrome/content/rules/SF.net.xml
@@ -1,4 +1,10 @@
+
 
-	
-	
+	
+	
 	
 	
-	
 
 	
+	
+		
+		
+		
+		
+		
+
 	
 		
diff --git a/src/chrome/content/rules/SFGate.com.xml b/src/chrome/content/rules/SFGate.com.xml
new file mode 100644
index 000000000000..01e7d27fdab8
--- /dev/null
+++ b/src/chrome/content/rules/SFGate.com.xml
@@ -0,0 +1,118 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/SFM-Group.xml b/src/chrome/content/rules/SFM-Group.xml
index a1ef21cce058..07d10c726c67 100644
--- a/src/chrome/content/rules/SFM-Group.xml
+++ b/src/chrome/content/rules/SFM-Group.xml
@@ -5,7 +5,11 @@ Fetch error: http://sfm-offshore.com/ => https://www.sfm-offshore.com/: (60, 'SS
 
 
 	
-	
+	
+	
+	
+	
+	
 
 	
diff --git a/src/chrome/content/rules/SGI.com.xml b/src/chrome/content/rules/SGI.com.xml
index 589c7a828817..96f46a8cef23 100644
--- a/src/chrome/content/rules/SGI.com.xml
+++ b/src/chrome/content/rules/SGI.com.xml
@@ -12,4 +12,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SIDN.xml b/src/chrome/content/rules/SIDN.xml
index 5534dde4f3a1..46015fbd34f3 100644
--- a/src/chrome/content/rules/SIDN.xml
+++ b/src/chrome/content/rules/SIDN.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SIFF.xml b/src/chrome/content/rules/SIFF.xml
index aa5b2070ee1d..665dfc24afd0 100644
--- a/src/chrome/content/rules/SIFF.xml
+++ b/src/chrome/content/rules/SIFF.xml
@@ -6,7 +6,7 @@
   
   
 
-  
+  
 
   
- 
+
diff --git a/src/chrome/content/rules/SIL-International.xml b/src/chrome/content/rules/SIL-International.xml
index e5b170d4bca0..86a3f3ee8da6 100644
--- a/src/chrome/content/rules/SIL-International.xml
+++ b/src/chrome/content/rules/SIL-International.xml
@@ -29,4 +29,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SIL_International-problematic.xml b/src/chrome/content/rules/SIL_International-problematic.xml
index f89f9a92d2ae..5000d691a20e 100644
--- a/src/chrome/content/rules/SIL_International-problematic.xml
+++ b/src/chrome/content/rules/SIL_International-problematic.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SIMILE-Widgets.org.xml b/src/chrome/content/rules/SIMILE-Widgets.org.xml
new file mode 100644
index 000000000000..6037a13221b2
--- /dev/null
+++ b/src/chrome/content/rules/SIMILE-Widgets.org.xml
@@ -0,0 +1,18 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/SIRCorp.com.xml b/src/chrome/content/rules/SIRCorp.com.xml
new file mode 100644
index 000000000000..8907f5d06596
--- /dev/null
+++ b/src/chrome/content/rules/SIRCorp.com.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/SJ.se.xml b/src/chrome/content/rules/SJ.se.xml
index 0a14340ddd56..80f2e45d0639 100644
--- a/src/chrome/content/rules/SJ.se.xml
+++ b/src/chrome/content/rules/SJ.se.xml
@@ -1,21 +1,18 @@
 
 
-  
-  
-		
-		
+	
 
-
-	
-	
-
-
-  
-  
+	
 
-
diff --git a/src/chrome/content/rules/SKNVibes.xml b/src/chrome/content/rules/SKNVibes.xml
deleted file mode 100644
index a4a9de3286de..000000000000
--- a/src/chrome/content/rules/SKNVibes.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-	
-		
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/SK_hynix.com.xml b/src/chrome/content/rules/SK_hynix.com.xml
index e9e0b60c1c2d..3bca17f52206 100644
--- a/src/chrome/content/rules/SK_hynix.com.xml
+++ b/src/chrome/content/rules/SK_hynix.com.xml
@@ -18,7 +18,7 @@ Fetch error: http://skhynix.com/ => https://skhynix.com/: (35, 'error:140773E8:S
 		- www.skhynix.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/SKortekaas.nl.xml b/src/chrome/content/rules/SKortekaas.nl.xml
index 0b62ee5032e6..a8e154324131 100644
--- a/src/chrome/content/rules/SKortekaas.nl.xml
+++ b/src/chrome/content/rules/SKortekaas.nl.xml
@@ -4,4 +4,4 @@
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SLOOH.xml b/src/chrome/content/rules/SLOOH.xml
deleted file mode 100644
index 93f849b9348b..000000000000
--- a/src/chrome/content/rules/SLOOH.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-	
-	
-		
-		
-
-
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/SME.sk.xml b/src/chrome/content/rules/SME.sk.xml
index 0828b2e047f0..fef8a3a6fb4c 100644
--- a/src/chrome/content/rules/SME.sk.xml
+++ b/src/chrome/content/rules/SME.sk.xml
@@ -1,4 +1,21 @@
+
 
 	
-	
+	
 	
-	
+	
 	
-	
+	
 	
-	
+	
 	
-	
+	
 	
 	
 	
@@ -72,7 +89,7 @@
 	
 	
 	
-	
+	
 	
 	
 	
@@ -108,8 +125,5 @@
 	
 
-	
-
 	
 
diff --git a/src/chrome/content/rules/SMFTA.com.xml b/src/chrome/content/rules/SMFTA.com.xml
index 553afa01bcbc..c7d504ecfbca 100644
--- a/src/chrome/content/rules/SMFTA.com.xml
+++ b/src/chrome/content/rules/SMFTA.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://www.smfta.com/ => https://www.smfta.com/: (7, 'Failed to con
 		- beta	(works; mismatched, CN: *.securesites.net)
 
 -->
-
+
 
 	
 	
@@ -24,4 +24,4 @@ Fetch error: http://www.smfta.com/ => https://www.smfta.com/: (7, 'Failed to con
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SMF_for_Free.xml b/src/chrome/content/rules/SMF_for_Free.xml
index 4ba7178ee9c1..f01e3cbbf9da 100644
--- a/src/chrome/content/rules/SMF_for_Free.xml
+++ b/src/chrome/content/rules/SMF_for_Free.xml
@@ -16,13 +16,8 @@
 -->
 
 
-	
+	
+	
 
-
-	
-
-	
-
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/SMSSecure.org.xml b/src/chrome/content/rules/SMSSecure.org.xml
index 6746a4f5a385..67e72a806214 100644
--- a/src/chrome/content/rules/SMSSecure.org.xml
+++ b/src/chrome/content/rules/SMSSecure.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://smssecure.org/ => https://smssecure.org/: (60, 'SSL certific
 Fetch error: http://www.smssecure.org/ => https://www.smssecure.org/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/SNCB.xml b/src/chrome/content/rules/SNCB.xml
index cc7d5933b04e..45899247ce59 100644
--- a/src/chrome/content/rules/SNCB.xml
+++ b/src/chrome/content/rules/SNCB.xml
@@ -2,7 +2,7 @@
     
     
 
-    
+    
 
     
diff --git a/src/chrome/content/rules/SNL.com.xml b/src/chrome/content/rules/SNL.com.xml
index a687bff20d53..3f465c4d798c 100644
--- a/src/chrome/content/rules/SNL.com.xml
+++ b/src/chrome/content/rules/SNL.com.xml
@@ -19,4 +19,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SNstatic.fi.xml b/src/chrome/content/rules/SNstatic.fi.xml
index fcae4152d962..6b1e6c891450 100644
--- a/src/chrome/content/rules/SNstatic.fi.xml
+++ b/src/chrome/content/rules/SNstatic.fi.xml
@@ -15,7 +15,7 @@ Fetch error: http://hs11.snstatic.fi/webkuva/oletus/60/1305620265306 => https://
 		- hs1[0-3] (redirects to http; mismatched, CN: *.hs.fi)
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/SNtech.xml b/src/chrome/content/rules/SNtech.xml
index db6fb12b4be8..738af7c83c53 100644
--- a/src/chrome/content/rules/SNtech.xml
+++ b/src/chrome/content/rules/SNtech.xml
@@ -13,11 +13,11 @@ Fetch error: http://ssl.sntech.de/ => https://ssl.sntech.de/: (60, 'SSL certific
 	* Shows ssl; mismatched, CN: ssl.sntech.de
 
 -->
-
+
 
 	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SONGLYRICS.com.xml b/src/chrome/content/rules/SONGLYRICS.com.xml
index 0185e6576596..676a088c1906 100644
--- a/src/chrome/content/rules/SONGLYRICS.com.xml
+++ b/src/chrome/content/rules/SONGLYRICS.com.xml
@@ -1,18 +1,19 @@
 
-
+
 	
 	
 	
+	
+	
 	
 
 	
diff --git a/src/chrome/content/rules/SOS.wa.gov.xml b/src/chrome/content/rules/SOS.wa.gov.xml
index cdffaf2f4c28..2eff06226f73 100644
--- a/src/chrome/content/rules/SOS.wa.gov.xml
+++ b/src/chrome/content/rules/SOS.wa.gov.xml
@@ -1,7 +1,17 @@
+
 
 	
-	
-	
-	
-		
-		
-		
-	
+	
+	
+	
+	
 	
-	
-		
+	
 	
 		
 		
 		
-	
+	
 	
 		
 		
diff --git a/src/chrome/content/rules/SPBAS.com.xml b/src/chrome/content/rules/SPBAS.com.xml
index ca003b49598f..406b5d5456d7 100644
--- a/src/chrome/content/rules/SPBAS.com.xml
+++ b/src/chrome/content/rules/SPBAS.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.spbas.com/ => https://www.spbas.com/: (60, 'SSL certific
 		- blog
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/SPDX.org.xml b/src/chrome/content/rules/SPDX.org.xml
index 38d68dadd2a2..1e15e74e2b82 100644
--- a/src/chrome/content/rules/SPDX.org.xml
+++ b/src/chrome/content/rules/SPDX.org.xml
@@ -22,7 +22,7 @@
 	
-		
+	
 
 
 	
     
 
-    
 
     
diff --git a/src/chrome/content/rules/SPU.ac.th.xml b/src/chrome/content/rules/SPU.ac.th.xml
index 730ee9cc3007..bed0d639abda 100644
--- a/src/chrome/content/rules/SPU.ac.th.xml
+++ b/src/chrome/content/rules/SPU.ac.th.xml
@@ -118,6 +118,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/SP_Times.com.xml b/src/chrome/content/rules/SP_Times.com.xml
deleted file mode 100644
index 05bc8030c597..000000000000
--- a/src/chrome/content/rules/SP_Times.com.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/SPajIT.xml b/src/chrome/content/rules/SPajIT.xml
deleted file mode 100644
index e4c34fb3bb8c..000000000000
--- a/src/chrome/content/rules/SPajIT.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-	
-	
-	
-	
-
-	
-
-	
-	
-
-	
-	
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/SQL_Converter.xml b/src/chrome/content/rules/SQL_Converter.xml
index b71617ff5fb8..672c5ad2ff82 100644
--- a/src/chrome/content/rules/SQL_Converter.xml
+++ b/src/chrome/content/rules/SQL_Converter.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SQLite.xml b/src/chrome/content/rules/SQLite.xml
index 1bd5ffd7b7cd..a325900ab5df 100644
--- a/src/chrome/content/rules/SQLite.xml
+++ b/src/chrome/content/rules/SQLite.xml
@@ -1,20 +1,27 @@
+
 
 
 	
-	
 	
+	
+	
+	
 
 		
 		
-
 			
 
+	
 
-	
-
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/SQLiteBrowser.org.xml b/src/chrome/content/rules/SQLiteBrowser.org.xml
new file mode 100644
index 000000000000..b9979d9ecad6
--- /dev/null
+++ b/src/chrome/content/rules/SQLiteBrowser.org.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/SRB2Skybase.org.xml b/src/chrome/content/rules/SRB2Skybase.org.xml
new file mode 100644
index 000000000000..8546d33142e3
--- /dev/null
+++ b/src/chrome/content/rules/SRB2Skybase.org.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/SRI_Hash.org.xml b/src/chrome/content/rules/SRI_Hash.org.xml
deleted file mode 100644
index d71b0cdfac4e..000000000000
--- a/src/chrome/content/rules/SRI_Hash.org.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/SRM.de.xml b/src/chrome/content/rules/SRM.de.xml
index 75bb3b5c517b..e561bfcbf055 100644
--- a/src/chrome/content/rules/SRM.de.xml
+++ b/src/chrome/content/rules/SRM.de.xml
@@ -20,7 +20,7 @@ Fetch error: http://www.srm.de/ => https://www.srm.de/: Cycle detected - URL alr
 	platform should be removed with Ffx 24.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/SSL-Cert-Shop.com.xml b/src/chrome/content/rules/SSL-Cert-Shop.com.xml
deleted file mode 100644
index de57ee1a4a25..000000000000
--- a/src/chrome/content/rules/SSL-Cert-Shop.com.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-	
-
-		
-		
-
-
-	
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/SSL-Images-Amazon.com.xml b/src/chrome/content/rules/SSL-Images-Amazon.com.xml
index ec98b467fd77..f65483cde500 100644
--- a/src/chrome/content/rules/SSL-Images-Amazon.com.xml
+++ b/src/chrome/content/rules/SSL-Images-Amazon.com.xml
@@ -6,9 +6,9 @@
 
 	
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/SSLEnforcer.com.xml b/src/chrome/content/rules/SSLEnforcer.com.xml
new file mode 100644
index 000000000000..77aa7f2e133f
--- /dev/null
+++ b/src/chrome/content/rules/SSLEnforcer.com.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/SSSup.it.xml b/src/chrome/content/rules/SSSup.it.xml
index e906140b01f5..8c26ece9aafd 100644
--- a/src/chrome/content/rules/SSSup.it.xml
+++ b/src/chrome/content/rules/SSSup.it.xml
@@ -45,9 +45,12 @@
 	* Secured by us
 
 -->
-
-
-	
+
+	
+	
+	
+	
+	
 		
@@ -70,13 +73,5 @@
 					-->
 	
 
-
-	
-	
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/STA-Travel.at.xml b/src/chrome/content/rules/STA-Travel.at.xml
new file mode 100644
index 000000000000..81e55ed017ac
--- /dev/null
+++ b/src/chrome/content/rules/STA-Travel.at.xml
@@ -0,0 +1,33 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/STA-Travel.ch.xml b/src/chrome/content/rules/STA-Travel.ch.xml
new file mode 100644
index 000000000000..fc8611babd21
--- /dev/null
+++ b/src/chrome/content/rules/STA-Travel.ch.xml
@@ -0,0 +1,44 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/STA-Travel.co.jp.xml b/src/chrome/content/rules/STA-Travel.co.jp.xml
new file mode 100644
index 000000000000..2b46bd642bad
--- /dev/null
+++ b/src/chrome/content/rules/STA-Travel.co.jp.xml
@@ -0,0 +1,26 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/STA-Travel.co.nz.xml b/src/chrome/content/rules/STA-Travel.co.nz.xml
new file mode 100644
index 000000000000..83ead9f632cb
--- /dev/null
+++ b/src/chrome/content/rules/STA-Travel.co.nz.xml
@@ -0,0 +1,48 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+	
+
+	
+
+	
+	
+		
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/STA-Travel.co.th.xml b/src/chrome/content/rules/STA-Travel.co.th.xml
new file mode 100644
index 000000000000..9094db564b32
--- /dev/null
+++ b/src/chrome/content/rules/STA-Travel.co.th.xml
@@ -0,0 +1,30 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/STA-Travel.co.za.xml b/src/chrome/content/rules/STA-Travel.co.za.xml
new file mode 100644
index 000000000000..fc63a93e6cf2
--- /dev/null
+++ b/src/chrome/content/rules/STA-Travel.co.za.xml
@@ -0,0 +1,30 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/STA-Travel.com.au.xml b/src/chrome/content/rules/STA-Travel.com.au.xml
new file mode 100644
index 000000000000..0b0a3803c626
--- /dev/null
+++ b/src/chrome/content/rules/STA-Travel.com.au.xml
@@ -0,0 +1,48 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+		
+
+	
+
+	
+	
+		
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/STA-Travel.com.sg.xml b/src/chrome/content/rules/STA-Travel.com.sg.xml
new file mode 100644
index 000000000000..9fdc7d485666
--- /dev/null
+++ b/src/chrome/content/rules/STA-Travel.com.sg.xml
@@ -0,0 +1,25 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/STA-Travel.com.xml b/src/chrome/content/rules/STA-Travel.com.xml
new file mode 100644
index 000000000000..fcd0243cc351
--- /dev/null
+++ b/src/chrome/content/rules/STA-Travel.com.xml
@@ -0,0 +1,75 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+
+	
+
+	
+	
+		
+		
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/STA-Travel.de.xml b/src/chrome/content/rules/STA-Travel.de.xml
new file mode 100644
index 000000000000..0756444bf02c
--- /dev/null
+++ b/src/chrome/content/rules/STA-Travel.de.xml
@@ -0,0 +1,44 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/STARTTLS.info.xml b/src/chrome/content/rules/STARTTLS.info.xml
index 10cce5a46347..b6d8acbd319b 100644
--- a/src/chrome/content/rules/STARTTLS.info.xml
+++ b/src/chrome/content/rules/STARTTLS.info.xml
@@ -5,7 +5,7 @@ Fetch error: http://starttls.info/ => https://starttls.info/: (51, "SSL: no alte
 Fetch error: http://www.starttls.info/ => https://www.starttls.info/: (51, "SSL: no alternative certificate subject name matches target host name 'www.starttls.info'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/STLinux.com.xml b/src/chrome/content/rules/STLinux.com.xml
deleted file mode 100644
index 517b1e876ed6..000000000000
--- a/src/chrome/content/rules/STLinux.com.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/STRATO_MailCenter.xml b/src/chrome/content/rules/STRATO_MailCenter.xml
index 28ebc2ae639a..4ff0ae05a608 100644
--- a/src/chrome/content/rules/STRATO_MailCenter.xml
+++ b/src/chrome/content/rules/STRATO_MailCenter.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.strato-mailcenter.com/ => https://www.strato-mailcenter.
 	Cert only matches www.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/STRATO_Pro.xml b/src/chrome/content/rules/STRATO_Pro.xml
index bea7edb6de99..9ceb7e865483 100644
--- a/src/chrome/content/rules/STRATO_Pro.xml
+++ b/src/chrome/content/rules/STRATO_Pro.xml
@@ -13,7 +13,7 @@ Fetch error: http://www.strato-pro.com/ => https://www.strato-pro.com/: (60, 'SS
 	Cert only matches www.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/STSDB.com.xml b/src/chrome/content/rules/STSDB.com.xml
deleted file mode 100644
index ba1dc6d21037..000000000000
--- a/src/chrome/content/rules/STSDB.com.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/STUBA.sk.xml b/src/chrome/content/rules/STUBA.sk.xml
new file mode 100644
index 000000000000..7917df9eedb5
--- /dev/null
+++ b/src/chrome/content/rules/STUBA.sk.xml
@@ -0,0 +1,38 @@
+
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/SUEDKURIER.de.xml b/src/chrome/content/rules/SUEDKURIER.de.xml
new file mode 100644
index 000000000000..3cd0511b42f9
--- /dev/null
+++ b/src/chrome/content/rules/SUEDKURIER.de.xml
@@ -0,0 +1,119 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/SUPERVALU.xml b/src/chrome/content/rules/SUPERVALU.xml
index 28fb204fbbee..7f95b821fb00 100644
--- a/src/chrome/content/rules/SUPERVALU.xml
+++ b/src/chrome/content/rules/SUPERVALU.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.supervalu.com/ => https://www.supervalu.com/: (28, 'Conn
 	Cert only matches www.
 
 -->
-
+
 
 	
 	
@@ -22,4 +22,4 @@ Fetch error: http://www.supervalu.com/ => https://www.supervalu.com/: (28, 'Conn
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SVGOpen.xml b/src/chrome/content/rules/SVGOpen.xml
index 0d3bb0b180af..b2dd84dab757 100644
--- a/src/chrome/content/rules/SVGOpen.xml
+++ b/src/chrome/content/rules/SVGOpen.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://svgopen.org/ => https://www.svgopen.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.svgopen.org'")
 Fetch error: http://www.svgopen.org/ => https://www.svgopen.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.svgopen.org'")
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/SVN-Lab.xml b/src/chrome/content/rules/SVN-Lab.xml
deleted file mode 100644
index 8d765dfca005..000000000000
--- a/src/chrome/content/rules/SVN-Lab.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-	
-	
-	
-
-	
-
-	
-	
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/SVT.se.xml b/src/chrome/content/rules/SVT.se.xml
index 2835ce327965..4182ad71078f 100644
--- a/src/chrome/content/rules/SVT.se.xml
+++ b/src/chrome/content/rules/SVT.se.xml
@@ -1,27 +1,19 @@
 
-
-
-	
 
+
+	
+	
+	
 
-	
+	
+	
 
+	
 
 	
-
 
-
diff --git a/src/chrome/content/rules/SWISS-Virtual.com.xml b/src/chrome/content/rules/SWISS-Virtual.com.xml
index 41f8f30ae906..259ee94a4ccd 100644
--- a/src/chrome/content/rules/SWISS-Virtual.com.xml
+++ b/src/chrome/content/rules/SWISS-Virtual.com.xml
@@ -1,6 +1,6 @@
 
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/SWT.com.xml b/src/chrome/content/rules/SWT.com.xml
index a5e25bc02814..0b9ad8098f11 100644
--- a/src/chrome/content/rules/SWT.com.xml
+++ b/src/chrome/content/rules/SWT.com.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
-	
+
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Sabq.org.xml b/src/chrome/content/rules/Sabq.org.xml
new file mode 100644
index 000000000000..b286059676ec
--- /dev/null
+++ b/src/chrome/content/rules/Sabq.org.xml
@@ -0,0 +1,21 @@
+
+
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Sabre_Hospitality_Solutions.xml b/src/chrome/content/rules/Sabre_Hospitality_Solutions.xml
index 0d46761e427e..9701451842f1 100644
--- a/src/chrome/content/rules/Sabre_Hospitality_Solutions.xml
+++ b/src/chrome/content/rules/Sabre_Hospitality_Solutions.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Sacramento-Bee.xml b/src/chrome/content/rules/Sacramento-Bee.xml
new file mode 100644
index 000000000000..3c05b1cf6477
--- /dev/null
+++ b/src/chrome/content/rules/Sacramento-Bee.xml
@@ -0,0 +1,29 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Sacramento_Bee.xml b/src/chrome/content/rules/Sacramento_Bee.xml
deleted file mode 100644
index 1e5fce7dee1a..000000000000
--- a/src/chrome/content/rules/Sacramento_Bee.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/SadeceHosting.com.xml b/src/chrome/content/rules/SadeceHosting.com.xml
deleted file mode 100644
index c5dece473792..000000000000
--- a/src/chrome/content/rules/SadeceHosting.com.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Safari_Flow.com.xml b/src/chrome/content/rules/Safari_Flow.com.xml
index 0bed6fd4ce1f..5a6b1c831ec6 100644
--- a/src/chrome/content/rules/Safari_Flow.com.xml
+++ b/src/chrome/content/rules/Safari_Flow.com.xml
@@ -18,7 +18,7 @@
 	* Unsecurable <= http reply
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Safe-mail.net.xml b/src/chrome/content/rules/Safe-mail.net.xml
index 8dba2fe1c39a..1a01a1619411 100644
--- a/src/chrome/content/rules/Safe-mail.net.xml
+++ b/src/chrome/content/rules/Safe-mail.net.xml
@@ -1,19 +1,16 @@
-
-
-
+
 
 	
-	
-
-		
-		
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/SafeAssign.xml b/src/chrome/content/rules/SafeAssign.xml
deleted file mode 100644
index 0e3079b6a8bc..000000000000
--- a/src/chrome/content/rules/SafeAssign.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/SafeHouse.com.xml b/src/chrome/content/rules/SafeHouse.com.xml
new file mode 100644
index 000000000000..67b0da614f79
--- /dev/null
+++ b/src/chrome/content/rules/SafeHouse.com.xml
@@ -0,0 +1,18 @@
+
+
+
+	
+	
+		
+		
+		
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/SafeNet.xml b/src/chrome/content/rules/SafeNet.xml
index 6979e56e3f29..f8e60b3e5a6a 100644
--- a/src/chrome/content/rules/SafeNet.xml
+++ b/src/chrome/content/rules/SafeNet.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://sentineldiscussion.safenet-inc.com/ => https://sentineldiscussion.safenet-inc.com/: (51, "SSL: no alternative certificate subject name matches target host name 'sentineldiscussion.gemalto.com'")
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/SafePilots.org.xml b/src/chrome/content/rules/SafePilots.org.xml
new file mode 100644
index 000000000000..c5319e7c2a96
--- /dev/null
+++ b/src/chrome/content/rules/SafePilots.org.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/SafeSource.org.nz.xml b/src/chrome/content/rules/SafeSource.org.nz.xml
deleted file mode 100644
index e2d79ef1211b..000000000000
--- a/src/chrome/content/rules/SafeSource.org.nz.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Safebilling.com.xml b/src/chrome/content/rules/Safebilling.com.xml
deleted file mode 100644
index 385947ddbcaa..000000000000
--- a/src/chrome/content/rules/Safebilling.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Safercar.gov.xml b/src/chrome/content/rules/Safercar.gov.xml
deleted file mode 100644
index 4b93a7ff8616..000000000000
--- a/src/chrome/content/rules/Safercar.gov.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/SafinaSociety.org.xml b/src/chrome/content/rules/SafinaSociety.org.xml
new file mode 100644
index 000000000000..04f91eb9e015
--- /dev/null
+++ b/src/chrome/content/rules/SafinaSociety.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Saga-Group.xml b/src/chrome/content/rules/Saga-Group.xml
index f98903235477..280c0920e9cd 100644
--- a/src/chrome/content/rules/Saga-Group.xml
+++ b/src/chrome/content/rules/Saga-Group.xml
@@ -1,7 +1,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Sage.xml b/src/chrome/content/rules/Sage.xml
index 956285cf6c52..6c2c8d54bf8c 100644
--- a/src/chrome/content/rules/Sage.xml
+++ b/src/chrome/content/rules/Sage.xml
@@ -1,7 +1,11 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Sahab.net.xml b/src/chrome/content/rules/Sahab.net.xml
deleted file mode 100644
index ef3f6a2c5d0b..000000000000
--- a/src/chrome/content/rules/Sahab.net.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Sahih-Bukhari.com.xml b/src/chrome/content/rules/Sahih-Bukhari.com.xml
new file mode 100644
index 000000000000..d1266e2f205a
--- /dev/null
+++ b/src/chrome/content/rules/Sahih-Bukhari.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/SailfishOS.org.xml b/src/chrome/content/rules/SailfishOS.org.xml
index 4de22f100efc..6d4ebe3ca682 100644
--- a/src/chrome/content/rules/SailfishOS.org.xml
+++ b/src/chrome/content/rules/SailfishOS.org.xml
@@ -21,7 +21,8 @@
 
 
 	
-	
+	
+	
 
 
 	
 
 
-	
+	
+	
+	
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Sailthru.xml b/src/chrome/content/rules/Sailthru.xml
index df92a978c667..25fc62281e8d 100644
--- a/src/chrome/content/rules/Sailthru.xml
+++ b/src/chrome/content/rules/Sailthru.xml
@@ -57,7 +57,7 @@ Fetch error: http://me.sailthru.com/ => https://www.sailthru.com/: Too many redi
 	* Secured by us
 
 -->
-
+
 
 	
@@ -111,9 +111,6 @@ Fetch error: http://me.sailthru.com/ => https://www.sailthru.com/: Too many redi
 	
 
-	
-
 	
 
diff --git a/src/chrome/content/rules/Salah.com.xml b/src/chrome/content/rules/Salah.com.xml
new file mode 100644
index 000000000000..2e49553627ae
--- /dev/null
+++ b/src/chrome/content/rules/Salah.com.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/SaleCycle.xml b/src/chrome/content/rules/SaleCycle.xml
index ce67cec1f976..670c9835a9e6 100644
--- a/src/chrome/content/rules/SaleCycle.xml
+++ b/src/chrome/content/rules/SaleCycle.xml
@@ -16,13 +16,16 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Salenames.ru.xml b/src/chrome/content/rules/Salenames.ru.xml
index d76ac91eb076..2e394905a330 100644
--- a/src/chrome/content/rules/Salenames.ru.xml
+++ b/src/chrome/content/rules/Salenames.ru.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://partner.salenames.ru/ => https://partner.salenames.ru/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Salk_Institute.xml b/src/chrome/content/rules/Salk_Institute.xml
index 6813e804d250..ccbbb986c062 100644
--- a/src/chrome/content/rules/Salk_Institute.xml
+++ b/src/chrome/content/rules/Salk_Institute.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Salla.sa.xml b/src/chrome/content/rules/Salla.sa.xml
new file mode 100644
index 000000000000..581c6818f9e4
--- /dev/null
+++ b/src/chrome/content/rules/Salla.sa.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Salon.xml b/src/chrome/content/rules/Salon.xml
index e3bcdb33ab2b..d5af9bd5b64a 100644
--- a/src/chrome/content/rules/Salon.xml
+++ b/src/chrome/content/rules/Salon.xml
@@ -37,7 +37,7 @@ Fetch error: http://salon.com/ => https://www.salon.com/: Too many redirects whi
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/SaltStack.com.xml b/src/chrome/content/rules/SaltStack.com.xml
index fd4f2f071492..7fc6cbfe6179 100644
--- a/src/chrome/content/rules/SaltStack.com.xml
+++ b/src/chrome/content/rules/SaltStack.com.xml
@@ -1,18 +1,24 @@
 
 
 	
-	
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 	
diff --git a/src/chrome/content/rules/Sam_Whited.com.xml b/src/chrome/content/rules/Sam_Whited.com.xml
index 1c0fef76bc07..d971e4b596c1 100644
--- a/src/chrome/content/rules/Sam_Whited.com.xml
+++ b/src/chrome/content/rules/Sam_Whited.com.xml
@@ -7,7 +7,8 @@ Fetch error: http://samwhited.com/ => https://samwhited.com/: (52, 'Empty reply
 
 
 	
-	
+	
+	
 
 
 	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Sams_Software_and_Consulting.xml b/src/chrome/content/rules/Sams_Software_and_Consulting.xml
index 63f1589b69b4..9fa8d6801af0 100644
--- a/src/chrome/content/rules/Sams_Software_and_Consulting.xml
+++ b/src/chrome/content/rules/Sams_Software_and_Consulting.xml
@@ -6,7 +6,7 @@ Fetch error: http://cdn.samssoftware.com.au/ => https://cdn.samssoftware.com.au/
 	Some pages redirect to http.
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://cdn.samssoftware.com.au/ => https://cdn.samssoftware.com.au/
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Samsung-cn.xml b/src/chrome/content/rules/Samsung-cn.xml
index 71b70f2e1ed5..10d3556eade2 100644
--- a/src/chrome/content/rules/Samsung-cn.xml
+++ b/src/chrome/content/rules/Samsung-cn.xml
@@ -15,6 +15,6 @@
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Samsung.xml b/src/chrome/content/rules/Samsung.xml
index f3c9f9b5da5f..34332a78366d 100644
--- a/src/chrome/content/rules/Samsung.xml
+++ b/src/chrome/content/rules/Samsung.xml
@@ -1,12 +1,11 @@
 
 
 
-
+
 
+	
+	
 	
 		
 	
@@ -99,36 +87,19 @@ Non-2xx HTTP code: http://shop.us.samsung.com/ (200) => https://shop.us.samsung.
 	
 		
 	
-		
-	
-		
-	
-		
+	
 	
-		
 	
 		
-	
-		
-	
-		
-	
-	
-
+	
+	
 
 	
-	
 		
 
-
 	
 
-	
-
 	
-		
 		
 		
 		
@@ -137,7 +108,7 @@ Non-2xx HTTP code: http://shop.us.samsung.com/ (200) => https://shop.us.samsung.
 		
 		
 		
-			
+		
 
 	
 		
@@ -157,24 +128,12 @@ Non-2xx HTTP code: http://shop.us.samsung.com/ (200) => https://shop.us.samsung.
 		
 		
 
+	
 
-	
+	
 
-	
-
-	
-		
-
-	
-		
-		
-		
-		
-		
-		
-		
-		
-	
+	
 
diff --git a/src/chrome/content/rules/SamsungPortal.com.xml b/src/chrome/content/rules/SamsungPortal.com.xml
new file mode 100644
index 000000000000..c28c4ff268c4
--- /dev/null
+++ b/src/chrome/content/rules/SamsungPortal.com.xml
@@ -0,0 +1,19 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Samsung_Apps.xml b/src/chrome/content/rules/Samsung_Apps.xml
index e529abc80949..1a403f503abf 100644
--- a/src/chrome/content/rules/Samsung_Apps.xml
+++ b/src/chrome/content/rules/Samsung_Apps.xml
@@ -1,6 +1,6 @@
 
 
 
diff --git a/src/chrome/content/rules/Samsung_Indiaestore.xml b/src/chrome/content/rules/Samsung_Indiaestore.xml
index 29b80426cc98..86747ef380f7 100644
--- a/src/chrome/content/rules/Samsung_Indiaestore.xml
+++ b/src/chrome/content/rules/Samsung_Indiaestore.xml
@@ -7,11 +7,11 @@ Fetch error: http://www.samsungindiaestore.com/ => https://www.samsungindiaestor
 	For other Samsung coverage, see Samsung.com.xml.
 -->
 
-
+
 
 	
 	
-	
+
 	
-	
+
 
diff --git a/src/chrome/content/rules/Samsung_Sem.xml b/src/chrome/content/rules/Samsung_Sem.xml
deleted file mode 100644
index 1130c47dff25..000000000000
--- a/src/chrome/content/rules/Samsung_Sem.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-
-
diff --git a/src/chrome/content/rules/Samsung_Techwin.xml b/src/chrome/content/rules/Samsung_Techwin.xml
index af2cf7e92061..80457cfd79f9 100644
--- a/src/chrome/content/rules/Samsung_Techwin.xml
+++ b/src/chrome/content/rules/Samsung_Techwin.xml
@@ -1,6 +1,6 @@
 
 	
-	
+
 
diff --git a/src/chrome/content/rules/Samsung_mySingle.xml b/src/chrome/content/rules/Samsung_mySingle.xml
index 35f171bc1f69..38f00fb8b579 100644
--- a/src/chrome/content/rules/Samsung_mySingle.xml
+++ b/src/chrome/content/rules/Samsung_mySingle.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://light.samsung.net/ => https://light.samsung.net/: (28, 'Connection timed out after 20001 milliseconds')
 
 	For other Samsung coverage, see Samsung.com.xml.
-	
+
 	Mismatch:
 		test.cyber.*
 		drm.*
@@ -26,7 +26,7 @@ Fetch error: http://light.samsung.net/ => https://light.samsung.net/: (28, 'Conn
 
 -->
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/San-Diego-Reader.xml b/src/chrome/content/rules/San-Diego-Reader.xml
index 04a717ed66c6..0d62266f24d9 100644
--- a/src/chrome/content/rules/San-Diego-Reader.xml
+++ b/src/chrome/content/rules/San-Diego-Reader.xml
@@ -10,7 +10,7 @@ Fetch error: http://hummingbird.sandiegoreader.com/ => https://hummingbird.sandi
 		- media.sdreader.com
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/San_Francisco_Marathon.xml b/src/chrome/content/rules/San_Francisco_Marathon.xml
index a3bcc3a8f060..073d4ae0041f 100644
--- a/src/chrome/content/rules/San_Francisco_Marathon.xml
+++ b/src/chrome/content/rules/San_Francisco_Marathon.xml
@@ -6,13 +6,13 @@
 -->
 
 
-	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Sanalika.xml b/src/chrome/content/rules/Sanalika.xml
index 5d0f09555cd9..0eb8b3c3cd86 100644
--- a/src/chrome/content/rules/Sanalika.xml
+++ b/src/chrome/content/rules/Sanalika.xml
@@ -6,13 +6,14 @@
 -->
 
 
-	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Sandeen.net.xml b/src/chrome/content/rules/Sandeen.net.xml
index 7d693132ea50..8584f3caf70a 100644
--- a/src/chrome/content/rules/Sandeen.net.xml
+++ b/src/chrome/content/rules/Sandeen.net.xml
@@ -12,7 +12,7 @@ Fetch error: http://sandeen.net/ => https://sandeen.net/: (60, 'SSL certificate
 	* Unsecurable
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Sandstorm.de.xml b/src/chrome/content/rules/Sandstorm.de.xml
index d0f5dfdddf9e..cf621d005fa7 100644
--- a/src/chrome/content/rules/Sandstorm.de.xml
+++ b/src/chrome/content/rules/Sandstorm.de.xml
@@ -3,7 +3,7 @@
 
 		- Sandstorm-Media.de.xml
 
-		- 
+		-
 	* www.sandstorm.de: Redirects to activecollab.sandstorm.de
 
 
diff --git a/src/chrome/content/rules/Sanitarium.se.xml b/src/chrome/content/rules/Sanitarium.se.xml
index dfab4d66c64d..fd42d2a4ef58 100644
--- a/src/chrome/content/rules/Sanitarium.se.xml
+++ b/src/chrome/content/rules/Sanitarium.se.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://sanitarium.se/ => https://sanitarium.se/: (60, 'SSL certificate problem: certificate has expired')
 Fetch error: http://www.sanitarium.se/ => https://sanitarium.se/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Sankaty_Advisors.xml b/src/chrome/content/rules/Sankaty_Advisors.xml
index 7e1a0d78e1d6..729492c0b07b 100644
--- a/src/chrome/content/rules/Sankaty_Advisors.xml
+++ b/src/chrome/content/rules/Sankaty_Advisors.xml
@@ -1,7 +1,7 @@
 
 
 	
-	
+	
 	
 	
 
@@ -9,8 +9,6 @@
 	
 
 
-	
 
 	
-
+
 
 	
 	
@@ -85,4 +84,4 @@ Fetch error: http://santander.co.uk/ => https://www.santander.co.uk/: Cycle dete
 	
 
- 
+
diff --git a/src/chrome/content/rules/Santander_BillPayment.co.uk.xml b/src/chrome/content/rules/Santander_BillPayment.co.uk.xml
deleted file mode 100644
index 89f5deb309e2..000000000000
--- a/src/chrome/content/rules/Santander_BillPayment.co.uk.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-		
-
-
-	
-	
-
-	
-
-
-	
-	
-
-		
-
-	
-
-		
-		
-
-	
-
-
diff --git a/src/chrome/content/rules/Sapphire_Forum.com.xml b/src/chrome/content/rules/Sapphire_Forum.com.xml
index 72d0cff61cb7..75c97346d0bc 100644
--- a/src/chrome/content/rules/Sapphire_Forum.com.xml
+++ b/src/chrome/content/rules/Sapphire_Forum.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://sapphireforum.com/ => https://sapphireforum.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Sarava.org.xml b/src/chrome/content/rules/Sarava.org.xml
index 6c96f808e9cc..7891dbc69cf5 100644
--- a/src/chrome/content/rules/Sarava.org.xml
+++ b/src/chrome/content/rules/Sarava.org.xml
@@ -43,10 +43,31 @@ Fetch error: http://sarava.org/ => https://sarava.org/: (28, 'Connection timed o
 		- anotador
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Sauce_Labs.xml b/src/chrome/content/rules/Sauce_Labs.xml
deleted file mode 100644
index 5cf03911b623..000000000000
--- a/src/chrome/content/rules/Sauce_Labs.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Saucony.com.au.xml b/src/chrome/content/rules/Saucony.com.au.xml
new file mode 100644
index 000000000000..d5b4de6d22a5
--- /dev/null
+++ b/src/chrome/content/rules/Saucony.com.au.xml
@@ -0,0 +1,12 @@
+
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/SaucyTime.com.xml b/src/chrome/content/rules/SaucyTime.com.xml
index 7580bd27201d..9b5fc81a0f01 100644
--- a/src/chrome/content/rules/SaucyTime.com.xml
+++ b/src/chrome/content/rules/SaucyTime.com.xml
@@ -17,7 +17,7 @@ Fetch error: http://saucytime.com/ => https://www.saucytime.com/: (60, 'SSL cert
 		- www.saucytime.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/SaudiAirlines.xml b/src/chrome/content/rules/SaudiAirlines.xml
index ed4eaf5b434a..42c08e186cf1 100644
--- a/src/chrome/content/rules/SaudiAirlines.xml
+++ b/src/chrome/content/rules/SaudiAirlines.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://bookonline.saudiairlines.com/ => https://bookonline.saudiairlines.com/: (6, 'Could not resolve host: bookonline.saudiairlines.com')
 
 -->
-
+
 	
 	
 	 https://www.pv.gov.sa/: (28, 'Connection t
 Fetch error: http://mol.gov.sa/ => https://mol.gov.sa/: (28, 'Operation timed out after 0 milliseconds with 0 out of 0 bytes received')
 Fetch error: http://www.mol.gov.sa/ => https://mol.gov.sa/: (28, 'Operation timed out after 0 milliseconds with 0 out of 0 bytes received')
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/Saurik.xml b/src/chrome/content/rules/Saurik.xml
index d17b5b8d5ecd..4284a2a82c99 100644
--- a/src/chrome/content/rules/Saurik.xml
+++ b/src/chrome/content/rules/Saurik.xml
@@ -17,4 +17,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SaveDeo.com.xml b/src/chrome/content/rules/SaveDeo.com.xml
index 7cb6764c5b2c..3e248e1a7439 100644
--- a/src/chrome/content/rules/SaveDeo.com.xml
+++ b/src/chrome/content/rules/SaveDeo.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://www.savedeo.com/ => https://www.savedeo.com/: (51, "SSL: no
 		- www.savedeo.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/SaveTheChildren.org.uk.xml b/src/chrome/content/rules/SaveTheChildren.org.uk.xml
new file mode 100644
index 000000000000..2f5dad15c842
--- /dev/null
+++ b/src/chrome/content/rules/SaveTheChildren.org.uk.xml
@@ -0,0 +1,24 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Save_the_Children.org.uk-falsemixed.xml b/src/chrome/content/rules/Save_the_Children.org.uk-falsemixed.xml
deleted file mode 100644
index 6125e951d495..000000000000
--- a/src/chrome/content/rules/Save_the_Children.org.uk-falsemixed.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Save_the_Children.org.uk.xml b/src/chrome/content/rules/Save_the_Children.org.uk.xml
deleted file mode 100644
index 8defada0add6..000000000000
--- a/src/chrome/content/rules/Save_the_Children.org.uk.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-	
-	
-		
-		
-		
-		
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Saveyourinternet.eu.xml b/src/chrome/content/rules/Saveyourinternet.eu.xml
new file mode 100644
index 000000000000..0fc6ac574b8f
--- /dev/null
+++ b/src/chrome/content/rules/Saveyourinternet.eu.xml
@@ -0,0 +1,35 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/SavvyHawk.com.xml b/src/chrome/content/rules/SavvyHawk.com.xml
index 5b8f45625b16..b7502063db5d 100644
--- a/src/chrome/content/rules/SavvyHawk.com.xml
+++ b/src/chrome/content/rules/SavvyHawk.com.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://savvyhawk.com/ => https://savvyhawk.com/: (51, "SSL: no alternative certificate subject name matches target host name 'savvyhawk.com'")
 Fetch error: http://www.savvyhawk.com/ => https://www.savvyhawk.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.savvyhawk.com'")
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/SavvySME.xml b/src/chrome/content/rules/SavvySME.xml
index 2f3767fa9f25..30f0c08ef78d 100644
--- a/src/chrome/content/rules/SavvySME.xml
+++ b/src/chrome/content/rules/SavvySME.xml
@@ -4,4 +4,4 @@
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Sberbank_of_Russia.xml b/src/chrome/content/rules/Sberbank_of_Russia.xml
deleted file mode 100644
index e0f44a880d99..000000000000
--- a/src/chrome/content/rules/Sberbank_of_Russia.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-
-	
-	
-	
-
diff --git a/src/chrome/content/rules/ScMagazineUS.com.xml b/src/chrome/content/rules/ScMagazineUS.com.xml
index 080802a7e097..679c954053b6 100644
--- a/src/chrome/content/rules/ScMagazineUS.com.xml
+++ b/src/chrome/content/rules/ScMagazineUS.com.xml
@@ -23,7 +23,7 @@ Fetch error: http://www.scmagazineus.com/ => https://www.scmagazineus.com/: (28,
 	* CN: *.hs.llnwd.net, 400.
 
 -->
-
+
 
 	
 	
@@ -31,4 +31,4 @@ Fetch error: http://www.scmagazineus.com/ => https://www.scmagazineus.com/: (28,
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Scala-lang.org.xml b/src/chrome/content/rules/Scala-lang.org.xml
new file mode 100644
index 000000000000..84a8142cc304
--- /dev/null
+++ b/src/chrome/content/rules/Scala-lang.org.xml
@@ -0,0 +1,31 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Scale-Engine.xml b/src/chrome/content/rules/Scale-Engine.xml
index 6fbe2eef5528..af579a811c6f 100644
--- a/src/chrome/content/rules/Scale-Engine.xml
+++ b/src/chrome/content/rules/Scale-Engine.xml
@@ -12,7 +12,7 @@ Fetch error: http://scaleengine.com/ => https://scaleengine.com/: (60, 'SSL cert
 		- \w+.cdn.scaleengine.net	(CDN; redirects to www.scaleengine.com, depth mismatched)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Scaling_Bitcoin.org.xml b/src/chrome/content/rules/Scaling_Bitcoin.org.xml
index 30bb09dd4cec..a6c4249664cb 100644
--- a/src/chrome/content/rules/Scaling_Bitcoin.org.xml
+++ b/src/chrome/content/rules/Scaling_Bitcoin.org.xml
@@ -9,7 +9,7 @@ Non-2xx HTTP code: http://www.scalingbitcoin.org/ (200) => https://www.scalingbi
 		- www.scalingbitcoin.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Scanadu.com.xml b/src/chrome/content/rules/Scanadu.com.xml
index 0391075db942..723d26995fe5 100644
--- a/src/chrome/content/rules/Scanadu.com.xml
+++ b/src/chrome/content/rules/Scanadu.com.xml
@@ -35,4 +35,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Scania.xml b/src/chrome/content/rules/Scania.xml
index 8426be2add5a..9e3a79e099ab 100644
--- a/src/chrome/content/rules/Scania.xml
+++ b/src/chrome/content/rules/Scania.xml
@@ -14,10 +14,10 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Scanmarker.xml b/src/chrome/content/rules/Scanmarker.xml
index 82c5802e9040..ba79715343b6 100644
--- a/src/chrome/content/rules/Scanmarker.xml
+++ b/src/chrome/content/rules/Scanmarker.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Scanning_Pens.co.uk.xml b/src/chrome/content/rules/Scanning_Pens.co.uk.xml
index 89051b0ff76c..05e57e4de9df 100644
--- a/src/chrome/content/rules/Scanning_Pens.co.uk.xml
+++ b/src/chrome/content/rules/Scanning_Pens.co.uk.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.scanningpens.co.uk/ => https://www.scanningpens.co.uk/:
 Disabled by https-everywhere-checker because:
 Fetch error: http://scanningpens.co.uk/ => https://scanningpens.co.uk/: (51, "SSL: no alternative certificate subject name matches target host name 'scanningpens.co.uk'")
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Scanscout.com.xml b/src/chrome/content/rules/Scanscout.com.xml
index 0954af18b8f5..22c72dd977bc 100644
--- a/src/chrome/content/rules/Scanscout.com.xml
+++ b/src/chrome/content/rules/Scanscout.com.xml
@@ -39,7 +39,7 @@ Fetch error: http://dt.scanscout.com/ => https://dt.scanscout.com/: (60, 'SSL ce
 	dt serves web bugs.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Sccassessor.org.xml b/src/chrome/content/rules/Sccassessor.org.xml
index c5d7fa512254..e185197093bd 100644
--- a/src/chrome/content/rules/Sccassessor.org.xml
+++ b/src/chrome/content/rules/Sccassessor.org.xml
@@ -24,4 +24,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Sccgov.org.xml b/src/chrome/content/rules/Sccgov.org.xml
index 20dc0ebb7ff4..0731af27bc59 100644
--- a/src/chrome/content/rules/Sccgov.org.xml
+++ b/src/chrome/content/rules/Sccgov.org.xml
@@ -66,4 +66,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Scene7.xml b/src/chrome/content/rules/Scene7.xml
index c8f787c64242..eb5199b2f965 100644
--- a/src/chrome/content/rules/Scene7.xml
+++ b/src/chrome/content/rules/Scene7.xml
@@ -1,48 +1,659 @@
 
-
-
-	
+
 	
-
-	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
+	
+	
+	
+	
+	
+	
+	
 	
+	
+	
+	
+	
+	
 	
+	
+	
+	
+	
+	
+	
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
-	
-	
-	
-	
-	
-
-		
-		
-		
-		
-
-
-	
+	
+		
 
+	
 
diff --git a/src/chrome/content/rules/SceneMusic.net.xml b/src/chrome/content/rules/SceneMusic.net.xml
deleted file mode 100644
index 10135885b703..000000000000
--- a/src/chrome/content/rules/SceneMusic.net.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-  
-  
-
-  
-
diff --git a/src/chrome/content/rules/SceneTap.xml b/src/chrome/content/rules/SceneTap.xml
index e7cab2224d7d..36724b7e8cd3 100644
--- a/src/chrome/content/rules/SceneTap.xml
+++ b/src/chrome/content/rules/SceneTap.xml
@@ -6,7 +6,7 @@
 	
 
 
-	
+	
 
 
 	 https://scepsis.ru/: (60, 'SSL certificate problem: certificate has expired')
 Fetch error: http://scepsis.ru/ => https://scepsis.ru/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Sched.org.xml b/src/chrome/content/rules/Sched.org.xml
index cf47069a4275..221df2b27672 100644
--- a/src/chrome/content/rules/Sched.org.xml
+++ b/src/chrome/content/rules/Sched.org.xml
@@ -17,10 +17,13 @@
 
 
 	
-	
+	
+	
 	
 	
-	
+	
+	
+	
 
 
 	
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Schibsted-IT.xml b/src/chrome/content/rules/Schibsted-IT.xml
index 09d14451d7ec..77fd00e66c77 100644
--- a/src/chrome/content/rules/Schibsted-IT.xml
+++ b/src/chrome/content/rules/Schibsted-IT.xml
@@ -16,4 +16,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Schibsted.io.xml b/src/chrome/content/rules/Schibsted.io.xml
index 15ecbcc8d929..a828e411aae5 100644
--- a/src/chrome/content/rules/Schibsted.io.xml
+++ b/src/chrome/content/rules/Schibsted.io.xml
@@ -12,7 +12,7 @@
 		- mc.rkt-dev.ingress.cre-pro
 		- mc.rkt-pre.ingress.cre-pro
 		- mc.rkt-pro.ingress.cre-pro
-		
+
 		- static.messaging
 		- artifacts.infra-dev
 		- travis.infra-pro
@@ -40,8 +40,8 @@
 	Connection refused:
 		- codeload.github
 		- raw.github
-		
-		
+
+
 	Timeout:
 		- xmpp.messaging
 		- northstar
@@ -58,10 +58,10 @@
 		- prometheus.dev.sportsnext
 		- vglive-admin.dev.sportsnext
 		- vglive-api.dev.sportsnext
-		- vglive-web.dev.sportsnext		
+		- vglive-web.dev.sportsnext
 		- heimdall.heimdall-pro
 		- observatory.security-pro
-		
+
 
 -->
 
@@ -72,7 +72,7 @@
 	
 
 	
-	   
+	
 	
 	
 	
@@ -230,4 +230,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Schibsted.xml b/src/chrome/content/rules/Schibsted.xml
deleted file mode 100644
index 44797000687c..000000000000
--- a/src/chrome/content/rules/Schibsted.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Schlossberg_Store.xml b/src/chrome/content/rules/Schlossberg_Store.xml
deleted file mode 100644
index 532226baec98..000000000000
--- a/src/chrome/content/rules/Schlossberg_Store.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Schlumberger.xml b/src/chrome/content/rules/Schlumberger.xml
index 0e4e9af40fda..db8ba782948c 100644
--- a/src/chrome/content/rules/Schlumberger.xml
+++ b/src/chrome/content/rules/Schlumberger.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://slb.com/ => https://slb.com/: Cycle detected - URL already encountered: https://slb.com/
 Fetch error: http://www.slb.com/ => https://www.slb.com/: Cycle detected - URL already encountered: https://www.slb.com/
 -->
-
+
 
 	
 	
@@ -19,4 +19,4 @@ Fetch error: http://www.slb.com/ => https://www.slb.com/: Cycle detected - URL a
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Schneider-Electric.com.xml b/src/chrome/content/rules/Schneider-Electric.com.xml
index 7a48540a970c..1b7a329bbf5f 100644
--- a/src/chrome/content/rules/Schneider-Electric.com.xml
+++ b/src/chrome/content/rules/Schneider-Electric.com.xml
@@ -9,59 +9,12 @@
 
 		- schneiderele.taleo.net
 
-
-	Nonfunctional subdomains:
-
-		- www2	(503, akamai)
-
-
-	Problematic subdomains:
-
-		- ^	(works, cert only matches www)
-
-
-	Partially covered subdomains:
-
-		- (www.)
-
-			- Some pages redirect to http
-
-			- These paths 503:
-
-				- css/
-				- documents/flash/en/shared/
-				- gc_1_0/	(xiti web bugs)
-				- images/
-				- js/
-				- sites/corporate/en/customers/satisfy-our-customers/electric-utilities.page
-				- templatedata/Configuration/Xiti/
-
-			- These don't 503:
-
-				- download/resource/scripts/
-				- navigation/images/
-				- navigation/scripts/
-				- products$
-				- resource/scripts/
-				- site/home/images/custom/
-				- site/home/images/structure/
-				- site/home/js/
-				- site/marketing_center/images/
-				- site/marketing_center/js/
-				- site/tasks/sites/marketing_center/assets/Image/Corporate/Teasers/
-				- stat/xtcore.js
-				- solutions$
-				- solutions/resource/css/
-				- solutions/resource/images/
-				- solutions/resource/js/
-				- solutions/ww/en/rme/\d+/image/
-
 -->
 
 
 	
-	
-		
+	
+	
 
 
 	
-
+
 
 	
 
diff --git a/src/chrome/content/rules/SchoolForge.xml b/src/chrome/content/rules/SchoolForge.xml
index 1ecabaab3c50..1810427205ed 100644
--- a/src/chrome/content/rules/SchoolForge.xml
+++ b/src/chrome/content/rules/SchoolForge.xml
@@ -8,4 +8,4 @@
 		to="https://schoolforge.net/" />
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Schottenland.xml b/src/chrome/content/rules/Schottenland.xml
deleted file mode 100644
index e42335f479a6..000000000000
--- a/src/chrome/content/rules/Schottenland.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/SchuelerVZ.xml b/src/chrome/content/rules/SchuelerVZ.xml
index d83c2fdfcd4a..41d31dddf6fb 100644
--- a/src/chrome/content/rules/SchuelerVZ.xml
+++ b/src/chrome/content/rules/SchuelerVZ.xml
@@ -2,7 +2,7 @@
 	Invalid Certificate:
 	blog.schuelervz.net
 	static.pe.schuelervz.net
-	
+
 	Time Out:
 	schuelervz.net
 -->
diff --git a/src/chrome/content/rules/Schuilenburg.org.xml b/src/chrome/content/rules/Schuilenburg.org.xml
index eca929d6e39d..e7317c3f9d14 100644
--- a/src/chrome/content/rules/Schuilenburg.org.xml
+++ b/src/chrome/content/rules/Schuilenburg.org.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.schuilenburg.org/ => https://www.schuilenburg.org/: (60,
 		- gallery	(shows www.ecoscentric.com)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Schwab.com.xml b/src/chrome/content/rules/Schwab.com.xml
index f86511aa5e58..57be6f9611c0 100644
--- a/src/chrome/content/rules/Schwab.com.xml
+++ b/src/chrome/content/rules/Schwab.com.xml
@@ -31,10 +31,13 @@ Fetch error: http://schwab.com/ => https://schwab.com/: (60, 'SSL certificate pr
 	* Secured by us
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
 
 
 	
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Sci-Hub.love.xml b/src/chrome/content/rules/Sci-Hub.love.xml
new file mode 100644
index 000000000000..801498e94c94
--- /dev/null
+++ b/src/chrome/content/rules/Sci-Hub.love.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Sci-Hub.xml b/src/chrome/content/rules/Sci-Hub.xml
index ea7b6f97bba5..3b759ed97099 100644
--- a/src/chrome/content/rules/Sci-Hub.xml
+++ b/src/chrome/content/rules/Sci-Hub.xml
@@ -1,4 +1,35 @@
+
 
-
+
 
 	
 	
 	
 	
-		
 	
-		
 	
 	
 	
-		
 	
-		
-	
 	
 	
 	
-		
 	
-		
 	
 	
 	
-		
 	
-		
-	
+
 	
 	
 	
-		
 	
-		
 	
 	
 	
-		
 	
-		
 
 	
 
diff --git a/src/chrome/content/rules/SciPy.org.xml b/src/chrome/content/rules/SciPy.org.xml
index 713d4c06be4b..a917c90aa184 100644
--- a/src/chrome/content/rules/SciPy.org.xml
+++ b/src/chrome/content/rules/SciPy.org.xml
@@ -1,32 +1,56 @@
-
 
-
+
 
 	
 	
-
-	
+	
 	
 	
+	
+	
+	
+	
+	
+
+	
 
 	
diff --git a/src/chrome/content/rules/Scieneo.de.xml b/src/chrome/content/rules/Scieneo.de.xml
index 94458e62aa79..9e34923a9d1e 100644
--- a/src/chrome/content/rules/Scieneo.de.xml
+++ b/src/chrome/content/rules/Scieneo.de.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.scieneo.de/ => https://www.scieneo.de/: (51, "SSL: no al
 	    - Dynatech.de
 	    - Dynavision.de
 -->
-
+
     
     
 
diff --git a/src/chrome/content/rules/Scientific-American.xml b/src/chrome/content/rules/Scientific-American.xml
index ce0f48f146be..670cb6750b6f 100644
--- a/src/chrome/content/rules/Scientific-American.xml
+++ b/src/chrome/content/rules/Scientific-American.xml
@@ -36,7 +36,7 @@ Fetch error: http://www.subscribe.scientificamerican.com/ => https://www.subscri
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Scintilla.utwente.xml b/src/chrome/content/rules/Scintilla.utwente.xml
deleted file mode 100644
index 708242a7a5ec..000000000000
--- a/src/chrome/content/rules/Scintilla.utwente.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Scoop.co.nz.xml b/src/chrome/content/rules/Scoop.co.nz.xml
deleted file mode 100644
index 10ebcf17a2ef..000000000000
--- a/src/chrome/content/rules/Scoop.co.nz.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Scoop.it.xml b/src/chrome/content/rules/Scoop.it.xml
index 42519c6a0c2c..565b4511ec43 100644
--- a/src/chrome/content/rules/Scoop.it.xml
+++ b/src/chrome/content/rules/Scoop.it.xml
@@ -19,7 +19,8 @@
 
 
 	
-	
+	
+	
 		
 
 
@@ -30,6 +31,6 @@
 		to="https://www.scoop.it/$1" />
 
 	
+		to="https://img.scoop.it/" />
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Scooter-Attack.xml b/src/chrome/content/rules/Scooter-Attack.xml
index 53df8af3acd1..ed531bb85c47 100644
--- a/src/chrome/content/rules/Scooter-Attack.xml
+++ b/src/chrome/content/rules/Scooter-Attack.xml
@@ -29,7 +29,7 @@ Fetch error: http://stats.scooter-attack.com/ => https://stats.scooter-attack.co
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Scot_Borders.gov.uk.xml b/src/chrome/content/rules/Scot_Borders.gov.uk.xml
index 1ccf8c96ccad..e56570815284 100644
--- a/src/chrome/content/rules/Scot_Borders.gov.uk.xml
+++ b/src/chrome/content/rules/Scot_Borders.gov.uk.xml
@@ -35,7 +35,7 @@ Fetch error: http://www.scotborders.gov.uk/ => https://www.scotborders.gov.uk/:
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Scottbrand.com.xml b/src/chrome/content/rules/Scottbrand.com.xml
index 1ad48e349015..d2ba111e65b5 100644
--- a/src/chrome/content/rules/Scottbrand.com.xml
+++ b/src/chrome/content/rules/Scottbrand.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://scottbrand.com/ => https://scottbrand.com/: (51, "SSL: no al
 		- www.scottbrand.com
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Scottevest.xml b/src/chrome/content/rules/Scottevest.xml
index 9d0e4f70cd38..a9eec98b1ed1 100644
--- a/src/chrome/content/rules/Scottevest.xml
+++ b/src/chrome/content/rules/Scottevest.xml
@@ -2,7 +2,7 @@
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/Scottish-Country-Cottages.co.uk.xml b/src/chrome/content/rules/Scottish-Country-Cottages.co.uk.xml
index 2ea93b700f08..92c2f51f9b2e 100644
--- a/src/chrome/content/rules/Scottish-Country-Cottages.co.uk.xml
+++ b/src/chrome/content/rules/Scottish-Country-Cottages.co.uk.xml
@@ -1,5 +1,5 @@
 
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.scraporchard.com/ => https://www.scraporchard.com/: (60,
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Scrapy.org.xml b/src/chrome/content/rules/Scrapy.org.xml
new file mode 100644
index 000000000000..aedf5c18402f
--- /dev/null
+++ b/src/chrome/content/rules/Scrapy.org.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Screen_International.xml b/src/chrome/content/rules/Screen_International.xml
index ff79c00f89f7..a3c082b57e54 100644
--- a/src/chrome/content/rules/Screen_International.xml
+++ b/src/chrome/content/rules/Screen_International.xml
@@ -20,4 +20,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Screenshot_machine.xml b/src/chrome/content/rules/Screenshot_machine.xml
index 093fc05725fb..17dc76efa95b 100644
--- a/src/chrome/content/rules/Screenshot_machine.xml
+++ b/src/chrome/content/rules/Screenshot_machine.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ScribbleLive.com-falsemixed.xml b/src/chrome/content/rules/ScribbleLive.com-falsemixed.xml
index 095984b321a9..b9694bb8c307 100644
--- a/src/chrome/content/rules/ScribbleLive.com-falsemixed.xml
+++ b/src/chrome/content/rules/ScribbleLive.com-falsemixed.xml
@@ -8,7 +8,7 @@ Fetch error: http://www2.scribblelive.com/ => https://www.scribblelive.com/: (51
 	For rules not causing false/broken MCB, see ScribbleLive.com.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/ScribbleLive.com.xml b/src/chrome/content/rules/ScribbleLive.com.xml
index c9ceff6b6d9d..f3feaff9a0c7 100644
--- a/src/chrome/content/rules/ScribbleLive.com.xml
+++ b/src/chrome/content/rules/ScribbleLive.com.xml
@@ -18,7 +18,7 @@ Fetch error: http://scribblelive.com/ => https://scribblelive.com/: (51, "SSL: n
 		- help ¹
 		- www ²
 		- www2 ¹
-	
+
 	² Mixed css
 	¹ Mismatched
 
@@ -42,7 +42,7 @@ Fetch error: http://scribblelive.com/ => https://scribblelive.com/: (51, "SSL: n
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Scribd.com.xml b/src/chrome/content/rules/Scribd.com.xml
index 72988c0678a9..560af2cef19a 100644
--- a/src/chrome/content/rules/Scribd.com.xml
+++ b/src/chrome/content/rules/Scribd.com.xml
@@ -1,15 +1,5 @@
 
-		
-		
-		
-		
-		
-	
+    
+    
+    
 
+	
+    
+    
+    
 
 	
 	
 	
 
-
-	
-
-	
-
-	
-	
-
-	
-
-	
-
-	
-
-	
-
-
+  
 
diff --git a/src/chrome/content/rules/Scribol.xml b/src/chrome/content/rules/Scribol.xml
deleted file mode 100644
index 87aad745d305..000000000000
--- a/src/chrome/content/rules/Scribol.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/ScriptSource.xml b/src/chrome/content/rules/ScriptSource.xml
index 4a9459d67b6d..bf18d2e4d22d 100644
--- a/src/chrome/content/rules/ScriptSource.xml
+++ b/src/chrome/content/rules/ScriptSource.xml
@@ -13,4 +13,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Scriptfodder.com.xml b/src/chrome/content/rules/Scriptfodder.com.xml
index 50ad62f7a6c4..23710f7e831a 100644
--- a/src/chrome/content/rules/Scriptfodder.com.xml
+++ b/src/chrome/content/rules/Scriptfodder.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://media.scriptfodder.com/ => https://media.scriptfodder.com/: (6, 'Could not resolve host: media.scriptfodder.com')
 
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/Scripting-News.xml b/src/chrome/content/rules/Scripting-News.xml
deleted file mode 100644
index b52d44fc215d..000000000000
--- a/src/chrome/content/rules/Scripting-News.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Scruss.com.xml b/src/chrome/content/rules/Scruss.com.xml
new file mode 100644
index 000000000000..04731078a623
--- /dev/null
+++ b/src/chrome/content/rules/Scruss.com.xml
@@ -0,0 +1,12 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Scsstatic.ch.xml b/src/chrome/content/rules/Scsstatic.ch.xml
deleted file mode 100644
index f5036cec5aab..000000000000
--- a/src/chrome/content/rules/Scsstatic.ch.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Scubbly.xml b/src/chrome/content/rules/Scubbly.xml
index e646ebfe373b..3a9b2b396325 100644
--- a/src/chrome/content/rules/Scubbly.xml
+++ b/src/chrome/content/rules/Scubbly.xml
@@ -16,4 +16,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Sculpteo.com.xml b/src/chrome/content/rules/Sculpteo.com.xml
index 891114dacf52..520bd3dd3eae 100644
--- a/src/chrome/content/rules/Sculpteo.com.xml
+++ b/src/chrome/content/rules/Sculpteo.com.xml
@@ -16,7 +16,9 @@
 
 
 	
-	
+	
+	
+	
 		
 
 
@@ -26,7 +28,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Seacloud.xml b/src/chrome/content/rules/Seacloud.xml
deleted file mode 100644
index 2e187b81cac7..000000000000
--- a/src/chrome/content/rules/Seacloud.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Seafile-Server.de.xml b/src/chrome/content/rules/Seafile-Server.de.xml
index 31f02f9c37b7..ca42d899759e 100644
--- a/src/chrome/content/rules/Seafile-Server.de.xml
+++ b/src/chrome/content/rules/Seafile-Server.de.xml
@@ -25,12 +25,15 @@ Fetch error: http://www.seafileserver.de/ => https://www.seafileserver.de/: (51,
 		- wiki.seafile-server.de
 
 -->
-
+
 
 	
 	
 	
-	
+	
+	
+	
+	
 
 
 	
@@ -42,10 +45,6 @@ Fetch error: http://www.seafileserver.de/ => https://www.seafileserver.de/: (51,
 	
 
 
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Seafile.xml b/src/chrome/content/rules/Seafile.xml
index 9a6ea2198cbb..27e1972e1960 100644
--- a/src/chrome/content/rules/Seafile.xml
+++ b/src/chrome/content/rules/Seafile.xml
@@ -13,7 +13,7 @@ Fetch error: http://cloud.seafile.com/ => https://cloud.seafile.com/: (51, "SSL:
 		- (www.)	(shows seacloud.cc; mismatched, CN: cloud.seafile.com)
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Seagate.com.xml b/src/chrome/content/rules/Seagate.com.xml
index e2070066871a..4b304d7d4cdd 100644
--- a/src/chrome/content/rules/Seagate.com.xml
+++ b/src/chrome/content/rules/Seagate.com.xml
@@ -63,7 +63,7 @@ Fetch error: http://wwwlacie.seagate.com/ => https://wwwlacie.seagate.com/: (6,
 		- wwwlacie.seagate.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Sealed_Abstract.com.xml b/src/chrome/content/rules/Sealed_Abstract.com.xml
index dccd2d7917df..4249a3510acb 100644
--- a/src/chrome/content/rules/Sealed_Abstract.com.xml
+++ b/src/chrome/content/rules/Sealed_Abstract.com.xml
@@ -10,4 +10,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Seamonkey-project.org.xml b/src/chrome/content/rules/Seamonkey-project.org.xml
new file mode 100644
index 000000000000..8410566912e6
--- /dev/null
+++ b/src/chrome/content/rules/Seamonkey-project.org.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Seanmckaybeck.com.xml b/src/chrome/content/rules/Seanmckaybeck.com.xml
index c84a0cde9e3f..e7037a6997a5 100644
--- a/src/chrome/content/rules/Seanmckaybeck.com.xml
+++ b/src/chrome/content/rules/Seanmckaybeck.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://seanmckaybeck.com/ => https://seanmckaybeck.com/: (7, 'Failed to connect to seanmckaybeck.com port 443: Connection refused')
 
 -->
-
+
   
 
   
diff --git a/src/chrome/content/rules/Search_Commander.xml b/src/chrome/content/rules/Search_Commander.xml
index e4e71029dc45..ca7d8d9f8737 100644
--- a/src/chrome/content/rules/Search_Commander.xml
+++ b/src/chrome/content/rules/Search_Commander.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Searchfox.org.xml b/src/chrome/content/rules/Searchfox.org.xml
deleted file mode 100644
index 326d7cef2eb8..000000000000
--- a/src/chrome/content/rules/Searchfox.org.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Searchmarketing.com.xml b/src/chrome/content/rules/Searchmarketing.com.xml
deleted file mode 100644
index 70e174a37ed9..000000000000
--- a/src/chrome/content/rules/Searchmarketing.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Sears.com.xml b/src/chrome/content/rules/Sears.com.xml
index dc843bf098f6..ab46c9424edc 100644
--- a/src/chrome/content/rules/Sears.com.xml
+++ b/src/chrome/content/rules/Sears.com.xml
@@ -1,34 +1,29 @@
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Seasonal.ly.xml b/src/chrome/content/rules/Seasonal.ly.xml
index dd8a787a4992..6aafd5e5d53a 100644
--- a/src/chrome/content/rules/Seasonal.ly.xml
+++ b/src/chrome/content/rules/Seasonal.ly.xml
@@ -10,4 +10,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SeattleAquarium.org.xml b/src/chrome/content/rules/SeattleAquarium.org.xml
index 206755a1bf51..a31ba8e2a3ba 100644
--- a/src/chrome/content/rules/SeattleAquarium.org.xml
+++ b/src/chrome/content/rules/SeattleAquarium.org.xml
@@ -1,16 +1,21 @@
 
+
 
+	
 	
 	
 
 	
 
+	
 	
 
diff --git a/src/chrome/content/rules/SeattleIX.net.xml b/src/chrome/content/rules/SeattleIX.net.xml
index 9be005b0d708..8931c922089d 100644
--- a/src/chrome/content/rules/SeattleIX.net.xml
+++ b/src/chrome/content/rules/SeattleIX.net.xml
@@ -17,4 +17,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Sebastian_Wick.net.xml b/src/chrome/content/rules/Sebastian_Wick.net.xml
index ef257d56533c..4987972deea3 100644
--- a/src/chrome/content/rules/Sebastian_Wick.net.xml
+++ b/src/chrome/content/rules/Sebastian_Wick.net.xml
@@ -19,6 +19,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/SecDev.ca.xml b/src/chrome/content/rules/SecDev.ca.xml
index f23dc09c4e07..7a27c21eb9c2 100644
--- a/src/chrome/content/rules/SecDev.ca.xml
+++ b/src/chrome/content/rules/SecDev.ca.xml
@@ -9,7 +9,7 @@
 	* Server sends no certificate chain, see https://whatsmychaincert.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/SecondMarket.com.xml b/src/chrome/content/rules/SecondMarket.com.xml
index 8591b3f59bfb..915244da49a4 100644
--- a/src/chrome/content/rules/SecondMarket.com.xml
+++ b/src/chrome/content/rules/SecondMarket.com.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.secondmarket.com/ => https://www.secondmarket.com/: (28,
 		- ^	(cert only matches www)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Second_Life.com.xml b/src/chrome/content/rules/Second_Life.com.xml
index 023f9734c027..1b3456c6d95b 100644
--- a/src/chrome/content/rules/Second_Life.com.xml
+++ b/src/chrome/content/rules/Second_Life.com.xml
@@ -69,7 +69,7 @@ Fetch error: http://lists.secondlife.com/ => https://lists.secondlife.com/: (60,
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Second_Look_Forensics.com.xml b/src/chrome/content/rules/Second_Look_Forensics.com.xml
index 1d9b9397372c..ec298e1dfa1e 100644
--- a/src/chrome/content/rules/Second_Look_Forensics.com.xml
+++ b/src/chrome/content/rules/Second_Look_Forensics.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://secondlookforensics.com/ => https://secondlookforensics.com/
 Fetch error: http://www.secondlookforensics.com/ => https://www.secondlookforensics.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Section9.co.uk.xml b/src/chrome/content/rules/Section9.co.uk.xml
deleted file mode 100644
index f8efdea71536..000000000000
--- a/src/chrome/content/rules/Section9.co.uk.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Secular.org.xml b/src/chrome/content/rules/Secular.org.xml
index 4807c558dafe..49d8aeba0ad9 100644
--- a/src/chrome/content/rules/Secular.org.xml
+++ b/src/chrome/content/rules/Secular.org.xml
@@ -31,7 +31,7 @@
 					-->
 	
 
-  
+  
 
 
 	
 
 	
-	
+	
+	
 
 
 	
-
-
-	
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Secure-Endpoints.com.xml b/src/chrome/content/rules/Secure-Endpoints.com.xml
index a0103cc58d7a..c065ee9239c5 100644
--- a/src/chrome/content/rules/Secure-Endpoints.com.xml
+++ b/src/chrome/content/rules/Secure-Endpoints.com.xml
@@ -19,7 +19,7 @@ Non-2xx HTTP code: http://secure-endpoints.com/ (200) => https://secure-endpoint
 			- www.h5l.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Secure-OS.org.xml b/src/chrome/content/rules/Secure-OS.org.xml
deleted file mode 100644
index 4c06ec5c6ad0..000000000000
--- a/src/chrome/content/rules/Secure-OS.org.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Secure-resumption.com.xml b/src/chrome/content/rules/Secure-resumption.com.xml
index a5b8749d7494..4467fbcff6e5 100644
--- a/src/chrome/content/rules/Secure-resumption.com.xml
+++ b/src/chrome/content/rules/Secure-resumption.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://secure-resumption.com/ => https://secure-resumption.com/: (6
 Fetch error: http://www.secure-resumption.com/ => https://www.secure-resumption.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Secure-secure.co.uk.xml b/src/chrome/content/rules/Secure-secure.co.uk.xml
index 458e21653e97..8268a68bf215 100644
--- a/src/chrome/content/rules/Secure-secure.co.uk.xml
+++ b/src/chrome/content/rules/Secure-secure.co.uk.xml
@@ -9,4 +9,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Secure-u.de.xml b/src/chrome/content/rules/Secure-u.de.xml
deleted file mode 100644
index f902f1b67328..000000000000
--- a/src/chrome/content/rules/Secure-u.de.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Secure-zone.net.xml b/src/chrome/content/rules/Secure-zone.net.xml
index 897011645b5b..dfe4fd47d48b 100644
--- a/src/chrome/content/rules/Secure-zone.net.xml
+++ b/src/chrome/content/rules/Secure-zone.net.xml
@@ -9,4 +9,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Secure.me.xml b/src/chrome/content/rules/Secure.me.xml
index c0054349901c..e5be782272c1 100644
--- a/src/chrome/content/rules/Secure.me.xml
+++ b/src/chrome/content/rules/Secure.me.xml
@@ -7,7 +7,7 @@ Fetch error: http://wp.secure.me/ => https://wp.secure.me/: (51, "SSL: no altern
 Fetch error: http://www.secure.me/ => https://www.secure.me/: (51, "SSL: no alternative certificate subject name matches target host name 'www.secure.me'")
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Secure.metoffice.gov.uk.xml b/src/chrome/content/rules/Secure.metoffice.gov.uk.xml
deleted file mode 100644
index 00c20beefbc3..000000000000
--- a/src/chrome/content/rules/Secure.metoffice.gov.uk.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-  
-
-  
-
diff --git a/src/chrome/content/rules/SecureConnect.com.xml b/src/chrome/content/rules/SecureConnect.com.xml
deleted file mode 100644
index 0d907d971ed9..000000000000
--- a/src/chrome/content/rules/SecureConnect.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/SecureNet.com.xml b/src/chrome/content/rules/SecureNet.com.xml
index c349026ff5e5..46ef3d54aaac 100644
--- a/src/chrome/content/rules/SecureNet.com.xml
+++ b/src/chrome/content/rules/SecureNet.com.xml
@@ -14,7 +14,7 @@ Fetch error: http://securenet.com/ => https://www.securenet.com/: (60, 'SSL cert
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/SecurePro_Software.xml b/src/chrome/content/rules/SecurePro_Software.xml
index eef53662e1aa..67b5ad5c1904 100644
--- a/src/chrome/content/rules/SecurePro_Software.xml
+++ b/src/chrome/content/rules/SecurePro_Software.xml
@@ -14,7 +14,7 @@ Non-2xx HTTP code: http://www.secureprosoftware.com/ (200) => https://securepros
 	www: mismatched, CN: *.websitewelcome.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/SecureProxySite.com.xml b/src/chrome/content/rules/SecureProxySite.com.xml
new file mode 100644
index 000000000000..fbe8574d621c
--- /dev/null
+++ b/src/chrome/content/rules/SecureProxySite.com.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Secure_Upload.eu.xml b/src/chrome/content/rules/Secure_Upload.eu.xml
index 0e0b1cd829f2..f33df7148e0f 100644
--- a/src/chrome/content/rules/Secure_Upload.eu.xml
+++ b/src/chrome/content/rules/Secure_Upload.eu.xml
@@ -5,7 +5,7 @@ Fetch error: http://secureupload.eu/ => https://secureupload.eu/: (60, 'SSL cert
 Fetch error: http://www.secureupload.eu/ => https://www.secureupload.eu/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Securepaynet.net.xml b/src/chrome/content/rules/Securepaynet.net.xml
index 9df833c24043..f998631620d3 100644
--- a/src/chrome/content/rules/Securepaynet.net.xml
+++ b/src/chrome/content/rules/Securepaynet.net.xml
@@ -1,51 +1,22 @@
-
 
-
-
-	
-	
+
+	
 	
 	
 	
@@ -53,37 +24,7 @@ Fetch error: http://securepaynet.net/ => https://www.securepaynet.net/: (60, 'SS
 	
 	
 
-	
-	
-
-		
-		
-		
-		
-		
-		
-		
-		
-		
-
-		
-		
-		
-
-		
-
-
-	
-
-
-	
-
-	
-
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/Securepicssl.com.xml b/src/chrome/content/rules/Securepicssl.com.xml
index ad62d1fde611..f54a687d65ec 100644
--- a/src/chrome/content/rules/Securepicssl.com.xml
+++ b/src/chrome/content/rules/Securepicssl.com.xml
@@ -8,10 +8,10 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Securepurchaseserver.com.xml b/src/chrome/content/rules/Securepurchaseserver.com.xml
index 500180d9f009..0504d294920a 100644
--- a/src/chrome/content/rules/Securepurchaseserver.com.xml
+++ b/src/chrome/content/rules/Securepurchaseserver.com.xml
@@ -17,7 +17,7 @@ Fetch error: http://www.securepurchaseserver2.com/ => https://securepurchaseserv
 	Cert doesn't match www.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Securetrust.com.xml b/src/chrome/content/rules/Securetrust.com.xml
index e12a776915b4..82c6e8178f34 100644
--- a/src/chrome/content/rules/Securetrust.com.xml
+++ b/src/chrome/content/rules/Securetrust.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://securetrust.com/ => https://www.securetrust.com/: (60, 'SSL
 	^securetrust.com: Cert only matches www.securetrust.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Secureuk.net.xml b/src/chrome/content/rules/Secureuk.net.xml
deleted file mode 100644
index eb9b4c4d9da3..000000000000
--- a/src/chrome/content/rules/Secureuk.net.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Securing_the_Human.org.xml b/src/chrome/content/rules/Securing_the_Human.org.xml
index f115b395dd6b..79af1dfc1227 100644
--- a/src/chrome/content/rules/Securing_the_Human.org.xml
+++ b/src/chrome/content/rules/Securing_the_Human.org.xml
@@ -6,7 +6,7 @@ Fetch error: http://help.securingthehuman.org/ => https://help.securingthehuman.
 	For other SANS Institute coverage, see SANS.org.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/SecurityMetrics.xml b/src/chrome/content/rules/SecurityMetrics.xml
index 1cdeb574713a..0affd1a96e4f 100644
--- a/src/chrome/content/rules/SecurityMetrics.xml
+++ b/src/chrome/content/rules/SecurityMetrics.xml
@@ -6,7 +6,7 @@ Fetch error: http://web2.securitymetrics.com/ => https://web2.securitymetrics.co
 	Refused:
 		- blog
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/SecurityWeek.com.xml b/src/chrome/content/rules/SecurityWeek.com.xml
index a8aebc99ade7..02478af12396 100644
--- a/src/chrome/content/rules/SecurityWeek.com.xml
+++ b/src/chrome/content/rules/SecurityWeek.com.xml
@@ -1,57 +1,18 @@
 
-
+
 
-	
-	
-
-	
 	
+	
 
 
 	
 	
 
-	
-
-
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Security_Conference.de.xml b/src/chrome/content/rules/Security_Conference.de.xml
index 083d6fc956cd..dd5782317f03 100644
--- a/src/chrome/content/rules/Security_Conference.de.xml
+++ b/src/chrome/content/rules/Security_Conference.de.xml
@@ -8,7 +8,7 @@
 	
 
 
-	
+	
 
 
 	 https://www.securityexperten.com/:
 	For rules not causing false/broken MCB, see Security_Experten.com.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Security_Experten.com.xml b/src/chrome/content/rules/Security_Experten.com.xml
index 6994b383b992..a06db1046187 100644
--- a/src/chrome/content/rules/Security_Experten.com.xml
+++ b/src/chrome/content/rules/Security_Experten.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.securityexperten.com/ => http://www.securityexperten.com
 	^: mismatched
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Sedo.com.xml b/src/chrome/content/rules/Sedo.com.xml
index 1524d82dae35..4767a0a46ec6 100644
--- a/src/chrome/content/rules/Sedo.com.xml
+++ b/src/chrome/content/rules/Sedo.com.xml
@@ -6,11 +6,9 @@ Fetch error: http://sc.sedo.com/ => https://sc.sedo.com/: (60, 'SSL certificate
 	For problematic rules, see Sedo-problematic.xml.
 
 
-	Other Sedo rulesets: 
+	Other Sedo rulesets:
 
 		- Affili.net.xml
-		- Reussissonsensemble.fr.xml
-		- Sedo_Holding.com.xml
 
 
 	Problematic hosts in *sedo.com:
@@ -25,7 +23,7 @@ Fetch error: http://sc.sedo.com/ => https://sc.sedo.com/: (60, 'SSL certificate
 		- .sedo.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Sedo.de.xml b/src/chrome/content/rules/Sedo.de.xml
index 752992814dad..c7e85f5f4033 100644
--- a/src/chrome/content/rules/Sedo.de.xml
+++ b/src/chrome/content/rules/Sedo.de.xml
@@ -25,7 +25,7 @@ Fetch error: http://backoffice.sedo.de/ => https://backoffice.sedo.de/: (6, 'Cou
 		- .sedo.de
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Sedo_Holding.com.xml b/src/chrome/content/rules/Sedo_Holding.com.xml
deleted file mode 100644
index 77c6ff1ea960..000000000000
--- a/src/chrome/content/rules/Sedo_Holding.com.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Seecrypt.xml b/src/chrome/content/rules/Seecrypt.xml
index 0d767d1d29c4..a15eeddf5da1 100644
--- a/src/chrome/content/rules/Seecrypt.xml
+++ b/src/chrome/content/rules/Seecrypt.xml
@@ -14,7 +14,7 @@ Fetch error: http://seecrypt.com/ => https://seecrypt.com/: (60, 'SSL certificat
 	* Unsecurable <= dropped
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Seedboxes.cc.xml b/src/chrome/content/rules/Seedboxes.cc.xml
index 97dea19704d6..33c5bddb857d 100644
--- a/src/chrome/content/rules/Seedboxes.cc.xml
+++ b/src/chrome/content/rules/Seedboxes.cc.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Seedr.xml b/src/chrome/content/rules/Seedr.xml
index 7009490c9515..229deec41e8b 100644
--- a/src/chrome/content/rules/Seedr.xml
+++ b/src/chrome/content/rules/Seedr.xml
@@ -8,7 +8,7 @@ Fetch error: http://nl8.seedr.cc/ => https://nl8.seedr.cc/: (60, 'SSL certificat
 		- nl[3-12]
 		- www
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Seedrs.xml b/src/chrome/content/rules/Seedrs.xml
index 81c60a7b44be..246159f83540 100644
--- a/src/chrome/content/rules/Seedrs.xml
+++ b/src/chrome/content/rules/Seedrs.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://learn.seedrs.com/ => https://learn.seedrs.com/: (6, 'Could not resolve host: learn.seedrs.com')
 
 -->
-
+
 	
 	
 	
@@ -12,6 +12,6 @@ Fetch error: http://learn.seedrs.com/ => https://learn.seedrs.com/: (6, 'Could n
 
   	
 
-	
 
diff --git a/src/chrome/content/rules/Segger.com.xml b/src/chrome/content/rules/Segger.com.xml
index 4ca011eaf412..ff0e773dc00c 100644
--- a/src/chrome/content/rules/Segger.com.xml
+++ b/src/chrome/content/rules/Segger.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://segger.com/ => https://segger.com/: (60, 'SSL certificate pr
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Segment.xml b/src/chrome/content/rules/Segment.xml
index 197c33454703..5a841d4b666b 100644
--- a/src/chrome/content/rules/Segment.xml
+++ b/src/chrome/content/rules/Segment.xml
@@ -3,12 +3,12 @@
 	
 	
 	
-	
+
 	
-	
+
 	
 
 	
@@ -16,7 +16,7 @@
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Seguros_Universales.xml b/src/chrome/content/rules/Seguros_Universales.xml
index e6f229e84e70..571690701e4c 100644
--- a/src/chrome/content/rules/Seguros_Universales.xml
+++ b/src/chrome/content/rules/Seguros_Universales.xml
@@ -19,4 +19,4 @@ Fetch error: http://segurosuniversales.net/ => https://www.segurosuniversales.ne
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Sehirfirsati.xml b/src/chrome/content/rules/Sehirfirsati.xml
index 9b03dc620625..3e67427e1d15 100644
--- a/src/chrome/content/rules/Sehirfirsati.xml
+++ b/src/chrome/content/rules/Sehirfirsati.xml
@@ -6,7 +6,7 @@ Fetch error: http://sehirfirsati.com/ => https://www.sehirfirsati.com/: (51, "SS
 Fetch error: http://static.sehirfirsati.com/ => https://static.sehirfirsati.com/: (51, "SSL: no alternative certificate subject name matches target host name 'static.sehirfirsati.com'")
 
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/Selangorku.xml b/src/chrome/content/rules/Selangorku.xml
index 67ee34eae4b8..28f3cde40da5 100644
--- a/src/chrome/content/rules/Selangorku.xml
+++ b/src/chrome/content/rules/Selangorku.xml
@@ -11,15 +11,15 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://selangorku.com/ => https://selangorku.com/: (60, 'SSL certificate problem: self signed certificate')
 
 -->
-
+
 
 	
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Selfhost.de.xml b/src/chrome/content/rules/Selfhost.de.xml
deleted file mode 100644
index c36370734a53..000000000000
--- a/src/chrome/content/rules/Selfhost.de.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Selfridges.com.xml b/src/chrome/content/rules/Selfridges.com.xml
index 82a0c7ca2dad..8a6189a7b859 100644
--- a/src/chrome/content/rules/Selfridges.com.xml
+++ b/src/chrome/content/rules/Selfridges.com.xml
@@ -23,4 +23,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Sellaband.com.xml b/src/chrome/content/rules/Sellaband.com.xml
index 79041cb84647..dfcf91db1f7e 100644
--- a/src/chrome/content/rules/Sellaband.com.xml
+++ b/src/chrome/content/rules/Sellaband.com.xml
@@ -4,12 +4,20 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://sellaband.com/ => https://sellaband.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 
 	
-	
-
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
 
 	
diff --git a/src/chrome/content/rules/SemanticScholar.org.xml b/src/chrome/content/rules/SemanticScholar.org.xml
new file mode 100644
index 000000000000..4b5a635dbdbe
--- /dev/null
+++ b/src/chrome/content/rules/SemanticScholar.org.xml
@@ -0,0 +1,21 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+		
+
+	
+
+
diff --git a/src/chrome/content/rules/Semasio.net.xml b/src/chrome/content/rules/Semasio.net.xml
index 91613895a258..27c32ba2c9ae 100644
--- a/src/chrome/content/rules/Semasio.net.xml
+++ b/src/chrome/content/rules/Semasio.net.xml
@@ -7,7 +7,7 @@
 		- (www.)semasio.com
 		- labs.semasio.com
 		- wiki.semasio.net
-	
+
 -->
 
 
diff --git a/src/chrome/content/rules/SemiAccurate.com.xml b/src/chrome/content/rules/SemiAccurate.com.xml
new file mode 100644
index 000000000000..9ce07512aca2
--- /dev/null
+++ b/src/chrome/content/rules/SemiAccurate.com.xml
@@ -0,0 +1,9 @@
+
+
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/SemiAccurate.xml b/src/chrome/content/rules/SemiAccurate.xml
deleted file mode 100644
index dc990ca3cde3..000000000000
--- a/src/chrome/content/rules/SemiAccurate.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/SemperVideo.xml b/src/chrome/content/rules/SemperVideo.xml
deleted file mode 100644
index 4c2980d90817..000000000000
--- a/src/chrome/content/rules/SemperVideo.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Sencha.xml b/src/chrome/content/rules/Sencha.xml
index 6d3f7cff87f8..23bbddbcfac2 100644
--- a/src/chrome/content/rules/Sencha.xml
+++ b/src/chrome/content/rules/Sencha.xml
@@ -32,7 +32,7 @@ Non-2xx HTTP code: http://cdn.sencha.io/ (200) => https://extjs.cachefly.net/ (4
 		- .manage.sencha.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/SendGrid.com.xml b/src/chrome/content/rules/SendGrid.com.xml
index 40fd2d6d9eef..a5f5beac81ec 100644
--- a/src/chrome/content/rules/SendGrid.com.xml
+++ b/src/chrome/content/rules/SendGrid.com.xml
@@ -21,7 +21,7 @@ Fetch error: http://community.sendgrid.com/ => https://community.sendgrid.com/:
 		- .sendgrid.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/SendMoneyToSchool.com.xml b/src/chrome/content/rules/SendMoneyToSchool.com.xml
index cbdcd0b85dda..a6fbc0cb29f8 100644
--- a/src/chrome/content/rules/SendMoneyToSchool.com.xml
+++ b/src/chrome/content/rules/SendMoneyToSchool.com.xml
@@ -9,4 +9,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SendYourFiles.com.xml b/src/chrome/content/rules/SendYourFiles.com.xml
deleted file mode 100644
index e5661672521d..000000000000
--- a/src/chrome/content/rules/SendYourFiles.com.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Sendmoments.com.xml b/src/chrome/content/rules/Sendmoments.com.xml
index cf54e550fd69..822d2109f907 100644
--- a/src/chrome/content/rules/Sendmoments.com.xml
+++ b/src/chrome/content/rules/Sendmoments.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://ck.sendmoments.com/ => https://ck.sendmoments.com/: Too many
 Disabled by https-everywhere-checker because:
 Fetch error: http://ck.sendmoments.com/ => https://ck.sendmoments.com/: Cycle detected - URL already encountered: http://ck.sendmoments.com
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Sensiolabs.com.xml b/src/chrome/content/rules/Sensiolabs.com.xml
index 103e289b775f..670a3a5d82df 100644
--- a/src/chrome/content/rules/Sensiolabs.com.xml
+++ b/src/chrome/content/rules/Sensiolabs.com.xml
@@ -10,9 +10,8 @@ Fetch error: http://www.connect.sensiolabs.com/ => https://www.connect.sensiolab
 
     More SensioLabs rulesets:
 	    - Symfony.com.xml
-	    - Blackfire.io.xml
 -->
-
+
     
     
     
diff --git a/src/chrome/content/rules/Seower.com.xml b/src/chrome/content/rules/Seower.com.xml
deleted file mode 100644
index 900f13e1dc03..000000000000
--- a/src/chrome/content/rules/Seower.com.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Sequanux.org-falsemixed.xml b/src/chrome/content/rules/Sequanux.org-falsemixed.xml
index 481ab7d03723..a87463fdc987 100644
--- a/src/chrome/content/rules/Sequanux.org-falsemixed.xml
+++ b/src/chrome/content/rules/Sequanux.org-falsemixed.xml
@@ -8,7 +8,7 @@ Fetch error: http://wiki.sequanux.org/ => https://wiki.sequanux.org/: (60, 'SSL
 	For rules that are on by default, see Sequanux.org.xml.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Sequanux.org.xml b/src/chrome/content/rules/Sequanux.org.xml
index d9a614cea115..b7574e848a17 100644
--- a/src/chrome/content/rules/Sequanux.org.xml
+++ b/src/chrome/content/rules/Sequanux.org.xml
@@ -17,7 +17,8 @@
 
 
 	
-	
+	
+	
 
 
 	
 
 	
-	
+	
+	
+	
+	
+	
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Serialist.xml b/src/chrome/content/rules/Serialist.xml
deleted file mode 100644
index 8c1b6b62f8c9..000000000000
--- a/src/chrome/content/rules/Serialist.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Serienjunkies.de.xml b/src/chrome/content/rules/Serienjunkies.de.xml
index cdf9ec93acd6..06b3ee47dbb2 100644
--- a/src/chrome/content/rules/Serienjunkies.de.xml
+++ b/src/chrome/content/rules/Serienjunkies.de.xml
@@ -1,44 +1,30 @@
 
-
-
-
-
-		
-		
-
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 	
-	
-
 	
 
-
-
-
- 
-
+	
 
 
- 
+
diff --git a/src/chrome/content/rules/Seriouseats.com.xml b/src/chrome/content/rules/Seriouseats.com.xml
new file mode 100644
index 000000000000..156d6243ff72
--- /dev/null
+++ b/src/chrome/content/rules/Seriouseats.com.xml
@@ -0,0 +1,12 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/Sertifikatai.lt.xml b/src/chrome/content/rules/Sertifikatai.lt.xml
index 0f22cd3db356..541b0a00e461 100644
--- a/src/chrome/content/rules/Sertifikatai.lt.xml
+++ b/src/chrome/content/rules/Sertifikatai.lt.xml
@@ -12,4 +12,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Server314.com.xml b/src/chrome/content/rules/Server314.com.xml
index 39e67a402a26..0f46d8402a95 100644
--- a/src/chrome/content/rules/Server314.com.xml
+++ b/src/chrome/content/rules/Server314.com.xml
@@ -10,4 +10,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ServerCentral.xml b/src/chrome/content/rules/ServerCentral.xml
index 93c6ba361272..2c97c6fb99b4 100644
--- a/src/chrome/content/rules/ServerCentral.xml
+++ b/src/chrome/content/rules/ServerCentral.xml
@@ -14,7 +14,7 @@ Fetch error: http://portal.servercentral.net/ => https://portal.servercentral.ne
 	Redirects to http://www.servercentral.com/$, expired 2012-12-02, CN: *.nlayer.net
 
 -->
-
+
 
 	
 
@@ -24,4 +24,4 @@ Fetch error: http://portal.servercentral.net/ => https://portal.servercentral.ne
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ServerCrate.com.xml b/src/chrome/content/rules/ServerCrate.com.xml
deleted file mode 100644
index 8594e12ea510..000000000000
--- a/src/chrome/content/rules/ServerCrate.com.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-	
-		
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/ServerExpress.co.il.xml b/src/chrome/content/rules/ServerExpress.co.il.xml
deleted file mode 100644
index e87cd346f28c..000000000000
--- a/src/chrome/content/rules/ServerExpress.co.il.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Server_Express.xml b/src/chrome/content/rules/Server_Express.xml
deleted file mode 100644
index 7d91e4ed83e4..000000000000
--- a/src/chrome/content/rules/Server_Express.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Servera.ovh.xml b/src/chrome/content/rules/Servera.ovh.xml
new file mode 100644
index 000000000000..e57b53ab91a6
--- /dev/null
+++ b/src/chrome/content/rules/Servera.ovh.xml
@@ -0,0 +1,16 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Serverfruit.com.xml b/src/chrome/content/rules/Serverfruit.com.xml
index dc4c17e865ed..dff0d1173edd 100644
--- a/src/chrome/content/rules/Serverfruit.com.xml
+++ b/src/chrome/content/rules/Serverfruit.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://client.serverfruit.com/ => https://client.serverfruit.com/:
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Serveriai.lt.xml b/src/chrome/content/rules/Serveriai.lt.xml
index 5b70dd224f65..5849e7c9ef36 100644
--- a/src/chrome/content/rules/Serveriai.lt.xml
+++ b/src/chrome/content/rules/Serveriai.lt.xml
@@ -13,7 +13,7 @@
 	
 	
 
-	
+
 	
 
diff --git a/src/chrome/content/rules/Servers_for_Hackers.com.xml b/src/chrome/content/rules/Servers_for_Hackers.com.xml
index 599ebededf25..2d3bbeefa4dc 100644
--- a/src/chrome/content/rules/Servers_for_Hackers.com.xml
+++ b/src/chrome/content/rules/Servers_for_Hackers.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://forums.serversforhackers.com/ => https://forums.serversforha
 		- www.serversforhackers.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Serversaurus.com.au.xml b/src/chrome/content/rules/Serversaurus.com.au.xml
index b1c77f565550..27f310d15576 100644
--- a/src/chrome/content/rules/Serversaurus.com.au.xml
+++ b/src/chrome/content/rules/Serversaurus.com.au.xml
@@ -15,7 +15,7 @@ Fetch error: http://tasha.serversaurus.com.au/ => https://tasha.serversaurus.com
 		- www.tasha.serversaurus.com.au
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ServiceTick.com.xml b/src/chrome/content/rules/ServiceTick.com.xml
index d3778fc902a0..2060190e9b9f 100644
--- a/src/chrome/content/rules/ServiceTick.com.xml
+++ b/src/chrome/content/rules/ServiceTick.com.xml
@@ -22,7 +22,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -31,7 +32,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Service_by_Air.xml b/src/chrome/content/rules/Service_by_Air.xml
index e608069d5822..97b5f325867a 100644
--- a/src/chrome/content/rules/Service_by_Air.xml
+++ b/src/chrome/content/rules/Service_by_Air.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://community.sbaglobal.com/ => https://community.sbaglobal.com/: (51, "SSL: no alternative certificate subject name matches target host name 'community.sbaglobal.com'")
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://community.sbaglobal.com/ => https://community.sbaglobal.com/
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Servo.org.xml b/src/chrome/content/rules/Servo.org.xml
deleted file mode 100644
index 5cc35340d7e3..000000000000
--- a/src/chrome/content/rules/Servo.org.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Sesamstrasse.de.xml b/src/chrome/content/rules/Sesamstrasse.de.xml
index d998bea8c31c..224b0f4b8e72 100644
--- a/src/chrome/content/rules/Sesamstrasse.de.xml
+++ b/src/chrome/content/rules/Sesamstrasse.de.xml
@@ -1,7 +1,7 @@
 
 	
 	
-	
+
 	
 
 	
diff --git a/src/chrome/content/rules/SesliSozluk.net.xml b/src/chrome/content/rules/SesliSozluk.net.xml
new file mode 100644
index 000000000000..76a85011cd85
--- /dev/null
+++ b/src/chrome/content/rules/SesliSozluk.net.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+	
+		
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Sevenoaks.gov.uk.xml b/src/chrome/content/rules/Sevenoaks.gov.uk.xml
index 0092e4176f56..ff4a53f1a6d1 100644
--- a/src/chrome/content/rules/Sevenoaks.gov.uk.xml
+++ b/src/chrome/content/rules/Sevenoaks.gov.uk.xml
@@ -35,7 +35,7 @@
 	Mixed content:
 
 		- Images on www from $self ˢ
-	
+
 	ˢ Secured by us
 
 -->
diff --git a/src/chrome/content/rules/Sex.com.xml b/src/chrome/content/rules/Sex.com.xml
index f26e4b4112b2..1feca94e8f9a 100644
--- a/src/chrome/content/rules/Sex.com.xml
+++ b/src/chrome/content/rules/Sex.com.xml
@@ -22,6 +22,6 @@
 	
 	
 
-		
+	
 	
 
diff --git a/src/chrome/content/rules/SexNarod.xml b/src/chrome/content/rules/SexNarod.xml
index 9520a9f6f576..20e1c3724688 100644
--- a/src/chrome/content/rules/SexNarod.xml
+++ b/src/chrome/content/rules/SexNarod.xml
@@ -3,20 +3,20 @@
 	
 	
 	
-	
+	
+	
 	
-	
+	
+	
+	
 
 	
 
-	
 
-	
 
 	
 	
 
+	
 
diff --git a/src/chrome/content/rules/Sexad.net.xml b/src/chrome/content/rules/Sexad.net.xml
deleted file mode 100644
index 8ef292a59edd..000000000000
--- a/src/chrome/content/rules/Sexad.net.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Sexkompas.net.xml b/src/chrome/content/rules/Sexkompas.net.xml
index 57cd44ea25a7..a7d376a62007 100644
--- a/src/chrome/content/rules/Sexkompas.net.xml
+++ b/src/chrome/content/rules/Sexkompas.net.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.sexkompas.net/ => https://www.sexkompas.net/: (60, 'SSL
 		- www.sexkompas.net
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Sexstories.com.xml b/src/chrome/content/rules/Sexstories.com.xml
index 733324b3f772..624fdc104a36 100644
--- a/src/chrome/content/rules/Sexstories.com.xml
+++ b/src/chrome/content/rules/Sexstories.com.xml
@@ -3,4 +3,4 @@
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Sexy_House.xml b/src/chrome/content/rules/Sexy_House.xml
index 18e74c95e838..7371c00e5a51 100644
--- a/src/chrome/content/rules/Sexy_House.xml
+++ b/src/chrome/content/rules/Sexy_House.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Sferra.xml b/src/chrome/content/rules/Sferra.xml
index 644c021da90c..ac71bc954e7d 100644
--- a/src/chrome/content/rules/Sferra.xml
+++ b/src/chrome/content/rules/Sferra.xml
@@ -12,4 +12,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Sfu.ca.xml b/src/chrome/content/rules/Sfu.ca.xml
index 337324e6f6f4..0d1270ef4b81 100644
--- a/src/chrome/content/rules/Sfu.ca.xml
+++ b/src/chrome/content/rules/Sfu.ca.xml
@@ -77,7 +77,7 @@ Fetch error: http://itunes.sfu.ca/ => https://itunes.sfu.ca/: (6, 'Could not res
 		* www.vancouver.sfu.ca
 		* xpressconnect.its.sfu.ca
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Sgtools.info.xml b/src/chrome/content/rules/Sgtools.info.xml
new file mode 100644
index 000000000000..dbbde702b066
--- /dev/null
+++ b/src/chrome/content/rules/Sgtools.info.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ShackleLabs.com.xml b/src/chrome/content/rules/ShackleLabs.com.xml
deleted file mode 100644
index 3e40de3c1f6e..000000000000
--- a/src/chrome/content/rules/ShackleLabs.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Shacknews.com.xml b/src/chrome/content/rules/Shacknews.com.xml
new file mode 100644
index 000000000000..517065734b83
--- /dev/null
+++ b/src/chrome/content/rules/Shacknews.com.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Shacknews.xml b/src/chrome/content/rules/Shacknews.xml
deleted file mode 100644
index 66f43e3ba6e4..000000000000
--- a/src/chrome/content/rules/Shacknews.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Shadow_of_Mordor.com.xml b/src/chrome/content/rules/Shadow_of_Mordor.com.xml
index 7a35be087ec3..32f4dbb8435e 100644
--- a/src/chrome/content/rules/Shadow_of_Mordor.com.xml
+++ b/src/chrome/content/rules/Shadow_of_Mordor.com.xml
@@ -20,7 +20,7 @@ Fetch error: http://shadowofmordor.com/ => https://www.shadowofmordor.com/: (28,
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Shadowfacts.net.xml b/src/chrome/content/rules/Shadowfacts.net.xml
new file mode 100644
index 000000000000..dc6e6365dd20
--- /dev/null
+++ b/src/chrome/content/rules/Shadowfacts.net.xml
@@ -0,0 +1,26 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Shamans_Garden.xml b/src/chrome/content/rules/Shamans_Garden.xml
index 25f10b200bd4..daa6a3fd2b2a 100644
--- a/src/chrome/content/rules/Shamans_Garden.xml
+++ b/src/chrome/content/rules/Shamans_Garden.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Shamela.ws.xml b/src/chrome/content/rules/Shamela.ws.xml
new file mode 100644
index 000000000000..00a44f029023
--- /dev/null
+++ b/src/chrome/content/rules/Shamela.ws.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ShanghaiCommercialBank.xml b/src/chrome/content/rules/ShanghaiCommercialBank.xml
index f544891b1dbf..432f53bc0c2b 100644
--- a/src/chrome/content/rules/ShanghaiCommercialBank.xml
+++ b/src/chrome/content/rules/ShanghaiCommercialBank.xml
@@ -4,9 +4,9 @@
 	
 	
 	
-	
+
 	
-	
+
 		
 
 
diff --git a/src/chrome/content/rules/Shannon-Health.xml b/src/chrome/content/rules/Shannon-Health.xml
index e28f9ec7577c..5cf42226243a 100644
--- a/src/chrome/content/rules/Shannon-Health.xml
+++ b/src/chrome/content/rules/Shannon-Health.xml
@@ -4,16 +4,14 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://myshannonconnection.org/ => https://www.myshannonconnection.org/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 
 	
-	
+	
 	
-	
+	
 
-
-	
-	
+	
 
 
 	
 
 
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/ShareFile_support.com-problematic.xml b/src/chrome/content/rules/ShareFile_support.com-problematic.xml
index e5ccc0912872..77ec5650e604 100644
--- a/src/chrome/content/rules/ShareFile_support.com-problematic.xml
+++ b/src/chrome/content/rules/ShareFile_support.com-problematic.xml
@@ -7,7 +7,7 @@
 	* See https://whatsmychaincert.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/ShareThis.xml b/src/chrome/content/rules/ShareThis.xml
index 1d552436f299..2af4869de38f 100644
--- a/src/chrome/content/rules/ShareThis.xml
+++ b/src/chrome/content/rules/ShareThis.xml
@@ -74,7 +74,7 @@
 
 	
 	
-	
+	
 
 
 	 https://secure.shareit.com/: (7, 'Fai
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Shared.sx-falsemixed.xml b/src/chrome/content/rules/Shared.sx-falsemixed.xml
deleted file mode 100644
index 5df3864af969..000000000000
--- a/src/chrome/content/rules/Shared.sx-falsemixed.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Shared.sx.xml b/src/chrome/content/rules/Shared.sx.xml
deleted file mode 100644
index 00fc4c3c284b..000000000000
--- a/src/chrome/content/rules/Shared.sx.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-	
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/SharedCount.com.xml b/src/chrome/content/rules/SharedCount.com.xml
index 12677710a76c..7a020e3ab512 100644
--- a/src/chrome/content/rules/SharedCount.com.xml
+++ b/src/chrome/content/rules/SharedCount.com.xml
@@ -11,16 +11,16 @@
 		
 		
 		
-	
+
 		
 		
 		
 		
 		
-	
+
 		
 			
-  
+
 	
 
 
diff --git a/src/chrome/content/rules/Shareshight.com.xml b/src/chrome/content/rules/Shareshight.com.xml
new file mode 100644
index 000000000000..0dac6fb4a28b
--- /dev/null
+++ b/src/chrome/content/rules/Shareshight.com.xml
@@ -0,0 +1,15 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/SharpSpring.xml b/src/chrome/content/rules/SharpSpring.xml
index 7ddcd0c2d987..0edc05a042ba 100644
--- a/src/chrome/content/rules/SharpSpring.xml
+++ b/src/chrome/content/rules/SharpSpring.xml
@@ -10,9 +10,9 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Sharpmen.xml b/src/chrome/content/rules/Sharpmen.xml
index 07bf17f2bc5d..ee19d8dbd05b 100644
--- a/src/chrome/content/rules/Sharpmen.xml
+++ b/src/chrome/content/rules/Sharpmen.xml
@@ -5,7 +5,7 @@ Fetch error: http://sharpmen.com/ => https://sharpmen.com/: (35, 'error:14077438
 Fetch error: http://www.sharpmen.com/ => https://www.sharpmen.com/: (35, 'error:14077438:SSL routines:SSL23_GET_SERVER_HELLO:tlsv1 alert internal error')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.sharpmen.com/ => https://www.sharpmen.com/: (35, 'error:
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Shashkovs.ru.xml b/src/chrome/content/rules/Shashkovs.ru.xml
new file mode 100644
index 000000000000..bb1541235de0
--- /dev/null
+++ b/src/chrome/content/rules/Shashkovs.ru.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Shatiby.edu.sa.xml b/src/chrome/content/rules/Shatiby.edu.sa.xml
new file mode 100644
index 000000000000..8c4ad0319b29
--- /dev/null
+++ b/src/chrome/content/rules/Shatiby.edu.sa.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Shaun_Lorrain.com.au.xml b/src/chrome/content/rules/Shaun_Lorrain.com.au.xml
index 305973c6309c..60cb6bc5b5ee 100644
--- a/src/chrome/content/rules/Shaun_Lorrain.com.au.xml
+++ b/src/chrome/content/rules/Shaun_Lorrain.com.au.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.shaunlorrain.com.au/ => https://www.shaunlorrain.com.au/
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Shazam.xml b/src/chrome/content/rules/Shazam.xml
index 4b832eb2e769..a502d459f59a 100644
--- a/src/chrome/content/rules/Shazam.xml
+++ b/src/chrome/content/rules/Shazam.xml
@@ -4,7 +4,6 @@
 	Other Shazam rulesets:
 
 		- My_Shazam.com.xml
-		- ShazamID.com.xml
 
 
 	CDN buckets:
diff --git a/src/chrome/content/rules/ShazamID.com.xml b/src/chrome/content/rules/ShazamID.com.xml
deleted file mode 100644
index 8baf9b5556ee..000000000000
--- a/src/chrome/content/rules/ShazamID.com.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Sheet-Music-Plus.xml b/src/chrome/content/rules/Sheet-Music-Plus.xml
index 4c4288c97ba3..404672b6801d 100644
--- a/src/chrome/content/rules/Sheet-Music-Plus.xml
+++ b/src/chrome/content/rules/Sheet-Music-Plus.xml
@@ -3,7 +3,9 @@
 
 
 	
-	
+	
+	
+	
 
 	
@@ -11,7 +13,7 @@
 	
 
-	
diff --git a/src/chrome/content/rules/Sheffield.gov.uk.xml b/src/chrome/content/rules/Sheffield.gov.uk.xml
index 6b71aea5d19e..8a054e08e78a 100644
--- a/src/chrome/content/rules/Sheffield.gov.uk.xml
+++ b/src/chrome/content/rules/Sheffield.gov.uk.xml
@@ -30,7 +30,7 @@ Fetch error: http://taxbenefits.sheffield.gov.uk/ => https://taxbenefits.sheffie
 		- signpostsheffield.sheffield.gov.uk
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/SheldonBrown.com.xml b/src/chrome/content/rules/SheldonBrown.com.xml
new file mode 100644
index 000000000000..db70edd96189
--- /dev/null
+++ b/src/chrome/content/rules/SheldonBrown.com.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Shellspace.net.xml b/src/chrome/content/rules/Shellspace.net.xml
deleted file mode 100644
index 63c59f36067e..000000000000
--- a/src/chrome/content/rules/Shellspace.net.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Shenandoah_University.xml b/src/chrome/content/rules/Shenandoah_University.xml
deleted file mode 100644
index 014122029017..000000000000
--- a/src/chrome/content/rules/Shenandoah_University.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Sheperds_Friendly_Society.xml b/src/chrome/content/rules/Sheperds_Friendly_Society.xml
deleted file mode 100644
index 93ef4413f346..000000000000
--- a/src/chrome/content/rules/Sheperds_Friendly_Society.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Shift_Payments.com.xml b/src/chrome/content/rules/Shift_Payments.com.xml
deleted file mode 100644
index fc6382d8aaf0..000000000000
--- a/src/chrome/content/rules/Shift_Payments.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Shinobi.jp.xml b/src/chrome/content/rules/Shinobi.jp.xml
new file mode 100644
index 000000000000..1346adbc6ef1
--- /dev/null
+++ b/src/chrome/content/rules/Shinobi.jp.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Shipment.xml b/src/chrome/content/rules/Shipment.xml
index b4a95b9bd541..5e56a09fdf05 100644
--- a/src/chrome/content/rules/Shipment.xml
+++ b/src/chrome/content/rules/Shipment.xml
@@ -5,7 +5,7 @@ Fetch error: http://ship-ment.com/ => https://ship-ment.com/: (60, 'SSL certific
 Fetch error: http://www.ship-ment.com/ => https://www.ship-ment.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.ship-ment.com/ => https://www.ship-ment.com/: (60, 'SSL
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ShippingWatch.xml b/src/chrome/content/rules/ShippingWatch.xml
index 71834c8b3410..a453e10e8ab8 100644
--- a/src/chrome/content/rules/ShippingWatch.xml
+++ b/src/chrome/content/rules/ShippingWatch.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.shippingwatch.dk/ => https://www.shippingwatch.dk/: (51,
     http://shippingwatch.dk/template/swVer1-0/css/main.css?rev=35794
   is essential for the layout but is served through http.
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Shipto.com.xml b/src/chrome/content/rules/Shipto.com.xml
index d21c775a6d66..e1e8aae5b448 100644
--- a/src/chrome/content/rules/Shipto.com.xml
+++ b/src/chrome/content/rules/Shipto.com.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Shmoop.com.xml b/src/chrome/content/rules/Shmoop.com.xml
index db934ea84b91..3ae5b8191df9 100644
--- a/src/chrome/content/rules/Shmoop.com.xml
+++ b/src/chrome/content/rules/Shmoop.com.xml
@@ -12,7 +12,8 @@
 
 
 	
-	
+	
+	
 		
 
 
@@ -23,6 +24,6 @@
 		to="https://www.shmoop.com/" />
 
 	
+		to="https://media1.shmoop.com/" />
 
 
diff --git a/src/chrome/content/rules/Shobohat.com.xml b/src/chrome/content/rules/Shobohat.com.xml
deleted file mode 100644
index d7fa35dd3516..000000000000
--- a/src/chrome/content/rules/Shobohat.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Shock_Media.nl.xml b/src/chrome/content/rules/Shock_Media.nl.xml
index 45050670be6b..d897f52e8aa9 100644
--- a/src/chrome/content/rules/Shock_Media.nl.xml
+++ b/src/chrome/content/rules/Shock_Media.nl.xml
@@ -16,7 +16,9 @@ Fetch error: http://shockmedia.nl/ => https://www.shockmedia.nl/: (28, 'Connecti
 
 
 	
-	
+	
+	
+	
 
 
 	
@@ -25,7 +27,6 @@ Fetch error: http://shockmedia.nl/ => https://www.shockmedia.nl/: (28, 'Connecti
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/ShoeShow.xml b/src/chrome/content/rules/ShoeShow.xml
index 0ef38f2ccd86..e7d5be99ea49 100644
--- a/src/chrome/content/rules/ShoeShow.xml
+++ b/src/chrome/content/rules/ShoeShow.xml
@@ -4,4 +4,4 @@
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Shoebuy.com.xml b/src/chrome/content/rules/Shoebuy.com.xml
index e06b3cd6e3f0..dffbf9aaf3c0 100644
--- a/src/chrome/content/rules/Shoebuy.com.xml
+++ b/src/chrome/content/rules/Shoebuy.com.xml
@@ -31,7 +31,7 @@ Fetch error: http://att-i.shoebuy.com/ => https://att-i.shoebuy.com/: (51, "SSL:
 		- i		(→ akamai)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ShopCo.com.xml b/src/chrome/content/rules/ShopCo.com.xml
index e0b3baf3b90e..303b356b0c17 100644
--- a/src/chrome/content/rules/ShopCo.com.xml
+++ b/src/chrome/content/rules/ShopCo.com.xml
@@ -9,10 +9,10 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ShopLocal.xml b/src/chrome/content/rules/ShopLocal.xml
index 69f66a433ebf..3b93d4076167 100644
--- a/src/chrome/content/rules/ShopLocal.xml
+++ b/src/chrome/content/rules/ShopLocal.xml
@@ -34,9 +34,14 @@ Fetch error: http://shoplocal.com/ => https://shoplocal.com/: (60, 'SSL certific
 -->
 
 
-        
+        
+        
 	
-	
+	
+	
+	
+	
+	
 
 
 	
@@ -45,7 +50,6 @@ Fetch error: http://shoplocal.com/ => https://shoplocal.com/: (60, 'SSL certific
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/ShopPBS.org.xml b/src/chrome/content/rules/ShopPBS.org.xml
new file mode 100644
index 000000000000..163adbe11791
--- /dev/null
+++ b/src/chrome/content/rules/ShopPBS.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ShopToIt.ca.xml b/src/chrome/content/rules/ShopToIt.ca.xml
new file mode 100644
index 000000000000..e738405f469f
--- /dev/null
+++ b/src/chrome/content/rules/ShopToIt.ca.xml
@@ -0,0 +1,23 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ShopWiki.com.xml b/src/chrome/content/rules/ShopWiki.com.xml
new file mode 100644
index 000000000000..7d8305a89eb3
--- /dev/null
+++ b/src/chrome/content/rules/ShopWiki.com.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ShopWiki.xml b/src/chrome/content/rules/ShopWiki.xml
deleted file mode 100644
index a5c6546fc2bf..000000000000
--- a/src/chrome/content/rules/ShopWiki.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Shopatron.xml b/src/chrome/content/rules/Shopatron.xml
index 19d44b5797b0..4f77e5b4d8fc 100644
--- a/src/chrome/content/rules/Shopatron.xml
+++ b/src/chrome/content/rules/Shopatron.xml
@@ -30,12 +30,15 @@ Fetch error: http://shopatron.com/ => https://shopatron.com/: (7, 'Failed to con
 		- cdn.shptrn.com
 
 -->
-
+
 
 	
 	
 	
-	
+	
+	
+	
+	
 	
 
 
@@ -45,13 +48,10 @@ Fetch error: http://shopatron.com/ => https://shopatron.com/: (7, 'Failed to con
 	
 
-	
 
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Shopee.com.my.xml b/src/chrome/content/rules/Shopee.com.my.xml
new file mode 100644
index 000000000000..737b4526320d
--- /dev/null
+++ b/src/chrome/content/rules/Shopee.com.my.xml
@@ -0,0 +1,49 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Shopfiller.com.xml b/src/chrome/content/rules/Shopfiller.com.xml
new file mode 100644
index 000000000000..1c0b56a8a9c0
--- /dev/null
+++ b/src/chrome/content/rules/Shopfiller.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Shopify.xml b/src/chrome/content/rules/Shopify.xml
index d65aa40a15d9..7f1707c2ed86 100644
--- a/src/chrome/content/rules/Shopify.xml
+++ b/src/chrome/content/rules/Shopify.xml
@@ -3,8 +3,6 @@
 
 		- *.myshopify.com	(stores/clients)
 
-		- various shopify.com subdomains
-
 		- shopify local homepages
 
 	* Secured by us
@@ -17,26 +15,8 @@
 		
 		
 		
-	
-	
-	
-	
-	
-	
-	
-	
-	
-		
-	
 
-	
 	
-	
-	
-	
-	
-	
-	
 	
 	
 	
@@ -48,8 +28,6 @@
 	
 	
 	
-	
-	
 	
 	
 	
@@ -80,7 +58,6 @@
 	
 	
-	
 
 	
 
diff --git a/src/chrome/content/rules/Shopping.com.xml b/src/chrome/content/rules/Shopping.com.xml
deleted file mode 100644
index e1947b2060f8..000000000000
--- a/src/chrome/content/rules/Shopping.com.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-	
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Shopping_Cart_Elite.xml b/src/chrome/content/rules/Shopping_Cart_Elite.xml
index 57746bccd5c3..2010e0ce4519 100644
--- a/src/chrome/content/rules/Shopping_Cart_Elite.xml
+++ b/src/chrome/content/rules/Shopping_Cart_Elite.xml
@@ -10,9 +10,9 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Shoppingshadow.com.xml b/src/chrome/content/rules/Shoppingshadow.com.xml
deleted file mode 100644
index 32f36c581cbd..000000000000
--- a/src/chrome/content/rules/Shoppingshadow.com.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Shoptiques.com.xml b/src/chrome/content/rules/Shoptiques.com.xml
index cf0fd1ae88e7..559fa62d7304 100644
--- a/src/chrome/content/rules/Shoptiques.com.xml
+++ b/src/chrome/content/rules/Shoptiques.com.xml
@@ -14,7 +14,8 @@
 
 
 	
-	
+	
+	
 	
 
 
@@ -27,4 +28,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Shopware.de.xml b/src/chrome/content/rules/Shopware.de.xml
deleted file mode 100644
index 4b6c403f7f0c..000000000000
--- a/src/chrome/content/rules/Shopware.de.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-		
-		
-		
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Shopzilla.xml b/src/chrome/content/rules/Shopzilla.xml
index 938d2057c4ee..52397e8666f0 100644
--- a/src/chrome/content/rules/Shopzilla.xml
+++ b/src/chrome/content/rules/Shopzilla.xml
@@ -10,10 +10,11 @@ Fetch error: http://shopzilla.com/ => https://www.shopzilla.com/: (35, 'Unknown
 		- Bizrate.com.xml
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
@@ -23,7 +24,6 @@ Fetch error: http://shopzilla.com/ => https://www.shopzilla.com/: (35, 'Unknown
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/ShortList.xml b/src/chrome/content/rules/ShortList.xml
index c530a72bf61a..4558a118e2cf 100644
--- a/src/chrome/content/rules/ShortList.xml
+++ b/src/chrome/content/rules/ShortList.xml
@@ -45,7 +45,7 @@ Fetch error: http://shortlist.com/ => https://www.shortlist.com/: Too many redir
 	ˢ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Shorty_Awards.com.xml b/src/chrome/content/rules/Shorty_Awards.com.xml
index 883ff796d055..fa1771c99644 100644
--- a/src/chrome/content/rules/Shorty_Awards.com.xml
+++ b/src/chrome/content/rules/Shorty_Awards.com.xml
@@ -26,7 +26,8 @@
 -->
 
 
-	
+	
+	
 
 
 	
 
-	
+
 	
 	
 	
 	
 
 	
-	
+
 
diff --git a/src/chrome/content/rules/Shotgun_Club.xml b/src/chrome/content/rules/Shotgun_Club.xml
deleted file mode 100644
index c6963bc242a2..000000000000
--- a/src/chrome/content/rules/Shotgun_Club.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/ShouldIAnswer.xml b/src/chrome/content/rules/ShouldIAnswer.xml
new file mode 100644
index 000000000000..672d47bff54c
--- /dev/null
+++ b/src/chrome/content/rules/ShouldIAnswer.xml
@@ -0,0 +1,92 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ShoutWiki.com.xml b/src/chrome/content/rules/ShoutWiki.com.xml
new file mode 100644
index 000000000000..68b1685dfcec
--- /dev/null
+++ b/src/chrome/content/rules/ShoutWiki.com.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ShowMeCon.com.xml b/src/chrome/content/rules/ShowMeCon.com.xml
index 4b39e23c276a..cba97961db86 100644
--- a/src/chrome/content/rules/ShowMeCon.com.xml
+++ b/src/chrome/content/rules/ShowMeCon.com.xml
@@ -8,7 +8,7 @@
 
 
 	
-	
+	
 		
diff --git a/src/chrome/content/rules/Showcase-TV.xml b/src/chrome/content/rules/Showcase-TV.xml
index b1a46a534c87..0237431a2f3c 100644
--- a/src/chrome/content/rules/Showcase-TV.xml
+++ b/src/chrome/content/rules/Showcase-TV.xml
@@ -1,32 +1,11 @@
-
-
-
-
-	
+
 	
+
 	
 	
-	
-	
+
 	
 	
-	
 
 	
-
 
diff --git a/src/chrome/content/rules/Showcase.ca-problematic.xml b/src/chrome/content/rules/Showcase.ca-problematic.xml
deleted file mode 100644
index 4d5990b74d9a..000000000000
--- a/src/chrome/content/rules/Showcase.ca-problematic.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Showcase.ca.xml b/src/chrome/content/rules/Showcase.ca.xml
index de456e96c907..4ce298541b15 100644
--- a/src/chrome/content/rules/Showcase.ca.xml
+++ b/src/chrome/content/rules/Showcase.ca.xml
@@ -1,66 +1,11 @@
 
-
-
+
+	
+	
 	
-		
-		
-		
-		
-		
-		
-
-
-	
 
+	
 
diff --git a/src/chrome/content/rules/Showing_Cloud.com.xml b/src/chrome/content/rules/Showing_Cloud.com.xml
index 86e1425490a9..07541df3eb0c 100644
--- a/src/chrome/content/rules/Showing_Cloud.com.xml
+++ b/src/chrome/content/rules/Showing_Cloud.com.xml
@@ -1,7 +1,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Shubh.am.xml b/src/chrome/content/rules/Shubh.am.xml
index bbcf75fc4923..d28d2770fdb8 100644
--- a/src/chrome/content/rules/Shubh.am.xml
+++ b/src/chrome/content/rules/Shubh.am.xml
@@ -8,7 +8,7 @@ Fetch error: http://www.shubh.am/ => https://www.shubh.am/: (6, 'Could not resol
 		- .shubh.am
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Shuddle.us.xml b/src/chrome/content/rules/Shuddle.us.xml
index 092b7aea67e3..b16c434de111 100644
--- a/src/chrome/content/rules/Shuddle.us.xml
+++ b/src/chrome/content/rules/Shuddle.us.xml
@@ -6,10 +6,13 @@ Fetch error: http://shuddle.us/ => https://shuddle.us/: (28, 'Connection timed o
 	www: refused
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
 
 
 	
 
-	
 
 
diff --git a/src/chrome/content/rules/Siciarz.net.xml b/src/chrome/content/rules/Siciarz.net.xml
new file mode 100644
index 000000000000..e587389c462d
--- /dev/null
+++ b/src/chrome/content/rules/Siciarz.net.xml
@@ -0,0 +1,9 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/SideReel.com.xml b/src/chrome/content/rules/SideReel.com.xml
new file mode 100644
index 000000000000..1b966c8207d2
--- /dev/null
+++ b/src/chrome/content/rules/SideReel.com.xml
@@ -0,0 +1,22 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/SideReel.xml b/src/chrome/content/rules/SideReel.xml
deleted file mode 100644
index d77763bb4255..000000000000
--- a/src/chrome/content/rules/SideReel.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Sidearm_Sports-problematic.xml b/src/chrome/content/rules/Sidearm_Sports-problematic.xml
deleted file mode 100644
index 2e8903394b15..000000000000
--- a/src/chrome/content/rules/Sidearm_Sports-problematic.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Sidearm_Sports.xml b/src/chrome/content/rules/Sidearm_Sports.xml
index 3ce058b24ad9..1874e979f999 100644
--- a/src/chrome/content/rules/Sidearm_Sports.xml
+++ b/src/chrome/content/rules/Sidearm_Sports.xml
@@ -1,21 +1,12 @@
 
 
+	
+	
+	
 
-	
-
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/Sidibouras.xml b/src/chrome/content/rules/Sidibouras.xml
deleted file mode 100644
index 98ed48c200b2..000000000000
--- a/src/chrome/content/rules/Sidibouras.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Sidux-ev.org.xml b/src/chrome/content/rules/Sidux-ev.org.xml
deleted file mode 100644
index 36c8231bdd10..000000000000
--- a/src/chrome/content/rules/Sidux-ev.org.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Siemens.xml b/src/chrome/content/rules/Siemens.xml
index 15ae4bfcf2ca..1ed21b45c95c 100644
--- a/src/chrome/content/rules/Siemens.xml
+++ b/src/chrome/content/rules/Siemens.xml
@@ -1,5 +1,5 @@
 
-
+
 
 	
 	
@@ -22,4 +22,4 @@ Fetch error: http://sierraclubgreenhome.com/ => https://sierraclubgreenhome.com/
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SigFig.xml b/src/chrome/content/rules/SigFig.xml
index 1ccede5c352b..2a189c774886 100644
--- a/src/chrome/content/rules/SigFig.xml
+++ b/src/chrome/content/rules/SigFig.xml
@@ -49,7 +49,11 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 		
@@ -59,7 +63,6 @@
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Sigdet.nu.xml b/src/chrome/content/rules/Sigdet.nu.xml
index ce17ab9e499b..867ac33b1efe 100644
--- a/src/chrome/content/rules/Sigdet.nu.xml
+++ b/src/chrome/content/rules/Sigdet.nu.xml
@@ -5,7 +5,7 @@ Fetch error: http://sigdet.nu/ => https://sigdet.nu/: (35, 'Unknown SSL protocol
 Fetch error: http://www.sigdet.nu/ => https://www.sigdet.nu/: (35, 'Unknown SSL protocol error in connection to www.sigdet.nu:443 ')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Siggraph.org.xml b/src/chrome/content/rules/Siggraph.org.xml
index b0942335d409..b8fd5bc7de01 100644
--- a/src/chrome/content/rules/Siggraph.org.xml
+++ b/src/chrome/content/rules/Siggraph.org.xml
@@ -1,6 +1,6 @@
-
-  
-  
+
+	
+	
 
-  
+	
 
diff --git a/src/chrome/content/rules/SigmaAldrich.com.xml b/src/chrome/content/rules/SigmaAldrich.com.xml
index 38f82ee80417..a00e6a2f1afd 100644
--- a/src/chrome/content/rules/SigmaAldrich.com.xml
+++ b/src/chrome/content/rules/SigmaAldrich.com.xml
@@ -1,4 +1,11 @@
+
 
 
 
-	
-	
+	
+	
 	
 
-	
-
 	
 
 
diff --git a/src/chrome/content/rules/SigmaBeauty.xml b/src/chrome/content/rules/SigmaBeauty.xml
index 1c292001672d..51e82b88b8fd 100644
--- a/src/chrome/content/rules/SigmaBeauty.xml
+++ b/src/chrome/content/rules/SigmaBeauty.xml
@@ -7,10 +7,10 @@ enews. mismatch
 	
 	
 	
-	
+
 	
 	
-	
+
 	
 
 	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Signals.xml b/src/chrome/content/rules/Signals.xml
index 71d20eabb694..eb050a8ebc4f 100644
--- a/src/chrome/content/rules/Signals.xml
+++ b/src/chrome/content/rules/Signals.xml
@@ -7,7 +7,10 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
@@ -16,7 +19,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Sigterm.no.xml b/src/chrome/content/rules/Sigterm.no.xml
index 25d31f75cfaa..a87190568a2b 100644
--- a/src/chrome/content/rules/Sigterm.no.xml
+++ b/src/chrome/content/rules/Sigterm.no.xml
@@ -14,7 +14,7 @@ Fetch error: http://clients.sigterm.no/ => https://clients.sigterm.no/: (6, 'Cou
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Sikur.xml b/src/chrome/content/rules/Sikur.xml
index 87506302a8be..fe8eb7b5feab 100644
--- a/src/chrome/content/rules/Sikur.xml
+++ b/src/chrome/content/rules/Sikur.xml
@@ -19,13 +19,13 @@
 	
 
 	
-	
+
 	
 
 	
 
-	
 
diff --git a/src/chrome/content/rules/Silent_Circle.xml b/src/chrome/content/rules/Silent_Circle.xml
index 4d53f5a59b9b..d0d061ff968d 100644
--- a/src/chrome/content/rules/Silent_Circle.xml
+++ b/src/chrome/content/rules/Silent_Circle.xml
@@ -29,7 +29,7 @@ Fetch error: http://mail.silentcircle.com/ => https://mail.silentcircle.com/: (6
 	No respone:
 		- (www.)silentcircle.org
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Silicon.com.xml b/src/chrome/content/rules/Silicon.com.xml
index 5308da2da6d5..142eab5a1c9a 100644
--- a/src/chrome/content/rules/Silicon.com.xml
+++ b/src/chrome/content/rules/Silicon.com.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://silicon.com/ => https://www.silicon.com/: (28, 'Connection timed out after 10000 milliseconds')
 Fetch error: http://www.silicon.com/ => https://www.silicon.com/: (28, 'Connection timed out after 10001 milliseconds')
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Siliconera.com.xml b/src/chrome/content/rules/Siliconera.com.xml
index 038c6c83a2c8..fc7b7da7e07f 100644
--- a/src/chrome/content/rules/Siliconera.com.xml
+++ b/src/chrome/content/rules/Siliconera.com.xml
@@ -6,7 +6,7 @@
 	
 
 	
-	
+
 	
 
 
diff --git a/src/chrome/content/rules/SilkRoad.xml b/src/chrome/content/rules/SilkRoad.xml
index 6f0b6ef33720..fe45530e76a4 100644
--- a/src/chrome/content/rules/SilkRoad.xml
+++ b/src/chrome/content/rules/SilkRoad.xml
@@ -32,7 +32,7 @@ Fetch error: http://dandbcareers.silkroad.com/ => https://dandbcareers.silkroad.
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Silkn.com.xml b/src/chrome/content/rules/Silkn.com.xml
index 3a64f888e4bf..201815bd30c4 100644
--- a/src/chrome/content/rules/Silkn.com.xml
+++ b/src/chrome/content/rules/Silkn.com.xml
@@ -28,12 +28,13 @@ Fetch error: http://www.buyfacefx.com/ => https://www.buyfacefx.com/: (6, 'Could
 		- shop.silkn.com
 
 -->
-
+
 
 	
 	
 	
-	
+	
+	
 		
 
 
@@ -43,7 +44,6 @@ Fetch error: http://www.buyfacefx.com/ => https://www.buyfacefx.com/: (6, 'Could
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Silkroad_WS.xml b/src/chrome/content/rules/Silkroad_WS.xml
deleted file mode 100644
index 9a0714855bd0..000000000000
--- a/src/chrome/content/rules/Silkroad_WS.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-	
-		
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Silkspan.com.xml b/src/chrome/content/rules/Silkspan.com.xml
index 89f4b3072579..c9d42eacba13 100644
--- a/src/chrome/content/rules/Silkspan.com.xml
+++ b/src/chrome/content/rules/Silkspan.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://silkspan.com/ => https://www.silkspan.com/: (60, 'SSL certif
 Fetch error: http://www.silkspan.com/ => https://www.silkspan.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Silktide.xml b/src/chrome/content/rules/Silktide.xml
index 020350b68067..7974a373e3d9 100644
--- a/src/chrome/content/rules/Silktide.xml
+++ b/src/chrome/content/rules/Silktide.xml
@@ -27,7 +27,7 @@ Fetch error: http://status.silktide.com/ => https://status.silktide.com/: (35, '
 	ᵂ WP Engine/redirects to http
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Silobreaker.xml b/src/chrome/content/rules/Silobreaker.xml
index eb232ec6b6d9..0e3f7ead558e 100644
--- a/src/chrome/content/rules/Silobreaker.xml
+++ b/src/chrome/content/rules/Silobreaker.xml
@@ -20,16 +20,18 @@
 
 	
 	
-	
+	
+	
+	
+	
 
 
 	
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Silva_Wood_Flooring.xml b/src/chrome/content/rules/Silva_Wood_Flooring.xml
index 8e5e587ca52a..0d7d263941f5 100644
--- a/src/chrome/content/rules/Silva_Wood_Flooring.xml
+++ b/src/chrome/content/rules/Silva_Wood_Flooring.xml
@@ -5,7 +5,7 @@ Fetch error: http://silvawoodflooring.co.uk/ => https://silvawoodflooring.co.uk/
 Fetch error: http://www.silvawoodflooring.co.uk/ => https://www.silvawoodflooring.co.uk/: (28, 'Operation timed out after 30001 milliseconds with 0 bytes received')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.silvawoodflooring.co.uk/ => https://www.silvawoodfloorin
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Silver-Oven.xml b/src/chrome/content/rules/Silver-Oven.xml
index 6da70592de9b..9999f5ebe044 100644
--- a/src/chrome/content/rules/Silver-Oven.xml
+++ b/src/chrome/content/rules/Silver-Oven.xml
@@ -3,7 +3,7 @@
 	
 	
 
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/SilverRush_Style.xml b/src/chrome/content/rules/SilverRush_Style.xml
index 566393f497ac..faeb986e492a 100644
--- a/src/chrome/content/rules/SilverRush_Style.xml
+++ b/src/chrome/content/rules/SilverRush_Style.xml
@@ -16,7 +16,7 @@
 		- .silverrushstyle.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Silverflint.xml b/src/chrome/content/rules/Silverflint.xml
index 36e238ca3d47..16e6495e7eef 100644
--- a/src/chrome/content/rules/Silverflint.xml
+++ b/src/chrome/content/rules/Silverflint.xml
@@ -15,4 +15,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Silverpop.xml b/src/chrome/content/rules/Silverpop.xml
index 1c713c8a11ed..4328c21de420 100644
--- a/src/chrome/content/rules/Silverpop.xml
+++ b/src/chrome/content/rules/Silverpop.xml
@@ -10,7 +10,6 @@ Fetch error: http://www1.vtrenz.net/ => https://www1.vtrenz.net/: (6, 'Could not
 
 	Other Silverpop rulesets:
 
-		- CoreMotives.com.xml
 		- mkt51.net.xml
 		- Pages05.net.xml
 
@@ -78,7 +77,7 @@ Fetch error: http://www1.vtrenz.net/ => https://www1.vtrenz.net/: (6, 'Could not
 	* Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Silvertunnel.org.xml b/src/chrome/content/rules/Silvertunnel.org.xml
index a6ac1577f18b..37388c01c45b 100644
--- a/src/chrome/content/rules/Silvertunnel.org.xml
+++ b/src/chrome/content/rules/Silvertunnel.org.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.silvertunnel.org/ => https://silvertunnel.org/: (35, 'Un
 	www.silvertunnel.org: Refused
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Sim-technik.de.xml b/src/chrome/content/rules/Sim-technik.de.xml
index 63bc8dbfaf6b..ab769dc24dd7 100644
--- a/src/chrome/content/rules/Sim-technik.de.xml
+++ b/src/chrome/content/rules/Sim-technik.de.xml
@@ -5,4 +5,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SimFlight-problematic.xml b/src/chrome/content/rules/SimFlight-problematic.xml
index 604d02f9cdd9..09e5edd556d4 100644
--- a/src/chrome/content/rules/SimFlight-problematic.xml
+++ b/src/chrome/content/rules/SimFlight-problematic.xml
@@ -24,39 +24,39 @@
 	
 	
 	
-	
+
 	
 	
 	
-	
+
 	
 	
 	
-	
+
 	
 	
 	
-	
+
 	
 	
 	
-	
+
 	
 	
 	
-	
+
 	
 	
 	
-	
+
 	
 	
 	
-	
+
 	
 	
 	
 
-	
+
 	
 
diff --git a/src/chrome/content/rules/SimFlight.xml b/src/chrome/content/rules/SimFlight.xml
index ebba4fa42c67..c9a372ed08dc 100644
--- a/src/chrome/content/rules/SimFlight.xml
+++ b/src/chrome/content/rules/SimFlight.xml
@@ -1,9 +1,10 @@
 
 
 	
-	
+	
+	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Simblee.com.xml b/src/chrome/content/rules/Simblee.com.xml
deleted file mode 100644
index e994fc3673d1..000000000000
--- a/src/chrome/content/rules/Simblee.com.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Simg.jp.xml b/src/chrome/content/rules/Simg.jp.xml
deleted file mode 100644
index 3dd8f2a26f12..000000000000
--- a/src/chrome/content/rules/Simg.jp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/SimilarGroup.com.xml b/src/chrome/content/rules/SimilarGroup.com.xml
index dfad0ff9eade..606744272218 100644
--- a/src/chrome/content/rules/SimilarGroup.com.xml
+++ b/src/chrome/content/rules/SimilarGroup.com.xml
@@ -9,7 +9,7 @@
 	* Server sends no certificate chain, see https://whatsmychaincert.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Simlar.org.xml b/src/chrome/content/rules/Simlar.org.xml
index 507f3c1ebfe0..2e5976a82808 100644
--- a/src/chrome/content/rules/Simlar.org.xml
+++ b/src/chrome/content/rules/Simlar.org.xml
@@ -11,7 +11,7 @@ Fetch error: http://simlar.org/ => https://simlar.org/: (51, "SSL: no alternativ
 	² Self-signed
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Simosnap.com.xml b/src/chrome/content/rules/Simosnap.com.xml
index bd007d4fe253..04458367e41a 100644
--- a/src/chrome/content/rules/Simosnap.com.xml
+++ b/src/chrome/content/rules/Simosnap.com.xml
@@ -18,7 +18,9 @@
 -->
 
 
-	
+	
+	
+	
 		
diff --git a/src/chrome/content/rules/SimpleReach.com.xml b/src/chrome/content/rules/SimpleReach.com.xml
index 80bfa5c251a6..da2c0b6311f7 100644
--- a/src/chrome/content/rules/SimpleReach.com.xml
+++ b/src/chrome/content/rules/SimpleReach.com.xml
@@ -12,7 +12,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -21,7 +22,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Simple_Pickup.xml b/src/chrome/content/rules/Simple_Pickup.xml
index 4115c815bb6d..6decbba483d6 100644
--- a/src/chrome/content/rules/Simple_Pickup.xml
+++ b/src/chrome/content/rules/Simple_Pickup.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Simplebooklet.com.xml b/src/chrome/content/rules/Simplebooklet.com.xml
index 52785ff2979e..d117a93c4d32 100644
--- a/src/chrome/content/rules/Simplebooklet.com.xml
+++ b/src/chrome/content/rules/Simplebooklet.com.xml
@@ -22,4 +22,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Simpli.fi.xml b/src/chrome/content/rules/Simpli.fi.xml
index b45b19c0b9e8..6777efcfdcfc 100644
--- a/src/chrome/content/rules/Simpli.fi.xml
+++ b/src/chrome/content/rules/Simpli.fi.xml
@@ -1,20 +1,82 @@
 
 
 
+	
+	
+
+	
+	
+	
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
+	
+	
+	
+	
+	
+	
 
-
-	
-	
-	
-
+	
 
 	
diff --git a/src/chrome/content/rules/Simply-Hired.xml b/src/chrome/content/rules/Simply-Hired.xml
index 57ec6a5a1f4a..d6c2962b84ff 100644
--- a/src/chrome/content/rules/Simply-Hired.xml
+++ b/src/chrome/content/rules/Simply-Hired.xml
@@ -69,7 +69,7 @@ Fetch error: http://blog.simplyhired.com/ => https://www.simplyhired.com/blog: (
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Simply-Partner.com.xml b/src/chrome/content/rules/Simply-Partner.com.xml
index 652a658cab66..f22462c5e09b 100644
--- a/src/chrome/content/rules/Simply-Partner.com.xml
+++ b/src/chrome/content/rules/Simply-Partner.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.simply-partner.com/ => https://www.simply-partner.com/:
 		- simply-partner.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Simply_Business.xml b/src/chrome/content/rules/Simply_Business.xml
index 717e5451f412..ea7fd1fc5a3b 100644
--- a/src/chrome/content/rules/Simply_Business.xml
+++ b/src/chrome/content/rules/Simply_Business.xml
@@ -13,4 +13,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Simply_Technology.net.xml b/src/chrome/content/rules/Simply_Technology.net.xml
deleted file mode 100644
index 40c69f5735c9..000000000000
--- a/src/chrome/content/rules/Simply_Technology.net.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Simson.net.xml b/src/chrome/content/rules/Simson.net.xml
new file mode 100644
index 000000000000..7a1cf46bed39
--- /dev/null
+++ b/src/chrome/content/rules/Simson.net.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Simyo.xml b/src/chrome/content/rules/Simyo.xml
index a796eb5cce8b..f334adb676f9 100644
--- a/src/chrome/content/rules/Simyo.xml
+++ b/src/chrome/content/rules/Simyo.xml
@@ -28,7 +28,13 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
@@ -40,7 +46,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Sina.cn-mixedcontent.xml b/src/chrome/content/rules/Sina.cn-mixedcontent.xml
index e5bacfb458a0..a5765f65e434 100644
--- a/src/chrome/content/rules/Sina.cn-mixedcontent.xml
+++ b/src/chrome/content/rules/Sina.cn-mixedcontent.xml
@@ -1,16 +1,10 @@
 
-
 
-
-	
-	
+	
 	
-	
-	
-	
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Sina.cn.xml b/src/chrome/content/rules/Sina.cn.xml
index 7985ae31117d..5e7b068e0ab3 100644
--- a/src/chrome/content/rules/Sina.cn.xml
+++ b/src/chrome/content/rules/Sina.cn.xml
@@ -1,60 +1,61 @@
 
-
 
 	
 	
+	
+		
+	
+	
+	
+	
+	
+	
+	
 	
 		
+	
+	
+		
+	
+	
+	
+	
 	
 		
+	
+	
+		
+	
 	
 		
+	
+	
+	
 	
 		
-	
-		
+	
+	
+	
 	
 		
+	
+	
 
+	
+	
+		
+	
+	
+	
+	
 	
 
diff --git a/src/chrome/content/rules/Sina.com.cn-mixedcontent.xml b/src/chrome/content/rules/Sina.com.cn-mixedcontent.xml
new file mode 100644
index 000000000000..2ec9824b708d
--- /dev/null
+++ b/src/chrome/content/rules/Sina.com.cn-mixedcontent.xml
@@ -0,0 +1,37 @@
+
+
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+		
+	
+	
+		
+		
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Sina.com.cn.xml b/src/chrome/content/rules/Sina.com.cn.xml
index 2b79da1dcb5e..92181efeb9aa 100644
--- a/src/chrome/content/rules/Sina.com.cn.xml
+++ b/src/chrome/content/rules/Sina.com.cn.xml
@@ -1,9 +1,8 @@
-
 
-
 
-
-	
-	
+	
+	
 	
+	
+	
+	
+	
 	
 	
-	
+	
+		
 		
+	
+		
+	
 	
+	
+		
+	
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
 		
+	
 	
 	
 	
 	
 	
+	
+	
+		
+	
+	
 	
-	
 	
+	
 	
-	
+	
 	
 	
 		
@@ -165,171 +161,29 @@
 	
 	
 		
+	
+		
 	
+	
+		
 		
+	
 	
 		
 		
 	
 		
 		
+	
+	
+	
 	
 	
 		
-	
 	
-	
-
-	
-	
-		
-		
-		
-		
-		
-		
-		
-
-	
-		
-		
-		
-		
-		
-
-	
-		
-		
-		
-		
-
-	
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-
-	
-		
-		
-		
-
-	
-		
-		
-		
-		
-
-		
-		
-		
-
-	
-		
-		
-		
-		
-
-		
-		
-		
-		
-
-	
-		
-		
-
-	
-		
-		
-		
-		
-
-	
-		
-		
-		
-		
-		
-		
-
-	
-		
-		
-		
-		
-		
-		
-		
-		
-		
-
-	
-		
-		
-		
-		
-		
-		
-		
-
-	
-		
-		
-		
-
-		
-		
-
-	
-		
-		
-		
-		
-		
-		
-
-	
-
+	
 	
-		
-		
-		
-		
-		
-		
-		
+	
 
 	
 
diff --git a/src/chrome/content/rules/Sina.com.xml b/src/chrome/content/rules/Sina.com.xml
deleted file mode 100644
index 3303cbb5a416..000000000000
--- a/src/chrome/content/rules/Sina.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-		
-	
-		
-
-	
-
diff --git a/src/chrome/content/rules/SinaApp.com.xml b/src/chrome/content/rules/SinaApp.com.xml
index d85388e5c74b..2a61169820ca 100644
--- a/src/chrome/content/rules/SinaApp.com.xml
+++ b/src/chrome/content/rules/SinaApp.com.xml
@@ -9,7 +9,7 @@
 		greengrass.sinaapp.com
 		hiwgy.sinaapp.com
 		weihr.sinaapp.com
-		
+
 	Invalid certificate:
 		greengrass-wordpress.stor.sinaapp.com
 		qdomain-saenew.stor.sinaapp.com
@@ -30,7 +30,7 @@
 		
 		
 		
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/SinaCloud.com.xml b/src/chrome/content/rules/SinaCloud.com.xml
index b1e1dd284baa..294d459a6be8 100644
--- a/src/chrome/content/rules/SinaCloud.com.xml
+++ b/src/chrome/content/rules/SinaCloud.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://gongkaike.sinacloud.com/ => https://gongkaike.sinacloud.com/
 		pma.tools.sinacloud.com	https://pma.tools.sinacloud.com/print.css
 -->
 
-
+
 	
 	
 	
@@ -23,6 +23,6 @@ Fetch error: http://gongkaike.sinacloud.com/ => https://gongkaike.sinacloud.com/
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/SinaJS.cn.xml b/src/chrome/content/rules/SinaJS.cn.xml
index 15b2448e2c6f..f77d31c6e7c4 100644
--- a/src/chrome/content/rules/SinaJS.cn.xml
+++ b/src/chrome/content/rules/SinaJS.cn.xml
@@ -1,47 +1,32 @@
 
 
+	
 	
 		
 	
 		
 		
+	
+	
+	
+	
 	
 		
+	
+	
+	
+	
 	
 		
 	
 		
-
 	
+		
 	
 	
 	
-	
-		
-
-	
-	
-	
-	
-	
-	
-		
 
 	
 
diff --git a/src/chrome/content/rules/Sinaimg.cn.xml b/src/chrome/content/rules/Sinaimg.cn.xml
index c6ae6a027974..693852a12b86 100644
--- a/src/chrome/content/rules/Sinaimg.cn.xml
+++ b/src/chrome/content/rules/Sinaimg.cn.xml
@@ -1,18 +1,26 @@
 
 
 	
-	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
 	
 	
 	
@@ -23,20 +31,14 @@
 	
 	
 	
+	
 	
-	
-	
-	
-	
-	
-	
-	
-	
 	
 	
 	
 	
 	
+    		
 	
 	
 	
@@ -59,22 +61,6 @@
 	
 	
 	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
 	
 	
 	
@@ -103,22 +89,13 @@
 	
 	
 	
-	
 	
 	
 	
-	
-	
-	
-	
 	
 	
 	
 	
-	
-	
-	
-	
 	
 	
 	
@@ -130,37 +107,66 @@
 	
 	
 
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
 		
 		
-		
 		
 		
 		
 		
 		
-		
 		
 		
 		
 		
 		
-		
-		
+		
 		
 		
 		
-		
 		
-		
 		
-		
-		
 		
 
 	
-	
-	
-		
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+		
+		
+		
+		
+		
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+		
 
 	
 
diff --git a/src/chrome/content/rules/Sinefa.com.xml b/src/chrome/content/rules/Sinefa.com.xml
index b8f20f33eeb9..026e5d1eb3df 100644
--- a/src/chrome/content/rules/Sinefa.com.xml
+++ b/src/chrome/content/rules/Sinefa.com.xml
@@ -15,7 +15,8 @@
 -->
 
 
-	
+	
+	
 
 
 	
-	
+	
 
 
diff --git a/src/chrome/content/rules/Singularity_Hub.xml b/src/chrome/content/rules/Singularity_Hub.xml
index 5d51ce66bcf5..9519632d2af1 100644
--- a/src/chrome/content/rules/Singularity_Hub.xml
+++ b/src/chrome/content/rules/Singularity_Hub.xml
@@ -24,7 +24,7 @@
 	
 		
 		
-		
+
 
 	
 
diff --git a/src/chrome/content/rules/Sinica.edu.tw.xml b/src/chrome/content/rules/Sinica.edu.tw.xml
index 11d46a19080f..2a2501e3af55 100644
--- a/src/chrome/content/rules/Sinica.edu.tw.xml
+++ b/src/chrome/content/rules/Sinica.edu.tw.xml
@@ -1,75 +1,53 @@
 
 
-
-	
-		
-		
-
-
-	
-
-	
-
-	
-
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
 
diff --git a/src/chrome/content/rules/Sins_of_a_Solar_Empire.com.xml b/src/chrome/content/rules/Sins_of_a_Solar_Empire.com.xml
index 5e13b0a22915..12e7ccad1b3a 100644
--- a/src/chrome/content/rules/Sins_of_a_Solar_Empire.com.xml
+++ b/src/chrome/content/rules/Sins_of_a_Solar_Empire.com.xml
@@ -14,7 +14,7 @@ Fetch error: http://sinsofasolarempire.com/ => https://sinsofasolarempire.com/:
 	Mixed images from draginol.stardock.net
 
 -->
-
+
 
 	
 	
@@ -25,4 +25,4 @@ Fetch error: http://sinsofasolarempire.com/ => https://sinsofasolarempire.com/:
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Sipgate.co.uk.xml b/src/chrome/content/rules/Sipgate.co.uk.xml
index 8f2366461f37..afb630161798 100644
--- a/src/chrome/content/rules/Sipgate.co.uk.xml
+++ b/src/chrome/content/rules/Sipgate.co.uk.xml
@@ -34,7 +34,7 @@ Fetch error: http://www.sipgate.co.uk/ => https://www.sipgate.co.uk/: Too many r
 		- www.sipgate.co.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Siraj.Institute.xml b/src/chrome/content/rules/Siraj.Institute.xml
new file mode 100644
index 000000000000..add2473b3491
--- /dev/null
+++ b/src/chrome/content/rules/Siraj.Institute.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Sirportly.xml b/src/chrome/content/rules/Sirportly.xml
index 94fbfe5da24f..412ca7beb839 100644
--- a/src/chrome/content/rules/Sirportly.xml
+++ b/src/chrome/content/rules/Sirportly.xml
@@ -15,4 +15,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Site24x7.xml b/src/chrome/content/rules/Site24x7.xml
index 0e342256df3f..529d538b9b7b 100644
--- a/src/chrome/content/rules/Site24x7.xml
+++ b/src/chrome/content/rules/Site24x7.xml
@@ -11,7 +11,7 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SiteCompass.com.xml b/src/chrome/content/rules/SiteCompass.com.xml
index 003b8eb4bac9..ce8ce9ad1675 100644
--- a/src/chrome/content/rules/SiteCompass.com.xml
+++ b/src/chrome/content/rules/SiteCompass.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://mm.sitecompass.com/ => https://mm.sitecompass.com/: (28, 'Co
 	* Dropped
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/SiteGround.xml b/src/chrome/content/rules/SiteGround.xml
index 7ee686be65aa..ac06a45278cf 100644
--- a/src/chrome/content/rules/SiteGround.xml
+++ b/src/chrome/content/rules/SiteGround.xml
@@ -24,7 +24,7 @@ Fetch error: http://forum.siteground.com/ => https://forum.siteground.com/: (60,
 		- .siteground.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/SitePen.com.xml b/src/chrome/content/rules/SitePen.com.xml
index 19ba5e625165..ff0228b35fa1 100644
--- a/src/chrome/content/rules/SitePen.com.xml
+++ b/src/chrome/content/rules/SitePen.com.xml
@@ -11,7 +11,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
-
-
-	
-	
-	
-		
-		
-		
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/SiteTrust-Network.xml b/src/chrome/content/rules/SiteTrust-Network.xml
deleted file mode 100644
index 44336d4d69b8..000000000000
--- a/src/chrome/content/rules/SiteTrust-Network.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Site_Blindado.xml b/src/chrome/content/rules/Site_Blindado.xml
index 1dd85cbb3dec..7f5c1186aa7e 100644
--- a/src/chrome/content/rules/Site_Blindado.xml
+++ b/src/chrome/content/rules/Site_Blindado.xml
@@ -36,24 +36,26 @@ Fetch error: http://siteblindado.com/ => https://siteblindado.com/: (60, 'SSL ce
 
 
 	
-	
-	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 	
 
 
-	
 
 	
 
-	
 
 	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Siteor.xml b/src/chrome/content/rules/Siteor.xml
index 6960b62fde3f..3f732f6fceae 100644
--- a/src/chrome/content/rules/Siteor.xml
+++ b/src/chrome/content/rules/Siteor.xml
@@ -21,9 +21,12 @@
 -->
 
 
-	
+	
+	
 	
-	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Sitizens.com.xml b/src/chrome/content/rules/Sitizens.com.xml
deleted file mode 100644
index 6ecac00c3d91..000000000000
--- a/src/chrome/content/rules/Sitizens.com.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Sitola.xml b/src/chrome/content/rules/Sitola.xml
index 533f1a6bcf88..81c4e720c216 100644
--- a/src/chrome/content/rules/Sitola.xml
+++ b/src/chrome/content/rules/Sitola.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.sitola.cz/ => https://www.sitola.cz/: (60, 'SSL certific
 Fetch error: http://sitola.fi.muni.cz/ => https://sitola.fi.muni.cz/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
     
     
     
diff --git a/src/chrome/content/rules/SixApart.xml b/src/chrome/content/rules/SixApart.xml
index e69fc77f1310..eb7b4cfd74b6 100644
--- a/src/chrome/content/rules/SixApart.xml
+++ b/src/chrome/content/rules/SixApart.xml
@@ -46,7 +46,7 @@ Fetch error: http://blog.sixapart.jp/ => https://blog.sixapart.jp/: (60, 'SSL ce
 	Note that ^ redirects to https, so....
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/SixthTone.com.xml b/src/chrome/content/rules/SixthTone.com.xml
new file mode 100644
index 000000000000..ca30e0e87e19
--- /dev/null
+++ b/src/chrome/content/rules/SixthTone.com.xml
@@ -0,0 +1,25 @@
+
+
+
+	
+	
+	
+		
+	
+		
+	
+		
+	
+		
+
+	
+
+
diff --git a/src/chrome/content/rules/Sizzle-Sites.xml b/src/chrome/content/rules/Sizzle-Sites.xml
index 83802603d000..aa476d9286ca 100644
--- a/src/chrome/content/rules/Sizzle-Sites.xml
+++ b/src/chrome/content/rules/Sizzle-Sites.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.sizzlesitesinc.com/ => https://www.sizzlesitesinc.com/:
 Disabled by https-everywhere-checker because:
 Fetch error: http://sizzlesitesinc.com/ => https://sizzlesitesinc.com/: (35, 'Unknown SSL protocol error in connection to sizzlesitesinc.com:443 ')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Skanetrafiken.se.xml b/src/chrome/content/rules/Skanetrafiken.se.xml
index 4953de8a6c69..2caad0d793bd 100644
--- a/src/chrome/content/rules/Skanetrafiken.se.xml
+++ b/src/chrome/content/rules/Skanetrafiken.se.xml
@@ -9,10 +9,10 @@ Fetch error: http://skanetrafiken.se/ => https://www.skanetrafiken.se/: (60, 'SS
 Fetch error: http://www.skanetrafiken.se/ => https://www.skanetrafiken.se/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 Fetch error: http://shop.skanetrafiken.se/ => https://www.shop.skanetrafiken.se/: (6, 'Could not resolve host: shop.skanetrafiken.se')
     Unsupported domains:
-    
+
     www.reseplaneraren.skanetrafiken.se     (cannot establish connection)
 -->
-
+
   
   
   
@@ -20,6 +20,6 @@ Fetch error: http://shop.skanetrafiken.se/ => https://www.shop.skanetrafiken.se/
 
   
   
-  
+
   
 
diff --git a/src/chrome/content/rules/Skat.dk.xml b/src/chrome/content/rules/Skat.dk.xml
index b0a353156d8d..9e2b3dd415eb 100644
--- a/src/chrome/content/rules/Skat.dk.xml
+++ b/src/chrome/content/rules/Skat.dk.xml
@@ -3,7 +3,7 @@
 	Problematic subdomains:
 
 		- extranet.demo ⁴
-		- lagerhotel ¹ 
+		- lagerhotel ¹
 		- www.lagerhotel ¹
 		- tarif ²
 		- www.tarif ²
diff --git a/src/chrome/content/rules/SkateMall.xml b/src/chrome/content/rules/SkateMall.xml
index bf42c00f74de..19448ad37dcc 100644
--- a/src/chrome/content/rules/SkateMall.xml
+++ b/src/chrome/content/rules/SkateMall.xml
@@ -1,14 +1,9 @@
-
-
+
 
 	
 	
 
+	
 
-	
-
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Skch.me.xml b/src/chrome/content/rules/Skch.me.xml
index 90bf349fe5f0..68e7a781fe39 100644
--- a/src/chrome/content/rules/Skch.me.xml
+++ b/src/chrome/content/rules/Skch.me.xml
@@ -5,7 +5,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/SkepticsAnnotatedBible.com.xml b/src/chrome/content/rules/SkepticsAnnotatedBible.com.xml
new file mode 100644
index 000000000000..760cba38966f
--- /dev/null
+++ b/src/chrome/content/rules/SkepticsAnnotatedBible.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Sketch.systems.xml b/src/chrome/content/rules/Sketch.systems.xml
new file mode 100644
index 000000000000..2b46e38b9422
--- /dev/null
+++ b/src/chrome/content/rules/Sketch.systems.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/SkimLinks.xml b/src/chrome/content/rules/SkimLinks.xml
index 74527c26b717..e42cbcccd058 100644
--- a/src/chrome/content/rules/SkimLinks.xml
+++ b/src/chrome/content/rules/SkimLinks.xml
@@ -8,7 +8,6 @@ Non-2xx HTTP code: http://info.skimlinks.com/rs/skimbitltd/images/bg.jpg (200) =
 
 		- redirectingat.com.xml
 		- Skimresources.com.xml
-		- Skm.io.xml
 
 
 	Problematic subdomains:
@@ -50,7 +49,7 @@ Non-2xx HTTP code: http://info.skimlinks.com/rs/skimbitltd/images/bg.jpg (200) =
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Skinflint.xml b/src/chrome/content/rules/Skinflint.xml
index f79bcc6051e7..71281576bc40 100644
--- a/src/chrome/content/rules/Skinflint.xml
+++ b/src/chrome/content/rules/Skinflint.xml
@@ -10,4 +10,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Skitch.xml b/src/chrome/content/rules/Skitch.xml
index 2b3c21876a74..97bc21d0a711 100644
--- a/src/chrome/content/rules/Skitch.xml
+++ b/src/chrome/content/rules/Skitch.xml
@@ -6,12 +6,12 @@
 -->
 
   
-  
+  
+  
 
-	
+	
 
   
-  
+  
 
diff --git a/src/chrome/content/rules/Skm.io.xml b/src/chrome/content/rules/Skm.io.xml
deleted file mode 100644
index e438583c2c51..000000000000
--- a/src/chrome/content/rules/Skm.io.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Skoop.xml b/src/chrome/content/rules/Skoop.xml
deleted file mode 100644
index a1a916743e40..000000000000
--- a/src/chrome/content/rules/Skoop.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-		
-		
-		
-		
-
-	
-	
-
-		
-		
-		
-		
-		
-		
-
-
diff --git a/src/chrome/content/rules/Skrill.com.xml b/src/chrome/content/rules/Skrill.com.xml
index 72b781156dcd..fdb4608a0036 100644
--- a/src/chrome/content/rules/Skrill.com.xml
+++ b/src/chrome/content/rules/Skrill.com.xml
@@ -23,17 +23,19 @@ Fetch error: http://sso.skrill.com/ => https://sso.skrill.com/: (7, 'Failed to c
 		- help
 
 -->
-
+
 
 	
 
-	
+	
+	
+	
+	
 
 
 	
 
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Skroutz.gr.xml b/src/chrome/content/rules/Skroutz.gr.xml
deleted file mode 100644
index 71ae86e2ddca..000000000000
--- a/src/chrome/content/rules/Skroutz.gr.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-  
-  
-  
-
-	
-	
-
-  
-  
-  
-
diff --git a/src/chrome/content/rules/Sky-ip.org.xml b/src/chrome/content/rules/Sky-ip.org.xml
index 7b096ccccfc6..87b916654ff3 100644
--- a/src/chrome/content/rules/Sky-ip.org.xml
+++ b/src/chrome/content/rules/Sky-ip.org.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.sky-ip.org/ => https://www.sky-ip.org/: (7, 'Failed to c
 	^: Cert only matches www
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Sky.com.xml b/src/chrome/content/rules/Sky.com.xml
index 886441d40cad..2fe9764a2cde 100644
--- a/src/chrome/content/rules/Sky.com.xml
+++ b/src/chrome/content/rules/Sky.com.xml
@@ -1,11 +1,19 @@
+
 
 	
 	
 	
@@ -106,22 +114,22 @@
 	
 	
 	
-	
+	
 	
 	
 	
 	
 	
 
-	
+	
 	
 
 	
 	
-	
+	
 	
 	
-	
+	
 	
 	
 	
@@ -132,7 +140,7 @@
 	
 	
 	
-	
+	
 
 		
@@ -206,9 +214,6 @@
 	
 
-	
-
 	
 
diff --git a/src/chrome/content/rules/Sky.de.xml b/src/chrome/content/rules/Sky.de.xml
index c6dbb03d5739..dd20392f59c7 100644
--- a/src/chrome/content/rules/Sky.de.xml
+++ b/src/chrome/content/rules/Sky.de.xml
@@ -52,7 +52,7 @@ Fetch error: http://uk-www.sky.de/ => https://uk-www.sky.de/: (6, 'Could not res
 		- www.skyticket.sky.de
 		- www.spieldeslebens.sky.de
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/SkySQL.com.xml b/src/chrome/content/rules/SkySQL.com.xml
index 8e52c1725fdd..1bdf11479797 100644
--- a/src/chrome/content/rules/SkySQL.com.xml
+++ b/src/chrome/content/rules/SkySQL.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://www.skysql.com/ => https://www.skysql.com/: (51, "SSL: no al
 	For other MariaDB Corporation coverage, see MariaDB.com.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/SkyViewingHelp.com.xml b/src/chrome/content/rules/SkyViewingHelp.com.xml
index 53bc23b1d804..bf2fb253a6cd 100644
--- a/src/chrome/content/rules/SkyViewingHelp.com.xml
+++ b/src/chrome/content/rules/SkyViewingHelp.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://www.skyviewinghelp.com/ => https://www.skyviewinghelp.com/:
 			- ^	(expired, mismatched, CN: secure.sky.com)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Sky_Academy.com.xml b/src/chrome/content/rules/Sky_Academy.com.xml
index 08cf2bd86c79..8f2294ba7eb9 100644
--- a/src/chrome/content/rules/Sky_Academy.com.xml
+++ b/src/chrome/content/rules/Sky_Academy.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://skyacademy.com/ => https://skyacademy.com/: (35, 'Unknown SS
 	For other Sky coverage see Sky.com.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Sky_Programme_Information.co.uk.xml b/src/chrome/content/rules/Sky_Programme_Information.co.uk.xml
deleted file mode 100644
index 179a0a1480d2..000000000000
--- a/src/chrome/content/rules/Sky_Programme_Information.co.uk.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Sky_Sports.com.xml b/src/chrome/content/rules/Sky_Sports.com.xml
deleted file mode 100644
index 8934a17e9050..000000000000
--- a/src/chrome/content/rules/Sky_Sports.com.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Sky_and_Telescope.xml b/src/chrome/content/rules/Sky_and_Telescope.xml
index 10a78c762c3d..4713280f1b2a 100644
--- a/src/chrome/content/rules/Sky_and_Telescope.xml
+++ b/src/chrome/content/rules/Sky_and_Telescope.xml
@@ -14,7 +14,7 @@ Fetch error: http://link.eml.skyandtelescope.com/ => https://link.eml.skyandtele
 		- media		(Refused)
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Skylark_cloud.com.xml b/src/chrome/content/rules/Skylark_cloud.com.xml
index be759148b760..bcab5d75286f 100644
--- a/src/chrome/content/rules/Skylark_cloud.com.xml
+++ b/src/chrome/content/rules/Skylark_cloud.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.skylarkcloud.com/ => https://www.skylarkcloud.com/: (28,
 		- www.skylarkcloud.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Skyline_Registrations.co.uk.xml b/src/chrome/content/rules/Skyline_Registrations.co.uk.xml
index 54e1d719a793..eddca92126a3 100644
--- a/src/chrome/content/rules/Skyline_Registrations.co.uk.xml
+++ b/src/chrome/content/rules/Skyline_Registrations.co.uk.xml
@@ -14,7 +14,7 @@ Fetch error: http://skylineregistrations.co.uk/ => https://www.skylineregistrati
 		- Ads from www.googleadservices.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Skyrider_GraalOnline.xml b/src/chrome/content/rules/Skyrider_GraalOnline.xml
index 7c9948babbdc..e4bc2917efc5 100644
--- a/src/chrome/content/rules/Skyrider_GraalOnline.xml
+++ b/src/chrome/content/rules/Skyrider_GraalOnline.xml
@@ -11,7 +11,7 @@ Disabled by https-everywhere-checker because:
 Non-2xx HTTP code: http://skyriderplay.com/ (200) => https://skyriderplay.com/ (521)
 
 -->
-
+
 
 	
 	
@@ -22,4 +22,4 @@ Non-2xx HTTP code: http://skyriderplay.com/ (200) => https://skyriderplay.com/ (
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Skyscanner.xml b/src/chrome/content/rules/Skyscanner.xml
index 73bd37478bda..ae6db4a6f6d3 100644
--- a/src/chrome/content/rules/Skyscanner.xml
+++ b/src/chrome/content/rules/Skyscanner.xml
@@ -1,50 +1,17 @@
-
 
-
+
 
 	
 	
@@ -114,7 +65,6 @@ Fetch error: http://facescanner.skyscanner.net/ => https://facescanner.skyscanne
 	
 	
 	
-	
 	
 	
 	
@@ -124,53 +74,11 @@ Fetch error: http://facescanner.skyscanner.net/ => https://facescanner.skyscanne
 	
 	
 	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-		
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-		
-
 	
 	
-	
 	
-	
 	
 
-	
-	
-		
-	
-	
-	
-	
-	
-	
-	
-
 	
 
diff --git a/src/chrome/content/rules/SkyscraperPage.com.xml b/src/chrome/content/rules/SkyscraperPage.com.xml
new file mode 100644
index 000000000000..3b609b0cbc15
--- /dev/null
+++ b/src/chrome/content/rules/SkyscraperPage.com.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Slader.com.xml b/src/chrome/content/rules/Slader.com.xml
new file mode 100644
index 000000000000..2ef25f846484
--- /dev/null
+++ b/src/chrome/content/rules/Slader.com.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/SlashFilm.com.xml b/src/chrome/content/rules/SlashFilm.com.xml
new file mode 100644
index 000000000000..2f3d39130f34
--- /dev/null
+++ b/src/chrome/content/rules/SlashFilm.com.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Slashbits.com.xml b/src/chrome/content/rules/Slashbits.com.xml
index fa80e8338a27..1799da8a955e 100644
--- a/src/chrome/content/rules/Slashbits.com.xml
+++ b/src/chrome/content/rules/Slashbits.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.slashbits.com/ => https://www.slashbits.com/: (51, "SSL:
 Disabled by https-everywhere-checker because:
 Fetch error: http://slashbits.com/ => https://slashbits.com/: (51, "SSL: no alternative certificate subject name matches target host name 'slashbits.com'")
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Slax_Linux.xml b/src/chrome/content/rules/Slax_Linux.xml
index 4db9eede29ef..45fff63faecc 100644
--- a/src/chrome/content/rules/Slax_Linux.xml
+++ b/src/chrome/content/rules/Slax_Linux.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Slender_Kitchen.xml b/src/chrome/content/rules/Slender_Kitchen.xml
index 24c1ad5a052b..d146d37471ce 100644
--- a/src/chrome/content/rules/Slender_Kitchen.xml
+++ b/src/chrome/content/rules/Slender_Kitchen.xml
@@ -5,7 +5,7 @@ Fetch error: http://slenderkitchen.com/ => https://slenderkitchen.com/: Too many
 Fetch error: http://www.slenderkitchen.com/ => https://www.slenderkitchen.com/: Too many redirects while fetching 'https://www.slenderkitchen.com/'
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.slenderkitchen.com/ => https://www.slenderkitchen.com/:
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SliTaz.org.xml b/src/chrome/content/rules/SliTaz.org.xml
index 5eca813d7fad..f74325fa687b 100644
--- a/src/chrome/content/rules/SliTaz.org.xml
+++ b/src/chrome/content/rules/SliTaz.org.xml
@@ -13,18 +13,20 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
 
-	
 
 	
 	
 
+	
 
diff --git a/src/chrome/content/rules/SlickEdit.com.xml b/src/chrome/content/rules/SlickEdit.com.xml
index 2ea9ac9cce82..396ded8c837e 100644
--- a/src/chrome/content/rules/SlickEdit.com.xml
+++ b/src/chrome/content/rules/SlickEdit.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://slickedit.com/ => https://slickedit.com/: (51, "SSL: no alternative certificate subject name matches target host name 'slickedit.com'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Slick_Products.xml b/src/chrome/content/rules/Slick_Products.xml
index bf0d4275582b..7e55024c05e9 100644
--- a/src/chrome/content/rules/Slick_Products.xml
+++ b/src/chrome/content/rules/Slick_Products.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Slickdeals.xml b/src/chrome/content/rules/Slickdeals.xml
index eec83dc00cd6..1710095c79a8 100644
--- a/src/chrome/content/rules/Slickdeals.xml
+++ b/src/chrome/content/rules/Slickdeals.xml
@@ -31,7 +31,13 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
 	
 	
 
@@ -49,10 +55,9 @@
 	
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/SlideMyPics.xml b/src/chrome/content/rules/SlideMyPics.xml
deleted file mode 100644
index 9f055d787b0d..000000000000
--- a/src/chrome/content/rules/SlideMyPics.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/SlidePlayer.fr.xml b/src/chrome/content/rules/SlidePlayer.fr.xml
new file mode 100644
index 000000000000..aa2ad9b6f3c2
--- /dev/null
+++ b/src/chrome/content/rules/SlidePlayer.fr.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+	
+	
+		
+
+	
+
+
diff --git a/src/chrome/content/rules/Slippedisc.com.xml b/src/chrome/content/rules/Slippedisc.com.xml
new file mode 100644
index 000000000000..4a408a30d155
--- /dev/null
+++ b/src/chrome/content/rules/Slippedisc.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Sloan-Digital-Sky-Survey.xml b/src/chrome/content/rules/Sloan-Digital-Sky-Survey.xml
index 2ba03c729d07..683fa8993028 100644
--- a/src/chrome/content/rules/Sloan-Digital-Sky-Survey.xml
+++ b/src/chrome/content/rules/Sloan-Digital-Sky-Survey.xml
@@ -4,13 +4,13 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://sdss3.org/ => https://sdss3.org/: (51, "SSL: no alternative certificate subject name matches target host name 'sdss3.org'")
 
 -->
-
+
 
 	
 	
 		
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Slough.gov.uk.xml b/src/chrome/content/rules/Slough.gov.uk.xml
index 2649c740b211..45ee3c10723d 100644
--- a/src/chrome/content/rules/Slough.gov.uk.xml
+++ b/src/chrome/content/rules/Slough.gov.uk.xml
@@ -57,7 +57,7 @@
 					-->
 	
 
-	
+	
 
 
 	
 
 
 
   
   
+  
+
+
+  
+  
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+
+
+  
+  
 
 
   
@@ -36,17 +58,53 @@
   
 
 
+  
+  
+  
   
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
 
+  
+  
 
 
   
 
 
+  
+  
+  
+  
+  
+  
+  
 
 
   
+  
+  
+
+
+  
+  
+
+
+  
+  
 
 
   
@@ -56,7 +114,6 @@
   
 
 
-  
 
 
   
@@ -70,31 +127,19 @@
   
 
 
+  
+  
+
+
+  
+  
 
 
   
   
 
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-  
-
-  
-
-  
-
-  
+  
+  
 
   
 
diff --git a/src/chrome/content/rules/Slovensko.digital.xml b/src/chrome/content/rules/Slovensko.digital.xml
new file mode 100644
index 000000000000..aa3ebacfa947
--- /dev/null
+++ b/src/chrome/content/rules/Slovensko.digital.xml
@@ -0,0 +1,19 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Slyar.com.xml b/src/chrome/content/rules/Slyar.com.xml
index e931d098ad6e..fd2183cb97e1 100644
--- a/src/chrome/content/rules/Slyar.com.xml
+++ b/src/chrome/content/rules/Slyar.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://slyar.com/ => https://slyar.com/: Too many redirects while f
 Fetch error: http://www.slyar.com/ => https://www.slyar.com/: Too many redirects while fetching 'https://www.slyar.com/'
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/SmackJeeves.xml b/src/chrome/content/rules/SmackJeeves.xml
index acacc51b15f5..c4876320c3ac 100644
--- a/src/chrome/content/rules/SmackJeeves.xml
+++ b/src/chrome/content/rules/SmackJeeves.xml
@@ -1,17 +1,17 @@
 
 
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/SmallArmsReview.com.xml b/src/chrome/content/rules/SmallArmsReview.com.xml
new file mode 100644
index 000000000000..c97295bc0fae
--- /dev/null
+++ b/src/chrome/content/rules/SmallArmsReview.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/SmallCultFollowing.com.xml b/src/chrome/content/rules/SmallCultFollowing.com.xml
new file mode 100644
index 000000000000..1c8aa5d5dd5d
--- /dev/null
+++ b/src/chrome/content/rules/SmallCultFollowing.com.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Smallbits.com.xml b/src/chrome/content/rules/Smallbits.com.xml
index 77a55b1e4c69..7573295566a8 100644
--- a/src/chrome/content/rules/Smallbits.com.xml
+++ b/src/chrome/content/rules/Smallbits.com.xml
@@ -8,11 +8,11 @@ Fetch error: http://secure.smallbits.com/ => https://secure.smallbits.com/: (60,
 		- (www.)	(shows secure; mismatched, CN: secure.smallbits.com)
 
 -->
-
+
 
 	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Smart-AdServer.xml b/src/chrome/content/rules/Smart-AdServer.xml
index 4372dbdb2671..969e435cf9a2 100644
--- a/src/chrome/content/rules/Smart-AdServer.xml
+++ b/src/chrome/content/rules/Smart-AdServer.xml
@@ -20,7 +20,7 @@
 			- ww284-itx4.smartadserver.com
 			- ww284-itx5.smartadserver.com
 			- ww284.smartadserver.com
-		
+
 		Cert mismatch:
 			- ww339-itx5.smartadserver.com
 			- ww362-itx4.smartadserver.com
diff --git a/src/chrome/content/rules/SmartBrief.xml b/src/chrome/content/rules/SmartBrief.xml
index 2cd254692c82..52b6c6263085 100644
--- a/src/chrome/content/rules/SmartBrief.xml
+++ b/src/chrome/content/rules/SmartBrief.xml
@@ -5,7 +5,7 @@ Non-2xx HTTP code: http://smartbrief.com/ (200) => https://smartbrief.com/ (404)
 Non-2xx HTTP code: http://www.smartbrief.com/ (200) => https://www.smartbrief.com/ (404)
 
 -->
-
+
 
 	
 	
@@ -18,7 +18,7 @@ Non-2xx HTTP code: http://www.smartbrief.com/ (200) => https://www.smartbrief.co
 			- jobs
 			- www
 				-->
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/SmartPractice.com.xml b/src/chrome/content/rules/SmartPractice.com.xml
index 2fb39f1413aa..d049c7411ea2 100644
--- a/src/chrome/content/rules/SmartPractice.com.xml
+++ b/src/chrome/content/rules/SmartPractice.com.xml
@@ -16,7 +16,7 @@ Fetch error: http://www.allerderm.com/ => https://allerderm.com/: (51, "SSL: no
 	* Handshake fails
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/SmartSource.xml b/src/chrome/content/rules/SmartSource.xml
new file mode 100644
index 000000000000..6bbe90eaf128
--- /dev/null
+++ b/src/chrome/content/rules/SmartSource.xml
@@ -0,0 +1,16 @@
+
+
+
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/SmartURL.it.xml b/src/chrome/content/rules/SmartURL.it.xml
new file mode 100644
index 000000000000..72429ec56e31
--- /dev/null
+++ b/src/chrome/content/rules/SmartURL.it.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Smartclip.net.xml b/src/chrome/content/rules/Smartclip.net.xml
index e8c63d0d0a1b..800c6b7321d1 100644
--- a/src/chrome/content/rules/Smartclip.net.xml
+++ b/src/chrome/content/rules/Smartclip.net.xml
@@ -37,7 +37,7 @@
 
 	Timeout:
 		- smokeping.dev.hbbtv
-		
+
 	TLS error:
 		- demo
 		- gallery
@@ -129,5 +129,5 @@
 
 	
- 
+
 
diff --git a/src/chrome/content/rules/Smartling.xml b/src/chrome/content/rules/Smartling.xml
index b8da78e3edcf..278b35048be6 100644
--- a/src/chrome/content/rules/Smartling.xml
+++ b/src/chrome/content/rules/Smartling.xml
@@ -27,7 +27,11 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 
 
 	
@@ -39,4 +43,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Smartmix.io.xml b/src/chrome/content/rules/Smartmix.io.xml
new file mode 100644
index 000000000000..f41ad8e7d610
--- /dev/null
+++ b/src/chrome/content/rules/Smartmix.io.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Smartmixer.io.xml b/src/chrome/content/rules/Smartmixer.io.xml
new file mode 100644
index 000000000000..7c1e1aca3d80
--- /dev/null
+++ b/src/chrome/content/rules/Smartmixer.io.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Smartphone_Experts.xml b/src/chrome/content/rules/Smartphone_Experts.xml
deleted file mode 100644
index 5cbbf980a9fb..000000000000
--- a/src/chrome/content/rules/Smartphone_Experts.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Smartstream.tv.xml b/src/chrome/content/rules/Smartstream.tv.xml
index 04530e4ca2c8..e578a3113926 100644
--- a/src/chrome/content/rules/Smartstream.tv.xml
+++ b/src/chrome/content/rules/Smartstream.tv.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://dashboard.smartstream.tv/ => https://dashboard.smartstream.tv/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
 	
@@ -26,7 +26,7 @@ Fetch error: http://dashboard.smartstream.tv/ => https://dashboard.smartstream.t
 	
 
diff --git a/src/chrome/content/rules/SmashFly.com.xml b/src/chrome/content/rules/SmashFly.com.xml
index e20d3135e9ca..f324d732a4df 100644
--- a/src/chrome/content/rules/SmashFly.com.xml
+++ b/src/chrome/content/rules/SmashFly.com.xml
@@ -53,7 +53,7 @@ Non-2xx HTTP code: http://go.smashfly.com/ (200) => https://smashfly.com/ (502)
 	⁴ Refused
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Smdg.ca.xml b/src/chrome/content/rules/Smdg.ca.xml
index 99b3b72c910f..c2ba73160ffa 100644
--- a/src/chrome/content/rules/Smdg.ca.xml
+++ b/src/chrome/content/rules/Smdg.ca.xml
@@ -14,7 +14,6 @@
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Smi2.net.xml b/src/chrome/content/rules/Smi2.net.xml
index c9c640348702..4171ba887d51 100644
--- a/src/chrome/content/rules/Smi2.net.xml
+++ b/src/chrome/content/rules/Smi2.net.xml
@@ -8,7 +8,7 @@ Fetch error: http://www.smi2.net/ => https://www.smi2.net/: (6, 'Could not resol
 		- smi2.net
 
 -->
-
+
 
 	
@@ -25,7 +25,7 @@ Fetch error: http://www.smi2.net/ => https://www.smi2.net/: (6, 'Could not resol
 					-->
 	
 
-	
+	
 
 
 	
-
-
-	
-
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Smuxi.im.xml b/src/chrome/content/rules/Smuxi.im.xml
index 04ed01550cdd..3e6605a0855a 100644
--- a/src/chrome/content/rules/Smuxi.im.xml
+++ b/src/chrome/content/rules/Smuxi.im.xml
@@ -8,7 +8,7 @@ Fetch error: http://smuxi.net/ => https://smuxi.net/: (51, "SSL: no alternative
 Fetch error: http://www.smuxi.net/ => https://www.smuxi.net/: (51, "SSL: no alternative certificate subject name matches target host name 'www.smuxi.net'")
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Smzdm.com.xml b/src/chrome/content/rules/Smzdm.com.xml
index ce6b0670908a..b19a58f7a047 100644
--- a/src/chrome/content/rules/Smzdm.com.xml
+++ b/src/chrome/content/rules/Smzdm.com.xml
@@ -12,13 +12,13 @@
 		quan
 		test
 		wiki
-	
+
 	404:
 		avatarimg
-	
+
 	502:
 		2
-	
+
 	Mismatch:
 		*.zdmimg.com
 
@@ -27,21 +27,21 @@
 -->
 
 
-	
+
 	
 	
-	
+
 	
 		
 		
 		
-		
+
 	
 
 	
 	
 	
-	
+
 	
 
 
diff --git a/src/chrome/content/rules/Snabb.co.xml b/src/chrome/content/rules/Snabb.co.xml
index 2bd650e04909..72c643f34fc8 100644
--- a/src/chrome/content/rules/Snabb.co.xml
+++ b/src/chrome/content/rules/Snabb.co.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://snabb.co/ => https://snabb.co/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 Fetch error: http://www.snabb.co/ => https://www.snabb.co/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/SnackTools.com-problematic.xml b/src/chrome/content/rules/SnackTools.com-problematic.xml
index f82ad6afb8bb..e7e6dbad4e9c 100644
--- a/src/chrome/content/rules/SnackTools.com-problematic.xml
+++ b/src/chrome/content/rules/SnackTools.com-problematic.xml
@@ -12,4 +12,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SnackTools.com.xml b/src/chrome/content/rules/SnackTools.com.xml
index 5c9ffa53a1da..7967966594a5 100644
--- a/src/chrome/content/rules/SnackTools.com.xml
+++ b/src/chrome/content/rules/SnackTools.com.xml
@@ -5,8 +5,6 @@
 	Other SnackTools rulesets:
 
 		- BannerSnack.com.xml
-		- Quizsnack.com.xml
-		- SnackTools.net.xml
 
 
 	Problematic subdomains:
diff --git a/src/chrome/content/rules/SnackTools.net.xml b/src/chrome/content/rules/SnackTools.net.xml
deleted file mode 100644
index e3f43bfa6486..000000000000
--- a/src/chrome/content/rules/SnackTools.net.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Snacktv.de.xml b/src/chrome/content/rules/Snacktv.de.xml
deleted file mode 100644
index 20b894b684bf..000000000000
--- a/src/chrome/content/rules/Snacktv.de.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Snafu.xml b/src/chrome/content/rules/Snafu.xml
index f81a880f9750..fb154414ff32 100644
--- a/src/chrome/content/rules/Snafu.xml
+++ b/src/chrome/content/rules/Snafu.xml
@@ -9,7 +9,7 @@ Fetch error: http://service.snafu.de/ => https://service.snafu.de/: (7, 'Failed
 		- www	(cert: ; redirects there)
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Snagajob.xml b/src/chrome/content/rules/Snagajob.xml
index 7e0826aab1bb..8e9f9f582ba9 100644
--- a/src/chrome/content/rules/Snagajob.xml
+++ b/src/chrome/content/rules/Snagajob.xml
@@ -1,14 +1,15 @@
 
   
-  
+  
+  
 
-  
+  
 
   
-  
 
   
   
   
   
+  
 
diff --git a/src/chrome/content/rules/Snapchat.com.xml b/src/chrome/content/rules/Snapchat.com.xml
deleted file mode 100644
index 479ea1edd4ee..000000000000
--- a/src/chrome/content/rules/Snapchat.com.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/SndCDN.com.xml b/src/chrome/content/rules/SndCDN.com.xml
index 11bfacd87a67..3b419fdb35df 100644
--- a/src/chrome/content/rules/SndCDN.com.xml
+++ b/src/chrome/content/rules/SndCDN.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://api.sndcdn.com/ => https://api.sndcdn.com/: (6, 'Could not r
 			- i1.sndcdn.com
 			- w1.sndcdn.com
 
-		- m-a.sndcdn.com.edgesuite.net 
+		- m-a.sndcdn.com.edgesuite.net
 
 
 	Problematic hosts in *sndcdn.com:
@@ -25,7 +25,7 @@ Fetch error: http://api.sndcdn.com/ => https://api.sndcdn.com/: (6, 'Could not r
 	* Akamai
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Snel-Internet-Services.xml b/src/chrome/content/rules/Snel-Internet-Services.xml
index 5907e595d864..813ab352fb8b 100644
--- a/src/chrome/content/rules/Snel-Internet-Services.xml
+++ b/src/chrome/content/rules/Snel-Internet-Services.xml
@@ -21,7 +21,7 @@ Fetch error: http://snelserver.com/ => https://snelserver.com/: (51, "SSL: no al
 	but these don't appear to exist(?)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Snel.com.xml b/src/chrome/content/rules/Snel.com.xml
index e44ed96a47fb..3f4e7ea2e3d5 100644
--- a/src/chrome/content/rules/Snel.com.xml
+++ b/src/chrome/content/rules/Snel.com.xml
@@ -18,7 +18,7 @@ Non-2xx HTTP code: http://session.snel.com/ (200) => https://control.snel.com/ (
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Snip.ly.xml b/src/chrome/content/rules/Snip.ly.xml
new file mode 100644
index 000000000000..4e82a3bd8136
--- /dev/null
+++ b/src/chrome/content/rules/Snip.ly.xml
@@ -0,0 +1,24 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Snip2Code.com.xml b/src/chrome/content/rules/Snip2Code.com.xml
index 2db3d782a6de..64a60aa3d175 100644
--- a/src/chrome/content/rules/Snip2Code.com.xml
+++ b/src/chrome/content/rules/Snip2Code.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://dev.snip2code.com/ => https://dev.snip2code.com/: (28, 'Conn
 	^snip2code.com: Handshake fails
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Snipt.net.xml b/src/chrome/content/rules/Snipt.net.xml
index c787a9b5b86e..ec9fe04db9b4 100644
--- a/src/chrome/content/rules/Snipt.net.xml
+++ b/src/chrome/content/rules/Snipt.net.xml
@@ -8,7 +8,7 @@ Fetch error: http://blog.snipt.net/ => https://blog.snipt.net/: (6, 'Could not r
 		- .snipt.net
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Snoobi.xml b/src/chrome/content/rules/Snoobi.xml
index 143d13c85590..c1623ff32b10 100644
--- a/src/chrome/content/rules/Snoobi.xml
+++ b/src/chrome/content/rules/Snoobi.xml
@@ -11,7 +11,7 @@
 	
 
 
-	
+	
 
 
 	 https://store.snort.org/: (6, 'Could not
 	* Blogger
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Snowfly.xml b/src/chrome/content/rules/Snowfly.xml
index 2e1996111263..ceb267df9abf 100644
--- a/src/chrome/content/rules/Snowfly.xml
+++ b/src/chrome/content/rules/Snowfly.xml
@@ -6,7 +6,7 @@ Fetch error: http://regencesecure.snowfly.com/ => https://regencesecure.snowfly.
 	(www.)?snowfly.com: 403
 
 -->
-
+
 
 	
 	
@@ -15,5 +15,5 @@ Fetch error: http://regencesecure.snowfly.com/ => https://regencesecure.snowfly.
 
 	
-    
+
 
diff --git a/src/chrome/content/rules/So-Raise-Your-Glasses.xml b/src/chrome/content/rules/So-Raise-Your-Glasses.xml
index dd0862ad20b8..e1261304a209 100644
--- a/src/chrome/content/rules/So-Raise-Your-Glasses.xml
+++ b/src/chrome/content/rules/So-Raise-Your-Glasses.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://soraiseyourglasses.com/ => https://soraiseyourglasses.com/: (51, "SSL: no alternative certificate subject name matches target host name 'soraiseyourglasses.com'")
 Fetch error: http://www.soraiseyourglasses.com/ => https://www.soraiseyourglasses.com/: Cycle detected - URL already encountered: https://www.soraiseyourglasses.com/
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/So.cl.xml b/src/chrome/content/rules/So.cl.xml
index 4780d15b045f..e07371cef9b1 100644
--- a/src/chrome/content/rules/So.cl.xml
+++ b/src/chrome/content/rules/So.cl.xml
@@ -15,7 +15,7 @@ Fetch error: http://www.so.cl/ => https://www.so.cl/: Cycle detected - URL alrea
 		- (www.)?
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/SoCal_Linux_Expo.org.xml b/src/chrome/content/rules/SoCal_Linux_Expo.org.xml
index f77d5056e501..a94816968360 100644
--- a/src/chrome/content/rules/SoCal_Linux_Expo.org.xml
+++ b/src/chrome/content/rules/SoCal_Linux_Expo.org.xml
@@ -10,7 +10,8 @@
 
 
 	
-	
+	
+	
 
 
 	
-
+
 
 	
 	
 
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Sobollubov.ru.xml b/src/chrome/content/rules/Sobollubov.ru.xml
index fa885c27d5c1..69e05a45da46 100644
--- a/src/chrome/content/rules/Sobollubov.ru.xml
+++ b/src/chrome/content/rules/Sobollubov.ru.xml
@@ -5,7 +5,7 @@ Fetch error: http://sobollubov.ru/ => https://sobollubov.ru/: (28, 'Operation ti
 Fetch error: http://www.sobollubov.ru/ => https://www.sobollubov.ru/: (28, 'Operation timed out after 30001 milliseconds with 0 bytes received')
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/SocialRank.com.xml b/src/chrome/content/rules/SocialRank.com.xml
index 22d2493b9cfa..3d6d6beff87f 100644
--- a/src/chrome/content/rules/SocialRank.com.xml
+++ b/src/chrome/content/rules/SocialRank.com.xml
@@ -19,7 +19,7 @@ Fetch error: http://www.socialrank.co/ => https://www.socialrank.co/: Too many r
 	(www.)?....co is a simple redirect to .com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/SocialShows.xml b/src/chrome/content/rules/SocialShows.xml
index 2f5a1b9762d6..7acbedff114c 100644
--- a/src/chrome/content/rules/SocialShows.xml
+++ b/src/chrome/content/rules/SocialShows.xml
@@ -13,12 +13,12 @@ Fetch error: http://socialshows.net/ => https://socialshows.net/: (6, 'Could not
 	* No https
 
 -->
-
+
 
 	
 	
 	
-	
+	
 
 
 	
@@ -27,4 +27,4 @@ Fetch error: http://socialshows.net/ => https://socialshows.net/: (6, 'Could not
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SocialTwist.xml b/src/chrome/content/rules/SocialTwist.xml
index d37f0d959987..b21ee16e33d7 100644
--- a/src/chrome/content/rules/SocialTwist.xml
+++ b/src/chrome/content/rules/SocialTwist.xml
@@ -6,7 +6,7 @@ Fetch error: http://socialtwist.com/ => https://socialtwist.com/: (51, "SSL: no
 	cdn.socialtwist.com is hosted at s3.amazonaws.com/cdn.socialtwist.com/, but has a valid cert.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Social_Code_dev.com.xml b/src/chrome/content/rules/Social_Code_dev.com.xml
index def7b583781a..23499795d87c 100644
--- a/src/chrome/content/rules/Social_Code_dev.com.xml
+++ b/src/chrome/content/rules/Social_Code_dev.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.socialcodedev.com/ => https://www.socialcodedev.com/: (6
 	Web bugs.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Social_Reader.com.xml b/src/chrome/content/rules/Social_Reader.com.xml
deleted file mode 100644
index bf5e31a4c1b7..000000000000
--- a/src/chrome/content/rules/Social_Reader.com.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-	
-	
-	
-
-	
-	
-	
-	
-
-
-	
-
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-
-
diff --git a/src/chrome/content/rules/Social_Screamer.xml b/src/chrome/content/rules/Social_Screamer.xml
index cf2a9f48c033..c164ff92d6e0 100644
--- a/src/chrome/content/rules/Social_Screamer.xml
+++ b/src/chrome/content/rules/Social_Screamer.xml
@@ -5,7 +5,7 @@ Fetch error: http://socialscreamer.com/ => https://socialscreamer.com/: (28, 'Co
 Fetch error: http://www.socialscreamer.com/ => https://www.socialscreamer.com/: (28, 'Connection timed out after 20011 milliseconds')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.socialscreamer.com/ => https://www.socialscreamer.com/:
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Social_Theater.xml b/src/chrome/content/rules/Social_Theater.xml
index fd5ac334b45f..cd9415102eb5 100644
--- a/src/chrome/content/rules/Social_Theater.xml
+++ b/src/chrome/content/rules/Social_Theater.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Socialbakers.xml b/src/chrome/content/rules/Socialbakers.xml
index 6863828cc10e..58a7281ef9e0 100644
--- a/src/chrome/content/rules/Socialbakers.xml
+++ b/src/chrome/content/rules/Socialbakers.xml
@@ -7,7 +7,7 @@ Fetch error: http://socialbakers.com/ => https://socialbakers.com/: (52, 'Empty
 	
 	
 
-	
+	
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/SocialistWorker.org.xml b/src/chrome/content/rules/SocialistWorker.org.xml
new file mode 100644
index 000000000000..72ed9ad1f5cb
--- /dev/null
+++ b/src/chrome/content/rules/SocialistWorker.org.xml
@@ -0,0 +1,12 @@
+
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Socializer.cc.xml b/src/chrome/content/rules/Socializer.cc.xml
deleted file mode 100644
index 74483adfe120..000000000000
--- a/src/chrome/content/rules/Socializer.cc.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Socialtyzetracking.com.xml b/src/chrome/content/rules/Socialtyzetracking.com.xml
index c3214144c03e..19800d19d78e 100644
--- a/src/chrome/content/rules/Socialtyzetracking.com.xml
+++ b/src/chrome/content/rules/Socialtyzetracking.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://socialtyzetracking.com/ => https://www.socialtyzetracking.co
 	^socialtyzetracking.com: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Society-for-Technical-Communication.xml b/src/chrome/content/rules/Society-for-Technical-Communication.xml
index a8f5bb60abb2..ed404f104e9c 100644
--- a/src/chrome/content/rules/Society-for-Technical-Communication.xml
+++ b/src/chrome/content/rules/Society-for-Technical-Communication.xml
@@ -1,7 +1,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Societyforscience.org.xml b/src/chrome/content/rules/Societyforscience.org.xml
index eb83f6fccf8a..b8bb8a6385ab 100644
--- a/src/chrome/content/rules/Societyforscience.org.xml
+++ b/src/chrome/content/rules/Societyforscience.org.xml
@@ -8,7 +8,7 @@ Fetch error: http://societyforscience.org/ => https://societyforscience.org/: (2
 		- Science_News.org.xml
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/SockShare.xml b/src/chrome/content/rules/SockShare.xml
index 399ec1d1a122..06e6ab6c6836 100644
--- a/src/chrome/content/rules/SockShare.xml
+++ b/src/chrome/content/rules/SockShare.xml
@@ -30,7 +30,7 @@ Fetch error: http://static1.sockshare.com/ => https://static1.sockshare.com/: (6
 	² Works; mismatched, CN: *.firedrive.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Socrata.com.xml b/src/chrome/content/rules/Socrata.com.xml
index 532ec1a6a5cb..7b06e3170947 100644
--- a/src/chrome/content/rules/Socrata.com.xml
+++ b/src/chrome/content/rules/Socrata.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://finance.socrata.com/ => https://finance.socrata.com/: (7, 'F
 		- 1j3rac4ejwve1p3y0x1gprgk-wpengine.netdna-ssl.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/SodaHead.com.xml b/src/chrome/content/rules/SodaHead.com.xml
index fe3abd9cc029..26726d4dcc57 100644
--- a/src/chrome/content/rules/SodaHead.com.xml
+++ b/src/chrome/content/rules/SodaHead.com.xml
@@ -19,20 +19,23 @@ Fetch error: http://sodahead.com/ => https://sodahead.com/: (51, "SSL: no altern
 	* cloudfront.net
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
 
-	
 
 	
@@ -40,4 +43,5 @@ Fetch error: http://sodahead.com/ => https://sodahead.com/: (51, "SSL: no altern
 	
 
+	
 
diff --git a/src/chrome/content/rules/SoftCom.xml b/src/chrome/content/rules/SoftCom.xml
index 511215961e3e..126456fc4182 100644
--- a/src/chrome/content/rules/SoftCom.xml
+++ b/src/chrome/content/rules/SoftCom.xml
@@ -7,7 +7,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://slhost.com/ => https://slhost.com/: (28, 'Resolving timed out after 10518 milliseconds')	!functional:
 		- softcom.com	(timeout)
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/SoftEther_VPN.xml b/src/chrome/content/rules/SoftEther_VPN.xml
index 1bdd6ec2f9f8..daaac629a606 100644
--- a/src/chrome/content/rules/SoftEther_VPN.xml
+++ b/src/chrome/content/rules/SoftEther_VPN.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://softether.org/ => https://softether.org/: (51, "SSL: no alternative certificate subject name matches target host name 'softether.org'")
 
 -->
-
+
 
 	
 	
@@ -15,4 +15,4 @@ Fetch error: http://softether.org/ => https://softether.org/: (51, "SSL: no alte
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SoftLayer-mismatches.xml b/src/chrome/content/rules/SoftLayer-mismatches.xml
index 71680f36bd72..8802998e52d2 100644
--- a/src/chrome/content/rules/SoftLayer-mismatches.xml
+++ b/src/chrome/content/rules/SoftLayer-mismatches.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SoftLayer.xml b/src/chrome/content/rules/SoftLayer.xml
index c0ab611b62f8..7158ac58a8bc 100644
--- a/src/chrome/content/rules/SoftLayer.xml
+++ b/src/chrome/content/rules/SoftLayer.xml
@@ -33,7 +33,7 @@ Fetch error: http://softlayer.com/ => https://softlayer.com/: Too many redirects
 		- www
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Software-in-the-Public-Interest.xml b/src/chrome/content/rules/Software-in-the-Public-Interest.xml
deleted file mode 100644
index 1983271a85d9..000000000000
--- a/src/chrome/content/rules/Software-in-the-Public-Interest.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Sohu.com-mixedcontent.xml b/src/chrome/content/rules/Sohu.com-mixedcontent.xml
new file mode 100644
index 000000000000..d46cd4760f77
--- /dev/null
+++ b/src/chrome/content/rules/Sohu.com-mixedcontent.xml
@@ -0,0 +1,23 @@
+
+
+	
+		
+		
+		
+
+	
+		
+
+	
+		
+
+	
+		
+
+	
+		
+
+	
+
diff --git a/src/chrome/content/rules/Sohu.com.xml b/src/chrome/content/rules/Sohu.com.xml
index 3d38f73ec86d..a20409b71f84 100644
--- a/src/chrome/content/rules/Sohu.com.xml
+++ b/src/chrome/content/rules/Sohu.com.xml
@@ -1,12 +1,17 @@
+
 
-
 
-
-	
+	
+	
 	
 	
 	
@@ -87,7 +86,9 @@
 		
 	
 		
-	
+	
+	
+	
 	
 		
 	
@@ -99,8 +100,8 @@
 	
 	
 	
-	
-		
+	
+		
 	
 	
 	
@@ -108,81 +109,17 @@
 		
 	
 	
+	
+		
 	
+	
+		
 	
 	
 	
 	
 		
 
-	
-	
-		
-		
-		
-		
-		
-		
-		
-		
-		
-
-	
-		
-		
-		
-		
-		
-		
-		
-		
-		
-
-	
-		
-		
-		
-
-		
-
-	
-		
-		
-		
-
-		
-
-	
-		
-		
-		
-
-		
-
-	
-		
-		
-		
-		
-
-		
-
-	
-		
-		
-		
-		
-
-		
-		
-	
-		
-		
-		
-		
-
-		
-
 	
 
 	
diff --git a/src/chrome/content/rules/Sohu.net.xml b/src/chrome/content/rules/Sohu.net.xml
deleted file mode 100644
index e9315cc18ef4..000000000000
--- a/src/chrome/content/rules/Sohu.net.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/SohuSCE.com.xml b/src/chrome/content/rules/SohuSCE.com.xml
deleted file mode 100644
index 1f41d38705da..000000000000
--- a/src/chrome/content/rules/SohuSCE.com.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-		
-
-	
-
diff --git a/src/chrome/content/rules/Solar1.net.xml b/src/chrome/content/rules/Solar1.net.xml
index ebf1499628ec..c671d351a14e 100644
--- a/src/chrome/content/rules/Solar1.net.xml
+++ b/src/chrome/content/rules/Solar1.net.xml
@@ -11,4 +11,4 @@
 						-->
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SolarCity.xml b/src/chrome/content/rules/SolarCity.xml
index 4bcefedeb72c..fead9dba490e 100644
--- a/src/chrome/content/rules/SolarCity.xml
+++ b/src/chrome/content/rules/SolarCity.xml
@@ -7,7 +7,8 @@ Fetch error: http://solarcity.com/ => https://www.solarcity.com/: (60, 'SSL cert
 	
 	
 	
-	
+	
+	
 
 
 	
@@ -18,7 +19,6 @@ Fetch error: http://solarcity.com/ => https://www.solarcity.com/: (60, 'SSL cert
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/SolarList.com.xml b/src/chrome/content/rules/SolarList.com.xml
deleted file mode 100644
index d372f84c4f53..000000000000
--- a/src/chrome/content/rules/SolarList.com.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Solarbotics.com.xml b/src/chrome/content/rules/Solarbotics.com.xml
index b3627d4120ec..353a17e8fd94 100644
--- a/src/chrome/content/rules/Solarbotics.com.xml
+++ b/src/chrome/content/rules/Solarbotics.com.xml
@@ -1,30 +1,17 @@
-
 
 
 	
-	
-
-
-	
-
-
-	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
 
 
diff --git a/src/chrome/content/rules/SolidAlert.com.xml b/src/chrome/content/rules/SolidAlert.com.xml
index 9f563207152e..8e142914a74c 100644
--- a/src/chrome/content/rules/SolidAlert.com.xml
+++ b/src/chrome/content/rules/SolidAlert.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.solidalert.com/ => https://www.solidalert.com/: (7, 'Fai
 	For other Rose Web Services coverage, see RoseHosting.com.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Solid_Cactus.xml b/src/chrome/content/rules/Solid_Cactus.xml
index 8d2322f8e30c..d3ef7c6b7ad2 100644
--- a/src/chrome/content/rules/Solid_Cactus.xml
+++ b/src/chrome/content/rules/Solid_Cactus.xml
@@ -27,4 +27,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Solid_Logic_Technology.xml b/src/chrome/content/rules/Solid_Logic_Technology.xml
index 28fc3d8f7251..f913087e3670 100644
--- a/src/chrome/content/rules/Solid_Logic_Technology.xml
+++ b/src/chrome/content/rules/Solid_Logic_Technology.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.solidlogic.com/ => https://www.solidlogic.com/: (7, 'Fai
 		- dvharv77wz0dp.cloudfront.net
 
 -->
-
+
 
 	
 	
@@ -20,4 +20,4 @@ Fetch error: http://www.solidlogic.com/ => https://www.solidlogic.com/: (7, 'Fai
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Solola.ca.xml b/src/chrome/content/rules/Solola.ca.xml
deleted file mode 100644
index c9006dd9910c..000000000000
--- a/src/chrome/content/rules/Solola.ca.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Solus-Project.com.xml b/src/chrome/content/rules/Solus-Project.com.xml
deleted file mode 100644
index 2dedfb859851..000000000000
--- a/src/chrome/content/rules/Solus-Project.com.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-	
-	
-
-		
-		
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Solutions_Healthcare_Management.xml b/src/chrome/content/rules/Solutions_Healthcare_Management.xml
index b74ec1403e3e..9f096bba50c0 100644
--- a/src/chrome/content/rules/Solutions_Healthcare_Management.xml
+++ b/src/chrome/content/rules/Solutions_Healthcare_Management.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.solutionshealthcare.com/ => https://www.solutionshealthcare.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 
 	
 	
@@ -15,4 +15,4 @@ Fetch error: http://www.solutionshealthcare.com/ => https://www.solutionshealthc
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Solvemedia.com.xml b/src/chrome/content/rules/Solvemedia.com.xml
index 7fbcca80dd7e..82b25cb2b82b 100644
--- a/src/chrome/content/rules/Solvemedia.com.xml
+++ b/src/chrome/content/rules/Solvemedia.com.xml
@@ -24,7 +24,7 @@ Fetch error: http://data-secure.solvemedia.com/ => https://data-secure.solvemedi
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Somerset.gov.uk.xml b/src/chrome/content/rules/Somerset.gov.uk.xml
index 66f9f7c51fee..cd7442734d42 100644
--- a/src/chrome/content/rules/Somerset.gov.uk.xml
+++ b/src/chrome/content/rules/Somerset.gov.uk.xml
@@ -44,7 +44,7 @@ Fetch error: http://secure.somerset.gov.uk/ => https://secure.somerset.gov.uk/:
 		- secure.somerset.gov.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Somerset.org.uk.xml b/src/chrome/content/rules/Somerset.org.uk.xml
deleted file mode 100644
index f513462dbd2c..000000000000
--- a/src/chrome/content/rules/Somerset.org.uk.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Someserver.xml b/src/chrome/content/rules/Someserver.xml
index 092adc3bb648..dae14db53e5c 100644
--- a/src/chrome/content/rules/Someserver.xml
+++ b/src/chrome/content/rules/Someserver.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.someserver.de/ => https://www.someserver.de/: (60, 'SSL
 		- CHDK.xml
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Somevid.com.xml b/src/chrome/content/rules/Somevid.com.xml
index fc853dd5f9b3..75bd4013552c 100644
--- a/src/chrome/content/rules/Somevid.com.xml
+++ b/src/chrome/content/rules/Somevid.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.somevid.com/ => https://www.somevid.com/: (28, 'Connecti
 		- www.somevid.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/SonarCloud.io.xml b/src/chrome/content/rules/SonarCloud.io.xml
new file mode 100644
index 000000000000..116470aa6aee
--- /dev/null
+++ b/src/chrome/content/rules/SonarCloud.io.xml
@@ -0,0 +1,12 @@
+
+
+
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/SonarLint.org.xml b/src/chrome/content/rules/SonarLint.org.xml
new file mode 100644
index 000000000000..811b8769ac74
--- /dev/null
+++ b/src/chrome/content/rules/SonarLint.org.xml
@@ -0,0 +1,18 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/SonarQube.org.xml b/src/chrome/content/rules/SonarQube.org.xml
new file mode 100644
index 000000000000..00a318654cdf
--- /dev/null
+++ b/src/chrome/content/rules/SonarQube.org.xml
@@ -0,0 +1,16 @@
+
+
+
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/SonarSource.com.xml b/src/chrome/content/rules/SonarSource.com.xml
new file mode 100644
index 000000000000..6e70e2c8691a
--- /dev/null
+++ b/src/chrome/content/rules/SonarSource.com.xml
@@ -0,0 +1,36 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/SongColeta.com.xml b/src/chrome/content/rules/SongColeta.com.xml
index 9ec8bf4757b6..1bf152628be7 100644
--- a/src/chrome/content/rules/SongColeta.com.xml
+++ b/src/chrome/content/rules/SongColeta.com.xml
@@ -19,4 +19,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Songsterr.com.xml b/src/chrome/content/rules/Songsterr.com.xml
deleted file mode 100644
index ea5426002eb6..000000000000
--- a/src/chrome/content/rules/Songsterr.com.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-	
-	
-		
-		
-		
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Sonic.net.xml b/src/chrome/content/rules/Sonic.net.xml
index 05973bc49479..271ffc1eb1e7 100644
--- a/src/chrome/content/rules/Sonic.net.xml
+++ b/src/chrome/content/rules/Sonic.net.xml
@@ -37,7 +37,13 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Sonobi.com.xml b/src/chrome/content/rules/Sonobi.com.xml
index 7614db7642f3..fa0ec8262a12 100644
--- a/src/chrome/content/rules/Sonobi.com.xml
+++ b/src/chrome/content/rules/Sonobi.com.xml
@@ -1,31 +1,81 @@
 
 
 
 	
+	
 
+	
+	
+	
+	
+	
+	
+	
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
+	
+	
+	
+	
+	
+	
+	
 	
-
-	
-
-
-	
-	
-	
+	
+	
+	
+	
 
 	
 
-
 	
 
diff --git a/src/chrome/content/rules/Sony.com.hk.xml b/src/chrome/content/rules/Sony.com.hk.xml
index a1ce6449222b..23ea43206a98 100644
--- a/src/chrome/content/rules/Sony.com.hk.xml
+++ b/src/chrome/content/rules/Sony.com.hk.xml
@@ -67,6 +67,6 @@
 	
 	
 
-	
 
diff --git a/src/chrome/content/rules/Sony.com.mx.xml b/src/chrome/content/rules/Sony.com.mx.xml
index b3efe27d1edf..c656ddfe6ba0 100644
--- a/src/chrome/content/rules/Sony.com.mx.xml
+++ b/src/chrome/content/rules/Sony.com.mx.xml
@@ -46,6 +46,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/Sony.se.xml b/src/chrome/content/rules/Sony.se.xml
index 9abd6934bae2..2b84199e359d 100644
--- a/src/chrome/content/rules/Sony.se.xml
+++ b/src/chrome/content/rules/Sony.se.xml
@@ -32,6 +32,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/SonyMobile.xml b/src/chrome/content/rules/SonyMobile.xml
index ab67b2bea007..73fb1ab7ad75 100644
--- a/src/chrome/content/rules/SonyMobile.xml
+++ b/src/chrome/content/rules/SonyMobile.xml
@@ -34,12 +34,12 @@
 	
 	
 		
-	
+
 	
 
 	
 
-	
 
diff --git a/src/chrome/content/rules/Sony_Computer_Science_Laboratories.xml b/src/chrome/content/rules/Sony_Computer_Science_Laboratories.xml
index bb692a184c17..5f16e4c3b44c 100644
--- a/src/chrome/content/rules/Sony_Computer_Science_Laboratories.xml
+++ b/src/chrome/content/rules/Sony_Computer_Science_Laboratories.xml
@@ -10,4 +10,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Sony_Pictures_UK.xml b/src/chrome/content/rules/Sony_Pictures_UK.xml
index fdd39726f52c..0928059eec80 100644
--- a/src/chrome/content/rules/Sony_Pictures_UK.xml
+++ b/src/chrome/content/rules/Sony_Pictures_UK.xml
@@ -13,7 +13,7 @@ Fetch error: http://www.sonypictures.co.uk/ => https://www.sonypictures.co.uk/:
 	Cert only matches www.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Sonyalpha.blog.xml b/src/chrome/content/rules/Sonyalpha.blog.xml
new file mode 100644
index 000000000000..c5b4b916c168
--- /dev/null
+++ b/src/chrome/content/rules/Sonyalpha.blog.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Sonyalpharumors.com.xml b/src/chrome/content/rules/Sonyalpharumors.com.xml
new file mode 100644
index 000000000000..f66a328453ed
--- /dev/null
+++ b/src/chrome/content/rules/Sonyalpharumors.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/SoundKit.io.xml b/src/chrome/content/rules/SoundKit.io.xml
deleted file mode 100644
index 8bd0db7467ff..000000000000
--- a/src/chrome/content/rules/SoundKit.io.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Sound_On_Sound.com.xml b/src/chrome/content/rules/Sound_On_Sound.com.xml
deleted file mode 100644
index 4cedd28cda18..000000000000
--- a/src/chrome/content/rules/Sound_On_Sound.com.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-	
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Soundcloud.xml b/src/chrome/content/rules/Soundcloud.xml
index 2ec3b410a766..b62356be2d05 100644
--- a/src/chrome/content/rules/Soundcloud.xml
+++ b/src/chrome/content/rules/Soundcloud.xml
@@ -44,7 +44,6 @@
 	
 	
 	
-	
 	
 	
 	
@@ -52,8 +51,6 @@
 	
 	
 	
-	
-	
 
 	
 
diff --git a/src/chrome/content/rules/Sounds-True.xml b/src/chrome/content/rules/Sounds-True.xml
index 4ab22469a995..aca7da50fce4 100644
--- a/src/chrome/content/rules/Sounds-True.xml
+++ b/src/chrome/content/rules/Sounds-True.xml
@@ -12,7 +12,9 @@
 
 
 	
-	
+	
+	
+	
 
 	
 	 https://www.soup.io/favicon.ico: (60, 'SSL certificate problem: unable to get local issuer certificate')
-Fetch error: http://www.soup.io/images/soup_small.png => https://www.soup.io/images/soup_small.png: (60, 'SSL certificate problem: unable to get local issuer certificate')
-Fetch error: http://www.soup.io/login => https://www.soup.io/login: (60, 'SSL certificate problem: unable to get local issuer certificate')
-Fetch error: http://static.soup.io/images/bar/drop.gif => https://static.soup.io/images/bar/drop.gif: (60, 'SSL certificate problem: unable to get local issuer certificate')
-Fetch error: http://0.asset.soup.io/asset/1539/2240_65c6_500.jpeg => https://asset-0.soup.io/asset/1539/2240_65c6_500.jpeg: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://1.asset.soup.io/asset/4345/4529_01da_390.jpeg => https://asset-1.soup.io/asset/4345/4529_01da_390.jpeg: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://2.asset.soup.io/asset/3784/8642_df7d.jpeg => https://asset-2.soup.io/asset/3784/8642_df7d.jpeg: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://3.asset.soup.io/asset/3810/3683_f2a3_390.jpeg => https://asset-3.soup.io/asset/3810/3683_f2a3_390.jpeg: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://4.asset.soup.io/asset/3061/5988_4d48.png => https://asset-4.soup.io/asset/3061/5988_4d48.png: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://5.asset.soup.io/asset/0932/6117_09a9.jpeg => https://asset-5.soup.io/asset/0932/6117_09a9.jpeg: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://6.asset.soup.io/asset/0661/6294_aaef.jpeg => https://asset-6.soup.io/asset/0661/6294_aaef.jpeg: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://7.asset.soup.io/asset/2587/3719_3b0d_960.jpeg => https://asset-7.soup.io/asset/2587/3719_3b0d_960.jpeg: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://8.asset.soup.io/asset/3170/9080_6033_480.jpeg => https://asset-8.soup.io/asset/3170/9080_6033_480.jpeg: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://9.asset.soup.io/asset/2204/2617_36e0.jpeg => https://asset-9.soup.io/asset/2204/2617_36e0.jpeg: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://a.asset.soup.io/asset/3290/9786_0213_960.jpeg => https://asset-a.soup.io/asset/3290/9786_0213_960.jpeg: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://b.asset.soup.io/asset/3743/9787_4343_390.jpeg => https://asset-b.soup.io/asset/3743/9787_4343_390.jpeg: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://c.asset.soup.io/asset/4582/2300_3c64.jpeg => https://asset-c.soup.io/asset/4582/2300_3c64.jpeg: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://d.asset.soup.io/asset/3879/6365_97be.jpeg => https://asset-d.soup.io/asset/3879/6365_97be.jpeg: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://e.asset.soup.io/asset/3708/2638_b88c.jpeg => https://asset-e.soup.io/asset/3708/2638_b88c.jpeg: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://f.asset.soup.io/asset/2516/9167_0f28.jpeg => https://asset-f.soup.io/asset/2516/9167_0f28.jpeg: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://soup.io/ => https://soup.io/: (60, 'SSL certificate problem: unable to get local issuer certificate')
-Fetch error: http://asset-0.soup.io/ => https://asset-0.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://asset-1.soup.io/ => https://asset-1.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://asset-2.soup.io/ => https://asset-2.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://asset-3.soup.io/ => https://asset-3.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://asset-4.soup.io/ => https://asset-4.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://asset-5.soup.io/ => https://asset-5.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://asset-6.soup.io/ => https://asset-6.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://asset-7.soup.io/ => https://asset-7.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://asset-8.soup.io/ => https://asset-8.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://asset-9.soup.io/ => https://asset-9.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://asset-a.soup.io/ => https://asset-a.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://asset-b.soup.io/ => https://asset-b.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://asset-c.soup.io/ => https://asset-c.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://asset-d.soup.io/ => https://asset-d.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://asset-e.soup.io/ => https://asset-e.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://asset-f.soup.io/ => https://asset-f.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://static.soup.io/ => https://static.soup.io/: (60, 'SSL certificate problem: unable to get local issuer certificate')
-Fetch error: http://0.asset.soup.io/ => https://asset-0.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://1.asset.soup.io/ => https://asset-1.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://2.asset.soup.io/ => https://asset-2.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://3.asset.soup.io/ => https://asset-3.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://4.asset.soup.io/ => https://asset-4.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://5.asset.soup.io/ => https://asset-5.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://6.asset.soup.io/ => https://asset-6.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://7.asset.soup.io/ => https://asset-7.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://8.asset.soup.io/ => https://asset-8.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://9.asset.soup.io/ => https://asset-9.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://a.asset.soup.io/ => https://asset-a.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://b.asset.soup.io/ => https://asset-b.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://c.asset.soup.io/ => https://asset-c.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://d.asset.soup.io/ => https://asset-d.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://e.asset.soup.io/ => https://asset-e.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-Fetch error: http://f.asset.soup.io/ => https://asset-f.soup.io/: (60, 'SSL certificate problem: certificate has expired')
-
 	Other Soup rulesets:
 
-		- Soup_CDN.com.xml
+		- SoupCDN.com.xml
 
 
 	Problematic hosts in *soup.io:
@@ -83,9 +26,9 @@ Fetch error: http://f.asset.soup.io/ => https://asset-f.soup.io/: (60, 'SSL cert
 		- Bug on www from pixel.quantserve.com ˢ
 
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
-
 -->
-
+
+
 
 	
@@ -185,7 +128,5 @@ Fetch error: http://f.asset.soup.io/ => https://asset-f.soup.io/: (60, 'SSL cert
 		
 		
 
-	
-
+	
 
diff --git a/src/chrome/content/rules/SoupCDN.com.xml b/src/chrome/content/rules/SoupCDN.com.xml
new file mode 100644
index 000000000000..556b849d31d0
--- /dev/null
+++ b/src/chrome/content/rules/SoupCDN.com.xml
@@ -0,0 +1,53 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Soup_CDN.com.xml b/src/chrome/content/rules/Soup_CDN.com.xml
deleted file mode 100644
index d846b1c95772..000000000000
--- a/src/chrome/content/rules/Soup_CDN.com.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/SourceCoast.xml b/src/chrome/content/rules/SourceCoast.xml
index 7d1bb275595e..84d579729c0a 100644
--- a/src/chrome/content/rules/SourceCoast.xml
+++ b/src/chrome/content/rules/SourceCoast.xml
@@ -17,4 +17,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SourcePoint.xml b/src/chrome/content/rules/SourcePoint.xml
new file mode 100644
index 000000000000..5720ff80dbee
--- /dev/null
+++ b/src/chrome/content/rules/SourcePoint.xml
@@ -0,0 +1,34 @@
+
+
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/SourceRuns.org.xml b/src/chrome/content/rules/SourceRuns.org.xml
new file mode 100644
index 000000000000..9a88304e1a1a
--- /dev/null
+++ b/src/chrome/content/rules/SourceRuns.org.xml
@@ -0,0 +1,25 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Sourced.fm.xml b/src/chrome/content/rules/Sourced.fm.xml
deleted file mode 100644
index 36cc07a6185b..000000000000
--- a/src/chrome/content/rules/Sourced.fm.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Sous-Surveillance.fr.xml b/src/chrome/content/rules/Sous-Surveillance.fr.xml
deleted file mode 100644
index b5d7c1dc6e57..000000000000
--- a/src/chrome/content/rules/Sous-Surveillance.fr.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/South_Devon.ac.uk.xml b/src/chrome/content/rules/South_Devon.ac.uk.xml
index 1b3ab59cbd5d..7e3591ae47c6 100644
--- a/src/chrome/content/rules/South_Devon.ac.uk.xml
+++ b/src/chrome/content/rules/South_Devon.ac.uk.xml
@@ -17,11 +17,11 @@ Fetch error: http://mobile.southdevon.ac.uk/ => https://mobile.southdevon.ac.uk/
 	Problematic hosts in *southdevon.ac.uk:
 
 		- staff *
-		
+
 	* Expired
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/South_Glos.gov.uk.xml b/src/chrome/content/rules/South_Glos.gov.uk.xml
index 607c57a80758..e24b9a91f1cb 100644
--- a/src/chrome/content/rules/South_Glos.gov.uk.xml
+++ b/src/chrome/content/rules/South_Glos.gov.uk.xml
@@ -45,7 +45,7 @@ Fetch error: http://www.southglos.gov.uk/ => https://www.southglos.gov.uk/: Too
 		- .www.southglos.gov.uk
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Southampton.gov.uk.xml b/src/chrome/content/rules/Southampton.gov.uk.xml
index e0b628492303..f68369811d83 100644
--- a/src/chrome/content/rules/Southampton.gov.uk.xml
+++ b/src/chrome/content/rules/Southampton.gov.uk.xml
@@ -33,7 +33,7 @@ Fetch error: http://secure.southampton.gov.uk/ => https://secure.southampton.gov
 		- www.southampton.gov.uk
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Southbank_Centre.co.uk.xml b/src/chrome/content/rules/Southbank_Centre.co.uk.xml
index 52bcde93731e..ecea15ed72e0 100644
--- a/src/chrome/content/rules/Southbank_Centre.co.uk.xml
+++ b/src/chrome/content/rules/Southbank_Centre.co.uk.xml
@@ -28,7 +28,7 @@ Fetch error: http://shopcms.southbankcentre.co.uk/ => https://shopcms.southbankc
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Southpark.de.xml b/src/chrome/content/rules/Southpark.de.xml
new file mode 100644
index 000000000000..397a3901a188
--- /dev/null
+++ b/src/chrome/content/rules/Southpark.de.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Southwark.gov.uk.xml b/src/chrome/content/rules/Southwark.gov.uk.xml
index 6793205f259b..6c164116a270 100644
--- a/src/chrome/content/rules/Southwark.gov.uk.xml
+++ b/src/chrome/content/rules/Southwark.gov.uk.xml
@@ -40,7 +40,7 @@ Fetch error: http://www.southwark.gov.uk/ => https://www.southwark.gov.uk/: (60,
 		- www.southwark.gov.uk
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Space-Inch.xml b/src/chrome/content/rules/Space-Inch.xml
index dbffd2045933..e5f754bc3d7f 100644
--- a/src/chrome/content/rules/Space-Inch.xml
+++ b/src/chrome/content/rules/Space-Inch.xml
@@ -10,7 +10,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://skipscreen.com/ => https://skipscreen.com/: (60, 'SSL certificate problem: certificate has expired')
 Fetch error: http://www.skipscreen.com/ => https://skipscreen.com/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Space.com.xml b/src/chrome/content/rules/Space.com.xml
index 4f720d95cb8f..e0429aa57bff 100644
--- a/src/chrome/content/rules/Space.com.xml
+++ b/src/chrome/content/rules/Space.com.xml
@@ -17,7 +17,7 @@ Fetch error: http://store.space.com/ => https://store.space.com/: (51, "SSL: no
 	* Secured by us
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Space2u.xml b/src/chrome/content/rules/Space2u.xml
index 284d42ee19c6..852da3a661a0 100644
--- a/src/chrome/content/rules/Space2u.xml
+++ b/src/chrome/content/rules/Space2u.xml
@@ -29,4 +29,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SpaceLab.ie.xml b/src/chrome/content/rules/SpaceLab.ie.xml
new file mode 100644
index 000000000000..3efbb5a46dcf
--- /dev/null
+++ b/src/chrome/content/rules/SpaceLab.ie.xml
@@ -0,0 +1,13 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/SpaceX.xml b/src/chrome/content/rules/SpaceX.xml
index 13da69e24c8e..69aa86e4c619 100644
--- a/src/chrome/content/rules/SpaceX.xml
+++ b/src/chrome/content/rules/SpaceX.xml
@@ -8,7 +8,7 @@ Automatically by https-everywhere-checker because:
 Fetch error: http://spacex.com/ => https://spacex.com/: Cycle detected - URL already encountered: https://spacex.com/
 Fetch error: http://www.spacex.com/ => https://spacex.com/: Cycle detected - URL already encountered: https://spacex.com/
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Space_Industry_News.xml b/src/chrome/content/rules/Space_Industry_News.xml
index c372ebb30f77..244ef5f5f645 100644
--- a/src/chrome/content/rules/Space_Industry_News.xml
+++ b/src/chrome/content/rules/Space_Industry_News.xml
@@ -5,7 +5,7 @@ Fetch error: http://spaceindustrynews.com/ => https://spaceindnews.wpengine.com/
 Fetch error: http://www.spaceindustrynews.com/ => https://spaceindnews.wpengine.com/: (7, 'Failed to connect to spaceindnews.wpengine.com port 443: Connection refused')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Space_Telescope_Science_Institute.xml b/src/chrome/content/rules/Space_Telescope_Science_Institute.xml
index 36839e408bf3..31e673e35c15 100644
--- a/src/chrome/content/rules/Space_Telescope_Science_Institute.xml
+++ b/src/chrome/content/rules/Space_Telescope_Science_Institute.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Sparked.com.xml b/src/chrome/content/rules/Sparked.com.xml
deleted file mode 100644
index a823750596bb..000000000000
--- a/src/chrome/content/rules/Sparked.com.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-  
-
-  
-
diff --git a/src/chrome/content/rules/Sparkfun.xml b/src/chrome/content/rules/Sparkfun.xml
index bafd7dd78dcc..769db804e69f 100644
--- a/src/chrome/content/rules/Sparkfun.xml
+++ b/src/chrome/content/rules/Sparkfun.xml
@@ -14,7 +14,7 @@ Fetch error: http://analytics.sparkfun.com/ => https://analytics.sparkfun.com/:
 		- static
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Sparklit.xml b/src/chrome/content/rules/Sparklit.xml
index f1a49f02f409..51b43d2aeb95 100644
--- a/src/chrome/content/rules/Sparklit.xml
+++ b/src/chrome/content/rules/Sparklit.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Sparkstudios.com.xml b/src/chrome/content/rules/Sparkstudios.com.xml
index ccfa03c2cc12..77fe3d6b0738 100644
--- a/src/chrome/content/rules/Sparkstudios.com.xml
+++ b/src/chrome/content/rules/Sparkstudios.com.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.sparkstudios.com/ => https://www.sparkstudios.com/: (60, 'SSL certificate problem: certificate has expired')
 Fetch error: http://sparkstudios.com/ => https://www.sparkstudios.com/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/Spartafx.com.xml b/src/chrome/content/rules/Spartafx.com.xml
index 9a788c1e6bc4..49bd0ec0ff89 100644
--- a/src/chrome/content/rules/Spartafx.com.xml
+++ b/src/chrome/content/rules/Spartafx.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.spartafx.com/ => https://www.spartafx.com/: (51, "SSL: n
 Disabled by https-everywhere-checker because:
 Fetch error: http://spartafx.com/ => https://spartafx.com/: (6, 'Could not resolve host: spartafx.com')
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://spartafx.com/ => https://spartafx.com/: (6, 'Could not resol
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Spartan_Institute.xml b/src/chrome/content/rules/Spartan_Institute.xml
index 03c8fcd0842a..e9bc8bc4b1ac 100644
--- a/src/chrome/content/rules/Spartan_Institute.xml
+++ b/src/chrome/content/rules/Spartan_Institute.xml
@@ -11,7 +11,7 @@ Fetch error: http://thespartaninstitute.com/ => https://thespartaninstitute.com/
 		- portal	(http reply)
 
 -->
-
+
 
 	
 	
@@ -22,4 +22,4 @@ Fetch error: http://thespartaninstitute.com/ => https://thespartaninstitute.com/
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Sparx.org.nz.xml b/src/chrome/content/rules/Sparx.org.nz.xml
index d886e702b0cd..2949a07d2ad0 100644
--- a/src/chrome/content/rules/Sparx.org.nz.xml
+++ b/src/chrome/content/rules/Sparx.org.nz.xml
@@ -8,7 +8,7 @@ Fetch error: http://research.sparx.org.nz/ => https://research.sparx.org.nz/: (2
 		- www.research.sparx.org.nz
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Sparx_Trading.com-falsemixed.xml b/src/chrome/content/rules/Sparx_Trading.com-falsemixed.xml
index c4512bb7e9d3..ea3609fd57d8 100644
--- a/src/chrome/content/rules/Sparx_Trading.com-falsemixed.xml
+++ b/src/chrome/content/rules/Sparx_Trading.com-falsemixed.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/SpatialBuzz.com.xml b/src/chrome/content/rules/SpatialBuzz.com.xml
index 3f4590b6fea8..9d19971464e2 100644
--- a/src/chrome/content/rules/SpatialBuzz.com.xml
+++ b/src/chrome/content/rules/SpatialBuzz.com.xml
@@ -37,7 +37,15 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 	
-	
+	
+	
 
 
 	 https://smp.specificmedia.net/: (6
 
 	Other Specific Media rulesets:
 
-		- Adviva.net.xml
 		- Specificclick.xml
 
 
@@ -21,7 +20,7 @@ Fetch error: http://smp.specificmedia.net/ => https://smp.specificmedia.net/: (6
 		- (www.)specificmedia.net	(cert: mail.localsvcs.com; shows IIS7 default page)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Spectraflow.com.xml b/src/chrome/content/rules/Spectraflow.com.xml
index e2a132287fe9..4a111d11f226 100644
--- a/src/chrome/content/rules/Spectraflow.com.xml
+++ b/src/chrome/content/rules/Spectraflow.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.spectraflow.com/ => https://www.spectraflow.com/: (28, '
 Disabled by https-everywhere-checker because:
 Fetch error: http://spectraflow.com/ => https://spectraflow.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://spectraflow.com/ => https://spectraflow.com/: (60, 'SSL cert
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Spectrum.com.xml b/src/chrome/content/rules/Spectrum.com.xml
deleted file mode 100644
index 493a83503e52..000000000000
--- a/src/chrome/content/rules/Spectrum.com.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-
-		
-		
-
-
-	
-	
-	
-	
-	
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Speed-Dreams.xml b/src/chrome/content/rules/Speed-Dreams.xml
index 8929a6a66409..ab0356f06bba 100644
--- a/src/chrome/content/rules/Speed-Dreams.xml
+++ b/src/chrome/content/rules/Speed-Dreams.xml
@@ -4,7 +4,7 @@
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/SpeedBurger.xml b/src/chrome/content/rules/SpeedBurger.xml
index 804e03e6b8af..3a4cd0f775e8 100644
--- a/src/chrome/content/rules/SpeedBurger.xml
+++ b/src/chrome/content/rules/SpeedBurger.xml
@@ -3,11 +3,10 @@
 	
 	
 
-	
 	
 	
 
 	
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SpeedTree.com.xml b/src/chrome/content/rules/SpeedTree.com.xml
index cebab1b985da..d5b459950702 100644
--- a/src/chrome/content/rules/SpeedTree.com.xml
+++ b/src/chrome/content/rules/SpeedTree.com.xml
@@ -32,4 +32,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Speed_World_Grafix.com.xml b/src/chrome/content/rules/Speed_World_Grafix.com.xml
index d553133f3a82..e7f884c04f12 100644
--- a/src/chrome/content/rules/Speed_World_Grafix.com.xml
+++ b/src/chrome/content/rules/Speed_World_Grafix.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://speedworldgrafix.com/ => https://speedworldgrafix.com/: (60,
 Fetch error: http://www.speedworldgrafix.com/ => https://www.speedworldgrafix.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Speedify.com.xml b/src/chrome/content/rules/Speedify.com.xml
new file mode 100644
index 000000000000..0317f17edaee
--- /dev/null
+++ b/src/chrome/content/rules/Speedify.com.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/Speedof.me.xml b/src/chrome/content/rules/Speedof.me.xml
deleted file mode 100644
index 71a1c7958871..000000000000
--- a/src/chrome/content/rules/Speedof.me.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-  
-  
-  
-  
-  
-
diff --git a/src/chrome/content/rules/Speedtest.net.xml b/src/chrome/content/rules/Speedtest.net.xml
index ee7f0508d66f..4f15664e2029 100644
--- a/src/chrome/content/rules/Speedtest.net.xml
+++ b/src/chrome/content/rules/Speedtest.net.xml
@@ -1,67 +1,13 @@
 
-
+
 
 	
-	
 	
-		
-		
-
-			
-
-		
-		
-		
-		
-
-			
-			
-			
-			
-
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-
-	
-	
+	
+	
 
-	
-	
+	
 
 
diff --git a/src/chrome/content/rules/Speedyshare.com.xml b/src/chrome/content/rules/Speedyshare.com.xml
index 3cd464d3d342..5c5b0799002a 100644
--- a/src/chrome/content/rules/Speedyshare.com.xml
+++ b/src/chrome/content/rules/Speedyshare.com.xml
@@ -5,10 +5,10 @@ Fetch error: http://www.speedyshare.com/ => https://www.speedyshare.com/: (28, '
 Fetch error: http://speedyshare.com/ => https://speedyshare.com/: (28, 'Connection timed out after 20000 milliseconds')
 
 -->
-
+
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Spench.net.xml b/src/chrome/content/rules/Spench.net.xml
index 7034fe67c55e..f6f4944986c9 100644
--- a/src/chrome/content/rules/Spench.net.xml
+++ b/src/chrome/content/rules/Spench.net.xml
@@ -17,7 +17,8 @@
 
 
 	
-	
+	
+	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/SphereUp.xml b/src/chrome/content/rules/SphereUp.xml
index 88a52f4297bd..9f56b61eb21b 100644
--- a/src/chrome/content/rules/SphereUp.xml
+++ b/src/chrome/content/rules/SphereUp.xml
@@ -61,4 +61,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Sphinx-doc.org.xml b/src/chrome/content/rules/Sphinx-doc.org.xml
new file mode 100644
index 000000000000..156b61a60185
--- /dev/null
+++ b/src/chrome/content/rules/Sphinx-doc.org.xml
@@ -0,0 +1,16 @@
+
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Spicebox.xml b/src/chrome/content/rules/Spicebox.xml
index de0f33b572f1..63878021b303 100644
--- a/src/chrome/content/rules/Spicebox.xml
+++ b/src/chrome/content/rules/Spicebox.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Spiceworks.xml b/src/chrome/content/rules/Spiceworks.xml
index 88f9b95b5381..63f2c3c58bc3 100644
--- a/src/chrome/content/rules/Spiceworks.xml
+++ b/src/chrome/content/rules/Spiceworks.xml
@@ -40,7 +40,7 @@ Fetch error: http://wwwstatic.spiceworks.com/ => https://wwwstatic.spiceworks.co
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Spiderweb-Software.xml b/src/chrome/content/rules/Spiderweb-Software.xml
index fe1455968994..0b698620dbe0 100644
--- a/src/chrome/content/rules/Spiderweb-Software.xml
+++ b/src/chrome/content/rules/Spiderweb-Software.xml
@@ -32,9 +32,6 @@
 
 	
 
-	
-	
-	
 
 	
diff --git a/src/chrome/content/rules/Spiegel-QC.xml b/src/chrome/content/rules/Spiegel-QC.xml
index 3509b22c0a6c..5632757bbf7d 100644
--- a/src/chrome/content/rules/Spiegel-QC.xml
+++ b/src/chrome/content/rules/Spiegel-QC.xml
@@ -12,7 +12,7 @@ Fetch error: http://adserv.quality-channel.de/ => https://adserv.quality-channel
 		- (www.)spiegel-qc.de
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Spiegel.xml b/src/chrome/content/rules/Spiegel.xml
index f58888e5cff6..773861284563 100644
--- a/src/chrome/content/rules/Spiegel.xml
+++ b/src/chrome/content/rules/Spiegel.xml
@@ -1,136 +1,35 @@
-
 
-
+
 
 	
 	
+	
+	
+	
+	
+	
+	
+	
+	
 	
-	
+	
 	
-	
-	
-	
+	
+	
+	
 
 	
-	
-	
-	
-	
-	
 	
 
-		
-		
-		
-		
-
-		
-		
-		
-		
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-			
-
-
-	
-	
-	
-	
-	
-	
-
-	
-
-
-	
-	
-
 	
+
 	
 
@@ -139,8 +38,8 @@ Fetch error: http://ophirum.spiegel.de/ => https://ophirum.spiegel.de/: (51, "SS
 		
 		
 
-	
+	
+
 	
 
@@ -149,8 +48,6 @@ Fetch error: http://ophirum.spiegel.de/ => https://ophirum.spiegel.de/: (51, "SS
 		
 		
 
-	
-	
+	
 
 
diff --git a/src/chrome/content/rules/Spilnu.dk.xml b/src/chrome/content/rules/Spilnu.dk.xml
deleted file mode 100644
index b6489d7f0952..000000000000
--- a/src/chrome/content/rules/Spilnu.dk.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Spinroot.com.xml b/src/chrome/content/rules/Spinroot.com.xml
new file mode 100644
index 000000000000..d88b6ee54a17
--- /dev/null
+++ b/src/chrome/content/rules/Spinroot.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/SpiritAirlines.xml b/src/chrome/content/rules/SpiritAirlines.xml
index f5c4d3c93317..80677cba8d34 100644
--- a/src/chrome/content/rules/SpiritAirlines.xml
+++ b/src/chrome/content/rules/SpiritAirlines.xml
@@ -3,4 +3,4 @@
   
 
   
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Splash_Data.com.xml b/src/chrome/content/rules/Splash_Data.com.xml
index cd9932046b94..cf6d890dea72 100644
--- a/src/chrome/content/rules/Splash_Data.com.xml
+++ b/src/chrome/content/rules/Splash_Data.com.xml
@@ -21,7 +21,7 @@ Fetch error: http://www.splashdata.com/ => https://www.splashdata.com/: (35, 'Un
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Split_Reason_Clothing.xml b/src/chrome/content/rules/Split_Reason_Clothing.xml
index 5558746405c7..e32ad6c6767a 100644
--- a/src/chrome/content/rules/Split_Reason_Clothing.xml
+++ b/src/chrome/content/rules/Split_Reason_Clothing.xml
@@ -5,7 +5,7 @@ Fetch error: http://splitreason.com/ => https://splitreason.com/: (28, 'Connecti
 Fetch error: http://www.splitreason.com/ => https://www.splitreason.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.splitreason.com/ => https://www.splitreason.com/: (28, '
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Spogo.co.uk.xml b/src/chrome/content/rules/Spogo.co.uk.xml
index ec03e85aaec1..fc3ce4e3ebdf 100644
--- a/src/chrome/content/rules/Spogo.co.uk.xml
+++ b/src/chrome/content/rules/Spogo.co.uk.xml
@@ -5,7 +5,7 @@ Fetch error: http://spogo.co.uk/ => https://spogo.co.uk/: (7, 'Failed to connect
 Fetch error: http://www.spogo.co.uk/ => https://www.spogo.co.uk/: (7, 'Failed to connect to www.spogo.co.uk port 443: Connection refused')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Spoonful.com.xml b/src/chrome/content/rules/Spoonful.com.xml
index 35a7eea012c9..b3cdb8f2c085 100644
--- a/src/chrome/content/rules/Spoonful.com.xml
+++ b/src/chrome/content/rules/Spoonful.com.xml
@@ -27,10 +27,11 @@ Fetch error: http://spoonful.com/ => https://spoonful.com/: (51, "SSL: no altern
 	* Secured by us
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Sport1.de.xml b/src/chrome/content/rules/Sport1.de.xml
index 71b3bc52524e..42fea585d655 100644
--- a/src/chrome/content/rules/Sport1.de.xml
+++ b/src/chrome/content/rules/Sport1.de.xml
@@ -1,5 +1,99 @@
+
 
-  
 
-  
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
 
diff --git a/src/chrome/content/rules/Sports_Authority.xml b/src/chrome/content/rules/Sports_Authority.xml
index 9fcf24515bc6..4805f5439102 100644
--- a/src/chrome/content/rules/Sports_Authority.xml
+++ b/src/chrome/content/rules/Sports_Authority.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.sportsauthority.com/ => https://www.sportsauthority.com/
 		- stores.sportsauthority.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Sportys.xml b/src/chrome/content/rules/Sportys.xml
index 7dc35488f0e5..6600e40b323b 100644
--- a/src/chrome/content/rules/Sportys.xml
+++ b/src/chrome/content/rules/Sportys.xml
@@ -1,8 +1,8 @@
 
 	
 	
-	
-	
+
+	
 
 	
diff --git a/src/chrome/content/rules/Spotplanet.xml b/src/chrome/content/rules/Spotplanet.xml
index 833e508f6d61..05a4b7166259 100644
--- a/src/chrome/content/rules/Spotplanet.xml
+++ b/src/chrome/content/rules/Spotplanet.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.spotplanet.org/ => https://www.spotplanet.org/: (60, 'SS
 Disabled by https-everywhere-checker because:
 Fetch error: http://spotplanet.org/ => https://spotplanet.org/: (60, 'SSL certificate problem: self signed certificate')
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://spotplanet.org/ => https://spotplanet.org/: (60, 'SSL certif
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SpreadPrivacy.com.xml b/src/chrome/content/rules/SpreadPrivacy.com.xml
new file mode 100644
index 000000000000..86db6c6f7f2d
--- /dev/null
+++ b/src/chrome/content/rules/SpreadPrivacy.com.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Spreadshirt.xml b/src/chrome/content/rules/Spreadshirt.xml
deleted file mode 100644
index 1c490e382f4d..000000000000
--- a/src/chrome/content/rules/Spreadshirt.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-
-	
-	
-	
-		
-	
-
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Sprig-of-Thyme.com.xml b/src/chrome/content/rules/Sprig-of-Thyme.com.xml
new file mode 100644
index 000000000000..1f8c282b40bd
--- /dev/null
+++ b/src/chrome/content/rules/Sprig-of-Thyme.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Spring-TNS.net.xml b/src/chrome/content/rules/Spring-TNS.net.xml
index c700411cbea2..f7f01b5c205f 100644
--- a/src/chrome/content/rules/Spring-TNS.net.xml
+++ b/src/chrome/content/rules/Spring-TNS.net.xml
@@ -14,7 +14,7 @@ Fetch error: http://foreca.spring-tns.net/blank.gif => https://ssl-foreca.spring
 		- nelonen	(refused)
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Springer-Medizin.de.xml b/src/chrome/content/rules/Springer-Medizin.de.xml
index ee37860b43db..5f3132733f21 100644
--- a/src/chrome/content/rules/Springer-Medizin.de.xml
+++ b/src/chrome/content/rules/Springer-Medizin.de.xml
@@ -18,7 +18,7 @@ Fetch error: http://registrierung.springer-medizin.de/ => https://registrierung.
 		- registrierung.springer-medizin.de
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/SpringerNature.com.xml b/src/chrome/content/rules/SpringerNature.com.xml
new file mode 100644
index 000000000000..f2c7956a43b7
--- /dev/null
+++ b/src/chrome/content/rules/SpringerNature.com.xml
@@ -0,0 +1,61 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Springer_Zahnmedizin.de.xml b/src/chrome/content/rules/Springer_Zahnmedizin.de.xml
index c2637de35021..f072b8fc2ae4 100644
--- a/src/chrome/content/rules/Springer_Zahnmedizin.de.xml
+++ b/src/chrome/content/rules/Springer_Zahnmedizin.de.xml
@@ -21,7 +21,7 @@ Fetch error: http://www.springerzahnmedizin.de/ => https://www.springerzahnmediz
 		- www.springerzahnmedizin.de
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Sprint.com.xml b/src/chrome/content/rules/Sprint.com.xml
index 9864b6f92c5e..a459f3133494 100644
--- a/src/chrome/content/rules/Sprint.com.xml
+++ b/src/chrome/content/rules/Sprint.com.xml
@@ -1,10 +1,26 @@
+
+
+
 
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
@@ -29,16 +56,7 @@ Fetch error: http://manage.sprintpcs.com/ => https://manage.sprintpcs.com/: (28,
 	
 
-	
-
-	
-
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Sprint_Rebates.com.xml b/src/chrome/content/rules/Sprint_Rebates.com.xml
deleted file mode 100644
index 6c7601e8f73d..000000000000
--- a/src/chrome/content/rules/Sprint_Rebates.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/SpritesMods.com.xml b/src/chrome/content/rules/SpritesMods.com.xml
index 7ab959924ef1..0923c5099202 100644
--- a/src/chrome/content/rules/SpritesMods.com.xml
+++ b/src/chrome/content/rules/SpritesMods.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.spritesmods.com/ => https://www.spritesmods.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.spritesmods.com'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Spriza.com.xml b/src/chrome/content/rules/Spriza.com.xml
deleted file mode 100644
index 8c8176c2518d..000000000000
--- a/src/chrome/content/rules/Spriza.com.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Sprout.xml b/src/chrome/content/rules/Sprout.xml
index 9d0d0dcb0197..4fa1600d8c6c 100644
--- a/src/chrome/content/rules/Sprout.xml
+++ b/src/chrome/content/rules/Sprout.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.sproutinc.com/ => https://sproutinc.com/: (28, 'Connecti
 		- (www.)sproutbuilder.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Spylog.com.xml b/src/chrome/content/rules/Spylog.com.xml
index 3a7be0d2538e..12f02661f7b9 100644
--- a/src/chrome/content/rules/Spylog.com.xml
+++ b/src/chrome/content/rules/Spylog.com.xml
@@ -20,4 +20,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Square.xml b/src/chrome/content/rules/Square.xml
deleted file mode 100644
index 37e3f1128e28..000000000000
--- a/src/chrome/content/rules/Square.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Squarespace-clients.xml b/src/chrome/content/rules/Squarespace-clients.xml
deleted file mode 100644
index f1723cb7cc68..000000000000
--- a/src/chrome/content/rules/Squarespace-clients.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Squarespace.xml b/src/chrome/content/rules/Squarespace.xml
index 2a0b12c4e3d8..b442b47d7c0a 100644
--- a/src/chrome/content/rules/Squarespace.xml
+++ b/src/chrome/content/rules/Squarespace.xml
@@ -4,15 +4,6 @@
 		- Sqsp.com.xml
 
 
-	CDN buckets:
-
-		- s3.amazonaws.com/s3.media.squarespace.com/
-			- s3.media.squarespace.com
-
-		- squarespace.cachefly.net
-			- squarespace.cachefly.net
-
-
 	Mixed content:
 
 		- Images on (client_subdomain).squarespace.com from $self *
@@ -36,11 +27,6 @@
 		
 		
 
-		
-		
-		
-
 		
@@ -57,20 +43,8 @@
 
 		
 
-	
-	
-
-	
-
-
-	
-
-	
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Squid_Solutions.xml b/src/chrome/content/rules/Squid_Solutions.xml
deleted file mode 100644
index 97a62bc5bf44..000000000000
--- a/src/chrome/content/rules/Squid_Solutions.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Squirrel-webmail.surftown.com.xml b/src/chrome/content/rules/Squirrel-webmail.surftown.com.xml
index 90aa5ab28bff..3a611b7db383 100644
--- a/src/chrome/content/rules/Squirrel-webmail.surftown.com.xml
+++ b/src/chrome/content/rules/Squirrel-webmail.surftown.com.xml
@@ -10,7 +10,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://squirrel-webmail.surftown.com/ => https://squirrel-webmail.surftown.com/: (7, 'Failed to connect to squirrel-webmail.surftown.com port 443: Connection refused')
 
 -->
-
+
   
 
   
diff --git a/src/chrome/content/rules/Srcclr.com.xml b/src/chrome/content/rules/Srcclr.com.xml
index 2b7c8ae42589..064f567c8fa3 100644
--- a/src/chrome/content/rules/Srcclr.com.xml
+++ b/src/chrome/content/rules/Srcclr.com.xml
@@ -6,10 +6,9 @@ Fetch error: http://app.srcclr.com/ => https://app.srcclr.com/: (60, 'SSL certif
 
 	Other SourceClear rulesets:
 
-		- Srcclr.help.xml
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Srcclr.help.xml b/src/chrome/content/rules/Srcclr.help.xml
deleted file mode 100644
index 55deb4ba3378..000000000000
--- a/src/chrome/content/rules/Srcclr.help.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Srcf.net.xml b/src/chrome/content/rules/Srcf.net.xml
index a11540d10594..c50be1db5b92 100644
--- a/src/chrome/content/rules/Srcf.net.xml
+++ b/src/chrome/content/rules/Srcf.net.xml
@@ -51,7 +51,7 @@
 	wiki.srcf.net            (Known to exist, but not yet tested for HTTPS support.)
 -->
 
-	
+
 	
 	
 	
@@ -59,5 +59,5 @@
 	
 
 	
-	
+
 
diff --git a/src/chrome/content/rules/Srware.xml b/src/chrome/content/rules/Srware.xml
index bcf5976176e0..c27f333a5be1 100644
--- a/src/chrome/content/rules/Srware.xml
+++ b/src/chrome/content/rules/Srware.xml
@@ -11,7 +11,7 @@
   
   
 
-  
+  
 
 	
diff --git a/src/chrome/content/rules/SsbKyh.com.xml b/src/chrome/content/rules/SsbKyh.com.xml
index 06e3280fbf14..28b6b7735892 100644
--- a/src/chrome/content/rules/SsbKyh.com.xml
+++ b/src/chrome/content/rules/SsbKyh.com.xml
@@ -19,4 +19,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Sslcert35.com.xml b/src/chrome/content/rules/Sslcert35.com.xml
index e25c9ccb40f8..199156f95563 100644
--- a/src/chrome/content/rules/Sslcert35.com.xml
+++ b/src/chrome/content/rules/Sslcert35.com.xml
@@ -19,4 +19,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ssldomain.com.xml b/src/chrome/content/rules/Ssldomain.com.xml
index a7296633b1b2..18549cfcd16b 100644
--- a/src/chrome/content/rules/Ssldomain.com.xml
+++ b/src/chrome/content/rules/Ssldomain.com.xml
@@ -10,10 +10,10 @@
 		
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ssltrust.us.xml b/src/chrome/content/rules/Ssltrust.us.xml
index c823f5f0e70f..ba2c6e426dd3 100644
--- a/src/chrome/content/rules/Ssltrust.us.xml
+++ b/src/chrome/content/rules/Ssltrust.us.xml
@@ -4,11 +4,11 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://test.ssltrust.us/ => https://test.ssltrust.us/: (6, 'Could not resolve host: test.ssltrust.us')
 
 -->
-
+
 
 	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Sstest.jp.xml b/src/chrome/content/rules/Sstest.jp.xml
deleted file mode 100644
index d118f9267ab2..000000000000
--- a/src/chrome/content/rules/Sstest.jp.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/St-Andrews.ac.uk.xml b/src/chrome/content/rules/St-Andrews.ac.uk.xml
index 103e9bad5ef6..5fad8b8bbc79 100644
--- a/src/chrome/content/rules/St-Andrews.ac.uk.xml
+++ b/src/chrome/content/rules/St-Andrews.ac.uk.xml
@@ -41,7 +41,10 @@
 
 
 	
-	
+	
+	
+	
+	
 		
 
 
@@ -52,7 +55,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/StShrt.com.xml b/src/chrome/content/rules/StShrt.com.xml
index 741f8311a641..388151875813 100644
--- a/src/chrome/content/rules/StShrt.com.xml
+++ b/src/chrome/content/rules/StShrt.com.xml
@@ -17,7 +17,7 @@ Fetch error: http://www.stshrt.com/ => https://www.stshrt.com/: (51, "SSL: no al
 		- .stshrt.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/St_Kitts_Zipline.xml b/src/chrome/content/rules/St_Kitts_Zipline.xml
index acbef8199b51..75a5e65c65a3 100644
--- a/src/chrome/content/rules/St_Kitts_Zipline.xml
+++ b/src/chrome/content/rules/St_Kitts_Zipline.xml
@@ -11,10 +11,11 @@ Fetch error: http://stkittszipline.com/ => http://stkittszipline.com/: (28, 'Res
 		- www		(redirects to secure, valid cert)
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
@@ -26,4 +27,4 @@ Fetch error: http://stkittszipline.com/ => http://stkittszipline.com/: (28, 'Res
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/St_L_Beacon.org.xml b/src/chrome/content/rules/St_L_Beacon.org.xml
index 604f561f1152..bfd3b65e04bd 100644
--- a/src/chrome/content/rules/St_L_Beacon.org.xml
+++ b/src/chrome/content/rules/St_L_Beacon.org.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.stlbeacon.org/ => https://www.stlbeacon.org/: (28, 'Conn
 
 	^: shows another domain
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Stack-Exchange.xml b/src/chrome/content/rules/Stack-Exchange.xml
index 7657876dd9ac..1a2410d9833c 100644
--- a/src/chrome/content/rules/Stack-Exchange.xml
+++ b/src/chrome/content/rules/Stack-Exchange.xml
@@ -25,15 +25,15 @@
 	
 	
 	
-	
+
 	
 	
 	
-	
+
 	
 	
 	
-	
+
 	
 	
 	
@@ -71,12 +71,13 @@
 	
 	
 	
+	
 
 	
 	
 	
 	
-	
+
 	
 	
 	
@@ -97,20 +98,20 @@
 	
 	
 	
-	
+
 	
 	
 	
 	
-	
+
 	
 	
 	
-	
+
 	
 	
 	
-	
+
 	
 	
 	
@@ -122,8 +123,8 @@
 
 	
 	
-		
-	
+	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/StackEdit.io.xml b/src/chrome/content/rules/StackEdit.io.xml
new file mode 100644
index 000000000000..09b2c096176f
--- /dev/null
+++ b/src/chrome/content/rules/StackEdit.io.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/StackSocial.xml b/src/chrome/content/rules/StackSocial.xml
index 887b11698f8c..d2e2af45e119 100644
--- a/src/chrome/content/rules/StackSocial.xml
+++ b/src/chrome/content/rules/StackSocial.xml
@@ -23,7 +23,7 @@ Fetch error: http://jobs.stacksocial.com/ => https://jobs.stacksocial.com/: (6,
 		- jobs
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Stacklet.com.xml b/src/chrome/content/rules/Stacklet.com.xml
index 730ae1c162ad..0d1eb727a2d8 100644
--- a/src/chrome/content/rules/Stacklet.com.xml
+++ b/src/chrome/content/rules/Stacklet.com.xml
@@ -14,7 +14,7 @@
 	* Server sends no certificate chain, see https://whatsmychaincert.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Stacksity.com.xml b/src/chrome/content/rules/Stacksity.com.xml
index 4dfa2e771c0d..a97e7856d559 100644
--- a/src/chrome/content/rules/Stacksity.com.xml
+++ b/src/chrome/content/rules/Stacksity.com.xml
@@ -24,7 +24,7 @@ Fetch error: http://www.stacksity.com/ => https://www.stacksity.com/: (6, 'Could
 		- .stacksity.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Stadt-bremerhaven.de.xml b/src/chrome/content/rules/Stadt-bremerhaven.de.xml
index ade726a63980..1523f67cec80 100644
--- a/src/chrome/content/rules/Stadt-bremerhaven.de.xml
+++ b/src/chrome/content/rules/Stadt-bremerhaven.de.xml
@@ -1,19 +1,7 @@
 
-
-
-
-
+
 
-
+
 
-
-
+
 
diff --git a/src/chrome/content/rules/Stadtwerke-Ingolstadt.xml b/src/chrome/content/rules/Stadtwerke-Ingolstadt.xml
index f1fcc5f3e9e8..277cb4d7fdc6 100644
--- a/src/chrome/content/rules/Stadtwerke-Ingolstadt.xml
+++ b/src/chrome/content/rules/Stadtwerke-Ingolstadt.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://portal.sw-in.de/ => https://portal.sw-in.de/: (6, 'Could not resolve host: portal.sw-in.de')
 
 -->
-
+
 
 
 
diff --git a/src/chrome/content/rules/Staffordshire.gov.uk.xml b/src/chrome/content/rules/Staffordshire.gov.uk.xml
index 7cc56c909617..545ee0b402e2 100644
--- a/src/chrome/content/rules/Staffordshire.gov.uk.xml
+++ b/src/chrome/content/rules/Staffordshire.gov.uk.xml
@@ -52,7 +52,7 @@ Fetch error: http://pcbooking.staffordshire.gov.uk/ => https://pcbooking.staffor
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Stand-for-Children.xml b/src/chrome/content/rules/Stand-for-Children.xml
index 85e71558424b..43564c3a4beb 100644
--- a/src/chrome/content/rules/Stand-for-Children.xml
+++ b/src/chrome/content/rules/Stand-for-Children.xml
@@ -6,11 +6,11 @@ Fetch error: http://greatteachersgreatschools.org/ => https://www.greatteachersg
 Disabled by https-everywhere-checker because:
 Fetch error: http://greatteachersgreatschools.org/ => https://www.greatteachersgreatschools.org/: (6, 'Could not resolve host: greatteachersgreatschools.org')
 -->
-
+
 
 	
 	
-	
+	
 	
 	
 
diff --git a/src/chrome/content/rules/Stand_Up_to_Cancer.xml b/src/chrome/content/rules/Stand_Up_to_Cancer.xml
index 03e97fe43c90..ec46bbbdbf20 100644
--- a/src/chrome/content/rules/Stand_Up_to_Cancer.xml
+++ b/src/chrome/content/rules/Stand_Up_to_Cancer.xml
@@ -45,12 +45,16 @@ Fetch error: http://standup2cancer.ca/ => https://www.standup2cancer.ca/: (51, "
 	* Secured by us
 
 -->
-
+
 
 	
-	
+	
 	
-	
+	
+	
+	
+	
+	
 		
diff --git a/src/chrome/content/rules/Standaard.be-mixed.xml b/src/chrome/content/rules/Standaard.be-mixed.xml
index 7c200ecd44db..6025e222a2f9 100644
--- a/src/chrome/content/rules/Standaard.be-mixed.xml
+++ b/src/chrome/content/rules/Standaard.be-mixed.xml
@@ -8,7 +8,7 @@ Fetch error: http://www.standaard.be/ => https://www.standaard.be/: Cycle detect
 	For rules not causing neither false/broken nor valid MCB, see Standaard.be.xml.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Standaard.be.xml b/src/chrome/content/rules/Standaard.be.xml
index b63162092424..3830ca707d64 100644
--- a/src/chrome/content/rules/Standaard.be.xml
+++ b/src/chrome/content/rules/Standaard.be.xml
@@ -85,7 +85,7 @@ Fetch error: http://2.standaardcdn.be/ => https://www.standaard.be/: Cycle detec
 	² Secured by us
 
 -->
-
+
 
 	
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-
-		
-		
-
-			
-			
-			
-
-			
-			
-
-
-	
-	
-
-
-	
-	
-
-	
-
-		
-
-	
-
-
diff --git a/src/chrome/content/rules/Stanford-University.xml b/src/chrome/content/rules/Stanford-University.xml
deleted file mode 100644
index c510f0fc9506..000000000000
--- a/src/chrome/content/rules/Stanford-University.xml
+++ /dev/null
@@ -1,1565 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-		
-		
-		
-		
-
-			
-			
-			
-
-			
-			
-
-		
-		
-
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-
-		
-		
-		
-		
-
-			
-			
-			
-			
-
-			
-			
-			
-
-		
-		
-
-			
-			
-
-		
-
-			
-			
-			
-			
-
-			
-			
-			
-
-		
-		
-		
-		
-
-			
-			
-			
-			
-
-			
-			
-
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-			
-			
-
-		
-		
-
-			
-			
-			
-
-			
-			
-
-		
-		
-
-			
-			
-			
-			
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-
-	
-
-		
-
-	
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-
-	
-
-	
-	
-
-		
-
-	
-	
-
-		
-		
-		
-
-	
-	
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-		
-
-	
-	
-
-		
-		
-
-	
-
-		
-
-	
-	
-
-		
-		
-
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-		
-
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Stanford.edu-falsemixed.xml b/src/chrome/content/rules/Stanford.edu-falsemixed.xml
deleted file mode 100644
index 3a32cc18230e..000000000000
--- a/src/chrome/content/rules/Stanford.edu-falsemixed.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-
-
-	
-	
-
-		
-
-	
-
-
diff --git a/src/chrome/content/rules/Stanford.edu.xml b/src/chrome/content/rules/Stanford.edu.xml
new file mode 100644
index 000000000000..9f2e748eb7d4
--- /dev/null
+++ b/src/chrome/content/rules/Stanford.edu.xml
@@ -0,0 +1,201 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Stanford_Med.org.xml b/src/chrome/content/rules/Stanford_Med.org.xml
index db4b63257df4..135a166f78e8 100644
--- a/src/chrome/content/rules/Stanford_Med.org.xml
+++ b/src/chrome/content/rules/Stanford_Med.org.xml
@@ -10,7 +10,7 @@ Fetch error: http://econnect.stanfordmed.org/ => https://econnect.stanfordmed.or
 	www.stanfordmed.org: Refused
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Stanographer.com.xml b/src/chrome/content/rules/Stanographer.com.xml
new file mode 100644
index 000000000000..504813cb01b2
--- /dev/null
+++ b/src/chrome/content/rules/Stanographer.com.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Staples.com.xml b/src/chrome/content/rules/Staples.com.xml
deleted file mode 100644
index d3a55a449dda..000000000000
--- a/src/chrome/content/rules/Staples.com.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/StarMoney.de.xml b/src/chrome/content/rules/StarMoney.de.xml
index 78a515f00ab5..9b82bd3d2ade 100644
--- a/src/chrome/content/rules/StarMoney.de.xml
+++ b/src/chrome/content/rules/StarMoney.de.xml
@@ -12,7 +12,8 @@
 
 
 	
-	
+	
+	
 
 
 	
-
-
-	
-	
-		
-		
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/StarRez.xml b/src/chrome/content/rules/StarRez.xml
index 5cd294aad3b4..20fddcfbcfe8 100644
--- a/src/chrome/content/rules/StarRez.xml
+++ b/src/chrome/content/rules/StarRez.xml
@@ -7,4 +7,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Star_Product_Reviews.xml b/src/chrome/content/rules/Star_Product_Reviews.xml
deleted file mode 100644
index 881d94f1989f..000000000000
--- a/src/chrome/content/rules/Star_Product_Reviews.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Star_Search_Casting.com.xml b/src/chrome/content/rules/Star_Search_Casting.com.xml
deleted file mode 100644
index 7156639005e1..000000000000
--- a/src/chrome/content/rules/Star_Search_Casting.com.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-	
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Star_Trek.xml b/src/chrome/content/rules/Star_Trek.xml
index 0c6e285d56e5..3ce5446ca97e 100644
--- a/src/chrome/content/rules/Star_Trek.xml
+++ b/src/chrome/content/rules/Star_Trek.xml
@@ -11,7 +11,7 @@ Fetch error: http://store.startrek.com/ => https://store.startrek.com/: (60, 'SS
 		- www	(akamai; 503)
 
 -->
-
+
 
 	
 
@@ -21,4 +21,4 @@ Fetch error: http://store.startrek.com/ => https://store.startrek.com/: (60, 'SS
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Starbucks.com.xml b/src/chrome/content/rules/Starbucks.com.xml
index 449b114839dd..1a4131242fb6 100644
--- a/src/chrome/content/rules/Starbucks.com.xml
+++ b/src/chrome/content/rules/Starbucks.com.xml
@@ -43,7 +43,9 @@
 
 
 	
-	
+	
+	
+	
 		
 
 
diff --git a/src/chrome/content/rules/Stardock.xml b/src/chrome/content/rules/Stardock.xml
index bd8afa05278b..c4feed03929a 100644
--- a/src/chrome/content/rules/Stardock.xml
+++ b/src/chrome/content/rules/Stardock.xml
@@ -34,7 +34,7 @@ Fetch error: http://stardock.com/ => https://stardock.com/: (35, 'Unknown SSL pr
 		- services.stardock.net
 
 -->
-
+
 
 	
 	
@@ -57,4 +57,4 @@ Fetch error: http://stardock.com/ => https://stardock.com/: (35, 'Unknown SSL pr
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Starfield.xml b/src/chrome/content/rules/Starfield.xml
index 9e18df4f61c0..6d9564bc83b0 100644
--- a/src/chrome/content/rules/Starfield.xml
+++ b/src/chrome/content/rules/Starfield.xml
@@ -18,16 +18,19 @@ Fetch error: http://starfieldtech.com/ => https://starfieldtech.com/: (51, "SSL:
 		- seal
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
+	
 
 
-	
+	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Starship.rs.xml b/src/chrome/content/rules/Starship.rs.xml
new file mode 100644
index 000000000000..33aa27cb4d2a
--- /dev/null
+++ b/src/chrome/content/rules/Starship.rs.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Start.lgbt.xml b/src/chrome/content/rules/Start.lgbt.xml
deleted file mode 100644
index d7f6fc055a90..000000000000
--- a/src/chrome/content/rules/Start.lgbt.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Start.me.xml b/src/chrome/content/rules/Start.me.xml
index b73ef97fc8c6..e0f8253def55 100644
--- a/src/chrome/content/rules/Start.me.xml
+++ b/src/chrome/content/rules/Start.me.xml
@@ -1,5 +1,5 @@
 
-
+
   
   
   
@@ -51,16 +51,16 @@ Fetch error: http://startssl.us/ => https://startssl.us/: (6, 'Could not resolve
 
   
   
-  
+
   
   
-  
+
   
   
   
   
   
-  
+
   
 
   
-
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/StartingPage.com.xml b/src/chrome/content/rules/StartingPage.com.xml
index 326bf4925c8f..aa8018ac3533 100644
--- a/src/chrome/content/rules/StartingPage.com.xml
+++ b/src/chrome/content/rules/StartingPage.com.xml
@@ -1,5 +1,5 @@
-
 
diff --git a/src/chrome/content/rules/Starwood-Hotels-and-Resorts.xml b/src/chrome/content/rules/Starwood-Hotels-and-Resorts.xml
deleted file mode 100644
index 2acffed46482..000000000000
--- a/src/chrome/content/rules/Starwood-Hotels-and-Resorts.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-	
-	
-	
-	
-
-
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/StarwoodHotels.com.xml b/src/chrome/content/rules/StarwoodHotels.com.xml
new file mode 100644
index 000000000000..cfa27a7c5fa1
--- /dev/null
+++ b/src/chrome/content/rules/StarwoodHotels.com.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/StatOwl.com.xml b/src/chrome/content/rules/StatOwl.com.xml
index 5c2b79bd2b1b..0ddc35dacfd7 100644
--- a/src/chrome/content/rules/StatOwl.com.xml
+++ b/src/chrome/content/rules/StatOwl.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://collector.statowl.com/ => https://collector.statowl.com/: (6
 		- (www.)	(404; mismatched, CN: homer.terabytemedia.com)
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/StateFarm.xml b/src/chrome/content/rules/StateFarm.xml
index 8802ca8875c2..123adc770133 100644
--- a/src/chrome/content/rules/StateFarm.xml
+++ b/src/chrome/content/rules/StateFarm.xml
@@ -6,7 +6,7 @@ Fetch error: http://sfsecuremail.statefarm.com/ => https://sfsecuremail.statefar
 Disabled by https-everywhere-checker because:
 Fetch error: http://sfsecuremail.statefarm.com/ => https://sfsecuremail.statefarm.com/: (28, 'Connection timed out after 10001 milliseconds')
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/State_of_Delaware.xml b/src/chrome/content/rules/State_of_Delaware.xml
index 4de6a6c7c727..2e6f52c38283 100644
--- a/src/chrome/content/rules/State_of_Delaware.xml
+++ b/src/chrome/content/rules/State_of_Delaware.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://delecorp.delaware.gov/ => https://delecorp.delaware.gov/: (7, 'Failed to connect to delecorp.delaware.gov port 443: Connection refused')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/State_of_Oregon.xml b/src/chrome/content/rules/State_of_Oregon.xml
index aee05c745fa2..b0357e8e4e99 100644
--- a/src/chrome/content/rules/State_of_Oregon.xml
+++ b/src/chrome/content/rules/State_of_Oregon.xml
@@ -23,4 +23,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/StaticStuff.net.xml b/src/chrome/content/rules/StaticStuff.net.xml
new file mode 100644
index 000000000000..9a4ed3568af9
--- /dev/null
+++ b/src/chrome/content/rules/StaticStuff.net.xml
@@ -0,0 +1,26 @@
+
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Static_Site_Generators.net.xml b/src/chrome/content/rules/Static_Site_Generators.net.xml
index c18fdbaf8dbd..cb98d53d7621 100644
--- a/src/chrome/content/rules/Static_Site_Generators.net.xml
+++ b/src/chrome/content/rules/Static_Site_Generators.net.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Staticskynet.be.xml b/src/chrome/content/rules/Staticskynet.be.xml
index 9a63f9f941e9..82df5a82c484 100644
--- a/src/chrome/content/rules/Staticskynet.be.xml
+++ b/src/chrome/content/rules/Staticskynet.be.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://common.staticskynet.be/ => https://common.staticskynet.be/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/StationColdBrew.com.xml b/src/chrome/content/rules/StationColdBrew.com.xml
new file mode 100644
index 000000000000..0feb48954b48
--- /dev/null
+++ b/src/chrome/content/rules/StationColdBrew.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Station_L_Rowing_Club.xml b/src/chrome/content/rules/Station_L_Rowing_Club.xml
index d08b97cfff03..1bca9ff97f34 100644
--- a/src/chrome/content/rules/Station_L_Rowing_Club.xml
+++ b/src/chrome/content/rules/Station_L_Rowing_Club.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Statistics.gov.uk.xml b/src/chrome/content/rules/Statistics.gov.uk.xml
index a4fedf197127..b1afa453a32f 100644
--- a/src/chrome/content/rules/Statistics.gov.uk.xml
+++ b/src/chrome/content/rules/Statistics.gov.uk.xml
@@ -32,10 +32,10 @@
 	
 	
 	
-	
+
 	
 
-	
 
diff --git a/src/chrome/content/rules/Statushub.io.xml b/src/chrome/content/rules/Statushub.io.xml
index 553f55b3d796..2e63ffc0c339 100644
--- a/src/chrome/content/rules/Statushub.io.xml
+++ b/src/chrome/content/rules/Statushub.io.xml
@@ -5,7 +5,7 @@ Fetch error: http://workspaces.statushub.io/ => https://workspaces.statushub.io/
 blog. protocol error
 mozillastatus. mismatch
 msuservicestatus. mismatch-->
-
+
 	
 	
 	
@@ -21,10 +21,10 @@ msuservicestatus. mismatch-->
 	
 	
 	
-	
+
 	
-	
+
 	
 
 	
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/StaySmartOnline.xml b/src/chrome/content/rules/StaySmartOnline.xml
index c855b3425263..4eb4e31bc955 100644
--- a/src/chrome/content/rules/StaySmartOnline.xml
+++ b/src/chrome/content/rules/StaySmartOnline.xml
@@ -1,10 +1,12 @@
 
 	
-	
+	
+	
+	
 
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/StayToday.com.xml b/src/chrome/content/rules/StayToday.com.xml
index 1bf691284d7f..3e7a361cf107 100644
--- a/src/chrome/content/rules/StayToday.com.xml
+++ b/src/chrome/content/rules/StayToday.com.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://staytoday.com/ => https://staytoday.com/: (60, 'SSL certificate problem: certificate has expired')
 Fetch error: http://www.staytoday.com/ => https://www.staytoday.com/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Stayfriends.xml b/src/chrome/content/rules/Stayfriends.xml
index 0ffa77cdc60b..c4608147665f 100644
--- a/src/chrome/content/rules/Stayfriends.xml
+++ b/src/chrome/content/rules/Stayfriends.xml
@@ -1,17 +1,19 @@
 
 
 	
-	
 	
-	  
 	
-	
-  
+	
+	
+	
+	
+	
+	
+
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Std3.ru.xml b/src/chrome/content/rules/Std3.ru.xml
deleted file mode 100644
index 023f23eb7271..000000000000
--- a/src/chrome/content/rules/Std3.ru.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Steam.xml b/src/chrome/content/rules/Steam.xml
index f4b30357f641..7bac4b2f6e0a 100644
--- a/src/chrome/content/rules/Steam.xml
+++ b/src/chrome/content/rules/Steam.xml
@@ -1,149 +1,59 @@
-
-
-
-	
+	
+	
 	
-	
+	
+	
+	
 	
-	
-	
 	
+	
+	
 	
-	
 
-	
-	
-	
-	
+	
+	
+	
+	
+	
+	
 
-		
-		
-		
-		
-		
-		
-		
-		
-		
+	
 
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
+	
 
-			
-			
-			
-			
+	
+	
 
+	
 
-	
-	
+	
 
-	
+	
 
+	
 
-	
-
-	
-	
+	
 
 	
-
+			to="https:" />
 
diff --git a/src/chrome/content/rules/Steam_Community.com.xml b/src/chrome/content/rules/Steam_Community.com.xml
deleted file mode 100644
index f7cfd929c8fe..000000000000
--- a/src/chrome/content/rules/Steam_Community.com.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Steam_static.com.xml b/src/chrome/content/rules/Steam_static.com.xml
deleted file mode 100644
index 175119c19d1b..000000000000
--- a/src/chrome/content/rules/Steam_static.com.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Steamgames.com.xml b/src/chrome/content/rules/Steamgames.com.xml
deleted file mode 100644
index caa224027d29..000000000000
--- a/src/chrome/content/rules/Steamgames.com.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Steaw.xml b/src/chrome/content/rules/Steaw.xml
index a1a76b743086..a79b2518c182 100644
--- a/src/chrome/content/rules/Steaw.xml
+++ b/src/chrome/content/rules/Steaw.xml
@@ -7,7 +7,7 @@ Fetch error: http://steaw.com/ => https://www.steaw.com/: (28, 'Connection timed
 	^steaw.com: Shows another domain
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Steeleye.com.xml b/src/chrome/content/rules/Steeleye.com.xml
index f1b7487baf13..9d57d3655f4e 100644
--- a/src/chrome/content/rules/Steeleye.com.xml
+++ b/src/chrome/content/rules/Steeleye.com.xml
@@ -14,4 +14,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Steemh.org.xml b/src/chrome/content/rules/Steemh.org.xml
new file mode 100644
index 000000000000..34033b15e5f5
--- /dev/null
+++ b/src/chrome/content/rules/Steemh.org.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Steganos.com.xml b/src/chrome/content/rules/Steganos.com.xml
index cac1a7332910..ecd83987be0b 100644
--- a/src/chrome/content/rules/Steganos.com.xml
+++ b/src/chrome/content/rules/Steganos.com.xml
@@ -25,13 +25,14 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Stella_and_Dot.xml b/src/chrome/content/rules/Stella_and_Dot.xml
index dac9b5f43a79..80689fdcd3a8 100644
--- a/src/chrome/content/rules/Stella_and_Dot.xml
+++ b/src/chrome/content/rules/Stella_and_Dot.xml
@@ -5,7 +5,6 @@ Fetch error: http://stylewatch.stelladot.com/ => https://stylewatch.stelladot.co
 
 	Other Stella & Dot rulesets:
 
-		- stelladotcdn.com.xml
 
 
 	CDN buckets:
@@ -43,7 +42,7 @@ Fetch error: http://stylewatch.stelladot.com/ => https://stylewatch.stelladot.co
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Stellwerksim.de.xml b/src/chrome/content/rules/Stellwerksim.de.xml
new file mode 100644
index 000000000000..6b8123daa774
--- /dev/null
+++ b/src/chrome/content/rules/Stellwerksim.de.xml
@@ -0,0 +1,33 @@
+
+
+
+    
+    
+    
+    
+
+	
+
diff --git a/src/chrome/content/rules/Stelter.xml b/src/chrome/content/rules/Stelter.xml
index cd4222d45e24..b9fa88a95381 100644
--- a/src/chrome/content/rules/Stelter.xml
+++ b/src/chrome/content/rules/Stelter.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.gftplns.org/ => https://www.gftplns.org/: (60, 'SSL cert
 Fetch error: http://www.plan.gs/ => https://www.gftplns.org/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 Fetch error: http://dashboard.stelter.com/ => https://dashboard.stelter.com/: (28, 'Connection timed out after 10000 milliseconds')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Stemulite_Fitness_Formula.xml b/src/chrome/content/rules/Stemulite_Fitness_Formula.xml
index 8335eb085490..f31382a255ed 100644
--- a/src/chrome/content/rules/Stemulite_Fitness_Formula.xml
+++ b/src/chrome/content/rules/Stemulite_Fitness_Formula.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/StephenHicks.org.xml b/src/chrome/content/rules/StephenHicks.org.xml
new file mode 100644
index 000000000000..9ea52731c076
--- /dev/null
+++ b/src/chrome/content/rules/StephenHicks.org.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/StephenHolyday.ca.xml b/src/chrome/content/rules/StephenHolyday.ca.xml
new file mode 100644
index 000000000000..e701286ce47e
--- /dev/null
+++ b/src/chrome/content/rules/StephenHolyday.ca.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Stephenpi.com.xml b/src/chrome/content/rules/Stephenpi.com.xml
new file mode 100644
index 000000000000..eedc4d06e229
--- /dev/null
+++ b/src/chrome/content/rules/Stephenpi.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Stepmaniax.com.xml b/src/chrome/content/rules/Stepmaniax.com.xml
new file mode 100644
index 000000000000..1bc6267bbcd2
--- /dev/null
+++ b/src/chrome/content/rules/Stepmaniax.com.xml
@@ -0,0 +1,15 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Stern.de.xml b/src/chrome/content/rules/Stern.de.xml
index c07d6c4434da..f801c1f2e9f5 100644
--- a/src/chrome/content/rules/Stern.de.xml
+++ b/src/chrome/content/rules/Stern.de.xml
@@ -1,69 +1,45 @@
 
 
 
 	
 	
 	
+	
 	
 	
 	
 	
+	
 	
-	
-	
-	
+	
 	
-	
+	
 	
 	
+	
 	
 	
 	
+	
 	
 	
-	
 	
 	
 	
@@ -73,19 +49,13 @@
 	
 	
 	
-	
 	
 	
 	
-	
+	
 
 	
 
-	
-	
-
 	
 
 
diff --git a/src/chrome/content/rules/Sternkom.xml b/src/chrome/content/rules/Sternkom.xml
index aeccafce988e..7d48bf8acb52 100644
--- a/src/chrome/content/rules/Sternkom.xml
+++ b/src/chrome/content/rules/Sternkom.xml
@@ -3,6 +3,5 @@
 
 
 
-
 
 
diff --git a/src/chrome/content/rules/Stevesie.xml b/src/chrome/content/rules/Stevesie.xml
index e4e194e28262..fffc091bc1b5 100644
--- a/src/chrome/content/rules/Stevesie.xml
+++ b/src/chrome/content/rules/Stevesie.xml
@@ -6,7 +6,7 @@ Fetch error: http://api.stevesie.com/ => https://api.stevesie.com/: (6, 'Could n
 Disabled by https-everywhere-checker because:
 Fetch error: http://stevesie.com/ => https://stevesie.com/: (35, 'error:140770FC:SSL routines:SSL23_GET_SERVER_HELLO:unknown protocol')
 -->
-
+
 
 	
 	
@@ -15,4 +15,4 @@ Fetch error: http://stevesie.com/ => https://stevesie.com/: (35, 'error:140770FC
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/StewartCalculus.com.xml b/src/chrome/content/rules/StewartCalculus.com.xml
new file mode 100644
index 000000000000..3adaf9b78cb4
--- /dev/null
+++ b/src/chrome/content/rules/StewartCalculus.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Stgbssint.com.xml b/src/chrome/content/rules/Stgbssint.com.xml
deleted file mode 100644
index 8b59416fcab2..000000000000
--- a/src/chrome/content/rules/Stgbssint.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Stickhet.xml b/src/chrome/content/rules/Stickhet.xml
index 4a01e933e547..a0bcfb6155fb 100644
--- a/src/chrome/content/rules/Stickhet.xml
+++ b/src/chrome/content/rules/Stickhet.xml
@@ -5,7 +5,7 @@ Fetch error: http://stickhet.com/ => https://stickhet.com/: (51, "SSL: no altern
 Fetch error: http://www.stickhet.com/ => https://www.stickhet.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.stickhet.com'")
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.stickhet.com/ => https://www.stickhet.com/: (51, "SSL: n
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/StockCharts.xml b/src/chrome/content/rules/StockCharts.xml
index 1f3bcccff34f..34e2f7dbc15f 100644
--- a/src/chrome/content/rules/StockCharts.xml
+++ b/src/chrome/content/rules/StockCharts.xml
@@ -5,7 +5,7 @@
 		- store	(cert: *.myshopify.com; redirects to http)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/StockReportsPlus.com.xml b/src/chrome/content/rules/StockReportsPlus.com.xml
new file mode 100644
index 000000000000..a3a1ac5c231c
--- /dev/null
+++ b/src/chrome/content/rules/StockReportsPlus.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/StockTwits.com.xml b/src/chrome/content/rules/StockTwits.com.xml
new file mode 100644
index 000000000000..d96222c7b9bd
--- /dev/null
+++ b/src/chrome/content/rules/StockTwits.com.xml
@@ -0,0 +1,51 @@
+
+
+
+	
+	
+	
+		
+	
+		
+	
+		
+	
+		
+	
+	
+		
+	
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/StockTwits.xml b/src/chrome/content/rules/StockTwits.xml
deleted file mode 100644
index a8dffeaf0e37..000000000000
--- a/src/chrome/content/rules/StockTwits.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-	
-		
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Stockton_College.xml b/src/chrome/content/rules/Stockton_College.xml
index 7b651dd99b10..ff2d67e4b107 100644
--- a/src/chrome/content/rules/Stockton_College.xml
+++ b/src/chrome/content/rules/Stockton_College.xml
@@ -75,4 +75,4 @@ www.lynda.com.ezproxy.stockton.edu
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/StoneArch.net.xml b/src/chrome/content/rules/StoneArch.net.xml
new file mode 100644
index 000000000000..cdfb186364fe
--- /dev/null
+++ b/src/chrome/content/rules/StoneArch.net.xml
@@ -0,0 +1,20 @@
+
+
+	
+		
+		
+	
+		
+		
+
+	
+
diff --git a/src/chrome/content/rules/Stoneandstone.org.xml b/src/chrome/content/rules/Stoneandstone.org.xml
new file mode 100644
index 000000000000..5f394c2d4056
--- /dev/null
+++ b/src/chrome/content/rules/Stoneandstone.org.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Stony_Brook_University.xml b/src/chrome/content/rules/Stony_Brook_University.xml
index cf2aec1b3530..f45150ea98f6 100644
--- a/src/chrome/content/rules/Stony_Brook_University.xml
+++ b/src/chrome/content/rules/Stony_Brook_University.xml
@@ -62,7 +62,7 @@ Fetch error: http://www.cs.sunysb.edu/ => https://www.cs.sunysb.edu/: (51, "SSL:
 		- Bug on (www.)?studentaffairs from snapwidget.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Stop-Snoring-Mouthpiece.org.xml b/src/chrome/content/rules/Stop-Snoring-Mouthpiece.org.xml
index 54024e5f216b..7ccafdc6262e 100644
--- a/src/chrome/content/rules/Stop-Snoring-Mouthpiece.org.xml
+++ b/src/chrome/content/rules/Stop-Snoring-Mouthpiece.org.xml
@@ -19,7 +19,7 @@ Fetch error: http://www.stop-snoring-mouthpiece.org/ => https://www.stop-snoring
 		- old	(works, CN: Parallels Panel)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Stop-TTIP.org.xml b/src/chrome/content/rules/Stop-TTIP.org.xml
deleted file mode 100644
index ca9828c26776..000000000000
--- a/src/chrome/content/rules/Stop-TTIP.org.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Stop_Cyber_Spying.com.xml b/src/chrome/content/rules/Stop_Cyber_Spying.com.xml
index 293f9ea2d167..788b2e6d4937 100644
--- a/src/chrome/content/rules/Stop_Cyber_Spying.com.xml
+++ b/src/chrome/content/rules/Stop_Cyber_Spying.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://www.stopcyberspying.com/ => https://www.stopcyberspying.com/
 		- www.stopcyberspying.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Stop_Software_Patents.xml b/src/chrome/content/rules/Stop_Software_Patents.xml
deleted file mode 100644
index b9cbbdb79555..000000000000
--- a/src/chrome/content/rules/Stop_Software_Patents.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Storage-Bin.com.xml b/src/chrome/content/rules/Storage-Bin.com.xml
index 1e09b2a34bb9..bf2a8d394aa9 100644
--- a/src/chrome/content/rules/Storage-Bin.com.xml
+++ b/src/chrome/content/rules/Storage-Bin.com.xml
@@ -1,13 +1,13 @@
 
 
 	
-	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Storebot.me.xml b/src/chrome/content/rules/Storebot.me.xml
deleted file mode 100644
index ed93401375cf..000000000000
--- a/src/chrome/content/rules/Storebot.me.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Storenvy.xml b/src/chrome/content/rules/Storenvy.xml
index 6da1fb0c6d6e..a7457c228c07 100644
--- a/src/chrome/content/rules/Storenvy.xml
+++ b/src/chrome/content/rules/Storenvy.xml
@@ -19,4 +19,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Storify.xml b/src/chrome/content/rules/Storify.xml
index bfe077db9500..e32f7e0de6be 100644
--- a/src/chrome/content/rules/Storify.xml
+++ b/src/chrome/content/rules/Storify.xml
@@ -6,7 +6,7 @@ Fetch error: http://manage.storify.com/ => https://manage.storify.com/: (6, 'Cou
 Fetch error: http://proxy.storify.com/ => https://proxy.storify.com/: (6, 'Could not resolve host: proxy.storify.com')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Storm-Internet.xml b/src/chrome/content/rules/Storm-Internet.xml
index 89f4cee48061..53759e01e64b 100644
--- a/src/chrome/content/rules/Storm-Internet.xml
+++ b/src/chrome/content/rules/Storm-Internet.xml
@@ -8,7 +8,7 @@ Fetch error: http://classic.storminternet.co.uk/ => https://classic.storminterne
 		- Linux_control_panel.co.uk.xml
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Stormiq.com.xml b/src/chrome/content/rules/Stormiq.com.xml
deleted file mode 100644
index c2207f840fcd..000000000000
--- a/src/chrome/content/rules/Stormiq.com.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Storywrite.xml b/src/chrome/content/rules/Storywrite.xml
index bd35c59e3329..5673e67f8de9 100644
--- a/src/chrome/content/rules/Storywrite.xml
+++ b/src/chrome/content/rules/Storywrite.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Stovetop.com.au.xml b/src/chrome/content/rules/Stovetop.com.au.xml
new file mode 100644
index 000000000000..949d86e28c07
--- /dev/null
+++ b/src/chrome/content/rules/Stovetop.com.au.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Stpeter.im.xml b/src/chrome/content/rules/Stpeter.im.xml
index 6acd61db97d8..4455aa8ad495 100644
--- a/src/chrome/content/rules/Stpeter.im.xml
+++ b/src/chrome/content/rules/Stpeter.im.xml
@@ -19,7 +19,7 @@ Fetch error: http://www.stpeter.im/ => https://stpeter.im/: (51, "SSL: no altern
 		- mailhost
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/StrangeWorlds.xml b/src/chrome/content/rules/StrangeWorlds.xml
index b77c72d91de8..35b1b15b851c 100644
--- a/src/chrome/content/rules/StrangeWorlds.xml
+++ b/src/chrome/content/rules/StrangeWorlds.xml
@@ -4,11 +4,11 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://strangeworlds.co.uk/ => https://strangeworlds.co.uk/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Strategic_Management_Society.xml b/src/chrome/content/rules/Strategic_Management_Society.xml
index ab2672a3e3b0..00135ea001f8 100644
--- a/src/chrome/content/rules/Strategic_Management_Society.xml
+++ b/src/chrome/content/rules/Strategic_Management_Society.xml
@@ -6,10 +6,10 @@ Fetch error: http://strategicmanagement.net/ => https://strategicmanagement.net/
 	www redirects to http before redirecting to !www.
 
 -->
-
+
 
 	
-	
+	
 
 
 	
@@ -18,4 +18,4 @@ Fetch error: http://strategicmanagement.net/ => https://strategicmanagement.net/
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Stratum_0.xml b/src/chrome/content/rules/Stratum_0.xml
index 88b096b1a091..3bb79735ab25 100644
--- a/src/chrome/content/rules/Stratum_0.xml
+++ b/src/chrome/content/rules/Stratum_0.xml
@@ -8,4 +8,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Strawpoll.me.xml b/src/chrome/content/rules/Strawpoll.me.xml
index d0409801eb0c..982bdf4305a4 100644
--- a/src/chrome/content/rules/Strawpoll.me.xml
+++ b/src/chrome/content/rules/Strawpoll.me.xml
@@ -13,7 +13,7 @@
 		
 		
 		
-	
+
 	
 		
 		
@@ -21,13 +21,13 @@
 		
 
 	
-	
+
 	
 
 	
 	
-	
+
 	
 	
diff --git a/src/chrome/content/rules/StreamGoals.com.xml b/src/chrome/content/rules/StreamGoals.com.xml
new file mode 100644
index 000000000000..812c39d5b8fb
--- /dev/null
+++ b/src/chrome/content/rules/StreamGoals.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/StreamMyGame.xml b/src/chrome/content/rules/StreamMyGame.xml
deleted file mode 100644
index d82cf7b86222..000000000000
--- a/src/chrome/content/rules/StreamMyGame.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/StreamVI.com.xml b/src/chrome/content/rules/StreamVI.com.xml
new file mode 100644
index 000000000000..42da3f80c0c4
--- /dev/null
+++ b/src/chrome/content/rules/StreamVI.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Streamfarm.net.xml b/src/chrome/content/rules/Streamfarm.net.xml
index 3bda22846e5f..dbf9060f2e8e 100644
--- a/src/chrome/content/rules/Streamfarm.net.xml
+++ b/src/chrome/content/rules/Streamfarm.net.xml
@@ -4,15 +4,15 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://c17001-o.l.core.cdn.streamfarm.net/ => https://c17001-o.l.core.cdn.streamfarm.net/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
   
 
-
 
   
-  
+
   
   
   
diff --git a/src/chrome/content/rules/Streamja.com.xml b/src/chrome/content/rules/Streamja.com.xml
new file mode 100644
index 000000000000..513f77d474cc
--- /dev/null
+++ b/src/chrome/content/rules/Streamja.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Streamtip.com.xml b/src/chrome/content/rules/Streamtip.com.xml
deleted file mode 100644
index cd292ea32942..000000000000
--- a/src/chrome/content/rules/Streamtip.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Street_Moda.xml b/src/chrome/content/rules/Street_Moda.xml
index 0380f798b83d..b73b343437d2 100644
--- a/src/chrome/content/rules/Street_Moda.xml
+++ b/src/chrome/content/rules/Street_Moda.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Strelkacard.ru.xml b/src/chrome/content/rules/Strelkacard.ru.xml
index 2eb2e5f93b7a..1c60ac116dc0 100644
--- a/src/chrome/content/rules/Strelkacard.ru.xml
+++ b/src/chrome/content/rules/Strelkacard.ru.xml
@@ -3,7 +3,7 @@
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Stripe.com.xml b/src/chrome/content/rules/Stripe.com.xml
index 3023bb9ac370..e3f71dd89171 100644
--- a/src/chrome/content/rules/Stripe.com.xml
+++ b/src/chrome/content/rules/Stripe.com.xml
@@ -1,8 +1,4 @@
 
-
-
-	
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Stroeerdigitalmedia.xml b/src/chrome/content/rules/Stroeerdigitalmedia.xml
index be08344efd70..130978898d59 100644
--- a/src/chrome/content/rules/Stroeerdigitalmedia.xml
+++ b/src/chrome/content/rules/Stroeerdigitalmedia.xml
@@ -2,4 +2,4 @@
 
 
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Stuart-Robbins.xml b/src/chrome/content/rules/Stuart-Robbins.xml
deleted file mode 100644
index 2bf6af7b4713..000000000000
--- a/src/chrome/content/rules/Stuart-Robbins.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-
-
-	
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Stubhub.co.uk.xml b/src/chrome/content/rules/Stubhub.co.uk.xml
new file mode 100644
index 000000000000..708ffc9bb3b2
--- /dev/null
+++ b/src/chrome/content/rules/Stubhub.co.uk.xml
@@ -0,0 +1,40 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Stubhub.com.xml b/src/chrome/content/rules/Stubhub.com.xml
new file mode 100644
index 000000000000..4c46b0d4f6b3
--- /dev/null
+++ b/src/chrome/content/rules/Stubhub.com.xml
@@ -0,0 +1,127 @@
+
+
+
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Stubhub.de.xml b/src/chrome/content/rules/Stubhub.de.xml
new file mode 100644
index 000000000000..385bd400b94a
--- /dev/null
+++ b/src/chrome/content/rules/Stubhub.de.xml
@@ -0,0 +1,39 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Stubhub.mx.xml b/src/chrome/content/rules/Stubhub.mx.xml
deleted file mode 100644
index e6da32bcbe59..000000000000
--- a/src/chrome/content/rules/Stubhub.mx.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Stubhub.pt.xml b/src/chrome/content/rules/Stubhub.pt.xml
deleted file mode 100644
index 8ae101cca06e..000000000000
--- a/src/chrome/content/rules/Stubhub.pt.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-	
-	
-		
-
-	
-
diff --git a/src/chrome/content/rules/Stubhub.xml b/src/chrome/content/rules/Stubhub.xml
deleted file mode 100644
index 0892cfe29f09..000000000000
--- a/src/chrome/content/rules/Stubhub.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/StudentDoctor.net.xml b/src/chrome/content/rules/StudentDoctor.net.xml
index 1f94096f6806..5f04a50ee688 100644
--- a/src/chrome/content/rules/StudentDoctor.net.xml
+++ b/src/chrome/content/rules/StudentDoctor.net.xml
@@ -1,10 +1,11 @@
 
-	
+	
 	
-	
-	
 	
 	
+	
+	
+	
 
 	
diff --git a/src/chrome/content/rules/Student_Aid_Calculator.com.xml b/src/chrome/content/rules/Student_Aid_Calculator.com.xml
deleted file mode 100644
index 2cf85c77b050..000000000000
--- a/src/chrome/content/rules/Student_Aid_Calculator.com.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-	
-
-	
-
-
-
diff --git a/src/chrome/content/rules/Students_for_Sensible_Drug_Policy.xml b/src/chrome/content/rules/Students_for_Sensible_Drug_Policy.xml
index 852a901b4ddf..188188cf13c6 100644
--- a/src/chrome/content/rules/Students_for_Sensible_Drug_Policy.xml
+++ b/src/chrome/content/rules/Students_for_Sensible_Drug_Policy.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/StudiesAbroad.com.xml b/src/chrome/content/rules/StudiesAbroad.com.xml
index 826b3d08e6f6..fe9ae45daa95 100644
--- a/src/chrome/content/rules/StudiesAbroad.com.xml
+++ b/src/chrome/content/rules/StudiesAbroad.com.xml
@@ -5,4 +5,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/StudySchedule.org.xml b/src/chrome/content/rules/StudySchedule.org.xml
index ef23a8b8aa08..aa4c88ffce37 100644
--- a/src/chrome/content/rules/StudySchedule.org.xml
+++ b/src/chrome/content/rules/StudySchedule.org.xml
@@ -1,6 +1,6 @@
 
 
diff --git a/src/chrome/content/rules/StudyinAustralia.xml b/src/chrome/content/rules/StudyinAustralia.xml
index b6b198685b9b..628c945488de 100644
--- a/src/chrome/content/rules/StudyinAustralia.xml
+++ b/src/chrome/content/rules/StudyinAustralia.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/StumblingOn.com.xml b/src/chrome/content/rules/StumblingOn.com.xml
new file mode 100644
index 000000000000..60c0d8a5a973
--- /dev/null
+++ b/src/chrome/content/rules/StumblingOn.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Stupid.com.xml b/src/chrome/content/rules/Stupid.com.xml
index c88a8627a28e..8d6ce3520323 100644
--- a/src/chrome/content/rules/Stupid.com.xml
+++ b/src/chrome/content/rules/Stupid.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://stupid.com/ => https://stupid.com/: Too many redirects while
 Fetch error: http://www.stupid.com/ => https://www.stupid.com/: Too many redirects while fetching 'https://www.stupid.com/'
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Style.com.xml b/src/chrome/content/rules/Style.com.xml
index 86f37b1edac4..c09f6bd69591 100644
--- a/src/chrome/content/rules/Style.com.xml
+++ b/src/chrome/content/rules/Style.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://www.style.com/ => https://www.style.com/: (60, 'SSL certific
 	For other Condé Nast coverage, see Conde-Nast.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/StyleCaster.com.xml b/src/chrome/content/rules/StyleCaster.com.xml
new file mode 100644
index 000000000000..5274f0f4c1dd
--- /dev/null
+++ b/src/chrome/content/rules/StyleCaster.com.xml
@@ -0,0 +1,40 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/SubDownloader.net.xml b/src/chrome/content/rules/SubDownloader.net.xml
index 8bf387b44189..adfe34a8d3f7 100644
--- a/src/chrome/content/rules/SubDownloader.net.xml
+++ b/src/chrome/content/rules/SubDownloader.net.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Subeta.xml b/src/chrome/content/rules/Subeta.xml
index 964df5c73249..5a1534fd2bd3 100644
--- a/src/chrome/content/rules/Subeta.xml
+++ b/src/chrome/content/rules/Subeta.xml
@@ -15,7 +15,7 @@
 	
 	
 	
-	
+
 	
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Submission-Technology.xml b/src/chrome/content/rules/Submission-Technology.xml
index 2d19897e3f39..b0482b12e76b 100644
--- a/src/chrome/content/rules/Submission-Technology.xml
+++ b/src/chrome/content/rules/Submission-Technology.xml
@@ -6,13 +6,13 @@ Fetch error: http://ssl.submissiontechnology.co.uk/ => https://ssl.submissiontec
 Fetch error: http://www.submissiontechnology.co.uk/ => https://www.submissiontechnology.co.uk/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
 	
 	
 
-	
+	
 
 	
 	
diff --git a/src/chrome/content/rules/Subrosa.io.xml b/src/chrome/content/rules/Subrosa.io.xml
index ae471be34477..c3c7c14e0c44 100644
--- a/src/chrome/content/rules/Subrosa.io.xml
+++ b/src/chrome/content/rules/Subrosa.io.xml
@@ -6,7 +6,7 @@ Fetch error: http://subrosa.io/ => https://subrosa.io/: (28, 'Connection timed o
 	www.subrosa.io doesn't exist.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/SubscriptionGenius.com.xml b/src/chrome/content/rules/SubscriptionGenius.com.xml
index 4c7a53abfa98..11a5403ae0b2 100644
--- a/src/chrome/content/rules/SubscriptionGenius.com.xml
+++ b/src/chrome/content/rules/SubscriptionGenius.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://support.subscriptiongenius.com/ => https://support.subscript
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Subway.com.xml b/src/chrome/content/rules/Subway.com.xml
index 1a6ff290803f..66471e0bf1ec 100644
--- a/src/chrome/content/rules/Subway.com.xml
+++ b/src/chrome/content/rules/Subway.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://subway.com/ => https://subway.com/: (51, "SSL: no alternativ
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/SuccessFactors.xml b/src/chrome/content/rules/SuccessFactors.xml
index afae2735590f..309b19124cba 100644
--- a/src/chrome/content/rules/SuccessFactors.xml
+++ b/src/chrome/content/rules/SuccessFactors.xml
@@ -44,4 +44,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Sucuri.xml b/src/chrome/content/rules/Sucuri.xml
index d62c23d4039a..df9a764a9044 100644
--- a/src/chrome/content/rules/Sucuri.xml
+++ b/src/chrome/content/rules/Sucuri.xml
@@ -15,7 +15,7 @@ Non-2xx HTTP code: http://cloudproxy.sucuri.net/ (200) => https://cloudproxy.suc
 		- .sucuri.net
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Sudbury_Neutrino_Observatory_Institute.xml b/src/chrome/content/rules/Sudbury_Neutrino_Observatory_Institute.xml
index 61a3451a7806..332f1157debd 100644
--- a/src/chrome/content/rules/Sudbury_Neutrino_Observatory_Institute.xml
+++ b/src/chrome/content/rules/Sudbury_Neutrino_Observatory_Institute.xml
@@ -4,13 +4,10 @@
 -->
 
 
-	
+	
 
 
-	
 
+	
 
-	
-
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Suddeutsche_Zeitung-problematic.xml b/src/chrome/content/rules/Suddeutsche_Zeitung-problematic.xml
deleted file mode 100644
index 3e164cccef29..000000000000
--- a/src/chrome/content/rules/Suddeutsche_Zeitung-problematic.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Suddeutsche_Zeitung.xml b/src/chrome/content/rules/Suddeutsche_Zeitung.xml
index a9e710a9e416..b23a1b8ab21d 100644
--- a/src/chrome/content/rules/Suddeutsche_Zeitung.xml
+++ b/src/chrome/content/rules/Suddeutsche_Zeitung.xml
@@ -1,177 +1,61 @@
-
 
-
-
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
-	
-
-	
-
-	 
-
-	 
-
-	
-
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+	
+		
+	
+	
+		
+		
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
+	
+
+	
 
-	
-	
-	
-	
-	
-	
-	
-	
 
diff --git a/src/chrome/content/rules/Sugarsync.com.xml b/src/chrome/content/rules/Sugarsync.com.xml
index 083284008e0d..fd94c4857841 100644
--- a/src/chrome/content/rules/Sugarsync.com.xml
+++ b/src/chrome/content/rules/Sugarsync.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://sugarsync.com/ => https://sugarsync.com/: (60, 'SSL certific
 	See .
 
 	Not supporting HTTPS or using an invalid certificate:
-		
+
 		* betasupport.sugarsync.com
 		* blog.sugarsync.com
 		* brendapie.sugarsync.com
@@ -34,7 +34,7 @@ Fetch error: http://sugarsync.com/ => https://sugarsync.com/: (60, 'SSL certific
 		* sugar274.sugarsync.com
 		* wwwa.sugarsync.com
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/SuicideGirls.xml b/src/chrome/content/rules/SuicideGirls.xml
index acee6b0a9a14..e3e185cffbcf 100644
--- a/src/chrome/content/rules/SuicideGirls.xml
+++ b/src/chrome/content/rules/SuicideGirls.xml
@@ -4,4 +4,4 @@
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Suitecrm.com.xml b/src/chrome/content/rules/Suitecrm.com.xml
new file mode 100644
index 000000000000..44fda4e0aae3
--- /dev/null
+++ b/src/chrome/content/rules/Suitecrm.com.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Suitey.com.xml b/src/chrome/content/rules/Suitey.com.xml
index c4aa1cc2ca91..b283888775a9 100644
--- a/src/chrome/content/rules/Suitey.com.xml
+++ b/src/chrome/content/rules/Suitey.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.suitey.com/ => https://www.suitey.com/: (51, "SSL: no al
 		- d1i0b14063qyxc.cloudfront.net
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/SummitPost.xml b/src/chrome/content/rules/SummitPost.xml
deleted file mode 100644
index f391dd594bb3..000000000000
--- a/src/chrome/content/rules/SummitPost.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Sumo_Logic.com.xml b/src/chrome/content/rules/Sumo_Logic.com.xml
index e8da7c90188f..4f589df87ac3 100644
--- a/src/chrome/content/rules/Sumo_Logic.com.xml
+++ b/src/chrome/content/rules/Sumo_Logic.com.xml
@@ -1,120 +1,19 @@
 
-
-
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-
-		
-
-			
-			
-
-
-	
-	
-	
-
-	
-
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-
-	
-
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+	
 
diff --git a/src/chrome/content/rules/SunTimes.com.xml b/src/chrome/content/rules/SunTimes.com.xml
index 67ba7d7cc6ca..546f622d7306 100644
--- a/src/chrome/content/rules/SunTimes.com.xml
+++ b/src/chrome/content/rules/SunTimes.com.xml
@@ -62,17 +62,17 @@ Fetch error: http://suntimes.com/ => https://www.suntimes.com/: (51, "SSL: no al
 	* Secured by us
 
 -->
-
+
 
 	
-	
+	
+	
 		
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/SunTrust.xml b/src/chrome/content/rules/SunTrust.xml
index 2b3ecc6402e9..bec2d4d0b694 100644
--- a/src/chrome/content/rules/SunTrust.xml
+++ b/src/chrome/content/rules/SunTrust.xml
@@ -1,9 +1,16 @@
 
   
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
   
-  
-
\ No newline at end of file
+  
+
diff --git a/src/chrome/content/rules/Sunbeltsoftware.com.xml b/src/chrome/content/rules/Sunbeltsoftware.com.xml
index ceaad7ecc505..62e0c37f2b19 100644
--- a/src/chrome/content/rules/Sunbeltsoftware.com.xml
+++ b/src/chrome/content/rules/Sunbeltsoftware.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://sunbeltsoftware.com/ => https://sunbeltsoftware.com/: (60, '
 Fetch error: http://www.sunbeltsoftware.com/ => https://www.sunbeltsoftware.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
@@ -20,4 +20,4 @@ Fetch error: http://www.sunbeltsoftware.com/ => https://www.sunbeltsoftware.com/
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Sundance_Channel.xml b/src/chrome/content/rules/Sundance_Channel.xml
index 98194604f756..c17b9cf6fac6 100644
--- a/src/chrome/content/rules/Sundance_Channel.xml
+++ b/src/chrome/content/rules/Sundance_Channel.xml
@@ -6,16 +6,16 @@ Fetch error: http://sundancechannel.com/ => https://www.sundancechannel.com/: (7
 Disabled by https-everywhere-checker because:
 Fetch error: http://sundancechannel.com/ => https://www.sundancechannel.com/: (7, 'Failed to connect to www.sundancechannel.com port 443: Connection timed out')
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Sunglass_Warehouse.xml b/src/chrome/content/rules/Sunglass_Warehouse.xml
index 0e434156ae47..a316431a283b 100644
--- a/src/chrome/content/rules/Sunglass_Warehouse.xml
+++ b/src/chrome/content/rules/Sunglass_Warehouse.xml
@@ -10,4 +10,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Sunlight-Foundation.xml b/src/chrome/content/rules/Sunlight-Foundation.xml
deleted file mode 100644
index a3119f501640..000000000000
--- a/src/chrome/content/rules/Sunlight-Foundation.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-
diff --git a/src/chrome/content/rules/SunlightFoundation.com.xml b/src/chrome/content/rules/SunlightFoundation.com.xml
new file mode 100644
index 000000000000..3d64e4f6dbd6
--- /dev/null
+++ b/src/chrome/content/rules/SunlightFoundation.com.xml
@@ -0,0 +1,22 @@
+
+
+	
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/Sunnah.one.xml b/src/chrome/content/rules/Sunnah.one.xml
new file mode 100644
index 000000000000..40d750fb915d
--- /dev/null
+++ b/src/chrome/content/rules/Sunnah.one.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/SunoSanuo.com.xml b/src/chrome/content/rules/SunoSanuo.com.xml
index dc42f5985d19..d7e45105f73e 100644
--- a/src/chrome/content/rules/SunoSanuo.com.xml
+++ b/src/chrome/content/rules/SunoSanuo.com.xml
@@ -18,7 +18,7 @@ Fetch error: http://app.sunosunao.com/ => https://app.sunosunao.com/: (51, "SSL:
 		- www	(shows app; mismatched, CN: app.sunosunao.com)
 
 -->
-
+
 
 	
 
@@ -28,4 +28,4 @@ Fetch error: http://app.sunosunao.com/ => https://app.sunosunao.com/: (51, "SSL:
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Sunrise.xml b/src/chrome/content/rules/Sunrise.xml
index 66eebea0070e..34284de59d95 100644
--- a/src/chrome/content/rules/Sunrise.xml
+++ b/src/chrome/content/rules/Sunrise.xml
@@ -1,14 +1,67 @@
-
-    
-    
+
-    
+	h: http redirect
+	i: incomplete cert chain
+	m: certificate mismatch
+	r: connection refused
+	s: self-signed certificate
+	t: timeout on https
+-->
+
+	
+	
+	
+	
+	
+		
+		
+		
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+		
+	
+	
+	
+	
 
-    
+	
 
-    
-    
+	
 
diff --git a/src/chrome/content/rules/Sunrise_Print_Online.xml b/src/chrome/content/rules/Sunrise_Print_Online.xml
index 6a55c40c8384..5fa4bf29ef7a 100644
--- a/src/chrome/content/rules/Sunrise_Print_Online.xml
+++ b/src/chrome/content/rules/Sunrise_Print_Online.xml
@@ -5,7 +5,7 @@ Fetch error: http://sunriseprintonline.com/ => https://sunriseprintonline.com/:
 Fetch error: http://www.sunriseprintonline.com/ => https://www.sunriseprintonline.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.sunriseprintonline.com/ => https://www.sunriseprintonlin
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Suntec.net.xml b/src/chrome/content/rules/Suntec.net.xml
index b6e3ecb62868..f6aa2778942c 100644
--- a/src/chrome/content/rules/Suntec.net.xml
+++ b/src/chrome/content/rules/Suntec.net.xml
@@ -13,4 +13,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SupaDupa.xml b/src/chrome/content/rules/SupaDupa.xml
index cef004f5249e..b05c16521b3c 100644
--- a/src/chrome/content/rules/SupaDupa.xml
+++ b/src/chrome/content/rules/SupaDupa.xml
@@ -15,16 +15,17 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/SuperGuarantee.com.xml b/src/chrome/content/rules/SuperGuarantee.com.xml
index 9b84a5e7f92d..7fd3f5ad8684 100644
--- a/src/chrome/content/rules/SuperGuarantee.com.xml
+++ b/src/chrome/content/rules/SuperGuarantee.com.xml
@@ -17,7 +17,7 @@ Fetch error: http://www.superguarantee.com/ => https://www.superguarantee.com/:
 		- Bug from fls.doubleclick.net
 
 -->
-
+
 
 	
 	
@@ -27,7 +27,7 @@ Fetch error: http://www.superguarantee.com/ => https://www.superguarantee.com/:
 					-->
 	
 
-	
+	
 
 
 	
 
diff --git a/src/chrome/content/rules/SuperStats.com.xml b/src/chrome/content/rules/SuperStats.com.xml
index a1495e4f17b4..715f44b096cc 100644
--- a/src/chrome/content/rules/SuperStats.com.xml
+++ b/src/chrome/content/rules/SuperStats.com.xml
@@ -23,7 +23,13 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
@@ -32,7 +38,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/SuperStrands.xml b/src/chrome/content/rules/SuperStrands.xml
index edb2a056739d..73cefb1279d8 100644
--- a/src/chrome/content/rules/SuperStrands.xml
+++ b/src/chrome/content/rules/SuperStrands.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Super_Pet_USA.com.xml b/src/chrome/content/rules/Super_Pet_USA.com.xml
index e2fd99676fab..77822169c05d 100644
--- a/src/chrome/content/rules/Super_Pet_USA.com.xml
+++ b/src/chrome/content/rules/Super_Pet_USA.com.xml
@@ -13,7 +13,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/SuperannuationComplaintsTribunal.xml b/src/chrome/content/rules/SuperannuationComplaintsTribunal.xml
index 2efb25cab0e3..cb0362a53ed2 100644
--- a/src/chrome/content/rules/SuperannuationComplaintsTribunal.xml
+++ b/src/chrome/content/rules/SuperannuationComplaintsTribunal.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Superblock.net.xml b/src/chrome/content/rules/Superblock.net.xml
deleted file mode 100644
index 35d32d2d3714..000000000000
--- a/src/chrome/content/rules/Superblock.net.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Superdrug.xml b/src/chrome/content/rules/Superdrug.xml
index a6d154a2c17f..4bb5dfc1b0d2 100644
--- a/src/chrome/content/rules/Superdrug.xml
+++ b/src/chrome/content/rules/Superdrug.xml
@@ -26,7 +26,7 @@ Fetch error: http://www.superdrug.com/combined.css => https://www.superdrug.com/
 		- onlinedoctor.superdrug.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Superfast-Openreach.co.uk.xml b/src/chrome/content/rules/Superfast-Openreach.co.uk.xml
index 3c5a2874592a..344fa466a2c0 100644
--- a/src/chrome/content/rules/Superfast-Openreach.co.uk.xml
+++ b/src/chrome/content/rules/Superfast-Openreach.co.uk.xml
@@ -10,7 +10,7 @@
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Superkuh.com.xml b/src/chrome/content/rules/Superkuh.com.xml
index 0afebe9ef308..78409f8038ab 100644
--- a/src/chrome/content/rules/Superkuh.com.xml
+++ b/src/chrome/content/rules/Superkuh.com.xml
@@ -3,7 +3,7 @@
 	www: Self-signed
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Supersec.xml b/src/chrome/content/rules/Supersec.xml
index e2d6a3851486..633f2d98067e 100644
--- a/src/chrome/content/rules/Supersec.xml
+++ b/src/chrome/content/rules/Supersec.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Supplies_for_Dreams.org-falsemixed.xml b/src/chrome/content/rules/Supplies_for_Dreams.org-falsemixed.xml
index af6e575300a9..80e1aa907a0c 100644
--- a/src/chrome/content/rules/Supplies_for_Dreams.org-falsemixed.xml
+++ b/src/chrome/content/rules/Supplies_for_Dreams.org-falsemixed.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Supplies_for_Dreams.org.xml b/src/chrome/content/rules/Supplies_for_Dreams.org.xml
index 32ad7690bf2e..a409840a70b6 100644
--- a/src/chrome/content/rules/Supplies_for_Dreams.org.xml
+++ b/src/chrome/content/rules/Supplies_for_Dreams.org.xml
@@ -1,4 +1,9 @@
+
 
 
 
-	
+	
 	
 		
 		
 
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Supply_Frame.com.xml b/src/chrome/content/rules/Supply_Frame.com.xml
index 7807c1fba304..0e18e7398f81 100644
--- a/src/chrome/content/rules/Supply_Frame.com.xml
+++ b/src/chrome/content/rules/Supply_Frame.com.xml
@@ -1,6 +1,6 @@
 
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Surveillance_Law.org.xml b/src/chrome/content/rules/Surveillance_Law.org.xml
index 306cc738a2a1..bd010f753818 100644
--- a/src/chrome/content/rules/Surveillance_Law.org.xml
+++ b/src/chrome/content/rules/Surveillance_Law.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://surveillancelaw.org/ => https://surveillancelaw.org/: (7, 'F
 Fetch error: http://www.surveillancelaw.org/ => https://www.surveillancelaw.org/: (7, 'Failed to connect to www.surveillancelaw.org port 443: Connection refused')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/SurveyGizmo.com.xml b/src/chrome/content/rules/SurveyGizmo.com.xml
index 478f0ceccc35..1f0ddc0e4242 100644
--- a/src/chrome/content/rules/SurveyGizmo.com.xml
+++ b/src/chrome/content/rules/SurveyGizmo.com.xml
@@ -1,9 +1,29 @@
 
   
   
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
   
 
-  
+  
 
diff --git a/src/chrome/content/rules/Surveydaddy.xml b/src/chrome/content/rules/Surveydaddy.xml
index 3de50d5d9d89..bb9799e95edd 100644
--- a/src/chrome/content/rules/Surveydaddy.xml
+++ b/src/chrome/content/rules/Surveydaddy.xml
@@ -6,7 +6,7 @@ Fetch error: http://surveydaddy.com/ => https://surveydaddy.com/: (51, "SSL: no
 Disabled by https-everywhere-checker because:
 Fetch error: http://surveydaddy.com/ => https://surveydaddy.com/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Survive_The_Claire_Perry_Inter.net.xml b/src/chrome/content/rules/Survive_The_Claire_Perry_Inter.net.xml
deleted file mode 100644
index 3a004ed53cd3..000000000000
--- a/src/chrome/content/rules/Survive_The_Claire_Perry_Inter.net.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Susliving.xml b/src/chrome/content/rules/Susliving.xml
index 656f2173c8cc..4d6d232939f0 100644
--- a/src/chrome/content/rules/Susliving.xml
+++ b/src/chrome/content/rules/Susliving.xml
@@ -11,7 +11,7 @@ Fetch error: http://forum.susliving.org/ => https://forum.susliving.org/: (51, "
 	* Redirects to http; expired 2013-01-27, mismatched, CN: forum.susliving.org
 
 -->
-
+
 
 	
 
@@ -21,4 +21,4 @@ Fetch error: http://forum.susliving.org/ => https://forum.susliving.org/: (51, "
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Sussan.com.au.xml b/src/chrome/content/rules/Sussan.com.au.xml
index edc5516d448c..abc9726228ac 100644
--- a/src/chrome/content/rules/Sussan.com.au.xml
+++ b/src/chrome/content/rules/Sussan.com.au.xml
@@ -38,12 +38,10 @@
 	
 
 
-	
+	
 
 		
 
-	
+
 
 
diff --git a/src/chrome/content/rules/Svbtle.com.xml b/src/chrome/content/rules/Svbtle.com.xml
index 79404e8c6e23..ef9994ec6d37 100644
--- a/src/chrome/content/rules/Svbtle.com.xml
+++ b/src/chrome/content/rules/Svbtle.com.xml
@@ -8,7 +8,7 @@
 
 	
 	
-	
+
 		
 		
 		
diff --git a/src/chrome/content/rules/Svenskakyrkan.se.xml b/src/chrome/content/rules/Svenskakyrkan.se.xml
index 76f178af36ee..ff9c7f15b8c2 100644
--- a/src/chrome/content/rules/Svenskakyrkan.se.xml
+++ b/src/chrome/content/rules/Svenskakyrkan.se.xml
@@ -1,7 +1,6 @@
-
+
 	
 	
-	
-	
-
 
+	
+
diff --git a/src/chrome/content/rules/Svenskaspel.se.xml b/src/chrome/content/rules/Svenskaspel.se.xml
index 2ecf5253c1ea..665df8e35c87 100644
--- a/src/chrome/content/rules/Svenskaspel.se.xml
+++ b/src/chrome/content/rules/Svenskaspel.se.xml
@@ -1,5 +1,6 @@
 
   
+  
   
   
 
diff --git a/src/chrome/content/rules/Svtrd.com.xml b/src/chrome/content/rules/Svtrd.com.xml
index 01837dca80f5..d5f03df16572 100644
--- a/src/chrome/content/rules/Svtrd.com.xml
+++ b/src/chrome/content/rules/Svtrd.com.xml
@@ -4,11 +4,11 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://s.svtrd.com/ => https://s.svtrd.com/: (6, 'Could not resolve host: s.svtrd.com')
 
 -->
-
+
 
 	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Sw-KA.de.xml b/src/chrome/content/rules/Sw-KA.de.xml
new file mode 100644
index 000000000000..d1a22f7424e1
--- /dev/null
+++ b/src/chrome/content/rules/Sw-KA.de.xml
@@ -0,0 +1,19 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Swan.sk.xml b/src/chrome/content/rules/Swan.sk.xml
index 4d771ffe3d10..962ecb595ae0 100644
--- a/src/chrome/content/rules/Swan.sk.xml
+++ b/src/chrome/content/rules/Swan.sk.xml
@@ -1,19 +1,23 @@
-
 
-
+
   
   
-  
-
-  
-  
+  
+  
 
-  
-  
-  
+  
 
diff --git a/src/chrome/content/rules/Swapspace.net.xml b/src/chrome/content/rules/Swapspace.net.xml
index f197073e30e1..2de6d3eb497a 100644
--- a/src/chrome/content/rules/Swapspace.net.xml
+++ b/src/chrome/content/rules/Swapspace.net.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Sweden.se.xml b/src/chrome/content/rules/Sweden.se.xml
index c5c7fe91c352..f97f166bb456 100644
--- a/src/chrome/content/rules/Sweden.se.xml
+++ b/src/chrome/content/rules/Sweden.se.xml
@@ -16,7 +16,7 @@ Non-2xx HTTP code: http://work.sweden.se/ (200) => https://work.sweden.se/ (403)
 		- www.imagebank (self signed)
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/SweetDreamsMiniDonuts.com.xml b/src/chrome/content/rules/SweetDreamsMiniDonuts.com.xml
new file mode 100644
index 000000000000..72382da27757
--- /dev/null
+++ b/src/chrome/content/rules/SweetDreamsMiniDonuts.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/SweetPepper.org.xml b/src/chrome/content/rules/SweetPepper.org.xml
new file mode 100644
index 000000000000..18b8f21249b3
--- /dev/null
+++ b/src/chrome/content/rules/SweetPepper.org.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Sweet_and_Sour.xml b/src/chrome/content/rules/Sweet_and_Sour.xml
index fd365e804363..dfe3cebc3ee3 100644
--- a/src/chrome/content/rules/Sweet_and_Sour.xml
+++ b/src/chrome/content/rules/Sweet_and_Sour.xml
@@ -12,7 +12,7 @@ Fetch error: http://sweetandsourstudio.com/ => https://sweetandsourstudio.com/:
 Fetch error: http://www.sweetandsourstudio.com/ => https://www.sweetandsourstudio.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
@@ -20,4 +20,4 @@ Fetch error: http://www.sweetandsourstudio.com/ => https://www.sweetandsourstudi
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SwetsWise.xml b/src/chrome/content/rules/SwetsWise.xml
deleted file mode 100644
index 58682b59db20..000000000000
--- a/src/chrome/content/rules/SwetsWise.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-	
-
-
-	
-
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Swin.edu.au.xml b/src/chrome/content/rules/Swin.edu.au.xml
index 76868d051b88..4ee93cdef563 100644
--- a/src/chrome/content/rules/Swin.edu.au.xml
+++ b/src/chrome/content/rules/Swin.edu.au.xml
@@ -22,7 +22,10 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
@@ -31,7 +34,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Swiss-Federal-Railways.xml b/src/chrome/content/rules/Swiss-Federal-Railways.xml
index b90f1e79407b..d4237dd96eae 100644
--- a/src/chrome/content/rules/Swiss-Federal-Railways.xml
+++ b/src/chrome/content/rules/Swiss-Federal-Railways.xml
@@ -4,13 +4,13 @@ Mismatch:
 	-blog
 	-geschaeftsbericht
 	-unterwegs
-	
+
 	cff.ch
 	-blog
 	-enroute
 	-int-www
 	-rapport-de-gestion
-	
+
 	ffs.ch
 	-blog
 	-inviaggio
@@ -19,10 +19,10 @@ Mismatch:
 Redirect:
 	sbb.ch
 	-fahrplan
-	
+
 	cff.ch
 	-horaire
-	
+
 	ffs.ch
 	-orario
 -->
diff --git a/src/chrome/content/rules/Swiss.xml b/src/chrome/content/rules/Swiss.xml
index 567f3193afda..113c06a65616 100644
--- a/src/chrome/content/rules/Swiss.xml
+++ b/src/chrome/content/rules/Swiss.xml
@@ -6,7 +6,7 @@ Fetch error: http://booking.swiss.com/ => https://booking.swiss.com/: (51, "SSL:
 Fetch error: http://mobile.swiss.com/ => https://mobile.swiss.com/: (51, "SSL: no alternative certificate subject name matches target host name 'mobile.swiss.com'")
 
 -->
-
+
 	
 	
 	
@@ -14,7 +14,7 @@ Fetch error: http://mobile.swiss.com/ => https://mobile.swiss.com/: (51, "SSL: n
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Swisscom.ch.xml b/src/chrome/content/rules/Swisscom.ch.xml
index 2349b7f51e1c..a0eb9b08cf59 100644
--- a/src/chrome/content/rules/Swisscom.ch.xml
+++ b/src/chrome/content/rules/Swisscom.ch.xml
@@ -39,7 +39,7 @@ Fetch error: http://services.snoopy.swisscom.com/ => https://services.snoopy.swi
 					- web.tvair
 				- tvonline
 					- web.tvonline
-	
+
 			Unknown issuer:
 				- expats
 
@@ -53,14 +53,14 @@ Fetch error: http://services.snoopy.swisscom.com/ => https://services.snoopy.swi
 				- mobileemail
 					- www.mobileemail
 				- www.mafo
-	
+
 			Refused:
 				- brandcenter
 				- documents
 				- ictquiz
 				- quiz365d
 -->
-
+
 	
 	
 	
@@ -79,7 +79,7 @@ Fetch error: http://services.snoopy.swisscom.com/ => https://services.snoopy.swi
 	
 	
 	
-	
+
 	
 	
 	
@@ -96,7 +96,7 @@ Fetch error: http://services.snoopy.swisscom.com/ => https://services.snoopy.swi
 	
 	
 	
-	
+
 	
 
 
@@ -106,7 +106,7 @@ Fetch error: http://services.snoopy.swisscom.com/ => https://services.snoopy.swi
 	
 	
 
-		
+	
 	
 	
 	
@@ -131,7 +131,7 @@ Fetch error: http://services.snoopy.swisscom.com/ => https://services.snoopy.swi
 
 	
-		
+
 	
 
diff --git a/src/chrome/content/rules/Switch.ch.xml b/src/chrome/content/rules/Switch.ch.xml
index 5b7a5e9ae7a7..743b87bbddb2 100644
--- a/src/chrome/content/rules/Switch.ch.xml
+++ b/src/chrome/content/rules/Switch.ch.xml
@@ -66,7 +66,7 @@
 		- presentation.cast-test.switch.ch
 -->
 
-		
+	
 	
 	
 	
@@ -231,8 +231,8 @@
 	
 
 	
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Switch.co.xml b/src/chrome/content/rules/Switch.co.xml
index 02c1d2cdba0e..58749880ec58 100644
--- a/src/chrome/content/rules/Switch.co.xml
+++ b/src/chrome/content/rules/Switch.co.xml
@@ -4,13 +4,13 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://switch.co/ => https://www.switch.co/: (51, "SSL: no alternative certificate subject name matches target host name 'www.switch.co'")
 
 -->
-
+
 
 	
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SwitchConcepts.xml b/src/chrome/content/rules/SwitchConcepts.xml
index ce627b6f9d96..2d94e517b81b 100644
--- a/src/chrome/content/rules/SwitchConcepts.xml
+++ b/src/chrome/content/rules/SwitchConcepts.xml
@@ -13,7 +13,7 @@ Fetch error: http://support.switchconcepts.com/ => https://support.switchconcept
 
 -->
 
-
+
 		
-
+
 
 	
-	
+	
+	
 
 		
 
@@ -27,13 +28,10 @@ Fetch error: http://switchnetworks.com.au/ => https://www.switchnetworks.com.au/
 	
 
-	
 
 		
 		
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Switchplus.ch.xml b/src/chrome/content/rules/Switchplus.ch.xml
index 3ee0b9941a5d..cedd5f22bda6 100644
--- a/src/chrome/content/rules/Switchplus.ch.xml
+++ b/src/chrome/content/rules/Switchplus.ch.xml
@@ -8,7 +8,8 @@
 
 
 	
-	
+	
+	
 
 
 	
-
+
 
 	
-	
+	
 
 
 	
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Sydney-Tower-Eye.xml b/src/chrome/content/rules/Sydney-Tower-Eye.xml
index 0188de06d922..6a5689338f4a 100644
--- a/src/chrome/content/rules/Sydney-Tower-Eye.xml
+++ b/src/chrome/content/rules/Sydney-Tower-Eye.xml
@@ -7,7 +7,7 @@ Fetch error: http://secure.sydneytowereye.com.au/ => https://secure.sydneytowere
 	For other Merlin Entertainments coverage, see Merlin-Entertainments.xml.
 -->
 
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/SydneysHardRockStory.com.xml b/src/chrome/content/rules/SydneysHardRockStory.com.xml
new file mode 100644
index 000000000000..0dda0df99df3
--- /dev/null
+++ b/src/chrome/content/rules/SydneysHardRockStory.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Sydostran.se.xml b/src/chrome/content/rules/Sydostran.se.xml
index d02ebf58f3ad..c29bfe3387a1 100644
--- a/src/chrome/content/rules/Sydostran.se.xml
+++ b/src/chrome/content/rules/Sydostran.se.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://sydostran.se/ => https://www.sydostran.se/: (28, 'Connection timed out after 10001 milliseconds')
 Fetch error: http://www.sydostran.se/ => https://www.sydostran.se/: (28, 'Connection timed out after 10000 milliseconds')
 -->
-
+
 
 
 
diff --git a/src/chrome/content/rules/Syllabusshare-mismatches.xml b/src/chrome/content/rules/Syllabusshare-mismatches.xml
index 518080c613ab..6c8681c42b6b 100644
--- a/src/chrome/content/rules/Syllabusshare-mismatches.xml
+++ b/src/chrome/content/rules/Syllabusshare-mismatches.xml
@@ -3,7 +3,7 @@
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Syllabusshare.xml b/src/chrome/content/rules/Syllabusshare.xml
index 7887616086aa..ef69d9c699ce 100644
--- a/src/chrome/content/rules/Syllabusshare.xml
+++ b/src/chrome/content/rules/Syllabusshare.xml
@@ -6,7 +6,7 @@ Fetch error: http://secure.syllabushare.com/ => https://secure.syllabushare.com/
 Disabled by https-everywhere-checker because:
 Fetch error: http://secure.syllabushare.com/ => https://secure.syllabushare.com/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Symantec.xml b/src/chrome/content/rules/Symantec.xml
index 1b055ac00653..49479219383d 100644
--- a/src/chrome/content/rules/Symantec.xml
+++ b/src/chrome/content/rules/Symantec.xml
@@ -1,202 +1,165 @@
-
 
-
+
 
 	
+	
 	
+	
 	
-	
-	
-	
-	
-	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
-	
-	
+	
+	
+	
+	
+	
+	
+	
 	
-	
+	
+	
+	
 	
-	
-	
-	
-	
-	
-	
-	
-	
+	
+	
+	
 	
-	
-	
-	
-	
-	
-	
+	
 	
-	
-	
+	
+	
+	
+	
+	
+	
+	
 	
-	
+	
+	
+	
 	
-	
-	
-	
-	
-	
+	
+	
+	
 	
-	
+	
 	
-	
-	
-	
+	
+	
+	
+	
 	
-	
 	
-	
-	
-	
+	
+	
 	
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-
-
-	
-
-	
-	
-
-	
-
-		
-
-	
-
-		
-
-	
-
-		
-
-	
-
-		
-		
-
-	
-
-		
-
-	
+	
 
-		
+	
 
 	
diff --git a/src/chrome/content/rules/Symbolab.com.xml b/src/chrome/content/rules/Symbolab.com.xml
index 32ff07ff87ff..16354f1d6e67 100644
--- a/src/chrome/content/rules/Symbolab.com.xml
+++ b/src/chrome/content/rules/Symbolab.com.xml
@@ -2,9 +2,9 @@
     Mixed content:
 	    - blog
 		    - some images loaded from blogspot.com *
-		
+
 		* secured by us
-	
+
 	Notes:
 	    - blog
 		    - Cloudflare SSL
diff --git a/src/chrome/content/rules/Symfony.com.xml b/src/chrome/content/rules/Symfony.com.xml
index 206483ab3c4e..621106457155 100644
--- a/src/chrome/content/rules/Symfony.com.xml
+++ b/src/chrome/content/rules/Symfony.com.xml
@@ -1,7 +1,6 @@
 
 
     
diff --git a/src/chrome/content/rules/SymlynX.xml b/src/chrome/content/rules/SymlynX.xml
index 9338d1251a38..2e38ab20421e 100644
--- a/src/chrome/content/rules/SymlynX.xml
+++ b/src/chrome/content/rules/SymlynX.xml
@@ -6,7 +6,7 @@ Fetch error: http://symlynx.com/ => https://symlynx.com/: (60, 'SSL certificate
 Disabled by https-everywhere-checker because:
 Fetch error: http://symlynx.com/ => https://symlynx.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/SymmetricStrength.com.xml b/src/chrome/content/rules/SymmetricStrength.com.xml
new file mode 100644
index 000000000000..97719083cf22
--- /dev/null
+++ b/src/chrome/content/rules/SymmetricStrength.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Symplicity.xml b/src/chrome/content/rules/Symplicity.xml
index f469684dd4ac..3862ede9adc4 100644
--- a/src/chrome/content/rules/Symplicity.xml
+++ b/src/chrome/content/rules/Symplicity.xml
@@ -10,4 +10,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Synacor.xml b/src/chrome/content/rules/Synacor.xml
index 3cdb123ad812..f2990bb3a3d2 100644
--- a/src/chrome/content/rules/Synacor.xml
+++ b/src/chrome/content/rules/Synacor.xml
@@ -24,4 +24,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Synaptop.com.xml b/src/chrome/content/rules/Synaptop.com.xml
deleted file mode 100644
index b3c711f846dd..000000000000
--- a/src/chrome/content/rules/Synaptop.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-  
-  
-
-  
-
diff --git a/src/chrome/content/rules/SyncBoss.xml b/src/chrome/content/rules/SyncBoss.xml
deleted file mode 100644
index 4009f7f733cf..000000000000
--- a/src/chrome/content/rules/SyncBoss.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Synch.hu.xml b/src/chrome/content/rules/Synch.hu.xml
deleted file mode 100644
index 033c421577cf..000000000000
--- a/src/chrome/content/rules/Synch.hu.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Synchronicer.dk.xml b/src/chrome/content/rules/Synchronicer.dk.xml
index b69cb2b97557..9da044c9fe31 100644
--- a/src/chrome/content/rules/Synchronicer.dk.xml
+++ b/src/chrome/content/rules/Synchronicer.dk.xml
@@ -1,10 +1,7 @@
-
-
+
 	
 	
+		
 
 	
 
diff --git a/src/chrome/content/rules/Syncplicity.xml b/src/chrome/content/rules/Syncplicity.xml
index 925c889c9e94..c9b21f2d9c87 100644
--- a/src/chrome/content/rules/Syncplicity.xml
+++ b/src/chrome/content/rules/Syncplicity.xml
@@ -13,6 +13,6 @@
 
   	
 
-	
 
diff --git a/src/chrome/content/rules/Syncthing.net.xml b/src/chrome/content/rules/Syncthing.net.xml
index bc68e18a0da4..e69eb24a4547 100644
--- a/src/chrome/content/rules/Syncthing.net.xml
+++ b/src/chrome/content/rules/Syncthing.net.xml
@@ -1,7 +1,7 @@
 
-
+
 
 	
diff --git a/src/chrome/content/rules/Syndie.xml b/src/chrome/content/rules/Syndie.xml
index ea670481a4d7..49b49052123b 100644
--- a/src/chrome/content/rules/Syndie.xml
+++ b/src/chrome/content/rules/Syndie.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Synergist_SCADA.xml b/src/chrome/content/rules/Synergist_SCADA.xml
index 966fe7f27e99..379522485ead 100644
--- a/src/chrome/content/rules/Synergist_SCADA.xml
+++ b/src/chrome/content/rules/Synergist_SCADA.xml
@@ -11,7 +11,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://synergistscada.com/ => https://synergistscada.com/: Too many redirects while fetching 'https://synergistscada.com/'
 
 -->
-
+
 
 	
 	
@@ -22,4 +22,4 @@ Fetch error: http://synergistscada.com/ => https://synergistscada.com/: Too many
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Synology.com.tw.xml b/src/chrome/content/rules/Synology.com.tw.xml
index 47260bd7c826..b60be5965721 100644
--- a/src/chrome/content/rules/Synology.com.tw.xml
+++ b/src/chrome/content/rules/Synology.com.tw.xml
@@ -1,5 +1,5 @@
 
-
+
 
 	
diff --git a/src/chrome/content/rules/Synopsys.xml b/src/chrome/content/rules/Synopsys.xml
index d1ffd3e6c458..f93de60474a6 100644
--- a/src/chrome/content/rules/Synopsys.xml
+++ b/src/chrome/content/rules/Synopsys.xml
@@ -9,7 +9,10 @@
 
 	
 	
-	
+	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Synovite-scripts.com.xml b/src/chrome/content/rules/Synovite-scripts.com.xml
index b8aee04b8391..8fa93274f1af 100644
--- a/src/chrome/content/rules/Synovite-scripts.com.xml
+++ b/src/chrome/content/rules/Synovite-scripts.com.xml
@@ -5,4 +5,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Synthetix.com.xml b/src/chrome/content/rules/Synthetix.com.xml
index 505b26f459e9..f46c906034b0 100644
--- a/src/chrome/content/rules/Synthetix.com.xml
+++ b/src/chrome/content/rules/Synthetix.com.xml
@@ -1,7 +1,6 @@
 
-
-
-	
-	
-	
-	
-
-
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Synthfont.com.xml b/src/chrome/content/rules/Synthfont.com.xml
new file mode 100644
index 000000000000..58f4d2d16443
--- /dev/null
+++ b/src/chrome/content/rules/Synthfont.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Syracuse_University.xml b/src/chrome/content/rules/Syracuse_University.xml
index c50b2d2b00d5..c1a441d5d0ec 100644
--- a/src/chrome/content/rules/Syracuse_University.xml
+++ b/src/chrome/content/rules/Syracuse_University.xml
@@ -5,4 +5,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SysCan.org.xml b/src/chrome/content/rules/SysCan.org.xml
deleted file mode 100644
index 4fff8028a2de..000000000000
--- a/src/chrome/content/rules/SysCan.org.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/SysWard.com.xml b/src/chrome/content/rules/SysWard.com.xml
index 8d211edb1cd2..68b322d06f59 100644
--- a/src/chrome/content/rules/SysWard.com.xml
+++ b/src/chrome/content/rules/SysWard.com.xml
@@ -9,7 +9,7 @@
 
 
 	
-	
+	
 
 
 	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Sysmex.com.xml b/src/chrome/content/rules/Sysmex.com.xml
index e80e60b2059a..78a69bb97cbe 100644
--- a/src/chrome/content/rules/Sysmex.com.xml
+++ b/src/chrome/content/rules/Sysmex.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.sysmex.com/ => https://www.sysmex.com/: (60, 'SSL certif
 		- www.sysmex.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Sysprofile.de.xml b/src/chrome/content/rules/Sysprofile.de.xml
new file mode 100644
index 000000000000..189517e156de
--- /dev/null
+++ b/src/chrome/content/rules/Sysprofile.de.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/SystemIntegra.ru.xml b/src/chrome/content/rules/SystemIntegra.ru.xml
index d4d6b1c32bca..ccad3aca7a73 100644
--- a/src/chrome/content/rules/SystemIntegra.ru.xml
+++ b/src/chrome/content/rules/SystemIntegra.ru.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/SystemSensor.ca.xml b/src/chrome/content/rules/SystemSensor.ca.xml
new file mode 100644
index 000000000000..9926bebb9fbb
--- /dev/null
+++ b/src/chrome/content/rules/SystemSensor.ca.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/System_Center_Advisor.com.xml b/src/chrome/content/rules/System_Center_Advisor.com.xml
index c6cdc81bf3ee..669c0021c7ea 100644
--- a/src/chrome/content/rules/System_Center_Advisor.com.xml
+++ b/src/chrome/content/rules/System_Center_Advisor.com.xml
@@ -18,25 +18,22 @@ Fetch error: http://systemcenteradvisor.net/ => https://systemcenteradvisor.net/
 		- (www.)systemcenteradvisor.net
 
 -->
-
+
 
 	
-	
 	
-	
 	
-	
 	
-	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
-	
-
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Systemausfall.org.xml b/src/chrome/content/rules/Systemausfall.org.xml
deleted file mode 100644
index 46d71c43adf7..000000000000
--- a/src/chrome/content/rules/Systemausfall.org.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Systemli.org.xml b/src/chrome/content/rules/Systemli.org.xml
deleted file mode 100644
index 476d7b8c000b..000000000000
--- a/src/chrome/content/rules/Systemli.org.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Systemspace.network.xml b/src/chrome/content/rules/Systemspace.network.xml
new file mode 100644
index 000000000000..12e90cc1921b
--- /dev/null
+++ b/src/chrome/content/rules/Systemspace.network.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Szm.com.xml b/src/chrome/content/rules/Szm.com.xml
deleted file mode 100644
index 62fc8d326d8b..000000000000
--- a/src/chrome/content/rules/Szm.com.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-	
-  
-  
-
-
-  
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/T-Engine.org.xml b/src/chrome/content/rules/T-Engine.org.xml
index 99ae1f3abd99..6d226de52324 100644
--- a/src/chrome/content/rules/T-Engine.org.xml
+++ b/src/chrome/content/rules/T-Engine.org.xml
@@ -19,7 +19,7 @@ Fetch error: http://www.t-engine.org/ => https://www.t-engine.org/: (60, 'SSL ce
 	** Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/T-Mobile.co.uk.xml b/src/chrome/content/rules/T-Mobile.co.uk.xml
deleted file mode 100644
index f806bd9af3f7..000000000000
--- a/src/chrome/content/rules/T-Mobile.co.uk.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/T-Nation.com.xml b/src/chrome/content/rules/T-Nation.com.xml
index 1cea91bb087c..f206430da062 100644
--- a/src/chrome/content/rules/T-Nation.com.xml
+++ b/src/chrome/content/rules/T-Nation.com.xml
@@ -21,7 +21,7 @@ Fetch error: http://tnation.t-nation.com/ => https://tnation.t-nation.com/: (51,
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/T-Online.xml b/src/chrome/content/rules/T-Online.xml
index 397053080e46..55d11fb2947a 100644
--- a/src/chrome/content/rules/T-Online.xml
+++ b/src/chrome/content/rules/T-Online.xml
@@ -1,107 +1,58 @@
-
 
-
-
-	
-	
-	
-		
-
-
-	
-
-
-	
-
-	
-
-	
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+		
+		
+
+	
+
+	
 
 
diff --git a/src/chrome/content/rules/T-Shirt_Mojo.xml b/src/chrome/content/rules/T-Shirt_Mojo.xml
deleted file mode 100644
index 2c4a40ae7984..000000000000
--- a/src/chrome/content/rules/T-Shirt_Mojo.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/T3.io.xml b/src/chrome/content/rules/T3.io.xml
index 17bf69c1905b..e232492b4712 100644
--- a/src/chrome/content/rules/T3.io.xml
+++ b/src/chrome/content/rules/T3.io.xml
@@ -10,7 +10,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://t3.io/ => https://t3.io/: (60, 'SSL certificate problem: self signed certificate')
 
 -->
-
+
 
 	
 	
@@ -21,4 +21,4 @@ Fetch error: http://t3.io/ => https://t3.io/: (60, 'SSL certificate problem: sel
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/T3Blog.com.xml b/src/chrome/content/rules/T3Blog.com.xml
deleted file mode 100644
index 69f1f948df0f..000000000000
--- a/src/chrome/content/rules/T3Blog.com.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/TACAR.org.xml b/src/chrome/content/rules/TACAR.org.xml
index f94d5fc670b2..3dfe444fdc83 100644
--- a/src/chrome/content/rules/TACAR.org.xml
+++ b/src/chrome/content/rules/TACAR.org.xml
@@ -6,7 +6,7 @@
 
 		- tacar.org
 		- www.tacar.org
-		
+
 -->
 
 
diff --git a/src/chrome/content/rules/TAG24.de.xml b/src/chrome/content/rules/TAG24.de.xml
new file mode 100644
index 000000000000..4858da2bcebc
--- /dev/null
+++ b/src/chrome/content/rules/TAG24.de.xml
@@ -0,0 +1,35 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/TAU.ac.il.xml b/src/chrome/content/rules/TAU.ac.il.xml
index 516e9be7cd95..1add39342d50 100644
--- a/src/chrome/content/rules/TAU.ac.il.xml
+++ b/src/chrome/content/rules/TAU.ac.il.xml
@@ -29,13 +29,16 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/TCPA_Compliance.us.xml b/src/chrome/content/rules/TCPA_Compliance.us.xml
deleted file mode 100644
index ea52f2d75771..000000000000
--- a/src/chrome/content/rules/TCPA_Compliance.us.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/TCPalm.com.xml b/src/chrome/content/rules/TCPalm.com.xml
index 6bc94e4d4447..104554ee28c3 100644
--- a/src/chrome/content/rules/TCPalm.com.xml
+++ b/src/chrome/content/rules/TCPalm.com.xml
@@ -49,10 +49,11 @@ Fetch error: http://tcpalm.com/ => https://www.tcpalm.com/: (51, "SSL: no altern
 	* → akamai
 
 -->
-
+
 
 	
-	
+	
+	
 	
 	
 
@@ -68,7 +69,6 @@ Fetch error: http://tcpalm.com/ => https://www.tcpalm.com/: (51, "SSL: no altern
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/TC_img.net.xml b/src/chrome/content/rules/TC_img.net.xml
deleted file mode 100644
index 8ac450e4103a..000000000000
--- a/src/chrome/content/rules/TC_img.net.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/TDBank.xml b/src/chrome/content/rules/TDBank.xml
index d67ca95f600a..b6493bcaeeaf 100644
--- a/src/chrome/content/rules/TDBank.xml
+++ b/src/chrome/content/rules/TDBank.xml
@@ -2,4 +2,4 @@
   
 
   
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TDC.dk.xml b/src/chrome/content/rules/TDC.dk.xml
index 65c684ffeed7..45585d8606cc 100644
--- a/src/chrome/content/rules/TDC.dk.xml
+++ b/src/chrome/content/rules/TDC.dk.xml
@@ -15,7 +15,6 @@ Fetch error: http://www.tdc-wholesale.com/ => https://wholesale.tdc.dk/nordic/:
 
 		- C.dk.xml
 		- TDC.no.xml
-		- TDC_online.se.xml
 		- TDC_Service_Online.com.xml
 
 
@@ -49,7 +48,7 @@ Fetch error: http://www.tdc-wholesale.com/ => https://wholesale.tdc.dk/nordic/:
 	² Secured by us <= complete coverage
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/TDC.no.xml b/src/chrome/content/rules/TDC.no.xml
index c9c02beaf582..c20ba2aef60e 100644
--- a/src/chrome/content/rules/TDC.no.xml
+++ b/src/chrome/content/rules/TDC.no.xml
@@ -19,7 +19,7 @@ Fetch error: http://henvis.tdc.no/ => https://henvis.tdc.no/: (28, 'Connection t
 
 	* Dropped
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/TDC_online.se.xml b/src/chrome/content/rules/TDC_online.se.xml
deleted file mode 100644
index 8e7e7974d4f7..000000000000
--- a/src/chrome/content/rules/TDC_online.se.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/TDS.net.xml b/src/chrome/content/rules/TDS.net.xml
index c9ffd7f084cd..637bd10307f2 100644
--- a/src/chrome/content/rules/TDS.net.xml
+++ b/src/chrome/content/rules/TDS.net.xml
@@ -27,4 +27,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TEAC.xml b/src/chrome/content/rules/TEAC.xml
index 8a755a633d44..7747484a7d4b 100644
--- a/src/chrome/content/rules/TEAC.xml
+++ b/src/chrome/content/rules/TEAC.xml
@@ -10,7 +10,7 @@ Fetch error: http://teac.co.jp/ => https://teac.co.jp/: (60, 'SSL certificate pr
 Fetch error: http://www.teac.co.jp/ => https://teac.co.jp/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 Fetch error: http://shop.teac.com/ => https://shop.teac.com/: (28, 'Connection timed out after 10000 milliseconds')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/TEHTRI-Security.com.xml b/src/chrome/content/rules/TEHTRI-Security.com.xml
index 4ff24b4aff62..46d07a547a1f 100644
--- a/src/chrome/content/rules/TEHTRI-Security.com.xml
+++ b/src/chrome/content/rules/TEHTRI-Security.com.xml
@@ -18,7 +18,7 @@ Fetch error: http://tehtri-security.com/ => https://tehtri-security.com/: (6, 'C
 	platform should be removed with Ffx 24.
 
 -->
-
+
 
 	
 	
@@ -26,4 +26,4 @@ Fetch error: http://tehtri-security.com/ => https://tehtri-security.com/: (6, 'C
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TFAW.com.xml b/src/chrome/content/rules/TFAW.com.xml
index 152858979a1e..e3a1dab4600a 100644
--- a/src/chrome/content/rules/TFAW.com.xml
+++ b/src/chrome/content/rules/TFAW.com.xml
@@ -1,15 +1,15 @@
-
-
-
-	
-	
-	
-
-	
-
-	
-	
-
+
+
+
+	
+	
+	
+
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/TH-Mittelhessen.de.xml b/src/chrome/content/rules/TH-Mittelhessen.de.xml
index fd02398678f6..68f38d7fb04f 100644
--- a/src/chrome/content/rules/TH-Mittelhessen.de.xml
+++ b/src/chrome/content/rules/TH-Mittelhessen.de.xml
@@ -21,7 +21,7 @@ Fetch error: http://alumni.th-mittelhessen.de/ => https://alumni.th-mittelhessen
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/THM.de.xml b/src/chrome/content/rules/THM.de.xml
index d31dca3787ed..d869ffe22c02 100644
--- a/src/chrome/content/rules/THM.de.xml
+++ b/src/chrome/content/rules/THM.de.xml
@@ -68,7 +68,7 @@ Fetch error: http://pharus.thm.de/ => https://pharus.thm.de/: (6, 'Could not res
 	² Unsecurable <= refused
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/THR.com.xml b/src/chrome/content/rules/THR.com.xml
index 8d87ba8227e8..a1f80a8ca659 100644
--- a/src/chrome/content/rules/THR.com.xml
+++ b/src/chrome/content/rules/THR.com.xml
@@ -21,7 +21,7 @@ Fetch error: http://www.thr.com/ => https://www.hollywoodreporter.com/: Too many
 	² Secured by us
 
 -->
-
+
 
 	
@@ -30,7 +30,7 @@ Fetch error: http://www.thr.com/ => https://www.hollywoodreporter.com/: Too many
 	
 	
 	
-	
+
 	
 	
diff --git a/src/chrome/content/rules/THW.de.xml b/src/chrome/content/rules/THW.de.xml
new file mode 100644
index 000000000000..9916aa042344
--- /dev/null
+++ b/src/chrome/content/rules/THW.de.xml
@@ -0,0 +1,24 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/TI.com-falsemixed.xml b/src/chrome/content/rules/TI.com-falsemixed.xml
deleted file mode 100644
index bb81d11e8cf5..000000000000
--- a/src/chrome/content/rules/TI.com-falsemixed.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-		
-		
-
-			
-			
-			
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/TIBCO.com.xml b/src/chrome/content/rules/TIBCO.com.xml
index 09b4c1a444f7..5d1eabad7d68 100644
--- a/src/chrome/content/rules/TIBCO.com.xml
+++ b/src/chrome/content/rules/TIBCO.com.xml
@@ -19,7 +19,10 @@
 -->
 
 
-	
+	
+	
+	
+	
 
 
 	
-
+
 
 	
 	
@@ -15,4 +15,4 @@ Fetch error: http://www.ticketsage.com/ => https://www.ticketsage.com/: (60, 'SS
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TIME.com.xml b/src/chrome/content/rules/TIME.com.xml
index 79dc58bce235..f316a87e7134 100644
--- a/src/chrome/content/rules/TIME.com.xml
+++ b/src/chrome/content/rules/TIME.com.xml
@@ -6,13 +6,11 @@
 			 - 100photos.time.com
 
 		SSL peer certificate was not OK:
-			 - www.time.com
 			 - 10questions.time.com
 			 - motto.time.com
 			 - thepage.time.com
 
 		Secure connection redirects to plaintext:
-			 - time.com
 			 - business.time.com
 			 - entertainment.time.com
 			 - healthland.time.com
@@ -33,14 +31,20 @@
 			 - life.time.com
 			 - lightbox.time.com
 
+		Active mixed content:
+			 - content.time.com
+				
+				
+
 -->
 
 
+	
+	
 	
 		
 	
 	
-	
 	
 	
 	
diff --git a/src/chrome/content/rules/TKK.fi.xml b/src/chrome/content/rules/TKK.fi.xml
index e6294f127dd3..5e2499164644 100644
--- a/src/chrome/content/rules/TKK.fi.xml
+++ b/src/chrome/content/rules/TKK.fi.xml
@@ -6,7 +6,7 @@
 	* Server sends no certificate chain, see https://whatsmychaincert.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/TLHP.cf.xml b/src/chrome/content/rules/TLHP.cf.xml
deleted file mode 100644
index ceec0e46265a..000000000000
--- a/src/chrome/content/rules/TLHP.cf.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/TLS.so.xml b/src/chrome/content/rules/TLS.so.xml
deleted file mode 100644
index 08e6f621ac91..000000000000
--- a/src/chrome/content/rules/TLS.so.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/TMBC.gov.uk.xml b/src/chrome/content/rules/TMBC.gov.uk.xml
index 9afbbc6c5c99..faac61e3fa92 100644
--- a/src/chrome/content/rules/TMBC.gov.uk.xml
+++ b/src/chrome/content/rules/TMBC.gov.uk.xml
@@ -22,7 +22,7 @@ Fetch error: http://publicaccess2.tmbc.gov.uk/ => https://publicaccess2.tmbc.gov
 		- tmbc.gov.uk
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/TMCH.xml b/src/chrome/content/rules/TMCH.xml
index 77218fb6e454..e546fe88dec1 100644
--- a/src/chrome/content/rules/TMCH.xml
+++ b/src/chrome/content/rules/TMCH.xml
@@ -1,7 +1,7 @@
 
 
 
-	
+	
+	
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/TMPwebeng.com.xml b/src/chrome/content/rules/TMPwebeng.com.xml
index ff1d13c55a51..afc48bae2f64 100644
--- a/src/chrome/content/rules/TMPwebeng.com.xml
+++ b/src/chrome/content/rules/TMPwebeng.com.xml
@@ -18,10 +18,12 @@ Fetch error: http://tmpwebeng.com/ => https://secure.tmpwebeng.com/: (7, 'Failed
 		- services
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
 	
@@ -30,7 +32,6 @@ Fetch error: http://tmpwebeng.com/ => https://secure.tmpwebeng.com/: (7, 'Failed
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/TMT.org.xml b/src/chrome/content/rules/TMT.org.xml
new file mode 100644
index 000000000000..572ac8cab356
--- /dev/null
+++ b/src/chrome/content/rules/TMT.org.xml
@@ -0,0 +1,24 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/TMtm.ru.xml b/src/chrome/content/rules/TMtm.ru.xml
index d2f8872f07df..16677f03f3ad 100644
--- a/src/chrome/content/rules/TMtm.ru.xml
+++ b/src/chrome/content/rules/TMtm.ru.xml
@@ -5,7 +5,6 @@
 		- Freelansim.ru.xml
 		- HabraCDN.net.xml
 		- Habrahabr.ru.xml
-		- Habrastorage.org.xml
 		- Hsto.org.xml
 		- Hstor.org.xml
 		- megamozg.ru.xml
diff --git a/src/chrome/content/rules/TNNet.xml b/src/chrome/content/rules/TNNet.xml
index a5455d68091c..8008a16ae58e 100644
--- a/src/chrome/content/rules/TNNet.xml
+++ b/src/chrome/content/rules/TNNet.xml
@@ -4,15 +4,18 @@
 	-->
 
 	
-	
+	
+	
+	
+	
+	
 
 
-	
+	
 
 
 	
-	
 
+	
 
diff --git a/src/chrome/content/rules/TNS-Gallup.xml b/src/chrome/content/rules/TNS-Gallup.xml
index c289e3ac1794..a3cbf7fd4673 100644
--- a/src/chrome/content/rules/TNS-Gallup.xml
+++ b/src/chrome/content/rules/TNS-Gallup.xml
@@ -15,7 +15,7 @@ Fetch error: http://statistik-gallup.net/ => https://statistik-gallup.net/: (7,
 	* Refused
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/TNS-Global.xml b/src/chrome/content/rules/TNS-Global.xml
index 9371a448352b..ecb8b50b1b93 100644
--- a/src/chrome/content/rules/TNS-Global.xml
+++ b/src/chrome/content/rules/TNS-Global.xml
@@ -1,10 +1,30 @@
+
+
+
 
+	
 	
-	
-	
-	
-	
-	
-	
+	
+	
+	
+	
+	
+	
 	
 	
 	
 	
-	
-	
-	
+	
+	
+	
 
 	
 
diff --git a/src/chrome/content/rules/TNS-Info.xml b/src/chrome/content/rules/TNS-Info.xml
index cd77611a55ba..d67a518979b1 100644
--- a/src/chrome/content/rules/TNS-Info.xml
+++ b/src/chrome/content/rules/TNS-Info.xml
@@ -1,17 +1,24 @@
+
 
 
 
-	
-	
-	
-		
+	
+	
 	
-	
-		
-	
-		
+	
 
 	
 
diff --git a/src/chrome/content/rules/TNS-Sifo.xml b/src/chrome/content/rules/TNS-Sifo.xml
deleted file mode 100644
index 5497c3954bd1..000000000000
--- a/src/chrome/content/rules/TNS-Sifo.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/TOPlist.cz-falsemixed.xml b/src/chrome/content/rules/TOPlist.cz-falsemixed.xml
deleted file mode 100644
index 1f49587f9881..000000000000
--- a/src/chrome/content/rules/TOPlist.cz-falsemixed.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/TOPlist.cz.xml b/src/chrome/content/rules/TOPlist.cz.xml
deleted file mode 100644
index 587d0a44f8f6..000000000000
--- a/src/chrome/content/rules/TOPlist.cz.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-		
-		
-
-			
-			
-			
-			
-
-			
-			
-			
-
-
-	
-
-
diff --git a/src/chrome/content/rules/TPG-Capital.xml b/src/chrome/content/rules/TPG-Capital.xml
index dc4970baf67e..f0b60d0f98a4 100644
--- a/src/chrome/content/rules/TPG-Capital.xml
+++ b/src/chrome/content/rules/TPG-Capital.xml
@@ -24,7 +24,8 @@ Fetch error: http://neimanmarcus.com/ => https://www.neimanmarcus.com/: None
 	
 	
 	
-	
+	
+	
 
 	
diff --git a/src/chrome/content/rules/TRUNI.sk.xml b/src/chrome/content/rules/TRUNI.sk.xml
new file mode 100644
index 000000000000..164d7324925c
--- /dev/null
+++ b/src/chrome/content/rules/TRUNI.sk.xml
@@ -0,0 +1,25 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+        
+
+	
+
diff --git a/src/chrome/content/rules/TRiBot.org.xml b/src/chrome/content/rules/TRiBot.org.xml
index f8014202a549..833ece434812 100644
--- a/src/chrome/content/rules/TRiBot.org.xml
+++ b/src/chrome/content/rules/TRiBot.org.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TSHA_online.org.xml b/src/chrome/content/rules/TSHA_online.org.xml
index 649fee76675f..d6ac73450dfd 100644
--- a/src/chrome/content/rules/TSHA_online.org.xml
+++ b/src/chrome/content/rules/TSHA_online.org.xml
@@ -13,4 +13,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TSO.co.uk.xml b/src/chrome/content/rules/TSO.co.uk.xml
index 0db903cc31b1..8fcd851116de 100644
--- a/src/chrome/content/rules/TSO.co.uk.xml
+++ b/src/chrome/content/rules/TSO.co.uk.xml
@@ -8,10 +8,11 @@ Non-2xx HTTP code: http://tso.co.uk/ (200) => https://www.tso.co.uk/ (503)
 		- ^	(cert only matches www)
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
@@ -20,7 +21,6 @@ Non-2xx HTTP code: http://tso.co.uk/ (200) => https://www.tso.co.uk/ (503)
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/TSOshop.co.uk.xml b/src/chrome/content/rules/TSOshop.co.uk.xml
index 05a202b6be9b..c39c6c2801e4 100644
--- a/src/chrome/content/rules/TSOshop.co.uk.xml
+++ b/src/chrome/content/rules/TSOshop.co.uk.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TSUTAYA.co.jp.xml b/src/chrome/content/rules/TSUTAYA.co.jp.xml
new file mode 100644
index 000000000000..5fb454e51506
--- /dev/null
+++ b/src/chrome/content/rules/TSUTAYA.co.jp.xml
@@ -0,0 +1,45 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/TT.se.xml b/src/chrome/content/rules/TT.se.xml
index a0b56b1d7b63..271ce4133b44 100644
--- a/src/chrome/content/rules/TT.se.xml
+++ b/src/chrome/content/rules/TT.se.xml
@@ -1,7 +1,20 @@
+
+
 
-
-
-
-
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
+	
+
diff --git a/src/chrome/content/rules/TU-Chemnitz.de.xml b/src/chrome/content/rules/TU-Chemnitz.de.xml
index a19c73c747bf..507a69a3c7d7 100644
--- a/src/chrome/content/rules/TU-Chemnitz.de.xml
+++ b/src/chrome/content/rules/TU-Chemnitz.de.xml
@@ -22,13 +22,14 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/TU-Darmstadt.de.xml b/src/chrome/content/rules/TU-Darmstadt.de.xml
index b1ac6c7d59a5..62b1b9a20906 100644
--- a/src/chrome/content/rules/TU-Darmstadt.de.xml
+++ b/src/chrome/content/rules/TU-Darmstadt.de.xml
@@ -1,46 +1,285 @@
 
-
-
-	
-
-
-	
-	
+
 
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/TU-I-TAM.xml b/src/chrome/content/rules/TU-I-TAM.xml
index c79260c9ee6e..e3a9a1f2f956 100644
--- a/src/chrome/content/rules/TU-I-TAM.xml
+++ b/src/chrome/content/rules/TU-I-TAM.xml
@@ -5,12 +5,12 @@ Fetch error: http://tuitam.pl/ => https://tuitam.pl/: (60, 'SSL certificate prob
 Fetch error: http://www.tuitam.pl/ => https://www.tuitam.pl/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
 
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/TU-Ilmenau.de.xml b/src/chrome/content/rules/TU-Ilmenau.de.xml
index 26edb00c889d..a5568d363f58 100644
--- a/src/chrome/content/rules/TU-Ilmenau.de.xml
+++ b/src/chrome/content/rules/TU-Ilmenau.de.xml
@@ -13,7 +13,8 @@
 
 
 	
-	
+	
+	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/TUGraz.at.xml b/src/chrome/content/rules/TUGraz.at.xml
index 9e333c247150..6b7df774977e 100644
--- a/src/chrome/content/rules/TUGraz.at.xml
+++ b/src/chrome/content/rules/TUGraz.at.xml
@@ -69,16 +69,24 @@ Fetch error: http://online.tu-graz.ac.at/ => https://online.tu-graz.ac.at/: (51,
 	* Unsecurable <= 404
 
 -->
-
-
-	
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 		
 		
 	
 
 
-	
 
 	
@@ -86,7 +94,6 @@ Fetch error: http://online.tu-graz.ac.at/ => https://online.tu-graz.ac.at/: (51,
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/TUHH.de.xml b/src/chrome/content/rules/TUHH.de.xml
index a63f7c99ff9c..f147ea42b13a 100644
--- a/src/chrome/content/rules/TUHH.de.xml
+++ b/src/chrome/content/rules/TUHH.de.xml
@@ -40,7 +40,7 @@
 	
 	
 		
-	
+
 		
 
 
diff --git a/src/chrome/content/rules/TUKE.sk.xml b/src/chrome/content/rules/TUKE.sk.xml
new file mode 100644
index 000000000000..d7c793ae45de
--- /dev/null
+++ b/src/chrome/content/rules/TUKE.sk.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/TUT.fi.xml b/src/chrome/content/rules/TUT.fi.xml
index 4fb0f8568eb0..3d5be1a5a214 100644
--- a/src/chrome/content/rules/TUT.fi.xml
+++ b/src/chrome/content/rules/TUT.fi.xml
@@ -13,7 +13,8 @@
 -->
 
 
-	
+	
+	
 
 
 	
-
+
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/TV4Play.se.xml b/src/chrome/content/rules/TV4Play.se.xml
index 9174b91ca794..74f6c33b9829 100644
--- a/src/chrome/content/rules/TV4Play.se.xml
+++ b/src/chrome/content/rules/TV4Play.se.xml
@@ -27,7 +27,7 @@ Connection refused:
 	- ^
 	- api.tv4play.se
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/TVBrowser.org.xml b/src/chrome/content/rules/TVBrowser.org.xml
index b30da1665647..abbac6d1d099 100644
--- a/src/chrome/content/rules/TVBrowser.org.xml
+++ b/src/chrome/content/rules/TVBrowser.org.xml
@@ -36,7 +36,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -45,4 +46,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TVLinks.xml b/src/chrome/content/rules/TVLinks.xml
deleted file mode 100644
index 83f5c40e5a67..000000000000
--- a/src/chrome/content/rules/TVLinks.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/TVMaze.com.xml b/src/chrome/content/rules/TVMaze.com.xml
new file mode 100644
index 000000000000..1405cc43fe76
--- /dev/null
+++ b/src/chrome/content/rules/TVMaze.com.xml
@@ -0,0 +1,10 @@
+
+		
+        
+        
+        
+        
+
+        
+
diff --git a/src/chrome/content/rules/TVNZ.xml b/src/chrome/content/rules/TVNZ.xml
index 1907be3489ad..abc5542e319f 100644
--- a/src/chrome/content/rules/TVNZ.xml
+++ b/src/chrome/content/rules/TVNZ.xml
@@ -44,7 +44,7 @@
 
 	
-		
+
 	
 
diff --git a/src/chrome/content/rules/TVNewsCheck.com.xml b/src/chrome/content/rules/TVNewsCheck.com.xml
index 646364441346..d46e16e83f48 100644
--- a/src/chrome/content/rules/TVNewsCheck.com.xml
+++ b/src/chrome/content/rules/TVNewsCheck.com.xml
@@ -11,11 +11,12 @@
 
 
 	
-	
+	
+	
 		
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TVTropes.org.xml b/src/chrome/content/rules/TVTropes.org.xml
new file mode 100644
index 000000000000..c26877945bee
--- /dev/null
+++ b/src/chrome/content/rules/TVTropes.org.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+		
+
+
+	
+
+
diff --git a/src/chrome/content/rules/TV_Nutt.com.xml b/src/chrome/content/rules/TV_Nutt.com.xml
deleted file mode 100644
index 37de00bf5b92..000000000000
--- a/src/chrome/content/rules/TV_Nutt.com.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/TV_Tropes.xml b/src/chrome/content/rules/TV_Tropes.xml
deleted file mode 100644
index 40a79aded7aa..000000000000
--- a/src/chrome/content/rules/TV_Tropes.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/TWRP.xml b/src/chrome/content/rules/TWRP.xml
index 0dd2eb38a7b6..a106ac0a4ee0 100644
--- a/src/chrome/content/rules/TWRP.xml
+++ b/src/chrome/content/rules/TWRP.xml
@@ -14,6 +14,6 @@
 
 	
 
-	
 
diff --git a/src/chrome/content/rules/TXT.ca.xml b/src/chrome/content/rules/TXT.ca.xml
new file mode 100644
index 000000000000..89db350b6f5d
--- /dev/null
+++ b/src/chrome/content/rules/TXT.ca.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/TYPO3.org-falsemixed.xml b/src/chrome/content/rules/TYPO3.org-falsemixed.xml
index e4a891b17b61..b441b954a5b4 100644
--- a/src/chrome/content/rules/TYPO3.org-falsemixed.xml
+++ b/src/chrome/content/rules/TYPO3.org-falsemixed.xml
@@ -6,7 +6,7 @@ Fetch error: http://flow.typo3.org/ => https://flow.typo3.org/: (51, "SSL: no al
 	For rules not causing false/broken MCB, see TYPO3.xml.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/TYPO3.xml b/src/chrome/content/rules/TYPO3.xml
index 986a9a2beaf9..5345a26447ad 100644
--- a/src/chrome/content/rules/TYPO3.xml
+++ b/src/chrome/content/rules/TYPO3.xml
@@ -5,11 +5,6 @@ Fetch error: http://flow.typo3.org/_Resources/Static/Packages/TYPO3.FlowTypo3Org
 
 	For rules causing false/broken MCB, see TYPO3.org-falsemixed.xml.
 
-	Other TYPO3 rulesets:
-
-		- T3Blog.com.xml
-
-
 	Nonfunctional hosts in *typo3.org:
 
 		- demo ¹
@@ -46,7 +41,7 @@ Fetch error: http://flow.typo3.org/_Resources/Static/Packages/TYPO3.FlowTypo3Org
 	⁴ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/TZ.de.xml b/src/chrome/content/rules/TZ.de.xml
index 54ffead3aa78..df98030befc0 100644
--- a/src/chrome/content/rules/TZ.de.xml
+++ b/src/chrome/content/rules/TZ.de.xml
@@ -1,9 +1,26 @@
+
 
 
-	
-	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/TaDst.com.xml b/src/chrome/content/rules/TaDst.com.xml
index 6c5e60fa7cc2..507f5d574034 100644
--- a/src/chrome/content/rules/TaDst.com.xml
+++ b/src/chrome/content/rules/TaDst.com.xml
@@ -15,7 +15,8 @@
 -->
 
 
-	
+	
+	
 
 
 	
-
 
+
 	
 	
 	
+	
 	
 	
 	
@@ -40,6 +39,7 @@
 	
 	
 	
+	
 	
 	
 	
@@ -48,6 +48,7 @@
 	
 	
 	
+	
 	
 	
 	
@@ -64,5 +65,4 @@
 	
 
 	
-
 
diff --git a/src/chrome/content/rules/Tactical_Tech.org.xml b/src/chrome/content/rules/Tactical_Tech.org.xml
index e09ca209f58f..5a719cef843f 100644
--- a/src/chrome/content/rules/Tactical_Tech.org.xml
+++ b/src/chrome/content/rules/Tactical_Tech.org.xml
@@ -5,7 +5,6 @@ Fetch error: http://protect.tacticaltech.org/ => https://protect.tacticaltech.or
 
 	Other Tactical Technology rulesets:
 
-		- Drawing_by_Numbers.org.xml
 		- Exposing_the_Invisible.org.xml
 		- Informationactivism.org.xml
 		- My_Shadow.com.xml
@@ -35,7 +34,7 @@ Fetch error: http://protect.tacticaltech.org/ => https://protect.tacticaltech.or
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/TafasirStore.com.xml b/src/chrome/content/rules/TafasirStore.com.xml
new file mode 100644
index 000000000000..dce05c286f57
--- /dev/null
+++ b/src/chrome/content/rules/TafasirStore.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Tafsir.one.xml b/src/chrome/content/rules/Tafsir.one.xml
new file mode 100644
index 000000000000..b7aef7dcb4d7
--- /dev/null
+++ b/src/chrome/content/rules/Tafsir.one.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/TafsirStore.com.xml b/src/chrome/content/rules/TafsirStore.com.xml
new file mode 100644
index 000000000000..380059c2c796
--- /dev/null
+++ b/src/chrome/content/rules/TafsirStore.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/TagMan.xml b/src/chrome/content/rules/TagMan.xml
index aafe8f893e3b..89f1dfd87564 100644
--- a/src/chrome/content/rules/TagMan.xml
+++ b/src/chrome/content/rules/TagMan.xml
@@ -16,7 +16,7 @@ Fetch error: http://admin.tagman.com/ => https://admin.tagman.com/: (60, 'SSL ce
 	* Refused
 
 -->
-
+
 
 	
 
@@ -26,4 +26,4 @@ Fetch error: http://admin.tagman.com/ => https://admin.tagman.com/: (60, 'SSL ce
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Tagasauris.com.xml b/src/chrome/content/rules/Tagasauris.com.xml
index 746b2a541b06..ace413bc7c0a 100644
--- a/src/chrome/content/rules/Tagasauris.com.xml
+++ b/src/chrome/content/rules/Tagasauris.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://photo.tagasauris.com/ => https://photo.tagasauris.com/: Too
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Tagesanzeiger.ch.xml b/src/chrome/content/rules/Tagesanzeiger.ch.xml
index 4482c2c9f705..80cfe58210ec 100644
--- a/src/chrome/content/rules/Tagesanzeiger.ch.xml
+++ b/src/chrome/content/rules/Tagesanzeiger.ch.xml
@@ -3,7 +3,7 @@
 
 	Cert expired:
 		- staging.mobile.tagesanzeiger.ch
-		
+
 	Cert mismatch:
 		- www.1zu12.tagesanzeiger.ch
 		- www.abo.tagesanzeiger.ch
diff --git a/src/chrome/content/rules/Tagesspiegel.de.xml b/src/chrome/content/rules/Tagesspiegel.de.xml
new file mode 100644
index 000000000000..cc37ad658d78
--- /dev/null
+++ b/src/chrome/content/rules/Tagesspiegel.de.xml
@@ -0,0 +1,79 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Tahmil-KutubPDF.com.xml b/src/chrome/content/rules/Tahmil-KutubPDF.com.xml
deleted file mode 100644
index 9f2207e98f89..000000000000
--- a/src/chrome/content/rules/Tahmil-KutubPDF.com.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-	
-	
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Taimiah.org.xml b/src/chrome/content/rules/Taimiah.org.xml
new file mode 100644
index 000000000000..748509161e9b
--- /dev/null
+++ b/src/chrome/content/rules/Taimiah.org.xml
@@ -0,0 +1,14 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Take_Control_Ebooks.xml b/src/chrome/content/rules/Take_Control_Ebooks.xml
index 270b09792a0f..106b3610e93a 100644
--- a/src/chrome/content/rules/Take_Control_Ebooks.xml
+++ b/src/chrome/content/rules/Take_Control_Ebooks.xml
@@ -4,9 +4,9 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Takw.in.xml b/src/chrome/content/rules/Takw.in.xml
new file mode 100644
index 000000000000..e121fdd237b8
--- /dev/null
+++ b/src/chrome/content/rules/Takw.in.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Taleo.xml b/src/chrome/content/rules/Taleo.xml
index 9141504a6ab7..1f220f058827 100644
--- a/src/chrome/content/rules/Taleo.xml
+++ b/src/chrome/content/rules/Taleo.xml
@@ -15,7 +15,7 @@ Fetch error: http://www.taleo.com/ => https://www.oracle.com/us/products/applica
 	(www.)?taleo.com: Redirects to http
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Talk-Active.xml b/src/chrome/content/rules/Talk-Active.xml
deleted file mode 100644
index 89b40a8d942b..000000000000
--- a/src/chrome/content/rules/Talk-Active.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/TalkTalk-mismatches.xml b/src/chrome/content/rules/TalkTalk-mismatches.xml
index f386b4b4dda9..f6fe0287b531 100644
--- a/src/chrome/content/rules/TalkTalk-mismatches.xml
+++ b/src/chrome/content/rules/TalkTalk-mismatches.xml
@@ -3,7 +3,7 @@
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/TalkTalk.xml b/src/chrome/content/rules/TalkTalk.xml
index 77f8298e0cbe..b8d3e3069f63 100644
--- a/src/chrome/content/rules/TalkTalk.xml
+++ b/src/chrome/content/rules/TalkTalk.xml
@@ -56,7 +56,7 @@ Fetch error: http://my.talktalk.co.uk/ => https://my.talktalk.co.uk/: (7, 'Faile
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/TalkTalk_Business.co.uk.xml b/src/chrome/content/rules/TalkTalk_Business.co.uk.xml
index 1dc65d925cd5..0c0996d074b2 100644
--- a/src/chrome/content/rules/TalkTalk_Business.co.uk.xml
+++ b/src/chrome/content/rules/TalkTalk_Business.co.uk.xml
@@ -15,7 +15,7 @@ Fetch error: http://www.talktalkbusiness.co.uk/ => https://www.talktalkbusiness.
 		- www.talktalkbusiness.co.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Talkhealth_partnership.com.xml b/src/chrome/content/rules/Talkhealth_partnership.com.xml
index a53714e7ada6..4d358a3bd0d4 100644
--- a/src/chrome/content/rules/Talkhealth_partnership.com.xml
+++ b/src/chrome/content/rules/Talkhealth_partnership.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.talkhealthpartnership.com/ => https://www.talkhealthpart
 		- www.talkhealthpartnership.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Talking_Points_Memo.com.xml b/src/chrome/content/rules/Talking_Points_Memo.com.xml
index 525e463e3a28..d9af449cccde 100644
--- a/src/chrome/content/rules/Talking_Points_Memo.com.xml
+++ b/src/chrome/content/rules/Talking_Points_Memo.com.xml
@@ -34,7 +34,6 @@
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Talky.io.xml b/src/chrome/content/rules/Talky.io.xml
index d361acedea30..d8534101e0c8 100644
--- a/src/chrome/content/rules/Talky.io.xml
+++ b/src/chrome/content/rules/Talky.io.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://beta.talky.io/ => https://beta.talky.io/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Tampermonkey.xml b/src/chrome/content/rules/Tampermonkey.xml
index 7e635122386b..d6e6b5d1aef2 100644
--- a/src/chrome/content/rules/Tampermonkey.xml
+++ b/src/chrome/content/rules/Tampermonkey.xml
@@ -16,9 +16,9 @@
 	
 	
 	
-	
+
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Tandem_Calendar.xml b/src/chrome/content/rules/Tandem_Calendar.xml
index 897861cb8451..daec148bc4cd 100644
--- a/src/chrome/content/rules/Tandem_Calendar.xml
+++ b/src/chrome/content/rules/Tandem_Calendar.xml
@@ -18,4 +18,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Tanger.ma.xml b/src/chrome/content/rules/Tanger.ma.xml
new file mode 100644
index 000000000000..e40ba58c166c
--- /dev/null
+++ b/src/chrome/content/rules/Tanger.ma.xml
@@ -0,0 +1,34 @@
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Tangerine-Bank.xml b/src/chrome/content/rules/Tangerine-Bank.xml
index 7c751aa2a31d..861fdbc2092d 100644
--- a/src/chrome/content/rules/Tangerine-Bank.xml
+++ b/src/chrome/content/rules/Tangerine-Bank.xml
@@ -24,7 +24,6 @@
 	
 	
 
-	
 
 	
 
diff --git a/src/chrome/content/rules/Tango.me.xml b/src/chrome/content/rules/Tango.me.xml
index 40e565d07bbd..09b8c8171bea 100644
--- a/src/chrome/content/rules/Tango.me.xml
+++ b/src/chrome/content/rules/Tango.me.xml
@@ -24,7 +24,7 @@ Fetch error: http://media.tango.me/ => https://media.tango.me/: (28, 'Operation
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/TankaFetast.com.xml b/src/chrome/content/rules/TankaFetast.com.xml
index 1a57e7c19feb..e284af3e887c 100644
--- a/src/chrome/content/rules/TankaFetast.com.xml
+++ b/src/chrome/content/rules/TankaFetast.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.tankafetast.com/ => https://www.tankafetast.com/: (35, '
 		- .tankafetast.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Tanzschule-wernecke.de.xml b/src/chrome/content/rules/Tanzschule-wernecke.de.xml
new file mode 100644
index 000000000000..207a76f07b04
--- /dev/null
+++ b/src/chrome/content/rules/Tanzschule-wernecke.de.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Tapatalk.com.xml b/src/chrome/content/rules/Tapatalk.com.xml
new file mode 100644
index 000000000000..b4360d3fc0cc
--- /dev/null
+++ b/src/chrome/content/rules/Tapatalk.com.xml
@@ -0,0 +1,106 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Tapatalk.xml b/src/chrome/content/rules/Tapatalk.xml
deleted file mode 100644
index 4a64bfaba7d9..000000000000
--- a/src/chrome/content/rules/Tapatalk.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Tape.tv.xml b/src/chrome/content/rules/Tape.tv.xml
index dc8fcc419886..637a50a3255d 100644
--- a/src/chrome/content/rules/Tape.tv.xml
+++ b/src/chrome/content/rules/Tape.tv.xml
@@ -9,7 +9,7 @@ Fetch error: http://web202.tape.tv/ => https://web202.tape.tv/: (6, 'Could not r
 Fetch error: http://tapetv-slowjam.de/ => https://tapetv-slowjam.de/: (6, 'Could not resolve host: tapetv-slowjam.de')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Tapgage.xml b/src/chrome/content/rules/Tapgage.xml
index 3c3ff2dead3a..a16812f02e71 100644
--- a/src/chrome/content/rules/Tapgage.xml
+++ b/src/chrome/content/rules/Tapgage.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.tapgage.net/ => https://www.tapgage.net/: (60, 'SSL cert
 	!www: self-signed
 
 -->
-
+
 
 	
 	
@@ -21,4 +21,4 @@ Fetch error: http://www.tapgage.net/ => https://www.tapgage.net/: (60, 'SSL cert
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Tapiture.com.xml b/src/chrome/content/rules/Tapiture.com.xml
index 5cf0501480b4..7b4608501d48 100644
--- a/src/chrome/content/rules/Tapiture.com.xml
+++ b/src/chrome/content/rules/Tapiture.com.xml
@@ -36,7 +36,7 @@ Fetch error: http://www.tapiture.com/ => https://www.tapiture.com/: (28, 'Connec
 		- Image from s3-live.tapcdn.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Taranis.news.xml b/src/chrome/content/rules/Taranis.news.xml
new file mode 100644
index 000000000000..60c8d5b85f17
--- /dev/null
+++ b/src/chrome/content/rules/Taranis.news.xml
@@ -0,0 +1,8 @@
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Tarasic.com.tw.xml b/src/chrome/content/rules/Tarasic.com.tw.xml
index 548f2b8cfd9c..029e5a3f3bb9 100644
--- a/src/chrome/content/rules/Tarasic.com.tw.xml
+++ b/src/chrome/content/rules/Tarasic.com.tw.xml
@@ -30,4 +30,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Target.com.au.xml b/src/chrome/content/rules/Target.com.au.xml
new file mode 100644
index 000000000000..014283e18c50
--- /dev/null
+++ b/src/chrome/content/rules/Target.com.au.xml
@@ -0,0 +1,75 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Target_Performance.xml b/src/chrome/content/rules/Target_Performance.xml
index 56b5ca67d213..4b1ff59712b0 100644
--- a/src/chrome/content/rules/Target_Performance.xml
+++ b/src/chrome/content/rules/Target_Performance.xml
@@ -1,6 +1,15 @@
+
+
 
-
+
+
+
 
-
-
+
 
diff --git a/src/chrome/content/rules/Targeted_Threats.net.xml b/src/chrome/content/rules/Targeted_Threats.net.xml
index 20abca67f7bc..4c740baa00fa 100644
--- a/src/chrome/content/rules/Targeted_Threats.net.xml
+++ b/src/chrome/content/rules/Targeted_Threats.net.xml
@@ -5,7 +5,7 @@ Fetch error: http://targetedthreats.net/ => https://targetedthreats.net/: (28, '
 Fetch error: http://www.targetedthreats.net/ => https://www.targetedthreats.net/: (28, 'Connection timed out after 20000 milliseconds')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Tarlogic.com.xml b/src/chrome/content/rules/Tarlogic.com.xml
index 73a8e2676ee9..9d8f4fbe0914 100644
--- a/src/chrome/content/rules/Tarlogic.com.xml
+++ b/src/chrome/content/rules/Tarlogic.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://tarlogic.com/ => https://tarlogic.com/: (51, "SSL: no altern
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Task_Force_on_Shale_Gas.uk.xml b/src/chrome/content/rules/Task_Force_on_Shale_Gas.uk.xml
deleted file mode 100644
index aad0faf2430b..000000000000
--- a/src/chrome/content/rules/Task_Force_on_Shale_Gas.uk.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-	
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Tate_Publishing.com.xml b/src/chrome/content/rules/Tate_Publishing.com.xml
deleted file mode 100644
index 7d869d033cc0..000000000000
--- a/src/chrome/content/rules/Tate_Publishing.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Tatrabanka.sk.xml b/src/chrome/content/rules/Tatrabanka.sk.xml
new file mode 100644
index 000000000000..825a14e82d24
--- /dev/null
+++ b/src/chrome/content/rules/Tatrabanka.sk.xml
@@ -0,0 +1,23 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/TauCeti.org.au.xml b/src/chrome/content/rules/TauCeti.org.au.xml
index bf19feba4f7b..3987d0e82390 100644
--- a/src/chrome/content/rules/TauCeti.org.au.xml
+++ b/src/chrome/content/rules/TauCeti.org.au.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TawkTo.xml b/src/chrome/content/rules/TawkTo.xml
index cc002a3b7eef..1b2e8b8d9253 100644
--- a/src/chrome/content/rules/TawkTo.xml
+++ b/src/chrome/content/rules/TawkTo.xml
@@ -3,9 +3,9 @@
 	
 	
 	
-	
+
 	
-  
+
 	
 
diff --git a/src/chrome/content/rules/TaxAct.xml b/src/chrome/content/rules/TaxAct.xml
index b070dd5c3b61..13323a76adaa 100644
--- a/src/chrome/content/rules/TaxAct.xml
+++ b/src/chrome/content/rules/TaxAct.xml
@@ -17,7 +17,7 @@ Fetch error: http://www2.taxactonline.com/ => https://www2.taxactonline.com/: (6
 
 		¹ hostname mismatch
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/TaxChopper.ca.xml b/src/chrome/content/rules/TaxChopper.ca.xml
new file mode 100644
index 000000000000..180ac4d4d66b
--- /dev/null
+++ b/src/chrome/content/rules/TaxChopper.ca.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/TaxPayers_Alliance.xml b/src/chrome/content/rules/TaxPayers_Alliance.xml
index 5dc9bea0fd16..0745ca0bebd0 100644
--- a/src/chrome/content/rules/TaxPayers_Alliance.xml
+++ b/src/chrome/content/rules/TaxPayers_Alliance.xml
@@ -8,10 +8,10 @@ Non-2xx HTTP code: http://taxpayersalliance.com/ (200) => https://www.taxpayersa
 	^: Expired 2013-05-13
 
 -->
-
+
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Taxify.eu.xml b/src/chrome/content/rules/Taxify.eu.xml
new file mode 100644
index 000000000000..eb562a8bed75
--- /dev/null
+++ b/src/chrome/content/rules/Taxify.eu.xml
@@ -0,0 +1,23 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Tchibo.xml b/src/chrome/content/rules/Tchibo.xml
index 3e4eaac365e5..92288bed6d3a 100644
--- a/src/chrome/content/rules/Tchibo.xml
+++ b/src/chrome/content/rules/Tchibo.xml
@@ -14,7 +14,7 @@ Problematic domains:
 	- radoscodkrywania.tchibo.pl
 	- *tchibo.com
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Tcpdump.org.xml b/src/chrome/content/rules/Tcpdump.org.xml
new file mode 100644
index 000000000000..1488137fdb38
--- /dev/null
+++ b/src/chrome/content/rules/Tcpdump.org.xml
@@ -0,0 +1,25 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Tdesktop.com.xml b/src/chrome/content/rules/Tdesktop.com.xml
index 0e8dfe3c887b..25b10c59108c 100644
--- a/src/chrome/content/rules/Tdesktop.com.xml
+++ b/src/chrome/content/rules/Tdesktop.com.xml
@@ -3,7 +3,7 @@
 Disabled by https-everywhere-checker because:
 Fetch error: http://update.tdesktop.com/ => https://update.tdesktop.com/: (51, "SSL: no alternative certificate subject name matches target host name 'update.tdesktop.com'")
 
-	For other Telegram coverage, see Telegram.org.xml.
+	For other Telegram coverage, see Telegram.me.xml.
 
 
 	These altnames don't exist:
@@ -11,7 +11,7 @@ Fetch error: http://update.tdesktop.com/ => https://update.tdesktop.com/: (51, "
 		- www.updates.tdesktop.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Tdnam.com.xml b/src/chrome/content/rules/Tdnam.com.xml
deleted file mode 100644
index e4ca7fbfbac5..000000000000
--- a/src/chrome/content/rules/Tdnam.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/TeacherCast.net.xml b/src/chrome/content/rules/TeacherCast.net.xml
new file mode 100644
index 000000000000..f7a37a2b89df
--- /dev/null
+++ b/src/chrome/content/rules/TeacherCast.net.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Teachers_Assurance.xml b/src/chrome/content/rules/Teachers_Assurance.xml
index 6f26a9e6dba2..9715caf00a3e 100644
--- a/src/chrome/content/rules/Teachers_Assurance.xml
+++ b/src/chrome/content/rules/Teachers_Assurance.xml
@@ -33,4 +33,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Tealium.com.xml b/src/chrome/content/rules/Tealium.com.xml
index f55fbd0f07c1..4659293279d9 100644
--- a/src/chrome/content/rules/Tealium.com.xml
+++ b/src/chrome/content/rules/Tealium.com.xml
@@ -22,7 +22,7 @@
 
 	TLS-error:
 		- mail.tealium.com
-	
+
 	Redirects to plain-text:
 		- support.tealiumiq.com
 -->
diff --git a/src/chrome/content/rules/Team-share.net.xml b/src/chrome/content/rules/Team-share.net.xml
deleted file mode 100644
index 782645f43657..000000000000
--- a/src/chrome/content/rules/Team-share.net.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/TeamLiquid.net.xml b/src/chrome/content/rules/TeamLiquid.net.xml
new file mode 100644
index 000000000000..1f8e699ddd57
--- /dev/null
+++ b/src/chrome/content/rules/TeamLiquid.net.xml
@@ -0,0 +1,8 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Team_Cymru.xml b/src/chrome/content/rules/Team_Cymru.xml
index ba27eeea3cc5..6996b3310ddd 100644
--- a/src/chrome/content/rules/Team_Cymru.xml
+++ b/src/chrome/content/rules/Team_Cymru.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Team_UNICEF.org.xml b/src/chrome/content/rules/Team_UNICEF.org.xml
deleted file mode 100644
index 9f3d59c804c4..000000000000
--- a/src/chrome/content/rules/Team_UNICEF.org.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Team_in_Training.org.xml b/src/chrome/content/rules/Team_in_Training.org.xml
index b3f71968e454..91587e7c6ccd 100644
--- a/src/chrome/content/rules/Team_in_Training.org.xml
+++ b/src/chrome/content/rules/Team_in_Training.org.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.teamintraining.org/ => https://www.teamintraining.org/:
 		- ^	(works; mismatched, CN: *.lls.org)
 
 -->
-
+
 
 	
 	
@@ -26,4 +26,4 @@ Fetch error: http://www.teamintraining.org/ => https://www.teamintraining.org/:
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Teamviewer.xml b/src/chrome/content/rules/Teamviewer.xml
index b106065ff8eb..9c1a661c05bf 100644
--- a/src/chrome/content/rules/Teamviewer.xml
+++ b/src/chrome/content/rules/Teamviewer.xml
@@ -1,5 +1,5 @@
 
 
diff --git a/src/chrome/content/rules/Teanglann.ie.xml b/src/chrome/content/rules/Teanglann.ie.xml
new file mode 100644
index 000000000000..5531450060c7
--- /dev/null
+++ b/src/chrome/content/rules/Teanglann.ie.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/TeardownIQ.com.xml b/src/chrome/content/rules/TeardownIQ.com.xml
deleted file mode 100644
index 4fcd58e6e401..000000000000
--- a/src/chrome/content/rules/TeardownIQ.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/TechHouse.xml b/src/chrome/content/rules/TechHouse.xml
index 60de3dea2444..bde8eab45d42 100644
--- a/src/chrome/content/rules/TechHouse.xml
+++ b/src/chrome/content/rules/TechHouse.xml
@@ -2,7 +2,7 @@
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/TechRepublic.com-problematic.xml b/src/chrome/content/rules/TechRepublic.com-problematic.xml
deleted file mode 100644
index a60f7a65522d..000000000000
--- a/src/chrome/content/rules/TechRepublic.com-problematic.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/TechRepublic.com.xml b/src/chrome/content/rules/TechRepublic.com.xml
new file mode 100644
index 000000000000..186a269b37cc
--- /dev/null
+++ b/src/chrome/content/rules/TechRepublic.com.xml
@@ -0,0 +1,43 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/TechRepublic.xml b/src/chrome/content/rules/TechRepublic.xml
deleted file mode 100644
index 248b1def8de0..000000000000
--- a/src/chrome/content/rules/TechRepublic.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-
-	
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/TechSay.com.xml b/src/chrome/content/rules/TechSay.com.xml
index 422c900b392d..e33ec8fc4d5d 100644
--- a/src/chrome/content/rules/TechSay.com.xml
+++ b/src/chrome/content/rules/TechSay.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://techsay.com/ => https://techsay.com/: (51, "SSL: no alternat
 		- www.techsay.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/TechStage.de.xml b/src/chrome/content/rules/TechStage.de.xml
new file mode 100644
index 000000000000..1ccf16507454
--- /dev/null
+++ b/src/chrome/content/rules/TechStage.de.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/TechVerse.xml b/src/chrome/content/rules/TechVerse.xml
index fccec383db55..0b82c67fb6f7 100644
--- a/src/chrome/content/rules/TechVerse.xml
+++ b/src/chrome/content/rules/TechVerse.xml
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TechWeb.xml b/src/chrome/content/rules/TechWeb.xml
index 90f433b88fba..d1794776d7a7 100644
--- a/src/chrome/content/rules/TechWeb.xml
+++ b/src/chrome/content/rules/TechWeb.xml
@@ -36,7 +36,7 @@ Fetch error: http://techwebonlineevents.com/ => https://www.techwebonlineevents.
 			- ng
 
 -->
-
+
 
 	
 	
@@ -65,7 +65,7 @@ Fetch error: http://techwebonlineevents.com/ => https://www.techwebonlineevents.
 	
 	
+		to="https://img.lightreading.com/" />
 
 	
diff --git a/src/chrome/content/rules/Tech_Tools_for_Activism.org.xml b/src/chrome/content/rules/Tech_Tools_for_Activism.org.xml
index 9f91c977a0a2..b0314a8a9d32 100644
--- a/src/chrome/content/rules/Tech_Tools_for_Activism.org.xml
+++ b/src/chrome/content/rules/Tech_Tools_for_Activism.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://techtoolsforactivism.org/ => https://techtoolsforactivism.or
 Fetch error: http://www.techtoolsforactivism.org/ => https://www.techtoolsforactivism.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.techtoolsforactivism.org'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Techendo.com.xml b/src/chrome/content/rules/Techendo.com.xml
index 98bedb9eff00..979c2c4f6f99 100644
--- a/src/chrome/content/rules/Techendo.com.xml
+++ b/src/chrome/content/rules/Techendo.com.xml
@@ -5,7 +5,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
 	
 	
 	
-	
+
 	
 
-	
 
diff --git a/src/chrome/content/rules/Technical-University-of-Denmark.xml b/src/chrome/content/rules/Technical-University-of-Denmark.xml
index abfd9b9b5766..bf4b105ccfc3 100644
--- a/src/chrome/content/rules/Technical-University-of-Denmark.xml
+++ b/src/chrome/content/rules/Technical-University-of-Denmark.xml
@@ -41,7 +41,7 @@ Fetch error: http://www.portalen.dtu.dk/ => https://portalen.dtu.dk/: (7, 'Faile
 		- www.portalen.dtu.dk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Technical-University-of-Lisbon.xml b/src/chrome/content/rules/Technical-University-of-Lisbon.xml
index 9b7d0b3d9783..a6bf979ebe3d 100644
--- a/src/chrome/content/rules/Technical-University-of-Lisbon.xml
+++ b/src/chrome/content/rules/Technical-University-of-Lisbon.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://utl.pt/ => https://www.utl.pt/: (6, 'Could not resolve host: utl.pt')
 Non-2xx HTTP code: http://www.utl.pt/ (200) => https://www.utl.pt/ (401)
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Technical.ly.xml b/src/chrome/content/rules/Technical.ly.xml
index a95a9907b587..49bd09c47cfc 100644
--- a/src/chrome/content/rules/Technical.ly.xml
+++ b/src/chrome/content/rules/Technical.ly.xml
@@ -7,12 +7,12 @@ Fetch error: http://www.technical.ly/organization/accessmd-com/ => https://www.t
 Fetch error: http://www.technical.ly/philly/2016/03/11/federal-open-source-policy-philadelphia/ => https://www.technical.ly/philly/2016/03/11/federal-open-source-policy-philadelphia/: Too many redirects while fetching 'https://www.technical.ly/philly/2016/03/11/federal-open-source-policy-philadelphia/'
 
 -->
-
+
 	
 	
 	
 
-	
 	
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Technical_Community.com.xml b/src/chrome/content/rules/Technical_Community.com.xml
deleted file mode 100644
index ebdd3baa255a..000000000000
--- a/src/chrome/content/rules/Technical_Community.com.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Technical_University_Munich.xml b/src/chrome/content/rules/Technical_University_Munich.xml
index 7c16b97c8be1..d24b125ba067 100644
--- a/src/chrome/content/rules/Technical_University_Munich.xml
+++ b/src/chrome/content/rules/Technical_University_Munich.xml
@@ -50,11 +50,23 @@ Fetch error: http://ias.cs.tum.edu/ => https://ias.cs.tum.edu/: (60, 'SSL certif
 	* Secured by us
 
 -->
-
-
-	
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
-	
+	
+	
+	
+	
 
 
 	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Teddy_Online_Judge.net.xml b/src/chrome/content/rules/Teddy_Online_Judge.net.xml
index 62800eca99b8..207c47770498 100644
--- a/src/chrome/content/rules/Teddy_Online_Judge.net.xml
+++ b/src/chrome/content/rules/Teddy_Online_Judge.net.xml
@@ -8,7 +8,7 @@
 		- www.teddyonlinejudge.net
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/TeenDriverSource.org.xml b/src/chrome/content/rules/TeenDriverSource.org.xml
index f3a4b27b7d97..0ed09385492e 100644
--- a/src/chrome/content/rules/TeenDriverSource.org.xml
+++ b/src/chrome/content/rules/TeenDriverSource.org.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://teendriversource.org/ => https://teendriversource.org/: Cycle detected - URL already encountered: https://www.teendriversource.org/
 Fetch error: http://www.teendriversource.org/ => https://www.teendriversource.org/: Cycle detected - URL already encountered: https://www.teendriversource.org/
 -->
-
+
 
 	
 	
@@ -19,4 +19,4 @@ Fetch error: http://www.teendriversource.org/ => https://www.teendriversource.or
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Teen_Revenue.com.xml b/src/chrome/content/rules/Teen_Revenue.com.xml
index 09e7936a3470..7545f2f274d0 100644
--- a/src/chrome/content/rules/Teen_Revenue.com.xml
+++ b/src/chrome/content/rules/Teen_Revenue.com.xml
@@ -8,7 +8,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -17,4 +18,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Teevox.com.xml b/src/chrome/content/rules/Teevox.com.xml
index 2917251664ee..caef61ce41c3 100644
--- a/src/chrome/content/rules/Teevox.com.xml
+++ b/src/chrome/content/rules/Teevox.com.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.teevox.com/ => https://www.teevox.com/: (51, "SSL: no al
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Tek_Syndicate.com.xml b/src/chrome/content/rules/Tek_Syndicate.com.xml
index 2afe57ef4edc..61ecc76a9f7d 100644
--- a/src/chrome/content/rules/Tek_Syndicate.com.xml
+++ b/src/chrome/content/rules/Tek_Syndicate.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://newton.teksyndicate.com/ => https://newton.teksyndicate.com/
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/TelMasters.xml b/src/chrome/content/rules/TelMasters.xml
index 3f7e7f795b75..96e9e0623177 100644
--- a/src/chrome/content/rules/TelMasters.xml
+++ b/src/chrome/content/rules/TelMasters.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://telmasters.com/ => https://telmasters.com/: (51, "SSL: no alternative certificate subject name matches target host name 'telmasters.com'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Tele-TASK.xml b/src/chrome/content/rules/Tele-TASK.xml
index b340c561f5de..5ec0ca597194 100644
--- a/src/chrome/content/rules/Tele-TASK.xml
+++ b/src/chrome/content/rules/Tele-TASK.xml
@@ -18,4 +18,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Tele2.lt.xml b/src/chrome/content/rules/Tele2.lt.xml
index 8c05eee2b38b..95101f5b1cd8 100644
--- a/src/chrome/content/rules/Tele2.lt.xml
+++ b/src/chrome/content/rules/Tele2.lt.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://loyaloop.tele2.lt/ => https://loyaloop.tele2.lt/: (7, 'Failed to connect to loyaloop.tele2.lt port 443: No route to host')
 
 	Unsupported subdomains:
-		
+
 		- pagalba.tele2.lt *
 		- narsyk.tele2.lt *
 		- pyptonas.tele2.lt **
@@ -16,19 +16,19 @@ Fetch error: http://loyaloop.tele2.lt/ => https://loyaloop.tele2.lt/: (7, 'Faile
 		- parkuok.tele2.lt ***
 		- internetas.tele2.lt ***
 		- editorial.tele2.lt ***
-		
+
 	* 404s on HTTPS
 	** Connection fails, times out, or is refused on HTTPS
 	*** Invalid certificate
 -->
-
+
 	
 	
 	
 	
 	
-	
-		
+
+
 	
 
diff --git a/src/chrome/content/rules/Telebrands.xml b/src/chrome/content/rules/Telebrands.xml
index c1502417d416..8af43a4164d0 100644
--- a/src/chrome/content/rules/Telebrands.xml
+++ b/src/chrome/content/rules/Telebrands.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Telecolumbus.com.xml b/src/chrome/content/rules/Telecolumbus.com.xml
index a460e3cbba56..d143b8634f92 100644
--- a/src/chrome/content/rules/Telecolumbus.com.xml
+++ b/src/chrome/content/rules/Telecolumbus.com.xml
@@ -2,11 +2,11 @@
     
     
     
-    
+
     
     
     
-    
+
     
     
 
diff --git a/src/chrome/content/rules/Telecommunications-Industry-Ombudsman-mixedcontent.xml b/src/chrome/content/rules/Telecommunications-Industry-Ombudsman-mixedcontent.xml
deleted file mode 100644
index c3e81c101aea..000000000000
--- a/src/chrome/content/rules/Telecommunications-Industry-Ombudsman-mixedcontent.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Telefonica.xml b/src/chrome/content/rules/Telefonica.xml
index e549475052ef..170a2633e0a5 100644
--- a/src/chrome/content/rules/Telefonica.xml
+++ b/src/chrome/content/rules/Telefonica.xml
@@ -1,36 +1,5 @@
 
 
-
+
 
 	
 	
-	
-	
+	
 	
-	
-	
-	
-	
-	
-	
-	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
 	
-	
-	
 	
 	
-	
-	
 
-	
-	
-	
 	
 	
 
 	
 	
 
-	
-	
-	
-	
-	
+	
+	
+	
 	
 
-
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Telegr.am.xml b/src/chrome/content/rules/Telegr.am.xml
index 5bb90927a31b..1c3c337bcd54 100644
--- a/src/chrome/content/rules/Telegr.am.xml
+++ b/src/chrome/content/rules/Telegr.am.xml
@@ -1,7 +1,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
diff --git a/src/chrome/content/rules/Telegram.org.xml b/src/chrome/content/rules/Telegram.org.xml
deleted file mode 100644
index 432c6023d761..000000000000
--- a/src/chrome/content/rules/Telegram.org.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Telegram.wiki.xml b/src/chrome/content/rules/Telegram.wiki.xml
index 1a9d65d0b1f5..f81e4c1a29ca 100644
--- a/src/chrome/content/rules/Telegram.wiki.xml
+++ b/src/chrome/content/rules/Telegram.wiki.xml
@@ -1,17 +1,17 @@
-
-
-	
-	
-
-	
-	
-
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Telegraph-Media-Group.xml b/src/chrome/content/rules/Telegraph-Media-Group.xml
index b124440e2053..e2b455747305 100644
--- a/src/chrome/content/rules/Telegraph-Media-Group.xml
+++ b/src/chrome/content/rules/Telegraph-Media-Group.xml
@@ -1,8 +1,4 @@
-
 
-
+
 
 	
+	
+	
 	
 	
-	
-	
 	
-	
 	
 	
 	
 	
-	
 	
 	
 	
 	
 	
-	
-	
-	
-
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-			
-			
-			
-
 
 	
@@ -161,7 +117,7 @@ Fetch error: http://webtrends.telegraph.co.uk/ => https://webtrends.telegraph.co
 	
 	
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Telekom-Malaysia.xml b/src/chrome/content/rules/Telekom-Malaysia.xml
index 336b8aaab898..fa15e32c5545 100644
--- a/src/chrome/content/rules/Telekom-Malaysia.xml
+++ b/src/chrome/content/rules/Telekom-Malaysia.xml
@@ -11,7 +11,7 @@ Fetch error: http://tmshop.tm.com.my/ => https://tmshop.tm.com.my/: Too many red
 		- securevpn	(self-signed)
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Telekom-Partnerwelt.de.xml b/src/chrome/content/rules/Telekom-Partnerwelt.de.xml
index 43fe06e7dec3..e0eb8df945f7 100644
--- a/src/chrome/content/rules/Telekom-Partnerwelt.de.xml
+++ b/src/chrome/content/rules/Telekom-Partnerwelt.de.xml
@@ -27,7 +27,7 @@ Fetch error: http://telekom-partnerwelt.de/ => https://www.telekom-partnerwelt.d
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Telekom.sk.xml b/src/chrome/content/rules/Telekom.sk.xml
index 180728a3f5f6..02817bd7b96a 100644
--- a/src/chrome/content/rules/Telekom.sk.xml
+++ b/src/chrome/content/rules/Telekom.sk.xml
@@ -13,6 +13,7 @@
   
 
   
+  
   
 
   
-
-
-	
-	
-
-
-	
-	
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Telenor-banka.xml b/src/chrome/content/rules/Telenor-banka.xml
new file mode 100644
index 000000000000..da8706bfb33f
--- /dev/null
+++ b/src/chrome/content/rules/Telenor-banka.xml
@@ -0,0 +1,12 @@
+
+
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Telenor.se.xml b/src/chrome/content/rules/Telenor.se.xml
index 798e11511394..b772a23f3941 100644
--- a/src/chrome/content/rules/Telenor.se.xml
+++ b/src/chrome/content/rules/Telenor.se.xml
@@ -21,7 +21,7 @@ Fetch error: http://www.euromail.se/ => https://www.euromail.se/: (28, 'Connecti
 		- minasidor.telenor.se
 
 -->
-
+
 
 	
 	
@@ -39,4 +39,4 @@ Fetch error: http://www.euromail.se/ => https://www.euromail.se/: (28, 'Connecti
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Telepigeon.com.xml b/src/chrome/content/rules/Telepigeon.com.xml
index f9109ca92c37..9895ba603903 100644
--- a/src/chrome/content/rules/Telepigeon.com.xml
+++ b/src/chrome/content/rules/Telepigeon.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://www.telepigeon.com/ => https://www.telepigeon.com/: (28, 'Co
 		- www.telepigeon.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Telerik.com.xml b/src/chrome/content/rules/Telerik.com.xml
index 63cc671f4e64..e31ed461afd3 100644
--- a/src/chrome/content/rules/Telerik.com.xml
+++ b/src/chrome/content/rules/Telerik.com.xml
@@ -32,7 +32,11 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 		
@@ -52,7 +56,6 @@
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Telex.xml b/src/chrome/content/rules/Telex.xml
index fe042bb82f45..7e852dd221d2 100644
--- a/src/chrome/content/rules/Telex.xml
+++ b/src/chrome/content/rules/Telex.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://notblocked.telex.cc/ => https://notblocked.telex.cc/: (6, 'Could not resolve host: notblocked.telex.cc')
 
 -->
-
+
 
 	
 	
@@ -13,4 +13,4 @@ Fetch error: http://notblocked.telex.cc/ => https://notblocked.telex.cc/: (6, 'C
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Telfort.nl.xml b/src/chrome/content/rules/Telfort.nl.xml
index 09b109034287..1325b852c587 100644
--- a/src/chrome/content/rules/Telfort.nl.xml
+++ b/src/chrome/content/rules/Telfort.nl.xml
@@ -16,7 +16,12 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
 		
@@ -28,10 +33,9 @@
 	
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Telia.se.xml b/src/chrome/content/rules/Telia.se.xml
index f9189624ce8d..adc7fe9d5ccf 100644
--- a/src/chrome/content/rules/Telia.se.xml
+++ b/src/chrome/content/rules/Telia.se.xml
@@ -1,7 +1,7 @@
 
   
-  
+  
   
-  
+  
 
 
diff --git a/src/chrome/content/rules/Tello.xml b/src/chrome/content/rules/Tello.xml
index 663023d4cdc8..5496455a5b09 100644
--- a/src/chrome/content/rules/Tello.xml
+++ b/src/chrome/content/rules/Tello.xml
@@ -1,16 +1,11 @@
+
 
-
-    
-
     
     
 
-        
-        
-
     
-
 
diff --git a/src/chrome/content/rules/Telnic.xml b/src/chrome/content/rules/Telnic.xml
index db421cbe8b0d..3777aeeb56b8 100644
--- a/src/chrome/content/rules/Telnic.xml
+++ b/src/chrome/content/rules/Telnic.xml
@@ -14,7 +14,7 @@ Fetch error: http://nic.tel/ => https://www.telnic.org/: (6, 'Could not resolve
 		- dev.telnic.org	(ssl_error_rx_record_too_long)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Telphin.ru.xml b/src/chrome/content/rules/Telphin.ru.xml
index abd15c6e4c98..a556c5721dad 100644
--- a/src/chrome/content/rules/Telphin.ru.xml
+++ b/src/chrome/content/rules/Telphin.ru.xml
@@ -12,7 +12,7 @@ test-pbx.telphin.ru ³
 ² refused
 ³ timed out
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Telstra-Corporation.xml b/src/chrome/content/rules/Telstra-Corporation.xml
index dadfae5952f3..b157e8c9f61e 100644
--- a/src/chrome/content/rules/Telstra-Corporation.xml
+++ b/src/chrome/content/rules/Telstra-Corporation.xml
@@ -13,11 +13,11 @@ Fetch error: http://sockassist.com.au/ => https://sockassist.com.au/: (60, 'SSL
 
 	See Telstra-Corporation-mismatches.xml for problematic rules.
 -->
-
+
 
 	
 	
-	
+
 	
 
 
diff --git a/src/chrome/content/rules/Telstra.com.au.xml b/src/chrome/content/rules/Telstra.com.au.xml
new file mode 100644
index 000000000000..52dbc48b22c2
--- /dev/null
+++ b/src/chrome/content/rules/Telstra.com.au.xml
@@ -0,0 +1,320 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+  	
+
+	
+
diff --git a/src/chrome/content/rules/Telstra.com.xml b/src/chrome/content/rules/Telstra.com.xml
new file mode 100644
index 000000000000..1ecb951a5aa4
--- /dev/null
+++ b/src/chrome/content/rules/Telstra.com.xml
@@ -0,0 +1,674 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+  	
+
+	
+
diff --git a/src/chrome/content/rules/Teltarif.xml b/src/chrome/content/rules/Teltarif.xml
index 2208f93c1853..11bf0c526471 100644
--- a/src/chrome/content/rules/Teltarif.xml
+++ b/src/chrome/content/rules/Teltarif.xml
@@ -1,15 +1,15 @@
 
-	
+
 	
 	
 	
 	
 	
-	
+
         
         
         
-        
+
 	
 
 	 https://msg.telus.com/: (7, 'Failed to connect to msg.telus.com port 443: Connection refused')
-Fetch error: http://telushealth.com/ => https://telushealth.com/: (51, "SSL: no alternative certificate subject name matches target host name 'telushealth.com'")
-Fetch error: http://telusmobility.com/ => https://telusmobility.com/: (51, "SSL: no alternative certificate subject name matches target host name 'telusmobility.com'")
+	Non-functional hosts
+		Couldn't connect to server:
+		- msg.telus.com
+
+		SSL peer certificate was not OK:
+		- telushealth.com
+		- telusmobility.com
 
+		Incomplete certificate chain error:
+		- mobileidentity.telus.com
 -->
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-
-    
-    
-    
-    
-
-    
-    
-    
+
+	
+	
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+
+	
+
+	
+
+	
 
diff --git a/src/chrome/content/rules/Temando.com.xml b/src/chrome/content/rules/Temando.com.xml
deleted file mode 100644
index 652bf84e33a7..000000000000
--- a/src/chrome/content/rules/Temando.com.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Temp-Mail.xml b/src/chrome/content/rules/Temp-Mail.xml
index bcea5b0a3515..6602282e3035 100644
--- a/src/chrome/content/rules/Temp-Mail.xml
+++ b/src/chrome/content/rules/Temp-Mail.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.temp-mail.ru/ => https://www.temp-mail.ru/: (6, 'Could n
 	¹: Timeout
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Template_Monster.com.xml b/src/chrome/content/rules/Template_Monster.com.xml
index e8396bd46c1d..8fbc2f317946 100644
--- a/src/chrome/content/rules/Template_Monster.com.xml
+++ b/src/chrome/content/rules/Template_Monster.com.xml
@@ -58,10 +58,15 @@
 
 
 	
-	
+	
+	
+	
+	
 		
 		
-	
+	
+	
+	
 
 
 	
-
-
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Tendatta.com.xml b/src/chrome/content/rules/Tendatta.com.xml
deleted file mode 100644
index 26a40c9161c3..000000000000
--- a/src/chrome/content/rules/Tendatta.com.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Tenhou.net.xml b/src/chrome/content/rules/Tenhou.net.xml
new file mode 100644
index 000000000000..56bdafe13a32
--- /dev/null
+++ b/src/chrome/content/rules/Tenhou.net.xml
@@ -0,0 +1,12 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Tenon.com.xml b/src/chrome/content/rules/Tenon.com.xml
index 766667304f85..d93ee27f7088 100644
--- a/src/chrome/content/rules/Tenon.com.xml
+++ b/src/chrome/content/rules/Tenon.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.tenon.com/ => https://www.tenon.com/: (28, 'Connection t
 	^: cert only matches www
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Tenpay.com-falsemixed.xml b/src/chrome/content/rules/Tenpay.com-falsemixed.xml
deleted file mode 100644
index 74bbc957c134..000000000000
--- a/src/chrome/content/rules/Tenpay.com-falsemixed.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Tenpay.com.xml b/src/chrome/content/rules/Tenpay.com.xml
index 564fbdd75390..307de0be02ad 100644
--- a/src/chrome/content/rules/Tenpay.com.xml
+++ b/src/chrome/content/rules/Tenpay.com.xml
@@ -12,7 +12,7 @@
 		- open		200 redirects to error.shtml
 		- sdc		Blank page
 		- union		Dropped
-	
+
 
 	Problematic hosts in *tenpay.com:
 
diff --git a/src/chrome/content/rules/Tent.is.xml b/src/chrome/content/rules/Tent.is.xml
index 38e522cbed70..976f83b9bde4 100644
--- a/src/chrome/content/rules/Tent.is.xml
+++ b/src/chrome/content/rules/Tent.is.xml
@@ -18,7 +18,7 @@ Fetch error: http://tent.is/ => https://tent.is/: (6, 'Could not resolve host: t
 		- *	(user subdomains)
 
 -->
-
+
 
 	
 	
@@ -27,4 +27,4 @@ Fetch error: http://tent.is/ => https://tent.is/: (6, 'Could not resolve host: t
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Teo.xml b/src/chrome/content/rules/Teo.xml
index 40bfeabac93f..2ae5878d23f6 100644
--- a/src/chrome/content/rules/Teo.xml
+++ b/src/chrome/content/rules/Teo.xml
@@ -1,7 +1,7 @@
 
 	
 	
-		
+
 	
 
diff --git a/src/chrome/content/rules/Tequipment.NET.xml b/src/chrome/content/rules/Tequipment.NET.xml
index 74c7ab0ae3fe..372c3d399f43 100644
--- a/src/chrome/content/rules/Tequipment.NET.xml
+++ b/src/chrome/content/rules/Tequipment.NET.xml
@@ -14,4 +14,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Terena.org.xml b/src/chrome/content/rules/Terena.org.xml
index 0458294d40e5..320fab5bc1ab 100644
--- a/src/chrome/content/rules/Terena.org.xml
+++ b/src/chrome/content/rules/Terena.org.xml
@@ -86,7 +86,7 @@ Non-2xx HTTP code: http://tnc2006.terena.org/ (200) => https://www.terena.org/ev
 		- www.terena.org
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Terminal.com.xml b/src/chrome/content/rules/Terminal.com.xml
index 66ebe81ff1c8..b4824fa0994f 100644
--- a/src/chrome/content/rules/Terminal.com.xml
+++ b/src/chrome/content/rules/Terminal.com.xml
@@ -16,7 +16,7 @@ Fetch error: http://www.terminal.com/ => https://www.terminal.com/: (7, 'Failed
 		- www.terminal.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Terminatio.org.xml b/src/chrome/content/rules/Terminatio.org.xml
deleted file mode 100644
index e0ad4a8440de..000000000000
--- a/src/chrome/content/rules/Terminatio.org.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/TerraMailMX.xml b/src/chrome/content/rules/TerraMailMX.xml
deleted file mode 100644
index ce0657115525..000000000000
--- a/src/chrome/content/rules/TerraMailMX.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	
-	
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/TerraUserCentralMX.xml b/src/chrome/content/rules/TerraUserCentralMX.xml
index 0ba79ae32404..ce380eaec0dd 100644
--- a/src/chrome/content/rules/TerraUserCentralMX.xml
+++ b/src/chrome/content/rules/TerraUserCentralMX.xml
@@ -1,4 +1,4 @@
 
 	
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Terra_Bank.ru.xml b/src/chrome/content/rules/Terra_Bank.ru.xml
deleted file mode 100644
index b80f2754448b..000000000000
--- a/src/chrome/content/rules/Terra_Bank.ru.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Terres_Oubliees.com.xml b/src/chrome/content/rules/Terres_Oubliees.com.xml
index 9a1c08f6d3ea..4741abc25e2b 100644
--- a/src/chrome/content/rules/Terres_Oubliees.com.xml
+++ b/src/chrome/content/rules/Terres_Oubliees.com.xml
@@ -1,7 +1,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -13,7 +14,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Tesco_Compare.com.xml b/src/chrome/content/rules/Tesco_Compare.com.xml
index 3cc5bee914b0..81d6b6976dca 100644
--- a/src/chrome/content/rules/Tesco_Compare.com.xml
+++ b/src/chrome/content/rules/Tesco_Compare.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://www.tescocompare.com/ => https://www.tescocompare.com/: (7,
 	Cert only matches www.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Tesco_Diets.com.xml b/src/chrome/content/rules/Tesco_Diets.com.xml
index b4a4eac6f54b..924e46b4a113 100644
--- a/src/chrome/content/rules/Tesco_Diets.com.xml
+++ b/src/chrome/content/rules/Tesco_Diets.com.xml
@@ -24,7 +24,7 @@ Fetch error: http://www.tescodiets.com/ => https://www.tescodiets.com/: (51, "SS
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Test-IPv6.cz.xml b/src/chrome/content/rules/Test-IPv6.cz.xml
deleted file mode 100644
index 40e8a5601130..000000000000
--- a/src/chrome/content/rules/Test-IPv6.cz.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Test-IPv6.xml b/src/chrome/content/rules/Test-IPv6.xml
new file mode 100644
index 000000000000..abdd2f73626c
--- /dev/null
+++ b/src/chrome/content/rules/Test-IPv6.xml
@@ -0,0 +1,457 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/TestCloud.io.xml b/src/chrome/content/rules/TestCloud.io.xml
index d7f9811ffe36..6d2f9d7e0f35 100644
--- a/src/chrome/content/rules/TestCloud.io.xml
+++ b/src/chrome/content/rules/TestCloud.io.xml
@@ -28,7 +28,7 @@ Fetch error: http://testcloud.io/ => https://testcloud.io/: (7, 'Failed to conne
 		- app.thetestcloud.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/TestPolitique.fr.xml b/src/chrome/content/rules/TestPolitique.fr.xml
index 3f648c87f7a5..88f36788e88d 100644
--- a/src/chrome/content/rules/TestPolitique.fr.xml
+++ b/src/chrome/content/rules/TestPolitique.fr.xml
@@ -11,7 +11,7 @@
 	
 
-	
 
 
diff --git a/src/chrome/content/rules/Test_Equipment_Depot.xml b/src/chrome/content/rules/Test_Equipment_Depot.xml
index 77c1e1c4dd7e..e876027c7d2a 100644
--- a/src/chrome/content/rules/Test_Equipment_Depot.xml
+++ b/src/chrome/content/rules/Test_Equipment_Depot.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TetherReport.com.xml b/src/chrome/content/rules/TetherReport.com.xml
new file mode 100644
index 000000000000..87afb7239c75
--- /dev/null
+++ b/src/chrome/content/rules/TetherReport.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Tetu.com.xml b/src/chrome/content/rules/Tetu.com.xml
index 3bb25866f28b..1f15bc728104 100644
--- a/src/chrome/content/rules/Tetu.com.xml
+++ b/src/chrome/content/rules/Tetu.com.xml
@@ -19,7 +19,7 @@
 	
 	
 
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Texas-Association-of-School-Boards.xml b/src/chrome/content/rules/Texas-Association-of-School-Boards.xml
index c80f56529629..baf7575a3579 100644
--- a/src/chrome/content/rules/Texas-Association-of-School-Boards.xml
+++ b/src/chrome/content/rules/Texas-Association-of-School-Boards.xml
@@ -1,9 +1,10 @@
 
 
 	
-	
+	
+	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Texas-Department-of-State-Health-Services.xml b/src/chrome/content/rules/Texas-Department-of-State-Health-Services.xml
deleted file mode 100644
index 804a0897a519..000000000000
--- a/src/chrome/content/rules/Texas-Department-of-State-Health-Services.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Texas-Instruments.xml b/src/chrome/content/rules/Texas-Instruments.xml
index 3e1fab8ac346..69853f08f389 100644
--- a/src/chrome/content/rules/Texas-Instruments.xml
+++ b/src/chrome/content/rules/Texas-Instruments.xml
@@ -1,241 +1,59 @@
-
 
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
 
-	
-	
-	
+
 
 	
-	
-	
-	
-	
-
-		
-
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-
-		
-
-			
-			
-			
-			
-
-		
-		
-
-		
-		
-
-			
-			
-			
-
-		
-		
-
-			
-			
-			
-			
-			
-
-		
-		
-
-			
-			
-
-		
-		
-		
+	
 
+		
+			
+			
 
-	
-	
+	
 
-	
+	
 
-	
+	
 
+	
+	
 
-	
-	
+	
+	
 
-		
+	
 
 	
 
-	
-
-	
-
-		
-		
-		
-
-	
-
-		
-		
-		
-
-	
-
-		
-		
-		
-
-	
-
-		
-		
-		
-
 	
 
diff --git a/src/chrome/content/rules/Texas-State-Library-and-Archives-Commission.xml b/src/chrome/content/rules/Texas-State-Library-and-Archives-Commission.xml
index e8e0dbb900b2..f9e68f0bcae7 100644
--- a/src/chrome/content/rules/Texas-State-Library-and-Archives-Commission.xml
+++ b/src/chrome/content/rules/Texas-State-Library-and-Archives-Commission.xml
@@ -1,13 +1,13 @@
 
 
 	
-	
+	
 
 
 	
 
 
-	
-
-
-	
-	
-
-
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Texas_Tribune.org.xml b/src/chrome/content/rules/Texas_Tribune.org.xml
index 39180ce14969..dd29b0028a7d 100644
--- a/src/chrome/content/rules/Texas_Tribune.org.xml
+++ b/src/chrome/content/rules/Texas_Tribune.org.xml
@@ -19,7 +19,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -28,7 +29,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Texblog.org.xml b/src/chrome/content/rules/Texblog.org.xml
new file mode 100644
index 000000000000..1dc7330148ea
--- /dev/null
+++ b/src/chrome/content/rules/Texblog.org.xml
@@ -0,0 +1,13 @@
+
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/TextFixer.com.xml b/src/chrome/content/rules/TextFixer.com.xml
index d9bd7227061d..daafe150e634 100644
--- a/src/chrome/content/rules/TextFixer.com.xml
+++ b/src/chrome/content/rules/TextFixer.com.xml
@@ -7,4 +7,4 @@
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TextMagic.com.xml b/src/chrome/content/rules/TextMagic.com.xml
index 77cdcbdca818..d3c1c9b19e4c 100644
--- a/src/chrome/content/rules/TextMagic.com.xml
+++ b/src/chrome/content/rules/TextMagic.com.xml
@@ -34,7 +34,7 @@
 	
 	
 
-	
+	
 
 
 	
 
 	
-	
+	
+	
 	
 
 
@@ -12,7 +13,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Textracer.dk.xml b/src/chrome/content/rules/Textracer.dk.xml
index f018bbf74086..3a405c7e0faa 100644
--- a/src/chrome/content/rules/Textracer.dk.xml
+++ b/src/chrome/content/rules/Textracer.dk.xml
@@ -5,7 +5,7 @@ Fetch error: http://textracer.dk/ => https://textracer.dk/: (7, 'Failed to conne
 Fetch error: http://www.textracer.dk/ => https://www.textracer.dk/: (7, 'Failed to connect to www.textracer.dk port 443: Connection refused')
 
 -->
-
+
 
     
     
diff --git a/src/chrome/content/rules/Tfb.ru.xml b/src/chrome/content/rules/Tfb.ru.xml
index 17d5ee30aba4..3c458d12d7ea 100644
--- a/src/chrome/content/rules/Tfb.ru.xml
+++ b/src/chrome/content/rules/Tfb.ru.xml
@@ -24,7 +24,7 @@ voip-e.tfb.ru ³
 ² refused
 ³ timed out
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Th-nuernberg.de.xml b/src/chrome/content/rules/Th-nuernberg.de.xml
deleted file mode 100644
index b34f50a1d4c9..000000000000
--- a/src/chrome/content/rules/Th-nuernberg.de.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
diff --git a/src/chrome/content/rules/Thales-Communications.xml b/src/chrome/content/rules/Thales-Communications.xml
index a889b7482f8d..9ecf62440d72 100644
--- a/src/chrome/content/rules/Thales-Communications.xml
+++ b/src/chrome/content/rules/Thales-Communications.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://thalescomminc.com/ => https://www.thalescomminc.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.thalescomminc.com'")
 Fetch error: http://www.thalescomminc.com/ => https://www.thalescomminc.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.thalescomminc.com'")
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Thalia_Holding.xml b/src/chrome/content/rules/Thalia_Holding.xml
index e0a01b9d3fad..bfdffbfd73f9 100644
--- a/src/chrome/content/rules/Thalia_Holding.xml
+++ b/src/chrome/content/rules/Thalia_Holding.xml
@@ -11,7 +11,7 @@
 		- blog.buch.de
 		- unternehmen.thalia.de
 		- ^buch.de
-		
+
 
 	Wrong content:
 		- ^thalia.ch
diff --git a/src/chrome/content/rules/Thalys.xml b/src/chrome/content/rules/Thalys.xml
index fe4b1a364ec6..eb09c48623fd 100644
--- a/src/chrome/content/rules/Thalys.xml
+++ b/src/chrome/content/rules/Thalys.xml
@@ -8,7 +8,7 @@ Fetch error: http://portal.thalysnet.com/ => https://portal.thalysnet.com/: (6,
 		- Bug on (www.)?thalysthecard.com from logi\d+.xiti.com
 
 -->
-
+
     
     
     
@@ -21,7 +21,7 @@ Fetch error: http://portal.thalysnet.com/ => https://portal.thalysnet.com/: (6,
 					-->
 	
 
-    
+    
 
 	
diff --git a/src/chrome/content/rules/Thawte.xml b/src/chrome/content/rules/Thawte.xml
index 65cbf7c5402f..daeb1cdaa4d9 100644
--- a/src/chrome/content/rules/Thawte.xml
+++ b/src/chrome/content/rules/Thawte.xml
@@ -2,7 +2,7 @@
 		- ocsp.thawte.com
 -->
 
-  
+ 
  
 
  
diff --git a/src/chrome/content/rules/The-ACLU-of-Idaho.xml b/src/chrome/content/rules/The-ACLU-of-Idaho.xml
index 2d83a958d174..6933b0259ae0 100644
--- a/src/chrome/content/rules/The-ACLU-of-Idaho.xml
+++ b/src/chrome/content/rules/The-ACLU-of-Idaho.xml
@@ -8,4 +8,4 @@
 		to="https://acluidaho.org/" />
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/The-Art-Institutes.xml b/src/chrome/content/rules/The-Art-Institutes.xml
index 0b07507b2e64..4992ccd31d69 100644
--- a/src/chrome/content/rules/The-Art-Institutes.xml
+++ b/src/chrome/content/rules/The-Art-Institutes.xml
@@ -14,7 +14,8 @@
 
 
 	
-	
+	
+	
 
 
 	
+	
+	
+	
+	
+	
+	
+
+	
+
+
+	
+
diff --git a/src/chrome/content/rules/The-Cutest-Site-on-the-Block.xml b/src/chrome/content/rules/The-Cutest-Site-on-the-Block.xml
index f0f63577c286..5a435345c1c7 100644
--- a/src/chrome/content/rules/The-Cutest-Site-on-the-Block.xml
+++ b/src/chrome/content/rules/The-Cutest-Site-on-the-Block.xml
@@ -6,13 +6,13 @@ Fetch error: http://thecutestsiteontheblock.com/ => https://www.thecutestsiteont
 Disabled by https-everywhere-checker because:
 Fetch error: http://thecutestsiteontheblock.com/ => https://www.thecutestsiteontheblock.com/: (7, 'Failed to connect to www.thecutestsiteontheblock.com port 443: Connection refused')
 -->
-
+
 
 	
-	
+	
 
 
-	
+	
 
 
 	
-
-
-	
-	
-
-		
-		
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-			
-			
-			
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/The-FCA.org.uk.xml b/src/chrome/content/rules/The-FCA.org.uk.xml
deleted file mode 100644
index aa80bcab4f9f..000000000000
--- a/src/chrome/content/rules/The-FCA.org.uk.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/The-Flirble-Organisation.xml b/src/chrome/content/rules/The-Flirble-Organisation.xml
index f335e12fedfa..0fbb9687cd63 100644
--- a/src/chrome/content/rules/The-Flirble-Organisation.xml
+++ b/src/chrome/content/rules/The-Flirble-Organisation.xml
@@ -19,7 +19,7 @@ Fetch error: http://wiki.flirble.org/ => https://wiki.flirble.org/: (6, 'Could n
 		- www.flirble.org
 
 -->
-
+
 
 	
@@ -39,7 +39,7 @@ Fetch error: http://wiki.flirble.org/ => https://wiki.flirble.org/: (6, 'Could n
 	
 	
 
-	
+	
 
 
 	
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/The-Inspiration-Room.xml b/src/chrome/content/rules/The-Inspiration-Room.xml
index 0f637c015d2b..088d789d2978 100644
--- a/src/chrome/content/rules/The-Inspiration-Room.xml
+++ b/src/chrome/content/rules/The-Inspiration-Room.xml
@@ -3,7 +3,7 @@
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/The-Nation.xml b/src/chrome/content/rules/The-Nation.xml
index 5d9ce686dbe4..bafb365ad04c 100644
--- a/src/chrome/content/rules/The-Nation.xml
+++ b/src/chrome/content/rules/The-Nation.xml
@@ -46,7 +46,7 @@ Fetch error: http://nationbuilders.thenation.com/ => https://donate.thenation.co
 	* Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/The-National-Academies-Press.xml b/src/chrome/content/rules/The-National-Academies-Press.xml
index a21f32d1c70c..733076401b04 100644
--- a/src/chrome/content/rules/The-National-Academies-Press.xml
+++ b/src/chrome/content/rules/The-National-Academies-Press.xml
@@ -22,7 +22,11 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 
 
 	
@@ -33,7 +37,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/The-Next-Web.xml b/src/chrome/content/rules/The-Next-Web.xml
index 96929871a38d..07d1e29f7bbb 100644
--- a/src/chrome/content/rules/The-Next-Web.xml
+++ b/src/chrome/content/rules/The-Next-Web.xml
@@ -30,7 +30,15 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
-
-
-	
-	
-		
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/The-Public-Index.xml b/src/chrome/content/rules/The-Public-Index.xml
index 2326ca7333db..410880e7f917 100644
--- a/src/chrome/content/rules/The-Public-Index.xml
+++ b/src/chrome/content/rules/The-Public-Index.xml
@@ -2,7 +2,8 @@
 
 	
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/The-Republic.xml b/src/chrome/content/rules/The-Republic.xml
index a6c3810bd3d3..d299424f04bd 100644
--- a/src/chrome/content/rules/The-Republic.xml
+++ b/src/chrome/content/rules/The-Republic.xml
@@ -14,7 +14,7 @@
 
 
 	
-	
 
 
diff --git a/src/chrome/content/rules/The-Skynet-Project.xml b/src/chrome/content/rules/The-Skynet-Project.xml
index 01ecddb327f5..48d4bb770ff4 100644
--- a/src/chrome/content/rules/The-Skynet-Project.xml
+++ b/src/chrome/content/rules/The-Skynet-Project.xml
@@ -30,7 +30,7 @@ Fetch error: http://www.skynet.ie/ => https://www.skynet.ie/: (60, 'SSL certific
 		- wiki
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/The-Washington-Examiner.xml b/src/chrome/content/rules/The-Washington-Examiner.xml
deleted file mode 100644
index 0176c214a002..000000000000
--- a/src/chrome/content/rules/The-Washington-Examiner.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/The-Wrap.xml b/src/chrome/content/rules/The-Wrap.xml
index a1cccc6717df..bc258593288e 100644
--- a/src/chrome/content/rules/The-Wrap.xml
+++ b/src/chrome/content/rules/The-Wrap.xml
@@ -28,7 +28,8 @@ Fetch error: http://thewrap.com/ => https://www.thewrap.com/: (51, "SSL: no alte
 
 
 	
-	
+	
+	
 
 
 	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/TheAnarchistLibrary.org.xml b/src/chrome/content/rules/TheAnarchistLibrary.org.xml
index 946c5c1e1b6c..0590d807499e 100644
--- a/src/chrome/content/rules/TheAnarchistLibrary.org.xml
+++ b/src/chrome/content/rules/TheAnarchistLibrary.org.xml
@@ -1,9 +1,9 @@
 
 
diff --git a/src/chrome/content/rules/TheArchive.me.xml b/src/chrome/content/rules/TheArchive.me.xml
index 01fb8a431f79..5b3d61d7cb04 100644
--- a/src/chrome/content/rules/TheArchive.me.xml
+++ b/src/chrome/content/rules/TheArchive.me.xml
@@ -3,6 +3,6 @@
     
 
 	
-  
+
     
 
diff --git a/src/chrome/content/rules/TheBabushkasOfChernobyl.com.xml b/src/chrome/content/rules/TheBabushkasOfChernobyl.com.xml
new file mode 100644
index 000000000000..ec5b775242a6
--- /dev/null
+++ b/src/chrome/content/rules/TheBabushkasOfChernobyl.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/TheBanners.uk.xml b/src/chrome/content/rules/TheBanners.uk.xml
new file mode 100644
index 000000000000..71af903075fb
--- /dev/null
+++ b/src/chrome/content/rules/TheBanners.uk.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/TheBookPeople.xml b/src/chrome/content/rules/TheBookPeople.xml
index 377d0a9e94b8..e218421b2ced 100644
--- a/src/chrome/content/rules/TheBookPeople.xml
+++ b/src/chrome/content/rules/TheBookPeople.xml
@@ -5,4 +5,4 @@
 
   
   
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TheChronicleHerald.ca.xml b/src/chrome/content/rules/TheChronicleHerald.ca.xml
new file mode 100644
index 000000000000..1fcd1c2afd20
--- /dev/null
+++ b/src/chrome/content/rules/TheChronicleHerald.ca.xml
@@ -0,0 +1,21 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/TheCityUK.xml b/src/chrome/content/rules/TheCityUK.xml
index 72b9c397947b..021558ee7dc7 100644
--- a/src/chrome/content/rules/TheCityUK.xml
+++ b/src/chrome/content/rules/TheCityUK.xml
@@ -13,4 +13,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TheClaroGroup.com.xml b/src/chrome/content/rules/TheClaroGroup.com.xml
new file mode 100644
index 000000000000..5df0e50519d5
--- /dev/null
+++ b/src/chrome/content/rules/TheClaroGroup.com.xml
@@ -0,0 +1,27 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/TheDailyWTF.com.xml b/src/chrome/content/rules/TheDailyWTF.com.xml
new file mode 100644
index 000000000000..df6df8a023fb
--- /dev/null
+++ b/src/chrome/content/rules/TheDailyWTF.com.xml
@@ -0,0 +1,26 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/TheDiplomat.com.xml b/src/chrome/content/rules/TheDiplomat.com.xml
new file mode 100644
index 000000000000..32b85a72c6a8
--- /dev/null
+++ b/src/chrome/content/rules/TheDiplomat.com.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/TheDogBowl.ca.xml b/src/chrome/content/rules/TheDogBowl.ca.xml
new file mode 100644
index 000000000000..597526754863
--- /dev/null
+++ b/src/chrome/content/rules/TheDogBowl.ca.xml
@@ -0,0 +1,12 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/TheEpochTimes.com.xml b/src/chrome/content/rules/TheEpochTimes.com.xml
new file mode 100644
index 000000000000..9fbb88843f92
--- /dev/null
+++ b/src/chrome/content/rules/TheEpochTimes.com.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/TheFader.com.xml b/src/chrome/content/rules/TheFader.com.xml
new file mode 100644
index 000000000000..2dfa08a2a677
--- /dev/null
+++ b/src/chrome/content/rules/TheFader.com.xml
@@ -0,0 +1,25 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/TheFappening2015.com.xml b/src/chrome/content/rules/TheFappening2015.com.xml
new file mode 100644
index 000000000000..5ded32bf4cac
--- /dev/null
+++ b/src/chrome/content/rules/TheFappening2015.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/TheFappeningBlog.com.xml b/src/chrome/content/rules/TheFappeningBlog.com.xml
new file mode 100644
index 000000000000..171cce8f2343
--- /dev/null
+++ b/src/chrome/content/rules/TheFappeningBlog.com.xml
@@ -0,0 +1,11 @@
+
+	
+	
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/TheFashionLaw.com.xml b/src/chrome/content/rules/TheFashionLaw.com.xml
new file mode 100644
index 000000000000..0c7b0a547878
--- /dev/null
+++ b/src/chrome/content/rules/TheFashionLaw.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/TheFederalistPapers.org.xml b/src/chrome/content/rules/TheFederalistPapers.org.xml
new file mode 100644
index 000000000000..e78f75909370
--- /dev/null
+++ b/src/chrome/content/rules/TheFederalistPapers.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/TheFreeDictionary.com.xml b/src/chrome/content/rules/TheFreeDictionary.com.xml
index 279e8ec7c5e0..cb70c668f7cb 100644
--- a/src/chrome/content/rules/TheFreeDictionary.com.xml
+++ b/src/chrome/content/rules/TheFreeDictionary.com.xml
@@ -1,4 +1,7 @@
 
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/TheGrio.com.xml b/src/chrome/content/rules/TheGrio.com.xml
deleted file mode 100644
index 53f5446f2710..000000000000
--- a/src/chrome/content/rules/TheGrio.com.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/TheGroceryOutlet.ca.xml b/src/chrome/content/rules/TheGroceryOutlet.ca.xml
new file mode 100644
index 000000000000..3f318be7358a
--- /dev/null
+++ b/src/chrome/content/rules/TheGroceryOutlet.ca.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/TheGuardian.pe.ca.xml b/src/chrome/content/rules/TheGuardian.pe.ca.xml
new file mode 100644
index 000000000000..37d6e74aafc9
--- /dev/null
+++ b/src/chrome/content/rules/TheGuardian.pe.ca.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/TheMadinanWay.com.xml b/src/chrome/content/rules/TheMadinanWay.com.xml
deleted file mode 100644
index 949e0e2f82ad..000000000000
--- a/src/chrome/content/rules/TheMadinanWay.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/TheMuslimahDiaries.com.xml b/src/chrome/content/rules/TheMuslimahDiaries.com.xml
deleted file mode 100644
index cfd132a3dfb0..000000000000
--- a/src/chrome/content/rules/TheMuslimahDiaries.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/TheNewsLens.com.xml b/src/chrome/content/rules/TheNewsLens.com.xml
index ac2bdc2b7519..62f2eee5d56c 100644
--- a/src/chrome/content/rules/TheNewsLens.com.xml
+++ b/src/chrome/content/rules/TheNewsLens.com.xml
@@ -48,7 +48,7 @@ Non-2xx HTTP code: http://superpost.thenewslens.com/ (200) => https://superpost.
 		Mixed content blocking (MCB) tiggered:
 			 - test.thenewslens.com
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/TheOJ.org.xml b/src/chrome/content/rules/TheOJ.org.xml
new file mode 100644
index 000000000000..5764889c1b98
--- /dev/null
+++ b/src/chrome/content/rules/TheOJ.org.xml
@@ -0,0 +1,16 @@
+
+
+
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/ThePermitStore.com.xml b/src/chrome/content/rules/ThePermitStore.com.xml
index b14503a84bc7..912f3de2ff1f 100644
--- a/src/chrome/content/rules/ThePermitStore.com.xml
+++ b/src/chrome/content/rules/ThePermitStore.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://www.thepermitstore.com/ => https://www.thepermitstore.com/:
 Fetch error: http://thepermitstore.com/ => https://thepermitstore.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/ThePirateBay.xml b/src/chrome/content/rules/ThePirateBay.xml
index 387af8db18b8..14b947b4c800 100644
--- a/src/chrome/content/rules/ThePirateBay.xml
+++ b/src/chrome/content/rules/ThePirateBay.xml
@@ -1,29 +1,38 @@
 
 
 	
 	
+	
+
 	
 	
-	
-	
-	
-	
+
+	
+	
 
 	
 
diff --git a/src/chrome/content/rules/ThePlatform.xml b/src/chrome/content/rules/ThePlatform.xml
index a8b32dc73481..1623982c4e33 100644
--- a/src/chrome/content/rules/ThePlatform.xml
+++ b/src/chrome/content/rules/ThePlatform.xml
@@ -39,7 +39,7 @@ Fetch error: http://uploads.www.theplatform.com/ => https://uploads.www.theplatf
 		- mps.theplatform.com
 
 -->
-
+
 
 	
@@ -55,7 +55,7 @@ Fetch error: http://uploads.www.theplatform.com/ => https://uploads.www.theplatf
 	
 	
-		
+
 
 	
diff --git a/src/chrome/content/rules/TheRealTalk.org.xml b/src/chrome/content/rules/TheRealTalk.org.xml
index 10176a365f57..a6068f9a2a72 100644
--- a/src/chrome/content/rules/TheRealTalk.org.xml
+++ b/src/chrome/content/rules/TheRealTalk.org.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.therealtalk.org/ => https://www.therealtalk.org/: (28, '
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/TheResumator.com.xml b/src/chrome/content/rules/TheResumator.com.xml
index 776581d39ffa..ee7a38ee52ea 100644
--- a/src/chrome/content/rules/TheResumator.com.xml
+++ b/src/chrome/content/rules/TheResumator.com.xml
@@ -21,7 +21,7 @@
 		to="https://$1theresumator.com/" />
 
 	
+		to="https://assets.theresumator.com/" />
 
 	
diff --git a/src/chrome/content/rules/TheRoot.com.xml b/src/chrome/content/rules/TheRoot.com.xml
index 874874eaf7ee..71a2d8785ed8 100644
--- a/src/chrome/content/rules/TheRoot.com.xml
+++ b/src/chrome/content/rules/TheRoot.com.xml
@@ -14,7 +14,7 @@
 
 	
 	
-	
+
 		
 		
 		
diff --git a/src/chrome/content/rules/TheSafety.US.xml b/src/chrome/content/rules/TheSafety.US.xml
index cab6e3b4e9c4..78204a7a708f 100644
--- a/src/chrome/content/rules/TheSafety.US.xml
+++ b/src/chrome/content/rules/TheSafety.US.xml
@@ -13,4 +13,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TheSims3.com.xml b/src/chrome/content/rules/TheSims3.com.xml
new file mode 100644
index 000000000000..372d81162fcc
--- /dev/null
+++ b/src/chrome/content/rules/TheSims3.com.xml
@@ -0,0 +1,19 @@
+
+
+
+	
+	
+		
+		
+		
+
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/TheSixthAxis.com.xml b/src/chrome/content/rules/TheSixthAxis.com.xml
index 4cdd74655885..e9fdb8c9c455 100644
--- a/src/chrome/content/rules/TheSixthAxis.com.xml
+++ b/src/chrome/content/rules/TheSixthAxis.com.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TheStandNews.com.xml b/src/chrome/content/rules/TheStandNews.com.xml
index 492138211a95..f74faae46440 100644
--- a/src/chrome/content/rules/TheStandNews.com.xml
+++ b/src/chrome/content/rules/TheStandNews.com.xml
@@ -2,12 +2,20 @@
 	
 	
 	
+	
 	
 	
 	
 	
+	
+	
+	
 	
+	
+	
 	
+	
+	
 
 	
 
diff --git a/src/chrome/content/rules/TheStar.com.my.xml b/src/chrome/content/rules/TheStar.com.my.xml
index 5fa4d83c486c..81bf48e7bd60 100644
--- a/src/chrome/content/rules/TheStar.com.my.xml
+++ b/src/chrome/content/rules/TheStar.com.my.xml
@@ -28,7 +28,7 @@
 		- trek	(t)
 		- videos	(m)
 		- winwithwords	(m)
-	
+
 	e: expired certificate
 	h: http redirect
 	m: certificate mismatch
diff --git a/src/chrome/content/rules/TheSwanSanctuary.org.uk.xml b/src/chrome/content/rules/TheSwanSanctuary.org.uk.xml
new file mode 100644
index 000000000000..63bb91bc01ba
--- /dev/null
+++ b/src/chrome/content/rules/TheSwanSanctuary.org.uk.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/TheThinkingVegan.com.xml b/src/chrome/content/rules/TheThinkingVegan.com.xml
deleted file mode 100644
index ca033729f820..000000000000
--- a/src/chrome/content/rules/TheThinkingVegan.com.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/The_109.xml b/src/chrome/content/rules/The_109.xml
index 76f834acec7a..341adee06990 100644
--- a/src/chrome/content/rules/The_109.xml
+++ b/src/chrome/content/rules/The_109.xml
@@ -11,7 +11,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://the109.org/ => https://the109.org/: (7, 'Failed to connect to the109.org port 443: Connection refused')
 
 -->
-
+
 
 	
 	
@@ -22,4 +22,4 @@ Fetch error: http://the109.org/ => https://the109.org/: (7, 'Failed to connect t
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/The_American_Prospect.xml b/src/chrome/content/rules/The_American_Prospect.xml
index fb82f0ef682f..ae5b29556945 100644
--- a/src/chrome/content/rules/The_American_Prospect.xml
+++ b/src/chrome/content/rules/The_American_Prospect.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.prospect.org/ => https://prospect.org/: (60, 'SSL certif
 		- www	(cert only matches ^prospect.org)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/The_Appendix.net.xml b/src/chrome/content/rules/The_Appendix.net.xml
index fca0defba99d..b8f6694b4303 100644
--- a/src/chrome/content/rules/The_Appendix.net.xml
+++ b/src/chrome/content/rules/The_Appendix.net.xml
@@ -33,7 +33,7 @@ Fetch error: http://www.theappendix.net/ => https://theappendix.net/: (51, "SSL:
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/The_ArtStack.com.xml b/src/chrome/content/rules/The_ArtStack.com.xml
deleted file mode 100644
index 5547cbece3f1..000000000000
--- a/src/chrome/content/rules/The_ArtStack.com.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/The_Baffler.xml b/src/chrome/content/rules/The_Baffler.xml
index 4e0050dc3098..55e3a98186c8 100644
--- a/src/chrome/content/rules/The_Baffler.xml
+++ b/src/chrome/content/rules/The_Baffler.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/The_Blue_Sky_Life.com.xml b/src/chrome/content/rules/The_Blue_Sky_Life.com.xml
index 86326fd162e6..20f0d2a79a13 100644
--- a/src/chrome/content/rules/The_Blue_Sky_Life.com.xml
+++ b/src/chrome/content/rules/The_Blue_Sky_Life.com.xml
@@ -1,4 +1,4 @@
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/The_Body_Shop.co.uk.xml b/src/chrome/content/rules/The_Body_Shop.co.uk.xml
index 6269ce2515ea..38ff663a75da 100644
--- a/src/chrome/content/rules/The_Body_Shop.co.uk.xml
+++ b/src/chrome/content/rules/The_Body_Shop.co.uk.xml
@@ -55,7 +55,7 @@ Fetch error: http://secure.thebodyshop.co.uk/ => https://secure.thebodyshop.co.u
 	* Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/The_Changelog.com.xml b/src/chrome/content/rules/The_Changelog.com.xml
index d79d19a43d99..d6ae807874d4 100644
--- a/src/chrome/content/rules/The_Changelog.com.xml
+++ b/src/chrome/content/rules/The_Changelog.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://thechangelog.com/ => https://thechangelog.com/: (60, 'SSL ce
 Fetch error: http://www.thechangelog.com/ => https://www.thechangelog.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/The_Conversation.xml b/src/chrome/content/rules/The_Conversation.xml
deleted file mode 100644
index 1f62d0ada0fe..000000000000
--- a/src/chrome/content/rules/The_Conversation.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/The_DMA.org.xml b/src/chrome/content/rules/The_DMA.org.xml
index c2fde86e12cf..0692584d44f0 100644
--- a/src/chrome/content/rules/The_DMA.org.xml
+++ b/src/chrome/content/rules/The_DMA.org.xml
@@ -33,7 +33,7 @@ Fetch error: http://www.thedma.org/ => https://www.thedma.org/: (60, 'SSL certif
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/The_Dark_Mod.com.xml b/src/chrome/content/rules/The_Dark_Mod.com.xml
deleted file mode 100644
index 6d5967332c14..000000000000
--- a/src/chrome/content/rules/The_Dark_Mod.com.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/The_Explorer_Card.com.xml b/src/chrome/content/rules/The_Explorer_Card.com.xml
deleted file mode 100644
index afe23c2e9043..000000000000
--- a/src/chrome/content/rules/The_Explorer_Card.com.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/The_FADER.com.xml b/src/chrome/content/rules/The_FADER.com.xml
deleted file mode 100644
index 83cc0fcc9822..000000000000
--- a/src/chrome/content/rules/The_FADER.com.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/The_Federalist_Papers.org-falsemixed.xml b/src/chrome/content/rules/The_Federalist_Papers.org-falsemixed.xml
deleted file mode 100644
index 6bbab52dec73..000000000000
--- a/src/chrome/content/rules/The_Federalist_Papers.org-falsemixed.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/The_Federalist_Papers.org.xml b/src/chrome/content/rules/The_Federalist_Papers.org.xml
deleted file mode 100644
index 22f9197b4057..000000000000
--- a/src/chrome/content/rules/The_Federalist_Papers.org.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-	
-	
-		
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/The_G_Cloud.com.xml b/src/chrome/content/rules/The_G_Cloud.com.xml
index 6827d9184d75..6c28618d5f33 100644
--- a/src/chrome/content/rules/The_G_Cloud.com.xml
+++ b/src/chrome/content/rules/The_G_Cloud.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://thegcloud.com/ => https://thegcloud.com/: (60, 'SSL certific
 	www: expired 2008-12-05, self-signed, CN: mainsites.gigenet.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/The_Grand.xml b/src/chrome/content/rules/The_Grand.xml
deleted file mode 100644
index 021de6459aa1..000000000000
--- a/src/chrome/content/rules/The_Grand.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/The_Great_Courses_Plus.com.xml b/src/chrome/content/rules/The_Great_Courses_Plus.com.xml
index e3ea2f6b73f8..dc20c0100350 100644
--- a/src/chrome/content/rules/The_Great_Courses_Plus.com.xml
+++ b/src/chrome/content/rules/The_Great_Courses_Plus.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://release.thegreatcoursesplus.com/ => https://release.thegreat
 		- Image on dev from cdn.snagfilms.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/The_Group.xml b/src/chrome/content/rules/The_Group.xml
index 83618cd7e49a..7163653138d2 100644
--- a/src/chrome/content/rules/The_Group.xml
+++ b/src/chrome/content/rules/The_Group.xml
@@ -8,7 +8,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/The_Guardian.com.xml b/src/chrome/content/rules/The_Guardian.com.xml
index 9201ee3e6dda..3e653c89ac71 100644
--- a/src/chrome/content/rules/The_Guardian.com.xml
+++ b/src/chrome/content/rules/The_Guardian.com.xml
@@ -6,7 +6,6 @@
 		- guardianapps.co.uk.xml
 		- Guardian_Escapes.com.xml
 		- Guardian_Offers.co.uk.xml
-		- Guardian_Subscriptions.co.uk.xml
 
 
 	CDN buckets:
@@ -50,6 +49,7 @@
 		- next ¹
 		- m.jobs ¹
 		- oas ¹
+		- register ¹
 
 	¹ Mismatched
 
@@ -91,9 +91,6 @@
 	
 	
 	
-	
-	
-	
 	
 	
 	
@@ -102,12 +99,11 @@
 	
 	
 	
-	
 	
 	
 	
 	
-	
+
 	
 
 	
diff --git a/src/chrome/content/rules/The_Hill.com.xml b/src/chrome/content/rules/The_Hill.com.xml
index 3c9d8c758b00..525ec8c0b952 100644
--- a/src/chrome/content/rules/The_Hill.com.xml
+++ b/src/chrome/content/rules/The_Hill.com.xml
@@ -30,7 +30,7 @@ Fetch error: http://thehill.com/ => https://thehill.com/: (60, 'SSL certificate
 	³ Unsecurable <= refused
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/The_Hoxton.com.xml b/src/chrome/content/rules/The_Hoxton.com.xml
index fd6059c66dd2..bec4bc0ecf14 100644
--- a/src/chrome/content/rules/The_Hoxton.com.xml
+++ b/src/chrome/content/rules/The_Hoxton.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.thehoxton.com/ => https://www.thehoxton.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.thehoxton.com'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/The_Iconic.com.au.xml b/src/chrome/content/rules/The_Iconic.com.au.xml
deleted file mode 100644
index 590508b90596..000000000000
--- a/src/chrome/content/rules/The_Iconic.com.au.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-	
-	
-	
-	
-		
-		
-		
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/The_Johns_Hopkins_University.xml b/src/chrome/content/rules/The_Johns_Hopkins_University.xml
index 64230794640e..2bf5d5307985 100644
--- a/src/chrome/content/rules/The_Johns_Hopkins_University.xml
+++ b/src/chrome/content/rules/The_Johns_Hopkins_University.xml
@@ -181,7 +181,7 @@ Fetch error: http://wiki.pha.jhu.edu/ => https://wiki.pha.jhu.edu/: (60, 'SSL ce
 	ˢ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/The_Newsmarket.xml b/src/chrome/content/rules/The_Newsmarket.xml
index 4a3a1389e2ce..0347072bc706 100644
--- a/src/chrome/content/rules/The_Newsmarket.xml
+++ b/src/chrome/content/rules/The_Newsmarket.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/The_Next_Web-problematic.xml b/src/chrome/content/rules/The_Next_Web-problematic.xml
index eea957f95495..7a973ff284d5 100644
--- a/src/chrome/content/rules/The_Next_Web-problematic.xml
+++ b/src/chrome/content/rules/The_Next_Web-problematic.xml
@@ -13,4 +13,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/The_Outnet.xml b/src/chrome/content/rules/The_Outnet.xml
index a962621b71c8..f991c527bd56 100644
--- a/src/chrome/content/rules/The_Outnet.xml
+++ b/src/chrome/content/rules/The_Outnet.xml
@@ -13,10 +13,12 @@ Non-2xx HTTP code: http://theoutnet.com/ (200) => https://www.theoutnet.com/ (40
 		- cache
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
 	
@@ -25,7 +27,6 @@ Non-2xx HTTP code: http://theoutnet.com/ (200) => https://www.theoutnet.com/ (40
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/The_Patriot_Post.xml b/src/chrome/content/rules/The_Patriot_Post.xml
deleted file mode 100644
index 96c65dfcee75..000000000000
--- a/src/chrome/content/rules/The_Patriot_Post.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/The_Satanic_Temple.com.xml b/src/chrome/content/rules/The_Satanic_Temple.com.xml
index 1e12835637eb..a414f5cec72b 100644
--- a/src/chrome/content/rules/The_Satanic_Temple.com.xml
+++ b/src/chrome/content/rules/The_Satanic_Temple.com.xml
@@ -12,7 +12,7 @@
 
 
 	
-	
+	
 	
 	
 
diff --git a/src/chrome/content/rules/The_Security_Practice.com.xml b/src/chrome/content/rules/The_Security_Practice.com.xml
index edb0a22c19c6..595576166c1f 100644
--- a/src/chrome/content/rules/The_Security_Practice.com.xml
+++ b/src/chrome/content/rules/The_Security_Practice.com.xml
@@ -14,13 +14,10 @@
 -->
 
 
-	
+	
 
 
-	
 
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/The_TFP.xml b/src/chrome/content/rules/The_TFP.xml
index 552ff3922c51..1d7abbd94a34 100644
--- a/src/chrome/content/rules/The_TFP.xml
+++ b/src/chrome/content/rules/The_TFP.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/The_Tin_Hat.com.xml b/src/chrome/content/rules/The_Tin_Hat.com.xml
index e6807254907b..3d135567260d 100644
--- a/src/chrome/content/rules/The_Tin_Hat.com.xml
+++ b/src/chrome/content/rules/The_Tin_Hat.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.thetinhat.com/ => https://www.thetinhat.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.thetinhat.com'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/The_Watershed.xml b/src/chrome/content/rules/The_Watershed.xml
deleted file mode 100644
index 6026e423e722..000000000000
--- a/src/chrome/content/rules/The_Watershed.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/The_Watershed_Residence.xml b/src/chrome/content/rules/The_Watershed_Residence.xml
index ae39e3894b56..e6cd17cb7339 100644
--- a/src/chrome/content/rules/The_Watershed_Residence.xml
+++ b/src/chrome/content/rules/The_Watershed_Residence.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.thewatershedresidence.com/ => https://thewatershedreside
 	www: mismatched
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/The_Web_Index.org.xml b/src/chrome/content/rules/The_Web_Index.org.xml
index 98d70c575a0a..b600ac9a7b0c 100644
--- a/src/chrome/content/rules/The_Web_Index.org.xml
+++ b/src/chrome/content/rules/The_Web_Index.org.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.thewebindex.org/ => https://www.thewebindex.org/: (51, "
 		- beta	(mismatched, CN: thewebindex.org)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/The_Western_World.xml b/src/chrome/content/rules/The_Western_World.xml
index dab396690a8d..7f89f142c51a 100644
--- a/src/chrome/content/rules/The_Western_World.xml
+++ b/src/chrome/content/rules/The_Western_World.xml
@@ -19,7 +19,7 @@ Fetch error: http://www.thewesternworld.com/ => https://www.thewesternworld.com/
 	The above three appear to serve images only.
 
 -->
-
+
 
 	
 	
@@ -30,4 +30,4 @@ Fetch error: http://www.thewesternworld.com/ => https://www.thewesternworld.com/
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/The_World_According_to_Nouns.xml b/src/chrome/content/rules/The_World_According_to_Nouns.xml
index 774b1ded6df9..9dc26e0e677a 100644
--- a/src/chrome/content/rules/The_World_According_to_Nouns.xml
+++ b/src/chrome/content/rules/The_World_According_to_Nouns.xml
@@ -1,7 +1,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Theadex.xml b/src/chrome/content/rules/Theadex.xml
index 4bf073a1edcd..219935b66e6c 100644
--- a/src/chrome/content/rules/Theadex.xml
+++ b/src/chrome/content/rules/Theadex.xml
@@ -5,4 +5,4 @@
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Theads.me.xml b/src/chrome/content/rules/Theads.me.xml
index 1ddd6dc6a7dd..222af250f7fa 100644
--- a/src/chrome/content/rules/Theads.me.xml
+++ b/src/chrome/content/rules/Theads.me.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.theads.me/ => https://www.theads.me/: (28, 'Operation ti
 		- code.theads.me
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Thecanadaline.com.xml b/src/chrome/content/rules/Thecanadaline.com.xml
new file mode 100644
index 000000000000..982d34230a24
--- /dev/null
+++ b/src/chrome/content/rules/Thecanadaline.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Thecthulhu.com.xml b/src/chrome/content/rules/Thecthulhu.com.xml
index 2a526d6c5d22..d8fbe76b9def 100644
--- a/src/chrome/content/rules/Thecthulhu.com.xml
+++ b/src/chrome/content/rules/Thecthulhu.com.xml
@@ -37,7 +37,7 @@ Fetch error: http://www.thecthulhu.com/ => https://www.thecthulhu.com/: (6, 'Cou
 	* Temporarily down
 -->
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Thefind.xml b/src/chrome/content/rules/Thefind.xml
index dcce07da9f0a..31316004dafb 100644
--- a/src/chrome/content/rules/Thefind.xml
+++ b/src/chrome/content/rules/Thefind.xml
@@ -12,11 +12,15 @@ Fetch error: http://s.tfcdn.com/ => https://www.thefind.com/: (60, 'SSL certific
 Fetch error: http://thefind.com/ => https://thefind.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
-	
+	
+	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Thehabbos.org.xml b/src/chrome/content/rules/Thehabbos.org.xml
index 85f82524763e..c01fd07cc878 100644
--- a/src/chrome/content/rules/Thehabbos.org.xml
+++ b/src/chrome/content/rules/Thehabbos.org.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Thehackernews.com.xml b/src/chrome/content/rules/Thehackernews.com.xml
index 238a5dfc24b5..a04bd2a38de9 100644
--- a/src/chrome/content/rules/Thehackernews.com.xml
+++ b/src/chrome/content/rules/Thehackernews.com.xml
@@ -17,5 +17,5 @@
 
 	
-	
+
 
diff --git a/src/chrome/content/rules/Themacro.com.xml b/src/chrome/content/rules/Themacro.com.xml
deleted file mode 100644
index 17b380315f9a..000000000000
--- a/src/chrome/content/rules/Themacro.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/ThemeParkReview.com.xml b/src/chrome/content/rules/ThemeParkReview.com.xml
new file mode 100644
index 000000000000..50c879b4dda6
--- /dev/null
+++ b/src/chrome/content/rules/ThemeParkReview.com.xml
@@ -0,0 +1,30 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Themes_and_Co.com.xml b/src/chrome/content/rules/Themes_and_Co.com.xml
deleted file mode 100644
index 905adbe2cf9a..000000000000
--- a/src/chrome/content/rules/Themes_and_Co.com.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-	
-	
-		
-		
-		
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Thephone.coop.xml b/src/chrome/content/rules/Thephone.coop.xml
index 097838441747..9fa697682ea3 100644
--- a/src/chrome/content/rules/Thephone.coop.xml
+++ b/src/chrome/content/rules/Thephone.coop.xml
@@ -12,7 +12,7 @@ Fetch error: http://plesk2.thephone.coop/ => https://plesk2.thephone.coop/: (60,
 		- Phone.coop.xml
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Thermitic.net.xml b/src/chrome/content/rules/Thermitic.net.xml
index f6c09e599ad2..b4ba9aef9833 100644
--- a/src/chrome/content/rules/Thermitic.net.xml
+++ b/src/chrome/content/rules/Thermitic.net.xml
@@ -6,7 +6,7 @@ Fetch error: http://stats.thermitic.net/ => https://stats.thermitic.net/: (60, '
 	^: shows stats, valid cert
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Thermo_Scientific.com.xml b/src/chrome/content/rules/Thermo_Scientific.com.xml
index 7765daeab952..9e418b3110bf 100644
--- a/src/chrome/content/rules/Thermo_Scientific.com.xml
+++ b/src/chrome/content/rules/Thermo_Scientific.com.xml
@@ -31,7 +31,7 @@ Non-2xx HTTP code: http://thermoscientific.com/ (200) => https://www.thermoscien
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Theses.cz.xml b/src/chrome/content/rules/Theses.cz.xml
index 4cccc51c5619..0a25486d050b 100644
--- a/src/chrome/content/rules/Theses.cz.xml
+++ b/src/chrome/content/rules/Theses.cz.xml
@@ -1,7 +1,6 @@
 
@@ -10,15 +9,9 @@
 	
 	
 
-
-	
-	
-
 	
 
-
-	
 
 
diff --git a/src/chrome/content/rules/Thesn.net.xml b/src/chrome/content/rules/Thesn.net.xml
index 75396253ffde..142f81e96558 100644
--- a/src/chrome/content/rules/Thesn.net.xml
+++ b/src/chrome/content/rules/Thesn.net.xml
@@ -14,7 +14,6 @@
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Thing.net-falsemixed.xml b/src/chrome/content/rules/Thing.net-falsemixed.xml
deleted file mode 100644
index 6ffba70831b8..000000000000
--- a/src/chrome/content/rules/Thing.net-falsemixed.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Thing.net.xml b/src/chrome/content/rules/Thing.net.xml
index 35bbdb6796ea..f09a3906cffc 100644
--- a/src/chrome/content/rules/Thing.net.xml
+++ b/src/chrome/content/rules/Thing.net.xml
@@ -1,54 +1,23 @@
 
 
 
 	
+	
+	
+	
+	
 	
 	
 	
+	
+	
 	
-	
+	
 	
-	
-		
-		
-
 
 	
 
diff --git a/src/chrome/content/rules/ThinkFaster.co.xml b/src/chrome/content/rules/ThinkFaster.co.xml
index 3c24785c635f..ae6fe830a560 100644
--- a/src/chrome/content/rules/ThinkFaster.co.xml
+++ b/src/chrome/content/rules/ThinkFaster.co.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.thinkfaster.co/ => https://www.thinkfaster.co/: (6, 'Could not resolve host: www.thinkfaster.co')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ThinkGeek.xml b/src/chrome/content/rules/ThinkGeek.xml
deleted file mode 100644
index ac789b425074..000000000000
--- a/src/chrome/content/rules/ThinkGeek.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-        
-        
-
-        
-        
-
diff --git a/src/chrome/content/rules/ThinkingDiver.com.xml b/src/chrome/content/rules/ThinkingDiver.com.xml
new file mode 100644
index 000000000000..fe94ca7c9819
--- /dev/null
+++ b/src/chrome/content/rules/ThinkingDiver.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Thinking_Christian.xml b/src/chrome/content/rules/Thinking_Christian.xml
index ba1c2b55d027..67c6bcfc48cc 100644
--- a/src/chrome/content/rules/Thinking_Christian.xml
+++ b/src/chrome/content/rules/Thinking_Christian.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Thinkwiki.org.xml b/src/chrome/content/rules/Thinkwiki.org.xml
new file mode 100644
index 000000000000..a9dc1658529a
--- /dev/null
+++ b/src/chrome/content/rules/Thinkwiki.org.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ThirdAge.xml b/src/chrome/content/rules/ThirdAge.xml
index 5bfd918832ef..b2e55021fba5 100644
--- a/src/chrome/content/rules/ThirdAge.xml
+++ b/src/chrome/content/rules/ThirdAge.xml
@@ -24,16 +24,17 @@ Fetch error: http://thirdage.com/ => https://thirdage.com/: (7, 'Failed to conne
 		- videos	(cert: *.onescreen.net; 403)
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/ThirdPresence.com.xml b/src/chrome/content/rules/ThirdPresence.com.xml
index 80df03e7610f..e0f7ef044dc5 100644
--- a/src/chrome/content/rules/ThirdPresence.com.xml
+++ b/src/chrome/content/rules/ThirdPresence.com.xml
@@ -20,4 +20,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Thirty_Meter_Telescope.xml b/src/chrome/content/rules/Thirty_Meter_Telescope.xml
deleted file mode 100644
index d2a5e3495d8a..000000000000
--- a/src/chrome/content/rules/Thirty_Meter_Telescope.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-	
-	
-		
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/ThisCatDoesNotExist.com.xml b/src/chrome/content/rules/ThisCatDoesNotExist.com.xml
new file mode 100644
index 000000000000..3f5aec9dd963
--- /dev/null
+++ b/src/chrome/content/rules/ThisCatDoesNotExist.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ThisCrazyTrain.com.xml b/src/chrome/content/rules/ThisCrazyTrain.com.xml
new file mode 100644
index 000000000000..d5ee85668542
--- /dev/null
+++ b/src/chrome/content/rules/ThisCrazyTrain.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ThisPersonDoesNotExist.com.xml b/src/chrome/content/rules/ThisPersonDoesNotExist.com.xml
new file mode 100644
index 000000000000..f15ba00e0355
--- /dev/null
+++ b/src/chrome/content/rules/ThisPersonDoesNotExist.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ThisWebHost.xml b/src/chrome/content/rules/ThisWebHost.xml
index 1d387a0221ed..7c155b05d45f 100644
--- a/src/chrome/content/rules/ThisWebHost.xml
+++ b/src/chrome/content/rules/ThisWebHost.xml
@@ -2,7 +2,7 @@
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/ThisisColossal.com.xml b/src/chrome/content/rules/ThisisColossal.com.xml
index bae0b2212ad7..51b2c1fd32cd 100644
--- a/src/chrome/content/rules/ThisisColossal.com.xml
+++ b/src/chrome/content/rules/ThisisColossal.com.xml
@@ -9,7 +9,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Thomas-Krenn.com.xml b/src/chrome/content/rules/Thomas-Krenn.com.xml
index 575bf6baea98..4dd234ccf4b8 100644
--- a/src/chrome/content/rules/Thomas-Krenn.com.xml
+++ b/src/chrome/content/rules/Thomas-Krenn.com.xml
@@ -11,7 +11,7 @@
 
 
 	
-	
+	
 
 
 	
-
+
 
 	
-	
+	
 
 
 	 https://admin.checkp
 		- Thomson.com.xml
 		- thomsoninnovation.com.xml
 		- thomsonreuters.com.ar.xml
-		- Thomson_Reuters_Life_Sciences.com.xml
 		- Web_of_Knowledge.xml
 		- Westlaw.com.xml
 
@@ -150,7 +149,7 @@ Fetch error: http://admin.checkpoint.thomsonreuters.com/ => https://admin.checkp
 	³ Unsecurable <= refused
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Thomson_Reuters_Life_Sciences.com.xml b/src/chrome/content/rules/Thomson_Reuters_Life_Sciences.com.xml
deleted file mode 100644
index a6a736e67eec..000000000000
--- a/src/chrome/content/rules/Thomson_Reuters_Life_Sciences.com.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Thp.io.xml b/src/chrome/content/rules/Thp.io.xml
index f5cbac3cd0a3..701077e24c52 100644
--- a/src/chrome/content/rules/Thp.io.xml
+++ b/src/chrome/content/rules/Thp.io.xml
@@ -1,16 +1,20 @@
 
 
 
 	
 	
+	
 
-
-	
 
+	
+
 
diff --git a/src/chrome/content/rules/ThreadReaderApp.com.xml b/src/chrome/content/rules/ThreadReaderApp.com.xml
new file mode 100644
index 000000000000..0e3a1fd7ae2f
--- /dev/null
+++ b/src/chrome/content/rules/ThreadReaderApp.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Threading-Building-Blocks.xml b/src/chrome/content/rules/Threading-Building-Blocks.xml
index c6ebe7773f2e..8a3292203668 100644
--- a/src/chrome/content/rules/Threading-Building-Blocks.xml
+++ b/src/chrome/content/rules/Threading-Building-Blocks.xml
@@ -6,7 +6,7 @@ Fetch error: http://threadingbuildingblocks.org/ => https://threadingbuildingblo
 	For other Intel coverage, see Intel.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Threat2Alert.com.xml b/src/chrome/content/rules/Threat2Alert.com.xml
index 4867754aebce..994031b2c32d 100644
--- a/src/chrome/content/rules/Threat2Alert.com.xml
+++ b/src/chrome/content/rules/Threat2Alert.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://threat2alert.com/ => https://threat2alert.com/: (6, 'Could n
 		- www.threat2alert.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/ThreatTrack_Security.com.xml b/src/chrome/content/rules/ThreatTrack_Security.com.xml
index b089a22f6457..491e2b68e44c 100644
--- a/src/chrome/content/rules/ThreatTrack_Security.com.xml
+++ b/src/chrome/content/rules/ThreatTrack_Security.com.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://threattracksecurity.com/ => https://threattracksecurity.com/: Cycle detected - URL already encountered: https://www.threattracksecurity.com/
 Fetch error: http://www.threattracksecurity.com/ => https://www.threattracksecurity.com/: Cycle detected - URL already encountered: https://www.threattracksecurity.com/
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Three.xml b/src/chrome/content/rules/Three.xml
index 42f43acea689..b8e0b25c6006 100644
--- a/src/chrome/content/rules/Three.xml
+++ b/src/chrome/content/rules/Three.xml
@@ -8,7 +8,7 @@ Fetch error: http://threestore.three.co.uk/ => https://threestore.three.co.uk/:
 Disabled by https-everywhere-checker because:
 Fetch error: http://threestore.three.co.uk/ => https://threestore.three.co.uk/: (51, "SSL: no alternative certificate subject name matches target host name 'threestore.three.co.uk'")
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/Threema.xml b/src/chrome/content/rules/Threema.xml
index 4e7f27cf8c1b..0383e34014a4 100644
--- a/src/chrome/content/rules/Threema.xml
+++ b/src/chrome/content/rules/Threema.xml
@@ -1,31 +1,11 @@
 
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+	
+	
 
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+	
+	
 
-    
+	
 
-    
+	
 
diff --git a/src/chrome/content/rules/Thrifty.be.xml b/src/chrome/content/rules/Thrifty.be.xml
new file mode 100644
index 000000000000..dd0fc32966ae
--- /dev/null
+++ b/src/chrome/content/rules/Thrifty.be.xml
@@ -0,0 +1,28 @@
+
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Thrifty.ch.xml b/src/chrome/content/rules/Thrifty.ch.xml
new file mode 100644
index 000000000000..1795fad219c7
--- /dev/null
+++ b/src/chrome/content/rules/Thrifty.ch.xml
@@ -0,0 +1,28 @@
+
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Thrifty.co.kr.xml b/src/chrome/content/rules/Thrifty.co.kr.xml
new file mode 100644
index 000000000000..58ff0f3f399e
--- /dev/null
+++ b/src/chrome/content/rules/Thrifty.co.kr.xml
@@ -0,0 +1,28 @@
+
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Thrifty.co.nz.xml b/src/chrome/content/rules/Thrifty.co.nz.xml
new file mode 100644
index 000000000000..12a83d4a3cff
--- /dev/null
+++ b/src/chrome/content/rules/Thrifty.co.nz.xml
@@ -0,0 +1,23 @@
+
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Thrifty.co.uk.xml b/src/chrome/content/rules/Thrifty.co.uk.xml
new file mode 100644
index 000000000000..2ff1bba30b67
--- /dev/null
+++ b/src/chrome/content/rules/Thrifty.co.uk.xml
@@ -0,0 +1,37 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Thrifty.co.za.xml b/src/chrome/content/rules/Thrifty.co.za.xml
new file mode 100644
index 000000000000..b294c6e9c536
--- /dev/null
+++ b/src/chrome/content/rules/Thrifty.co.za.xml
@@ -0,0 +1,34 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Thrifty.com.au.xml b/src/chrome/content/rules/Thrifty.com.au.xml
new file mode 100644
index 000000000000..8347a9089dbe
--- /dev/null
+++ b/src/chrome/content/rules/Thrifty.com.au.xml
@@ -0,0 +1,54 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Thrifty.com.br.xml b/src/chrome/content/rules/Thrifty.com.br.xml
new file mode 100644
index 000000000000..295725cf4311
--- /dev/null
+++ b/src/chrome/content/rules/Thrifty.com.br.xml
@@ -0,0 +1,13 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Thrifty.com.ph.xml b/src/chrome/content/rules/Thrifty.com.ph.xml
new file mode 100644
index 000000000000..356a03cb0617
--- /dev/null
+++ b/src/chrome/content/rules/Thrifty.com.ph.xml
@@ -0,0 +1,13 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Thrifty.com.xml b/src/chrome/content/rules/Thrifty.com.xml
new file mode 100644
index 000000000000..ac8640a0bdfe
--- /dev/null
+++ b/src/chrome/content/rules/Thrifty.com.xml
@@ -0,0 +1,62 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Thrifty.de.xml b/src/chrome/content/rules/Thrifty.de.xml
new file mode 100644
index 000000000000..795e9f32cfa5
--- /dev/null
+++ b/src/chrome/content/rules/Thrifty.de.xml
@@ -0,0 +1,29 @@
+
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Thrifty.ie.xml b/src/chrome/content/rules/Thrifty.ie.xml
new file mode 100644
index 000000000000..4d961b011baf
--- /dev/null
+++ b/src/chrome/content/rules/Thrifty.ie.xml
@@ -0,0 +1,28 @@
+
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Thrifty.ma.xml b/src/chrome/content/rules/Thrifty.ma.xml
new file mode 100644
index 000000000000..5311d1e26d41
--- /dev/null
+++ b/src/chrome/content/rules/Thrifty.ma.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Thrifty.nl.xml b/src/chrome/content/rules/Thrifty.nl.xml
new file mode 100644
index 000000000000..4cf5e08f4b61
--- /dev/null
+++ b/src/chrome/content/rules/Thrifty.nl.xml
@@ -0,0 +1,28 @@
+
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Thrifty.no.xml b/src/chrome/content/rules/Thrifty.no.xml
new file mode 100644
index 000000000000..28026ade2f8c
--- /dev/null
+++ b/src/chrome/content/rules/Thrifty.no.xml
@@ -0,0 +1,28 @@
+
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ThriftyCanada.ca.xml b/src/chrome/content/rules/ThriftyCanada.ca.xml
new file mode 100644
index 000000000000..19ec335f3fed
--- /dev/null
+++ b/src/chrome/content/rules/ThriftyCanada.ca.xml
@@ -0,0 +1,28 @@
+
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ThriftySingapore.com.xml b/src/chrome/content/rules/ThriftySingapore.com.xml
new file mode 100644
index 000000000000..4dc86f49a7cd
--- /dev/null
+++ b/src/chrome/content/rules/ThriftySingapore.com.xml
@@ -0,0 +1,28 @@
+
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Thumbshots.xml b/src/chrome/content/rules/Thumbshots.xml
index 1ab762317ada..83fa73b2a1c7 100644
--- a/src/chrome/content/rules/Thumbshots.xml
+++ b/src/chrome/content/rules/Thumbshots.xml
@@ -31,7 +31,7 @@
 
 	
-	
+
 		
 		
 		
diff --git a/src/chrome/content/rules/Thunderbird.net.xml b/src/chrome/content/rules/Thunderbird.net.xml
index 30c6743180bb..558516910d85 100644
--- a/src/chrome/content/rules/Thunderbird.net.xml
+++ b/src/chrome/content/rules/Thunderbird.net.xml
@@ -1,8 +1,8 @@
 
 
 	
-		
-	
+	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Thunderclap.it.xml b/src/chrome/content/rules/Thunderclap.it.xml
deleted file mode 100644
index f207670be278..000000000000
--- a/src/chrome/content/rules/Thunderclap.it.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Thunderkick.xml b/src/chrome/content/rules/Thunderkick.xml
index 2c6c61d5ac48..581d0d2da23a 100644
--- a/src/chrome/content/rules/Thunderkick.xml
+++ b/src/chrome/content/rules/Thunderkick.xml
@@ -6,7 +6,7 @@ Fetch error: http://thunderkick.com/ => https://thunderkick.com/: (60, 'SSL cert
 Disabled by https-everywhere-checker because:
 Fetch error: http://thunderkick.com/ => https://thunderkick.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 -->
-
+
 
 	
 	
@@ -15,4 +15,4 @@ Fetch error: http://thunderkick.com/ => https://thunderkick.com/: (60, 'SSL cert
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Thuvien.lgbt.xml b/src/chrome/content/rules/Thuvien.lgbt.xml
new file mode 100644
index 000000000000..badac978a37a
--- /dev/null
+++ b/src/chrome/content/rules/Thuvien.lgbt.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/TiMos.me.xml b/src/chrome/content/rules/TiMos.me.xml
index bb9ed90ef0e0..bde694e91053 100644
--- a/src/chrome/content/rules/TiMos.me.xml
+++ b/src/chrome/content/rules/TiMos.me.xml
@@ -6,7 +6,7 @@ Fetch error: http://timos.me/ => https://timos.me/: (28, 'Connection timed out a
 	www.timos.me doesn't exist.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Ticaretsicil.gov.tr.xml b/src/chrome/content/rules/Ticaretsicil.gov.tr.xml
new file mode 100644
index 000000000000..26e5f0f76b6f
--- /dev/null
+++ b/src/chrome/content/rules/Ticaretsicil.gov.tr.xml
@@ -0,0 +1,7 @@
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/TickerTech.com.xml b/src/chrome/content/rules/TickerTech.com.xml
index 587009b6b298..54009d92b129 100644
--- a/src/chrome/content/rules/TickerTech.com.xml
+++ b/src/chrome/content/rules/TickerTech.com.xml
@@ -7,10 +7,11 @@
 
 
 	
-	
+	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TicketOne.xml b/src/chrome/content/rules/TicketOne.xml
index 1512656b3763..fba7d174cf83 100644
--- a/src/chrome/content/rules/TicketOne.xml
+++ b/src/chrome/content/rules/TicketOne.xml
@@ -6,10 +6,11 @@ Non-2xx HTTP code: http://ticketone.it/ (200) => https://www.ticketone.it/ (403)
 	^ticketone.it doesn't work.
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
@@ -18,7 +19,6 @@ Non-2xx HTTP code: http://ticketone.it/ (200) => https://www.ticketone.it/ (403)
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Ticket_Driver.xml b/src/chrome/content/rules/Ticket_Driver.xml
deleted file mode 100644
index 86f7c541a495..000000000000
--- a/src/chrome/content/rules/Ticket_Driver.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Ticket_Online.xml b/src/chrome/content/rules/Ticket_Online.xml
index dba8513fad85..7dd583f248ee 100644
--- a/src/chrome/content/rules/Ticket_Online.xml
+++ b/src/chrome/content/rules/Ticket_Online.xml
@@ -8,10 +8,11 @@ Non-2xx HTTP code: http://ticketonline.de/ (200) => https://www.ticketonline.de/
 		- ticketonline.de	(times out)
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
@@ -20,7 +21,6 @@ Non-2xx HTTP code: http://ticketonline.de/ (200) => https://www.ticketonline.de/
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Ticketcorner.ch.xml b/src/chrome/content/rules/Ticketcorner.ch.xml
index f66126beb366..ce1d5487258c 100644
--- a/src/chrome/content/rules/Ticketcorner.ch.xml
+++ b/src/chrome/content/rules/Ticketcorner.ch.xml
@@ -1,5 +1,5 @@
 
-
+
   
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/Ticketmaster.ae.xml b/src/chrome/content/rules/Ticketmaster.ae.xml
new file mode 100644
index 000000000000..93c2a3f38dda
--- /dev/null
+++ b/src/chrome/content/rules/Ticketmaster.ae.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ticketmaster.at.xml b/src/chrome/content/rules/Ticketmaster.at.xml
new file mode 100644
index 000000000000..506ced89e6e1
--- /dev/null
+++ b/src/chrome/content/rules/Ticketmaster.at.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ticketmaster.be.xml b/src/chrome/content/rules/Ticketmaster.be.xml
new file mode 100644
index 000000000000..37be670df049
--- /dev/null
+++ b/src/chrome/content/rules/Ticketmaster.be.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ticketmaster.ch.xml b/src/chrome/content/rules/Ticketmaster.ch.xml
new file mode 100644
index 000000000000..c48059653738
--- /dev/null
+++ b/src/chrome/content/rules/Ticketmaster.ch.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ticketmaster.co.nz.xml b/src/chrome/content/rules/Ticketmaster.co.nz.xml
new file mode 100644
index 000000000000..769f3f110a60
--- /dev/null
+++ b/src/chrome/content/rules/Ticketmaster.co.nz.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ticketmaster.co.uk.xml b/src/chrome/content/rules/Ticketmaster.co.uk.xml
new file mode 100644
index 000000000000..11897fb2cb07
--- /dev/null
+++ b/src/chrome/content/rules/Ticketmaster.co.uk.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ticketmaster.com.au.xml b/src/chrome/content/rules/Ticketmaster.com.au.xml
new file mode 100644
index 000000000000..4785441336c5
--- /dev/null
+++ b/src/chrome/content/rules/Ticketmaster.com.au.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ticketmaster.com.mx.xml b/src/chrome/content/rules/Ticketmaster.com.mx.xml
new file mode 100644
index 000000000000..b661094f6f14
--- /dev/null
+++ b/src/chrome/content/rules/Ticketmaster.com.mx.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ticketmaster.cz.xml b/src/chrome/content/rules/Ticketmaster.cz.xml
new file mode 100644
index 000000000000..08cc23f9f393
--- /dev/null
+++ b/src/chrome/content/rules/Ticketmaster.cz.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ticketmaster.de.xml b/src/chrome/content/rules/Ticketmaster.de.xml
new file mode 100644
index 000000000000..8c81674a7b84
--- /dev/null
+++ b/src/chrome/content/rules/Ticketmaster.de.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ticketmaster.dk.xml b/src/chrome/content/rules/Ticketmaster.dk.xml
new file mode 100644
index 000000000000..583e67f45d7e
--- /dev/null
+++ b/src/chrome/content/rules/Ticketmaster.dk.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ticketmaster.es.xml b/src/chrome/content/rules/Ticketmaster.es.xml
new file mode 100644
index 000000000000..e5a79d639ecd
--- /dev/null
+++ b/src/chrome/content/rules/Ticketmaster.es.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ticketmaster.eu.xml b/src/chrome/content/rules/Ticketmaster.eu.xml
new file mode 100644
index 000000000000..99fadcc72eac
--- /dev/null
+++ b/src/chrome/content/rules/Ticketmaster.eu.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ticketmaster.fi.xml b/src/chrome/content/rules/Ticketmaster.fi.xml
new file mode 100644
index 000000000000..1121e05773d5
--- /dev/null
+++ b/src/chrome/content/rules/Ticketmaster.fi.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ticketmaster.fr.xml b/src/chrome/content/rules/Ticketmaster.fr.xml
new file mode 100644
index 000000000000..cc0ded4254d9
--- /dev/null
+++ b/src/chrome/content/rules/Ticketmaster.fr.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ticketmaster.gr.xml b/src/chrome/content/rules/Ticketmaster.gr.xml
new file mode 100644
index 000000000000..a0a0d30c1ded
--- /dev/null
+++ b/src/chrome/content/rules/Ticketmaster.gr.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ticketmaster.ie.xml b/src/chrome/content/rules/Ticketmaster.ie.xml
new file mode 100644
index 000000000000..c9cbcd41422f
--- /dev/null
+++ b/src/chrome/content/rules/Ticketmaster.ie.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ticketmaster.it.xml b/src/chrome/content/rules/Ticketmaster.it.xml
new file mode 100644
index 000000000000..94815a2b327f
--- /dev/null
+++ b/src/chrome/content/rules/Ticketmaster.it.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ticketmaster.nl.xml b/src/chrome/content/rules/Ticketmaster.nl.xml
new file mode 100644
index 000000000000..4c4d9bdde637
--- /dev/null
+++ b/src/chrome/content/rules/Ticketmaster.nl.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ticketmaster.no.xml b/src/chrome/content/rules/Ticketmaster.no.xml
new file mode 100644
index 000000000000..02b692ce57bb
--- /dev/null
+++ b/src/chrome/content/rules/Ticketmaster.no.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ticketmaster.pl.xml b/src/chrome/content/rules/Ticketmaster.pl.xml
new file mode 100644
index 000000000000..1b1dc3f7eb78
--- /dev/null
+++ b/src/chrome/content/rules/Ticketmaster.pl.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ticketmaster.se.xml b/src/chrome/content/rules/Ticketmaster.se.xml
new file mode 100644
index 000000000000..1e17b5975a7c
--- /dev/null
+++ b/src/chrome/content/rules/Ticketmaster.se.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ticketmaster.xml b/src/chrome/content/rules/Ticketmaster.xml
index f48dc08e661e..137ce45d44ab 100644
--- a/src/chrome/content/rules/Ticketmaster.xml
+++ b/src/chrome/content/rules/Ticketmaster.xml
@@ -1,140 +1,43 @@
-
 
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-	
-
-
-	
-
-	
-
-	
-
-
-	
-
-	
-
-	
-
-
-	
-
-
-	
-
-
-	
-
-
-	
-
-
-	
-
-
-	
-
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
 
diff --git a/src/chrome/content/rules/Ticketpro.xml b/src/chrome/content/rules/Ticketpro.xml
deleted file mode 100644
index f25374701dd4..000000000000
--- a/src/chrome/content/rules/Ticketpro.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Tickets.com.xml b/src/chrome/content/rules/Tickets.com.xml
index 1be7758d87d5..53b574acf471 100644
--- a/src/chrome/content/rules/Tickets.com.xml
+++ b/src/chrome/content/rules/Tickets.com.xml
@@ -1,9 +1,14 @@
+
 
 
 
-	
+	
 	
 	
-
+    
+    
+    
 
 	
 	
 
-
-	
-
-	
-
-	
 
-	
-
-	
-
-	
+  -->
+
+  
 
 
diff --git a/src/chrome/content/rules/Tickets.gwr.com.xml b/src/chrome/content/rules/Tickets.gwr.com.xml
index 8b84b60330b3..48913593a91f 100644
--- a/src/chrome/content/rules/Tickets.gwr.com.xml
+++ b/src/chrome/content/rules/Tickets.gwr.com.xml
@@ -1,7 +1,6 @@
 
 	
 
-	
 
 	
 
diff --git a/src/chrome/content/rules/TicketsNow.xml b/src/chrome/content/rules/TicketsNow.xml
index 1e6ef17aa3f9..411354d7f758 100644
--- a/src/chrome/content/rules/TicketsNow.xml
+++ b/src/chrome/content/rules/TicketsNow.xml
@@ -46,6 +46,6 @@
 	
 
-		
 
diff --git a/src/chrome/content/rules/Ticketweb.co.uk.xml b/src/chrome/content/rules/Ticketweb.co.uk.xml
new file mode 100644
index 000000000000..1f7456f99aaa
--- /dev/null
+++ b/src/chrome/content/rules/Ticketweb.co.uk.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ticketweb.com.xml b/src/chrome/content/rules/Ticketweb.com.xml
new file mode 100644
index 000000000000..668ab22b8b37
--- /dev/null
+++ b/src/chrome/content/rules/Ticketweb.com.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Tictail.com.xml b/src/chrome/content/rules/Tictail.com.xml
index 30e80a767dd1..76ad370aa337 100644
--- a/src/chrome/content/rules/Tictail.com.xml
+++ b/src/chrome/content/rules/Tictail.com.xml
@@ -49,7 +49,11 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 		
 
 
diff --git a/src/chrome/content/rules/TidBITS.xml b/src/chrome/content/rules/TidBITS.xml
index 05c61553ee48..6716ab03ea3b 100644
--- a/src/chrome/content/rules/TidBITS.xml
+++ b/src/chrome/content/rules/TidBITS.xml
@@ -12,4 +12,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Tidal_HiFi.com.xml b/src/chrome/content/rules/Tidal_HiFi.com.xml
index 17cc1dcefa00..cc46e57aaab7 100644
--- a/src/chrome/content/rules/Tidal_HiFi.com.xml
+++ b/src/chrome/content/rules/Tidal_HiFi.com.xml
@@ -16,7 +16,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
-
-
-	
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/TieTuKu.xml b/src/chrome/content/rules/TieTuKu.xml
index aca41267ed5b..04393440a400 100644
--- a/src/chrome/content/rules/TieTuKu.xml
+++ b/src/chrome/content/rules/TieTuKu.xml
@@ -30,7 +30,7 @@ Fetch error: http://i2.piimg.com/ => https://i2.piimg.com/: (28, 'Connection tim
 		i7.buimg.com
 		i7.piimg.com
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Tieto.com.xml b/src/chrome/content/rules/Tieto.com.xml
index cefa73be2d09..64c46137609d 100644
--- a/src/chrome/content/rules/Tieto.com.xml
+++ b/src/chrome/content/rules/Tieto.com.xml
@@ -1,15 +1,11 @@
 
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Tiger-Airways.xml b/src/chrome/content/rules/Tiger-Airways.xml
index 6dce0a6c2b1a..6b5dc5c5e740 100644
--- a/src/chrome/content/rules/Tiger-Airways.xml
+++ b/src/chrome/content/rules/Tiger-Airways.xml
@@ -25,7 +25,7 @@ Fetch error: http://groups.tigerair.com/ => https://groups.tigerair.com/: (51, "
 	¹ timeout
 	² cert mismatch
 -->
-
+
 	
 	
 	
@@ -39,4 +39,4 @@ Fetch error: http://groups.tigerair.com/ => https://groups.tigerair.com/: (51, "
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TigerDirect.xml b/src/chrome/content/rules/TigerDirect.xml
index f8033bda973f..0126088acaa4 100644
--- a/src/chrome/content/rules/TigerDirect.xml
+++ b/src/chrome/content/rules/TigerDirect.xml
@@ -18,7 +18,7 @@ Fetch error: http://biz.tigerdirect.com/ => https://biz.tigerdirect.com/: (60, '
 		- Image on biz from i\d+.geccdn.net
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Tigertronics.com.xml b/src/chrome/content/rules/Tigertronics.com.xml
new file mode 100644
index 000000000000..56fa29031f46
--- /dev/null
+++ b/src/chrome/content/rules/Tigertronics.com.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/TiggersWelt.net.xml b/src/chrome/content/rules/TiggersWelt.net.xml
index 5c0ffb0d609d..d63e0de39273 100644
--- a/src/chrome/content/rules/TiggersWelt.net.xml
+++ b/src/chrome/content/rules/TiggersWelt.net.xml
@@ -17,12 +17,12 @@ Non-2xx HTTP code: http://ssl.tiggerswelt.net/ (200) => https://ssl.tiggerswelt.
 		- webmail	(→ ssl)
 
 
-	Insecure cookies are set for these 
+	Insecure cookies are set for these
 
 		- ssl
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/TikTok.xml b/src/chrome/content/rules/TikTok.xml
new file mode 100644
index 000000000000..72a95709636a
--- /dev/null
+++ b/src/chrome/content/rules/TikTok.xml
@@ -0,0 +1,36 @@
+
+
+	
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+
+	
+	
+		
+		
+		
+		
+
+	
+
diff --git a/src/chrome/content/rules/Tilastokeskus.fi.xml b/src/chrome/content/rules/Tilastokeskus.fi.xml
new file mode 100644
index 000000000000..351399038c3f
--- /dev/null
+++ b/src/chrome/content/rules/Tilastokeskus.fi.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Tilburg_University.xml b/src/chrome/content/rules/Tilburg_University.xml
index 32cfae740cb4..50a7d51e4b87 100644
--- a/src/chrome/content/rules/Tilburg_University.xml
+++ b/src/chrome/content/rules/Tilburg_University.xml
@@ -9,7 +9,7 @@ Fetch error: http://stuwww.uvt.nl/ => https://stuwww.uvt.nl/: (28, 'Connection t
 		- www.tilburguniversity.edu
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Tilt.com.xml b/src/chrome/content/rules/Tilt.com.xml
deleted file mode 100644
index 4d290c2ee087..000000000000
--- a/src/chrome/content/rules/Tilt.com.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-	
-	
-
-		
-
-			
-			
-			
-			
-			
-
-		
-		
-
-	
-
-
diff --git a/src/chrome/content/rules/Tim.it.xml b/src/chrome/content/rules/Tim.it.xml
new file mode 100644
index 000000000000..750eab225f59
--- /dev/null
+++ b/src/chrome/content/rules/Tim.it.xml
@@ -0,0 +1,19 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/TimHortons.com.xml b/src/chrome/content/rules/TimHortons.com.xml
new file mode 100644
index 000000000000..989087dfd56c
--- /dev/null
+++ b/src/chrome/content/rules/TimHortons.com.xml
@@ -0,0 +1,23 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Tim_Minchin.com.xml b/src/chrome/content/rules/Tim_Minchin.com.xml
index 0a1a1e20225c..bc0b06308c88 100644
--- a/src/chrome/content/rules/Tim_Minchin.com.xml
+++ b/src/chrome/content/rules/Tim_Minchin.com.xml
@@ -1,23 +1,10 @@
-
 
 
+	
+	
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/TimeTrade.xml b/src/chrome/content/rules/TimeTrade.xml
deleted file mode 100644
index 25ff538bfc56..000000000000
--- a/src/chrome/content/rules/TimeTrade.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/TimeWeb.xml b/src/chrome/content/rules/TimeWeb.xml
index 1e1cb8622beb..a56979a8e437 100644
--- a/src/chrome/content/rules/TimeWeb.xml
+++ b/src/chrome/content/rules/TimeWeb.xml
@@ -12,7 +12,7 @@
 	
 
 
-	
+	
 
 
 	 https://amp.timeinc.net/time/4753419/time-100-gala-biggest-moments/?source=dam: (6, 'Could not resolve host: amp.timeinc.net')
+Fetch error: http://amp.timeinc.net/ => https://amp.timeinc.net/: (6, 'Could not resolve host: amp.timeinc.net')
+
+-->
+
 
 	
 		
-	
-		
-	
+	
 	
 		
 	
@@ -48,11 +59,11 @@
 	
 	
 	
-	
+	
 	
 	
 		
-	
+
 	
 
 	
diff --git a/src/chrome/content/rules/Times_Record_News.xml b/src/chrome/content/rules/Times_Record_News.xml
index 268dc39fe001..302d303b97af 100644
--- a/src/chrome/content/rules/Times_Record_News.xml
+++ b/src/chrome/content/rules/Times_Record_News.xml
@@ -33,7 +33,8 @@ Fetch error: http://timesrecordnews.com/ => https://www.timesrecordnews.com/: (5
 
 
 	
-	
+	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Timex.xml b/src/chrome/content/rules/Timex.xml
index c1db26e01cd1..47160102f312 100644
--- a/src/chrome/content/rules/Timex.xml
+++ b/src/chrome/content/rules/Timex.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://timex.com/ => https://timex.com/: (51, "SSL: no alternative certificate subject name matches target host name 'timex.com'")
 
 -->
-
+
 
 	
 	
@@ -15,4 +15,4 @@ Fetch error: http://timex.com/ => https://timex.com/: (51, "SSL: no alternative
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Tinc-vpn.org.xml b/src/chrome/content/rules/Tinc-vpn.org.xml
new file mode 100644
index 000000000000..8662eaa2ce2c
--- /dev/null
+++ b/src/chrome/content/rules/Tinc-vpn.org.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ting.com.xml b/src/chrome/content/rules/Ting.com.xml
index 4555feb72f0f..87069e776e61 100644
--- a/src/chrome/content/rules/Ting.com.xml
+++ b/src/chrome/content/rules/Ting.com.xml
@@ -24,13 +24,15 @@
 
 
 	
-	
+	
+	
+	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TinkerSoup.de.xml b/src/chrome/content/rules/TinkerSoup.de.xml
index f51dcfb2d4ac..47d5c8484343 100644
--- a/src/chrome/content/rules/TinkerSoup.de.xml
+++ b/src/chrome/content/rules/TinkerSoup.de.xml
@@ -18,7 +18,7 @@ Fetch error: http://www.tinkersoup.de/ => https://www.tinkersoup.de/: (60, 'SSL
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Tinkerforge.com.xml b/src/chrome/content/rules/Tinkerforge.com.xml
index 18cfce69a0b9..ab42090aae37 100644
--- a/src/chrome/content/rules/Tinkerforge.com.xml
+++ b/src/chrome/content/rules/Tinkerforge.com.xml
@@ -23,4 +23,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TinyBites.xml b/src/chrome/content/rules/TinyBites.xml
deleted file mode 100644
index 626ef1787baa..000000000000
--- a/src/chrome/content/rules/TinyBites.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/TinyChat.xml b/src/chrome/content/rules/TinyChat.xml
index 94859445da85..63aa9f52571d 100644
--- a/src/chrome/content/rules/TinyChat.xml
+++ b/src/chrome/content/rules/TinyChat.xml
@@ -7,8 +7,8 @@ Fetch error: http://www.tinychat.com/ => https://tinychat.com/: (60, 'SSL certif
   
   
 
-  
   
diff --git a/src/chrome/content/rules/TinyDL.com.xml b/src/chrome/content/rules/TinyDL.com.xml
deleted file mode 100644
index f79f9286b141..000000000000
--- a/src/chrome/content/rules/TinyDL.com.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/TinyURL.xml b/src/chrome/content/rules/TinyURL.xml
deleted file mode 100644
index d8ba57fd80a0..000000000000
--- a/src/chrome/content/rules/TinyURL.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Tinypass.com-falsemixed.xml b/src/chrome/content/rules/Tinypass.com-falsemixed.xml
deleted file mode 100644
index 5e7925ae565c..000000000000
--- a/src/chrome/content/rules/Tinypass.com-falsemixed.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Tinypass.com.xml b/src/chrome/content/rules/Tinypass.com.xml
index 6e7be9e62890..48b54db922ed 100644
--- a/src/chrome/content/rules/Tinypass.com.xml
+++ b/src/chrome/content/rules/Tinypass.com.xml
@@ -1,54 +1,40 @@
 
-
+
 
 	
+	
+	
+	
+	
 	
+	
+	
 	
 	
+	
+	
+	
+	
+	
+	
+	
+	
 	
-	
-		
-		
-		
-		
-
+	
 
 	
 
diff --git a/src/chrome/content/rules/Tinyteenpass.com.xml b/src/chrome/content/rules/Tinyteenpass.com.xml
index 1ae6df7409a4..23e1c52ff061 100644
--- a/src/chrome/content/rules/Tinyteenpass.com.xml
+++ b/src/chrome/content/rules/Tinyteenpass.com.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://tinyteenpass.com/ => https://tinyteenpass.com/: (7, 'Failed to connect to tinyteenpass.com port 443: No route to host')
 Fetch error: http://www.tinyteenpass.com/ => https://www.tinyteenpass.com/: (7, 'Failed to connect to www.tinyteenpass.com port 443: No route to host')
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.tinyteenpass.com/ => https://www.tinyteenpass.com/: (7,
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Tipico.de.xml b/src/chrome/content/rules/Tipico.de.xml
index ef4572ae922d..83a08957f8de 100644
--- a/src/chrome/content/rules/Tipico.de.xml
+++ b/src/chrome/content/rules/Tipico.de.xml
@@ -10,4 +10,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Tirerack.com.xml b/src/chrome/content/rules/Tirerack.com.xml
deleted file mode 100644
index 3acb50702749..000000000000
--- a/src/chrome/content/rules/Tirerack.com.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-  
-  
-
-  
-
-
diff --git a/src/chrome/content/rules/TitanPad.com.xml b/src/chrome/content/rules/TitanPad.com.xml
deleted file mode 100644
index 02c54f32ce65..000000000000
--- a/src/chrome/content/rules/TitanPad.com.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Tizen.org.xml b/src/chrome/content/rules/Tizen.org.xml
index 658867eb8d05..209740f2f421 100644
--- a/src/chrome/content/rules/Tizen.org.xml
+++ b/src/chrome/content/rules/Tizen.org.xml
@@ -16,7 +16,7 @@ Fetch error: http://tizen.org/ => https://tizen.org/: (51, "SSL: no alternative
 		- wiki
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Tjoos.xml b/src/chrome/content/rules/Tjoos.xml
index b909fa2f5e51..96b47e45936f 100644
--- a/src/chrome/content/rules/Tjoos.xml
+++ b/src/chrome/content/rules/Tjoos.xml
@@ -5,7 +5,11 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 
 
 	 https://www.tjournal.ru/: (51, "SSL: no alternative certificate subject name matches target host name 'www.tjournal.ru'")
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Tkbbank.ru.xml b/src/chrome/content/rules/Tkbbank.ru.xml
index e4610627355f..de13ebf5b426 100644
--- a/src/chrome/content/rules/Tkbbank.ru.xml
+++ b/src/chrome/content/rules/Tkbbank.ru.xml
@@ -10,7 +10,7 @@ sfera.tkbbank.ru ³
 ¹ mismatch
 ³ timed out
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Tls.li.xml b/src/chrome/content/rules/Tls.li.xml
index fe3323337241..58fe6324dc37 100644
--- a/src/chrome/content/rules/Tls.li.xml
+++ b/src/chrome/content/rules/Tls.li.xml
@@ -8,7 +8,7 @@ Fetch error: http://tls.li/ => https://tls.li/: (28, 'Connection timed out after
 		- www.tls.li
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Tmcnet.com.xml b/src/chrome/content/rules/Tmcnet.com.xml
index 53aa8e267089..f90a14f5bd98 100644
--- a/src/chrome/content/rules/Tmcnet.com.xml
+++ b/src/chrome/content/rules/Tmcnet.com.xml
@@ -20,7 +20,7 @@ Fetch error: http://www.tmcnet.com/ => https://www.tmcnet.com/: Cycle detected -
 	** 404, CN: www.tmcnet.com
 
 -->
-
+
 
 	
 	
@@ -28,4 +28,4 @@ Fetch error: http://www.tmcnet.com/ => https://www.tmcnet.com/: Cycle detected -
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Tmsz.com.xml b/src/chrome/content/rules/Tmsz.com.xml
index b7960b28de79..59d217eeba12 100644
--- a/src/chrome/content/rules/Tmsz.com.xml
+++ b/src/chrome/content/rules/Tmsz.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.tmsz.com/ => https://www.tmsz.com/: (7, 'Failed to conne
 	Mixed images from various domains
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ToFOUR.net.xml b/src/chrome/content/rules/ToFOUR.net.xml
index 241e69980921..114d0b7e0d0f 100644
--- a/src/chrome/content/rules/ToFOUR.net.xml
+++ b/src/chrome/content/rules/ToFOUR.net.xml
@@ -1,13 +1,17 @@
+
 
 
 
 	
-	
+	
 	
 	
 
diff --git a/src/chrome/content/rules/ToLearnEnglish.com.xml b/src/chrome/content/rules/ToLearnEnglish.com.xml
new file mode 100644
index 000000000000..640104d3a9c1
--- /dev/null
+++ b/src/chrome/content/rules/ToLearnEnglish.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Toad_Fly.xml b/src/chrome/content/rules/Toad_Fly.xml
index bce3b4d33730..1a2ec78f491c 100644
--- a/src/chrome/content/rules/Toad_Fly.xml
+++ b/src/chrome/content/rules/Toad_Fly.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Toastmasters.org.xml b/src/chrome/content/rules/Toastmasters.org.xml
new file mode 100644
index 000000000000..6b75d412a405
--- /dev/null
+++ b/src/chrome/content/rules/Toastmasters.org.xml
@@ -0,0 +1,36 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Todo_en_Tinta.xml b/src/chrome/content/rules/Todo_en_Tinta.xml
index ee664e867dc5..6fd44f8e2239 100644
--- a/src/chrome/content/rules/Todo_en_Tinta.xml
+++ b/src/chrome/content/rules/Todo_en_Tinta.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.ahorroentinta.com/ => https://www.ahorroentinta.com/: (6
 Disabled by https-everywhere-checker because:
 Fetch error: http://ahorroentinta.com/ => https://ahorroentinta.com/: Redirect for 'http://peplogar.com/' missing Location
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://ahorroentinta.com/ => https://ahorroentinta.com/: Redirect f
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Todoly.xml b/src/chrome/content/rules/Todoly.xml
index c056af1a18fa..f34dc53a3247 100644
--- a/src/chrome/content/rules/Todoly.xml
+++ b/src/chrome/content/rules/Todoly.xml
@@ -2,7 +2,7 @@
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/Toga_Hotels.xml b/src/chrome/content/rules/Toga_Hotels.xml
index 722bf8248206..2826b4e3139f 100644
--- a/src/chrome/content/rules/Toga_Hotels.xml
+++ b/src/chrome/content/rules/Toga_Hotels.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Toko_Bitcoin.com.xml b/src/chrome/content/rules/Toko_Bitcoin.com.xml
deleted file mode 100644
index 40fbdf30bc03..000000000000
--- a/src/chrome/content/rules/Toko_Bitcoin.com.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Tokopedia.com.xml b/src/chrome/content/rules/Tokopedia.com.xml
new file mode 100644
index 000000000000..b233b8c0a1b3
--- /dev/null
+++ b/src/chrome/content/rules/Tokopedia.com.xml
@@ -0,0 +1,18 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Tokyo-Broadcasting-System-Television.xml b/src/chrome/content/rules/Tokyo-Broadcasting-System-Television.xml
new file mode 100644
index 000000000000..05965a9c87e5
--- /dev/null
+++ b/src/chrome/content/rules/Tokyo-Broadcasting-System-Television.xml
@@ -0,0 +1,5 @@
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Tokyo-Linux-Users-Group.xml b/src/chrome/content/rules/Tokyo-Linux-Users-Group.xml
index 414912d8e275..8524aefb4779 100644
--- a/src/chrome/content/rules/Tokyo-Linux-Users-Group.xml
+++ b/src/chrome/content/rules/Tokyo-Linux-Users-Group.xml
@@ -7,12 +7,12 @@
 
 
 	
-	
+	
+	
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Tokyo_University_of_Science.xml b/src/chrome/content/rules/Tokyo_University_of_Science.xml
index bf2d5db6f740..45de56d6744d 100644
--- a/src/chrome/content/rules/Tokyo_University_of_Science.xml
+++ b/src/chrome/content/rules/Tokyo_University_of_Science.xml
@@ -7,4 +7,4 @@
 						-->
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TomPawlak.org.xml b/src/chrome/content/rules/TomPawlak.org.xml
deleted file mode 100644
index ae7f943f95ae..000000000000
--- a/src/chrome/content/rules/TomPawlak.org.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/TomTom-International.xml b/src/chrome/content/rules/TomTom-International.xml
index 5e37257b5478..4f914fbaa428 100644
--- a/src/chrome/content/rules/TomTom-International.xml
+++ b/src/chrome/content/rules/TomTom-International.xml
@@ -14,10 +14,10 @@ Fetch error: http://www.tomtomrunningrace.com/ => https://www.tomtomrunningrace.
 		- lbs
 		- livetraffic
 		- download *
-		
+
 	* bad cert domain
 -->
-
+
 
 	
 	
@@ -25,7 +25,7 @@ Fetch error: http://www.tomtomrunningrace.com/ => https://www.tomtomrunningrace.
 	
 	
 	
-	
+
 	
 	
 	
@@ -47,20 +47,20 @@ Fetch error: http://www.tomtomrunningrace.com/ => https://www.tomtomrunningrace.
 	
 	
 	
-	
+
 	
 	
 	
-	
+
 	
 	
-	
-	
+
+
 	
 	
 	
-	
-	
+
+
 	
-	
+
 
diff --git a/src/chrome/content/rules/Toms-of-Maine.xml b/src/chrome/content/rules/Toms-of-Maine.xml
index ecd6d0e59fd6..4f5d151ad1c7 100644
--- a/src/chrome/content/rules/Toms-of-Maine.xml
+++ b/src/chrome/content/rules/Toms-of-Maine.xml
@@ -6,7 +6,7 @@ Fetch error: http://images.tomsofmainestore.com/ => https://images.tomsofmainest
 Disabled by https-everywhere-checker because:
 Fetch error: http://images.tomsofmainestore.com/ => https://images.tomsofmainestore.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/TomsHardware.com.xml b/src/chrome/content/rules/TomsHardware.com.xml
new file mode 100644
index 000000000000..77297018663d
--- /dev/null
+++ b/src/chrome/content/rules/TomsHardware.com.xml
@@ -0,0 +1,27 @@
+
+
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/TonerGiant.xml b/src/chrome/content/rules/TonerGiant.xml
index 194a90702c01..0d16bb210095 100644
--- a/src/chrome/content/rules/TonerGiant.xml
+++ b/src/chrome/content/rules/TonerGiant.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TonyBianco.xml b/src/chrome/content/rules/TonyBianco.xml
index a6e362f5676f..f7d8626c7fd3 100644
--- a/src/chrome/content/rules/TonyBianco.xml
+++ b/src/chrome/content/rules/TonyBianco.xml
@@ -5,4 +5,4 @@
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TonyZTan.xml b/src/chrome/content/rules/TonyZTan.xml
index d98dabe71128..12b15f5b4c3c 100644
--- a/src/chrome/content/rules/TonyZTan.xml
+++ b/src/chrome/content/rules/TonyZTan.xml
@@ -4,11 +4,11 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://ztan.tk/ => https://ztan.tk/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 
 	
 	
-	
+
 	
 
 	 https://toogl.com/: (35, 'Unknown SSL protocol
 		- quiz
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Toolbox.com.xml b/src/chrome/content/rules/Toolbox.com.xml
new file mode 100644
index 000000000000..a8c88393bc1e
--- /dev/null
+++ b/src/chrome/content/rules/Toolbox.com.xml
@@ -0,0 +1,23 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ToontownRewritten.xml b/src/chrome/content/rules/ToontownRewritten.xml
deleted file mode 100644
index 1202ec297138..000000000000
--- a/src/chrome/content/rules/ToontownRewritten.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Top.de.xml b/src/chrome/content/rules/Top.de.xml
index f97d2e97b662..d06aedede095 100644
--- a/src/chrome/content/rules/Top.de.xml
+++ b/src/chrome/content/rules/Top.de.xml
@@ -40,7 +40,7 @@ Fetch error: http://sec-i.top.de/ => https://sec-i.top.de/: (6, 'Could not resol
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/TopBuy.com.au.xml b/src/chrome/content/rules/TopBuy.com.au.xml
index c90b82d21a4b..871664292422 100644
--- a/src/chrome/content/rules/TopBuy.com.au.xml
+++ b/src/chrome/content/rules/TopBuy.com.au.xml
@@ -4,16 +4,16 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://groupbuy.topbuy.com.au/ => https://groupbuy.topbuy.com.au/: (28, 'Connection timed out after 20006 milliseconds')
 
 -->
-
+
 
 	
 	
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TopCoder.xml b/src/chrome/content/rules/TopCoder.xml
index 5ae1c9ee5901..663d3d5c5ab7 100644
--- a/src/chrome/content/rules/TopCoder.xml
+++ b/src/chrome/content/rules/TopCoder.xml
@@ -36,7 +36,7 @@
 	
 	
 
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/TopOption.com.xml b/src/chrome/content/rules/TopOption.com.xml
index a38baadcc093..98556091834f 100644
--- a/src/chrome/content/rules/TopOption.com.xml
+++ b/src/chrome/content/rules/TopOption.com.xml
@@ -36,7 +36,9 @@
 
 
 	
-	
+	
+	
+	
 		
 		
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/TopatoCo.xml b/src/chrome/content/rules/TopatoCo.xml
index ea5db714bc3b..66a78d71f7b7 100644
--- a/src/chrome/content/rules/TopatoCo.xml
+++ b/src/chrome/content/rules/TopatoCo.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Topky.sk.xml b/src/chrome/content/rules/Topky.sk.xml
new file mode 100644
index 000000000000..c30e61be463a
--- /dev/null
+++ b/src/chrome/content/rules/Topky.sk.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Toppers.jp.xml b/src/chrome/content/rules/Toppers.jp.xml
new file mode 100644
index 000000000000..d486b15bb889
--- /dev/null
+++ b/src/chrome/content/rules/Toppers.jp.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Tor2Web.xml b/src/chrome/content/rules/Tor2Web.xml
index 90f4b14cd11d..5196d85957a7 100644
--- a/src/chrome/content/rules/Tor2Web.xml
+++ b/src/chrome/content/rules/Tor2Web.xml
@@ -11,7 +11,7 @@ Fetch error: http://torlink.co/ => https://torlink.co/: (6, 'Could not resolve h
 Fetch error: http://onion.ink/ => https://onion.ink/: (6, 'Could not resolve host: onion.ink')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/TorLock.com.xml b/src/chrome/content/rules/TorLock.com.xml
deleted file mode 100644
index 1ce291c82f11..000000000000
--- a/src/chrome/content/rules/TorLock.com.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Torcache.xml b/src/chrome/content/rules/Torcache.xml
index 53c4cc21270c..9777986e2456 100644
--- a/src/chrome/content/rules/Torcache.xml
+++ b/src/chrome/content/rules/Torcache.xml
@@ -5,7 +5,7 @@ Fetch error: http://torcache.net/ => https://torcache.net/: (28, 'Connection tim
 Fetch error: http://www.torcache.net/ => https://www.torcache.net/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/TornadoWeb.org.xml b/src/chrome/content/rules/TornadoWeb.org.xml
new file mode 100644
index 000000000000..8b46c644adf4
--- /dev/null
+++ b/src/chrome/content/rules/TornadoWeb.org.xml
@@ -0,0 +1,17 @@
+
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Tornado_Web.org.xml b/src/chrome/content/rules/Tornado_Web.org.xml
deleted file mode 100644
index aefb641f909b..000000000000
--- a/src/chrome/content/rules/Tornado_Web.org.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Toronto-Star.xml b/src/chrome/content/rules/Toronto-Star.xml
index 15f3c1a5a811..cc446d316c9b 100644
--- a/src/chrome/content/rules/Toronto-Star.xml
+++ b/src/chrome/content/rules/Toronto-Star.xml
@@ -37,7 +37,7 @@ Fetch error: http://emarketing.thestar.com/ => https://emarketing.thestar.com/:
 	ˢ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/TorontoHydro.com.xml b/src/chrome/content/rules/TorontoHydro.com.xml
new file mode 100644
index 000000000000..a70e9eb022ba
--- /dev/null
+++ b/src/chrome/content/rules/TorontoHydro.com.xml
@@ -0,0 +1,21 @@
+
+
+
+	
+	
+	
+	
+  	
+  	
+
+	
+
diff --git a/src/chrome/content/rules/TorontoPolice.on.ca.xml b/src/chrome/content/rules/TorontoPolice.on.ca.xml
index 74c039d1e1b1..2d9f7739eb66 100644
--- a/src/chrome/content/rules/TorontoPolice.on.ca.xml
+++ b/src/chrome/content/rules/TorontoPolice.on.ca.xml
@@ -1,18 +1,18 @@
 
+
 
 	
 	
@@ -20,8 +20,15 @@
 	
 	
 	
+	
+	
+	
+	
+	
+	
 	
+	
+	
 
-	
+	
 
diff --git a/src/chrome/content/rules/Torontohydro.com.xml b/src/chrome/content/rules/Torontohydro.com.xml
deleted file mode 100644
index b1635d132373..000000000000
--- a/src/chrome/content/rules/Torontohydro.com.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-	
-	
-	
-	
-  	
-	
-  	
-  	
-  	
-  	
-
-	
-
diff --git a/src/chrome/content/rules/Torrent.tm.xml b/src/chrome/content/rules/Torrent.tm.xml
deleted file mode 100644
index 181591b3dfbd..000000000000
--- a/src/chrome/content/rules/Torrent.tm.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/TorrentButler.xml b/src/chrome/content/rules/TorrentButler.xml
index 8c9658e8d740..f9ba7e93a180 100644
--- a/src/chrome/content/rules/TorrentButler.xml
+++ b/src/chrome/content/rules/TorrentButler.xml
@@ -1,7 +1,7 @@
 
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/TorrentDay.com.xml b/src/chrome/content/rules/TorrentDay.com.xml
index ac97b4067074..24d42d398639 100644
--- a/src/chrome/content/rules/TorrentDay.com.xml
+++ b/src/chrome/content/rules/TorrentDay.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://editor.torrentday.com/ => https://editor.torrentday.com/: (6
 		announce.torrentday.com
 		irc.torrentday.com
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/TorrentFunk.com.xml b/src/chrome/content/rules/TorrentFunk.com.xml
deleted file mode 100644
index 74bdb07aacfd..000000000000
--- a/src/chrome/content/rules/TorrentFunk.com.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-	
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Torrentleech.org.xml b/src/chrome/content/rules/Torrentleech.org.xml
index 36cc896313c0..0d6a2ffbc626 100644
--- a/src/chrome/content/rules/Torrentleech.org.xml
+++ b/src/chrome/content/rules/Torrentleech.org.xml
@@ -1,28 +1,19 @@
-
-
-
-	
+
 	
 	
-
-
-	
-	
-	
-
-	
-
-
-	
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+        
 
+
diff --git a/src/chrome/content/rules/Torrentproject.com.xml b/src/chrome/content/rules/Torrentproject.com.xml
deleted file mode 100644
index 496636181de0..000000000000
--- a/src/chrome/content/rules/Torrentproject.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Torrentsmirror.xml b/src/chrome/content/rules/Torrentsmirror.xml
deleted file mode 100644
index d647211f894a..000000000000
--- a/src/chrome/content/rules/Torrentsmirror.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Torrentz-Proxy.xml b/src/chrome/content/rules/Torrentz-Proxy.xml
deleted file mode 100644
index 836f8a5480c3..000000000000
--- a/src/chrome/content/rules/Torrentz-Proxy.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Torrentz.xml b/src/chrome/content/rules/Torrentz.xml
deleted file mode 100644
index 59292ef8baae..000000000000
--- a/src/chrome/content/rules/Torrentz.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/TorreyCommerce.net.xml b/src/chrome/content/rules/TorreyCommerce.net.xml
index 5da7937cd8c1..eaa6513c03b3 100644
--- a/src/chrome/content/rules/TorreyCommerce.net.xml
+++ b/src/chrome/content/rules/TorreyCommerce.net.xml
@@ -9,7 +9,7 @@ Fetch error: http://torreycommerce.net/ => https://torreycommerce.net/: Redirect
 	For other TorreyCommerce coverage, see TorreyCommerce.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Torus_Knot.com.xml b/src/chrome/content/rules/Torus_Knot.com.xml
index 8d707839a344..4b9e18753c51 100644
--- a/src/chrome/content/rules/Torus_Knot.com.xml
+++ b/src/chrome/content/rules/Torus_Knot.com.xml
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Toshiba.co.jp.xml b/src/chrome/content/rules/Toshiba.co.jp.xml
index 0c9d580f6836..15686e336886 100644
--- a/src/chrome/content/rules/Toshiba.co.jp.xml
+++ b/src/chrome/content/rules/Toshiba.co.jp.xml
@@ -13,4 +13,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TotalBarcode.com.xml b/src/chrome/content/rules/TotalBarcode.com.xml
index 463117742c45..8acc39cfe2c2 100644
--- a/src/chrome/content/rules/TotalBarcode.com.xml
+++ b/src/chrome/content/rules/TotalBarcode.com.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TotalProSports.com.xml b/src/chrome/content/rules/TotalProSports.com.xml
new file mode 100644
index 000000000000..920dfa63d051
--- /dev/null
+++ b/src/chrome/content/rules/TotalProSports.com.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Total_Boox.xml b/src/chrome/content/rules/Total_Boox.xml
index f3e3093bfb2e..f97b0d36f276 100644
--- a/src/chrome/content/rules/Total_Boox.xml
+++ b/src/chrome/content/rules/Total_Boox.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://totalboox.com/ => https://totalboox.com/: (6, 'Could not resolve host: totalboox.com')
 
 -->
-
+
 
 	
 	
@@ -15,4 +15,4 @@ Fetch error: http://totalboox.com/ => https://totalboox.com/: (6, 'Could not res
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Total_Eyecare.xml b/src/chrome/content/rules/Total_Eyecare.xml
index c56b8bfd2bef..11634f20244a 100644
--- a/src/chrome/content/rules/Total_Eyecare.xml
+++ b/src/chrome/content/rules/Total_Eyecare.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Total_Fan_Shop.net.xml b/src/chrome/content/rules/Total_Fan_Shop.net.xml
index e69cb34996fe..ad5c2550e0fc 100644
--- a/src/chrome/content/rules/Total_Fan_Shop.net.xml
+++ b/src/chrome/content/rules/Total_Fan_Shop.net.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.totalfanshop.net/ => https://www.totalfanshop.net/: (28,
 Disabled by https-everywhere-checker because:
 Fetch error: http://totalfanshop.net/ => https://totalfanshop.net/: (35, 'error:14094410:SSL routines:SSL3_READ_BYTES:sslv3 alert handshake failure')
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://totalfanshop.net/ => https://totalfanshop.net/: (35, 'error:
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Total_Investor.xml b/src/chrome/content/rules/Total_Investor.xml
index c8688996cc89..e4f6f51203d5 100644
--- a/src/chrome/content/rules/Total_Investor.xml
+++ b/src/chrome/content/rules/Total_Investor.xml
@@ -24,7 +24,10 @@ Fetch error: http://totalinvestor.co.uk/ => https://www.totalinvestor.co.uk/: (7
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Total_Web_Solutions.xml b/src/chrome/content/rules/Total_Web_Solutions.xml
index f0a537fb5385..a1326e5702d7 100644
--- a/src/chrome/content/rules/Total_Web_Solutions.xml
+++ b/src/chrome/content/rules/Total_Web_Solutions.xml
@@ -16,10 +16,16 @@ Fetch error: http://store.totalwebsolutions.com/ => https://store.totalwebsoluti
 	* Shows order.totalwebsecure.com; mismatched, CN: *.totalwebsecure.com
 
 -->
-
-
-	
-	
+
+
+	
+	
+	
+	
+	
+	
+	
+	
 	
 
 
@@ -27,13 +33,8 @@ Fetch error: http://store.totalwebsolutions.com/ => https://store.totalwebsoluti
 	
 
 
-	
 
-	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Totem.xml b/src/chrome/content/rules/Totem.xml
index 52fb72debd04..1b287aca2a7f 100644
--- a/src/chrome/content/rules/Totem.xml
+++ b/src/chrome/content/rules/Totem.xml
@@ -25,7 +25,7 @@
 		
 		
 		
-	
+
 	
diff --git a/src/chrome/content/rules/TouClick.xml b/src/chrome/content/rules/TouClick.xml
index 045781285103..25b24fe1c3da 100644
--- a/src/chrome/content/rules/TouClick.xml
+++ b/src/chrome/content/rules/TouClick.xml
@@ -2,20 +2,20 @@
 
 
-
+
 
 	
 	
@@ -23,5 +23,5 @@ Fetch error: http://admin.touclick.com/ => https://admin.touclick.com/: (35, 'er
 	
 
 	
-	
+
 
diff --git a/src/chrome/content/rules/TouTiao.xml b/src/chrome/content/rules/TouTiao.xml
index 4b0bee57cf79..987cc913d0ed 100644
--- a/src/chrome/content/rules/TouTiao.xml
+++ b/src/chrome/content/rules/TouTiao.xml
@@ -1,40 +1,34 @@
 
-
 
-
 	
-	
 	
-	
-		
+	
 		
 
 	
 	
 	
-		
-		
 		
-
+	
+	
+	
 	
 	
+	
 	
 
+	
+		
+	
+
+	
+	
 	
 	
 	
@@ -55,6 +49,7 @@
 	
 	
 	
+	
 	
 
 	
diff --git a/src/chrome/content/rules/TouchCommerce.xml b/src/chrome/content/rules/TouchCommerce.xml
deleted file mode 100644
index bbf861bda0c4..000000000000
--- a/src/chrome/content/rules/TouchCommerce.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-	
-		
-		
-	
-
-
-	
-	
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/TouchNet_Information_Systems.xml b/src/chrome/content/rules/TouchNet_Information_Systems.xml
index a8f05e2d7654..7674cf07937e 100644
--- a/src/chrome/content/rules/TouchNet_Information_Systems.xml
+++ b/src/chrome/content/rules/TouchNet_Information_Systems.xml
@@ -8,4 +8,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Touchandtravel.de.xml b/src/chrome/content/rules/Touchandtravel.de.xml
index b5b3cda3b6fb..89b203fa7dcb 100644
--- a/src/chrome/content/rules/Touchandtravel.de.xml
+++ b/src/chrome/content/rules/Touchandtravel.de.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.touchandtravel.de/ => https://www.touchandtravel.de/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
   
 
   
diff --git a/src/chrome/content/rules/Tourism_and_Events_Queensland.xml b/src/chrome/content/rules/Tourism_and_Events_Queensland.xml
index 7d86a4a08395..b16c0a79abda 100644
--- a/src/chrome/content/rules/Tourism_and_Events_Queensland.xml
+++ b/src/chrome/content/rules/Tourism_and_Events_Queensland.xml
@@ -11,7 +11,7 @@ Fetch error: http://atdw.tq.com.au/ => https://atdw.tq.com.au/: (51, "SSL: no al
 		- paypoint	(expired 2012-04-22)
 
 -->
-
+
 
 	
 
@@ -21,4 +21,4 @@ Fetch error: http://atdw.tq.com.au/ => https://atdw.tq.com.au/: (51, "SSL: no al
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TousLesCours.com.xml b/src/chrome/content/rules/TousLesCours.com.xml
new file mode 100644
index 000000000000..b979e819452a
--- /dev/null
+++ b/src/chrome/content/rules/TousLesCours.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/TowersTimes.co.uk.xml b/src/chrome/content/rules/TowersTimes.co.uk.xml
new file mode 100644
index 000000000000..2019280fff3e
--- /dev/null
+++ b/src/chrome/content/rules/TowersTimes.co.uk.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Toyota.es.xml b/src/chrome/content/rules/Toyota.es.xml
index 51d8d63a35ff..1ce4a2b43c9c 100644
--- a/src/chrome/content/rules/Toyota.es.xml
+++ b/src/chrome/content/rules/Toyota.es.xml
@@ -11,4 +11,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Toys_R_Us.com.xml b/src/chrome/content/rules/Toys_R_Us.com.xml
deleted file mode 100644
index af1a91465148..000000000000
--- a/src/chrome/content/rules/Toys_R_Us.com.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-	
-	
-		
-		
-		
-		
-
-
-	
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Tpaste.us.xml b/src/chrome/content/rules/Tpaste.us.xml
new file mode 100644
index 000000000000..44ddeb9da095
--- /dev/null
+++ b/src/chrome/content/rules/Tpaste.us.xml
@@ -0,0 +1,9 @@
+
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/TracFone_Wireless.com.xml b/src/chrome/content/rules/TracFone_Wireless.com.xml
deleted file mode 100644
index bbc88263cf36..000000000000
--- a/src/chrome/content/rules/TracFone_Wireless.com.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Trace_Register.xml b/src/chrome/content/rules/Trace_Register.xml
index dda75eaadced..50cfa904dcb4 100644
--- a/src/chrome/content/rules/Trace_Register.xml
+++ b/src/chrome/content/rules/Trace_Register.xml
@@ -11,4 +11,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Trachtenshop24.de.xml b/src/chrome/content/rules/Trachtenshop24.de.xml
deleted file mode 100644
index c5297d4d9b3e..000000000000
--- a/src/chrome/content/rules/Trachtenshop24.de.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/src/chrome/content/rules/Traction-Digital.com.xml b/src/chrome/content/rules/Traction-Digital.com.xml
index df99a938d0e2..f107d8393784 100644
--- a/src/chrome/content/rules/Traction-Digital.com.xml
+++ b/src/chrome/content/rules/Traction-Digital.com.xml
@@ -1,33 +1,15 @@
 
-
-
-	
-
-
-	
-	
+
 
+	
+	
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/TradeLeaks.com.xml b/src/chrome/content/rules/TradeLeaks.com.xml
index 05c3b0e2fff5..9c2005d5384e 100644
--- a/src/chrome/content/rules/TradeLeaks.com.xml
+++ b/src/chrome/content/rules/TradeLeaks.com.xml
@@ -17,7 +17,7 @@ Fetch error: http://www.tradeleaks.com/ => https://www.tradeleaks.com/: (60, 'SS
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/TradeNetworks.xml b/src/chrome/content/rules/TradeNetworks.xml
index 905fc94ae04a..91ba92586429 100644
--- a/src/chrome/content/rules/TradeNetworks.xml
+++ b/src/chrome/content/rules/TradeNetworks.xml
@@ -20,4 +20,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Tradeinchecker.com.xml b/src/chrome/content/rules/Tradeinchecker.com.xml
deleted file mode 100644
index 28ac3c5293a5..000000000000
--- a/src/chrome/content/rules/Tradeinchecker.com.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Tradelab.xml b/src/chrome/content/rules/Tradelab.xml
index ef61d84765cd..687f73712aea 100644
--- a/src/chrome/content/rules/Tradelab.xml
+++ b/src/chrome/content/rules/Tradelab.xml
@@ -19,4 +19,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TrafficHolder.com.xml b/src/chrome/content/rules/TrafficHolder.com.xml
deleted file mode 100644
index a45dc7ddc9d6..000000000000
--- a/src/chrome/content/rules/TrafficHolder.com.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/TrafficPrivacy.xml b/src/chrome/content/rules/TrafficPrivacy.xml
index 03a53dbd82f0..724e7fb5d979 100644
--- a/src/chrome/content/rules/TrafficPrivacy.xml
+++ b/src/chrome/content/rules/TrafficPrivacy.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.trafficprivacy.com/ => https://trafficprivacy.com/: (60,
 		- trafficprivacy.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Traffic_Safety_Marketing.gov.xml b/src/chrome/content/rules/Traffic_Safety_Marketing.gov.xml
deleted file mode 100644
index bf5e3edede9e..000000000000
--- a/src/chrome/content/rules/Traffic_Safety_Marketing.gov.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Trafficfacts.com.xml b/src/chrome/content/rules/Trafficfacts.com.xml
index 313e7f95add6..50e3fd20a5eb 100644
--- a/src/chrome/content/rules/Trafficfacts.com.xml
+++ b/src/chrome/content/rules/Trafficfacts.com.xml
@@ -6,8 +6,8 @@ Fetch error: http://rt.trafficfacts.com/ => https://rt.trafficfacts.com/: (6, 'C
 Disabled by https-everywhere-checker because:
 Fetch error: http://rt.trafficfacts.com/ => https://rt.trafficfacts.com/: (6, 'Could not resolve host: rt.trafficfacts.com')
 -->
-
+
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Trafficmaxx.xml b/src/chrome/content/rules/Trafficmaxx.xml
index 8da071eafe0a..1fed66484962 100644
--- a/src/chrome/content/rules/Trafficmaxx.xml
+++ b/src/chrome/content/rules/Trafficmaxx.xml
@@ -8,14 +8,14 @@ Fetch error: http://s3.trafficmaxx.de/ => https://s3.trafficmaxx.de/: (28, 'Conn
 		- (www.)trafficmaxx.com	(cert: *.trafficmaxx.de; redirects there)
 
 -->
-
+
 
 	
 	
 	
 
 
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Trails.com.xml b/src/chrome/content/rules/Trails.com.xml
new file mode 100644
index 000000000000..4107a429a2e9
--- /dev/null
+++ b/src/chrome/content/rules/Trails.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Trakehner-nord-west.de.xml b/src/chrome/content/rules/Trakehner-nord-west.de.xml
deleted file mode 100644
index 0bffaec21d90..000000000000
--- a/src/chrome/content/rules/Trakehner-nord-west.de.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/TransLink.ca.xml b/src/chrome/content/rules/TransLink.ca.xml
new file mode 100644
index 000000000000..6ca2c820a856
--- /dev/null
+++ b/src/chrome/content/rules/TransLink.ca.xml
@@ -0,0 +1,48 @@
+
+
+	
+	
+	
+	
+	
+	
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/TransTravels.lgbt.xml b/src/chrome/content/rules/TransTravels.lgbt.xml
deleted file mode 100644
index 3c45987967d9..000000000000
--- a/src/chrome/content/rules/TransTravels.lgbt.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Trans_Marine.xml b/src/chrome/content/rules/Trans_Marine.xml
index bb426055cf6b..8f67595961f7 100644
--- a/src/chrome/content/rules/Trans_Marine.xml
+++ b/src/chrome/content/rules/Trans_Marine.xml
@@ -5,7 +5,7 @@ Fetch error: http://transmarine.org/ => https://transmarine.org/: (60, 'SSL cert
 Fetch error: http://www.transmarine.org/ => https://www.transmarine.org/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.transmarine.org/ => https://www.transmarine.org/: (60, '
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TransferWise.com.xml b/src/chrome/content/rules/TransferWise.com.xml
index c969e59bf4c8..8f0e3304aa63 100644
--- a/src/chrome/content/rules/TransferWise.com.xml
+++ b/src/chrome/content/rules/TransferWise.com.xml
@@ -1,32 +1,32 @@
 
-
+
 
 	
 	
-
-
-	
-	
-
-	
-	
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
 
 	
-
 
diff --git a/src/chrome/content/rules/Transformationmadeeasy.com.xml b/src/chrome/content/rules/Transformationmadeeasy.com.xml
index 38532c51c7b0..8f63d5775112 100644
--- a/src/chrome/content/rules/Transformationmadeeasy.com.xml
+++ b/src/chrome/content/rules/Transformationmadeeasy.com.xml
@@ -29,4 +29,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Transformative_Works.org.xml b/src/chrome/content/rules/Transformative_Works.org.xml
index 58b4a4e33b5e..a323e2d23f0b 100644
--- a/src/chrome/content/rules/Transformative_Works.org.xml
+++ b/src/chrome/content/rules/Transformative_Works.org.xml
@@ -31,7 +31,7 @@ Fetch error: http://www.transformativeworks.org/ => https://transformativeworks.
 	² Secured in -problematic
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/TranslateHouse.org.xml b/src/chrome/content/rules/TranslateHouse.org.xml
new file mode 100644
index 000000000000..f9f5348fb274
--- /dev/null
+++ b/src/chrome/content/rules/TranslateHouse.org.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/TranslateThi.is.xml b/src/chrome/content/rules/TranslateThi.is.xml
index 02fcafcbf510..f5ffc76f4481 100644
--- a/src/chrome/content/rules/TranslateThi.is.xml
+++ b/src/chrome/content/rules/TranslateThi.is.xml
@@ -13,12 +13,11 @@ Non-2xx HTTP code: http://x.translateth.is/ (200) => https://s3.amazonaws.com/x.
 		- (www.)	(prints "dashd", invalid cert)
 
 -->
-
+
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Translatewiki.net.xml b/src/chrome/content/rules/Translatewiki.net.xml
index e543ad0f4f93..f5a607b27686 100644
--- a/src/chrome/content/rules/Translatewiki.net.xml
+++ b/src/chrome/content/rules/Translatewiki.net.xml
@@ -3,4 +3,4 @@
   
 
   
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Translink.xml b/src/chrome/content/rules/Translink.xml
index b121eafd6500..52877bed8196 100644
--- a/src/chrome/content/rules/Translink.xml
+++ b/src/chrome/content/rules/Translink.xml
@@ -6,7 +6,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/TransmissionZero.co.uk.xml b/src/chrome/content/rules/TransmissionZero.co.uk.xml
new file mode 100644
index 000000000000..0422718260b7
--- /dev/null
+++ b/src/chrome/content/rules/TransmissionZero.co.uk.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Transmode.se.xml b/src/chrome/content/rules/Transmode.se.xml
index 2f8f8e5517c7..9d4ffda77505 100644
--- a/src/chrome/content/rules/Transmode.se.xml
+++ b/src/chrome/content/rules/Transmode.se.xml
@@ -9,7 +9,7 @@ Fetch error: http://transmode.se/ => https://www.transmode.com/: (7, 'Failed to
 	(www.): mismatched
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Transmode.xml b/src/chrome/content/rules/Transmode.xml
index 2c1ef0a40f4a..5683d4e8db83 100644
--- a/src/chrome/content/rules/Transmode.xml
+++ b/src/chrome/content/rules/Transmode.xml
@@ -16,12 +16,12 @@ Fetch error: http://www.transmode.com/ => https://www.transmode.com/: (7, 'Faile
 	* Secured by us
 
 -->
-
+
 
 	
 	
 
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Transparency_Toolkit.org.xml b/src/chrome/content/rules/Transparency_Toolkit.org.xml
index fafd5ac0481d..c1b1ddbd77ae 100644
--- a/src/chrome/content/rules/Transparency_Toolkit.org.xml
+++ b/src/chrome/content/rules/Transparency_Toolkit.org.xml
@@ -8,7 +8,7 @@ Fetch error: http://htwiki.transparencytoolkit.org/ => https://htwiki.transparen
 		- .transparencytoolkit.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Trapologyboston.com.xml b/src/chrome/content/rules/Trapologyboston.com.xml
new file mode 100644
index 000000000000..93b7cef3362e
--- /dev/null
+++ b/src/chrome/content/rules/Trapologyboston.com.xml
@@ -0,0 +1,5 @@
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/Trash-Mail.com.xml b/src/chrome/content/rules/Trash-Mail.com.xml
deleted file mode 100644
index caa25aa88d4c..000000000000
--- a/src/chrome/content/rules/Trash-Mail.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Trauer.de.xml b/src/chrome/content/rules/Trauer.de.xml
index deaab097b3b4..9911e2cbc5ce 100644
--- a/src/chrome/content/rules/Trauer.de.xml
+++ b/src/chrome/content/rules/Trauer.de.xml
@@ -5,13 +5,13 @@
 
 
 	
-	
+	
+	
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/TravelBlog.xml b/src/chrome/content/rules/TravelBlog.xml
index 8a7f6b3fed2f..835e2edb6898 100644
--- a/src/chrome/content/rules/TravelBlog.xml
+++ b/src/chrome/content/rules/TravelBlog.xml
@@ -3,7 +3,7 @@
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/TravelDoctor.xml b/src/chrome/content/rules/TravelDoctor.xml
index 71fad445718d..5045bf52c2ac 100644
--- a/src/chrome/content/rules/TravelDoctor.xml
+++ b/src/chrome/content/rules/TravelDoctor.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TravelNow.xml b/src/chrome/content/rules/TravelNow.xml
index 35f8fdea7c29..513ac4da2ae2 100644
--- a/src/chrome/content/rules/TravelNow.xml
+++ b/src/chrome/content/rules/TravelNow.xml
@@ -16,7 +16,7 @@ Fetch error: http://dg.travelnow.com/ => https://dg.travelnow.com/: (6, 'Could n
 		- .www.travelnow.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/TravelPod.xml b/src/chrome/content/rules/TravelPod.xml
deleted file mode 100644
index d0735459b0a7..000000000000
--- a/src/chrome/content/rules/TravelPod.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Travel_Plan.xml b/src/chrome/content/rules/Travel_Plan.xml
index 827b00269503..e5fd9a0a5b73 100644
--- a/src/chrome/content/rules/Travel_Plan.xml
+++ b/src/chrome/content/rules/Travel_Plan.xml
@@ -8,7 +8,7 @@ Automatically by https-everywhere-checker because:
 Fetch error: http://travelplan.gr/ => https://travelplan.gr/: Cycle detected - URL already encountered: https://travelplan.gr/
 Fetch error: http://www.travelplan.gr/ => https://www.travelplan.gr/: Cycle detected - URL already encountered: https://www.travelplan.gr/
 -->
-
+
 
 	
 	
@@ -19,4 +19,4 @@ Fetch error: http://www.travelplan.gr/ => https://www.travelplan.gr/: Cycle dete
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Travelingnuker.com.xml b/src/chrome/content/rules/Travelingnuker.com.xml
index 4e5f230956d6..36e14d307180 100644
--- a/src/chrome/content/rules/Travelingnuker.com.xml
+++ b/src/chrome/content/rules/Travelingnuker.com.xml
@@ -22,7 +22,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Travelmarket.com.xml b/src/chrome/content/rules/Travelmarket.com.xml
index e8bed68b8e11..53b6e82fc704 100644
--- a/src/chrome/content/rules/Travelmarket.com.xml
+++ b/src/chrome/content/rules/Travelmarket.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://tmcomponents.travelmarket.com/ => https://tmcomponents.trave
 	* Refused
 
 -->
-
+
 
 	
 
@@ -21,4 +21,4 @@ Fetch error: http://tmcomponents.travelmarket.com/ => https://tmcomponents.trave
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Travelocity.xml b/src/chrome/content/rules/Travelocity.xml
index 8a38e96fa94a..bad884ee8c31 100644
--- a/src/chrome/content/rules/Travelocity.xml
+++ b/src/chrome/content/rules/Travelocity.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Non-2xx HTTP code: http://travelocity.com/ (200) => https://www.travelocity.com/ (403)
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Travelspecialistsite.com.xml b/src/chrome/content/rules/Travelspecialistsite.com.xml
index 71379139b405..f63c24a2ca8f 100644
--- a/src/chrome/content/rules/Travelspecialistsite.com.xml
+++ b/src/chrome/content/rules/Travelspecialistsite.com.xml
@@ -16,7 +16,7 @@
 		- www.manager.travelspecialistsite.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Travelzoo.com.xml b/src/chrome/content/rules/Travelzoo.com.xml
index 8aecbc5fe0c3..290ce2e978c5 100644
--- a/src/chrome/content/rules/Travelzoo.com.xml
+++ b/src/chrome/content/rules/Travelzoo.com.xml
@@ -44,9 +44,13 @@
 -->
 
 
-	
+	
+	
 	
-	
+	
+	
+	
+	
 
 
 	
@@ -61,4 +65,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Treasury.gov.xml b/src/chrome/content/rules/Treasury.gov.xml
index c0d10cce5c88..2ec2bf2392f5 100644
--- a/src/chrome/content/rules/Treasury.gov.xml
+++ b/src/chrome/content/rules/Treasury.gov.xml
@@ -39,7 +39,7 @@ Fetch error: http://m.treasury.gov/ => https://m.treasury.gov/: (51, "SSL: no al
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Trefis.xml b/src/chrome/content/rules/Trefis.xml
index 2a5a1e2e7f30..c664d1009dc2 100644
--- a/src/chrome/content/rules/Trefis.xml
+++ b/src/chrome/content/rules/Trefis.xml
@@ -14,7 +14,8 @@ Fetch error: http://trefis.com/ => https://www.trefis.com/: Cycle detected - URL
 
 
 	
-	
+	
+	
 
 
 	
@@ -23,7 +24,6 @@ Fetch error: http://trefis.com/ => https://www.trefis.com/: Cycle detected - URL
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Trekaroo.xml b/src/chrome/content/rules/Trekaroo.xml
deleted file mode 100644
index 3204a9229749..000000000000
--- a/src/chrome/content/rules/Trekaroo.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Tremor_Video.com.xml b/src/chrome/content/rules/Tremor_Video.com.xml
index 50c6fd6df583..e24d6bf44451 100644
--- a/src/chrome/content/rules/Tremor_Video.com.xml
+++ b/src/chrome/content/rules/Tremor_Video.com.xml
@@ -36,4 +36,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TrendWeight.xml b/src/chrome/content/rules/TrendWeight.xml
index d6a887e4871e..c11669d47f14 100644
--- a/src/chrome/content/rules/TrendWeight.xml
+++ b/src/chrome/content/rules/TrendWeight.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Trend_Micro.eu.xml b/src/chrome/content/rules/Trend_Micro.eu.xml
index 35335651ef76..75788e4c0517 100644
--- a/src/chrome/content/rules/Trend_Micro.eu.xml
+++ b/src/chrome/content/rules/Trend_Micro.eu.xml
@@ -15,7 +15,7 @@
 
 		- countermeasures ¹
 		- eeur ²
-		
+
 	¹ Mixed css
 	² Akamai
 
diff --git a/src/chrome/content/rules/Trend_Micro.xml b/src/chrome/content/rules/Trend_Micro.xml
index 43bbfe278d1d..6f87443a13f3 100644
--- a/src/chrome/content/rules/Trend_Micro.xml
+++ b/src/chrome/content/rules/Trend_Micro.xml
@@ -6,6 +6,7 @@
 
 		- Trend_Micro.de.xml
 		- Trend_Micro.eu.xml
+		- Zero_Day_Initiative.com.xml
 
 
 	CDN buckets:
diff --git a/src/chrome/content/rules/Trgt.eu.xml b/src/chrome/content/rules/Trgt.eu.xml
index 3c96f49cf7a9..9e374b41b19b 100644
--- a/src/chrome/content/rules/Trgt.eu.xml
+++ b/src/chrome/content/rules/Trgt.eu.xml
@@ -4,11 +4,11 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://cdn.trgt.eu/ => https://cdn.trgt.eu/: (6, 'Could not resolve host: cdn.trgt.eu')
 
 -->
-
+
 
 	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Tri-CUE.xml b/src/chrome/content/rules/Tri-CUE.xml
index 77914d7093e5..2154776d2b7c 100644
--- a/src/chrome/content/rules/Tri-CUE.xml
+++ b/src/chrome/content/rules/Tri-CUE.xml
@@ -8,9 +8,9 @@
 	
 
 
-		
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TriDeci.xml b/src/chrome/content/rules/TriDeci.xml
deleted file mode 100644
index 51ebf22e3472..000000000000
--- a/src/chrome/content/rules/TriDeci.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/TrialFunder.com.xml b/src/chrome/content/rules/TrialFunder.com.xml
deleted file mode 100644
index 8fa89b61d7cf..000000000000
--- a/src/chrome/content/rules/TrialFunder.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/TrialPay.xml b/src/chrome/content/rules/TrialPay.xml
index b920d4ab0ec6..541ec3f2ba90 100644
--- a/src/chrome/content/rules/TrialPay.xml
+++ b/src/chrome/content/rules/TrialPay.xml
@@ -9,7 +9,8 @@
 
 
 	
-	
+	
+	
 		
@@ -22,7 +23,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Tribalhosting.net.xml b/src/chrome/content/rules/Tribalhosting.net.xml
deleted file mode 100644
index 4534fca77373..000000000000
--- a/src/chrome/content/rules/Tribalhosting.net.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Tribune.xml b/src/chrome/content/rules/Tribune.xml
index 14887fb571dd..ba3c621ff9cd 100644
--- a/src/chrome/content/rules/Tribune.xml
+++ b/src/chrome/content/rules/Tribune.xml
@@ -13,7 +13,7 @@
 
 		- s3.amazonaws.com/MG2_Tribune/
 
-		-  trb.edgesuite.net 
+		-  trb.edgesuite.net
 
 			- www.trbimg.com
 
diff --git a/src/chrome/content/rules/Tricolumbia.org.xml b/src/chrome/content/rules/Tricolumbia.org.xml
index b301916cf507..00bb1399e238 100644
--- a/src/chrome/content/rules/Tricolumbia.org.xml
+++ b/src/chrome/content/rules/Tricolumbia.org.xml
@@ -6,10 +6,10 @@ Fetch error: http://tricolumbia.org/ => https://www.tricolumbia.org/: (28, 'Conn
 Disabled by https-everywhere-checker because:
 Fetch error: http://tricolumbia.org/ => https://www.tricolumbia.org/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Triggit.com.xml b/src/chrome/content/rules/Triggit.com.xml
index ee7917df928f..50a16a9f3364 100644
--- a/src/chrome/content/rules/Triggit.com.xml
+++ b/src/chrome/content/rules/Triggit.com.xml
@@ -20,7 +20,7 @@ Fetch error: http://portal.triggit.com/ => https://portal.triggit.com/: (28, 'Co
 		- Images on ^ from i.imgur.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Trillian.im.xml b/src/chrome/content/rules/Trillian.im.xml
deleted file mode 100644
index be06fdef1833..000000000000
--- a/src/chrome/content/rules/Trillian.im.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/TripHip.xml b/src/chrome/content/rules/TripHip.xml
index cf4a7db129c7..bf656988be2e 100644
--- a/src/chrome/content/rules/TripHip.xml
+++ b/src/chrome/content/rules/TripHip.xml
@@ -5,7 +5,7 @@ Fetch error: http://triphip.com/ => https://triphip.com/: (28, 'Connection timed
 Fetch error: http://www.triphip.com/ => https://www.triphip.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.triphip.com/ => https://www.triphip.com/: (28, 'Connecti
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/TripIt.com.xml b/src/chrome/content/rules/TripIt.com.xml
index b65782cafe61..edb433205640 100644
--- a/src/chrome/content/rules/TripIt.com.xml
+++ b/src/chrome/content/rules/TripIt.com.xml
@@ -9,7 +9,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Tripwire.com-falsemixed.xml b/src/chrome/content/rules/Tripwire.com-falsemixed.xml
deleted file mode 100644
index 508d57dcd0b4..000000000000
--- a/src/chrome/content/rules/Tripwire.com-falsemixed.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Tripwire.com.xml b/src/chrome/content/rules/Tripwire.com.xml
index 1306fdf8a06d..abb1c734d44c 100644
--- a/src/chrome/content/rules/Tripwire.com.xml
+++ b/src/chrome/content/rules/Tripwire.com.xml
@@ -1,52 +1,6 @@
-
 
-
 	
 	
-		
-		
-
-			
-			
-			
-			
-			
-			
-
-			
-			
-
-
-	
-	
-
-	
-
-
-	
-
-	
 
+	
 
diff --git a/src/chrome/content/rules/Triumph-Adler.de.xml b/src/chrome/content/rules/Triumph-Adler.de.xml
index c818a6bece81..a8b168b5a48b 100644
--- a/src/chrome/content/rules/Triumph-Adler.de.xml
+++ b/src/chrome/content/rules/Triumph-Adler.de.xml
@@ -9,4 +9,4 @@
 						-->
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Trkclk.net.xml b/src/chrome/content/rules/Trkclk.net.xml
deleted file mode 100644
index 974ab9a51607..000000000000
--- a/src/chrome/content/rules/Trkclk.net.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Tros.nl.xml b/src/chrome/content/rules/Tros.nl.xml
index 9db99cd3f384..8eabd59237df 100644
--- a/src/chrome/content/rules/Tros.nl.xml
+++ b/src/chrome/content/rules/Tros.nl.xml
@@ -5,7 +5,7 @@ Fetch error: http://tros.nl/ => https://tros.nl/: (60, 'SSL certificate problem:
 Fetch error: http://www.tros.nl/ => https://www.tros.nl/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Trove.com.xml b/src/chrome/content/rules/Trove.com.xml
index 1d89bb6e8a99..719a7f067d87 100644
--- a/src/chrome/content/rules/Trove.com.xml
+++ b/src/chrome/content/rules/Trove.com.xml
@@ -1,48 +1,12 @@
-
-
-
-
-	
+
 	
-	
-	
 	
-
-	
-
-
-	
-	
-
-	
-
+	
+	
+	
+	
+	
 
 	
-
+		    to="https:" />
 
diff --git a/src/chrome/content/rules/Troy_Hunt.xml b/src/chrome/content/rules/Troy_Hunt.xml
deleted file mode 100644
index 91c5e5ad4d6e..000000000000
--- a/src/chrome/content/rules/Troy_Hunt.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/TruckingUnlimited.com.xml b/src/chrome/content/rules/TruckingUnlimited.com.xml
index 5ef4dca0f0b4..f3592f9d98e3 100644
--- a/src/chrome/content/rules/TruckingUnlimited.com.xml
+++ b/src/chrome/content/rules/TruckingUnlimited.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://static.truckingunlimited.com/ => https://www.truckingunlimit
 		- static	(akamai)
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/TrueCrypt.ch.xml b/src/chrome/content/rules/TrueCrypt.ch.xml
index 66af4ab6f334..22f554b1df16 100644
--- a/src/chrome/content/rules/TrueCrypt.ch.xml
+++ b/src/chrome/content/rules/TrueCrypt.ch.xml
@@ -1,21 +1,12 @@
-
 
 
 	
-	
-
-
-	
-	
-
-	
+	
+	
+	
 
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/TrueLife.com-problematic.xml b/src/chrome/content/rules/TrueLife.com-problematic.xml
index 1a55618eef39..1d86d02ed06d 100644
--- a/src/chrome/content/rules/TrueLife.com-problematic.xml
+++ b/src/chrome/content/rules/TrueLife.com-problematic.xml
@@ -2,7 +2,7 @@
 	For rules that are on by default, see TrueLife.com.xml.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Trueachievements.com.xml b/src/chrome/content/rules/Trueachievements.com.xml
deleted file mode 100644
index a2ed2e993f2b..000000000000
--- a/src/chrome/content/rules/Trueachievements.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-  
-  
-
-  
-
diff --git a/src/chrome/content/rules/Truenudists.com.xml b/src/chrome/content/rules/Truenudists.com.xml
index 442da771b85b..46898aeaabfd 100644
--- a/src/chrome/content/rules/Truenudists.com.xml
+++ b/src/chrome/content/rules/Truenudists.com.xml
@@ -3,7 +3,7 @@
 		a.truenudists.com
 		g.truenudists.com
 		m.truenudists.com
-		
+
 -->
 
 
@@ -17,7 +17,7 @@
 
 	
 
-	
 
 
diff --git a/src/chrome/content/rules/Trump.com.xml b/src/chrome/content/rules/Trump.com.xml
new file mode 100644
index 000000000000..e14ddc248bdf
--- /dev/null
+++ b/src/chrome/content/rules/Trump.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/TrumpGolf.com.xml b/src/chrome/content/rules/TrumpGolf.com.xml
new file mode 100644
index 000000000000..cea8689da98d
--- /dev/null
+++ b/src/chrome/content/rules/TrumpGolf.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/TrumpGolfCount.com.xml b/src/chrome/content/rules/TrumpGolfCount.com.xml
new file mode 100644
index 000000000000..a2f6b76f8f65
--- /dev/null
+++ b/src/chrome/content/rules/TrumpGolfCount.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/TrumpHotels.com.xml b/src/chrome/content/rules/TrumpHotels.com.xml
new file mode 100644
index 000000000000..0cf83e66926b
--- /dev/null
+++ b/src/chrome/content/rules/TrumpHotels.com.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/TrumpInternationalRealty.com.xml b/src/chrome/content/rules/TrumpInternationalRealty.com.xml
new file mode 100644
index 000000000000..9422e4b73ffd
--- /dev/null
+++ b/src/chrome/content/rules/TrumpInternationalRealty.com.xml
@@ -0,0 +1,19 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/TrumpStore.com.xml b/src/chrome/content/rules/TrumpStore.com.xml
new file mode 100644
index 000000000000..aa5fb1e5f271
--- /dev/null
+++ b/src/chrome/content/rules/TrumpStore.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/TrumpWinery.com.xml b/src/chrome/content/rules/TrumpWinery.com.xml
new file mode 100644
index 000000000000..260299be624b
--- /dev/null
+++ b/src/chrome/content/rules/TrumpWinery.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Trumpia.com.xml b/src/chrome/content/rules/Trumpia.com.xml
deleted file mode 100644
index 70cde47c86cc..000000000000
--- a/src/chrome/content/rules/Trumpia.com.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/TrustKeeper.xml b/src/chrome/content/rules/TrustKeeper.xml
index 3d3eedbdb964..8a7afad774c4 100644
--- a/src/chrome/content/rules/TrustKeeper.xml
+++ b/src/chrome/content/rules/TrustKeeper.xml
@@ -13,7 +13,7 @@ Fetch error: http://www.trustkeeper.net/ => https://www.trustkeeper.net/: (28, '
 		- www.trustkeeper.net
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/TrustSign.com.br.xml b/src/chrome/content/rules/TrustSign.com.br.xml
index d4c47bf60875..39ab68b89a2e 100644
--- a/src/chrome/content/rules/TrustSign.com.br.xml
+++ b/src/chrome/content/rules/TrustSign.com.br.xml
@@ -12,7 +12,7 @@ Fetch error: http://security.trustsign.com.br/ => https://security.trustsign.com
 		- www.trustsign.com.br
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Trust_Dale.com.xml b/src/chrome/content/rules/Trust_Dale.com.xml
deleted file mode 100644
index 8d8e8d7ea140..000000000000
--- a/src/chrome/content/rules/Trust_Dale.com.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Trusted_CS.com.xml b/src/chrome/content/rules/Trusted_CS.com.xml
index 735a5f53e114..d8dbb6a4f3e1 100644
--- a/src/chrome/content/rules/Trusted_CS.com.xml
+++ b/src/chrome/content/rules/Trusted_CS.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.trustedcs.com/ => https://www.trustedcs.com/: (28, 'Conn
 	^: cert only matches www
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Trustwave.xml b/src/chrome/content/rules/Trustwave.xml
index 7d2200e0a053..5486800ccb23 100644
--- a/src/chrome/content/rules/Trustwave.xml
+++ b/src/chrome/content/rules/Trustwave.xml
@@ -1,8 +1,11 @@
+
 
 	
 	
-	
+	
 	
 	
 	
diff --git a/src/chrome/content/rules/Truth_in_Advertising.xml b/src/chrome/content/rules/Truth_in_Advertising.xml
index ebe89c3f72d0..c5898dbd45e1 100644
--- a/src/chrome/content/rules/Truth_in_Advertising.xml
+++ b/src/chrome/content/rules/Truth_in_Advertising.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Truthdig.xml b/src/chrome/content/rules/Truthdig.xml
index 0a0913ef65b0..37a81b853019 100644
--- a/src/chrome/content/rules/Truthdig.xml
+++ b/src/chrome/content/rules/Truthdig.xml
@@ -3,7 +3,7 @@
 	
 	
 
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/TryMagPop.ca.xml b/src/chrome/content/rules/TryMagPop.ca.xml
new file mode 100644
index 000000000000..6d60f3292845
--- /dev/null
+++ b/src/chrome/content/rules/TryMagPop.ca.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Try_Zen99.com.xml b/src/chrome/content/rules/Try_Zen99.com.xml
index 2c13bc9b48f3..918901f47d58 100644
--- a/src/chrome/content/rules/Try_Zen99.com.xml
+++ b/src/chrome/content/rules/Try_Zen99.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://tryzen99.com/ => https://tryzen99.com/: (51, "SSL: no alternative certificate subject name matches target host name 'tryzen99.com'")
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Tryton.org.xml b/src/chrome/content/rules/Tryton.org.xml
new file mode 100644
index 000000000000..6e2631e0eb14
--- /dev/null
+++ b/src/chrome/content/rules/Tryton.org.xml
@@ -0,0 +1,35 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Tsgstatic.com.xml b/src/chrome/content/rules/Tsgstatic.com.xml
index 8be1421230fc..dbf42bc2b4bd 100644
--- a/src/chrome/content/rules/Tsgstatic.com.xml
+++ b/src/chrome/content/rules/Tsgstatic.com.xml
@@ -22,7 +22,9 @@
 -->
 
 
-	
+	
+	
+	
 
 
 	
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/TuXingSun.net.xml b/src/chrome/content/rules/TuXingSun.net.xml
index ef430192ecad..e635c328b270 100644
--- a/src/chrome/content/rules/TuXingSun.net.xml
+++ b/src/chrome/content/rules/TuXingSun.net.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.tuxingsun.net/ => https://www.tuxingsun.net/: (6, 'Could
 		- www.tuxingsun.net
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Tub.ee.xml b/src/chrome/content/rules/Tub.ee.xml
new file mode 100644
index 000000000000..ee0e3c2a52c8
--- /dev/null
+++ b/src/chrome/content/rules/Tub.ee.xml
@@ -0,0 +1,25 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Tube4.me.xml b/src/chrome/content/rules/Tube4.me.xml
index 19b7dce64085..482b527d9717 100644
--- a/src/chrome/content/rules/Tube4.me.xml
+++ b/src/chrome/content/rules/Tube4.me.xml
@@ -17,7 +17,7 @@ Fetch error: http://tube4.me/ => https://tube4.me/: (60, 'SSL certificate proble
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Tucows.xml b/src/chrome/content/rules/Tucows.xml
index 23ae0204bcbe..7ad9853bec9a 100644
--- a/src/chrome/content/rules/Tucows.xml
+++ b/src/chrome/content/rules/Tucows.xml
@@ -28,7 +28,7 @@ Fetch error: http://contact-privacy.com/ => http://contact-privacy.com/: (28, 'R
 	² Refused
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Tufts.edu.xml b/src/chrome/content/rules/Tufts.edu.xml
index e80835adfca7..c7c0292b6164 100644
--- a/src/chrome/content/rules/Tufts.edu.xml
+++ b/src/chrome/content/rules/Tufts.edu.xml
@@ -129,7 +129,7 @@
 			Avoid false/broken MCB:
 						-->
 		
-		
+
 
 
 	
 
 
@@ -20,4 +20,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Tulemar.xml b/src/chrome/content/rules/Tulemar.xml
new file mode 100644
index 000000000000..def1c8927ac4
--- /dev/null
+++ b/src/chrome/content/rules/Tulemar.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+
+	
+	
+
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/Tum.de.xml b/src/chrome/content/rules/Tum.de.xml
index c87136c7431a..3ccaff21e24f 100644
--- a/src/chrome/content/rules/Tum.de.xml
+++ b/src/chrome/content/rules/Tum.de.xml
@@ -9,6 +9,6 @@ Technical University Munich
 	
 	
 	
-	
+
   
 
diff --git a/src/chrome/content/rules/Tumblr.com_blogs.xml b/src/chrome/content/rules/Tumblr.com_blogs.xml
deleted file mode 100644
index 25bf8ab8795b..000000000000
--- a/src/chrome/content/rules/Tumblr.com_blogs.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Tumblr.xml b/src/chrome/content/rules/Tumblr.xml
deleted file mode 100644
index 6f9d1ef214c5..000000000000
--- a/src/chrome/content/rules/Tumblr.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-	
-	
-	
-		
-	
-		
-		
-		
-		
-		
-		
-	
-		
-	
-		
-	
-	
-		
-	
-		
-		
-		
-	
-		
-	
-		
-	
-	
-		
-	
-		
-	
-	
-		
-	
-		
-
-	
-	
-	
-	
-
-	
-	
-
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Tunespeak.com.xml b/src/chrome/content/rules/Tunespeak.com.xml
index 19db8a9d65ca..0696dbe49f07 100644
--- a/src/chrome/content/rules/Tunespeak.com.xml
+++ b/src/chrome/content/rules/Tunespeak.com.xml
@@ -1,15 +1,14 @@
 
 
 	
-	
 	
-	
+	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Tuning_World.xml b/src/chrome/content/rules/Tuning_World.xml
deleted file mode 100644
index 65b64b4e598b..000000000000
--- a/src/chrome/content/rules/Tuning_World.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/TunnelBear.com.xml b/src/chrome/content/rules/TunnelBear.com.xml
deleted file mode 100644
index cfab114e10f9..000000000000
--- a/src/chrome/content/rules/TunnelBear.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/TunnelBroker.xml b/src/chrome/content/rules/TunnelBroker.xml
index 1daadfd7b853..615f4b82e31a 100644
--- a/src/chrome/content/rules/TunnelBroker.xml
+++ b/src/chrome/content/rules/TunnelBroker.xml
@@ -8,7 +8,7 @@ Fetch error: http://ipv6.tunnelbroker.net/ => https://ipv6.tunnelbroker.net/: (7
 	For other Hurricane Electric coverage, see HurricaneElectric.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Turath.co.uk.xml b/src/chrome/content/rules/Turath.co.uk.xml
new file mode 100644
index 000000000000..6aa6e44b9bbf
--- /dev/null
+++ b/src/chrome/content/rules/Turath.co.uk.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Turbine.com.xml b/src/chrome/content/rules/Turbine.com.xml
deleted file mode 100644
index 0eb93ce2c907..000000000000
--- a/src/chrome/content/rules/Turbine.com.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-	
-
-		
-		
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/TurboSquid.xml b/src/chrome/content/rules/TurboSquid.xml
index 489e8972c607..2c6333ed02a8 100644
--- a/src/chrome/content/rules/TurboSquid.xml
+++ b/src/chrome/content/rules/TurboSquid.xml
@@ -9,17 +9,15 @@ Fetch error: http://turbosquid.com/ => https://turbosquid.com/: Cycle detected -
 
 
 	
-	
+	
+	
+	
 		
 
 
 	
 
 
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/TurboTax.com.xml b/src/chrome/content/rules/TurboTax.com.xml
new file mode 100644
index 000000000000..a66009b734f5
--- /dev/null
+++ b/src/chrome/content/rules/TurboTax.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Turbobytes.com.xml b/src/chrome/content/rules/Turbobytes.com.xml
index ae9ca104b018..a51e63c0be3a 100644
--- a/src/chrome/content/rules/Turbobytes.com.xml
+++ b/src/chrome/content/rules/Turbobytes.com.xml
@@ -19,4 +19,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Turbobytes.net.xml b/src/chrome/content/rules/Turbobytes.net.xml
index f4329d7c3647..57e663b2eb90 100644
--- a/src/chrome/content/rules/Turbobytes.net.xml
+++ b/src/chrome/content/rules/Turbobytes.net.xml
@@ -11,11 +11,11 @@ Fetch error: http://az.turbobytes.net/ => https://az.turbobytes.net/: (6, 'Could
 	az serves ads.
 
 -->
-
+
 
 	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Turkiye.gov.tr.xml b/src/chrome/content/rules/Turkiye.gov.tr.xml
new file mode 100644
index 000000000000..4fc6c557a8b7
--- /dev/null
+++ b/src/chrome/content/rules/Turkiye.gov.tr.xml
@@ -0,0 +1,13 @@
+
+	
+	
+	
+	
+	
+	
+		
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Turn.com.xml b/src/chrome/content/rules/Turn.com.xml
index bf6ca801bf17..11196149e984 100644
--- a/src/chrome/content/rules/Turn.com.xml
+++ b/src/chrome/content/rules/Turn.com.xml
@@ -1,97 +1,73 @@
-
 
-
+
 
-	
-	
-	
+	
+	
 	
+	
+	
+	
 	
+	
+	
+	
+	
+	
+	
+	
 	
-		
-		
-		
-		
-		
-		
-
-
-	
-	
-
-
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
 
 	
diff --git a/src/chrome/content/rules/Turn_Game_Studios.xml b/src/chrome/content/rules/Turn_Game_Studios.xml
index 9f971b83711e..66e4fb020c4b 100644
--- a/src/chrome/content/rules/Turn_Game_Studios.xml
+++ b/src/chrome/content/rules/Turn_Game_Studios.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Turner.com.xml b/src/chrome/content/rules/Turner.com.xml
index 0811ccd57a21..9e8b61c7582a 100644
--- a/src/chrome/content/rules/Turner.com.xml
+++ b/src/chrome/content/rules/Turner.com.xml
@@ -1,7 +1,7 @@
 
-
+
 
 	
diff --git a/src/chrome/content/rules/Tutanota.de.xml b/src/chrome/content/rules/Tutanota.de.xml
deleted file mode 100644
index 0feb3e1cad19..000000000000
--- a/src/chrome/content/rules/Tutanota.de.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Tutor.com.xml b/src/chrome/content/rules/Tutor.com.xml
index 5b405c62ade8..25a059076be9 100644
--- a/src/chrome/content/rules/Tutor.com.xml
+++ b/src/chrome/content/rules/Tutor.com.xml
@@ -11,10 +11,11 @@ Fetch error: http://tutor.com/ => http://tutor.com/: (60, 'SSL certificate probl
 	Some pages redirect to http.
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	 http://tutor.com/: (60, 'SSL certificate probl
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Tutorialspoint.xml b/src/chrome/content/rules/Tutorialspoint.xml
index a92ed90d7ce8..24e47a23f60d 100644
--- a/src/chrome/content/rules/Tutorialspoint.xml
+++ b/src/chrome/content/rules/Tutorialspoint.xml
@@ -3,10 +3,10 @@
 
 -->
 
-	
+
 	
 	
-	
+
 	
 
 
diff --git a/src/chrome/content/rules/TutsPlus.com.xml b/src/chrome/content/rules/TutsPlus.com.xml
index 919390d8f5b1..d5f175f850b5 100644
--- a/src/chrome/content/rules/TutsPlus.com.xml
+++ b/src/chrome/content/rules/TutsPlus.com.xml
@@ -23,7 +23,14 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
 		
@@ -44,7 +51,6 @@
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Tux.Org.xml b/src/chrome/content/rules/Tux.Org.xml
index 3609be1eedeb..14af635b7b67 100644
--- a/src/chrome/content/rules/Tux.Org.xml
+++ b/src/chrome/content/rules/Tux.Org.xml
@@ -12,7 +12,7 @@
 
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/TuxFamily.org.xml b/src/chrome/content/rules/TuxFamily.org.xml
index bdc91483d5b2..49c1b551fe24 100644
--- a/src/chrome/content/rules/TuxFamily.org.xml
+++ b/src/chrome/content/rules/TuxFamily.org.xml
@@ -175,7 +175,7 @@ pics.glx-dock.org ³
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Tvp.pl.xml b/src/chrome/content/rules/Tvp.pl.xml
new file mode 100644
index 000000000000..306843e24f22
--- /dev/null
+++ b/src/chrome/content/rules/Tvp.pl.xml
@@ -0,0 +1,155 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Twattle.net.xml b/src/chrome/content/rules/Twattle.net.xml
index 2920f0585b93..3a707c57d88f 100644
--- a/src/chrome/content/rules/Twattle.net.xml
+++ b/src/chrome/content/rules/Twattle.net.xml
@@ -11,7 +11,7 @@
 		- (www.)?	(www → ^)
 
 
-	Insecure cookies are set for these 
+	Insecure cookies are set for these
 
 		- twattle.net
 
diff --git a/src/chrome/content/rules/Tweakers.net.xml b/src/chrome/content/rules/Tweakers.net.xml
index b80eb422437f..f89ddad1f7cc 100644
--- a/src/chrome/content/rules/Tweakers.net.xml
+++ b/src/chrome/content/rules/Tweakers.net.xml
@@ -20,7 +20,9 @@
 
 
 	
-	
+	
+	
+	
 		
diff --git a/src/chrome/content/rules/TweetAdder.com.xml b/src/chrome/content/rules/TweetAdder.com.xml
index 98d94c476de2..ec689f8717c2 100644
--- a/src/chrome/content/rules/TweetAdder.com.xml
+++ b/src/chrome/content/rules/TweetAdder.com.xml
@@ -16,7 +16,7 @@ Fetch error: http://www.tweetadder.com/ => https://www.tweetadder.com/: (51, "SS
 		- www.tweetadder.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/TweetSave.com.xml b/src/chrome/content/rules/TweetSave.com.xml
deleted file mode 100644
index 3070db33e59c..000000000000
--- a/src/chrome/content/rules/TweetSave.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Twenga.com-falsemixed.xml b/src/chrome/content/rules/Twenga.com-falsemixed.xml
index 10acd050dad6..54f15fc8b6ee 100644
--- a/src/chrome/content/rules/Twenga.com-falsemixed.xml
+++ b/src/chrome/content/rules/Twenga.com-falsemixed.xml
@@ -6,7 +6,7 @@ Fetch error: http://blog.twenga.com/ => https://blog.twenga.com/: (28, 'Connecti
 	For rules not causing false/broken MCB, see Twenga.com.xml.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Twenga.com.xml b/src/chrome/content/rules/Twenga.com.xml
index b628c2b74448..728ae35834a1 100644
--- a/src/chrome/content/rules/Twenga.com.xml
+++ b/src/chrome/content/rules/Twenga.com.xml
@@ -49,10 +49,10 @@
 					-->
 			
 			
-			
+			
 			
 
-		
+		
 		
 		
 		
diff --git a/src/chrome/content/rules/Twiago.com.xml b/src/chrome/content/rules/Twiago.com.xml
new file mode 100644
index 000000000000..6e08a6139ed3
--- /dev/null
+++ b/src/chrome/content/rules/Twiago.com.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Twingly.xml b/src/chrome/content/rules/Twingly.xml
index 67bcdcd548b4..dfe78c9aec07 100644
--- a/src/chrome/content/rules/Twingly.xml
+++ b/src/chrome/content/rules/Twingly.xml
@@ -14,4 +14,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Twinprime.com.xml b/src/chrome/content/rules/Twinprime.com.xml
index 59b4d0de1ccd..0f498dfba573 100644
--- a/src/chrome/content/rules/Twinprime.com.xml
+++ b/src/chrome/content/rules/Twinprime.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://support.twinprime.com/ => https://support.twinprime.com/: (2
 		- go.twinprime.com (certificate mismatch)
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/TwinsOrNot.Net.xml b/src/chrome/content/rules/TwinsOrNot.Net.xml
index c48c7dd3d658..72357511b5b3 100644
--- a/src/chrome/content/rules/TwinsOrNot.Net.xml
+++ b/src/chrome/content/rules/TwinsOrNot.Net.xml
@@ -6,7 +6,7 @@ Fetch error: http://twinsornot.net/ => https://twinsornot.net/: (7, 'Failed to c
 	For other Microsoft coverage, see Microsoft.xml.
 -->
 
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Twistage.xml b/src/chrome/content/rules/Twistage.xml
index 36e8ea879fa6..d8ad3995befd 100644
--- a/src/chrome/content/rules/Twistage.xml
+++ b/src/chrome/content/rules/Twistage.xml
@@ -26,4 +26,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Twisted4Life.xml b/src/chrome/content/rules/Twisted4Life.xml
index 312243beaef0..67df068aacb1 100644
--- a/src/chrome/content/rules/Twisted4Life.xml
+++ b/src/chrome/content/rules/Twisted4Life.xml
@@ -5,11 +5,11 @@ Fetch error: http://twisted4life.com/ => https://twisted4life.com/: (60, 'SSL ce
 Fetch error: http://www.twisted4life.com/ => https://www.twisted4life.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/TwistedMatrix.xml b/src/chrome/content/rules/TwistedMatrix.xml
index 0cfb643f05b9..1f2070188392 100644
--- a/src/chrome/content/rules/TwistedMatrix.xml
+++ b/src/chrome/content/rules/TwistedMatrix.xml
@@ -41,7 +41,7 @@ Fetch error: http://speed.twistedmatrix.com/ => https://speed.twistedmatrix.com/
 	* Mismatched, CN: www.twistedmatrix.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/TwitCasting.tv.xml b/src/chrome/content/rules/TwitCasting.tv.xml
new file mode 100644
index 000000000000..a7c81bd3d206
--- /dev/null
+++ b/src/chrome/content/rules/TwitCasting.tv.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/TwitCasting.xml b/src/chrome/content/rules/TwitCasting.xml
deleted file mode 100644
index 690d5bb876b3..000000000000
--- a/src/chrome/content/rules/TwitCasting.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-	
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Twitch.tv.xml b/src/chrome/content/rules/Twitch.tv.xml
index f429b40a3865..9f95382f71f9 100644
--- a/src/chrome/content/rules/Twitch.tv.xml
+++ b/src/chrome/content/rules/Twitch.tv.xml
@@ -1,18 +1,17 @@
 
+
 
 	
 	
@@ -23,10 +22,10 @@
 	
 	
 		
-		
+		
 		
 	
-	
+
 	
 	
 	
@@ -34,6 +33,7 @@
 	
 	
 	
+	
 	
 	
 	
@@ -45,6 +45,6 @@
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Twitter-Counter.xml b/src/chrome/content/rules/Twitter-Counter.xml
index af838959d95c..c8c4e5f2f889 100644
--- a/src/chrome/content/rules/Twitter-Counter.xml
+++ b/src/chrome/content/rules/Twitter-Counter.xml
@@ -1,10 +1,10 @@
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Twtpoll.com.xml b/src/chrome/content/rules/Twtpoll.com.xml
index 93db581a7f52..99ee76f7dd5c 100644
--- a/src/chrome/content/rules/Twtpoll.com.xml
+++ b/src/chrome/content/rules/Twtpoll.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://twtpoll.com/ => https://twtpoll.com/: (51, "SSL: no alternat
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Twylah.com.xml b/src/chrome/content/rules/Twylah.com.xml
index b609ddd04306..24e334676f7c 100644
--- a/src/chrome/content/rules/Twylah.com.xml
+++ b/src/chrome/content/rules/Twylah.com.xml
@@ -21,7 +21,7 @@ Fetch error: http://www.twylah.com/ => https://www.twylah.com/: (60, 'SSL certif
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Tyndall.ie.xml b/src/chrome/content/rules/Tyndall.ie.xml
index 5ffbd24eb844..a46ea5282ee0 100644
--- a/src/chrome/content/rules/Tyndall.ie.xml
+++ b/src/chrome/content/rules/Tyndall.ie.xml
@@ -4,13 +4,10 @@
 -->
 
 
-	
+	
 
 
-	
 
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Tyo-ja-elinkeinoministerio.xml b/src/chrome/content/rules/Tyo-ja-elinkeinoministerio.xml
index e582794f1b1c..b73a404d781d 100644
--- a/src/chrome/content/rules/Tyo-ja-elinkeinoministerio.xml
+++ b/src/chrome/content/rules/Tyo-ja-elinkeinoministerio.xml
@@ -5,7 +5,7 @@ Non-2xx HTTP code: http://tem.fi/ (200) => https://www.tem.fi/ (404)
 Non-2xx HTTP code: http://www.tem.fi/ (200) => https://www.tem.fi/ (404)
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Typ.io.xml b/src/chrome/content/rules/Typ.io.xml
new file mode 100644
index 000000000000..fd866d9263e9
--- /dev/null
+++ b/src/chrome/content/rules/Typ.io.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/TypeRacer.com.xml b/src/chrome/content/rules/TypeRacer.com.xml
new file mode 100644
index 000000000000..4941614280cc
--- /dev/null
+++ b/src/chrome/content/rules/TypeRacer.com.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Typography.com.xml b/src/chrome/content/rules/Typography.com.xml
index 1dd04039ccea..09945070a1e6 100644
--- a/src/chrome/content/rules/Typography.com.xml
+++ b/src/chrome/content/rules/Typography.com.xml
@@ -15,7 +15,10 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Typora.io.xml b/src/chrome/content/rules/Typora.io.xml
new file mode 100644
index 000000000000..092b47aea5cb
--- /dev/null
+++ b/src/chrome/content/rules/Typora.io.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Typora.xml b/src/chrome/content/rules/Typora.xml
deleted file mode 100644
index 1f2fdbfd2f6a..000000000000
--- a/src/chrome/content/rules/Typora.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-	
-	
-	
-
-
diff --git a/src/chrome/content/rules/Typotheque.xml b/src/chrome/content/rules/Typotheque.xml
index 91858ec68f75..eebffc174b9f 100644
--- a/src/chrome/content/rules/Typotheque.xml
+++ b/src/chrome/content/rules/Typotheque.xml
@@ -1,45 +1,16 @@
 
 
-
-	
 	
+	
 	
 	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
 
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/U-Tokyo.ac.jp.xml b/src/chrome/content/rules/U-Tokyo.ac.jp.xml
index 659371ace188..11b623b2e56a 100644
--- a/src/chrome/content/rules/U-Tokyo.ac.jp.xml
+++ b/src/chrome/content/rules/U-Tokyo.ac.jp.xml
@@ -70,7 +70,20 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/UAB.edu.xml b/src/chrome/content/rules/UAB.edu.xml
new file mode 100644
index 000000000000..8a0045d6bc55
--- /dev/null
+++ b/src/chrome/content/rules/UAB.edu.xml
@@ -0,0 +1,215 @@
+
+
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/UBS.xml b/src/chrome/content/rules/UBS.xml
index 0bea4d89022f..5b36363d275e 100644
--- a/src/chrome/content/rules/UBS.xml
+++ b/src/chrome/content/rules/UBS.xml
@@ -1,157 +1,120 @@
-
 
-
+
 	
-	
-
-		
-
-			
-
-		
-
-			
-			
-			
-
-			
-			
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
 	
+	
 
-	
-	
-	
-	
-
-	
-
-	
-
-	
+	
 
diff --git a/src/chrome/content/rules/UC.xml b/src/chrome/content/rules/UC.xml
index 0df2efb5f214..9b3ae8297ad4 100644
--- a/src/chrome/content/rules/UC.xml
+++ b/src/chrome/content/rules/UC.xml
@@ -20,7 +20,7 @@
 		m.down2.uc.cn
 		ibooks.uc.cn
 		school.uc.cn
-		union.uc.cn	
+		union.uc.cn
 -->
 
 	
diff --git a/src/chrome/content/rules/UCAR.edu.xml b/src/chrome/content/rules/UCAR.edu.xml
index e5fdff713e6d..44526f22334d 100644
--- a/src/chrome/content/rules/UCAR.edu.xml
+++ b/src/chrome/content/rules/UCAR.edu.xml
@@ -31,13 +31,18 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/UCC.ie.xml b/src/chrome/content/rules/UCC.ie.xml
index 682b49f74358..9178c1039899 100644
--- a/src/chrome/content/rules/UCC.ie.xml
+++ b/src/chrome/content/rules/UCC.ie.xml
@@ -23,7 +23,7 @@ Fetch error: http://yosemite.ucc.ie/ => https://yosemite.ucc.ie/: (28, 'Connecti
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/UCLA_Health.xml b/src/chrome/content/rules/UCLA_Health.xml
index a77a32811d25..6c754e44af91 100644
--- a/src/chrome/content/rules/UCLA_Health.xml
+++ b/src/chrome/content/rules/UCLA_Health.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/UC_Hastings.edu-falsemixed.xml b/src/chrome/content/rules/UC_Hastings.edu-falsemixed.xml
deleted file mode 100644
index 5a52f8fabc36..000000000000
--- a/src/chrome/content/rules/UC_Hastings.edu-falsemixed.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/UC_Hastings.edu-problematic.xml b/src/chrome/content/rules/UC_Hastings.edu-problematic.xml
index d5d825d4eee8..a5032d150891 100644
--- a/src/chrome/content/rules/UC_Hastings.edu-problematic.xml
+++ b/src/chrome/content/rules/UC_Hastings.edu-problematic.xml
@@ -2,7 +2,7 @@
 	For rules that are on by default, see UC_Hastings.edu.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/UC_Hastings.edu.xml b/src/chrome/content/rules/UC_Hastings.edu.xml
index dd9ed75a6df8..b46845238005 100644
--- a/src/chrome/content/rules/UC_Hastings.edu.xml
+++ b/src/chrome/content/rules/UC_Hastings.edu.xml
@@ -43,7 +43,7 @@ Fetch error: http://webadvisor.uchastings.edu/ => https://webadvisor.uchastings.
 	² Rule disabled by default <= missing certificate chain
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/UCalgary_Mag.ca.xml b/src/chrome/content/rules/UCalgary_Mag.ca.xml
index f1d34844fb53..d3e47762d54a 100644
--- a/src/chrome/content/rules/UCalgary_Mag.ca.xml
+++ b/src/chrome/content/rules/UCalgary_Mag.ca.xml
@@ -19,7 +19,7 @@ Fetch error: http://www.ucalgarymag.ca/ => https://www.ucalgarymag.ca/: (60, 'SS
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/UClinics.xml b/src/chrome/content/rules/UClinics.xml
deleted file mode 100644
index 12f3e4bc867f..000000000000
--- a/src/chrome/content/rules/UClinics.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/UDK.com.xml b/src/chrome/content/rules/UDK.com.xml
index 60acdc8db377..06b2ee4a1564 100644
--- a/src/chrome/content/rules/UDK.com.xml
+++ b/src/chrome/content/rules/UDK.com.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://udk.com/ => https://udk.com/: (60, 'SSL certificate problem: certificate has expired')
 Fetch error: http://www.udk.com/ => https://udk.com/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/UDN.xml b/src/chrome/content/rules/UDN.xml
index cdc9d5dffad6..27a0ac556906 100644
--- a/src/chrome/content/rules/UDN.xml
+++ b/src/chrome/content/rules/UDN.xml
@@ -1,22 +1,8 @@
-
 
-
-
+
+	
+	
+		
+		
+		
 	
 		
 		
@@ -61,8 +51,13 @@ Fetch error: http://paper.udn.com/ => https://paper.udn.com/: (28, 'Operation ti
 	
 	
 	
+	
+		
+	
 	
 	
+	
+		
 	
 		
 	
@@ -74,6 +69,7 @@ Fetch error: http://paper.udn.com/ => https://paper.udn.com/: (28, 'Operation ti
 	
 	
 	
+	
 	
 	
 	
@@ -90,11 +86,14 @@ Fetch error: http://paper.udn.com/ => https://paper.udn.com/: (28, 'Operation ti
 	
 	
 	
+	
 	
 	
 	
 	
 
+	
+		
 	
 	
 	
@@ -110,7 +109,6 @@ Fetch error: http://paper.udn.com/ => https://paper.udn.com/: (28, 'Operation ti
 	
 	
 	
-	
 	
 
 	
diff --git a/src/chrome/content/rules/UESP.net.xml b/src/chrome/content/rules/UESP.net.xml
new file mode 100644
index 000000000000..42b820e873e4
--- /dev/null
+++ b/src/chrome/content/rules/UESP.net.xml
@@ -0,0 +1,62 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/UFC_Fit.xml b/src/chrome/content/rules/UFC_Fit.xml
index 8015e778005a..ae3cefa08701 100644
--- a/src/chrome/content/rules/UFC_Fit.xml
+++ b/src/chrome/content/rules/UFC_Fit.xml
@@ -8,7 +8,7 @@ Fetch error: http://www.ufcfit.com/ => https://www.ufcfit.com/: (28, 'Operation
 Disabled by https-everywhere-checker because:
 Fetch error: http://ufcfit.com/ => https://ufcfit.com/: (7, 'Failed to connect to ufcfit.com port 443: Connection refused')
 -->
-
+
 
 	
 	
@@ -20,4 +20,4 @@ Fetch error: http://ufcfit.com/ => https://ufcfit.com/: (7, 'Failed to connect t
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/UFies.org.xml b/src/chrome/content/rules/UFies.org.xml
index 5d00034c5265..ca49dd81eb1f 100644
--- a/src/chrome/content/rules/UFies.org.xml
+++ b/src/chrome/content/rules/UFies.org.xml
@@ -30,4 +30,4 @@ Fetch error: http://ufies.org/ => https://ufies.org/: (60, 'SSL certificate prob
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/UHH-Informatik.xml b/src/chrome/content/rules/UHH-Informatik.xml
index 442849e94b5f..c5939458b8bc 100644
--- a/src/chrome/content/rules/UHH-Informatik.xml
+++ b/src/chrome/content/rules/UHH-Informatik.xml
@@ -27,7 +27,7 @@ Fetch error: http://surfmail.rrz.uni-hamburg.de/ => https://surfmail.rrz.uni-ham
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/UIE.xml b/src/chrome/content/rules/UIE.xml
index 97a907c38805..557072f12dbb 100644
--- a/src/chrome/content/rules/UIE.xml
+++ b/src/chrome/content/rules/UIE.xml
@@ -2,7 +2,7 @@
   
   
 
-  
+  
 
   
 
diff --git a/src/chrome/content/rules/UIUC.edu.xml b/src/chrome/content/rules/UIUC.edu.xml
index e39978c0ff20..b10eaca823e3 100644
--- a/src/chrome/content/rules/UIUC.edu.xml
+++ b/src/chrome/content/rules/UIUC.edu.xml
@@ -46,7 +46,7 @@ Fetch error: http://www.uiuc.edu/ => https://illinois.edu/: Too many redirects w
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/UIllinois.edu-falsemixed.xml b/src/chrome/content/rules/UIllinois.edu-falsemixed.xml
deleted file mode 100644
index 2776d2610962..000000000000
--- a/src/chrome/content/rules/UIllinois.edu-falsemixed.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/UIllinois.edu.xml b/src/chrome/content/rules/UIllinois.edu.xml
index bc154ea5630c..8f5cd188f58a 100644
--- a/src/chrome/content/rules/UIllinois.edu.xml
+++ b/src/chrome/content/rules/UIllinois.edu.xml
@@ -77,7 +77,7 @@ Non-2xx HTTP code: http://uofi.uillinois.edu/ (200) => https://uofi.uillinois.ed
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/UImserv.net.xml b/src/chrome/content/rules/UImserv.net.xml
index a07ca32e3d29..82d43aeb1f3b 100644
--- a/src/chrome/content/rules/UImserv.net.xml
+++ b/src/chrome/content/rules/UImserv.net.xml
@@ -16,15 +16,18 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
-	
 
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/UJF-Grenoble.fr.xml b/src/chrome/content/rules/UJF-Grenoble.fr.xml
deleted file mode 100644
index d4fe91e908de..000000000000
--- a/src/chrome/content/rules/UJF-Grenoble.fr.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/UK-2.xml b/src/chrome/content/rules/UK-2.xml
index 8b61f1906126..6047347646f3 100644
--- a/src/chrome/content/rules/UK-2.xml
+++ b/src/chrome/content/rules/UK-2.xml
@@ -35,10 +35,17 @@ Fetch error: http://www.uk2img.net/ => https://www.uk2img.net/: (60, 'SSL certif
 		- (www.)uk2img.net
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
 	
 	
 
@@ -47,8 +54,6 @@ Fetch error: http://www.uk2img.net/ => https://www.uk2img.net/: (60, 'SSL certif
 	
 
 
-	
 
 	
@@ -56,7 +61,6 @@ Fetch error: http://www.uk2img.net/ => https://www.uk2img.net/: (60, 'SSL certif
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/UK-Department-for-Business-Innovation-and-Skills.xml b/src/chrome/content/rules/UK-Department-for-Business-Innovation-and-Skills.xml
index 972ec6ebf6bf..0c911daae9c3 100644
--- a/src/chrome/content/rules/UK-Department-for-Business-Innovation-and-Skills.xml
+++ b/src/chrome/content/rules/UK-Department-for-Business-Innovation-and-Skills.xml
@@ -50,7 +50,7 @@ Fetch error: http://www.edrs.sfa.bis.gov.uk/ => https://edrs.sfa.bis.gov.uk/: (6
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/UK-Free-Software-Network.xml b/src/chrome/content/rules/UK-Free-Software-Network.xml
index 7b08eca0bed4..5c2fd2ca4f4d 100644
--- a/src/chrome/content/rules/UK-Free-Software-Network.xml
+++ b/src/chrome/content/rules/UK-Free-Software-Network.xml
@@ -8,7 +8,7 @@ Fetch error: http://www.ukfsn.org/ => https://www.ukfsn.org/: (60, 'SSL certific
 Disabled by https-everywhere-checker because:
 Fetch error: http://ukfsn.org/ => https://ukfsn.org/: (28, 'Connection timed out after 10001 milliseconds')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/UK_Ministry_of_Defence.xml b/src/chrome/content/rules/UK_Ministry_of_Defence.xml
index 263878470294..652bc699520c 100644
--- a/src/chrome/content/rules/UK_Ministry_of_Defence.xml
+++ b/src/chrome/content/rules/UK_Ministry_of_Defence.xml
@@ -1,13 +1,15 @@
 
 
 
-    
-    
+	
+	
 
-    
-    
+	
 
diff --git a/src/chrome/content/rules/UL.ie-falsemixed.xml b/src/chrome/content/rules/UL.ie-falsemixed.xml
index 2fa27a4cce0b..d06c6ac4a4eb 100644
--- a/src/chrome/content/rules/UL.ie-falsemixed.xml
+++ b/src/chrome/content/rules/UL.ie-falsemixed.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.ul.ie/ => https://www.ul.ie/: (60, 'SSL certificate prob
 	For rules not causing false/broken MCB, see UL.ie.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/UL.ie.xml b/src/chrome/content/rules/UL.ie.xml
index 14ec107c4c35..c3182f76a6b1 100644
--- a/src/chrome/content/rules/UL.ie.xml
+++ b/src/chrome/content/rules/UL.ie.xml
@@ -27,10 +27,10 @@ Fetch error: http://ul.ie/ => http://ul.ie/: (60, 'SSL certificate problem: unab
 	* Secured by us
 
 -->
-
+
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/ULAKBIM.gov.tr.xml b/src/chrome/content/rules/ULAKBIM.gov.tr.xml
index 315e8b498274..1ba784137b85 100644
--- a/src/chrome/content/rules/ULAKBIM.gov.tr.xml
+++ b/src/chrome/content/rules/ULAKBIM.gov.tr.xml
@@ -22,7 +22,10 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
@@ -31,7 +34,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/UMBC.edu.xml b/src/chrome/content/rules/UMBC.edu.xml
index 2fb3459bfa36..334b7f99364c 100644
--- a/src/chrome/content/rules/UMBC.edu.xml
+++ b/src/chrome/content/rules/UMBC.edu.xml
@@ -18,7 +18,13 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
-	
 
+	
 
diff --git a/src/chrome/content/rules/UN.org.xml b/src/chrome/content/rules/UN.org.xml
index 992dbca10763..a02501f1bcc6 100644
--- a/src/chrome/content/rules/UN.org.xml
+++ b/src/chrome/content/rules/UN.org.xml
@@ -109,7 +109,7 @@ Timeout:
 	peacemaker.un.org
 	repository.un.org
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/UNC.edu-mixedcontent.xml b/src/chrome/content/rules/UNC.edu-mixedcontent.xml
deleted file mode 100644
index 7588ff6bc3b6..000000000000
--- a/src/chrome/content/rules/UNC.edu-mixedcontent.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/UNC.edu.xml b/src/chrome/content/rules/UNC.edu.xml
index 08da460c54c8..45bc3004012f 100644
--- a/src/chrome/content/rules/UNC.edu.xml
+++ b/src/chrome/content/rules/UNC.edu.xml
@@ -1,148 +1,63 @@
 
+
+	
+	
 
-			- library from $self ²
-			- library from autosuggest.trln.org ³
+	
+	
+	
+	
 
-		- Images, on:
+	
+	
+	
+	
+	
+	
 
-			- library from $self ²
-			- library from blogs.lib ²
+	
 
-	¹ Unsecurable <= redirects back from unc.libcal.com
-	² Secured by us
-	³ Unsecurable <= redirects to another domain
+	
 
--->
-
+	
+	
+	
 
-	
-		
-		
-		
-		
-		
-		
-		
+	
+	
+	
 
+	
+	
 
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
+	
+	
 
-	
+	
 
+	
 
-	
+	
+	
+	
 
-	
+	
+	
+	
+	
 
+	
 
diff --git a/src/chrome/content/rules/UNC_Lineberger.org.xml b/src/chrome/content/rules/UNC_Lineberger.org.xml
index 5e5df4585c56..8528a396c048 100644
--- a/src/chrome/content/rules/UNC_Lineberger.org.xml
+++ b/src/chrome/content/rules/UNC_Lineberger.org.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.unclineberger.org/ => https://www.unclineberger.org/: (6
 	For other University of North Carolina at Chapel Hill coverage, see UNC.edu.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/UNFPA.org.xml b/src/chrome/content/rules/UNFPA.org.xml
index d1d8318f21b0..c516260027a8 100644
--- a/src/chrome/content/rules/UNFPA.org.xml
+++ b/src/chrome/content/rules/UNFPA.org.xml
@@ -153,6 +153,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/UNIBA.sk.xml b/src/chrome/content/rules/UNIBA.sk.xml
new file mode 100644
index 000000000000..7597189abc95
--- /dev/null
+++ b/src/chrome/content/rules/UNIBA.sk.xml
@@ -0,0 +1,25 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/UNICEF-IRC.org.xml b/src/chrome/content/rules/UNICEF-IRC.org.xml
index c9e721622585..c032e0b377b7 100644
--- a/src/chrome/content/rules/UNICEF-IRC.org.xml
+++ b/src/chrome/content/rules/UNICEF-IRC.org.xml
@@ -22,6 +22,6 @@
 	
 	
 
-	
 
diff --git a/src/chrome/content/rules/UNICEF.fi.xml b/src/chrome/content/rules/UNICEF.fi.xml
index d08555fb807a..f7882a84f42a 100644
--- a/src/chrome/content/rules/UNICEF.fi.xml
+++ b/src/chrome/content/rules/UNICEF.fi.xml
@@ -1,30 +1,15 @@
-
 
-
+
 	
 	
-	
+	
+	
 
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/UNICEF.or.jp.xml b/src/chrome/content/rules/UNICEF.or.jp.xml
index 9da4a1dda932..420484867878 100644
--- a/src/chrome/content/rules/UNICEF.or.jp.xml
+++ b/src/chrome/content/rules/UNICEF.or.jp.xml
@@ -19,7 +19,7 @@ Fetch error: http://appdev.unicef.or.jp/ => https://appdev.unicef.or.jp/: (60, '
 			 - google.com on https://www.unicef.or.jp/
 			 - mixi.jp on https://www.unicef.or.jp/news/2017/0075.html
 -->
-
+
 	
 	
 	
@@ -31,6 +31,6 @@ Fetch error: http://appdev.unicef.or.jp/ => https://appdev.unicef.or.jp/: (60, '
 	
 
-	
 
diff --git a/src/chrome/content/rules/UNICEF.org.uk.xml b/src/chrome/content/rules/UNICEF.org.uk.xml
index 08b5d3a60648..093a4526981d 100644
--- a/src/chrome/content/rules/UNICEF.org.uk.xml
+++ b/src/chrome/content/rules/UNICEF.org.uk.xml
@@ -86,6 +86,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/UNICEF.org.xml b/src/chrome/content/rules/UNICEF.org.xml
index 637ee0bbd7db..cf424184a22b 100644
--- a/src/chrome/content/rules/UNICEF.org.xml
+++ b/src/chrome/content/rules/UNICEF.org.xml
@@ -1,6 +1,28 @@
+
 
+	
 	
-	
-	
-	
+	
+	
+	
 	
 	
 	
-	
+	
 	
 	
 	
 	
-	
-	
-	
+	
+	
+	
 	
 	
-	
+	
 	
 	
 	
 	
-	
+	
 	
 	
 	
-	
-	
-	
+	
+	
+	
 	
-	
+	
 	
-	
+	
 	
 	
 	
-	
-	
-	
+	
+	
+	
 	
-	
-	
+	
+	
 
 	
 
-	
 
diff --git a/src/chrome/content/rules/UNICEF_USA.org.xml b/src/chrome/content/rules/UNICEF_USA.org.xml
index a789c7c37a03..1c59d2bab02d 100644
--- a/src/chrome/content/rules/UNICEF_USA.org.xml
+++ b/src/chrome/content/rules/UNICEF_USA.org.xml
@@ -59,7 +59,7 @@ Fetch error: http://globalaction.unicefusa.org/ => https://globalaction.unicefus
 			 - tapproject.unicefusa.org
 			 - vem.unicefusa.org
 -->
-
+
 	
 	
 	
@@ -94,6 +94,6 @@ Fetch error: http://globalaction.unicefusa.org/ => https://globalaction.unicefus
 	
 
-	
 
diff --git a/src/chrome/content/rules/UNIPO.sk.xml b/src/chrome/content/rules/UNIPO.sk.xml
new file mode 100644
index 000000000000..3a3f71e3a5bf
--- /dev/null
+++ b/src/chrome/content/rules/UNIPO.sk.xml
@@ -0,0 +1,24 @@
+
+
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/UNIZA.sk.xml b/src/chrome/content/rules/UNIZA.sk.xml
new file mode 100644
index 000000000000..e8c131e97b3c
--- /dev/null
+++ b/src/chrome/content/rules/UNIZA.sk.xml
@@ -0,0 +1,12 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/UNM.edu-falsemixed.xml b/src/chrome/content/rules/UNM.edu-falsemixed.xml
deleted file mode 100644
index 6dd0751c9e72..000000000000
--- a/src/chrome/content/rules/UNM.edu-falsemixed.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/UNM.edu-problematic.xml b/src/chrome/content/rules/UNM.edu-problematic.xml
deleted file mode 100644
index 59502f8f4351..000000000000
--- a/src/chrome/content/rules/UNM.edu-problematic.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/UNM.edu.xml b/src/chrome/content/rules/UNM.edu.xml
new file mode 100644
index 000000000000..190e48f168a3
--- /dev/null
+++ b/src/chrome/content/rules/UNM.edu.xml
@@ -0,0 +1,67 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/UNM.xml b/src/chrome/content/rules/UNM.xml
deleted file mode 100644
index 76d270773f15..000000000000
--- a/src/chrome/content/rules/UNM.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-
-
-
-	
-	
-		
-		
-		
-		
-
-
-	
-
-	
-	
-
-	
-	
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/UNODC.org.xml b/src/chrome/content/rules/UNODC.org.xml
index 1b36479cb5d9..642c3a6dbb8e 100644
--- a/src/chrome/content/rules/UNODC.org.xml
+++ b/src/chrome/content/rules/UNODC.org.xml
@@ -16,16 +16,16 @@
 		profi.unodc.org
 		staffingtable.unodc.org
 		wiki.unodc.org
-		
+
 	No working URL known:
 		cns.unodc.org
 		services2.unodc.org
 		static.unodc.org
 		trackservices.unodc.org
-	
+
 	Invalid certificate:
 		www.track.unodc.org
-	
+
 -->
 
 
diff --git a/src/chrome/content/rules/UN_Multimedia.org.xml b/src/chrome/content/rules/UN_Multimedia.org.xml
index a73ff8aa4ad1..8fd8ccff5178 100644
--- a/src/chrome/content/rules/UN_Multimedia.org.xml
+++ b/src/chrome/content/rules/UN_Multimedia.org.xml
@@ -1,34 +1,16 @@
 
 
-
 	
-	
-
-
-	
-
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/UOL.xml b/src/chrome/content/rules/UOL.xml
index 3f8e5a800ee4..1dce059af37f 100644
--- a/src/chrome/content/rules/UOL.xml
+++ b/src/chrome/content/rules/UOL.xml
@@ -1,10 +1,4 @@
-
 
-
+
 
-	
 	
 	
 	
+	
 	
-	
 	
 	
 	
@@ -162,13 +150,6 @@ Non-2xx HTTP code: http://tts.uol.com.br/ (200) => https://tts.uol.com.br/ (500)
 	
 	
 	
-	
-	
-	
-
-	
-	
 
 		
@@ -185,23 +166,10 @@ Non-2xx HTTP code: http://tts.uol.com.br/ (200) => https://tts.uol.com.br/ (500)
 			
 
 
-	
-	
-	
-	
-	
-	
-	
-
 	
-	
+	
 	
 
-
-	
-
 	
 
diff --git a/src/chrome/content/rules/UOregon.xml b/src/chrome/content/rules/UOregon.xml
index 6ae8e0ff7dcf..b6fccec36ecb 100644
--- a/src/chrome/content/rules/UOregon.xml
+++ b/src/chrome/content/rules/UOregon.xml
@@ -341,6 +341,6 @@
 						-->
 	
-          
+
 
 
diff --git a/src/chrome/content/rules/UPC.cz.xml b/src/chrome/content/rules/UPC.cz.xml
index 1c7d0aafdbb4..7be2334d0de6 100644
--- a/src/chrome/content/rules/UPC.cz.xml
+++ b/src/chrome/content/rules/UPC.cz.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://tvprogram.upc.cz/ => https://tvprogram.upc.cz/: (28, 'Connection timed out after 20004 milliseconds')
 
 -->
-
+
     
     
     
diff --git a/src/chrome/content/rules/UPC.edu.xml b/src/chrome/content/rules/UPC.edu.xml
new file mode 100644
index 000000000000..2abcf04e6812
--- /dev/null
+++ b/src/chrome/content/rules/UPC.edu.xml
@@ -0,0 +1,25 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/UPC.es.xml b/src/chrome/content/rules/UPC.es.xml
new file mode 100644
index 000000000000..26916597433c
--- /dev/null
+++ b/src/chrome/content/rules/UPC.es.xml
@@ -0,0 +1,106 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/UPC.ie.xml b/src/chrome/content/rules/UPC.ie.xml
index 92dee65d9b45..63ec435259c3 100644
--- a/src/chrome/content/rules/UPC.ie.xml
+++ b/src/chrome/content/rules/UPC.ie.xml
@@ -27,7 +27,7 @@ Fetch error: http://as.upc.ie/ => https://as.upc.ie/: (60, 'SSL certificate prob
 		- mail.upc.ie
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/UPC.nl.xml b/src/chrome/content/rules/UPC.nl.xml
index 1f56207d2020..cafb8dde1e76 100644
--- a/src/chrome/content/rules/UPC.nl.xml
+++ b/src/chrome/content/rules/UPC.nl.xml
@@ -23,7 +23,7 @@ Fetch error: http://service.upc.nl/ => https://service.upc.nl/: (60, 'SSL certif
 	ᵐ Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/UPC_Business.nl.xml b/src/chrome/content/rules/UPC_Business.nl.xml
index 3894aff10662..7436f36b74a1 100644
--- a/src/chrome/content/rules/UPC_Business.nl.xml
+++ b/src/chrome/content/rules/UPC_Business.nl.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://origin.www.upcbusiness.nl/ => https://origin.www.upcbusiness.nl/: (7, 'Failed to connect to origin.www.upcbusiness.nl port 443: No route to host')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/UPV.cz.xml b/src/chrome/content/rules/UPV.cz.xml
index 6bc22c0439b3..edf97cead6fc 100644
--- a/src/chrome/content/rules/UPV.cz.xml
+++ b/src/chrome/content/rules/UPV.cz.xml
@@ -5,7 +5,7 @@ Fetch error: http://upv.cz/ => https://upv.cz/: (60, 'SSL certificate problem: u
 Fetch error: http://www.upv.cz/ => https://www.upv.cz/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/UPatient.xml b/src/chrome/content/rules/UPatient.xml
deleted file mode 100644
index 81a87589bde7..000000000000
--- a/src/chrome/content/rules/UPatient.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/UProd.biz.xml b/src/chrome/content/rules/UProd.biz.xml
index b89dce1f54fe..91e68289e336 100644
--- a/src/chrome/content/rules/UProd.biz.xml
+++ b/src/chrome/content/rules/UProd.biz.xml
@@ -4,7 +4,7 @@
 	* See https://whatsmychaincert.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/UQWiMAX.xml b/src/chrome/content/rules/UQWiMAX.xml
index 2f03e4ce2c61..1a8dce7ed1c6 100644
--- a/src/chrome/content/rules/UQWiMAX.xml
+++ b/src/chrome/content/rules/UQWiMAX.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.uqwimax.jp/ => https://www.uqwimax.jp/: Too many redirec
 Disabled by https-everywhere-checker because:
 Fetch error: http://uqwimax.jp/ => https://www.uqwimax.jp/: (28, 'Connection timed out after 10001 milliseconds')
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/URX.com.xml b/src/chrome/content/rules/URX.com.xml
index 077c224a4d4d..c58f72f87230 100644
--- a/src/chrome/content/rules/URX.com.xml
+++ b/src/chrome/content/rules/URX.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.urx.com/ => https://www.urx.com/: (6, 'Could not resolve
 	* Squarespace
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/US-Dept-of-Veterans-Affairs.xml b/src/chrome/content/rules/US-Dept-of-Veterans-Affairs.xml
deleted file mode 100644
index 66c6a73ca967..000000000000
--- a/src/chrome/content/rules/US-Dept-of-Veterans-Affairs.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-
-	
-	
-
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-
-	
-
-	
-	
-
-	
-	
-
-	
-	
-	
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/US-Internet-Crime-Complaint-Ctr.xml b/src/chrome/content/rules/US-Internet-Crime-Complaint-Ctr.xml
deleted file mode 100644
index ab251c131086..000000000000
--- a/src/chrome/content/rules/US-Internet-Crime-Complaint-Ctr.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/US-News.com.xml b/src/chrome/content/rules/US-News.com.xml
index 079585b09e7e..ee4c303aa6db 100644
--- a/src/chrome/content/rules/US-News.com.xml
+++ b/src/chrome/content/rules/US-News.com.xml
@@ -1,6 +1,6 @@
 
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/US-Selective-Service-System.xml b/src/chrome/content/rules/US-Selective-Service-System.xml
index a880acebf650..6d50f37d9a21 100644
--- a/src/chrome/content/rules/US-Selective-Service-System.xml
+++ b/src/chrome/content/rules/US-Selective-Service-System.xml
@@ -2,7 +2,7 @@
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/US-Social-Forum.xml b/src/chrome/content/rules/US-Social-Forum.xml
index d47603f92ae3..43858684c7e0 100644
--- a/src/chrome/content/rules/US-Social-Forum.xml
+++ b/src/chrome/content/rules/US-Social-Forum.xml
@@ -8,7 +8,7 @@ Fetch error: http://community.ussf2010.org/ => https://community.ussf2010.org/:
 		- (www.)	(cert: community.ussf2010.org; 404)
 		- ict		(cert: june.mayfirst.org)
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/US-military.xml b/src/chrome/content/rules/US-military.xml
index 4e19bb9f5d7c..f21caf86cd1f 100644
--- a/src/chrome/content/rules/US-military.xml
+++ b/src/chrome/content/rules/US-military.xml
@@ -22,7 +22,6 @@
 	
 	
 	
-	
 	
 
 	
@@ -51,11 +50,6 @@
 	
 
-	
-	
-
 	
 	
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-		
-		
-		
-
-
-	
-	
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/USA_Today.xml b/src/chrome/content/rules/USA_Today.xml
index ac50836eb8b4..464341595ca7 100644
--- a/src/chrome/content/rules/USA_Today.xml
+++ b/src/chrome/content/rules/USA_Today.xml
@@ -31,8 +31,6 @@
 	
 	
 
-	
-
 	
 
 	
diff --git a/src/chrome/content/rules/USAlliance.xml b/src/chrome/content/rules/USAlliance.xml
index 1e6199c25215..7e465d7fccc2 100644
--- a/src/chrome/content/rules/USAlliance.xml
+++ b/src/chrome/content/rules/USAlliance.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/USAspending.gov.xml b/src/chrome/content/rules/USAspending.gov.xml
index f5d806c3ec3a..e2f3438cbffa 100644
--- a/src/chrome/content/rules/USAspending.gov.xml
+++ b/src/chrome/content/rules/USAspending.gov.xml
@@ -18,7 +18,7 @@ Fetch error: http://openbeta-comm.usaspending.gov/ => https://openbeta-comm.usas
 		- openbeta-comm.usaspending.gov
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/USBank.xml b/src/chrome/content/rules/USBank.xml
index afad2e0a64c2..db0de92b24e0 100644
--- a/src/chrome/content/rules/USBank.xml
+++ b/src/chrome/content/rules/USBank.xml
@@ -35,7 +35,15 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
+	
+	
 
 
 	
-
+
 
 	
 
diff --git a/src/chrome/content/rules/USFSP.edu.xml b/src/chrome/content/rules/USFSP.edu.xml
new file mode 100644
index 000000000000..7857492e3a0d
--- /dev/null
+++ b/src/chrome/content/rules/USFSP.edu.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/USF_CA.edu.xml b/src/chrome/content/rules/USF_CA.edu.xml
index 379d0f5217ea..42b4adfb92d6 100644
--- a/src/chrome/content/rules/USF_CA.edu.xml
+++ b/src/chrome/content/rules/USF_CA.edu.xml
@@ -31,7 +31,9 @@ Fetch error: http://usfca.edu/ => https://usfca.edu/: (28, 'Connection timed out
 
 
 	
-	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/USFreeads.xml b/src/chrome/content/rules/USFreeads.xml
index a89ea3ffc565..f6beacdd1549 100644
--- a/src/chrome/content/rules/USFreeads.xml
+++ b/src/chrome/content/rules/USFreeads.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/USPS.xml b/src/chrome/content/rules/USPS.xml
index c74a67ff2406..057a8ea70c06 100644
--- a/src/chrome/content/rules/USPS.xml
+++ b/src/chrome/content/rules/USPS.xml
@@ -49,16 +49,27 @@ Fetch error: http://usps.com/ => https://www.usps.com/: Cycle detected - URL alr
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
-	
+	
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/USRowing.xml b/src/chrome/content/rules/USRowing.xml
index b14ea8e4e90f..751a8979de0a 100644
--- a/src/chrome/content/rules/USRowing.xml
+++ b/src/chrome/content/rules/USRowing.xml
@@ -3,7 +3,7 @@
 	- Some pages redirect to http
 
 -->
-
+
 
 	
 	
@@ -12,4 +12,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/UST.hk.xml b/src/chrome/content/rules/UST.hk.xml
index 287bfa0bdf08..b8d4e2b8d827 100644
--- a/src/chrome/content/rules/UST.hk.xml
+++ b/src/chrome/content/rules/UST.hk.xml
@@ -1,107 +1,185 @@
 
 
-	
 	
 	
 	
 	
 	
 	
+	
+	
+	
 	
 
+	
 	
-	
+	
+	
+
 	
+	
 	
 	
+	
 	
+	
+	
+	
+	
 	
-	
+	
 	
 	
+	
+	
+	
 	
-	
 	
+	
 
+	
+	
+	
+	
+	
 	
 
-	
+	
+	
+	
 	
+	
+	
+	
+	
+
+	
+	
+	
+	
 
-	
-	
+	
+	
+	
+	
+	
 	
+	
 	
 	
-	
+	
+	
 
 	
 
 	
+	
 	
+	
+	
 	
-	
-	
+	
 	
 	
-	
 	
+	
+	
+	
+	
+	
+	
+	
 
-	
 	
 	
+	
+	
+	
+	
+	
 	
 	
+	
+	
+
+	
+	
 
 	
 	
 	
 	
+	
+	
 
 	
 	
 	
-	
-	
 	
 
+	
+
+	
 	
+	
 
 	
+	
+
+	
 
 	
 	
@@ -111,6 +189,6 @@
 	
 	
 
-	
 
diff --git a/src/chrome/content/rules/USTC.edu.cn.xml b/src/chrome/content/rules/USTC.edu.cn.xml
index 9bd567f13f62..ea4cc4e6e3f6 100644
--- a/src/chrome/content/rules/USTC.edu.cn.xml
+++ b/src/chrome/content/rules/USTC.edu.cn.xml
@@ -1,36 +1,115 @@
 
 
-
+	
+	
+	
+	
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
 	
-	
-
 
 	
-
 
diff --git a/src/chrome/content/rules/USUHS.edu.xml b/src/chrome/content/rules/USUHS.edu.xml
index da2ca59dfa2c..2e8ee8899007 100644
--- a/src/chrome/content/rules/USUHS.edu.xml
+++ b/src/chrome/content/rules/USUHS.edu.xml
@@ -42,7 +42,7 @@
 	
 
 	
-	
+
 
 	
diff --git a/src/chrome/content/rules/US_Citizenship_and_Immigration_Services.xml b/src/chrome/content/rules/US_Citizenship_and_Immigration_Services.xml
deleted file mode 100644
index 8b3a9bd2b69a..000000000000
--- a/src/chrome/content/rules/US_Citizenship_and_Immigration_Services.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-	
-		
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/US_Currency.gov.xml b/src/chrome/content/rules/US_Currency.gov.xml
deleted file mode 100644
index bb34595bff86..000000000000
--- a/src/chrome/content/rules/US_Currency.gov.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/US_Cyber_Challenge.org.xml b/src/chrome/content/rules/US_Cyber_Challenge.org.xml
index 3a36c608efab..65fbfdaa0cc1 100644
--- a/src/chrome/content/rules/US_Cyber_Challenge.org.xml
+++ b/src/chrome/content/rules/US_Cyber_Challenge.org.xml
@@ -7,9 +7,9 @@
 	
 	
 
-	
 
-	
 
diff --git a/src/chrome/content/rules/US_Fish_and_Wildlife_Service.xml b/src/chrome/content/rules/US_Fish_and_Wildlife_Service.xml
deleted file mode 100644
index 03d97bb43e1a..000000000000
--- a/src/chrome/content/rules/US_Fish_and_Wildlife_Service.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/US_Geological_Survey.xml b/src/chrome/content/rules/US_Geological_Survey.xml
index dc8da00e9527..faebe01fbf8a 100644
--- a/src/chrome/content/rules/US_Geological_Survey.xml
+++ b/src/chrome/content/rules/US_Geological_Survey.xml
@@ -35,4 +35,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/US_Nautic.xml b/src/chrome/content/rules/US_Nautic.xml
index 990cf3ef87cd..b3f1b7da3bb1 100644
--- a/src/chrome/content/rules/US_Nautic.xml
+++ b/src/chrome/content/rules/US_Nautic.xml
@@ -5,10 +5,10 @@
 
 
 	
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/US_Patent_and_Trademark_Office.xml b/src/chrome/content/rules/US_Patent_and_Trademark_Office.xml
index a5fbdd0c5d0e..0e2665474fde 100644
--- a/src/chrome/content/rules/US_Patent_and_Trademark_Office.xml
+++ b/src/chrome/content/rules/US_Patent_and_Trademark_Office.xml
@@ -44,7 +44,7 @@
 	
 
 
-	
+	
 
 
 	 https://uk.state.gov/: (35, 'Unknown SSL pr
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/US_UK_ITA.org.xml b/src/chrome/content/rules/US_UK_ITA.org.xml
deleted file mode 100644
index 21e95a46550c..000000000000
--- a/src/chrome/content/rules/US_UK_ITA.org.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/UT.ee.xml b/src/chrome/content/rules/UT.ee.xml
index 7edb400b24ca..ca1753c60182 100644
--- a/src/chrome/content/rules/UT.ee.xml
+++ b/src/chrome/content/rules/UT.ee.xml
@@ -96,7 +96,7 @@ Fetch error: http://cs.ut.ee/ => https://cs.ut.ee/: (51, "SSL: no alternative ce
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/UTSanDiego.com.xml b/src/chrome/content/rules/UTSanDiego.com.xml
index 5ed073332952..622790060a3f 100644
--- a/src/chrome/content/rules/UTSanDiego.com.xml
+++ b/src/chrome/content/rules/UTSanDiego.com.xml
@@ -13,7 +13,9 @@ Fetch error: http://iservice.uniontrib.com/ => https://iservice.uniontrib.com/:
 
 	
 	
-	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/UU.nl.xml b/src/chrome/content/rules/UU.nl.xml
index f4152c25ebbd..1600193db87c 100644
--- a/src/chrome/content/rules/UU.nl.xml
+++ b/src/chrome/content/rules/UU.nl.xml
@@ -94,16 +94,32 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/UU.se.xml b/src/chrome/content/rules/UU.se.xml
index 494a187e51ef..d8c1b3ccaa74 100644
--- a/src/chrome/content/rules/UU.se.xml
+++ b/src/chrome/content/rules/UU.se.xml
@@ -65,7 +65,7 @@ Fetch error: http://www-hotel.uu.se/ => https://www-hotel.uu.se/: (6, 'Could not
 		- www.it
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/UVM.edu.xml b/src/chrome/content/rules/UVM.edu.xml
index 62ed0266ff8f..bac8f6e23eb9 100644
--- a/src/chrome/content/rules/UVM.edu.xml
+++ b/src/chrome/content/rules/UVM.edu.xml
@@ -29,7 +29,7 @@ Fetch error: http://login.ezproxy.uvm.edu/ => https://login.ezproxy.uvm.edu/: (6
 		- Images on library, scholarworks from $self
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/UVic.ca.xml b/src/chrome/content/rules/UVic.ca.xml
index d9a53760f15d..a4845723b996 100644
--- a/src/chrome/content/rules/UVic.ca.xml
+++ b/src/chrome/content/rules/UVic.ca.xml
@@ -13,7 +13,9 @@
 
 
 	
-	
+	
+	
+	
 		
 
 
diff --git a/src/chrome/content/rules/UWB.edu.xml b/src/chrome/content/rules/UWB.edu.xml
index c2151d83c5f4..b289a82eebae 100644
--- a/src/chrome/content/rules/UWB.edu.xml
+++ b/src/chrome/content/rules/UWB.edu.xml
@@ -35,7 +35,7 @@ Fetch error: http://library.uwb.edu/ => https://library.uwb.edu/: (51, "SSL: no
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/U_Mag.ca.xml b/src/chrome/content/rules/U_Mag.ca.xml
index c663985cad2b..fe01b18b7b95 100644
--- a/src/chrome/content/rules/U_Mag.ca.xml
+++ b/src/chrome/content/rules/U_Mag.ca.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.umag.ca/ => https://www.ucalgarymag.ca/: (60, 'SSL certi
 	(www.)?umag.ca: 404
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Ua-hosting.com.ua.xml b/src/chrome/content/rules/Ua-hosting.com.ua.xml
index 87ea73038b32..f9dc540d1587 100644
--- a/src/chrome/content/rules/Ua-hosting.com.ua.xml
+++ b/src/chrome/content/rules/Ua-hosting.com.ua.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.ua-hosting.com.ua/ => https://ua-hosting.com.ua/: (60, '
 	www: cert only matches ^ua-hosting.com.ua
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Ual.es.xml b/src/chrome/content/rules/Ual.es.xml
index 4b4702a531a5..1cc6d1908afe 100644
--- a/src/chrome/content/rules/Ual.es.xml
+++ b/src/chrome/content/rules/Ual.es.xml
@@ -81,7 +81,7 @@ Fetch error: http://www2.ual.es/ => https://www2.ual.es/: (60, 'SSL certificate
 		* www.ieei.ual.es
 		* www.indirural.ual.es
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/UbCDN.co.xml b/src/chrome/content/rules/UbCDN.co.xml
deleted file mode 100644
index 815f6f7a6321..000000000000
--- a/src/chrome/content/rules/UbCDN.co.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/UbNt.com.xml b/src/chrome/content/rules/UbNt.com.xml
index a62496ffbeaa..200cf88775b0 100644
--- a/src/chrome/content/rules/UbNt.com.xml
+++ b/src/chrome/content/rules/UbNt.com.xml
@@ -2,7 +2,6 @@
 	Other Ubiquiti Networks rulesets:
 
 		- Go_Ubiquiti.com.xml
-		- UbCDN.co.xml
 
 
 	Nonfunctional hosts in *ubnt.com:
diff --git a/src/chrome/content/rules/UberMedia.com.xml b/src/chrome/content/rules/UberMedia.com.xml
index 734540c853bf..db1657c4e8d7 100644
--- a/src/chrome/content/rules/UberMedia.com.xml
+++ b/src/chrome/content/rules/UberMedia.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://ubermedia.com/ => https://ubermedia.com/: (7, 'Failed to con
 Fetch error: http://www.ubermedia.com/ => https://www.ubermedia.com/: (7, 'Failed to connect to www.ubermedia.com port 443: Connection refused')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/UberTags-mismatches.xml b/src/chrome/content/rules/UberTags-mismatches.xml
deleted file mode 100644
index c5719a7ac3d0..000000000000
--- a/src/chrome/content/rules/UberTags-mismatches.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-	
-	
-	
-	
-	
-
-	
-	
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/UberTags.xml b/src/chrome/content/rules/UberTags.xml
deleted file mode 100644
index 90b5d1481b13..000000000000
--- a/src/chrome/content/rules/UberTags.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Uber_Technologies.xml b/src/chrome/content/rules/Uber_Technologies.xml
index ac17c022af9f..2b5e5c6640e5 100644
--- a/src/chrome/content/rules/Uber_Technologies.xml
+++ b/src/chrome/content/rules/Uber_Technologies.xml
@@ -1,5 +1,5 @@
 
-
-
-	
-		
-
-
-	
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-		
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-		
-	
-
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
 
diff --git a/src/chrome/content/rules/Ubisoft_Group.com.xml b/src/chrome/content/rules/Ubisoft_Group.com.xml
deleted file mode 100644
index c0df0aa450e7..000000000000
--- a/src/chrome/content/rules/Ubisoft_Group.com.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Ubrr.ru.xml b/src/chrome/content/rules/Ubrr.ru.xml
index 15f30bbe32a2..93e5c4609363 100644
--- a/src/chrome/content/rules/Ubrr.ru.xml
+++ b/src/chrome/content/rules/Ubrr.ru.xml
@@ -62,7 +62,7 @@ tbinfo.ubrr.ru different content
 ³ timed out
 ⁶ redirect
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Ubuntu-CN.xml b/src/chrome/content/rules/Ubuntu-CN.xml
deleted file mode 100644
index 5e6111c349f7..000000000000
--- a/src/chrome/content/rules/Ubuntu-CN.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-
-	
-		
-		
-		
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Ubuntu.com.cn.xml b/src/chrome/content/rules/Ubuntu.com.cn.xml
new file mode 100644
index 000000000000..43dc6c22cdf2
--- /dev/null
+++ b/src/chrome/content/rules/Ubuntu.com.cn.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ubuntu.org.cn.xml b/src/chrome/content/rules/Ubuntu.org.cn.xml
new file mode 100644
index 000000000000..b60528f4f7b6
--- /dev/null
+++ b/src/chrome/content/rules/Ubuntu.org.cn.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ubuntu.xml b/src/chrome/content/rules/Ubuntu.xml
index 8adcab3fac6a..5d914972270a 100644
--- a/src/chrome/content/rules/Ubuntu.xml
+++ b/src/chrome/content/rules/Ubuntu.xml
@@ -1,55 +1,37 @@
 
 
 	
@@ -59,6 +41,8 @@
 		
 	
 	
+	
+	
 	
 	
 	
@@ -66,24 +50,35 @@
 	
 	
 	
+	
 	
 	
 	
 	
+	
 	
+	
 	
-		
-		
-			
+	
+	
+		
+	
 	
+	
 	
 	
+	
+	
 	
 	
 	
 	
-	
-	
+	
+	
+	
+	
+		
+	
 	
 	
 	
diff --git a/src/chrome/content/rules/UbuntuUsers.de.xml b/src/chrome/content/rules/UbuntuUsers.de.xml
index 398fb9f951fc..f7fd3f26718c 100644
--- a/src/chrome/content/rules/UbuntuUsers.de.xml
+++ b/src/chrome/content/rules/UbuntuUsers.de.xml
@@ -51,7 +51,7 @@
 	
 	
 
-	
+	
 
 
 	
 
-	
 
diff --git a/src/chrome/content/rules/Uclibc-ng.org.xml b/src/chrome/content/rules/Uclibc-ng.org.xml
new file mode 100644
index 000000000000..c9d794fbb514
--- /dev/null
+++ b/src/chrome/content/rules/Uclibc-ng.org.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Uclibc.org.xml b/src/chrome/content/rules/Uclibc.org.xml
new file mode 100644
index 000000000000..ac6814569609
--- /dev/null
+++ b/src/chrome/content/rules/Uclibc.org.xml
@@ -0,0 +1,21 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Udacity.com.xml b/src/chrome/content/rules/Udacity.com.xml
index 3cfe2967d99a..4efb0c5515fe 100644
--- a/src/chrome/content/rules/Udacity.com.xml
+++ b/src/chrome/content/rules/Udacity.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://email.udacity.com/ => https://email.udacity.com/: (6, 'Could
 		- labs 	(refused)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Udistrital.xml b/src/chrome/content/rules/Udistrital.xml
index a9ce4fbb22b2..04cbf6100275 100644
--- a/src/chrome/content/rules/Udistrital.xml
+++ b/src/chrome/content/rules/Udistrital.xml
@@ -44,7 +44,7 @@ Fetch error: http://oas.udistrital.edu.co/ => https://oas.udistrital.edu.co/: (2
 		- herbario.udistrital.edu.co
 		- idexud.udistrital.edu.co
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Ugandan-government.xml b/src/chrome/content/rules/Ugandan-government.xml
index e71583e445a2..a42ae69e99b3 100644
--- a/src/chrome/content/rules/Ugandan-government.xml
+++ b/src/chrome/content/rules/Ugandan-government.xml
@@ -3,7 +3,7 @@
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Uhhospitals.org.xml b/src/chrome/content/rules/Uhhospitals.org.xml
index 246bcda5e8a4..95d537d3c0bc 100644
--- a/src/chrome/content/rules/Uhhospitals.org.xml
+++ b/src/chrome/content/rules/Uhhospitals.org.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Uhrzeit.org.xml b/src/chrome/content/rules/Uhrzeit.org.xml
index 5b5521bde902..39342c1bc5ab 100644
--- a/src/chrome/content/rules/Uhrzeit.org.xml
+++ b/src/chrome/content/rules/Uhrzeit.org.xml
@@ -8,16 +8,17 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://atomic-clock.org.uk/ => https://www.atomic-clock.org.uk/: (60, 'SSL certificate problem: certificate has expired')
 Fetch error: http://la-hora.org/ => https://www.la-hora.org/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
 
 	
 	
-	
+	
 	
 	
-	
+	
 	
-	
+	
+	
 		
diff --git a/src/chrome/content/rules/Ukash.com.xml b/src/chrome/content/rules/Ukash.com.xml
index 230295a66840..e0c045cf9104 100644
--- a/src/chrome/content/rules/Ukash.com.xml
+++ b/src/chrome/content/rules/Ukash.com.xml
@@ -24,7 +24,7 @@ Fetch error: http://www.ukash.com/ => https://www.ukash.com/: (7, 'Failed to con
 		- www.ukash.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/UkiahDailyJournal.com.xml b/src/chrome/content/rules/UkiahDailyJournal.com.xml
new file mode 100644
index 000000000000..d6ed122fcef9
--- /dev/null
+++ b/src/chrome/content/rules/UkiahDailyJournal.com.xml
@@ -0,0 +1,30 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ukrnames.com.xml b/src/chrome/content/rules/Ukrnames.com.xml
index 630f0e685e31..68e51e74a153 100644
--- a/src/chrome/content/rules/Ukrnames.com.xml
+++ b/src/chrome/content/rules/Ukrnames.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://s.ukrnames.com/ => https://s.ukrnames.com/: (28, 'Connection
 		- support.ukrnames.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Uksrv.co.uk.xml b/src/chrome/content/rules/Uksrv.co.uk.xml
index 22d0610c9fea..7f8b3394f493 100644
--- a/src/chrome/content/rules/Uksrv.co.uk.xml
+++ b/src/chrome/content/rules/Uksrv.co.uk.xml
@@ -1,18 +1,15 @@
 
 
-	
+	
+	
+	
 
 
-	
+	
 
 
-	
 
-	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Ulpgc.es.xml b/src/chrome/content/rules/Ulpgc.es.xml
index b7142f78f52b..0259058140cc 100644
--- a/src/chrome/content/rules/Ulpgc.es.xml
+++ b/src/chrome/content/rules/Ulpgc.es.xml
@@ -417,7 +417,7 @@ Fetch error: http://www4.ulpgc.es/ => https://www4.ulpgc.es/: (6, 'Could not res
 		* www.www.ccbb.ulpgc.es
 		* www.www.dim.ulpgc.es
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Ulteo.com.xml b/src/chrome/content/rules/Ulteo.com.xml
index bdc1aa9735be..a7f13c2ff6de 100644
--- a/src/chrome/content/rules/Ulteo.com.xml
+++ b/src/chrome/content/rules/Ulteo.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://www.ulteo.com/ => https://www.ulteo.com/: (51, "SSL: no alte
 		spoon.ulteo.com
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Ultimate_Boot_CD.com.xml b/src/chrome/content/rules/Ultimate_Boot_CD.com.xml
index f538577efd2a..418e926292fb 100644
--- a/src/chrome/content/rules/Ultimate_Boot_CD.com.xml
+++ b/src/chrome/content/rules/Ultimate_Boot_CD.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.ultimatebootcd.com/ => https://www.ultimatebootcd.com/:
 	* Shows www
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/UltraTools.com.xml b/src/chrome/content/rules/UltraTools.com.xml
index da199102d31e..2c1e373a7f5f 100644
--- a/src/chrome/content/rules/UltraTools.com.xml
+++ b/src/chrome/content/rules/UltraTools.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://ultratools.com/ => https://ultratools.com/: (51, "SSL: no al
 		- www.ultratools.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Ultrabug.fr.xml b/src/chrome/content/rules/Ultrabug.fr.xml
new file mode 100644
index 000000000000..923be7121b23
--- /dev/null
+++ b/src/chrome/content/rules/Ultrabug.fr.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Ultrabug.xml b/src/chrome/content/rules/Ultrabug.xml
deleted file mode 100644
index c1bab3511538..000000000000
--- a/src/chrome/content/rules/Ultrabug.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Ultrasawt.com.xml b/src/chrome/content/rules/Ultrasawt.com.xml
new file mode 100644
index 000000000000..2f3861be103a
--- /dev/null
+++ b/src/chrome/content/rules/Ultrasawt.com.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Ultrasurf.us.xml b/src/chrome/content/rules/Ultrasurf.us.xml
index e772e61239d0..303854eeeefc 100644
--- a/src/chrome/content/rules/Ultrasurf.us.xml
+++ b/src/chrome/content/rules/Ultrasurf.us.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Uma.es.xml b/src/chrome/content/rules/Uma.es.xml
deleted file mode 100644
index ea83153afb5c..000000000000
--- a/src/chrome/content/rules/Uma.es.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-  
-  
-  
-
-  
-  
-  
-
diff --git a/src/chrome/content/rules/Umano.me.xml b/src/chrome/content/rules/Umano.me.xml
index dd3f6020157f..7232173e01ee 100644
--- a/src/chrome/content/rules/Umano.me.xml
+++ b/src/chrome/content/rules/Umano.me.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.umano.me/ => https://www.umano.me/: (28, 'Connection tim
 		- www.umano.me
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Umea_University.xml b/src/chrome/content/rules/Umea_University.xml
index 553118f2c75a..2e4d98cde996 100644
--- a/src/chrome/content/rules/Umea_University.xml
+++ b/src/chrome/content/rules/Umea_University.xml
@@ -1,51 +1,47 @@
 
 
-
 	
-	
-		
-
-
-	
-
-
-	
-
-	
-	
-
-
\ No newline at end of file
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Umsmash.com.xml b/src/chrome/content/rules/Umsmash.com.xml
new file mode 100644
index 000000000000..a0b63dce0336
--- /dev/null
+++ b/src/chrome/content/rules/Umsmash.com.xml
@@ -0,0 +1,5 @@
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/UnRealWorld.fi.xml b/src/chrome/content/rules/UnRealWorld.fi.xml
new file mode 100644
index 000000000000..67f1a8357f69
--- /dev/null
+++ b/src/chrome/content/rules/UnRealWorld.fi.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Unbit.it.xml b/src/chrome/content/rules/Unbit.it.xml
index 2ded92da4fa1..bfe3efca8763 100644
--- a/src/chrome/content/rules/Unbit.it.xml
+++ b/src/chrome/content/rules/Unbit.it.xml
@@ -5,7 +5,7 @@ Fetch error: http://wiki.unbit.it/ => https://wiki.unbit.it/: (60, 'SSL certific
 Fetch error: http://www.wiki.unbit.it/ => https://wiki.unbit.it/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
@@ -31,7 +31,7 @@ Fetch error: http://www.wiki.unbit.it/ => https://wiki.unbit.it/: (60, 'SSL cert
 		
 		
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Unblocked.xml b/src/chrome/content/rules/Unblocked.xml
index 3ed6745c4dc1..a1334e686ee9 100644
--- a/src/chrome/content/rules/Unblocked.xml
+++ b/src/chrome/content/rules/Unblocked.xml
@@ -2,7 +2,7 @@
 	Other domains:
 		unblocked.pub
 		unblckd.biz
-		
+
 -->
 
 
diff --git a/src/chrome/content/rules/Unblu.com.xml b/src/chrome/content/rules/Unblu.com.xml
index 176ec3e01d6b..d0bd3d8cd077 100644
--- a/src/chrome/content/rules/Unblu.com.xml
+++ b/src/chrome/content/rules/Unblu.com.xml
@@ -16,4 +16,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Unbounce.xml b/src/chrome/content/rules/Unbounce.xml
index 27c0060ac8a9..005576e563eb 100644
--- a/src/chrome/content/rules/Unbounce.xml
+++ b/src/chrome/content/rules/Unbounce.xml
@@ -58,7 +58,7 @@ Fetch error: http://ubounce.wpengine.netdna-cdn.com/ => https://ubounce.wpengine
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Uned.es.xml b/src/chrome/content/rules/Uned.es.xml
index 3595fce3f3d5..843aba3c043a 100644
--- a/src/chrome/content/rules/Uned.es.xml
+++ b/src/chrome/content/rules/Uned.es.xml
@@ -3,9 +3,9 @@
 	See .
 
 	Not supporting HTTPS or using an invalid certificate:
-	
+
 		* uned.es
-	
+
 		* 2013.cursosvirtuales.uned.es
 		* acacia.intecca.uned.es
 		* adenu.ia.uned.es
diff --git a/src/chrome/content/rules/Uneddit.xml b/src/chrome/content/rules/Uneddit.xml
index 955af0d38763..f72a77fd9b53 100644
--- a/src/chrome/content/rules/Uneddit.xml
+++ b/src/chrome/content/rules/Uneddit.xml
@@ -4,10 +4,10 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.uneddit.com/ => https://www.uneddit.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.uneddit.com'")
 
 -->
-
+
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Ungleich.ch.xml b/src/chrome/content/rules/Ungleich.ch.xml
new file mode 100644
index 000000000000..a684a740f319
--- /dev/null
+++ b/src/chrome/content/rules/Ungleich.ch.xml
@@ -0,0 +1,13 @@
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Unhosted.xml b/src/chrome/content/rules/Unhosted.xml
index c49d4982bd66..c0fd0e222399 100644
--- a/src/chrome/content/rules/Unhosted.xml
+++ b/src/chrome/content/rules/Unhosted.xml
@@ -8,7 +8,7 @@ Fetch error: http://apps.unhosted.org/ => https://apps.unhosted.org/: (6, 'Could
 		- www		(self-signed)
 
 -->
-
+
 
 	
 	
@@ -19,7 +19,7 @@ Fetch error: http://apps.unhosted.org/ => https://apps.unhosted.org/: (6, 'Could
 
 		
 
-	
 
 
diff --git a/src/chrome/content/rules/Uni-Saarland.de.xml b/src/chrome/content/rules/Uni-Saarland.de.xml
index 79a1bee540e0..24991402094f 100644
--- a/src/chrome/content/rules/Uni-Saarland.de.xml
+++ b/src/chrome/content/rules/Uni-Saarland.de.xml
@@ -57,7 +57,34 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 		
@@ -83,14 +110,11 @@
 	
 
-	
 
 	
-	
 
 
+	
 
diff --git a/src/chrome/content/rules/Uni-Wuerzburg.de.xml b/src/chrome/content/rules/Uni-Wuerzburg.de.xml
index 4285b5ce938b..66bbf9d1114f 100644
--- a/src/chrome/content/rules/Uni-Wuerzburg.de.xml
+++ b/src/chrome/content/rules/Uni-Wuerzburg.de.xml
@@ -23,7 +23,8 @@
 -->
 
 
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Uni.Lu.xml b/src/chrome/content/rules/Uni.Lu.xml
index 96c1d4a17743..d007595be4d2 100644
--- a/src/chrome/content/rules/Uni.Lu.xml
+++ b/src/chrome/content/rules/Uni.Lu.xml
@@ -1,46 +1,17 @@
 
 
-
-	
-
-
-	
-
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
 
diff --git a/src/chrome/content/rules/UniTech.net.xml b/src/chrome/content/rules/UniTech.net.xml
deleted file mode 100644
index 043386930c69..000000000000
--- a/src/chrome/content/rules/UniTech.net.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Unibet_Australia.xml b/src/chrome/content/rules/Unibet_Australia.xml
index be2eec02a657..531f306b25fb 100644
--- a/src/chrome/content/rules/Unibet_Australia.xml
+++ b/src/chrome/content/rules/Unibet_Australia.xml
@@ -12,7 +12,7 @@ Fetch error: http://m.unibet.com.au/ => https://m.unibet.com.au/: (6, 'Could not
 		- .www.unibet.com.au
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Uniblue.xml b/src/chrome/content/rules/Uniblue.xml
deleted file mode 100644
index b9d0bcfd8bba..000000000000
--- a/src/chrome/content/rules/Uniblue.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Unicorn-engine.org.xml b/src/chrome/content/rules/Unicorn-engine.org.xml
new file mode 100644
index 000000000000..add3abf7ee0e
--- /dev/null
+++ b/src/chrome/content/rules/Unicorn-engine.org.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Unified_Social.com.xml b/src/chrome/content/rules/Unified_Social.com.xml
index 9edecf3bc862..f1049edde523 100644
--- a/src/chrome/content/rules/Unified_Social.com.xml
+++ b/src/chrome/content/rules/Unified_Social.com.xml
@@ -26,7 +26,7 @@ Fetch error: http://login.unifiedsocial.com/ => https://login.unifiedsocial.com/
 		- login.unifiedsocial.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Unifiedtracking.com.xml b/src/chrome/content/rules/Unifiedtracking.com.xml
index 75d5fe731cc6..f318a3f81a33 100644
--- a/src/chrome/content/rules/Unifiedtracking.com.xml
+++ b/src/chrome/content/rules/Unifiedtracking.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://unifiedtracking.com/ => https://www.unifiedtracking.com/: (2
 	^unifiedtracking.com: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Unigine.xml b/src/chrome/content/rules/Unigine.xml
index 7fdaadf4833c..270d38f2310b 100644
--- a/src/chrome/content/rules/Unigine.xml
+++ b/src/chrome/content/rules/Unigine.xml
@@ -1,13 +1,14 @@
 
 
 	
-	
+	
+	
+	
 
 
-	
+	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Unikernel.org.xml b/src/chrome/content/rules/Unikernel.org.xml
deleted file mode 100644
index dc9cff1ccb3b..000000000000
--- a/src/chrome/content/rules/Unikernel.org.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Unilever.xml b/src/chrome/content/rules/Unilever.xml
index cd24213f097c..fb483eb275e4 100644
--- a/src/chrome/content/rules/Unilever.xml
+++ b/src/chrome/content/rules/Unilever.xml
@@ -2,14 +2,14 @@
 
 	
 	
-	
+	
+	
 
 
 	
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Uninett.xml b/src/chrome/content/rules/Uninett.xml
index d28c4817f6fc..85f94ca54f21 100644
--- a/src/chrome/content/rules/Uninett.xml
+++ b/src/chrome/content/rules/Uninett.xml
@@ -53,7 +53,7 @@ Fetch error: http://www.gn3campus.uninett.no/ => https://ow.feide.no/geantcampus
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/UnionPay.com.xml b/src/chrome/content/rules/UnionPay.com.xml
index 9d010ceea636..aefe25bf5b4e 100644
--- a/src/chrome/content/rules/UnionPay.com.xml
+++ b/src/chrome/content/rules/UnionPay.com.xml
@@ -28,7 +28,7 @@ Fetch error: http://ums.unionpaysecure.com/ => https://ums.unionpaysecure.com/:
 		- goldenweek.unionpayintl.com
 		- m.unionpayintl.com
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Unique_Vintage.xml b/src/chrome/content/rules/Unique_Vintage.xml
index 3aeeed8318b1..934afd92aa32 100644
--- a/src/chrome/content/rules/Unique_Vintage.xml
+++ b/src/chrome/content/rules/Unique_Vintage.xml
@@ -1,7 +1,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Unisend.com.mx.xml b/src/chrome/content/rules/Unisend.com.mx.xml
deleted file mode 100644
index 7fd7a4e89cc1..000000000000
--- a/src/chrome/content/rules/Unisend.com.mx.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Unister.xml b/src/chrome/content/rules/Unister.xml
deleted file mode 100644
index ed79cfad5b29..000000000000
--- a/src/chrome/content/rules/Unister.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/chrome/content/rules/Unisys.com.xml b/src/chrome/content/rules/Unisys.com.xml
index 022ebcdc034a..51084b077e45 100644
--- a/src/chrome/content/rules/Unisys.com.xml
+++ b/src/chrome/content/rules/Unisys.com.xml
@@ -18,14 +18,15 @@
 -->
 
 
-	
+	
+	
+	
 		
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/United-Internet.xml b/src/chrome/content/rules/United-Internet.xml
index d6d19e498128..604f3deb75aa 100644
--- a/src/chrome/content/rules/United-Internet.xml
+++ b/src/chrome/content/rules/United-Internet.xml
@@ -10,6 +10,7 @@
 		- Corpimages.de.xml
 		- GMX.xml
 		- initial-website.com.xml
+		- oneandone.net.xml
 		- perfora.net
 		- tifbs.net.xml
 		- Top.de.xml
diff --git a/src/chrome/content/rules/United-Nuclear-Scientific.xml b/src/chrome/content/rules/United-Nuclear-Scientific.xml
index 2f6174ca52c7..c4a78ec305d6 100644
--- a/src/chrome/content/rules/United-Nuclear-Scientific.xml
+++ b/src/chrome/content/rules/United-Nuclear-Scientific.xml
@@ -3,10 +3,10 @@
 	
 	
 	
-	
 
 
-	
+
+	
 
 
 	
diff --git a/src/chrome/content/rules/United-San-Antonio-Fed-Credit-Union.xml b/src/chrome/content/rules/United-San-Antonio-Fed-Credit-Union.xml
deleted file mode 100644
index 31ee060d8bed..000000000000
--- a/src/chrome/content/rules/United-San-Antonio-Fed-Credit-Union.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/United-States-Department-of-Agriculture.xml b/src/chrome/content/rules/United-States-Department-of-Agriculture.xml
index 7b71282798d5..4ec6ac7eb5cb 100644
--- a/src/chrome/content/rules/United-States-Department-of-Agriculture.xml
+++ b/src/chrome/content/rules/United-States-Department-of-Agriculture.xml
@@ -99,7 +99,7 @@ Fetch error: http://my.usda.gov/ => https://my.usda.gov/: (35, 'Unknown SSL prot
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/United-States-Department-of-Energy.xml b/src/chrome/content/rules/United-States-Department-of-Energy.xml
index eb5a23f06174..dc5e95bdca62 100644
--- a/src/chrome/content/rules/United-States-Department-of-Energy.xml
+++ b/src/chrome/content/rules/United-States-Department-of-Energy.xml
@@ -11,7 +11,10 @@
 -->
 
 
-	
+	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/United-States-Nuclear-Regulatory-Commission.xml b/src/chrome/content/rules/United-States-Nuclear-Regulatory-Commission.xml
index 02fada26172b..6ece8e3a1376 100644
--- a/src/chrome/content/rules/United-States-Nuclear-Regulatory-Commission.xml
+++ b/src/chrome/content/rules/United-States-Nuclear-Regulatory-Commission.xml
@@ -17,7 +17,7 @@
 	ᵐ Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/United_Acquisition_Services.xml b/src/chrome/content/rules/United_Acquisition_Services.xml
index 9f8e0f4cc8e2..3e7616748c88 100644
--- a/src/chrome/content/rules/United_Acquisition_Services.xml
+++ b/src/chrome/content/rules/United_Acquisition_Services.xml
@@ -10,11 +10,11 @@ Fetch error: http://mail.uas.biz/ => https://mail.uas.biz/: (28, 'Connection tim
 		- (www.)	(shows mail; mismatched, CN: mail.uas.biz)
 
 -->
-
+
 
 	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/United_Nations_Office_at_Vienna.xml b/src/chrome/content/rules/United_Nations_Office_at_Vienna.xml
index 07cd5a63ca52..ceee64676c22 100644
--- a/src/chrome/content/rules/United_Nations_Office_at_Vienna.xml
+++ b/src/chrome/content/rules/United_Nations_Office_at_Vienna.xml
@@ -22,4 +22,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/United_Republic.xml b/src/chrome/content/rules/United_Republic.xml
index 3392d1cb0755..bd6f862f2116 100644
--- a/src/chrome/content/rules/United_Republic.xml
+++ b/src/chrome/content/rules/United_Republic.xml
@@ -22,4 +22,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/United_Stationers.xml b/src/chrome/content/rules/United_Stationers.xml
index 8d8a075a272e..38bdfc99fdc8 100644
--- a/src/chrome/content/rules/United_Stationers.xml
+++ b/src/chrome/content/rules/United_Stationers.xml
@@ -1,23 +1,24 @@
 
 
 	
-	
+	
+	
+	
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
 
 	
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Unitn.it.xml b/src/chrome/content/rules/Unitn.it.xml
index abfe5f6c0c35..754116f5713b 100644
--- a/src/chrome/content/rules/Unitn.it.xml
+++ b/src/chrome/content/rules/Unitn.it.xml
@@ -26,4 +26,4 @@
 
 	
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Univ-Montp3.fr.xml b/src/chrome/content/rules/Univ-Montp3.fr.xml
index 08fe2d8b7f04..6e0359a451c2 100644
--- a/src/chrome/content/rules/Univ-Montp3.fr.xml
+++ b/src/chrome/content/rules/Univ-Montp3.fr.xml
@@ -19,9 +19,9 @@ Fetch error: http://gt5-jres2015.univ-montp3.fr/ => https://gt5-jres2015.univ-mo
 		- css on gt5-jres2015 from fonts.googleapis.com *
 
 	* Secured by us
-	
+
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Univention.de.xml b/src/chrome/content/rules/Univention.de.xml
index 817d33ad94e6..8965b60f8e30 100644
--- a/src/chrome/content/rules/Univention.de.xml
+++ b/src/chrome/content/rules/Univention.de.xml
@@ -45,13 +45,13 @@
 
 	
-		
+
 	
-	
+
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/UniversalSubtitles.xml b/src/chrome/content/rules/UniversalSubtitles.xml
deleted file mode 100644
index b16fd89c2afd..000000000000
--- a/src/chrome/content/rules/UniversalSubtitles.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-  
-  
-
-  
-  
-  
-
diff --git a/src/chrome/content/rules/Universite_Laval.xml b/src/chrome/content/rules/Universite_Laval.xml
index acabc74eb57c..aa75feddd6c1 100644
--- a/src/chrome/content/rules/Universite_Laval.xml
+++ b/src/chrome/content/rules/Universite_Laval.xml
@@ -69,18 +69,18 @@ Fetch error: http://www.viraj.ulaval.ca/ => https://www.viraj.ulaval.ca/: (60, '
 	² Expired
 
 -->
-
+
 	
 	
 	
-  
+
 
-  
+
 	
-	 
+	
 
 	
-	  
+	
 
 	
 	
@@ -106,29 +106,29 @@ Fetch error: http://www.viraj.ulaval.ca/ => https://www.viraj.ulaval.ca/: (60, '
 	
 	
 
-	 
+	
 	
 
-	  
+	
 	
 
-	 
+	
 	
 
-	 
+	
 	
 	
 	
 	
 
-	 
-	 
+	
+	
 	
 
-	 
-	 
+	
+	
 
-	  
+	
 	
 	
 	
@@ -136,23 +136,23 @@ Fetch error: http://www.viraj.ulaval.ca/ => https://www.viraj.ulaval.ca/: (60, '
 	
 	
 
-	 
+	
 	
 	
 
-	 
+	
 	
 	
 
 	
-	 
+	
 	
 	
-	
+
 	
 	
 	
-	
+
 	
 	
 	
@@ -176,25 +176,25 @@ Fetch error: http://www.viraj.ulaval.ca/ => https://www.viraj.ulaval.ca/: (60, '
 	
 	
 
-	 
+	
 	
 
-	 
+	
 	
 	
 	
 	
 
-	 
+	
 	
 	
 	
 
-	 
+	
 	
 	
 
-	 
+	
 	
 	
 	
@@ -222,15 +222,15 @@ Fetch error: http://www.viraj.ulaval.ca/ => https://www.viraj.ulaval.ca/: (60, '
 
 	
 	
-	 
+	
 
 	
 	
-	 
-  
-  
-	
 	
diff --git a/src/chrome/content/rules/Universite_catholique_de_Louvain.xml b/src/chrome/content/rules/Universite_catholique_de_Louvain.xml
index a9e42136f068..d0793c60d746 100644
--- a/src/chrome/content/rules/Universite_catholique_de_Louvain.xml
+++ b/src/chrome/content/rules/Universite_catholique_de_Louvain.xml
@@ -36,24 +36,28 @@
 -->
 
 
-	
+	
+	
+	
 	
-	
+	
+	
+	
+	
+	
+	
 
 
 	
 	
 
 
-	
 
 	
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/University-Illinois-at-Chicago.xml b/src/chrome/content/rules/University-Illinois-at-Chicago.xml
index e8d050c71e23..2af7f5f03cd1 100644
--- a/src/chrome/content/rules/University-Illinois-at-Chicago.xml
+++ b/src/chrome/content/rules/University-Illinois-at-Chicago.xml
@@ -68,7 +68,7 @@ Fetch error: http://www2.uic.edu/ => https://www2.uic.edu/: (60, 'SSL certificat
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/University-of-Alaska-Anchorage.xml b/src/chrome/content/rules/University-of-Alaska-Anchorage.xml
deleted file mode 100644
index 987b0dca0124..000000000000
--- a/src/chrome/content/rules/University-of-Alaska-Anchorage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/University-of-Alaska.xml b/src/chrome/content/rules/University-of-Alaska.xml
deleted file mode 100644
index 04c6f52e4fed..000000000000
--- a/src/chrome/content/rules/University-of-Alaska.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/University-of-Applied-Sciences-Rapperswil.xml b/src/chrome/content/rules/University-of-Applied-Sciences-Rapperswil.xml
index 8644dd64548f..d550f5bb9753 100644
--- a/src/chrome/content/rules/University-of-Applied-Sciences-Rapperswil.xml
+++ b/src/chrome/content/rules/University-of-Applied-Sciences-Rapperswil.xml
@@ -5,7 +5,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -15,7 +16,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/University-of-Bern.xml b/src/chrome/content/rules/University-of-Bern.xml
index f5b62bd1ed5c..4414caee5460 100644
--- a/src/chrome/content/rules/University-of-Bern.xml
+++ b/src/chrome/content/rules/University-of-Bern.xml
@@ -12,16 +12,34 @@
 -->
 
 
-	
-
-
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+	
 
 
 	
-	
 
 	
+
 
 
-	
+	
+	
 	
+	
+	
 	
-	
-	
 	
-	
-	
-	
-	
+	
+	
+	
 	
 	
 	
-	
+	
 	
+	
 	
 	
 	
 	
 	
 	
+	
 	
+	
 	
 	
-	
+	
+	
 	
+	
+	
+	
+	
+	
 	
 	
+	
 	
 	
+	
+	
 	
+	
 	
+	
+	
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
-
-	
-	
-	
-
+	
+	
+	
+	
+	
+	
 	
-	
 	
-	
+	
 	
 	
-	
+	
 	
+	
 	
+	
 	
 	
-	
+	
 	
-	
+
+	
+	
+	
+	
 
 	
+	
+	
 	
 	
 	
 	
+	
 	
 	
+	
 	
-	
-
-	
-	
-
-	
-	
-
 
 	
+	
+	
 	
 
 	
 	
+	
 
 	
 	
@@ -149,74 +178,23 @@
 	
 
 	
+	
+	
 	
-	
 	
+	
+	
+	
 	
 	
 	
 	
-	
-	
 
-	
-	
+	
 	
-	
 	
-	
-	
-	
-	
+	
 	
-	
-
-		
-		
-
-			
-			
-			
-			
-			
-
-		
-
-			
-			
-			
-
-		
-		
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-			
 
 
 	
-
-	
-
 	
 	
 
-	
-	
-
-		
-		
-		
-		
-		
-
 	
 
-	
-	
-
-	
+	
 
-	
 
 	
diff --git a/src/chrome/content/rules/University-of-California-San-Diego.xml b/src/chrome/content/rules/University-of-California-San-Diego.xml
index 160999323cef..67f2b1f4c1d6 100644
--- a/src/chrome/content/rules/University-of-California-San-Diego.xml
+++ b/src/chrome/content/rules/University-of-California-San-Diego.xml
@@ -1,204 +1,170 @@
-
-
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-
-	
-	
-	
-
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
-	
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+    
+    
 
diff --git a/src/chrome/content/rules/University-of-Cambridge.xml b/src/chrome/content/rules/University-of-Cambridge.xml
index 1eeb2b2792c2..89fa52d56576 100644
--- a/src/chrome/content/rules/University-of-Cambridge.xml
+++ b/src/chrome/content/rules/University-of-Cambridge.xml
@@ -1,5 +1,5 @@
 
-
+
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/University-of-Chicago.xml b/src/chrome/content/rules/University-of-Chicago.xml
index 6940c351105b..d57aff861bb5 100644
--- a/src/chrome/content/rules/University-of-Chicago.xml
+++ b/src/chrome/content/rules/University-of-Chicago.xml
@@ -41,6 +41,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/University-of-Colorado-at-Boulder.xml b/src/chrome/content/rules/University-of-Colorado-at-Boulder.xml
index 4d5a9db884b6..95396da59157 100644
--- a/src/chrome/content/rules/University-of-Colorado-at-Boulder.xml
+++ b/src/chrome/content/rules/University-of-Colorado-at-Boulder.xml
@@ -52,7 +52,11 @@ Fetch error: http://colorado.edu/ => http://colorado.edu/: Redirect for 'http://
 
 
 	
-	
+	
+	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/University-of-Delaware.xml b/src/chrome/content/rules/University-of-Delaware.xml
index 9a3e860205ec..b403b33ba2cd 100644
--- a/src/chrome/content/rules/University-of-Delaware.xml
+++ b/src/chrome/content/rules/University-of-Delaware.xml
@@ -22,4 +22,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/University-of-Eastern-Finland.xml b/src/chrome/content/rules/University-of-Eastern-Finland.xml
index c294c36f01fb..081e69718db4 100644
--- a/src/chrome/content/rules/University-of-Eastern-Finland.xml
+++ b/src/chrome/content/rules/University-of-Eastern-Finland.xml
@@ -5,7 +5,7 @@ Fetch error: http://cs.joensuu.fi/ => https://cs.joensuu.fi/: (60, 'SSL certific
 	!functional:
 		- aducate.uef.fi	(valid cert, shows RHEL test page)
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/University-of-Exeter.xml b/src/chrome/content/rules/University-of-Exeter.xml
index abe8ca63e48d..6a6299b82931 100644
--- a/src/chrome/content/rules/University-of-Exeter.xml
+++ b/src/chrome/content/rules/University-of-Exeter.xml
@@ -1,74 +1,48 @@
 
 
-
-	
-	
-
-		
-
 	
-	
-		
-
-
-	
-
-
-	
-	
-
-	
-	
-
-	
-	
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
 
diff --git a/src/chrome/content/rules/University-of-Florida.xml b/src/chrome/content/rules/University-of-Florida.xml
index ad7e04703d95..aa20fa166606 100644
--- a/src/chrome/content/rules/University-of-Florida.xml
+++ b/src/chrome/content/rules/University-of-Florida.xml
@@ -49,7 +49,7 @@ Fetch error: http://www.shands.org/ => https://www.shands.org/: (51, "SSL: no al
 		- www			(refused)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/University-of-Groningen.xml b/src/chrome/content/rules/University-of-Groningen.xml
index 3fa2bf4d470f..01be299ad688 100644
--- a/src/chrome/content/rules/University-of-Groningen.xml
+++ b/src/chrome/content/rules/University-of-Groningen.xml
@@ -5,7 +5,9 @@ Fetch error: http://www.astro.rug.nl/ => https://www.astro.rug.nl/: (60, 'SSL ce
 
 
 	
-	
+	
+	
+	
 
 	
diff --git a/src/chrome/content/rules/University-of-Helsinki.xml b/src/chrome/content/rules/University-of-Helsinki.xml
index d01fdb772568..356984a4da87 100644
--- a/src/chrome/content/rules/University-of-Helsinki.xml
+++ b/src/chrome/content/rules/University-of-Helsinki.xml
@@ -26,7 +26,13 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/University-of-Idaho.xml b/src/chrome/content/rules/University-of-Idaho.xml
index e38ed6760acf..8e859fe046b1 100644
--- a/src/chrome/content/rules/University-of-Idaho.xml
+++ b/src/chrome/content/rules/University-of-Idaho.xml
@@ -22,10 +22,19 @@ Fetch error: http://www2.sites.uidaho.edu/ => https://www2.sites.uidaho.edu/: (6
 		- www.webs	(cert: www.sci.uidaho.edu; 302s to www.webpages)
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
diff --git a/src/chrome/content/rules/University-of-Illinois-at-Urbana-Champaign.xml b/src/chrome/content/rules/University-of-Illinois-at-Urbana-Champaign.xml
index 5164cf43aa6b..4717d8870206 100644
--- a/src/chrome/content/rules/University-of-Illinois-at-Urbana-Champaign.xml
+++ b/src/chrome/content/rules/University-of-Illinois-at-Urbana-Champaign.xml
@@ -159,7 +159,7 @@ Fetch error: http://police.illinois.edu/ => https://dps.illinois.edu/: (51, "SSL
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/University-of-Manitoba.xml b/src/chrome/content/rules/University-of-Manitoba.xml
index cc07a5b1f62a..ab1e9c2cbffe 100644
--- a/src/chrome/content/rules/University-of-Manitoba.xml
+++ b/src/chrome/content/rules/University-of-Manitoba.xml
@@ -2,7 +2,7 @@
 	Nonfunctional domains:
 
 
-		- umanitoba.ca subdomains: 
+		- umanitoba.ca subdomains:
 
 			- crscalprod1.cc
 			- fasprod.cc		(interrupted)
diff --git a/src/chrome/content/rules/University-of-Maryland.xml b/src/chrome/content/rules/University-of-Maryland.xml
index 399606e63a40..deacfe7cc02c 100644
--- a/src/chrome/content/rules/University-of-Maryland.xml
+++ b/src/chrome/content/rules/University-of-Maryland.xml
@@ -135,7 +135,7 @@ Fetch error: http://www.urhome.umd.edu/ => https://www.urhome.umd.edu/: (51, "SS
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/University-of-Massachusetts-Amherst.xml b/src/chrome/content/rules/University-of-Massachusetts-Amherst.xml
index 99c27ab23769..53daf1996b8a 100644
--- a/src/chrome/content/rules/University-of-Massachusetts-Amherst.xml
+++ b/src/chrome/content/rules/University-of-Massachusetts-Amherst.xml
@@ -23,7 +23,20 @@
 
 	
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
 	
 	
@@ -33,13 +46,8 @@
 	
 
 
-	
 
-	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/University-of-Minnesota.xml b/src/chrome/content/rules/University-of-Minnesota.xml
index 549459b1c6f6..d51cba3733fc 100644
--- a/src/chrome/content/rules/University-of-Minnesota.xml
+++ b/src/chrome/content/rules/University-of-Minnesota.xml
@@ -44,7 +44,7 @@ Non-2xx HTTP code: http://www1.umn.edu/ (200) => https://www1.umn.edu/ (404)
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/University-of-Ottawa.xml b/src/chrome/content/rules/University-of-Ottawa.xml
index 4952ba1e699e..5abb5362fb1d 100644
--- a/src/chrome/content/rules/University-of-Ottawa.xml
+++ b/src/chrome/content/rules/University-of-Ottawa.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://web5.uottawa.ca/ => https://web5.uottawa.ca/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/University-of-Oxford.xml b/src/chrome/content/rules/University-of-Oxford.xml
index a78a504d84e5..74c3da840575 100644
--- a/src/chrome/content/rules/University-of-Oxford.xml
+++ b/src/chrome/content/rules/University-of-Oxford.xml
@@ -106,7 +106,6 @@ Fetch error: http://mail.bfriars.ox.ac.uk/ => https://www.bfriars.ox.ac.uk/horde
 		- medieval.history		("Site Maintenance")
 		- www.history		Mixed css
 		- www.issf ᵃ
-		- www2.maths ³
 		- tools.ndm ³
 		- nqit		Mismatched
 		- www.torch	Mismatched
@@ -191,7 +190,7 @@ Fetch error: http://mail.bfriars.ox.ac.uk/ => https://www.bfriars.ox.ac.uk/horde
 	* Secured by us
 
 -->
-
+
 
 	
@@ -251,7 +250,11 @@ Fetch error: http://mail.bfriars.ox.ac.uk/ => https://www.bfriars.ox.ac.uk/horde
 	
 	
 	
-	
+	
+	
+	
+	
+	
 
 	
 	
diff --git a/src/chrome/content/rules/University-of-Pennsylvania.xml b/src/chrome/content/rules/University-of-Pennsylvania.xml
index f5fba50f3517..5412fcdc0754 100644
--- a/src/chrome/content/rules/University-of-Pennsylvania.xml
+++ b/src/chrome/content/rules/University-of-Pennsylvania.xml
@@ -29,7 +29,16 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 		
 
 
@@ -37,7 +46,6 @@
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/University-of-South-Florida-mismatches.xml b/src/chrome/content/rules/University-of-South-Florida-mismatches.xml
deleted file mode 100644
index 09e599711e46..000000000000
--- a/src/chrome/content/rules/University-of-South-Florida-mismatches.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/University-of-South-Florida.xml b/src/chrome/content/rules/University-of-South-Florida.xml
index c2cb4e08b475..1e10d021c95e 100644
--- a/src/chrome/content/rules/University-of-South-Florida.xml
+++ b/src/chrome/content/rules/University-of-South-Florida.xml
@@ -1,58 +1,46 @@
-
 
-
-
-	
-	
-	
 
+	Refused:
+		- news
 
-	
-	
-
-
-	
-	
-
-	
-
-	
-	
-
-	
+	Timeout:
+		- tap
 
-	
-	
+	Incomplete certificate chain:
+		- lib
 
+	SSL configuration error:
+		- usfweb2 (see https://www.ssllabs.com/ssltest/analyze.html?d=usfweb2.usf.edu)
+-->
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+
+	
+
+	
 
diff --git a/src/chrome/content/rules/University-of-Southampton.xml b/src/chrome/content/rules/University-of-Southampton.xml
index 8dedd9efe1d8..ce42ea5e427b 100644
--- a/src/chrome/content/rules/University-of-Southampton.xml
+++ b/src/chrome/content/rules/University-of-Southampton.xml
@@ -10,9 +10,16 @@
 	
-	
+	
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
 	
 
 
@@ -28,15 +35,10 @@
 	
 
-	
 
-	
 	
 	
 
-	
 
 	
 
@@ -55,4 +57,5 @@
 	
 
+	
 
diff --git a/src/chrome/content/rules/University-of-Southern-California.xml b/src/chrome/content/rules/University-of-Southern-California.xml
index b1acfdd31e9b..a764dd09e9dc 100644
--- a/src/chrome/content/rules/University-of-Southern-California.xml
+++ b/src/chrome/content/rules/University-of-Southern-California.xml
@@ -171,7 +171,7 @@ Fetch error: http://policies.usc.edu/ => https://policy.usc.edu/: (28, 'Connecti
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/University-of-Strathclyde.xml b/src/chrome/content/rules/University-of-Strathclyde.xml
index db6bc4f6fe2f..25755f3ed196 100644
--- a/src/chrome/content/rules/University-of-Strathclyde.xml
+++ b/src/chrome/content/rules/University-of-Strathclyde.xml
@@ -1,7 +1,37 @@
+
+
 
 
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
 
+	
+
 	
 
 
diff --git a/src/chrome/content/rules/University-of-Texas-System.xml b/src/chrome/content/rules/University-of-Texas-System.xml
index 2a4258bf5f26..b584db987694 100644
--- a/src/chrome/content/rules/University-of-Texas-System.xml
+++ b/src/chrome/content/rules/University-of-Texas-System.xml
@@ -6,7 +6,7 @@ Fetch error: http://data.utsystem.edu/ => https://data.utsystem.edu/: (7, 'Faile
 Disabled by https-everywhere-checker because:
 Fetch error: http://utsystem.edu/ => https://utsystem.edu/: (51, "SSL: no alternative certificate subject name matches target host name 'utsystem.edu'")
 -->
-
+
 
 	
 	
@@ -14,7 +14,7 @@ Fetch error: http://utsystem.edu/ => https://utsystem.edu/: (51, "SSL: no altern
 	
 
 
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/University-of-Texas-at-Austin-mismatches.xml b/src/chrome/content/rules/University-of-Texas-at-Austin-mismatches.xml
index 936931c2598e..ae36ef6084c1 100644
--- a/src/chrome/content/rules/University-of-Texas-at-Austin-mismatches.xml
+++ b/src/chrome/content/rules/University-of-Texas-at-Austin-mismatches.xml
@@ -4,14 +4,14 @@
 -->
 
 
-	
+	
+	
 	
 
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/University-of-Texas-at-Dallas.xml b/src/chrome/content/rules/University-of-Texas-at-Dallas.xml
index c79a79ef7cb3..d6c33dfe3587 100644
--- a/src/chrome/content/rules/University-of-Texas-at-Dallas.xml
+++ b/src/chrome/content/rules/University-of-Texas-at-Dallas.xml
@@ -70,7 +70,33 @@
 -->
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 	
 
-	
 
 	
+	
 
diff --git a/src/chrome/content/rules/University-of-Utah.xml b/src/chrome/content/rules/University-of-Utah.xml
index f5ca33fafb8d..f6e3e08968fc 100644
--- a/src/chrome/content/rules/University-of-Utah.xml
+++ b/src/chrome/content/rules/University-of-Utah.xml
@@ -51,7 +51,7 @@ Fetch error: http://www.gradschool.utah.edu/ => https://www.gradschool.utah.edu/
 	² Expired
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/University-of-Virginia.xml b/src/chrome/content/rules/University-of-Virginia.xml
index 40763740a9fa..7d7c408d1411 100644
--- a/src/chrome/content/rules/University-of-Virginia.xml
+++ b/src/chrome/content/rules/University-of-Virginia.xml
@@ -70,7 +70,24 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 
 	
 	
-	
+	
 	
 	
 	
 	
+	
 	
 	
 	
 	
-	
-		
+	
+	
 	
 	
 	
 		
 		
-		
-	
-	
+		  
+	
+	
+	
 	
 	
-	
+	
 	
 
-	
+	
+	
+	
 
diff --git a/src/chrome/content/rules/University-of-Western-Australia.xml b/src/chrome/content/rules/University-of-Western-Australia.xml
index b999a6061d95..1ad390903f39 100644
--- a/src/chrome/content/rules/University-of-Western-Australia.xml
+++ b/src/chrome/content/rules/University-of-Western-Australia.xml
@@ -2,7 +2,7 @@
 	Nonfunctional subdomains:
 
 		- (www.)
-		- websites.psychology	(times out)	
+		- websites.psychology	(times out)
 		- www.news		(rx_record_too_long)
 
 
diff --git a/src/chrome/content/rules/University-of-Wisconsin-Milwaukee.xml b/src/chrome/content/rules/University-of-Wisconsin-Milwaukee.xml
index 38891af1c4c5..6d1e8b9d19d9 100644
--- a/src/chrome/content/rules/University-of-Wisconsin-Milwaukee.xml
+++ b/src/chrome/content/rules/University-of-Wisconsin-Milwaukee.xml
@@ -38,7 +38,7 @@ Fetch error: http://roomscheduling.uwm.edu/ => https://roomscheduling.uwm.edu/:
 		apps.uwm.edu
 		techmallshop.uwm.edu
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/University_Computer_Club.xml b/src/chrome/content/rules/University_Computer_Club.xml
index b8f55eef8765..5b7f425452f1 100644
--- a/src/chrome/content/rules/University_Computer_Club.xml
+++ b/src/chrome/content/rules/University_Computer_Club.xml
@@ -14,4 +14,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/University_at_Buffalo.xml b/src/chrome/content/rules/University_at_Buffalo.xml
index 36f53985c450..284536762aad 100644
--- a/src/chrome/content/rules/University_at_Buffalo.xml
+++ b/src/chrome/content/rules/University_at_Buffalo.xml
@@ -16,7 +16,6 @@ Non-2xx HTTP code: http://www.ubfoundation.buffalo.edu/ (200) => https://ubfound
 
 	Other University at Buffalo rulesets:
 
-		- BioXFEL.org.xml
 
 
 	Nonfunctional hosts in *buffalo.edu:
@@ -113,7 +112,7 @@ Non-2xx HTTP code: http://www.ubfoundation.buffalo.edu/ (200) => https://ubfound
 	* Secured by us
 
 -->
-
+
 
 	
@@ -122,7 +121,9 @@ Non-2xx HTTP code: http://www.ubfoundation.buffalo.edu/ (200) => https://ubfound
 	
 	
 	
-	
+	
+	
+	
 	
 	
 	
diff --git a/src/chrome/content/rules/University_of_Applied_Sciences_Kiel.xml b/src/chrome/content/rules/University_of_Applied_Sciences_Kiel.xml
index 2dc30c9ee3ce..b0c44410556a 100644
--- a/src/chrome/content/rules/University_of_Applied_Sciences_Kiel.xml
+++ b/src/chrome/content/rules/University_of_Applied_Sciences_Kiel.xml
@@ -1,19 +1,30 @@
+
 
-
 	
-	
-
+	
+	
+	
+	
+	
+	
 
-	
+	
 
-
-	
 
-	
-
-	
+	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/University_of_Bath.xml b/src/chrome/content/rules/University_of_Bath.xml
index 1e1079d99d40..278fe7f466ca 100644
--- a/src/chrome/content/rules/University_of_Bath.xml
+++ b/src/chrome/content/rules/University_of_Bath.xml
@@ -18,4 +18,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/University_of_Bristol.xml b/src/chrome/content/rules/University_of_Bristol.xml
index d18f389942d8..77570f9c0ed5 100644
--- a/src/chrome/content/rules/University_of_Bristol.xml
+++ b/src/chrome/content/rules/University_of_Bristol.xml
@@ -26,7 +26,10 @@
 -->
 
 
-	
+	
+	
+	
+	
 		
@@ -50,7 +53,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/University_of_California_San_Francisco-problematic.xml b/src/chrome/content/rules/University_of_California_San_Francisco-problematic.xml
index aaceedb28d10..d0af4422f83e 100644
--- a/src/chrome/content/rules/University_of_California_San_Francisco-problematic.xml
+++ b/src/chrome/content/rules/University_of_California_San_Francisco-problematic.xml
@@ -5,14 +5,12 @@
 
 
 	
-	
 	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/University_of_California_San_Francisco.xml b/src/chrome/content/rules/University_of_California_San_Francisco.xml
index 9af10e193b98..667423220696 100644
--- a/src/chrome/content/rules/University_of_California_San_Francisco.xml
+++ b/src/chrome/content/rules/University_of_California_San_Francisco.xml
@@ -18,6 +18,8 @@ vx28.ucsf.edu
 		- brightideas	(redirects to http; mismatched, CN: slotmatching14.salesforce.com)
 		- calendar *
 		- directory *
+		- elsamadlab (no https)
+		- floorlab	(no https)
 		- osl		(shows campuslifeservices)
 		- synapse	(no https)
 
@@ -62,31 +64,88 @@ vx28.ucsf.edu
 		- (www.)warnme		(www → ^)
 
 -->
+
 
 
 	
-	
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 	
 
-
-	
-
-	
-	
-
-	
-
-	
-
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/University_of_California_Santa_Cruz-problematic.xml b/src/chrome/content/rules/University_of_California_Santa_Cruz-problematic.xml
index 965e241f09cf..38248a1b2ede 100644
--- a/src/chrome/content/rules/University_of_California_Santa_Cruz-problematic.xml
+++ b/src/chrome/content/rules/University_of_California_Santa_Cruz-problematic.xml
@@ -1,5 +1,5 @@
 
 
@@ -7,13 +7,11 @@
 	
 	
 	
-	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/University_of_California_Santa_Cruz.xml b/src/chrome/content/rules/University_of_California_Santa_Cruz.xml
index 5e91eea45d19..b2e015b049e1 100644
--- a/src/chrome/content/rules/University_of_California_Santa_Cruz.xml
+++ b/src/chrome/content/rules/University_of_California_Santa_Cruz.xml
@@ -102,7 +102,7 @@ Fetch error: http://its-proposals-dev.ucsc.edu/ => https://its-proposals-dev.ucs
 	ˢ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/University_of_Cape_Town.xml b/src/chrome/content/rules/University_of_Cape_Town.xml
index 3005de4fcf24..2ecfa6e320c8 100644
--- a/src/chrome/content/rules/University_of_Cape_Town.xml
+++ b/src/chrome/content/rules/University_of_Cape_Town.xml
@@ -46,7 +46,7 @@ Fetch error: http://uct.ac.za/ => https://www.uct.ac.za/: (60, 'SSL certificate
 	^staff doesn't exist
 
 -->
-
+
 
 	
 	
@@ -83,4 +83,4 @@ Fetch error: http://uct.ac.za/ => https://www.uct.ac.za/: (60, 'SSL certificate
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/University_of_Central_Lancashire.xml b/src/chrome/content/rules/University_of_Central_Lancashire.xml
index 3b7c56a49366..8e75c4ba5c97 100644
--- a/src/chrome/content/rules/University_of_Central_Lancashire.xml
+++ b/src/chrome/content/rules/University_of_Central_Lancashire.xml
@@ -6,7 +6,7 @@ Fetch error: http://staff.uclan.ac.uk/ => https://staff.uclan.ac.uk/: (28, 'Conn
 Disabled by https-everywhere-checker because:
 Fetch error: http://uclan.ac.uk/ => https://uclan.ac.uk/: (51, "SSL: no alternative certificate subject name matches target host name 'uclan.ac.uk'")
 -->
-
+
 
 	
 	
@@ -15,4 +15,4 @@ Fetch error: http://uclan.ac.uk/ => https://uclan.ac.uk/: (51, "SSL: no alternat
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/University_of_Cincinatti.xml b/src/chrome/content/rules/University_of_Cincinatti.xml
index 041104354698..3a5907ca8a40 100644
--- a/src/chrome/content/rules/University_of_Cincinatti.xml
+++ b/src/chrome/content/rules/University_of_Cincinatti.xml
@@ -26,7 +26,20 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 		
 
 
@@ -36,7 +49,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/University_of_Derby.xml b/src/chrome/content/rules/University_of_Derby.xml
index 1d7538a0915b..57ceb6c5dca2 100644
--- a/src/chrome/content/rules/University_of_Derby.xml
+++ b/src/chrome/content/rules/University_of_Derby.xml
@@ -9,16 +9,19 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
 
 
-	
+	
 
 
 	
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/University_of_Georgia.xml b/src/chrome/content/rules/University_of_Georgia.xml
index e34eedf12936..8d465177e131 100644
--- a/src/chrome/content/rules/University_of_Georgia.xml
+++ b/src/chrome/content/rules/University_of_Georgia.xml
@@ -5,4 +5,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/University_of_Greifswald.xml b/src/chrome/content/rules/University_of_Greifswald.xml
deleted file mode 100644
index 408381977c4d..000000000000
--- a/src/chrome/content/rules/University_of_Greifswald.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/University_of_Grenada.xml b/src/chrome/content/rules/University_of_Grenada.xml
index f7966673c6cd..ef2e0b96d3b7 100644
--- a/src/chrome/content/rules/University_of_Grenada.xml
+++ b/src/chrome/content/rules/University_of_Grenada.xml
@@ -10,13 +10,12 @@
 -->
 
 
-	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/University_of_Houston.xml b/src/chrome/content/rules/University_of_Houston.xml
index be26209ee53d..752c8c695d69 100644
--- a/src/chrome/content/rules/University_of_Houston.xml
+++ b/src/chrome/content/rules/University_of_Houston.xml
@@ -1,69 +1,53 @@
 
 
-
-	
-
-
-	
-
-
-	
-
-	
-
-	
-	
-
-	
-	
-
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
 
diff --git a/src/chrome/content/rules/University_of_Kent.xml b/src/chrome/content/rules/University_of_Kent.xml
index 5437b7f5cf27..d8df7f5fc471 100644
--- a/src/chrome/content/rules/University_of_Kent.xml
+++ b/src/chrome/content/rules/University_of_Kent.xml
@@ -18,7 +18,7 @@ Fetch error: http://sds-staff.kent.ac.uk/ => https://sds-staff.kent.ac.uk/: (28,
 		- .kent.ac.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/University_of_Leeds.xml b/src/chrome/content/rules/University_of_Leeds.xml
index 41904a6d36cd..327fbee9a577 100644
--- a/src/chrome/content/rules/University_of_Leeds.xml
+++ b/src/chrome/content/rules/University_of_Leeds.xml
@@ -157,7 +157,7 @@ Fetch error: http://pvac.leeds.ac.uk/ => https://www.pvac.leeds.ac.uk/: (51, "SS
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/University_of_Leicester.xml b/src/chrome/content/rules/University_of_Leicester.xml
index db9bb578663f..f8c962c3aa5d 100644
--- a/src/chrome/content/rules/University_of_Leicester.xml
+++ b/src/chrome/content/rules/University_of_Leicester.xml
@@ -23,7 +23,13 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
@@ -32,10 +38,9 @@
 	
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/University_of_Mainz-falsemixed.xml b/src/chrome/content/rules/University_of_Mainz-falsemixed.xml
index 226013dd8b05..51b6f5daf470 100644
--- a/src/chrome/content/rules/University_of_Mainz-falsemixed.xml
+++ b/src/chrome/content/rules/University_of_Mainz-falsemixed.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.zdv.uni-mainz.de/ => https://www.zdv.uni-mainz.de/: (60,
 	For rules not causing false/broken MCB, see University_of_Mainz.xml.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/University_of_Mainz.xml b/src/chrome/content/rules/University_of_Mainz.xml
index 4380d66fe616..bcef5f2261aa 100644
--- a/src/chrome/content/rules/University_of_Mainz.xml
+++ b/src/chrome/content/rules/University_of_Mainz.xml
@@ -110,32 +110,32 @@ Fetch error: http://zdv.uni-mainz.de/ => https://www.$uni-mainz.de/: (6, 'Could
 	ᵘ Unsecurable, doesn't trip MCB
 
 -->
-
+
 
 	
-		
+	
 	
 	
 	
 	
 	
 	
-		
-			
-		
-		
-		
+	
+	
+	
+	
+	
 	
-		
-		
-		
+	
+	
+	
 	
 	
 	
-		
+	
 
-		
+	
 	
 	
 	
@@ -144,9 +144,9 @@ Fetch error: http://zdv.uni-mainz.de/ => https://www.$uni-mainz.de/: (6, 'Could
 	
 	
 	
-		
+	
 
-		
+	
 	
 	
 
diff --git a/src/chrome/content/rules/University_of_North_Carolina_at_Greensboro.xml b/src/chrome/content/rules/University_of_North_Carolina_at_Greensboro.xml
index ca401b20be11..eccf1c8ff613 100644
--- a/src/chrome/content/rules/University_of_North_Carolina_at_Greensboro.xml
+++ b/src/chrome/content/rules/University_of_North_Carolina_at_Greensboro.xml
@@ -61,4 +61,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/University_of_Notre_Dame.xml b/src/chrome/content/rules/University_of_Notre_Dame.xml
index b18d1724e6c7..ca980f2d6d06 100644
--- a/src/chrome/content/rules/University_of_Notre_Dame.xml
+++ b/src/chrome/content/rules/University_of_Notre_Dame.xml
@@ -380,7 +380,7 @@ Fetch error: http://nd.edu/ => https://nd.edu/: (60, 'SSL certificate problem: u
 	³ Unsecurable
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/University_of_Oslo.xml b/src/chrome/content/rules/University_of_Oslo.xml
index b9b9d1098ea5..f2dbadb31280 100644
--- a/src/chrome/content/rules/University_of_Oslo.xml
+++ b/src/chrome/content/rules/University_of_Oslo.xml
@@ -32,7 +32,7 @@ Fetch error: http://www.diskusjonsforum.uio.no/ => https://www.diskusjonsforum.u
 		- (www.)ub
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/University_of_Passau.xml b/src/chrome/content/rules/University_of_Passau.xml
index 02be9e787bc9..bd8ebddd5f60 100644
--- a/src/chrome/content/rules/University_of_Passau.xml
+++ b/src/chrome/content/rules/University_of_Passau.xml
@@ -55,4 +55,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/University_of_Pittsburgh.xml b/src/chrome/content/rules/University_of_Pittsburgh.xml
index a04d69259c89..e35e6bd020c0 100644
--- a/src/chrome/content/rules/University_of_Pittsburgh.xml
+++ b/src/chrome/content/rules/University_of_Pittsburgh.xml
@@ -27,17 +27,25 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 	
 
 
-	
 
 	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/University_of_Reading.xml b/src/chrome/content/rules/University_of_Reading.xml
deleted file mode 100644
index aae636d400c8..000000000000
--- a/src/chrome/content/rules/University_of_Reading.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/University_of_Rostock.xml b/src/chrome/content/rules/University_of_Rostock.xml
index 41172178d6e5..f929c5f82110 100644
--- a/src/chrome/content/rules/University_of_Rostock.xml
+++ b/src/chrome/content/rules/University_of_Rostock.xml
@@ -33,14 +33,19 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
+	
+	
 		
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/University_of_Salford.xml b/src/chrome/content/rules/University_of_Salford.xml
index 6fa667bd479a..f4e5c78f46e0 100644
--- a/src/chrome/content/rules/University_of_Salford.xml
+++ b/src/chrome/content/rules/University_of_Salford.xml
@@ -12,13 +12,14 @@
 -->
 
 
-	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/University_of_Saskatchewan.xml b/src/chrome/content/rules/University_of_Saskatchewan.xml
index c3d99770d1ca..23bd019e07e0 100644
--- a/src/chrome/content/rules/University_of_Saskatchewan.xml
+++ b/src/chrome/content/rules/University_of_Saskatchewan.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/University_of_Sheffield.xml b/src/chrome/content/rules/University_of_Sheffield.xml
index 8f25adc44cb2..746fed45eea2 100644
--- a/src/chrome/content/rules/University_of_Sheffield.xml
+++ b/src/chrome/content/rules/University_of_Sheffield.xml
@@ -27,22 +27,23 @@
 
 
 	
-	
+	
+	
+	
+	
 	
-	
+	
+	
 
 
 	
 	
 
 
-	
 
-	
 
 	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/University_of_Tampa.xml b/src/chrome/content/rules/University_of_Tampa.xml
index e82c4f0aa748..4b0fc84bde2c 100644
--- a/src/chrome/content/rules/University_of_Tampa.xml
+++ b/src/chrome/content/rules/University_of_Tampa.xml
@@ -7,7 +7,10 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
@@ -16,7 +19,6 @@
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/University_of_Tennessee_System.xml b/src/chrome/content/rules/University_of_Tennessee_System.xml
index 96667c90602b..ba59f1d00274 100644
--- a/src/chrome/content/rules/University_of_Tennessee_System.xml
+++ b/src/chrome/content/rules/University_of_Tennessee_System.xml
@@ -26,16 +26,20 @@
 		- security
 		- utap1
 
---> 
+-->
 
 
-	
+	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/University_of_Tennessee_at_Martin.xml b/src/chrome/content/rules/University_of_Tennessee_at_Martin.xml
index e9891f819f5e..0f680f0791ce 100644
--- a/src/chrome/content/rules/University_of_Tennessee_at_Martin.xml
+++ b/src/chrome/content/rules/University_of_Tennessee_at_Martin.xml
@@ -5,28 +5,28 @@ Fetch error: http://legacy.utm.edu/ => https://legacy.utm.edu/: (51, "SSL: no al
 Fetch error: http://primes.utm.edu/ => https://primes.utm.edu/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 	See .
-	
+
 	HTTP only:
 		eviprod.utm.edu
-	
+
 	Refused:
 		twister.utm.edu
-	
+
 	Mismatch:
 		www.iep.utm.edu
 		www.philfilms.utm.edu
-	
+
 	Expired:
 		stem.utm.edu
-	
+
 	Self-signed:
 		catalog.utm.edu
 		ns9200.utm.edu
-	
+
 	Mixed content:
 		utmgive.wpengine.com
 
--->
+-->
 
 	
 
diff --git a/src/chrome/content/rules/University_of_Tuebingen-problematic.xml b/src/chrome/content/rules/University_of_Tuebingen-problematic.xml
index 77d98a7d961b..c2bf9d58bc15 100644
--- a/src/chrome/content/rules/University_of_Tuebingen-problematic.xml
+++ b/src/chrome/content/rules/University_of_Tuebingen-problematic.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/University_of_Tuebingen.xml b/src/chrome/content/rules/University_of_Tuebingen.xml
index a3056867b5fc..23992aa40d6b 100644
--- a/src/chrome/content/rules/University_of_Tuebingen.xml
+++ b/src/chrome/content/rules/University_of_Tuebingen.xml
@@ -30,7 +30,10 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
@@ -41,7 +44,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/University_of_Waikato.xml b/src/chrome/content/rules/University_of_Waikato.xml
index be5d57077c53..f52f12c89074 100644
--- a/src/chrome/content/rules/University_of_Waikato.xml
+++ b/src/chrome/content/rules/University_of_Waikato.xml
@@ -31,7 +31,12 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/University_of_Warwick.xml b/src/chrome/content/rules/University_of_Warwick.xml
index 3feae7ba1ab3..54c0f072da7a 100644
--- a/src/chrome/content/rules/University_of_Warwick.xml
+++ b/src/chrome/content/rules/University_of_Warwick.xml
@@ -18,14 +18,18 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
 		
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/University_of_Wisconsin-Madison.xml b/src/chrome/content/rules/University_of_Wisconsin-Madison.xml
index 50f23b5be8ce..4b5646b2d289 100644
--- a/src/chrome/content/rules/University_of_Wisconsin-Madison.xml
+++ b/src/chrome/content/rules/University_of_Wisconsin-Madison.xml
@@ -75,16 +75,38 @@ Fetch error: http://wayf.wisc.edu/ => https://wayf.wisc.edu/: (6, 'Could not res
 	* Secured by us
 
 -->
-
-
-	
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 	
 	
 	
 
-	
 
 	
 	
@@ -113,4 +135,5 @@ Fetch error: http://wayf.wisc.edu/ => https://wayf.wisc.edu/: (6, 'Could not res
 	
 	
 
+	
 
diff --git a/src/chrome/content/rules/Universityadmissions.se.xml b/src/chrome/content/rules/Universityadmissions.se.xml
index 0957f19d4324..eeb6fd9f867d 100644
--- a/src/chrome/content/rules/Universityadmissions.se.xml
+++ b/src/chrome/content/rules/Universityadmissions.se.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Univie.ac.at.xml b/src/chrome/content/rules/Univie.ac.at.xml
index 1419232cb2ac..17c38ad63654 100644
--- a/src/chrome/content/rules/Univie.ac.at.xml
+++ b/src/chrome/content/rules/Univie.ac.at.xml
@@ -70,7 +70,31 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 		
diff --git a/src/chrome/content/rules/Unizar.es.xml b/src/chrome/content/rules/Unizar.es.xml
index 34f3453b83b5..82c9ba80a8a9 100644
--- a/src/chrome/content/rules/Unizar.es.xml
+++ b/src/chrome/content/rules/Unizar.es.xml
@@ -9,13 +9,13 @@ Fetch error: http://mularroya10.cps.unizar.es/ => https://mularroya10.cps.unizar
 
 	Ruleset for unizar.es, the University of Zaragoza website.
 	See .
-	
+
 	Known issues:
 		* mixed content issues on:
 			- cursosextraordinarios.unizar.es
 			- ocw.unizar.es
 		* incomplete certificate chain on sede.unizar.es.
-	
+
 	Known subdomains that does not support HTTPS or have a wrongly
 	configured certificate (incomplete list):
 		* aize.unizar.es
@@ -38,7 +38,7 @@ Fetch error: http://mularroya10.cps.unizar.es/ => https://mularroya10.cps.unizar
 		* aulavet11.unizar.es
 		* babel.unizar.es
 		* bash.unizar.es
-		
+
 		* bifi.unizar.es
 		* 3gbifi.bifi.unizar.es
 		* analyzer1.bifi.unizar.es
@@ -373,7 +373,7 @@ Fetch error: http://mularroya10.cps.unizar.es/ => https://mularroya10.cps.unizar
 		* zenon.unizar.es
 		* zuriza.unizar.es
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/UnlimitedHost.xml b/src/chrome/content/rules/UnlimitedHost.xml
deleted file mode 100644
index 4c4fa094a594..000000000000
--- a/src/chrome/content/rules/UnlimitedHost.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Uno.im.xml b/src/chrome/content/rules/Uno.im.xml
index 703dff89e487..9e030ac24964 100644
--- a/src/chrome/content/rules/Uno.im.xml
+++ b/src/chrome/content/rules/Uno.im.xml
@@ -18,7 +18,7 @@ Fetch error: http://www.uno.im/ => https://www.uno.im/: (6, 'Could not resolve h
 		- .www.uno.im
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/UnoEuro.com.xml b/src/chrome/content/rules/UnoEuro.com.xml
index 5b9a746db3bc..11af8ccbb8f9 100644
--- a/src/chrome/content/rules/UnoEuro.com.xml
+++ b/src/chrome/content/rules/UnoEuro.com.xml
@@ -18,13 +18,18 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Unpaywall.org.xml b/src/chrome/content/rules/Unpaywall.org.xml
new file mode 100644
index 000000000000..cf22855bf86a
--- /dev/null
+++ b/src/chrome/content/rules/Unpaywall.org.xml
@@ -0,0 +1,13 @@
+
+
+
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Unsplash.com.xml b/src/chrome/content/rules/Unsplash.com.xml
new file mode 100644
index 000000000000..044651a931fb
--- /dev/null
+++ b/src/chrome/content/rules/Unsplash.com.xml
@@ -0,0 +1,43 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Untangle.com.xml b/src/chrome/content/rules/Untangle.com.xml
index 3b88f9349c17..3e229b26362e 100644
--- a/src/chrome/content/rules/Untangle.com.xml
+++ b/src/chrome/content/rules/Untangle.com.xml
@@ -31,7 +31,7 @@ Fetch error: http://promo.untangle.com/ => https://promo.untangle.com/: (51, "SS
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Unthem.xml b/src/chrome/content/rules/Unthem.xml
index 5b1a2eac5c4f..3039ede91e39 100644
--- a/src/chrome/content/rules/Unthem.xml
+++ b/src/chrome/content/rules/Unthem.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Unvanquished.net.xml b/src/chrome/content/rules/Unvanquished.net.xml
index e1d340b3a0ea..9486ed075020 100644
--- a/src/chrome/content/rules/Unvanquished.net.xml
+++ b/src/chrome/content/rules/Unvanquished.net.xml
@@ -7,7 +7,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Unwire.hk.xml b/src/chrome/content/rules/Unwire.hk.xml
index c3f1b5715bb5..2a5780c96ba5 100644
--- a/src/chrome/content/rules/Unwire.hk.xml
+++ b/src/chrome/content/rules/Unwire.hk.xml
@@ -1,33 +1,32 @@
 
 
 	
 	
-	
 	
-	
-	
-	
-	
+	
+	
+	
 	
-	
+	
 	
 
+	
+
 	
 
diff --git a/src/chrome/content/rules/Unwire.xml b/src/chrome/content/rules/Unwire.xml
deleted file mode 100644
index 68712b1878de..000000000000
--- a/src/chrome/content/rules/Unwire.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/UnwiredLtd.com.xml b/src/chrome/content/rules/UnwiredLtd.com.xml
new file mode 100644
index 000000000000..562f42df321d
--- /dev/null
+++ b/src/chrome/content/rules/UnwiredLtd.com.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/UpScore.com.xml b/src/chrome/content/rules/UpScore.com.xml
new file mode 100644
index 000000000000..0be4e6aa6a81
--- /dev/null
+++ b/src/chrome/content/rules/UpScore.com.xml
@@ -0,0 +1,21 @@
+
+
+
+	
+	
+	
+	
+		
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Upaiyun.com.xml b/src/chrome/content/rules/Upaiyun.com.xml
index ce1d49fbdd43..ec65cb6f7022 100644
--- a/src/chrome/content/rules/Upaiyun.com.xml
+++ b/src/chrome/content/rules/Upaiyun.com.xml
@@ -4,24 +4,22 @@
 	Invalid certificate:
 		- upaiyun.com
 		- www.upaiyun.com
-
 -->
 
+	
 	
 	
+		
+		
+		
 		
 		
 		
 		
 		
+		
 
-	
-	
-		
-		
-		
-		
+	
 
-	
 	
 
diff --git a/src/chrome/content/rules/Upay.co.uk.xml b/src/chrome/content/rules/Upay.co.uk.xml
index cc78368e1665..9ed4278ca6a1 100644
--- a/src/chrome/content/rules/Upay.co.uk.xml
+++ b/src/chrome/content/rules/Upay.co.uk.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.upaymobile.co.uk/ => https://www.upaymobile.co.uk/: (51,
 Disabled by https-everywhere-checker because:
 Fetch error: http://upay.co.uk/ => https://www.upay.co.uk/: (6, 'Could not resolve host: upay.co.uk')
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/Update_Framework.com.xml b/src/chrome/content/rules/Update_Framework.com.xml
deleted file mode 100644
index e6054547b5d6..000000000000
--- a/src/chrome/content/rules/Update_Framework.com.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Upf.edu.xml b/src/chrome/content/rules/Upf.edu.xml
index ffbf5420e281..ca014861b81a 100644
--- a/src/chrome/content/rules/Upf.edu.xml
+++ b/src/chrome/content/rules/Upf.edu.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.iula.upf.edu/ => https://www.iula.upf.edu/: (28, 'Connec
 
 	Ruleset for upf.edu, the Pompeu Fabra University website.
 	See .
-	
+
 	Not supporting HTTPS or using an invalid certificate:
 		* aaa.idec.upf.edu
 		* abacdiscoverer.upf.edu
@@ -92,7 +92,7 @@ Fetch error: http://www.iula.upf.edu/ => https://www.iula.upf.edu/: (28, 'Connec
 		* videowork-linux-2.gti.upf.edu
 		* vinson2.upf.edu
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Upic.me.xml b/src/chrome/content/rules/Upic.me.xml
deleted file mode 100644
index d33767f1a05b..000000000000
--- a/src/chrome/content/rules/Upic.me.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-	
-	
-		
-		
-		
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Upickem.net.xml b/src/chrome/content/rules/Upickem.net.xml
index 881b3ff28da9..7fda3b7efa7c 100644
--- a/src/chrome/content/rules/Upickem.net.xml
+++ b/src/chrome/content/rules/Upickem.net.xml
@@ -48,7 +48,7 @@
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Uplay.ubi.com.xml b/src/chrome/content/rules/Uplay.ubi.com.xml
deleted file mode 100644
index dfbe5efc5055..000000000000
--- a/src/chrome/content/rules/Uplay.ubi.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-  
-  
-
-  
-
diff --git a/src/chrome/content/rules/Uploading.com.xml b/src/chrome/content/rules/Uploading.com.xml
index 61ff1fff3e55..ecb2994065c8 100644
--- a/src/chrome/content/rules/Uploading.com.xml
+++ b/src/chrome/content/rules/Uploading.com.xml
@@ -8,10 +8,11 @@ Fetch error: http://uploading.com/ => https://uploading.com/: (60, 'SSL certific
 	Cert doesn't match www.
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Upo.es.xml b/src/chrome/content/rules/Upo.es.xml
index 20123e61301f..a6fb99f5fbbf 100644
--- a/src/chrome/content/rules/Upo.es.xml
+++ b/src/chrome/content/rules/Upo.es.xml
@@ -32,7 +32,7 @@ Fetch error: http://riemann.upo.es/ => https://riemann.upo.es/: (51, "SSL: no al
 		* www1.upo.es
 		* www.bioinfocabd.upo.es
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/UpsideOut.com.xml b/src/chrome/content/rules/UpsideOut.com.xml
deleted file mode 100644
index 43ddf6f1347a..000000000000
--- a/src/chrome/content/rules/UpsideOut.com.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Upstart.xml b/src/chrome/content/rules/Upstart.xml
deleted file mode 100644
index 505626e01bb3..000000000000
--- a/src/chrome/content/rules/Upstart.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Uptilo.xml b/src/chrome/content/rules/Uptilo.xml
index 7dc74715c1a4..7a15785293eb 100644
--- a/src/chrome/content/rules/Uptilo.xml
+++ b/src/chrome/content/rules/Uptilo.xml
@@ -9,16 +9,17 @@
 
 
 	
-	
+	
+	
+	
 
 
-	
+	
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Upxth.com.xml b/src/chrome/content/rules/Upxth.com.xml
index cc8f87bd0ab3..a06716e32353 100644
--- a/src/chrome/content/rules/Upxth.com.xml
+++ b/src/chrome/content/rules/Upxth.com.xml
@@ -15,7 +15,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Ur.se.xml b/src/chrome/content/rules/Ur.se.xml
new file mode 100644
index 000000000000..0c19ef52445c
--- /dev/null
+++ b/src/chrome/content/rules/Ur.se.xml
@@ -0,0 +1,64 @@
+
+
+
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Uralfd.ru.xml b/src/chrome/content/rules/Uralfd.ru.xml
deleted file mode 100644
index 6d5a0e4ab9bb..000000000000
--- a/src/chrome/content/rules/Uralfd.ru.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Urban-Media.xml b/src/chrome/content/rules/Urban-Media.xml
index ffc8f1804304..1ddc3c0acd89 100644
--- a/src/chrome/content/rules/Urban-Media.xml
+++ b/src/chrome/content/rules/Urban-Media.xml
@@ -39,7 +39,7 @@
 
 	
- 
+
 
 
 
diff --git a/src/chrome/content/rules/Urban_Villa.nl.xml b/src/chrome/content/rules/Urban_Villa.nl.xml
index 9156aab88a1c..2f67cba75e05 100644
--- a/src/chrome/content/rules/Urban_Villa.nl.xml
+++ b/src/chrome/content/rules/Urban_Villa.nl.xml
@@ -5,7 +5,7 @@ Fetch error: http://urbanvilla.nl/ => https://urbanvilla.nl/: (60, 'SSL certific
 Fetch error: http://www.urbanvilla.nl/ => https://www.urbanvilla.nl/: (60, 'SSL certificate problem: self signed certificate')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Urbanartcloud.com.xml b/src/chrome/content/rules/Urbanartcloud.com.xml
deleted file mode 100644
index 01d28c175485..000000000000
--- a/src/chrome/content/rules/Urbanartcloud.com.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/chrome/content/rules/UrlTrends.xml b/src/chrome/content/rules/UrlTrends.xml
index 2a1b19abebf3..82adfcffb673 100644
--- a/src/chrome/content/rules/UrlTrends.xml
+++ b/src/chrome/content/rules/UrlTrends.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Urospace.xml b/src/chrome/content/rules/Urospace.xml
index 86d1117a6dbb..bf6b62729e9b 100644
--- a/src/chrome/content/rules/Urospace.xml
+++ b/src/chrome/content/rules/Urospace.xml
@@ -17,7 +17,7 @@ Fetch error: http://www.urospace.de/ => https://urospace.de/: (60, 'SSL certific
 		- www.urospace.de	(cert only matches ^urospace.de)
 
 -->
-
+
 
 	
 	
@@ -33,4 +33,4 @@ Fetch error: http://www.urospace.de/ => https://urospace.de/: (60, 'SSL certific
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Us-cert.gov.xml b/src/chrome/content/rules/Us-cert.gov.xml
index 9b4b9696f818..93915c736fa0 100644
--- a/src/chrome/content/rules/Us-cert.gov.xml
+++ b/src/chrome/content/rules/Us-cert.gov.xml
@@ -5,7 +5,7 @@ Fetch error: http://preview.buildsecurityin.us-cert.gov/ => https://preview.buil
 
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Us.es.xml b/src/chrome/content/rules/Us.es.xml
index 622df9487eca..bfa4a290fd49 100644
--- a/src/chrome/content/rules/Us.es.xml
+++ b/src/chrome/content/rules/Us.es.xml
@@ -95,7 +95,7 @@ Fetch error: http://www.lsi.us.es/ => https://www.lsi.us.es/: (60, 'SSL certific
 		* www.sav.us.es
 		* www.us.es
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Us_Weekly_subscriptions.com.xml b/src/chrome/content/rules/Us_Weekly_subscriptions.com.xml
deleted file mode 100644
index 89911ac4eaf2..000000000000
--- a/src/chrome/content/rules/Us_Weekly_subscriptions.com.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Uschovna.cz.xml b/src/chrome/content/rules/Uschovna.cz.xml
new file mode 100644
index 000000000000..198f62d259c4
--- /dev/null
+++ b/src/chrome/content/rules/Uschovna.cz.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Use-Enco.com.xml b/src/chrome/content/rules/Use-Enco.com.xml
index d90fa52fa8dd..c4385021501c 100644
--- a/src/chrome/content/rules/Use-Enco.com.xml
+++ b/src/chrome/content/rules/Use-Enco.com.xml
@@ -8,10 +8,10 @@ Fetch error: http://use-enco.com/ => https://www.use-enco.com/: (28, 'Connection
 	Cert only matches www.
 
 -->
-
+
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/UsenetServer.xml b/src/chrome/content/rules/UsenetServer.xml
index 70694a6e5a36..295e957d92fa 100644
--- a/src/chrome/content/rules/UsenetServer.xml
+++ b/src/chrome/content/rules/UsenetServer.xml
@@ -1,13 +1,14 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/UserScape.xml b/src/chrome/content/rules/UserScape.xml
index a317c7acf99a..4b7773b99866 100644
--- a/src/chrome/content/rules/UserScape.xml
+++ b/src/chrome/content/rules/UserScape.xml
@@ -14,7 +14,7 @@ Fetch error: http://drop.userscape.com/ => https://www.userscape.com/: Too many
 	¹: Serves 404s on all requests
 	²: Mismatch
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Userfox.xml b/src/chrome/content/rules/Userfox.xml
index 54124229cd5b..ac799a210a66 100644
--- a/src/chrome/content/rules/Userfox.xml
+++ b/src/chrome/content/rules/Userfox.xml
@@ -34,10 +34,13 @@ Fetch error: http://userfox.com/ => https://www.userfox.com/: (6, 'Could not res
 		- static	(→ d2y71mjhnajxcg.cloudfront.net)
 
 -->
-
+
 
 	
-	
+	
+	
+	
+	
 
 
 	
-
+
 
 	
diff --git a/src/chrome/content/rules/Userscontent.net.xml b/src/chrome/content/rules/Userscontent.net.xml
index 031c8beb014c..037d2cd0609f 100644
--- a/src/chrome/content/rules/Userscontent.net.xml
+++ b/src/chrome/content/rules/Userscontent.net.xml
@@ -5,7 +5,7 @@ Fetch error: http://cdn-eu-i1.userscontent.net/thumbs/662/662020/153_m.jpg => ht
 Fetch error: http://cdn-eu-i1.userscontent.net/ => https://cdn-eu-i1.userscontent.net/: (60, 'SSL certificate problem: self signed certificate')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Uservoice.xml b/src/chrome/content/rules/Uservoice.xml
index 2da33bec7252..6838f86ed208 100644
--- a/src/chrome/content/rules/Uservoice.xml
+++ b/src/chrome/content/rules/Uservoice.xml
@@ -36,7 +36,6 @@
 
 	
 
-	
 	
 	
 	
diff --git a/src/chrome/content/rules/Usesthis.com.xml b/src/chrome/content/rules/Usesthis.com.xml
index 28045454c8ad..41e618d21c88 100644
--- a/src/chrome/content/rules/Usesthis.com.xml
+++ b/src/chrome/content/rules/Usesthis.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.usesthis.com/ => https://www.usesthis.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.usesthis.com'")
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Ushahidi.com.xml b/src/chrome/content/rules/Ushahidi.com.xml
deleted file mode 100644
index 7a74281975dc..000000000000
--- a/src/chrome/content/rules/Ushahidi.com.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/UsrJoy.xml b/src/chrome/content/rules/UsrJoy.xml
deleted file mode 100644
index b8f478a90be4..000000000000
--- a/src/chrome/content/rules/UsrJoy.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-  
-  
-
-  
-
-  
-
diff --git a/src/chrome/content/rules/Utah-Education-Network.xml b/src/chrome/content/rules/Utah-Education-Network.xml
index 944e2ff3f45e..122da7f6ea16 100644
--- a/src/chrome/content/rules/Utah-Education-Network.xml
+++ b/src/chrome/content/rules/Utah-Education-Network.xml
@@ -12,7 +12,7 @@ Fetch error: http://uen.org/ => https://www.eun.org/: (28, 'Connection timed out
 		- uen.org/^(css|images)+/.+
 		- pioneer.uen.org
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Uv.es.xml b/src/chrome/content/rules/Uv.es.xml
index b72b0f1da6c7..85d92d402745 100644
--- a/src/chrome/content/rules/Uv.es.xml
+++ b/src/chrome/content/rules/Uv.es.xml
@@ -8,7 +8,7 @@ Fetch error: http://tresor.uv.es/ => https://tresor.uv.es/: (6, 'Could not resol
 	See .
 
 	Not supporting HTTPS or using an invalid certificate:
-	
+
 		* acceso.uv.es
 		* anglogermanica.uv.es
 		* aposta.uv.es
@@ -73,7 +73,7 @@ Fetch error: http://tresor.uv.es/ => https://tresor.uv.es/: (6, 'Could not resol
 		* uvx.uv.es
 		* webific.ific.uv.es
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Uvnc.com.xml b/src/chrome/content/rules/Uvnc.com.xml
new file mode 100644
index 000000000000..030d63cd4fa8
--- /dev/null
+++ b/src/chrome/content/rules/Uvnc.com.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/V-identity.com.xml b/src/chrome/content/rules/V-identity.com.xml
index d56af7bc5d52..7bc4db531052 100644
--- a/src/chrome/content/rules/V-identity.com.xml
+++ b/src/chrome/content/rules/V-identity.com.xml
@@ -8,16 +8,16 @@ Fetch error: http://v-identity.com/ => https://www.v-identity.com/: (6, 'Could n
 		- ^	(404)
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/V2-Cigs.xml b/src/chrome/content/rules/V2-Cigs.xml
deleted file mode 100644
index 4d251202839e..000000000000
--- a/src/chrome/content/rules/V2-Cigs.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/V3.co.uk.xml b/src/chrome/content/rules/V3.co.uk.xml
index 2c80d2f32d59..a7d9c2633fa1 100644
--- a/src/chrome/content/rules/V3.co.uk.xml
+++ b/src/chrome/content/rules/V3.co.uk.xml
@@ -18,4 +18,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/VA_Loan_Captain.xml b/src/chrome/content/rules/VA_Loan_Captain.xml
index dc88af7a2a3c..6e794fef4081 100644
--- a/src/chrome/content/rules/VA_Loan_Captain.xml
+++ b/src/chrome/content/rules/VA_Loan_Captain.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/VBSEO.xml b/src/chrome/content/rules/VBSEO.xml
index fd7ae3353d15..13fff2e23368 100644
--- a/src/chrome/content/rules/VBSEO.xml
+++ b/src/chrome/content/rules/VBSEO.xml
@@ -20,4 +20,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/VB_static.co.xml b/src/chrome/content/rules/VB_static.co.xml
index afa38346cc64..9b8eeaed6f8e 100644
--- a/src/chrome/content/rules/VB_static.co.xml
+++ b/src/chrome/content/rules/VB_static.co.xml
@@ -9,7 +9,7 @@ Fetch error: http://curate.vbstatic.co/ => https://curate.vbstatic.co/: (60, 'SS
 	www.vbstatic.co doesn't exist.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/VBulletin.xml b/src/chrome/content/rules/VBulletin.xml
index b8f1ae37677a..1ed56cd29287 100644
--- a/src/chrome/content/rules/VBulletin.xml
+++ b/src/chrome/content/rules/VBulletin.xml
@@ -6,7 +6,7 @@
 	
 
 
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/VC-Server.xml b/src/chrome/content/rules/VC-Server.xml
index 0573e729e9f7..d821d4058ca8 100644
--- a/src/chrome/content/rules/VC-Server.xml
+++ b/src/chrome/content/rules/VC-Server.xml
@@ -10,7 +10,7 @@
 	
 	
 	
-	
+
 	
 	
 
diff --git a/src/chrome/content/rules/VCAB.com.xml b/src/chrome/content/rules/VCAB.com.xml
index c34ee9399afd..9dadf63f34fb 100644
--- a/src/chrome/content/rules/VCAB.com.xml
+++ b/src/chrome/content/rules/VCAB.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://secure.vcab.com/ => https://secure.vcab.com/: (60, 'SSL cert
 	* Works; mismatched, CN: secure.vcab.com
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/VCD.org.xml b/src/chrome/content/rules/VCD.org.xml
index bd7c4a5aa17d..29676b5d52f0 100644
--- a/src/chrome/content/rules/VCD.org.xml
+++ b/src/chrome/content/rules/VCD.org.xml
@@ -14,10 +14,10 @@ Fetch error: http://bildungsservice.vcd.org/ => https://bildungsservice.vcd.org/
   ¹: Redirects to www.vcd.org
   ²: Mismatch
 -->
-
+
   
   
-  	
+  
   
   
   
diff --git a/src/chrome/content/rules/VCE.com.xml b/src/chrome/content/rules/VCE.com.xml
index 5ac16de6badb..7b65aa0ee2be 100644
--- a/src/chrome/content/rules/VCE.com.xml
+++ b/src/chrome/content/rules/VCE.com.xml
@@ -24,4 +24,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/VClock.com.xml b/src/chrome/content/rules/VClock.com.xml
new file mode 100644
index 000000000000..e822547af189
--- /dev/null
+++ b/src/chrome/content/rules/VClock.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/VE7SCC.org.xml b/src/chrome/content/rules/VE7SCC.org.xml
new file mode 100644
index 000000000000..918005765d36
--- /dev/null
+++ b/src/chrome/content/rules/VE7SCC.org.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/VEVO.xml b/src/chrome/content/rules/VEVO.xml
index bbe1df6a6954..195b255a901d 100644
--- a/src/chrome/content/rules/VEVO.xml
+++ b/src/chrome/content/rules/VEVO.xml
@@ -34,27 +34,11 @@
 	
 	
 	
-
+		
 	
 
 	
 
-	
-	
-
-		
-		
-		
-
-	
-	
-
-		
-		
-		
-
 	
 
diff --git a/src/chrome/content/rules/VGO_Com.com.xml b/src/chrome/content/rules/VGO_Com.com.xml
deleted file mode 100644
index cae09a9aac39..000000000000
--- a/src/chrome/content/rules/VGO_Com.com.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-		
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/VIM-Adventures.com.xml b/src/chrome/content/rules/VIM-Adventures.com.xml
new file mode 100644
index 000000000000..407aa6ded6bf
--- /dev/null
+++ b/src/chrome/content/rules/VIM-Adventures.com.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/VIOFO.com.xml b/src/chrome/content/rules/VIOFO.com.xml
new file mode 100644
index 000000000000..76f55bcfa07a
--- /dev/null
+++ b/src/chrome/content/rules/VIOFO.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/VIP.de.xml b/src/chrome/content/rules/VIP.de.xml
deleted file mode 100644
index f26a60a6e637..000000000000
--- a/src/chrome/content/rules/VIP.de.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/VIPLeague.cc.xml b/src/chrome/content/rules/VIPLeague.cc.xml
new file mode 100644
index 000000000000..3b6c6a402bfc
--- /dev/null
+++ b/src/chrome/content/rules/VIPLeague.cc.xml
@@ -0,0 +1,14 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/VIRURL.xml b/src/chrome/content/rules/VIRURL.xml
index f18be618cda4..62b91909c0b0 100644
--- a/src/chrome/content/rules/VIRURL.xml
+++ b/src/chrome/content/rules/VIRURL.xml
@@ -8,7 +8,7 @@ Fetch error: http://www.virurl.com/ => https://www.virurl.com/: (6, 'Could not r
 Automatically by https-everywhere-checker because:
 Fetch error: http://spn.sr/ => https://spn.sr/: (6, 'Could not resolve host: revv.nu')
 -->
-
+
 
 	
 	
@@ -21,4 +21,4 @@ Fetch error: http://spn.sr/ => https://spn.sr/: (6, 'Could not resolve host: rev
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/VIVE.com.xml b/src/chrome/content/rules/VIVE.com.xml
new file mode 100644
index 000000000000..621cd4c84796
--- /dev/null
+++ b/src/chrome/content/rules/VIVE.com.xml
@@ -0,0 +1,42 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/VK.se.xml b/src/chrome/content/rules/VK.se.xml
index b77bd740b434..bee3ab532a6c 100644
--- a/src/chrome/content/rules/VK.se.xml
+++ b/src/chrome/content/rules/VK.se.xml
@@ -27,16 +27,16 @@
 -->
 
 
-	
+	
+	
 
 
 	
 
 
-	
 
 	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/VMware.xml b/src/chrome/content/rules/VMware.xml
index 4a8347658528..b75777aa0538 100644
--- a/src/chrome/content/rules/VMware.xml
+++ b/src/chrome/content/rules/VMware.xml
@@ -1,7 +1,6 @@
 
-
-
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-	
-
-		
-
-	
-
-
diff --git a/src/chrome/content/rules/VOA_Chinese.com.xml b/src/chrome/content/rules/VOA_Chinese.com.xml
index cfaacdfeab22..d1d663521f84 100644
--- a/src/chrome/content/rules/VOA_Chinese.com.xml
+++ b/src/chrome/content/rules/VOA_Chinese.com.xml
@@ -1,12 +1,7 @@
-
 
 	
 	
 	
 
-	
+	
 
diff --git a/src/chrome/content/rules/VPAC.org.xml b/src/chrome/content/rules/VPAC.org.xml
index 57463b0486b3..9873fb553ead 100644
--- a/src/chrome/content/rules/VPAC.org.xml
+++ b/src/chrome/content/rules/VPAC.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://vpac.org/ => https://vpac.org/: (28, 'Connection timed out a
 Fetch error: http://www.vpac.org/ => https://www.vpac.org/: (7, 'Failed to connect to www.vpac.org port 443: Connection refused')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/VPN4ALL.xml b/src/chrome/content/rules/VPN4ALL.xml
index e6ee760edb0f..2c528f414310 100644
--- a/src/chrome/content/rules/VPN4ALL.xml
+++ b/src/chrome/content/rules/VPN4ALL.xml
@@ -5,7 +5,7 @@ Fetch error: http://vpn4all.com/ => https://vpn4all.com/: (60, 'SSL certificate
 Fetch error: http://www.vpn4all.com/ => https://www.vpn4all.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/VPNGate.net.xml b/src/chrome/content/rules/VPNGate.net.xml
new file mode 100644
index 000000000000..92286065cac8
--- /dev/null
+++ b/src/chrome/content/rules/VPNGate.net.xml
@@ -0,0 +1,39 @@
+
+
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/VPNGlobe.com.xml b/src/chrome/content/rules/VPNGlobe.com.xml
index 010590111bc6..9bfc7f312bd0 100644
--- a/src/chrome/content/rules/VPNGlobe.com.xml
+++ b/src/chrome/content/rules/VPNGlobe.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://my.vpnglobe.com/ => https://my.vpnglobe.com/: Too many redirects while fetching 'https://my.vpnglobe.com/'
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/VPNOverDNS.com.xml b/src/chrome/content/rules/VPNOverDNS.com.xml
new file mode 100644
index 000000000000..3109fac5ba0a
--- /dev/null
+++ b/src/chrome/content/rules/VPNOverDNS.com.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/VPNReactor.xml b/src/chrome/content/rules/VPNReactor.xml
index 51770ce669fc..7e25bdb557e6 100644
--- a/src/chrome/content/rules/VPNReactor.xml
+++ b/src/chrome/content/rules/VPNReactor.xml
@@ -4,7 +4,7 @@
 	
 	
 
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/VPN_Reviewer.com.xml b/src/chrome/content/rules/VPN_Reviewer.com.xml
index 3af606984a14..c5ce580d89cb 100644
--- a/src/chrome/content/rules/VPN_Reviewer.com.xml
+++ b/src/chrome/content/rules/VPN_Reviewer.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.vpnreviewer.com/ => https://www.vpnreviewer.com/: (52, 'Empty reply from server')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/VPS.net-problematic.xml b/src/chrome/content/rules/VPS.net-problematic.xml
index 82b31992359d..531ea96c573e 100644
--- a/src/chrome/content/rules/VPS.net-problematic.xml
+++ b/src/chrome/content/rules/VPS.net-problematic.xml
@@ -2,7 +2,7 @@
 	For rules that are on by default, see VPS.net.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/VSCo.co.xml b/src/chrome/content/rules/VSCo.co.xml
index 094a5ee6df26..b0a66884cead 100644
--- a/src/chrome/content/rules/VSCo.co.xml
+++ b/src/chrome/content/rules/VSCo.co.xml
@@ -47,4 +47,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/VSHosting.xml b/src/chrome/content/rules/VSHosting.xml
index a6ef8360b229..709112fa919f 100644
--- a/src/chrome/content/rules/VSHosting.xml
+++ b/src/chrome/content/rules/VSHosting.xml
@@ -9,6 +9,6 @@
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/VSIP_Program.com.xml b/src/chrome/content/rules/VSIP_Program.com.xml
deleted file mode 100644
index 61a0256b26cf..000000000000
--- a/src/chrome/content/rules/VSIP_Program.com.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/VSIXGallery.com.xml b/src/chrome/content/rules/VSIXGallery.com.xml
new file mode 100644
index 000000000000..24a47c9da1e7
--- /dev/null
+++ b/src/chrome/content/rules/VSIXGallery.com.xml
@@ -0,0 +1,7 @@
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/VTB.com.xml b/src/chrome/content/rules/VTB.com.xml
index c9ba2bd03df8..aaf0155bcd5d 100644
--- a/src/chrome/content/rules/VTB.com.xml
+++ b/src/chrome/content/rules/VTB.com.xml
@@ -34,7 +34,7 @@
 	
 	
 
-	
+	
 
 
 	 https://vtcsec.ru/: (6, 'Could not resolve hos
 	www: mismatched, CN: wargame.vtcsec.ru
 
 -->
-
+
 
 	
-	
+	
 
 
 	
 
 	
-	
+	
+	
 
 
 	 https://www.vtunnel.com/: (7, 'Failed to
 	* Secured by us
 
 -->
-
+
 
 	
 	
 
 
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/VU.nl.xml b/src/chrome/content/rules/VU.nl.xml
index 2169f36d0097..62519c658c74 100644
--- a/src/chrome/content/rules/VU.nl.xml
+++ b/src/chrome/content/rules/VU.nl.xml
@@ -37,7 +37,7 @@ Fetch error: http://fbw.vu.nl/ => https://www.fbw.vu.nl/: (51, "SSL: no alternat
 	ᵐ Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/VUTBr.cz.xml b/src/chrome/content/rules/VUTBr.cz.xml
index 4340f8a135b1..608de7d342bc 100644
--- a/src/chrome/content/rules/VUTBr.cz.xml
+++ b/src/chrome/content/rules/VUTBr.cz.xml
@@ -72,7 +72,7 @@ Fetch error: http://wiki.ro.vutbr.cz/ => https://wiki.ro.vutbr.cz/: (60, 'SSL ce
 		- knihovna.fme	Untrusted root
 		- www.tst.fme	Untrusted root
 
-		- best.kn	Expired, mixed css, mismatched, self-signed	
+		- best.kn	Expired, mixed css, mismatched, self-signed
 		- aleph.lib	Mixed css
 		- lists		Mismatched, untrusted root
 		- www.lli	Expired
@@ -150,7 +150,7 @@ Fetch error: http://wiki.ro.vutbr.cz/ => https://wiki.ro.vutbr.cz/: (60, 'SSL ce
 		- Bug on www.feec from c1.navrcholu.cz	Unsecurable <= refused
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/VacationRoost.xml b/src/chrome/content/rules/VacationRoost.xml
index d968ab014cc5..4a382e498598 100644
--- a/src/chrome/content/rules/VacationRoost.xml
+++ b/src/chrome/content/rules/VacationRoost.xml
@@ -4,11 +4,11 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://ajax.vacationroost.com/ => https://ajax.vacationroost.com/: (6, 'Could not resolve host: ajax.vacationroost.com')
 
 -->
-
+
 
 	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Vacenza.com.xml b/src/chrome/content/rules/Vacenza.com.xml
deleted file mode 100644
index 116bb82b1214..000000000000
--- a/src/chrome/content/rules/Vacenza.com.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/ValerieAurora.org.xml b/src/chrome/content/rules/ValerieAurora.org.xml
new file mode 100644
index 000000000000..a145ee0b9623
--- /dev/null
+++ b/src/chrome/content/rules/ValerieAurora.org.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ValidCreditCardNumber.com.xml b/src/chrome/content/rules/ValidCreditCardNumber.com.xml
new file mode 100644
index 000000000000..6f0642a41d2a
--- /dev/null
+++ b/src/chrome/content/rules/ValidCreditCardNumber.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Valley-First-Credit-Union.xml b/src/chrome/content/rules/Valley-First-Credit-Union.xml
index 124c069ecb21..f0954d4c7373 100644
--- a/src/chrome/content/rules/Valley-First-Credit-Union.xml
+++ b/src/chrome/content/rules/Valley-First-Credit-Union.xml
@@ -7,7 +7,7 @@ Fetch error: http://insurance.valleyfirst.com/ => https://insurance.valleyfirst.
 		- dashband.valleyfirst.com
 -->
 
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Valley_First_CU.org.xml b/src/chrome/content/rules/Valley_First_CU.org.xml
index 77d29759616f..a8eea0b0827a 100644
--- a/src/chrome/content/rules/Valley_First_CU.org.xml
+++ b/src/chrome/content/rules/Valley_First_CU.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://hb.valleyfirstcu.org/ => https://hb.valleyfirstcu.org/: (28, 'Connection timed out after 20004 milliseconds')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Valtiolle.fi-problematic.xml b/src/chrome/content/rules/Valtiolle.fi-problematic.xml
index 84d2c4a9e4c2..08e75f928535 100644
--- a/src/chrome/content/rules/Valtiolle.fi-problematic.xml
+++ b/src/chrome/content/rules/Valtiolle.fi-problematic.xml
@@ -1,8 +1,8 @@
 
-
+
 
 	
diff --git a/src/chrome/content/rules/Valtiolle.fi.xml b/src/chrome/content/rules/Valtiolle.fi.xml
index 558ff59ac66a..d1276fa5c02b 100644
--- a/src/chrome/content/rules/Valtiolle.fi.xml
+++ b/src/chrome/content/rules/Valtiolle.fi.xml
@@ -15,7 +15,7 @@
 
 		- valtiolle.fi
 		- www.valtiolle.fi
-	
+
 -->
 
 
diff --git a/src/chrome/content/rules/Valtion-taloudellinen-tutkimuskeskus.xml b/src/chrome/content/rules/Valtion-taloudellinen-tutkimuskeskus.xml
index 14ed6c4bbb8a..92bdaadb9499 100644
--- a/src/chrome/content/rules/Valtion-taloudellinen-tutkimuskeskus.xml
+++ b/src/chrome/content/rules/Valtion-taloudellinen-tutkimuskeskus.xml
@@ -5,7 +5,7 @@ Fetch error: http://vatt.fi/ => https://vatt.fi/: (28, 'Connection timed out aft
 Fetch error: http://www.vatt.fi/ => https://www.vatt.fi/: (28, 'Connection timed out after 20000 milliseconds')
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Value-Applications.xml b/src/chrome/content/rules/Value-Applications.xml
index 5a5d1df34ad6..b67f93216e93 100644
--- a/src/chrome/content/rules/Value-Applications.xml
+++ b/src/chrome/content/rules/Value-Applications.xml
@@ -5,13 +5,13 @@ Fetch error: http://valueapplications.com/ => https://www.valueapplications.com/
 Fetch error: http://www.valueapplications.com/ => https://www.valueapplications.com/: (28, 'Connection timed out after 20000 milliseconds')
 
 -->
-
+
 
 	
 	
 
 
-	
+	
 
 
 	
 	
-	
+	
 	
-	
+	
 	
-	
+	
 	
 	
 
@@ -24,10 +24,7 @@
 	
 
-	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/ValueClick.xml b/src/chrome/content/rules/ValueClick.xml
index d757844f70d6..a949ab649289 100644
--- a/src/chrome/content/rules/ValueClick.xml
+++ b/src/chrome/content/rules/ValueClick.xml
@@ -52,7 +52,7 @@ Non-2xx HTTP code: http://valueclickmedia.com/ (200) => https://www.valueclickme
 	** Akamai
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Valued_Opinions.xml b/src/chrome/content/rules/Valued_Opinions.xml
deleted file mode 100644
index 1e3904260068..000000000000
--- a/src/chrome/content/rules/Valued_Opinions.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Valve-mismatches.xml b/src/chrome/content/rules/Valve-mismatches.xml
deleted file mode 100644
index 24e035ac3123..000000000000
--- a/src/chrome/content/rules/Valve-mismatches.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/ValveSoftware.com.xml b/src/chrome/content/rules/ValveSoftware.com.xml
index 093d5114f339..bf65fee57cba 100644
--- a/src/chrome/content/rules/ValveSoftware.com.xml
+++ b/src/chrome/content/rules/ValveSoftware.com.xml
@@ -2,9 +2,6 @@
 	Other Valve rulesets:
 		+ Dota_2.com.xml
 		+ Steam.xml
-		+ Steam_Community.com.xml
-		+ Steam_static.com.xml
-		+ Steamgames.com.xml
 
 	Redirect to HTTP:
 		- ^
diff --git a/src/chrome/content/rules/Vanco-Asiapac.com.xml b/src/chrome/content/rules/Vanco-Asiapac.com.xml
index 38019accf794..adaef4d43223 100644
--- a/src/chrome/content/rules/Vanco-Asiapac.com.xml
+++ b/src/chrome/content/rules/Vanco-Asiapac.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://o-zone.vanco-asiapac.com/ => https://o-zone.vanco-asiapac.co
 	(www.): broken redirect
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Vanco.co.uk.xml b/src/chrome/content/rules/Vanco.co.uk.xml
deleted file mode 100644
index cfcc02f7eb42..000000000000
--- a/src/chrome/content/rules/Vanco.co.uk.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/VancouverInternationalAutoShow.com.xml b/src/chrome/content/rules/VancouverInternationalAutoShow.com.xml
new file mode 100644
index 000000000000..6adfa36c787d
--- /dev/null
+++ b/src/chrome/content/rules/VancouverInternationalAutoShow.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Vanderbilt.org.xml b/src/chrome/content/rules/Vanderbilt.org.xml
index 6a2d5465a79d..3c7ddd079f96 100644
--- a/src/chrome/content/rules/Vanderbilt.org.xml
+++ b/src/chrome/content/rules/Vanderbilt.org.xml
@@ -3,7 +3,7 @@
 Disabled by https-everywhere-checker because:
 Fetch error: http://sitemason.vanderbilt.edu/ => https://sitemason.vanderbilt.edu/: (7, 'Failed to connect to sitemason.vanderbilt.edu port 443: No route to host')
  see Vanderbilt.org-falsemixed.xml for other rules -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Vanilla-Forums.xml b/src/chrome/content/rules/Vanilla-Forums.xml
deleted file mode 100644
index 523f2b783a16..000000000000
--- a/src/chrome/content/rules/Vanilla-Forums.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-	
-	
-		
-		
-	
-	
-
-
-	
-
-	
-	
-
-	
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/VanillaMastercard.com.xml b/src/chrome/content/rules/VanillaMastercard.com.xml
deleted file mode 100644
index ad82187a6069..000000000000
--- a/src/chrome/content/rules/VanillaMastercard.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Vanity-Fair.xml b/src/chrome/content/rules/Vanity-Fair.xml
index 9d117046cd17..b321755475f7 100644
--- a/src/chrome/content/rules/Vanity-Fair.xml
+++ b/src/chrome/content/rules/Vanity-Fair.xml
@@ -1,30 +1,20 @@
 
 
 
-	
-
-
-	
-
-
-	
+	
+	
+	
 
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/Vara.nl.xml b/src/chrome/content/rules/Vara.nl.xml
index d73bd042b588..f56b3c7a8096 100644
--- a/src/chrome/content/rules/Vara.nl.xml
+++ b/src/chrome/content/rules/Vara.nl.xml
@@ -47,7 +47,13 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
+	
+	
 		
@@ -70,7 +76,6 @@
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Variety.xml b/src/chrome/content/rules/Variety.xml
index 5d7813ce27da..aff3f4f8d03a 100644
--- a/src/chrome/content/rules/Variety.xml
+++ b/src/chrome/content/rules/Variety.xml
@@ -27,7 +27,7 @@ Fetch error: http://haas.variety.com/ => https://haas.reedbusiness.nl/: (28, 'Co
 	² Expired
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Variety_Latino.com.xml b/src/chrome/content/rules/Variety_Latino.com.xml
deleted file mode 100644
index 83c9b45c0479..000000000000
--- a/src/chrome/content/rules/Variety_Latino.com.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Variomedia.de.xml b/src/chrome/content/rules/Variomedia.de.xml
deleted file mode 100644
index 8d88bbcc1784..000000000000
--- a/src/chrome/content/rules/Variomedia.de.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Vast.xml b/src/chrome/content/rules/Vast.xml
index 8c93c981f814..d20ecb8a9d42 100644
--- a/src/chrome/content/rules/Vast.xml
+++ b/src/chrome/content/rules/Vast.xml
@@ -6,20 +6,20 @@ Fetch error: http://www.staticv.net/ => https://www.vast.com/: (51, "SSL: no alt
 Fetch error: http://vast.com/ => https://www.vast.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.vast.com'")
 
 -->
-
+
 
 	
 	
 	
 	
-	
+	
+	
 
 	
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Vast_Interactive.xml b/src/chrome/content/rules/Vast_Interactive.xml
index 9a7fedfc5941..841272d433e0 100644
--- a/src/chrome/content/rules/Vast_Interactive.xml
+++ b/src/chrome/content/rules/Vast_Interactive.xml
@@ -13,7 +13,7 @@ Fetch error: http://dsply.com/ => https://dsply.com/: (51, "SSL: no alternative
 		- www.dsply.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Vaultize.com.xml b/src/chrome/content/rules/Vaultize.com.xml
new file mode 100644
index 000000000000..d1a364196daa
--- /dev/null
+++ b/src/chrome/content/rules/Vaultize.com.xml
@@ -0,0 +1,53 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Vayabe.com.xml b/src/chrome/content/rules/Vayabe.com.xml
index 567592f26853..e670d362b362 100644
--- a/src/chrome/content/rules/Vayabe.com.xml
+++ b/src/chrome/content/rules/Vayabe.com.xml
@@ -21,4 +21,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Vc.ru.xml b/src/chrome/content/rules/Vc.ru.xml
index 6919a475e907..b4a39c638970 100644
--- a/src/chrome/content/rules/Vc.ru.xml
+++ b/src/chrome/content/rules/Vc.ru.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.vc.ru/ => https://www.vc.ru/: (51, "SSL: no alternative certificate subject name matches target host name 'www.vc.ru'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Vcommerce.com.xml b/src/chrome/content/rules/Vcommerce.com.xml
new file mode 100644
index 000000000000..b173c4997062
--- /dev/null
+++ b/src/chrome/content/rules/Vcommerce.com.xml
@@ -0,0 +1,27 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Vcommerce.xml b/src/chrome/content/rules/Vcommerce.xml
deleted file mode 100644
index bd788a0c7e35..000000000000
--- a/src/chrome/content/rules/Vcommerce.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Vdio.xml b/src/chrome/content/rules/Vdio.xml
index 1fe5a0c1bb5a..e42840275e0c 100644
--- a/src/chrome/content/rules/Vdio.xml
+++ b/src/chrome/content/rules/Vdio.xml
@@ -16,7 +16,7 @@ Fetch error: http://www.vdio.com/ => https://www.rdio.com/: (7, 'Failed to conne
 	(www.)?vdio.com: Refused
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Vdopia.xml b/src/chrome/content/rules/Vdopia.xml
index 7ce29b5a93b8..ce9f9187c800 100644
--- a/src/chrome/content/rules/Vdopia.xml
+++ b/src/chrome/content/rules/Vdopia.xml
@@ -43,12 +43,19 @@ Fetch error: http://mobile.sb.vdopia.com/ => https://mobile.sb.vdopia.com/: (28,
 	* Seems identical to www
 
 -->
-
+
 
 	
 	
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
 		
 
 
diff --git a/src/chrome/content/rules/Vdoth.com.xml b/src/chrome/content/rules/Vdoth.com.xml
index 63b4194f029e..ff60fa1646fa 100644
--- a/src/chrome/content/rules/Vdoth.com.xml
+++ b/src/chrome/content/rules/Vdoth.com.xml
@@ -25,7 +25,7 @@ Fetch error: http://www.clipth.net/ => https://www.vdoth.com/: (28, 'Connection
 	** Unsecurable
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Ve_Interactive.xml b/src/chrome/content/rules/Ve_Interactive.xml
index 747189bca8e4..39f5065b646e 100644
--- a/src/chrome/content/rules/Ve_Interactive.xml
+++ b/src/chrome/content/rules/Ve_Interactive.xml
@@ -21,13 +21,19 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Veber.co.uk.xml b/src/chrome/content/rules/Veber.co.uk.xml
index 590076973edf..dec7e52bd472 100644
--- a/src/chrome/content/rules/Veber.co.uk.xml
+++ b/src/chrome/content/rules/Veber.co.uk.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://blog.veber.co.uk/ => https://blog.veber.co.uk/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Veeseo.xml b/src/chrome/content/rules/Veeseo.xml
deleted file mode 100644
index 8006ba7d4108..000000000000
--- a/src/chrome/content/rules/Veeseo.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/VegasInc.com.xml b/src/chrome/content/rules/VegasInc.com.xml
index 8e39ea4d7a3f..6aea0e0e5057 100644
--- a/src/chrome/content/rules/VegasInc.com.xml
+++ b/src/chrome/content/rules/VegasInc.com.xml
@@ -10,7 +10,7 @@ Non-2xx HTTP code: http://www.vegasinc.com/ (200) => https://www.vegasinc.com/ (
 		Mixed content blocking (MCB) tiggered:
 			 - m.vegasinc.com
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Vegas_Partner_Lounge.xml b/src/chrome/content/rules/Vegas_Partner_Lounge.xml
index 1ec47fb2c8c5..e1422d5f3268 100644
--- a/src/chrome/content/rules/Vegas_Partner_Lounge.xml
+++ b/src/chrome/content/rules/Vegas_Partner_Lounge.xml
@@ -10,16 +10,17 @@ Non-2xx HTTP code: http://vegaspartnerlounge.com/ (200) => https://vegaspartnerl
 		- starpartner
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
-	
+	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Velaro.xml b/src/chrome/content/rules/Velaro.xml
index 80937b67574e..dd9090bf4b12 100644
--- a/src/chrome/content/rules/Velaro.xml
+++ b/src/chrome/content/rules/Velaro.xml
@@ -11,7 +11,7 @@
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Velleman-Group.xml b/src/chrome/content/rules/Velleman-Group.xml
index ed506a5a0910..c6df45b51b85 100644
--- a/src/chrome/content/rules/Velleman-Group.xml
+++ b/src/chrome/content/rules/Velleman-Group.xml
@@ -1,4 +1,14 @@
+
 
 
 	
-	
 
 	
 
 	
 
-	
-	
-
 	
 
 	
 
-	
-	
-	
-
-	
 	 
-	
-	
+	-->
 
 	
 	
@@ -72,17 +68,16 @@ Fetch error: http://perel.eu/ => https://www.perel.eu/: (6, 'Could not resolve h
 		gives an error about the SSL certificate only being valid for the portal.velleman.eu domain. As such,
 		this ruleset redirects such requests to the https://portal.velleman.eu/ServicePortal/ URL
 		(August 30, 2013.)
-	--> 
+	-->
 	
-	
 
-	
-	
+	
+	
 
 	
 
 	
+
 
diff --git a/src/chrome/content/rules/Velmedia.net.xml b/src/chrome/content/rules/Velmedia.net.xml
index 60bc519c6621..a54716bf052e 100644
--- a/src/chrome/content/rules/Velmedia.net.xml
+++ b/src/chrome/content/rules/Velmedia.net.xml
@@ -10,7 +10,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -19,4 +20,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/VelocityFrequentFlyer.com.xml b/src/chrome/content/rules/VelocityFrequentFlyer.com.xml
new file mode 100644
index 000000000000..2c590cb26459
--- /dev/null
+++ b/src/chrome/content/rules/VelocityFrequentFlyer.com.xml
@@ -0,0 +1,47 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Velox-Project.eu.xml b/src/chrome/content/rules/Velox-Project.eu.xml
deleted file mode 100644
index 577fac51ed3b..000000000000
--- a/src/chrome/content/rules/Velox-Project.eu.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Velvet_Cache.org.xml b/src/chrome/content/rules/Velvet_Cache.org.xml
index 9b42dafd032e..7170fe464a30 100644
--- a/src/chrome/content/rules/Velvet_Cache.org.xml
+++ b/src/chrome/content/rules/Velvet_Cache.org.xml
@@ -12,7 +12,6 @@
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Vendercom.xml b/src/chrome/content/rules/Vendercom.xml
index 54fb138b150c..d1c36a9f0317 100644
--- a/src/chrome/content/rules/Vendercom.xml
+++ b/src/chrome/content/rules/Vendercom.xml
@@ -13,4 +13,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Vendetta-Online.xml b/src/chrome/content/rules/Vendetta-Online.xml
index 19135b67a9f1..06db29e0655d 100644
--- a/src/chrome/content/rules/Vendetta-Online.xml
+++ b/src/chrome/content/rules/Vendetta-Online.xml
@@ -16,14 +16,14 @@
 
 
 	
-	
+	
+	
 
-	
+	
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/Vendo-Services.xml b/src/chrome/content/rules/Vendo-Services.xml
index e932f075f96a..1bc82307c487 100644
--- a/src/chrome/content/rules/Vendo-Services.xml
+++ b/src/chrome/content/rules/Vendo-Services.xml
@@ -12,7 +12,7 @@ Fetch error: http://cdn1.vendocdn.com/ => https://cdn1.vendocdn.com/: (51, "SSL:
 		- start.vendoservices.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Ventivmedia.com.xml b/src/chrome/content/rules/Ventivmedia.com.xml
index e092f07d9848..711ee4e28e58 100644
--- a/src/chrome/content/rules/Ventivmedia.com.xml
+++ b/src/chrome/content/rules/Ventivmedia.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://ads.ventivmedia.com/www/delivery/lg.php?bannerid=&campaignid
 Fetch error: http://ads.ventivmedia.com/ => https://ads.ventivmedia.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Verbling.com.xml b/src/chrome/content/rules/Verbling.com.xml
index 267df17a2076..c8da64305d61 100644
--- a/src/chrome/content/rules/Verbling.com.xml
+++ b/src/chrome/content/rules/Verbling.com.xml
@@ -31,7 +31,7 @@ Fetch error: http://pt.verbling.com/ => https://pt.verbling.com/: (6, 'Could not
 		- .www.verbling.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Verbraucher-Sicher-Online.xml b/src/chrome/content/rules/Verbraucher-Sicher-Online.xml
deleted file mode 100644
index 5d44b359664b..000000000000
--- a/src/chrome/content/rules/Verbraucher-Sicher-Online.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-    
-
-
diff --git a/src/chrome/content/rules/Verbraucherzentrale_Nordrhein-Westfalen.xml b/src/chrome/content/rules/Verbraucherzentrale_Nordrhein-Westfalen.xml
index ab175a9a1903..89701fac0906 100644
--- a/src/chrome/content/rules/Verbraucherzentrale_Nordrhein-Westfalen.xml
+++ b/src/chrome/content/rules/Verbraucherzentrale_Nordrhein-Westfalen.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.vz-nrw.de/ => https://www.vz-nrw.de/: (60, 'SSL certific
 	^meine-verbraucherzentrale.de doesn't exist.
 
 -->
-
+
 
 	
 	
@@ -22,4 +22,4 @@ Fetch error: http://www.vz-nrw.de/ => https://www.vz-nrw.de/: (60, 'SSL certific
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Verdad_Media.xml b/src/chrome/content/rules/Verdad_Media.xml
deleted file mode 100644
index b8aeab04b1ea..000000000000
--- a/src/chrome/content/rules/Verdad_Media.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Vereinigte-IKK.xml b/src/chrome/content/rules/Vereinigte-IKK.xml
index f1dfe890dcf8..5cf1259ccc15 100644
--- a/src/chrome/content/rules/Vereinigte-IKK.xml
+++ b/src/chrome/content/rules/Vereinigte-IKK.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.vereinigte-ikk.de/ => https://www.vereinigte-ikk.de/: (51, "SSL: no alternative certificate subject name matches target host name 'www.vereinigte-ikk.de'")
 Fetch error: http://vereinigte-ikk.de/ => https://www.vereinigte-ikk.de/: (51, "SSL: no alternative certificate subject name matches target host name 'www.vereinigte-ikk.de'")
 -->
-
+
 
 
 
diff --git a/src/chrome/content/rules/Verigames.com.xml b/src/chrome/content/rules/Verigames.com.xml
index 33a79441b336..5b40b5360f8b 100644
--- a/src/chrome/content/rules/Verigames.com.xml
+++ b/src/chrome/content/rules/Verigames.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://www.verigames.com/ => https://www.verigames.com/: (7, 'Faile
 	* Unsecurable
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Verisign-Inc.com.xml b/src/chrome/content/rules/Verisign-Inc.com.xml
new file mode 100644
index 000000000000..08c1597dd59c
--- /dev/null
+++ b/src/chrome/content/rules/Verisign-Inc.com.xml
@@ -0,0 +1,49 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Verisign-Labs.com.xml b/src/chrome/content/rules/Verisign-Labs.com.xml
new file mode 100644
index 000000000000..b90038939207
--- /dev/null
+++ b/src/chrome/content/rules/Verisign-Labs.com.xml
@@ -0,0 +1,58 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Verisign-grs.com.xml b/src/chrome/content/rules/Verisign-grs.com.xml
new file mode 100644
index 000000000000..c610d2d53065
--- /dev/null
+++ b/src/chrome/content/rules/Verisign-grs.com.xml
@@ -0,0 +1,131 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Verisign.com.au.xml b/src/chrome/content/rules/Verisign.com.au.xml
new file mode 100644
index 000000000000..e67807eece1f
--- /dev/null
+++ b/src/chrome/content/rules/Verisign.com.au.xml
@@ -0,0 +1,49 @@
+
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Verisign.com.br.xml b/src/chrome/content/rules/Verisign.com.br.xml
new file mode 100644
index 000000000000..c17422983e26
--- /dev/null
+++ b/src/chrome/content/rules/Verisign.com.br.xml
@@ -0,0 +1,28 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Verisign.com.hk.xml b/src/chrome/content/rules/Verisign.com.hk.xml
new file mode 100644
index 000000000000..e2d8f52be001
--- /dev/null
+++ b/src/chrome/content/rules/Verisign.com.hk.xml
@@ -0,0 +1,37 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Verisign.com.sg.xml b/src/chrome/content/rules/Verisign.com.sg.xml
new file mode 100644
index 000000000000..b8ea68c4ad7f
--- /dev/null
+++ b/src/chrome/content/rules/Verisign.com.sg.xml
@@ -0,0 +1,37 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Verisign.com.tw.xml b/src/chrome/content/rules/Verisign.com.tw.xml
new file mode 100644
index 000000000000..68d773dbdeef
--- /dev/null
+++ b/src/chrome/content/rules/Verisign.com.tw.xml
@@ -0,0 +1,35 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Verisign.dk.xml b/src/chrome/content/rules/Verisign.dk.xml
new file mode 100644
index 000000000000..5ae3681d1a1c
--- /dev/null
+++ b/src/chrome/content/rules/Verisign.dk.xml
@@ -0,0 +1,36 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Verisign.fr.xml b/src/chrome/content/rules/Verisign.fr.xml
new file mode 100644
index 000000000000..6efac6f441c9
--- /dev/null
+++ b/src/chrome/content/rules/Verisign.fr.xml
@@ -0,0 +1,37 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Verisign.se.xml b/src/chrome/content/rules/Verisign.se.xml
new file mode 100644
index 000000000000..b32a04213009
--- /dev/null
+++ b/src/chrome/content/rules/Verisign.se.xml
@@ -0,0 +1,37 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Verisign.xml b/src/chrome/content/rules/Verisign.xml
index fbc5d0e542d3..b2294fd96eb3 100644
--- a/src/chrome/content/rules/Verisign.xml
+++ b/src/chrome/content/rules/Verisign.xml
@@ -1,137 +1,253 @@
-
 
-
-	
-	
+
 
-	
+	
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
 	
-	
-	
+	
+	
+	
+	
+	
+	
+	
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
 	
+	
+	
+	
+	
+	
+	
+	
 	
-		
+	
+	
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
 
-	
-	
-	
-
-	
-	
-
-	
-	
-	
-
-	
-	
-
-	
-	
-	
-
-	
-	
-
-	
-
-	
-	
-
-	
-	
-
-	
-	
-
-	
-	
-
-	
-	
-
-	
-
-	
-	
-
-	
-
-	
-
-	
 
diff --git a/src/chrome/content/rules/Verisign_Labs.com.xml b/src/chrome/content/rules/Verisign_Labs.com.xml
deleted file mode 100644
index 7ced974d69cb..000000000000
--- a/src/chrome/content/rules/Verisign_Labs.com.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Verivox.xml b/src/chrome/content/rules/Verivox.xml
index a43f4fed039b..51786cc7a2f6 100644
--- a/src/chrome/content/rules/Verivox.xml
+++ b/src/chrome/content/rules/Verivox.xml
@@ -13,7 +13,8 @@
 
 	
 	
-	
+	
+	
 	
 
 
diff --git a/src/chrome/content/rules/Verizon-Enterprise.xml b/src/chrome/content/rules/Verizon-Enterprise.xml
new file mode 100644
index 000000000000..7e0ad0befc92
--- /dev/null
+++ b/src/chrome/content/rules/Verizon-Enterprise.xml
@@ -0,0 +1,27 @@
+
+
+
+	
+	
+
+	
+	
+		
+		
+		
+		
+		
+		
+
+	
+		
+		
+		
+		
+
diff --git a/src/chrome/content/rules/Verizon-Wireless.xml b/src/chrome/content/rules/Verizon-Wireless.xml
new file mode 100644
index 000000000000..a29ace856828
--- /dev/null
+++ b/src/chrome/content/rules/Verizon-Wireless.xml
@@ -0,0 +1,138 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
+
+	
+	
+
+	
+
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Verizon.xml b/src/chrome/content/rules/Verizon.xml
index 8d08d06805e8..773409eaa2a4 100644
--- a/src/chrome/content/rules/Verizon.xml
+++ b/src/chrome/content/rules/Verizon.xml
@@ -4,8 +4,8 @@
 		- Share_the_Network.xml
 		- verizon.net.xml
 		- verizonbusiness.com.xml
-		- Verizon_Enterprise.xml
-		- Verizon_Wireless.xml
+		- Verizon-Enterprise.xml
+		- Verizon-Wireless.xml
 
 
 	CDN buckets:
@@ -56,7 +56,7 @@
 
 	** ?lid=//global//residential redirects
 
-	* See: 
+	* See:
 		- https://lists.eff.org/pipermail/https-everywhere/2011-November/001237.html
 		- https://lists.eff.org/pipermail/https-everywhere-rules/2012-February/001003.html
 
diff --git a/src/chrome/content/rules/Verizon_Enterprise.xml b/src/chrome/content/rules/Verizon_Enterprise.xml
deleted file mode 100644
index c06803512404..000000000000
--- a/src/chrome/content/rules/Verizon_Enterprise.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Verizon_Wireless.xml b/src/chrome/content/rules/Verizon_Wireless.xml
deleted file mode 100644
index 377714c9eeb6..000000000000
--- a/src/chrome/content/rules/Verizon_Wireless.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-	
-	
-
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Verkkomaksut.fi.xml b/src/chrome/content/rules/Verkkomaksut.fi.xml
index f7b968aab11c..d68c2e481440 100644
--- a/src/chrome/content/rules/Verkkomaksut.fi.xml
+++ b/src/chrome/content/rules/Verkkomaksut.fi.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/VeronikaMaine.xml b/src/chrome/content/rules/VeronikaMaine.xml
index c4ebef6d39ca..3bb7c9fe5e60 100644
--- a/src/chrome/content/rules/VeronikaMaine.xml
+++ b/src/chrome/content/rules/VeronikaMaine.xml
@@ -4,4 +4,4 @@
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/VersaCart_Systems.xml b/src/chrome/content/rules/VersaCart_Systems.xml
index 94d9e5501c6b..6053894f1dc9 100644
--- a/src/chrome/content/rules/VersaCart_Systems.xml
+++ b/src/chrome/content/rules/VersaCart_Systems.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Versus-Technologies.xml b/src/chrome/content/rules/Versus-Technologies.xml
index 73f600192686..653725c9d657 100644
--- a/src/chrome/content/rules/Versus-Technologies.xml
+++ b/src/chrome/content/rules/Versus-Technologies.xml
@@ -7,7 +7,7 @@ Fetch error: http://vstech.net/ => https://vstech.net/: Cycle detected - URL alr
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Vertical-Media.xml b/src/chrome/content/rules/Vertical-Media.xml
index de8a9575e867..453c32e5474a 100644
--- a/src/chrome/content/rules/Vertical-Media.xml
+++ b/src/chrome/content/rules/Vertical-Media.xml
@@ -9,7 +9,7 @@ Fetch error: http://mail.verticalmedia.com/ => https://mail.verticalmedia.com/:
 		- (www.)verticalmedia.com	(cert: *.securesites.net; redirects to www.alltrips.com over http,
 						shows Vertical Media logo and "vmcorp1.serverpros.com" over https)
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Vertical-Web-Media.xml b/src/chrome/content/rules/Vertical-Web-Media.xml
index 3695a4161a27..52beacfa05b1 100644
--- a/src/chrome/content/rules/Vertical-Web-Media.xml
+++ b/src/chrome/content/rules/Vertical-Web-Media.xml
@@ -2,9 +2,9 @@
 
 	
 	
-	
+	
 
-	
+	
 
 	
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Vertx.com.xml b/src/chrome/content/rules/Vertx.com.xml
new file mode 100644
index 000000000000..dd32c649dc40
--- /dev/null
+++ b/src/chrome/content/rules/Vertx.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Veruta.com.xml b/src/chrome/content/rules/Veruta.com.xml
deleted file mode 100644
index 40d593fadec3..000000000000
--- a/src/chrome/content/rules/Veruta.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Verwaltung_Online.xml b/src/chrome/content/rules/Verwaltung_Online.xml
index 52a8da2c36f9..4c7ce8aecaac 100644
--- a/src/chrome/content/rules/Verwaltung_Online.xml
+++ b/src/chrome/content/rules/Verwaltung_Online.xml
@@ -1,17 +1,25 @@
 
diff --git a/src/chrome/content/rules/Verzekeringssite.nl.xml b/src/chrome/content/rules/Verzekeringssite.nl.xml
index e3b7cef22461..80af66ce5555 100644
--- a/src/chrome/content/rules/Verzekeringssite.nl.xml
+++ b/src/chrome/content/rules/Verzekeringssite.nl.xml
@@ -9,7 +9,7 @@ Fetch error: http://verzekeringssite.nl/ => https://www.verzekeringssite.nl/: (5
 	- blog 404s
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Vesess.xml b/src/chrome/content/rules/Vesess.xml
index f5ee327aeb85..560458b12aa7 100644
--- a/src/chrome/content/rules/Vesess.xml
+++ b/src/chrome/content/rules/Vesess.xml
@@ -14,7 +14,7 @@
 	* Shows default page
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Vessel.xml b/src/chrome/content/rules/Vessel.xml
index 0c692d9ec397..9ffa8b55e51b 100644
--- a/src/chrome/content/rules/Vessel.xml
+++ b/src/chrome/content/rules/Vessel.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Veuwer.xml b/src/chrome/content/rules/Veuwer.xml
index d985825a6218..5fed9d30639c 100644
--- a/src/chrome/content/rules/Veuwer.xml
+++ b/src/chrome/content/rules/Veuwer.xml
@@ -6,7 +6,7 @@ Fetch error: http://veuwer.com/ => https://veuwer.com/: (7, 'Failed to connect t
 Fetch error: http://www.veuwer.com/ => https://veuwer.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Vhs-lkr-ansbach.de.xml b/src/chrome/content/rules/Vhs-lkr-ansbach.de.xml
new file mode 100644
index 000000000000..7f19e5b5db09
--- /dev/null
+++ b/src/chrome/content/rules/Vhs-lkr-ansbach.de.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Viacom.xml b/src/chrome/content/rules/Viacom.xml
index 1d5b5c225fbc..0fb14c8a5cb7 100644
--- a/src/chrome/content/rules/Viacom.xml
+++ b/src/chrome/content/rules/Viacom.xml
@@ -21,7 +21,7 @@ Fetch error: http://specials.mtvnn.com/ => https://specials.mtvnn.com/: (60, 'SS
 		- mtvplay.tv
 		- www.mtvplay.tv
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Viaduct.io.xml b/src/chrome/content/rules/Viaduct.io.xml
index 389df7cf4948..7172ac9ff817 100644
--- a/src/chrome/content/rules/Viaduct.io.xml
+++ b/src/chrome/content/rules/Viaduct.io.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.viaduct.io/ => https://www.viaduct.io/: (51, "SSL: no al
 		- status.viaduct.io
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Viazul.com.xml b/src/chrome/content/rules/Viazul.com.xml
new file mode 100644
index 000000000000..9063cc0d21ce
--- /dev/null
+++ b/src/chrome/content/rules/Viazul.com.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Viber.xml b/src/chrome/content/rules/Viber.xml
index be6a576a001e..348508d20086 100644
--- a/src/chrome/content/rules/Viber.xml
+++ b/src/chrome/content/rules/Viber.xml
@@ -40,7 +40,7 @@ Non-2xx HTTP code: http://helpme.viber.com/ (200) => https://viber.kayako.com/ (
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Vibrant.xml b/src/chrome/content/rules/Vibrant.xml
index bbf7bf84a49b..c68f76421cdf 100644
--- a/src/chrome/content/rules/Vibrant.xml
+++ b/src/chrome/content/rules/Vibrant.xml
@@ -9,7 +9,7 @@ Fetch error: http://vibrantmedia.com/ => https://vibrantmedia.com/: (60, 'SSL ce
 		- *.us.intellitxt.com	(times out; where * is a unique subdomain for each client)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Vice-problematic.xml b/src/chrome/content/rules/Vice-problematic.xml
deleted file mode 100644
index f62bdf0dde83..000000000000
--- a/src/chrome/content/rules/Vice-problematic.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Vice.xml b/src/chrome/content/rules/Vice.xml
index 6861d7a955a2..3b5f662ff7fc 100644
--- a/src/chrome/content/rules/Vice.xml
+++ b/src/chrome/content/rules/Vice.xml
@@ -1,7 +1,4 @@
 
 
 
-	
 	
+	
+	
+	
 	
 	
 	
@@ -94,58 +57,22 @@
 	
 	
 	
+	
 	
 	
 	
+	
 	
 	
 	
+	
 	
 	
 	
 	
-	
-
-	
-	
-	
-	
-
-		
-
-		
-		
-
-
-	
-	
 
 	
 
-	
-
-	
-
-		
-		
-		
-		
-
-	
-
-		
-
-	
-
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/VicinityRewards.ca.xml b/src/chrome/content/rules/VicinityRewards.ca.xml
new file mode 100644
index 000000000000..8dbb090a3868
--- /dev/null
+++ b/src/chrome/content/rules/VicinityRewards.ca.xml
@@ -0,0 +1,19 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Victi.ms.xml b/src/chrome/content/rules/Victi.ms.xml
index b9728cf36b60..8f9aef9324ec 100644
--- a/src/chrome/content/rules/Victi.ms.xml
+++ b/src/chrome/content/rules/Victi.ms.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.victi.ms/ => https://www.victi.ms/: (60, 'SSL certificat
 	* Mismatched, CN: *.rhcloud.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Victor-Chandler.xml b/src/chrome/content/rules/Victor-Chandler.xml
index 1e5331e05275..94a4121fa3fd 100644
--- a/src/chrome/content/rules/Victor-Chandler.xml
+++ b/src/chrome/content/rules/Victor-Chandler.xml
@@ -6,7 +6,7 @@ Fetch error: http://vcint.com/ => https://vcint.com/: (28, 'Connection timed out
 Disabled by https-everywhere-checker because:
 Fetch error: http://vcint.com/ => https://vcint.com/: (28, 'Connection timed out after 10000 milliseconds')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Victorias_Secret.xml b/src/chrome/content/rules/Victorias_Secret.xml
index 7cc188a2baad..ec8883cc5837 100644
--- a/src/chrome/content/rules/Victorias_Secret.xml
+++ b/src/chrome/content/rules/Victorias_Secret.xml
@@ -1,9 +1,20 @@
+
 
 	
 	
-	
-	
-	
+	
+	
+	
 
 	
-	
+	
 
 
 	
-	
-
-		
-
 	
 
diff --git a/src/chrome/content/rules/Victorias_Secret_Canada.ca.xml b/src/chrome/content/rules/Victorias_Secret_Canada.ca.xml
deleted file mode 100644
index 16059d4607c2..000000000000
--- a/src/chrome/content/rules/Victorias_Secret_Canada.ca.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Victorinox.xml b/src/chrome/content/rules/Victorinox.xml
index 5e025749fa3b..c01869d26594 100644
--- a/src/chrome/content/rules/Victorinox.xml
+++ b/src/chrome/content/rules/Victorinox.xml
@@ -18,7 +18,7 @@ Fetch error: http://static.victorinox.com/ => https://static.victorinox.com/: (6
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
     
 	
diff --git a/src/chrome/content/rules/Vid.ly.xml b/src/chrome/content/rules/Vid.ly.xml
index 4e1704191f32..c3655ee24d60 100644
--- a/src/chrome/content/rules/Vid.ly.xml
+++ b/src/chrome/content/rules/Vid.ly.xml
@@ -20,7 +20,10 @@
 
 
 	
-	
+	
+	
+	
+	
 
 
 	
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/VideoBloom.com.xml b/src/chrome/content/rules/VideoBloom.com.xml
deleted file mode 100644
index b6770ee63f34..000000000000
--- a/src/chrome/content/rules/VideoBloom.com.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/VideoLAN.org.xml b/src/chrome/content/rules/VideoLAN.org.xml
index ab0cf6c9a20f..46ddde5d8b1a 100644
--- a/src/chrome/content/rules/VideoLAN.org.xml
+++ b/src/chrome/content/rules/VideoLAN.org.xml
@@ -1,70 +1,79 @@
 
 
 
 	
 	
-	
-	
+	
+	
+	
+	
+	
+	
 	
+	
+	
+	
 	
-	
 	
+	
 	
 	
+	
+	
 	
 	
-	
-	
 	
 	
+	
 	
 	
 	
+	
+	
 	
 	
 	
+	
+	
 	
 	
+	
 
 	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Video_Aided_Instruction.xml b/src/chrome/content/rules/Video_Aided_Instruction.xml
index fe02398f4827..3dc4490bda10 100644
--- a/src/chrome/content/rules/Video_Aided_Instruction.xml
+++ b/src/chrome/content/rules/Video_Aided_Instruction.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Video_Dean.xml b/src/chrome/content/rules/Video_Dean.xml
index 2acbb2aebe78..1ed20e7f66b4 100644
--- a/src/chrome/content/rules/Video_Dean.xml
+++ b/src/chrome/content/rules/Video_Dean.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.video-dean.com/ => https://www.video-dean.com/: (28, 'Co
 Disabled by https-everywhere-checker because:
 Fetch error: http://video-dean.com/ => https://video-dean.com/: (51, "SSL: no alternative certificate subject name matches target host name 'video-dean.com'")
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://video-dean.com/ => https://video-dean.com/: (51, "SSL: no al
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Video_Interchange.xml b/src/chrome/content/rules/Video_Interchange.xml
index ad4973005178..88c25ea9f688 100644
--- a/src/chrome/content/rules/Video_Interchange.xml
+++ b/src/chrome/content/rules/Video_Interchange.xml
@@ -11,4 +11,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Videoemail.com.xml b/src/chrome/content/rules/Videoemail.com.xml
index 5331382b375a..1a1409002d49 100644
--- a/src/chrome/content/rules/Videoemail.com.xml
+++ b/src/chrome/content/rules/Videoemail.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://sc.videoemail.com/ => https://sc.videoemail.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Videogamer.com.xml b/src/chrome/content/rules/Videogamer.com.xml
deleted file mode 100644
index 9c644a265568..000000000000
--- a/src/chrome/content/rules/Videogamer.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Videojs.com.xml b/src/chrome/content/rules/Videojs.com.xml
new file mode 100644
index 000000000000..692699d448aa
--- /dev/null
+++ b/src/chrome/content/rules/Videojs.com.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Videoplaza.tv.xml b/src/chrome/content/rules/Videoplaza.tv.xml
index 760619e07b6c..5d24f06cd7ef 100644
--- a/src/chrome/content/rules/Videoplaza.tv.xml
+++ b/src/chrome/content/rules/Videoplaza.tv.xml
@@ -1,42 +1,94 @@
 
 
 
-
-
-
-	
-	
-	
-
-	
 	
 
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
 	
 
 
diff --git a/src/chrome/content/rules/Vidplay.net.xml b/src/chrome/content/rules/Vidplay.net.xml
index f966007b92bd..1cc551e48864 100644
--- a/src/chrome/content/rules/Vidplay.net.xml
+++ b/src/chrome/content/rules/Vidplay.net.xml
@@ -20,7 +20,6 @@
 
 
 	
-	
 
 
 	
-
+
 
 	
diff --git a/src/chrome/content/rules/Vidup.me.xml b/src/chrome/content/rules/Vidup.me.xml
index aef19dfec92e..b17eece3dd0f 100644
--- a/src/chrome/content/rules/Vidup.me.xml
+++ b/src/chrome/content/rules/Vidup.me.xml
@@ -48,7 +48,7 @@ Fetch error: http://vidup.me/ => https://www.vidup.me/: Too many redirects while
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Vie_Pratique.fr.xml b/src/chrome/content/rules/Vie_Pratique.fr.xml
index 28655c8a6b8a..cefc0b624a78 100644
--- a/src/chrome/content/rules/Vie_Pratique.fr.xml
+++ b/src/chrome/content/rules/Vie_Pratique.fr.xml
@@ -34,7 +34,7 @@ Non-2xx HTTP code: http://viepratique.fr/ (200) => https://www.viepratique.fr/ (
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Vienna_University_of_Technology.xml b/src/chrome/content/rules/Vienna_University_of_Technology.xml
index 9ce9789c5587..e031500461b6 100644
--- a/src/chrome/content/rules/Vienna_University_of_Technology.xml
+++ b/src/chrome/content/rules/Vienna_University_of_Technology.xml
@@ -32,7 +32,15 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 		
 		
 		
@@ -44,7 +52,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/View_Central.com.xml b/src/chrome/content/rules/View_Central.com.xml
index 519c54d4436f..4c523d5aa03d 100644
--- a/src/chrome/content/rules/View_Central.com.xml
+++ b/src/chrome/content/rules/View_Central.com.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Villas.com.xml b/src/chrome/content/rules/Villas.com.xml
index f096ac3a29fe..7e12cdba6a55 100644
--- a/src/chrome/content/rules/Villas.com.xml
+++ b/src/chrome/content/rules/Villas.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://r-ec.vcomstatic.com/ => https://r-ec.vcomstatic.com/: (6, 'C
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Vim.org.xml b/src/chrome/content/rules/Vim.org.xml
new file mode 100644
index 000000000000..e5dfb3f9ea05
--- /dev/null
+++ b/src/chrome/content/rules/Vim.org.xml
@@ -0,0 +1,8 @@
+
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Vin-DiCarlo.xml b/src/chrome/content/rules/Vin-DiCarlo.xml
index 317942436a9d..4ec3ec8943b7 100644
--- a/src/chrome/content/rules/Vin-DiCarlo.xml
+++ b/src/chrome/content/rules/Vin-DiCarlo.xml
@@ -3,7 +3,7 @@
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Vindico_suite.com.xml b/src/chrome/content/rules/Vindico_suite.com.xml
index 797dfcd8c780..8d9b94408bbe 100644
--- a/src/chrome/content/rules/Vindico_suite.com.xml
+++ b/src/chrome/content/rules/Vindico_suite.com.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.vindicosuite.com/ => https://www.vindicosuite.com/: (28,
 		- .vindicosuite.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Vineyard_Vines.com.xml b/src/chrome/content/rules/Vineyard_Vines.com.xml
index 1239a5280df4..e8fff37bf6ff 100644
--- a/src/chrome/content/rules/Vineyard_Vines.com.xml
+++ b/src/chrome/content/rules/Vineyard_Vines.com.xml
@@ -29,7 +29,7 @@ Fetch error: http://m.vineyardvines.com/ => https://m.vineyardvines.com/: (51, "
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Vinilox.eu.xml b/src/chrome/content/rules/Vinilox.eu.xml
index 315aa99a9c4e..ab84994ccd69 100644
--- a/src/chrome/content/rules/Vinilox.eu.xml
+++ b/src/chrome/content/rules/Vinilox.eu.xml
@@ -31,7 +31,7 @@ Fetch error: http://wiki.vinilox.eu/ => https://wiki.vinilox.eu/: (51, "SSL: no
 		4xx client error:
 			 - mail.vinilox.eu
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/VintageCellars.com.au.xml b/src/chrome/content/rules/VintageCellars.com.au.xml
new file mode 100644
index 000000000000..8b8df60c56d0
--- /dev/null
+++ b/src/chrome/content/rules/VintageCellars.com.au.xml
@@ -0,0 +1,23 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Vinumeris.com.xml b/src/chrome/content/rules/Vinumeris.com.xml
index b374b4cf5b5e..df7c2b5af6fa 100644
--- a/src/chrome/content/rules/Vinumeris.com.xml
+++ b/src/chrome/content/rules/Vinumeris.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.vinumeris.com/ => https://www.vinumeris.com/: (7, 'Faile
 		- www.vinumeris.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Violet_Darkling.com.xml b/src/chrome/content/rules/Violet_Darkling.com.xml
index d437c0a5ff24..b8dee00ef730 100644
--- a/src/chrome/content/rules/Violet_Darkling.com.xml
+++ b/src/chrome/content/rules/Violet_Darkling.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://violetdarkling.com/ => https://violetdarkling.com/: (7, 'Fai
 Fetch error: http://www.violetdarkling.com/ => https://www.violetdarkling.com/: (7, 'Failed to connect to www.violetdarkling.com port 443: Connection refused')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Violet_Indigo.xml b/src/chrome/content/rules/Violet_Indigo.xml
index ed2bf9244617..0978c53e849b 100644
--- a/src/chrome/content/rules/Violet_Indigo.xml
+++ b/src/chrome/content/rules/Violet_Indigo.xml
@@ -7,7 +7,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/VipMobile.rs.xml b/src/chrome/content/rules/VipMobile.rs.xml
new file mode 100644
index 000000000000..dcc598a97aa2
--- /dev/null
+++ b/src/chrome/content/rules/VipMobile.rs.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Vippy.co.xml b/src/chrome/content/rules/Vippy.co.xml
index 7ebcb951ee56..8d2fcb296f88 100644
--- a/src/chrome/content/rules/Vippy.co.xml
+++ b/src/chrome/content/rules/Vippy.co.xml
@@ -27,7 +27,11 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 
 
 	
@@ -48,4 +52,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Virgin-mismatches.xml b/src/chrome/content/rules/Virgin-mismatches.xml
index 8a0afb09458f..8f5de9b33d60 100644
--- a/src/chrome/content/rules/Virgin-mismatches.xml
+++ b/src/chrome/content/rules/Virgin-mismatches.xml
@@ -19,4 +19,4 @@
 						-->
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/VirginAustralia.xml b/src/chrome/content/rules/VirginAustralia.xml
index c782f534175f..f2fa04cd6c20 100644
--- a/src/chrome/content/rules/VirginAustralia.xml
+++ b/src/chrome/content/rules/VirginAustralia.xml
@@ -1,9 +1,135 @@
+
 
-  
-  
-
-  
-  
-
\ No newline at end of file
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/VirginMobile.xml b/src/chrome/content/rules/VirginMobile.xml
index 279f014ea9d7..fbed419a08ec 100644
--- a/src/chrome/content/rules/VirginMobile.xml
+++ b/src/chrome/content/rules/VirginMobile.xml
@@ -13,7 +13,12 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
 	
 
 
diff --git a/src/chrome/content/rules/Virgin_Media.com.xml b/src/chrome/content/rules/Virgin_Media.com.xml
index f2ceeb1c0ce1..64e8a1080ceb 100644
--- a/src/chrome/content/rules/Virgin_Media.com.xml
+++ b/src/chrome/content/rules/Virgin_Media.com.xml
@@ -103,7 +103,7 @@ Fetch error: http://myphotos4.virginmedia.com/ => https://myphotos4.virginmedia.
 
 		- assets
 		- cablemystreet
-		- community 
+		- community
 		- da
 		- ebill2
 		- help		(requires assets rule to prevent mixed-content)
@@ -120,7 +120,7 @@ Fetch error: http://myphotos4.virginmedia.com/ => https://myphotos4.virginmedia.
 		- national
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Virginia-Mason-Hospital.xml b/src/chrome/content/rules/Virginia-Mason-Hospital.xml
index 3efc6b94215a..41a295847e1d 100644
--- a/src/chrome/content/rules/Virginia-Mason-Hospital.xml
+++ b/src/chrome/content/rules/Virginia-Mason-Hospital.xml
@@ -4,7 +4,7 @@
 	
 
 
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Virginia-Polytechnic-Institute-and-State-University.xml b/src/chrome/content/rules/Virginia-Polytechnic-Institute-and-State-University.xml
index 6e2600da0968..47a13daf3940 100644
--- a/src/chrome/content/rules/Virginia-Polytechnic-Institute-and-State-University.xml
+++ b/src/chrome/content/rules/Virginia-Polytechnic-Institute-and-State-University.xml
@@ -97,7 +97,7 @@ Fetch error: http://www.unirel.vt.edu/ => https://www.unirel.vt.edu/: (51, "SSL:
 		- (www.)vtnews
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Virool.com.xml b/src/chrome/content/rules/Virool.com.xml
index 82e7198cd5f6..523287b7176f 100644
--- a/src/chrome/content/rules/Virool.com.xml
+++ b/src/chrome/content/rules/Virool.com.xml
@@ -16,7 +16,7 @@
 
 
 	
-	
+	
 
 
 	
-
+
 
 	
diff --git a/src/chrome/content/rules/Virtual-Server.org.xml b/src/chrome/content/rules/Virtual-Server.org.xml
deleted file mode 100644
index 9e8b6ecc382f..000000000000
--- a/src/chrome/content/rules/Virtual-Server.org.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/VirtualBox.org.xml b/src/chrome/content/rules/VirtualBox.org.xml
index 5530f45f7f10..27b15fe1f56d 100644
--- a/src/chrome/content/rules/VirtualBox.org.xml
+++ b/src/chrome/content/rules/VirtualBox.org.xml
@@ -1,19 +1,22 @@
 
+	Non-functional hosts
+		SSL peer certificate was not OK:
+		- forum.virtualbox.org
+		- registration.virtualbox.org
 
+-->
 
 	
 	
-	
+	
 	
+	
 	
 
 	
 
-	
+	
+
 	
 
diff --git a/src/chrome/content/rules/VirtualQube.com.xml b/src/chrome/content/rules/VirtualQube.com.xml
index 07a016b69721..bd2ed39aafe9 100644
--- a/src/chrome/content/rules/VirtualQube.com.xml
+++ b/src/chrome/content/rules/VirtualQube.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.virtualqube.com/ => https://www.virtualqube.com/: (28, '
 		- www.virtualqube.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Virtual_Spirits.xml b/src/chrome/content/rules/Virtual_Spirits.xml
index bfbfc91dc9bd..4c26bf6a70b1 100644
--- a/src/chrome/content/rules/Virtual_Spirits.xml
+++ b/src/chrome/content/rules/Virtual_Spirits.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://virtualspirits.com/ => https://virtualspirits.com/: Cycle detected - URL already encountered: https://virtualspirits.com/Default.aspx
 Fetch error: http://www.virtualspirits.com/ => https://www.virtualspirits.com/: Cycle detected - URL already encountered: https://www.virtualspirits.com/Default.aspx
 -->
-
+
 
 	
 	
@@ -19,4 +19,4 @@ Fetch error: http://www.virtualspirits.com/ => https://www.virtualspirits.com/:
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Virtualearth.net.xml b/src/chrome/content/rules/Virtualearth.net.xml
index 8b690826b7d4..4d9294bd999f 100644
--- a/src/chrome/content/rules/Virtualearth.net.xml
+++ b/src/chrome/content/rules/Virtualearth.net.xml
@@ -6,7 +6,7 @@
 
 		- (www.)? *
 		- fb.ecn.api.tiles *
-		
+
 	* Mismatched
 
 -->
diff --git a/src/chrome/content/rules/VirtusOnline.org.xml b/src/chrome/content/rules/VirtusOnline.org.xml
index 21d7b2b27f25..7813981089af 100644
--- a/src/chrome/content/rules/VirtusOnline.org.xml
+++ b/src/chrome/content/rules/VirtusOnline.org.xml
@@ -5,4 +5,4 @@
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Virus_Tracker.net.xml b/src/chrome/content/rules/Virus_Tracker.net.xml
index 98bb8aaddb89..dd8a3283484a 100644
--- a/src/chrome/content/rules/Virus_Tracker.net.xml
+++ b/src/chrome/content/rules/Virus_Tracker.net.xml
@@ -14,7 +14,7 @@ Fetch error: http://map.virustracker.net/ => https://map.virustracker.net/: (60,
 		- virustracker.net
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Virusec.com.xml b/src/chrome/content/rules/Virusec.com.xml
index 8f90b7e0d40b..44f06662fc00 100644
--- a/src/chrome/content/rules/Virusec.com.xml
+++ b/src/chrome/content/rules/Virusec.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.escan.com/ => https://www.virusec.com/: (60, 'SSL certif
 Fetch error: http://escan.com/ => https://www.virusec.com/: (60, 'SSL certificate problem: self signed certificate')
 Fetch error: http://www.virusec.com/ => https://www.virusec.com/: (60, 'SSL certificate problem: self signed certificate')
 Fetch error: http://virusec.com/ => https://www.virusec.com/: (60, 'SSL certificate problem: self signed certificate') Av vendor. -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Visa.com.xml b/src/chrome/content/rules/Visa.com.xml
index 0bceeba718d0..bdfed44db04c 100644
--- a/src/chrome/content/rules/Visa.com.xml
+++ b/src/chrome/content/rules/Visa.com.xml
@@ -33,7 +33,7 @@ Non-2xx HTTP code: http://developer.visa.com/ (200) => https://developer.visa.co
 		jobs.visa.com
 -->
 
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Visa_Buxx.com.xml b/src/chrome/content/rules/Visa_Buxx.com.xml
index acdfb642e314..59d74a44b064 100644
--- a/src/chrome/content/rules/Visa_Buxx.com.xml
+++ b/src/chrome/content/rules/Visa_Buxx.com.xml
@@ -1,25 +1,28 @@
+
 
-
+
 
 	
-	
-
+	
+	
 
 	
 
+	
+	
 
-	
-	
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/Visa_to_Vietnam.xml b/src/chrome/content/rules/Visa_to_Vietnam.xml
index 2723a5b30adb..2f1668dde35f 100644
--- a/src/chrome/content/rules/Visa_to_Vietnam.xml
+++ b/src/chrome/content/rules/Visa_to_Vietnam.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Visalia_Times-Delta.xml b/src/chrome/content/rules/Visalia_Times-Delta.xml
index 6ea737b6ddbe..717d975f2661 100644
--- a/src/chrome/content/rules/Visalia_Times-Delta.xml
+++ b/src/chrome/content/rules/Visalia_Times-Delta.xml
@@ -1,7 +1,7 @@
 
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Visible_Technologies.xml b/src/chrome/content/rules/Visible_Technologies.xml
index 4df9a08f81a0..48a0477b365f 100644
--- a/src/chrome/content/rules/Visible_Technologies.xml
+++ b/src/chrome/content/rules/Visible_Technologies.xml
@@ -5,7 +5,7 @@ Fetch error: http://visibletechnologies.com/ => https://visibletechnologies.com/
 Fetch error: http://www.visibletechnologies.com/ => https://www.visibletechnologies.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.visibletechnologies.com'")
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.visibletechnologies.com/ => https://www.visibletechnolog
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Visiblebody.com.xml b/src/chrome/content/rules/Visiblebody.com.xml
index 789283c67ca5..0a2b13378173 100644
--- a/src/chrome/content/rules/Visiblebody.com.xml
+++ b/src/chrome/content/rules/Visiblebody.com.xml
@@ -22,6 +22,6 @@
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/VisionAirlines.xml b/src/chrome/content/rules/VisionAirlines.xml
index 0c73cdf47ddd..66588c669dda 100644
--- a/src/chrome/content/rules/VisionAirlines.xml
+++ b/src/chrome/content/rules/VisionAirlines.xml
@@ -8,10 +8,10 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://visionairlines.com/ => https://www.visionairlines.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 Fetch error: http://www.visionairlines.com/ => https://www.visionairlines.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 -->
-
+
   
   
 
   
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Vision_Art_Forum.com.xml b/src/chrome/content/rules/Vision_Art_Forum.com.xml
index 08d5c7e5bb89..8a3a2da975ac 100644
--- a/src/chrome/content/rules/Vision_Art_Forum.com.xml
+++ b/src/chrome/content/rules/Vision_Art_Forum.com.xml
@@ -12,4 +12,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Vision_Critical.com.xml b/src/chrome/content/rules/Vision_Critical.com.xml
index 3322b1231242..e2884558880f 100644
--- a/src/chrome/content/rules/Vision_Critical.com.xml
+++ b/src/chrome/content/rules/Vision_Critical.com.xml
@@ -28,7 +28,7 @@ Fetch error: http://fr.visioncritical.com/ => https://fr.visioncritical.com/: (5
 	ᵐ Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Vision_Critical_Panels.com.xml b/src/chrome/content/rules/Vision_Critical_Panels.com.xml
index 24edef4604a2..6a0bd572ec97 100644
--- a/src/chrome/content/rules/Vision_Critical_Panels.com.xml
+++ b/src/chrome/content/rules/Vision_Critical_Panels.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://logos.visioncriticalpanels.com/ => https://logos.visioncriti
 	(www.)?visioncriticalpanels.com does not exist.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Visitestonia.com.xml b/src/chrome/content/rules/Visitestonia.com.xml
index 290b77d3b8e1..c185c59545f9 100644
--- a/src/chrome/content/rules/Visitestonia.com.xml
+++ b/src/chrome/content/rules/Visitestonia.com.xml
@@ -41,14 +41,14 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 
 
-	
 
-	
 
 	
@@ -56,4 +56,5 @@
 	
 
+	
 
diff --git a/src/chrome/content/rules/Vispa.net.uk.xml b/src/chrome/content/rules/Vispa.net.uk.xml
new file mode 100644
index 000000000000..2abe125ef233
--- /dev/null
+++ b/src/chrome/content/rules/Vispa.net.uk.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/Vispa.xml b/src/chrome/content/rules/Vispa.xml
deleted file mode 100644
index 02fd2545a9fb..000000000000
--- a/src/chrome/content/rules/Vispa.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-
-	
-	
-
-	
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Vistech-Communications.xml b/src/chrome/content/rules/Vistech-Communications.xml
index 19c1438ee311..45c17f660d3f 100644
--- a/src/chrome/content/rules/Vistech-Communications.xml
+++ b/src/chrome/content/rules/Vistech-Communications.xml
@@ -1,9 +1,10 @@
 
 
 	
-	
+	
+	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/VisualNews.com.xml b/src/chrome/content/rules/VisualNews.com.xml
deleted file mode 100644
index 3562a4e38d91..000000000000
--- a/src/chrome/content/rules/VisualNews.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/VisualWebsiteOptimizer.xml b/src/chrome/content/rules/VisualWebsiteOptimizer.xml
index b4aa4ecb2f76..285b07851023 100644
--- a/src/chrome/content/rules/VisualWebsiteOptimizer.xml
+++ b/src/chrome/content/rules/VisualWebsiteOptimizer.xml
@@ -1,7 +1,9 @@
 
 
 	
-	
+	
+	
+	
 		
 
 
-	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/VisualizingPalestine.org.xml b/src/chrome/content/rules/VisualizingPalestine.org.xml
new file mode 100644
index 000000000000..1410dc50789a
--- /dev/null
+++ b/src/chrome/content/rules/VisualizingPalestine.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/VitalAds.xml b/src/chrome/content/rules/VitalAds.xml
index 44ddab5415a3..e2252a816c33 100644
--- a/src/chrome/content/rules/VitalAds.xml
+++ b/src/chrome/content/rules/VitalAds.xml
@@ -8,12 +8,12 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://vitalads.com/ => https://vitalads.com/: (60, 'SSL certificate problem: certificate has expired')
 Fetch error: http://www.vitalads.com/ => https://www.vitalads.com/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
 
 	
 	
 
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Vitalwerks.xml b/src/chrome/content/rules/Vitalwerks.xml
index c0b86b92bdf6..4350308ca187 100644
--- a/src/chrome/content/rules/Vitalwerks.xml
+++ b/src/chrome/content/rules/Vitalwerks.xml
@@ -5,10 +5,11 @@
 	
 	
 
-	
+	
+	
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Vitamin_D_Council.xml b/src/chrome/content/rules/Vitamin_D_Council.xml
index 63c8785f0fd4..2ba6ad62eff9 100644
--- a/src/chrome/content/rules/Vitamin_D_Council.xml
+++ b/src/chrome/content/rules/Vitamin_D_Council.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Vitamin_Shoppe.xml b/src/chrome/content/rules/Vitamin_Shoppe.xml
index e39b9e284dc3..8c22e23e3be7 100644
--- a/src/chrome/content/rules/Vitamin_Shoppe.xml
+++ b/src/chrome/content/rules/Vitamin_Shoppe.xml
@@ -33,7 +33,8 @@ Fetch error: http://vitaminshoppe.com/ => https://www.vitaminshoppe.com/: Too ma
 
 
 	
-	
+	
+	
 
 
 	
-
-
-	
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Viviscal.xml b/src/chrome/content/rules/Viviscal.xml
index 75527773de8f..dec4b8a89f1c 100644
--- a/src/chrome/content/rules/Viviscal.xml
+++ b/src/chrome/content/rules/Viviscal.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://viviscal.co.uk/ => https://viviscal.co.uk/: Cycle detected - URL already encountered: https://viviscal.co.uk/
 Fetch error: http://www.viviscal.co.uk/ => https://www.viviscal.co.uk/: Cycle detected - URL already encountered: https://www.viviscal.co.uk/
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Vm.ag.xml b/src/chrome/content/rules/Vm.ag.xml
index e6b58f1ccbfa..ecf5a4240b1d 100644
--- a/src/chrome/content/rules/Vm.ag.xml
+++ b/src/chrome/content/rules/Vm.ag.xml
@@ -1,15 +1,10 @@
-
 
 
 	
-	
 	
+	
 
-
-	
+	
 
 
 	
-  
-  
-
-  
-
diff --git a/src/chrome/content/rules/Vmmpxl.com.xml b/src/chrome/content/rules/Vmmpxl.com.xml
deleted file mode 100644
index 4e9bf5b620b7..000000000000
--- a/src/chrome/content/rules/Vmmpxl.com.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/VoDLocker.to.xml b/src/chrome/content/rules/VoDLocker.to.xml
new file mode 100644
index 000000000000..7377d66d41a4
--- /dev/null
+++ b/src/chrome/content/rules/VoDLocker.to.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/VoIPDistributor.net.xml b/src/chrome/content/rules/VoIPDistributor.net.xml
deleted file mode 100644
index e995f8b30d15..000000000000
--- a/src/chrome/content/rules/VoIPDistributor.net.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Vocativ.com.xml b/src/chrome/content/rules/Vocativ.com.xml
index 7c22b16aedf5..5cd79630a43d 100644
--- a/src/chrome/content/rules/Vocativ.com.xml
+++ b/src/chrome/content/rules/Vocativ.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.vocativ.com/content/themes/vocativ/images/vocativ-logo-2
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Vodafone.co.nz.xml b/src/chrome/content/rules/Vodafone.co.nz.xml
index 312f9fb9a2af..eed058777288 100644
--- a/src/chrome/content/rules/Vodafone.co.nz.xml
+++ b/src/chrome/content/rules/Vodafone.co.nz.xml
@@ -57,7 +57,7 @@ Fetch error: http://wholesale.vodafone.co.nz/ => https://wholesale.vodafone.co.n
 	* Secured by us
 
 -->
-
+
 
 	
@@ -100,7 +100,7 @@ Fetch error: http://wholesale.vodafone.co.nz/ => https://wholesale.vodafone.co.n
 	
 	
 
-	
+	
 
 
 	
-
+
 
 	
diff --git a/src/chrome/content/rules/Vodafone.ie.xml b/src/chrome/content/rules/Vodafone.ie.xml
index 8df0f2e911df..0ba85778e69f 100644
--- a/src/chrome/content/rules/Vodafone.ie.xml
+++ b/src/chrome/content/rules/Vodafone.ie.xml
@@ -48,7 +48,7 @@
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Vodafone.pt.xml b/src/chrome/content/rules/Vodafone.pt.xml
index e6d4f500d4b5..7c305348a2e7 100644
--- a/src/chrome/content/rules/Vodafone.pt.xml
+++ b/src/chrome/content/rules/Vodafone.pt.xml
@@ -1,17 +1,8 @@
-
-
-
-
+
+	
+	
 	
 	
-	
 	
 	
 	
@@ -22,13 +13,12 @@ Fetch error: http://webvodafonemail.vodafone.pt/ => https://webvodafonemail.voda
 	
 	
 	
-	
 	
 	
-	
 	
 	
 	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Vodafone.xml b/src/chrome/content/rules/Vodafone.xml
index 9ccb80912c35..0623ce5e9a08 100644
--- a/src/chrome/content/rules/Vodafone.xml
+++ b/src/chrome/content/rules/Vodafone.xml
@@ -1,8 +1,4 @@
-
 
-
-
-	
-	
+
 
-	
 	
 	
 
-
-	
-	
-
-	
-
-
-	
-	
-
-		
-		
-		
-		
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Voffka.xml b/src/chrome/content/rules/Voffka.xml
index 08914b60dddb..3777ac1fbf2e 100644
--- a/src/chrome/content/rules/Voffka.xml
+++ b/src/chrome/content/rules/Voffka.xml
@@ -1,38 +1,67 @@
-
 
-
-
-	
+
 	
 	
-
-
-	
-
+	
+	
+	
+	
+	
+	
+
+	
+	
 
diff --git a/src/chrome/content/rules/Vogel.de.xml b/src/chrome/content/rules/Vogel.de.xml
index e96cd462984b..dc108df1dfe9 100644
--- a/src/chrome/content/rules/Vogel.de.xml
+++ b/src/chrome/content/rules/Vogel.de.xml
@@ -9,7 +9,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 	
 
+	
 
diff --git a/src/chrome/content/rules/VoidLinux.org.xml b/src/chrome/content/rules/VoidLinux.org.xml
new file mode 100644
index 000000000000..64a3b8cb9e06
--- /dev/null
+++ b/src/chrome/content/rules/VoidLinux.org.xml
@@ -0,0 +1,26 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Volatile_Systems.com-problematic.xml b/src/chrome/content/rules/Volatile_Systems.com-problematic.xml
index 58c6a6f2d785..88ffbf203c4b 100644
--- a/src/chrome/content/rules/Volatile_Systems.com-problematic.xml
+++ b/src/chrome/content/rules/Volatile_Systems.com-problematic.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Volatile_Systems.com.xml b/src/chrome/content/rules/Volatile_Systems.com.xml
index 3ff48bce27a0..bec9cef9c502 100644
--- a/src/chrome/content/rules/Volatile_Systems.com.xml
+++ b/src/chrome/content/rules/Volatile_Systems.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://www.volatilesystems.com/ => https://www.volatilesystems.com/
 		- lists		(works; expired 2008-12-15, mismatched, CN: www.volatilesystems.com)
 
 -->
-
+
 
 	
 	
@@ -30,4 +30,4 @@ Fetch error: http://www.volatilesystems.com/ => https://www.volatilesystems.com/
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/VolkswagenBank.xml b/src/chrome/content/rules/VolkswagenBank.xml
index 404053727a38..43f269aa55c2 100644
--- a/src/chrome/content/rules/VolkswagenBank.xml
+++ b/src/chrome/content/rules/VolkswagenBank.xml
@@ -1,7 +1,8 @@
 
-  
+  
+  
   
 
   
-  
+  
 
diff --git a/src/chrome/content/rules/Volotea.com.xml b/src/chrome/content/rules/Volotea.com.xml
index 0710a0489e76..3eb045d44658 100644
--- a/src/chrome/content/rules/Volotea.com.xml
+++ b/src/chrome/content/rules/Volotea.com.xml
@@ -13,13 +13,18 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Voltage.com.xml b/src/chrome/content/rules/Voltage.com.xml
deleted file mode 100644
index 7f1cb730f2c3..000000000000
--- a/src/chrome/content/rules/Voltage.com.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-	
-	
-
-  	
-
-	
-
diff --git a/src/chrome/content/rules/Volunteer2.xml b/src/chrome/content/rules/Volunteer2.xml
index 0d88ec32de7d..0d4c7f414431 100644
--- a/src/chrome/content/rules/Volunteer2.xml
+++ b/src/chrome/content/rules/Volunteer2.xml
@@ -5,14 +5,14 @@
 -->
 
 
-	
+	
+	
 	
 	
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Volunteer_Centers_of_Michigan.xml b/src/chrome/content/rules/Volunteer_Centers_of_Michigan.xml
index e2a39c3e64d7..713c5e690fc8 100644
--- a/src/chrome/content/rules/Volunteer_Centers_of_Michigan.xml
+++ b/src/chrome/content/rules/Volunteer_Centers_of_Michigan.xml
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Volusion.xml b/src/chrome/content/rules/Volusion.xml
index 51436d760e74..2476b2ca6c12 100644
--- a/src/chrome/content/rules/Volusion.xml
+++ b/src/chrome/content/rules/Volusion.xml
@@ -43,21 +43,24 @@
 
 
 	
-	
+	
+	
 	
-	
+	
+	
+	
+	
+	
+	
 
 
-	
+	
 
 
-	
 
 	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/Voodoo.com.xml b/src/chrome/content/rules/Voodoo.com.xml
index ffdc5b010a21..a6ce3f415847 100644
--- a/src/chrome/content/rules/Voodoo.com.xml
+++ b/src/chrome/content/rules/Voodoo.com.xml
@@ -12,7 +12,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -21,4 +22,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Voost.xml b/src/chrome/content/rules/Voost.xml
index 7f33f088a8ac..d0755f564a54 100644
--- a/src/chrome/content/rules/Voost.xml
+++ b/src/chrome/content/rules/Voost.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Vooxe.com.xml b/src/chrome/content/rules/Vooxe.com.xml
index ae5fd3fad675..62723b65240a 100644
--- a/src/chrome/content/rules/Vooxe.com.xml
+++ b/src/chrome/content/rules/Vooxe.com.xml
@@ -11,7 +11,7 @@
 		- cdn.static.vooxe.com
 		- svcone1.vooxe.com
 		- testweb.vooxe.com
-		
+
 	Chain issues:
 		- webapi.reports.vooxe.com
 		- system.vooxe.com
diff --git a/src/chrome/content/rules/Vorpal.io.xml b/src/chrome/content/rules/Vorpal.io.xml
index dc10832ff3df..5647108a93e4 100644
--- a/src/chrome/content/rules/Vorpal.io.xml
+++ b/src/chrome/content/rules/Vorpal.io.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.vorpal.io/ => https://www.vorpal.io/: (60, 'SSL certific
 		- c929457.ssl.cf2.rackcdn.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/VoteWatch.eu.xml b/src/chrome/content/rules/VoteWatch.eu.xml
index 25c8d4e7ffa2..de6e3f6e3b3f 100644
--- a/src/chrome/content/rules/VoteWatch.eu.xml
+++ b/src/chrome/content/rules/VoteWatch.eu.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://votewatch.eu/ => https://www.votewatch.eu/: (60, 'SSL certificate problem: certificate has expired')
 Fetch error: http://www.votewatch.eu/ => https://www.votewatch.eu/: (60, 'SSL certificate problem: certificate has expired')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/VoterVOICE.xml b/src/chrome/content/rules/VoterVOICE.xml
index bf42288176ea..9fc078c94538 100644
--- a/src/chrome/content/rules/VoterVOICE.xml
+++ b/src/chrome/content/rules/VoterVOICE.xml
@@ -3,4 +3,4 @@
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/VouchedFor.co.uk.xml b/src/chrome/content/rules/VouchedFor.co.uk.xml
index 45f3d0d42ba9..805c2b97bbd1 100644
--- a/src/chrome/content/rules/VouchedFor.co.uk.xml
+++ b/src/chrome/content/rules/VouchedFor.co.uk.xml
@@ -14,7 +14,7 @@ Fetch error: http://partners.vouchedfor.co.uk/ => https://partners.vouchedfor.co
 		- .vouchedfor.co.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Vovici.com.xml b/src/chrome/content/rules/Vovici.com.xml
index e40ee203e6fd..3d77ad8a1acc 100644
--- a/src/chrome/content/rules/Vovici.com.xml
+++ b/src/chrome/content/rules/Vovici.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://desktop.vovici.com/ => https://desktop.vovici.com/: (28, 'Op
 Fetch error: http://system.vovici.com/ => https://system.vovici.com/: (28, 'Operation timed out after 0 milliseconds with 0 out of 0 bytes received')
 Fetch error: http://www.vovici.com/ => https://vovici.com/: (28, 'Operation timed out after 0 milliseconds with 0 out of 0 bytes received')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Vox.com.xml b/src/chrome/content/rules/Vox.com.xml
index 99b2fa5487f0..e636dfa5b91f 100644
--- a/src/chrome/content/rules/Vox.com.xml
+++ b/src/chrome/content/rules/Vox.com.xml
@@ -18,38 +18,14 @@
 
 	ʳ Refused
 
-
-	^vox.com: Refused
-
 -->
-
+
 
-	
-	
-
-	
 	
+	
 
-		
-		
-
-			
-			
-
-
-	
-	
-
-
-	
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Voxel.xml b/src/chrome/content/rules/Voxel.xml
index 17fa3f6b56f8..f2aa6e268377 100644
--- a/src/chrome/content/rules/Voxel.xml
+++ b/src/chrome/content/rules/Voxel.xml
@@ -5,7 +5,7 @@
 	
 
 
-	
+	
 
 
 	
 
 	
-	
+	
+	
+	
+	
+	
+	
 		
diff --git a/src/chrome/content/rules/Voyage_Group.com.xml b/src/chrome/content/rules/Voyage_Group.com.xml
index e0d5d92278e1..d6e55f59b059 100644
--- a/src/chrome/content/rules/Voyage_Group.com.xml
+++ b/src/chrome/content/rules/Voyage_Group.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://boat.voyagegroup.com/ => https://boat.voyagegroup.com/: (28,
 	www.voyagegroup.com: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Vozpopuli.com.xml b/src/chrome/content/rules/Vozpopuli.com.xml
index 03b256006c58..313cddec6e17 100644
--- a/src/chrome/content/rules/Vozpopuli.com.xml
+++ b/src/chrome/content/rules/Vozpopuli.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://tendencias.vozpopuli.com/ => https://tendencias.vozpopuli.co
 	* gestion.vozpopuli.com
 	* bolsa.vozpopuli.com
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Vpnbook.com.xml b/src/chrome/content/rules/Vpnbook.com.xml
index 3d7549ac6675..65b13721403e 100644
--- a/src/chrome/content/rules/Vpnbook.com.xml
+++ b/src/chrome/content/rules/Vpnbook.com.xml
@@ -1,7 +1,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -13,7 +14,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Vr-mfr.de.xml b/src/chrome/content/rules/Vr-mfr.de.xml
new file mode 100644
index 000000000000..60bd4b529bc6
--- /dev/null
+++ b/src/chrome/content/rules/Vr-mfr.de.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Vrt.be.xml b/src/chrome/content/rules/Vrt.be.xml
index ab8337b3498d..fb05eeade4f7 100644
--- a/src/chrome/content/rules/Vrt.be.xml
+++ b/src/chrome/content/rules/Vrt.be.xml
@@ -13,6 +13,8 @@
 		pers.vrt.be
         Mixed Content:
                 radiospotcel.vrt.be (Missing CSS)
+  Timeout
+    css.vrt.be
 -->
 
     
@@ -21,8 +23,7 @@
     
     
     
-    
-        
+    
     
     
     
diff --git a/src/chrome/content/rules/Vsexshop.ru.xml b/src/chrome/content/rules/Vsexshop.ru.xml
index 5eab7c8bea91..5971aab5c0d8 100644
--- a/src/chrome/content/rules/Vsexshop.ru.xml
+++ b/src/chrome/content/rules/Vsexshop.ru.xml
@@ -4,11 +4,12 @@
 -->
 
 
-	
+	
+	
 	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Vtiger.com.xml b/src/chrome/content/rules/Vtiger.com.xml
index 98110f2f3fa6..84c883992906 100644
--- a/src/chrome/content/rules/Vtiger.com.xml
+++ b/src/chrome/content/rules/Vtiger.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://blogs.vtiger.com/ => https://blogs.vtiger.com/: (7, 'Failed
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/VuFind.org.xml b/src/chrome/content/rules/VuFind.org.xml
index b66093364923..5482a62a80d9 100644
--- a/src/chrome/content/rules/VuFind.org.xml
+++ b/src/chrome/content/rules/VuFind.org.xml
@@ -12,6 +12,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/Vueling.xml b/src/chrome/content/rules/Vueling.xml
index 1203b3ac14f1..3d301a00cbd1 100644
--- a/src/chrome/content/rules/Vueling.xml
+++ b/src/chrome/content/rules/Vueling.xml
@@ -1,7 +1,7 @@
 
   
   
-  
+
   
   
 
diff --git a/src/chrome/content/rules/Vulture.com.xml b/src/chrome/content/rules/Vulture.com.xml
deleted file mode 100644
index bd70913e3f89..000000000000
--- a/src/chrome/content/rules/Vulture.com.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Vumanity.net.xml b/src/chrome/content/rules/Vumanity.net.xml
index e0b460bf5352..7e87c6e8b6a3 100644
--- a/src/chrome/content/rules/Vumanity.net.xml
+++ b/src/chrome/content/rules/Vumanity.net.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.vumanity.net/ => https://www.vumanity.net/: (28, 'Connec
 		- help	(dropped)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Vungle.com-falsemixed.xml b/src/chrome/content/rules/Vungle.com-falsemixed.xml
index b080dba44b04..368af0cc1ba2 100644
--- a/src/chrome/content/rules/Vungle.com-falsemixed.xml
+++ b/src/chrome/content/rules/Vungle.com-falsemixed.xml
@@ -4,13 +4,11 @@
 -->
 
 
-	
+	
+	
 
 
-	
 
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Vuze.xml b/src/chrome/content/rules/Vuze.xml
index 6b1b37f15a95..b8667cfb5e7a 100644
--- a/src/chrome/content/rules/Vuze.xml
+++ b/src/chrome/content/rules/Vuze.xml
@@ -4,7 +4,7 @@
 
 	CDN buckets:
 
-		- web-www-1660276444.us-east-1.elb.amazonaws.com 
+		- web-www-1660276444.us-east-1.elb.amazonaws.com
 		- d1ov8b9v5fwdrf.cloudfront.net
 
 		- d2ojrr2o5sghfq.cloudfront.net
diff --git a/src/chrome/content/rules/VyprVPN.com.xml b/src/chrome/content/rules/VyprVPN.com.xml
new file mode 100644
index 000000000000..b005a7013da9
--- /dev/null
+++ b/src/chrome/content/rules/VyprVPN.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Vzaar.xml b/src/chrome/content/rules/Vzaar.xml
index 62b91103a830..2677035c1884 100644
--- a/src/chrome/content/rules/Vzaar.xml
+++ b/src/chrome/content/rules/Vzaar.xml
@@ -1,47 +1,18 @@
-
-
-
-
-	
+
 	
+	
 	
 	
 	
 	
-	
 	
 	
+	
 	
 	
-	
-
-	
-	
-
-
-	
-	
-	
-
-	
-
 
-	
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/W00tads.com.xml b/src/chrome/content/rules/W00tads.com.xml
index 71ea196eb847..87e0c2415232 100644
--- a/src/chrome/content/rules/W00tads.com.xml
+++ b/src/chrome/content/rules/W00tads.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://delivery.w00tads.com/ => https://delivery.w00tads.com/: (28,
 Fetch error: http://www.w00tads.com/ => https://www.w00tads.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/W3C-Test.org.xml b/src/chrome/content/rules/W3C-Test.org.xml
new file mode 100644
index 000000000000..6ae6a5285743
--- /dev/null
+++ b/src/chrome/content/rules/W3C-Test.org.xml
@@ -0,0 +1,28 @@
+
+
+	
+	
+	
+	
+	
+	
+		
+
+	
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/W3C.xml b/src/chrome/content/rules/W3C.xml
index b07eb63ab093..6e612d5fa1ff 100644
--- a/src/chrome/content/rules/W3C.xml
+++ b/src/chrome/content/rules/W3C.xml
@@ -6,9 +6,12 @@
 		- flanders (mismatch)
 		- herman (timeout)
 		- irc (401)
-		- people (mismatch)
+		- people (mixed content)
 		- services (mixed content)
 		- test (no longer exists on server)
+
+	Related:
+		W3C-Test.org.xml
 -->
 
 
diff --git a/src/chrome/content/rules/W4a.fr.xml b/src/chrome/content/rules/W4a.fr.xml
deleted file mode 100644
index 8cf5886ca007..000000000000
--- a/src/chrome/content/rules/W4a.fr.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/WAPY.xml b/src/chrome/content/rules/WAPY.xml
index 6d436e427005..e82dafdffeaa 100644
--- a/src/chrome/content/rules/WAPY.xml
+++ b/src/chrome/content/rules/WAPY.xml
@@ -2,7 +2,8 @@
 
 	
 	
-	
+	
+	
 
 
 	
-
+
 
 	
diff --git a/src/chrome/content/rules/WDWS.xml b/src/chrome/content/rules/WDWS.xml
index 3f42aea9d8af..dd01bf0b3e52 100644
--- a/src/chrome/content/rules/WDWS.xml
+++ b/src/chrome/content/rules/WDWS.xml
@@ -15,4 +15,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/WEBxMedia.xml b/src/chrome/content/rules/WEBxMedia.xml
index 5db1edb8e22a..d8b3fa62d8f1 100644
--- a/src/chrome/content/rules/WEBxMedia.xml
+++ b/src/chrome/content/rules/WEBxMedia.xml
@@ -5,7 +5,7 @@ Fetch error: http://webxmedia.co.uk/ => https://webxmedia.co.uk/: (51, "SSL: no
 Fetch error: http://www.webxmedia.co.uk/ => https://www.webxmedia.co.uk/: (51, "SSL: no alternative certificate subject name matches target host name 'www.webxmedia.co.uk'")
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.webxmedia.co.uk/ => https://www.webxmedia.co.uk/: (51, "
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/WEDOS.xml b/src/chrome/content/rules/WEDOS.xml
index 5ce1307e5166..96a0c2beffc7 100644
--- a/src/chrome/content/rules/WEDOS.xml
+++ b/src/chrome/content/rules/WEDOS.xml
@@ -8,7 +8,7 @@
 	- dod.wedos.com
 	- webpagetest.wedos.com
 	- *.wedos.ws
-	
+
 	Redirect loop:
 	- www.wedos.com
 -->
diff --git a/src/chrome/content/rules/WEForum.org.xml b/src/chrome/content/rules/WEForum.org.xml
new file mode 100644
index 000000000000..438a0ba188a2
--- /dev/null
+++ b/src/chrome/content/rules/WEForum.org.xml
@@ -0,0 +1,23 @@
+
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/WE_Forum.org.xml b/src/chrome/content/rules/WE_Forum.org.xml
deleted file mode 100644
index 15ba0db8b696..000000000000
--- a/src/chrome/content/rules/WE_Forum.org.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-	
-	
-	
-	
-		
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/WHI_CDN.com.xml b/src/chrome/content/rules/WHI_CDN.com.xml
deleted file mode 100644
index 7c994c5a8bb2..000000000000
--- a/src/chrome/content/rules/WHI_CDN.com.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/WHIcdn.com.xml b/src/chrome/content/rules/WHIcdn.com.xml
new file mode 100644
index 000000000000..232b39782dbe
--- /dev/null
+++ b/src/chrome/content/rules/WHIcdn.com.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+		
+		
+
+	
+
diff --git a/src/chrome/content/rules/WHMCS.xml b/src/chrome/content/rules/WHMCS.xml
index 459cd85a3b6c..2b4208d4d2d0 100644
--- a/src/chrome/content/rules/WHMCS.xml
+++ b/src/chrome/content/rules/WHMCS.xml
@@ -52,7 +52,7 @@
 					-->
 	
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/WHYY.org.xml b/src/chrome/content/rules/WHYY.org.xml
index 6bb3c28844f6..dda0dc1aff83 100644
--- a/src/chrome/content/rules/WHYY.org.xml
+++ b/src/chrome/content/rules/WHYY.org.xml
@@ -21,7 +21,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/WIMM.com.xml b/src/chrome/content/rules/WIMM.com.xml
deleted file mode 100644
index a891aa5d02fe..000000000000
--- a/src/chrome/content/rules/WIMM.com.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/WIPO.int.xml b/src/chrome/content/rules/WIPO.int.xml
new file mode 100644
index 000000000000..9b6f17ec1502
--- /dev/null
+++ b/src/chrome/content/rules/WIPO.int.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/WLxrs.com.xml b/src/chrome/content/rules/WLxrs.com.xml
index c6ca7f59675f..a9b10b3c42a6 100644
--- a/src/chrome/content/rules/WLxrs.com.xml
+++ b/src/chrome/content/rules/WLxrs.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://secure.wlxrs.com/ => https://secure.wlxrs.com/: (51, "SSL: n
 			- secure
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/WM_Jobs.co.uk.xml b/src/chrome/content/rules/WM_Jobs.co.uk.xml
index 2856ec8ba03e..133753f73f25 100644
--- a/src/chrome/content/rules/WM_Jobs.co.uk.xml
+++ b/src/chrome/content/rules/WM_Jobs.co.uk.xml
@@ -10,7 +10,7 @@ Fetch error: http://wmjobs.co.uk/ => https://wmjobs.co.uk/: (60, 'SSL certificat
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/WP-Engine.xml b/src/chrome/content/rules/WP-Engine.xml
index ea0739a52696..f7630719288f 100644
--- a/src/chrome/content/rules/WP-Engine.xml
+++ b/src/chrome/content/rules/WP-Engine.xml
@@ -15,7 +15,6 @@
 	Problematic subdomains:
 
 		- cdn			(404; mismatched, CN: *.netdna-ssl.com)
-		- press			(mismatched, CN: *.heroku.com)
 		- *.*.wpengine.com	(mismatched, CN: *.wpengine.com)
 
 
@@ -25,7 +24,7 @@
 		- cdn		(→ ^)
 		- devbox
 		- my
-		- press		(→ wpengine.totemapp.com)
+		- press
 		- signup
 		- support
 		- \w+ *
@@ -60,7 +59,6 @@
 	
 	
 
-		
 		
 		
 		
@@ -83,15 +81,12 @@
 	
 	
 
-	
+	
 
 
 	
 
-	
-
 	
 
diff --git a/src/chrome/content/rules/WP.pl-problematic.xml b/src/chrome/content/rules/WP.pl-problematic.xml
deleted file mode 100644
index 318c29540c92..000000000000
--- a/src/chrome/content/rules/WP.pl-problematic.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/WP.pl.xml b/src/chrome/content/rules/WP.pl.xml
index 6fe0da210b91..3262b3b08093 100644
--- a/src/chrome/content/rules/WP.pl.xml
+++ b/src/chrome/content/rules/WP.pl.xml
@@ -1,153 +1,87 @@
-
 
-
+
 
+	
+	
+	
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
 	
+	
+	
+	
+	
+	
+	
+	
 	
+	
 	
+	
+	
+	
 	
+	
 	
+	
+	
+	
 	
+	
+	
 	
+	
+	
+	
+	
+	
 
 		
diff --git a/src/chrome/content/rules/WPML.org.xml b/src/chrome/content/rules/WPML.org.xml
deleted file mode 100644
index d6f84ae1900d..000000000000
--- a/src/chrome/content/rules/WPML.org.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/WP_Software.net.xml b/src/chrome/content/rules/WP_Software.net.xml
deleted file mode 100644
index 173d16f44ec2..000000000000
--- a/src/chrome/content/rules/WP_Software.net.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/WP_VulnDB.com.xml b/src/chrome/content/rules/WP_VulnDB.com.xml
deleted file mode 100644
index 2f50a39033e2..000000000000
--- a/src/chrome/content/rules/WP_VulnDB.com.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/WP_digital.net.xml b/src/chrome/content/rules/WP_digital.net.xml
index 773330e7d31b..2dcae0256bd9 100644
--- a/src/chrome/content/rules/WP_digital.net.xml
+++ b/src/chrome/content/rules/WP_digital.net.xml
@@ -39,7 +39,8 @@
 -->
 
 
-	
+	
+	
 
 
 	
-
-
-	
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/WRAL.com.xml b/src/chrome/content/rules/WRAL.com.xml
index 93bc1e75ece7..bdaa473b58df 100644
--- a/src/chrome/content/rules/WRAL.com.xml
+++ b/src/chrome/content/rules/WRAL.com.xml
@@ -10,19 +10,19 @@ Fetch error: http://wral.com/ => https://wral.com/: Cycle detected - URL already
 		- wwwcache	(akamai)
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
 
 
-	
 
 	
 
+	
 
diff --git a/src/chrome/content/rules/WSJ.net.xml b/src/chrome/content/rules/WSJ.net.xml
index 480cedb48066..3d777d77c323 100644
--- a/src/chrome/content/rules/WSJ.net.xml
+++ b/src/chrome/content/rules/WSJ.net.xml
@@ -8,70 +8,60 @@
 		- sc.wsj.net.edgesuite.net
 
 	403:
-		stvquotes.wsj.net
-
-	Different http/https content:
-		s.wsj.net/video/	http://s.wsj.net/video/public/videocenter.min-a269c50b.css
+		- stvquotes.wsj.net
 
 	Mismatched:
-		^wsj.net
-		www.wsj.net
-		images.conferences.wsj.net
+		- wsj.net
+		- www.wsj.net
+		- barrons.wsj.net
+		- ereader.wsj.net
+		- images.conferences.wsj.net
 -->
 
 
-	
 	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
 		
+	
 		
+	
 		
+	
 		
+	
 		
+	
 		
+	
+	
+		
+		
+		
+		
+		
+	
 		
+	
 		
+	
 		
+	
 		
+	
 		
+	
 		
+	
 		
+	
+	
 		
+	
 		
+	
 		
+	
 		
 
-	
-	
-	
-		
-
-	
-	
-		
-		
-		
-		
-		
-		
-
 	
 
 	
diff --git a/src/chrome/content/rules/WSO2.com.xml b/src/chrome/content/rules/WSO2.com.xml
index d52ee30f0eb3..4036cc877d49 100644
--- a/src/chrome/content/rules/WSO2.com.xml
+++ b/src/chrome/content/rules/WSO2.com.xml
@@ -11,7 +11,7 @@
 
 		- Images, on:
 
-			- ^ from connect * 
+			- ^ from connect *
 			- ^ from \d.content *
 
 	* Secured by us
diff --git a/src/chrome/content/rules/WSPRnet.org.xml b/src/chrome/content/rules/WSPRnet.org.xml
new file mode 100644
index 000000000000..02bc23509a74
--- /dev/null
+++ b/src/chrome/content/rules/WSPRnet.org.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/WURFUL.xml b/src/chrome/content/rules/WURFUL.xml
index 81138a4f824a..95ac55a67cc1 100644
--- a/src/chrome/content/rules/WURFUL.xml
+++ b/src/chrome/content/rules/WURFUL.xml
@@ -1,5 +1,5 @@
 
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/WVU.edu.xml b/src/chrome/content/rules/WVU.edu.xml
new file mode 100644
index 000000000000..17cdcd3be922
--- /dev/null
+++ b/src/chrome/content/rules/WVU.edu.xml
@@ -0,0 +1,96 @@
+
+
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+	
+	
+	
+
+	
+	
+
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+
+	
+	
+	
+
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
+	
+	
+	
+	
+	
+
+	
+	
+	
+
+	
+	
+	
+	
+	
+
+	
+	
+	
+
+	
+
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/WWTE.xml b/src/chrome/content/rules/WWTE.xml
index 07b8ab002958..646e775312fc 100644
--- a/src/chrome/content/rules/WWTE.xml
+++ b/src/chrome/content/rules/WWTE.xml
@@ -48,7 +48,7 @@ Fetch error: http://www.wwte14.com/ => https://travel.wwte1.com/pubspec/scripts/
 	* Mismatched, CN: *.wwte1.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/WaBi.com.xml b/src/chrome/content/rules/WaBi.com.xml
deleted file mode 100644
index 28fbb376d4fd..000000000000
--- a/src/chrome/content/rules/WaBi.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/WaPo_Labs.com.xml b/src/chrome/content/rules/WaPo_Labs.com.xml
deleted file mode 100644
index 36af32ba7823..000000000000
--- a/src/chrome/content/rules/WaPo_Labs.com.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Wachovia.xml b/src/chrome/content/rules/Wachovia.xml
index 0eb66a3050e7..3590f9ff3f00 100644
--- a/src/chrome/content/rules/Wachovia.xml
+++ b/src/chrome/content/rules/Wachovia.xml
@@ -10,7 +10,7 @@
 		- myed.wachovia.com
 
 -->
-
+
 
 	
@@ -23,7 +23,7 @@
 					-->
 	
 
-	
+	
 
 
 	
 
 	
-	
+	
+	
 
 
 	
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Waffles.fm.xml b/src/chrome/content/rules/Waffles.fm.xml
index c8a5f59059a6..97aa8b3023de 100644
--- a/src/chrome/content/rules/Waffles.fm.xml
+++ b/src/chrome/content/rules/Waffles.fm.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.waffles.fm/ => https://www.waffles.fm/: (28, 'Connection
 	* Secured by us, site redirects to https without us
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Waitrose_Direct.com.xml b/src/chrome/content/rules/Waitrose_Direct.com.xml
index 21159ddedc25..3540085c2818 100644
--- a/src/chrome/content/rules/Waitrose_Direct.com.xml
+++ b/src/chrome/content/rules/Waitrose_Direct.com.xml
@@ -21,7 +21,8 @@
 
 
 	
-	
+	
+	
 		
diff --git a/src/chrome/content/rules/Wakelet.com.xml b/src/chrome/content/rules/Wakelet.com.xml
index d94a248f9af0..d23e0b25b686 100644
--- a/src/chrome/content/rules/Wakelet.com.xml
+++ b/src/chrome/content/rules/Wakelet.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://img3.wakelet.com/ => https://img3.wakelet.com/: (6, 'Could n
 		- wakelet.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Wales.gov.uk.xml b/src/chrome/content/rules/Wales.gov.uk.xml
index 9e496efe4a82..79a15483bc05 100644
--- a/src/chrome/content/rules/Wales.gov.uk.xml
+++ b/src/chrome/content/rules/Wales.gov.uk.xml
@@ -32,7 +32,7 @@ Fetch error: http://cssiw.wales.gov.uk/ => https://cssiw.wales.gov.uk/: (51, "SS
 		- statswales.wales.gov.uk
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Walgreens.xml b/src/chrome/content/rules/Walgreens.xml
index 69d3403d0008..d02e3cf7c1c4 100644
--- a/src/chrome/content/rules/Walgreens.xml
+++ b/src/chrome/content/rules/Walgreens.xml
@@ -13,7 +13,9 @@
 
 
 	
-	
+	
+	
+	
 		
 
 
@@ -22,7 +24,6 @@
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Walking_Men.xml b/src/chrome/content/rules/Walking_Men.xml
index 3991ae5bc442..d2fd059ac497 100644
--- a/src/chrome/content/rules/Walking_Men.xml
+++ b/src/chrome/content/rules/Walking_Men.xml
@@ -14,7 +14,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Wall-Street-Journal.xml b/src/chrome/content/rules/Wall-Street-Journal.xml
new file mode 100644
index 000000000000..9c9f4e2da194
--- /dev/null
+++ b/src/chrome/content/rules/Wall-Street-Journal.xml
@@ -0,0 +1,125 @@
+
+
+
+	
+	
+
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+
+
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+
+
+	
+
diff --git a/src/chrome/content/rules/Wallabag.org.xml b/src/chrome/content/rules/Wallabag.org.xml
deleted file mode 100644
index 16a611b6f52f..000000000000
--- a/src/chrome/content/rules/Wallabag.org.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Wallet.La.xml b/src/chrome/content/rules/Wallet.La.xml
index 56b5cf295d6b..6a17b7ebaf14 100644
--- a/src/chrome/content/rules/Wallet.La.xml
+++ b/src/chrome/content/rules/Wallet.La.xml
@@ -5,7 +5,7 @@ Fetch error: http://wallet.la/ => https://wallet.la/: (28, 'Connection timed out
 Fetch error: http://www.wallet.la/ => https://www.wallet.la/: (7, '')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/WalletGenerator.net.xml b/src/chrome/content/rules/WalletGenerator.net.xml
index a55debba05cd..f9f06273712a 100644
--- a/src/chrome/content/rules/WalletGenerator.net.xml
+++ b/src/chrome/content/rules/WalletGenerator.net.xml
@@ -5,7 +5,7 @@
 	www.walletgenerator.net: Shows default page
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Walmart.com-falsemixed.xml b/src/chrome/content/rules/Walmart.com-falsemixed.xml
deleted file mode 100644
index 341e9d03ff6e..000000000000
--- a/src/chrome/content/rules/Walmart.com-falsemixed.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Walmart.com.xml b/src/chrome/content/rules/Walmart.com.xml
index 2fb7b625eaec..1e006740a7ef 100644
--- a/src/chrome/content/rules/Walmart.com.xml
+++ b/src/chrome/content/rules/Walmart.com.xml
@@ -1,21 +1,5 @@
-
 
-
+
+	
+	
 
-	
-	
 	
 	
-	
 	
+	
 	
+
+	
 	
+	
+
+	
 	
 	
-
 	
 	
 	
-
 	
+
 	
 	
-	
 	
+
 	
+
+	
+
+	
+
 	
 	
-	
+
+	
 	
+
 	
 	
-	
 	
 	
-	
-	
 
-	
-	
-	
-
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-			
-
-		
-		
-
-			
-			
-			
-			
-			
-
-			
-			
-			
-
-		
-
-			
-		
+	
+	
 
-			
-			
-
-		
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-
-	
-
-	
-	
+	
 
 	
-
 
diff --git a/src/chrome/content/rules/Walmart_images.com.xml b/src/chrome/content/rules/Walmart_images.com.xml
index 175adc27da87..677dc63f3bdf 100644
--- a/src/chrome/content/rules/Walmart_images.com.xml
+++ b/src/chrome/content/rules/Walmart_images.com.xml
@@ -1,4 +1,13 @@
+
 
-	
+	
 	
 	
 	
-	
+	
 
 	
-	
-	
-
+	
+	
 
 	
@@ -34,10 +42,6 @@
 
 	
 
-
-	
-
 	
 
diff --git a/src/chrome/content/rules/Wamba.com.xml b/src/chrome/content/rules/Wamba.com.xml
index a22f50795f10..d3ce4c99e9bc 100644
--- a/src/chrome/content/rules/Wamba.com.xml
+++ b/src/chrome/content/rules/Wamba.com.xml
@@ -14,7 +14,6 @@
 
 	
 
-	
 	
 	
 	
diff --git a/src/chrome/content/rules/Wand.com.xml b/src/chrome/content/rules/Wand.com.xml
index e2fea1fe8c91..ae3b1ab4507d 100644
--- a/src/chrome/content/rules/Wand.com.xml
+++ b/src/chrome/content/rules/Wand.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.wand.com/ => https://www.wand.com/: (28, 'Connection tim
 		- www.wand.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Wandoujia.xml b/src/chrome/content/rules/Wandoujia.xml
index f1538d5a6db2..47b18eb1802d 100644
--- a/src/chrome/content/rules/Wandoujia.xml
+++ b/src/chrome/content/rules/Wandoujia.xml
@@ -36,7 +36,6 @@
 
 	
 	
-		
 		
 		
 
diff --git a/src/chrome/content/rules/Wanglibao.com.xml b/src/chrome/content/rules/Wanglibao.com.xml
deleted file mode 100644
index 1666e73c23c9..000000000000
--- a/src/chrome/content/rules/Wanglibao.com.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Waqi.info.xml b/src/chrome/content/rules/Waqi.info.xml
new file mode 100644
index 000000000000..7eaf24d3358e
--- /dev/null
+++ b/src/chrome/content/rules/Waqi.info.xml
@@ -0,0 +1,53 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/WardahBooks.com.xml b/src/chrome/content/rules/WardahBooks.com.xml
new file mode 100644
index 000000000000..b7318cf74945
--- /dev/null
+++ b/src/chrome/content/rules/WardahBooks.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Wargaming.net.xml b/src/chrome/content/rules/Wargaming.net.xml
deleted file mode 100644
index 163dc1ea1213..000000000000
--- a/src/chrome/content/rules/Wargaming.net.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Wargaming.xml b/src/chrome/content/rules/Wargaming.xml
new file mode 100644
index 000000000000..5b3e16bd3267
--- /dev/null
+++ b/src/chrome/content/rules/Wargaming.xml
@@ -0,0 +1,93 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+	
+
diff --git a/src/chrome/content/rules/Warner_Bros.com.xml b/src/chrome/content/rules/Warner_Bros.com.xml
index 3839c41c39c8..0d0eb70b23cf 100644
--- a/src/chrome/content/rules/Warner_Bros.com.xml
+++ b/src/chrome/content/rules/Warner_Bros.com.xml
@@ -5,7 +5,6 @@ Fetch error: http://registration.warnerbros.com/ => https://registration.warnerb
 
 	Other Warner Bros rulesets:
 
-		- Batman_Arkham_Knight.com.xml
 		- Community.wbgames.com.xml
 		- Shadow_of_Mordor.com.xml
 		- WB_Play.com.xml
@@ -21,7 +20,7 @@ Fetch error: http://registration.warnerbros.com/ => https://registration.warnerb
 	² Redirects to http
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Warwick-Castle.xml b/src/chrome/content/rules/Warwick-Castle.xml
index f92ac576ea73..6014d33f2dc4 100644
--- a/src/chrome/content/rules/Warwick-Castle.xml
+++ b/src/chrome/content/rules/Warwick-Castle.xml
@@ -5,7 +5,7 @@ Fetch error: http://warwick-castle.com/ => https://warwick-castle.com/: (28, 'Co
 
 	For other Merlin Entertainments coverage, see Merlin-Entertainments.xml.
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Warzone2100.xml b/src/chrome/content/rules/Warzone2100.xml
deleted file mode 100644
index b72014a1e029..000000000000
--- a/src/chrome/content/rules/Warzone2100.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-	
-	
-	
-
-
-	
-	
-
-  
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Wash_Post.com.xml b/src/chrome/content/rules/Wash_Post.com.xml
index ba736da22e03..3f77835bbefe 100644
--- a/src/chrome/content/rules/Wash_Post.com.xml
+++ b/src/chrome/content/rules/Wash_Post.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://media.washpost.com/ => https://media.washpost.com/: (28, 'Co
 	^washpost.com doesn't exist
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Washington-Post-Company.xml b/src/chrome/content/rules/Washington-Post-Company.xml
index 969dc6be793e..1cf8d14bafa0 100644
--- a/src/chrome/content/rules/Washington-Post-Company.xml
+++ b/src/chrome/content/rules/Washington-Post-Company.xml
@@ -1,4 +1,9 @@
+
 
 
 	
@@ -157,13 +160,13 @@
 					-->
 			
 			
+			
 			
 			
 
 			
 			
-			
 
 		
 		
@@ -182,14 +185,14 @@
 	
 
 	
-	
+
 	
 	
 		
 	
 	
 		
-	
+
 	
 
 
diff --git a/src/chrome/content/rules/Washington_University_in_St_Louis.xml b/src/chrome/content/rules/Washington_University_in_St_Louis.xml
index b9da042c58d0..f4ca98576f96 100644
--- a/src/chrome/content/rules/Washington_University_in_St_Louis.xml
+++ b/src/chrome/content/rules/Washington_University_in_St_Louis.xml
@@ -320,7 +320,7 @@ Fetch error: http://www.insurance.wustl.edu/ => https://www.insurance.wustl.edu/
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Water-Challenge.com.xml b/src/chrome/content/rules/Water-Challenge.com.xml
index 0a55bc180a33..e0c28329a096 100644
--- a/src/chrome/content/rules/Water-Challenge.com.xml
+++ b/src/chrome/content/rules/Water-Challenge.com.xml
@@ -14,4 +14,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Water.org.xml b/src/chrome/content/rules/Water.org.xml
index ea6562f1046a..4d39542f071b 100644
--- a/src/chrome/content/rules/Water.org.xml
+++ b/src/chrome/content/rules/Water.org.xml
@@ -10,7 +10,9 @@
 
 
 	
-	
+	
+	
+	
 		
 
 
@@ -20,7 +22,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Water_Marquee.xml b/src/chrome/content/rules/Water_Marquee.xml
index b7158463740c..dda9df8bb8cb 100644
--- a/src/chrome/content/rules/Water_Marquee.xml
+++ b/src/chrome/content/rules/Water_Marquee.xml
@@ -4,9 +4,9 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Watershed.xml b/src/chrome/content/rules/Watershed.xml
index c3a55782f13a..0e3401ac47b5 100644
--- a/src/chrome/content/rules/Watershed.xml
+++ b/src/chrome/content/rules/Watershed.xml
@@ -10,16 +10,16 @@ Fetch error: http://watershed.co.uk/ => https://www.watershed.co.uk/: Cycle dete
 		- ^	(redirects to http)
 
 -->
-
+
 
 	
-	
+	
+	
 
 
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Watkins.edu.xml b/src/chrome/content/rules/Watkins.edu.xml
index c436fca3a98b..3189e8b527c4 100644
--- a/src/chrome/content/rules/Watkins.edu.xml
+++ b/src/chrome/content/rules/Watkins.edu.xml
@@ -19,7 +19,7 @@ Fetch error: http://www.watkins.edu/ => https://www.watkins.edu/: (51, "SSL: no
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Watson_Institute.org.xml b/src/chrome/content/rules/Watson_Institute.org.xml
index fc55e63493c6..c708c6e6636b 100644
--- a/src/chrome/content/rules/Watson_Institute.org.xml
+++ b/src/chrome/content/rules/Watson_Institute.org.xml
@@ -25,4 +25,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Watsons.com.hk.xml b/src/chrome/content/rules/Watsons.com.hk.xml
new file mode 100644
index 000000000000..7ea68c527c34
--- /dev/null
+++ b/src/chrome/content/rules/Watsons.com.hk.xml
@@ -0,0 +1,37 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Wauland.de.xml b/src/chrome/content/rules/Wauland.de.xml
deleted file mode 100644
index 468d136ceddb..000000000000
--- a/src/chrome/content/rules/Wauland.de.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Wavpin.xml b/src/chrome/content/rules/Wavpin.xml
index 4f765200425d..dfdea6c2d7f9 100644
--- a/src/chrome/content/rules/Wavpin.xml
+++ b/src/chrome/content/rules/Wavpin.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.wavpin.com/ => https://www.wavpin.com/: (7, 'Failed to c
 	Mixed images from 3rd-party news websites.
 
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://www.wavpin.com/ => https://www.wavpin.com/: (7, 'Failed to c
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Way2Allah.com.xml b/src/chrome/content/rules/Way2Allah.com.xml
new file mode 100644
index 000000000000..6ac18d139c5f
--- /dev/null
+++ b/src/chrome/content/rules/Way2Allah.com.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Waymoot.org.xml b/src/chrome/content/rules/Waymoot.org.xml
index 3116514ecec6..4f82a9db7607 100644
--- a/src/chrome/content/rules/Waymoot.org.xml
+++ b/src/chrome/content/rules/Waymoot.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.waymoot.org/ => https://www.waymoot.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.waymoot.org'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Wayneashworthart.com.xml b/src/chrome/content/rules/Wayneashworthart.com.xml
new file mode 100644
index 000000000000..1c45cdbd2567
--- /dev/null
+++ b/src/chrome/content/rules/Wayneashworthart.com.xml
@@ -0,0 +1,8 @@
+
+    
+    
+
+    
+
+    
+
diff --git a/src/chrome/content/rules/Wayskinny.com.xml b/src/chrome/content/rules/Wayskinny.com.xml
deleted file mode 100644
index 12e35f385a41..000000000000
--- a/src/chrome/content/rules/Wayskinny.com.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Wccftech.com.xml b/src/chrome/content/rules/Wccftech.com.xml
new file mode 100644
index 000000000000..424a7caaec0f
--- /dev/null
+++ b/src/chrome/content/rules/Wccftech.com.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Wdr.de.xml b/src/chrome/content/rules/Wdr.de.xml
index 992e571e9d5c..4f281c719889 100644
--- a/src/chrome/content/rules/Wdr.de.xml
+++ b/src/chrome/content/rules/Wdr.de.xml
@@ -1,37 +1,56 @@
 
-
+
 
+	
+	
+	
 	
 	
 	
@@ -39,6 +58,7 @@
 	
 	
 	
+	
 	
 	
 	
@@ -59,24 +79,48 @@
 	
 	
 	
+	
 	
 	
 	
+	
+	
+	
 	
-	
+	
+	
+
 	
 	
+
+	
+	
+
+	
 	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
 	
 	
 	
 	
-	
-	
-	
 
-	
+	
+
+	
 
 
diff --git a/src/chrome/content/rules/We-Heart-It.xml b/src/chrome/content/rules/We-Heart-It.xml
deleted file mode 100644
index cf474d01abc9..000000000000
--- a/src/chrome/content/rules/We-Heart-It.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/WeChat.xml b/src/chrome/content/rules/WeChat.xml
index 2d7cc5d84ab9..897e462feb8f 100644
--- a/src/chrome/content/rules/WeChat.xml
+++ b/src/chrome/content/rules/WeChat.xml
@@ -7,7 +7,7 @@
 			 - file2.wechat.com
 
 		Secure connection redirects to plaintext:
-			 - 
+			 -
 -->
 
 	
@@ -27,6 +27,6 @@
 	
 
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/WeHeartIt.com.xml b/src/chrome/content/rules/WeHeartIt.com.xml
new file mode 100644
index 000000000000..6320356b7ea5
--- /dev/null
+++ b/src/chrome/content/rules/WeHeartIt.com.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/WeMonIt.de.xml b/src/chrome/content/rules/WeMonIt.de.xml
deleted file mode 100644
index b3898fcb1bb2..000000000000
--- a/src/chrome/content/rules/WeMonIt.de.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/WePay.xml b/src/chrome/content/rules/WePay.xml
index af821ec6704c..9aaaff46ee3c 100644
--- a/src/chrome/content/rules/WePay.xml
+++ b/src/chrome/content/rules/WePay.xml
@@ -12,13 +12,16 @@
 
 
 	
-	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/WeRoSys.de.xml b/src/chrome/content/rules/WeRoSys.de.xml
deleted file mode 100644
index 49f9bd2743be..000000000000
--- a/src/chrome/content/rules/WeRoSys.de.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/WeTransfer.xml b/src/chrome/content/rules/WeTransfer.xml
index 1c5acfd9c1c3..74cb04d2d12f 100644
--- a/src/chrome/content/rules/WeTransfer.xml
+++ b/src/chrome/content/rules/WeTransfer.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/WeUseCoins.xml b/src/chrome/content/rules/WeUseCoins.xml
index 3ccd48f06e25..d4c75b944017 100644
--- a/src/chrome/content/rules/WeUseCoins.xml
+++ b/src/chrome/content/rules/WeUseCoins.xml
@@ -12,7 +12,7 @@
 
 	
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/We_Are_Wizards.io.xml b/src/chrome/content/rules/We_Are_Wizards.io.xml
index e94ab43fbb5c..f8310b6fba57 100644
--- a/src/chrome/content/rules/We_Are_Wizards.io.xml
+++ b/src/chrome/content/rules/We_Are_Wizards.io.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.wearewizards.io/ => https://www.wearewizards.io/: (51, "
 		- www.blog.wearewizards.io
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Weather-Underground.xml b/src/chrome/content/rules/Weather-Underground.xml
deleted file mode 100644
index 706b8be509b3..000000000000
--- a/src/chrome/content/rules/Weather-Underground.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-		
-	
-
-
diff --git a/src/chrome/content/rules/Weather.com.xml b/src/chrome/content/rules/Weather.com.xml
index c7b44e06982b..6ddbd32fc696 100644
--- a/src/chrome/content/rules/Weather.com.xml
+++ b/src/chrome/content/rules/Weather.com.xml
@@ -1,39 +1,17 @@
-
 
 
-	
+	
+	
 	
-	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
 
 
diff --git a/src/chrome/content/rules/Weather.gov.xml b/src/chrome/content/rules/Weather.gov.xml
index 9aca06fd30a4..89755d323380 100644
--- a/src/chrome/content/rules/Weather.gov.xml
+++ b/src/chrome/content/rules/Weather.gov.xml
@@ -61,7 +61,7 @@ Non-2xx HTTP code: http://nws.weather.gov/nthmp/ (200) => https://nws.weather.go
 		- ocwws.weather.gov
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Weatherzone.xml b/src/chrome/content/rules/Weatherzone.xml
index de6dcf778eaa..943c6fd0ab98 100644
--- a/src/chrome/content/rules/Weatherzone.xml
+++ b/src/chrome/content/rules/Weatherzone.xml
@@ -19,7 +19,8 @@
 
 
 	
-	
+	
+	
 		
 		
diff --git a/src/chrome/content/rules/Web-Hosting-Talk.xml b/src/chrome/content/rules/Web-Hosting-Talk.xml
index c9d01b67b026..7a1c769541c1 100644
--- a/src/chrome/content/rules/Web-Hosting-Talk.xml
+++ b/src/chrome/content/rules/Web-Hosting-Talk.xml
@@ -19,7 +19,7 @@
 	
 	
 	
-	
+
 		
 
 
diff --git a/src/chrome/content/rules/Web-Reservations-International.xml b/src/chrome/content/rules/Web-Reservations-International.xml
index 70fd3bf0b34a..c98d0e9749d6 100644
--- a/src/chrome/content/rules/Web-Reservations-International.xml
+++ b/src/chrome/content/rules/Web-Reservations-International.xml
@@ -21,9 +21,18 @@
 
 	
 	
-	
-	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
@@ -31,8 +40,6 @@
 	
 
 
-	
 
 	
-
+
 
 	
diff --git a/src/chrome/content/rules/Web-registry.com.xml b/src/chrome/content/rules/Web-registry.com.xml
index 8f81ddbcd0bd..211fb93bb33f 100644
--- a/src/chrome/content/rules/Web-registry.com.xml
+++ b/src/chrome/content/rules/Web-registry.com.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://web-registry.com/ => https://web-registry.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 Fetch error: http://www.web-registry.com/ => https://web-registry.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Web-servers.com.au.xml b/src/chrome/content/rules/Web-servers.com.au.xml
index 37de292aa9a2..de27800e006d 100644
--- a/src/chrome/content/rules/Web-servers.com.au.xml
+++ b/src/chrome/content/rules/Web-servers.com.au.xml
@@ -3,10 +3,10 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Web.com.xml b/src/chrome/content/rules/Web.com.xml
index b3e61cc441ae..810e039136e4 100644
--- a/src/chrome/content/rules/Web.com.xml
+++ b/src/chrome/content/rules/Web.com.xml
@@ -10,13 +10,10 @@
 	Other Web.com rulesets:
 
 		- Cactus_Complete_Commerce.xml
-		- LogoYes.xml
 		- Mcssl.com.xml
 		- Myregisteredsite.com.xml
-		- Renovation_Experts.xml
 		- Securepurchaseserver.com.xml
 		- Solid_Cactus.xml
-		- Star_Product_Reviews.xml
 
 
 	ne.edgecastcdn.net/00016B/
@@ -26,6 +23,7 @@
 	Nonfunctional subdomains:
 
 		- ir	(times out)
+    - wpc.016b.edgecastcdn.net
 
 
 	^: cert only matches www
@@ -47,10 +45,11 @@
 -->
 
 
-	
+	
 	
-	
-
+	
+	
+	
 
 	
@@ -63,15 +62,10 @@
 
 	
 
-
 	
 	
 
-	
-
-	
+  
 
 
diff --git a/src/chrome/content/rules/Web4all.fr.xml b/src/chrome/content/rules/Web4all.fr.xml
index 33af3243cbd5..0de484ac3e48 100644
--- a/src/chrome/content/rules/Web4all.fr.xml
+++ b/src/chrome/content/rules/Web4all.fr.xml
@@ -1,7 +1,19 @@
+
 
 	
-	
-	
-	
-	
-	
-	
-	
-	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
 
 
diff --git a/src/chrome/content/rules/WebAssembly.studio.xml b/src/chrome/content/rules/WebAssembly.studio.xml
new file mode 100644
index 000000000000..047b05b85995
--- /dev/null
+++ b/src/chrome/content/rules/WebAssembly.studio.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/WebAssign.xml b/src/chrome/content/rules/WebAssign.xml
index d4106f1d15a5..1709a6432200 100644
--- a/src/chrome/content/rules/WebAssign.xml
+++ b/src/chrome/content/rules/WebAssign.xml
@@ -1,7 +1,7 @@
 
diff --git a/src/chrome/content/rules/WebChuck_hosting.com.xml b/src/chrome/content/rules/WebChuck_hosting.com.xml
index b0717263a577..6778e0c5b81a 100644
--- a/src/chrome/content/rules/WebChuck_hosting.com.xml
+++ b/src/chrome/content/rules/WebChuck_hosting.com.xml
@@ -9,13 +9,12 @@
 -->
 
 
-	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/WebCitz.xml b/src/chrome/content/rules/WebCitz.xml
index 338ee34b7d3a..e8f32e557ce4 100644
--- a/src/chrome/content/rules/WebCitz.xml
+++ b/src/chrome/content/rules/WebCitz.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/WebD.AM.xml b/src/chrome/content/rules/WebD.AM.xml
deleted file mode 100644
index 9240d93a4277..000000000000
--- a/src/chrome/content/rules/WebD.AM.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/WebDAM_DB.com.xml b/src/chrome/content/rules/WebDAM_DB.com.xml
index 1dc70b513ff8..33aac92f54fb 100644
--- a/src/chrome/content/rules/WebDAM_DB.com.xml
+++ b/src/chrome/content/rules/WebDAM_DB.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://webdam.com/ => https://webdam.com/: (35, 'error:140770FC:SSL
 		- secure
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/WebDevStudios.xml b/src/chrome/content/rules/WebDevStudios.xml
index c81b17849a52..b60c79c02611 100644
--- a/src/chrome/content/rules/WebDevStudios.xml
+++ b/src/chrome/content/rules/WebDevStudios.xml
@@ -15,7 +15,7 @@ Fetch error: http://www.webdevstudios.com/ => https://www.webdevstudios.com/: To
 		 - www.webdevstudios.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/WebDiplomacy.net.xml b/src/chrome/content/rules/WebDiplomacy.net.xml
new file mode 100644
index 000000000000..d7f43017923c
--- /dev/null
+++ b/src/chrome/content/rules/WebDiplomacy.net.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/WebEx-Communications.xml b/src/chrome/content/rules/WebEx-Communications.xml
deleted file mode 100644
index afde2d987ebb..000000000000
--- a/src/chrome/content/rules/WebEx-Communications.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-	
-		
-		
-
-
-	
-	
-
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/WebGo.xml b/src/chrome/content/rules/WebGo.xml
index bd7ee3e6a709..2c2cdbd18691 100644
--- a/src/chrome/content/rules/WebGo.xml
+++ b/src/chrome/content/rules/WebGo.xml
@@ -19,14 +19,14 @@ Fetch error: http://www.website.webgo.de/ => https://www.website.webgo.de/: (6,
 		- support
 
 -->
-
+
 	
 	
 	
-		
+	
 	
 	
-	
+
 	
 
      https://login.webgo24.de/: (51, "SSL: n
 	² Unsecurable
 
 -->
-
+
 
 	
 	
@@ -36,7 +36,7 @@ Fetch error: http://login.webgo24.de/ => https://login.webgo24.de/: (51, "SSL: n
 		Server sets Secure for:
 					-->
 	
-	
+
     
 
diff --git a/src/chrome/content/rules/WebINK.com.xml b/src/chrome/content/rules/WebINK.com.xml
index 6efe24a1285a..d9ceed94c9ca 100644
--- a/src/chrome/content/rules/WebINK.com.xml
+++ b/src/chrome/content/rules/WebINK.com.xml
@@ -41,7 +41,7 @@ Fetch error: http://www.webink.com/ => https://www.webink.com/: (51, "SSL: no al
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/WebKite.com.xml b/src/chrome/content/rules/WebKite.com.xml
index c4ea23709ea5..74e47b6e1135 100644
--- a/src/chrome/content/rules/WebKite.com.xml
+++ b/src/chrome/content/rules/WebKite.com.xml
@@ -15,13 +15,18 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/WebMD.xml b/src/chrome/content/rules/WebMD.xml
index be10b1039703..d63b40c87d1d 100644
--- a/src/chrome/content/rules/WebMD.xml
+++ b/src/chrome/content/rules/WebMD.xml
@@ -1,58 +1,65 @@
 
 
-
-	
-
-
-	
-
-
-	
-
-	
-
-	
-
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+
+	
+
+	
 
diff --git a/src/chrome/content/rules/WebMD_Health.xml b/src/chrome/content/rules/WebMD_Health.xml
index 30d37ff4107f..75af262c8213 100644
--- a/src/chrome/content/rules/WebMD_Health.xml
+++ b/src/chrome/content/rules/WebMD_Health.xml
@@ -10,7 +10,7 @@
 
 
 	
-	
+	
 
 
 	
@@ -19,4 +19,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/WebMD_Health_Services.xml b/src/chrome/content/rules/WebMD_Health_Services.xml
index 6c3247e3720e..f9f1ff410f16 100644
--- a/src/chrome/content/rules/WebMD_Health_Services.xml
+++ b/src/chrome/content/rules/WebMD_Health_Services.xml
@@ -10,7 +10,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -19,7 +20,6 @@
 	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/WebMediaBrands.xml b/src/chrome/content/rules/WebMediaBrands.xml
index 0e9fb81f486a..5e41a0ed815b 100644
--- a/src/chrome/content/rules/WebMediaBrands.xml
+++ b/src/chrome/content/rules/WebMediaBrands.xml
@@ -9,7 +9,8 @@
 
 
 	
-	
+	
+	
 
 	
 	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/WebProspector.xml b/src/chrome/content/rules/WebProspector.xml
index ac0c39d10af8..e03f3fabe4c7 100644
--- a/src/chrome/content/rules/WebProspector.xml
+++ b/src/chrome/content/rules/WebProspector.xml
@@ -16,4 +16,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/WebRTC-Experiment.com.xml b/src/chrome/content/rules/WebRTC-Experiment.com.xml
index f37b968b6e3e..a4cd87746496 100644
--- a/src/chrome/content/rules/WebRTC-Experiment.com.xml
+++ b/src/chrome/content/rules/WebRTC-Experiment.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.cdn.webrtc-experiment.com/ => https://www.cdn.webrtc-exp
 		- (www.)?cdn
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/WebSharks-Inc.com.xml b/src/chrome/content/rules/WebSharks-Inc.com.xml
deleted file mode 100644
index 4377298ef2da..000000000000
--- a/src/chrome/content/rules/WebSharks-Inc.com.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-		
-		
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/WebShopRevolution.com.xml b/src/chrome/content/rules/WebShopRevolution.com.xml
index ced300aa09ee..a1d442f6f573 100644
--- a/src/chrome/content/rules/WebShopRevolution.com.xml
+++ b/src/chrome/content/rules/WebShopRevolution.com.xml
@@ -5,14 +5,14 @@ Fetch error: http://webshoprevolution.com/ => https://webshoprevolution.com/: (6
 
 -->
 
-    
+
     
     
     
 
     
     
-    
+
     
     
 
diff --git a/src/chrome/content/rules/WebSocial.ly.xml b/src/chrome/content/rules/WebSocial.ly.xml
index f03d8c8b6587..8816cf3735eb 100644
--- a/src/chrome/content/rules/WebSocial.ly.xml
+++ b/src/chrome/content/rules/WebSocial.ly.xml
@@ -12,4 +12,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/WebSpectator.com.xml b/src/chrome/content/rules/WebSpectator.com.xml
index 45de132a2004..9fdcf45b8d22 100644
--- a/src/chrome/content/rules/WebSpectator.com.xml
+++ b/src/chrome/content/rules/WebSpectator.com.xml
@@ -25,13 +25,14 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/WebStarts.xml b/src/chrome/content/rules/WebStarts.xml
index 5200226953d6..00b21cd282a3 100644
--- a/src/chrome/content/rules/WebStarts.xml
+++ b/src/chrome/content/rules/WebStarts.xml
@@ -7,7 +7,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/WebTrust.xml b/src/chrome/content/rules/WebTrust.xml
index b99ef6690190..15d4f33b31e9 100644
--- a/src/chrome/content/rules/WebTrust.xml
+++ b/src/chrome/content/rules/WebTrust.xml
@@ -1,36 +1,22 @@
+
 
-
+
 
 	
 	
-	
-
-		
-		
-
-			
-			
-			
-
-			
-			
-
-			
-			
-
-			
-
 
 	
diff --git a/src/chrome/content/rules/WebUrbanist.com.xml b/src/chrome/content/rules/WebUrbanist.com.xml
index c62255740098..c2469d07fe5d 100644
--- a/src/chrome/content/rules/WebUrbanist.com.xml
+++ b/src/chrome/content/rules/WebUrbanist.com.xml
@@ -19,11 +19,12 @@
 
 
 	
-	
+	
+	
 		
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/WebXakep.Net.xml b/src/chrome/content/rules/WebXakep.Net.xml
index 9e9e98a4f00b..d91772e0f526 100644
--- a/src/chrome/content/rules/WebXakep.Net.xml
+++ b/src/chrome/content/rules/WebXakep.Net.xml
@@ -11,18 +11,17 @@ Fetch error: http://infotech-team.com/ => https://infotech-team.com/: (6, 'Could
 		- Web bug from hit\d+.hotlog.ru
 
 -->
-
+
 
 	
-	
 	
-	
+	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Web_Design_Marketing.xml b/src/chrome/content/rules/Web_Design_Marketing.xml
index 49b627d42551..61826abfc426 100644
--- a/src/chrome/content/rules/Web_Design_Marketing.xml
+++ b/src/chrome/content/rules/Web_Design_Marketing.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Web_Forest.eu.xml b/src/chrome/content/rules/Web_Forest.eu.xml
index 1259fb63b956..01aaa79e980b 100644
--- a/src/chrome/content/rules/Web_Forest.eu.xml
+++ b/src/chrome/content/rules/Web_Forest.eu.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Web_Foundation.org.xml b/src/chrome/content/rules/Web_Foundation.org.xml
index 2e3e5de60e30..8af16631e41e 100644
--- a/src/chrome/content/rules/Web_Foundation.org.xml
+++ b/src/chrome/content/rules/Web_Foundation.org.xml
@@ -15,7 +15,7 @@ Fetch error: http://labs.webfoundation.org/ => https://labs.webfoundation.org/:
 		- data
 		- mlabs
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/Web_Hosting_Geeks.com.xml b/src/chrome/content/rules/Web_Hosting_Geeks.com.xml
index cfff669fe63f..7e55396579d7 100644
--- a/src/chrome/content/rules/Web_Hosting_Geeks.com.xml
+++ b/src/chrome/content/rules/Web_Hosting_Geeks.com.xml
@@ -23,7 +23,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -35,4 +36,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Web_Hosting_Pad.xml b/src/chrome/content/rules/Web_Hosting_Pad.xml
index 80752f15dc9e..ff4b94e05df8 100644
--- a/src/chrome/content/rules/Web_Hosting_Pad.xml
+++ b/src/chrome/content/rules/Web_Hosting_Pad.xml
@@ -5,14 +5,16 @@
 
 
 	
-	
+	
+	
+	
+	
 		
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Web_Service_Award.xml b/src/chrome/content/rules/Web_Service_Award.xml
index f505842a786c..24daabe01d2e 100644
--- a/src/chrome/content/rules/Web_Service_Award.xml
+++ b/src/chrome/content/rules/Web_Service_Award.xml
@@ -11,4 +11,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Web_Tune_Factory.xml b/src/chrome/content/rules/Web_Tune_Factory.xml
index c793c50d170d..47676533bccb 100644
--- a/src/chrome/content/rules/Web_Tune_Factory.xml
+++ b/src/chrome/content/rules/Web_Tune_Factory.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.w-tune.com/ => https://www.w-tune.com/: (6, 'Could not r
 	!www: cert only matches www
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Web_of_Knowledge.xml b/src/chrome/content/rules/Web_of_Knowledge.xml
index 1c96c43a0d90..e7b580faff35 100644
--- a/src/chrome/content/rules/Web_of_Knowledge.xml
+++ b/src/chrome/content/rules/Web_of_Knowledge.xml
@@ -14,16 +14,19 @@ Fetch error: http://www.isiknowledge.com/ => https://www.isiknowledge.com/: (51,
 	
 	
 	
-	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
 
-	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Webby-Awards.xml b/src/chrome/content/rules/Webby-Awards.xml
index e7d0ec466c34..0cd66f6cc485 100644
--- a/src/chrome/content/rules/Webby-Awards.xml
+++ b/src/chrome/content/rules/Webby-Awards.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.webbyawards.com/ => https://www.webbyawards.com/: (7, 'F
 		- (www.)netted.net
 		- pv.webbyawards.com	(timeout)
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Webcontrolcenter.com.xml b/src/chrome/content/rules/Webcontrolcenter.com.xml
deleted file mode 100644
index 7403be7b84c8..000000000000
--- a/src/chrome/content/rules/Webcontrolcenter.com.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Webcruiter.xml b/src/chrome/content/rules/Webcruiter.xml
index 4d16cc203c83..27a2d40848a1 100644
--- a/src/chrome/content/rules/Webcruiter.xml
+++ b/src/chrome/content/rules/Webcruiter.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Webento.xml b/src/chrome/content/rules/Webento.xml
index cef31038fd28..a5a7e5137a6d 100644
--- a/src/chrome/content/rules/Webento.xml
+++ b/src/chrome/content/rules/Webento.xml
@@ -11,15 +11,15 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://webento.com/ => https://webento.com/: (35, 'error:14077438:SSL routines:SSL23_GET_SERVER_HELLO:tlsv1 alert internal error')
 
 -->
-
+
 
 	
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Webex.com.xml b/src/chrome/content/rules/Webex.com.xml
new file mode 100644
index 000000000000..d32b107b390d
--- /dev/null
+++ b/src/chrome/content/rules/Webex.com.xml
@@ -0,0 +1,22 @@
+
+
+
+	
+	
+		
+
+	
+
+	
+	
+
+		
+		
+		
+
+
diff --git a/src/chrome/content/rules/Webfusion.xml b/src/chrome/content/rules/Webfusion.xml
deleted file mode 100644
index 152ad5ae5ca7..000000000000
--- a/src/chrome/content/rules/Webfusion.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-	
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Webgility.xml b/src/chrome/content/rules/Webgility.xml
index d7cab6b668f6..72784a4b4fc8 100644
--- a/src/chrome/content/rules/Webgility.xml
+++ b/src/chrome/content/rules/Webgility.xml
@@ -9,7 +9,7 @@ Fetch error: http://webgility.com/ => https://webgility.com/: Cycle detected - U
 Fetch error: http://portal.webgility.com/ => https://portal.webgility.com/: Redirect for 'http://portal.webgility.com/' missing Location
 Fetch error: http://www.webgility.com/ => https://webgility.com/: Cycle detected - URL already encountered: https://webgility.com/
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Webhostlist.de.xml b/src/chrome/content/rules/Webhostlist.de.xml
deleted file mode 100644
index 069972d939a2..000000000000
--- a/src/chrome/content/rules/Webhostlist.de.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Webhungary.hu.xml b/src/chrome/content/rules/Webhungary.hu.xml
deleted file mode 100644
index 5930c3078ec4..000000000000
--- a/src/chrome/content/rules/Webhungary.hu.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Webjet.xml b/src/chrome/content/rules/Webjet.xml
index 74b0bbbb4719..22f718b2d453 100644
--- a/src/chrome/content/rules/Webjet.xml
+++ b/src/chrome/content/rules/Webjet.xml
@@ -33,6 +33,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/Webkitgtk.org.xml b/src/chrome/content/rules/Webkitgtk.org.xml
new file mode 100644
index 000000000000..6d351a7586fb
--- /dev/null
+++ b/src/chrome/content/rules/Webkitgtk.org.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Weblog_Awards.xml b/src/chrome/content/rules/Weblog_Awards.xml
index aa4a77db9cb8..b8ab859c599c 100644
--- a/src/chrome/content/rules/Weblog_Awards.xml
+++ b/src/chrome/content/rules/Weblog_Awards.xml
@@ -10,4 +10,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Webmail-Loxinfo.xml b/src/chrome/content/rules/Webmail-Loxinfo.xml
deleted file mode 100644
index f685a0edc095..000000000000
--- a/src/chrome/content/rules/Webmail-Loxinfo.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-  
-
-  
-
diff --git a/src/chrome/content/rules/Webmasterplan.com.xml b/src/chrome/content/rules/Webmasterplan.com.xml
deleted file mode 100644
index 550615712093..000000000000
--- a/src/chrome/content/rules/Webmasterplan.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Webmon.com.xml b/src/chrome/content/rules/Webmon.com.xml
deleted file mode 100644
index 142c3e1d05cf..000000000000
--- a/src/chrome/content/rules/Webmon.com.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Weboolu.xml b/src/chrome/content/rules/Weboolu.xml
index 4d655603cbf9..b51f5938e8b6 100644
--- a/src/chrome/content/rules/Weboolu.xml
+++ b/src/chrome/content/rules/Weboolu.xml
@@ -18,7 +18,7 @@ Fetch error: http://weboolu.com/ => https://weboolu.com/: (7, 'Failed to connect
 		- developer.weboolu.com
 
 -->
-
+
 
 	
 	
@@ -32,4 +32,4 @@ Fetch error: http://weboolu.com/ => https://weboolu.com/: (7, 'Failed to connect
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Weborama.xml b/src/chrome/content/rules/Weborama.xml
index fae067d139f5..0968f85877d8 100644
--- a/src/chrome/content/rules/Weborama.xml
+++ b/src/chrome/content/rules/Weborama.xml
@@ -9,7 +9,7 @@ Fetch error: http://static.weborama.fr/ => https://ssl.weborama.fr/: (7, 'Failed
 
 	(www.)weborama.fr doesn't work
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Webroot.com.xml b/src/chrome/content/rules/Webroot.com.xml
index 1a6baa7673a1..9b044a4cff6d 100644
--- a/src/chrome/content/rules/Webroot.com.xml
+++ b/src/chrome/content/rules/Webroot.com.xml
@@ -16,7 +16,9 @@ Fetch error: http://webroot.com/ => https://webroot.com/: (28, 'Resolving timed
 
 
 	
-	
+	
+	
+	
 		
 
 
@@ -27,7 +29,6 @@ Fetch error: http://webroot.com/ => https://webroot.com/: (28, 'Resolving timed
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/WebrtcHacks.com.xml b/src/chrome/content/rules/WebrtcHacks.com.xml
index 710d2d89b78c..209a6f753d50 100644
--- a/src/chrome/content/rules/WebrtcHacks.com.xml
+++ b/src/chrome/content/rules/WebrtcHacks.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://www.webrtchacks.com/ => https://www.webrtchacks.com/: Too ma
 		- .webrtchacks.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Webs-MixedContent.xml b/src/chrome/content/rules/Webs-MixedContent.xml
deleted file mode 100644
index 9514e20b41ed..000000000000
--- a/src/chrome/content/rules/Webs-MixedContent.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Webs.com.xml b/src/chrome/content/rules/Webs.com.xml
new file mode 100644
index 000000000000..60109d963180
--- /dev/null
+++ b/src/chrome/content/rules/Webs.com.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Webs.xml b/src/chrome/content/rules/Webs.xml
deleted file mode 100644
index 7e6f529ac2c6..000000000000
--- a/src/chrome/content/rules/Webs.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-	
-	
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Websec_Weekly.org.xml b/src/chrome/content/rules/Websec_Weekly.org.xml
index 854baca36d09..6afa256a62ad 100644
--- a/src/chrome/content/rules/Websec_Weekly.org.xml
+++ b/src/chrome/content/rules/Websec_Weekly.org.xml
@@ -24,7 +24,7 @@ Fetch error: http://www.websecweekly.org/ => https://www.websecweekly.org/: (28,
 		- .websecweekly.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Websecurify.com.xml b/src/chrome/content/rules/Websecurify.com.xml
index 0a7478245c98..1c6d55215c94 100644
--- a/src/chrome/content/rules/Websecurify.com.xml
+++ b/src/chrome/content/rules/Websecurify.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://learn.websecurify.com/ => https://learn.websecurify.com/: (6
 Fetch error: http://suite.websecurify.com/ => https://suite.websecurify.com/: (6, 'Could not resolve host: suite.websecurify.com')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Websimages.com.xml b/src/chrome/content/rules/Websimages.com.xml
new file mode 100644
index 000000000000..2d2fb4105299
--- /dev/null
+++ b/src/chrome/content/rules/Websimages.com.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Website-start.de.xml b/src/chrome/content/rules/Website-start.de.xml
index e5960c8d8b36..a8e281ac92ce 100644
--- a/src/chrome/content/rules/Website-start.de.xml
+++ b/src/chrome/content/rules/Website-start.de.xml
@@ -12,7 +12,8 @@
 -->
 
 
-	
+	
+	
 
 
 	
-
+
 
 	
diff --git a/src/chrome/content/rules/WebsiteGrowers.com.xml b/src/chrome/content/rules/WebsiteGrowers.com.xml
index 94cd17cb9c70..1d2492ba9736 100644
--- a/src/chrome/content/rules/WebsiteGrowers.com.xml
+++ b/src/chrome/content/rules/WebsiteGrowers.com.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Website_Pipeline.xml b/src/chrome/content/rules/Website_Pipeline.xml
index 1bb75d894e71..c2ccdc086971 100644
--- a/src/chrome/content/rules/Website_Pipeline.xml
+++ b/src/chrome/content/rules/Website_Pipeline.xml
@@ -9,7 +9,7 @@ Fetch error: http://gweb03.webstorepackage.com/ => https://gweb03.webstorepackag
 		- (www.)webstorepackage.com	(redirects to www.websitepipeline.com; expired 2013-03-09, mismatched, CN: www.ebiz4idiots.com)
 
 -->
-
+
 
 	
 	
@@ -21,4 +21,4 @@ Fetch error: http://gweb03.webstorepackage.com/ => https://gweb03.webstorepackag
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Websitesettings.com.xml b/src/chrome/content/rules/Websitesettings.com.xml
index e9c76ba643f4..b8ae910b1657 100644
--- a/src/chrome/content/rules/Websitesettings.com.xml
+++ b/src/chrome/content/rules/Websitesettings.com.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Webspace4All.xml b/src/chrome/content/rules/Webspace4All.xml
index 00504244ee73..5e48619913a8 100644
--- a/src/chrome/content/rules/Webspace4All.xml
+++ b/src/chrome/content/rules/Webspace4All.xml
@@ -16,4 +16,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Webspace4Clans.de.xml b/src/chrome/content/rules/Webspace4Clans.de.xml
index bef5ac21fcaf..06bfd915c7c9 100644
--- a/src/chrome/content/rules/Webspace4Clans.de.xml
+++ b/src/chrome/content/rules/Webspace4Clans.de.xml
@@ -24,4 +24,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Webstat.com.xml b/src/chrome/content/rules/Webstat.com.xml
index fcc48a256cbd..9cfced6ae104 100644
--- a/src/chrome/content/rules/Webstat.com.xml
+++ b/src/chrome/content/rules/Webstat.com.xml
@@ -12,7 +12,8 @@
 -->
 
 
-	
+	
+	
 
 
 	
 
 
 	
 	
 	
 	
-	
-	
-	
-		
-		
-		
-		
-		
 	
 
 	 https://zimbra.webstyle.ch/: (6, 'Could not resolve host: zimbra.webstyle.ch')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Webthumbnail.org.xml b/src/chrome/content/rules/Webthumbnail.org.xml
deleted file mode 100644
index 99d47ff6c771..000000000000
--- a/src/chrome/content/rules/Webthumbnail.org.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Webtracker.jp.xml b/src/chrome/content/rules/Webtracker.jp.xml
index 172fe5687d42..249c9c35a0d4 100644
--- a/src/chrome/content/rules/Webtracker.jp.xml
+++ b/src/chrome/content/rules/Webtracker.jp.xml
@@ -26,7 +26,7 @@ Fetch error: http://t.webtracker.jp/ => https://t.webtracker.jp/: (7, 'Failed to
 	(www.)?: Dropped over http & https
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/WebtraffIQ.com.xml b/src/chrome/content/rules/WebtraffIQ.com.xml
index 41df0a7f6980..0a9083661aec 100644
--- a/src/chrome/content/rules/WebtraffIQ.com.xml
+++ b/src/chrome/content/rules/WebtraffIQ.com.xml
@@ -21,7 +21,9 @@
 
 
 	
-	
+	
+	
+	
 		
 
 
diff --git a/src/chrome/content/rules/Webtraffic.se.xml b/src/chrome/content/rules/Webtraffic.se.xml
index c93abbfe75ad..cdd4d7816ddc 100644
--- a/src/chrome/content/rules/Webtraffic.se.xml
+++ b/src/chrome/content/rules/Webtraffic.se.xml
@@ -8,7 +8,7 @@ Fetch error: http://dyn.webtraffic.se/ => https://dyn.webtraffic.se/: (60, 'SSL
 		 - (www.)	(403; mismatched, CN; dyn.webtraffic.se)
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Webtrekk.net.xml b/src/chrome/content/rules/Webtrekk.net.xml
index 22c811c2745d..383a504b84cb 100644
--- a/src/chrome/content/rules/Webtrekk.net.xml
+++ b/src/chrome/content/rules/Webtrekk.net.xml
@@ -37,7 +37,6 @@
 		
 		
 		
-		
 
 		
diff --git a/src/chrome/content/rules/Webtrends.com.xml b/src/chrome/content/rules/Webtrends.com.xml
index d052ae440617..9acfe47adf75 100644
--- a/src/chrome/content/rules/Webtrends.com.xml
+++ b/src/chrome/content/rules/Webtrends.com.xml
@@ -89,7 +89,7 @@ Fetch error: http://m.webtrends.com/ => https://m.webtrends.com/: (6, 'Could not
 		- .www.webtrends.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Webyog.com.xml b/src/chrome/content/rules/Webyog.com.xml
index cd0b297c9569..a55c39ccc54b 100644
--- a/src/chrome/content/rules/Webyog.com.xml
+++ b/src/chrome/content/rules/Webyog.com.xml
@@ -14,6 +14,6 @@
 
   	
 
-	
 
diff --git a/src/chrome/content/rules/Wed.is.xml b/src/chrome/content/rules/Wed.is.xml
deleted file mode 100644
index 68b385881199..000000000000
--- a/src/chrome/content/rules/Wed.is.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Week_Plan.xml b/src/chrome/content/rules/Week_Plan.xml
index 7570bc00352b..29378c5dedee 100644
--- a/src/chrome/content/rules/Week_Plan.xml
+++ b/src/chrome/content/rules/Week_Plan.xml
@@ -5,7 +5,7 @@ Fetch error: http://weekplan.net/ => https://weekplan.net/: Too many redirects w
 Fetch error: http://www.weekplan.net/ => https://www.weekplan.net/: Too many redirects while fetching 'https://www.weekplan.net/'
 
 -->
-
+
 
 	
 	
@@ -17,4 +17,4 @@ Fetch error: http://www.weekplan.net/ => https://www.weekplan.net/: Too many red
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Weeklyosm.eu.xml b/src/chrome/content/rules/Weeklyosm.eu.xml
new file mode 100644
index 000000000000..2bf93500df07
--- /dev/null
+++ b/src/chrome/content/rules/Weeklyosm.eu.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Wego_Health.com.xml b/src/chrome/content/rules/Wego_Health.com.xml
index d283f5709341..b3450803e4b4 100644
--- a/src/chrome/content/rules/Wego_Health.com.xml
+++ b/src/chrome/content/rules/Wego_Health.com.xml
@@ -62,10 +62,12 @@ Fetch error: http://wegohealth.com/ => https://wegohealth.com/: (60, 'SSL certif
 	* Secured by us
 
 -->
-
+
 
 	
-	
+	
+	
+	
 		
@@ -85,7 +87,6 @@ Fetch error: http://wegohealth.com/ => https://wegohealth.com/: (60, 'SSL certif
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Weho.st.xml b/src/chrome/content/rules/Weho.st.xml
new file mode 100644
index 000000000000..39afcda9d21c
--- /dev/null
+++ b/src/chrome/content/rules/Weho.st.xml
@@ -0,0 +1,16 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Weibo.cn.xml b/src/chrome/content/rules/Weibo.cn.xml
index b3086b87979a..61a07a8e6dc7 100644
--- a/src/chrome/content/rules/Weibo.cn.xml
+++ b/src/chrome/content/rules/Weibo.cn.xml
@@ -1,34 +1,27 @@
 
-
 
 	
 	
+	
 	
+	
 	
-		
+	
 	
 		
 	
 		
+	
 	
-	
-		
 	
-		
 
 	
 
diff --git a/src/chrome/content/rules/Weibo.com-mixedcontent.xml b/src/chrome/content/rules/Weibo.com-mixedcontent.xml
deleted file mode 100644
index 8e54baf7d7f2..000000000000
--- a/src/chrome/content/rules/Weibo.com-mixedcontent.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Weibo.com.xml b/src/chrome/content/rules/Weibo.com.xml
index caf1d600832e..6b852d6a0bdd 100644
--- a/src/chrome/content/rules/Weibo.com.xml
+++ b/src/chrome/content/rules/Weibo.com.xml
@@ -1,62 +1,45 @@
 
 
 	
 	
 	
-		
-		
+		
 	
-		
+		
 	
 		
-	
-		
+	
 	
+	
+	
 	
+	
 	
 		
-	
+	
+	
+		
 	
 
 	
 
-	
-
 	
 
diff --git a/src/chrome/content/rules/Weiss-Research.xml b/src/chrome/content/rules/Weiss-Research.xml
index b40a96533394..dd6da9a8e367 100644
--- a/src/chrome/content/rules/Weiss-Research.xml
+++ b/src/chrome/content/rules/Weiss-Research.xml
@@ -9,18 +9,17 @@ Fetch error: http://moneyandmarkets.com/ => https://moneyandmarkets.com/: (60, '
 
 
 	
-	
+	
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/WelcomeCottages.com.xml b/src/chrome/content/rules/WelcomeCottages.com.xml
index 55859db9dc47..e01bd9750078 100644
--- a/src/chrome/content/rules/WelcomeCottages.com.xml
+++ b/src/chrome/content/rules/WelcomeCottages.com.xml
@@ -1,5 +1,5 @@
 
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Welect.de.xml b/src/chrome/content/rules/Welect.de.xml
new file mode 100644
index 000000000000..a69f26f77b25
--- /dev/null
+++ b/src/chrome/content/rules/Welect.de.xml
@@ -0,0 +1,32 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Wellbid.com.xml b/src/chrome/content/rules/Wellbid.com.xml
index e066495b9529..67577524c7ef 100644
--- a/src/chrome/content/rules/Wellbid.com.xml
+++ b/src/chrome/content/rules/Wellbid.com.xml
@@ -10,4 +10,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Wellcome-HK-Lucky-Draws.xml b/src/chrome/content/rules/Wellcome-HK-Lucky-Draws.xml
new file mode 100644
index 000000000000..47988e1dbff6
--- /dev/null
+++ b/src/chrome/content/rules/Wellcome-HK-Lucky-Draws.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Wello.com.xml b/src/chrome/content/rules/Wello.com.xml
index c5a3e1ef734b..b3ed09f6ec4f 100644
--- a/src/chrome/content/rules/Wello.com.xml
+++ b/src/chrome/content/rules/Wello.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://wello.com/ => https://wello.com/: (7, 'Failed to connect to
 Fetch error: http://www.wello.com/ => https://www.wello.com/: (7, 'Failed to connect to www.wello.com port 443: Connection refused')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Welsh-Country-Cottages.co.uk.xml b/src/chrome/content/rules/Welsh-Country-Cottages.co.uk.xml
index 1691df9ca79e..c07457f0f3d5 100644
--- a/src/chrome/content/rules/Welsh-Country-Cottages.co.uk.xml
+++ b/src/chrome/content/rules/Welsh-Country-Cottages.co.uk.xml
@@ -1,5 +1,5 @@
 
-
-	
+
 	
 		
 		
@@ -50,19 +39,24 @@ Fetch error: http://mobiepaper.apps.welt.de/ => https://mobiepaper.apps.welt.de/
 		
 		
 	
-	
 	
 	
+	
 	
+	
+	
 	
-	
-	
-	
+	
+		
+	
 	
 	
+	
+	
+	
+	
 	
-		
-		
+		
 		
 			
 			
@@ -80,4 +74,5 @@ Fetch error: http://mobiepaper.apps.welt.de/ => https://mobiepaper.apps.welt.de/
 	
 
 	
+	
 
diff --git a/src/chrome/content/rules/Weltbild.ch.xml b/src/chrome/content/rules/Weltbild.ch.xml
index 6a56a20ca824..9b022b1b3357 100644
--- a/src/chrome/content/rules/Weltbild.ch.xml
+++ b/src/chrome/content/rules/Weltbild.ch.xml
@@ -2,7 +2,7 @@
 	
 	
 
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Wemadethis.co.uk.xml b/src/chrome/content/rules/Wemadethis.co.uk.xml
new file mode 100644
index 000000000000..e0c87d5f956e
--- /dev/null
+++ b/src/chrome/content/rules/Wemadethis.co.uk.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Wemfbox.ch.xml b/src/chrome/content/rules/Wemfbox.ch.xml
index 2b4db1058709..6db5a9763fa5 100644
--- a/src/chrome/content/rules/Wemfbox.ch.xml
+++ b/src/chrome/content/rules/Wemfbox.ch.xml
@@ -1,4 +1,11 @@
-
+-->
 
 
 	
+
+	
+	
+
+	
 	
-	
+
+	
+	
+
+	
+	
+
 	
-	
+	
+
 	
+	
 	
 
+	
+	
+
+	
+	
+
+	
+	
+
+	
+	
+
 	
 	
 
@@ -179,6 +210,9 @@
 	
 	
 
+	
+	
+
 	
 	
 	
@@ -186,10 +220,12 @@
 
 	
 
+	
+	
+
 	
 	
 
-
 	
 	
 	
@@ -199,12 +235,19 @@
 
 	
 	
+
 	
 	
 
 	
 	
 
+	
+	
+
+	
+	
+
 	
 	
 
@@ -218,7 +261,8 @@
 
 	
 	
-		
+	
+
 	
 	
 
@@ -228,20 +272,28 @@
 	
 	
 
+	
+	
+
 	
 	
 	
 
+	
+	
+
 	
+
 	
 	
 
 	
 	
 
-
 	
 	
+
+	
 	
 
 	
@@ -253,6 +305,9 @@
 	
 	
 
+	
+	
+
 	
 
 	
@@ -265,124 +320,134 @@
 
 	
 	
-	
+
 	
 	
 	 
 
+	
+	
+
+	
+	
+
 	
 	
 
 	
 	
 
+	
+	
+
 	
 	
 
-
 	
 	
 
+	
+	
+
 	
 	
 
+	
+	
+
+	
 	
-	
+
 	
 	
 
+	
+	
+
 	
 	
 
 	
 	
 
+	
+	
+
 	
 
 	
 	
 
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	 
-	 
-	 
-	 
-	 
-	 
-	 
-	 
-	 
-	 
-	 
-	 
-	 
-	 
-	 
-	 
-	 
-	 
-	 
-	 
-	 
+		
+
+		
 
 		
+			to="https://arci-ssl.wemfbox.ch/" />
 
 		
+			to="https://asct-ssl.wemfbox.ch/" />
+
+		
 
 		
+			to="https://chba-ssl.wemfbox.ch/" />
 
 		
+			to="https://engy-ssl.wemfbox.ch/" />
 
 		
+			to="https://finan-ssl.wemfbox.ch/" />
 
 		
+			to="https://gmx-ssl.wemfbox.ch/" />
 
 		
+			to="https://golf-ssl.wemfbox.ch/" />
 
 		
+			to="https://hebd-ssl.wemfbox.ch/" />
+
+		
 
 		
+			to="https://mima-ssl.wemfbox.ch/" />
 
 		
+			to="https://monh-ssl.wemfbox.ch/" />
 
 		
+			to="https://nhom-ssl.wemfbox.ch/" />
 
 		
+			to="https://netmetrix-ssl.wemfbox.ch/" />
+
+		
+
+		
+		
+
+		
 
 		
+			to="https://temp-ssl.wemfbox.ch/" />
+
+		
 
-		
+		
 
-		
+		
+		
 
 	
diff --git a/src/chrome/content/rules/Wennect.info.xml b/src/chrome/content/rules/Wennect.info.xml
index 5adee4b1d7af..cbe620325a6e 100644
--- a/src/chrome/content/rules/Wennect.info.xml
+++ b/src/chrome/content/rules/Wennect.info.xml
@@ -5,7 +5,8 @@
 
 
 	
-	
+	
+	
 
 
 	
   
-  
+  
+  
 
   
-  
-
\ No newline at end of file
+  
+
diff --git a/src/chrome/content/rules/West_Devon.gov.uk.xml b/src/chrome/content/rules/West_Devon.gov.uk.xml
index cee9a7d94edd..cbdb7fe4f27e 100644
--- a/src/chrome/content/rules/West_Devon.gov.uk.xml
+++ b/src/chrome/content/rules/West_Devon.gov.uk.xml
@@ -14,7 +14,7 @@
 	NB: Server sends no certificate chain, see https://whatsmychaincert.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/West_Orange_History.xml b/src/chrome/content/rules/West_Orange_History.xml
index 45d39c04b2fd..0429d895d2df 100644
--- a/src/chrome/content/rules/West_Orange_History.xml
+++ b/src/chrome/content/rules/West_Orange_History.xml
@@ -17,4 +17,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/West_Virginia_University-problematic.xml b/src/chrome/content/rules/West_Virginia_University-problematic.xml
deleted file mode 100644
index 18bcf504d2af..000000000000
--- a/src/chrome/content/rules/West_Virginia_University-problematic.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-	
-	
-		
-		
-	
-
-
-	
-
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/West_Virginia_University.xml b/src/chrome/content/rules/West_Virginia_University.xml
deleted file mode 100644
index f34c58b49689..000000000000
--- a/src/chrome/content/rules/West_Virginia_University.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-	
-	
-
-
-	
-
-	
-	
-
-	
-
-	
-
-	
-
-	
-	
-
-	
-	
-
-	
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/West_Yorkshire_Observatory.org.xml b/src/chrome/content/rules/West_Yorkshire_Observatory.org.xml
index e7fe2afb0e59..357ca5d1c50b 100644
--- a/src/chrome/content/rules/West_Yorkshire_Observatory.org.xml
+++ b/src/chrome/content/rules/West_Yorkshire_Observatory.org.xml
@@ -28,7 +28,7 @@ Fetch error: http://www.westyorkshireobservatory.org/ => https://westyorkshireob
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Westconsin_Credit_Union.xml b/src/chrome/content/rules/Westconsin_Credit_Union.xml
index 195d1810b7e6..b3d6da049874 100644
--- a/src/chrome/content/rules/Westconsin_Credit_Union.xml
+++ b/src/chrome/content/rules/Westconsin_Credit_Union.xml
@@ -7,7 +7,7 @@
 
 
 	
-	
+	
 	
 	
 
@@ -16,10 +16,9 @@
 	
 
 
-	
 
 	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Western_Union.xml b/src/chrome/content/rules/Western_Union.xml
index 5a622536ffbc..0018789531cc 100644
--- a/src/chrome/content/rules/Western_Union.xml
+++ b/src/chrome/content/rules/Western_Union.xml
@@ -51,7 +51,7 @@ Non-2xx HTTP code: http://westernunion.com/ (200) => https://westernunion.com/ (
 		- agentportal.westernunion.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/WestlandUtrecht.xml b/src/chrome/content/rules/WestlandUtrecht.xml
index ce8efa190b2f..6cf2588156fd 100644
--- a/src/chrome/content/rules/WestlandUtrecht.xml
+++ b/src/chrome/content/rules/WestlandUtrecht.xml
@@ -5,7 +5,7 @@ Fetch error: http://www.mijnwestlandutrecht.nl/ => https://mijnwestlandutrecht.n
 Fetch error: http://mijnwestlandutrecht.nl/ => https://mijnwestlandutrecht.nl/: (7, 'Failed to connect to mijnwestlandutrecht.nl port 443: Connection refused')
 
 -->
-
+
   
 
   
diff --git a/src/chrome/content/rules/Westlaw.com.xml b/src/chrome/content/rules/Westlaw.com.xml
index 3fb55d04bd1f..692d141e01df 100644
--- a/src/chrome/content/rules/Westlaw.com.xml
+++ b/src/chrome/content/rules/Westlaw.com.xml
@@ -3,7 +3,7 @@
 
 
 	Problematic hosts in *westlaw.com:
- 
+
 		- ^ *
 		- store *
 
diff --git a/src/chrome/content/rules/Westminster.gov.uk.xml b/src/chrome/content/rules/Westminster.gov.uk.xml
index caf044f2d4d6..80e8a97fef85 100644
--- a/src/chrome/content/rules/Westminster.gov.uk.xml
+++ b/src/chrome/content/rules/Westminster.gov.uk.xml
@@ -57,14 +57,14 @@ Fetch error: http://partnerweb.westminster.gov.uk/ => https://partnerweb.westmin
 		- css on openforum from fonts.googleapis.com ˢ
 
 		- Images, on:
-		
+
 			- cleanstreets from $self
 			- elibrary from trib.ent.sirsidynix.net.uk ˢ
 
 	ˢ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Westpac.com.au.xml b/src/chrome/content/rules/Westpac.com.au.xml
index 19b0262fe237..305ad8b161aa 100644
--- a/src/chrome/content/rules/Westpac.com.au.xml
+++ b/src/chrome/content/rules/Westpac.com.au.xml
@@ -167,7 +167,7 @@
 		- xylofx	(r)
 		- yellow	(t)
 		- www.yourbankyoursay	(m)
-		
+
 	e: expired certificate
 	h: http redirect
 	m: certificate mismatch
diff --git a/src/chrome/content/rules/Wetter.de.xml b/src/chrome/content/rules/Wetter.de.xml
deleted file mode 100644
index 61a9d3a17ae8..000000000000
--- a/src/chrome/content/rules/Wetter.de.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-	
-	
-	
-	
-
-	
-	
-
diff --git a/src/chrome/content/rules/Wettergefahren.de.xml b/src/chrome/content/rules/Wettergefahren.de.xml
new file mode 100644
index 000000000000..3dd3ab94e6ba
--- /dev/null
+++ b/src/chrome/content/rules/Wettergefahren.de.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Wg_cdn.net.xml b/src/chrome/content/rules/Wg_cdn.net.xml
deleted file mode 100644
index a78af6db847a..000000000000
--- a/src/chrome/content/rules/Wg_cdn.net.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/WhatCanIDoForMozilla.org.xml b/src/chrome/content/rules/WhatCanIDoForMozilla.org.xml
new file mode 100644
index 000000000000..355d396e1b15
--- /dev/null
+++ b/src/chrome/content/rules/WhatCanIDoForMozilla.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/WhatPulse.org.xml b/src/chrome/content/rules/WhatPulse.org.xml
index d2e9ada4f874..2d81c5514a1a 100644
--- a/src/chrome/content/rules/WhatPulse.org.xml
+++ b/src/chrome/content/rules/WhatPulse.org.xml
@@ -13,7 +13,7 @@ Fetch error: http://api.whatpulse.org/ => https://api.whatpulse.org/: (60, 'SSL
 		- developer.whatpulse.org (https://github.com/EFForg/https-everywhere/pull/4882)
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/WhatReallyHappened.com.xml b/src/chrome/content/rules/WhatReallyHappened.com.xml
new file mode 100644
index 000000000000..fba7a6159ba9
--- /dev/null
+++ b/src/chrome/content/rules/WhatReallyHappened.com.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+
+	
+
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/WhatsApp.com.xml b/src/chrome/content/rules/WhatsApp.com.xml
deleted file mode 100644
index 63e07d0938f6..000000000000
--- a/src/chrome/content/rules/WhatsApp.com.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-	
-	
-
-		
-		
-
-			
-			
-			
-
-		
-		
-		
-		
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Whatsbroadcast.com.xml b/src/chrome/content/rules/Whatsbroadcast.com.xml
index c2c3093715e4..a5019bd05996 100644
--- a/src/chrome/content/rules/Whatsbroadcast.com.xml
+++ b/src/chrome/content/rules/Whatsbroadcast.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://www.widget.whatsbroadcast.com/ => https://www.widget.whatsbr
 Fetch error: http://www2.whatsbroadcast.com/ => https://www2.whatsbroadcast.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www2.whatsbroadcast.com'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Where.com.xml b/src/chrome/content/rules/Where.com.xml
index 563a8bc6bd4a..f31afa724e67 100644
--- a/src/chrome/content/rules/Where.com.xml
+++ b/src/chrome/content/rules/Where.com.xml
@@ -18,7 +18,7 @@ Fetch error: http://upstream.where.com/ => https://upstream.where.com/: (7, 'Fai
 		- .where.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/WhippleHill.com.xml b/src/chrome/content/rules/WhippleHill.com.xml
new file mode 100644
index 000000000000..1855bf92a110
--- /dev/null
+++ b/src/chrome/content/rules/WhippleHill.com.xml
@@ -0,0 +1,16 @@
+
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/WhippleHill.xml b/src/chrome/content/rules/WhippleHill.xml
deleted file mode 100644
index adf0e23ad97c..000000000000
--- a/src/chrome/content/rules/WhippleHill.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-	
-		
-		
-	
-
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Whirlpool.xml b/src/chrome/content/rules/Whirlpool.xml
deleted file mode 100644
index d3ac2f6be151..000000000000
--- a/src/chrome/content/rules/Whirlpool.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-	
-	
-	
-	
-
-    
-    
-    
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Whiskey-Media.xml b/src/chrome/content/rules/Whiskey-Media.xml
deleted file mode 100644
index f69887479bdc..000000000000
--- a/src/chrome/content/rules/Whiskey-Media.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Whisky.de.xml b/src/chrome/content/rules/Whisky.de.xml
new file mode 100644
index 000000000000..3af4e16e7f80
--- /dev/null
+++ b/src/chrome/content/rules/Whisky.de.xml
@@ -0,0 +1,29 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Whisper-Gifts.xml b/src/chrome/content/rules/Whisper-Gifts.xml
index a10eeb944f1d..f53c911e6a9d 100644
--- a/src/chrome/content/rules/Whisper-Gifts.xml
+++ b/src/chrome/content/rules/Whisper-Gifts.xml
@@ -1,16 +1,17 @@
+
 
 
 	
 	
 
 
-	
 	
+		to="https://www.whispergifts.com/" />
 
-	
-	
+	
 
 
diff --git a/src/chrome/content/rules/Whisper.sh.xml b/src/chrome/content/rules/Whisper.sh.xml
index bd832aa266ee..7ab5d0d9862f 100644
--- a/src/chrome/content/rules/Whisper.sh.xml
+++ b/src/chrome/content/rules/Whisper.sh.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.whisper.sh/ => https://www.whisper.sh/: Too many redirec
 		- support		(hostname mismatch, CN: *.desk.com, desk.com)
 		- your-voice.org        (connection refused)
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/WhiteFence.com.xml b/src/chrome/content/rules/WhiteFence.com.xml
deleted file mode 100644
index 2c4fb9e2a8a5..000000000000
--- a/src/chrome/content/rules/WhiteFence.com.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/WhiteThreadInstitute.org.xml b/src/chrome/content/rules/WhiteThreadInstitute.org.xml
new file mode 100644
index 000000000000..74d9ef2bde38
--- /dev/null
+++ b/src/chrome/content/rules/WhiteThreadInstitute.org.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/WhiteThreadPress.com.xml b/src/chrome/content/rules/WhiteThreadPress.com.xml
new file mode 100644
index 000000000000..b485ceec7338
--- /dev/null
+++ b/src/chrome/content/rules/WhiteThreadPress.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/White_Lisbon.com.xml b/src/chrome/content/rules/White_Lisbon.com.xml
index a5aef19b974a..34c907b22f7a 100644
--- a/src/chrome/content/rules/White_Lisbon.com.xml
+++ b/src/chrome/content/rules/White_Lisbon.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://mail.whitelisbon.com/ => https://mail.whitelisbon.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Whiteout.io.xml b/src/chrome/content/rules/Whiteout.io.xml
deleted file mode 100644
index 192bf8f31e15..000000000000
--- a/src/chrome/content/rules/Whiteout.io.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/WhitneyWisconsinFans.com.xml b/src/chrome/content/rules/WhitneyWisconsinFans.com.xml
new file mode 100644
index 000000000000..082a47ea9c17
--- /dev/null
+++ b/src/chrome/content/rules/WhitneyWisconsinFans.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Who.is.xml b/src/chrome/content/rules/Who.is.xml
index cd7c29f28636..c5dac804a631 100644
--- a/src/chrome/content/rules/Who.is.xml
+++ b/src/chrome/content/rules/Who.is.xml
@@ -4,4 +4,4 @@
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/WhoIsJuan.me.xml b/src/chrome/content/rules/WhoIsJuan.me.xml
new file mode 100644
index 000000000000..8e9814f7f2a8
--- /dev/null
+++ b/src/chrome/content/rules/WhoIsJuan.me.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/WhoSampled.com.xml b/src/chrome/content/rules/WhoSampled.com.xml
index 8bddda069df5..4bca801186a9 100644
--- a/src/chrome/content/rules/WhoSampled.com.xml
+++ b/src/chrome/content/rules/WhoSampled.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.whosampled.com/ => http://www.whosampled.com/: (7, 'Fail
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/WhoSpendsMoney.com.xml b/src/chrome/content/rules/WhoSpendsMoney.com.xml
new file mode 100644
index 000000000000..39a4d01d1077
--- /dev/null
+++ b/src/chrome/content/rules/WhoSpendsMoney.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Whoer.net.xml b/src/chrome/content/rules/Whoer.net.xml
new file mode 100644
index 000000000000..5debae8b0753
--- /dev/null
+++ b/src/chrome/content/rules/Whoer.net.xml
@@ -0,0 +1,72 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Whole_Earth_Lectronic_Link.xml b/src/chrome/content/rules/Whole_Earth_Lectronic_Link.xml
index 292044adb206..1fb1d0ed78c9 100644
--- a/src/chrome/content/rules/Whole_Earth_Lectronic_Link.xml
+++ b/src/chrome/content/rules/Whole_Earth_Lectronic_Link.xml
@@ -1,7 +1,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/WiMP_Music.com.xml b/src/chrome/content/rules/WiMP_Music.com.xml
index 1eb07ce15763..2465a3982c24 100644
--- a/src/chrome/content/rules/WiMP_Music.com.xml
+++ b/src/chrome/content/rules/WiMP_Music.com.xml
@@ -37,7 +37,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
-
+
 
 	
 	
-
 	
-	
 	
 	
 	
+	
 	
 	
 	
 	
+	
 	
+	
 	
+	
 	
+	
+	
 	
 	
+	
 	
-	
-	
+	
 	
+	
 	
 	
+	
+	
+	
+	
+	
+	
+	
 	
+	
+	
 	
 	
 	
 	
-	
 	
-	
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
 	
+	
 	
 	
 	
-	
 
 	
 
diff --git a/src/chrome/content/rules/Wicked-Lasers.xml b/src/chrome/content/rules/Wicked-Lasers.xml
index a6407fef0505..241a3ae4d34e 100644
--- a/src/chrome/content/rules/Wicked-Lasers.xml
+++ b/src/chrome/content/rules/Wicked-Lasers.xml
@@ -8,12 +8,12 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://wickedlasers.com/ => https://wickedlasers.com/: (7, 'Failed to connect to wickedlasers.com port 443: Connection refused')
 Fetch error: http://www.wickedlasers.com/ => https://www.wickedlasers.com/: (7, 'Failed to connect to www.wickedlasers.com port 443: Connection refused')
 -->
-
+
 
 	
 	
 	
-	
+
 
 
 	
diff --git a/src/chrome/content/rules/Wicked_Fiber.xml b/src/chrome/content/rules/Wicked_Fiber.xml
index 7699f2e7e64a..d8d74051f80a 100644
--- a/src/chrome/content/rules/Wicked_Fiber.xml
+++ b/src/chrome/content/rules/Wicked_Fiber.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://wickedfiber.com/ => https://wickedfiber.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 Fetch error: http://www.wickedfiber.com/ => https://www.wickedfiber.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 -->
-
+
 
 	
 	
@@ -19,4 +19,4 @@ Fetch error: http://www.wickedfiber.com/ => https://www.wickedfiber.com/: (60, '
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/WiebeTech.com.xml b/src/chrome/content/rules/WiebeTech.com.xml
index 5520bea76f1e..6c2734c827be 100644
--- a/src/chrome/content/rules/WiebeTech.com.xml
+++ b/src/chrome/content/rules/WiebeTech.com.xml
@@ -9,7 +9,7 @@ Non-2xx HTTP code: http://www.wiebetech.com/default.aspx (200) => https://www.cr
 	(www.)?wiebetech.com: Mismatched
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Wien-IT.xml b/src/chrome/content/rules/Wien-IT.xml
index 0a7ad899f694..6059207bb251 100644
--- a/src/chrome/content/rules/Wien-IT.xml
+++ b/src/chrome/content/rules/Wien-IT.xml
@@ -7,7 +7,7 @@ Fetch error: http://extranet.fernwaermewien.at/ => https://extranet.fernwaermewi
 Fetch error: http://www.fernwaerme-partner.at/ => https://www.fernwaerme-partner.at/: (51, "SSL: no alternative certificate subject name matches target host name 'www.fernwaerme-partner.at'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/WifiLib.xml b/src/chrome/content/rules/WifiLib.xml
deleted file mode 100644
index d79ff5902563..000000000000
--- a/src/chrome/content/rules/WifiLib.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/WifiWX.com.xml b/src/chrome/content/rules/WifiWX.com.xml
index 450ea0313d58..f35bf2a8e69c 100644
--- a/src/chrome/content/rules/WifiWX.com.xml
+++ b/src/chrome/content/rules/WifiWX.com.xml
@@ -1,13 +1,13 @@
 
 
 
-        
+
         
         
         
 
         
-        
+
 
diff --git a/src/chrome/content/rules/Wigan.gov.uk.xml b/src/chrome/content/rules/Wigan.gov.uk.xml
index 6fec372ae8d0..546c584b5866 100644
--- a/src/chrome/content/rules/Wigan.gov.uk.xml
+++ b/src/chrome/content/rules/Wigan.gov.uk.xml
@@ -40,7 +40,7 @@ Fetch error: http://rylands.wigan.gov.uk/ => https://rylands.wigan.gov.uk/: (7,
 		- www.wigan.gov.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Wiggle.xml b/src/chrome/content/rules/Wiggle.xml
index 85196fb0d552..e5ef599079f6 100644
--- a/src/chrome/content/rules/Wiggle.xml
+++ b/src/chrome/content/rules/Wiggle.xml
@@ -11,7 +11,10 @@
 
 
 	
-	
+	
+	
+	
+	
 	
 
 
diff --git a/src/chrome/content/rules/Wiiings.com.xml b/src/chrome/content/rules/Wiiings.com.xml
index a383aa1cdc98..335ea068270d 100644
--- a/src/chrome/content/rules/Wiiings.com.xml
+++ b/src/chrome/content/rules/Wiiings.com.xml
@@ -26,7 +26,7 @@ Fetch error: http://wiiings.com/ => https://www.wiiings.com/: invalid group refe
 		- stage-mas
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/WikiFur.xml b/src/chrome/content/rules/WikiFur.xml
index 46b8d43ccd63..7f9d45e8fb9d 100644
--- a/src/chrome/content/rules/WikiFur.xml
+++ b/src/chrome/content/rules/WikiFur.xml
@@ -1,8 +1,38 @@
 
-  
-  
-
-  
-
-  
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+  
+	
+	
 
diff --git a/src/chrome/content/rules/Wikidot.xml b/src/chrome/content/rules/Wikidot.xml
deleted file mode 100644
index b6936b2cc8ab..000000000000
--- a/src/chrome/content/rules/Wikidot.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-	
-	
-	
-	
-		
-		
-
-
-	
-
-	
-
-	
-
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Wikimedia.xml b/src/chrome/content/rules/Wikimedia.xml
index cf2c00e7f645..ffe6947c6540 100644
--- a/src/chrome/content/rules/Wikimedia.xml
+++ b/src/chrome/content/rules/Wikimedia.xml
@@ -1,10 +1,5 @@
 
 
-
+
 
 	
 	
 
-
 	
-	
-	
-	
-	
+	
+	
+		
+		
+		
+		
+		
+		
 
 	
 
@@ -66,20 +64,20 @@ Fetch error: http://www.wikimedia.org.uk/ => https://www.wikimedia.org.uk/: (56,
 
 	
 	
-		
-		
-			
 		
 		
 			
+		
+		
+			
 		
 		
 		
-		
 		
 		
 		
 		
+		
 
 	
 	
@@ -90,7 +88,7 @@ Fetch error: http://www.wikimedia.org.uk/ => https://www.wikimedia.org.uk/: (56,
 	
 	
 
-	
@@ -139,6 +137,9 @@ Fetch error: http://www.wikimedia.org.uk/ => https://www.wikimedia.org.uk/: (56,
 	
 
+	
+
 	
 
diff --git a/src/chrome/content/rules/Wikimonde.com.xml b/src/chrome/content/rules/Wikimonde.com.xml
new file mode 100644
index 000000000000..8e7a4e038190
--- /dev/null
+++ b/src/chrome/content/rules/Wikimonde.com.xml
@@ -0,0 +1,16 @@
+
+
+
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Wikinvest.xml b/src/chrome/content/rules/Wikinvest.xml
index 2c60db202b0f..b11b20f1d0cd 100644
--- a/src/chrome/content/rules/Wikinvest.xml
+++ b/src/chrome/content/rules/Wikinvest.xml
@@ -1,7 +1,9 @@
 
 
 	
-	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Wikiscan.xml b/src/chrome/content/rules/Wikiscan.xml
new file mode 100644
index 000000000000..b94fd1f6545f
--- /dev/null
+++ b/src/chrome/content/rules/Wikiscan.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+
+	
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/Wikisimpsons.xml b/src/chrome/content/rules/Wikisimpsons.xml
new file mode 100644
index 000000000000..45d0e6b85e24
--- /dev/null
+++ b/src/chrome/content/rules/Wikisimpsons.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Wikispooks.xml b/src/chrome/content/rules/Wikispooks.xml
index f1dc4c39333a..27a6ebc98cd8 100644
--- a/src/chrome/content/rules/Wikispooks.xml
+++ b/src/chrome/content/rules/Wikispooks.xml
@@ -4,7 +4,7 @@
 	
 
 
-	
+	
 
 
 	 https://cart.wildwestdomains.com/: (6, 'Could not resolve host: cart.wildwestdomains.com')
-Fetch error: http://img.wildwestdomains.com/ => https://img.wildwestdomains.com/: (28, 'Connection timed out after 20000 milliseconds')
-Fetch error: http://who.wildwestdomains.com/ => https://who.wildwestdomains.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
-
-	Insecure cookies are set for these domains and hosts:
-
-		- .wildwestdomains.com
-		- www.wildwestdomains.com
-
--->
-
-
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/WildArchives.com.xml b/src/chrome/content/rules/WildArchives.com.xml
deleted file mode 100644
index edf5c2e5008c..000000000000
--- a/src/chrome/content/rules/WildArchives.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/WildLeaks.org.xml b/src/chrome/content/rules/WildLeaks.org.xml
new file mode 100644
index 000000000000..6289ea37725c
--- /dev/null
+++ b/src/chrome/content/rules/WildLeaks.org.xml
@@ -0,0 +1,8 @@
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Wild_Apricot.org.xml b/src/chrome/content/rules/Wild_Apricot.org.xml
index 03b90b23df90..42820ae3dcb6 100644
--- a/src/chrome/content/rules/Wild_Apricot.org.xml
+++ b/src/chrome/content/rules/Wild_Apricot.org.xml
@@ -7,7 +7,8 @@
 
 
 	
-	
+	
+	
 
 
 	
@@ -17,4 +18,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Wildcard_Corp.com.xml b/src/chrome/content/rules/Wildcard_Corp.com.xml
deleted file mode 100644
index 54cea5051e7e..000000000000
--- a/src/chrome/content/rules/Wildcard_Corp.com.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Wilde_Beuger_Solmecke.xml b/src/chrome/content/rules/Wilde_Beuger_Solmecke.xml
index f3e7ff2bda94..8f692bd19876 100644
--- a/src/chrome/content/rules/Wilde_Beuger_Solmecke.xml
+++ b/src/chrome/content/rules/Wilde_Beuger_Solmecke.xml
@@ -4,7 +4,7 @@
 
 	Problematic subdomains:
 
-		- ^	(self-signed, mismatched; CN: 17833.whserv.de)		
+		- ^	(self-signed, mismatched; CN: 17833.whserv.de)
 
 -->
 
diff --git a/src/chrome/content/rules/Wildfiregames.com.xml b/src/chrome/content/rules/Wildfiregames.com.xml
index 6829f87d398e..f4fd98c1d6e6 100644
--- a/src/chrome/content/rules/Wildfiregames.com.xml
+++ b/src/chrome/content/rules/Wildfiregames.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://releases.wildfiregames.com/ => https://releases.wildfiregame
     Other rulesets for related sites:
         - Play0ad.com.xml
 -->
-
+
     
     
     
diff --git a/src/chrome/content/rules/Wildlifesydney.com.au.xml b/src/chrome/content/rules/Wildlifesydney.com.au.xml
index 8e8e0b9add9c..dac8fd9a5866 100644
--- a/src/chrome/content/rules/Wildlifesydney.com.au.xml
+++ b/src/chrome/content/rules/Wildlifesydney.com.au.xml
@@ -8,7 +8,7 @@ Fetch error: http://secure.wildlifesydney.com.au/ => https://secure.wildlifesydn
 	Nonfunctional subdomains:
 		- calendar		(cert mismatch)
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Wildwestdomains.com.xml b/src/chrome/content/rules/Wildwestdomains.com.xml
new file mode 100644
index 000000000000..06663eef6616
--- /dev/null
+++ b/src/chrome/content/rules/Wildwestdomains.com.xml
@@ -0,0 +1,16 @@
+
+
+
+	
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/Wilhelm-gym.net.xml b/src/chrome/content/rules/Wilhelm-gym.net.xml
index 76fc86b07474..f45b083af105 100644
--- a/src/chrome/content/rules/Wilhelm-gym.net.xml
+++ b/src/chrome/content/rules/Wilhelm-gym.net.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Will_Leather_Goods.xml b/src/chrome/content/rules/Will_Leather_Goods.xml
index c4a6f424a2d9..5c21ee606432 100644
--- a/src/chrome/content/rules/Will_Leather_Goods.xml
+++ b/src/chrome/content/rules/Will_Leather_Goods.xml
@@ -4,9 +4,9 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Willamette_Week.xml b/src/chrome/content/rules/Willamette_Week.xml
index 1925abf5cb2d..a28b5ff48257 100644
--- a/src/chrome/content/rules/Willamette_Week.xml
+++ b/src/chrome/content/rules/Willamette_Week.xml
@@ -15,4 +15,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/William-Hill.xml b/src/chrome/content/rules/William-Hill.xml
index aa398470b858..8629a3aecc7a 100644
--- a/src/chrome/content/rules/William-Hill.xml
+++ b/src/chrome/content/rules/William-Hill.xml
@@ -56,7 +56,7 @@ Fetch error: http://cacheserve.williamhill.com/ => https://serve.williamhill.com
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Williams-College.xml b/src/chrome/content/rules/Williams-College.xml
index 66e28383df2c..7001fda7a265 100644
--- a/src/chrome/content/rules/Williams-College.xml
+++ b/src/chrome/content/rules/Williams-College.xml
@@ -49,10 +49,10 @@
 
 	
-	
+
 	
 
-	
 
diff --git a/src/chrome/content/rules/Willow-Garage.xml b/src/chrome/content/rules/Willow-Garage.xml
index 46d7f6551e17..f4256f04878f 100644
--- a/src/chrome/content/rules/Willow-Garage.xml
+++ b/src/chrome/content/rules/Willow-Garage.xml
@@ -16,10 +16,10 @@ Fetch error: http://willowgarage.com/ => https://www.willowgarage.com/: (28, 'Co
 		- ^	(cert only matches www)
 
 -->
-
+
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Willy-Brandt.de.xml b/src/chrome/content/rules/Willy-Brandt.de.xml
new file mode 100644
index 000000000000..51585a8a9ae3
--- /dev/null
+++ b/src/chrome/content/rules/Willy-Brandt.de.xml
@@ -0,0 +1,12 @@
+
+	
+
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/WilsonTimes.com.xml b/src/chrome/content/rules/WilsonTimes.com.xml
new file mode 100644
index 000000000000..1783c91631dc
--- /dev/null
+++ b/src/chrome/content/rules/WilsonTimes.com.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Win-is.com.xml b/src/chrome/content/rules/Win-is.com.xml
deleted file mode 100644
index 737606c8328f..000000000000
--- a/src/chrome/content/rules/Win-is.com.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/WinRAR.xml b/src/chrome/content/rules/WinRAR.xml
index 2939192c27fc..05e2eaeda7bd 100644
--- a/src/chrome/content/rules/WinRAR.xml
+++ b/src/chrome/content/rules/WinRAR.xml
@@ -1,6 +1,5 @@
 
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/WinZip.com.xml b/src/chrome/content/rules/WinZip.com.xml
index 4aee1928d632..18735152c0c7 100644
--- a/src/chrome/content/rules/WinZip.com.xml
+++ b/src/chrome/content/rules/WinZip.com.xml
@@ -1,5 +1,5 @@
 
 
-
+
   
 
 	
diff --git a/src/chrome/content/rules/Wind.it.xml b/src/chrome/content/rules/Wind.it.xml
new file mode 100644
index 000000000000..8d5d7e66109c
--- /dev/null
+++ b/src/chrome/content/rules/Wind.it.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Wind_River.com-problematic.xml b/src/chrome/content/rules/Wind_River.com-problematic.xml
index ca5b714da952..a0239d23e517 100644
--- a/src/chrome/content/rules/Wind_River.com-problematic.xml
+++ b/src/chrome/content/rules/Wind_River.com-problematic.xml
@@ -5,7 +5,8 @@
 
 
 	
-	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Wind_River.com.xml b/src/chrome/content/rules/Wind_River.com.xml
index edff5a44a29d..7445e0f60daf 100644
--- a/src/chrome/content/rules/Wind_River.com.xml
+++ b/src/chrome/content/rules/Wind_River.com.xml
@@ -18,7 +18,7 @@ Fetch error: http://developer.windriver.com/ => https://developer.windriver.com/
 		- developer.windriver.com
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Windows_IT_Pro.xml b/src/chrome/content/rules/Windows_IT_Pro.xml
deleted file mode 100644
index 3e47db301ff0..000000000000
--- a/src/chrome/content/rules/Windows_IT_Pro.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Windstream_Communications.xml b/src/chrome/content/rules/Windstream_Communications.xml
index c9085d6e6ea3..31ef1e686460 100644
--- a/src/chrome/content/rules/Windstream_Communications.xml
+++ b/src/chrome/content/rules/Windstream_Communications.xml
@@ -32,4 +32,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/WineAustraliaCorporation.xml b/src/chrome/content/rules/WineAustraliaCorporation.xml
index 0a24898e0c44..7cfd3e1b13b8 100644
--- a/src/chrome/content/rules/WineAustraliaCorporation.xml
+++ b/src/chrome/content/rules/WineAustraliaCorporation.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Winhawille.edu.hel.fi.xml b/src/chrome/content/rules/Winhawille.edu.hel.fi.xml
deleted file mode 100644
index 6963d7d67e6e..000000000000
--- a/src/chrome/content/rules/Winhawille.edu.hel.fi.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-  
-  
-
-
diff --git a/src/chrome/content/rules/Winner.com.xml b/src/chrome/content/rules/Winner.com.xml
index d2164e21f92a..0c9c091c5ed5 100644
--- a/src/chrome/content/rules/Winner.com.xml
+++ b/src/chrome/content/rules/Winner.com.xml
@@ -55,12 +55,33 @@
 		- securelivecasino
 		- securemobile
 		- service
-		- wap		
+		- wap
 
 -->
 
 
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 		
 		
 		
@@ -70,8 +91,6 @@
 	
 
 
-	
 
 	
@@ -79,4 +98,5 @@
 	
 
+	
 
diff --git a/src/chrome/content/rules/Winoptions.com.xml b/src/chrome/content/rules/Winoptions.com.xml
deleted file mode 100644
index d57f7fbdcf16..000000000000
--- a/src/chrome/content/rules/Winoptions.com.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Wintotal.de.xml b/src/chrome/content/rules/Wintotal.de.xml
index 02c31e3f6f48..f0f2f31a6c46 100644
--- a/src/chrome/content/rules/Wintotal.de.xml
+++ b/src/chrome/content/rules/Wintotal.de.xml
@@ -1,6 +1,6 @@
 
 
 
diff --git a/src/chrome/content/rules/Wire.com.xml b/src/chrome/content/rules/Wire.com.xml
deleted file mode 100644
index 66e836c9b2be..000000000000
--- a/src/chrome/content/rules/Wire.com.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Wire.innocraft.cloud.xml b/src/chrome/content/rules/Wire.innocraft.cloud.xml
new file mode 100644
index 000000000000..e3a3ca8c2485
--- /dev/null
+++ b/src/chrome/content/rules/Wire.innocraft.cloud.xml
@@ -0,0 +1,8 @@
+
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/WireEdit.com.xml b/src/chrome/content/rules/WireEdit.com.xml
index c75d1d1523e9..9e69fe0a264c 100644
--- a/src/chrome/content/rules/WireEdit.com.xml
+++ b/src/chrome/content/rules/WireEdit.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.wireedit.com/ => https://www.wireedit.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.wireedit.com'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Wired.com.xml b/src/chrome/content/rules/Wired.com.xml
index e8393c45c9b0..1746f106f363 100644
--- a/src/chrome/content/rules/Wired.com.xml
+++ b/src/chrome/content/rules/Wired.com.xml
@@ -5,7 +5,7 @@
 		- insights.wired.com
 		- www.insights.wired.com
 		- stats.wired.com
-		
+
 	Refused:
 		- feeds.wired.com
 		- howto.wired.com
@@ -20,12 +20,12 @@
 	
 	
 		
-			
+		
 	
 	
 	
 	
-			
+		
 	
 	
 	
diff --git a/src/chrome/content/rules/WiredMinds.xml b/src/chrome/content/rules/WiredMinds.xml
index 8e77fba1bc77..c40787ab2337 100644
--- a/src/chrome/content/rules/WiredMinds.xml
+++ b/src/chrome/content/rules/WiredMinds.xml
@@ -1,4 +1,9 @@
+
 
+	
+	
+	
 
 	
 	
 
-
-	
-
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/WiredSafety.org.xml b/src/chrome/content/rules/WiredSafety.org.xml
index 26173470cb2d..19a8f1cb6eb0 100644
--- a/src/chrome/content/rules/WiredSafety.org.xml
+++ b/src/chrome/content/rules/WiredSafety.org.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.wiredsafety.org/ => https://www.wiredsafety.org/: Too ma
 		- www.wiredsafety.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Wiredjs.com.xml b/src/chrome/content/rules/Wiredjs.com.xml
new file mode 100644
index 000000000000..628887ece194
--- /dev/null
+++ b/src/chrome/content/rules/Wiredjs.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Wirral.gov.uk-falsemixed.xml b/src/chrome/content/rules/Wirral.gov.uk-falsemixed.xml
index d37f0578944f..eae3cd90d304 100644
--- a/src/chrome/content/rules/Wirral.gov.uk-falsemixed.xml
+++ b/src/chrome/content/rules/Wirral.gov.uk-falsemixed.xml
@@ -7,7 +7,7 @@ Fetch error: http://democracy.wirral.gov.uk/ => https://democracy.wirral.gov.uk/
 	For rules not causing false/broken MCB, see Wirral.gov.uk.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Wirral.gov.uk.xml b/src/chrome/content/rules/Wirral.gov.uk.xml
index 919525210298..fd15d8e8573e 100644
--- a/src/chrome/content/rules/Wirral.gov.uk.xml
+++ b/src/chrome/content/rules/Wirral.gov.uk.xml
@@ -17,7 +17,7 @@
 	Problematic hosts in *wirral.gov.uk:
 
 		- democracy * ˣ
-	
+
 	* s:.../$ redirects to p:...:443/
 	ˣ Mixed css
 
diff --git a/src/chrome/content/rules/Wishabi.xml b/src/chrome/content/rules/Wishabi.xml
deleted file mode 100644
index 56530a5413ee..000000000000
--- a/src/chrome/content/rules/Wishabi.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Wishlist_Granted.com.xml b/src/chrome/content/rules/Wishlist_Granted.com.xml
index 332ab71452a8..5c06e1861591 100644
--- a/src/chrome/content/rules/Wishlist_Granted.com.xml
+++ b/src/chrome/content/rules/Wishlist_Granted.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.wishlistgranted.com/ => https://wishlistgranted.com/: (6
 	www: cert only matches ^wishlistgranted.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Wishpot.com.xml b/src/chrome/content/rules/Wishpot.com.xml
index cd16575ac40a..75b0ce87803f 100644
--- a/src/chrome/content/rules/Wishpot.com.xml
+++ b/src/chrome/content/rules/Wishpot.com.xml
@@ -11,10 +11,12 @@ Fetch error: http://wishpot.com/ => https://www.wishpot.com/: (28, 'Operation ti
 	^: 404
 
 -->
-
+
 
 	
-	
+	
+	
+	
 
 
 	
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Wit.ai.xml b/src/chrome/content/rules/Wit.ai.xml
deleted file mode 100644
index 9fe44853bff9..000000000000
--- a/src/chrome/content/rules/Wit.ai.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/WithSIX.xml b/src/chrome/content/rules/WithSIX.xml
deleted file mode 100644
index 870fd7bf2f9f..000000000000
--- a/src/chrome/content/rules/WithSIX.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-	
-	
-	
-  
-  
-	
-
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-
-			
-			
-
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Wix.xml b/src/chrome/content/rules/Wix.xml
index 62c9e6aa3785..0cdde3705751 100644
--- a/src/chrome/content/rules/Wix.xml
+++ b/src/chrome/content/rules/Wix.xml
@@ -13,7 +13,7 @@
 		- archive (unknown SSL protocol error)
 		- arena ¹
 		- beat (interrupted)
-		- dns.lc 
+		- dns.lc
 		- investors ²
 		- jobs (cert: dns.lc.wix.com; 403)
 
@@ -34,6 +34,7 @@
 	
 	
 	
+	
 	
 	
 	
diff --git a/src/chrome/content/rules/Wiz.cn.xml b/src/chrome/content/rules/Wiz.cn.xml
index 841c2350b4cd..981569b041c1 100644
--- a/src/chrome/content/rules/Wiz.cn.xml
+++ b/src/chrome/content/rules/Wiz.cn.xml
@@ -1,11 +1,11 @@
 
 
 	
+	
+	
+
 	
 	
 		
@@ -21,16 +24,15 @@
 		
 
 	
-	
 	
 	
 	
 		
+	
 	
 	
-	
-	
-	
+	
+	
 	
 
 	
diff --git a/src/chrome/content/rules/Wizard-Internet-Services.xml b/src/chrome/content/rules/Wizard-Internet-Services.xml
index bbe7d5961e3f..ee229eb963b3 100644
--- a/src/chrome/content/rules/Wizard-Internet-Services.xml
+++ b/src/chrome/content/rules/Wizard-Internet-Services.xml
@@ -1,26 +1,20 @@
 
 
 
-	
-
-
-	
-	
-
-	
+	
+	
 
+	
 
diff --git a/src/chrome/content/rules/Wizards.com.xml b/src/chrome/content/rules/Wizards.com.xml
index a09e38659461..29733628825f 100644
--- a/src/chrome/content/rules/Wizards.com.xml
+++ b/src/chrome/content/rules/Wizards.com.xml
@@ -20,7 +20,7 @@
 
 		Mixed content blocking (MCB) triggered:
 		- dnd.wizards.com
-	
+
 -->
 
 
diff --git a/src/chrome/content/rules/Wizbang.xml b/src/chrome/content/rules/Wizbang.xml
index 6cc3477c82ec..f5c9eeea5aee 100644
--- a/src/chrome/content/rules/Wizbang.xml
+++ b/src/chrome/content/rules/Wizbang.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Wizbang_Pop.xml b/src/chrome/content/rules/Wizbang_Pop.xml
deleted file mode 100644
index 0a7d595cba89..000000000000
--- a/src/chrome/content/rules/Wizbang_Pop.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/WoSign.cn.xml b/src/chrome/content/rules/WoSign.cn.xml
index d186db166cef..fa10cc4ae1af 100644
--- a/src/chrome/content/rules/WoSign.cn.xml
+++ b/src/chrome/content/rules/WoSign.cn.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.wosign.cn/ => https://www.wosign.cn/: (51, "SSL: no alte
 	For other WoSign coverage, see WoSign.com.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/WoSign.com.xml b/src/chrome/content/rules/WoSign.com.xml
index cb8265b3b465..d743b488279f 100644
--- a/src/chrome/content/rules/WoSign.com.xml
+++ b/src/chrome/content/rules/WoSign.com.xml
@@ -19,7 +19,7 @@ Fetch error: http://support.wosign.com/ => https://support.wosign.com/: (6, 'Cou
 	² Invalid certificate
 	⁴ 404
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/WolfeBransonZipline.com.xml b/src/chrome/content/rules/WolfeBransonZipline.com.xml
new file mode 100644
index 000000000000..36cf83c5eefd
--- /dev/null
+++ b/src/chrome/content/rules/WolfeBransonZipline.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Wolfire-Games.xml b/src/chrome/content/rules/Wolfire-Games.xml
index 8e0c333b35b7..4b59670a2485 100644
--- a/src/chrome/content/rules/Wolfire-Games.xml
+++ b/src/chrome/content/rules/Wolfire-Games.xml
@@ -15,7 +15,7 @@ Fetch error: http://discourse.wolfire.com/ => https://discourse.wolfire.com/: (7
 		- legacy.wolfire.com (self-signed)
 		- wiki.wolfire.com (self-signed)
 -->
-
+
 	
 	
 		
diff --git a/src/chrome/content/rules/Wolfram.com.xml b/src/chrome/content/rules/Wolfram.com.xml
index d8c6af5c2abd..a58cf764f810 100644
--- a/src/chrome/content/rules/Wolfram.com.xml
+++ b/src/chrome/content/rules/Wolfram.com.xml
@@ -1,9 +1,10 @@
 
 
 
@@ -24,7 +28,7 @@
 	
 	
 	
-	
+	
 	
 	
 	
diff --git a/src/chrome/content/rules/WolframAlpha.com.xml b/src/chrome/content/rules/WolframAlpha.com.xml
new file mode 100644
index 000000000000..811835fab63f
--- /dev/null
+++ b/src/chrome/content/rules/WolframAlpha.com.xml
@@ -0,0 +1,67 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+
+	
+		
+
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Wolfram_Alpha.xml b/src/chrome/content/rules/Wolfram_Alpha.xml
deleted file mode 100644
index 4b837cde66a6..000000000000
--- a/src/chrome/content/rules/Wolfram_Alpha.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Wolfram_CDN.com.xml b/src/chrome/content/rules/Wolfram_CDN.com.xml
index ebd1d1ffad6d..5267c0720bd9 100644
--- a/src/chrome/content/rules/Wolfram_CDN.com.xml
+++ b/src/chrome/content/rules/Wolfram_CDN.com.xml
@@ -1,9 +1,5 @@
 
 
   
   
diff --git a/src/chrome/content/rules/Wolverhampton.gov.uk.xml b/src/chrome/content/rules/Wolverhampton.gov.uk.xml
index a8e0d172b6c7..733caae05416 100644
--- a/src/chrome/content/rules/Wolverhampton.gov.uk.xml
+++ b/src/chrome/content/rules/Wolverhampton.gov.uk.xml
@@ -75,7 +75,6 @@
 					-->
 			
 			
-			
 			
 			
 			
diff --git a/src/chrome/content/rules/WolverineWorldwide.com.xml b/src/chrome/content/rules/WolverineWorldwide.com.xml
new file mode 100644
index 000000000000..1e5f79cd72fc
--- /dev/null
+++ b/src/chrome/content/rules/WolverineWorldwide.com.xml
@@ -0,0 +1,16 @@
+
+
+
+	
+	
+	
+
+	
+		
+
+	
+
diff --git a/src/chrome/content/rules/Women_on_Web.xml b/src/chrome/content/rules/Women_on_Web.xml
index 4dd6770532c7..2f346ea5a225 100644
--- a/src/chrome/content/rules/Women_on_Web.xml
+++ b/src/chrome/content/rules/Women_on_Web.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://womenonweb.org/ => https://womenonweb.org/: (51, "SSL: no alternative certificate subject name matches target host name 'womenonweb.org'")
 
 -->
-
+
 
 	
 	
@@ -15,4 +15,4 @@ Fetch error: http://womenonweb.org/ => https://womenonweb.org/: (51, "SSL: no al
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Womens-Aid.xml b/src/chrome/content/rules/Womens-Aid.xml
index eba63ae6a6c7..fb68654142b3 100644
--- a/src/chrome/content/rules/Womens-Aid.xml
+++ b/src/chrome/content/rules/Womens-Aid.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://womensaid.ie/ => https://womensaid.ie/: (51, "SSL: no alternative certificate subject name matches target host name 'womensaid.ie'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Womens_Health_Specialists.xml b/src/chrome/content/rules/Womens_Health_Specialists.xml
index c70d57092b43..7d44a6de043a 100644
--- a/src/chrome/content/rules/Womens_Health_Specialists.xml
+++ b/src/chrome/content/rules/Womens_Health_Specialists.xml
@@ -16,4 +16,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Womenshealth.de.xml b/src/chrome/content/rules/Womenshealth.de.xml
index c1529dc07509..5a457b7d803d 100644
--- a/src/chrome/content/rules/Womenshealth.de.xml
+++ b/src/chrome/content/rules/Womenshealth.de.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.womenshealth.de/ => https://www.womenshealth.de/: (51, "SSL: no alternative certificate subject name matches target host name 'www.womenshealth.de'")
 
 -->
-
+
 
 
 
diff --git a/src/chrome/content/rules/Wonderlandmovies.xml b/src/chrome/content/rules/Wonderlandmovies.xml
index 6017033c3c09..bf168c1b9c2c 100644
--- a/src/chrome/content/rules/Wonderlandmovies.xml
+++ b/src/chrome/content/rules/Wonderlandmovies.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Wonga.com.xml b/src/chrome/content/rules/Wonga.com.xml
index 5293e6741889..77a2e1779bd1 100644
--- a/src/chrome/content/rules/Wonga.com.xml
+++ b/src/chrome/content/rules/Wonga.com.xml
@@ -15,4 +15,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Wood_Green.org.uk.xml b/src/chrome/content/rules/Wood_Green.org.uk.xml
index 772c235d271f..894fc1ccc5d9 100644
--- a/src/chrome/content/rules/Wood_Green.org.uk.xml
+++ b/src/chrome/content/rules/Wood_Green.org.uk.xml
@@ -1,7 +1,6 @@
 
 		
 
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Wood_Green_Shop.org.uk.xml b/src/chrome/content/rules/Wood_Green_Shop.org.uk.xml
deleted file mode 100644
index d2f37ee2ad2e..000000000000
--- a/src/chrome/content/rules/Wood_Green_Shop.org.uk.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Wood_Tree_Swings.xml b/src/chrome/content/rules/Wood_Tree_Swings.xml
index 54720e81b02a..1fe752462343 100644
--- a/src/chrome/content/rules/Wood_Tree_Swings.xml
+++ b/src/chrome/content/rules/Wood_Tree_Swings.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Wooga.xml b/src/chrome/content/rules/Wooga.xml
index 1fc90ecd9ff0..af8d78e7c812 100644
--- a/src/chrome/content/rules/Wooga.xml
+++ b/src/chrome/content/rules/Wooga.xml
@@ -8,7 +8,8 @@
 -->
 
 
-	
+	
+	
 
 
 	 https://webchatau.woolworths.com.au/: (7, 'Failed to connect to webchatau.woolworths.com.au port 443: Connection refused')
+Fetch error: http://webchatnz.woolworths.com.au/ => https://webchatnz.woolworths.com.au/: (7, 'Failed to connect to webchatnz.woolworths.com.au port 443: Connection refused')
+
+-->
+
+
+
+
 
 	
 	
 	
-	
+	
 	
 	
 	
 	
 	
 	
-	
+	
 	
-	
-	
+	
+	
 	
 	
 	
-	
-	
-	
+	
+	
+	
 	
 	
-	
+	
 	
 	
 	
-	
-		
-		
-	
 	
 	
 	
@@ -125,14 +158,13 @@
 	
 	
 	
-	
-	
-	
-	
+	
+	
+	
 	
 	
 	
-	
+	
 	
 	
 	
@@ -151,8 +183,8 @@
 	
 	
 	
-	
-	
+	
+	
 	
 	
 	
diff --git a/src/chrome/content/rules/WoolworthsFlowers.com.au.xml b/src/chrome/content/rules/WoolworthsFlowers.com.au.xml
deleted file mode 100644
index 503fd19bb24b..000000000000
--- a/src/chrome/content/rules/WoolworthsFlowers.com.au.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/WoolworthsMobile.com.au.xml b/src/chrome/content/rules/WoolworthsMobile.com.au.xml
index e766ed11b2a5..14dae60497ee 100644
--- a/src/chrome/content/rules/WoolworthsMobile.com.au.xml
+++ b/src/chrome/content/rules/WoolworthsMobile.com.au.xml
@@ -3,7 +3,7 @@
 
 
 	Nonfunctional subdomains:
-		
+
 		- woolworthsmobile.com.au
 			- it	(connection refused)
 			- shoutout	(mismatch hostname, CN: shoutout.woolworths.com.au)
diff --git a/src/chrome/content/rules/Woot.com.xml b/src/chrome/content/rules/Woot.com.xml
new file mode 100644
index 000000000000..12bafacfedd7
--- /dev/null
+++ b/src/chrome/content/rules/Woot.com.xml
@@ -0,0 +1,33 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Woot.xml b/src/chrome/content/rules/Woot.xml
deleted file mode 100644
index bab364002f33..000000000000
--- a/src/chrome/content/rules/Woot.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-		
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Wooting.nl.xml b/src/chrome/content/rules/Wooting.nl.xml
new file mode 100644
index 000000000000..868353fbe018
--- /dev/null
+++ b/src/chrome/content/rules/Wooting.nl.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/WordPress-blogs.xml b/src/chrome/content/rules/WordPress-blogs.xml
index 661afb6abd84..2d6529b342cd 100644
--- a/src/chrome/content/rules/WordPress-blogs.xml
+++ b/src/chrome/content/rules/WordPress-blogs.xml
@@ -3,10 +3,8 @@
 -->
 
 
-	
 	
 	
-	
 
 	
 
diff --git a/src/chrome/content/rules/WordPress.tv.xml b/src/chrome/content/rules/WordPress.tv.xml
index 06305b1c4b3c..7af416568d07 100644
--- a/src/chrome/content/rules/WordPress.tv.xml
+++ b/src/chrome/content/rules/WordPress.tv.xml
@@ -1,6 +1,6 @@
 
diff --git a/src/chrome/content/rules/WordPress.xml b/src/chrome/content/rules/WordPress.xml
index a253d795a154..137f3c553130 100644
--- a/src/chrome/content/rules/WordPress.xml
+++ b/src/chrome/content/rules/WordPress.xml
@@ -28,7 +28,7 @@
 		
 		
 
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/WordRider.net.xml b/src/chrome/content/rules/WordRider.net.xml
new file mode 100644
index 000000000000..9823fefc8a3c
--- /dev/null
+++ b/src/chrome/content/rules/WordRider.net.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Word_Pro.xml b/src/chrome/content/rules/Word_Pro.xml
index f52c9533da63..8da88e2ff618 100644
--- a/src/chrome/content/rules/Word_Pro.xml
+++ b/src/chrome/content/rules/Word_Pro.xml
@@ -13,7 +13,7 @@
 
 
 	
-	
+	
 
 
 	
@@ -22,4 +22,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Wordentropy.org.xml b/src/chrome/content/rules/Wordentropy.org.xml
index e45c50a15801..66eeb95ab6c1 100644
--- a/src/chrome/content/rules/Wordentropy.org.xml
+++ b/src/chrome/content/rules/Wordentropy.org.xml
@@ -5,10 +5,10 @@ Fetch error: http://wordentropy.org/ => https://wordentropy.org/: (28, 'Operatio
 Fetch error: http://www.wordentropy.org/ => https://www.wordentropy.org/: (28, 'Operation timed out after 30001 milliseconds with 0 bytes received')
 
 -->
-
+
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Wordnik.xml b/src/chrome/content/rules/Wordnik.xml
index f237070797bf..2fa17582e2cd 100644
--- a/src/chrome/content/rules/Wordnik.xml
+++ b/src/chrome/content/rules/Wordnik.xml
@@ -3,7 +3,7 @@
 	
 	
 	
-	
+
 
 
 	
diff --git a/src/chrome/content/rules/Work4_Labs.xml b/src/chrome/content/rules/Work4_Labs.xml
index 50cfedc275a6..10ae25d96826 100644
--- a/src/chrome/content/rules/Work4_Labs.xml
+++ b/src/chrome/content/rules/Work4_Labs.xml
@@ -10,4 +10,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Workaround.org.xml b/src/chrome/content/rules/Workaround.org.xml
index 6f17f4c7e53e..76bac1759d70 100644
--- a/src/chrome/content/rules/Workaround.org.xml
+++ b/src/chrome/content/rules/Workaround.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://fry.workaround.org/ => https://fry.workaround.org/: (51, "SS
 Fetch error: http://www.workaround.org/ => https://www.workaround.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.workaround.org'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/WorkplaceGenderEqualityAgency.xml b/src/chrome/content/rules/WorkplaceGenderEqualityAgency.xml
index a2cf27f5f833..9eb0cf95b438 100644
--- a/src/chrome/content/rules/WorkplaceGenderEqualityAgency.xml
+++ b/src/chrome/content/rules/WorkplaceGenderEqualityAgency.xml
@@ -1,7 +1,7 @@
 
 	
-	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Workzeitung.ch.xml b/src/chrome/content/rules/Workzeitung.ch.xml
new file mode 100644
index 000000000000..d1d98fc2a338
--- /dev/null
+++ b/src/chrome/content/rules/Workzeitung.ch.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/World-Nuclear-News.org.xml b/src/chrome/content/rules/World-Nuclear-News.org.xml
new file mode 100644
index 000000000000..263a0a96b959
--- /dev/null
+++ b/src/chrome/content/rules/World-Nuclear-News.org.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/World-of-Warships.xml b/src/chrome/content/rules/World-of-Warships.xml
new file mode 100644
index 000000000000..f0601fbcefac
--- /dev/null
+++ b/src/chrome/content/rules/World-of-Warships.xml
@@ -0,0 +1,91 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/WorldMate.com.xml b/src/chrome/content/rules/WorldMate.com.xml
index b9b498e6ef18..56e4347174e2 100644
--- a/src/chrome/content/rules/WorldMate.com.xml
+++ b/src/chrome/content/rules/WorldMate.com.xml
@@ -5,7 +5,8 @@
 
 
 	
-	
+	
+	
 
 
 	
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/WorldOfPlayers.ru.xml b/src/chrome/content/rules/WorldOfPlayers.ru.xml
new file mode 100644
index 000000000000..61877374142a
--- /dev/null
+++ b/src/chrome/content/rules/WorldOfPlayers.ru.xml
@@ -0,0 +1,23 @@
+
+
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/WorldRemit.com.xml b/src/chrome/content/rules/WorldRemit.com.xml
index 908fd3db38ee..648b0d82ef6c 100644
--- a/src/chrome/content/rules/WorldRemit.com.xml
+++ b/src/chrome/content/rules/WorldRemit.com.xml
@@ -5,7 +5,8 @@
 
 
 	
-	
+	
+	
 
 
 	
-
+
 
 	
 	
@@ -15,4 +15,4 @@ Fetch error: http://worldfoodprize.org/ => https://worldfoodprize.org/: (51, "SS
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/World_Landscape_Architecture.xml b/src/chrome/content/rules/World_Landscape_Architecture.xml
index 2cc08e0991c1..8fdcf91679d4 100644
--- a/src/chrome/content/rules/World_Landscape_Architecture.xml
+++ b/src/chrome/content/rules/World_Landscape_Architecture.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/World_Precision_Instruments.xml b/src/chrome/content/rules/World_Precision_Instruments.xml
index 55b099092569..35b37ed707df 100644
--- a/src/chrome/content/rules/World_Precision_Instruments.xml
+++ b/src/chrome/content/rules/World_Precision_Instruments.xml
@@ -17,4 +17,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/World_Television.xml b/src/chrome/content/rules/World_Television.xml
index 7c959967b052..b8af9e5787fb 100644
--- a/src/chrome/content/rules/World_Television.xml
+++ b/src/chrome/content/rules/World_Television.xml
@@ -14,13 +14,13 @@
 -->
 
 
-	
+	
+	
 
 
 	
 
 
-	
+	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/World_e-ID_Congress.xml b/src/chrome/content/rules/World_e-ID_Congress.xml
index 0fb53fefc971..80bbd4c09d76 100644
--- a/src/chrome/content/rules/World_e-ID_Congress.xml
+++ b/src/chrome/content/rules/World_e-ID_Congress.xml
@@ -15,4 +15,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/World_of_Warships.xml b/src/chrome/content/rules/World_of_Warships.xml
deleted file mode 100644
index b5f8807c8811..000000000000
--- a/src/chrome/content/rules/World_of_Warships.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Worldometers.info.xml b/src/chrome/content/rules/Worldometers.info.xml
new file mode 100644
index 000000000000..14f4f21b92ad
--- /dev/null
+++ b/src/chrome/content/rules/Worldometers.info.xml
@@ -0,0 +1,21 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Worldtimebuddy.com.xml b/src/chrome/content/rules/Worldtimebuddy.com.xml
new file mode 100644
index 000000000000..98ef8951f272
--- /dev/null
+++ b/src/chrome/content/rules/Worldtimebuddy.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/WorstPills.org.xml b/src/chrome/content/rules/WorstPills.org.xml
index e74c7ec9e2c1..6850e13f1d54 100644
--- a/src/chrome/content/rules/WorstPills.org.xml
+++ b/src/chrome/content/rules/WorstPills.org.xml
@@ -3,4 +3,4 @@
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Wpveda.com.xml b/src/chrome/content/rules/Wpveda.com.xml
index 215d6231e432..bd176cd4d733 100644
--- a/src/chrome/content/rules/Wpveda.com.xml
+++ b/src/chrome/content/rules/Wpveda.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://www.wpveda.com/ => https://www.wpveda.com/: (6, 'Could not r
 		- .wpveda.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Wqf.me.xml b/src/chrome/content/rules/Wqf.me.xml
deleted file mode 100644
index 81f20db1f1e8..000000000000
--- a/src/chrome/content/rules/Wqf.me.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Wrapadviser.co.uk.xml b/src/chrome/content/rules/Wrapadviser.co.uk.xml
index cfdadebebcd8..fc56eab730e0 100644
--- a/src/chrome/content/rules/Wrapadviser.co.uk.xml
+++ b/src/chrome/content/rules/Wrapadviser.co.uk.xml
@@ -3,10 +3,10 @@
 	
 
 
-	
+	
 
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Wrating.com.xml b/src/chrome/content/rules/Wrating.com.xml
index 7fa92fbc1ce4..0365c2fdf96e 100644
--- a/src/chrome/content/rules/Wrating.com.xml
+++ b/src/chrome/content/rules/Wrating.com.xml
@@ -18,7 +18,7 @@ Fetch error: http://sohu.wrating.com/ => https://dsl.wrating.com/: (60, 'SSL cer
 		- .wrating.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/WriteTheDocs.org.xml b/src/chrome/content/rules/WriteTheDocs.org.xml
new file mode 100644
index 000000000000..aeed976fcde8
--- /dev/null
+++ b/src/chrome/content/rules/WriteTheDocs.org.xml
@@ -0,0 +1,29 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/WritingStreak.io.xml b/src/chrome/content/rules/WritingStreak.io.xml
new file mode 100644
index 000000000000..8e173e6a5d0f
--- /dev/null
+++ b/src/chrome/content/rules/WritingStreak.io.xml
@@ -0,0 +1,10 @@
+
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Wrzuta.pl.xml b/src/chrome/content/rules/Wrzuta.pl.xml
index 277b38b08e5f..96ac7035f979 100644
--- a/src/chrome/content/rules/Wrzuta.pl.xml
+++ b/src/chrome/content/rules/Wrzuta.pl.xml
@@ -15,10 +15,11 @@ Fetch error: http://ssl.wrzuta.pl/static/opensearch/search.xml => https://ssl.wr
 		- (www.)	(mismatched, CN: ssl.wrzuta.pl)
 
 -->
-
+
 
 	
-	
+	
+	
 		
 
 
diff --git a/src/chrome/content/rules/Wservices.ch.xml b/src/chrome/content/rules/Wservices.ch.xml
index 4f6f0dfa1787..7fb60462a3a0 100644
--- a/src/chrome/content/rules/Wservices.ch.xml
+++ b/src/chrome/content/rules/Wservices.ch.xml
@@ -18,4 +18,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Wtpx-Telekom.com.xml b/src/chrome/content/rules/Wtpx-Telekom.com.xml
deleted file mode 100644
index 9aa17bc9d0b5..000000000000
--- a/src/chrome/content/rules/Wtpx-Telekom.com.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Wuala.xml b/src/chrome/content/rules/Wuala.xml
index d5e4fd1270fc..949927ce36e9 100644
--- a/src/chrome/content/rules/Wuala.xml
+++ b/src/chrome/content/rules/Wuala.xml
@@ -1,14 +1,6 @@
-
-  
-  
+
+	
+	
 
-	
-	
-	
-
-  
-
-  
-  
+	
 
diff --git a/src/chrome/content/rules/Wunderground.com.xml b/src/chrome/content/rules/Wunderground.com.xml
new file mode 100644
index 000000000000..09fdb312f028
--- /dev/null
+++ b/src/chrome/content/rules/Wunderground.com.xml
@@ -0,0 +1,44 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Wxug.com.xml b/src/chrome/content/rules/Wxug.com.xml
new file mode 100644
index 000000000000..2ac3ec5c179f
--- /dev/null
+++ b/src/chrome/content/rules/Wxug.com.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Wykop.pl.xml b/src/chrome/content/rules/Wykop.pl.xml
index 90cfd38200ef..5c498f422567 100644
--- a/src/chrome/content/rules/Wykop.pl.xml
+++ b/src/chrome/content/rules/Wykop.pl.xml
@@ -21,4 +21,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Wyndham.xml b/src/chrome/content/rules/Wyndham.xml
deleted file mode 100644
index a3955adcdb4b..000000000000
--- a/src/chrome/content/rules/Wyndham.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-	
-
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/WyndhamHotels.com.xml b/src/chrome/content/rules/WyndhamHotels.com.xml
new file mode 100644
index 000000000000..581ae3a540de
--- /dev/null
+++ b/src/chrome/content/rules/WyndhamHotels.com.xml
@@ -0,0 +1,77 @@
+
+
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/WyndhamJobs.com.xml b/src/chrome/content/rules/WyndhamJobs.com.xml
index 92c193f566bf..f0b40a980284 100644
--- a/src/chrome/content/rules/WyndhamJobs.com.xml
+++ b/src/chrome/content/rules/WyndhamJobs.com.xml
@@ -1,5 +1,5 @@
 
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/X-lift.jp.xml b/src/chrome/content/rules/X-lift.jp.xml
deleted file mode 100644
index 332fe947a1be..000000000000
--- a/src/chrome/content/rules/X-lift.jp.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/X.Org.xml b/src/chrome/content/rules/X.Org.xml
new file mode 100644
index 000000000000..b3991fcb64c3
--- /dev/null
+++ b/src/chrome/content/rules/X.Org.xml
@@ -0,0 +1,26 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/X2Go.org.xml b/src/chrome/content/rules/X2Go.org.xml
index 82d9bcf25303..caa3ea4bf289 100644
--- a/src/chrome/content/rules/X2Go.org.xml
+++ b/src/chrome/content/rules/X2Go.org.xml
@@ -15,7 +15,7 @@
 	² Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/XAGYL.us.xml b/src/chrome/content/rules/XAGYL.us.xml
index 6c299236fb93..898d938b835b 100644
--- a/src/chrome/content/rules/XAGYL.us.xml
+++ b/src/chrome/content/rules/XAGYL.us.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.xagyl.us/ => https://www.xagyl.us/: (60, 'SSL certificat
 	For other XAGYL Communications coverage, see XAGYL.com.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/XCAT.nl.xml b/src/chrome/content/rules/XCAT.nl.xml
index aea2f2da414e..d9a7eca7e422 100644
--- a/src/chrome/content/rules/XCAT.nl.xml
+++ b/src/chrome/content/rules/XCAT.nl.xml
@@ -1,7 +1,6 @@
 
-
+
 
 	
diff --git a/src/chrome/content/rules/XDA-Developers.com.xml b/src/chrome/content/rules/XDA-Developers.com.xml
index 6b9025b8f96f..ec1b7659bc19 100644
--- a/src/chrome/content/rules/XDA-Developers.com.xml
+++ b/src/chrome/content/rules/XDA-Developers.com.xml
@@ -9,6 +9,7 @@
 	Invalid certificate:
 		ns2.xda-developers.com
 		sites.xda-developers.com
+    media.xda-developers.com
 
 	Non-2xx HTTP code:
 		http://api.xda-developers.com/ (200) => https://api.xda-developers.com/ (404)
@@ -42,8 +43,6 @@
 		
 	
 		
-	
-		
 
 	
 
diff --git a/src/chrome/content/rules/XEU.com.xml b/src/chrome/content/rules/XEU.com.xml
index 9d8e9c7b98d6..24f244e62b1a 100644
--- a/src/chrome/content/rules/XEU.com.xml
+++ b/src/chrome/content/rules/XEU.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://shop.xeu.com/ => https://shop.xeu.com/: (51, "SSL: no altern
 		- www.shop.xeu.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/XFCE.org.xml b/src/chrome/content/rules/XFCE.org.xml
index c4c5d00fc6c1..f1796233799c 100644
--- a/src/chrome/content/rules/XFCE.org.xml
+++ b/src/chrome/content/rules/XFCE.org.xml
@@ -1,54 +1,55 @@
 
-
+
+
 	
 	
+	
+	
+	
+	
 	
 	
 	
 	
 	
+	
 	
+	
 	
 	
+	
+	
 	
 	
 
 	
 
 	
+
 
diff --git a/src/chrome/content/rules/XHamster_Premium_Pass.com.xml b/src/chrome/content/rules/XHamster_Premium_Pass.com.xml
index 6d542eb667cb..04b78eb5001c 100644
--- a/src/chrome/content/rules/XHamster_Premium_Pass.com.xml
+++ b/src/chrome/content/rules/XHamster_Premium_Pass.com.xml
@@ -35,7 +35,7 @@ Fetch error: http://e19.xhamsterpremiumpass.com/ => https://e19.xhamsterpremiump
 	* Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/XILO-Communications.xml b/src/chrome/content/rules/XILO-Communications.xml
deleted file mode 100644
index 9c00be071287..000000000000
--- a/src/chrome/content/rules/XILO-Communications.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-
-	
-	
-
-
-	
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/XM-CDN.com.xml b/src/chrome/content/rules/XM-CDN.com.xml
index 9a12a00194e2..e4756fde72d1 100644
--- a/src/chrome/content/rules/XM-CDN.com.xml
+++ b/src/chrome/content/rules/XM-CDN.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://static.xm-cdn.com/ => https://static.xm-cdn.com/: (6, 'Could
 	For other XEMarkets coverage, see XM.com.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/XM.com.xml b/src/chrome/content/rules/XM.com.xml
index 8da398727d12..e76ea8b3b297 100644
--- a/src/chrome/content/rules/XM.com.xml
+++ b/src/chrome/content/rules/XM.com.xml
@@ -23,7 +23,7 @@ Fetch error: http://bo.xm.com/ => https://bo.xm.com/: (28, 'Connection timed out
 		- .xm.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/XMLGold.eu.xml b/src/chrome/content/rules/XMLGold.eu.xml
deleted file mode 100644
index 35d777604982..000000000000
--- a/src/chrome/content/rules/XMLGold.eu.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/XMPP.net.xml b/src/chrome/content/rules/XMPP.net.xml
deleted file mode 100644
index 9c1b27881bb0..000000000000
--- a/src/chrome/content/rules/XMPP.net.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-	
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/XMission.com-problematic.xml b/src/chrome/content/rules/XMission.com-problematic.xml
index 55f9cca7cf97..b57e6617430f 100644
--- a/src/chrome/content/rules/XMission.com-problematic.xml
+++ b/src/chrome/content/rules/XMission.com-problematic.xml
@@ -7,7 +7,7 @@
 	* see https://whatsmychaincert.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/XMission.xml b/src/chrome/content/rules/XMission.xml
index 176a57e30284..e64056b8bfce 100644
--- a/src/chrome/content/rules/XMission.xml
+++ b/src/chrome/content/rules/XMission.xml
@@ -70,7 +70,7 @@
 	
 	
 
-	
+	
 
 
 	 https://xpiconly.com/: (28, 'Operation time
 Fetch error: http://www.xpiconly.com/ => https://www.xpiconly.com/: (28, 'Operation timed out after 30002 milliseconds with 0 bytes received')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/XS4ALL.xml b/src/chrome/content/rules/XS4ALL.xml
index 4be32b9e5356..cc214626b34b 100644
--- a/src/chrome/content/rules/XS4ALL.xml
+++ b/src/chrome/content/rules/XS4ALL.xml
@@ -13,6 +13,7 @@
 	
 	
 	
+	
 	
 	
 	
diff --git a/src/chrome/content/rules/XSSposed.org.xml b/src/chrome/content/rules/XSSposed.org.xml
index f55d693cce0b..b87fb9755b05 100644
--- a/src/chrome/content/rules/XSSposed.org.xml
+++ b/src/chrome/content/rules/XSSposed.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://xssposed.org/ => https://xssposed.org/: (60, 'SSL certificat
 Fetch error: http://www.xssposed.org/ => https://www.xssposed.org/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Xakep.ru.xml b/src/chrome/content/rules/Xakep.ru.xml
index 0cf6e8009cbf..3fe3a8b24db7 100644
--- a/src/chrome/content/rules/Xakep.ru.xml
+++ b/src/chrome/content/rules/Xakep.ru.xml
@@ -6,7 +6,7 @@ Fetch error: http://forum.xakep.ru/ => https://forum.xakep.ru/: (60, 'SSL certif
 Fetch error: http://group.xakep.ru/ => https://group.xakep.ru/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Xamarin.com.xml b/src/chrome/content/rules/Xamarin.com.xml
index c155efc98019..0a18f4c02d53 100644
--- a/src/chrome/content/rules/Xamarin.com.xml
+++ b/src/chrome/content/rules/Xamarin.com.xml
@@ -32,7 +32,7 @@
 	Mixed content:
 
 		- iframes, on:
-		
+
 			- planet from app.stitcher.com
 			- planet from www.youtube.com ¹
 
diff --git a/src/chrome/content/rules/Xavisys.xml b/src/chrome/content/rules/Xavisys.xml
index bcaa1b46d0ad..7b0b89275eeb 100644
--- a/src/chrome/content/rules/Xavisys.xml
+++ b/src/chrome/content/rules/Xavisys.xml
@@ -12,7 +12,7 @@ Fetch error: http://xavisys.com/ => https://xavisys.com/: (60, 'SSL certificate
 		- xavisys.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Xbox.xml b/src/chrome/content/rules/Xbox.xml
index 23edba8cbf28..a737015635bc 100644
--- a/src/chrome/content/rules/Xbox.xml
+++ b/src/chrome/content/rules/Xbox.xml
@@ -1,10 +1,4 @@
-
 
-
+
 
 	
 	
 	
 	
-	
 	
-	
 	
-	
 	
-	
-	
 	
 	
-	
-	
 	
 
 	
 	
-	
 	
 	
 	
 
-		
-		
-		
-		
-		
-
 		
-		
+		
 
 			
@@ -145,16 +123,12 @@ Fetch error: http://service.xbox.com/ => https://service.xbox.com/: (28, 'Connec
 			
 			
 			
-			
 
 		
 
 
 	
-	
-	
-
 	
 	
 
@@ -162,9 +136,6 @@ Fetch error: http://service.xbox.com/ => https://service.xbox.com/: (28, 'Connec
 	
 
-	
-
 	
 
diff --git a/src/chrome/content/rules/Xbox_Live.com.xml b/src/chrome/content/rules/Xbox_Live.com.xml
index 3aaf0ca7da9f..1cf1ea9198b2 100644
--- a/src/chrome/content/rules/Xbox_Live.com.xml
+++ b/src/chrome/content/rules/Xbox_Live.com.xml
@@ -16,7 +16,7 @@
 		- avatar	(→ avatar-ssl.xboxlive.com)
 		- avatar-ssl
 		- compass	(→ compass-ssl.xboxlive.com)
-		- compass-ssl	
+		- compass-ssl
 		- piflc
 
 -->
diff --git a/src/chrome/content/rules/Xchan.xml b/src/chrome/content/rules/Xchan.xml
index 337f6004f679..ea2c4f92ae6f 100644
--- a/src/chrome/content/rules/Xchan.xml
+++ b/src/chrome/content/rules/Xchan.xml
@@ -4,11 +4,11 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://old.xchan.pw/ => https://old.xchan.pw/: (6, 'Could not resolve host: old.xchan.pw')
 
 -->
-
-	
-	
-	
-
-	
-
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Xdebug.org.xml b/src/chrome/content/rules/Xdebug.org.xml
index 6fb502ace231..57f3903707a2 100644
--- a/src/chrome/content/rules/Xdebug.org.xml
+++ b/src/chrome/content/rules/Xdebug.org.xml
@@ -11,7 +11,7 @@
 
     
-    
+
     
 
diff --git a/src/chrome/content/rules/Xeneris.net.xml b/src/chrome/content/rules/Xeneris.net.xml
index 1f6588a16051..8970069131b2 100644
--- a/src/chrome/content/rules/Xeneris.net.xml
+++ b/src/chrome/content/rules/Xeneris.net.xml
@@ -26,7 +26,7 @@ Fetch error: http://mail.xeneris.net/ => https://mail.xeneris.net/: (60, 'SSL ce
 		- kronix.xeneris.net:8443
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/XenoNode.com.xml b/src/chrome/content/rules/XenoNode.com.xml
new file mode 100644
index 000000000000..6a9801bc78ab
--- /dev/null
+++ b/src/chrome/content/rules/XenoNode.com.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Xeno_Gamers.org.xml b/src/chrome/content/rules/Xeno_Gamers.org.xml
deleted file mode 100644
index 4de189ea936f..000000000000
--- a/src/chrome/content/rules/Xeno_Gamers.org.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Xenobite.eu.xml b/src/chrome/content/rules/Xenobite.eu.xml
index cd1f9a6e08bf..2452c46bb4f0 100644
--- a/src/chrome/content/rules/Xenobite.eu.xml
+++ b/src/chrome/content/rules/Xenobite.eu.xml
@@ -6,7 +6,7 @@ Fetch error: http://xenobite.eu/ => https://xenobite.eu/: (51, "SSL: no alternat
 	www doesn't exist.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Xfire.xml b/src/chrome/content/rules/Xfire.xml
index bf9979e55c75..b97f3f5a1c3e 100644
--- a/src/chrome/content/rules/Xfire.xml
+++ b/src/chrome/content/rules/Xfire.xml
@@ -30,7 +30,7 @@
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Xg4ken.com.xml b/src/chrome/content/rules/Xg4ken.com.xml
index ca9ddf9db864..7b3eccf4b429 100644
--- a/src/chrome/content/rules/Xg4ken.com.xml
+++ b/src/chrome/content/rules/Xg4ken.com.xml
@@ -19,4 +19,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/XiTi.com.xml b/src/chrome/content/rules/XiTi.com.xml
index e8744c29d3e0..c7197ff87daf 100644
--- a/src/chrome/content/rules/XiTi.com.xml
+++ b/src/chrome/content/rules/XiTi.com.xml
@@ -51,7 +51,7 @@ Fetch error: http://logs142.xiti.com/hit.xiti?s= => https://logs142.xiti.com/hit
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Xiami.xml b/src/chrome/content/rules/Xiami.xml
index 02ceadaa9534..c1741e67a151 100644
--- a/src/chrome/content/rules/Xiami.xml
+++ b/src/chrome/content/rules/Xiami.xml
@@ -13,7 +13,7 @@
     
     
         
-    
+
     
     
         
@@ -22,6 +22,6 @@
     
     
         
-	
+
 	
 
diff --git a/src/chrome/content/rules/Xiaomi.cn.xml b/src/chrome/content/rules/Xiaomi.cn.xml
index 40dc9acf5b2a..8fde3cfa66f3 100644
--- a/src/chrome/content/rules/Xiaomi.cn.xml
+++ b/src/chrome/content/rules/Xiaomi.cn.xml
@@ -1,8 +1,5 @@
 
 
 
-
-
+
 	
-	
-
-	
-	
-		
-		
-		
-
 	
 	
 	
@@ -48,5 +35,13 @@ Fetch error: http://m.xiaomi.cn/ => https://m.xiaomi.cn/: (6, 'Could not resolve
 	
 	
 
+	
+	
+		
+		
+		
+
+	
+
 	
 
diff --git a/src/chrome/content/rules/Xignite.xml b/src/chrome/content/rules/Xignite.xml
index 69eaff27283b..810fc91d20cd 100644
--- a/src/chrome/content/rules/Xignite.xml
+++ b/src/chrome/content/rules/Xignite.xml
@@ -64,10 +64,6 @@
 	
 
 
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/Xiscosoft.es.xml b/src/chrome/content/rules/Xiscosoft.es.xml
index 1d1727fb46c4..dd49640a0266 100644
--- a/src/chrome/content/rules/Xiscosoft.es.xml
+++ b/src/chrome/content/rules/Xiscosoft.es.xml
@@ -30,7 +30,7 @@
 	* Secured by us, doesn't trip MCB
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Xively.com.xml b/src/chrome/content/rules/Xively.com.xml
deleted file mode 100644
index 4cad63521c4e..000000000000
--- a/src/chrome/content/rules/Xively.com.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Xmarks.xml b/src/chrome/content/rules/Xmarks.xml
deleted file mode 100644
index caa756f3553f..000000000000
--- a/src/chrome/content/rules/Xmarks.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Xnxx-cdn.com.xml b/src/chrome/content/rules/Xnxx-cdn.com.xml
index 9b60f8f66825..ddcc9b38deea 100644
--- a/src/chrome/content/rules/Xnxx-cdn.com.xml
+++ b/src/chrome/content/rules/Xnxx-cdn.com.xml
@@ -19,4 +19,4 @@
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Xonotic.org.xml b/src/chrome/content/rules/Xonotic.org.xml
new file mode 100644
index 000000000000..567f29d97f9b
--- /dev/null
+++ b/src/chrome/content/rules/Xonotic.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Xroxy.com.xml b/src/chrome/content/rules/Xroxy.com.xml
index 16679f006807..b23a6939b3fe 100644
--- a/src/chrome/content/rules/Xroxy.com.xml
+++ b/src/chrome/content/rules/Xroxy.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.xroxy.com/ => https://www.xroxy.com/: (60, 'SSL certific
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Xserver.xml b/src/chrome/content/rules/Xserver.xml
index 4233b45ba3a2..def959d11697 100644
--- a/src/chrome/content/rules/Xserver.xml
+++ b/src/chrome/content/rules/Xserver.xml
@@ -18,4 +18,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Xtendmedia.com.xml b/src/chrome/content/rules/Xtendmedia.com.xml
deleted file mode 100644
index edca6bac52ea..000000000000
--- a/src/chrome/content/rules/Xtendmedia.com.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/Xtenit.xml b/src/chrome/content/rules/Xtenit.xml
index 5718d4834ae5..e0b166cab53d 100644
--- a/src/chrome/content/rules/Xtenit.xml
+++ b/src/chrome/content/rules/Xtenit.xml
@@ -21,4 +21,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Xtnetwork.fr.xml b/src/chrome/content/rules/Xtnetwork.fr.xml
index f0c028ea0509..de4a452a6b7c 100644
--- a/src/chrome/content/rules/Xtnetwork.fr.xml
+++ b/src/chrome/content/rules/Xtnetwork.fr.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://cdn.realdebrid.xtnetwork.fr/ => https://cdn.realdebrid.xtnetwork.fr/: (35, 'error:14077438:SSL routines:SSL23_GET_SERVER_HELLO:tlsv1 alert internal error')
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Xwiki.org.xml b/src/chrome/content/rules/Xwiki.org.xml
new file mode 100644
index 000000000000..991fda3aafeb
--- /dev/null
+++ b/src/chrome/content/rules/Xwiki.org.xml
@@ -0,0 +1,29 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Xxxbunker.com.xml b/src/chrome/content/rules/Xxxbunker.com.xml
deleted file mode 100644
index 4dd4392dae3b..000000000000
--- a/src/chrome/content/rules/Xxxbunker.com.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-
-		
-
-			
-			
-			
-			
-
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-
-	
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Xyratex.com.xml b/src/chrome/content/rules/Xyratex.com.xml
index 0bb27f838e2f..2302a24c4d1a 100644
--- a/src/chrome/content/rules/Xyratex.com.xml
+++ b/src/chrome/content/rules/Xyratex.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://www.xyratex.com/ => https://www.xyratex.com/: (51, "SSL: no
 	For other Seagate coverage, see Seagate.com.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Y6xjgkgwj47us5ca.onion.xml b/src/chrome/content/rules/Y6xjgkgwj47us5ca.onion.xml
deleted file mode 100644
index 398da03f6224..000000000000
--- a/src/chrome/content/rules/Y6xjgkgwj47us5ca.onion.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/YBitcoin.com.xml b/src/chrome/content/rules/YBitcoin.com.xml
deleted file mode 100644
index 4680eb046816..000000000000
--- a/src/chrome/content/rules/YBitcoin.com.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/YEAH.xml b/src/chrome/content/rules/YEAH.xml
index 97fd9bfb5ddb..5e0aa949ca6d 100644
--- a/src/chrome/content/rules/YEAH.xml
+++ b/src/chrome/content/rules/YEAH.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.yeahtv.com/ => https://www.yeahtv.com/: (28, 'Connection
 	!www times out.
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.yeahtv.com/ => https://www.yeahtv.com/: (28, 'Connection
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/YFS.ca.xml b/src/chrome/content/rules/YFS.ca.xml
new file mode 100644
index 000000000000..a9fc890f2798
--- /dev/null
+++ b/src/chrome/content/rules/YFS.ca.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/YGTech.Tools.xml b/src/chrome/content/rules/YGTech.Tools.xml
index 28d5ec114884..9130385325f7 100644
--- a/src/chrome/content/rules/YGTech.Tools.xml
+++ b/src/chrome/content/rules/YGTech.Tools.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.ygtech.tools/ => https://www.ygtech.tools/: (28, 'Connec
 		- (www.)?
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/YMCA_of_Greater_St_Louis.xml b/src/chrome/content/rules/YMCA_of_Greater_St_Louis.xml
index 23bc75de86c5..61d539257189 100644
--- a/src/chrome/content/rules/YMCA_of_Greater_St_Louis.xml
+++ b/src/chrome/content/rules/YMCA_of_Greater_St_Louis.xml
@@ -5,7 +5,7 @@
 	^ymcastlouis.org: Cert only matches www.ymcastlouis.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/YMcdn.com.xml b/src/chrome/content/rules/YMcdn.com.xml
deleted file mode 100644
index b24afa6c1460..000000000000
--- a/src/chrome/content/rules/YMcdn.com.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/YP_bot.net.xml b/src/chrome/content/rules/YP_bot.net.xml
index 9afbb9f71136..4680cdb2b567 100644
--- a/src/chrome/content/rules/YP_bot.net.xml
+++ b/src/chrome/content/rules/YP_bot.net.xml
@@ -24,7 +24,9 @@
 
 
 	
-	
+	
+	
+	
 		
 
 
diff --git a/src/chrome/content/rules/YT_Channel_Embed.com.xml b/src/chrome/content/rules/YT_Channel_Embed.com.xml
deleted file mode 100644
index cbc4f63faa8d..000000000000
--- a/src/chrome/content/rules/YT_Channel_Embed.com.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Ya.ru.xml b/src/chrome/content/rules/Ya.ru.xml
index 267691c88391..263f5e31da66 100644
--- a/src/chrome/content/rules/Ya.ru.xml
+++ b/src/chrome/content/rules/Ya.ru.xml
@@ -97,7 +97,7 @@ Fetch error: http://realty.ya.ru/ => https://realty.ya.ru/: (51, "SSL: no altern
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Yabause.org.xml b/src/chrome/content/rules/Yabause.org.xml
deleted file mode 100644
index 015c2b0d923a..000000000000
--- a/src/chrome/content/rules/Yabause.org.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Yacuna.com.xml b/src/chrome/content/rules/Yacuna.com.xml
index f5844c0a88c5..30311a2cbdf1 100644
--- a/src/chrome/content/rules/Yacuna.com.xml
+++ b/src/chrome/content/rules/Yacuna.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.yacuna.com/ => https://www.yacuna.com/: (6, 'Could not r
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Yadro.ru.xml b/src/chrome/content/rules/Yadro.ru.xml
index 11506980c9e5..20ee84a10020 100644
--- a/src/chrome/content/rules/Yadro.ru.xml
+++ b/src/chrome/content/rules/Yadro.ru.xml
@@ -1,37 +1,15 @@
-
 
-
-
-	
+
 	
 	
-
-		
-		
 		
 
+	
 
-	
-	
-
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/Yakala.co.xml b/src/chrome/content/rules/Yakala.co.xml
index 2bf61f34ba8c..66783f6c4e5e 100644
--- a/src/chrome/content/rules/Yakala.co.xml
+++ b/src/chrome/content/rules/Yakala.co.xml
@@ -38,7 +38,7 @@
 					-->
 	
 
-	
+	
 
 
 	
 
 	
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Yam.xml b/src/chrome/content/rules/Yam.xml
index a1f1f6f683b0..2a5b1d2a5403 100644
--- a/src/chrome/content/rules/Yam.xml
+++ b/src/chrome/content/rules/Yam.xml
@@ -8,7 +8,7 @@ Fetch error: http://s1-world.yamedia.tw/ => https://s1-world.yamedia.tw/: (35, '
 	Invalid certificate:
 		love.yam.com
 		member.yam.com
-		
+
 		p1-josho.yamedia.tw
 		p1-kids.yamedia.tw
 		p1-money.yamedia.tw
@@ -37,7 +37,7 @@ Fetch error: http://s1-world.yamedia.tw/ => https://s1-world.yamedia.tw/: (35, '
 		profile.yamedia.tw	(http://profile.yamedia.tw/n/i/nigili5/sindex.jpg)
 -->
 
-
+
 
 	
 	
@@ -50,13 +50,13 @@ Fetch error: http://s1-world.yamedia.tw/ => https://s1-world.yamedia.tw/: (35, '
 	
 	
 	
-	
+
 	
 	
 	
 	
 	
-	
+
 	
-	
+
 
diff --git a/src/chrome/content/rules/Yamgo.com.xml b/src/chrome/content/rules/Yamgo.com.xml
deleted file mode 100644
index 72909c21b2fa..000000000000
--- a/src/chrome/content/rules/Yamgo.com.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Yammer.xml b/src/chrome/content/rules/Yammer.xml
index 6f4f0b28fbf1..e99976b91a49 100644
--- a/src/chrome/content/rules/Yammer.xml
+++ b/src/chrome/content/rules/Yammer.xml
@@ -45,7 +45,7 @@ Fetch error: http://eng.staging.yammer.com/ => https://eng.staging.yammer.com/:
 		- devices.yammer.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Yandex.by.xml b/src/chrome/content/rules/Yandex.by.xml
index 5fdc553cc95e..515398b9b163 100644
--- a/src/chrome/content/rules/Yandex.by.xml
+++ b/src/chrome/content/rules/Yandex.by.xml
@@ -202,7 +202,7 @@ Fetch error: http://suggests.rasp.yandex.by/ => https://suggests.rasp.yandex.by/
 	² Unsecurable <= dropped
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Yandex.com.tr.xml b/src/chrome/content/rules/Yandex.com.tr.xml
index aa193816c0e0..c3b40b6e7ecd 100644
--- a/src/chrome/content/rules/Yandex.com.tr.xml
+++ b/src/chrome/content/rules/Yandex.com.tr.xml
@@ -273,9 +273,9 @@ Fetch error: http://gazeta.yandex.com.tr/ => https://haber.yandex.com.tr/mynews:
 			- pda.haber from www.tns-counter.ru *
 
 	* Secured by us
- 
+
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Yandex.com.ua.xml b/src/chrome/content/rules/Yandex.com.ua.xml
index 068727e70622..019784508277 100644
--- a/src/chrome/content/rules/Yandex.com.ua.xml
+++ b/src/chrome/content/rules/Yandex.com.ua.xml
@@ -57,7 +57,7 @@ Fetch error: http://www.taras.yandex.com.ua/ => https://taras.yandex.com.ua/: (5
 		- mail.yandex.com.ua
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Yandex.kz.xml b/src/chrome/content/rules/Yandex.kz.xml
index dc001a19d565..5a2433a44e1a 100644
--- a/src/chrome/content/rules/Yandex.kz.xml
+++ b/src/chrome/content/rules/Yandex.kz.xml
@@ -198,7 +198,7 @@ Fetch error: http://suggests.rasp.yandex.kz/ => https://suggests.rasp.yandex.kz/
 	² Unsecurable <= dropped
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Yandex.mobi.xml b/src/chrome/content/rules/Yandex.mobi.xml
deleted file mode 100644
index f8843ce0f18c..000000000000
--- a/src/chrome/content/rules/Yandex.mobi.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Yandex.net.xml b/src/chrome/content/rules/Yandex.net.xml
index 9008eee5b2b3..c1a5cadb467d 100644
--- a/src/chrome/content/rules/Yandex.net.xml
+++ b/src/chrome/content/rules/Yandex.net.xml
@@ -1,18 +1,3 @@
-
-
-
 
-
+
 
 	
 	
@@ -204,56 +177,39 @@ Fetch error: http://xss.yandex.net/ => https://xss.yandex.net/: (7, 'Failed to c
 		
-		
+		
 
+			
 			
 			
 			
 			
 			
 
-		
 		
 		
 		
 		
 		
 		
-		
-		
-		
-		
 		
-		
-		
-		
-		
-		
+		
 		
 		
-		
 		
-		
 		
 		
 		
 		
 		
-		
-		
 		
 		
 		
-		
-		
 		
 		
 		
 		
 		
-		
-		
-		
 		
 		
 		
@@ -273,23 +229,11 @@ Fetch error: http://xss.yandex.net/ => https://xss.yandex.net/: (7, 'Failed to c
 		
 		
 		
-		
-		
 
 		
 		
 		
 
-
-	
-	
-
-			
-			
-			
-
 	
 
@@ -304,4 +248,7 @@ Fetch error: http://xss.yandex.net/ => https://xss.yandex.net/: (7, 'Failed to c
 						-->
 	
+
+	
 
diff --git a/src/chrome/content/rules/Yandex.xml b/src/chrome/content/rules/Yandex.xml
index 09b8ef85296b..ac75c7cc143d 100644
--- a/src/chrome/content/rules/Yandex.xml
+++ b/src/chrome/content/rules/Yandex.xml
@@ -1,4 +1,9 @@
 
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-
-	
-	
-
-	
-	
-
-	
-
-	
-	
-
-	
-	
-
-	
-
-	
-	
-
-	
-
-	
-
-	
-	
-
-	
+    
+    
+    
+    
+    
+    
 
 	
+    
+    
+    
 
 	
 	
+    
+    
+    
 
+  
 
-	
-	
+  
 
 
diff --git a/src/chrome/content/rules/Yard_Digital.com.xml b/src/chrome/content/rules/Yard_Digital.com.xml
index 7f4e91f75976..3dff4e69a5b3 100644
--- a/src/chrome/content/rules/Yard_Digital.com.xml
+++ b/src/chrome/content/rules/Yard_Digital.com.xml
@@ -15,4 +15,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Ybin.me.xml b/src/chrome/content/rules/Ybin.me.xml
deleted file mode 100644
index 346c598b545b..000000000000
--- a/src/chrome/content/rules/Ybin.me.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Yellow-Pages-IMA.xml b/src/chrome/content/rules/Yellow-Pages-IMA.xml
index 8e202d7d215d..e63ffc56e2f6 100644
--- a/src/chrome/content/rules/Yellow-Pages-IMA.xml
+++ b/src/chrome/content/rules/Yellow-Pages-IMA.xml
@@ -18,7 +18,7 @@ Fetch error: http://www.ypassociation.org/ => https://localsearchassociation.org
 		- Yellow_Pages_Opt_Out.com.xml
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Yellow_Pages_Opt_Out.com.xml b/src/chrome/content/rules/Yellow_Pages_Opt_Out.com.xml
index 24297820ab90..5313da688293 100644
--- a/src/chrome/content/rules/Yellow_Pages_Opt_Out.com.xml
+++ b/src/chrome/content/rules/Yellow_Pages_Opt_Out.com.xml
@@ -25,7 +25,7 @@
 					-->
 	
 
-	
+	
 
 
 	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Yeshiva.xml b/src/chrome/content/rules/Yeshiva.xml
index 952f35998a68..ad10abc01f36 100644
--- a/src/chrome/content/rules/Yeshiva.xml
+++ b/src/chrome/content/rules/Yeshiva.xml
@@ -5,7 +5,7 @@ Fetch error: http://www.yu.edu/ => https://yu.edu/: Too many redirects while fet
 Fetch error: http://yu.edu/ => https://yu.edu/: Too many redirects while fetching 'https://yu.edu/'
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/Yesss.at.xml b/src/chrome/content/rules/Yesss.at.xml
index c777546cbec8..4ce702cb3885 100644
--- a/src/chrome/content/rules/Yesss.at.xml
+++ b/src/chrome/content/rules/Yesss.at.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://nulleuro.yesss.at/ => https://nulleuro.yesss.at/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Ygnition.xml b/src/chrome/content/rules/Ygnition.xml
index 9b7684e9d9d0..bffca910dba5 100644
--- a/src/chrome/content/rules/Ygnition.xml
+++ b/src/chrome/content/rules/Ygnition.xml
@@ -11,14 +11,14 @@ Fetch error: http://yoda.ygnition.com/ => https://yoda.ygnition.com/: (28, 'Conn
 		- yoda02			(refused)
 
 -->
-
+
 
 	
 	
 	
 
 
-	
+	
 
 
 	 https://www.yieldselect.com/: (60, '
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Yieldbot.xml b/src/chrome/content/rules/Yieldbot.xml
index fc18c8058a6e..957fd06d8911 100644
--- a/src/chrome/content/rules/Yieldbot.xml
+++ b/src/chrome/content/rules/Yieldbot.xml
@@ -27,4 +27,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Yieldlab.de.xml b/src/chrome/content/rules/Yieldlab.de.xml
index 4bde011eed23..6c84807fead5 100644
--- a/src/chrome/content/rules/Yieldlab.de.xml
+++ b/src/chrome/content/rules/Yieldlab.de.xml
@@ -11,7 +11,7 @@
 	Mixed content:
 
 		- Images from $self
-		- Bug from www.facebook.com 
+		- Bug from www.facebook.com
 
 -->
 
diff --git a/src/chrome/content/rules/Yieldlove.com.xml b/src/chrome/content/rules/Yieldlove.com.xml
new file mode 100644
index 000000000000..ca5e84352d61
--- /dev/null
+++ b/src/chrome/content/rules/Yieldlove.com.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Yimg.com.xml b/src/chrome/content/rules/Yimg.com.xml
index cc8045de2e46..1121df877aa4 100644
--- a/src/chrome/content/rules/Yimg.com.xml
+++ b/src/chrome/content/rules/Yimg.com.xml
@@ -1,112 +1,39 @@
 
 
 
-	
-
-
-	
-
-
-	
-
-	
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-
-	
-	
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
 
diff --git a/src/chrome/content/rules/Ynet.io.xml b/src/chrome/content/rules/Ynet.io.xml
index 53166caab96d..909e9b65d8f6 100644
--- a/src/chrome/content/rules/Ynet.io.xml
+++ b/src/chrome/content/rules/Ynet.io.xml
@@ -16,7 +16,7 @@ Fetch error: http://s.ynet.io/ => https://s.ynet.io/: (28, 'Connection timed out
 		- .ynet.io
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Yocto_Project.org.xml b/src/chrome/content/rules/Yocto_Project.org.xml
index d9e608cf67bc..f30d1ab3b761 100644
--- a/src/chrome/content/rules/Yocto_Project.org.xml
+++ b/src/chrome/content/rules/Yocto_Project.org.xml
@@ -31,7 +31,12 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
 
 
 	
 	
 
-	
+	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/YogaDNS.com.xml b/src/chrome/content/rules/YogaDNS.com.xml
new file mode 100644
index 000000000000..69ec2c6f7f08
--- /dev/null
+++ b/src/chrome/content/rules/YogaDNS.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Yokl.com.xml b/src/chrome/content/rules/Yokl.com.xml
index 697c24bc656d..b8727b46745f 100644
--- a/src/chrome/content/rules/Yokl.com.xml
+++ b/src/chrome/content/rules/Yokl.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://www.yokl.com/ => https://yokl.com/: (60, 'SSL certificate pr
 		- yokl.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/YoklAPI.com.xml b/src/chrome/content/rules/YoklAPI.com.xml
index c43201ef5d38..e634f46e7f23 100644
--- a/src/chrome/content/rules/YoklAPI.com.xml
+++ b/src/chrome/content/rules/YoklAPI.com.xml
@@ -16,7 +16,7 @@ Fetch error: http://yoklapi.com/ => https://api.yokl.com/: (60, 'SSL certificate
 	* Not secured by us <= mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/York.edu.xml b/src/chrome/content/rules/York.edu.xml
index 6686c40b0827..d82d52a1e760 100644
--- a/src/chrome/content/rules/York.edu.xml
+++ b/src/chrome/content/rules/York.edu.xml
@@ -25,7 +25,7 @@
 	
 	
 
-	
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Yospace.com.xml b/src/chrome/content/rules/Yospace.com.xml
index bb4788b883df..8506fac50895 100644
--- a/src/chrome/content/rules/Yospace.com.xml
+++ b/src/chrome/content/rules/Yospace.com.xml
@@ -17,4 +17,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Yottaa.xml b/src/chrome/content/rules/Yottaa.xml
index 9fae84174bb7..3e9bedf7c0d9 100644
--- a/src/chrome/content/rules/Yottaa.xml
+++ b/src/chrome/content/rules/Yottaa.xml
@@ -28,13 +28,17 @@
 -->
 
 
-	
+	
+	
+	
+	
+	
+	
 
 
 	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/YouCanBook.Me.xml b/src/chrome/content/rules/YouCanBook.Me.xml
index 7cd12ca5a338..923801724e67 100644
--- a/src/chrome/content/rules/YouCanBook.Me.xml
+++ b/src/chrome/content/rules/YouCanBook.Me.xml
@@ -10,7 +10,7 @@ Fetch error: http://fwd.youcanbook.me/ => https://fwd.youcanbook.me/: (60, 'SSL
 		- upload.youcanbook.me
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/YouSendIt.xml b/src/chrome/content/rules/YouSendIt.xml
index 52bac8a71211..8ccc39cc769d 100644
--- a/src/chrome/content/rules/YouSendIt.xml
+++ b/src/chrome/content/rules/YouSendIt.xml
@@ -8,7 +8,7 @@ Fetch error: http://a15.ysicdo002.com/ => https://a15.ysicdo002.com/: (51, "SSL:
 	Cert only matches *.yousendit.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/YouVersion.com.xml b/src/chrome/content/rules/YouVersion.com.xml
new file mode 100644
index 000000000000..8ef0fbe12f54
--- /dev/null
+++ b/src/chrome/content/rules/YouVersion.com.xml
@@ -0,0 +1,29 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/YouVersion.xml b/src/chrome/content/rules/YouVersion.xml
deleted file mode 100644
index 3b0d4ce834cc..000000000000
--- a/src/chrome/content/rules/YouVersion.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-
-	
-	
-
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/YouVisit.com.xml b/src/chrome/content/rules/YouVisit.com.xml
index f507f7190337..747f72ed1464 100644
--- a/src/chrome/content/rules/YouVisit.com.xml
+++ b/src/chrome/content/rules/YouVisit.com.xml
@@ -9,4 +9,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Youmix.xml b/src/chrome/content/rules/Youmix.xml
deleted file mode 100644
index 781438455981..000000000000
--- a/src/chrome/content/rules/Youmix.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-	
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Young-Pirates.Eu.xml b/src/chrome/content/rules/Young-Pirates.Eu.xml
index 44ba136b79b8..05ec6522c103 100644
--- a/src/chrome/content/rules/Young-Pirates.Eu.xml
+++ b/src/chrome/content/rules/Young-Pirates.Eu.xml
@@ -18,7 +18,7 @@ Fetch error: http://wiki.young-pirates.eu/ => https://wiki.young-pirates.eu/: (6
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Young_Rewired_State.org.xml b/src/chrome/content/rules/Young_Rewired_State.org.xml
index d564fcc1c828..cea0d760666e 100644
--- a/src/chrome/content/rules/Young_Rewired_State.org.xml
+++ b/src/chrome/content/rules/Young_Rewired_State.org.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.youngrewiredstate.org/ => https://youngrewiredstate.org/
 		- .youngrewiredstate.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Younited.com.xml b/src/chrome/content/rules/Younited.com.xml
deleted file mode 100644
index 0d238191a641..000000000000
--- a/src/chrome/content/rules/Younited.com.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-		
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Your-File-System.com.xml b/src/chrome/content/rules/Your-File-System.com.xml
index a082d5e51e59..7d1ecba8bf17 100644
--- a/src/chrome/content/rules/Your-File-System.com.xml
+++ b/src/chrome/content/rules/Your-File-System.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://your-file-system.com/ => https://your-file-system.com/: (7,
 Fetch error: http://www.your-file-system.com/ => https://www.your-file-system.com/: (7, 'Failed to connect to www.your-file-system.com port 443: Connection refused')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Your-Mailing-List-Provider.xml b/src/chrome/content/rules/Your-Mailing-List-Provider.xml
index ee6ff761a47d..ec339dfe77b9 100644
--- a/src/chrome/content/rules/Your-Mailing-List-Provider.xml
+++ b/src/chrome/content/rules/Your-Mailing-List-Provider.xml
@@ -1,24 +1,11 @@
-
 
 	
-	
 	
+	
+	
+
 	
 	
 
-	
-
-	
-	
-	
+	
 
diff --git a/src/chrome/content/rules/YourBittorrent.xml b/src/chrome/content/rules/YourBittorrent.xml
deleted file mode 100644
index 0d55ada3392e..000000000000
--- a/src/chrome/content/rules/YourBittorrent.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-	
-
-
-	
-
-
-	
-
-	
-
-	
-
-
-
diff --git a/src/chrome/content/rules/YourMembership.com.xml b/src/chrome/content/rules/YourMembership.com.xml
index a99acde54790..e68d80b0bcb9 100644
--- a/src/chrome/content/rules/YourMembership.com.xml
+++ b/src/chrome/content/rules/YourMembership.com.xml
@@ -12,7 +12,7 @@
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/YourPSHome.net.xml b/src/chrome/content/rules/YourPSHome.net.xml
index 025f533a9789..69aafdb4cdf2 100644
--- a/src/chrome/content/rules/YourPSHome.net.xml
+++ b/src/chrome/content/rules/YourPSHome.net.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://cdn.yourpshome.net/ => https://cdn.yourpshome.net/: (6, 'Could not resolve host: cdn.yourpshome.net')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/YourWorldOfText.com.xml b/src/chrome/content/rules/YourWorldOfText.com.xml
new file mode 100644
index 000000000000..dd495bd32059
--- /dev/null
+++ b/src/chrome/content/rules/YourWorldOfText.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/YourYU.ca.xml b/src/chrome/content/rules/YourYU.ca.xml
new file mode 100644
index 000000000000..fe6c227e0399
--- /dev/null
+++ b/src/chrome/content/rules/YourYU.ca.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Your_Date_Link.xml b/src/chrome/content/rules/Your_Date_Link.xml
index 4bc490dbdffd..4e27526ae715 100644
--- a/src/chrome/content/rules/Your_Date_Link.xml
+++ b/src/chrome/content/rules/Your_Date_Link.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.yourdatelink.com/ => https://www.yourdatelink.com/: (51,
 Disabled by https-everywhere-checker because:
 Fetch error: http://yourdatelink.com/ => https://yourdatelink.com/: (51, "SSL: no alternative certificate subject name matches target host name 'yourdatelink.com'")
 -->
-
+
 
 	
 	
@@ -18,4 +18,4 @@ Fetch error: http://yourdatelink.com/ => https://yourdatelink.com/: (51, "SSL: n
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Your_Local_Edge.com.xml b/src/chrome/content/rules/Your_Local_Edge.com.xml
index 7b8aeed2fed1..0ef7842abb46 100644
--- a/src/chrome/content/rules/Your_Local_Edge.com.xml
+++ b/src/chrome/content/rules/Your_Local_Edge.com.xml
@@ -17,10 +17,10 @@ Fetch error: http://yourlocaledge.com/ => https://yourlocaledge.com/: (28, 'Conn
 	* Secured by us
 
 -->
-
+
 
 	
-	
+	
 
 
 	
@@ -29,4 +29,4 @@ Fetch error: http://yourlocaledge.com/ => https://yourlocaledge.com/: (28, 'Conn
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Your_Video_Host.com.xml b/src/chrome/content/rules/Your_Video_Host.com.xml
index fa0c1a281606..fa4903df03cc 100644
--- a/src/chrome/content/rules/Your_Video_Host.com.xml
+++ b/src/chrome/content/rules/Your_Video_Host.com.xml
@@ -23,7 +23,7 @@ Fetch error: http://www.yourvideohost.com/ => https://www.yourvideohost.com/: (2
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Yourcounciljobs.co.uk.xml b/src/chrome/content/rules/Yourcounciljobs.co.uk.xml
index 3d5dc274be3a..8e0c75387af4 100644
--- a/src/chrome/content/rules/Yourcounciljobs.co.uk.xml
+++ b/src/chrome/content/rules/Yourcounciljobs.co.uk.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.yourcounciljobs.co.uk/ => https://www.yourcounciljobs.co
 		- www.yourcounciljobs.co.uk
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Yourfone.de.xml b/src/chrome/content/rules/Yourfone.de.xml
index d5e566375285..cf852f80f5a3 100644
--- a/src/chrome/content/rules/Yourfone.de.xml
+++ b/src/chrome/content/rules/Yourfone.de.xml
@@ -15,7 +15,13 @@
 
 
 	
-	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/YoursAV.com.xml b/src/chrome/content/rules/YoursAV.com.xml
index f47479c5b905..a94cfa382212 100644
--- a/src/chrome/content/rules/YoursAV.com.xml
+++ b/src/chrome/content/rules/YoursAV.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://yoursav.com/ => https://yoursav.com/: (51, "SSL: no alternat
 Fetch error: http://www.yoursav.com/ => https://www.yoursav.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.yoursav.com'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/YoutubeUnblocks.com.xml b/src/chrome/content/rules/YoutubeUnblocks.com.xml
deleted file mode 100644
index 0197a4b5a6b5..000000000000
--- a/src/chrome/content/rules/YoutubeUnblocks.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/Yt-dl.org.xml b/src/chrome/content/rules/Yt-dl.org.xml
index 6cc05430fd97..bcc468f9f59a 100644
--- a/src/chrome/content/rules/Yt-dl.org.xml
+++ b/src/chrome/content/rules/Yt-dl.org.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Yuku.xml b/src/chrome/content/rules/Yuku.xml
deleted file mode 100644
index 78182757bedf..000000000000
--- a/src/chrome/content/rules/Yuku.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/YunoHost.org.xml b/src/chrome/content/rules/YunoHost.org.xml
index c534d103be59..b1e4b1cab0e0 100644
--- a/src/chrome/content/rules/YunoHost.org.xml
+++ b/src/chrome/content/rules/YunoHost.org.xml
@@ -8,7 +8,7 @@ Fetch error: http://doc.yunohost.org/ => https://doc.yunohost.org/: (51, "SSL: n
 		- forum.yunohost.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/ZDbb.net.xml b/src/chrome/content/rules/ZDbb.net.xml
index 019e6a2a453a..69ab3479a002 100644
--- a/src/chrome/content/rules/ZDbb.net.xml
+++ b/src/chrome/content/rules/ZDbb.net.xml
@@ -29,10 +29,6 @@
 	
 
 
-	
-
-	
+	
 
 
diff --git a/src/chrome/content/rules/ZDmcirc.com.xml b/src/chrome/content/rules/ZDmcirc.com.xml
index cbd141ed60b1..ec40a2a33dad 100644
--- a/src/chrome/content/rules/ZDmcirc.com.xml
+++ b/src/chrome/content/rules/ZDmcirc.com.xml
@@ -12,7 +12,7 @@
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ZKM.de.xml b/src/chrome/content/rules/ZKM.de.xml
new file mode 100644
index 000000000000..1c282ae2daea
--- /dev/null
+++ b/src/chrome/content/rules/ZKM.de.xml
@@ -0,0 +1,148 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/ZNC.in.xml b/src/chrome/content/rules/ZNC.in.xml
new file mode 100644
index 000000000000..330fe519be5d
--- /dev/null
+++ b/src/chrome/content/rules/ZNC.in.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ZONZA.tv.xml b/src/chrome/content/rules/ZONZA.tv.xml
deleted file mode 100644
index f993b4b61adc..000000000000
--- a/src/chrome/content/rules/ZONZA.tv.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-	
-	
-
-		
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/ZOUM.xml b/src/chrome/content/rules/ZOUM.xml
index dc3d67494e44..53e5a11b1a24 100644
--- a/src/chrome/content/rules/ZOUM.xml
+++ b/src/chrome/content/rules/ZOUM.xml
@@ -5,7 +5,7 @@ Fetch error: http://zoum.ca/ => https://zoum.ca/: (60, 'SSL certificate problem:
 Fetch error: http://www.zoum.ca/ => https://www.zoum.ca/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ZSR.sk.xml b/src/chrome/content/rules/ZSR.sk.xml
new file mode 100644
index 000000000000..cb30d94bee4b
--- /dev/null
+++ b/src/chrome/content/rules/ZSR.sk.xml
@@ -0,0 +1,16 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ZUNO.eu.xml b/src/chrome/content/rules/ZUNO.eu.xml
deleted file mode 100644
index f5a1210c82ac..000000000000
--- a/src/chrome/content/rules/ZUNO.eu.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/ZUNO.sk.xml b/src/chrome/content/rules/ZUNO.sk.xml
index c0b3ec69ba66..eae82281a292 100644
--- a/src/chrome/content/rules/ZUNO.sk.xml
+++ b/src/chrome/content/rules/ZUNO.sk.xml
@@ -9,7 +9,7 @@ Fetch error: http://m.zuno.sk/ => https://m.zuno.sk/: (6, 'Could not resolve hos
 		- moje.zuno.sk
 		- www.zuno.sk
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/ZUS.pl.xml b/src/chrome/content/rules/ZUS.pl.xml
index 8d34530907a3..f0c06d8eda54 100644
--- a/src/chrome/content/rules/ZUS.pl.xml
+++ b/src/chrome/content/rules/ZUS.pl.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://ssl.zus.pl/ => https://ssl.zus.pl/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ZX2C4.com.xml b/src/chrome/content/rules/ZX2C4.com.xml
new file mode 100644
index 000000000000..9e9caf2c29ac
--- /dev/null
+++ b/src/chrome/content/rules/ZX2C4.com.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ZXIDP.org.xml b/src/chrome/content/rules/ZXIDP.org.xml
index 93cd721faf38..071a6c82f89c 100644
--- a/src/chrome/content/rules/ZXIDP.org.xml
+++ b/src/chrome/content/rules/ZXIDP.org.xml
@@ -4,7 +4,7 @@
 	www.zxidp.org: cert only matches ^zxidp.org
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ZYVOXassist.com.xml b/src/chrome/content/rules/ZYVOXassist.com.xml
deleted file mode 100644
index 38ac4e710006..000000000000
--- a/src/chrome/content/rules/ZYVOXassist.com.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/ZZounds.com.xml b/src/chrome/content/rules/ZZounds.com.xml
index 175befec7731..5339a86bbbbd 100644
--- a/src/chrome/content/rules/ZZounds.com.xml
+++ b/src/chrome/content/rules/ZZounds.com.xml
@@ -40,7 +40,7 @@ Fetch error: http://c0.zzounds.com/ => https://c0.zzounds.com/: (60, 'SSL certif
 		- delivery
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Zabbix.com.xml b/src/chrome/content/rules/Zabbix.com.xml
new file mode 100644
index 000000000000..e1268127d447
--- /dev/null
+++ b/src/chrome/content/rules/Zabbix.com.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Zabbix.xml b/src/chrome/content/rules/Zabbix.xml
deleted file mode 100644
index c56b70c6c3ff..000000000000
--- a/src/chrome/content/rules/Zabbix.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
-	
-	
-	
-
-
-		
-		
-
-		
-		
-
-			
-			
-			
-			
-			
-
-			
-			
-			
-
-
-	
-	
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Zacks_Investment_Research.xml b/src/chrome/content/rules/Zacks_Investment_Research.xml
index f7218842a9cf..3bec4ad3f5b3 100644
--- a/src/chrome/content/rules/Zacks_Investment_Research.xml
+++ b/src/chrome/content/rules/Zacks_Investment_Research.xml
@@ -44,4 +44,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Zadolba.li.xml b/src/chrome/content/rules/Zadolba.li.xml
new file mode 100644
index 000000000000..ef26e1d69b96
--- /dev/null
+++ b/src/chrome/content/rules/Zadolba.li.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Zaehlwerk.net.xml b/src/chrome/content/rules/Zaehlwerk.net.xml
index a32d01864d40..f55073f37ac2 100644
--- a/src/chrome/content/rules/Zaehlwerk.net.xml
+++ b/src/chrome/content/rules/Zaehlwerk.net.xml
@@ -8,7 +8,7 @@ Fetch error: http://mail.zaehlwerk.net/ => https://mail.zaehlwerk.net/: (51, "SS
 		- Zwmail.de.xml
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Zagony.ru.xml b/src/chrome/content/rules/Zagony.ru.xml
index c31717461508..8409d0d905ff 100644
--- a/src/chrome/content/rules/Zagony.ru.xml
+++ b/src/chrome/content/rules/Zagony.ru.xml
@@ -18,7 +18,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Zahnarzt-herrieden.de.xml b/src/chrome/content/rules/Zahnarzt-herrieden.de.xml
new file mode 100644
index 000000000000..eb7d8b7b41ee
--- /dev/null
+++ b/src/chrome/content/rules/Zahnarzt-herrieden.de.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Zakonypreludi.sk.xml b/src/chrome/content/rules/Zakonypreludi.sk.xml
new file mode 100644
index 000000000000..cf4454dafbc3
--- /dev/null
+++ b/src/chrome/content/rules/Zakonypreludi.sk.xml
@@ -0,0 +1,24 @@
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Zam.xml b/src/chrome/content/rules/Zam.xml
index ad93507ec483..307a2224a569 100644
--- a/src/chrome/content/rules/Zam.xml
+++ b/src/chrome/content/rules/Zam.xml
@@ -76,12 +76,11 @@
 	
 		
-		
+
 	
 	
 	
 
-	
 	
 	
 	
diff --git a/src/chrome/content/rules/Zanbase.com.xml b/src/chrome/content/rules/Zanbase.com.xml
new file mode 100644
index 000000000000..233f85512ec8
--- /dev/null
+++ b/src/chrome/content/rules/Zanbase.com.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Zanox.xml b/src/chrome/content/rules/Zanox.xml
index c3fe3af5498d..95233dc77d54 100644
--- a/src/chrome/content/rules/Zanox.xml
+++ b/src/chrome/content/rules/Zanox.xml
@@ -33,7 +33,7 @@ Fetch error: http://ad.zanox.com/ => https://ad.zanox.com/: (60, 'SSL certificat
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ZapChain.com.xml b/src/chrome/content/rules/ZapChain.com.xml
index 6d431d4fdf62..3f0d1c09c820 100644
--- a/src/chrome/content/rules/ZapChain.com.xml
+++ b/src/chrome/content/rules/ZapChain.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://zapchain.com/ => https://www.zapchain.com/: (6, 'Could not r
 	* Not secured by us <= mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Zap_Lab.xml b/src/chrome/content/rules/Zap_Lab.xml
index fe107c978a81..c529109b22b1 100644
--- a/src/chrome/content/rules/Zap_Lab.xml
+++ b/src/chrome/content/rules/Zap_Lab.xml
@@ -24,7 +24,7 @@ Fetch error: http://www.thezaplab.com/ => https://www.thezaplab.com/: (28, 'Conn
 		- .thezaplab.com
 
 -->
-
+
 
 	
 	
@@ -34,7 +34,7 @@ Fetch error: http://www.thezaplab.com/ => https://www.thezaplab.com/: (28, 'Conn
 					-->
 	
 
-	
+	
 
 
 	 https://zaption.com/: (51, "SSL: no alternat
 Fetch error: http://www.zaption.com/ => https://www.zaption.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.zaption.com'")
 
 -->
-
+
 
 	
 	
@@ -16,4 +16,4 @@ Fetch error: http://www.zaption.com/ => https://www.zaption.com/: (51, "SSL: no
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/Zapunited.xml b/src/chrome/content/rules/Zapunited.xml
deleted file mode 100644
index 8bd0a8422c7f..000000000000
--- a/src/chrome/content/rules/Zapunited.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Zayo.com.xml b/src/chrome/content/rules/Zayo.com.xml
index 6d1c0c77ef2d..dca2784c0082 100644
--- a/src/chrome/content/rules/Zayo.com.xml
+++ b/src/chrome/content/rules/Zayo.com.xml
@@ -28,7 +28,7 @@ Fetch error: http://www.zayo.com/ => https://www.zayo.com/: Too many redirects w
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Zazzle-mismatches.xml b/src/chrome/content/rules/Zazzle-mismatches.xml
index 5cebfb492ced..ebb5ac41e544 100644
--- a/src/chrome/content/rules/Zazzle-mismatches.xml
+++ b/src/chrome/content/rules/Zazzle-mismatches.xml
@@ -2,9 +2,9 @@
 
 	
 	
-	
+	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/Zeit.de.xml b/src/chrome/content/rules/Zeit.de.xml
index 31f8fc35e848..0eae628dd75d 100644
--- a/src/chrome/content/rules/Zeit.de.xml
+++ b/src/chrome/content/rules/Zeit.de.xml
@@ -1,121 +1,216 @@
 
 
 
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
+	
+	
 
-		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 	
 
diff --git a/src/chrome/content/rules/Zello.com.xml b/src/chrome/content/rules/Zello.com.xml
new file mode 100644
index 000000000000..1cb8f071c424
--- /dev/null
+++ b/src/chrome/content/rules/Zello.com.xml
@@ -0,0 +1,29 @@
+
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Zemanta.xml b/src/chrome/content/rules/Zemanta.xml
index 6d4bc1322a84..bc6cb8706f2e 100644
--- a/src/chrome/content/rules/Zemanta.xml
+++ b/src/chrome/content/rules/Zemanta.xml
@@ -1,89 +1,51 @@
-
 
-
-
-	
-	
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	
-	
+	
 	
+	
 	
 	
-	
 	
-	
-	
-	
-
-		
-		
-
-		
-		
-		
-		
-		
-
-		
-		
-
-
-	
-	
-	
-	
-	
-
-	
-	
+	
+	
+	
+	
+	
 
+	
 
 	
diff --git a/src/chrome/content/rules/Zen-Internet.xml b/src/chrome/content/rules/Zen-Internet.xml
index 9cbbbbfeaa26..4a65d5b8d16b 100644
--- a/src/chrome/content/rules/Zen-Internet.xml
+++ b/src/chrome/content/rules/Zen-Internet.xml
@@ -35,7 +35,7 @@
 
 	
 
-	
+	
 
 
 	 https://blog.zencoder.com/: (60, 'SSL
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Zend.xml b/src/chrome/content/rules/Zend.xml
index 501af0a6f27f..2f8dd5f46ee3 100644
--- a/src/chrome/content/rules/Zend.xml
+++ b/src/chrome/content/rules/Zend.xml
@@ -46,7 +46,7 @@ Fetch error: http://support.zend.com/ => https://support.zend.com/: (60, 'SSL ce
 		- www.pages.zend.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Zendy_Labs.xml b/src/chrome/content/rules/Zendy_Labs.xml
deleted file mode 100644
index 9a820a50467a..000000000000
--- a/src/chrome/content/rules/Zendy_Labs.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Zenfolio.xml b/src/chrome/content/rules/Zenfolio.xml
index 4a7e2ddb1bf3..213bc332b659 100644
--- a/src/chrome/content/rules/Zenfolio.xml
+++ b/src/chrome/content/rules/Zenfolio.xml
@@ -16,7 +16,7 @@
 	
 
-	
+
 	
 
diff --git a/src/chrome/content/rules/ZeniMax.com.xml b/src/chrome/content/rules/ZeniMax.com.xml
index dab8d8d41afc..14408de6f152 100644
--- a/src/chrome/content/rules/ZeniMax.com.xml
+++ b/src/chrome/content/rules/ZeniMax.com.xml
@@ -8,13 +8,14 @@
 		- Dishonored.com.xml
 		- ZeniMaxOnline.com.xml
 
+	Timeout:
+		dialin.zenimax.com
 
 	Login required:
 		ausvpn.zenimax.com
 
 	Invalid certificate:
 		cdn.zenimax.com
-		static.zenimax.com
 
 	No working URL known:
 		lyncwebext.zenimax.com
@@ -25,7 +26,6 @@
 
 	
 	
-	
 	
 	
 	
@@ -33,9 +33,6 @@
 		
 		
 
-	
-
 	
 
 
diff --git a/src/chrome/content/rules/ZenithMedia.net.xml b/src/chrome/content/rules/ZenithMedia.net.xml
new file mode 100644
index 000000000000..fe4929c73ff6
--- /dev/null
+++ b/src/chrome/content/rules/ZenithMedia.net.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Zentyal.com.xml b/src/chrome/content/rules/Zentyal.com.xml
index e0817b026e7b..dfd0d1ae2385 100644
--- a/src/chrome/content/rules/Zentyal.com.xml
+++ b/src/chrome/content/rules/Zentyal.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://store.zentyal.com/ => https://store.zentyal.com/: (60, 'SSL
 
 	This ruleset is otherwise entirely and woefully incomplete.
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Zentyal.org.xml b/src/chrome/content/rules/Zentyal.org.xml
index d46818534b29..195e64a9bc15 100644
--- a/src/chrome/content/rules/Zentyal.org.xml
+++ b/src/chrome/content/rules/Zentyal.org.xml
@@ -27,7 +27,7 @@ Fetch error: http://wiki.zentyal.org/ => https://wiki.zentyal.org/: (60, 'SSL ce
 		- wiki.zentyal.org
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Zerigo.com.xml b/src/chrome/content/rules/Zerigo.com.xml
index a396c56da015..270c33636ee3 100644
--- a/src/chrome/content/rules/Zerigo.com.xml
+++ b/src/chrome/content/rules/Zerigo.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.zerigo.com/ => https://www.zerigo.com/: (6, 'Could not r
 		- manage
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Zero-Robotics.xml b/src/chrome/content/rules/Zero-Robotics.xml
index f40a2b79a8e0..7c3b3e1c2b7c 100644
--- a/src/chrome/content/rules/Zero-Robotics.xml
+++ b/src/chrome/content/rules/Zero-Robotics.xml
@@ -7,12 +7,12 @@ Fetch error: http://www.zerorobotics.org/ => https://www.zerorobotics.org/: (28,
 Disabled by https-everywhere-checker because:
 Fetch error: http://zerorobotics.org/ => https://zerorobotics.org/: (28, 'Connection timed out after 10001 milliseconds')
 -->
-
+
 
 	
 	
 
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/ZeroBin.net.xml b/src/chrome/content/rules/ZeroBin.net.xml
index aa217501fa4e..2ed93c804848 100644
--- a/src/chrome/content/rules/ZeroBin.net.xml
+++ b/src/chrome/content/rules/ZeroBin.net.xml
@@ -6,4 +6,4 @@
 
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/ZeroBlock.com.xml b/src/chrome/content/rules/ZeroBlock.com.xml
deleted file mode 100644
index ad67cb7a2747..000000000000
--- a/src/chrome/content/rules/ZeroBlock.com.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Zero_Day_Initiative.com.xml b/src/chrome/content/rules/Zero_Day_Initiative.com.xml
index 366df993c7ad..61c089ba808d 100644
--- a/src/chrome/content/rules/Zero_Day_Initiative.com.xml
+++ b/src/chrome/content/rules/Zero_Day_Initiative.com.xml
@@ -1,25 +1,12 @@
 
-
+
+
 
 	
 	
-		
-		
-		
-		
-
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/Zerowater.com.xml b/src/chrome/content/rules/Zerowater.com.xml
index 11cbd28b1976..494fa1ed3ddd 100644
--- a/src/chrome/content/rules/Zerowater.com.xml
+++ b/src/chrome/content/rules/Zerowater.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://help-flint-mi.zerowater.com/ => https://help-flint-mi.zerowa
 		- consumerinfo (issue with cert chain)
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/Zerve.xml b/src/chrome/content/rules/Zerve.xml
deleted file mode 100644
index e94ba45961a5..000000000000
--- a/src/chrome/content/rules/Zerve.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Zeta.Systems.xml b/src/chrome/content/rules/Zeta.Systems.xml
deleted file mode 100644
index ce78b217a83b..000000000000
--- a/src/chrome/content/rules/Zeta.Systems.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Zetel.de.xml b/src/chrome/content/rules/Zetel.de.xml
index 009a3286a360..bf120732b3f8 100644
--- a/src/chrome/content/rules/Zetel.de.xml
+++ b/src/chrome/content/rules/Zetel.de.xml
@@ -11,7 +11,7 @@ Fetch error: http://intranet.zetel.de/ => https://intranet.zetel.de/: (51, "SSL:
 
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/ZeusHash.com.xml b/src/chrome/content/rules/ZeusHash.com.xml
deleted file mode 100644
index beed27f85480..000000000000
--- a/src/chrome/content/rules/ZeusHash.com.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Zeusclicks.com.xml b/src/chrome/content/rules/Zeusclicks.com.xml
index 3ed9f7e7f149..1fea83690c14 100644
--- a/src/chrome/content/rules/Zeusclicks.com.xml
+++ b/src/chrome/content/rules/Zeusclicks.com.xml
@@ -32,7 +32,7 @@
 		- Images on (www.)? from ^zeusclicks.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Zhaw.ch.xml b/src/chrome/content/rules/Zhaw.ch.xml
index 98429860610d..14ee4c254b10 100644
--- a/src/chrome/content/rules/Zhaw.ch.xml
+++ b/src/chrome/content/rules/Zhaw.ch.xml
@@ -32,7 +32,7 @@ unable to get local issuer certificate:
 	
 	
 	
-	
+
 	
 	
 	
@@ -54,7 +54,6 @@ unable to get local issuer certificate:
 	
 	
 	
-	
 
 	
 	
@@ -66,7 +65,7 @@ unable to get local issuer certificate:
 	
 	
 
-	 
+	
 	
 	
 	
diff --git a/src/chrome/content/rules/Zhihu.xml b/src/chrome/content/rules/Zhihu.xml
index cb46d57a6c44..3e26724c64ed 100644
--- a/src/chrome/content/rules/Zhihu.xml
+++ b/src/chrome/content/rules/Zhihu.xml
@@ -11,8 +11,6 @@
 	Mixcontent but no function issue:
 		daily.zhihu.com
 		news-at.zhihu.com
-
-	Redirect to http:
 		worldcup2014.zhihu.com
 -->
 
@@ -32,17 +30,15 @@
 	
 	
 	
+	
 	
 	
 	
 
-	
 	
 	
 	
 	
-	
-		
 
 	
 
diff --git a/src/chrome/content/rules/Zierer.com.xml b/src/chrome/content/rules/Zierer.com.xml
new file mode 100644
index 000000000000..3fff40a351d9
--- /dev/null
+++ b/src/chrome/content/rules/Zierer.com.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+
+	
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Ziff-Davis-mismatches.xml b/src/chrome/content/rules/Ziff-Davis-mismatches.xml
deleted file mode 100644
index 6aaa82d2d2f3..000000000000
--- a/src/chrome/content/rules/Ziff-Davis-mismatches.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-		
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Ziff-Davis.xml b/src/chrome/content/rules/Ziff-Davis.xml
index 3c026fdd149c..d2fc5aa6b7d0 100644
--- a/src/chrome/content/rules/Ziff-Davis.xml
+++ b/src/chrome/content/rules/Ziff-Davis.xml
@@ -1,10 +1,7 @@
 
-
-
-	
-	
-	
-
-
-	
-
diff --git a/src/chrome/content/rules/Ziggo.xml b/src/chrome/content/rules/Ziggo.xml
index ba53adb1b198..a1f8cbd77263 100644
--- a/src/chrome/content/rules/Ziggo.xml
+++ b/src/chrome/content/rules/Ziggo.xml
@@ -1,7 +1,6 @@
 
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Zillow.com.xml b/src/chrome/content/rules/Zillow.com.xml
new file mode 100644
index 000000000000..bd3d7c25d8a4
--- /dev/null
+++ b/src/chrome/content/rules/Zillow.com.xml
@@ -0,0 +1,25 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+		
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Zillow.xml b/src/chrome/content/rules/Zillow.xml
deleted file mode 100644
index 5ac83f231eef..000000000000
--- a/src/chrome/content/rules/Zillow.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-
-
-
-	
-	
-		
-		
-	
-	
-
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-	
-
-	
-
-		
-
-	
-
-
diff --git a/src/chrome/content/rules/Zillowstatic.com.xml b/src/chrome/content/rules/Zillowstatic.com.xml
new file mode 100644
index 000000000000..e3a8212df0f6
--- /dev/null
+++ b/src/chrome/content/rules/Zillowstatic.com.xml
@@ -0,0 +1,25 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+		
+	
+		
+	
+		
+	
+		
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Zilog.com.xml b/src/chrome/content/rules/Zilog.com.xml
deleted file mode 100644
index eb288a51920a..000000000000
--- a/src/chrome/content/rules/Zilog.com.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Zimbatm.com.xml b/src/chrome/content/rules/Zimbatm.com.xml
index 87e8a2a3d063..f5ea3716346b 100644
--- a/src/chrome/content/rules/Zimbatm.com.xml
+++ b/src/chrome/content/rules/Zimbatm.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.zimbatm.com/ => https://www.zimbatm.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.zimbatm.com'")
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Zimbra.com.xml b/src/chrome/content/rules/Zimbra.com.xml
new file mode 100644
index 000000000000..7301987b4899
--- /dev/null
+++ b/src/chrome/content/rules/Zimbra.com.xml
@@ -0,0 +1,35 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Zimbra.xml b/src/chrome/content/rules/Zimbra.xml
deleted file mode 100644
index ac65b6b5acde..000000000000
--- a/src/chrome/content/rules/Zimbra.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-	
-
-
-	
-
-	
-
-	
-
-
-
diff --git a/src/chrome/content/rules/Zimperium.xml b/src/chrome/content/rules/Zimperium.xml
index b574ec788c90..2193dc37f794 100644
--- a/src/chrome/content/rules/Zimperium.xml
+++ b/src/chrome/content/rules/Zimperium.xml
@@ -2,7 +2,7 @@
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/Zing_Checkout.com-problematic.xml b/src/chrome/content/rules/Zing_Checkout.com-problematic.xml
index f93f0cc9d986..d87bdfd014d1 100644
--- a/src/chrome/content/rules/Zing_Checkout.com-problematic.xml
+++ b/src/chrome/content/rules/Zing_Checkout.com-problematic.xml
@@ -5,7 +5,7 @@
 
 
 	
-	
+	
 
 
 	
diff --git a/src/chrome/content/rules/Zing_Checkout.com.xml b/src/chrome/content/rules/Zing_Checkout.com.xml
index b23c61074a56..2c0bf747b355 100644
--- a/src/chrome/content/rules/Zing_Checkout.com.xml
+++ b/src/chrome/content/rules/Zing_Checkout.com.xml
@@ -21,7 +21,7 @@ Fetch error: http://app.zingcheckout.com/ => https://app.zingcheckout.com/: (28,
 	* Secured by us
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Zipcar.xml b/src/chrome/content/rules/Zipcar.xml
index 9c405f1e666e..81f3aa8e9025 100644
--- a/src/chrome/content/rules/Zipcar.xml
+++ b/src/chrome/content/rules/Zipcar.xml
@@ -19,7 +19,7 @@
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Zipy.co.il.xml b/src/chrome/content/rules/Zipy.co.il.xml
index c11baad46a08..8a30dd6e4f52 100644
--- a/src/chrome/content/rules/Zipy.co.il.xml
+++ b/src/chrome/content/rules/Zipy.co.il.xml
@@ -19,7 +19,7 @@ Fetch error: http://m.zipy.co.il/ => https://m.zipy.co.il/: (51, "SSL: no altern
 	ˢ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Zissousecure.com.xml b/src/chrome/content/rules/Zissousecure.com.xml
index 36d4cd717d37..03d0b9e7c7b0 100644
--- a/src/chrome/content/rules/Zissousecure.com.xml
+++ b/src/chrome/content/rules/Zissousecure.com.xml
@@ -10,7 +10,7 @@
 		
 
 
-	
+	
 
 
 	
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Zoho.jp.xml b/src/chrome/content/rules/Zoho.jp.xml
index 934103a07d4b..df2cc56b6211 100644
--- a/src/chrome/content/rules/Zoho.jp.xml
+++ b/src/chrome/content/rules/Zoho.jp.xml
@@ -18,7 +18,7 @@ Fetch error: http://www.zoho.co.jp/ => https://www.zoho.co.jp/: (51, "SSL: no al
 	* Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Zoklet.net.xml b/src/chrome/content/rules/Zoklet.net.xml
index a7ac14e25ff3..5a74108c42ec 100644
--- a/src/chrome/content/rules/Zoklet.net.xml
+++ b/src/chrome/content/rules/Zoklet.net.xml
@@ -1,6 +1,6 @@
 
   
   
-  
+  
   
 
diff --git a/src/chrome/content/rules/Zones.com.xml b/src/chrome/content/rules/Zones.com.xml
new file mode 100644
index 000000000000..0ac7ba1ad85e
--- /dev/null
+++ b/src/chrome/content/rules/Zones.com.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Zong.xml b/src/chrome/content/rules/Zong.xml
deleted file mode 100644
index 784a8c4f24f1..000000000000
--- a/src/chrome/content/rules/Zong.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Zooku.xml b/src/chrome/content/rules/Zooku.xml
index b0becfd73629..6b9ffdad0131 100644
--- a/src/chrome/content/rules/Zooku.xml
+++ b/src/chrome/content/rules/Zooku.xml
@@ -5,7 +5,7 @@
 	
 
 
-	
+	
 
 
 	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/Zoomerang.xml b/src/chrome/content/rules/Zoomerang.xml
index a80183406c1f..0ea175b7c8bf 100644
--- a/src/chrome/content/rules/Zoomerang.xml
+++ b/src/chrome/content/rules/Zoomerang.xml
@@ -19,7 +19,7 @@ Fetch error: http://www.zoomerang.com/ => https://www.zoomerang.com/: (60, 'SSL
 	mark this ruleset as mixedcontent.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Zoomshare.xml b/src/chrome/content/rules/Zoomshare.xml
index 9ecffacfc540..f37b544a2d9b 100644
--- a/src/chrome/content/rules/Zoomshare.xml
+++ b/src/chrome/content/rules/Zoomshare.xml
@@ -11,7 +11,7 @@
 	* Server sends no certificate chain, see https://whatsmychaincert.com
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Zoosk.com.xml b/src/chrome/content/rules/Zoosk.com.xml
index 10f390fe8393..113957ea7bac 100644
--- a/src/chrome/content/rules/Zoosk.com.xml
+++ b/src/chrome/content/rules/Zoosk.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Non-2xx HTTP code: http://zoosk.com/ (200) => https://zoosk.com/ (403)
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Zopa.xml b/src/chrome/content/rules/Zopa.xml
deleted file mode 100644
index 4610ac12d8c0..000000000000
--- a/src/chrome/content/rules/Zopa.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/Zopim.com.xml b/src/chrome/content/rules/Zopim.com.xml
new file mode 100644
index 000000000000..859a080bdfc5
--- /dev/null
+++ b/src/chrome/content/rules/Zopim.com.xml
@@ -0,0 +1,29 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/Zopim.xml b/src/chrome/content/rules/Zopim.xml
deleted file mode 100644
index 3d01e223c279..000000000000
--- a/src/chrome/content/rules/Zopim.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/Zorpia.xml b/src/chrome/content/rules/Zorpia.xml
index d5936e1f7381..66d8ba0d1a6f 100644
--- a/src/chrome/content/rules/Zorpia.xml
+++ b/src/chrome/content/rules/Zorpia.xml
@@ -120,16 +120,31 @@
 
 
 	
-	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 
 	
 	
 
 
-	
 
 	
@@ -140,4 +155,5 @@
 	
 
-
\ No newline at end of file
+	
+
diff --git a/src/chrome/content/rules/Zoznam.sk.xml b/src/chrome/content/rules/Zoznam.sk.xml
new file mode 100644
index 000000000000..7f06af353017
--- /dev/null
+++ b/src/chrome/content/rules/Zoznam.sk.xml
@@ -0,0 +1,64 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/Zscaler.xml b/src/chrome/content/rules/Zscaler.xml
index cf3358b1fb83..c73f9f4985bc 100644
--- a/src/chrome/content/rules/Zscaler.xml
+++ b/src/chrome/content/rules/Zscaler.xml
@@ -42,7 +42,7 @@ Non-2xx HTTP code: http://info.zscaler.com/images/forms/backRequiredGray.gif (20
 	ᵐ Not secured by us <= mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Zt03.net.xml b/src/chrome/content/rules/Zt03.net.xml
index 842178c242b8..f6f58ee5137b 100644
--- a/src/chrome/content/rules/Zt03.net.xml
+++ b/src/chrome/content/rules/Zt03.net.xml
@@ -11,7 +11,7 @@ Fetch error: http://secure.zt03.net/ => https://secure.zt03.net/: (60, 'SSL cert
 		- www.secure.zt03.net
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/Zugaina-mismatches.xml b/src/chrome/content/rules/Zugaina-mismatches.xml
index bbe5999b2ac2..d5dedc5c6269 100644
--- a/src/chrome/content/rules/Zugaina-mismatches.xml
+++ b/src/chrome/content/rules/Zugaina-mismatches.xml
@@ -2,7 +2,7 @@
 	For other Zugaina coverage, see Zugaina.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Zuhah.com.xml b/src/chrome/content/rules/Zuhah.com.xml
index 7d27ab8d4a47..8f920d11c80a 100644
--- a/src/chrome/content/rules/Zuhah.com.xml
+++ b/src/chrome/content/rules/Zuhah.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://cdn.zuhah.com/ => https://cdn.zuhah.com/: (60, 'SSL certific
 Fetch error: http://www.zuhah.com/ => https://www.zuhah.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/Zuji.com.hk.xml b/src/chrome/content/rules/Zuji.com.hk.xml
deleted file mode 100644
index 29407c627e34..000000000000
--- a/src/chrome/content/rules/Zuji.com.hk.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-		
-		
-	
-	
-	
-	
-	
-		
-		
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/Zumzi.xml b/src/chrome/content/rules/Zumzi.xml
deleted file mode 100644
index bceeedc3057a..000000000000
--- a/src/chrome/content/rules/Zumzi.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-	
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Zyado.com.xml b/src/chrome/content/rules/Zyado.com.xml
deleted file mode 100644
index 9ea7210902e1..000000000000
--- a/src/chrome/content/rules/Zyado.com.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Zylom.com.xml b/src/chrome/content/rules/Zylom.com.xml
index 5920ded0fda1..a29845df4a22 100644
--- a/src/chrome/content/rules/Zylom.com.xml
+++ b/src/chrome/content/rules/Zylom.com.xml
@@ -36,7 +36,7 @@ Fetch error: http://cdn.media.zylom.com/ => https://media.zylom.com/: (60, 'SSL
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/Zylon.net-falsemixed.xml b/src/chrome/content/rules/Zylon.net-falsemixed.xml
deleted file mode 100644
index c5cf5741c99e..000000000000
--- a/src/chrome/content/rules/Zylon.net-falsemixed.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/Zylon.net.xml b/src/chrome/content/rules/Zylon.net.xml
index 9de0ad78862e..21001c0a8d4d 100644
--- a/src/chrome/content/rules/Zylon.net.xml
+++ b/src/chrome/content/rules/Zylon.net.xml
@@ -1,48 +1,6 @@
-
-
-
-
+
 	
 	
-		
-		
-
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-
-
-	
 
+	
 
diff --git a/src/chrome/content/rules/aarresaari.net.xml b/src/chrome/content/rules/aarresaari.net.xml
new file mode 100644
index 000000000000..3145438c4be5
--- /dev/null
+++ b/src/chrome/content/rules/aarresaari.net.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/aastocks.com.xml b/src/chrome/content/rules/aastocks.com.xml
deleted file mode 100644
index 1817837a7748..000000000000
--- a/src/chrome/content/rules/aastocks.com.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-
-	
-	
-	
-	
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/abbott.com.xml b/src/chrome/content/rules/abbott.com.xml
new file mode 100644
index 000000000000..bd998af4df45
--- /dev/null
+++ b/src/chrome/content/rules/abbott.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/aberystwythartscentre.co.uk.xml b/src/chrome/content/rules/aberystwythartscentre.co.uk.xml
index a2d07c23444e..ee63769c3014 100644
--- a/src/chrome/content/rules/aberystwythartscentre.co.uk.xml
+++ b/src/chrome/content/rules/aberystwythartscentre.co.uk.xml
@@ -1,22 +1,8 @@
-
-
-
+
 	
 	
 
+	
 
-	
-
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/abload.de.xml b/src/chrome/content/rules/abload.de.xml
index 10d597f28a56..9450eaba594f 100644
--- a/src/chrome/content/rules/abload.de.xml
+++ b/src/chrome/content/rules/abload.de.xml
@@ -27,7 +27,7 @@
 		
 		
 		
-	
+
 	
diff --git a/src/chrome/content/rules/abma.de.xml b/src/chrome/content/rules/abma.de.xml
index 8dd94632bc27..2099e621b990 100644
--- a/src/chrome/content/rules/abma.de.xml
+++ b/src/chrome/content/rules/abma.de.xml
@@ -19,6 +19,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/about.com.xml b/src/chrome/content/rules/about.com.xml
index 50e58c7b49c7..e373ebfabb63 100644
--- a/src/chrome/content/rules/about.com.xml
+++ b/src/chrome/content/rules/about.com.xml
@@ -8,7 +8,7 @@
 	Problematic hosts in *about.com:
 
 		- index ᵐ
-		
+
 	ᵐ Mismatched
 
 
diff --git a/src/chrome/content/rules/abpchina.org.xml b/src/chrome/content/rules/abpchina.org.xml
new file mode 100644
index 000000000000..2c83a7ae36cb
--- /dev/null
+++ b/src/chrome/content/rules/abpchina.org.xml
@@ -0,0 +1,12 @@
+
+	
+	
+
+	
+	
+		
+		
+		
+
+	
+
diff --git a/src/chrome/content/rules/abuse.net.xml b/src/chrome/content/rules/abuse.net.xml
index 531ebb9ea52c..6cf6a3f1c865 100644
--- a/src/chrome/content/rules/abuse.net.xml
+++ b/src/chrome/content/rules/abuse.net.xml
@@ -3,6 +3,6 @@
   
   
 
-    
+  
   
 
diff --git a/src/chrome/content/rules/abw.blue.xml b/src/chrome/content/rules/abw.blue.xml
new file mode 100644
index 000000000000..b0d2ef9a955f
--- /dev/null
+++ b/src/chrome/content/rules/abw.blue.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/academ.info.xml b/src/chrome/content/rules/academ.info.xml
new file mode 100644
index 000000000000..4b744e886d2a
--- /dev/null
+++ b/src/chrome/content/rules/academ.info.xml
@@ -0,0 +1,40 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/acast.com.xml b/src/chrome/content/rules/acast.com.xml
index 938ee742f7c2..d3a8950da1ae 100644
--- a/src/chrome/content/rules/acast.com.xml
+++ b/src/chrome/content/rules/acast.com.xml
@@ -1,64 +1,24 @@
 
 
-
-	
+	
+	
 	
 	
+	
 	
 	
-	
-	
-
-		
-		
-
-	
-	
-	
-
-
-	
-	
-	
-
-	
-	
-
-
-	
-
-	
 
-	
+	
 
+	
+	
 
diff --git a/src/chrome/content/rules/accessedge.com.xml b/src/chrome/content/rules/accessedge.com.xml
index f321a7f36c38..ebba144c0157 100644
--- a/src/chrome/content/rules/accessedge.com.xml
+++ b/src/chrome/content/rules/accessedge.com.xml
@@ -18,7 +18,7 @@
 		- www2.accessedge.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/accessify.com.xml b/src/chrome/content/rules/accessify.com.xml
index 882dbc96e85d..676a2fb4bcc5 100644
--- a/src/chrome/content/rules/accessify.com.xml
+++ b/src/chrome/content/rules/accessify.com.xml
@@ -1,37 +1,15 @@
-
-
-
-	
+	
+	
 	
 
 		
 
 
-	
+	
 
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/accesspiratebay.co.uk.xml b/src/chrome/content/rules/accesspiratebay.co.uk.xml
deleted file mode 100644
index 90ffdedc3e43..000000000000
--- a/src/chrome/content/rules/accesspiratebay.co.uk.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/acme.com.xml b/src/chrome/content/rules/acme.com.xml
new file mode 100644
index 000000000000..f62d818b7f5f
--- /dev/null
+++ b/src/chrome/content/rules/acme.com.xml
@@ -0,0 +1,33 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/acmp.ru.xml b/src/chrome/content/rules/acmp.ru.xml
new file mode 100644
index 000000000000..f824f1ac2b1a
--- /dev/null
+++ b/src/chrome/content/rules/acmp.ru.xml
@@ -0,0 +1,21 @@
+
+
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/act-on.co.uk.xml b/src/chrome/content/rules/act-on.co.uk.xml
index 452628e55f77..11ecc9ef160f 100644
--- a/src/chrome/content/rules/act-on.co.uk.xml
+++ b/src/chrome/content/rules/act-on.co.uk.xml
@@ -6,7 +6,7 @@ Fetch error: http://act-on.co.uk/ => https://act-on.co.uk/: (28, 'Connection tim
 	For other Act-On Software coverage, see act-on.com.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/act-on.com-mixedcontent.xml b/src/chrome/content/rules/act-on.com-mixedcontent.xml
deleted file mode 100644
index d48e7696d755..000000000000
--- a/src/chrome/content/rules/act-on.com-mixedcontent.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/act-on.com.xml b/src/chrome/content/rules/act-on.com.xml
deleted file mode 100644
index eafec1c249d3..000000000000
--- a/src/chrome/content/rules/act-on.com.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-		
-		
-
-	
-	
-	
-
-		
-
-			
-			
-			
-			
-			
-			
-			
-
-
-	
-	
-
-	
-	
-
-
-	
-	
-
-		
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/act.org.xml b/src/chrome/content/rules/act.org.xml
new file mode 100644
index 000000000000..3c49bddadef2
--- /dev/null
+++ b/src/chrome/content/rules/act.org.xml
@@ -0,0 +1,205 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/actionfraud.police.uk.xml b/src/chrome/content/rules/actionfraud.police.uk.xml
deleted file mode 100644
index 4e8e425dc366..000000000000
--- a/src/chrome/content/rules/actionfraud.police.uk.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-
-		
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/active24.com.xml b/src/chrome/content/rules/active24.com.xml
index a67c506316ba..15deb5944a64 100644
--- a/src/chrome/content/rules/active24.com.xml
+++ b/src/chrome/content/rules/active24.com.xml
@@ -19,7 +19,7 @@ Fetch error: http://my.active24.com/ => https://my.active24.com/: (6, 'Could not
 	Self signed:
 		- exchange.active24.com
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/actor.im.xml b/src/chrome/content/rules/actor.im.xml
index 7f1dc384b111..83dcec70e47b 100644
--- a/src/chrome/content/rules/actor.im.xml
+++ b/src/chrome/content/rules/actor.im.xml
@@ -13,7 +13,7 @@ Fetch error: http://www.actor.im/ => https://www.actor.im/: (28, 'Operation time
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/acxiom.com.xml b/src/chrome/content/rules/acxiom.com.xml
index 9ae01652a83c..88cd2605e46a 100644
--- a/src/chrome/content/rules/acxiom.com.xml
+++ b/src/chrome/content/rules/acxiom.com.xml
@@ -1,8 +1,26 @@
+
 
+	
+	
+	
+	
 	
-	
-	
-	
+	
+	
+	
 	
 	
 	
-	
+	
 	
 	
 	
 	
 	
-	
+	
 	
-	
+	
 	
 	
 	
-	
-	
+	
+	
 	
 	
-	
-	
+	
+	
 
 	
 
diff --git a/src/chrome/content/rules/ad-m.asia.xml b/src/chrome/content/rules/ad-m.asia.xml
index 3596084738d9..f39e1b2db5f5 100644
--- a/src/chrome/content/rules/ad-m.asia.xml
+++ b/src/chrome/content/rules/ad-m.asia.xml
@@ -5,4 +5,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/adamcod.es.xml b/src/chrome/content/rules/adamcod.es.xml
deleted file mode 100644
index 7e07034b5c7c..000000000000
--- a/src/chrome/content/rules/adamcod.es.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/adc-srv.net.xml b/src/chrome/content/rules/adc-srv.net.xml
index 92dc0d8b0d4b..22f1ceaea22e 100644
--- a/src/chrome/content/rules/adc-srv.net.xml
+++ b/src/chrome/content/rules/adc-srv.net.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.adc-srv.net/ => https://www.adc-srv.net/: (51, "SSL: no
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/additifs-alimentaires.net.xml b/src/chrome/content/rules/additifs-alimentaires.net.xml
new file mode 100644
index 000000000000..48d84848c6dd
--- /dev/null
+++ b/src/chrome/content/rules/additifs-alimentaires.net.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/adfoc.us-mixedcontent.xml b/src/chrome/content/rules/adfoc.us-mixedcontent.xml
deleted file mode 100644
index 7dc6de9c72f2..000000000000
--- a/src/chrome/content/rules/adfoc.us-mixedcontent.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/adfoc.us.xml b/src/chrome/content/rules/adfoc.us.xml
index 6291b9e1311f..0eea88adfa4e 100644
--- a/src/chrome/content/rules/adfoc.us.xml
+++ b/src/chrome/content/rules/adfoc.us.xml
@@ -1,15 +1,10 @@
-
 
-
 	
+	
 	
-		
+	
 
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/adlantis.jp.xml b/src/chrome/content/rules/adlantis.jp.xml
deleted file mode 100644
index 0a4257b838ae..000000000000
--- a/src/chrome/content/rules/adlantis.jp.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/administrator.de.xml b/src/chrome/content/rules/administrator.de.xml
deleted file mode 100644
index d32aa2412085..000000000000
--- a/src/chrome/content/rules/administrator.de.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/adnet.pro.xml b/src/chrome/content/rules/adnet.pro.xml
index 1242cf96c005..ffdb43dac379 100644
--- a/src/chrome/content/rules/adnet.pro.xml
+++ b/src/chrome/content/rules/adnet.pro.xml
@@ -10,7 +10,7 @@
 
 	
 	
-	
+
 		
 		
diff --git a/src/chrome/content/rules/adnetexpress.net.xml b/src/chrome/content/rules/adnetexpress.net.xml
index 7321ba8b80e4..e71ccf633216 100644
--- a/src/chrome/content/rules/adnetexpress.net.xml
+++ b/src/chrome/content/rules/adnetexpress.net.xml
@@ -5,7 +5,7 @@ Fetch error: http://adnetexpress.net/ => https://adnetexpress.net/: (28, 'Operat
 Fetch error: http://www.adnetexpress.net/ => https://www.adnetexpress.net/: (28, 'Operation timed out after 30001 milliseconds with 0 bytes received')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/adr.org.xml b/src/chrome/content/rules/adr.org.xml
index f2c76ec25e43..02029187bd7c 100644
--- a/src/chrome/content/rules/adr.org.xml
+++ b/src/chrome/content/rules/adr.org.xml
@@ -38,7 +38,7 @@ Fetch error: http://services.adr.org/ => https://services.adr.org/: (28, 'Connec
 		- www.adr.org
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/adreclaim.com.xml b/src/chrome/content/rules/adreclaim.com.xml
index a0544f4ce89a..54e2ed2b88c4 100644
--- a/src/chrome/content/rules/adreclaim.com.xml
+++ b/src/chrome/content/rules/adreclaim.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://adreclaim.com/ => https://adreclaim.com/: (51, "SSL: no alternative certificate subject name matches target host name 'adreclaim.com'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/adsl.by.xml b/src/chrome/content/rules/adsl.by.xml
deleted file mode 100644
index 419a34d341e3..000000000000
--- a/src/chrome/content/rules/adsl.by.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/adsnative.com.xml b/src/chrome/content/rules/adsnative.com.xml
index 5011a1302022..6a7714faf659 100644
--- a/src/chrome/content/rules/adsnative.com.xml
+++ b/src/chrome/content/rules/adsnative.com.xml
@@ -24,7 +24,7 @@ Fetch error: http://adsnative.com/ => https://www.adsnative.com/: (28, 'Connecti
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/adultswim.xml b/src/chrome/content/rules/adultswim.xml
deleted file mode 100644
index f2495ba6548e..000000000000
--- a/src/chrome/content/rules/adultswim.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-	
- 	
-	
-
-
-	
-	
-
-	
-
-
-	
-
diff --git a/src/chrome/content/rules/advision-adnw.jp.xml b/src/chrome/content/rules/advision-adnw.jp.xml
index 9c21f5503c33..194f6e0584e3 100644
--- a/src/chrome/content/rules/advision-adnw.jp.xml
+++ b/src/chrome/content/rules/advision-adnw.jp.xml
@@ -5,4 +5,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/afisha.ru.xml b/src/chrome/content/rules/afisha.ru.xml
index 15f1a7e06de4..db8d16c78e03 100644
--- a/src/chrome/content/rules/afisha.ru.xml
+++ b/src/chrome/content/rules/afisha.ru.xml
@@ -186,7 +186,7 @@ zodakguide.afisha.ru different content
 ⁴ self signed
 ⁵ expired
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/agoradesk.com.xml b/src/chrome/content/rules/agoradesk.com.xml
new file mode 100644
index 000000000000..4f1616b1c0cf
--- /dev/null
+++ b/src/chrome/content/rules/agoradesk.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ahcdn.com-falsemixed.xml b/src/chrome/content/rules/ahcdn.com-falsemixed.xml
deleted file mode 100644
index d06d5c65e492..000000000000
--- a/src/chrome/content/rules/ahcdn.com-falsemixed.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/ahcdn.com.xml b/src/chrome/content/rules/ahcdn.com.xml
index 6e141d190296..9045b2687fc0 100644
--- a/src/chrome/content/rules/ahcdn.com.xml
+++ b/src/chrome/content/rules/ahcdn.com.xml
@@ -1,55 +1,21 @@
 
-
-
-	
-
-		
-
-			
-			
-			
-
-		
-		
-
-		
-		
-
-			
-			
-			
-			
-
-
-	
-	
-
-	
-
-
-	
-
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
 
diff --git a/src/chrome/content/rules/ahead.org.xml b/src/chrome/content/rules/ahead.org.xml
index 6bf49ab0fce3..a79e4736665b 100644
--- a/src/chrome/content/rules/ahead.org.xml
+++ b/src/chrome/content/rules/ahead.org.xml
@@ -2,7 +2,7 @@
 	Mixed content:
 
 		- Image on www from $self ˢ
-	
+
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
diff --git a/src/chrome/content/rules/ahoy.re.xml b/src/chrome/content/rules/ahoy.re.xml
deleted file mode 100644
index 3ab9936aeab5..000000000000
--- a/src/chrome/content/rules/ahoy.re.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/ahyasalam.com.xml b/src/chrome/content/rules/ahyasalam.com.xml
deleted file mode 100644
index 1f5b21d66027..000000000000
--- a/src/chrome/content/rules/ahyasalam.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/aimp.ru.xml b/src/chrome/content/rules/aimp.ru.xml
new file mode 100644
index 000000000000..72a70290d3ab
--- /dev/null
+++ b/src/chrome/content/rules/aimp.ru.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/airbites.net.ua.xml b/src/chrome/content/rules/airbites.net.ua.xml
index 9a0d7277fc73..6d53aeefb03a 100644
--- a/src/chrome/content/rules/airbites.net.ua.xml
+++ b/src/chrome/content/rules/airbites.net.ua.xml
@@ -47,7 +47,7 @@ speedtest-lv.airbites.net.ua different content
 ³ timed out
 ⁵ expired
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/aircrack-ng.org-mixedcontent.xml b/src/chrome/content/rules/aircrack-ng.org-mixedcontent.xml
deleted file mode 100644
index 4bf92e7a14ee..000000000000
--- a/src/chrome/content/rules/aircrack-ng.org-mixedcontent.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/aircrack-ng.org.xml b/src/chrome/content/rules/aircrack-ng.org.xml
index df9dab6010f8..95549bbe1cf5 100644
--- a/src/chrome/content/rules/aircrack-ng.org.xml
+++ b/src/chrome/content/rules/aircrack-ng.org.xml
@@ -1,15 +1,9 @@
 
 
-
 	
 	
 	
@@ -24,9 +18,6 @@
 	
 	
 	
-	
-	
-	
 	
 	
 	
@@ -38,7 +29,5 @@
 
 	
 
-	
-
+	
 
diff --git a/src/chrome/content/rules/airelf.com.tw.xml b/src/chrome/content/rules/airelf.com.tw.xml
deleted file mode 100644
index f9fa495f2556..000000000000
--- a/src/chrome/content/rules/airelf.com.tw.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-	
-	
-	
-
-	
-
-	
-	
-	
-
diff --git a/src/chrome/content/rules/airesume.com.xml b/src/chrome/content/rules/airesume.com.xml
deleted file mode 100644
index 8e74094204b0..000000000000
--- a/src/chrome/content/rules/airesume.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/aironetsp.ru.xml b/src/chrome/content/rules/aironetsp.ru.xml
deleted file mode 100644
index 994b5f7421ee..000000000000
--- a/src/chrome/content/rules/aironetsp.ru.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/airsoftclubnederland.nl.xml b/src/chrome/content/rules/airsoftclubnederland.nl.xml
new file mode 100644
index 000000000000..43cc26a21468
--- /dev/null
+++ b/src/chrome/content/rules/airsoftclubnederland.nl.xml
@@ -0,0 +1,8 @@
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/akbars.ru.xml b/src/chrome/content/rules/akbars.ru.xml
index 5c65d222ab56..f62a5cb62eb8 100644
--- a/src/chrome/content/rules/akbars.ru.xml
+++ b/src/chrome/content/rules/akbars.ru.xml
@@ -8,7 +8,7 @@ quickweb.akbars.ru ³
 
 ³ timed out
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/akixi.com.xml b/src/chrome/content/rules/akixi.com.xml
index 9150c82885e4..e53a2ab1e2a9 100644
--- a/src/chrome/content/rules/akixi.com.xml
+++ b/src/chrome/content/rules/akixi.com.xml
@@ -16,7 +16,7 @@ Fetch error: http://alto.akixi.com/ => https://alto.akixi.com/: (28, 'Connection
 		- stratus.akixi.com
 		- svn.akixi.com
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/alArabiya.net.xml b/src/chrome/content/rules/alArabiya.net.xml
index 0631254a6f13..3e5817f50f9b 100644
--- a/src/chrome/content/rules/alArabiya.net.xml
+++ b/src/chrome/content/rules/alArabiya.net.xml
@@ -20,14 +20,14 @@
 	Refused:
 		survey.alarabiya.net
 
-	Time out: 
+	Time out:
 		alarabiya.net
 		anaara.alarabiya.net
 		apisaic.alarabiya.net
 		api.cal.alarabiya.net
 		www.english.alarabiya.net
 		saic.alarabiya.net
-		api.saic.alarabiya.net 
+		api.saic.alarabiya.net
 -->
 
 	
@@ -38,11 +38,11 @@
 	
 	
 	
-	 
+	
 	
-	 
+	
 
 	
 
 	
- 
+
diff --git a/src/chrome/content/rules/alaMaula.com.xml b/src/chrome/content/rules/alaMaula.com.xml
new file mode 100644
index 000000000000..a8ad0339e7f1
--- /dev/null
+++ b/src/chrome/content/rules/alaMaula.com.xml
@@ -0,0 +1,124 @@
+
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/alau.kz.xml b/src/chrome/content/rules/alau.kz.xml
index 80f9e1d5955f..1208635611ba 100644
--- a/src/chrome/content/rules/alau.kz.xml
+++ b/src/chrome/content/rules/alau.kz.xml
@@ -5,7 +5,7 @@ Fetch error: http://alau.kz/ => https://alau.kz/: (7, 'Failed to connect to alau
 Fetch error: http://www.alau.kz/ => https://www.alau.kz/: (7, 'Failed to connect to www.alau.kz port 443: Connection refused')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/alayam24.com.xml b/src/chrome/content/rules/alayam24.com.xml
index b926c3b8fcaa..9615a1d939cc 100644
--- a/src/chrome/content/rules/alayam24.com.xml
+++ b/src/chrome/content/rules/alayam24.com.xml
@@ -1,9 +1,23 @@
-
+
+
 	
 	
+	
 	
+	
 	
-		
 
 	
 
diff --git a/src/chrome/content/rules/alcohol-soft.com.xml b/src/chrome/content/rules/alcohol-soft.com.xml
new file mode 100644
index 000000000000..48b928f384e8
--- /dev/null
+++ b/src/chrome/content/rules/alcohol-soft.com.xml
@@ -0,0 +1,53 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/aldeparty.eu.xml b/src/chrome/content/rules/aldeparty.eu.xml
index 65a73b2768d1..98a4eef85a2e 100644
--- a/src/chrome/content/rules/aldeparty.eu.xml
+++ b/src/chrome/content/rules/aldeparty.eu.xml
@@ -1,12 +1,8 @@
-
-
+
 	
 	
 
+	
+
 	
 
diff --git a/src/chrome/content/rules/alf.nu.xml b/src/chrome/content/rules/alf.nu.xml
new file mode 100644
index 000000000000..d5abbc23127a
--- /dev/null
+++ b/src/chrome/content/rules/alf.nu.xml
@@ -0,0 +1,436 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/alibaba-inc.com-falsemixed.xml b/src/chrome/content/rules/alibaba-inc.com-falsemixed.xml
deleted file mode 100644
index b16cbeb6b6d0..000000000000
--- a/src/chrome/content/rules/alibaba-inc.com-falsemixed.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-
diff --git a/src/chrome/content/rules/alibaba-inc.com.xml b/src/chrome/content/rules/alibaba-inc.com.xml
index d2b0f4415d98..a807630c7afd 100644
--- a/src/chrome/content/rules/alibaba-inc.com.xml
+++ b/src/chrome/content/rules/alibaba-inc.com.xml
@@ -1,71 +1,27 @@
 
 
-
-	
+	
 	
 	
 	
-	
 	
 	
 	
 	
 	
 	
-	
-
-	
-	
-
-
-	
-	
-	
-
-	
-
-
-	
-	
 
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/aliexpress.com-mixedcontent.xml b/src/chrome/content/rules/aliexpress.com-mixedcontent.xml
index da0f4a6490bb..9f0a57295989 100644
--- a/src/chrome/content/rules/aliexpress.com-mixedcontent.xml
+++ b/src/chrome/content/rules/aliexpress.com-mixedcontent.xml
@@ -2,18 +2,13 @@
 	For rules not causing MCB, see AliExpress.com.xml.
 -->
 
+	
+	
 	
-	
 	
 	
-	
-	
-	
-	
 	
-	
 	
-	
 
 	
 
diff --git a/src/chrome/content/rules/all4joomla.com.xml b/src/chrome/content/rules/all4joomla.com.xml
new file mode 100644
index 000000000000..59fb4b29cdb8
--- /dev/null
+++ b/src/chrome/content/rules/all4joomla.com.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/alliance-media.org.uk.xml b/src/chrome/content/rules/alliance-media.org.uk.xml
index 80fbf2e65c92..862cd85950a2 100644
--- a/src/chrome/content/rules/alliance-media.org.uk.xml
+++ b/src/chrome/content/rules/alliance-media.org.uk.xml
@@ -2,7 +2,7 @@
 	NB: server sends no certificate chain, see https://whatsmychaincert.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/allianz.com.xml b/src/chrome/content/rules/allianz.com.xml
index e3e0c6b1f229..4558c01fab54 100644
--- a/src/chrome/content/rules/allianz.com.xml
+++ b/src/chrome/content/rules/allianz.com.xml
@@ -72,7 +72,7 @@ Fetch error: http://www.azt.allianz.com/ => https://azt.allianz.com/: (6, 'Could
 	ˢ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/allinvestments.ru.xml b/src/chrome/content/rules/allinvestments.ru.xml
index 6cc703a9e423..0fc79416a169 100644
--- a/src/chrome/content/rules/allinvestments.ru.xml
+++ b/src/chrome/content/rules/allinvestments.ru.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.allinvestments.ru/ => https://www.allinvestments.ru/: (51, "SSL: no alternative certificate subject name matches target host name 'www.allinvestments.ru'")
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/almayadeen.net.xml b/src/chrome/content/rules/almayadeen.net.xml
index 9b8062b90db9..5d937858d094 100644
--- a/src/chrome/content/rules/almayadeen.net.xml
+++ b/src/chrome/content/rules/almayadeen.net.xml
@@ -7,14 +7,14 @@ Invalid certificate:
 	hubs-es.almayadeen.net
 	upload.almayadeen.net
 
-Timeout: 
+Timeout:
 	careers.almayadeen.net
 	media-g.almayadeen.net
 -->
-    
+
 	
-	      
-	  
+	
+	
 	
 	
 	
diff --git a/src/chrome/content/rules/almeshkat.net.xml b/src/chrome/content/rules/almeshkat.net.xml
index ef936283420b..bc1655a1063c 100644
--- a/src/chrome/content/rules/almeshkat.net.xml
+++ b/src/chrome/content/rules/almeshkat.net.xml
@@ -2,6 +2,6 @@
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/alpharatio.cc.xml b/src/chrome/content/rules/alpharatio.cc.xml
index 60614f826f12..993fcd558bff 100644
--- a/src/chrome/content/rules/alpharatio.cc.xml
+++ b/src/chrome/content/rules/alpharatio.cc.xml
@@ -1,6 +1,6 @@
 
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/alsace-lait.com.xml b/src/chrome/content/rules/alsace-lait.com.xml
new file mode 100644
index 000000000000..b25b019d7cad
--- /dev/null
+++ b/src/chrome/content/rules/alsace-lait.com.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/alt-usage-english.org.xml b/src/chrome/content/rules/alt-usage-english.org.xml
new file mode 100644
index 000000000000..ff6303d9b0d4
--- /dev/null
+++ b/src/chrome/content/rules/alt-usage-english.org.xml
@@ -0,0 +1,7 @@
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/alternacare.ca.xml b/src/chrome/content/rules/alternacare.ca.xml
new file mode 100644
index 000000000000..f2f005a60bd3
--- /dev/null
+++ b/src/chrome/content/rules/alternacare.ca.xml
@@ -0,0 +1,13 @@
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/alwadifa-club.com.xml b/src/chrome/content/rules/alwadifa-club.com.xml
deleted file mode 100644
index 29edf0fd9668..000000000000
--- a/src/chrome/content/rules/alwadifa-club.com.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/amap-mixedcontent.xml b/src/chrome/content/rules/amap-mixedcontent.xml
deleted file mode 100644
index fc8e85d4f844..000000000000
--- a/src/chrome/content/rules/amap-mixedcontent.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-	
-
-	
-		
-		
-		
-		
-
-	
-		
-		
-		
-		
-
-	
-		
-		
-		
-
-
diff --git a/src/chrome/content/rules/amap.com.xml b/src/chrome/content/rules/amap.com.xml
new file mode 100644
index 000000000000..1eba40ad2025
--- /dev/null
+++ b/src/chrome/content/rules/amap.com.xml
@@ -0,0 +1,27 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/amap.xml b/src/chrome/content/rules/amap.xml
deleted file mode 100644
index f5fdd83afb87..000000000000
--- a/src/chrome/content/rules/amap.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
diff --git a/src/chrome/content/rules/amazon.cn.xml b/src/chrome/content/rules/amazon.cn.xml
index 0b3bf8a78067..4b4d7bfd5118 100644
--- a/src/chrome/content/rules/amazon.cn.xml
+++ b/src/chrome/content/rules/amazon.cn.xml
@@ -1,20 +1,9 @@
 
-
-
+
 	
 	
-	
 	
 	
 	
@@ -22,17 +11,9 @@
 	
 	
 
+	
 
-	
-	
-	
-
-	
-	
-
-
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/amazon.co.jp.xml b/src/chrome/content/rules/amazon.co.jp.xml
index 294c65cee02f..f458948034d0 100644
--- a/src/chrome/content/rules/amazon.co.jp.xml
+++ b/src/chrome/content/rules/amazon.co.jp.xml
@@ -15,7 +15,7 @@
 	
 	
 	
-		 
+		
 	
 	
 	
diff --git a/src/chrome/content/rules/ambercutie.com.xml b/src/chrome/content/rules/ambercutie.com.xml
index dc1068a4ca11..9dfa46e4f253 100644
--- a/src/chrome/content/rules/ambercutie.com.xml
+++ b/src/chrome/content/rules/ambercutie.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://profiles.ambercutie.com/ => https://profiles.ambercutie.com/
 	⁵ 522, preemptable redirect
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/amd-osx.com.xml b/src/chrome/content/rules/amd-osx.com.xml
index d5bfec7302a7..f0817aa595b3 100644
--- a/src/chrome/content/rules/amd-osx.com.xml
+++ b/src/chrome/content/rules/amd-osx.com.xml
@@ -5,9 +5,6 @@
 
 	
 
-	
-	
-	
 	
 	
 
diff --git a/src/chrome/content/rules/america.gov.xml b/src/chrome/content/rules/america.gov.xml
deleted file mode 100644
index 7f7b2213eab0..000000000000
--- a/src/chrome/content/rules/america.gov.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-
-		
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/americanrifleman.org.xml b/src/chrome/content/rules/americanrifleman.org.xml
index c12344677bdc..e36944427153 100644
--- a/src/chrome/content/rules/americanrifleman.org.xml
+++ b/src/chrome/content/rules/americanrifleman.org.xml
@@ -13,7 +13,7 @@ Fetch error: http://wmp.americanrifleman.org/ => https://wmp.americanrifleman.or
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/americas1stfreedom.org.xml b/src/chrome/content/rules/americas1stfreedom.org.xml
index 7de4beabccb9..619d8d99e1b4 100644
--- a/src/chrome/content/rules/americas1stfreedom.org.xml
+++ b/src/chrome/content/rules/americas1stfreedom.org.xml
@@ -10,14 +10,14 @@ Fetch error: http://wmp.americas1stfreedom.org/ => https://wmp.americas1stfreedo
 	Mixed content:
 
 		- Bugs, from:
-		
+
 			- b.scorecardresearch.com ˢ
 			- sb.scorecardresearch.com ˢ
 
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ampproject.org.xml b/src/chrome/content/rules/ampproject.org.xml
deleted file mode 100644
index dc2223b7dcff..000000000000
--- a/src/chrome/content/rules/ampproject.org.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/amule.org.xml b/src/chrome/content/rules/amule.org.xml
new file mode 100644
index 000000000000..d8cd31520b4b
--- /dev/null
+++ b/src/chrome/content/rules/amule.org.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/analog.com.xml b/src/chrome/content/rules/analog.com.xml
new file mode 100644
index 000000000000..7270d064c117
--- /dev/null
+++ b/src/chrome/content/rules/analog.com.xml
@@ -0,0 +1,322 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/anapirana.com.xml b/src/chrome/content/rules/anapirana.com.xml
deleted file mode 100644
index 20752e49269a..000000000000
--- a/src/chrome/content/rules/anapirana.com.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/anderslernen.at.xml b/src/chrome/content/rules/anderslernen.at.xml
new file mode 100644
index 000000000000..cdf42b90501b
--- /dev/null
+++ b/src/chrome/content/rules/anderslernen.at.xml
@@ -0,0 +1,7 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/andreapaiola.name.xml b/src/chrome/content/rules/andreapaiola.name.xml
deleted file mode 100644
index 68448e60020f..000000000000
--- a/src/chrome/content/rules/andreapaiola.name.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/angband.pl.xml b/src/chrome/content/rules/angband.pl.xml
new file mode 100644
index 000000000000..111be59e8468
--- /dev/null
+++ b/src/chrome/content/rules/angband.pl.xml
@@ -0,0 +1,33 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/angr.io.xml b/src/chrome/content/rules/angr.io.xml
new file mode 100644
index 000000000000..73712a349120
--- /dev/null
+++ b/src/chrome/content/rules/angr.io.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/animenewsnetwork.xml b/src/chrome/content/rules/animenewsnetwork.xml
index 9f9f2cec0111..f6aea1eba083 100644
--- a/src/chrome/content/rules/animenewsnetwork.xml
+++ b/src/chrome/content/rules/animenewsnetwork.xml
@@ -1,7 +1,7 @@
 
 
@@ -15,13 +15,13 @@
   
   
   
-  
+
   
-  
+
   
   
   
@@ -30,6 +30,6 @@
   
   
   
-  
+
   
 
diff --git a/src/chrome/content/rules/annotum.org.xml b/src/chrome/content/rules/annotum.org.xml
index 4718f9f8430d..3baf4ccf9ead 100644
--- a/src/chrome/content/rules/annotum.org.xml
+++ b/src/chrome/content/rules/annotum.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://annotum.org/ => https://annotum.org/: (51, "SSL: no alternat
 Fetch error: http://www.annotum.org/ => https://www.annotum.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.annotum.org'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/anthem.com.xml b/src/chrome/content/rules/anthem.com.xml
index b074c34a0af7..11259621258a 100644
--- a/src/chrome/content/rules/anthem.com.xml
+++ b/src/chrome/content/rules/anthem.com.xml
@@ -113,7 +113,7 @@ Fetch error: http://www21.anthem.com/ => https://www21.anthem.com/: (60, 'SSL ce
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/apichangelog.com.xml b/src/chrome/content/rules/apichangelog.com.xml
index 48a390752fba..f6a90abfd804 100644
--- a/src/chrome/content/rules/apichangelog.com.xml
+++ b/src/chrome/content/rules/apichangelog.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://blog.apichangelog.com/ => https://blog.apichangelog.com/: (7, 'Failed to connect to blog.apichangelog.com port 443: Connection refused')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/apikabu.ru.xml b/src/chrome/content/rules/apikabu.ru.xml
new file mode 100644
index 000000000000..4f1cdbf832c3
--- /dev/null
+++ b/src/chrome/content/rules/apikabu.ru.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/apk-dl.com.xml b/src/chrome/content/rules/apk-dl.com.xml
index 51eec769e990..f0bb48fe3374 100644
--- a/src/chrome/content/rules/apk-dl.com.xml
+++ b/src/chrome/content/rules/apk-dl.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://dl3.apk-dl.com/ => https://dl3.apk-dl.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
@@ -12,7 +12,7 @@ Fetch error: http://dl3.apk-dl.com/ => https://dl3.apk-dl.com/: (60, 'SSL certif
 
 	
-	
+
 	
 
 
diff --git a/src/chrome/content/rules/applegate.com.xml b/src/chrome/content/rules/applegate.com.xml
new file mode 100644
index 000000000000..1f96459ffc49
--- /dev/null
+++ b/src/chrome/content/rules/applegate.com.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/apply55gx.com.xml b/src/chrome/content/rules/apply55gx.com.xml
deleted file mode 100644
index f1c7208489ac..000000000000
--- a/src/chrome/content/rules/apply55gx.com.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-        
-        
-        
-        
-
-        
-
diff --git a/src/chrome/content/rules/apps-cms.jp.xml b/src/chrome/content/rules/apps-cms.jp.xml
index ac2448afbe28..a3c103553208 100644
--- a/src/chrome/content/rules/apps-cms.jp.xml
+++ b/src/chrome/content/rules/apps-cms.jp.xml
@@ -5,4 +5,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/apricityos.com.xml b/src/chrome/content/rules/apricityos.com.xml
index 9bdb305d8237..2dabe98db38a 100644
--- a/src/chrome/content/rules/apricityos.com.xml
+++ b/src/chrome/content/rules/apricityos.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.apricityos.com/ => https://www.apricityos.com/: (35, 'Un
 Fetch error: http://static.apricityos.com/ => https://static.apricityos.com/: (35, 'Unknown SSL protocol error in connection to static.apricityos.com:443 ')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/aqmen.ac.uk.xml b/src/chrome/content/rules/aqmen.ac.uk.xml
deleted file mode 100644
index 4f8fa591c7ab..000000000000
--- a/src/chrome/content/rules/aqmen.ac.uk.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/arashanhoney.xml b/src/chrome/content/rules/arashanhoney.xml
new file mode 100644
index 000000000000..85a103bf9b9f
--- /dev/null
+++ b/src/chrome/content/rules/arashanhoney.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/aravot.am.xml b/src/chrome/content/rules/aravot.am.xml
index 255d27cdefae..b6a4472f9dff 100644
--- a/src/chrome/content/rules/aravot.am.xml
+++ b/src/chrome/content/rules/aravot.am.xml
@@ -11,7 +11,7 @@ archive.aravot.am ⁴
 
 ⁴ self signed
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/arcor.de.xml b/src/chrome/content/rules/arcor.de.xml
new file mode 100644
index 000000000000..645880c8bca5
--- /dev/null
+++ b/src/chrome/content/rules/arcor.de.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/arewee10syet.com.xml b/src/chrome/content/rules/arewee10syet.com.xml
deleted file mode 100644
index 55bd1abf27a5..000000000000
--- a/src/chrome/content/rules/arewee10syet.com.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/arewewebextensionsyet.com.xml b/src/chrome/content/rules/arewewebextensionsyet.com.xml
deleted file mode 100644
index 3c6b414d0b63..000000000000
--- a/src/chrome/content/rules/arewewebextensionsyet.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/arhivach.org.xml b/src/chrome/content/rules/arhivach.org.xml
deleted file mode 100644
index 98d3d05180a1..000000000000
--- a/src/chrome/content/rules/arhivach.org.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/arrr.xyz.xml b/src/chrome/content/rules/arrr.xyz.xml
deleted file mode 100644
index 1830f838db0f..000000000000
--- a/src/chrome/content/rules/arrr.xyz.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/arte.xml b/src/chrome/content/rules/arte.xml
index 198d0b3fed4a..0815f56d4922 100644
--- a/src/chrome/content/rules/arte.xml
+++ b/src/chrome/content/rules/arte.xml
@@ -1,79 +1,53 @@
-
 
 
+
 	
 	
 	
+	
+	
 	
 	
+	
+	
+	
+	
+	
+	
+	
 
 	
 	
+	
+	
 
 	
 
 	
+
 
diff --git a/src/chrome/content/rules/artefact.org.xml b/src/chrome/content/rules/artefact.org.xml
new file mode 100644
index 000000000000..d7befb43b289
--- /dev/null
+++ b/src/chrome/content/rules/artefact.org.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/artvillage.club.xml b/src/chrome/content/rules/artvillage.club.xml
index 50e9fa668328..fda63e3cc4ed 100644
--- a/src/chrome/content/rules/artvillage.club.xml
+++ b/src/chrome/content/rules/artvillage.club.xml
@@ -8,7 +8,7 @@ dev.artvillage.club ¹
 
 ¹ mismatch
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/arukas.io.xml b/src/chrome/content/rules/arukas.io.xml
index 30f569aa4818..cbed9fe65577 100644
--- a/src/chrome/content/rules/arukas.io.xml
+++ b/src/chrome/content/rules/arukas.io.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.arukas.io/ => https://www.arukas.io/: (6, 'Could not res
 	for ^, app
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/arun.gov.uk-mixedcontent.xml b/src/chrome/content/rules/arun.gov.uk-mixedcontent.xml
deleted file mode 100644
index af12229267dd..000000000000
--- a/src/chrome/content/rules/arun.gov.uk-mixedcontent.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-		
-		
-
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-			
-
-
-	
-
-
diff --git a/src/chrome/content/rules/arun.gov.uk.xml b/src/chrome/content/rules/arun.gov.uk.xml
deleted file mode 100644
index 46db9b1115ce..000000000000
--- a/src/chrome/content/rules/arun.gov.uk.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
-	
-		
-		
-		
-		
-		
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/as250.net.xml b/src/chrome/content/rules/as250.net.xml
new file mode 100644
index 000000000000..2d7447342316
--- /dev/null
+++ b/src/chrome/content/rules/as250.net.xml
@@ -0,0 +1,43 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/as3gamegears.com.xml b/src/chrome/content/rules/as3gamegears.com.xml
new file mode 100644
index 000000000000..1440abe0c463
--- /dev/null
+++ b/src/chrome/content/rules/as3gamegears.com.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/asa.org.uk.xml b/src/chrome/content/rules/asa.org.uk.xml
index 845a4d5773b3..5bfc2c6a2f35 100644
--- a/src/chrome/content/rules/asa.org.uk.xml
+++ b/src/chrome/content/rules/asa.org.uk.xml
@@ -1,6 +1,6 @@
 
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/asfera.info.xml b/src/chrome/content/rules/asfera.info.xml
index b0babde3d36e..6dff52cdb254 100644
--- a/src/chrome/content/rules/asfera.info.xml
+++ b/src/chrome/content/rules/asfera.info.xml
@@ -5,7 +5,7 @@ Non-2xx HTTP code: http://asfera.info/ (200) => https://asfera.info/ (521)
 Non-2xx HTTP code: http://www.asfera.info/ (200) => https://www.asfera.info/ (521)
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/ashford.gov.uk.xml b/src/chrome/content/rules/ashford.gov.uk.xml
index d4548731f009..48425c48be31 100644
--- a/src/chrome/content/rules/ashford.gov.uk.xml
+++ b/src/chrome/content/rules/ashford.gov.uk.xml
@@ -29,6 +29,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/ashops.co.il.xml b/src/chrome/content/rules/ashops.co.il.xml
index 9aac3cbcb49b..5e6ae0b3091f 100644
--- a/src/chrome/content/rules/ashops.co.il.xml
+++ b/src/chrome/content/rules/ashops.co.il.xml
@@ -7,7 +7,7 @@
 	Mixed content:
 
 		- Images from $self ˢ
-	
+
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
diff --git a/src/chrome/content/rules/asio.ooo.xml b/src/chrome/content/rules/asio.ooo.xml
deleted file mode 100644
index 903343398d1e..000000000000
--- a/src/chrome/content/rules/asio.ooo.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/askvg.com.xml b/src/chrome/content/rules/askvg.com.xml
deleted file mode 100644
index afa49c250461..000000000000
--- a/src/chrome/content/rules/askvg.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/assured.se.xml b/src/chrome/content/rules/assured.se.xml
deleted file mode 100644
index 36b13a8f3855..000000000000
--- a/src/chrome/content/rules/assured.se.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-         
-         
- 
-         
- 
diff --git a/src/chrome/content/rules/astrobl.ru.xml b/src/chrome/content/rules/astrobl.ru.xml
index fc94b9171214..c0018a77df81 100644
--- a/src/chrome/content/rules/astrobl.ru.xml
+++ b/src/chrome/content/rules/astrobl.ru.xml
@@ -63,7 +63,7 @@ voting.astrobl.ru ⁶
 ⁴ self signed
 ⁶ redirect
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/at-home.ru.xml b/src/chrome/content/rules/at-home.ru.xml
deleted file mode 100644
index f12dd5c774a8..000000000000
--- a/src/chrome/content/rules/at-home.ru.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/atfonline.gov.xml b/src/chrome/content/rules/atfonline.gov.xml
index e9b454803b6d..b6448297d53e 100644
--- a/src/chrome/content/rules/atfonline.gov.xml
+++ b/src/chrome/content/rules/atfonline.gov.xml
@@ -9,7 +9,7 @@ Fetch error: http://atfonline.gov/ => https://www.atfonline.gov/: (60, 'SSL cert
 	^atfonline.gov: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/atgfw.org.xml b/src/chrome/content/rules/atgfw.org.xml
index e15f769142e1..32f1428095a1 100644
--- a/src/chrome/content/rules/atgfw.org.xml
+++ b/src/chrome/content/rules/atgfw.org.xml
@@ -1,8 +1,8 @@
 
-	
+
 	
 	
 
 	
-	
+
 
diff --git a/src/chrome/content/rules/audioboom.com.xml b/src/chrome/content/rules/audioboom.com.xml
deleted file mode 100644
index 7b398d332929..000000000000
--- a/src/chrome/content/rules/audioboom.com.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/audit.wales.xml b/src/chrome/content/rules/audit.wales.xml
index 9d23e1f133db..0e61023738ac 100644
--- a/src/chrome/content/rules/audit.wales.xml
+++ b/src/chrome/content/rules/audit.wales.xml
@@ -29,7 +29,7 @@ Fetch error: http://autodiscover.audit.wales/ => https://email.wao.gov.uk/owa: (
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/autistica.org.uk.xml b/src/chrome/content/rules/autistica.org.uk.xml
index 8c6b16390fb7..bd2579df59ed 100644
--- a/src/chrome/content/rules/autistica.org.uk.xml
+++ b/src/chrome/content/rules/autistica.org.uk.xml
@@ -5,7 +5,7 @@ Fetch error: http://autistica.org.uk/ => https://autistica.org.uk/: (60, 'SSL ce
 Fetch error: http://www.autistica.org.uk/ => https://www.autistica.org.uk/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/autotrader.co.uk.xml b/src/chrome/content/rules/autotrader.co.uk.xml
index 909db4581007..aae01d060b34 100644
--- a/src/chrome/content/rules/autotrader.co.uk.xml
+++ b/src/chrome/content/rules/autotrader.co.uk.xml
@@ -44,13 +44,13 @@
 	Mixed content:
 
 		- css, on:
-		
+
 			- advertising from fast.fonts.net ˢ
 			- farm, plant from trucks.autotrader.co.uk ˢ
 			- trucks from $self ˢ
 
 		- Images, on:
-		
+
 			- advertising, promotions, trucks from $self ˢ
 			- farm, plant, trucks from i.autotrader.co.uk ⁴
 			- farm, plant, trucks from merlin-images.autotrader.co.uk ˢ
diff --git a/src/chrome/content/rules/autotrader.ie.xml b/src/chrome/content/rules/autotrader.ie.xml
index 4379fe49f5d3..788f98e374c3 100644
--- a/src/chrome/content/rules/autotrader.ie.xml
+++ b/src/chrome/content/rules/autotrader.ie.xml
@@ -23,7 +23,7 @@
 		- Images on www from www.carzone.ie ᵐ
 
 		- Bugs, on:
-		
+
 			- m from metrics.carzone.ie ᵐ
 			- www from metrics.autotrader.ie ˢ
 
diff --git a/src/chrome/content/rules/autotravel.ru.xml b/src/chrome/content/rules/autotravel.ru.xml
new file mode 100644
index 000000000000..843fe99752ab
--- /dev/null
+++ b/src/chrome/content/rules/autotravel.ru.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/aviationweather.gov.xml b/src/chrome/content/rules/aviationweather.gov.xml
deleted file mode 100644
index 39d847c8b699..000000000000
--- a/src/chrome/content/rules/aviationweather.gov.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/avoinyliopisto.xml b/src/chrome/content/rules/avoinyliopisto.xml
index 60f44ecf2566..d4a75bf734d6 100644
--- a/src/chrome/content/rules/avoinyliopisto.xml
+++ b/src/chrome/content/rules/avoinyliopisto.xml
@@ -5,7 +5,7 @@ Fetch error: http://www.avoinyliopisto.fi/ => https://www.avoinyliopisto.fi/: (5
 Fetch error: http://avoinyliopisto.fi/ => https://www.avoinyliopisto.fi/: (51, "SSL: no alternative certificate subject name matches target host name 'www.avoinyliopisto.fi'")
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/ayyo.ru.xml b/src/chrome/content/rules/ayyo.ru.xml
index e1f538ec4dc4..3959e38be160 100644
--- a/src/chrome/content/rules/ayyo.ru.xml
+++ b/src/chrome/content/rules/ayyo.ru.xml
@@ -29,7 +29,7 @@ wanted.ayyo.ru ²
 ¹ mismatch
 ² refused
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/babator.com.xml b/src/chrome/content/rules/babator.com.xml
deleted file mode 100644
index 7a84bcaba543..000000000000
--- a/src/chrome/content/rules/babator.com.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/babr24.com.xml b/src/chrome/content/rules/babr24.com.xml
new file mode 100644
index 000000000000..3e2b384a50e5
--- /dev/null
+++ b/src/chrome/content/rules/babr24.com.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/bacontent.de.xml b/src/chrome/content/rules/bacontent.de.xml
new file mode 100644
index 000000000000..5f3400024f43
--- /dev/null
+++ b/src/chrome/content/rules/bacontent.de.xml
@@ -0,0 +1,17 @@
+
+
+
+	
+		
+	
+		
+	
+		
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/bad-dragon.com.xml b/src/chrome/content/rules/bad-dragon.com.xml
index 2e774e91aebb..7fecad735430 100644
--- a/src/chrome/content/rules/bad-dragon.com.xml
+++ b/src/chrome/content/rules/bad-dragon.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://www.bad-dragon.com/ => https://www.bad-dragon.com/: Too many
 		- .bad-dragon.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/badil.info.xml b/src/chrome/content/rules/badil.info.xml
deleted file mode 100644
index 2f690d032829..000000000000
--- a/src/chrome/content/rules/badil.info.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/baf.bund.de.xml b/src/chrome/content/rules/baf.bund.de.xml
new file mode 100644
index 000000000000..b8521e36340c
--- /dev/null
+++ b/src/chrome/content/rules/baf.bund.de.xml
@@ -0,0 +1,12 @@
+
+
+
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/baidustatic.com.xml b/src/chrome/content/rules/baidustatic.com.xml
index 7d80d020476f..d370ff0b9024 100644
--- a/src/chrome/content/rules/baidustatic.com.xml
+++ b/src/chrome/content/rules/baidustatic.com.xml
@@ -1,7 +1,7 @@
 
diff --git a/src/chrome/content/rules/baifendian.xml b/src/chrome/content/rules/baifendian.xml
index a059854bb79f..ba1da6e2f69e 100644
--- a/src/chrome/content/rules/baifendian.xml
+++ b/src/chrome/content/rules/baifendian.xml
@@ -33,7 +33,7 @@
 		
 		
 		
-	
+
 	
 		
diff --git a/src/chrome/content/rules/baltika.fm.xml b/src/chrome/content/rules/baltika.fm.xml
deleted file mode 100644
index 0c892e3da8ea..000000000000
--- a/src/chrome/content/rules/baltika.fm.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-	
-	
-	
-
diff --git a/src/chrome/content/rules/bankcomat.com.xml b/src/chrome/content/rules/bankcomat.com.xml
index 115f171a8741..0f5a39182700 100644
--- a/src/chrome/content/rules/bankcomat.com.xml
+++ b/src/chrome/content/rules/bankcomat.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://bankcomat.com/ => https://bankcomat.com/: (60, 'SSL certific
 Fetch error: http://www.bankcomat.com/ => https://www.bankcomat.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/bankid.com.xml b/src/chrome/content/rules/bankid.com.xml
new file mode 100644
index 000000000000..20e852e63837
--- /dev/null
+++ b/src/chrome/content/rules/bankid.com.xml
@@ -0,0 +1,37 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/banned.video.xml b/src/chrome/content/rules/banned.video.xml
new file mode 100644
index 000000000000..332cf716234a
--- /dev/null
+++ b/src/chrome/content/rules/banned.video.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/barnardos.org.uk.xml b/src/chrome/content/rules/barnardos.org.uk.xml
index d1d484cfd988..4027fa74d713 100644
--- a/src/chrome/content/rules/barnardos.org.uk.xml
+++ b/src/chrome/content/rules/barnardos.org.uk.xml
@@ -24,7 +24,7 @@ Fetch error: http://testllwcmlw.barnardos.org.uk/ => https://testllwcmlw.barnard
 		- www.barnardos.org.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/basekit.com.xml b/src/chrome/content/rules/basekit.com.xml
index 5cecc1ad2217..86e3edc7a1cf 100644
--- a/src/chrome/content/rules/basekit.com.xml
+++ b/src/chrome/content/rules/basekit.com.xml
@@ -1,4 +1,7 @@
 
-	
-
-		
-		
-
 	
 
diff --git a/src/chrome/content/rules/basildon.gov.uk.xml b/src/chrome/content/rules/basildon.gov.uk.xml
index e1be729141f0..d7e4e9fd85fd 100644
--- a/src/chrome/content/rules/basildon.gov.uk.xml
+++ b/src/chrome/content/rules/basildon.gov.uk.xml
@@ -34,7 +34,7 @@
 			Exceptions:
 					-->
 		
-		
+
 			
 			
@@ -44,7 +44,7 @@
 			
 			
 			
-		
+
 			
 			
diff --git a/src/chrome/content/rules/bataysk-gorod.ru.xml b/src/chrome/content/rules/bataysk-gorod.ru.xml
index fa2516098d6b..13a3c5d5e8fc 100644
--- a/src/chrome/content/rules/bataysk-gorod.ru.xml
+++ b/src/chrome/content/rules/bataysk-gorod.ru.xml
@@ -5,7 +5,7 @@ Fetch error: http://bataysk-gorod.ru/ => https://bataysk-gorod.ru/: (7, 'Failed
 Fetch error: http://www.bataysk-gorod.ru/ => https://www.bataysk-gorod.ru/: (7, 'Failed to connect to www.bataysk-gorod.ru port 443: Connection refused')
 Fetch error: http://rss.bataysk-gorod.ru/ => https://rss.bataysk-gorod.ru/: (7, 'Failed to connect to rss.bataysk-gorod.ru port 443: Connection refused')
  old. refused -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/bato.to.xml b/src/chrome/content/rules/bato.to.xml
index 0b88aab1ff90..bf27fed1a8cf 100644
--- a/src/chrome/content/rules/bato.to.xml
+++ b/src/chrome/content/rules/bato.to.xml
@@ -1,7 +1,7 @@
 
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/bauercreative.net.xml b/src/chrome/content/rules/bauercreative.net.xml
index 5efe9c7e04c8..32a1bfea9914 100644
--- a/src/chrome/content/rules/bauercreative.net.xml
+++ b/src/chrome/content/rules/bauercreative.net.xml
@@ -1,37 +1,15 @@
 
-
+
 
-	
 	
+		
 
+	
 
-	
-
-
-	
+	
 
-		
 
 
diff --git a/src/chrome/content/rules/bauermedia.co.uk.xml b/src/chrome/content/rules/bauermedia.co.uk.xml
index 18f47a27b7e3..5c95d0a1d2dd 100644
--- a/src/chrome/content/rules/bauermedia.co.uk.xml
+++ b/src/chrome/content/rules/bauermedia.co.uk.xml
@@ -39,7 +39,7 @@ Fetch error: http://bauermedia.co.uk/ => https://bauermedia.co.uk/: (7, 'Failed
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/bav.bund.de.xml b/src/chrome/content/rules/bav.bund.de.xml
new file mode 100644
index 000000000000..d46536a6af46
--- /dev/null
+++ b/src/chrome/content/rules/bav.bund.de.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/bay12games.com.xml b/src/chrome/content/rules/bay12games.com.xml
new file mode 100644
index 000000000000..0089429227ca
--- /dev/null
+++ b/src/chrome/content/rules/bay12games.com.xml
@@ -0,0 +1,21 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/bbc.co.uk-resources.xml b/src/chrome/content/rules/bbc.co.uk-resources.xml
deleted file mode 100644
index 24b91b16e5f9..000000000000
--- a/src/chrome/content/rules/bbc.co.uk-resources.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-
-		
-		
-		
-
-		
-
-			
-			
-			
-			
-			
-
-			
-			
-
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-
-	
-
-
diff --git a/src/chrome/content/rules/bbk.bund.de.xml b/src/chrome/content/rules/bbk.bund.de.xml
index cea2fcdd5d92..3fb04263ea6c 100644
--- a/src/chrome/content/rules/bbk.bund.de.xml
+++ b/src/chrome/content/rules/bbk.bund.de.xml
@@ -11,7 +11,7 @@
 	
 	
 	
-	
+
 	
 	
diff --git a/src/chrome/content/rules/bdstatic.com.xml b/src/chrome/content/rules/bdstatic.com.xml
index 23e758506b3a..1c79221392d2 100644
--- a/src/chrome/content/rules/bdstatic.com.xml
+++ b/src/chrome/content/rules/bdstatic.com.xml
@@ -38,17 +38,17 @@
 	
 
 	
-	
+
 	
 	
 	
 	
 	
 	
-	
+
 	
 	
-	
+
 	
 
 		
diff --git a/src/chrome/content/rules/bedford.gov.uk.xml b/src/chrome/content/rules/bedford.gov.uk.xml
index 2c5eee377b4d..a147ed3e5e9b 100644
--- a/src/chrome/content/rules/bedford.gov.uk.xml
+++ b/src/chrome/content/rules/bedford.gov.uk.xml
@@ -44,7 +44,7 @@ Fetch error: http://www.athleticstadium.bedford.gov.uk/ => https://www.bedford.g
 	ˢ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/beirel.ru.xml b/src/chrome/content/rules/beirel.ru.xml
deleted file mode 100644
index d0e6cd1f3f20..000000000000
--- a/src/chrome/content/rules/beirel.ru.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/belaruswith.me.xml b/src/chrome/content/rules/belaruswith.me.xml
new file mode 100644
index 000000000000..24aa2c709d91
--- /dev/null
+++ b/src/chrome/content/rules/belaruswith.me.xml
@@ -0,0 +1,6 @@
+
+    
+    
+
+    
+
diff --git a/src/chrome/content/rules/belive.ru.xml b/src/chrome/content/rules/belive.ru.xml
deleted file mode 100644
index fb95bb73afd5..000000000000
--- a/src/chrome/content/rules/belive.ru.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-	
-	
-	
-
diff --git a/src/chrome/content/rules/benj.cloud.xml b/src/chrome/content/rules/benj.cloud.xml
new file mode 100644
index 000000000000..e1d9d5e46952
--- /dev/null
+++ b/src/chrome/content/rules/benj.cloud.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/beyondbinary.io.xml b/src/chrome/content/rules/beyondbinary.io.xml
index 722302f4c862..0be8f88b569e 100644
--- a/src/chrome/content/rules/beyondbinary.io.xml
+++ b/src/chrome/content/rules/beyondbinary.io.xml
@@ -1,18 +1,10 @@
-
 
 
 	
-	
-
-		
-
+	
 
 	
 
-
 	
 
diff --git a/src/chrome/content/rules/bezeq.co.il.xml b/src/chrome/content/rules/bezeq.co.il.xml
index 1d2074588ab4..58fc7b9ea0ec 100644
--- a/src/chrome/content/rules/bezeq.co.il.xml
+++ b/src/chrome/content/rules/bezeq.co.il.xml
@@ -36,7 +36,7 @@ Fetch error: http://music.bezeq.co.il/ => https://music.bezeq.co.il/: (6, 'Could
 	Mixed content:
 
 		- Images, on:
-		
+
 			- bsupport, m from www02.bezeq.co.il ˢ
 			- m from www.bezeq.co.il ˢ
 
@@ -45,7 +45,7 @@ Fetch error: http://music.bezeq.co.il/ => https://music.bezeq.co.il/: (6, 'Could
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/bezopasnik.org.xml b/src/chrome/content/rules/bezopasnik.org.xml
deleted file mode 100644
index 0ba3fb9a8240..000000000000
--- a/src/chrome/content/rules/bezopasnik.org.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/bgslinc.com.xml b/src/chrome/content/rules/bgslinc.com.xml
new file mode 100644
index 000000000000..f46a0c819211
--- /dev/null
+++ b/src/chrome/content/rules/bgslinc.com.xml
@@ -0,0 +1,21 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/bicomsystems.com.xml b/src/chrome/content/rules/bicomsystems.com.xml
index 81745af7bd42..5d1602b8f3b9 100644
--- a/src/chrome/content/rules/bicomsystems.com.xml
+++ b/src/chrome/content/rules/bicomsystems.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://wiki.bicomsystems.com/ => https://wiki.bicomsystems.com/: (6
 
 blog.bicomsystems.com expired
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/birmingham.gov.uk.xml b/src/chrome/content/rules/birmingham.gov.uk.xml
index c3581f4d6fce..7f415e9296e1 100644
--- a/src/chrome/content/rules/birmingham.gov.uk.xml
+++ b/src/chrome/content/rules/birmingham.gov.uk.xml
@@ -55,7 +55,7 @@ Fetch error: http://lsblaw.birmingham.gov.uk/ => https://lsblaw.birmingham.gov.u
 	Mixed content:
 
 		- css, on:
-		
+
 			- lsblaw from fonts.googleapis.com ˢ
 			- property from $self ˢ
 
@@ -64,7 +64,7 @@ Fetch error: http://lsblaw.birmingham.gov.uk/ => https://lsblaw.birmingham.gov.u
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
@@ -101,7 +101,7 @@ Fetch error: http://lsblaw.birmingham.gov.uk/ => https://lsblaw.birmingham.gov.u
 	
 	
 	
-	 
+	
 	
 	
 	
diff --git a/src/chrome/content/rules/bis.gov.uk-falsemixed.xml b/src/chrome/content/rules/bis.gov.uk-falsemixed.xml
index 7c7ed6ace09a..6012472b5e12 100644
--- a/src/chrome/content/rules/bis.gov.uk-falsemixed.xml
+++ b/src/chrome/content/rules/bis.gov.uk-falsemixed.xml
@@ -9,7 +9,7 @@ Fetch error: http://feconnect.sfa.bis.gov.uk/ => https://feconnect.sfa.bis.gov.u
 	NB: See https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/bitclubnetwork.com.xml b/src/chrome/content/rules/bitclubnetwork.com.xml
deleted file mode 100644
index d9f551ffe673..000000000000
--- a/src/chrome/content/rules/bitclubnetwork.com.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/bitcoinknots.org.xml b/src/chrome/content/rules/bitcoinknots.org.xml
index 0d623f6a7db7..0a2cd49d21de 100644
--- a/src/chrome/content/rules/bitcoinknots.org.xml
+++ b/src/chrome/content/rules/bitcoinknots.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.bitcoinknots.org/ => https://www.bitcoinknots.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.bitcoinknots.org'")
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/bither.net.xml b/src/chrome/content/rules/bither.net.xml
deleted file mode 100644
index c105eb2964a6..000000000000
--- a/src/chrome/content/rules/bither.net.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-	
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/bitlaunch.io.xml b/src/chrome/content/rules/bitlaunch.io.xml
new file mode 100644
index 000000000000..82fbd35dd275
--- /dev/null
+++ b/src/chrome/content/rules/bitlaunch.io.xml
@@ -0,0 +1,12 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/bitrise.io.xml b/src/chrome/content/rules/bitrise.io.xml
index e5f8114d7a5b..167de5b77623 100644
--- a/src/chrome/content/rules/bitrise.io.xml
+++ b/src/chrome/content/rules/bitrise.io.xml
@@ -8,7 +8,7 @@ chat.bitrise.io timed out
 devcenter.bitrise.io mismatch
 status.bitrise.io mismatch
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/bjoernkarmann.dk.xml b/src/chrome/content/rules/bjoernkarmann.dk.xml
new file mode 100644
index 000000000000..81f14daf8e7f
--- /dev/null
+++ b/src/chrome/content/rules/bjoernkarmann.dk.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/bk55.ru.xml b/src/chrome/content/rules/bk55.ru.xml
index c92e072f722c..b7d475e09d04 100644
--- a/src/chrome/content/rules/bk55.ru.xml
+++ b/src/chrome/content/rules/bk55.ru.xml
@@ -8,7 +8,7 @@ Fetch error: http://m.bk55.ru/ => https://m.bk55.ru/: Too many redirects while f
 Fetch error: http://blog.bk55.ru/ => https://blog.bk55.ru/: Too many redirects while fetching 'https://blog.bk55.ru/'
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/blackarrowsoftware.com.xml b/src/chrome/content/rules/blackarrowsoftware.com.xml
deleted file mode 100644
index 4e18ff222a67..000000000000
--- a/src/chrome/content/rules/blackarrowsoftware.com.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/blackburn.gov.uk.xml b/src/chrome/content/rules/blackburn.gov.uk.xml
index 40967e3e178b..7cc5c5b38a57 100644
--- a/src/chrome/content/rules/blackburn.gov.uk.xml
+++ b/src/chrome/content/rules/blackburn.gov.uk.xml
@@ -33,7 +33,7 @@ Fetch error: http://revenuesbenefits.blackburn.gov.uk/ => https://revenuesbenefi
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/bleepingcomputer.com.xml b/src/chrome/content/rules/bleepingcomputer.com.xml
new file mode 100644
index 000000000000..1b553716720e
--- /dev/null
+++ b/src/chrome/content/rules/bleepingcomputer.com.xml
@@ -0,0 +1,18 @@
+
+
+
+	
+	
+	
+	
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/blinkt.de.xml b/src/chrome/content/rules/blinkt.de.xml
new file mode 100644
index 000000000000..8d9903cdaad9
--- /dev/null
+++ b/src/chrome/content/rules/blinkt.de.xml
@@ -0,0 +1,61 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/blogimg.jp.xml b/src/chrome/content/rules/blogimg.jp.xml
new file mode 100644
index 000000000000..6390a9dd51eb
--- /dev/null
+++ b/src/chrome/content/rules/blogimg.jp.xml
@@ -0,0 +1,10 @@
+
+
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/blogsmithmedia.com.xml b/src/chrome/content/rules/blogsmithmedia.com.xml
index 2c214f8a34b5..b53ad4e8bccb 100644
--- a/src/chrome/content/rules/blogsmithmedia.com.xml
+++ b/src/chrome/content/rules/blogsmithmedia.com.xml
@@ -16,7 +16,7 @@
 			- www.blogcdn.com
 			- www.blogsmithcdn.com
 			- www.blogsmithmedia.com
-	
+
 	^blogsmithmedia.com: 503, Akamai
 
 -->
diff --git a/src/chrome/content/rules/bloomsky.com.xml b/src/chrome/content/rules/bloomsky.com.xml
index f36e20ce51de..5c37734aba96 100644
--- a/src/chrome/content/rules/bloomsky.com.xml
+++ b/src/chrome/content/rules/bloomsky.com.xml
@@ -11,13 +11,13 @@ Fetch error: http://maps.bloomsky.com/ => https://maps.bloomsky.com/: (60, 'SSL
 		- weatherlution.com	(handshake failure)
 
 	Mixed content:
-	
+
 		- video from storage.googleapis.com *
 
 	* Secured by us.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/blueonyx.it.xml b/src/chrome/content/rules/blueonyx.it.xml
index bd473a8007c9..e276e27cbc93 100644
--- a/src/chrome/content/rules/blueonyx.it.xml
+++ b/src/chrome/content/rules/blueonyx.it.xml
@@ -10,9 +10,9 @@ mobile.blueonyx.it mismatch
 	
 	
 	
-	
+
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/bmf1.dk.xml b/src/chrome/content/rules/bmf1.dk.xml
new file mode 100644
index 000000000000..ee0168b5ea9b
--- /dev/null
+++ b/src/chrome/content/rules/bmf1.dk.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/bnl.gov.xml b/src/chrome/content/rules/bnl.gov.xml
index e2a0a50c250b..ee2e1123b95b 100644
--- a/src/chrome/content/rules/bnl.gov.xml
+++ b/src/chrome/content/rules/bnl.gov.xml
@@ -92,7 +92,7 @@ Fetch error: http://wiki.bnl.gov/ => https://wiki.bnl.gov/: (6, 'Could not resol
 	ˢ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/bnymellon.com.xml b/src/chrome/content/rules/bnymellon.com.xml
index 61729a8458aa..512bda2d3855 100644
--- a/src/chrome/content/rules/bnymellon.com.xml
+++ b/src/chrome/content/rules/bnymellon.com.xml
@@ -49,7 +49,7 @@ Fetch error: http://talentcommunity.bnymellon.com/ => https://talentcommunity.bn
 		- jobs.bnymellon.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/bnymellonim.com.xml b/src/chrome/content/rules/bnymellonim.com.xml
index 4a1a68ad241e..b8be8ee7f553 100644
--- a/src/chrome/content/rules/bnymellonim.com.xml
+++ b/src/chrome/content/rules/bnymellonim.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://bnymellonim.com/ => https://www.bnymellonim.com/: (60, 'SSL
 	^bnymellonim.com: Dropped
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/boardreader.com.xml b/src/chrome/content/rules/boardreader.com.xml
new file mode 100644
index 000000000000..2acfbe0ac0f5
--- /dev/null
+++ b/src/chrome/content/rules/boardreader.com.xml
@@ -0,0 +1,24 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/boerse.to.xml b/src/chrome/content/rules/boerse.to.xml
index 3904077499af..ab962dfa1956 100644
--- a/src/chrome/content/rules/boerse.to.xml
+++ b/src/chrome/content/rules/boerse.to.xml
@@ -2,7 +2,7 @@
 
     
     
-    
+
     
 
     
diff --git a/src/chrome/content/rules/boincstats.com.xml b/src/chrome/content/rules/boincstats.com.xml
new file mode 100644
index 000000000000..4668b79e6f8c
--- /dev/null
+++ b/src/chrome/content/rules/boincstats.com.xml
@@ -0,0 +1,39 @@
+
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/bookware3000.ca.xml b/src/chrome/content/rules/bookware3000.ca.xml
index 9a683cad1312..69c7e2384367 100644
--- a/src/chrome/content/rules/bookware3000.ca.xml
+++ b/src/chrome/content/rules/bookware3000.ca.xml
@@ -4,7 +4,7 @@
 	
 
 	
-		
+	
 	
 	
 	
@@ -17,4 +17,4 @@
 
 	
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/boomstarter.ru.xml b/src/chrome/content/rules/boomstarter.ru.xml
index c3d7d67ea2a7..9502f188a398 100644
--- a/src/chrome/content/rules/boomstarter.ru.xml
+++ b/src/chrome/content/rules/boomstarter.ru.xml
@@ -7,7 +7,7 @@ gifts.boomstarter.ru nonexist
 
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/bosfera.ru.xml b/src/chrome/content/rules/bosfera.ru.xml
index a888c2277bd4..7fc11b61beaa 100644
--- a/src/chrome/content/rules/bosfera.ru.xml
+++ b/src/chrome/content/rules/bosfera.ru.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://bosfera.bosfera.ru/ => https://bosfera.bosfera.ru/: (6, 'Could not resolve host: bosfera.bosfera.ru')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/bostonfed.org.xml b/src/chrome/content/rules/bostonfed.org.xml
deleted file mode 100644
index 808476c5b47a..000000000000
--- a/src/chrome/content/rules/bostonfed.org.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/boxun.com.xml b/src/chrome/content/rules/boxun.com.xml
index e862425a0b72..8e2933105d6f 100644
--- a/src/chrome/content/rules/boxun.com.xml
+++ b/src/chrome/content/rules/boxun.com.xml
@@ -1,6 +1,6 @@
 
 
 
diff --git a/src/chrome/content/rules/bplaced.xml b/src/chrome/content/rules/bplaced.xml
index e652773c548e..101479eec8ce 100644
--- a/src/chrome/content/rules/bplaced.xml
+++ b/src/chrome/content/rules/bplaced.xml
@@ -15,7 +15,6 @@
 	
 
-		
 
 	
diff --git a/src/chrome/content/rules/bpsshop.org.uk.xml b/src/chrome/content/rules/bpsshop.org.uk.xml
index 9ba645867f5d..2ad77e651295 100644
--- a/src/chrome/content/rules/bpsshop.org.uk.xml
+++ b/src/chrome/content/rules/bpsshop.org.uk.xml
@@ -3,7 +3,7 @@
 
 
 	(www.)?bpsshop.org.uk: refused
-	
+
 -->
 
 
diff --git a/src/chrome/content/rules/brandhk.gov.hk.xml b/src/chrome/content/rules/brandhk.gov.hk.xml
index 80fe2fb0e3dd..1f6b90a92431 100644
--- a/src/chrome/content/rules/brandhk.gov.hk.xml
+++ b/src/chrome/content/rules/brandhk.gov.hk.xml
@@ -7,7 +7,7 @@
 
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/bristol.gov.uk.xml b/src/chrome/content/rules/bristol.gov.uk.xml
index 931bd2b9f62b..ed413e1c5c99 100644
--- a/src/chrome/content/rules/bristol.gov.uk.xml
+++ b/src/chrome/content/rules/bristol.gov.uk.xml
@@ -55,7 +55,7 @@ Fetch error: http://www2.bristol.gov.uk/ => https://www2.bristol.gov.uk/: (60, '
 		- www2 ʰ
 
 	ʰ Some pages redirect to http
-	
+
 
 	Insecure cookies are set for these domains and hosts: ᶜ
 
@@ -80,7 +80,7 @@ Fetch error: http://www2.bristol.gov.uk/ => https://www2.bristol.gov.uk/: (60, '
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/broadagesports.com.xml b/src/chrome/content/rules/broadagesports.com.xml
index f9edcb147536..c4a15dde41a8 100644
--- a/src/chrome/content/rules/broadagesports.com.xml
+++ b/src/chrome/content/rules/broadagesports.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://widgets-script.broadagesports.com/content/bage.main.bundle.m
 Fetch error: http://widgets-script.broadagesports.com/ => https://widgets-script.broadagesports.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/broadland.gov.uk-falsemixed.xml b/src/chrome/content/rules/broadland.gov.uk-falsemixed.xml
index 9d3f478ccfe7..097c5212e692 100644
--- a/src/chrome/content/rules/broadland.gov.uk-falsemixed.xml
+++ b/src/chrome/content/rules/broadland.gov.uk-falsemixed.xml
@@ -10,7 +10,7 @@ Non-2xx HTTP code: http://www.broadland.gov.uk/ (200) => https://secure.broadlan
 	NB: See https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/brucefwebster.xml b/src/chrome/content/rules/brucefwebster.xml
new file mode 100644
index 000000000000..b23b1fd1d465
--- /dev/null
+++ b/src/chrome/content/rules/brucefwebster.xml
@@ -0,0 +1,18 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/brzoo.org.xml b/src/chrome/content/rules/brzoo.org.xml
new file mode 100644
index 000000000000..7295f756571f
--- /dev/null
+++ b/src/chrome/content/rules/brzoo.org.xml
@@ -0,0 +1,22 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/bstu.bund.de.xml b/src/chrome/content/rules/bstu.bund.de.xml
new file mode 100644
index 000000000000..bbcfc76bad82
--- /dev/null
+++ b/src/chrome/content/rules/bstu.bund.de.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/btcgpu.org.xml b/src/chrome/content/rules/btcgpu.org.xml
deleted file mode 100644
index f7328c4c54cb..000000000000
--- a/src/chrome/content/rules/btcgpu.org.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/buaa.edu.cn.xml b/src/chrome/content/rules/buaa.edu.cn.xml
new file mode 100644
index 000000000000..9d0b9d2b0110
--- /dev/null
+++ b/src/chrome/content/rules/buaa.edu.cn.xml
@@ -0,0 +1,88 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/buckscc.gov.uk.xml b/src/chrome/content/rules/buckscc.gov.uk.xml
index 08de9d8621bf..4e885cc97a22 100644
--- a/src/chrome/content/rules/buckscc.gov.uk.xml
+++ b/src/chrome/content/rules/buckscc.gov.uk.xml
@@ -44,7 +44,7 @@ Fetch error: http://udp.buckscc.gov.uk/ => https://udp.buckscc.gov.uk/: (6, 'Cou
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/bullzip.com.xml b/src/chrome/content/rules/bullzip.com.xml
new file mode 100644
index 000000000000..5b7c1ed3c95e
--- /dev/null
+++ b/src/chrome/content/rules/bullzip.com.xml
@@ -0,0 +1,22 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/business.gov.au.xml b/src/chrome/content/rules/business.gov.au.xml
new file mode 100644
index 000000000000..9a9422fd24e8
--- /dev/null
+++ b/src/chrome/content/rules/business.gov.au.xml
@@ -0,0 +1,36 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+		
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/busnavi-okinawa.com.xml b/src/chrome/content/rules/busnavi-okinawa.com.xml
new file mode 100644
index 000000000000..7ad9106d53ac
--- /dev/null
+++ b/src/chrome/content/rules/busnavi-okinawa.com.xml
@@ -0,0 +1,5 @@
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/cackle.me.xml b/src/chrome/content/rules/cackle.me.xml
new file mode 100644
index 000000000000..6856e90ed763
--- /dev/null
+++ b/src/chrome/content/rules/cackle.me.xml
@@ -0,0 +1,36 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/cacti.net.xml b/src/chrome/content/rules/cacti.net.xml
index 67bd7eb0e507..831feba76ad5 100644
--- a/src/chrome/content/rules/cacti.net.xml
+++ b/src/chrome/content/rules/cacti.net.xml
@@ -3,7 +3,7 @@
 	
 	
 	
-	
+
 	
 
 	
diff --git a/src/chrome/content/rules/callrail.com.xml b/src/chrome/content/rules/callrail.com.xml
index 32693ab1b5fd..b32c613b2e03 100644
--- a/src/chrome/content/rules/callrail.com.xml
+++ b/src/chrome/content/rules/callrail.com.xml
@@ -2,7 +2,7 @@
 	CDN buckets:
 
 		- s3.amazonaws.com/calltrk-production/
-	
+
 
 	Nonfunctional hosts in *callrail.com:
 
diff --git a/src/chrome/content/rules/camopedia.org.xml b/src/chrome/content/rules/camopedia.org.xml
new file mode 100644
index 000000000000..32afba0491b4
--- /dev/null
+++ b/src/chrome/content/rules/camopedia.org.xml
@@ -0,0 +1,20 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/cancerresearchuk.org.xml b/src/chrome/content/rules/cancerresearchuk.org.xml
index f02709e515a7..1e4c16be7b4d 100644
--- a/src/chrome/content/rules/cancerresearchuk.org.xml
+++ b/src/chrome/content/rules/cancerresearchuk.org.xml
@@ -54,7 +54,7 @@ Fetch error: http://survey.cancerresearchuk.org/ => https://survey.cancerresearc
 	ˢ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/candelatech.com.xml b/src/chrome/content/rules/candelatech.com.xml
new file mode 100644
index 000000000000..5b28e7d28382
--- /dev/null
+++ b/src/chrome/content/rules/candelatech.com.xml
@@ -0,0 +1,7 @@
+
+	
+	 
+
+	
+	
+
diff --git a/src/chrome/content/rules/captora.com.xml b/src/chrome/content/rules/captora.com.xml
index 028f316db9ee..187390b87c37 100644
--- a/src/chrome/content/rules/captora.com.xml
+++ b/src/chrome/content/rules/captora.com.xml
@@ -21,14 +21,14 @@ Non-2xx HTTP code: http://digitalmarketing.captora.com/rs/719-TVA-959/images/arr
 	Mixed content:
 
 		- Images, on:
-		
+
 			- blog, www from www.captora.com ˢ
 			- blog from blakebrysha.com
 
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/cardiff.gov.uk.xml b/src/chrome/content/rules/cardiff.gov.uk.xml
index 8aa4f70e1349..3b19f6cddd1a 100644
--- a/src/chrome/content/rules/cardiff.gov.uk.xml
+++ b/src/chrome/content/rules/cardiff.gov.uk.xml
@@ -51,7 +51,7 @@ Fetch error: http://active.cardiff.gov.uk/ => https://active.cardiff.gov.uk/: (6
 		- www.cardiff.gov.uk
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/carecareersdevon.org.uk.xml b/src/chrome/content/rules/carecareersdevon.org.uk.xml
index edf85ec69103..3a054f8c41e9 100644
--- a/src/chrome/content/rules/carecareersdevon.org.uk.xml
+++ b/src/chrome/content/rules/carecareersdevon.org.uk.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.carecareersdevon.org.uk/ => https://www.carecareersdevon
 	For other UK government coverage, see GOV.UK.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/careerbuilder.no.xml b/src/chrome/content/rules/careerbuilder.no.xml
index 33c1c7b552df..1fb4fef5002a 100644
--- a/src/chrome/content/rules/careerbuilder.no.xml
+++ b/src/chrome/content/rules/careerbuilder.no.xml
@@ -28,7 +28,7 @@ Non-2xx HTTP code: http://api.careerbuilder.no/ (200) => https://api.careerbuild
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/careinternational.org.uk.xml b/src/chrome/content/rules/careinternational.org.uk.xml
index 3c93e759b5e9..fc5d35cb6f47 100644
--- a/src/chrome/content/rules/careinternational.org.uk.xml
+++ b/src/chrome/content/rules/careinternational.org.uk.xml
@@ -19,7 +19,7 @@ Fetch error: http://walkinhershoes.careinternational.org.uk/ => https://walkinhe
 		- walkinhershoes.careinternational.org.uk
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/carnegiehub.org.xml b/src/chrome/content/rules/carnegiehub.org.xml
new file mode 100644
index 000000000000..cf6e8745b3a7
--- /dev/null
+++ b/src/chrome/content/rules/carnegiehub.org.xml
@@ -0,0 +1,26 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/carsales.com.au.xml b/src/chrome/content/rules/carsales.com.au.xml
new file mode 100644
index 000000000000..664e920c8291
--- /dev/null
+++ b/src/chrome/content/rules/carsales.com.au.xml
@@ -0,0 +1,60 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/catchdigital.com.xml b/src/chrome/content/rules/catchdigital.com.xml
index cfa32431936c..9103fe0497a2 100644
--- a/src/chrome/content/rules/catchdigital.com.xml
+++ b/src/chrome/content/rules/catchdigital.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://secure.catchdigital.com/ => https://secure.catchdigital.com/
 	(www.)?catchdigital.com: Plaintext reply
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/cbor.io.xml b/src/chrome/content/rules/cbor.io.xml
new file mode 100644
index 000000000000..61f351bb68ac
--- /dev/null
+++ b/src/chrome/content/rules/cbor.io.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/ccc-ch.ch.xml b/src/chrome/content/rules/ccc-ch.ch.xml
deleted file mode 100644
index 42a980e08a18..000000000000
--- a/src/chrome/content/rules/ccc-ch.ch.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/ccxmedia.org.xml b/src/chrome/content/rules/ccxmedia.org.xml
new file mode 100644
index 000000000000..c9046b8d58da
--- /dev/null
+++ b/src/chrome/content/rules/ccxmedia.org.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/cdngc.net.xml b/src/chrome/content/rules/cdngc.net.xml
index 4f88c47ff070..c28896da3c2f 100644
--- a/src/chrome/content/rules/cdngc.net.xml
+++ b/src/chrome/content/rules/cdngc.net.xml
@@ -11,17 +11,9 @@
 
 	
 	
-	
 	
 	
-	
-	
 	
 
-	
-		
-		
-		
-
 	
 
diff --git a/src/chrome/content/rules/cdnmaster.xml b/src/chrome/content/rules/cdnmaster.xml
index 1329912ab13c..3dc03e630dc8 100644
--- a/src/chrome/content/rules/cdnmaster.xml
+++ b/src/chrome/content/rules/cdnmaster.xml
@@ -4,7 +4,7 @@
 	-->
 	
 	
-	
+
 	
 
 
diff --git a/src/chrome/content/rules/cdntrf.com.xml b/src/chrome/content/rules/cdntrf.com.xml
new file mode 100644
index 000000000000..3ccf826233b0
--- /dev/null
+++ b/src/chrome/content/rules/cdntrf.com.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+		
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/cede.ch.xml b/src/chrome/content/rules/cede.ch.xml
index b0684a4160f0..d01655c6f872 100644
--- a/src/chrome/content/rules/cede.ch.xml
+++ b/src/chrome/content/rules/cede.ch.xml
@@ -1,9 +1,7 @@
 
 	
 	
-	
-	
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/censornet.com.xml b/src/chrome/content/rules/censornet.com.xml
index 2169860ee19a..188de356358e 100644
--- a/src/chrome/content/rules/censornet.com.xml
+++ b/src/chrome/content/rules/censornet.com.xml
@@ -14,7 +14,7 @@ secure.censornet.com different content
 ¹ mismatch
 ⁴ self signed
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/centennialbulb.org.xml b/src/chrome/content/rules/centennialbulb.org.xml
new file mode 100644
index 000000000000..8a280157ce97
--- /dev/null
+++ b/src/chrome/content/rules/centennialbulb.org.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/central-lincs.org.uk.xml b/src/chrome/content/rules/central-lincs.org.uk.xml
index 4075f0876afa..82684560df9c 100644
--- a/src/chrome/content/rules/central-lincs.org.uk.xml
+++ b/src/chrome/content/rules/central-lincs.org.uk.xml
@@ -10,7 +10,7 @@ Non-2xx HTTP code: http://www.central-lincs.org.uk/ (200) => https://www.lincoln
 	(www.)?central-lincs.org.uk: Refused
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/centralindex.com.xml b/src/chrome/content/rules/centralindex.com.xml
index 043ed5d9d938..5c7951596426 100644
--- a/src/chrome/content/rules/centralindex.com.xml
+++ b/src/chrome/content/rules/centralindex.com.xml
@@ -24,8 +24,7 @@
 	
 
 
-	
+	
 
 		
 
diff --git a/src/chrome/content/rules/centrum.cz.xml b/src/chrome/content/rules/centrum.cz.xml
index ef874b8f5035..cbcf29616582 100644
--- a/src/chrome/content/rules/centrum.cz.xml
+++ b/src/chrome/content/rules/centrum.cz.xml
@@ -19,6 +19,7 @@
 		- slovniky.centrum.cz
 		- stahuj.centrum.cz
 		- svatky.centrum.cz
+    - sw.centrum..cz
 		- tvprogram.centrum.cz
 		- user.stahuj.centrum.cz
 		- www.stahuj.centrum.cz
@@ -52,8 +53,6 @@
 	
 	
 	
-	
-	
 	
 	
 	
@@ -61,7 +60,6 @@
 
 	
 	
-	
 	
 	
 	
diff --git a/src/chrome/content/rules/cesky-hosting.cz.xml b/src/chrome/content/rules/cesky-hosting.cz.xml
index 933d6beb5dba..28557f917d73 100644
--- a/src/chrome/content/rules/cesky-hosting.cz.xml
+++ b/src/chrome/content/rules/cesky-hosting.cz.xml
@@ -15,7 +15,7 @@ Fetch error: http://mysql2.cesky-hosting.cz/ => https://mysql2.cesky-hosting.cz/
 	- opensource.cesky-hosting.cz
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/cgames.de.xml b/src/chrome/content/rules/cgames.de.xml
new file mode 100644
index 000000000000..cf212a7328dc
--- /dev/null
+++ b/src/chrome/content/rules/cgames.de.xml
@@ -0,0 +1,40 @@
+
+
+
+	
+		
+	
+		
+	
+		
+	
+		
+	
+		
+	
+		
+	
+		
+	
+		
+	
+		
+	
+		
+	
+	
+		
+	
+		
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/chainfire.eu.xml b/src/chrome/content/rules/chainfire.eu.xml
index ba11f4f01f1c..a833e2511f2c 100644
--- a/src/chrome/content/rules/chainfire.eu.xml
+++ b/src/chrome/content/rules/chainfire.eu.xml
@@ -14,7 +14,7 @@ www.usbhost.chainfire.eu ¹
 ¹ mismatch
 ⁴ self signed
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/chcoc.gov.xml b/src/chrome/content/rules/chcoc.gov.xml
deleted file mode 100644
index f70a2fc7017d..000000000000
--- a/src/chrome/content/rules/chcoc.gov.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-	
-	
-
-		
-		
-
-			
-			
-			
-
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/cheapies.nz.xml b/src/chrome/content/rules/cheapies.nz.xml
index 0ea316ed7207..8087a6a2ff74 100644
--- a/src/chrome/content/rules/cheapies.nz.xml
+++ b/src/chrome/content/rules/cheapies.nz.xml
@@ -22,4 +22,4 @@
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/cheat.sh.xml b/src/chrome/content/rules/cheat.sh.xml
new file mode 100644
index 000000000000..f3ab9f0503da
--- /dev/null
+++ b/src/chrome/content/rules/cheat.sh.xml
@@ -0,0 +1,10 @@
+
+	
+	
+		
+		
+		
+		
+
+	
+
diff --git a/src/chrome/content/rules/cheetosmuseum.com.xml b/src/chrome/content/rules/cheetosmuseum.com.xml
deleted file mode 100644
index d3bcbba2c093..000000000000
--- a/src/chrome/content/rules/cheetosmuseum.com.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/cherwell.gov.uk-resources.xml b/src/chrome/content/rules/cherwell.gov.uk-resources.xml
deleted file mode 100644
index 31a1da33ca34..000000000000
--- a/src/chrome/content/rules/cherwell.gov.uk-resources.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-	
-
-		
-
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-
-
-	
-
-
diff --git a/src/chrome/content/rules/cheshirewestandchester.gov.uk-falsemixed.xml b/src/chrome/content/rules/cheshirewestandchester.gov.uk-falsemixed.xml
deleted file mode 100644
index f10adcd05dec..000000000000
--- a/src/chrome/content/rules/cheshirewestandchester.gov.uk-falsemixed.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/chichester.gov.uk.xml b/src/chrome/content/rules/chichester.gov.uk.xml
index 95dd6b5de3ef..07d2bd96be78 100644
--- a/src/chrome/content/rules/chichester.gov.uk.xml
+++ b/src/chrome/content/rules/chichester.gov.uk.xml
@@ -27,7 +27,7 @@ Fetch error: http://www.westgateleisure.chichester.gov.uk/ => https://www.westga
 
 
 	These altnames do not exist:
-	
+
 		- chichester.gov.uk
 
 
@@ -48,7 +48,7 @@ Fetch error: http://www.westgateleisure.chichester.gov.uk/ => https://www.westga
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/chinafile.com.xml b/src/chrome/content/rules/chinafile.com.xml
index 291d4e0f76bb..71025c5fcd16 100644
--- a/src/chrome/content/rules/chinafile.com.xml
+++ b/src/chrome/content/rules/chinafile.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.chinafile.com/ => https://www.chinafile.com/: Too many r
 	ᶜ Server sends no certificate chain, see https://whatsmychaincert.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/chomikuj.pl.xml b/src/chrome/content/rules/chomikuj.pl.xml
new file mode 100644
index 000000000000..bf7be888b331
--- /dev/null
+++ b/src/chrome/content/rules/chomikuj.pl.xml
@@ -0,0 +1,57 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/chronox.de.xml b/src/chrome/content/rules/chronox.de.xml
new file mode 100644
index 000000000000..ad0cd725e5f5
--- /dev/null
+++ b/src/chrome/content/rules/chronox.de.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/chuapp.com.xml b/src/chrome/content/rules/chuapp.com.xml
new file mode 100644
index 000000000000..68fab885c5e3
--- /dev/null
+++ b/src/chrome/content/rules/chuapp.com.xml
@@ -0,0 +1,22 @@
+
+
+	
+	
+	
+		
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/cihan.com.tr.xml b/src/chrome/content/rules/cihan.com.tr.xml
index bf9c7ec44b67..0ebafccc3af4 100644
--- a/src/chrome/content/rules/cihan.com.tr.xml
+++ b/src/chrome/content/rules/cihan.com.tr.xml
@@ -32,7 +32,7 @@ Fetch error: http://www.cihan.com.tr/ => https://www.cihan.com.tr/: (28, 'Operat
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/cincinnatizoo.org.xml b/src/chrome/content/rules/cincinnatizoo.org.xml
new file mode 100644
index 000000000000..32f3c84008d9
--- /dev/null
+++ b/src/chrome/content/rules/cincinnatizoo.org.xml
@@ -0,0 +1,27 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/citizensadvice.org.uk-falsemixed.xml b/src/chrome/content/rules/citizensadvice.org.uk-falsemixed.xml
deleted file mode 100644
index fa67c213cd2c..000000000000
--- a/src/chrome/content/rules/citizensadvice.org.uk-falsemixed.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/citizensadvice.org.uk.xml b/src/chrome/content/rules/citizensadvice.org.uk.xml
index 4a357a390467..0bcaf7abdf71 100644
--- a/src/chrome/content/rules/citizensadvice.org.uk.xml
+++ b/src/chrome/content/rules/citizensadvice.org.uk.xml
@@ -47,7 +47,7 @@ Fetch error: http://citizensadvice.org.uk/ => https://citizensadvice.org.uk/: (2
 	ˢ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/civilservice.gov.uk.xml b/src/chrome/content/rules/civilservice.gov.uk.xml
index aa1585ef199a..a528e4169de1 100644
--- a/src/chrome/content/rules/civilservice.gov.uk.xml
+++ b/src/chrome/content/rules/civilservice.gov.uk.xml
@@ -51,7 +51,7 @@ Fetch error: http://www.faststream.civilservice.gov.uk/ => https://www.faststrea
 		- www.gss.civilservice.gov.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/classistatic.com.xml b/src/chrome/content/rules/classistatic.com.xml
new file mode 100644
index 000000000000..0d95dc4e1625
--- /dev/null
+++ b/src/chrome/content/rules/classistatic.com.xml
@@ -0,0 +1,49 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+		
+
+	
+
diff --git a/src/chrome/content/rules/clicknupload.link.xml b/src/chrome/content/rules/clicknupload.link.xml
index 4158cd500096..55fd08c83cbd 100644
--- a/src/chrome/content/rules/clicknupload.link.xml
+++ b/src/chrome/content/rules/clicknupload.link.xml
@@ -5,7 +5,7 @@ Fetch error: http://clicknupload.link/ => https://clicknupload.link/: Too many r
 Fetch error: http://www.clicknupload.link/ => https://www.clicknupload.link/: Too many redirects while fetching 'https://www.clicknupload.link/'
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/clippings.com.xml b/src/chrome/content/rules/clippings.com.xml
deleted file mode 100644
index 21a93badd29c..000000000000
--- a/src/chrome/content/rules/clippings.com.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-	
-	
-
-		
-		
-
-			
-			
-			
-
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/clojure.org.xml b/src/chrome/content/rules/clojure.org.xml
new file mode 100644
index 000000000000..a633214b335c
--- /dev/null
+++ b/src/chrome/content/rules/clojure.org.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/clonezilla.org.xml b/src/chrome/content/rules/clonezilla.org.xml
new file mode 100644
index 000000000000..e40fc80adca0
--- /dev/null
+++ b/src/chrome/content/rules/clonezilla.org.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/cloud66.com.xml b/src/chrome/content/rules/cloud66.com.xml
index 804648104480..2262a4bb208d 100644
--- a/src/chrome/content/rules/cloud66.com.xml
+++ b/src/chrome/content/rules/cloud66.com.xml
@@ -6,20 +6,18 @@ realscale.cloud66.com mismatch
 status.cloud66.com mismatch
 uptime.cloud66.com timed out
 developers.cloud66.com timed out
-birdseye.cloud66.com mixed content font, image
+birdseye.cloud66.com mixed content font, image, expired
 help.cloud66.com mixed content image
 -->
 
 	
 	
 	
-	
 	
-	
+
 	
 
-	
 
 	
 
diff --git a/src/chrome/content/rules/cloudcma.com.xml b/src/chrome/content/rules/cloudcma.com.xml
new file mode 100644
index 000000000000..bb9ad72cbdf5
--- /dev/null
+++ b/src/chrome/content/rules/cloudcma.com.xml
@@ -0,0 +1,29 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/cmpxchg8b.com.xml b/src/chrome/content/rules/cmpxchg8b.com.xml
new file mode 100644
index 000000000000..33ffff90e2f9
--- /dev/null
+++ b/src/chrome/content/rules/cmpxchg8b.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/cms.gov.xml b/src/chrome/content/rules/cms.gov.xml
index 5b76e3161314..f2701fba98db 100644
--- a/src/chrome/content/rules/cms.gov.xml
+++ b/src/chrome/content/rules/cms.gov.xml
@@ -71,7 +71,7 @@ Non-2xx HTTP code: http://innovation.cms.gov/ (200) => https://innovation.cms.go
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/cnblogs.com.xml b/src/chrome/content/rules/cnblogs.com.xml
index 9a673a543528..59be90ed8a05 100644
--- a/src/chrome/content/rules/cnblogs.com.xml
+++ b/src/chrome/content/rules/cnblogs.com.xml
@@ -1,23 +1,20 @@
 
-
 
 	
 	
+	
+		
 	
 	
 		
@@ -25,8 +22,11 @@
 	
 	
 	
+	
 	
 	
+	
+		
 	
 	
 	
@@ -45,34 +45,15 @@
 	
 	
 	
+	
 	
 	
 	
 
 	
-	
-		
-		
-
 	
 		
 		
 
-	
-		
-		
-		
-		
-		
-		
-		
-
-		
-		
-		
-		
-		
-		
-
 	
 
diff --git a/src/chrome/content/rules/cncf.io.xml b/src/chrome/content/rules/cncf.io.xml
new file mode 100644
index 000000000000..85c5855ef46d
--- /dev/null
+++ b/src/chrome/content/rules/cncf.io.xml
@@ -0,0 +1,46 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/cnv.com.xml b/src/chrome/content/rules/cnv.com.xml
index 84c62b257b80..8e314f35ba38 100644
--- a/src/chrome/content/rules/cnv.com.xml
+++ b/src/chrome/content/rules/cnv.com.xml
@@ -1,7 +1,6 @@
 
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/cogentco.com.xml b/src/chrome/content/rules/cogentco.com.xml
new file mode 100644
index 000000000000..e7048aee60dc
--- /dev/null
+++ b/src/chrome/content/rules/cogentco.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/coin-have.com.xml b/src/chrome/content/rules/coin-have.com.xml
deleted file mode 100644
index fe6e50af8287..000000000000
--- a/src/chrome/content/rules/coin-have.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/coin.space.xml b/src/chrome/content/rules/coin.space.xml
index e3ca0cb670a1..02ecb5771bbd 100644
--- a/src/chrome/content/rules/coin.space.xml
+++ b/src/chrome/content/rules/coin.space.xml
@@ -1,16 +1,15 @@
-
 
-
+
 	
-	
-	
-	
-	
-	
+	
+	
+	
+	
 
 	
 
diff --git a/src/chrome/content/rules/coinblind.com.xml b/src/chrome/content/rules/coinblind.com.xml
deleted file mode 100644
index 7da8de966106..000000000000
--- a/src/chrome/content/rules/coinblind.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/coinhive.com.xml b/src/chrome/content/rules/coinhive.com.xml
deleted file mode 100644
index c1239051163c..000000000000
--- a/src/chrome/content/rules/coinhive.com.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-	
-	
-
-	
-	
-	
-
-	
-
-	
-	
-
-	
-
-	
-	
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/coinnebula.com.xml b/src/chrome/content/rules/coinnebula.com.xml
deleted file mode 100644
index 8a62a40e7ff6..000000000000
--- a/src/chrome/content/rules/coinnebula.com.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/cointelgraph.com.xml b/src/chrome/content/rules/cointelgraph.com.xml
index 50a08a4f954e..08f90af3933e 100644
--- a/src/chrome/content/rules/cointelgraph.com.xml
+++ b/src/chrome/content/rules/cointelgraph.com.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.cointelgraph.com/ => https://www.cointelgraph.com/: (28,
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/com.com.xml b/src/chrome/content/rules/com.com.xml
new file mode 100644
index 000000000000..ea4e751ad12c
--- /dev/null
+++ b/src/chrome/content/rules/com.com.xml
@@ -0,0 +1,22 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/comicvine.com.xml b/src/chrome/content/rules/comicvine.com.xml
new file mode 100644
index 000000000000..73ef97252477
--- /dev/null
+++ b/src/chrome/content/rules/comicvine.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/communities.gov.uk.xml b/src/chrome/content/rules/communities.gov.uk.xml
index 4627e5587c24..0d46070ba3f6 100644
--- a/src/chrome/content/rules/communities.gov.uk.xml
+++ b/src/chrome/content/rules/communities.gov.uk.xml
@@ -32,6 +32,8 @@
 		Status code mismatch:
 		- mcis.erdf.communities.gov.uk
 		- reporting.erdf.communities.gov.uk
+		- maps.communities.gov.uk
+			Example URL: http://maps.communities.gov.uk/geoserver/dclg_inspire/ows?service=WFS&version=2.0.0&request=GetFeature&typeName=dclg_inspire:Local_Authority_Greenbelt_boundaries_2017-18&outputFormat=shape-zip&srsName=EPSG:4326
 
 		4xx client error:
 		- logasnet.communities.gov.uk
@@ -47,7 +49,6 @@
 	
 	
 	
-	
 	
 	
 
diff --git a/src/chrome/content/rules/communitycrimemap.xml b/src/chrome/content/rules/communitycrimemap.xml
new file mode 100644
index 000000000000..f54c0cfe5a3d
--- /dev/null
+++ b/src/chrome/content/rules/communitycrimemap.xml
@@ -0,0 +1,7 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/companic.nl.xml b/src/chrome/content/rules/companic.nl.xml
index 4867ffad4831..2a787d8db7b3 100644
--- a/src/chrome/content/rules/companic.nl.xml
+++ b/src/chrome/content/rules/companic.nl.xml
@@ -7,7 +7,7 @@
 		- .companic.nl
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/companieshouse.gi.xml b/src/chrome/content/rules/companieshouse.gi.xml
index f738e57b8fe1..ddb0edcf092f 100644
--- a/src/chrome/content/rules/companieshouse.gi.xml
+++ b/src/chrome/content/rules/companieshouse.gi.xml
@@ -7,7 +7,7 @@
 		- companieshouse.gi
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/complinet.com.xml b/src/chrome/content/rules/complinet.com.xml
index e06606e201d6..939a840b5110 100644
--- a/src/chrome/content/rules/complinet.com.xml
+++ b/src/chrome/content/rules/complinet.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://complinet.com/ => https://complinet.com/: (51, "SSL: no alte
 Fetch error: http://www.complinet.com/ => https://www.complinet.com/: Too many redirects while fetching 'https://www.complinet.com/'
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/computerbild.de.xml b/src/chrome/content/rules/computerbild.de.xml
index 04bf918c7a20..81b78426d415 100644
--- a/src/chrome/content/rules/computerbild.de.xml
+++ b/src/chrome/content/rules/computerbild.de.xml
@@ -1,44 +1,39 @@
-
 
-
+
+
 	
 	
-	
+	
+	
 	
 	
+	
+	
+	
+	
+	
+
 	
 	
 	
 
 	
+
 	
+
 	
-	
+
+	
+
 
diff --git a/src/chrome/content/rules/conan.io.xml b/src/chrome/content/rules/conan.io.xml
new file mode 100644
index 000000000000..17655016ec73
--- /dev/null
+++ b/src/chrome/content/rules/conan.io.xml
@@ -0,0 +1,11 @@
+
+	
+	
+
+	
+
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/concourse.ci.xml b/src/chrome/content/rules/concourse.ci.xml
deleted file mode 100644
index 0c5508bfa17c..000000000000
--- a/src/chrome/content/rules/concourse.ci.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/connect.de.xml b/src/chrome/content/rules/connect.de.xml
new file mode 100644
index 000000000000..563bf72fe84f
--- /dev/null
+++ b/src/chrome/content/rules/connect.de.xml
@@ -0,0 +1,40 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/connectingcredentials.org.xml b/src/chrome/content/rules/connectingcredentials.org.xml
new file mode 100644
index 000000000000..3b3044be35fd
--- /dev/null
+++ b/src/chrome/content/rules/connectingcredentials.org.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/cookiepedia.co.uk.xml b/src/chrome/content/rules/cookiepedia.co.uk.xml
deleted file mode 100644
index 7cdbaaff2d75..000000000000
--- a/src/chrome/content/rules/cookiepedia.co.uk.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/cool18.com.xml b/src/chrome/content/rules/cool18.com.xml
new file mode 100644
index 000000000000..d3e0fc3e35a8
--- /dev/null
+++ b/src/chrome/content/rules/cool18.com.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/copeland.gov.uk.xml b/src/chrome/content/rules/copeland.gov.uk.xml
index a85e562e66ee..e603da006dbe 100644
--- a/src/chrome/content/rules/copeland.gov.uk.xml
+++ b/src/chrome/content/rules/copeland.gov.uk.xml
@@ -12,7 +12,7 @@ Fetch error: http://erb.copeland.gov.uk/ => https://erb.copeland.gov.uk/: (60, '
 	(www.)?copeland.gov.uk: Refused
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/copy.me.xml b/src/chrome/content/rules/copy.me.xml
index 9bfba78c971d..1beca7b6b198 100644
--- a/src/chrome/content/rules/copy.me.xml
+++ b/src/chrome/content/rules/copy.me.xml
@@ -16,4 +16,4 @@
 	
 
-	
+
diff --git a/src/chrome/content/rules/coralproject.net.xml b/src/chrome/content/rules/coralproject.net.xml
index f9595f8915a9..d739c880c446 100644
--- a/src/chrome/content/rules/coralproject.net.xml
+++ b/src/chrome/content/rules/coralproject.net.xml
@@ -4,4 +4,4 @@
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/coronavirus.gov.hk.xml b/src/chrome/content/rules/coronavirus.gov.hk.xml
new file mode 100644
index 000000000000..5386391c1ab2
--- /dev/null
+++ b/src/chrome/content/rules/coronavirus.gov.hk.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/corrupcia.net.xml b/src/chrome/content/rules/corrupcia.net.xml
index 4f05f0b055b0..1c1d5df77ab5 100644
--- a/src/chrome/content/rules/corrupcia.net.xml
+++ b/src/chrome/content/rules/corrupcia.net.xml
@@ -5,7 +5,7 @@ Fetch error: http://corrupcia.net/ => https://corrupcia.net/: (28, 'Operation ti
 Fetch error: http://www.corrupcia.net/ => https://www.corrupcia.net/: (28, 'Operation timed out after 30001 milliseconds with 0 bytes received')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/cosmonova.net.xml b/src/chrome/content/rules/cosmonova.net.xml
index 12b5584c7c69..63f5fa731bb1 100644
--- a/src/chrome/content/rules/cosmonova.net.xml
+++ b/src/chrome/content/rules/cosmonova.net.xml
@@ -10,7 +10,7 @@ mobapp.cosmonova.net ⁷
 
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/cotswold.gov.uk.xml b/src/chrome/content/rules/cotswold.gov.uk.xml
index 4914b0fc2880..831a7940a3a3 100644
--- a/src/chrome/content/rules/cotswold.gov.uk.xml
+++ b/src/chrome/content/rules/cotswold.gov.uk.xml
@@ -16,6 +16,6 @@
 -->
 
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/counterpath.com.xml b/src/chrome/content/rules/counterpath.com.xml
index 0637e7ba32d9..a20141e286a4 100644
--- a/src/chrome/content/rules/counterpath.com.xml
+++ b/src/chrome/content/rules/counterpath.com.xml
@@ -8,7 +8,7 @@ counterpath.com redirect
 www.counterpath.com redirect
 blog.counterpath.com mixed content
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/countle.com.xml b/src/chrome/content/rules/countle.com.xml
new file mode 100644
index 000000000000..7794d85c7f59
--- /dev/null
+++ b/src/chrome/content/rules/countle.com.xml
@@ -0,0 +1,7 @@
+
+  
+  
+
+  
+
diff --git a/src/chrome/content/rules/cpaste.xml b/src/chrome/content/rules/cpaste.xml
index 639dd5b8a27b..1644a8817b11 100644
--- a/src/chrome/content/rules/cpaste.xml
+++ b/src/chrome/content/rules/cpaste.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.cpaste.org/ => https://www.cpaste.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.cpaste.org'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/cpcwiki.eu.xml b/src/chrome/content/rules/cpcwiki.eu.xml
new file mode 100644
index 000000000000..4202cd093ed0
--- /dev/null
+++ b/src/chrome/content/rules/cpcwiki.eu.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/cpiz.net.xml b/src/chrome/content/rules/cpiz.net.xml
index ea02897f376a..22d4da540b0a 100644
--- a/src/chrome/content/rules/cpiz.net.xml
+++ b/src/chrome/content/rules/cpiz.net.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.cpiz.net/ => https://www.cpiz.net/: (60, 'SSL certificat
 Fetch error: http://annie.cpiz.net/ => https://annie.cpiz.net/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/cppc.ca.xml b/src/chrome/content/rules/cppc.ca.xml
new file mode 100644
index 000000000000..98515ac13af9
--- /dev/null
+++ b/src/chrome/content/rules/cppc.ca.xml
@@ -0,0 +1,6 @@
+
+		
+		
+
+		
+
diff --git a/src/chrome/content/rules/cppreference.com.xml b/src/chrome/content/rules/cppreference.com.xml
new file mode 100644
index 000000000000..e4341018909f
--- /dev/null
+++ b/src/chrome/content/rules/cppreference.com.xml
@@ -0,0 +1,29 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/craftilldawn.com.xml b/src/chrome/content/rules/craftilldawn.com.xml
deleted file mode 100644
index ed4b78307280..000000000000
--- a/src/chrome/content/rules/craftilldawn.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-        
-
-        
-
diff --git a/src/chrome/content/rules/crazespaces.pw.xml b/src/chrome/content/rules/crazespaces.pw.xml
index ac84b2d51330..788cf2ada326 100644
--- a/src/chrome/content/rules/crazespaces.pw.xml
+++ b/src/chrome/content/rules/crazespaces.pw.xml
@@ -5,7 +5,7 @@ Fetch error: http://crazespaces.pw/ => https://crazespaces.pw/: (28, 'Connection
 Fetch error: http://www.crazespaces.pw/ => https://www.crazespaces.pw/: (28, 'Connection timed out after 20000 milliseconds')
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/crick.ac.uk.xml b/src/chrome/content/rules/crick.ac.uk.xml
index b4d884b82aed..ace45dddd8bf 100644
--- a/src/chrome/content/rules/crick.ac.uk.xml
+++ b/src/chrome/content/rules/crick.ac.uk.xml
@@ -36,7 +36,7 @@
 		- Image on (www.)? from pbs.twimg.com ˢ
 
 		- favicons, on:
-		
+
 			- (www.)? from www.crick.ac.uk ˢ
 			- (www.)? from hts.cancerresearchuk.org
 
diff --git a/src/chrome/content/rules/crimestoppers-uk.org.xml b/src/chrome/content/rules/crimestoppers-uk.org.xml
index ed2cf09a1692..d064c2b36896 100644
--- a/src/chrome/content/rules/crimestoppers-uk.org.xml
+++ b/src/chrome/content/rules/crimestoppers-uk.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://arms.crimestoppers-uk.org/ => https://arms.crimestoppers-uk.org/: (6, 'Could not resolve host: arms.crimestoppers-uk.org')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/crondash.com.xml b/src/chrome/content/rules/crondash.com.xml
index c86bd00376d3..c36bd6379926 100644
--- a/src/chrome/content/rules/crondash.com.xml
+++ b/src/chrome/content/rules/crondash.com.xml
@@ -9,7 +9,7 @@ c.crondash.com ¹
 
 ¹ mismatch
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/crossorigin.me.xml b/src/chrome/content/rules/crossorigin.me.xml
deleted file mode 100644
index 327a6ea721cb..000000000000
--- a/src/chrome/content/rules/crossorigin.me.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/cryptostore.ru.xml b/src/chrome/content/rules/cryptostore.ru.xml
index 02e8bc80c56c..b0f5b73b51a8 100644
--- a/src/chrome/content/rules/cryptostore.ru.xml
+++ b/src/chrome/content/rules/cryptostore.ru.xml
@@ -6,7 +6,7 @@ www.cryptostore.ru non-2xx http code
 
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/cryptovpn.me.xml b/src/chrome/content/rules/cryptovpn.me.xml
deleted file mode 100644
index 1cc00ce068a6..000000000000
--- a/src/chrome/content/rules/cryptovpn.me.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/cubeupload.com.xml b/src/chrome/content/rules/cubeupload.com.xml
index 9820c2864928..a29e50f6cae0 100644
--- a/src/chrome/content/rules/cubeupload.com.xml
+++ b/src/chrome/content/rules/cubeupload.com.xml
@@ -1,13 +1,13 @@
 
 
 	
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/cublinux.com.xml b/src/chrome/content/rules/cublinux.com.xml
index 9b4f2bc4a6a5..018d18750bd5 100644
--- a/src/chrome/content/rules/cublinux.com.xml
+++ b/src/chrome/content/rules/cublinux.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://cublinux.com/ => https://cublinux.com/: (51, "SSL: no altern
 Fetch error: http://www.cublinux.com/ => https://www.cublinux.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.cublinux.com'")
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/cumbria.gov.uk.xml b/src/chrome/content/rules/cumbria.gov.uk.xml
index 8f778333c241..71ae69e2acd4 100644
--- a/src/chrome/content/rules/cumbria.gov.uk.xml
+++ b/src/chrome/content/rules/cumbria.gov.uk.xml
@@ -42,7 +42,7 @@ Fetch error: http://cumbria.gov.uk/ => https://www.cumbria.gov.uk/: (60, 'SSL ce
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/curve.co.uk.xml b/src/chrome/content/rules/curve.co.uk.xml
new file mode 100644
index 000000000000..253cd32babcb
--- /dev/null
+++ b/src/chrome/content/rules/curve.co.uk.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/cuteness.com.xml b/src/chrome/content/rules/cuteness.com.xml
index cf1dfb458b03..b2d9a8e55f52 100644
--- a/src/chrome/content/rules/cuteness.com.xml
+++ b/src/chrome/content/rules/cuteness.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://support.cuteness.com/ => https://support.cuteness.com/: (6,
 	^cuteness.com: Refused
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/cwc.im.xml b/src/chrome/content/rules/cwc.im.xml
new file mode 100644
index 000000000000..529d42fe28bb
--- /dev/null
+++ b/src/chrome/content/rules/cwc.im.xml
@@ -0,0 +1,8 @@
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/cwgv.com.tw.xml b/src/chrome/content/rules/cwgv.com.tw.xml
new file mode 100644
index 000000000000..be82c7736481
--- /dev/null
+++ b/src/chrome/content/rules/cwgv.com.tw.xml
@@ -0,0 +1,54 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/cyberbits.eu.xml b/src/chrome/content/rules/cyberbits.eu.xml
new file mode 100644
index 000000000000..962e55ab1355
--- /dev/null
+++ b/src/chrome/content/rules/cyberbits.eu.xml
@@ -0,0 +1,12 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/cyberciti.biz.xml b/src/chrome/content/rules/cyberciti.biz.xml
new file mode 100644
index 000000000000..c4771b853ee1
--- /dev/null
+++ b/src/chrome/content/rules/cyberciti.biz.xml
@@ -0,0 +1,21 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/cybrary.it.xml b/src/chrome/content/rules/cybrary.it.xml
deleted file mode 100644
index b098d4a3a644..000000000000
--- a/src/chrome/content/rules/cybrary.it.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-	
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/d3js.org.xml b/src/chrome/content/rules/d3js.org.xml
index 1f89769492b6..ad5b66b151aa 100644
--- a/src/chrome/content/rules/d3js.org.xml
+++ b/src/chrome/content/rules/d3js.org.xml
@@ -9,6 +9,6 @@
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/daemonology.net.xml b/src/chrome/content/rules/daemonology.net.xml
new file mode 100644
index 000000000000..f3e422a44742
--- /dev/null
+++ b/src/chrome/content/rules/daemonology.net.xml
@@ -0,0 +1,5 @@
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/dailystavropol.ru.xml b/src/chrome/content/rules/dailystavropol.ru.xml
deleted file mode 100644
index fac4b60c5351..000000000000
--- a/src/chrome/content/rules/dailystavropol.ru.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-	
-	
-	
-	
-
diff --git a/src/chrome/content/rules/darebee.com.xml b/src/chrome/content/rules/darebee.com.xml
index 0c66254984de..5b4d6aa687f6 100644
--- a/src/chrome/content/rules/darebee.com.xml
+++ b/src/chrome/content/rules/darebee.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://mail.darebee.com/ => https://mail.darebee.com/: (51, "SSL: n
 		webmail.darebee.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/darkwebnews.com.xml b/src/chrome/content/rules/darkwebnews.com.xml
deleted file mode 100644
index a6b0857ea9da..000000000000
--- a/src/chrome/content/rules/darkwebnews.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/darlinghq.org.xml b/src/chrome/content/rules/darlinghq.org.xml
new file mode 100644
index 000000000000..4e6882df85dc
--- /dev/null
+++ b/src/chrome/content/rules/darlinghq.org.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/data.gov.au.xml b/src/chrome/content/rules/data.gov.au.xml
index 1d7ae5244e8f..cfa432ebbc21 100644
--- a/src/chrome/content/rules/data.gov.au.xml
+++ b/src/chrome/content/rules/data.gov.au.xml
@@ -9,7 +9,7 @@
 
 -->
 
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/data.gov.hk.xml b/src/chrome/content/rules/data.gov.hk.xml
index 8885a63d529b..2d8d69b88d75 100644
--- a/src/chrome/content/rules/data.gov.hk.xml
+++ b/src/chrome/content/rules/data.gov.hk.xml
@@ -12,7 +12,7 @@
 
 	
-	
+
 	
 
 
diff --git a/src/chrome/content/rules/data.gov.uk.xml b/src/chrome/content/rules/data.gov.uk.xml
index 888cc923c784..3f5e0d051003 100644
--- a/src/chrome/content/rules/data.gov.uk.xml
+++ b/src/chrome/content/rules/data.gov.uk.xml
@@ -12,7 +12,7 @@
 		- reference ʳ
 		- statistics ᵃ
 		- transport ʳ
-	
+
 	ᵃ Shows another domain
 	ʰ Redirects to http
 	ʳ Refused
diff --git a/src/chrome/content/rules/datadryad.org.xml b/src/chrome/content/rules/datadryad.org.xml
index 7e85cc50cf0e..ec42dabf4881 100644
--- a/src/chrome/content/rules/datadryad.org.xml
+++ b/src/chrome/content/rules/datadryad.org.xml
@@ -2,15 +2,15 @@
 	Refused:
 		api.datadryad.org
 		secundus.datadryad.org
-		
+
 	No working URL known:
 		online.datadryad.org (403)
 		list.datadryad.org (timeout)
 		mailams.datadryad.org (timeout)
-		
+
 	Bad certificate:
 		wiki.datadryad.org
-		
+
 -->
 
 
diff --git a/src/chrome/content/rules/datafile.com-resources.xml b/src/chrome/content/rules/datafile.com-resources.xml
deleted file mode 100644
index 84d530a17bd1..000000000000
--- a/src/chrome/content/rules/datafile.com-resources.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-	
-	
-
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-			
-			
-
-
-	
-
-
diff --git a/src/chrome/content/rules/datafile.com.xml b/src/chrome/content/rules/datafile.com.xml
deleted file mode 100644
index 716414165d1d..000000000000
--- a/src/chrome/content/rules/datafile.com.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-	
-	
-
-		
-		
-		
-		
-		
-		
-
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-			
-			
-
-
-	
-
-
diff --git a/src/chrome/content/rules/datamotion.com.xml b/src/chrome/content/rules/datamotion.com.xml
index 4f620cdf5cae..ba2cb9f8adb2 100644
--- a/src/chrome/content/rules/datamotion.com.xml
+++ b/src/chrome/content/rules/datamotion.com.xml
@@ -23,7 +23,7 @@ Fetch error: http://testing.datamotion.com/ => https://testing.datamotion.com/:
 		- testing.datamotion.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/datinglab.net.xml b/src/chrome/content/rules/datinglab.net.xml
index b4d3a50c5c2c..6c8731422002 100644
--- a/src/chrome/content/rules/datinglab.net.xml
+++ b/src/chrome/content/rules/datinglab.net.xml
@@ -13,12 +13,12 @@
 	Mixed content:
 
 		- css, on:
-		
+
 			- secure from $self ˢ
 			- secure2 from is.i2.datinglab.net ˢ
 
 		- Images, on:
-		
+
 			- (www.)? from www.datinglab.net
 			- secure from $self ˢ
 			- secure2 from is.i2.datinglab.net ˢ
@@ -40,7 +40,7 @@
 		
 		
-	
+
 			
 			
@@ -49,7 +49,7 @@
 			
 			
 			
-	
+
 			
 			
diff --git a/src/chrome/content/rules/daum.net.xml b/src/chrome/content/rules/daum.net.xml
new file mode 100644
index 000000000000..d1db3abee24f
--- /dev/null
+++ b/src/chrome/content/rules/daum.net.xml
@@ -0,0 +1,44 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/david-dm.org.xml b/src/chrome/content/rules/david-dm.org.xml
index 0bc9d0d03dd8..17ca29fe7187 100644
--- a/src/chrome/content/rules/david-dm.org.xml
+++ b/src/chrome/content/rules/david-dm.org.xml
@@ -4,7 +4,7 @@ www.david-dm.org mismatch
 
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/davidperkinsphotography.com.xml b/src/chrome/content/rules/davidperkinsphotography.com.xml
new file mode 100644
index 000000000000..69cc693b3477
--- /dev/null
+++ b/src/chrome/content/rules/davidperkinsphotography.com.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/dbq.edu.xml b/src/chrome/content/rules/dbq.edu.xml
new file mode 100644
index 000000000000..4ccf18b73c8c
--- /dev/null
+++ b/src/chrome/content/rules/dbq.edu.xml
@@ -0,0 +1,93 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/dc121677.com.xml b/src/chrome/content/rules/dc121677.com.xml
deleted file mode 100644
index cf5fab678a42..000000000000
--- a/src/chrome/content/rules/dc121677.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-	
-
-		
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/dcerpc.org.xml b/src/chrome/content/rules/dcerpc.org.xml
index 0ee51e93d769..f66853eb5da2 100644
--- a/src/chrome/content/rules/dcerpc.org.xml
+++ b/src/chrome/content/rules/dcerpc.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://www.dcerpc.org/ => https://www.dcerpc.org/: (51, "SSL: no al
 Fetch error: http://dcerpc.org/ => https://www.dcerpc.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.dcerpc.org'")
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/dcmuseum.co.uk.xml b/src/chrome/content/rules/dcmuseum.co.uk.xml
new file mode 100644
index 000000000000..20584946813a
--- /dev/null
+++ b/src/chrome/content/rules/dcmuseum.co.uk.xml
@@ -0,0 +1,7 @@
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/dct.org.uk.xml b/src/chrome/content/rules/dct.org.uk.xml
deleted file mode 100644
index f4028e737a07..000000000000
--- a/src/chrome/content/rules/dct.org.uk.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/ddcdn.xml b/src/chrome/content/rules/ddcdn.xml
index dd3d56e8761a..e21e43bf737b 100644
--- a/src/chrome/content/rules/ddcdn.xml
+++ b/src/chrome/content/rules/ddcdn.xml
@@ -4,7 +4,7 @@
 	-->
 	
 	
-	
+
 	
 
 
diff --git a/src/chrome/content/rules/deSEC.xml b/src/chrome/content/rules/deSEC.xml
index 480d5270ca8d..4e4be36f26a0 100644
--- a/src/chrome/content/rules/deSEC.xml
+++ b/src/chrome/content/rules/deSEC.xml
@@ -10,9 +10,7 @@ Fetch error: http://checkip6.dedyn.io/ => https://checkip6.dedyn.io/: (6, 'Could
     * *.dedyn.io are user-generated domains with user content, so they do not
       have to support HTTPS there.
 -->
-
-  
-  
+
   
   
   
diff --git a/src/chrome/content/rules/dealinteractive.com.xml b/src/chrome/content/rules/dealinteractive.com.xml
index 402d98445f40..1c85df777f39 100644
--- a/src/chrome/content/rules/dealinteractive.com.xml
+++ b/src/chrome/content/rules/dealinteractive.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://securetrial.dealinteractive.com/ => https://securetrial.deal
 	(www.)?dealinteractive.com: server sends no certificate chain, see https://whatsmychaincert.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/debenhams.com.xml b/src/chrome/content/rules/debenhams.com.xml
index 4dad1ca7b0a2..693b58252be1 100644
--- a/src/chrome/content/rules/debenhams.com.xml
+++ b/src/chrome/content/rules/debenhams.com.xml
@@ -51,7 +51,7 @@ Fetch error: http://images.e.debenhams.com/ => https://images.e.debenhams.com/:
 		- css on www from fonts.googleapis.com ˢ
 
 		- Images, on:
-		
+
 			- pages.e from image.e.debenhams.com ˢ
 			- www from $self ˢ
 			- www from debenhams.scene7.com
@@ -59,7 +59,7 @@ Fetch error: http://images.e.debenhams.com/ => https://images.e.debenhams.com/:
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/deborahrfowler.com.xml b/src/chrome/content/rules/deborahrfowler.com.xml
new file mode 100644
index 000000000000..c314a7b8faf1
--- /dev/null
+++ b/src/chrome/content/rules/deborahrfowler.com.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/debugconnection.xml b/src/chrome/content/rules/debugconnection.xml
new file mode 100644
index 000000000000..487cf0c829e3
--- /dev/null
+++ b/src/chrome/content/rules/debugconnection.xml
@@ -0,0 +1,6 @@
+
+        
+        
+
+        
+
diff --git a/src/chrome/content/rules/decc.gov.uk.xml b/src/chrome/content/rules/decc.gov.uk.xml
index e6ef8aae2ee8..183ea1247483 100644
--- a/src/chrome/content/rules/decc.gov.uk.xml
+++ b/src/chrome/content/rules/decc.gov.uk.xml
@@ -76,7 +76,7 @@ Fetch error: http://econsultation.decc.gov.uk/ => https://econsultation.decc.gov
 		- gdorb.decc.gov.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/dei.gr.xml b/src/chrome/content/rules/dei.gr.xml
index 8378494414c1..8f3f3def010a 100644
--- a/src/chrome/content/rules/dei.gr.xml
+++ b/src/chrome/content/rules/dei.gr.xml
@@ -2,7 +2,7 @@
 	
 	
 	
-	
+
 	
 
 	
diff --git a/src/chrome/content/rules/dellin.ru.xml b/src/chrome/content/rules/dellin.ru.xml
index dfcd8fac103f..772dd746097d 100644
--- a/src/chrome/content/rules/dellin.ru.xml
+++ b/src/chrome/content/rules/dellin.ru.xml
@@ -3,15 +3,14 @@
 	
 	
 	
-	
+
 	
-	
-	
+
 	
-	
+
 	
 	
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/democracyclub.org.uk.xml b/src/chrome/content/rules/democracyclub.org.uk.xml
index f3d4046aec4b..41d27edbf17a 100644
--- a/src/chrome/content/rules/democracyclub.org.uk.xml
+++ b/src/chrome/content/rules/democracyclub.org.uk.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.democracyclub.org.uk/ => https://www.democracyclub.org.uk/: (52, 'Empty reply from server')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/democracyos.org.xml b/src/chrome/content/rules/democracyos.org.xml
index b8a50e254fc3..13d24b2e4f90 100644
--- a/src/chrome/content/rules/democracyos.org.xml
+++ b/src/chrome/content/rules/democracyos.org.xml
@@ -11,7 +11,7 @@ docs.democracyos.org ¹
 
 ¹ mismatch
 -->
-
+
 	
 
 	
diff --git a/src/chrome/content/rules/demonoid.cc.xml b/src/chrome/content/rules/demonoid.cc.xml
index 74f83e73d20b..26fcd9c0c75b 100644
--- a/src/chrome/content/rules/demonoid.cc.xml
+++ b/src/chrome/content/rules/demonoid.cc.xml
@@ -10,7 +10,7 @@ inferno.demonoid.cc ²
 
 ² refused
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/deploybot.com.xml b/src/chrome/content/rules/deploybot.com.xml
index c575a8c744de..d11c9aac786c 100644
--- a/src/chrome/content/rules/deploybot.com.xml
+++ b/src/chrome/content/rules/deploybot.com.xml
@@ -11,14 +11,14 @@ dploy.io/: (52, 'Empty reply from server')
 support.dploy.io mismatch
 blog.dploy.io mismatch
 -->
-
+
 	
 	
 	
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/derstandard.at.xml b/src/chrome/content/rules/derstandard.at.xml
index 59aae490036d..c35bc5777c47 100644
--- a/src/chrome/content/rules/derstandard.at.xml
+++ b/src/chrome/content/rules/derstandard.at.xml
@@ -15,7 +15,7 @@
 
 	
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/detini.gov.uk.xml b/src/chrome/content/rules/detini.gov.uk.xml
index d18439db451d..ac43c05c2b21 100644
--- a/src/chrome/content/rules/detini.gov.uk.xml
+++ b/src/chrome/content/rules/detini.gov.uk.xml
@@ -20,7 +20,7 @@ Fetch error: http://detini.gov.uk/ => https://www.detini.gov.uk/: (7, 'Failed to
 
 		- ^ ᶠ
 		- www.business ᵉ
-	
+
 	ᵉ Expired
 	ᶠ Handshake fails; preemptable redirect
 
@@ -31,7 +31,7 @@ Fetch error: http://detini.gov.uk/ => https://www.detini.gov.uk/: (7, 'Failed to
 		- insolvency.detini.gov.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/deutschland-spielt.de.xml b/src/chrome/content/rules/deutschland-spielt.de.xml
index 54225b32227f..e966132b7432 100644
--- a/src/chrome/content/rules/deutschland-spielt.de.xml
+++ b/src/chrome/content/rules/deutschland-spielt.de.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.deutschland-spielt.de/ => https://www.deutschland-spielt
 	Refused:
 		- download.deutschland-spielt.de
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/dev47apps.com.xml b/src/chrome/content/rules/dev47apps.com.xml
new file mode 100644
index 000000000000..251cd0574827
--- /dev/null
+++ b/src/chrome/content/rules/dev47apps.com.xml
@@ -0,0 +1,46 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/devalate.com.xml b/src/chrome/content/rules/devalate.com.xml
index 708661f2f54a..7c79dcfed39a 100644
--- a/src/chrome/content/rules/devalate.com.xml
+++ b/src/chrome/content/rules/devalate.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.devalate.com/ => https://www.devalate.com/: (28, 'Connec
 		- www.devalate.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/develop100.com.xml b/src/chrome/content/rules/develop100.com.xml
deleted file mode 100644
index 432c7fcf7691..000000000000
--- a/src/chrome/content/rules/develop100.com.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-	
-
-		
-
-
diff --git a/src/chrome/content/rules/dhbw-mannheim.de.xml b/src/chrome/content/rules/dhbw-mannheim.de.xml
index a1af54a624e4..2333e24e7a92 100644
--- a/src/chrome/content/rules/dhbw-mannheim.de.xml
+++ b/src/chrome/content/rules/dhbw-mannheim.de.xml
@@ -59,7 +59,7 @@
 	
 	
 	
-	
+
 	
 
 	
diff --git a/src/chrome/content/rules/dhi-scotland.com.xml b/src/chrome/content/rules/dhi-scotland.com.xml
index 8302db472445..24f2a1745f54 100644
--- a/src/chrome/content/rules/dhi-scotland.com.xml
+++ b/src/chrome/content/rules/dhi-scotland.com.xml
@@ -16,7 +16,7 @@ Fetch error: http://www.dhi-scotland.com/ => https://www.dhi-scotland.com/: (51,
 	STS header includes includeSubdomains
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/dhsspsni.gov.uk.xml b/src/chrome/content/rules/dhsspsni.gov.uk.xml
index 0b6c15e8eb44..d92e106a7b0e 100644
--- a/src/chrome/content/rules/dhsspsni.gov.uk.xml
+++ b/src/chrome/content/rules/dhsspsni.gov.uk.xml
@@ -24,7 +24,7 @@ Fetch error: http://dhsspsni.gov.uk/ => https://www.dhsspsni.gov.uk/: (7, 'Faile
 		- .dhsspsni.gov.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/dianping.com.xml b/src/chrome/content/rules/dianping.com.xml
index d601cc81c949..f0c367cad6fb 100644
--- a/src/chrome/content/rules/dianping.com.xml
+++ b/src/chrome/content/rules/dianping.com.xml
@@ -1,40 +1,33 @@
 
-
 
-
+	
+	
+	
 	
 	
 	
+	
 	
+	
+	
 	
+	
+	
 	
 	
 	
 	
+	
 
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/die-neue-welle.de.xml b/src/chrome/content/rules/die-neue-welle.de.xml
new file mode 100644
index 000000000000..c0f0df33517e
--- /dev/null
+++ b/src/chrome/content/rules/die-neue-welle.de.xml
@@ -0,0 +1,23 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/difficulties.de.xml b/src/chrome/content/rules/difficulties.de.xml
deleted file mode 100644
index f109c38a4fce..000000000000
--- a/src/chrome/content/rules/difficulties.de.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/digidip.net.xml b/src/chrome/content/rules/digidip.net.xml
new file mode 100644
index 000000000000..18e0ed9574f8
--- /dev/null
+++ b/src/chrome/content/rules/digidip.net.xml
@@ -0,0 +1,134 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/digip.org.xml b/src/chrome/content/rules/digip.org.xml
new file mode 100644
index 000000000000..6a30817e2351
--- /dev/null
+++ b/src/chrome/content/rules/digip.org.xml
@@ -0,0 +1,5 @@
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/dinglisch.net.xml b/src/chrome/content/rules/dinglisch.net.xml
index 27d626cccf2a..625631eb34ee 100644
--- a/src/chrome/content/rules/dinglisch.net.xml
+++ b/src/chrome/content/rules/dinglisch.net.xml
@@ -1,5 +1,5 @@
 
 
 	
diff --git a/src/chrome/content/rules/dinside.no.xml b/src/chrome/content/rules/dinside.no.xml
index caad13424955..22597aff74dd 100644
--- a/src/chrome/content/rules/dinside.no.xml
+++ b/src/chrome/content/rules/dinside.no.xml
@@ -21,12 +21,12 @@
 	Mixed content:
 
 		- css, on:
-		
+
 			- testpilot from $self ˢ
 			- testpilot, www from fonts.googleapis.com ˢ
 
 		- Images, on:
-		
+
 			- testpilot from $self ˢ
 			- www from gfx.dagbladet.no ˢ
 			- www from bilde.dinside.no ʳ
diff --git a/src/chrome/content/rules/dionyziz.com.xml b/src/chrome/content/rules/dionyziz.com.xml
index 9cf3f32288be..d5f57782e3e1 100644
--- a/src/chrome/content/rules/dionyziz.com.xml
+++ b/src/chrome/content/rules/dionyziz.com.xml
@@ -1,7 +1,7 @@
 
 	
 	
-	
+
 	
 
 	
diff --git a/src/chrome/content/rules/direxion.xml b/src/chrome/content/rules/direxion.xml
new file mode 100644
index 000000000000..824f584a1cc1
--- /dev/null
+++ b/src/chrome/content/rules/direxion.xml
@@ -0,0 +1,20 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/divShare.xml b/src/chrome/content/rules/divShare.xml
index bcd04e5475a7..0e1dd0c6c3ce 100644
--- a/src/chrome/content/rules/divShare.xml
+++ b/src/chrome/content/rules/divShare.xml
@@ -24,7 +24,7 @@ Fetch error: http://divshare.com/ => https://www.divshare.com/: (28, 'Connection
 	* Secured by us
 
 -->
-
+
 
 	
@@ -39,7 +39,7 @@ Fetch error: http://divshare.com/ => https://www.divshare.com/: (28, 'Connection
 					-->
 	
 
-	
+	
 
 
 	
-
-	
-	
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/diymealbox.com.xml b/src/chrome/content/rules/diymealbox.com.xml
deleted file mode 100644
index f5e35fb66b91..000000000000
--- a/src/chrome/content/rules/diymealbox.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/dltags.com.xml b/src/chrome/content/rules/dltags.com.xml
index cd07659fb976..6a756550e631 100644
--- a/src/chrome/content/rules/dltags.com.xml
+++ b/src/chrome/content/rules/dltags.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://dltags.com/ => https://dltags.com/: (7, 'Failed to connect t
 Fetch error: http://www.dltags.com/ => https://www.dltags.com/: (7, 'Failed to connect to www.dltags.com port 443: Connection refused')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/dlvr.it.xml b/src/chrome/content/rules/dlvr.it.xml
index 7fab4250f6c5..23e046734d04 100644
--- a/src/chrome/content/rules/dlvr.it.xml
+++ b/src/chrome/content/rules/dlvr.it.xml
@@ -42,8 +42,8 @@
 
 	
-	
-	
 
 
diff --git a/src/chrome/content/rules/dmalloc.com.xml b/src/chrome/content/rules/dmalloc.com.xml
new file mode 100644
index 000000000000..5a7df759c2c3
--- /dev/null
+++ b/src/chrome/content/rules/dmalloc.com.xml
@@ -0,0 +1,5 @@
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/dniester.ru.xml b/src/chrome/content/rules/dniester.ru.xml
deleted file mode 100644
index 18d22ff603fe..000000000000
--- a/src/chrome/content/rules/dniester.ru.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-	
-	
-	
-
diff --git a/src/chrome/content/rules/dns-shop.ru.xml b/src/chrome/content/rules/dns-shop.ru.xml
deleted file mode 100644
index 7c1b64c6f0dd..000000000000
--- a/src/chrome/content/rules/dns-shop.ru.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/dns4torpnlfs2ifuz2s2yf3fc7rdmsbhm6rw75euj35pac6ap25zgqad.onion.xml b/src/chrome/content/rules/dns4torpnlfs2ifuz2s2yf3fc7rdmsbhm6rw75euj35pac6ap25zgqad.onion.xml
new file mode 100644
index 000000000000..5f5a99d478e6
--- /dev/null
+++ b/src/chrome/content/rules/dns4torpnlfs2ifuz2s2yf3fc7rdmsbhm6rw75euj35pac6ap25zgqad.onion.xml
@@ -0,0 +1,14 @@
+
+
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/docin.xml b/src/chrome/content/rules/docin.xml
new file mode 100644
index 000000000000..d5d6ebc02f2d
--- /dev/null
+++ b/src/chrome/content/rules/docin.xml
@@ -0,0 +1,45 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/docs.tw.xml b/src/chrome/content/rules/docs.tw.xml
deleted file mode 100644
index 8c391d467c5c..000000000000
--- a/src/chrome/content/rules/docs.tw.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/dods.co.uk.xml b/src/chrome/content/rules/dods.co.uk.xml
index 528b8e9b58c8..d43117d87f1c 100644
--- a/src/chrome/content/rules/dods.co.uk.xml
+++ b/src/chrome/content/rules/dods.co.uk.xml
@@ -7,7 +7,7 @@ Fetch error: http://media.dods.co.uk/ => https://media.dods.co.uk/: (60, 'SSL ce
 	www.dods.co.uk: dropped
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/dof.gob.mx.xml b/src/chrome/content/rules/dof.gob.mx.xml
new file mode 100644
index 000000000000..6bf36db4a77d
--- /dev/null
+++ b/src/chrome/content/rules/dof.gob.mx.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/dol.gov.xml b/src/chrome/content/rules/dol.gov.xml
index 5a132d2dc3ed..bf2ddc5f5f8d 100644
--- a/src/chrome/content/rules/dol.gov.xml
+++ b/src/chrome/content/rules/dol.gov.xml
@@ -41,12 +41,12 @@ Fetch error: http://jobcorps.dol.gov/ => https://jobcorps.dol.gov/: (60, 'SSL ce
 	Mixed content:
 
 		- css, on:
-		
+
 			- developer from fonts.googleapis.com ˢ
 			- webapps from www.dol.gov ˢ
 
 		- Images, on:
-		
+
 			- api, savingmatters from www.dol.gov ˢ
 			- www.oalj, www from $self ˢ
 
@@ -56,7 +56,7 @@ Fetch error: http://jobcorps.dol.gov/ => https://jobcorps.dol.gov/: (60, 'SSL ce
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/domainsite.com.xml b/src/chrome/content/rules/domainsite.com.xml
index 24e6b4ea0a4f..917c92b95c1e 100644
--- a/src/chrome/content/rules/domainsite.com.xml
+++ b/src/chrome/content/rules/domainsite.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.domainsite.com/ => https://www.domainsite.com/: (60, 'SS
 	For other Name.com coverage, see Name.com.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/domtele.com.xml b/src/chrome/content/rules/domtele.com.xml
index 3316e1df51af..919276dadc32 100644
--- a/src/chrome/content/rules/domtele.com.xml
+++ b/src/chrome/content/rules/domtele.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.domtele.com/ => https://www.domtele.com/: (60, 'SSL cert
 
 dev.domtele.com mismatch
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/dongleauth.info.xml b/src/chrome/content/rules/dongleauth.info.xml
new file mode 100644
index 000000000000..405cd249b33b
--- /dev/null
+++ b/src/chrome/content/rules/dongleauth.info.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/donmai.us.xml b/src/chrome/content/rules/donmai.us.xml
index 8bddc96bcea0..d319c43a837f 100644
--- a/src/chrome/content/rules/donmai.us.xml
+++ b/src/chrome/content/rules/donmai.us.xml
@@ -1,4 +1,4 @@
-
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/dosbox.xml b/src/chrome/content/rules/dosbox.xml
index 862ae1bfda4a..a582869c6bbc 100644
--- a/src/chrome/content/rules/dosbox.xml
+++ b/src/chrome/content/rules/dosbox.xml
@@ -5,11 +5,8 @@
 	
 	
 	
-	
 	
 	
-	
-	
 	
 	
 
diff --git a/src/chrome/content/rules/douban.fm.xml b/src/chrome/content/rules/douban.fm.xml
index 426296eb285f..4f413b987248 100644
--- a/src/chrome/content/rules/douban.fm.xml
+++ b/src/chrome/content/rules/douban.fm.xml
@@ -1,36 +1,14 @@
 
 
-
-	
 	
-
-	
 	
 
-
-	
-	
-
 	
 
+	
 
-	
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/doubanio.com.xml b/src/chrome/content/rules/doubanio.com.xml
index 014ba3367419..a05ca720e07c 100644
--- a/src/chrome/content/rules/doubanio.com.xml
+++ b/src/chrome/content/rules/doubanio.com.xml
@@ -1,32 +1,25 @@
-
 
-
+
 	
 	
 	
 	
+		
 	
-	
+		
+	
 	
 	
-		
-		
 		
 	
 
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/dpfile.com.xml b/src/chrome/content/rules/dpfile.com.xml
index 759aa3b69e8d..7b78a763ea07 100644
--- a/src/chrome/content/rules/dpfile.com.xml
+++ b/src/chrome/content/rules/dpfile.com.xml
@@ -18,11 +18,11 @@
 		
 
 	
-	
+
 	
 	
 	
-	
+
 		
 		
 		
@@ -40,11 +40,11 @@
 		
 		
 		
-	
+
 		
 		
 		
 		
 		
-		
+
 
diff --git a/src/chrome/content/rules/draisberghof.de.xml b/src/chrome/content/rules/draisberghof.de.xml
new file mode 100644
index 000000000000..b4a2b030083f
--- /dev/null
+++ b/src/chrome/content/rules/draisberghof.de.xml
@@ -0,0 +1,5 @@
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/dreambox.com.xml b/src/chrome/content/rules/dreambox.com.xml
index 166767438f78..cd32c11128a7 100644
--- a/src/chrome/content/rules/dreambox.com.xml
+++ b/src/chrome/content/rules/dreambox.com.xml
@@ -20,7 +20,7 @@
 	Mixed content:
 
 		- Images, on:
-		
+
 			- www, www2 from $self ˢ
 			- www2 from storage.pardot.com ˢ
 
diff --git a/src/chrome/content/rules/dreampoint.co.uk.xml b/src/chrome/content/rules/dreampoint.co.uk.xml
new file mode 100644
index 000000000000..4040d3d1e3c5
--- /dev/null
+++ b/src/chrome/content/rules/dreampoint.co.uk.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/dribper.com.xml b/src/chrome/content/rules/dribper.com.xml
deleted file mode 100644
index 6a831cc271e5..000000000000
--- a/src/chrome/content/rules/dribper.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/driving.co.uk.xml b/src/chrome/content/rules/driving.co.uk.xml
index 0b6f233e2bce..070413360b06 100644
--- a/src/chrome/content/rules/driving.co.uk.xml
+++ b/src/chrome/content/rules/driving.co.uk.xml
@@ -13,7 +13,7 @@ Non-2xx HTTP code: http://www.driving.co.uk/ (200) => https://www.driving.co.uk/
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/drmemory.org.xml b/src/chrome/content/rules/drmemory.org.xml
new file mode 100644
index 000000000000..136dbf808f60
--- /dev/null
+++ b/src/chrome/content/rules/drmemory.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/duapp.com.xml b/src/chrome/content/rules/duapp.com.xml
deleted file mode 100644
index c61650dbb2d6..000000000000
--- a/src/chrome/content/rules/duapp.com.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/duoshuo.com.xml b/src/chrome/content/rules/duoshuo.com.xml
index c70ee85ea1ec..e33f0e17e02e 100644
--- a/src/chrome/content/rules/duoshuo.com.xml
+++ b/src/chrome/content/rules/duoshuo.com.xml
@@ -29,11 +29,11 @@ Fetch error: http://weishanghuoyuan.duoshuo.com/ => https://weishanghuoyuan.duos
 		dev
 -->
 
-
+
 
 	
 	
-	
+
 	
 	
 	
@@ -55,7 +55,7 @@ Fetch error: http://weishanghuoyuan.duoshuo.com/ => https://weishanghuoyuan.duos
 	
 	
 	
-	
+
 	
 
 
diff --git a/src/chrome/content/rules/dvalert.org.au.xml b/src/chrome/content/rules/dvalert.org.au.xml
index 16ae61fcc6cd..d0a7b2b05291 100644
--- a/src/chrome/content/rules/dvalert.org.au.xml
+++ b/src/chrome/content/rules/dvalert.org.au.xml
@@ -1,4 +1,4 @@
-	
+
 	
 	
 
diff --git a/src/chrome/content/rules/dvdsreleasedates.com.xml b/src/chrome/content/rules/dvdsreleasedates.com.xml
index aa098d08073f..7079a27781fd 100644
--- a/src/chrome/content/rules/dvdsreleasedates.com.xml
+++ b/src/chrome/content/rules/dvdsreleasedates.com.xml
@@ -3,7 +3,7 @@
 		- $self		(certificate mismatch)
 		- s0		(certificate mismatch)
 		- s1		(certificate mismatch)
-			
+
 -->
 
 
@@ -15,7 +15,7 @@
 	
 	
-		
+
 	
 
diff --git a/src/chrome/content/rules/dwnews.com-mixedcontent.xml b/src/chrome/content/rules/dwnews.com-mixedcontent.xml
new file mode 100644
index 000000000000..a309640827d9
--- /dev/null
+++ b/src/chrome/content/rules/dwnews.com-mixedcontent.xml
@@ -0,0 +1,25 @@
+
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/dwnews.net.xml b/src/chrome/content/rules/dwnews.net.xml
new file mode 100644
index 000000000000..2b2f6bbd72b9
--- /dev/null
+++ b/src/chrome/content/rules/dwnews.net.xml
@@ -0,0 +1,43 @@
+
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/dxy.com.xml b/src/chrome/content/rules/dxy.com.xml
index f9847141ee50..e5c46611d389 100644
--- a/src/chrome/content/rules/dxy.com.xml
+++ b/src/chrome/content/rules/dxy.com.xml
@@ -1,20 +1,17 @@
 
-
 
-	
-	
-
 	
+	
 	
+		
 	
 	
 
diff --git a/src/chrome/content/rules/dynamic1001.eu.xml b/src/chrome/content/rules/dynamic1001.eu.xml
index 551ec03465d9..110e7dc98288 100644
--- a/src/chrome/content/rules/dynamic1001.eu.xml
+++ b/src/chrome/content/rules/dynamic1001.eu.xml
@@ -21,7 +21,7 @@ Fetch error: http://www.customercenter.dynamic1001.eu/ => https://www.customerce
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/dyncdn.me.xml b/src/chrome/content/rules/dyncdn.me.xml
deleted file mode 100644
index 3bd63465300a..000000000000
--- a/src/chrome/content/rules/dyncdn.me.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/e17-stuff.org.xml b/src/chrome/content/rules/e17-stuff.org.xml
deleted file mode 100644
index d9192579d8a2..000000000000
--- a/src/chrome/content/rules/e17-stuff.org.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/eGenix.xml b/src/chrome/content/rules/eGenix.xml
index 8a5cea3a95a7..e4df73d4985e 100644
--- a/src/chrome/content/rules/eGenix.xml
+++ b/src/chrome/content/rules/eGenix.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://lists.egenix.com/ => https://lists.egenix.com/: (51, "SSL: no alternative certificate subject name matches target host name 'lists.egenix.com'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/eHarmony.xml b/src/chrome/content/rules/eHarmony.xml
index 568fc0b48920..3ee11efc2bbd 100644
--- a/src/chrome/content/rules/eHarmony.xml
+++ b/src/chrome/content/rules/eHarmony.xml
@@ -20,7 +20,7 @@
 	
 
 	
-	
+	
 
 	
 	
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/eIPOCIMB.com.xml b/src/chrome/content/rules/eIPOCIMB.com.xml
new file mode 100644
index 000000000000..cd979f9bb32d
--- /dev/null
+++ b/src/chrome/content/rules/eIPOCIMB.com.xml
@@ -0,0 +1,13 @@
+
+
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/eNovance.xml b/src/chrome/content/rules/eNovance.xml
index 34d8338d61c4..a2fe6d0ed97f 100644
--- a/src/chrome/content/rules/eNovance.xml
+++ b/src/chrome/content/rules/eNovance.xml
@@ -38,7 +38,7 @@ Fetch error: http://www.enocloud.com/ => https://www.enovance.com/: (60, 'SSL ce
 	² Unsecurable <= redirects to http
 
 -->
-
+
 
 	
@@ -51,7 +51,7 @@ Fetch error: http://www.enocloud.com/ => https://www.enovance.com/: (60, 'SSL ce
 	
 
 
-	
+	
 
 
 	
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/earlychildhoodcolorado.org.xml b/src/chrome/content/rules/earlychildhoodcolorado.org.xml
new file mode 100644
index 000000000000..3f560e0596fe
--- /dev/null
+++ b/src/chrome/content/rules/earlychildhoodcolorado.org.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/east.ru.xml b/src/chrome/content/rules/east.ru.xml
index 2a523fef43ee..0cf165ea1442 100644
--- a/src/chrome/content/rules/east.ru.xml
+++ b/src/chrome/content/rules/east.ru.xml
@@ -12,7 +12,7 @@ mspk.east.ru self signed
 skazka.east.ru self signed
 vok.east.ru self signed
 -->
-
+
 	
 
 	
diff --git a/src/chrome/content/rules/ebay.at.xml b/src/chrome/content/rules/ebay.at.xml
index dbd964d36b02..da9c794171c9 100644
--- a/src/chrome/content/rules/ebay.at.xml
+++ b/src/chrome/content/rules/ebay.at.xml
@@ -1,8 +1,8 @@
 
+
+
+	
+	
+		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/ebay.com.au.xml b/src/chrome/content/rules/ebay.com.au.xml
index 7193154627e6..137200d77d11 100644
--- a/src/chrome/content/rules/ebay.com.au.xml
+++ b/src/chrome/content/rules/ebay.com.au.xml
@@ -1,10 +1,10 @@
 
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ebay.com.xml b/src/chrome/content/rules/ebay.com.xml
index e1309c57b4b6..4e7b88c3d084 100644
--- a/src/chrome/content/rules/ebay.com.xml
+++ b/src/chrome/content/rules/ebay.com.xml
@@ -1,4 +1,9 @@
 
 	
 	
 	
-	
+	
 	
-	
+	
 	
 	
 	
 	
-	
+	
 	
 	
 	
 	
-	
+	
 	
 	
-	
+	
 	
-	
+	
 	
-	
+	
 	
 	
 	
 	
 	
-	
+	
 
 	
 	
 	
 	
-	
 	
 	
 	
@@ -161,11 +172,9 @@
 	
 	
 	
-	
 	
 	
 	
-	
 	
 	
 	
@@ -175,7 +184,6 @@
 	
 	
 	
-	
 	
 	
 	
@@ -189,18 +197,15 @@
 	
 	
 	
-	
 	
 	
 	
-	
 	
-	
+	
 	
 	
 	
 	
-	
 	
 	
 	
@@ -216,7 +221,6 @@
 	
 	
 	
-	
 	
 	
 	
@@ -224,7 +228,6 @@
 	
 	
 	
-	
 	
 	
 	
@@ -235,16 +238,13 @@
 	
 	
 	
-	
 	
 	
 	
 	
 	
 	
-	
 	
-	
 	
 	
 	
@@ -255,12 +255,10 @@
 	
 	
 	
-	
 	
 	
 	
 	
-	
 	
 	
 	
@@ -268,29 +266,20 @@
 	
 	
 	
-	
 	
-	
-	
 	
 	
 	
 	
-	
 	
 	
 	
-	
-	
 	
-	
 	
 	
 	
 	
 	
-	
-	
 	
 	
 	
diff --git a/src/chrome/content/rules/ebay.es.xml b/src/chrome/content/rules/ebay.es.xml
index 27c2d35673ce..4505e566f8b9 100644
--- a/src/chrome/content/rules/ebay.es.xml
+++ b/src/chrome/content/rules/ebay.es.xml
@@ -1,10 +1,10 @@
 
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/ebayimg.com.xml b/src/chrome/content/rules/ebayimg.com.xml
index e06408ff7dc2..7df6d6bba496 100644
--- a/src/chrome/content/rules/ebayimg.com.xml
+++ b/src/chrome/content/rules/ebayimg.com.xml
@@ -1,7 +1,7 @@
 
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ebaystatic.com.xml b/src/chrome/content/rules/ebaystatic.com.xml
index 265a6d2f20ad..56d2f2a003d6 100644
--- a/src/chrome/content/rules/ebaystatic.com.xml
+++ b/src/chrome/content/rules/ebaystatic.com.xml
@@ -1,10 +1,10 @@
 
-
+
     
     
     
diff --git a/src/chrome/content/rules/ecoast.com.tw.xml b/src/chrome/content/rules/ecoast.com.tw.xml
new file mode 100644
index 000000000000..0a4f2f6acde4
--- /dev/null
+++ b/src/chrome/content/rules/ecoast.com.tw.xml
@@ -0,0 +1,7 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/edens.com.xml b/src/chrome/content/rules/edens.com.xml
new file mode 100644
index 000000000000..0f83f928b470
--- /dev/null
+++ b/src/chrome/content/rules/edens.com.xml
@@ -0,0 +1,10 @@
+
+	
+	
+
+	
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/edgefonts.net.xml b/src/chrome/content/rules/edgefonts.net.xml
new file mode 100644
index 000000000000..d4106e6f4860
--- /dev/null
+++ b/src/chrome/content/rules/edgefonts.net.xml
@@ -0,0 +1,6 @@
+
+		
+
+		
+
diff --git a/src/chrome/content/rules/edina.ac.uk.xml b/src/chrome/content/rules/edina.ac.uk.xml
index 3e81b02e8a37..b67cddde3df4 100644
--- a/src/chrome/content/rules/edina.ac.uk.xml
+++ b/src/chrome/content/rules/edina.ac.uk.xml
@@ -25,7 +25,7 @@ Fetch error: http://census.edina.ac.uk/ => https://census.edina.ac.uk/: (51, "SS
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/education.gov.uk.xml b/src/chrome/content/rules/education.gov.uk.xml
index 09aa95f7afb9..26f09743761c 100644
--- a/src/chrome/content/rules/education.gov.uk.xml
+++ b/src/chrome/content/rules/education.gov.uk.xml
@@ -65,7 +65,7 @@ Fetch error: http://tableschecking.education.gov.uk/ => https://tableschecking.e
 	ˢ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/educationusa.info.xml b/src/chrome/content/rules/educationusa.info.xml
deleted file mode 100644
index 2a26ff4ad0ad..000000000000
--- a/src/chrome/content/rules/educationusa.info.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/eduserv.org.uk.xml b/src/chrome/content/rules/eduserv.org.uk.xml
index 200a18e0ffa6..0b2215ea878c 100644
--- a/src/chrome/content/rules/eduserv.org.uk.xml
+++ b/src/chrome/content/rules/eduserv.org.uk.xml
@@ -8,7 +8,7 @@
 		- swalive ᵐ
 
 	ᵐ Mismatched
-	
+
 
 	Insecure cookies are set for these domains and hosts: ᶜ
 
@@ -23,7 +23,7 @@
 
 		- css on (www.)? from fonts.googleapis.com ˢ
 		- Bug on (www.)? from www.final-azr-01.com ᵐ
-	
+
 	ᵐ Not secured by us <= mismatched
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
diff --git a/src/chrome/content/rules/edustore.fi.xml b/src/chrome/content/rules/edustore.fi.xml
new file mode 100644
index 000000000000..f952485ae15a
--- /dev/null
+++ b/src/chrome/content/rules/edustore.fi.xml
@@ -0,0 +1,13 @@
+
+
+		
+		
+
+		
+
diff --git a/src/chrome/content/rules/eforms.gov.ie.xml b/src/chrome/content/rules/eforms.gov.ie.xml
deleted file mode 100644
index b393ac5d7d57..000000000000
--- a/src/chrome/content/rules/eforms.gov.ie.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/efsyn.gr.xml b/src/chrome/content/rules/efsyn.gr.xml
index 5884daa6679e..dbbe486b563e 100644
--- a/src/chrome/content/rules/efsyn.gr.xml
+++ b/src/chrome/content/rules/efsyn.gr.xml
@@ -10,7 +10,7 @@ Fetch error: http://efsyn.gr/ => https://efsyn.gr/: (51, "SSL: no alternative ce
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/egl.lv.xml b/src/chrome/content/rules/egl.lv.xml
new file mode 100644
index 000000000000..1621e07ebc58
--- /dev/null
+++ b/src/chrome/content/rules/egl.lv.xml
@@ -0,0 +1,6 @@
+
+  
+  
+
+  
+
diff --git a/src/chrome/content/rules/eigenLab.xml b/src/chrome/content/rules/eigenLab.xml
index c0a65f871bec..5a90bf16c1de 100644
--- a/src/chrome/content/rules/eigenLab.xml
+++ b/src/chrome/content/rules/eigenLab.xml
@@ -1,8 +1,8 @@
 
 
diff --git a/src/chrome/content/rules/ejtaal.net.xml b/src/chrome/content/rules/ejtaal.net.xml
index ec1e9c5246dc..1900aea46f14 100644
--- a/src/chrome/content/rules/ejtaal.net.xml
+++ b/src/chrome/content/rules/ejtaal.net.xml
@@ -1,8 +1,8 @@
 
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/elections.bc.ca.xml b/src/chrome/content/rules/elections.bc.ca.xml
new file mode 100644
index 000000000000..403b915c1c5b
--- /dev/null
+++ b/src/chrome/content/rules/elections.bc.ca.xml
@@ -0,0 +1,15 @@
+
+	
+	
+	
+  
+	
+	
+	
+	
+	
+	
+	
+  
+	
+
diff --git a/src/chrome/content/rules/electric-cloud.com.xml b/src/chrome/content/rules/electric-cloud.com.xml
index 73ba0a19ba6d..f0110987ecd0 100644
--- a/src/chrome/content/rules/electric-cloud.com.xml
+++ b/src/chrome/content/rules/electric-cloud.com.xml
@@ -7,7 +7,7 @@ cdn.electric-cloud.com mismatch
 docs.electric-cloud.com mismatch
 downloads.electric-cloud.com mismatch
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/electroneum.com.xml b/src/chrome/content/rules/electroneum.com.xml
new file mode 100644
index 000000000000..70aa9efbc113
--- /dev/null
+++ b/src/chrome/content/rules/electroneum.com.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/elgoog.im.xml b/src/chrome/content/rules/elgoog.im.xml
deleted file mode 100644
index 02eb214eb0ee..000000000000
--- a/src/chrome/content/rules/elgoog.im.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/elkosmasgr.xml b/src/chrome/content/rules/elkosmasgr.xml
index 3cba3ad88d85..96ac9029a035 100644
--- a/src/chrome/content/rules/elkosmasgr.xml
+++ b/src/chrome/content/rules/elkosmasgr.xml
@@ -8,7 +8,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.elkosmas.gr/ => https://elkosmas.gr/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 Fetch error: http://elkosmas.gr/ => https://elkosmas.gr/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/elm-lang.org.xml b/src/chrome/content/rules/elm-lang.org.xml
new file mode 100644
index 000000000000..e32dea5a7b1c
--- /dev/null
+++ b/src/chrome/content/rules/elm-lang.org.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/elrippoisland.net.xml b/src/chrome/content/rules/elrippoisland.net.xml
index eddd723008df..d67a13230c16 100644
--- a/src/chrome/content/rules/elrippoisland.net.xml
+++ b/src/chrome/content/rules/elrippoisland.net.xml
@@ -2,7 +2,7 @@
 	NB: Server sends no certificate chain, see https://whatsmychaincert.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/email-comparethemarket.com.xml b/src/chrome/content/rules/email-comparethemarket.com.xml
index 300b616237ca..a64903e8b1f1 100644
--- a/src/chrome/content/rules/email-comparethemarket.com.xml
+++ b/src/chrome/content/rules/email-comparethemarket.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://email-comparethemarket.com/ => https://email-comparethemarke
 		- email-comparethemarket.com
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/emailarchivestaskforce.org.xml b/src/chrome/content/rules/emailarchivestaskforce.org.xml
new file mode 100644
index 000000000000..67b82ac84d95
--- /dev/null
+++ b/src/chrome/content/rules/emailarchivestaskforce.org.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/eme.moe.xml b/src/chrome/content/rules/eme.moe.xml
deleted file mode 100644
index fda768347190..000000000000
--- a/src/chrome/content/rules/eme.moe.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/emfcamp.org.xml b/src/chrome/content/rules/emfcamp.org.xml
index 02dab52e391f..a0db9534a2ae 100644
--- a/src/chrome/content/rules/emfcamp.org.xml
+++ b/src/chrome/content/rules/emfcamp.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://wiki-archive.emfcamp.org/ => https://wiki-archive.emfcamp.org/: (51, "SSL: no alternative certificate subject name matches target host name 'wiki-archive.emfcamp.org'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/empireblue.com.xml b/src/chrome/content/rules/empireblue.com.xml
index 1e753a146179..06249b051aeb 100644
--- a/src/chrome/content/rules/empireblue.com.xml
+++ b/src/chrome/content/rules/empireblue.com.xml
@@ -56,11 +56,11 @@ Fetch error: http://enrollment-info.empireblue.com/ => https://enrollment-info.e
 
 			- transformationcentral from transformation-central.com
 			- transformationcentral from www.transformation-central.com
-	
+
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/emssoftware.com.xml b/src/chrome/content/rules/emssoftware.com.xml
index a1ebbb3c8a6d..78bb7dbc609d 100644
--- a/src/chrome/content/rules/emssoftware.com.xml
+++ b/src/chrome/content/rules/emssoftware.com.xml
@@ -21,7 +21,7 @@ Non-2xx HTTP code: http://pages.emssoftware.com/rs/486-ESV-129/images/download-n
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/emucr.com.xml b/src/chrome/content/rules/emucr.com.xml
new file mode 100644
index 000000000000..fc301165696c
--- /dev/null
+++ b/src/chrome/content/rules/emucr.com.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/emule-rus.net.xml b/src/chrome/content/rules/emule-rus.net.xml
new file mode 100644
index 000000000000..6dc4147f5185
--- /dev/null
+++ b/src/chrome/content/rules/emule-rus.net.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/emule-security.org.xml b/src/chrome/content/rules/emule-security.org.xml
index 9d8ca276d847..0388c21f1f90 100644
--- a/src/chrome/content/rules/emule-security.org.xml
+++ b/src/chrome/content/rules/emule-security.org.xml
@@ -1,14 +1,16 @@
 
-
+
+	
+	
+	
 	
+	
+	
 	
+	
 
 	
 
diff --git a/src/chrome/content/rules/emuvr.net.xml b/src/chrome/content/rules/emuvr.net.xml
new file mode 100644
index 000000000000..059ddd4ff960
--- /dev/null
+++ b/src/chrome/content/rules/emuvr.net.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/endgame.com.xml b/src/chrome/content/rules/endgame.com.xml
index 2121adb7dee5..d12ef8ea17ec 100644
--- a/src/chrome/content/rules/endgame.com.xml
+++ b/src/chrome/content/rules/endgame.com.xml
@@ -11,7 +11,7 @@ Non-2xx HTTP code: http://pages.endgame.com/rs/endgame/images/f-logo.png (200) =
 	ᵃ Marketo / shows another domain
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/enterbrain.co.jp.xml b/src/chrome/content/rules/enterbrain.co.jp.xml
index ea3000ddd954..ebf885e29caa 100644
--- a/src/chrome/content/rules/enterbrain.co.jp.xml
+++ b/src/chrome/content/rules/enterbrain.co.jp.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.enterbrain.co.jp/ => https://www.enterbrain.co.jp/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/environment-agency.gov.uk.xml b/src/chrome/content/rules/environment-agency.gov.uk.xml
index 78af615107d6..5fd32bb606b6 100644
--- a/src/chrome/content/rules/environment-agency.gov.uk.xml
+++ b/src/chrome/content/rules/environment-agency.gov.uk.xml
@@ -61,7 +61,7 @@ Fetch error: http://learning.environment-agency.gov.uk/ => https://learning.envi
 		- piedc.environment-agency.gov.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/epsxe.com.xml b/src/chrome/content/rules/epsxe.com.xml
new file mode 100644
index 000000000000..346f38b90d69
--- /dev/null
+++ b/src/chrome/content/rules/epsxe.com.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/eschools.co.uk.xml b/src/chrome/content/rules/eschools.co.uk.xml
index 9738c3717c88..d6dd20845cb7 100644
--- a/src/chrome/content/rules/eschools.co.uk.xml
+++ b/src/chrome/content/rules/eschools.co.uk.xml
@@ -33,14 +33,14 @@ Fetch error: http://www.eschools.co.uk/ => https://www.eschools.co.uk/: (51, "SS
 		- css on 360, 457-northumberland, new-brighton from fonts.googleapis.com ˢ
 
 		- Images, on:
-		
+
 			- castle-hill from i\d+.photobucket.com ˢ
 			- new-brighton from www.computingatschool.org.uk
 
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/esp8266.com.xml b/src/chrome/content/rules/esp8266.com.xml
new file mode 100644
index 000000000000..6924907921c7
--- /dev/null
+++ b/src/chrome/content/rules/esp8266.com.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/espiv.net-falsemixed.xml b/src/chrome/content/rules/espiv.net-falsemixed.xml
deleted file mode 100644
index 5118d61ea6aa..000000000000
--- a/src/chrome/content/rules/espiv.net-falsemixed.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/espiv.net.xml b/src/chrome/content/rules/espiv.net.xml
index 677698dcc09e..795025b36de0 100644
--- a/src/chrome/content/rules/espiv.net.xml
+++ b/src/chrome/content/rules/espiv.net.xml
@@ -33,12 +33,12 @@
 	Mixed content:
 
 		- css, on:
-		
+
 			- saltadoroi, thersitis from fonts.googleapis.com ˢ
 			- skya from $self
 
 		- Images, on:
-		
+
 			- adelante from adelante.espivblogs.net
 			- adelante from athens.indymedia.org ˢ
 			- adelante from ia.media-imdb.com
diff --git a/src/chrome/content/rules/espivblogs.net-falsemixed.xml b/src/chrome/content/rules/espivblogs.net-falsemixed.xml
deleted file mode 100644
index 656761f02ef2..000000000000
--- a/src/chrome/content/rules/espivblogs.net-falsemixed.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
-	
-
-		
-
-			
-			
-			
-
-		
-
-			
-			
-			
-			
-			
-			
-			
-
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/espivblogs.net.xml b/src/chrome/content/rules/espivblogs.net.xml
index b9f75a253179..11b96682d543 100644
--- a/src/chrome/content/rules/espivblogs.net.xml
+++ b/src/chrome/content/rules/espivblogs.net.xml
@@ -88,14 +88,14 @@
 	Mixed content:
 
 		- iframes, on:
-		
+
 			- adn, agros, anotherdemocracy, apallotriwsh, farmazapatista, pastanaka from www.youtube.com ˢ
 			- ajde, nogoldthess from static.issuu.com ˢ
 			- psalidi from radiopsalidi.fs-dl.net ᵘ
 			- synerga-re from player.vimeo.com ˢ
 
 		- css, on:
-		
+
 			- adespoto-sinafi, aestia, aithrio, anarxikoigalatsiou, aneyarxon, anokatopatision, anwthrwskw, asyrmatos, autodiaxirizomenosyros, bastards, diamedia, espapei, freedomtrekking, immigrants-asoee, kaiussparilus, katalipsi-virwnos-3, katalipsianalipsis, kentauros, koinonikoiatreionfnx, kpapasotiriou, musaferat, nogoldthess, nolagerthess, oikodiktyo, olikiarnisi, paidikostekiftoukselefteria, peiratikokafeneio, proledialers, prosfygika, psalidi, radiofragmata, rioters, saher, sakana, sasta, stekiantipnoia, stepanyantsp, strouga, syl-kat-exarcheion, syneleusivolos, vogliamotutto, zsol from $self ˢ
 			- akay, antifaprotsamou, autonomomath, ekpaideysi, espapei, katalipsi-virwnos-3, katalipsimithe, sinialo, syl-kat-exarcheion, xanadu from fonts.googleapis.com ˢ
 			- alliotikosxoleio, antifa-ngt, antinertia, atakton, autonomohmmy from $self * ˢ
@@ -184,7 +184,6 @@
 			
 			
 			
-			
 			
 			
 			
@@ -200,7 +199,6 @@
 			
 			
 			
-			
 			
 			
 			
@@ -303,7 +301,6 @@
 		
 		
 		
-		
 		
 		
 		
diff --git a/src/chrome/content/rules/espn.com.xml b/src/chrome/content/rules/espn.com.xml
index 7395bc9ae309..f8d47348fdf8 100644
--- a/src/chrome/content/rules/espn.com.xml
+++ b/src/chrome/content/rules/espn.com.xml
@@ -22,7 +22,7 @@
 		- css on espndeportes, xgames from a.espncdn.com ᵐ
 
 		- Images, on:
-		
+
 			- espndeportes, xgames from a[1-4]?.espncdn.com ᵐ
 			- xgames from pbs.twimg.com ˢ
 
diff --git a/src/chrome/content/rules/etmirror.com.xml b/src/chrome/content/rules/etmirror.com.xml
index 87fab623a48e..820844f68adf 100644
--- a/src/chrome/content/rules/etmirror.com.xml
+++ b/src/chrome/content/rules/etmirror.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://etmirror.com/ => https://etmirror.com/: (28, 'Operation time
 Fetch error: http://www.etmirror.com/ => https://www.etmirror.com/: (28, 'Operation timed out after 30006 milliseconds with 0 bytes received')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/etoro.com-falsemixed.xml b/src/chrome/content/rules/etoro.com-falsemixed.xml
deleted file mode 100644
index 46de4dd58257..000000000000
--- a/src/chrome/content/rules/etoro.com-falsemixed.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-
-	
-
-	
diff --git a/src/chrome/content/rules/etorostatic.com.xml b/src/chrome/content/rules/etorostatic.com.xml
index e9ebdac31049..9e8c076d31d9 100644
--- a/src/chrome/content/rules/etorostatic.com.xml
+++ b/src/chrome/content/rules/etorostatic.com.xml
@@ -1,9 +1,11 @@
 
-
+
 
+	
+	
+	
 	
 
 		
diff --git a/src/chrome/content/rules/etransfer.com.xml b/src/chrome/content/rules/etransfer.com.xml
new file mode 100644
index 000000000000..bdea3668b8d1
--- /dev/null
+++ b/src/chrome/content/rules/etransfer.com.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/europe-miniatures.com.xml b/src/chrome/content/rules/europe-miniatures.com.xml
new file mode 100644
index 000000000000..449b24bfdf99
--- /dev/null
+++ b/src/chrome/content/rules/europe-miniatures.com.xml
@@ -0,0 +1,7 @@
+
+	
+	
+
+	 
+	
+
diff --git a/src/chrome/content/rules/europe1.fr.xml b/src/chrome/content/rules/europe1.fr.xml
index bc4603e113f9..82b5b3c8ba92 100644
--- a/src/chrome/content/rules/europe1.fr.xml
+++ b/src/chrome/content/rules/europe1.fr.xml
@@ -35,13 +35,13 @@ Non-2xx HTTP code: http://blog.europe1.fr/ (200) => https://blog.europe1.fr/ (40
 		club-news.europe1.fr
 		planiweb.europe1.fr (self-signed)
 		rencontres.europe1.fr
-		
+
 	Secure connection failed:
 		avantages.europe1.fr
 		bienvenueauclub.europe1.fr
 		elections.europe1.fr
 		generationseurope1.europe1.fr
-		
+
 	Bad redirection:
 		club.europe1.fr
 		festival-de-cannes.europe1.fr
@@ -54,7 +54,7 @@ Non-2xx HTTP code: http://blog.europe1.fr/ (200) => https://blog.europe1.fr/ (40
 		sport.europe1.fr
 		webradio.europe1.fr
 -->
-
+
 
 	
 	
@@ -62,10 +62,10 @@ Non-2xx HTTP code: http://blog.europe1.fr/ (200) => https://blog.europe1.fr/ (40
 	
 	
 	
-	
+
 	
-			
+
 	
 
 
diff --git a/src/chrome/content/rules/europeana.eu.xml b/src/chrome/content/rules/europeana.eu.xml
index ea667156eaa8..d50430e042bf 100644
--- a/src/chrome/content/rules/europeana.eu.xml
+++ b/src/chrome/content/rules/europeana.eu.xml
@@ -36,7 +36,7 @@ Fetch error: http://www.europeana.eu/ => https://www.europeana.eu/: Too many red
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/evangelische-jugend.de.xml b/src/chrome/content/rules/evangelische-jugend.de.xml
new file mode 100644
index 000000000000..2cfff1a55844
--- /dev/null
+++ b/src/chrome/content/rules/evangelische-jugend.de.xml
@@ -0,0 +1,20 @@
+
+
+
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/eveonline.com.xml b/src/chrome/content/rules/eveonline.com.xml
deleted file mode 100644
index 1fc471789abb..000000000000
--- a/src/chrome/content/rules/eveonline.com.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-	
-	
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/evolutionofsmooth.com.xml b/src/chrome/content/rules/evolutionofsmooth.com.xml
new file mode 100644
index 000000000000..3762bcacda26
--- /dev/null
+++ b/src/chrome/content/rules/evolutionofsmooth.com.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/eweiqi.com.xml b/src/chrome/content/rules/eweiqi.com.xml
index b1c2a119ae4d..1bbc673a4a53 100644
--- a/src/chrome/content/rules/eweiqi.com.xml
+++ b/src/chrome/content/rules/eweiqi.com.xml
@@ -52,6 +52,6 @@
 
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/explainshell.com.xml b/src/chrome/content/rules/explainshell.com.xml
new file mode 100644
index 000000000000..c1b1c98d4e99
--- /dev/null
+++ b/src/chrome/content/rules/explainshell.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/expreview.com.xml b/src/chrome/content/rules/expreview.com.xml
new file mode 100644
index 000000000000..d17ac6a08009
--- /dev/null
+++ b/src/chrome/content/rules/expreview.com.xml
@@ -0,0 +1,13 @@
+
+	
+	
+	
+		
+		
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/extra.to.xml b/src/chrome/content/rules/extra.to.xml
deleted file mode 100644
index 6e47ab365026..000000000000
--- a/src/chrome/content/rules/extra.to.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/extratorrentlive.com.xml b/src/chrome/content/rules/extratorrentlive.com.xml
index 67ecbf406d3e..f0efe0ec737f 100644
--- a/src/chrome/content/rules/extratorrentlive.com.xml
+++ b/src/chrome/content/rules/extratorrentlive.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.extratorrentlive.com/ => https://www.extratorrentlive.co
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/eydap.gr.xml b/src/chrome/content/rules/eydap.gr.xml
index 307d262fc7b4..f55b2952d951 100644
--- a/src/chrome/content/rules/eydap.gr.xml
+++ b/src/chrome/content/rules/eydap.gr.xml
@@ -1,6 +1,6 @@
 
 	
-	
+
 	
 
 	
diff --git a/src/chrome/content/rules/facebook.net.xml b/src/chrome/content/rules/facebook.net.xml
new file mode 100644
index 000000000000..0bf3d7253ffe
--- /dev/null
+++ b/src/chrome/content/rules/facebook.net.xml
@@ -0,0 +1,25 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/fact.group.xml b/src/chrome/content/rules/fact.group.xml
index 35ca7c1f8d6f..70cea7425392 100644
--- a/src/chrome/content/rules/fact.group.xml
+++ b/src/chrome/content/rules/fact.group.xml
@@ -5,10 +5,10 @@ Fetch error: http://fact.group/ => https://fact.group/: (60, 'SSL certificate pr
 Fetch error: http://www.fact.group/ => https://www.fact.group/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
     
     
-                                                      
+
     
 
diff --git a/src/chrome/content/rules/factor.io.xml b/src/chrome/content/rules/factor.io.xml
index 634e4f9c5676..d9b8de6b0332 100644
--- a/src/chrome/content/rules/factor.io.xml
+++ b/src/chrome/content/rules/factor.io.xml
@@ -8,10 +8,10 @@ Fetch error: http://www.factor.io/ => https://factor.io/: (6, 'Could not resolve
 www.factor.io timed out
 docs.factor.io timed out
 -->
-
+
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/fairoa.org.xml b/src/chrome/content/rules/fairoa.org.xml
deleted file mode 100644
index fae891c25c75..000000000000
--- a/src/chrome/content/rules/fairoa.org.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/familycouncil.gov.hk.xml b/src/chrome/content/rules/familycouncil.gov.hk.xml
new file mode 100644
index 000000000000..e34c8ae7e050
--- /dev/null
+++ b/src/chrome/content/rules/familycouncil.gov.hk.xml
@@ -0,0 +1,9 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/fatiguescience.com.xml b/src/chrome/content/rules/fatiguescience.com.xml
new file mode 100644
index 000000000000..61f0254767f5
--- /dev/null
+++ b/src/chrome/content/rules/fatiguescience.com.xml
@@ -0,0 +1,36 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/fbreader.org.xml b/src/chrome/content/rules/fbreader.org.xml
new file mode 100644
index 000000000000..cd9a2aa56be5
--- /dev/null
+++ b/src/chrome/content/rules/fbreader.org.xml
@@ -0,0 +1,14 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/fczbkk.com.xml b/src/chrome/content/rules/fczbkk.com.xml
new file mode 100644
index 000000000000..4c29578dd6c1
--- /dev/null
+++ b/src/chrome/content/rules/fczbkk.com.xml
@@ -0,0 +1,58 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/fedshirevets.gov.xml b/src/chrome/content/rules/fedshirevets.gov.xml
deleted file mode 100644
index 5d77b1c264f9..000000000000
--- a/src/chrome/content/rules/fedshirevets.gov.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/fgdc.gov.xml b/src/chrome/content/rules/fgdc.gov.xml
deleted file mode 100644
index 3240f9e32a10..000000000000
--- a/src/chrome/content/rules/fgdc.gov.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/fh-nuernberg.de.xml b/src/chrome/content/rules/fh-nuernberg.de.xml
new file mode 100644
index 000000000000..5794d00d042b
--- /dev/null
+++ b/src/chrome/content/rules/fh-nuernberg.de.xml
@@ -0,0 +1,35 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/fh-nuernberg.eu.xml b/src/chrome/content/rules/fh-nuernberg.eu.xml
new file mode 100644
index 000000000000..5e55c21f11a7
--- /dev/null
+++ b/src/chrome/content/rules/fh-nuernberg.eu.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/filecrypt.cc.xml b/src/chrome/content/rules/filecrypt.cc.xml
index c09f4bf434f3..2e174b4c4105 100644
--- a/src/chrome/content/rules/filecrypt.cc.xml
+++ b/src/chrome/content/rules/filecrypt.cc.xml
@@ -2,7 +2,7 @@
 
     
     
-    
+
     
 
     
diff --git a/src/chrome/content/rules/filecrypt.co.xml b/src/chrome/content/rules/filecrypt.co.xml
new file mode 100644
index 000000000000..97e19e6ee02d
--- /dev/null
+++ b/src/chrome/content/rules/filecrypt.co.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/filediva.com.xml b/src/chrome/content/rules/filediva.com.xml
new file mode 100644
index 000000000000..ff390bec538e
--- /dev/null
+++ b/src/chrome/content/rules/filediva.com.xml
@@ -0,0 +1,7 @@
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/finlex.xml b/src/chrome/content/rules/finlex.xml
index 35008adaa66d..82620611b91e 100644
--- a/src/chrome/content/rules/finlex.xml
+++ b/src/chrome/content/rules/finlex.xml
@@ -5,9 +5,9 @@ Fetch error: http://finlex.fi/ => https://www.finlex.fi/: (60, 'SSL certificate
 Fetch error: http://www.finlex.fi/ => https://www.finlex.fi/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
   
   
-  
+
 
 
diff --git a/src/chrome/content/rules/fir.im.xml b/src/chrome/content/rules/fir.im.xml
index 6d35e18e622e..39947285dd42 100644
--- a/src/chrome/content/rules/fir.im.xml
+++ b/src/chrome/content/rules/fir.im.xml
@@ -8,12 +8,12 @@ Fetch error: http://tweb.fir.im/ => https://tweb.fir.im/: (28, 'Operation timed
 		firicon.fir.im
 		firimg.fir.im
 		pkg3.fir.im
-	
+
 	Break load forum avatar images in https://firimg.fir.im/ :
 		club.fir.im
 -->
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/firealpaca.com.xml b/src/chrome/content/rules/firealpaca.com.xml
new file mode 100644
index 000000000000..688997313ef2
--- /dev/null
+++ b/src/chrome/content/rules/firealpaca.com.xml
@@ -0,0 +1,7 @@
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/firmstep.com-mixedcontent.xml b/src/chrome/content/rules/firmstep.com-mixedcontent.xml
index e7970d90ff8c..09ff996a526d 100644
--- a/src/chrome/content/rules/firmstep.com-mixedcontent.xml
+++ b/src/chrome/content/rules/firmstep.com-mixedcontent.xml
@@ -7,7 +7,7 @@ Fetch error: http://richmondshire.firmstep.com/ => https://richmondshire.firmste
 	For rules not causing MCB, see firmstep.com.xml.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/firmstep.com.xml b/src/chrome/content/rules/firmstep.com.xml
index 8eaedf577c94..a7e006276849 100644
--- a/src/chrome/content/rules/firmstep.com.xml
+++ b/src/chrome/content/rules/firmstep.com.xml
@@ -20,7 +20,7 @@
 		- blog ᵀ ʳ
 		- chelmsfordawards ʳ
 		- mindtouch ʳ
-	
+
 	ʳ Refused
 	ᵀ Tumblr
 
@@ -63,7 +63,7 @@
 	Mixed content:
 
 		- css, on:
-		
+
 			- charnwood from www.charnwood.gov.uk
 			- charnwood, northlincolnshire, waverly from fonts.googleapis.com ˢ
 			- corbycam, douglas, lancashire from fs-filestore-eu.s3.amazonaws.com ˢ
@@ -79,7 +79,7 @@
 			- waverley from www.waverlay.gov.uk
 
 		- Images, on:
-		
+
 			- richmondshire from assets.govplatform.firmstep.com ᵐ
 			- corbycam from www.firmstep.com ˢ
 			- douglas from douglas.co.im
diff --git a/src/chrome/content/rules/firstdirect.com.xml b/src/chrome/content/rules/firstdirect.com.xml
index f59a30972735..b5073e3e24e1 100644
--- a/src/chrome/content/rules/firstdirect.com.xml
+++ b/src/chrome/content/rules/firstdirect.com.xml
@@ -49,7 +49,7 @@ Fetch error: http://www.lifeinsurance.firstdirect.com/ => https://www.lifeinsura
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/fixstars.com.xml b/src/chrome/content/rules/fixstars.com.xml
index 64bbdc52a016..b2a9c6d0e325 100644
--- a/src/chrome/content/rules/fixstars.com.xml
+++ b/src/chrome/content/rules/fixstars.com.xml
@@ -13,7 +13,7 @@ www.fixstars.com redirects to http
 ⁶ redirect
 ⁷ protocol error
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/flinkster.xml b/src/chrome/content/rules/flinkster.xml
index 80c806f8b750..992673328d5c 100644
--- a/src/chrome/content/rules/flinkster.xml
+++ b/src/chrome/content/rules/flinkster.xml
@@ -2,4 +2,4 @@
   
 
   
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/fliphtml5.com.xml b/src/chrome/content/rules/fliphtml5.com.xml
new file mode 100644
index 000000000000..758e7e142636
--- /dev/null
+++ b/src/chrome/content/rules/fliphtml5.com.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/flippfly.com.xml b/src/chrome/content/rules/flippfly.com.xml
new file mode 100644
index 000000000000..1d98782baea9
--- /dev/null
+++ b/src/chrome/content/rules/flippfly.com.xml
@@ -0,0 +1,33 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/flowersofindia.net.xml b/src/chrome/content/rules/flowersofindia.net.xml
new file mode 100644
index 000000000000..ba2ebf56db1a
--- /dev/null
+++ b/src/chrome/content/rules/flowersofindia.net.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/flyingwith.us.xml b/src/chrome/content/rules/flyingwith.us.xml
new file mode 100644
index 000000000000..2f23601794e6
--- /dev/null
+++ b/src/chrome/content/rules/flyingwith.us.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/flyspray.org.xml b/src/chrome/content/rules/flyspray.org.xml
deleted file mode 100644
index 42773993443c..000000000000
--- a/src/chrome/content/rules/flyspray.org.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/fmu.br.xml b/src/chrome/content/rules/fmu.br.xml
new file mode 100644
index 000000000000..4513148d97f5
--- /dev/null
+++ b/src/chrome/content/rules/fmu.br.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+  
+  
+  
+  
+
+
+	
+
+
diff --git a/src/chrome/content/rules/fmworld.net.xml b/src/chrome/content/rules/fmworld.net.xml
new file mode 100644
index 000000000000..77b98d7779d4
--- /dev/null
+++ b/src/chrome/content/rules/fmworld.net.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/fofa.so.xml b/src/chrome/content/rules/fofa.so.xml
new file mode 100644
index 000000000000..ab2dc3624494
--- /dev/null
+++ b/src/chrome/content/rules/fofa.so.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/fontanka.ru.xml b/src/chrome/content/rules/fontanka.ru.xml
new file mode 100644
index 000000000000..2837f9ee5610
--- /dev/null
+++ b/src/chrome/content/rules/fontanka.ru.xml
@@ -0,0 +1,8 @@
+
+    
+    
+    
+    
+    
+    
+
diff --git a/src/chrome/content/rules/foobar2000.com.xml b/src/chrome/content/rules/foobar2000.com.xml
new file mode 100644
index 000000000000..462704e4208c
--- /dev/null
+++ b/src/chrome/content/rules/foobar2000.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/foobar2000.xml b/src/chrome/content/rules/foobar2000.xml
index 458512cde261..19798306ea2b 100644
--- a/src/chrome/content/rules/foobar2000.xml
+++ b/src/chrome/content/rules/foobar2000.xml
@@ -2,7 +2,7 @@
 
 	
 	
-	
+
 	
-	
+
 	
 
 
diff --git a/src/chrome/content/rules/formsite.com.xml b/src/chrome/content/rules/formsite.com.xml
index 8142b2fff695..189d28b58e5a 100644
--- a/src/chrome/content/rules/formsite.com.xml
+++ b/src/chrome/content/rules/formsite.com.xml
@@ -18,7 +18,7 @@ Fetch error: http://formsite.com/ => https://formsite.com/: (60, 'SSL certificat
 		- www.formsite.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/forum.gigabyte.ru.xml b/src/chrome/content/rules/forum.gigabyte.ru.xml
new file mode 100644
index 000000000000..5d4582fe245d
--- /dev/null
+++ b/src/chrome/content/rules/forum.gigabyte.ru.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/fosshub.xml b/src/chrome/content/rules/fosshub.xml
index 964edac025b1..2b059b6dde42 100644
--- a/src/chrome/content/rules/fosshub.xml
+++ b/src/chrome/content/rules/fosshub.xml
@@ -1,8 +1,8 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/src/chrome/content/rules/foundry.com.xml b/src/chrome/content/rules/foundry.com.xml
new file mode 100644
index 000000000000..2c5e07c8d0d5
--- /dev/null
+++ b/src/chrome/content/rules/foundry.com.xml
@@ -0,0 +1,25 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/fpslreb-crtespf.gc.ca.xml b/src/chrome/content/rules/fpslreb-crtespf.gc.ca.xml
new file mode 100644
index 000000000000..a730bae336f6
--- /dev/null
+++ b/src/chrome/content/rules/fpslreb-crtespf.gc.ca.xml
@@ -0,0 +1,17 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/fraedom.com.xml b/src/chrome/content/rules/fraedom.com.xml
index f78478a14561..179f456dcdb0 100644
--- a/src/chrome/content/rules/fraedom.com.xml
+++ b/src/chrome/content/rules/fraedom.com.xml
@@ -1,8 +1,17 @@
+
 
-	
+	
 
 
 	
-	
-
-	
-
-		
-
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-
 	
 
diff --git a/src/chrome/content/rules/frankfurt-university.de.xml b/src/chrome/content/rules/frankfurt-university.de.xml
new file mode 100644
index 000000000000..375144e52fc8
--- /dev/null
+++ b/src/chrome/content/rules/frankfurt-university.de.xml
@@ -0,0 +1,13 @@
+
+	
+	
+    	
+    	
+    	
+
+	
+    	
+    	
+    
+  
+
diff --git a/src/chrome/content/rules/fraudmetrix.cn.xml b/src/chrome/content/rules/fraudmetrix.cn.xml
index 872111cbe22e..9c27c3e64858 100644
--- a/src/chrome/content/rules/fraudmetrix.cn.xml
+++ b/src/chrome/content/rules/fraudmetrix.cn.xml
@@ -11,6 +11,6 @@
 	
 		
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/freeactionscript.com.xml b/src/chrome/content/rules/freeactionscript.com.xml
new file mode 100644
index 000000000000..2643ad8314fb
--- /dev/null
+++ b/src/chrome/content/rules/freeactionscript.com.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/freeboard.io.xml b/src/chrome/content/rules/freeboard.io.xml
index 27229e564b49..a40de175f113 100644
--- a/src/chrome/content/rules/freeboard.io.xml
+++ b/src/chrome/content/rules/freeboard.io.xml
@@ -1,15 +1,20 @@
 
 
 	
 	
 	
-	
+	
+	
+
 	
 
-	
-
 	
 
diff --git a/src/chrome/content/rules/freech.net.xml b/src/chrome/content/rules/freech.net.xml
deleted file mode 100644
index 5e6367e09f0b..000000000000
--- a/src/chrome/content/rules/freech.net.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/freecode.club.xml b/src/chrome/content/rules/freecode.club.xml
index b8144401dcfc..947c64a197d0 100644
--- a/src/chrome/content/rules/freecode.club.xml
+++ b/src/chrome/content/rules/freecode.club.xml
@@ -5,7 +5,7 @@ Fetch error: http://freecode.club/ => https://freecode.club/: (51, "SSL: no alte
 Fetch error: http://www.freecode.club/ => https://www.freecode.club/: (51, "SSL: no alternative certificate subject name matches target host name 'www.freecode.club'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/freedos.org.xml b/src/chrome/content/rules/freedos.org.xml
new file mode 100644
index 000000000000..aa21fcae0745
--- /dev/null
+++ b/src/chrome/content/rules/freedos.org.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/freeovi.com.xml b/src/chrome/content/rules/freeovi.com.xml
index 9147d0598c74..c19bb504c553 100644
--- a/src/chrome/content/rules/freeovi.com.xml
+++ b/src/chrome/content/rules/freeovi.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://freeovi.com/ => https://www.freeovi.com/: (51, "SSL: no alte
 	^freeovi.com: Refused
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/freerunet.ru.xml b/src/chrome/content/rules/freerunet.ru.xml
index e2e1604fa321..0ccfca26678f 100644
--- a/src/chrome/content/rules/freerunet.ru.xml
+++ b/src/chrome/content/rules/freerunet.ru.xml
@@ -4,7 +4,7 @@ www.freerunet.ru self signed
 
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/freifunk-rhein-neckar.de.xml b/src/chrome/content/rules/freifunk-rhein-neckar.de.xml
index 5c846c7ff8c9..d1f3d44fec4c 100644
--- a/src/chrome/content/rules/freifunk-rhein-neckar.de.xml
+++ b/src/chrome/content/rules/freifunk-rhein-neckar.de.xml
@@ -8,7 +8,7 @@
 		ffrn-c46e1fa11d8a.nodes.ffrn.de
 		survey.ffrn.de
 		webirc.ffrn.de
-	
+
 	Redirect loop:
 		netcheck.ffrn.de
 
diff --git a/src/chrome/content/rules/freshmeat.club.xml b/src/chrome/content/rules/freshmeat.club.xml
index 8f4be74badf6..3131046d2fba 100644
--- a/src/chrome/content/rules/freshmeat.club.xml
+++ b/src/chrome/content/rules/freshmeat.club.xml
@@ -5,7 +5,7 @@ Fetch error: http://freshmeat.club/ => https://freshmeat.club/: (6, 'Could not r
 Fetch error: http://www.freshmeat.club/ => https://www.freshmeat.club/: (6, 'Could not resolve host: www.freshmeat.club')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/from-ua.com.xml b/src/chrome/content/rules/from-ua.com.xml
deleted file mode 100644
index c7a16f346c9a..000000000000
--- a/src/chrome/content/rules/from-ua.com.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-	
-	
-	
-
diff --git a/src/chrome/content/rules/fsrar.ru.xml b/src/chrome/content/rules/fsrar.ru.xml
index c72e6addf7cd..c4429293dadc 100644
--- a/src/chrome/content/rules/fsrar.ru.xml
+++ b/src/chrome/content/rules/fsrar.ru.xml
@@ -26,7 +26,7 @@ askp.fsrar.ru ³
 ² refused
 ³ timed out
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/ftp.rnl.tecnico.ulisboa.pt.xml b/src/chrome/content/rules/ftp.rnl.tecnico.ulisboa.pt.xml
index 73b282e91322..a8f29b0f4a48 100644
--- a/src/chrome/content/rules/ftp.rnl.tecnico.ulisboa.pt.xml
+++ b/src/chrome/content/rules/ftp.rnl.tecnico.ulisboa.pt.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.ftp.rnl.tecnico.ulisboa.pt/ => https://www.ftp.rnl.tecni
   Software mirror provided by
   the Department of Computer Science and Engineering of Tecnico Lisboa.
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/ftsafe.com.xml b/src/chrome/content/rules/ftsafe.com.xml
new file mode 100644
index 000000000000..905fd4a40ebe
--- /dev/null
+++ b/src/chrome/content/rules/ftsafe.com.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/fujitsu-webmart.com.xml b/src/chrome/content/rules/fujitsu-webmart.com.xml
new file mode 100644
index 000000000000..1f066964b4af
--- /dev/null
+++ b/src/chrome/content/rules/fujitsu-webmart.com.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/funke.press.xml b/src/chrome/content/rules/funke.press.xml
new file mode 100644
index 000000000000..20f38d657901
--- /dev/null
+++ b/src/chrome/content/rules/funke.press.xml
@@ -0,0 +1,18 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/funktionstjanster.se.xml b/src/chrome/content/rules/funktionstjanster.se.xml
new file mode 100644
index 000000000000..a9275cddbbd2
--- /dev/null
+++ b/src/chrome/content/rules/funktionstjanster.se.xml
@@ -0,0 +1,34 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/futurezone.de.xml b/src/chrome/content/rules/futurezone.de.xml
new file mode 100644
index 000000000000..0e80859b1048
--- /dev/null
+++ b/src/chrome/content/rules/futurezone.de.xml
@@ -0,0 +1,30 @@
+
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/fuzeqna.com.xml b/src/chrome/content/rules/fuzeqna.com.xml
new file mode 100644
index 000000000000..4d4741663a5f
--- /dev/null
+++ b/src/chrome/content/rules/fuzeqna.com.xml
@@ -0,0 +1,5 @@
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/fvap.gov.xml b/src/chrome/content/rules/fvap.gov.xml
deleted file mode 100644
index a953eef9f89c..000000000000
--- a/src/chrome/content/rules/fvap.gov.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/fvz.io.xml b/src/chrome/content/rules/fvz.io.xml
deleted file mode 100644
index 909334d9a095..000000000000
--- a/src/chrome/content/rules/fvz.io.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/g4s.com.xml b/src/chrome/content/rules/g4s.com.xml
index 6cef66a0c2cb..aefdd3f44ea2 100644
--- a/src/chrome/content/rules/g4s.com.xml
+++ b/src/chrome/content/rules/g4s.com.xml
@@ -88,7 +88,7 @@ Fetch error: http://www.careers.g4s.com/ => https://www.careers.g4s.com/: (51, "
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/gamecraft.cz.xml b/src/chrome/content/rules/gamecraft.cz.xml
index 816662dc098c..c0cc36ae746c 100644
--- a/src/chrome/content/rules/gamecraft.cz.xml
+++ b/src/chrome/content/rules/gamecraft.cz.xml
@@ -5,7 +5,7 @@ Fetch error: http://gamecraft.cz/ => https://gamecraft.cz/: (60, 'SSL certificat
 Fetch error: http://www.gamecraft.cz/ => https://gamecraft.cz/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
     
     
 
diff --git a/src/chrome/content/rules/gamedev.ru.xml b/src/chrome/content/rules/gamedev.ru.xml
new file mode 100644
index 000000000000..0c700858f0bb
--- /dev/null
+++ b/src/chrome/content/rules/gamedev.ru.xml
@@ -0,0 +1,47 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/gamingpastime.com.xml b/src/chrome/content/rules/gamingpastime.com.xml
new file mode 100644
index 000000000000..915c6ebc2f82
--- /dev/null
+++ b/src/chrome/content/rules/gamingpastime.com.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/gardners.com.xml b/src/chrome/content/rules/gardners.com.xml
index d23bfbac4280..174d9ff1c69c 100644
--- a/src/chrome/content/rules/gardners.com.xml
+++ b/src/chrome/content/rules/gardners.com.xml
@@ -6,7 +6,7 @@
 	ᶜ Server sends no certificate chain, see https://whatsmychaincert.com
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/gargoyle.xml b/src/chrome/content/rules/gargoyle.xml
index 7daa317ea954..3820c409c925 100644
--- a/src/chrome/content/rules/gargoyle.xml
+++ b/src/chrome/content/rules/gargoyle.xml
@@ -11,7 +11,7 @@ Fetch error: http://gargoyle-router.com/ => https://gargoyle-router.com/: (51, "
 		- .gargoyle-router.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/gatewaytohomechoice.org.uk.xml b/src/chrome/content/rules/gatewaytohomechoice.org.uk.xml
index a41b00c1050c..436547659ddd 100644
--- a/src/chrome/content/rules/gatewaytohomechoice.org.uk.xml
+++ b/src/chrome/content/rules/gatewaytohomechoice.org.uk.xml
@@ -22,7 +22,7 @@ Fetch error: http://test1.gatewaytohomechoice.org.uk/ => https://test1.gatewayto
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/gawkermediagroup.com.xml b/src/chrome/content/rules/gawkermediagroup.com.xml
index 6a0b36be3075..77b204888df9 100644
--- a/src/chrome/content/rules/gawkermediagroup.com.xml
+++ b/src/chrome/content/rules/gawkermediagroup.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://gawkermediagroup.com/ => https://gawkermediagroup.com/: (60,
 	www.gawkermediagroup.com: Mismatched
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/gazellegames.xml b/src/chrome/content/rules/gazellegames.xml
index cc6138f9f64c..5d7a5b14f092 100644
--- a/src/chrome/content/rules/gazellegames.xml
+++ b/src/chrome/content/rules/gazellegames.xml
@@ -1,6 +1,6 @@
 
   
   
-  
+
 
 
diff --git a/src/chrome/content/rules/geacron.com.xml b/src/chrome/content/rules/geacron.com.xml
new file mode 100644
index 000000000000..a7070b9c4b13
--- /dev/null
+++ b/src/chrome/content/rules/geacron.com.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/genua.de.xml b/src/chrome/content/rules/genua.de.xml
index c125dfe82629..90e97bc93692 100644
--- a/src/chrome/content/rules/genua.de.xml
+++ b/src/chrome/content/rules/genua.de.xml
@@ -3,6 +3,6 @@
 	
 	
 
-	
 
diff --git a/src/chrome/content/rules/geoedge.be.xml b/src/chrome/content/rules/geoedge.be.xml
new file mode 100644
index 000000000000..465f1a814953
--- /dev/null
+++ b/src/chrome/content/rules/geoedge.be.xml
@@ -0,0 +1,22 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/geokrety.org.xml b/src/chrome/content/rules/geokrety.org.xml
index 84846fc980f2..5bec375aaf81 100644
--- a/src/chrome/content/rules/geokrety.org.xml
+++ b/src/chrome/content/rules/geokrety.org.xml
@@ -1,15 +1,15 @@
 
 
 	
 	
 	
-	
+
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/geokretymap.org.xml b/src/chrome/content/rules/geokretymap.org.xml
index 1d1232ad413c..a30bc7577d9c 100644
--- a/src/chrome/content/rules/geokretymap.org.xml
+++ b/src/chrome/content/rules/geokretymap.org.xml
@@ -1,11 +1,11 @@
 
 	
-	
+
 	
 	
-	
+
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/get.no.xml b/src/chrome/content/rules/get.no.xml
index f057244cfe9d..79c1b83d639d 100644
--- a/src/chrome/content/rules/get.no.xml
+++ b/src/chrome/content/rules/get.no.xml
@@ -37,7 +37,7 @@ Fetch error: http://zendesk.get.no/ => https://zendesk.get.no/: Too many redirec
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ghosthousecreative.com.xml b/src/chrome/content/rules/ghosthousecreative.com.xml
new file mode 100644
index 000000000000..6cb7207c4233
--- /dev/null
+++ b/src/chrome/content/rules/ghosthousecreative.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/gigablast.com.xml b/src/chrome/content/rules/gigablast.com.xml
new file mode 100644
index 000000000000..131f8bb13c85
--- /dev/null
+++ b/src/chrome/content/rules/gigablast.com.xml
@@ -0,0 +1,8 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/gimp.org.xml b/src/chrome/content/rules/gimp.org.xml
index 6d6a65778ac4..e9c203236b6c 100644
--- a/src/chrome/content/rules/gimp.org.xml
+++ b/src/chrome/content/rules/gimp.org.xml
@@ -1,28 +1,30 @@
 
 
 
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
 
diff --git a/src/chrome/content/rules/gitea.com.xml b/src/chrome/content/rules/gitea.com.xml
new file mode 100644
index 000000000000..d83a7e62dde8
--- /dev/null
+++ b/src/chrome/content/rules/gitea.com.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/githost.io.xml b/src/chrome/content/rules/githost.io.xml
index 90fd96ecf492..3ad0b472f881 100644
--- a/src/chrome/content/rules/githost.io.xml
+++ b/src/chrome/content/rules/githost.io.xml
@@ -6,7 +6,7 @@ Fetch error: http://guard.githost.io/ => https://guard.githost.io/: (6, 'Could n
 gnu.githost.io mismatch
 jfryelocaltest02.githost.io expired
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/githubassets.com.xml b/src/chrome/content/rules/githubassets.com.xml
new file mode 100644
index 000000000000..a3ba1cbf9316
--- /dev/null
+++ b/src/chrome/content/rules/githubassets.com.xml
@@ -0,0 +1,16 @@
+
+
+
+	
+		
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/gkovacs.com.xml b/src/chrome/content/rules/gkovacs.com.xml
new file mode 100644
index 000000000000..ed6115cd97d4
--- /dev/null
+++ b/src/chrome/content/rules/gkovacs.com.xml
@@ -0,0 +1,7 @@
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/glazdik.ru.xml b/src/chrome/content/rules/glazdik.ru.xml
new file mode 100644
index 000000000000..5a3ad752927b
--- /dev/null
+++ b/src/chrome/content/rules/glazdik.ru.xml
@@ -0,0 +1,21 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/glen-l.com.xml b/src/chrome/content/rules/glen-l.com.xml
index cfad99292730..cf4dd65df166 100644
--- a/src/chrome/content/rules/glen-l.com.xml
+++ b/src/chrome/content/rules/glen-l.com.xml
@@ -11,7 +11,7 @@
 		- css from www.glen-l.com ˢ
 
 		- Images, from:
-		
+
 			- glen-l.com ˢ
 			- www.glen-l.com ˢ
 
diff --git a/src/chrome/content/rules/glest.org.xml b/src/chrome/content/rules/glest.org.xml
new file mode 100644
index 000000000000..015fb8f2a5c1
--- /dev/null
+++ b/src/chrome/content/rules/glest.org.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/glimg.net.xml b/src/chrome/content/rules/glimg.net.xml
new file mode 100644
index 000000000000..ddeceffd0551
--- /dev/null
+++ b/src/chrome/content/rules/glimg.net.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/globbersthemes.com.xml b/src/chrome/content/rules/globbersthemes.com.xml
new file mode 100644
index 000000000000..2f9d49b43a2e
--- /dev/null
+++ b/src/chrome/content/rules/globbersthemes.com.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/glomex.com.xml b/src/chrome/content/rules/glomex.com.xml
new file mode 100644
index 000000000000..c91ed533f2f4
--- /dev/null
+++ b/src/chrome/content/rules/glomex.com.xml
@@ -0,0 +1,67 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/glowingbear.org.xml b/src/chrome/content/rules/glowingbear.org.xml
new file mode 100644
index 000000000000..45d79c60f38a
--- /dev/null
+++ b/src/chrome/content/rules/glowingbear.org.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/gmodmp.jp.xml b/src/chrome/content/rules/gmodmp.jp.xml
index ab2ae1a6aee5..3a070fe36c71 100644
--- a/src/chrome/content/rules/gmodmp.jp.xml
+++ b/src/chrome/content/rules/gmodmp.jp.xml
@@ -19,4 +19,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/go4go.net.xml b/src/chrome/content/rules/go4go.net.xml
new file mode 100644
index 000000000000..ee7abfe297b4
--- /dev/null
+++ b/src/chrome/content/rules/go4go.net.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/goMokulele.xml b/src/chrome/content/rules/goMokulele.xml
index 28c61e99ab05..7083f0c522f3 100644
--- a/src/chrome/content/rules/goMokulele.xml
+++ b/src/chrome/content/rules/goMokulele.xml
@@ -8,10 +8,10 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://iflygo.com/ => https://www.iflygo.com/: (28, 'Connection timed out after 10000 milliseconds')
 Fetch error: http://www.iflygo.com/ => https://www.iflygo.com/: (28, 'Connection timed out after 10001 milliseconds')
 -->
-
+
   
   
 
   
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/goldenpass.xml b/src/chrome/content/rules/goldenpass.xml
deleted file mode 100644
index 1eca07a4f26b..000000000000
--- a/src/chrome/content/rules/goldenpass.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-	
-	
-
-	
-	
-
diff --git a/src/chrome/content/rules/goldesel.to.xml b/src/chrome/content/rules/goldesel.to.xml
index 6691a556b16e..bd432d47778e 100644
--- a/src/chrome/content/rules/goldesel.to.xml
+++ b/src/chrome/content/rules/goldesel.to.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://board.goldesel.to/ => https://board.goldesel.to/: Too many redirects while fetching 'https://board.goldesel.to/'
 
 -->
-
+
   
 
   
diff --git a/src/chrome/content/rules/goodolddays.net.xml b/src/chrome/content/rules/goodolddays.net.xml
new file mode 100644
index 000000000000..97e8edc993db
--- /dev/null
+++ b/src/chrome/content/rules/goodolddays.net.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/goodweave.org.xml b/src/chrome/content/rules/goodweave.org.xml
new file mode 100644
index 000000000000..95fc885d486e
--- /dev/null
+++ b/src/chrome/content/rules/goodweave.org.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/gorcom.ru.xml b/src/chrome/content/rules/gorcom.ru.xml
deleted file mode 100644
index 55ce0e8fe7e4..000000000000
--- a/src/chrome/content/rules/gorcom.ru.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/goud.ma.xml b/src/chrome/content/rules/goud.ma.xml
deleted file mode 100644
index 7f18b4c3f423..000000000000
--- a/src/chrome/content/rules/goud.ma.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/gov-murman.ru.xml b/src/chrome/content/rules/gov-murman.ru.xml
index 8241e3e74c8f..14e99b28f916 100644
--- a/src/chrome/content/rules/gov-murman.ru.xml
+++ b/src/chrome/content/rules/gov-murman.ru.xml
@@ -42,7 +42,7 @@ utr.gov-murman.ru different content
 ⁶ redirect
 ⁷ protocol error
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/govdelivery.com-falsemixed.xml b/src/chrome/content/rules/govdelivery.com-falsemixed.xml
deleted file mode 100644
index 655b46d4b51d..000000000000
--- a/src/chrome/content/rules/govdelivery.com-falsemixed.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/gpuinfo.org.xml b/src/chrome/content/rules/gpuinfo.org.xml
new file mode 100644
index 000000000000..9af67d635acf
--- /dev/null
+++ b/src/chrome/content/rules/gpuinfo.org.xml
@@ -0,0 +1,14 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/gpupowered.org.xml b/src/chrome/content/rules/gpupowered.org.xml
new file mode 100644
index 000000000000..45bf082c2e6a
--- /dev/null
+++ b/src/chrome/content/rules/gpupowered.org.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/grafica.app.xml b/src/chrome/content/rules/grafica.app.xml
new file mode 100644
index 000000000000..190d4c6ded90
--- /dev/null
+++ b/src/chrome/content/rules/grafica.app.xml
@@ -0,0 +1,8 @@
+
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/granularproject.org.xml b/src/chrome/content/rules/granularproject.org.xml
deleted file mode 100644
index 7214b2fe677f..000000000000
--- a/src/chrome/content/rules/granularproject.org.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-	
-	
-	
-
diff --git a/src/chrome/content/rules/grape.ru.xml b/src/chrome/content/rules/grape.ru.xml
index a4b6dffc70cb..66416b911e68 100644
--- a/src/chrome/content/rules/grape.ru.xml
+++ b/src/chrome/content/rules/grape.ru.xml
@@ -23,7 +23,7 @@ zdraivery.pro.grape.ru ¹
 ² refused
 ⁴ self signed
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/graylady3jvrrxbe.onion.xml b/src/chrome/content/rules/graylady3jvrrxbe.onion.xml
new file mode 100644
index 000000000000..eb30c9b32224
--- /dev/null
+++ b/src/chrome/content/rules/graylady3jvrrxbe.onion.xml
@@ -0,0 +1,20 @@
+
+
+
+	
+	
+	
+		
+	
+		
+	
+		
+	
+		
+
+	
+
+
diff --git a/src/chrome/content/rules/greatplacetowork.com.xml b/src/chrome/content/rules/greatplacetowork.com.xml
new file mode 100644
index 000000000000..f2d05f695c27
--- /dev/null
+++ b/src/chrome/content/rules/greatplacetowork.com.xml
@@ -0,0 +1,54 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/greenhouseci.com.xml b/src/chrome/content/rules/greenhouseci.com.xml
deleted file mode 100644
index 07de2854dd71..000000000000
--- a/src/chrome/content/rules/greenhouseci.com.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/gregzaal.com.xml b/src/chrome/content/rules/gregzaal.com.xml
new file mode 100644
index 000000000000..891e698250e2
--- /dev/null
+++ b/src/chrome/content/rules/gregzaal.com.xml
@@ -0,0 +1,21 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/grist.org.xml b/src/chrome/content/rules/grist.org.xml
index a17e57e68511..a7f162af3fb6 100644
--- a/src/chrome/content/rules/grist.org.xml
+++ b/src/chrome/content/rules/grist.org.xml
@@ -2,7 +2,7 @@
 	Mixed content:
 
 		- Bug from b.scorecardresearch.com ˢ
-	
+
 	ˢ Secured by us
 
 -->
diff --git a/src/chrome/content/rules/growerscup.coffee.xml b/src/chrome/content/rules/growerscup.coffee.xml
index 2f27faa48382..ce2c0e59ebcb 100644
--- a/src/chrome/content/rules/growerscup.coffee.xml
+++ b/src/chrome/content/rules/growerscup.coffee.xml
@@ -4,10 +4,10 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.growerscup.coffee/ => https://www.growerscup.coffee/: (51, "SSL: no alternative certificate subject name matches target host name 'www.growerscup.coffee'")
 
 -->
-
+
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/gsmmap.org.xml b/src/chrome/content/rules/gsmmap.org.xml
index 1aecde618cc6..6dd0485420f8 100644
--- a/src/chrome/content/rules/gsmmap.org.xml
+++ b/src/chrome/content/rules/gsmmap.org.xml
@@ -2,7 +2,7 @@
 	Mismatch on www.
 -->
 
-	
+
 	
 	
 
diff --git a/src/chrome/content/rules/gsspat.jp.xml b/src/chrome/content/rules/gsspat.jp.xml
index a0d5ba749699..67c919fa3b15 100644
--- a/src/chrome/content/rules/gsspat.jp.xml
+++ b/src/chrome/content/rules/gsspat.jp.xml
@@ -5,4 +5,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/gtrk.tv.xml b/src/chrome/content/rules/gtrk.tv.xml
deleted file mode 100644
index 984ff04395c1..000000000000
--- a/src/chrome/content/rules/gtrk.tv.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-	
-	
-	
-
diff --git a/src/chrome/content/rules/gu.spb.ru.xml b/src/chrome/content/rules/gu.spb.ru.xml
new file mode 100644
index 000000000000..eb86c4546845
--- /dev/null
+++ b/src/chrome/content/rules/gu.spb.ru.xml
@@ -0,0 +1,6 @@
+
+    
+    
+    
+    
+
diff --git a/src/chrome/content/rules/gulli.com.xml b/src/chrome/content/rules/gulli.com.xml
index 5e9ffd4b3524..dcb79e183d8c 100644
--- a/src/chrome/content/rules/gulli.com.xml
+++ b/src/chrome/content/rules/gulli.com.xml
@@ -1,21 +1,9 @@
-
-
-
-	
-	
-	
-	
-
-	
-	
+
+	
+	
+ 	
+	
+	
 
+	
 
diff --git a/src/chrome/content/rules/guoshipartners.com.xml b/src/chrome/content/rules/guoshipartners.com.xml
index 7d438787040e..89bc8ee140c6 100644
--- a/src/chrome/content/rules/guoshipartners.com.xml
+++ b/src/chrome/content/rules/guoshipartners.com.xml
@@ -5,9 +5,9 @@ Mismatch:
 -->
 
 
-	
+
 	
-	
+
 	
-	
+
 
diff --git a/src/chrome/content/rules/gvt1.com.xml b/src/chrome/content/rules/gvt1.com.xml
new file mode 100644
index 000000000000..31a174f94ec9
--- /dev/null
+++ b/src/chrome/content/rules/gvt1.com.xml
@@ -0,0 +1,5 @@
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/gwdang.xml b/src/chrome/content/rules/gwdang.xml
index 034ecd6c1489..9535244a2612 100644
--- a/src/chrome/content/rules/gwdang.xml
+++ b/src/chrome/content/rules/gwdang.xml
@@ -15,5 +15,5 @@
 	
 
 	
-	
+
 
diff --git a/src/chrome/content/rules/halton.gov.uk-falsemixed.xml b/src/chrome/content/rules/halton.gov.uk-falsemixed.xml
index 121cc3ee3e64..dd7465daf2fa 100644
--- a/src/chrome/content/rules/halton.gov.uk-falsemixed.xml
+++ b/src/chrome/content/rules/halton.gov.uk-falsemixed.xml
@@ -6,7 +6,7 @@ Fetch error: http://kohalibrary.halton.gov.uk/ => https://kohalibrary.halton.gov
 	For rules not causing false/broken MCB, see halton.gov.uk.xml.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/halton.gov.uk.xml b/src/chrome/content/rules/halton.gov.uk.xml
index 8cf6b0ae9d85..0d3fe98837db 100644
--- a/src/chrome/content/rules/halton.gov.uk.xml
+++ b/src/chrome/content/rules/halton.gov.uk.xml
@@ -49,7 +49,7 @@ Fetch error: http://www2.halton.gov.uk/ => https://www2.halton.gov.uk/: (6, 'Cou
 
 		- iframe on careandsupportforyou from www.youtube.com
 		- css, on:
-		
+
 			- councillors, moderngov from www.halton.gov.uk
 			- kohalibrary from $self
 
@@ -66,7 +66,7 @@ Fetch error: http://www2.halton.gov.uk/ => https://www2.halton.gov.uk/: (6, 'Cou
 	ᵈ Unsecurable <= dropped
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/hamnetdb.net.xml b/src/chrome/content/rules/hamnetdb.net.xml
new file mode 100644
index 000000000000..eab7a65d1bb0
--- /dev/null
+++ b/src/chrome/content/rules/hamnetdb.net.xml
@@ -0,0 +1,12 @@
+
+
+
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/handelsbanken.se.xml b/src/chrome/content/rules/handelsbanken.se.xml
new file mode 100644
index 000000000000..fe23920bd4c1
--- /dev/null
+++ b/src/chrome/content/rules/handelsbanken.se.xml
@@ -0,0 +1,57 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/handylinux.org.xml b/src/chrome/content/rules/handylinux.org.xml
deleted file mode 100644
index 7d5ec3cf9a4d..000000000000
--- a/src/chrome/content/rules/handylinux.org.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-	
-	
-	
-
diff --git a/src/chrome/content/rules/hannahmageerd.com.xml b/src/chrome/content/rules/hannahmageerd.com.xml
new file mode 100644
index 000000000000..6944e921220d
--- /dev/null
+++ b/src/chrome/content/rules/hannahmageerd.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/hardware.fr.xml b/src/chrome/content/rules/hardware.fr.xml
index a9fc0514dd43..1dabcafeab6e 100644
--- a/src/chrome/content/rules/hardware.fr.xml
+++ b/src/chrome/content/rules/hardware.fr.xml
@@ -19,10 +19,10 @@
 	
 
 	
-	
+
 	
 
 	
-	
+
 
diff --git a/src/chrome/content/rules/hardwareluxx.ru.xml b/src/chrome/content/rules/hardwareluxx.ru.xml
deleted file mode 100644
index f17d41f5c24e..000000000000
--- a/src/chrome/content/rules/hardwareluxx.ru.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-      
-   
-   
-
-   
-
diff --git a/src/chrome/content/rules/hashkiller.co.uk.xml b/src/chrome/content/rules/hashkiller.co.uk.xml
deleted file mode 100644
index 63f12afaf822..000000000000
--- a/src/chrome/content/rules/hashkiller.co.uk.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/havant.gov.uk.xml b/src/chrome/content/rules/havant.gov.uk.xml
index c9833d6a64e2..1a3a7a7a0e15 100644
--- a/src/chrome/content/rules/havant.gov.uk.xml
+++ b/src/chrome/content/rules/havant.gov.uk.xml
@@ -37,7 +37,7 @@ Fetch error: http://www3.havant.gov.uk/ => https://www3.havant.gov.uk/: (28, 'Co
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/hayloft-plants.co.uk.xml b/src/chrome/content/rules/hayloft-plants.co.uk.xml
index 2ef03cc02c40..79e59de67909 100644
--- a/src/chrome/content/rules/hayloft-plants.co.uk.xml
+++ b/src/chrome/content/rules/hayloft-plants.co.uk.xml
@@ -2,7 +2,7 @@
 	Problematic hosts in *hayloft-plants.co.uk:
 
 		- support ᵐ
-	
+
 	ᵐ Mismatched
 
 
diff --git a/src/chrome/content/rules/hazro.com.xml b/src/chrome/content/rules/hazro.com.xml
index e2d2cb0a38bb..97ed311aa68f 100644
--- a/src/chrome/content/rules/hazro.com.xml
+++ b/src/chrome/content/rules/hazro.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://hazro.com/ => https://hazro.com/: (60, 'SSL certificate prob
 Fetch error: http://www.hazro.com/ => https://www.hazro.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/hcstx.org.xml b/src/chrome/content/rules/hcstx.org.xml
index d856cb1507df..084e03e25e15 100644
--- a/src/chrome/content/rules/hcstx.org.xml
+++ b/src/chrome/content/rules/hcstx.org.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.hcstx.org/ => https://www.hcstx.org/: (7, 'Failed to con
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/hdclub.org.xml b/src/chrome/content/rules/hdclub.org.xml
deleted file mode 100644
index 21e60cce59a3..000000000000
--- a/src/chrome/content/rules/hdclub.org.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-       
-          
-                
-       
-   
-
diff --git a/src/chrome/content/rules/hddguru.com.xml b/src/chrome/content/rules/hddguru.com.xml
new file mode 100644
index 000000000000..dd68dea7deaa
--- /dev/null
+++ b/src/chrome/content/rules/hddguru.com.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/hdvest.com.xml b/src/chrome/content/rules/hdvest.com.xml
index b0c1f4e59826..5fb46fd3e5db 100644
--- a/src/chrome/content/rules/hdvest.com.xml
+++ b/src/chrome/content/rules/hdvest.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://bcp.hdvlink.com/ => https://bcp.hdvlink.com/: (60, 'SSL cert
 		- my.hdvest.com			(incomplete cert chain)
 		- (my|www).myhdvest.com		(incomplete cert chain)
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/headline24.de.xml b/src/chrome/content/rules/headline24.de.xml
index f313ca520671..7b083eb0b226 100644
--- a/src/chrome/content/rules/headline24.de.xml
+++ b/src/chrome/content/rules/headline24.de.xml
@@ -5,20 +5,20 @@
 	
 	
 	
-	
+
 	
 	
 	
 	
 	
-	
+
 	
 	
 	
 	
 	
-	
+
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/healthnet.com.xml b/src/chrome/content/rules/healthnet.com.xml
index 6cfd11ec396f..d59421d57add 100644
--- a/src/chrome/content/rules/healthnet.com.xml
+++ b/src/chrome/content/rules/healthnet.com.xml
@@ -14,7 +14,7 @@ Fetch error: http://jobs.healthnet.com/ => https://jobs.healthnet.com/: (51, "SS
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/hebdo.ch.xml b/src/chrome/content/rules/hebdo.ch.xml
index 5a24b71f672d..47cff1d285e1 100644
--- a/src/chrome/content/rules/hebdo.ch.xml
+++ b/src/chrome/content/rules/hebdo.ch.xml
@@ -5,7 +5,7 @@ Fetch error: http://hebdo.ch/ => https://hebdo.ch/: Too many redirects while fet
 Fetch error: http://www.hebdo.ch/ => https://www.hebdo.ch/: Too many redirects while fetching 'https://www.hebdo.ch/'
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/heidilatskydance.org.xml b/src/chrome/content/rules/heidilatskydance.org.xml
new file mode 100644
index 000000000000..daa9e3fe0cd3
--- /dev/null
+++ b/src/chrome/content/rules/heidilatskydance.org.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/hekasoft.com.xml b/src/chrome/content/rules/hekasoft.com.xml
new file mode 100644
index 000000000000..7086c7f2e9bf
--- /dev/null
+++ b/src/chrome/content/rules/hekasoft.com.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/helptorrents.com.xml b/src/chrome/content/rules/helptorrents.com.xml
deleted file mode 100644
index f8031f5217e0..000000000000
--- a/src/chrome/content/rules/helptorrents.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/hengxinli.com.xml b/src/chrome/content/rules/hengxinli.com.xml
index de6fdd5faf6a..01d928eeb278 100644
--- a/src/chrome/content/rules/hengxinli.com.xml
+++ b/src/chrome/content/rules/hengxinli.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://hengxinli.com/ => https://hengxinli.com/: (28, 'Connection t
 Fetch error: http://www.hengxinli.com/ => https://www.hengxinli.com/: (28, 'Connection timed out after 20000 milliseconds')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/henrikc.dk.xml b/src/chrome/content/rules/henrikc.dk.xml
new file mode 100644
index 000000000000..216a1e4bab03
--- /dev/null
+++ b/src/chrome/content/rules/henrikc.dk.xml
@@ -0,0 +1,29 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/hessenschau.de.xml b/src/chrome/content/rules/hessenschau.de.xml
new file mode 100644
index 000000000000..fe94eb5ee49b
--- /dev/null
+++ b/src/chrome/content/rules/hessenschau.de.xml
@@ -0,0 +1,23 @@
+
+
+
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/heute.at.xml b/src/chrome/content/rules/heute.at.xml
new file mode 100644
index 000000000000..5037b0342107
--- /dev/null
+++ b/src/chrome/content/rules/heute.at.xml
@@ -0,0 +1,36 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/highways.gov.uk.xml b/src/chrome/content/rules/highways.gov.uk.xml
deleted file mode 100644
index 777ca17c5f15..000000000000
--- a/src/chrome/content/rules/highways.gov.uk.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-
-
-	
-	
-
-	
-	
-
-
-	
-	
-
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/hiking.gov.hk.xml b/src/chrome/content/rules/hiking.gov.hk.xml
new file mode 100644
index 000000000000..11ad990311d7
--- /dev/null
+++ b/src/chrome/content/rules/hiking.gov.hk.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/hkcnews.com.xml b/src/chrome/content/rules/hkcnews.com.xml
new file mode 100644
index 000000000000..ab54ff13c2a5
--- /dev/null
+++ b/src/chrome/content/rules/hkcnews.com.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/hkex.com.hk.xml b/src/chrome/content/rules/hkex.com.hk.xml
index 711c2d349d17..7eae35a02f32 100644
--- a/src/chrome/content/rules/hkex.com.hk.xml
+++ b/src/chrome/content/rules/hkex.com.hk.xml
@@ -1,16 +1,16 @@
 
 
 
@@ -19,10 +19,12 @@
 	
 	
 	
+	
+		
 
-	
+	
 
-	
 
 	
diff --git a/src/chrome/content/rules/hkexgroup.com.xml b/src/chrome/content/rules/hkexgroup.com.xml
new file mode 100644
index 000000000000..7adc252d11a1
--- /dev/null
+++ b/src/chrome/content/rules/hkexgroup.com.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/hkexnews.hk.xml b/src/chrome/content/rules/hkexnews.hk.xml
new file mode 100644
index 000000000000..1c138e7a1008
--- /dev/null
+++ b/src/chrome/content/rules/hkexnews.hk.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/hkicl.com.hk.xml b/src/chrome/content/rules/hkicl.com.hk.xml
index 05238e15c447..7d2e69a87a19 100644
--- a/src/chrome/content/rules/hkicl.com.hk.xml
+++ b/src/chrome/content/rules/hkicl.com.hk.xml
@@ -50,6 +50,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/hkjc.com.xml b/src/chrome/content/rules/hkjc.com.xml
index 0a5b1b37fe7d..2522a33d271b 100644
--- a/src/chrome/content/rules/hkjc.com.xml
+++ b/src/chrome/content/rules/hkjc.com.xml
@@ -102,13 +102,13 @@
 
 	
 	
-	
+
 	
 	
-	
+
 	
 	
-	
+
 	
 	
 	
@@ -123,10 +123,10 @@
 	
 	
 	
-	
+
 	
 	
-	
+
 	
 	
 	
@@ -139,17 +139,17 @@
 	
 	
 	
-	
+
 	
 	
-	
+
 	
 	
 	
-	
+
 	
 	
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/hko.gov.hk.xml b/src/chrome/content/rules/hko.gov.hk.xml
new file mode 100644
index 000000000000..4c58b6000da4
--- /dev/null
+++ b/src/chrome/content/rules/hko.gov.hk.xml
@@ -0,0 +1,42 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/hkstockadr.com.xml b/src/chrome/content/rules/hkstockadr.com.xml
new file mode 100644
index 000000000000..5eadb2999d97
--- /dev/null
+++ b/src/chrome/content/rules/hkstockadr.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/hku.hk.xml b/src/chrome/content/rules/hku.hk.xml
index 01428d6038db..2ebc79dc4cb0 100644
--- a/src/chrome/content/rules/hku.hk.xml
+++ b/src/chrome/content/rules/hku.hk.xml
@@ -9,7 +9,7 @@ Fetch error: http://acs.law.hku.hk/ => https://acs.law.hku.hk/: (28, 'Connection
 Fetch error: http://www.talentedapp.hku.hk/ => https://www.talentedapp.hku.hk/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 	Problematic domains:
-	
+
 	Invalid certs:
 	 	- www.aal.hku.hk
 	 	- www.als.hku.hk
@@ -181,11 +181,11 @@ Fetch error: http://www.talentedapp.hku.hk/ => https://www.talentedapp.hku.hk/:
 		- sis-eportal.hku.hk
 		- paed.hku.hk
 -->
-
+
 
 	
 	
-	
+
 	
 	
 	
@@ -339,6 +339,6 @@ Fetch error: http://www.talentedapp.hku.hk/ => https://www.talentedapp.hku.hk/:
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/hoehrmann.de.xml b/src/chrome/content/rules/hoehrmann.de.xml
new file mode 100644
index 000000000000..833331f608df
--- /dev/null
+++ b/src/chrome/content/rules/hoehrmann.de.xml
@@ -0,0 +1,26 @@
+
+
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/holyrood.com.xml b/src/chrome/content/rules/holyrood.com.xml
index 2b1ffaa1f137..c742f35e31cc 100644
--- a/src/chrome/content/rules/holyrood.com.xml
+++ b/src/chrome/content/rules/holyrood.com.xml
@@ -6,14 +6,14 @@ Fetch error: http://holyrood.com/ => https://holyrood.com/: (28, 'Connection tim
 	Mixed content:
 
 		- Image, on:
-		
+
 			- assetmanagement, bigdata, bim, brexitexplained, briefings, channelshift, childprotection, childrensinfosharing, cloud, colleges, connect, connectawards, connectdata, cybersecurity, digitaljustice, earlyyears, femaleoffenders, foi, healthandsocialcare, ltt, mobileworking, olderpeople, referendum, scotlandsuniversities, scottishpublicserviceawards, stem, swan, telehealthcare from media.dods.co.uk ˢ
 			- www from $self ˢ
 
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/homeaway.com.xml b/src/chrome/content/rules/homeaway.com.xml
index e897e259c794..3e5195700c8a 100644
--- a/src/chrome/content/rules/homeaway.com.xml
+++ b/src/chrome/content/rules/homeaway.com.xml
@@ -65,7 +65,7 @@ Fetch error: http://book.homeaway.com/ => https://book.homeaway.com/: (7, 'Faile
 		- css on mailaway from images.mailaway.homeaway.com ˢ
 
 		- Images, on:
-		
+
 			- blog, productupdates from static1.squarespace.com ˢ
 			- blog from pbs.twimg.com ˢ
 			- mailaway from images.mailaway.homeaway.com ˢ
@@ -73,7 +73,7 @@ Fetch error: http://book.homeaway.com/ => https://book.homeaway.com/: (7, 'Faile
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/homebid.org.uk.xml b/src/chrome/content/rules/homebid.org.uk.xml
index 41b894a99d98..393b9424f1ef 100644
--- a/src/chrome/content/rules/homebid.org.uk.xml
+++ b/src/chrome/content/rules/homebid.org.uk.xml
@@ -12,7 +12,7 @@
 		- Image from homeconnections.org.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/homeoffice.gov.uk.xml b/src/chrome/content/rules/homeoffice.gov.uk.xml
index 47b74db878eb..b95b5caf222b 100644
--- a/src/chrome/content/rules/homeoffice.gov.uk.xml
+++ b/src/chrome/content/rules/homeoffice.gov.uk.xml
@@ -62,7 +62,7 @@ Fetch error: http://elearning.homeoffice.gov.uk/ => https://www.elearning.homeof
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
@@ -152,7 +152,7 @@ Fetch error: http://elearning.homeoffice.gov.uk/ => https://www.elearning.homeof
 							-->
 	
-	
+
 	
 	 https://public.honeynet.org/: (60, '
 
 
 	Problematic subdomains:
-	
+
 		- pl. mismatch
 
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/host4coins.net.xml b/src/chrome/content/rules/host4coins.net.xml
new file mode 100644
index 000000000000..68705b03b9eb
--- /dev/null
+++ b/src/chrome/content/rules/host4coins.net.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+	
+	
+	
+ 
+	
+
diff --git a/src/chrome/content/rules/hosted-ci.com.xml b/src/chrome/content/rules/hosted-ci.com.xml
index cc819edf9dc8..8af4e6efb881 100644
--- a/src/chrome/content/rules/hosted-ci.com.xml
+++ b/src/chrome/content/rules/hosted-ci.com.xml
@@ -7,10 +7,10 @@ Fetch error: http://www.hosted-ci.com/ => https://hosted-ci.com/: (60, 'SSL cert
 
 www.hosted-ci.com mismatch
 -->
-
+
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/hosting.com.xml b/src/chrome/content/rules/hosting.com.xml
deleted file mode 100644
index dc38248c55db..000000000000
--- a/src/chrome/content/rules/hosting.com.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/hotel.ch.xml b/src/chrome/content/rules/hotel.ch.xml
index 5537d6d5440a..373839b0ead3 100644
--- a/src/chrome/content/rules/hotel.ch.xml
+++ b/src/chrome/content/rules/hotel.ch.xml
@@ -5,7 +5,7 @@ Fetch error: http://hotel.ch/ => https://www.hotel.ch/: (28, 'Connection timed o
 Fetch error: http://www.hotel.ch/ => https://www.hotel.ch/: (28, 'Connection timed out after 20000 milliseconds')
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/hotelchantelle.com.xml b/src/chrome/content/rules/hotelchantelle.com.xml
new file mode 100644
index 000000000000..bac9026b6326
--- /dev/null
+++ b/src/chrome/content/rules/hotelchantelle.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/hotelmetropolitan.co.il.xml b/src/chrome/content/rules/hotelmetropolitan.co.il.xml
new file mode 100644
index 000000000000..0398f8b3ee96
--- /dev/null
+++ b/src/chrome/content/rules/hotelmetropolitan.co.il.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/howard-cottage.co.uk.xml b/src/chrome/content/rules/howard-cottage.co.uk.xml
index 4dfc187fe3c2..b91c8d4f83a8 100644
--- a/src/chrome/content/rules/howard-cottage.co.uk.xml
+++ b/src/chrome/content/rules/howard-cottage.co.uk.xml
@@ -7,7 +7,7 @@ Fetch error: http://howard-cottage.co.uk/ => https://www.howard-cottage.co.uk/:
 	^howard-cottage.co.uk: Handshake fails
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/hr-fernsehen.de.xml b/src/chrome/content/rules/hr-fernsehen.de.xml
new file mode 100644
index 000000000000..66000c2299e4
--- /dev/null
+++ b/src/chrome/content/rules/hr-fernsehen.de.xml
@@ -0,0 +1,23 @@
+
+
+
+	
+	
+	
+		
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/hs-mannheim.de.xml b/src/chrome/content/rules/hs-mannheim.de.xml
index eb54aaa6a71f..5daeea23c23f 100644
--- a/src/chrome/content/rules/hs-mannheim.de.xml
+++ b/src/chrome/content/rules/hs-mannheim.de.xml
@@ -9,10 +9,10 @@
 		www.kve.hs-mannheim.de
 		www.mechatronik.hs-mannheim.de
 		www.pvs.hs-mannheim.de
-	
+
 	Time Out:
 		www.gestaltung.hs-mannheim.de
-		
+
 	Certificate Mismatch:
 	The non-www version of the targets
 -->
@@ -71,7 +71,7 @@
 	
 	
 	
-	
+
 	
 
 	
diff --git a/src/chrome/content/rules/hsbc.co.in.xml b/src/chrome/content/rules/hsbc.co.in.xml
index 29118b16eb7f..4e969fd0a688 100644
--- a/src/chrome/content/rules/hsbc.co.in.xml
+++ b/src/chrome/content/rules/hsbc.co.in.xml
@@ -29,7 +29,7 @@
 	Mixed content:
 
 		- Bugs, on:
-		
+
 			- services.assetmanagement from www1.member-hsbc-group.com ˢ
 			- www from ad.doubleclick.net
 
diff --git a/src/chrome/content/rules/hsbc.com.hk.xml b/src/chrome/content/rules/hsbc.com.hk.xml
index 6199fdc2ad28..fbdbafa5774b 100644
--- a/src/chrome/content/rules/hsbc.com.hk.xml
+++ b/src/chrome/content/rules/hsbc.com.hk.xml
@@ -1,87 +1,82 @@
 
 
-
 	
+
+	
+	
+	
 	
+	
+
+	
+	
+	
+
+	
+	
+	
 	
+	
+	
+	
+
 	
+
+	
+	
+	
 	
 	
+	
 	
-	
+
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+	
+	
+
 	
+
 	
-	
+	
 
-		
-		
+	
+	
+	
 
+	
 
-	
-	
-	
-	
-	
-	
-	
-	
+	
 
-	
+	
 
+	
 
 	
-
 
diff --git a/src/chrome/content/rules/hscic.gov.uk.xml b/src/chrome/content/rules/hscic.gov.uk.xml
index 4a3d67f6d872..bd41d0b85502 100644
--- a/src/chrome/content/rules/hscic.gov.uk.xml
+++ b/src/chrome/content/rules/hscic.gov.uk.xml
@@ -50,6 +50,6 @@
 	
 
-	
 
diff --git a/src/chrome/content/rules/https.cat.xml b/src/chrome/content/rules/https.cat.xml
deleted file mode 100644
index b28e0bedbe24..000000000000
--- a/src/chrome/content/rules/https.cat.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/humankode.com.xml b/src/chrome/content/rules/humankode.com.xml
index 8b005ffe1498..5b41e47b188f 100644
--- a/src/chrome/content/rules/humankode.com.xml
+++ b/src/chrome/content/rules/humankode.com.xml
@@ -6,4 +6,4 @@
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/hungryhowies.com.xml b/src/chrome/content/rules/hungryhowies.com.xml
deleted file mode 100644
index 2237d8c6a2cc..000000000000
--- a/src/chrome/content/rules/hungryhowies.com.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-        
-        
-        
-        
-        
-        
-
diff --git a/src/chrome/content/rules/hurl.it.xml b/src/chrome/content/rules/hurl.it.xml
deleted file mode 100644
index b9001aa72204..000000000000
--- a/src/chrome/content/rules/hurl.it.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-	
-
diff --git a/src/chrome/content/rules/huuto.net-resources.xml b/src/chrome/content/rules/huuto.net-resources.xml
index 1b1afdd4d02e..3c717bab8e86 100644
--- a/src/chrome/content/rules/huuto.net-resources.xml
+++ b/src/chrome/content/rules/huuto.net-resources.xml
@@ -10,7 +10,7 @@ Fetch error: http://kuvat2.huuto.net/ => https://kuvat2.huuto.net/: (35, 'error:
 	and no mixed content secured.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/huuto.net.xml b/src/chrome/content/rules/huuto.net.xml
index 0615f8520d28..113508509163 100644
--- a/src/chrome/content/rules/huuto.net.xml
+++ b/src/chrome/content/rules/huuto.net.xml
@@ -114,7 +114,7 @@
 
 	
 
-  
+
 	
 
diff --git a/src/chrome/content/rules/hyb.pw.xml b/src/chrome/content/rules/hyb.pw.xml
deleted file mode 100644
index 5b9ef2a94d99..000000000000
--- a/src/chrome/content/rules/hyb.pw.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/hydro.gov.hk.xml b/src/chrome/content/rules/hydro.gov.hk.xml
new file mode 100644
index 000000000000..3cd0e6c741d1
--- /dev/null
+++ b/src/chrome/content/rules/hydro.gov.hk.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/hyperrealm.com.xml b/src/chrome/content/rules/hyperrealm.com.xml
new file mode 100644
index 000000000000..691c159c8635
--- /dev/null
+++ b/src/chrome/content/rules/hyperrealm.com.xml
@@ -0,0 +1,25 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/hypestat.com.xml b/src/chrome/content/rules/hypestat.com.xml
index 145f775c116a..a8726298b9d4 100644
--- a/src/chrome/content/rules/hypestat.com.xml
+++ b/src/chrome/content/rules/hypestat.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://static.hypestat.com/ => https://static.hypestat.com/: Too ma
 Fetch error: http://www.hypestat.com/ => https://www.hypestat.com/: Too many redirects while fetching 'https://www.hypestat.com/'
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/hzqx.com.xml b/src/chrome/content/rules/hzqx.com.xml
new file mode 100644
index 000000000000..9dcb593e6b79
--- /dev/null
+++ b/src/chrome/content/rules/hzqx.com.xml
@@ -0,0 +1,8 @@
+
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/i4wifi.cz.xml b/src/chrome/content/rules/i4wifi.cz.xml
index 60180c9ba869..e299bdc8d584 100644
--- a/src/chrome/content/rules/i4wifi.cz.xml
+++ b/src/chrome/content/rules/i4wifi.cz.xml
@@ -14,7 +14,7 @@ Fetch error: http://files.i4wifi.cz/ => https://files.i4wifi.cz/: (60, 'SSL cert
 	Time out:
 		- old.i4wifi.cz
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/iCloud.com.xml b/src/chrome/content/rules/iCloud.com.xml
deleted file mode 100644
index 4d445e3c7b47..000000000000
--- a/src/chrome/content/rules/iCloud.com.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/iDreamx.com.xml b/src/chrome/content/rules/iDreamx.com.xml
new file mode 100644
index 000000000000..e3882c66cba1
--- /dev/null
+++ b/src/chrome/content/rules/iDreamx.com.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/iEntry.com.xml b/src/chrome/content/rules/iEntry.com.xml
new file mode 100644
index 000000000000..201094bd5842
--- /dev/null
+++ b/src/chrome/content/rules/iEntry.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/iEntry.xml b/src/chrome/content/rules/iEntry.xml
deleted file mode 100644
index 060f6f1fce09..000000000000
--- a/src/chrome/content/rules/iEntry.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/iHub_-Nairobi.xml b/src/chrome/content/rules/iHub_-Nairobi.xml
index 128657481a9e..eb79d6802eac 100644
--- a/src/chrome/content/rules/iHub_-Nairobi.xml
+++ b/src/chrome/content/rules/iHub_-Nairobi.xml
@@ -1,12 +1,14 @@
 
 
 
 	
-	
+	
+	
+	
 
 
 	
diff --git a/src/chrome/content/rules/iMapEnterprises.com.xml b/src/chrome/content/rules/iMapEnterprises.com.xml
new file mode 100644
index 000000000000..f8597f2744e7
--- /dev/null
+++ b/src/chrome/content/rules/iMapEnterprises.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/iPay88.com.xml b/src/chrome/content/rules/iPay88.com.xml
new file mode 100644
index 000000000000..a37b573b0b46
--- /dev/null
+++ b/src/chrome/content/rules/iPay88.com.xml
@@ -0,0 +1,44 @@
+
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/iStockphoto.com.xml b/src/chrome/content/rules/iStockphoto.com.xml
new file mode 100644
index 000000000000..bfcbe2214319
--- /dev/null
+++ b/src/chrome/content/rules/iStockphoto.com.xml
@@ -0,0 +1,61 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/iTerm2.xml b/src/chrome/content/rules/iTerm2.xml
index d9b7359ce788..2fb0d7c46d70 100644
--- a/src/chrome/content/rules/iTerm2.xml
+++ b/src/chrome/content/rules/iTerm2.xml
@@ -12,7 +12,7 @@
 
 	
 	
-	
+
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/iTradeCIMB.com.my.xml b/src/chrome/content/rules/iTradeCIMB.com.my.xml
new file mode 100644
index 000000000000..a46b5fbce8e4
--- /dev/null
+++ b/src/chrome/content/rules/iTradeCIMB.com.my.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/iWork.com.xml b/src/chrome/content/rules/iWork.com.xml
index 0f1b70e09f93..5f868c8f0156 100644
--- a/src/chrome/content/rules/iWork.com.xml
+++ b/src/chrome/content/rules/iWork.com.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.iwork.com/ => https://www.iwork.com/: (28, 'Connection t
 	Mismatch:
 		- iwork.com	(cert only matches www)
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/ibiblio.org.xml b/src/chrome/content/rules/ibiblio.org.xml
new file mode 100644
index 000000000000..aa68112f9c51
--- /dev/null
+++ b/src/chrome/content/rules/ibiblio.org.xml
@@ -0,0 +1,47 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ibutsu.org.xml b/src/chrome/content/rules/ibutsu.org.xml
deleted file mode 100644
index 6deab948afa8..000000000000
--- a/src/chrome/content/rules/ibutsu.org.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/ibx.com.xml b/src/chrome/content/rules/ibx.com.xml
index ec2f140a3e70..58d317d7038f 100644
--- a/src/chrome/content/rules/ibx.com.xml
+++ b/src/chrome/content/rules/ibx.com.xml
@@ -49,7 +49,7 @@ Fetch error: http://ibx.com/ => https://ibx.com/: (7, 'Failed to connect to ibx.
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/icabanken.se.xml b/src/chrome/content/rules/icabanken.se.xml
new file mode 100644
index 000000000000..4a4649fb92c1
--- /dev/null
+++ b/src/chrome/content/rules/icabanken.se.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/iconarchive.com.xml b/src/chrome/content/rules/iconarchive.com.xml
new file mode 100644
index 000000000000..c9a786086ad9
--- /dev/null
+++ b/src/chrome/content/rules/iconarchive.com.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ictv.ua.xml b/src/chrome/content/rules/ictv.ua.xml
index 3b6b3e5e7bb5..a5218e349427 100644
--- a/src/chrome/content/rules/ictv.ua.xml
+++ b/src/chrome/content/rules/ictv.ua.xml
@@ -105,7 +105,7 @@ zeki.ictv.ua ⁴
 ³ timed out
 ⁴ self signed
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/iddh.org.br.xml b/src/chrome/content/rules/iddh.org.br.xml
new file mode 100644
index 000000000000..2f99d74fc41c
--- /dev/null
+++ b/src/chrome/content/rules/iddh.org.br.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ideal-collaboration.net.xml b/src/chrome/content/rules/ideal-collaboration.net.xml
new file mode 100644
index 000000000000..440c17eca9d8
--- /dev/null
+++ b/src/chrome/content/rules/ideal-collaboration.net.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/idms-linux.org.xml b/src/chrome/content/rules/idms-linux.org.xml
index 6e293b08437c..99a64adeab22 100644
--- a/src/chrome/content/rules/idms-linux.org.xml
+++ b/src/chrome/content/rules/idms-linux.org.xml
@@ -10,7 +10,7 @@ cdn.idms-linux.org ³
 
 ³ timed out
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/idnes-cz.xml b/src/chrome/content/rules/idnes-cz.xml
index d2129cf99d50..70ae3a75a24c 100644
--- a/src/chrome/content/rules/idnes-cz.xml
+++ b/src/chrome/content/rules/idnes-cz.xml
@@ -71,7 +71,7 @@
 	
 	
 	
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/ifec.org.hk.xml b/src/chrome/content/rules/ifec.org.hk.xml
new file mode 100644
index 000000000000..e6a3885b0abb
--- /dev/null
+++ b/src/chrome/content/rules/ifec.org.hk.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ifeng.com.xml b/src/chrome/content/rules/ifeng.com.xml
new file mode 100644
index 000000000000..726b3076103d
--- /dev/null
+++ b/src/chrome/content/rules/ifeng.com.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ifos-bund.de.xml b/src/chrome/content/rules/ifos-bund.de.xml
deleted file mode 100644
index 4153adf7dac5..000000000000
--- a/src/chrome/content/rules/ifos-bund.de.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/iga.net.xml b/src/chrome/content/rules/iga.net.xml
new file mode 100644
index 000000000000..60b8fc2cc989
--- /dev/null
+++ b/src/chrome/content/rules/iga.net.xml
@@ -0,0 +1,38 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+  
+  
+
diff --git a/src/chrome/content/rules/ijg.org.xml b/src/chrome/content/rules/ijg.org.xml
new file mode 100644
index 000000000000..d3b1b89c53dc
--- /dev/null
+++ b/src/chrome/content/rules/ijg.org.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ilca.ru.xml b/src/chrome/content/rules/ilca.ru.xml
deleted file mode 100644
index 7ba43f62f2f9..000000000000
--- a/src/chrome/content/rules/ilca.ru.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/iliad.it.xml b/src/chrome/content/rules/iliad.it.xml
new file mode 100644
index 000000000000..5306825095fe
--- /dev/null
+++ b/src/chrome/content/rules/iliad.it.xml
@@ -0,0 +1,22 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/illuminateed.com.xml b/src/chrome/content/rules/illuminateed.com.xml
index 71f9cf68b942..1ea0a7de4300 100644
--- a/src/chrome/content/rules/illuminateed.com.xml
+++ b/src/chrome/content/rules/illuminateed.com.xml
@@ -19,7 +19,7 @@
 	Mixed content:
 
 		- Images, on:
-		
+
 			- go from $self ˢ
 			- go from storage.pardot.com ˢ
 
diff --git a/src/chrome/content/rules/illustre.ch.xml b/src/chrome/content/rules/illustre.ch.xml
index 8cbc5367a088..92ffe6016da4 100644
--- a/src/chrome/content/rules/illustre.ch.xml
+++ b/src/chrome/content/rules/illustre.ch.xml
@@ -5,7 +5,7 @@ Fetch error: http://illustre.ch/ => https://illustre.ch/: (28, 'Connection timed
 Fetch error: http://www.illustre.ch/ => https://www.illustre.ch/: (51, "SSL: no alternative certificate subject name matches target host name 'www.illustre.ch'")
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/im9.eu.xml b/src/chrome/content/rules/im9.eu.xml
deleted file mode 100644
index 0e5605a94795..000000000000
--- a/src/chrome/content/rules/im9.eu.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/imagecurl.com.xml b/src/chrome/content/rules/imagecurl.com.xml
deleted file mode 100644
index 3922286ffcfc..000000000000
--- a/src/chrome/content/rules/imagecurl.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-	
-	
-
diff --git a/src/chrome/content/rules/imagelayers.io.xml b/src/chrome/content/rules/imagelayers.io.xml
index f09580c3f990..c073c6028151 100644
--- a/src/chrome/content/rules/imagelayers.io.xml
+++ b/src/chrome/content/rules/imagelayers.io.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.imagelayers.io/ => https://www.imagelayers.io/: (6, 'Could not resolve host: www.imagelayers.io')
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/imercer.com.xml b/src/chrome/content/rules/imercer.com.xml
index 1786e6b2d51d..2ecde00a69d6 100644
--- a/src/chrome/content/rules/imercer.com.xml
+++ b/src/chrome/content/rules/imercer.com.xml
@@ -43,7 +43,7 @@ tmp-dr-www.imercer.com ³
 ⁵ expired
 ⁷ protocol error
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/img.ifcdn.com.xml b/src/chrome/content/rules/img.ifcdn.com.xml
index 0346a383c324..dbb362f40af5 100644
--- a/src/chrome/content/rules/img.ifcdn.com.xml
+++ b/src/chrome/content/rules/img.ifcdn.com.xml
@@ -1,6 +1,6 @@
 
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/imgburn.com.xml b/src/chrome/content/rules/imgburn.com.xml
new file mode 100644
index 000000000000..bea664a79a64
--- /dev/null
+++ b/src/chrome/content/rules/imgburn.com.xml
@@ -0,0 +1,27 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/imgoat.com.xml b/src/chrome/content/rules/imgoat.com.xml
deleted file mode 100644
index 20ce446d7679..000000000000
--- a/src/chrome/content/rules/imgoat.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/imgops.com.xml b/src/chrome/content/rules/imgops.com.xml
index 8e4f48b3f598..4bc58be5ce06 100644
--- a/src/chrome/content/rules/imgops.com.xml
+++ b/src/chrome/content/rules/imgops.com.xml
@@ -1,6 +1,6 @@
 
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/inetcom.ru.xml b/src/chrome/content/rules/inetcom.ru.xml
deleted file mode 100644
index a1295984bee8..000000000000
--- a/src/chrome/content/rules/inetcom.ru.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/inetvl.ru.xml b/src/chrome/content/rules/inetvl.ru.xml
index 5d831f635056..61ba0b600790 100644
--- a/src/chrome/content/rules/inetvl.ru.xml
+++ b/src/chrome/content/rules/inetvl.ru.xml
@@ -32,7 +32,7 @@ w-host-52.inetvl.ru ³
 ³ timed out
 ⁴ self signed
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/infinum.co.xml b/src/chrome/content/rules/infinum.co.xml
index 52f827014a73..c5cf14fd5c38 100644
--- a/src/chrome/content/rules/infinum.co.xml
+++ b/src/chrome/content/rules/infinum.co.xml
@@ -14,7 +14,7 @@ presence.infinum.co mixed content
 ¹ mismatch
 ² refused
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/info.gov.hk.xml b/src/chrome/content/rules/info.gov.hk.xml
new file mode 100644
index 000000000000..8e50fc6f154d
--- /dev/null
+++ b/src/chrome/content/rules/info.gov.hk.xml
@@ -0,0 +1,32 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/infolan.by.xml b/src/chrome/content/rules/infolan.by.xml
index 8c101af89edc..5e683dfdd4dd 100644
--- a/src/chrome/content/rules/infolan.by.xml
+++ b/src/chrome/content/rules/infolan.by.xml
@@ -7,13 +7,13 @@ Fetch error: http://www.infolan.by/ => https://infolan.by/: (51, "SSL: no altern
 
 www.infolan.by self signed
 -->
-
+
 	
 	
-	
+
 	
-	
+
 	
 
 	
diff --git a/src/chrome/content/rules/infosactu.com.xml b/src/chrome/content/rules/infosactu.com.xml
deleted file mode 100644
index 412c7f590d48..000000000000
--- a/src/chrome/content/rules/infosactu.com.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-        
-        
-
-        
-
diff --git a/src/chrome/content/rules/ingtes.ch.xml b/src/chrome/content/rules/ingtes.ch.xml
new file mode 100644
index 000000000000..625c831da8b4
--- /dev/null
+++ b/src/chrome/content/rules/ingtes.ch.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/init.sh.xml b/src/chrome/content/rules/init.sh.xml
index 2463a54420cb..dea24532a48f 100644
--- a/src/chrome/content/rules/init.sh.xml
+++ b/src/chrome/content/rules/init.sh.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.init.sh/ => https://www.init.sh/: (60, 'SSL certificate
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/iniy.org.xml b/src/chrome/content/rules/iniy.org.xml
index 37457589d4d6..e662b939b910 100644
--- a/src/chrome/content/rules/iniy.org.xml
+++ b/src/chrome/content/rules/iniy.org.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.iniy.org/ => https://iniy.org/: (60, 'SSL certificate pr
 		- iniy.org
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/inl.gov.xml b/src/chrome/content/rules/inl.gov.xml
index f9c226b83514..906092be1d5b 100644
--- a/src/chrome/content/rules/inl.gov.xml
+++ b/src/chrome/content/rules/inl.gov.xml
@@ -64,7 +64,7 @@ Fetch error: http://nuclear.inl.gov/ => https://inlportal.inl.gov/portal/server.
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/inmediahk.net.xml b/src/chrome/content/rules/inmediahk.net.xml
new file mode 100644
index 000000000000..31142880ce93
--- /dev/null
+++ b/src/chrome/content/rules/inmediahk.net.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/intagme.com.xml b/src/chrome/content/rules/intagme.com.xml
index 997f076861af..774483916470 100644
--- a/src/chrome/content/rules/intagme.com.xml
+++ b/src/chrome/content/rules/intagme.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://www.intagme.com/ => https://www.intagme.com/: (28, 'Operatio
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/intec.edu.za.xml b/src/chrome/content/rules/intec.edu.za.xml
new file mode 100644
index 000000000000..82cea871b0bf
--- /dev/null
+++ b/src/chrome/content/rules/intec.edu.za.xml
@@ -0,0 +1,27 @@
+
+
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/integrityglobal.com.xml b/src/chrome/content/rules/integrityglobal.com.xml
deleted file mode 100644
index 372840cfe7bb..000000000000
--- a/src/chrome/content/rules/integrityglobal.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/intellipoker.bg.xml b/src/chrome/content/rules/intellipoker.bg.xml
index 05bf8005bb4e..f74b3538c814 100644
--- a/src/chrome/content/rules/intellipoker.bg.xml
+++ b/src/chrome/content/rules/intellipoker.bg.xml
@@ -8,7 +8,7 @@ Fetch error: http://media.intellipoker.bg/ => https://media.intellipoker.bg/: (5
 		- .intellipoker.bg
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/intellnews.net.xml b/src/chrome/content/rules/intellnews.net.xml
index 2d93a2c2f538..d6f1a39da537 100644
--- a/src/chrome/content/rules/intellnews.net.xml
+++ b/src/chrome/content/rules/intellnews.net.xml
@@ -22,7 +22,7 @@ Fetch error: http://intellnews.net/ => https://www.intellnews.net/: (60, 'SSL ce
 	ˢ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/interactivepasts.com.xml b/src/chrome/content/rules/interactivepasts.com.xml
new file mode 100644
index 000000000000..93005660ec6f
--- /dev/null
+++ b/src/chrome/content/rules/interactivepasts.com.xml
@@ -0,0 +1,12 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/interactivepython.org.xml b/src/chrome/content/rules/interactivepython.org.xml
deleted file mode 100644
index 90a34d2ce4dc..000000000000
--- a/src/chrome/content/rules/interactivepython.org.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/internetessentials.com.xml b/src/chrome/content/rules/internetessentials.com.xml
index 5819cd65a9e1..6cf369d889a0 100644
--- a/src/chrome/content/rules/internetessentials.com.xml
+++ b/src/chrome/content/rules/internetessentials.com.xml
@@ -16,7 +16,7 @@ Fetch error: http://learning.internetessentials.com/ => https://learning.interne
 		- partner.internetessentials.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/internetua.com.xml b/src/chrome/content/rules/internetua.com.xml
new file mode 100644
index 000000000000..dbe7efd6c5c0
--- /dev/null
+++ b/src/chrome/content/rules/internetua.com.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/intertelecom.ru.com.xml b/src/chrome/content/rules/intertelecom.ru.com.xml
index d0738fc67edd..b5194b281db5 100644
--- a/src/chrome/content/rules/intertelecom.ru.com.xml
+++ b/src/chrome/content/rules/intertelecom.ru.com.xml
@@ -7,7 +7,7 @@ intertelecom.ru.com revoked
 www.intertelecom.ru.com revoked
 old.intertelecom.ru.com revoked
 -->
-
+
 	
 
 	
diff --git a/src/chrome/content/rules/intsig.com.xml b/src/chrome/content/rules/intsig.com.xml
index f074b468bda9..79622a457921 100644
--- a/src/chrome/content/rules/intsig.com.xml
+++ b/src/chrome/content/rules/intsig.com.xml
@@ -31,7 +31,7 @@ Fetch error: http://www.intsig.com/ => https://www.intsig.com/: Too many redirec
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/intsig.net.xml b/src/chrome/content/rules/intsig.net.xml
index 7c163890987a..b561e9cc730d 100644
--- a/src/chrome/content/rules/intsig.net.xml
+++ b/src/chrome/content/rules/intsig.net.xml
@@ -23,7 +23,7 @@ Fetch error: http://www.intsig.net/ => https://www.intsig.net/: Too many redirec
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/invincealabs.com.xml b/src/chrome/content/rules/invincealabs.com.xml
deleted file mode 100644
index 940f6739140d..000000000000
--- a/src/chrome/content/rules/invincealabs.com.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-	
-
-		
-		
-
-			
-			
-			
-
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/ipic.su.xml b/src/chrome/content/rules/ipic.su.xml
new file mode 100644
index 000000000000..8f604d9dc980
--- /dev/null
+++ b/src/chrome/content/rules/ipic.su.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/iplocation.net.xml b/src/chrome/content/rules/iplocation.net.xml
index 0f3df941c606..6dc3704ec8f8 100644
--- a/src/chrome/content/rules/iplocation.net.xml
+++ b/src/chrome/content/rules/iplocation.net.xml
@@ -14,5 +14,5 @@
 
 	
-		
+
 
diff --git a/src/chrome/content/rules/iqdb.xml b/src/chrome/content/rules/iqdb.xml
index b8fc1c63b9ed..6d060170300c 100644
--- a/src/chrome/content/rules/iqdb.xml
+++ b/src/chrome/content/rules/iqdb.xml
@@ -5,7 +5,7 @@
 
 
 	
-		
+	
 
 	
diff --git a/src/chrome/content/rules/iqoption.com.xml b/src/chrome/content/rules/iqoption.com.xml
new file mode 100644
index 000000000000..78ad03d49b35
--- /dev/null
+++ b/src/chrome/content/rules/iqoption.com.xml
@@ -0,0 +1,19 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/irc.lc.xml b/src/chrome/content/rules/irc.lc.xml
index 0fda010b8772..d2efc68eabd3 100644
--- a/src/chrome/content/rules/irc.lc.xml
+++ b/src/chrome/content/rules/irc.lc.xml
@@ -9,7 +9,7 @@ Fetch error: http://dev.irc.lc/ => https://dev.irc.lc/: (51, "SSL: no alternativ
 	Refused:
 		- pad.irc.lc
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/ireceivesmsonline.com.xml b/src/chrome/content/rules/ireceivesmsonline.com.xml
deleted file mode 100644
index c25c39d120f6..000000000000
--- a/src/chrome/content/rules/ireceivesmsonline.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/irfree.com.xml b/src/chrome/content/rules/irfree.com.xml
deleted file mode 100644
index 0c1b1858f459..000000000000
--- a/src/chrome/content/rules/irfree.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/irrlab.com.xml b/src/chrome/content/rules/irrlab.com.xml
index cb9e4407101a..ef9f7d424d26 100644
--- a/src/chrome/content/rules/irrlab.com.xml
+++ b/src/chrome/content/rules/irrlab.com.xml
@@ -1,6 +1,6 @@
 
diff --git a/src/chrome/content/rules/is74.ru.xml b/src/chrome/content/rules/is74.ru.xml
index a592dca8b57b..0221ded5099e 100644
--- a/src/chrome/content/rules/is74.ru.xml
+++ b/src/chrome/content/rules/is74.ru.xml
@@ -14,7 +14,7 @@ pomni.is74.ru different content
 pjreo.is74.ru different content
 lk.is74.ru different content
 -->
-
+
 	
 
 	
diff --git a/src/chrome/content/rules/islandhealth.ca.xml b/src/chrome/content/rules/islandhealth.ca.xml
new file mode 100644
index 000000000000..5d165fa38a0d
--- /dev/null
+++ b/src/chrome/content/rules/islandhealth.ca.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+	
+
+
diff --git a/src/chrome/content/rules/istheinternetonfire.com.xml b/src/chrome/content/rules/istheinternetonfire.com.xml
deleted file mode 100644
index 9cb02f1885e5..000000000000
--- a/src/chrome/content/rules/istheinternetonfire.com.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-    
-    
-
-		
-
-    
-
-    
-
diff --git a/src/chrome/content/rules/istockimg.com.xml b/src/chrome/content/rules/istockimg.com.xml
deleted file mode 100644
index 8c2310e693eb..000000000000
--- a/src/chrome/content/rules/istockimg.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/istockphoto.com.xml b/src/chrome/content/rules/istockphoto.com.xml
deleted file mode 100644
index f459d08fdc97..000000000000
--- a/src/chrome/content/rules/istockphoto.com.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-	
-
-		
-
-	
-
-
diff --git a/src/chrome/content/rules/itex.ru.xml b/src/chrome/content/rules/itex.ru.xml
index 669917450a01..265c25cfea76 100644
--- a/src/chrome/content/rules/itex.ru.xml
+++ b/src/chrome/content/rules/itex.ru.xml
@@ -12,7 +12,7 @@ git.itex.ru ²
 
 ² refused
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/ius.io.xml b/src/chrome/content/rules/ius.io.xml
index 56130f0db055..e1c851632eea 100644
--- a/src/chrome/content/rules/ius.io.xml
+++ b/src/chrome/content/rules/ius.io.xml
@@ -1,4 +1,9 @@
 
@@ -16,12 +21,12 @@
 			
 			
 
-		
-
+		
+    
+    
 
 	
 
-
 	
 
diff --git a/src/chrome/content/rules/ivsezaodnogo.ru.xml b/src/chrome/content/rules/ivsezaodnogo.ru.xml
index 41e8f5fa2e34..a9d51e4a520d 100644
--- a/src/chrome/content/rules/ivsezaodnogo.ru.xml
+++ b/src/chrome/content/rules/ivsezaodnogo.ru.xml
@@ -8,7 +8,7 @@
 		- www.ivsezaodnogo.ru
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/iweb.co.uk.xml b/src/chrome/content/rules/iweb.co.uk.xml
index 24dc3a075404..1aef232b1f8b 100644
--- a/src/chrome/content/rules/iweb.co.uk.xml
+++ b/src/chrome/content/rules/iweb.co.uk.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://dfblog.iweb.co.uk/ => https://dfblog.iweb.co.uk/: (35, 'error:140770FC:SSL routines:SSL23_GET_SERVER_HELLO:unknown protocol')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/iwi-i.xml b/src/chrome/content/rules/iwi-i.xml
deleted file mode 100644
index 103cb3439317..000000000000
--- a/src/chrome/content/rules/iwi-i.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/jacklmoore.com.xml b/src/chrome/content/rules/jacklmoore.com.xml
new file mode 100644
index 000000000000..60e947cadba3
--- /dev/null
+++ b/src/chrome/content/rules/jacklmoore.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/jacksonzoo.org.xml b/src/chrome/content/rules/jacksonzoo.org.xml
new file mode 100644
index 000000000000..00bb54271d28
--- /dev/null
+++ b/src/chrome/content/rules/jacksonzoo.org.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/jacktrammellmusic.com.xml b/src/chrome/content/rules/jacktrammellmusic.com.xml
new file mode 100644
index 000000000000..a48099f3f830
--- /dev/null
+++ b/src/chrome/content/rules/jacktrammellmusic.com.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/jaist.ac.jp.xml b/src/chrome/content/rules/jaist.ac.jp.xml
new file mode 100644
index 000000000000..40806789b0c9
--- /dev/null
+++ b/src/chrome/content/rules/jaist.ac.jp.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/jaoa.org.xml b/src/chrome/content/rules/jaoa.org.xml
index dd2aafd0f97e..e455d999616b 100644
--- a/src/chrome/content/rules/jaoa.org.xml
+++ b/src/chrome/content/rules/jaoa.org.xml
@@ -1,9 +1,9 @@
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/javaops.ru.xml b/src/chrome/content/rules/javaops.ru.xml
new file mode 100644
index 000000000000..978162303799
--- /dev/null
+++ b/src/chrome/content/rules/javaops.ru.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/jeman.de.xml b/src/chrome/content/rules/jeman.de.xml
index 1b2301b423bb..505c81a1a118 100644
--- a/src/chrome/content/rules/jeman.de.xml
+++ b/src/chrome/content/rules/jeman.de.xml
@@ -4,9 +4,9 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://jeman.de/ => https://jeman.de/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
         
 
         
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/jenkins.io.xml b/src/chrome/content/rules/jenkins.io.xml
index c9cbb7719cf8..be5a521c2803 100644
--- a/src/chrome/content/rules/jenkins.io.xml
+++ b/src/chrome/content/rules/jenkins.io.xml
@@ -1,28 +1,41 @@
 
 
+
 	
 	
 	
-	
-	
 	
+	
 	
+	
+	
+	
 	
 	
 	
 		
+	
+	
 	
+	
 	
 	
 
+	
+
 	
+
 
diff --git a/src/chrome/content/rules/jeremyheminger.com.xml b/src/chrome/content/rules/jeremyheminger.com.xml
new file mode 100644
index 000000000000..491086d1036e
--- /dev/null
+++ b/src/chrome/content/rules/jeremyheminger.com.xml
@@ -0,0 +1,23 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/jibbed.org.xml b/src/chrome/content/rules/jibbed.org.xml
index 484f15148116..577d8e4e3c65 100644
--- a/src/chrome/content/rules/jibbed.org.xml
+++ b/src/chrome/content/rules/jibbed.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://jibbed.org/ => https://jibbed.org/: (60, 'SSL certificate pr
 Fetch error: http://dus.jibbed.org/ => https://dus.jibbed.org/: (7, 'Failed to connect to dus.jibbed.org port 443: Connection timed out')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/jiri-dvorak.cz.xml b/src/chrome/content/rules/jiri-dvorak.cz.xml
new file mode 100644
index 000000000000..1d8c1a53c388
--- /dev/null
+++ b/src/chrome/content/rules/jiri-dvorak.cz.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/jklakshmicement.com.xml b/src/chrome/content/rules/jklakshmicement.com.xml
new file mode 100644
index 000000000000..2c1fa7914a2f
--- /dev/null
+++ b/src/chrome/content/rules/jklakshmicement.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/jm.com.xml b/src/chrome/content/rules/jm.com.xml
index 9534e228447b..9e75053ae018 100644
--- a/src/chrome/content/rules/jm.com.xml
+++ b/src/chrome/content/rules/jm.com.xml
@@ -7,7 +7,6 @@ Fetch error: http://e-commerce.jm.com/ => https://e-commerce.jm.com/: (60, 'SSL
 
 	Other Johns Manville rulesets:
 
-		- jmconnexus.com.xml
 
 
 	^jm.com: Dropped
@@ -26,7 +25,7 @@ Fetch error: http://e-commerce.jm.com/ => https://e-commerce.jm.com/: (60, 'SSL
 	ᵐ Pardot / mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/jma.go.jp.xml b/src/chrome/content/rules/jma.go.jp.xml
new file mode 100644
index 000000000000..ee73030747e1
--- /dev/null
+++ b/src/chrome/content/rules/jma.go.jp.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/jmconnexus.com.xml b/src/chrome/content/rules/jmconnexus.com.xml
deleted file mode 100644
index a1a4b045b72d..000000000000
--- a/src/chrome/content/rules/jmconnexus.com.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/jmd4you.de.xml b/src/chrome/content/rules/jmd4you.de.xml
new file mode 100644
index 000000000000..b10c89a2ba93
--- /dev/null
+++ b/src/chrome/content/rules/jmd4you.de.xml
@@ -0,0 +1,17 @@
+
+
+
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/jmsustainability.com.xml b/src/chrome/content/rules/jmsustainability.com.xml
new file mode 100644
index 000000000000..1d393d1d638f
--- /dev/null
+++ b/src/chrome/content/rules/jmsustainability.com.xml
@@ -0,0 +1,6 @@
+
+  
+	
+
+	
+
diff --git a/src/chrome/content/rules/joanganzcooneycenter.org.xml b/src/chrome/content/rules/joanganzcooneycenter.org.xml
new file mode 100644
index 000000000000..a65290932f84
--- /dev/null
+++ b/src/chrome/content/rules/joanganzcooneycenter.org.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/jobcorps.gov-resources.xml b/src/chrome/content/rules/jobcorps.gov-resources.xml
index 3f623154c1eb..5c56e574da12 100644
--- a/src/chrome/content/rules/jobcorps.gov-resources.xml
+++ b/src/chrome/content/rules/jobcorps.gov-resources.xml
@@ -15,7 +15,7 @@ Fetch error: http://www.jobcorps.gov/favicon.ico => https://www.jobcorps.gov/fav
 	and no mixed content secured.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/jobs.ch.xml b/src/chrome/content/rules/jobs.ch.xml
deleted file mode 100644
index 01dcb863936a..000000000000
--- a/src/chrome/content/rules/jobs.ch.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/jobs.gov.hk.xml b/src/chrome/content/rules/jobs.gov.hk.xml
index 34ae547e131a..e325739d01d0 100644
--- a/src/chrome/content/rules/jobs.gov.hk.xml
+++ b/src/chrome/content/rules/jobs.gov.hk.xml
@@ -14,7 +14,7 @@
 	
 
 	
-	
-	
 
diff --git a/src/chrome/content/rules/joejulian.name.xml b/src/chrome/content/rules/joejulian.name.xml
index 65110e4ec095..8a8e5305bcbd 100644
--- a/src/chrome/content/rules/joejulian.name.xml
+++ b/src/chrome/content/rules/joejulian.name.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Non-2xx HTTP code: http://www.joejulian.name/ (200) => https://www.joejulian.name/ (400)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/jomsocial.com.xml b/src/chrome/content/rules/jomsocial.com.xml
new file mode 100644
index 000000000000..1a28a0422a30
--- /dev/null
+++ b/src/chrome/content/rules/jomsocial.com.xml
@@ -0,0 +1,27 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/joxi.net.xml b/src/chrome/content/rules/joxi.net.xml
new file mode 100644
index 000000000000..16dbf205fb13
--- /dev/null
+++ b/src/chrome/content/rules/joxi.net.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/joycasino.com.xml b/src/chrome/content/rules/joycasino.com.xml
index 00631468576c..805a872754b0 100644
--- a/src/chrome/content/rules/joycasino.com.xml
+++ b/src/chrome/content/rules/joycasino.com.xml
@@ -41,7 +41,7 @@ www.joy-kazino.com 520
 www.joycazino.com mismatch
 www.joykazino.com 520
 www.joycasino9.com 522-->
-
+
 	
 	
 	
@@ -114,9 +114,9 @@ www.joycasino9.com 522-->
 	
 	
 	
-	
+
 	
-	
+
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/js1k.com.xml b/src/chrome/content/rules/js1k.com.xml
new file mode 100644
index 000000000000..bfea1e78b3a3
--- /dev/null
+++ b/src/chrome/content/rules/js1k.com.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/jsbin.com.xml b/src/chrome/content/rules/jsbin.com.xml
index 34a8c318859e..246cc5e41066 100644
--- a/src/chrome/content/rules/jsbin.com.xml
+++ b/src/chrome/content/rules/jsbin.com.xml
@@ -1,36 +1,24 @@
-
 
-
+
 	
 	
-	
-	
-	
-	
-	
-	
+	
+	
+	
+	
 	
-	
-	
-	
-	
-		
-	
-	
+	
+	
+	
 
+	
 	
 
diff --git a/src/chrome/content/rules/jsdelivr.com.xml b/src/chrome/content/rules/jsdelivr.com.xml
deleted file mode 100644
index 3ad67883b5ca..000000000000
--- a/src/chrome/content/rules/jsdelivr.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/jsrdn.com.xml b/src/chrome/content/rules/jsrdn.com.xml
index 39a0e06bcaea..ebd864c07896 100644
--- a/src/chrome/content/rules/jsrdn.com.xml
+++ b/src/chrome/content/rules/jsrdn.com.xml
@@ -1,32 +1,28 @@
 
 
 
+	
+	
 	
-
-		
-		
-
-
-	
-	
+	
+	
+	
+	
 
 	
 
-
 	
 
diff --git a/src/chrome/content/rules/juick.com.xml b/src/chrome/content/rules/juick.com.xml
index 31ddde2f4f14..80bd09dc94e0 100644
--- a/src/chrome/content/rules/juick.com.xml
+++ b/src/chrome/content/rules/juick.com.xml
@@ -4,11 +4,10 @@ www.juick.com mismatch
 
 	
 	
-	
+
 	
-	
-	
+
 
 	
 
diff --git a/src/chrome/content/rules/justeat.xml b/src/chrome/content/rules/justeat.xml
index b4c24e6bb4bd..800b7b5795d1 100644
--- a/src/chrome/content/rules/justeat.xml
+++ b/src/chrome/content/rules/justeat.xml
@@ -36,7 +36,7 @@ Fetch error: http://partner.justeat.nl/ => https://partner.justeat.nl/: (6, 'Cou
 		- www.plusdecommandes.fr
 		- www.eatonline.fr
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/justseedit.xml b/src/chrome/content/rules/justseedit.xml
index 2f2a5100c80e..a6c379b32611 100644
--- a/src/chrome/content/rules/justseedit.xml
+++ b/src/chrome/content/rules/justseedit.xml
@@ -1,7 +1,7 @@
 
   
   
-  
+
   
 
diff --git a/src/chrome/content/rules/jwz.org.xml b/src/chrome/content/rules/jwz.org.xml
deleted file mode 100644
index e9617a3ff4b9..000000000000
--- a/src/chrome/content/rules/jwz.org.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/jydoll.cn.xml b/src/chrome/content/rules/jydoll.cn.xml
new file mode 100644
index 000000000000..24a980e7e51d
--- /dev/null
+++ b/src/chrome/content/rules/jydoll.cn.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/kabelbw.xml b/src/chrome/content/rules/kabelbw.xml
index d1b2b3e906cc..0b0d6c799225 100644
--- a/src/chrome/content/rules/kabelbw.xml
+++ b/src/chrome/content/rules/kabelbw.xml
@@ -2,4 +2,4 @@
   
 
   
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/kancloud.cn.xml b/src/chrome/content/rules/kancloud.cn.xml
index 222116354237..c9741f8a3d02 100644
--- a/src/chrome/content/rules/kancloud.cn.xml
+++ b/src/chrome/content/rules/kancloud.cn.xml
@@ -6,7 +6,7 @@ Non-2xx HTTP code: http://kancloud.cn/ (200) => https://kancloud.cn/ (404)
 	Different HTTP/HTTPS content:
 		git.kancloud.cn
 		release.kancloud.cn
-		
+
 	Invalid certificate:
 		help.kancloud.cn
 
@@ -14,8 +14,8 @@ Non-2xx HTTP code: http://kancloud.cn/ (200) => https://kancloud.cn/ (404)
 		box.kancloud.cn
 -->
 
-
-	
+
+
 	
 		
 		
diff --git a/src/chrome/content/rules/kantonalbanken.xml b/src/chrome/content/rules/kantonalbanken.xml
index 6fbc41e97afc..a7543409aa47 100644
--- a/src/chrome/content/rules/kantonalbanken.xml
+++ b/src/chrome/content/rules/kantonalbanken.xml
@@ -10,7 +10,6 @@ Fetch error: http://advent.sgkb.ch/ => https://advent.sgkb.ch/: (60, 'SSL certif
 Fetch error: http://fxnet.sgkb.ch/ => https://fxnet.sgkb.ch/: (28, 'Connection timed out after 20001 milliseconds')
 Fetch error: http://tabs.sgkb.ch/ => https://tabs.sgkb.ch/: (60, 'SSL certificate problem: certificate has expired')
 Fetch error: http://tradedirect.ch/ => https://tradedirect.ch/: (51, "SSL: no alternative certificate subject name matches target host name 'tradedirect.ch'")
-Fetch error: http://fxnet.zkb.ch/ => https://fxnet.zkb.ch/: (6, 'Could not resolve host: fxnet.zkb.ch')
 Fetch error: http://tradedirect.ch/ => https://tradedirect.ch/: (51, "SSL: no alternative certificate subject name matches target host name 'tradedirect.ch'")
 
 	Problematic hosts:
@@ -20,9 +19,7 @@ Fetch error: http://tradedirect.ch/ => https://tradedirect.ch/: (51, "SSL: no al
 	Not supported:
 	- newhome.ch
 -->
-
-	
-	
+
 	
 	
 	
@@ -63,14 +60,9 @@ Fetch error: http://tradedirect.ch/ => https://tradedirect.ch/: (51, "SSL: no al
 	
 	
 	
-	
-	
 	
 	
 
-	
-	
-	
 	
 	
 	
@@ -163,16 +155,12 @@ Fetch error: http://tradedirect.ch/ => https://tradedirect.ch/: (51, "SSL: no al
 	
 	
 	
-	
-	
-	
 	
 	
 
 	
 	
 	
-	
 	
 	
 	
@@ -184,9 +172,9 @@ Fetch error: http://tradedirect.ch/ => https://tradedirect.ch/: (51, "SSL: no al
 	
 	
 
-	
+	
 
-	
 
 	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/kapital.kz.xml b/src/chrome/content/rules/kapital.kz.xml
deleted file mode 100644
index a5c011bd77c0..000000000000
--- a/src/chrome/content/rules/kapital.kz.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
diff --git a/src/chrome/content/rules/kaprica.com.xml b/src/chrome/content/rules/kaprica.com.xml
index 04b314013c92..40188ba8e501 100644
--- a/src/chrome/content/rules/kaprica.com.xml
+++ b/src/chrome/content/rules/kaprica.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://kaprica.com/ => https://kaprica.com/: (60, 'SSL certificate
 Fetch error: http://www.kaprica.com/ => https://www.kaprica.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/karlsruhe.freifunk.net.xml b/src/chrome/content/rules/karlsruhe.freifunk.net.xml
index c10651a9ff64..d3b3d212c327 100644
--- a/src/chrome/content/rules/karlsruhe.freifunk.net.xml
+++ b/src/chrome/content/rules/karlsruhe.freifunk.net.xml
@@ -1,16 +1,31 @@
 
 
 
-	
-	
-	
-	
-	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/keep4u.ru.xml b/src/chrome/content/rules/keep4u.ru.xml
new file mode 100644
index 000000000000..f240681f1b75
--- /dev/null
+++ b/src/chrome/content/rules/keep4u.ru.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/kennedy-center.org.xml b/src/chrome/content/rules/kennedy-center.org.xml
index 9f345fc332f9..a92e0e80896b 100644
--- a/src/chrome/content/rules/kennedy-center.org.xml
+++ b/src/chrome/content/rules/kennedy-center.org.xml
@@ -26,7 +26,7 @@ Fetch error: http://www.artsedge.kennedy-center.org/ => https://artsedge.kennedy
 	These altnames do not exist:
 
 		- www.blogs.kennedy-center.org
-	
+
 
 	Insecure cookies are set for these domains and hosts:
 
@@ -46,7 +46,7 @@ Fetch error: http://www.artsedge.kennedy-center.org/ => https://artsedge.kennedy
 	ˢ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/kernsec.org.xml b/src/chrome/content/rules/kernsec.org.xml
new file mode 100644
index 000000000000..b5b138f9f632
--- /dev/null
+++ b/src/chrome/content/rules/kernsec.org.xml
@@ -0,0 +1,11 @@
+
+
+  
+  
+	
+  
+  
+
diff --git a/src/chrome/content/rules/kf5.com.xml b/src/chrome/content/rules/kf5.com.xml
index 9ff5beb08a97..dc5853a202bb 100644
--- a/src/chrome/content/rules/kf5.com.xml
+++ b/src/chrome/content/rules/kf5.com.xml
@@ -4,13 +4,13 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://assetscdn.kf5.com/ => https://assetscdn.kf5.com/: (60, 'SSL certificate problem: certificate has expired')
 
 	kf5.com is an open site, so there are lots of *.kf5.com sites. Lucky, all of them support https.
-	 
+
 	Mismatch:
 		- agents
 		- d
 -->
 
-
+
 
 	
 
diff --git a/src/chrome/content/rules/kik.com-falsemixed.xml b/src/chrome/content/rules/kik.com-falsemixed.xml
deleted file mode 100644
index 62ff6c7ea242..000000000000
--- a/src/chrome/content/rules/kik.com-falsemixed.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/kikisso.com.xml b/src/chrome/content/rules/kikisso.com.xml
index dda028677f5b..f6a686175603 100644
--- a/src/chrome/content/rules/kikisso.com.xml
+++ b/src/chrome/content/rules/kikisso.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://www.kikisso.com/ => https://www.kikisso.com/: (6, 'Could not
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/kinogo.co.xml b/src/chrome/content/rules/kinogo.co.xml
index 88e3b0fbefcc..96b047f97b37 100644
--- a/src/chrome/content/rules/kinogo.co.xml
+++ b/src/chrome/content/rules/kinogo.co.xml
@@ -26,7 +26,7 @@ Fetch error: http://www.kinogo.co/ => https://www.kinogo.co/: Too many redirects
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/kinogo.net.xml b/src/chrome/content/rules/kinogo.net.xml
index 3538c9cb6f14..dba37ba2bfd6 100644
--- a/src/chrome/content/rules/kinogo.net.xml
+++ b/src/chrome/content/rules/kinogo.net.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.kinogo.net/ => https://www.kinogo.net/: Too many redirec
 	For other kinogo coverage, see kinogo.co.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/klick2contact.com.xml b/src/chrome/content/rules/klick2contact.com.xml
index f85e65cb89d0..63afc27e262a 100644
--- a/src/chrome/content/rules/klick2contact.com.xml
+++ b/src/chrome/content/rules/klick2contact.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://klick2contact.com/ => https://klick2contact.com/: (51, "SSL:
 Fetch error: http://www.klick2contact.com/ => https://www.klick2contact.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.klick2contactsales.com'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/klick2contactsales.com.xml b/src/chrome/content/rules/klick2contactsales.com.xml
index efa077e70102..1165d14884d3 100644
--- a/src/chrome/content/rules/klick2contactsales.com.xml
+++ b/src/chrome/content/rules/klick2contactsales.com.xml
@@ -24,7 +24,7 @@ Fetch error: http://www.klick2contactsales.com/ => https://www.klick2contactsale
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/klikki.fi.xml b/src/chrome/content/rules/klikki.fi.xml
index 07a97fbd2eee..d66d873a34b3 100644
--- a/src/chrome/content/rules/klikki.fi.xml
+++ b/src/chrome/content/rules/klikki.fi.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.klikki.fi/ => https://www.klikki.fi/: (51, "SSL: no alternative certificate subject name matches target host name 'www.klikki.fi'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/klikr.org.xml b/src/chrome/content/rules/klikr.org.xml
new file mode 100644
index 000000000000..2e3d44281b25
--- /dev/null
+++ b/src/chrome/content/rules/klikr.org.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/klikr.pw.xml b/src/chrome/content/rules/klikr.pw.xml
new file mode 100644
index 000000000000..69f829f02d1d
--- /dev/null
+++ b/src/chrome/content/rules/klikr.pw.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/klilu.de.xml b/src/chrome/content/rules/klilu.de.xml
index e9c7564e7d32..1520e65b0989 100644
--- a/src/chrome/content/rules/klilu.de.xml
+++ b/src/chrome/content/rules/klilu.de.xml
@@ -6,7 +6,7 @@ Non-2xx HTTP code: http://groupwise.klilu.de/ (200) => https://groupwise.klilu.d
 	Refused:
 	  mtaschule.klilu.de
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/klops.ru.xml b/src/chrome/content/rules/klops.ru.xml
index bc85cc6f6f02..2be6885e6b49 100644
--- a/src/chrome/content/rules/klops.ru.xml
+++ b/src/chrome/content/rules/klops.ru.xml
@@ -37,7 +37,7 @@ velo.klops.ru ¹
 ² refused
 ³ timed out
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/kmd.dk-resources.xml b/src/chrome/content/rules/kmd.dk-resources.xml
deleted file mode 100644
index 017922f26d6a..000000000000
--- a/src/chrome/content/rules/kmd.dk-resources.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-	
-
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-
-
-	
-
-
diff --git a/src/chrome/content/rules/knigafund.ru.xml b/src/chrome/content/rules/knigafund.ru.xml
index 196dfaafb3b9..f38a9b8bcf41 100644
--- a/src/chrome/content/rules/knigafund.ru.xml
+++ b/src/chrome/content/rules/knigafund.ru.xml
@@ -7,7 +7,7 @@ demo. mismatch
 api. mismatch
 vuz. mismatch
 library. mismatch-->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/komi-news.ru.xml b/src/chrome/content/rules/komi-news.ru.xml
index d91a9fc9bdbd..21dea0964014 100644
--- a/src/chrome/content/rules/komi-news.ru.xml
+++ b/src/chrome/content/rules/komi-news.ru.xml
@@ -10,7 +10,7 @@ stories.komi-news.ru/: (52, 'Empty reply from server')
 
 ⁴ self signed
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/koptevo.net.xml b/src/chrome/content/rules/koptevo.net.xml
index bca2bd35f67d..a57d424ea752 100644
--- a/src/chrome/content/rules/koptevo.net.xml
+++ b/src/chrome/content/rules/koptevo.net.xml
@@ -30,7 +30,7 @@ x-zone.koptevo.net ⁴
 ⁴ self signed
 ⁷ protocol error
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/krasnodar.ru.xml b/src/chrome/content/rules/krasnodar.ru.xml
index 23f43710bb0e..fa353d85de5f 100644
--- a/src/chrome/content/rules/krasnodar.ru.xml
+++ b/src/chrome/content/rules/krasnodar.ru.xml
@@ -91,7 +91,7 @@ www.vin.krasnodar.ru ¹
 ⁴ self signed
 ⁷ protocol error
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/kremlinpress.ru.xml b/src/chrome/content/rules/kremlinpress.ru.xml
deleted file mode 100644
index 1caeb2609786..000000000000
--- a/src/chrome/content/rules/kremlinpress.ru.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/kt.kz.xml b/src/chrome/content/rules/kt.kz.xml
deleted file mode 100644
index 6cbda0101350..000000000000
--- a/src/chrome/content/rules/kt.kz.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-	
-	
-	
-
diff --git a/src/chrome/content/rules/ktxtr.com.xml b/src/chrome/content/rules/ktxtr.com.xml
new file mode 100644
index 000000000000..f748b8258834
--- /dev/null
+++ b/src/chrome/content/rules/ktxtr.com.xml
@@ -0,0 +1,28 @@
+
+
+
+	
+	
+		
+	
+		
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/kuna.io.xml b/src/chrome/content/rules/kuna.io.xml
index b0dae1dba31f..321151ecc80d 100644
--- a/src/chrome/content/rules/kuna.io.xml
+++ b/src/chrome/content/rules/kuna.io.xml
@@ -11,7 +11,7 @@ investors.kuna.io different content
 ¹ mismatch
 ⁴ self signed
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/kurs.expert.xml b/src/chrome/content/rules/kurs.expert.xml
index 7b43dea8969a..f18ed7dfef07 100644
--- a/src/chrome/content/rules/kurs.expert.xml
+++ b/src/chrome/content/rules/kurs.expert.xml
@@ -5,7 +5,7 @@ Fetch error: http://p2p.kurs.expert/ => https://p2p.kurs.expert/: (51, "SSL: no
 Fetch error: http://www.p2p.kurs.expert/ => https://www.p2p.kurs.expert/: (6, 'Could not resolve host: www.p2p.kurs.expert')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/kva.se.xml b/src/chrome/content/rules/kva.se.xml
index 6039413aa943..0e2d2ad7db35 100644
--- a/src/chrome/content/rules/kva.se.xml
+++ b/src/chrome/content/rules/kva.se.xml
@@ -5,7 +5,7 @@ Fetch error: http://kva.se/ => https://kva.se/: (51, "SSL: no alternative certif
 Fetch error: http://www.kva.se/ => https://www.kva.se/: (51, "SSL: no alternative certificate subject name matches target host name 'www.kva.se'")
 
 -->
-
+
         
         
 
diff --git a/src/chrome/content/rules/kylie.com.xml b/src/chrome/content/rules/kylie.com.xml
deleted file mode 100644
index 7f7a8ebdac3d..000000000000
--- a/src/chrome/content/rules/kylie.com.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/l214.com.xml b/src/chrome/content/rules/l214.com.xml
deleted file mode 100644
index d18051b1ac3f..000000000000
--- a/src/chrome/content/rules/l214.com.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-	
-
-
diff --git a/src/chrome/content/rules/laiwang.com.xml b/src/chrome/content/rules/laiwang.com.xml
index 3e34863e3215..af927afaa35c 100644
--- a/src/chrome/content/rules/laiwang.com.xml
+++ b/src/chrome/content/rules/laiwang.com.xml
@@ -41,7 +41,7 @@ Fetch error: http://wukong.laiwang.com/ => https://wukong.laiwang.com/: (6, 'Cou
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/lambeth.gov.uk.xml b/src/chrome/content/rules/lambeth.gov.uk.xml
index 844c132f8a56..27eb4e98aade 100644
--- a/src/chrome/content/rules/lambeth.gov.uk.xml
+++ b/src/chrome/content/rules/lambeth.gov.uk.xml
@@ -73,7 +73,7 @@ Non-2xx HTTP code: http://onlinepermits.lambeth.gov.uk/ (200) => https://onlinep
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/lancashire.gov.uk.xml b/src/chrome/content/rules/lancashire.gov.uk.xml
index 6e904fbd1e82..c848d5a40178 100644
--- a/src/chrome/content/rules/lancashire.gov.uk.xml
+++ b/src/chrome/content/rules/lancashire.gov.uk.xml
@@ -59,7 +59,7 @@ Fetch error: http://eforms.lancashire.gov.uk/ => https://eforms.lancashire.gov.u
 	ᵘ Unsecurable
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/lancaster.gov.uk.xml b/src/chrome/content/rules/lancaster.gov.uk.xml
index 9c5a8c7bf33e..185ca63488e3 100644
--- a/src/chrome/content/rules/lancaster.gov.uk.xml
+++ b/src/chrome/content/rules/lancaster.gov.uk.xml
@@ -27,7 +27,7 @@ Non-2xx HTTP code: http://planning.lancaster.gov.uk/ (200) => https://planning.l
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/landalskilife.be.xml b/src/chrome/content/rules/landalskilife.be.xml
index 95a0651d8ecb..388bfd59a9c7 100644
--- a/src/chrome/content/rules/landalskilife.be.xml
+++ b/src/chrome/content/rules/landalskilife.be.xml
@@ -1,5 +1,5 @@
 
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/lazyfoo.net.xml b/src/chrome/content/rules/lazyfoo.net.xml
new file mode 100644
index 000000000000..a8b1c7f9c7b1
--- /dev/null
+++ b/src/chrome/content/rules/lazyfoo.net.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/lczero.org.xml b/src/chrome/content/rules/lczero.org.xml
new file mode 100644
index 000000000000..f68f691194c3
--- /dev/null
+++ b/src/chrome/content/rules/lczero.org.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/learning.hccs.edu.xml b/src/chrome/content/rules/learning.hccs.edu.xml
new file mode 100644
index 000000000000..da41f86b9f90
--- /dev/null
+++ b/src/chrome/content/rules/learning.hccs.edu.xml
@@ -0,0 +1,9 @@
+
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/lekumo.jp.xml b/src/chrome/content/rules/lekumo.jp.xml
index e2f23c7a43f3..667b5ec8cb3e 100644
--- a/src/chrome/content/rules/lekumo.jp.xml
+++ b/src/chrome/content/rules/lekumo.jp.xml
@@ -17,4 +17,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/lend.me.xml b/src/chrome/content/rules/lend.me.xml
index 764c0113afda..57861bf51f62 100644
--- a/src/chrome/content/rules/lend.me.xml
+++ b/src/chrome/content/rules/lend.me.xml
@@ -5,7 +5,7 @@ Fetch error: http://lend.me/ => https://lend.me/: (35, 'Unknown SSL protocol err
 Fetch error: http://www.lend.me/ => https://www.lend.me/: (35, 'Unknown SSL protocol error in connection to www.lend.me:443 ')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/lenta.ru.xml b/src/chrome/content/rules/lenta.ru.xml
index d954415875fc..3fb1de7dfec7 100644
--- a/src/chrome/content/rules/lenta.ru.xml
+++ b/src/chrome/content/rules/lenta.ru.xml
@@ -33,7 +33,7 @@ Fetch error: http://www.lenta.ru/ => https://www.lenta.ru/: (56, 'Malformed enco
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/letvcdn.xml b/src/chrome/content/rules/letvcdn.xml
index 60282c6c28e7..bfdfff570906 100644
--- a/src/chrome/content/rules/letvcdn.xml
+++ b/src/chrome/content/rules/letvcdn.xml
@@ -16,7 +16,7 @@ Not exist:
 	
 	
 	
-	
+
 	
-	
+
 
diff --git a/src/chrome/content/rules/letvimg.xml b/src/chrome/content/rules/letvimg.xml
index df84ed6b6c33..f4aad273052d 100644
--- a/src/chrome/content/rules/letvimg.xml
+++ b/src/chrome/content/rules/letvimg.xml
@@ -12,7 +12,7 @@ Not exist:
 	
 	
 	
-	
+
 	
-	
+
 
diff --git a/src/chrome/content/rules/lewes.gov.uk.xml b/src/chrome/content/rules/lewes.gov.uk.xml
index e831273b87d3..d18c9ffa0f95 100644
--- a/src/chrome/content/rules/lewes.gov.uk.xml
+++ b/src/chrome/content/rules/lewes.gov.uk.xml
@@ -18,7 +18,7 @@
 	ᶜ Server sends no certificate chain, see https://whatsmychaincert.com
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/lezhin.com.xml b/src/chrome/content/rules/lezhin.com.xml
index e421257d9481..637e78f4c6f1 100644
--- a/src/chrome/content/rules/lezhin.com.xml
+++ b/src/chrome/content/rules/lezhin.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://ggtoon.lezhin.com/ => https://ggtoon.lezhin.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 	
-	
+
 	
 	
 	
@@ -26,11 +26,11 @@ Fetch error: http://ggtoon.lezhin.com/ => https://ggtoon.lezhin.com/: (60, 'SSL
 
 	
 	
-	
+
 	
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/lfeeder.com.xml b/src/chrome/content/rules/lfeeder.com.xml
new file mode 100644
index 000000000000..05afe8df3958
--- /dev/null
+++ b/src/chrome/content/rules/lfeeder.com.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/libmng.com.xml b/src/chrome/content/rules/libmng.com.xml
new file mode 100644
index 000000000000..093e3c1f7589
--- /dev/null
+++ b/src/chrome/content/rules/libmng.com.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/libuv.org.xml b/src/chrome/content/rules/libuv.org.xml
new file mode 100644
index 000000000000..cdd515be66a7
--- /dev/null
+++ b/src/chrome/content/rules/libuv.org.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/lichfielddc.gov.uk.xml b/src/chrome/content/rules/lichfielddc.gov.uk.xml
index 78dcc1ff3170..18bbef23f234 100644
--- a/src/chrome/content/rules/lichfielddc.gov.uk.xml
+++ b/src/chrome/content/rules/lichfielddc.gov.uk.xml
@@ -24,7 +24,7 @@
 	Mixed content:
 
 		- css, on:
-		
+
 			- spending from www-prev.lichfielddc.gov.uk
 			- www2 from www.lichfielddc.gov.uk ˢ
 
diff --git a/src/chrome/content/rules/lidl.co.uk.xml b/src/chrome/content/rules/lidl.co.uk.xml
index 3cad509ef5c1..e2f2d4564ac0 100644
--- a/src/chrome/content/rules/lidl.co.uk.xml
+++ b/src/chrome/content/rules/lidl.co.uk.xml
@@ -39,7 +39,7 @@ Fetch error: http://specials.lidl.co.uk/ => https://specials.lidl.co.uk/: (6, 'C
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/lightreading.com.xml b/src/chrome/content/rules/lightreading.com.xml
index 94184d3b1c99..4984c8aee04f 100644
--- a/src/chrome/content/rules/lightreading.com.xml
+++ b/src/chrome/content/rules/lightreading.com.xml
@@ -68,12 +68,10 @@
 
 	
-	
+	
 
 		
 
-	
+
 
 
diff --git a/src/chrome/content/rules/lightwidget.com.xml b/src/chrome/content/rules/lightwidget.com.xml
index 0261608c00d1..cbdaaad2b773 100644
--- a/src/chrome/content/rules/lightwidget.com.xml
+++ b/src/chrome/content/rules/lightwidget.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.lightwidget.com/ => https://www.lightwidget.com/: (51, "
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/lime-technology.com.xml b/src/chrome/content/rules/lime-technology.com.xml
index e9045af1435c..b8983e3250da 100644
--- a/src/chrome/content/rules/lime-technology.com.xml
+++ b/src/chrome/content/rules/lime-technology.com.xml
@@ -1,38 +1,15 @@
 
 
 
-	
 	
 	
 
-	
-	
-
-
-	
-
-
-	
+	
 
-	
+	
 
 
diff --git a/src/chrome/content/rules/lingvo.org.xml b/src/chrome/content/rules/lingvo.org.xml
new file mode 100644
index 000000000000..8339bb1897f7
--- /dev/null
+++ b/src/chrome/content/rules/lingvo.org.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/linkline.ru.xml b/src/chrome/content/rules/linkline.ru.xml
deleted file mode 100644
index b64409b96cdf..000000000000
--- a/src/chrome/content/rules/linkline.ru.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/linux-notes.org.xml b/src/chrome/content/rules/linux-notes.org.xml
new file mode 100644
index 000000000000..3ce8e9200736
--- /dev/null
+++ b/src/chrome/content/rules/linux-notes.org.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/linuxcenter.ru.xml b/src/chrome/content/rules/linuxcenter.ru.xml
new file mode 100644
index 000000000000..933060fb80f8
--- /dev/null
+++ b/src/chrome/content/rules/linuxcenter.ru.xml
@@ -0,0 +1,28 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/linuxgizmos.com.xml b/src/chrome/content/rules/linuxgizmos.com.xml
deleted file mode 100644
index 34042cb5a96f..000000000000
--- a/src/chrome/content/rules/linuxgizmos.com.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/linuxgraphic.org.xml b/src/chrome/content/rules/linuxgraphic.org.xml
index 78d6ca87f00e..375933834998 100644
--- a/src/chrome/content/rules/linuxgraphic.org.xml
+++ b/src/chrome/content/rules/linuxgraphic.org.xml
@@ -11,7 +11,7 @@
 		- css on www from $self ˢ
 
 		- Images, on:
-		
+
 			- www from synfig.org ⁴
 			- www from download.tuxfamily.org ˢ
 
diff --git a/src/chrome/content/rules/listentothe.cloud.xml b/src/chrome/content/rules/listentothe.cloud.xml
new file mode 100644
index 000000000000..59274c6decbb
--- /dev/null
+++ b/src/chrome/content/rules/listentothe.cloud.xml
@@ -0,0 +1,7 @@
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/litresp.ru.xml b/src/chrome/content/rules/litresp.ru.xml
new file mode 100644
index 000000000000..6920e6c4e069
--- /dev/null
+++ b/src/chrome/content/rules/litresp.ru.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/livecomm.ru.xml b/src/chrome/content/rules/livecomm.ru.xml
index 1869c65fdc3d..37a6b5ccb2b9 100644
--- a/src/chrome/content/rules/livecomm.ru.xml
+++ b/src/chrome/content/rules/livecomm.ru.xml
@@ -5,7 +5,7 @@ Fetch error: http://livecomm.ru/ => https://livecomm.ru/: (60, 'SSL certificate
 Fetch error: http://www.livecomm.ru/ => https://www.livecomm.ru/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/lleo.me.xml b/src/chrome/content/rules/lleo.me.xml
new file mode 100644
index 000000000000..d38ef81c2e09
--- /dev/null
+++ b/src/chrome/content/rules/lleo.me.xml
@@ -0,0 +1,24 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/lme.com.xml b/src/chrome/content/rules/lme.com.xml
new file mode 100644
index 000000000000..cbd2b75f0a85
--- /dev/null
+++ b/src/chrome/content/rules/lme.com.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/locality.com.xml b/src/chrome/content/rules/locality.com.xml
deleted file mode 100644
index f99f54b1e9df..000000000000
--- a/src/chrome/content/rules/locality.com.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/localizejs.com.xml b/src/chrome/content/rules/localizejs.com.xml
deleted file mode 100644
index 981cc915884f..000000000000
--- a/src/chrome/content/rules/localizejs.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-	
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/localmonero.co.xml b/src/chrome/content/rules/localmonero.co.xml
new file mode 100644
index 000000000000..06a0ca47f416
--- /dev/null
+++ b/src/chrome/content/rules/localmonero.co.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/lockscalecompare.com.xml b/src/chrome/content/rules/lockscalecompare.com.xml
index 4b3f2936518b..3477c1d40432 100644
--- a/src/chrome/content/rules/lockscalecompare.com.xml
+++ b/src/chrome/content/rules/lockscalecompare.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://gets.lockscalecompare.com/ => https://gets.lockscalecompare.
 		- www.gets.lockscalecompare.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/lofter.com.xml b/src/chrome/content/rules/lofter.com.xml
index e51562d4a842..a3df3925a9e1 100644
--- a/src/chrome/content/rules/lofter.com.xml
+++ b/src/chrome/content/rules/lofter.com.xml
@@ -1,33 +1,21 @@
 
+
 
-
+	
+	
 
-	
-	
+	
+	
+	
+	
+	
+	
 
-	
-	
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
+	
 
+	
 	
-
 
diff --git a/src/chrome/content/rules/logicalincrements.com.xml b/src/chrome/content/rules/logicalincrements.com.xml
new file mode 100644
index 000000000000..65007777f178
--- /dev/null
+++ b/src/chrome/content/rules/logicalincrements.com.xml
@@ -0,0 +1,23 @@
+
+
+	
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/lorenzonuvoletta.com.xml b/src/chrome/content/rules/lorenzonuvoletta.com.xml
new file mode 100644
index 000000000000..2bba847cfde5
--- /dev/null
+++ b/src/chrome/content/rules/lorenzonuvoletta.com.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/lostpic.net.xml b/src/chrome/content/rules/lostpic.net.xml
new file mode 100644
index 000000000000..b3714cc89895
--- /dev/null
+++ b/src/chrome/content/rules/lostpic.net.xml
@@ -0,0 +1,33 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/lotro.com.xml b/src/chrome/content/rules/lotro.com.xml
index 3d8f96415f85..2a25896e8af3 100644
--- a/src/chrome/content/rules/lotro.com.xml
+++ b/src/chrome/content/rules/lotro.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://signup.lotro.com/ => https://signup.lotro.com/: (60, 'SSL ce
 	² Cert mismatched for redirect destination
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/lprs1.fr.xml b/src/chrome/content/rules/lprs1.fr.xml
deleted file mode 100644
index 45b0364f75bd..000000000000
--- a/src/chrome/content/rules/lprs1.fr.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-		
-	
-		
-
-	
-
-
diff --git a/src/chrome/content/rules/ltr-data.se.xml b/src/chrome/content/rules/ltr-data.se.xml
new file mode 100644
index 000000000000..1d60e86822f0
--- /dev/null
+++ b/src/chrome/content/rules/ltr-data.se.xml
@@ -0,0 +1,25 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/luca-steeb.com.xml b/src/chrome/content/rules/luca-steeb.com.xml
deleted file mode 100644
index b866c9457358..000000000000
--- a/src/chrome/content/rules/luca-steeb.com.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-
-		
-
-
-	
-	
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/luckyreferrals.com.xml b/src/chrome/content/rules/luckyreferrals.com.xml
index 6fe74aae39fc..b5584c5170f4 100644
--- a/src/chrome/content/rules/luckyreferrals.com.xml
+++ b/src/chrome/content/rules/luckyreferrals.com.xml
@@ -20,7 +20,7 @@ Fetch error: http://www.luckyreferrals.com/ => https://www.luckyreferrals.com/:
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/luosimao.com.xml b/src/chrome/content/rules/luosimao.com.xml
index d8440c12b72c..23f440202103 100644
--- a/src/chrome/content/rules/luosimao.com.xml
+++ b/src/chrome/content/rules/luosimao.com.xml
@@ -5,25 +5,24 @@ Non-2xx HTTP code: http://my.luosimao.com/ (200) => https://my.luosimao.com/ (50
 
 
 	
-	
+
 	
 		
-	
+
 	
 		
-	
+
 	
-	
+
 	
 		
 	
 	
-		
-	
+
 	
 		
 		
-	
+
 	
 
 	
diff --git a/src/chrome/content/rules/luukku.com.xml b/src/chrome/content/rules/luukku.com.xml
index c97a8f9a934d..9202dc79ccc8 100644
--- a/src/chrome/content/rules/luukku.com.xml
+++ b/src/chrome/content/rules/luukku.com.xml
@@ -11,7 +11,7 @@
 		- Image on www from st.mtv.fi ˢ
 
 		- Bugs, on:
-		
+
 			- www from code.adtlgc.com
 			- www from eas3.emediate.se ˢ
 
diff --git a/src/chrome/content/rules/lwfinger.com.xml b/src/chrome/content/rules/lwfinger.com.xml
new file mode 100644
index 000000000000..55fe04a18795
--- /dev/null
+++ b/src/chrome/content/rules/lwfinger.com.xml
@@ -0,0 +1,5 @@
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/m2c.ru.xml b/src/chrome/content/rules/m2c.ru.xml
deleted file mode 100644
index 7a81d318b145..000000000000
--- a/src/chrome/content/rules/m2c.ru.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/m2ch.hk.xml b/src/chrome/content/rules/m2ch.hk.xml
deleted file mode 100644
index b646cb9cbfb8..000000000000
--- a/src/chrome/content/rules/m2ch.hk.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/m2ch.xml b/src/chrome/content/rules/m2ch.xml
new file mode 100644
index 000000000000..594638467a6c
--- /dev/null
+++ b/src/chrome/content/rules/m2ch.xml
@@ -0,0 +1,19 @@
+	
+
+	
+	
+ 	
+	
+ 	
+	
+ 	
+	
+ 	
+	
+ 	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/madadsmedia.com.xml b/src/chrome/content/rules/madadsmedia.com.xml
index 28aae7256c67..be1342029ac3 100644
--- a/src/chrome/content/rules/madadsmedia.com.xml
+++ b/src/chrome/content/rules/madadsmedia.com.xml
@@ -19,7 +19,7 @@ Fetch error: http://www.madadsmedia.com/ => https://www.madadsmedia.com/: Too ma
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/madgex.com.xml b/src/chrome/content/rules/madgex.com.xml
index 9919320276c2..88400d89a0ec 100644
--- a/src/chrome/content/rules/madgex.com.xml
+++ b/src/chrome/content/rules/madgex.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://support.madgex.com/ => https://madgex.zendesk.com/: Too many
 	ᵐ Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/magnum-ci.com.xml b/src/chrome/content/rules/magnum-ci.com.xml
index df09dda5f374..c7205d0ebf2b 100644
--- a/src/chrome/content/rules/magnum-ci.com.xml
+++ b/src/chrome/content/rules/magnum-ci.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.magnum-ci.com/ => https://www.magnum-ci.com/: (7, 'Faile
 
 blog.magnum-ci.com mismatch
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/maist.jp.xml b/src/chrome/content/rules/maist.jp.xml
index 26043f11d92b..e7bfe411e2ee 100644
--- a/src/chrome/content/rules/maist.jp.xml
+++ b/src/chrome/content/rules/maist.jp.xml
@@ -19,4 +19,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/make-trivial-rule b/src/chrome/content/rules/make-trivial-rule
index 5eb61affc285..8a7d9c1a2ee8 100755
--- a/src/chrome/content/rules/make-trivial-rule
+++ b/src/chrome/content/rules/make-trivial-rule
@@ -51,7 +51,14 @@ fi
 
 cat > "$dest" <
 	
 	
-	
-	
-	
-	
 
diff --git a/src/chrome/content/rules/mameworld.info.xml b/src/chrome/content/rules/mameworld.info.xml
new file mode 100644
index 000000000000..2fd2f9cc805b
--- /dev/null
+++ b/src/chrome/content/rules/mameworld.info.xml
@@ -0,0 +1,204 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/mandrakewine.com.xml b/src/chrome/content/rules/mandrakewine.com.xml
new file mode 100644
index 000000000000..8c44b8e5c526
--- /dev/null
+++ b/src/chrome/content/rules/mandrakewine.com.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/manning.com.xml b/src/chrome/content/rules/manning.com.xml
index 05550e6fb012..03b829bbd128 100644
--- a/src/chrome/content/rules/manning.com.xml
+++ b/src/chrome/content/rules/manning.com.xml
@@ -1,6 +1,5 @@
 
@@ -8,6 +7,7 @@ ycart.manning.com different content
 	
 	
 	
+	
 	
 	
 
diff --git a/src/chrome/content/rules/marketingautomation-linz.de.xml b/src/chrome/content/rules/marketingautomation-linz.de.xml
new file mode 100644
index 000000000000..6428aff42295
--- /dev/null
+++ b/src/chrome/content/rules/marketingautomation-linz.de.xml
@@ -0,0 +1,46 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/marketoracle.co.uk.xml b/src/chrome/content/rules/marketoracle.co.uk.xml
new file mode 100644
index 000000000000..4efa89d8f08d
--- /dev/null
+++ b/src/chrome/content/rules/marketoracle.co.uk.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/masterpasswordapp.com.xml b/src/chrome/content/rules/masterpasswordapp.com.xml
new file mode 100644
index 000000000000..6051335fabad
--- /dev/null
+++ b/src/chrome/content/rules/masterpasswordapp.com.xml
@@ -0,0 +1,13 @@
+ 
+
+	
+	
+	
+	
+
+
+	
+
diff --git a/src/chrome/content/rules/mattermap.nl.xml b/src/chrome/content/rules/mattermap.nl.xml
deleted file mode 100644
index bc20ac80baea..000000000000
--- a/src/chrome/content/rules/mattermap.nl.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/mattermark.com.xml b/src/chrome/content/rules/mattermark.com.xml
index 20c3578675b8..90fa1d3f19f0 100644
--- a/src/chrome/content/rules/mattermark.com.xml
+++ b/src/chrome/content/rules/mattermark.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://wordpress.mattermark.com/ => https://wordpress.mattermark.co
 		- support.mattermark.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/maxthon.cn.xml b/src/chrome/content/rules/maxthon.cn.xml
new file mode 100644
index 000000000000..11b8f692e47c
--- /dev/null
+++ b/src/chrome/content/rules/maxthon.cn.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/mazesp.in.xml b/src/chrome/content/rules/mazesp.in.xml
new file mode 100644
index 000000000000..57e0d1c9d317
--- /dev/null
+++ b/src/chrome/content/rules/mazesp.in.xml
@@ -0,0 +1,7 @@
+
+	
+	
+
+	 
+	
+
diff --git a/src/chrome/content/rules/mcc.gov.xml b/src/chrome/content/rules/mcc.gov.xml
index 0877a09272aa..dfd8379a9eed 100644
--- a/src/chrome/content/rules/mcc.gov.xml
+++ b/src/chrome/content/rules/mcc.gov.xml
@@ -7,7 +7,7 @@ Fetch error: http://data.mcc.gov/ => https://data.mcc.gov/: (35, 'Unknown SSL pr
 
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/medicaid.gov.xml b/src/chrome/content/rules/medicaid.gov.xml
index c6ad4b3c62cb..64b90c32ca1c 100644
--- a/src/chrome/content/rules/medicaid.gov.xml
+++ b/src/chrome/content/rules/medicaid.gov.xml
@@ -36,7 +36,7 @@ Non-2xx HTTP code: http://questions.medicaid.gov/ (200) => https://questions.med
 			- public from ^medicaid.gov
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/medicare.gov.xml b/src/chrome/content/rules/medicare.gov.xml
index 8ee222c44e0b..42d77e9ca4c1 100644
--- a/src/chrome/content/rules/medicare.gov.xml
+++ b/src/chrome/content/rules/medicare.gov.xml
@@ -25,7 +25,7 @@ Fetch error: http://www4c.medicare.gov/ => https://www4c.medicare.gov/: (6, 'Cou
 
 
 	Insecure cookies are set for these hosts:
-	
+
 		- medicare.gov
 		- enrollmentcenter.medicare.gov
 		- es.medicare.gov
@@ -40,7 +40,7 @@ Fetch error: http://www4c.medicare.gov/ => https://www4c.medicare.gov/: (6, 'Cou
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/megaadventure.com.au.xml b/src/chrome/content/rules/megaadventure.com.au.xml
index 1cd5ff4dd42a..aacd62574223 100644
--- a/src/chrome/content/rules/megaadventure.com.au.xml
+++ b/src/chrome/content/rules/megaadventure.com.au.xml
@@ -9,7 +9,7 @@ Fetch error: http://tickets.megaadventure.com.au/ => https://tickets.megaadventu
 	Non-functional subdomain:
 		- (www)		(unknown protocol)
 -->
-
+
 	
 
 	
diff --git a/src/chrome/content/rules/meldmerge.org.xml b/src/chrome/content/rules/meldmerge.org.xml
new file mode 100644
index 000000000000..1968e22e2eb6
--- /dev/null
+++ b/src/chrome/content/rules/meldmerge.org.xml
@@ -0,0 +1,7 @@
+
+  
+  
+
+  
+  
+
diff --git a/src/chrome/content/rules/menulog.com.au.xml b/src/chrome/content/rules/menulog.com.au.xml
index d45369144011..5f50299ad6fb 100644
--- a/src/chrome/content/rules/menulog.com.au.xml
+++ b/src/chrome/content/rules/menulog.com.au.xml
@@ -9,7 +9,7 @@ Fetch error: http://menulog.com.au/ => https://menulog.com.au/: (51, "SSL: no al
 		- www.menulog.com.au
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/meraferesources.co.za.xml b/src/chrome/content/rules/meraferesources.co.za.xml
new file mode 100644
index 000000000000..772110b123f8
--- /dev/null
+++ b/src/chrome/content/rules/meraferesources.co.za.xml
@@ -0,0 +1,24 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/mercurius.space.xml b/src/chrome/content/rules/mercurius.space.xml
deleted file mode 100644
index 02ad7b8f95b8..000000000000
--- a/src/chrome/content/rules/mercurius.space.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/met.police.uk.xml b/src/chrome/content/rules/met.police.uk.xml
index b785653297ff..738bfb436b5c 100644
--- a/src/chrome/content/rules/met.police.uk.xml
+++ b/src/chrome/content/rules/met.police.uk.xml
@@ -35,7 +35,7 @@ Fetch error: http://secure.met.police.uk/ => https://secure.met.police.uk/: (35,
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/metafaq.com.xml b/src/chrome/content/rules/metafaq.com.xml
index 1335d5e4ac67..e182173655ae 100644
--- a/src/chrome/content/rules/metafaq.com.xml
+++ b/src/chrome/content/rules/metafaq.com.xml
@@ -10,7 +10,7 @@
 	Mixed content:
 
 		- Bug on tpr from logw309.ati-host.net ʳ
-	
+
 	ʳ Unsecurable <= refused
 
 -->
diff --git a/src/chrome/content/rules/mgmmirage.com.xml b/src/chrome/content/rules/mgmmirage.com.xml
index 936e2a017e28..d919c701995d 100644
--- a/src/chrome/content/rules/mgmmirage.com.xml
+++ b/src/chrome/content/rules/mgmmirage.com.xml
@@ -11,7 +11,7 @@ Non-2xx HTTP code: http://reservations.mgmmirage.com/ (200) => https://reservati
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/mheducation.com-falsemixed.xml b/src/chrome/content/rules/mheducation.com-falsemixed.xml
index b38651ab4197..34b35b01f613 100644
--- a/src/chrome/content/rules/mheducation.com-falsemixed.xml
+++ b/src/chrome/content/rules/mheducation.com-falsemixed.xml
@@ -10,7 +10,7 @@ Non-2xx HTTP code: http://info.mheducation.com/rs/mheducation/images/mcgrawhill-
 	NB: see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/mheducation.com.xml b/src/chrome/content/rules/mheducation.com.xml
index 9e1dd02d6872..3388b590e30f 100644
--- a/src/chrome/content/rules/mheducation.com.xml
+++ b/src/chrome/content/rules/mheducation.com.xml
@@ -1,10 +1,6 @@
 
 
-
+
 
 	
 	
 	
-	
+	
 	
 	
 	
-	
 	
 	
 	
@@ -82,10 +77,9 @@ Fetch error: http://careers.mheducation.com/ => https://mhecareers.silkroad.com/
 	
 	
 	
+	
 
-		
-		
+		
 
 		
 
@@ -96,7 +90,6 @@ Fetch error: http://careers.mheducation.com/ => https://mhecareers.silkroad.com/
 	
 	
-	
 	
 
 		
@@ -137,10 +130,6 @@ Fetch error: http://careers.mheducation.com/ => https://mhecareers.silkroad.com/
 	
-	
-
-		
 
 	
@@ -150,13 +139,9 @@ Fetch error: http://careers.mheducation.com/ => https://mhecareers.silkroad.com/
 	
 
-		
 		
-		
 
 	
diff --git a/src/chrome/content/rules/mhfa.com.au.xml b/src/chrome/content/rules/mhfa.com.au.xml
new file mode 100644
index 000000000000..e5e001fe8265
--- /dev/null
+++ b/src/chrome/content/rules/mhfa.com.au.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/mhwz.de.xml b/src/chrome/content/rules/mhwz.de.xml
new file mode 100644
index 000000000000..fe9ac967a482
--- /dev/null
+++ b/src/chrome/content/rules/mhwz.de.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/miaopai.com.xml b/src/chrome/content/rules/miaopai.com.xml
new file mode 100644
index 000000000000..130feffe819a
--- /dev/null
+++ b/src/chrome/content/rules/miaopai.com.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/midkemiaonline.xml b/src/chrome/content/rules/midkemiaonline.xml
index a300d1cc674c..55a8a295f983 100644
--- a/src/chrome/content/rules/midkemiaonline.xml
+++ b/src/chrome/content/rules/midkemiaonline.xml
@@ -5,7 +5,7 @@ Fetch error: http://midkemiaonline.com/ => https://midkemiaonline.com/: (6, 'Cou
 Fetch error: http://www.midkemiaonline.com/ => https://www.midkemiaonline.com/: (6, 'Could not resolve host: www.midkemiaonline.com')
 
 -->
-
+
     
     
     
diff --git a/src/chrome/content/rules/militarymaps.info.xml b/src/chrome/content/rules/militarymaps.info.xml
index 72183f7e5024..4c25166a11db 100644
--- a/src/chrome/content/rules/militarymaps.info.xml
+++ b/src/chrome/content/rules/militarymaps.info.xml
@@ -2,6 +2,6 @@
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/milk.com.xml b/src/chrome/content/rules/milk.com.xml
new file mode 100644
index 000000000000..7c8b47e7cb5c
--- /dev/null
+++ b/src/chrome/content/rules/milk.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/minavardkontakter.se.xml b/src/chrome/content/rules/minavardkontakter.se.xml
new file mode 100644
index 000000000000..753793ba3f00
--- /dev/null
+++ b/src/chrome/content/rules/minavardkontakter.se.xml
@@ -0,0 +1,18 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/minetrack.xml b/src/chrome/content/rules/minetrack.xml
index 927aa8a6d5d9..bb5c14b72a07 100644
--- a/src/chrome/content/rules/minetrack.xml
+++ b/src/chrome/content/rules/minetrack.xml
@@ -7,4 +7,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/mini-dweeb.org.xml b/src/chrome/content/rules/mini-dweeb.org.xml
new file mode 100644
index 000000000000..d28896484b8c
--- /dev/null
+++ b/src/chrome/content/rules/mini-dweeb.org.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/minmyndighetspost.se.xml b/src/chrome/content/rules/minmyndighetspost.se.xml
new file mode 100644
index 000000000000..a344cf04af0c
--- /dev/null
+++ b/src/chrome/content/rules/minmyndighetspost.se.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/mir-politika.ru.xml b/src/chrome/content/rules/mir-politika.ru.xml
index f377426e575c..518636d0b2e1 100644
--- a/src/chrome/content/rules/mir-politika.ru.xml
+++ b/src/chrome/content/rules/mir-politika.ru.xml
@@ -5,7 +5,7 @@ Fetch error: http://mir-politika.com/ => https://mir-politika.com/: (60, 'SSL ce
 Fetch error: http://www.mir-politika.com/ => https://mir-politika.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
  list. mismatcha
 www.mir-politika.com mismatch -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/mirtv33.ru.xml b/src/chrome/content/rules/mirtv33.ru.xml
index 9707f0109ab9..c05bf78342a9 100644
--- a/src/chrome/content/rules/mirtv33.ru.xml
+++ b/src/chrome/content/rules/mirtv33.ru.xml
@@ -5,7 +5,7 @@ Fetch error: http://mirtv33.ru/ => https://mirtv33.ru/: (7, 'Failed to connect t
 Fetch error: http://www.mirtv33.ru/ => https://www.mirtv33.ru/: (7, 'Failed to connect to www.mirtv33.ru port 443: Connection refused')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/mk.co.kr.xml b/src/chrome/content/rules/mk.co.kr.xml
index 82cd48ec7380..3a3f84567a9c 100644
--- a/src/chrome/content/rules/mk.co.kr.xml
+++ b/src/chrome/content/rules/mk.co.kr.xml
@@ -2,14 +2,14 @@
 	Mixed content:
 
 		- css, on:
-		
-			- estate from $self ˢ 
-			- estate from common.mk.co.kr ˢ 
+
+			- estate from $self ˢ
+			- estate from common.mk.co.kr ˢ
 
 		- Images, on:
-		
-			- estate from file.mk.co.kr ˢ 
-			- estate from img.mk.co.kr ˢ 
+
+			- estate from file.mk.co.kr ˢ
+			- estate from img.mk.co.kr ˢ
 
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
diff --git a/src/chrome/content/rules/mkwrs.com.xml b/src/chrome/content/rules/mkwrs.com.xml
new file mode 100644
index 000000000000..162bd15ac2b0
--- /dev/null
+++ b/src/chrome/content/rules/mkwrs.com.xml
@@ -0,0 +1,10 @@
+
+
+        
+        
+
+        
+
diff --git a/src/chrome/content/rules/mobileapptracking.com.xml b/src/chrome/content/rules/mobileapptracking.com.xml
deleted file mode 100644
index c2fb86710959..000000000000
--- a/src/chrome/content/rules/mobileapptracking.com.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/mobilism.me.xml b/src/chrome/content/rules/mobilism.me.xml
index 3ce3c423981a..533537df7157 100644
--- a/src/chrome/content/rules/mobilism.me.xml
+++ b/src/chrome/content/rules/mobilism.me.xml
@@ -7,7 +7,7 @@ Fetch error: http://forum.mobilism.me/ => https://forum.mobilism.me/: Too many r
 Fetch error: http://images.mobilism.me/ => https://images.mobilism.me/: (28, 'Operation timed out after 30001 milliseconds with 0 bytes received')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/moderngov.co.uk.xml b/src/chrome/content/rules/moderngov.co.uk.xml
index 1b4b40ec42e7..9bd4f98bcc43 100644
--- a/src/chrome/content/rules/moderngov.co.uk.xml
+++ b/src/chrome/content/rules/moderngov.co.uk.xml
@@ -72,7 +72,7 @@ Fetch error: http://powys.moderngov.co.uk/ => https://powys.moderngov.co.uk/: To
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/modulus.com.xml b/src/chrome/content/rules/modulus.com.xml
new file mode 100644
index 000000000000..c381f6986b96
--- /dev/null
+++ b/src/chrome/content/rules/modulus.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/molevalley.gov.uk.xml b/src/chrome/content/rules/molevalley.gov.uk.xml
index f851825fcf53..e9f2569b3a81 100644
--- a/src/chrome/content/rules/molevalley.gov.uk.xml
+++ b/src/chrome/content/rules/molevalley.gov.uk.xml
@@ -1,6 +1,6 @@
 
-
-	
-	
-	
-
diff --git a/src/chrome/content/rules/moneropool.com.xml b/src/chrome/content/rules/moneropool.com.xml
deleted file mode 100644
index 6fac8b3d44e7..000000000000
--- a/src/chrome/content/rules/moneropool.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/monolith.zone.xml b/src/chrome/content/rules/monolith.zone.xml
new file mode 100644
index 000000000000..10a53419e97b
--- /dev/null
+++ b/src/chrome/content/rules/monolith.zone.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/moodlerooms.com-falsemixed.xml b/src/chrome/content/rules/moodlerooms.com-falsemixed.xml
deleted file mode 100644
index a01b07456682..000000000000
--- a/src/chrome/content/rules/moodlerooms.com-falsemixed.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/moodys.com.xml b/src/chrome/content/rules/moodys.com.xml
index 0d482c9e67c7..88aef9922b15 100644
--- a/src/chrome/content/rules/moodys.com.xml
+++ b/src/chrome/content/rules/moodys.com.xml
@@ -84,7 +84,7 @@ projectfinance-models.moodys.com different content
 ⁴ self signed
 ⁷ protocol error
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/moslenta.ru.xml b/src/chrome/content/rules/moslenta.ru.xml
index 17ca97cc1a34..8b89fa17aedb 100644
--- a/src/chrome/content/rules/moslenta.ru.xml
+++ b/src/chrome/content/rules/moslenta.ru.xml
@@ -3,7 +3,7 @@
 Disabled by https-everywhere-checker because:
 Fetch error: http://cdn.moslenta.ru/ => https://cdn.moslenta.ru/: (51, "SSL: no alternative certificate subject name matches target host name 'cdn.moslenta.ru'")
 
-  Certificate mismatch: 
+  Certificate mismatch:
     dengoroda2016.moslenta.ru
     detmag.moslenta.ru
     mck.moslenta.ru
@@ -11,11 +11,11 @@ Fetch error: http://cdn.moslenta.ru/ => https://cdn.moslenta.ru/: (51, "SSL: no
     on.moslenta.ru
     sovety.moslenta.ru
 -->
-
+
     
     
     
     
-  
+
     
 
diff --git a/src/chrome/content/rules/motive.com.xml b/src/chrome/content/rules/motive.com.xml
index 386111151cab..55c0e2cf785f 100644
--- a/src/chrome/content/rules/motive.com.xml
+++ b/src/chrome/content/rules/motive.com.xml
@@ -21,7 +21,7 @@ Fetch error: http://pbttbcpn.bt.motive.com/ => https://pbttbcpn.bt.motive.com/:
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/motoslave.net.xml b/src/chrome/content/rules/motoslave.net.xml
deleted file mode 100644
index 9cd038a84929..000000000000
--- a/src/chrome/content/rules/motoslave.net.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-	
-	
-
-	
-	
-
diff --git a/src/chrome/content/rules/mousejack.com.xml b/src/chrome/content/rules/mousejack.com.xml
index 4b0ce99211fd..01f2a43e67f7 100644
--- a/src/chrome/content/rules/mousejack.com.xml
+++ b/src/chrome/content/rules/mousejack.com.xml
@@ -20,7 +20,7 @@ Fetch error: http://mousejack.com/ => https://www.mousejack.com/: Too many redir
 	ˢ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/mpg123.org.xml b/src/chrome/content/rules/mpg123.org.xml
new file mode 100644
index 000000000000..a1b12533052c
--- /dev/null
+++ b/src/chrome/content/rules/mpg123.org.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/msgme.com.xml b/src/chrome/content/rules/msgme.com.xml
index 5f5f6acd27e7..46c0e706cc24 100644
--- a/src/chrome/content/rules/msgme.com.xml
+++ b/src/chrome/content/rules/msgme.com.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.msgme.com/ => https://www.msgme.com/: (51, "SSL: no alte
 	For other Waterfall International coverage, see waterfall.com.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/msgsafe.io.xml b/src/chrome/content/rules/msgsafe.io.xml
new file mode 100644
index 000000000000..ef0ba0b80582
--- /dev/null
+++ b/src/chrome/content/rules/msgsafe.io.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/mshcdn.com.xml b/src/chrome/content/rules/mshcdn.com.xml
new file mode 100644
index 000000000000..b4cbd77dafa9
--- /dev/null
+++ b/src/chrome/content/rules/mshcdn.com.xml
@@ -0,0 +1,52 @@
+
+
+
+	
+		
+	
+		
+	
+		
+	
+		
+	
+		
+	
+		
+	
+		
+	
+		
+	
+		
+	
+		
+
+	
+		
+	
+		
+	
+		
+	
+		
+
+	
+		
+	
+		
+	
+		
+		
+		
+
+	
+
+
diff --git a/src/chrome/content/rules/msl24.de.xml b/src/chrome/content/rules/msl24.de.xml
new file mode 100644
index 000000000000..5d73ed37faf5
--- /dev/null
+++ b/src/chrome/content/rules/msl24.de.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/msu.edu.xml b/src/chrome/content/rules/msu.edu.xml
index f7e03ef3096d..9001693b7185 100644
--- a/src/chrome/content/rules/msu.edu.xml
+++ b/src/chrome/content/rules/msu.edu.xml
@@ -18,18 +18,18 @@
 	
 	
 	
-	
-	
-	
+
 	
 
 	
diff --git a/src/chrome/content/rules/mtel.ru.xml b/src/chrome/content/rules/mtel.ru.xml
index fbbd51c6c9b4..e415af40fb38 100644
--- a/src/chrome/content/rules/mtel.ru.xml
+++ b/src/chrome/content/rules/mtel.ru.xml
@@ -6,7 +6,7 @@ Fetch error: http://lk.mtel.ru/ => https://lk.mtel.ru/: (60, 'SSL certificate pr
 mtel.ru mismatch
 www.mtel.ru mismatch
 -->
-
+
 	
 
 	
diff --git a/src/chrome/content/rules/mtlbss.com.xml b/src/chrome/content/rules/mtlbss.com.xml
deleted file mode 100644
index 4b0c6a00be6e..000000000000
--- a/src/chrome/content/rules/mtlbss.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/mts.ru.xml b/src/chrome/content/rules/mts.ru.xml
index c0ed1591ada1..fee4c5aea3cd 100644
--- a/src/chrome/content/rules/mts.ru.xml
+++ b/src/chrome/content/rules/mts.ru.xml
@@ -42,7 +42,7 @@
 	Mixed content:
 
 		- Image, on:
-		
+
 			- cloud from static.cloud.mts.ru.s3.amazonaws.com
 			- www from static.mts.ru
 
diff --git a/src/chrome/content/rules/mtswelding.co.uk.xml b/src/chrome/content/rules/mtswelding.co.uk.xml
index a818d8e786df..b0f7fbc1f3e6 100644
--- a/src/chrome/content/rules/mtswelding.co.uk.xml
+++ b/src/chrome/content/rules/mtswelding.co.uk.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.mtswelding.co.uk/wp-content/plugins/sitemap/css/page-lis
 	www.mtswelding.co.uk: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/mtt.ru.xml b/src/chrome/content/rules/mtt.ru.xml
index faf7f42bad1b..35bbfec52e3d 100644
--- a/src/chrome/content/rules/mtt.ru.xml
+++ b/src/chrome/content/rules/mtt.ru.xml
@@ -12,7 +12,7 @@ uis.mtt.ru timed out
 mil.mtt.ru self signed
 magic.mtt.ru nonexist
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/mtv.com.xml b/src/chrome/content/rules/mtv.com.xml
new file mode 100644
index 000000000000..14d3dc5c82be
--- /dev/null
+++ b/src/chrome/content/rules/mtv.com.xml
@@ -0,0 +1,378 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	  
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/mtv.fi.xml b/src/chrome/content/rules/mtv.fi.xml
index be080203d449..638f2c746ced 100644
--- a/src/chrome/content/rules/mtv.fi.xml
+++ b/src/chrome/content/rules/mtv.fi.xml
@@ -32,7 +32,7 @@ Fetch error: http://s.mtv.fi/ => https://s.mtv.fi/: (6, 'Could not resolve host:
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/mucommander.com.xml b/src/chrome/content/rules/mucommander.com.xml
new file mode 100644
index 000000000000..daa38cdbf41f
--- /dev/null
+++ b/src/chrome/content/rules/mucommander.com.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/mupen64plus.org.xml b/src/chrome/content/rules/mupen64plus.org.xml
new file mode 100644
index 000000000000..1ea813fa849c
--- /dev/null
+++ b/src/chrome/content/rules/mupen64plus.org.xml
@@ -0,0 +1,13 @@
+
+
+  
+  
+
+  
+
diff --git a/src/chrome/content/rules/muscache.com.xml b/src/chrome/content/rules/muscache.com.xml
new file mode 100644
index 000000000000..6234ff85353b
--- /dev/null
+++ b/src/chrome/content/rules/muscache.com.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/mutts.com.xml b/src/chrome/content/rules/mutts.com.xml
index 0b2465ab84b8..adace1494e05 100644
--- a/src/chrome/content/rules/mutts.com.xml
+++ b/src/chrome/content/rules/mutts.com.xml
@@ -24,7 +24,7 @@ Fetch error: http://www.mutts.com/sites/default/files/css/css_a7lQP2XcNT8OtrLuoo
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/mycelium.com.xml b/src/chrome/content/rules/mycelium.com.xml
index 1417b6fef6fc..79bea014b66e 100644
--- a/src/chrome/content/rules/mycelium.com.xml
+++ b/src/chrome/content/rules/mycelium.com.xml
@@ -23,7 +23,7 @@ support.mycelium.com ¹
 ⁴ self signed
 ⁵ expired
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/mydrivers.com.xml b/src/chrome/content/rules/mydrivers.com.xml
new file mode 100644
index 000000000000..2034060769e1
--- /dev/null
+++ b/src/chrome/content/rules/mydrivers.com.xml
@@ -0,0 +1,21 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/myneighborsushicat.com.xml b/src/chrome/content/rules/myneighborsushicat.com.xml
new file mode 100644
index 000000000000..7c62d0fc7571
--- /dev/null
+++ b/src/chrome/content/rules/myneighborsushicat.com.xml
@@ -0,0 +1,22 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/mystar.org.uk.xml b/src/chrome/content/rules/mystar.org.uk.xml
deleted file mode 100644
index 1db1ae8d74c6..000000000000
--- a/src/chrome/content/rules/mystar.org.uk.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/mytalkdesk.com.xml b/src/chrome/content/rules/mytalkdesk.com.xml
deleted file mode 100644
index f8189d113d60..000000000000
--- a/src/chrome/content/rules/mytalkdesk.com.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-	
-	
-
-  	
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/mytrinity.com.ua.xml b/src/chrome/content/rules/mytrinity.com.ua.xml
deleted file mode 100644
index 381a151ff86a..000000000000
--- a/src/chrome/content/rules/mytrinity.com.ua.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/mywinamp.com.xml b/src/chrome/content/rules/mywinamp.com.xml
new file mode 100644
index 000000000000..2a4d19ddd981
--- /dev/null
+++ b/src/chrome/content/rules/mywinamp.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/myzuka.fm.xml b/src/chrome/content/rules/myzuka.fm.xml
index fde6de4bdd4e..1e724d78d6b7 100644
--- a/src/chrome/content/rules/myzuka.fm.xml
+++ b/src/chrome/content/rules/myzuka.fm.xml
@@ -40,7 +40,7 @@ Fetch error: http://cs9.myzuka.fm/ => https://cs9.myzuka.fm/: (51, "SSL: no alte
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/n-tv.de.xml b/src/chrome/content/rules/n-tv.de.xml
index d9267333ec54..aca33a93a751 100644
--- a/src/chrome/content/rules/n-tv.de.xml
+++ b/src/chrome/content/rules/n-tv.de.xml
@@ -1,20 +1,36 @@
-
 
+
 
-	Mismatch:
-		- bilder[1-4]
-		- tools
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
-	Expired:
-		- hbbtv
--->
-
-	
-	
+	
 
-	
 
diff --git a/src/chrome/content/rules/n210adserv.com.xml b/src/chrome/content/rules/n210adserv.com.xml
index afd3f169c29a..ee96727ea7a6 100644
--- a/src/chrome/content/rules/n210adserv.com.xml
+++ b/src/chrome/content/rules/n210adserv.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://www.n210adserv.com/ => https://www.n210adserv.com/: (28, 'Co
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/namibgrens.com.xml b/src/chrome/content/rules/namibgrens.com.xml
new file mode 100644
index 000000000000..0c6bedecf52a
--- /dev/null
+++ b/src/chrome/content/rules/namibgrens.com.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/narcity.xml b/src/chrome/content/rules/narcity.xml
new file mode 100644
index 000000000000..c8389e4d2b62
--- /dev/null
+++ b/src/chrome/content/rules/narcity.xml
@@ -0,0 +1,11 @@
+
+	
+	
+
+	
+	
+  
+
+  
+
diff --git a/src/chrome/content/rules/nasdaqtrader.com.xml b/src/chrome/content/rules/nasdaqtrader.com.xml
new file mode 100644
index 000000000000..be4437ff86f9
--- /dev/null
+++ b/src/chrome/content/rules/nasdaqtrader.com.xml
@@ -0,0 +1,18 @@
+
+
+
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/nationalinterest.org.xml b/src/chrome/content/rules/nationalinterest.org.xml
index 2ec29d60583d..8047ca7f4d41 100644
--- a/src/chrome/content/rules/nationalinterest.org.xml
+++ b/src/chrome/content/rules/nationalinterest.org.xml
@@ -11,7 +11,7 @@
 		- css from $self ˢ
 
 		- Images, from:
-		
+
 			- ^nationalinterest.org ˢ
 			- $self ˢ
 
diff --git a/src/chrome/content/rules/naturedestinations.ca.xml b/src/chrome/content/rules/naturedestinations.ca.xml
new file mode 100644
index 000000000000..b6edf272f2ea
--- /dev/null
+++ b/src/chrome/content/rules/naturedestinations.ca.xml
@@ -0,0 +1,6 @@
+
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/naukri.com-falsemixed.xml b/src/chrome/content/rules/naukri.com-falsemixed.xml
deleted file mode 100644
index 4ba0b3aeda47..000000000000
--- a/src/chrome/content/rules/naukri.com-falsemixed.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/naver.com.xml b/src/chrome/content/rules/naver.com.xml
new file mode 100644
index 000000000000..fd1929e7becf
--- /dev/null
+++ b/src/chrome/content/rules/naver.com.xml
@@ -0,0 +1,31 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ncar.cc.xml b/src/chrome/content/rules/ncar.cc.xml
deleted file mode 100644
index a4401a882f56..000000000000
--- a/src/chrome/content/rules/ncar.cc.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-		
-		
-		
-		
-		
-		
-		
-		
-
-	
-	
-	
-	
-
-
diff --git a/src/chrome/content/rules/ncrypt.in.xml b/src/chrome/content/rules/ncrypt.in.xml
deleted file mode 100644
index f3e62ce75157..000000000000
--- a/src/chrome/content/rules/ncrypt.in.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/nerdbacon.com.xml b/src/chrome/content/rules/nerdbacon.com.xml
new file mode 100644
index 000000000000..a135b9e72424
--- /dev/null
+++ b/src/chrome/content/rules/nerdbacon.com.xml
@@ -0,0 +1,30 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/nero.com.xml b/src/chrome/content/rules/nero.com.xml
new file mode 100644
index 000000000000..483e11a33535
--- /dev/null
+++ b/src/chrome/content/rules/nero.com.xml
@@ -0,0 +1,170 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/nervomusic.com.xml b/src/chrome/content/rules/nervomusic.com.xml
new file mode 100644
index 000000000000..1d5cc86c9643
--- /dev/null
+++ b/src/chrome/content/rules/nervomusic.com.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/net.cn.xml b/src/chrome/content/rules/net.cn.xml
index 9eab71db5a9c..a8873a63a2d9 100644
--- a/src/chrome/content/rules/net.cn.xml
+++ b/src/chrome/content/rules/net.cn.xml
@@ -26,13 +26,13 @@ Fetch error: http://www.net.cn/mail/ => https://www.net.cn/mail/: (28, 'Connecti
 	Mixed content:
 
 		- css, on:
-		
+
 			- www from g.alicdn.com ˢ
 			- www from cdn.hichinaimg.com ᵐ
 			- www from $self ˢ
 
 		- Images, on:
-		
+
 			- www from gtms0[1-4].alicdn.com ˢ
 			- www from $self ˢ
 
@@ -40,7 +40,7 @@ Fetch error: http://www.net.cn/mail/ => https://www.net.cn/mail/: (28, 'Connecti
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/netis.ru.xml b/src/chrome/content/rules/netis.ru.xml
index 95c96b6ea71c..db16f2788888 100644
--- a/src/chrome/content/rules/netis.ru.xml
+++ b/src/chrome/content/rules/netis.ru.xml
@@ -6,11 +6,10 @@ forum.netis.ru mismatch
 	
 	
 	
-	
+
 	
-	
-	
+
 
 	
 
diff --git a/src/chrome/content/rules/netn.fi.xml b/src/chrome/content/rules/netn.fi.xml
new file mode 100644
index 000000000000..4f72d7087bc4
--- /dev/null
+++ b/src/chrome/content/rules/netn.fi.xml
@@ -0,0 +1,29 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/netorn.ru.xml b/src/chrome/content/rules/netorn.ru.xml
deleted file mode 100644
index 2a3f32f15b84..000000000000
--- a/src/chrome/content/rules/netorn.ru.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/netsalesnetwork.com.xml b/src/chrome/content/rules/netsalesnetwork.com.xml
deleted file mode 100644
index e7bbe33a069b..000000000000
--- a/src/chrome/content/rules/netsalesnetwork.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/network-tools.com.xml b/src/chrome/content/rules/network-tools.com.xml
index a6fc8a74f0c0..caecf5574b1b 100644
--- a/src/chrome/content/rules/network-tools.com.xml
+++ b/src/chrome/content/rules/network-tools.com.xml
@@ -5,7 +5,7 @@ network-tools.com
 
   
    
-  
+
   
 
 
diff --git a/src/chrome/content/rules/netzclub.xml b/src/chrome/content/rules/netzclub.xml
index d049a9bb9d36..281b96405a6f 100644
--- a/src/chrome/content/rules/netzclub.xml
+++ b/src/chrome/content/rules/netzclub.xml
@@ -5,4 +5,4 @@
 
   
   
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/newkaliningrad.ru.xml b/src/chrome/content/rules/newkaliningrad.ru.xml
deleted file mode 100644
index 1b53f5dd4d8d..000000000000
--- a/src/chrome/content/rules/newkaliningrad.ru.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-	
-	
-	
-	
-
diff --git a/src/chrome/content/rules/newpiratebay.co.uk.xml b/src/chrome/content/rules/newpiratebay.co.uk.xml
deleted file mode 100644
index 3098b029b966..000000000000
--- a/src/chrome/content/rules/newpiratebay.co.uk.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/newsela.com.xml b/src/chrome/content/rules/newsela.com.xml
index a9b65ed37179..1080d3a81f20 100644
--- a/src/chrome/content/rules/newsela.com.xml
+++ b/src/chrome/content/rules/newsela.com.xml
@@ -1,57 +1,13 @@
-
-
-
-	
+
 	
+	
 	
 	
-	
-
-	
 	
-
-
-	
-	
-
-	
-
-
-	
-
 		
+	
 
-	
+	
 
+	
 
diff --git a/src/chrome/content/rules/nexedi.com.xml b/src/chrome/content/rules/nexedi.com.xml
new file mode 100644
index 000000000000..7d561528ee78
--- /dev/null
+++ b/src/chrome/content/rules/nexedi.com.xml
@@ -0,0 +1,94 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ngs.ru.xml b/src/chrome/content/rules/ngs.ru.xml
index 4804a21db78c..3ce5f45ad862 100644
--- a/src/chrome/content/rules/ngs.ru.xml
+++ b/src/chrome/content/rules/ngs.ru.xml
@@ -7,7 +7,7 @@ Fetch error: http://homes.ngs.ru/ => https://homes.ngs.ru/: Too many redirects w
 pogoda. redirect
 love. redirect
 news. redirect-->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/nibusinessinfo.co.uk.xml b/src/chrome/content/rules/nibusinessinfo.co.uk.xml
index e6bc46c7eb57..e2af927771c1 100644
--- a/src/chrome/content/rules/nibusinessinfo.co.uk.xml
+++ b/src/chrome/content/rules/nibusinessinfo.co.uk.xml
@@ -19,7 +19,7 @@ Fetch error: http://admin.events.nibusinessinfo.co.uk/ => https://admin.events.n
 	ᵈ Dropped; preemptable redirect
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/nicchile.xml b/src/chrome/content/rules/nicchile.xml
new file mode 100644
index 000000000000..1d8bd2c472fb
--- /dev/null
+++ b/src/chrome/content/rules/nicchile.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/nieman.de.xml b/src/chrome/content/rules/nieman.de.xml
index 5f616f2052ce..56881ffcb025 100644
--- a/src/chrome/content/rules/nieman.de.xml
+++ b/src/chrome/content/rules/nieman.de.xml
@@ -4,10 +4,10 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://nieman.de/ => https://nieman.de/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
         
         
 
         
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/nix.ru.xml b/src/chrome/content/rules/nix.ru.xml
new file mode 100644
index 000000000000..90142756a83c
--- /dev/null
+++ b/src/chrome/content/rules/nix.ru.xml
@@ -0,0 +1,179 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/nllapps.xml b/src/chrome/content/rules/nllapps.xml
index 652daed98355..adb78300816a 100644
--- a/src/chrome/content/rules/nllapps.xml
+++ b/src/chrome/content/rules/nllapps.xml
@@ -2,7 +2,7 @@
 
 	
 	
-	
+
 	
 
 
diff --git a/src/chrome/content/rules/nltk.org.xml b/src/chrome/content/rules/nltk.org.xml
new file mode 100644
index 000000000000..c8089f07918c
--- /dev/null
+++ b/src/chrome/content/rules/nltk.org.xml
@@ -0,0 +1,26 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/nlx.org.xml b/src/chrome/content/rules/nlx.org.xml
index fad60d3d5831..161ea19cf42d 100644
--- a/src/chrome/content/rules/nlx.org.xml
+++ b/src/chrome/content/rules/nlx.org.xml
@@ -53,7 +53,7 @@
 		
 
 	
+		to="https://de.nlx.org/" />
 
 		
 
diff --git a/src/chrome/content/rules/nodeny-plus.com.ua.xml b/src/chrome/content/rules/nodeny-plus.com.ua.xml
index 6779fe3943b9..3402e843e6a4 100644
--- a/src/chrome/content/rules/nodeny-plus.com.ua.xml
+++ b/src/chrome/content/rules/nodeny-plus.com.ua.xml
@@ -9,7 +9,7 @@ www.nodeny-plus.com.ua ⁵
 
 ⁵ expired
 -->
-
+
 	
 
 	
diff --git a/src/chrome/content/rules/northamptonshire.gov.uk.xml b/src/chrome/content/rules/northamptonshire.gov.uk.xml
index ff1d886bcfbb..ee950571890e 100644
--- a/src/chrome/content/rules/northamptonshire.gov.uk.xml
+++ b/src/chrome/content/rules/northamptonshire.gov.uk.xml
@@ -53,7 +53,7 @@ Fetch error: http://librarycatalogue.northamptonshire.gov.uk/ => https://library
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/northlincs.gov.uk-falsemixed.xml b/src/chrome/content/rules/northlincs.gov.uk-falsemixed.xml
index 5c078569cb35..ae762e6979f2 100644
--- a/src/chrome/content/rules/northlincs.gov.uk-falsemixed.xml
+++ b/src/chrome/content/rules/northlincs.gov.uk-falsemixed.xml
@@ -6,7 +6,7 @@ Non-2xx HTTP code: http://leisure.northlincs.gov.uk/ (200) => https://leisure.no
 	For rules not causing false/broken MCB, see northlincs.gov.uk.xml.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/notalways.xml b/src/chrome/content/rules/notalways.xml
deleted file mode 100644
index 1531433d861c..000000000000
--- a/src/chrome/content/rules/notalways.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-	
-	
-
-	
-	
-
-	
-	
-
-	
-	
-
-	
-	
-
-	
-	
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/nottsbusinesswatch.co.uk.xml b/src/chrome/content/rules/nottsbusinesswatch.co.uk.xml
deleted file mode 100644
index 55cb3da95420..000000000000
--- a/src/chrome/content/rules/nottsbusinesswatch.co.uk.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/nousrandom.net.xml b/src/chrome/content/rules/nousrandom.net.xml
index 22a5f54c229c..50e134d9f912 100644
--- a/src/chrome/content/rules/nousrandom.net.xml
+++ b/src/chrome/content/rules/nousrandom.net.xml
@@ -5,7 +5,7 @@ Fetch error: http://nousrandom.net/ => https://nousrandom.net/: (60, 'SSL certif
 Fetch error: http://www.nousrandom.net/ => https://www.nousrandom.net/: (60, 'SSL certificate problem: self signed certificate')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/novayagazeta.ru.xml b/src/chrome/content/rules/novayagazeta.ru.xml
index 7d2a299b4cac..5fa7d181777f 100644
--- a/src/chrome/content/rules/novayagazeta.ru.xml
+++ b/src/chrome/content/rules/novayagazeta.ru.xml
@@ -27,7 +27,7 @@ ys.novayagazeta.ru different content
 ² refused
 ³ timed out
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/novo-ordo.com.xml b/src/chrome/content/rules/novo-ordo.com.xml
new file mode 100644
index 000000000000..c9c2ca29a477
--- /dev/null
+++ b/src/chrome/content/rules/novo-ordo.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/nowybip.pl.xml b/src/chrome/content/rules/nowybip.pl.xml
new file mode 100644
index 000000000000..6e9cb700337c
--- /dev/null
+++ b/src/chrome/content/rules/nowybip.pl.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/noxa.de.xml b/src/chrome/content/rules/noxa.de.xml
index 808e8e05b4db..d0cec61be838 100644
--- a/src/chrome/content/rules/noxa.de.xml
+++ b/src/chrome/content/rules/noxa.de.xml
@@ -5,7 +5,7 @@ Fetch error: http://admin.noxa.de/ => https://admin.noxa.de/: (28, 'Connection t
 Fetch error: http://webmail.noxa.de/ => https://webmail.noxa.de/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
   
   
   
diff --git a/src/chrome/content/rules/npp.org.hk.xml b/src/chrome/content/rules/npp.org.hk.xml
index f3cd38f427b1..94be2d09e724 100644
--- a/src/chrome/content/rules/npp.org.hk.xml
+++ b/src/chrome/content/rules/npp.org.hk.xml
@@ -1,9 +1,9 @@
 
-	
+
 	
 	
 
 	
-	
+
 
diff --git a/src/chrome/content/rules/nra.org-resources.xml b/src/chrome/content/rules/nra.org-resources.xml
index a9c846f7132e..aedc6511d67f 100644
--- a/src/chrome/content/rules/nra.org-resources.xml
+++ b/src/chrome/content/rules/nra.org-resources.xml
@@ -12,7 +12,7 @@ Fetch error: http://training.nra.org/images/bg_gray.jpg => https://training.nra.
 	and no mixed content secured.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/nra.org.xml b/src/chrome/content/rules/nra.org.xml
index 928d8b64db53..671c53afdc47 100644
--- a/src/chrome/content/rules/nra.org.xml
+++ b/src/chrome/content/rules/nra.org.xml
@@ -1,4 +1,9 @@
 
 
 
-	
+	
 	
 	
 	
@@ -61,7 +65,7 @@
 	
 	
 	
-	
+	
 	
 	
 	
diff --git a/src/chrome/content/rules/nrafamily.org.xml b/src/chrome/content/rules/nrafamily.org.xml
index 3a4a41fd389c..0ac46f1c66e2 100644
--- a/src/chrome/content/rules/nrafamily.org.xml
+++ b/src/chrome/content/rules/nrafamily.org.xml
@@ -18,7 +18,7 @@ Fetch error: http://wmp.nrafamily.org/ => https://wmp.nrafamily.org/: (60, 'SSL
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/nrahq.org.xml b/src/chrome/content/rules/nrahq.org.xml
index a66bd5ba0d07..6d474cf58437 100644
--- a/src/chrome/content/rules/nrahq.org.xml
+++ b/src/chrome/content/rules/nrahq.org.xml
@@ -8,7 +8,7 @@ Fetch error: http://www.nrahq.org.org/ => https://www.nrahq.org.org/: (6, 'Could
 	For other National Rifle Association coverage, see nra.org.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/nranews.com.xml b/src/chrome/content/rules/nranews.com.xml
deleted file mode 100644
index 50818ff86cb9..000000000000
--- a/src/chrome/content/rules/nranews.com.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-	
-	
-
-		
-		
-			
-			
-			
-			
-
-		
-		
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/nrostatic.com.xml b/src/chrome/content/rules/nrostatic.com.xml
index 755f9b4e5fa6..c8ff41af7e80 100644
--- a/src/chrome/content/rules/nrostatic.com.xml
+++ b/src/chrome/content/rules/nrostatic.com.xml
@@ -21,7 +21,7 @@ Fetch error: http://c9.nrostatic.com/ => https://c9.nrostatic.com/: Too many red
 	and no mixed content secured.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/nsis.ro.xml b/src/chrome/content/rules/nsis.ro.xml
index cb465441458c..2cd6a16910c7 100644
--- a/src/chrome/content/rules/nsis.ro.xml
+++ b/src/chrome/content/rules/nsis.ro.xml
@@ -23,4 +23,4 @@
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/nso.ru.xml b/src/chrome/content/rules/nso.ru.xml
index 88aff12edd6c..e277f75e447f 100644
--- a/src/chrome/content/rules/nso.ru.xml
+++ b/src/chrome/content/rules/nso.ru.xml
@@ -134,7 +134,7 @@ wso2.nso.ru different content
 ³ timed out
 ⁴ self signed
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/nspublieksprijs.nl.xml b/src/chrome/content/rules/nspublieksprijs.nl.xml
index 85c148f5327d..ff5edab75c3b 100644
--- a/src/chrome/content/rules/nspublieksprijs.nl.xml
+++ b/src/chrome/content/rules/nspublieksprijs.nl.xml
@@ -8,7 +8,7 @@ Fetch error: http://api.nspublieksprijs.nl/ => https://api.nspublieksprijs.nl/:
 		- nspublieksprijs.nl
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ntkstatic.org.xml b/src/chrome/content/rules/ntkstatic.org.xml
deleted file mode 100644
index bb7e44204dbc..000000000000
--- a/src/chrome/content/rules/ntkstatic.org.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/numenta.com.xml b/src/chrome/content/rules/numenta.com.xml
index ffea8db94c78..237027fdb4dd 100644
--- a/src/chrome/content/rules/numenta.com.xml
+++ b/src/chrome/content/rules/numenta.com.xml
@@ -2,7 +2,7 @@
     
     
     
-    
+
     
     
 
diff --git a/src/chrome/content/rules/nvaccess.org.xml b/src/chrome/content/rules/nvaccess.org.xml
new file mode 100644
index 000000000000..37bb303d3408
--- /dev/null
+++ b/src/chrome/content/rules/nvaccess.org.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/nypf.org.uk.xml b/src/chrome/content/rules/nypf.org.uk.xml
index 54de98f4a9aa..201306fbee90 100644
--- a/src/chrome/content/rules/nypf.org.uk.xml
+++ b/src/chrome/content/rules/nypf.org.uk.xml
@@ -15,7 +15,7 @@ Fetch error: http://www.nypf.org.uk/ => https://www.nypf.org.uk/: (60, 'SSL cert
 		- www.nypf.org.uk
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/nytimes3xbfgragh.onion.xml b/src/chrome/content/rules/nytimes3xbfgragh.onion.xml
new file mode 100644
index 000000000000..80b5165c10af
--- /dev/null
+++ b/src/chrome/content/rules/nytimes3xbfgragh.onion.xml
@@ -0,0 +1,31 @@
+
+
+
+	
+	
+	
+		
+	
+		
+		
+		
+	
+	
+	
+	
+		
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/nzbget.net.xml b/src/chrome/content/rules/nzbget.net.xml
new file mode 100644
index 000000000000..0a269898376c
--- /dev/null
+++ b/src/chrome/content/rules/nzbget.net.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/nzbs.org.xml b/src/chrome/content/rules/nzbs.org.xml
deleted file mode 100644
index 2ccb331aca2e..000000000000
--- a/src/chrome/content/rules/nzbs.org.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/nzlweb.com.xml b/src/chrome/content/rules/nzlweb.com.xml
new file mode 100644
index 000000000000..5e9e275f6e04
--- /dev/null
+++ b/src/chrome/content/rules/nzlweb.com.xml
@@ -0,0 +1,38 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/nzpug.org.xml b/src/chrome/content/rules/nzpug.org.xml
index 065d1134f738..626047b8a18d 100644
--- a/src/chrome/content/rules/nzpug.org.xml
+++ b/src/chrome/content/rules/nzpug.org.xml
@@ -5,13 +5,13 @@ Fetch error: http://register.nzpug.org/ => https://register.nzpug.org/: (60, 'SS
 
     New Zealand Python User Group
 -->
-
+
 
         
         
-        
+
         
 
         
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/nzwinesociety.co.nz.xml b/src/chrome/content/rules/nzwinesociety.co.nz.xml
deleted file mode 100644
index cd1e3f9ed9da..000000000000
--- a/src/chrome/content/rules/nzwinesociety.co.nz.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/oaklands.ac.uk.xml b/src/chrome/content/rules/oaklands.ac.uk.xml
index 479dbb7a90a5..fc688c0f61b6 100644
--- a/src/chrome/content/rules/oaklands.ac.uk.xml
+++ b/src/chrome/content/rules/oaklands.ac.uk.xml
@@ -45,7 +45,7 @@ Fetch error: http://proportal.oaklands.ac.uk/ => https://portal.oaklands.ac.uk/d
 	* Not all paths redirect
 
 -->
-
+
 
 	
@@ -66,7 +66,7 @@ Fetch error: http://proportal.oaklands.ac.uk/ => https://portal.oaklands.ac.uk/d
 		
 
 			
 			
diff --git a/src/chrome/content/rules/objective.co.uk.xml b/src/chrome/content/rules/objective.co.uk.xml
index 582fa1a6d2df..b58bbdd792bc 100644
--- a/src/chrome/content/rules/objective.co.uk.xml
+++ b/src/chrome/content/rules/objective.co.uk.xml
@@ -28,7 +28,7 @@ Fetch error: http://swdp.objective.co.uk/ => https://swdp.objective.co.uk/: (51,
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ocado.com.xml b/src/chrome/content/rules/ocado.com.xml
new file mode 100644
index 000000000000..84f50873a901
--- /dev/null
+++ b/src/chrome/content/rules/ocado.com.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/odessa.tv.xml b/src/chrome/content/rules/odessa.tv.xml
index 0780675bd911..7c5d274011f8 100644
--- a/src/chrome/content/rules/odessa.tv.xml
+++ b/src/chrome/content/rules/odessa.tv.xml
@@ -11,7 +11,7 @@ www.sana.odessa.tv ¹
 ¹ mismatch
 ⁴ self signed
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/ofsted.gov.uk.xml b/src/chrome/content/rules/ofsted.gov.uk.xml
index 090269e8a6db..d89ae2e2498b 100644
--- a/src/chrome/content/rules/ofsted.gov.uk.xml
+++ b/src/chrome/content/rules/ofsted.gov.uk.xml
@@ -39,7 +39,7 @@ Fetch error: http://www.mobile.learnerview.ofsted.gov.uk/ => https://www.mobile.
 		- .reports.ofsted.gov.uk
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/ogcio.gov.hk.xml b/src/chrome/content/rules/ogcio.gov.hk.xml
new file mode 100644
index 000000000000..f26b04d31ae6
--- /dev/null
+++ b/src/chrome/content/rules/ogcio.gov.hk.xml
@@ -0,0 +1,24 @@
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ohnopodcast.com.xml b/src/chrome/content/rules/ohnopodcast.com.xml
new file mode 100644
index 000000000000..bb780ea7f1f6
--- /dev/null
+++ b/src/chrome/content/rules/ohnopodcast.com.xml
@@ -0,0 +1,8 @@
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/okligatv.com.xml b/src/chrome/content/rules/okligatv.com.xml
deleted file mode 100644
index b529c70f40c6..000000000000
--- a/src/chrome/content/rules/okligatv.com.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/oldbayproxy.eu.xml b/src/chrome/content/rules/oldbayproxy.eu.xml
deleted file mode 100644
index 75627c0fb0d4..000000000000
--- a/src/chrome/content/rules/oldbayproxy.eu.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/oload.info.xml b/src/chrome/content/rules/oload.info.xml
deleted file mode 100644
index ba1a4493045f..000000000000
--- a/src/chrome/content/rules/oload.info.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/omise.co.xml b/src/chrome/content/rules/omise.co.xml
deleted file mode 100644
index 92403333e6f8..000000000000
--- a/src/chrome/content/rules/omise.co.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-	
-	
-
-		
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-
-		
-		
-		
-		
-		
-		
-		
-		
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/omniweb.ru.xml b/src/chrome/content/rules/omniweb.ru.xml
index c5de834060c0..f20bbdb861fb 100644
--- a/src/chrome/content/rules/omniweb.ru.xml
+++ b/src/chrome/content/rules/omniweb.ru.xml
@@ -8,7 +8,7 @@ www.omniweb.ru mismatch
 stsl.omniweb.ru nonexist
 t5.omniweb.ru mismatch
 -->
-
+
 	
 
 	
diff --git a/src/chrome/content/rules/oneandone.net.xml b/src/chrome/content/rules/oneandone.net.xml
new file mode 100644
index 000000000000..f04342a8c471
--- /dev/null
+++ b/src/chrome/content/rules/oneandone.net.xml
@@ -0,0 +1,29 @@
+
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/oneclickdigital.eu.xml b/src/chrome/content/rules/oneclickdigital.eu.xml
deleted file mode 100644
index 78598c6788e9..000000000000
--- a/src/chrome/content/rules/oneclickdigital.eu.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-
-
-
-	
-
-		
-		
-
-			
-			
-			
-			
-			
-
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/onepace.net.xml b/src/chrome/content/rules/onepace.net.xml
new file mode 100644
index 000000000000..f508ea7310da
--- /dev/null
+++ b/src/chrome/content/rules/onepace.net.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/onlineprospectus.net.xml b/src/chrome/content/rules/onlineprospectus.net.xml
new file mode 100644
index 000000000000..9e8e05c32206
--- /dev/null
+++ b/src/chrome/content/rules/onlineprospectus.net.xml
@@ -0,0 +1,10 @@
+
+	
+	
+
+	
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/open27.ru.xml b/src/chrome/content/rules/open27.ru.xml
index 4e8fb299237d..f6648a3ef6a4 100644
--- a/src/chrome/content/rules/open27.ru.xml
+++ b/src/chrome/content/rules/open27.ru.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.open27.ru/ => https://www.open27.ru/: (51, "SSL: no alternative certificate subject name matches target host name 'www.open27.ru'")
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/openbank.ru.xml b/src/chrome/content/rules/openbank.ru.xml
index 57c0e583f536..7b38b36d08d0 100644
--- a/src/chrome/content/rules/openbank.ru.xml
+++ b/src/chrome/content/rules/openbank.ru.xml
@@ -16,7 +16,7 @@ otvet.openbank.ru ¹
 ¹ mismatch
 ⁶ redirect
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/opencaching.de.xml b/src/chrome/content/rules/opencaching.de.xml
index 9b414938fe53..e1ce21e08368 100644
--- a/src/chrome/content/rules/opencaching.de.xml
+++ b/src/chrome/content/rules/opencaching.de.xml
@@ -1,9 +1,9 @@
 
@@ -12,24 +12,24 @@
 	
 	
 	
-	
+
 	
 	
-	
+
 	
 	
-	
+
 	
 	
-	
+
 	
 	
-	
+
 	
 	
-	
+
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/opencaching.pl.xml b/src/chrome/content/rules/opencaching.pl.xml
index 7d0b68201510..84840df804c9 100644
--- a/src/chrome/content/rules/opencaching.pl.xml
+++ b/src/chrome/content/rules/opencaching.pl.xml
@@ -2,12 +2,12 @@
 	Main pages support https
 	Sub domains like blog / podsumowanie / testing do not support https or have
 	corrupted https or missing/wrong cert
-    
+
     Last test date: 19.08.2017
-    
+
     wrong certificate and wrong website served:
      - m.opencaching.pl
-    
+
     wrong certificate:
      - blog.opencaching.pl
 
@@ -16,15 +16,15 @@
 	
 	
 	
-	
+
 	
 	
-	
+
 	
 	
-	
+
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/opencaching.us.xml b/src/chrome/content/rules/opencaching.us.xml
index 6e9856c98d6d..acfd07581a42 100644
--- a/src/chrome/content/rules/opencaching.us.xml
+++ b/src/chrome/content/rules/opencaching.us.xml
@@ -1,7 +1,7 @@
 
@@ -9,15 +9,15 @@
 	
 	
 	
-	
+
 	
 	
-	
+
 	
 	
-	
+
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/opendata.ch.xml b/src/chrome/content/rules/opendata.ch.xml
index d06c0da2e4f9..369bcc7ae04f 100644
--- a/src/chrome/content/rules/opendata.ch.xml
+++ b/src/chrome/content/rules/opendata.ch.xml
@@ -9,11 +9,11 @@
 	Mixed content:
 
 		- css, on:
-		
+
 			- ^, en, energy, finance, food, fr, glam, make from fonts.googleapis.com ˢ
 
 		- Images, on:
-		
+
 			- ^, en, energy, finance, food, fr, glam from $self ˢ
 			- ^ from fr.opendata.ch ˢ
 			- ^, fr from soda.camp ⁴
@@ -21,7 +21,7 @@
 			- finance from assets.okfn.org ˢ
 
 		- Bugs, on:
-		
+
 			- ^, en, food, fr, make from i.creativecommons.org ˢ
 			- ^ from licensebuttons.net ˢ
 
diff --git a/src/chrome/content/rules/openembedded.org.xml b/src/chrome/content/rules/openembedded.org.xml
new file mode 100644
index 000000000000..b9ca57cde805
--- /dev/null
+++ b/src/chrome/content/rules/openembedded.org.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/opengo.nl.xml b/src/chrome/content/rules/opengo.nl.xml
deleted file mode 100644
index 1a13500bfdd2..000000000000
--- a/src/chrome/content/rules/opengo.nl.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/openmsx.org.xml b/src/chrome/content/rules/openmsx.org.xml
new file mode 100644
index 000000000000..eb78b7dab104
--- /dev/null
+++ b/src/chrome/content/rules/openmsx.org.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/openra.net.xml b/src/chrome/content/rules/openra.net.xml
new file mode 100644
index 000000000000..32fcd2ea170e
--- /dev/null
+++ b/src/chrome/content/rules/openra.net.xml
@@ -0,0 +1,21 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/openrct2.io.xml b/src/chrome/content/rules/openrct2.io.xml
new file mode 100644
index 000000000000..ca5ad9ec27d6
--- /dev/null
+++ b/src/chrome/content/rules/openrct2.io.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/openrunet.org.xml b/src/chrome/content/rules/openrunet.org.xml
index 4a68f11df8e8..10a4f1bc6ac2 100644
--- a/src/chrome/content/rules/openrunet.org.xml
+++ b/src/chrome/content/rules/openrunet.org.xml
@@ -4,7 +4,7 @@ www.openrunet.org self signed
 
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/openscad.org.xml b/src/chrome/content/rules/openscad.org.xml
new file mode 100644
index 000000000000..cdb466368c67
--- /dev/null
+++ b/src/chrome/content/rules/openscad.org.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/opensocietyfoundations.org.xml b/src/chrome/content/rules/opensocietyfoundations.org.xml
deleted file mode 100644
index aabaa3b5cc44..000000000000
--- a/src/chrome/content/rules/opensocietyfoundations.org.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/openwall.info.xml b/src/chrome/content/rules/openwall.info.xml
new file mode 100644
index 000000000000..1ad434cacd3b
--- /dev/null
+++ b/src/chrome/content/rules/openwall.info.xml
@@ -0,0 +1,6 @@
+
+	
+	  
+	
+	
+
diff --git a/src/chrome/content/rules/openwebrtc.org.xml b/src/chrome/content/rules/openwebrtc.org.xml
index 62f7fee56a85..bfe4c266c74c 100644
--- a/src/chrome/content/rules/openwebrtc.org.xml
+++ b/src/chrome/content/rules/openwebrtc.org.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://demo.openwebrtc.org/ => https://demo.openwebrtc.org/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/openxmarket.asia.xml b/src/chrome/content/rules/openxmarket.asia.xml
deleted file mode 100644
index a3547157e4d3..000000000000
--- a/src/chrome/content/rules/openxmarket.asia.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/optimizely.com-resources.xml b/src/chrome/content/rules/optimizely.com-resources.xml
index 43b7e10ecafe..5012f819fd5f 100644
--- a/src/chrome/content/rules/optimizely.com-resources.xml
+++ b/src/chrome/content/rules/optimizely.com-resources.xml
@@ -10,7 +10,7 @@ Non-2xx HTTP code: http://pages.optimizely.com/rs/361-GER-922/images/Share1.png
 	and no mixed content secured.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/optum.com.xml b/src/chrome/content/rules/optum.com.xml
index accc79c209cf..9934f0a2ed95 100644
--- a/src/chrome/content/rules/optum.com.xml
+++ b/src/chrome/content/rules/optum.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://optum.com/ => https://optum.com/: (51, "SSL: no alternative certificate subject name matches target host name 'optum.com'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/oraclefox.com.xml b/src/chrome/content/rules/oraclefox.com.xml
new file mode 100644
index 000000000000..34694a6c7483
--- /dev/null
+++ b/src/chrome/content/rules/oraclefox.com.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/orangeplant.co.uk.xml b/src/chrome/content/rules/orangeplant.co.uk.xml
index 47f8c7d9a2f6..b00b03abc69f 100644
--- a/src/chrome/content/rules/orangeplant.co.uk.xml
+++ b/src/chrome/content/rules/orangeplant.co.uk.xml
@@ -6,7 +6,7 @@ Non-2xx HTTP code: http://www.orangeplant.co.uk/ (200) => https://orangeplant.co
 	www.orangeplant.co.uk: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/oroboro.com.xml b/src/chrome/content/rules/oroboro.com.xml
index f389ae27326e..51e3bdb7f8a1 100644
--- a/src/chrome/content/rules/oroboro.com.xml
+++ b/src/chrome/content/rules/oroboro.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://img.oroboro.com/ => https://img.oroboro.com/: (35, 'error:14077458:SSL routines:SSL23_GET_SERVER_HELLO:tlsv1 unrecognized name')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/orr.gov.uk.xml b/src/chrome/content/rules/orr.gov.uk.xml
index 72f9b1c965ab..cd0d57b73055 100644
--- a/src/chrome/content/rules/orr.gov.uk.xml
+++ b/src/chrome/content/rules/orr.gov.uk.xml
@@ -24,7 +24,7 @@ Fetch error: http://orrdat.orr.gov.uk/ => https://orrdat.orr.gov.uk/: (60, 'SSL
 		- .dataportal.orr.gov.uk
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ortenau.freifunk.net.xml b/src/chrome/content/rules/ortenau.freifunk.net.xml
new file mode 100644
index 000000000000..8e24590d9403
--- /dev/null
+++ b/src/chrome/content/rules/ortenau.freifunk.net.xml
@@ -0,0 +1,18 @@
+
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/osf22p3lmweopgho.onion.xml b/src/chrome/content/rules/osf22p3lmweopgho.onion.xml
index 21e49a4d8295..d84f66845634 100644
--- a/src/chrome/content/rules/osf22p3lmweopgho.onion.xml
+++ b/src/chrome/content/rules/osf22p3lmweopgho.onion.xml
@@ -1,5 +1,5 @@
 
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/osufoundation.org.xml b/src/chrome/content/rules/osufoundation.org.xml
index da0557967e63..b3a70ddae013 100644
--- a/src/chrome/content/rules/osufoundation.org.xml
+++ b/src/chrome/content/rules/osufoundation.org.xml
@@ -1,11 +1,14 @@
 
-
+
 
 	
diff --git a/src/chrome/content/rules/osuosl.org.xml b/src/chrome/content/rules/osuosl.org.xml
index ee129dd3907d..e3fe0162468a 100644
--- a/src/chrome/content/rules/osuosl.org.xml
+++ b/src/chrome/content/rules/osuosl.org.xml
@@ -1,25 +1,260 @@
 
-
+	Unreachable:
+		lf-bugs.osuosl.org
+		lf-lists.osuosl.org
+		lf-web1.osuosl.org
+		lf-web2.osuosl.org
+		mon2.osuosl.org
+		mozillazine1.osuosl.org
+		ntp.osuosl.org
+		panama.osuosl.org
+		parisc.osuosl.org
+		time.osuosl.org
+		webdav1.osuosl.org
 
+	Unsupported protocol:
+		console1.gentoo.osuosl.org
+-->
+
 	
-	
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
-	
-
-
-	
-
+	
 
diff --git a/src/chrome/content/rules/osvehicle.com.xml b/src/chrome/content/rules/osvehicle.com.xml
deleted file mode 100644
index c46e58d1617b..000000000000
--- a/src/chrome/content/rules/osvehicle.com.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/otc-cta.gc.ca.xml b/src/chrome/content/rules/otc-cta.gc.ca.xml
new file mode 100644
index 000000000000..9303eef7021b
--- /dev/null
+++ b/src/chrome/content/rules/otc-cta.gc.ca.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ots-net.ru.xml b/src/chrome/content/rules/ots-net.ru.xml
index ececefca3529..7e3173369c0f 100644
--- a/src/chrome/content/rules/ots-net.ru.xml
+++ b/src/chrome/content/rules/ots-net.ru.xml
@@ -8,7 +8,7 @@ forum.ots-net.ru mismatch
 moidom.ots-net.ru mismatch
 info.ots-net.ru mismatch
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/ourskillsforce.co.uk.xml b/src/chrome/content/rules/ourskillsforce.co.uk.xml
index d120d8f45679..f30035a8bcc9 100644
--- a/src/chrome/content/rules/ourskillsforce.co.uk.xml
+++ b/src/chrome/content/rules/ourskillsforce.co.uk.xml
@@ -13,7 +13,7 @@ Fetch error: http://ourskillsforce.co.uk/ => https://ourskillsforce.co.uk/: (60,
 	ᵐ Mismatched
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/outnow.ch.xml b/src/chrome/content/rules/outnow.ch.xml
deleted file mode 100644
index 351dae3662f0..000000000000
--- a/src/chrome/content/rules/outnow.ch.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/oxfordshire.gov.uk-falsemixed.xml b/src/chrome/content/rules/oxfordshire.gov.uk-falsemixed.xml
index 20a85aed6f91..89b27071ab1e 100644
--- a/src/chrome/content/rules/oxfordshire.gov.uk-falsemixed.xml
+++ b/src/chrome/content/rules/oxfordshire.gov.uk-falsemixed.xml
@@ -8,7 +8,7 @@ Non-2xx HTTP code: http://winter.oxfordshire.gov.uk/ (200) => https://winter.oxf
 	For rules not causing false/broken MCB, see oxfordshire.gov.uk.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/oxfordshire.gov.uk.xml b/src/chrome/content/rules/oxfordshire.gov.uk.xml
index 0a6484fc1345..9f9e6ce5713e 100644
--- a/src/chrome/content/rules/oxfordshire.gov.uk.xml
+++ b/src/chrome/content/rules/oxfordshire.gov.uk.xml
@@ -57,14 +57,14 @@ Non-2xx HTTP code: http://owls.oxfordshire.gov.uk/ (200) => https://owls.oxfords
 		- css on insight, schools, volunteering, winter from $self ˢ
 
 		- Images, on:
-		
+
 			- insight, schools, volunteering, winter from $self ˢ
 			- schools from www.oxfordshire.gov.uk ˢ
 
 	ˢ Secured by us; see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/oyoony.xml b/src/chrome/content/rules/oyoony.xml
deleted file mode 100644
index 4e2a094527fd..000000000000
--- a/src/chrome/content/rules/oyoony.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-  
-  
-  
-  
-  
-  
-
-  
-
-  
-
diff --git a/src/chrome/content/rules/pCloud.xml b/src/chrome/content/rules/pCloud.xml
index 219068d8a0ea..6a7a73a95374 100644
--- a/src/chrome/content/rules/pCloud.xml
+++ b/src/chrome/content/rules/pCloud.xml
@@ -8,7 +8,7 @@ Fetch error: http://pc.cd/ => https://pc.cd/: (60, 'SSL certificate problem: una
   pc.cd is the short link for share links.
 -->
 
-
+
 
 	
 		
diff --git a/src/chrome/content/rules/packetflagon.is.xml b/src/chrome/content/rules/packetflagon.is.xml
deleted file mode 100644
index ba8f491d770f..000000000000
--- a/src/chrome/content/rules/packetflagon.is.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	
-	
-
-  	
-
-	
-
diff --git a/src/chrome/content/rules/panorama.am.xml b/src/chrome/content/rules/panorama.am.xml
index ee74a4631c22..a85a5c42ea11 100644
--- a/src/chrome/content/rules/panorama.am.xml
+++ b/src/chrome/content/rules/panorama.am.xml
@@ -7,7 +7,7 @@ Non-2xx HTTP code: http://life.panorama.am/ (200) => https://life.panorama.am/ (
 Non-2xx HTTP code: http://sport.panorama.am/ (200) => https://sport.panorama.am/ (521)
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/paralus.co.xml b/src/chrome/content/rules/paralus.co.xml
new file mode 100644
index 000000000000..c31b5bc2bc68
--- /dev/null
+++ b/src/chrome/content/rules/paralus.co.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/paralympic.org.xml b/src/chrome/content/rules/paralympic.org.xml
index 2ed69161f4f0..316b13bf866e 100644
--- a/src/chrome/content/rules/paralympic.org.xml
+++ b/src/chrome/content/rules/paralympic.org.xml
@@ -8,7 +8,7 @@ paralympic.org ³
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/parlmany.com.xml b/src/chrome/content/rules/parlmany.com.xml
index a56628cc11c1..e55a09558c3b 100644
--- a/src/chrome/content/rules/parlmany.com.xml
+++ b/src/chrome/content/rules/parlmany.com.xml
@@ -1,10 +1,10 @@
-        
-	        
-	  
+
+	
+	
 	
 	
-	
-		
-	
+
+	
+
 	
 
diff --git a/src/chrome/content/rules/passwordsgenerator.net.xml b/src/chrome/content/rules/passwordsgenerator.net.xml
new file mode 100644
index 000000000000..d87711320358
--- /dev/null
+++ b/src/chrome/content/rules/passwordsgenerator.net.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/patronbase.com.xml b/src/chrome/content/rules/patronbase.com.xml
index 806ae647850a..3c61351f7d9f 100644
--- a/src/chrome/content/rules/patronbase.com.xml
+++ b/src/chrome/content/rules/patronbase.com.xml
@@ -22,7 +22,7 @@ Fetch error: http://patronbase.com/ => https://patronbase.com/: (28, 'Connection
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/paypalobjects.com.xml b/src/chrome/content/rules/paypalobjects.com.xml
deleted file mode 100644
index 74cc6e1efcc6..000000000000
--- a/src/chrome/content/rules/paypalobjects.com.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-	
-
-		
-		
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/pckeyboard.com.xml b/src/chrome/content/rules/pckeyboard.com.xml
index 613670e5b4a4..2acfa90a85de 100644
--- a/src/chrome/content/rules/pckeyboard.com.xml
+++ b/src/chrome/content/rules/pckeyboard.com.xml
@@ -3,7 +3,7 @@
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/pcshannover.de.xml b/src/chrome/content/rules/pcshannover.de.xml
new file mode 100644
index 000000000000..10bafbd6965c
--- /dev/null
+++ b/src/chrome/content/rules/pcshannover.de.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/pdfforge.org.xml b/src/chrome/content/rules/pdfforge.org.xml
index 087aba9d1e58..b662e482ec35 100644
--- a/src/chrome/content/rules/pdfforge.org.xml
+++ b/src/chrome/content/rules/pdfforge.org.xml
@@ -11,27 +11,27 @@
 	
 	
 	
-	
+
 	
 	
 	
-	
+
 	
 	
-	
+
 	
 	
-	
+
 	
 	
 	
-	
+
 	
 	
-	
+
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/pearsoncmg.com.xml b/src/chrome/content/rules/pearsoncmg.com.xml
new file mode 100644
index 000000000000..0c50d2257873
--- /dev/null
+++ b/src/chrome/content/rules/pearsoncmg.com.xml
@@ -0,0 +1,12 @@
+
+
+
+
+	
+	
+
+  
+
diff --git a/src/chrome/content/rules/peercloud.io.xml b/src/chrome/content/rules/peercloud.io.xml
index 920a859f250b..8609dd9ddc98 100644
--- a/src/chrome/content/rules/peercloud.io.xml
+++ b/src/chrome/content/rules/peercloud.io.xml
@@ -5,7 +5,7 @@ Fetch error: http://peercloud.io/ => https://peercloud.io/: (60, 'SSL certificat
 Fetch error: http://www.peercloud.io/ => https://www.peercloud.io/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/pejs.net.xml b/src/chrome/content/rules/pejs.net.xml
deleted file mode 100644
index 63d9c80cc2fa..000000000000
--- a/src/chrome/content/rules/pejs.net.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/penzionspicak.cz.xml b/src/chrome/content/rules/penzionspicak.cz.xml
new file mode 100644
index 000000000000..d00e73824b43
--- /dev/null
+++ b/src/chrome/content/rules/penzionspicak.cz.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/pepperridgefarm.xml b/src/chrome/content/rules/pepperridgefarm.xml
new file mode 100644
index 000000000000..bc52dd6b431a
--- /dev/null
+++ b/src/chrome/content/rules/pepperridgefarm.xml
@@ -0,0 +1,7 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/permkrai.ru.xml b/src/chrome/content/rules/permkrai.ru.xml
index f53d3670f557..7f69d7a664eb 100644
--- a/src/chrome/content/rules/permkrai.ru.xml
+++ b/src/chrome/content/rules/permkrai.ru.xml
@@ -169,7 +169,7 @@ opendata.permkrai.ru different content
 ⁶ redirect
 ⁷ protocol error
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/pharmgkb.org.xml b/src/chrome/content/rules/pharmgkb.org.xml
index 9e23cd4bf6fe..c7b27c9342cc 100644
--- a/src/chrome/content/rules/pharmgkb.org.xml
+++ b/src/chrome/content/rules/pharmgkb.org.xml
@@ -6,7 +6,7 @@ Fetch error: http://pharmgkb.org/ => https://pharmgkb.org/: (28, 'Connection tim
 	STS header includes includeSubdomains
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/phonehouse.de.xml b/src/chrome/content/rules/phonehouse.de.xml
deleted file mode 100644
index 9fd8cc63dfd4..000000000000
--- a/src/chrome/content/rules/phonehouse.de.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/phys.org.xml b/src/chrome/content/rules/phys.org.xml
index 78ef13276672..306d187eb27a 100644
--- a/src/chrome/content/rules/phys.org.xml
+++ b/src/chrome/content/rules/phys.org.xml
@@ -3,11 +3,13 @@
 	
 	
 	
-
+	
 
 	
 	
 
+	
 
 	
diff --git a/src/chrome/content/rules/pi-hole.net.xml b/src/chrome/content/rules/pi-hole.net.xml
index 0ddaa4506c2f..2e1143393231 100644
--- a/src/chrome/content/rules/pi-hole.net.xml
+++ b/src/chrome/content/rules/pi-hole.net.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Non-2xx HTTP code: http://www.pi-hole.net/ (200) => https://www.pi-hole.net/ (526)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/piccy.info.xml b/src/chrome/content/rules/piccy.info.xml
new file mode 100644
index 000000000000..5ecc71a12532
--- /dev/null
+++ b/src/chrome/content/rules/piccy.info.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/pigtown.news.xml b/src/chrome/content/rules/pigtown.news.xml
deleted file mode 100644
index c763913f3528..000000000000
--- a/src/chrome/content/rules/pigtown.news.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/pindropsecurity.com.xml b/src/chrome/content/rules/pindropsecurity.com.xml
index 66d9da853670..1b23efe20e7c 100644
--- a/src/chrome/content/rules/pindropsecurity.com.xml
+++ b/src/chrome/content/rules/pindropsecurity.com.xml
@@ -14,7 +14,7 @@ Non-2xx HTTP code: http://info.pindropsecurity.com/rs/pindropsecurity/images/Pin
 	ᵃ Marketo / Shows another domain
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/piraattipuolue.fi.xml b/src/chrome/content/rules/piraattipuolue.fi.xml
index 6a01e3606926..43a472ab9889 100644
--- a/src/chrome/content/rules/piraattipuolue.fi.xml
+++ b/src/chrome/content/rules/piraattipuolue.fi.xml
@@ -36,7 +36,7 @@
 		- favicon on keskustelut from arkisto.piraattipuolue.fi ⁴
 
 		- Bug, on:
-		
+
 			- blogi from www.facebook.com ˢ
 			- blogi from apis.google.com ˢ
 			- blogi, keskustelut, wiki from stats.piraattipuolue.fi ᵉ
diff --git a/src/chrome/content/rules/pirata.cat.xml b/src/chrome/content/rules/pirata.cat.xml
deleted file mode 100644
index 1d84fefaf517..000000000000
--- a/src/chrome/content/rules/pirata.cat.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-	
-
-		
-		
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/pirateaccess.xyz.xml b/src/chrome/content/rules/pirateaccess.xyz.xml
deleted file mode 100644
index aea4539a2952..000000000000
--- a/src/chrome/content/rules/pirateaccess.xyz.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/piratebay.click.xml b/src/chrome/content/rules/piratebay.click.xml
deleted file mode 100644
index da8c5209d185..000000000000
--- a/src/chrome/content/rules/piratebay.click.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/piratebay.website.xml b/src/chrome/content/rules/piratebay.website.xml
deleted file mode 100644
index fc2c739b0d09..000000000000
--- a/src/chrome/content/rules/piratebay.website.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/piratebayblocked.com.xml b/src/chrome/content/rules/piratebayblocked.com.xml
deleted file mode 100644
index f4bf518d80cf..000000000000
--- a/src/chrome/content/rules/piratebayblocked.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/piratebayfast.co.uk.xml b/src/chrome/content/rules/piratebayfast.co.uk.xml
deleted file mode 100644
index 8a719859d965..000000000000
--- a/src/chrome/content/rules/piratebayfast.co.uk.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/piratebayguru.com.xml b/src/chrome/content/rules/piratebayguru.com.xml
deleted file mode 100644
index c675ebeb7dd6..000000000000
--- a/src/chrome/content/rules/piratebayguru.com.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/piratebayportal.co.uk.xml b/src/chrome/content/rules/piratebayportal.co.uk.xml
deleted file mode 100644
index b377a0e3844f..000000000000
--- a/src/chrome/content/rules/piratebayportal.co.uk.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/piratebays.co.uk.xml b/src/chrome/content/rules/piratebays.co.uk.xml
deleted file mode 100644
index 623de0b15f37..000000000000
--- a/src/chrome/content/rules/piratebays.co.uk.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/piratebays.co.xml b/src/chrome/content/rules/piratebays.co.xml
deleted file mode 100644
index 29459e430ac2..000000000000
--- a/src/chrome/content/rules/piratebays.co.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/piraten.lu.xml b/src/chrome/content/rules/piraten.lu.xml
index e3ddf8173e9a..33369a20eeb1 100644
--- a/src/chrome/content/rules/piraten.lu.xml
+++ b/src/chrome/content/rules/piraten.lu.xml
@@ -19,7 +19,7 @@ Fetch error: http://www.piraten.lu/ => https://www.piraten.lu/: (60, 'SSL certif
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/piratepartei.lu.xml b/src/chrome/content/rules/piratepartei.lu.xml
deleted file mode 100644
index 9f83a55626a0..000000000000
--- a/src/chrome/content/rules/piratepartei.lu.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/pirateproxy.click.xml b/src/chrome/content/rules/pirateproxy.click.xml
deleted file mode 100644
index b4c6e26de22f..000000000000
--- a/src/chrome/content/rules/pirateproxy.click.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/pirateproxy.club.xml b/src/chrome/content/rules/pirateproxy.club.xml
deleted file mode 100644
index bd9de3c5c032..000000000000
--- a/src/chrome/content/rules/pirateproxy.club.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-	
-	
-
-	
-
-	
-	
-
diff --git a/src/chrome/content/rules/pirateproxy.wf.xml b/src/chrome/content/rules/pirateproxy.wf.xml
deleted file mode 100644
index 2d5f654ec891..000000000000
--- a/src/chrome/content/rules/pirateproxy.wf.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/pirateproxy.yt.xml b/src/chrome/content/rules/pirateproxy.yt.xml
deleted file mode 100644
index c1e015ff315b..000000000000
--- a/src/chrome/content/rules/pirateproxy.yt.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/piratesahoy.net.xml b/src/chrome/content/rules/piratesahoy.net.xml
new file mode 100644
index 000000000000..0511ba08b44c
--- /dev/null
+++ b/src/chrome/content/rules/piratesahoy.net.xml
@@ -0,0 +1,28 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/pirateunblocked.xyz.xml b/src/chrome/content/rules/pirateunblocked.xyz.xml
deleted file mode 100644
index ceaa6ee91d1e..000000000000
--- a/src/chrome/content/rules/pirateunblocked.xyz.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/piratpartiet.dk.xml b/src/chrome/content/rules/piratpartiet.dk.xml
deleted file mode 100644
index 7bbddd868a88..000000000000
--- a/src/chrome/content/rules/piratpartiet.dk.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/pixhost.org.xml b/src/chrome/content/rules/pixhost.org.xml
deleted file mode 100644
index 5ec695d2cc51..000000000000
--- a/src/chrome/content/rules/pixhost.org.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
diff --git a/src/chrome/content/rules/pixxxels.org.xml b/src/chrome/content/rules/pixxxels.org.xml
deleted file mode 100644
index fcb342f1487f..000000000000
--- a/src/chrome/content/rules/pixxxels.org.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/pki.goog.xml b/src/chrome/content/rules/pki.goog.xml
new file mode 100644
index 000000000000..02ea3d24cdd3
--- /dev/null
+++ b/src/chrome/content/rules/pki.goog.xml
@@ -0,0 +1,27 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/plainenglish.co.uk.xml b/src/chrome/content/rules/plainenglish.co.uk.xml
index 3fd6208a939b..935007b1668b 100644
--- a/src/chrome/content/rules/plainenglish.co.uk.xml
+++ b/src/chrome/content/rules/plainenglish.co.uk.xml
@@ -17,7 +17,7 @@ Fetch error: http://www.plainenglish.co.uk/ => https://www.plainenglish.co.uk/:
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/planetrulers.xml b/src/chrome/content/rules/planetrulers.xml
index 0eaa91a2186e..015db691dd04 100644
--- a/src/chrome/content/rules/planetrulers.xml
+++ b/src/chrome/content/rules/planetrulers.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.planetrulers.com/ => https://www.planetrulers.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.planetrulers.com'")
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/plasq.com.xml b/src/chrome/content/rules/plasq.com.xml
new file mode 100644
index 000000000000..b3e0cf040cfb
--- /dev/null
+++ b/src/chrome/content/rules/plasq.com.xml
@@ -0,0 +1,48 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/playground.ru.xml b/src/chrome/content/rules/playground.ru.xml
new file mode 100644
index 000000000000..59b5820d8965
--- /dev/null
+++ b/src/chrome/content/rules/playground.ru.xml
@@ -0,0 +1,68 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/playphrase.me.xml b/src/chrome/content/rules/playphrase.me.xml
new file mode 100644
index 000000000000..7eaa5cf22ef9
--- /dev/null
+++ b/src/chrome/content/rules/playphrase.me.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/plymouth.gov.uk.xml b/src/chrome/content/rules/plymouth.gov.uk.xml
index 210239999d11..2108fa2f4246 100644
--- a/src/chrome/content/rules/plymouth.gov.uk.xml
+++ b/src/chrome/content/rules/plymouth.gov.uk.xml
@@ -24,7 +24,7 @@
 
 		- Images on democracy from go.m-gov.eu ⁴
 		- favicon on secure1 from www.plymouth.gov.uk ʳ
-	
+
 	⁴ Unsecurable <= 404
 	ʳ Unsecurable <= refused
 
diff --git a/src/chrome/content/rules/pmem.io.xml b/src/chrome/content/rules/pmem.io.xml
new file mode 100644
index 000000000000..43d589419249
--- /dev/null
+++ b/src/chrome/content/rules/pmem.io.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/pmf.gov.xml b/src/chrome/content/rules/pmf.gov.xml
deleted file mode 100644
index b46ddd2be046..000000000000
--- a/src/chrome/content/rules/pmf.gov.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/pocketmags.com.xml b/src/chrome/content/rules/pocketmags.com.xml
index cd0f22dc6117..ed7845296018 100644
--- a/src/chrome/content/rules/pocketmags.com.xml
+++ b/src/chrome/content/rules/pocketmags.com.xml
@@ -1,6 +1,6 @@
 
-
-
-	
-	
-
-		
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/pokerstarspartners.com.xml b/src/chrome/content/rules/pokerstarspartners.com.xml
index d381f9a8bffe..b831f1bfd90e 100644
--- a/src/chrome/content/rules/pokerstarspartners.com.xml
+++ b/src/chrome/content/rules/pokerstarspartners.com.xml
@@ -9,7 +9,7 @@
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/polarcloud.com.xml b/src/chrome/content/rules/polarcloud.com.xml
new file mode 100644
index 000000000000..13d35bd06ade
--- /dev/null
+++ b/src/chrome/content/rules/polarcloud.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/popcorntime.sh.xml b/src/chrome/content/rules/popcorntime.sh.xml
index 81fe731d5236..a6c2fb17ff24 100644
--- a/src/chrome/content/rules/popcorntime.sh.xml
+++ b/src/chrome/content/rules/popcorntime.sh.xml
@@ -16,7 +16,7 @@
 	
 	
 	
-	
+
 	
 	
 	
@@ -24,15 +24,15 @@
 	
 	
 	
-	
+
 	
 	
 	
-	
+
 	
 	
 	
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/pornolab.net.xml b/src/chrome/content/rules/pornolab.net.xml
index 63e13e478a60..f2f47a16415b 100644
--- a/src/chrome/content/rules/pornolab.net.xml
+++ b/src/chrome/content/rules/pornolab.net.xml
@@ -1,14 +1,14 @@
-
-       
-	       
-	    
+
+	
+	
 	
- 
+
 	
 
diff --git a/src/chrome/content/rules/portablepython.com.xml b/src/chrome/content/rules/portablepython.com.xml
new file mode 100644
index 000000000000..a7c6d1911a92
--- /dev/null
+++ b/src/chrome/content/rules/portablepython.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/portalpiratebay.co.uk.xml b/src/chrome/content/rules/portalpiratebay.co.uk.xml
deleted file mode 100644
index ad893ce495f4..000000000000
--- a/src/chrome/content/rules/portalpiratebay.co.uk.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/postovoy.org.xml b/src/chrome/content/rules/postovoy.org.xml
deleted file mode 100644
index 0546f9e3267b..000000000000
--- a/src/chrome/content/rules/postovoy.org.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/ppoi.org.xml b/src/chrome/content/rules/ppoi.org.xml
deleted file mode 100644
index c56452b2cf4c..000000000000
--- a/src/chrome/content/rules/ppoi.org.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/pqube.co.uk.xml b/src/chrome/content/rules/pqube.co.uk.xml
new file mode 100644
index 000000000000..639b09e386cf
--- /dev/null
+++ b/src/chrome/content/rules/pqube.co.uk.xml
@@ -0,0 +1,34 @@
+
+
+	
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/praktikpladsen.dk.xml b/src/chrome/content/rules/praktikpladsen.dk.xml
index 1a8115450c7d..43bb0c699d7a 100644
--- a/src/chrome/content/rules/praktikpladsen.dk.xml
+++ b/src/chrome/content/rules/praktikpladsen.dk.xml
@@ -1,6 +1,6 @@
 
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/pravdatyt.com.xml b/src/chrome/content/rules/pravdatyt.com.xml
deleted file mode 100644
index 575b9d294345..000000000000
--- a/src/chrome/content/rules/pravdatyt.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-	
-	
-	
-
diff --git a/src/chrome/content/rules/pravobraz.ru.xml b/src/chrome/content/rules/pravobraz.ru.xml
index 10cc2a7abd34..bd51d1a28390 100644
--- a/src/chrome/content/rules/pravobraz.ru.xml
+++ b/src/chrome/content/rules/pravobraz.ru.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://cdn1.pravobraz.ru/ => https://cdn1.pravobraz.ru/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/pretty52.com.xml b/src/chrome/content/rules/pretty52.com.xml
index 29dc72f416ed..8d592fef288b 100644
--- a/src/chrome/content/rules/pretty52.com.xml
+++ b/src/chrome/content/rules/pretty52.com.xml
@@ -15,7 +15,7 @@ Fetch error: http://www.pretty52.com/ => https://www.pretty52.com/: Too many red
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/preuveneers.be.xml b/src/chrome/content/rules/preuveneers.be.xml
new file mode 100644
index 000000000000..761b3443211b
--- /dev/null
+++ b/src/chrome/content/rules/preuveneers.be.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/prnt.sc.xml b/src/chrome/content/rules/prnt.sc.xml
index 0f2f8f010a2b..91d7fdfa3ec3 100644
--- a/src/chrome/content/rules/prnt.sc.xml
+++ b/src/chrome/content/rules/prnt.sc.xml
@@ -1,17 +1,15 @@
-
 
-
+
 	
 	
 	
-		
 	
 
 	
 
+	
 	
 
diff --git a/src/chrome/content/rules/pro.hostingas.lt.xml b/src/chrome/content/rules/pro.hostingas.lt.xml
index c72ffd9e7b75..433d0618429d 100644
--- a/src/chrome/content/rules/pro.hostingas.lt.xml
+++ b/src/chrome/content/rules/pro.hostingas.lt.xml
@@ -1,6 +1,6 @@
 
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/proXPN.xml b/src/chrome/content/rules/proXPN.xml
index f9bb757aa05c..64b52d88ba37 100644
--- a/src/chrome/content/rules/proXPN.xml
+++ b/src/chrome/content/rules/proXPN.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://get.proxpn.com/ => https://get.proxpn.com/: (51, "SSL: no alternative certificate subject name matches target host name 'get.proxpn.com'")
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/projectable.me.xml b/src/chrome/content/rules/projectable.me.xml
new file mode 100644
index 000000000000..eb48d0e2f664
--- /dev/null
+++ b/src/chrome/content/rules/projectable.me.xml
@@ -0,0 +1,5 @@
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/projectdev.org.xml b/src/chrome/content/rules/projectdev.org.xml
index a0ec39be2ac0..8bdf3968fea2 100644
--- a/src/chrome/content/rules/projectdev.org.xml
+++ b/src/chrome/content/rules/projectdev.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://wiki.projectdev.org/ => https://wiki.projectdev.org/: (6, 'C
 Fetch error: http://web.projectdev.org/ => https://web.projectdev.org/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/prokopievsk.ru.xml b/src/chrome/content/rules/prokopievsk.ru.xml
index 60ae7be4a28d..4a5f90590fc3 100644
--- a/src/chrome/content/rules/prokopievsk.ru.xml
+++ b/src/chrome/content/rules/prokopievsk.ru.xml
@@ -27,7 +27,7 @@ webcam.prokopievsk.ru ⁴
 ⁴ self signed
 ⁵ expired
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/pronoun.is.xml b/src/chrome/content/rules/pronoun.is.xml
new file mode 100644
index 000000000000..439d9722ba63
--- /dev/null
+++ b/src/chrome/content/rules/pronoun.is.xml
@@ -0,0 +1,23 @@
+
+
+	
+	
+	
+
+	
+
+	
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/propub3r6espa33w.onion.xml b/src/chrome/content/rules/propub3r6espa33w.onion.xml
index a106cac48d36..524d5db88b18 100644
--- a/src/chrome/content/rules/propub3r6espa33w.onion.xml
+++ b/src/chrome/content/rules/propub3r6espa33w.onion.xml
@@ -1,16 +1,16 @@
 
-
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/protvino.net.xml b/src/chrome/content/rules/protvino.net.xml
index 714b9ab95e57..6f6913180989 100644
--- a/src/chrome/content/rules/protvino.net.xml
+++ b/src/chrome/content/rules/protvino.net.xml
@@ -11,14 +11,14 @@ support.protvino.net mismatch
 hs.protvino.net mismatch
 uefa2016.protvino.net timed out
 -->
-
+
 	
 	
 	
-	
+
 	
-	
+
 	
 
 	
diff --git a/src/chrome/content/rules/providercentral.org.uk.xml b/src/chrome/content/rules/providercentral.org.uk.xml
index 2e87d2bbd126..b8e65840a254 100644
--- a/src/chrome/content/rules/providercentral.org.uk.xml
+++ b/src/chrome/content/rules/providercentral.org.uk.xml
@@ -7,7 +7,7 @@ Fetch error: http://providercentral.org.uk/ => https://www.providercentral.org.u
 	^providercentral.org.uk: Handshake fails
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/prox.press.xml b/src/chrome/content/rules/prox.press.xml
deleted file mode 100644
index fdb62f7d0a4f..000000000000
--- a/src/chrome/content/rules/prox.press.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/proxybay.pl.xml b/src/chrome/content/rules/proxybay.pl.xml
deleted file mode 100644
index 8584aaf782a9..000000000000
--- a/src/chrome/content/rules/proxybay.pl.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/proxyportal.org.xml b/src/chrome/content/rules/proxyportal.org.xml
index e83299f7a593..02d2ca681b76 100644
--- a/src/chrome/content/rules/proxyportal.org.xml
+++ b/src/chrome/content/rules/proxyportal.org.xml
@@ -38,7 +38,7 @@ Fetch error: http://thepiratebay.webypass.xyz/ => https://thepiratebay.webypass.
 pirateproxy.press non-2xx http code
 -->
 
-
+
 	
 	
 	
@@ -94,4 +94,4 @@ pirateproxy.press non-2xx http code
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/proxyship.cf.xml b/src/chrome/content/rules/proxyship.cf.xml
deleted file mode 100644
index c10b37e4de75..000000000000
--- a/src/chrome/content/rules/proxyship.cf.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/pspx.ru.xml b/src/chrome/content/rules/pspx.ru.xml
new file mode 100644
index 000000000000..1d868dda34c9
--- /dev/null
+++ b/src/chrome/content/rules/pspx.ru.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/puphpet.com.xml b/src/chrome/content/rules/puphpet.com.xml
index 208e3445150a..e296fc76e54b 100644
--- a/src/chrome/content/rules/puphpet.com.xml
+++ b/src/chrome/content/rules/puphpet.com.xml
@@ -8,7 +8,7 @@ beta.puphpet.com ¹
 
 ¹ mismatch
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/pwntools.com.xml b/src/chrome/content/rules/pwntools.com.xml
new file mode 100644
index 000000000000..fcdf6d491512
--- /dev/null
+++ b/src/chrome/content/rules/pwntools.com.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/pyeongchang2018.com.xml b/src/chrome/content/rules/pyeongchang2018.com.xml
index 5de4f3aa88ef..036928fc3c13 100644
--- a/src/chrome/content/rules/pyeongchang2018.com.xml
+++ b/src/chrome/content/rules/pyeongchang2018.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://missionrelay.pyeongchang2018.com/ => https://missionrelay.py
 
 newsletter.pyeongchang2018.com mismatch
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/pytamy.pl.xml b/src/chrome/content/rules/pytamy.pl.xml
index a03dfd2f66b9..3d429f3d9436 100644
--- a/src/chrome/content/rules/pytamy.pl.xml
+++ b/src/chrome/content/rules/pytamy.pl.xml
@@ -7,7 +7,7 @@
 			- ^ from a.wpimg.pl ˢ
 
 		- Bugs, on:
-		
+
 			- ^ from trzyszopy.pl ʰ
 			- ^ from ticket.www.wp.pl ˢ
 
diff --git a/src/chrome/content/rules/q-assets.com.xml b/src/chrome/content/rules/q-assets.com.xml
deleted file mode 100644
index 4dc94dbaa713..000000000000
--- a/src/chrome/content/rules/q-assets.com.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-		
-		
-		
-		
-		
-		
-		
-		
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/qdcdn.com.xml b/src/chrome/content/rules/qdcdn.com.xml
index 3ac878631d76..7cffcde8f14a 100644
--- a/src/chrome/content/rules/qdcdn.com.xml
+++ b/src/chrome/content/rules/qdcdn.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://ssl.qdcdn.com/ => https://ssl.qdcdn.com/: (7, 'Failed to con
 	Timeout:
 		- 2fs.qdcdn.com
 -->
-
+
 	
 
 	
diff --git a/src/chrome/content/rules/qf.org.qa.xml b/src/chrome/content/rules/qf.org.qa.xml
index 327fc50eea7d..ed43e88a041e 100644
--- a/src/chrome/content/rules/qf.org.qa.xml
+++ b/src/chrome/content/rules/qf.org.qa.xml
@@ -44,7 +44,7 @@ Timeout:
 Other:
 	fas.qf.org.qa
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/qira.me.xml b/src/chrome/content/rules/qira.me.xml
new file mode 100644
index 000000000000..ab00298ccfa8
--- /dev/null
+++ b/src/chrome/content/rules/qira.me.xml
@@ -0,0 +1,7 @@
+
+  
+  
+  
+
+  
+
diff --git a/src/chrome/content/rules/qiwi.me.xml b/src/chrome/content/rules/qiwi.me.xml
index 0828efa8cc37..827c2101b7f6 100644
--- a/src/chrome/content/rules/qiwi.me.xml
+++ b/src/chrome/content/rules/qiwi.me.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.qiwi.me/ => https://www.qiwi.me/: (51, "SSL: no alternative certificate subject name matches target host name 'www.qiwi.me'")
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/qiyukf.com.xml b/src/chrome/content/rules/qiyukf.com.xml
index f2b5f07c887a..25d03d1aa670 100644
--- a/src/chrome/content/rules/qiyukf.com.xml
+++ b/src/chrome/content/rules/qiyukf.com.xml
@@ -4,7 +4,7 @@
 	
 	
 	
-		
+
 	
 
diff --git a/src/chrome/content/rules/quakelive.com.xml b/src/chrome/content/rules/quakelive.com.xml
new file mode 100644
index 000000000000..08b504c0720d
--- /dev/null
+++ b/src/chrome/content/rules/quakelive.com.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/quickline.xml b/src/chrome/content/rules/quickline.xml
index 113b014e4f2f..62295c33392e 100644
--- a/src/chrome/content/rules/quickline.xml
+++ b/src/chrome/content/rules/quickline.xml
@@ -11,7 +11,7 @@ Fetch error: http://webmail.quickline.ch/ => https://webmail.quickline.ch/: (51,
 		- ndt.quickline.com
 		- speedtest.quickline.com
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/quran-online.ru.xml b/src/chrome/content/rules/quran-online.ru.xml
index b6076be1c99e..e895bee2e181 100644
--- a/src/chrome/content/rules/quran-online.ru.xml
+++ b/src/chrome/content/rules/quran-online.ru.xml
@@ -1,5 +1,5 @@
 
-      
+
         
         
 
diff --git a/src/chrome/content/rules/r46.ru.xml b/src/chrome/content/rules/r46.ru.xml
index 3816a628419f..e7cba5ecec74 100644
--- a/src/chrome/content/rules/r46.ru.xml
+++ b/src/chrome/content/rules/r46.ru.xml
@@ -10,7 +10,7 @@ games.r46.ru timed out
 kabinet-old.r46.ru mismatch
 webmail.r46.ru mismatch
 -->
-
+
 	
 
 	
diff --git a/src/chrome/content/rules/radeon.ru.xml b/src/chrome/content/rules/radeon.ru.xml
new file mode 100644
index 000000000000..de51cb263a49
--- /dev/null
+++ b/src/chrome/content/rules/radeon.ru.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/radio-browser.info.xml b/src/chrome/content/rules/radio-browser.info.xml
new file mode 100644
index 000000000000..17c987b4e26c
--- /dev/null
+++ b/src/chrome/content/rules/radio-browser.info.xml
@@ -0,0 +1,10 @@
+
+	
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/radiokniga.com.xml b/src/chrome/content/rules/radiokniga.com.xml
index 767714f49f65..9bf5c7fed773 100644
--- a/src/chrome/content/rules/radiokniga.com.xml
+++ b/src/chrome/content/rules/radiokniga.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://radiokniga.com/ => https://radiokniga.com/: (60, 'SSL certif
 Fetch error: http://www.radiokniga.com/ => https://www.radiokniga.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/raglan23.co.nz.xml b/src/chrome/content/rules/raglan23.co.nz.xml
index ece180c2535d..5e762cf06a25 100644
--- a/src/chrome/content/rules/raglan23.co.nz.xml
+++ b/src/chrome/content/rules/raglan23.co.nz.xml
@@ -4,7 +4,7 @@
 		- css from d1ycn9118ccflb.cloudfront.net ˢ
 
 		- Images, from:
-		
+
 			- d1ycn9118ccflb.cloudfront.net ˢ
 			- $self ˢ
 			- \d+.media.tumblr.com ˢ
diff --git a/src/chrome/content/rules/railyatri.in.xml b/src/chrome/content/rules/railyatri.in.xml
new file mode 100644
index 000000000000..0a4c5adde7f3
--- /dev/null
+++ b/src/chrome/content/rules/railyatri.in.xml
@@ -0,0 +1,48 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/rainews.it.xml b/src/chrome/content/rules/rainews.it.xml
new file mode 100644
index 000000000000..aa79fd317949
--- /dev/null
+++ b/src/chrome/content/rules/rainews.it.xml
@@ -0,0 +1,58 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/rapidrar.com.xml b/src/chrome/content/rules/rapidrar.com.xml
index 3c57972f2db0..d59abfe87d6e 100644
--- a/src/chrome/content/rules/rapidrar.com.xml
+++ b/src/chrome/content/rules/rapidrar.com.xml
@@ -20,7 +20,7 @@ Fetch error: http://www.rapidrar.com/ => https://www.rapidrar.com/: (60, 'SSL ce
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/raptrcdn.com.xml b/src/chrome/content/rules/raptrcdn.com.xml
deleted file mode 100644
index 8f322df2c090..000000000000
--- a/src/chrome/content/rules/raptrcdn.com.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/rascal999.co.uk.xml b/src/chrome/content/rules/rascal999.co.uk.xml
index b654257aa4c4..85079588e375 100644
--- a/src/chrome/content/rules/rascal999.co.uk.xml
+++ b/src/chrome/content/rules/rascal999.co.uk.xml
@@ -7,7 +7,7 @@ Fetch error: http://rascal999.co.uk/ => https://rascal999.co.uk/: (6, 'Could not
 	STS header includes includeSubdomains
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ravenjs.com.xml b/src/chrome/content/rules/ravenjs.com.xml
deleted file mode 100644
index 98917ab73ddf..000000000000
--- a/src/chrome/content/rules/ravenjs.com.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-	
-
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/razor1911.com.xml b/src/chrome/content/rules/razor1911.com.xml
deleted file mode 100644
index 763c4700c4a3..000000000000
--- a/src/chrome/content/rules/razor1911.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/rb-hk.de.xml b/src/chrome/content/rules/rb-hk.de.xml
new file mode 100644
index 000000000000..66de65a1bf4b
--- /dev/null
+++ b/src/chrome/content/rules/rb-hk.de.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/rbfi.io.xml b/src/chrome/content/rules/rbfi.io.xml
deleted file mode 100644
index cc87195444b3..000000000000
--- a/src/chrome/content/rules/rbfi.io.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-        
-        
-
-        
-
diff --git a/src/chrome/content/rules/rbth.com.xml b/src/chrome/content/rules/rbth.com.xml
index 80cdf1ce0391..41a4d89f2f24 100644
--- a/src/chrome/content/rules/rbth.com.xml
+++ b/src/chrome/content/rules/rbth.com.xml
@@ -34,7 +34,7 @@
 	Mixed content:
 
 		- Images, on:
-		
+
 			- ^, jp, mk, newsletter from nl.media.rbth.ru ˢ
 			- mk from static.rbth.com ˢ
 			- newsletter from ^rbth.com ˢ
diff --git a/src/chrome/content/rules/rbwm.gov.uk.xml b/src/chrome/content/rules/rbwm.gov.uk.xml
index 2a9c4322505c..1870e0c42d11 100644
--- a/src/chrome/content/rules/rbwm.gov.uk.xml
+++ b/src/chrome/content/rules/rbwm.gov.uk.xml
@@ -68,7 +68,7 @@ Fetch error: http://licensing.rbwm.gov.uk/ => https://licensing.rbwm.gov.uk/: (6
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/rbwmcarshare.co.uk.xml b/src/chrome/content/rules/rbwmcarshare.co.uk.xml
deleted file mode 100644
index 8ee19b791956..000000000000
--- a/src/chrome/content/rules/rbwmcarshare.co.uk.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/rclone.org.xml b/src/chrome/content/rules/rclone.org.xml
new file mode 100644
index 000000000000..9cea70ea1ace
--- /dev/null
+++ b/src/chrome/content/rules/rclone.org.xml
@@ -0,0 +1,34 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/re2c.org.xml b/src/chrome/content/rules/re2c.org.xml
new file mode 100644
index 000000000000..cfee422e6d31
--- /dev/null
+++ b/src/chrome/content/rules/re2c.org.xml
@@ -0,0 +1,7 @@
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/reCaptcha.net.xml b/src/chrome/content/rules/reCaptcha.net.xml
new file mode 100644
index 000000000000..5cab0cca5de2
--- /dev/null
+++ b/src/chrome/content/rules/reCaptcha.net.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/realestate.com.au.xml b/src/chrome/content/rules/realestate.com.au.xml
new file mode 100644
index 000000000000..78bd2f68d155
--- /dev/null
+++ b/src/chrome/content/rules/realestate.com.au.xml
@@ -0,0 +1,189 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/recognified.net.xml b/src/chrome/content/rules/recognified.net.xml
new file mode 100644
index 000000000000..816ed2489cb2
--- /dev/null
+++ b/src/chrome/content/rules/recognified.net.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+		
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/recordedbooks.com.xml b/src/chrome/content/rules/recordedbooks.com.xml
index 3893d5708331..3f627357f348 100644
--- a/src/chrome/content/rules/recordedbooks.com.xml
+++ b/src/chrome/content/rules/recordedbooks.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://images.recordedbooks.com/publications/2011/ly5110g_FB_FindUs
 Fetch error: http://images.recordedbooks.com/ => https://images.recordedbooks.com/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/redbtn.info.xml b/src/chrome/content/rules/redbtn.info.xml
deleted file mode 100644
index b8a5697eeff0..000000000000
--- a/src/chrome/content/rules/redbtn.info.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/redcare.com.xml b/src/chrome/content/rules/redcare.com.xml
index 6be227376c22..595a1d77dfc1 100644
--- a/src/chrome/content/rules/redcare.com.xml
+++ b/src/chrome/content/rules/redcare.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.redcare.com/ => https://www.redcare.com/: (7, 'Failed to
 		- redcare.com
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/redcom.ru.xml b/src/chrome/content/rules/redcom.ru.xml
index 17323a15fedf..34c2df5b4d9e 100644
--- a/src/chrome/content/rules/redcom.ru.xml
+++ b/src/chrome/content/rules/redcom.ru.xml
@@ -10,7 +10,7 @@ icepilots.redcom.ru mismatch
 files.redcom.ru protocol error
 genima.leased.redcom.ru timed out
 -->
-
+
 	
 
 	
diff --git a/src/chrome/content/rules/redditbot.com.xml b/src/chrome/content/rules/redditbot.com.xml
deleted file mode 100644
index 242f8f20984d..000000000000
--- a/src/chrome/content/rules/redditbot.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/reflets.info.xml b/src/chrome/content/rules/reflets.info.xml
deleted file mode 100644
index 13014eac96a4..000000000000
--- a/src/chrome/content/rules/reflets.info.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-        
-        
-
-
-	
-
-
-        
-
-
diff --git a/src/chrome/content/rules/regeringen.se.xml b/src/chrome/content/rules/regeringen.se.xml
new file mode 100644
index 000000000000..8d5996be77f1
--- /dev/null
+++ b/src/chrome/content/rules/regeringen.se.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/regettingold.com.xml b/src/chrome/content/rules/regettingold.com.xml
new file mode 100644
index 000000000000..d4490af839a9
--- /dev/null
+++ b/src/chrome/content/rules/regettingold.com.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+	
+
+	 
+	
+
diff --git a/src/chrome/content/rules/reporo.net.xml b/src/chrome/content/rules/reporo.net.xml
index a9031d1d5b5e..6ef7ec33066d 100644
--- a/src/chrome/content/rules/reporo.net.xml
+++ b/src/chrome/content/rules/reporo.net.xml
@@ -12,7 +12,7 @@
 	Nonfunctional hosts in *reporo.net:
 
 		- netdna ⁴
-		
+
 	⁴ 404; mismatched, CN: *.netdna-ssl.com)
 
 
diff --git a/src/chrome/content/rules/requestb.in.xml b/src/chrome/content/rules/requestb.in.xml
deleted file mode 100644
index 4419d8537e42..000000000000
--- a/src/chrome/content/rules/requestb.in.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/rescue.org-falsemixed.xml b/src/chrome/content/rules/rescue.org-falsemixed.xml
deleted file mode 100644
index 5622208543eb..000000000000
--- a/src/chrome/content/rules/rescue.org-falsemixed.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/rescue.org.xml b/src/chrome/content/rules/rescue.org.xml
index 21b7e773fbf8..dd0b4d970144 100644
--- a/src/chrome/content/rules/rescue.org.xml
+++ b/src/chrome/content/rules/rescue.org.xml
@@ -40,12 +40,12 @@ Non-2xx HTTP code: http://m.rescue.org/user (200) => https://m.rescue.org/user (
 
 	Mixed content:
 
-		- css on feature from $self 
-		- Images on feature from $self 
-		- favicon on feature from $self 
+		- css on feature from $self
+		- Images on feature from $self
+		- favicon on feature from $self
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/researchonline.org.uk.xml b/src/chrome/content/rules/researchonline.org.uk.xml
deleted file mode 100644
index 24119304e30c..000000000000
--- a/src/chrome/content/rules/researchonline.org.uk.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/responsetek.com.xml b/src/chrome/content/rules/responsetek.com.xml
deleted file mode 100644
index 6fe92f439891..000000000000
--- a/src/chrome/content/rules/responsetek.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/restic.net.xml b/src/chrome/content/rules/restic.net.xml
new file mode 100644
index 000000000000..8891333bd294
--- /dev/null
+++ b/src/chrome/content/rules/restic.net.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/rethrick.com.xml b/src/chrome/content/rules/rethrick.com.xml
new file mode 100644
index 000000000000..7d6a7d96b5ba
--- /dev/null
+++ b/src/chrome/content/rules/rethrick.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/retroachievements.org.xml b/src/chrome/content/rules/retroachievements.org.xml
new file mode 100644
index 000000000000..f7b5e2caecda
--- /dev/null
+++ b/src/chrome/content/rules/retroachievements.org.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/retroarch.com.xml b/src/chrome/content/rules/retroarch.com.xml
new file mode 100644
index 000000000000..c6de8257cf18
--- /dev/null
+++ b/src/chrome/content/rules/retroarch.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/rg.ru.xml b/src/chrome/content/rules/rg.ru.xml
index eef56fd310c5..9ac6f116b15a 100644
--- a/src/chrome/content/rules/rg.ru.xml
+++ b/src/chrome/content/rules/rg.ru.xml
@@ -57,7 +57,7 @@ worldcup2014.rg.ru different content
 ³ timed out
 ⁴ self signed
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/richmond.gov.uk.xml b/src/chrome/content/rules/richmond.gov.uk.xml
index cad793baba85..4210408efd29 100644
--- a/src/chrome/content/rules/richmond.gov.uk.xml
+++ b/src/chrome/content/rules/richmond.gov.uk.xml
@@ -3,7 +3,7 @@
 
 	For other UK government coverage, see GOV.UK.xml.
 
-	
+
 	Nonfunctional hosts in *richmond.gov.uk:
 
 		- gis ᵈ
diff --git a/src/chrome/content/rules/ridecompare.com.xml b/src/chrome/content/rules/ridecompare.com.xml
index 1ad36267b2ff..96681b67b85b 100644
--- a/src/chrome/content/rules/ridecompare.com.xml
+++ b/src/chrome/content/rules/ridecompare.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://ridecompare.com/ => https://ridecompare.com/: (28, 'Connecti
 Fetch error: http://www.ridecompare.com/ => https://www.ridecompare.com/: (28, 'Connection timed out after 20001 milliseconds')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/riksdagen.se.xml b/src/chrome/content/rules/riksdagen.se.xml
new file mode 100644
index 000000000000..c009ac91d31c
--- /dev/null
+++ b/src/chrome/content/rules/riksdagen.se.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/rio2016.com.xml b/src/chrome/content/rules/rio2016.com.xml
index ca482e332f90..f7b6e8a60383 100644
--- a/src/chrome/content/rules/rio2016.com.xml
+++ b/src/chrome/content/rules/rio2016.com.xml
@@ -8,7 +8,7 @@ Fetch error: http://rioexchange.rio2016.com/ => https://rioexchange.rio2016.com/
 imprensa.rio2016.com mismatch
 portaldesuprimentos.rio2016.com mismatch
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/risctraining.org.xml b/src/chrome/content/rules/risctraining.org.xml
new file mode 100644
index 000000000000..ab38d594ce15
--- /dev/null
+++ b/src/chrome/content/rules/risctraining.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/rkhd.in.xml b/src/chrome/content/rules/rkhd.in.xml
index ee0eb8a57293..76fe281780a4 100644
--- a/src/chrome/content/rules/rkhd.in.xml
+++ b/src/chrome/content/rules/rkhd.in.xml
@@ -19,7 +19,7 @@ Fetch error: http://www.rkhd.in/ => https://www.rkhd.in/: (60, 'SSL certificate
 	ʳ Refused
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/robinhood.xml b/src/chrome/content/rules/robinhood.xml
new file mode 100644
index 000000000000..a741e5f98f3d
--- /dev/null
+++ b/src/chrome/content/rules/robinhood.xml
@@ -0,0 +1,22 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/rocars.gov.hk.xml b/src/chrome/content/rules/rocars.gov.hk.xml
new file mode 100644
index 000000000000..40daac2c69be
--- /dev/null
+++ b/src/chrome/content/rules/rocars.gov.hk.xml
@@ -0,0 +1,8 @@
+
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/rockfile.eu.xml b/src/chrome/content/rules/rockfile.eu.xml
deleted file mode 100644
index c2e2a64a43ca..000000000000
--- a/src/chrome/content/rules/rockfile.eu.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-	
-	
-	
-
-		
-		
-
-
-	
-	
-
-	
-	
-	
-	
-	
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-
-
-	
-
-
diff --git a/src/chrome/content/rules/rocksbox.com.xml b/src/chrome/content/rules/rocksbox.com.xml
index e3cae202237b..1b406af20ca7 100644
--- a/src/chrome/content/rules/rocksbox.com.xml
+++ b/src/chrome/content/rules/rocksbox.com.xml
@@ -7,7 +7,7 @@
 	
 	
-	
+
 	
 	
diff --git a/src/chrome/content/rules/rodsbooks.com.xml b/src/chrome/content/rules/rodsbooks.com.xml
new file mode 100644
index 000000000000..a22f004ec116
--- /dev/null
+++ b/src/chrome/content/rules/rodsbooks.com.xml
@@ -0,0 +1,9 @@
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/rootless.org.xml b/src/chrome/content/rules/rootless.org.xml
index 6800563fabbd..1ce27deee54b 100644
--- a/src/chrome/content/rules/rootless.org.xml
+++ b/src/chrome/content/rules/rootless.org.xml
@@ -10,7 +10,7 @@
 	NB: server sends no certificate chain, see https://whatsmychaincert.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/rosamondgiffordzoo.org.xml b/src/chrome/content/rules/rosamondgiffordzoo.org.xml
new file mode 100644
index 000000000000..7af577edd225
--- /dev/null
+++ b/src/chrome/content/rules/rosamondgiffordzoo.org.xml
@@ -0,0 +1,22 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/roskomzakon.ru.xml b/src/chrome/content/rules/roskomzakon.ru.xml
index 00a05e63e731..bb3034a6c34c 100644
--- a/src/chrome/content/rules/roskomzakon.ru.xml
+++ b/src/chrome/content/rules/roskomzakon.ru.xml
@@ -4,7 +4,7 @@ www.roskomzakon.ru self signed
 
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/rosminzdrav.ru.xml b/src/chrome/content/rules/rosminzdrav.ru.xml
index 526f07524bf5..eae48a994da3 100644
--- a/src/chrome/content/rules/rosminzdrav.ru.xml
+++ b/src/chrome/content/rules/rosminzdrav.ru.xml
@@ -95,7 +95,7 @@ hc.rosminzdrav.ru different content
 ⁵ expired
 ⁷ protocol error
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/rostov.press.xml b/src/chrome/content/rules/rostov.press.xml
deleted file mode 100644
index 61c85b19d139..000000000000
--- a/src/chrome/content/rules/rostov.press.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-	
-	
-	
-
diff --git a/src/chrome/content/rules/routingpacketsisnotacrime.uk.xml b/src/chrome/content/rules/routingpacketsisnotacrime.uk.xml
deleted file mode 100644
index d2185f31f3bb..000000000000
--- a/src/chrome/content/rules/routingpacketsisnotacrime.uk.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-	
-	
-
-  	
-
-	
-
diff --git a/src/chrome/content/rules/royaldns.net.xml b/src/chrome/content/rules/royaldns.net.xml
index 923275b5b8d1..f93b1d68b4d9 100644
--- a/src/chrome/content/rules/royaldns.net.xml
+++ b/src/chrome/content/rules/royaldns.net.xml
@@ -2,9 +2,9 @@
 
 	
 	
- 
+
 	
- 
+
 	
 
diff --git a/src/chrome/content/rules/royalvoluntaryservice.org.uk.xml b/src/chrome/content/rules/royalvoluntaryservice.org.uk.xml
index 7493d222e4d6..1c1987ad2683 100644
--- a/src/chrome/content/rules/royalvoluntaryservice.org.uk.xml
+++ b/src/chrome/content/rules/royalvoluntaryservice.org.uk.xml
@@ -1,11 +1,21 @@
+
+
+
 
 
 	
 	
-	
-		
-	
-	
+	
+	
+	
 
 	
diff --git a/src/chrome/content/rules/roysac.com.xml b/src/chrome/content/rules/roysac.com.xml
deleted file mode 100644
index cf53ab8ef9e6..000000000000
--- a/src/chrome/content/rules/roysac.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/rsbsrt.ru.xml b/src/chrome/content/rules/rsbsrt.ru.xml
new file mode 100644
index 000000000000..13b48c98b835
--- /dev/null
+++ b/src/chrome/content/rules/rsbsrt.ru.xml
@@ -0,0 +1,7 @@
+
+	 
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/rsdn.org.xml b/src/chrome/content/rules/rsdn.org.xml
index 1e4d38076bf7..ea7c0152ae20 100644
--- a/src/chrome/content/rules/rsdn.org.xml
+++ b/src/chrome/content/rules/rsdn.org.xml
@@ -1,21 +1,15 @@
-
 
-
-	
+
+	
+	
 	
-	
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/rsl.ru.xml b/src/chrome/content/rules/rsl.ru.xml
index eebdfcc2b163..5b3e85087c05 100644
--- a/src/chrome/content/rules/rsl.ru.xml
+++ b/src/chrome/content/rules/rsl.ru.xml
@@ -91,7 +91,7 @@ nebreader.rsl.ru mixed content
 ⁴ self signed
 ⁵ expired
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/rssowl.org.xml b/src/chrome/content/rules/rssowl.org.xml
new file mode 100644
index 000000000000..af0bbb4be314
--- /dev/null
+++ b/src/chrome/content/rules/rssowl.org.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+
+  
+	
+
diff --git a/src/chrome/content/rules/rtm.quebec.xml b/src/chrome/content/rules/rtm.quebec.xml
new file mode 100644
index 000000000000..2195221b128e
--- /dev/null
+++ b/src/chrome/content/rules/rtm.quebec.xml
@@ -0,0 +1,27 @@
+
+
+
+	
+	
+	
+        
+        
+        
+        
+	
+
+        
+
diff --git a/src/chrome/content/rules/ru-board.com.xml b/src/chrome/content/rules/ru-board.com.xml
new file mode 100644
index 000000000000..e7d7ca26960e
--- /dev/null
+++ b/src/chrome/content/rules/ru-board.com.xml
@@ -0,0 +1,42 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ruanyifeng.com.xml b/src/chrome/content/rules/ruanyifeng.com.xml
new file mode 100644
index 000000000000..60e1d9f3b226
--- /dev/null
+++ b/src/chrome/content/rules/ruanyifeng.com.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/rudimental.co.uk.xml b/src/chrome/content/rules/rudimental.co.uk.xml
new file mode 100644
index 000000000000..85fd70632085
--- /dev/null
+++ b/src/chrome/content/rules/rudimental.co.uk.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ruffle.rs.xml b/src/chrome/content/rules/ruffle.rs.xml
new file mode 100644
index 000000000000..0457b49f4d25
--- /dev/null
+++ b/src/chrome/content/rules/ruffle.rs.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/rufus.ie.xml b/src/chrome/content/rules/rufus.ie.xml
new file mode 100644
index 000000000000..3ffbaacaabcd
--- /dev/null
+++ b/src/chrome/content/rules/rufus.ie.xml
@@ -0,0 +1,5 @@
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ruguoapp.com.xml b/src/chrome/content/rules/ruguoapp.com.xml
deleted file mode 100644
index 85d7f111954d..000000000000
--- a/src/chrome/content/rules/ruguoapp.com.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/runpee.com.xml b/src/chrome/content/rules/runpee.com.xml
new file mode 100644
index 000000000000..f27e17e3c789
--- /dev/null
+++ b/src/chrome/content/rules/runpee.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/russiain.space.xml b/src/chrome/content/rules/russiain.space.xml
deleted file mode 100644
index c707db0e6aab..000000000000
--- a/src/chrome/content/rules/russiain.space.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-        
-
-        
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/rustedlogic.net.xml b/src/chrome/content/rules/rustedlogic.net.xml
new file mode 100644
index 000000000000..9f9e456234d2
--- /dev/null
+++ b/src/chrome/content/rules/rustedlogic.net.xml
@@ -0,0 +1,168 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/rutland.gov.uk.xml b/src/chrome/content/rules/rutland.gov.uk.xml
index 398fbfbff045..48e2e1e4da1e 100644
--- a/src/chrome/content/rules/rutland.gov.uk.xml
+++ b/src/chrome/content/rules/rutland.gov.uk.xml
@@ -26,7 +26,7 @@
 		- webpayments.rutland.gov.uk
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/rw-online.co.uk.xml b/src/chrome/content/rules/rw-online.co.uk.xml
index 626ed536cea8..616d0e0d0b57 100644
--- a/src/chrome/content/rules/rw-online.co.uk.xml
+++ b/src/chrome/content/rules/rw-online.co.uk.xml
@@ -10,7 +10,7 @@ Fetch error: http://rw-online.co.uk/ => https://rw-online.co.uk/: (60, 'SSL cert
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/rwe.de.xml b/src/chrome/content/rules/rwe.de.xml
index d372463e7c71..289a8ac31e0f 100644
--- a/src/chrome/content/rules/rwe.de.xml
+++ b/src/chrome/content/rules/rwe.de.xml
@@ -8,7 +8,7 @@ Fetch error: http://webmarket.rwe.de/ => https://webmarket.rwe.de/: (6, 'Could n
 	^rwe.de: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/s3arch.eu.xml b/src/chrome/content/rules/s3arch.eu.xml
deleted file mode 100644
index 43c7eea9fa61..000000000000
--- a/src/chrome/content/rules/s3arch.eu.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/s8bbs.com.xml b/src/chrome/content/rules/s8bbs.com.xml
deleted file mode 100644
index c365ab221ccc..000000000000
--- a/src/chrome/content/rules/s8bbs.com.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-	
-		
-	
-		
-	
-		
-	
-		
-
-	
-
diff --git a/src/chrome/content/rules/saba.com.xml b/src/chrome/content/rules/saba.com.xml
index dec0575096b2..ed58885e062d 100644
--- a/src/chrome/content/rules/saba.com.xml
+++ b/src/chrome/content/rules/saba.com.xml
@@ -25,7 +25,7 @@ Fetch error: http://help.saba.com/ => https://help.saba.com/: (7, 'Failed to con
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/safeornot.net.xml b/src/chrome/content/rules/safeornot.net.xml
index dc9d4c42cf72..edbae0cf99d1 100644
--- a/src/chrome/content/rules/safeornot.net.xml
+++ b/src/chrome/content/rules/safeornot.net.xml
@@ -11,11 +11,11 @@ Fetch error: http://safeornot.net/ => https://safeornot.net/: (60, 'SSL certific
 		- www 		(cert mismatch, CN: geo.cryptolayer.net)
 
 -->
-
+
 	
 
   	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/sahih-bukhari.com.xml b/src/chrome/content/rules/sahih-bukhari.com.xml
deleted file mode 100644
index 0019cc7a9bf3..000000000000
--- a/src/chrome/content/rules/sahih-bukhari.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/samaratoday.ru.xml b/src/chrome/content/rules/samaratoday.ru.xml
index 30d73725a479..46917becb367 100644
--- a/src/chrome/content/rules/samaratoday.ru.xml
+++ b/src/chrome/content/rules/samaratoday.ru.xml
@@ -12,7 +12,7 @@ news.samaratoday.ru mixed content
 
 ⁴ self signed
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/samlab.ws.xml b/src/chrome/content/rules/samlab.ws.xml
new file mode 100644
index 000000000000..a10ba660862d
--- /dev/null
+++ b/src/chrome/content/rules/samlab.ws.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/samy.pl.xml b/src/chrome/content/rules/samy.pl.xml
index 0eb9b5d5b668..8dbd063bf12f 100644
--- a/src/chrome/content/rules/samy.pl.xml
+++ b/src/chrome/content/rules/samy.pl.xml
@@ -15,7 +15,7 @@ ww.samy.pl ¹
 
 ¹ mismatch
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/sanghicement.com.xml b/src/chrome/content/rules/sanghicement.com.xml
new file mode 100644
index 000000000000..46b34f01797f
--- /dev/null
+++ b/src/chrome/content/rules/sanghicement.com.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/santafelinux.com.xml b/src/chrome/content/rules/santafelinux.com.xml
deleted file mode 100644
index e7da270651e4..000000000000
--- a/src/chrome/content/rules/santafelinux.com.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-	
-	
-	
-
diff --git a/src/chrome/content/rules/saskatooncarshare.xml b/src/chrome/content/rules/saskatooncarshare.xml
new file mode 100644
index 000000000000..6a1a527ebaac
--- /dev/null
+++ b/src/chrome/content/rules/saskatooncarshare.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/saskcoop.xml b/src/chrome/content/rules/saskcoop.xml
new file mode 100644
index 000000000000..2d5e5f4ca0bc
--- /dev/null
+++ b/src/chrome/content/rules/saskcoop.xml
@@ -0,0 +1,5 @@
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/satoshilabs.com-falsemixed.xml b/src/chrome/content/rules/satoshilabs.com-falsemixed.xml
deleted file mode 100644
index 35bf22403e6f..000000000000
--- a/src/chrome/content/rules/satoshilabs.com-falsemixed.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/satoshilabs.com.xml b/src/chrome/content/rules/satoshilabs.com.xml
deleted file mode 100644
index 549b942fc1ed..000000000000
--- a/src/chrome/content/rules/satoshilabs.com.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/saturn.de.xml b/src/chrome/content/rules/saturn.de.xml
index 5255f2582f6e..3cd2a600f65b 100644
--- a/src/chrome/content/rules/saturn.de.xml
+++ b/src/chrome/content/rules/saturn.de.xml
@@ -54,7 +54,7 @@ prospekt.saturn.de different content
 ⁶ redirect
 ⁷ protocol error
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/schema.org.xml b/src/chrome/content/rules/schema.org.xml
index 23f0feeff3fd..212f5511dbb4 100644
--- a/src/chrome/content/rules/schema.org.xml
+++ b/src/chrome/content/rules/schema.org.xml
@@ -1,16 +1,25 @@
-
 
-
-	
-	
-	
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
 
-	
 
diff --git a/src/chrome/content/rules/schlicht-moebel.de.xml b/src/chrome/content/rules/schlicht-moebel.de.xml
deleted file mode 100644
index 9b5befb93d30..000000000000
--- a/src/chrome/content/rules/schlicht-moebel.de.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-        
-
-        
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/sciencedirect.com.xml b/src/chrome/content/rules/sciencedirect.com.xml
index 0875ecf82d73..3f24d070b8c0 100644
--- a/src/chrome/content/rules/sciencedirect.com.xml
+++ b/src/chrome/content/rules/sciencedirect.com.xml
@@ -14,7 +14,7 @@
 		technology.sciencedirect.com
 
 	Refused connection:
-		help.sciencedirect.com 
+		help.sciencedirect.com
 			(website sometimes links to //help.sciencedirect.com even though it is not working)
 		info.sciencedirect.com
 		www.info.sciencedirect.com
@@ -40,7 +40,7 @@
 	
 	
 	
-	
+
 	
 		
 	
diff --git a/src/chrome/content/rules/scmagazine.com.xml b/src/chrome/content/rules/scmagazine.com.xml
index ed2d41a37466..da18871b72a7 100644
--- a/src/chrome/content/rules/scmagazine.com.xml
+++ b/src/chrome/content/rules/scmagazine.com.xml
@@ -59,9 +59,6 @@
 	
 
-	
-
 		
 
 	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/scoreassured.com.xml b/src/chrome/content/rules/scoreassured.com.xml
index ad7431e8864b..d8527f6b9238 100644
--- a/src/chrome/content/rules/scoreassured.com.xml
+++ b/src/chrome/content/rules/scoreassured.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.scoreassured.com/ => https://www.scoreassured.com/: (60,
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/scotland.police.uk-mixedcontent.xml b/src/chrome/content/rules/scotland.police.uk-mixedcontent.xml
index 20360fb34e6b..f45de0215389 100644
--- a/src/chrome/content/rules/scotland.police.uk-mixedcontent.xml
+++ b/src/chrome/content/rules/scotland.police.uk-mixedcontent.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.scotland.police.uk/your-community/fife/ => https://www.s
 	NB: See https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/scotland.police.uk.xml b/src/chrome/content/rules/scotland.police.uk.xml
index 45c25d3c6ad5..66f06e58b743 100644
--- a/src/chrome/content/rules/scotland.police.uk.xml
+++ b/src/chrome/content/rules/scotland.police.uk.xml
@@ -18,7 +18,7 @@ Fetch error: http://www.askthe.scotland.police.uk/ => https://www.askthe.scotlan
 	Mixed content:
 
 		- css, on:
-		
+
 			- www from serverapi.arcgisonline.com ˢ
 			- www from live.policestatic.co.uk ʰ
 
@@ -28,7 +28,7 @@ Fetch error: http://www.askthe.scotland.police.uk/ => https://www.askthe.scotlan
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/scrutinizer-ci.com.xml b/src/chrome/content/rules/scrutinizer-ci.com.xml
index 7874ca6eae8d..caf61ae4538d 100644
--- a/src/chrome/content/rules/scrutinizer-ci.com.xml
+++ b/src/chrome/content/rules/scrutinizer-ci.com.xml
@@ -48,7 +48,7 @@ wss.scrutinizer-ci.com different content
 ³ timed out
 ⁵ expired
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/sdk.cn.xml b/src/chrome/content/rules/sdk.cn.xml
deleted file mode 100644
index 3d18529b4f4c..000000000000
--- a/src/chrome/content/rules/sdk.cn.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/sdkboy.com.xml b/src/chrome/content/rules/sdkboy.com.xml
new file mode 100644
index 000000000000..3cf4fa39046a
--- /dev/null
+++ b/src/chrome/content/rules/sdkboy.com.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/searchteria.co.jp.xml b/src/chrome/content/rules/searchteria.co.jp.xml
index 547ee2fc1c0c..cd7824a8b941 100644
--- a/src/chrome/content/rules/searchteria.co.jp.xml
+++ b/src/chrome/content/rules/searchteria.co.jp.xml
@@ -17,4 +17,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/searx.com.au.xml b/src/chrome/content/rules/searx.com.au.xml
deleted file mode 100644
index 567c7b676ceb..000000000000
--- a/src/chrome/content/rules/searx.com.au.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/searx.dk.xml b/src/chrome/content/rules/searx.dk.xml
deleted file mode 100644
index 39786859f03d..000000000000
--- a/src/chrome/content/rules/searx.dk.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/searx.pw.xml b/src/chrome/content/rules/searx.pw.xml
index 08ebb701a3b8..fdb877e85c08 100644
--- a/src/chrome/content/rules/searx.pw.xml
+++ b/src/chrome/content/rules/searx.pw.xml
@@ -1,8 +1,8 @@
 
-	
+
 	
 
-	
-	
+
 
diff --git a/src/chrome/content/rules/secnews.ru.xml b/src/chrome/content/rules/secnews.ru.xml
new file mode 100644
index 000000000000..9330ffd06695
--- /dev/null
+++ b/src/chrome/content/rules/secnews.ru.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/secouchermoinsbete.fr.xml b/src/chrome/content/rules/secouchermoinsbete.fr.xml
new file mode 100644
index 000000000000..1d26d293b6a8
--- /dev/null
+++ b/src/chrome/content/rules/secouchermoinsbete.fr.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/selfhtml.org.xml b/src/chrome/content/rules/selfhtml.org.xml
index 3d27739abafb..b7b2e904fb6e 100644
--- a/src/chrome/content/rules/selfhtml.org.xml
+++ b/src/chrome/content/rules/selfhtml.org.xml
@@ -1,11 +1,11 @@
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/sepa.org.uk.xml b/src/chrome/content/rules/sepa.org.uk.xml
index 869ca47a28bc..ad5ee3d7afa7 100644
--- a/src/chrome/content/rules/sepa.org.uk.xml
+++ b/src/chrome/content/rules/sepa.org.uk.xml
@@ -45,7 +45,7 @@
 	Mixed content:
 
 		- css, on:
-		
+
 			- gis from serverapi.arcgisonline.com ˢ
 			- map from js.arcgisonline.com ˢ
 			- map from code.jquery.com ˢ
diff --git a/src/chrome/content/rules/serieb.tv.xml b/src/chrome/content/rules/serieb.tv.xml
deleted file mode 100644
index 5adb52437303..000000000000
--- a/src/chrome/content/rules/serieb.tv.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/serverbase.xml b/src/chrome/content/rules/serverbase.xml
index 2a756d1ef6e6..1daa63c1e5a4 100644
--- a/src/chrome/content/rules/serverbase.xml
+++ b/src/chrome/content/rules/serverbase.xml
@@ -10,7 +10,7 @@ Fetch error: http://support.serverbase.ch/ => https://support.serverbase.ch/: (2
 			- vm*
 		*serverbase-status.net
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/servote.de.xml b/src/chrome/content/rules/servote.de.xml
new file mode 100644
index 000000000000..7a1e73864c2c
--- /dev/null
+++ b/src/chrome/content/rules/servote.de.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+	
+	
+		
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/seven-sky.net.xml b/src/chrome/content/rules/seven-sky.net.xml
index cd373fa27996..9820116c7457 100644
--- a/src/chrome/content/rules/seven-sky.net.xml
+++ b/src/chrome/content/rules/seven-sky.net.xml
@@ -10,7 +10,7 @@ community.seven-sky.net mismatch
 podpiska.seven-sky.net mismatch
 reg.seven-sky.net mismatch
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/sex8.cc.xml b/src/chrome/content/rules/sex8.cc.xml
new file mode 100644
index 000000000000..931895938ed9
--- /dev/null
+++ b/src/chrome/content/rules/sex8.cc.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/sharetobuy.com.xml b/src/chrome/content/rules/sharetobuy.com.xml
index 02e8d0d8122a..096b44bd1f80 100644
--- a/src/chrome/content/rules/sharetobuy.com.xml
+++ b/src/chrome/content/rules/sharetobuy.com.xml
@@ -2,7 +2,7 @@
     
     
 
-    
+    
 
     
diff --git a/src/chrome/content/rules/shields.io.xml b/src/chrome/content/rules/shields.io.xml
index 9ba825a80a6f..22bf19551c90 100644
--- a/src/chrome/content/rules/shields.io.xml
+++ b/src/chrome/content/rules/shields.io.xml
@@ -5,7 +5,7 @@ www.shields.io mismatch
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/shinystat.com.xml b/src/chrome/content/rules/shinystat.com.xml
index 894748739367..86ce284cd4fb 100644
--- a/src/chrome/content/rules/shinystat.com.xml
+++ b/src/chrome/content/rules/shinystat.com.xml
@@ -4,7 +4,7 @@
 		- css on (www.)? fonts.googleapis.com ˢ
 
 		- Bugs, on:
-		
+
 			- (www.)? from s[24].shinystat.com ˢ
 			- (www.)? from www.shinystat.com ˢ
 
diff --git a/src/chrome/content/rules/shitcoin.com.xml b/src/chrome/content/rules/shitcoin.com.xml
index 34be2251f452..62535fa1bd9d 100644
--- a/src/chrome/content/rules/shitcoin.com.xml
+++ b/src/chrome/content/rules/shitcoin.com.xml
@@ -4,7 +4,7 @@
 
 	
 
-	
 
 
diff --git a/src/chrome/content/rules/shootingillustrated.com.xml b/src/chrome/content/rules/shootingillustrated.com.xml
index 258e2a56abb9..560da36df5cc 100644
--- a/src/chrome/content/rules/shootingillustrated.com.xml
+++ b/src/chrome/content/rules/shootingillustrated.com.xml
@@ -13,7 +13,7 @@ Fetch error: http://wmp.shootingillustrated.com/ => https://wmp.shootingillustra
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/shoporca.com.xml b/src/chrome/content/rules/shoporca.com.xml
index fed702e2d28e..df3f1bf10ed1 100644
--- a/src/chrome/content/rules/shoporca.com.xml
+++ b/src/chrome/content/rules/shoporca.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.shoporca.com/ => https://www.shoporca.com/: (28, 'Connec
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/shopsite.com-falsemixed.xml b/src/chrome/content/rules/shopsite.com-falsemixed.xml
index f2d01a3ae619..378ad7c42a1f 100644
--- a/src/chrome/content/rules/shopsite.com-falsemixed.xml
+++ b/src/chrome/content/rules/shopsite.com-falsemixed.xml
@@ -14,7 +14,7 @@
 
 	
 
-	
+
 	
 
diff --git a/src/chrome/content/rules/shreksadventure.com.xml b/src/chrome/content/rules/shreksadventure.com.xml
index 9182bae3d8ff..5fcb1a532a4f 100644
--- a/src/chrome/content/rules/shreksadventure.com.xml
+++ b/src/chrome/content/rules/shreksadventure.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://secure.shreksadventure.com/ => https://secure.shreksadventur
 
 	For other Merlin Entertainments coverage, see Merlin-Entertainments.xml.
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/shrew.net.xml b/src/chrome/content/rules/shrew.net.xml
index 85a870e5f193..cad6a4c9796e 100644
--- a/src/chrome/content/rules/shrew.net.xml
+++ b/src/chrome/content/rules/shrew.net.xml
@@ -5,7 +5,7 @@
 
   	
 
-	
 
 
diff --git a/src/chrome/content/rules/shropshire.gov.uk.xml b/src/chrome/content/rules/shropshire.gov.uk.xml
index 2641f3bca867..f92a13f93cc3 100644
--- a/src/chrome/content/rules/shropshire.gov.uk.xml
+++ b/src/chrome/content/rules/shropshire.gov.uk.xml
@@ -23,6 +23,6 @@
 	
 
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/siamogeek.com.xml b/src/chrome/content/rules/siamogeek.com.xml
index af11bab27a0d..7de6c9cec428 100644
--- a/src/chrome/content/rules/siamogeek.com.xml
+++ b/src/chrome/content/rules/siamogeek.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.siamogeek.com/ => https://www.siamogeek.com/: (51, "SSL:
 	STS header includes includeSubdomains
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/siberianet.ru.xml b/src/chrome/content/rules/siberianet.ru.xml
deleted file mode 100644
index f74de31558d8..000000000000
--- a/src/chrome/content/rules/siberianet.ru.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/sibinfo.su.xml b/src/chrome/content/rules/sibinfo.su.xml
index d0df4e90f15b..b1a7e7a04c85 100644
--- a/src/chrome/content/rules/sibinfo.su.xml
+++ b/src/chrome/content/rules/sibinfo.su.xml
@@ -5,7 +5,7 @@ Non-2xx HTTP code: http://sibinfo.su/ (200) => https://sibinfo.su/ (521)
 Non-2xx HTTP code: http://www.sibinfo.su/ (200) => https://www.sibinfo.su/ (521)
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/sibttk.ru.xml b/src/chrome/content/rules/sibttk.ru.xml
index 7f33dcdfe8f0..feb26aa1817a 100644
--- a/src/chrome/content/rules/sibttk.ru.xml
+++ b/src/chrome/content/rules/sibttk.ru.xml
@@ -6,11 +6,11 @@ Fetch error: http://bill.sibttk.ru/ => https://bill.sibttk.ru/: (51, "SSL: no al
 sibttk.ru mismatch
 www.sibttk.ru mismatch
 -->
-
+
 	
-	
+
 	
-	
+
 	
 
 	
diff --git a/src/chrome/content/rules/sicurezzarete.com.xml b/src/chrome/content/rules/sicurezzarete.com.xml
index f6f8a9903e83..b5adfaba0d09 100644
--- a/src/chrome/content/rules/sicurezzarete.com.xml
+++ b/src/chrome/content/rules/sicurezzarete.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://voltalinux.sicurezzarete.com/ => https://voltalinux.sicurezzarete.com/: (51, "SSL: no alternative certificate subject name matches target host name 'voltalinux.sicurezzarete.com'")
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/sierraclubbc.xml b/src/chrome/content/rules/sierraclubbc.xml
new file mode 100644
index 000000000000..6de7c2e61c1e
--- /dev/null
+++ b/src/chrome/content/rules/sierraclubbc.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/silego.com.xml b/src/chrome/content/rules/silego.com.xml
new file mode 100644
index 000000000000..ef3735ae339c
--- /dev/null
+++ b/src/chrome/content/rules/silego.com.xml
@@ -0,0 +1,31 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/simpel.nl.xml b/src/chrome/content/rules/simpel.nl.xml
index 4a5a53873d4b..8d7358e1a2fc 100644
--- a/src/chrome/content/rules/simpel.nl.xml
+++ b/src/chrome/content/rules/simpel.nl.xml
@@ -5,15 +5,13 @@ Fetch error: http://mijnsimpel.nl/ => https://mijnsimpel.nl/: (7, 'Failed to con
 Fetch error: http://www.mijnsimpel.nl/ => https://www.mijnsimpel.nl/: (7, 'Failed to connect to www.mijnsimpel.nl port 443: Connection refused')
 
 -->
-
+
 
 	
 	
 	
 	
-
-	
-	
+	
 
 	
 
diff --git a/src/chrome/content/rules/simplemachines.xml b/src/chrome/content/rules/simplemachines.xml
index c0b49bbcbf29..dd58d5ef0bc9 100644
--- a/src/chrome/content/rules/simplemachines.xml
+++ b/src/chrome/content/rules/simplemachines.xml
@@ -1,17 +1,17 @@
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-		
-		  
-	
-	
-
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+		  
+	
+	
+
diff --git a/src/chrome/content/rules/simplewebrtc.com.xml b/src/chrome/content/rules/simplewebrtc.com.xml
index 2cbdca877e2a..f3f00bd46579 100644
--- a/src/chrome/content/rules/simplewebrtc.com.xml
+++ b/src/chrome/content/rules/simplewebrtc.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://www.simplewebrtc.com/ => https://www.simplewebrtc.com/: (7,
 Fetch error: http://signaling.simplewebrtc.com/ => https://signaling.simplewebrtc.com/: (6, 'Could not resolve host: signaling.simplewebrtc.com')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/simplyaccessible.com.xml b/src/chrome/content/rules/simplyaccessible.com.xml
deleted file mode 100644
index 8aa6eb0557ba..000000000000
--- a/src/chrome/content/rules/simplyaccessible.com.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/simtechdev.ru.xml b/src/chrome/content/rules/simtechdev.ru.xml
index 75aa75e17906..75fcac3a375b 100644
--- a/src/chrome/content/rules/simtechdev.ru.xml
+++ b/src/chrome/content/rules/simtechdev.ru.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.simtechdev.ru/ => https://www.simtechdev.ru/: (51, "SSL:
 
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/singyin.edu.hk.xml b/src/chrome/content/rules/singyin.edu.hk.xml
new file mode 100644
index 000000000000..3931fdded03c
--- /dev/null
+++ b/src/chrome/content/rules/singyin.edu.hk.xml
@@ -0,0 +1,37 @@
+
+
+	 
+	 
+	 
+	 
+
+	
+	
+	
+	
+	
+
+
+
+	
+
diff --git a/src/chrome/content/rules/sirsidynix.com-resources.xml b/src/chrome/content/rules/sirsidynix.com-resources.xml
index e2986ab8654d..e567b3b9ab2b 100644
--- a/src/chrome/content/rules/sirsidynix.com-resources.xml
+++ b/src/chrome/content/rules/sirsidynix.com-resources.xml
@@ -10,7 +10,7 @@ Non-2xx HTTP code: http://go.sirsidynix.com/rs/325-MEI-708/images/socialmedia-01
 	and no mixed content secured.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/sirsidynix.com.xml b/src/chrome/content/rules/sirsidynix.com.xml
index 30dfa800949e..735e711262d1 100644
--- a/src/chrome/content/rules/sirsidynix.com.xml
+++ b/src/chrome/content/rules/sirsidynix.com.xml
@@ -25,7 +25,7 @@ Non-2xx HTTP code: http://go.sirsidynix.com/rs/sirsidynix1/images/STEMtoolkit.pd
 		- www.support.sirsidynix.com
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/sis001.xml b/src/chrome/content/rules/sis001.xml
new file mode 100644
index 000000000000..d2aa14f4ece2
--- /dev/null
+++ b/src/chrome/content/rules/sis001.xml
@@ -0,0 +1,14 @@
+
+	
+	
+
+	
+	
+	
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/sitejam.com.xml b/src/chrome/content/rules/sitejam.com.xml
index 24dfd71116ab..ac4509fa738a 100644
--- a/src/chrome/content/rules/sitejam.com.xml
+++ b/src/chrome/content/rules/sitejam.com.xml
@@ -9,7 +9,7 @@
 	ᵐ Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/sitelabs.co.uk.xml b/src/chrome/content/rules/sitelabs.co.uk.xml
index 1a3f527888fa..45db467aa186 100644
--- a/src/chrome/content/rules/sitelabs.co.uk.xml
+++ b/src/chrome/content/rules/sitelabs.co.uk.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.sitelabs.co.uk/ => https://www.sitelabs.co.uk/: (51, "SSL: no alternative certificate subject name matches target host name 'www.sitelabs.co.uk'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/skbbank.ru.xml b/src/chrome/content/rules/skbbank.ru.xml
new file mode 100644
index 000000000000..dad384f4da21
--- /dev/null
+++ b/src/chrome/content/rules/skbbank.ru.xml
@@ -0,0 +1,7 @@
+
+        
+        
+
+        
+
diff --git a/src/chrome/content/rules/skifalls.com.au.xml b/src/chrome/content/rules/skifalls.com.au.xml
deleted file mode 100644
index 210f66b2deab..000000000000
--- a/src/chrome/content/rules/skifalls.com.au.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/skift.com.xml b/src/chrome/content/rules/skift.com.xml
index 1bd1166556a2..aff69a33cfb5 100644
--- a/src/chrome/content/rules/skift.com.xml
+++ b/src/chrome/content/rules/skift.com.xml
@@ -24,7 +24,7 @@ Fetch error: http://www.skift.com/ => https://www.skift.com/: Too many redirects
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/skillsdevelopmentscotland.co.uk.xml b/src/chrome/content/rules/skillsdevelopmentscotland.co.uk.xml
index e5d9fd0da5b5..ef3693572b9e 100644
--- a/src/chrome/content/rules/skillsdevelopmentscotland.co.uk.xml
+++ b/src/chrome/content/rules/skillsdevelopmentscotland.co.uk.xml
@@ -4,7 +4,7 @@
 		- apprenticeships.scot.xml
 		- myworldofwork.co.uk.xml
 		- ourskillsforce.co.uk.xml
-	
+
 
 	^skillsdevelopmentscotland.co.uk: Handshake fails
 
diff --git a/src/chrome/content/rules/sknt.ru.xml b/src/chrome/content/rules/sknt.ru.xml
index 330943807f52..99815139d010 100644
--- a/src/chrome/content/rules/sknt.ru.xml
+++ b/src/chrome/content/rules/sknt.ru.xml
@@ -77,7 +77,7 @@ amoris.sknt.ru:8000/: (35, 'Unknown SSL protocol error in connection to amoris.s
 ⁴ self signed
 ⁵ expired
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/skrinshoter.ru.xml b/src/chrome/content/rules/skrinshoter.ru.xml
new file mode 100644
index 000000000000..cfd20f10324f
--- /dev/null
+++ b/src/chrome/content/rules/skrinshoter.ru.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/skytal.es.xml b/src/chrome/content/rules/skytal.es.xml
index 157ff19b51b5..94340f549634 100644
--- a/src/chrome/content/rules/skytal.es.xml
+++ b/src/chrome/content/rules/skytal.es.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://www.skytal.es/ => https://www.skytal.es/: (51, "SSL: no alternative certificate subject name matches target host name 'www.skytal.es'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/sledcom.ru.xml b/src/chrome/content/rules/sledcom.ru.xml
index 0b3e627c9c92..e761c6add506 100644
--- a/src/chrome/content/rules/sledcom.ru.xml
+++ b/src/chrome/content/rules/sledcom.ru.xml
@@ -57,7 +57,7 @@
         www.yaroslavl.sledcom.ru
         www.zabaykalye.sledcom.ru
         www.zapsib-sut.sledcom.ru
---> 
+-->
 
         
         
diff --git a/src/chrome/content/rules/smart-DSL.xml b/src/chrome/content/rules/smart-DSL.xml
index d457639d70ab..2be42cd08770 100644
--- a/src/chrome/content/rules/smart-DSL.xml
+++ b/src/chrome/content/rules/smart-DSL.xml
@@ -1,16 +1,11 @@
 
 
 
-
+
 
-
+
 
 
 
 
-
-
-
-
-
 
diff --git a/src/chrome/content/rules/smartdnsproxy.com.xml b/src/chrome/content/rules/smartdnsproxy.com.xml
new file mode 100644
index 000000000000..9eb4c2140c11
--- /dev/null
+++ b/src/chrome/content/rules/smartdnsproxy.com.xml
@@ -0,0 +1,27 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/smartpiratebay.com.xml b/src/chrome/content/rules/smartpiratebay.com.xml
deleted file mode 100644
index 824ad70f5dd5..000000000000
--- a/src/chrome/content/rules/smartpiratebay.com.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/smava.xml b/src/chrome/content/rules/smava.xml
index 1f0b41ca6a1b..30f0cf0e006c 100644
--- a/src/chrome/content/rules/smava.xml
+++ b/src/chrome/content/rules/smava.xml
@@ -2,4 +2,4 @@
   
 
   
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/smeserver.org.xml b/src/chrome/content/rules/smeserver.org.xml
index b198dec71a94..ae62f5c6a08e 100644
--- a/src/chrome/content/rules/smeserver.org.xml
+++ b/src/chrome/content/rules/smeserver.org.xml
@@ -2,9 +2,9 @@
 
 	
 	
-	
+
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/smokefree.gov.xml b/src/chrome/content/rules/smokefree.gov.xml
deleted file mode 100644
index e316b8a4e0f1..000000000000
--- a/src/chrome/content/rules/smokefree.gov.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/smokefree.hk.xml b/src/chrome/content/rules/smokefree.hk.xml
new file mode 100644
index 000000000000..57fe42c4e50a
--- /dev/null
+++ b/src/chrome/content/rules/smokefree.hk.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/smspower.org.xml b/src/chrome/content/rules/smspower.org.xml
new file mode 100644
index 000000000000..cb96f358fa54
--- /dev/null
+++ b/src/chrome/content/rules/smspower.org.xml
@@ -0,0 +1,22 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/snap-ci.com.xml b/src/chrome/content/rules/snap-ci.com.xml
index f5ef18b04d38..6fe92c38a552 100644
--- a/src/chrome/content/rules/snap-ci.com.xml
+++ b/src/chrome/content/rules/snap-ci.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://production-website.snap-ci.com/ => https://production-website.snap-ci.com/: (6, 'Could not resolve host: production-website.snap-ci.com')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/snapraid.it.xml b/src/chrome/content/rules/snapraid.it.xml
new file mode 100644
index 000000000000..47bd72a936fe
--- /dev/null
+++ b/src/chrome/content/rules/snapraid.it.xml
@@ -0,0 +1,9 @@
+
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/sneakerfreaker.com-falsemixed.xml b/src/chrome/content/rules/sneakerfreaker.com-falsemixed.xml
index e0f7a57e0d60..45be05a21e42 100644
--- a/src/chrome/content/rules/sneakerfreaker.com-falsemixed.xml
+++ b/src/chrome/content/rules/sneakerfreaker.com-falsemixed.xml
@@ -9,7 +9,7 @@ Fetch error: http://archive.sneakerfreaker.com/ => https://archive.sneakerfreake
 	NB: See https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/sneakerfreaker.com.xml b/src/chrome/content/rules/sneakerfreaker.com.xml
index 107f88ed200f..165e966a6b76 100644
--- a/src/chrome/content/rules/sneakerfreaker.com.xml
+++ b/src/chrome/content/rules/sneakerfreaker.com.xml
@@ -13,17 +13,17 @@
 	Mixed content:
 
 		- css, on:
-		
+
 			- archive, forum from $self ˢ
 			- www from fonts.googleapis.com ˢ
 
 		- Images, on:
-		
+
 			- archive from from $self ˢ
 			- shop from cdn.shopify.com ˢ
 
 		- Ads, on:
-		
+
 			- archive from au.effectivemeasure.net ˢ
 			- archive from www.facebook.com ˢ
 			- archive from pixel.quantserve.com ˢ
diff --git a/src/chrome/content/rules/snipboard.io.xml b/src/chrome/content/rules/snipboard.io.xml
new file mode 100644
index 000000000000..68a00db40ea9
--- /dev/null
+++ b/src/chrome/content/rules/snipboard.io.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/snmtc.edu.gh.xml b/src/chrome/content/rules/snmtc.edu.gh.xml
deleted file mode 100644
index 45eecb6dfec4..000000000000
--- a/src/chrome/content/rules/snmtc.edu.gh.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/sns.gov.uk.xml b/src/chrome/content/rules/sns.gov.uk.xml
index db0347f31c30..4784ffcee817 100644
--- a/src/chrome/content/rules/sns.gov.uk.xml
+++ b/src/chrome/content/rules/sns.gov.uk.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.sns.gov.uk/ => https://admin.sns.gov.uk/: (6, 'Could not
 	www.sns.gov.uk: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/snyk.io.xml b/src/chrome/content/rules/snyk.io.xml
index fd4759a90609..efe2ef3f6a81 100644
--- a/src/chrome/content/rules/snyk.io.xml
+++ b/src/chrome/content/rules/snyk.io.xml
@@ -2,7 +2,7 @@
 	
 	
 	
-	
+
 	
 
 	
diff --git a/src/chrome/content/rules/sobytiya.info.xml b/src/chrome/content/rules/sobytiya.info.xml
index 7a31e5ccb22b..236fc221f62b 100644
--- a/src/chrome/content/rules/sobytiya.info.xml
+++ b/src/chrome/content/rules/sobytiya.info.xml
@@ -5,7 +5,7 @@ Non-2xx HTTP code: http://sobytiya.info/ (200) => https://sobytiya.info/ (521)
 Non-2xx HTTP code: http://www.sobytiya.info/ (200) => https://www.sobytiya.info/ (521)
  afisha. wrong content
 en. wrong content -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/softforge.de.xml b/src/chrome/content/rules/softforge.de.xml
new file mode 100644
index 000000000000..e6f7fc2591ce
--- /dev/null
+++ b/src/chrome/content/rules/softforge.de.xml
@@ -0,0 +1,5 @@
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/softwareok.com.xml b/src/chrome/content/rules/softwareok.com.xml
new file mode 100644
index 000000000000..bfb96739e5b8
--- /dev/null
+++ b/src/chrome/content/rules/softwareok.com.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/sol.no.xml b/src/chrome/content/rules/sol.no.xml
index cfbbc79b0e9d..419dbb2c0675 100644
--- a/src/chrome/content/rules/sol.no.xml
+++ b/src/chrome/content/rules/sol.no.xml
@@ -27,7 +27,7 @@ Fetch error: http://www.sol.no/ => https://www.sol.no/: Too many redirects while
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/solanolabs.com.xml b/src/chrome/content/rules/solanolabs.com.xml
deleted file mode 100644
index f89811f72675..000000000000
--- a/src/chrome/content/rules/solanolabs.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/solydxk.com.xml b/src/chrome/content/rules/solydxk.com.xml
index 9d3692adbac8..5b1f7399202c 100644
--- a/src/chrome/content/rules/solydxk.com.xml
+++ b/src/chrome/content/rules/solydxk.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://dev.solydxk.com/ => https://dev.solydxk.com/: (6, 'Could not
 downloads.solydxk.com refused
 repository.solydxk.com refused
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/songkick.com.xml b/src/chrome/content/rules/songkick.com.xml
index bae528539df8..a7da03a9967b 100644
--- a/src/chrome/content/rules/songkick.com.xml
+++ b/src/chrome/content/rules/songkick.com.xml
@@ -19,6 +19,6 @@
 	
 
 	
-		
+	
 
 
diff --git a/src/chrome/content/rules/soobi.org.xml b/src/chrome/content/rules/soobi.org.xml
deleted file mode 100644
index 75cd1b016109..000000000000
--- a/src/chrome/content/rules/soobi.org.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/sotawiki.net.xml b/src/chrome/content/rules/sotawiki.net.xml
new file mode 100644
index 000000000000..0adecf306b4f
--- /dev/null
+++ b/src/chrome/content/rules/sotawiki.net.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/soundbounce.org.xml b/src/chrome/content/rules/soundbounce.org.xml
new file mode 100644
index 000000000000..abe7fbe3872e
--- /dev/null
+++ b/src/chrome/content/rules/soundbounce.org.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/south-wales.police.uk.xml b/src/chrome/content/rules/south-wales.police.uk.xml
index 4caf48f66f16..6f963409a0dd 100644
--- a/src/chrome/content/rules/south-wales.police.uk.xml
+++ b/src/chrome/content/rules/south-wales.police.uk.xml
@@ -44,7 +44,7 @@ Fetch error: http://sports.south-wales.police.uk/ => https://sports.south-wales.
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/southdowns.gov.uk.xml b/src/chrome/content/rules/southdowns.gov.uk.xml
index fbb33efa8ef3..4ebda4a18ef0 100644
--- a/src/chrome/content/rules/southdowns.gov.uk.xml
+++ b/src/chrome/content/rules/southdowns.gov.uk.xml
@@ -37,7 +37,7 @@
 	Mixed content:
 
 		- css, on:
-		
+
 			- learning from fast.fonts.net ˢ
 			- learning, learningmap, maps from fonts.googleapis.com ˢ
 			- learningmap from learning.southdowns.gov.uk * ˢ
diff --git a/src/chrome/content/rules/southend-on-the-move.org.uk.xml b/src/chrome/content/rules/southend-on-the-move.org.uk.xml
index 739765ce1c25..fb8031a08d6d 100644
--- a/src/chrome/content/rules/southend-on-the-move.org.uk.xml
+++ b/src/chrome/content/rules/southend-on-the-move.org.uk.xml
@@ -13,7 +13,7 @@ Fetch error: http://southend-on-the-move.org.uk/ => https://southend-on-the-move
 		- train.southend-on-the-move.org.uk
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/sovcombank.ru.xml b/src/chrome/content/rules/sovcombank.ru.xml
index e48ba86db29c..8f66650e509c 100644
--- a/src/chrome/content/rules/sovcombank.ru.xml
+++ b/src/chrome/content/rules/sovcombank.ru.xml
@@ -7,7 +7,7 @@ lk.sovcombank.ru different content
 
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/soverin.net.xml b/src/chrome/content/rules/soverin.net.xml
new file mode 100644
index 000000000000..d11d189b5ee1
--- /dev/null
+++ b/src/chrome/content/rules/soverin.net.xml
@@ -0,0 +1,13 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/spacechase0.com.xml b/src/chrome/content/rules/spacechase0.com.xml
new file mode 100644
index 000000000000..7d1721d004d6
--- /dev/null
+++ b/src/chrome/content/rules/spacechase0.com.xml
@@ -0,0 +1,8 @@
+
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/spacecraft.co.uk.xml b/src/chrome/content/rules/spacecraft.co.uk.xml
index 66729ce05724..a04c495651f1 100644
--- a/src/chrome/content/rules/spacecraft.co.uk.xml
+++ b/src/chrome/content/rules/spacecraft.co.uk.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://spacecraft.co.uk/ => https://spacecraft.co.uk/: (51, "SSL: no alternative certificate subject name matches target host name 'spacecraft.co.uk'")
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/spacenews.com.xml b/src/chrome/content/rules/spacenews.com.xml
index d5721f0ae0c4..7e06522643fd 100644
--- a/src/chrome/content/rules/spacenews.com.xml
+++ b/src/chrome/content/rules/spacenews.com.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.spacenews.com/ => https://www.spacenews.com/: Too many r
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/spacepools.org.xml b/src/chrome/content/rules/spacepools.org.xml
new file mode 100644
index 000000000000..27eb59979f8a
--- /dev/null
+++ b/src/chrome/content/rules/spacepools.org.xml
@@ -0,0 +1,28 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/spamcop.xml b/src/chrome/content/rules/spamcop.xml
index ae4a143809a7..739b6798c0d2 100644
--- a/src/chrome/content/rules/spamcop.xml
+++ b/src/chrome/content/rules/spamcop.xml
@@ -1,6 +1,6 @@
 
     
     
-    
+
     
 
diff --git a/src/chrome/content/rules/sparanoid.xml b/src/chrome/content/rules/sparanoid.xml
deleted file mode 100644
index 8f0ccf9a2146..000000000000
--- a/src/chrome/content/rules/sparanoid.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-	
-	
-	
-	
-
-
diff --git a/src/chrome/content/rules/sparebank1.no.xml b/src/chrome/content/rules/sparebank1.no.xml
index 420678cad114..04b6307d537e 100644
--- a/src/chrome/content/rules/sparebank1.no.xml
+++ b/src/chrome/content/rules/sparebank1.no.xml
@@ -40,7 +40,7 @@ Fetch error: http://statistikk.sparebank1.no/ => https://statistikk.sparebank1.n
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/spbelect.info.xml b/src/chrome/content/rules/spbelect.info.xml
new file mode 100644
index 000000000000..c133334d4612
--- /dev/null
+++ b/src/chrome/content/rules/spbelect.info.xml
@@ -0,0 +1,6 @@
+
+    
+    
+    
+    
+
diff --git a/src/chrome/content/rules/spbelect.org.xml b/src/chrome/content/rules/spbelect.org.xml
new file mode 100644
index 000000000000..d9a93d6db1ee
--- /dev/null
+++ b/src/chrome/content/rules/spbelect.org.xml
@@ -0,0 +1,6 @@
+
+    
+    
+    
+    
+
diff --git a/src/chrome/content/rules/spdb.com.cn.xml b/src/chrome/content/rules/spdb.com.cn.xml
index baca4bf372f9..5576c324918f 100644
--- a/src/chrome/content/rules/spdb.com.cn.xml
+++ b/src/chrome/content/rules/spdb.com.cn.xml
@@ -6,6 +6,6 @@
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/spectator.co.uk.xml b/src/chrome/content/rules/spectator.co.uk.xml
index 9c9e07ddf924..d571625656bb 100644
--- a/src/chrome/content/rules/spectator.co.uk.xml
+++ b/src/chrome/content/rules/spectator.co.uk.xml
@@ -1,4 +1,10 @@
 
-	
+	
 	
 	
-	
-
-	
-	
-	
-
-
-	
-	
-
-		
-		
-
-	
-	
-
-		
-		
+	
 
 	
-
 
diff --git a/src/chrome/content/rules/speech.leseweb.dk.xml b/src/chrome/content/rules/speech.leseweb.dk.xml
index c7fb7a5d48d7..88e91a9c3664 100644
--- a/src/chrome/content/rules/speech.leseweb.dk.xml
+++ b/src/chrome/content/rules/speech.leseweb.dk.xml
@@ -2,4 +2,4 @@
   
 
   
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/speedwellsoftware.com.xml b/src/chrome/content/rules/speedwellsoftware.com.xml
index 9b5ba4870e91..f52ef70765e5 100644
--- a/src/chrome/content/rules/speedwellsoftware.com.xml
+++ b/src/chrome/content/rules/speedwellsoftware.com.xml
@@ -1,7 +1,12 @@
+
 
 
 
-	
+	
 	
-	
+	
 
 		
diff --git a/src/chrome/content/rules/speedyline.ru.xml b/src/chrome/content/rules/speedyline.ru.xml
index 6b88e0c43f7e..87d8d1305ca1 100644
--- a/src/chrome/content/rules/speedyline.ru.xml
+++ b/src/chrome/content/rules/speedyline.ru.xml
@@ -8,7 +8,7 @@ www.speedyline.ru mismatch
 vidnoe.speedyline.ru mismatch
 artelamp.speedyline.ru mismatch
 -->
-
+
 	
 
 	
diff --git a/src/chrome/content/rules/spelthorne.gov.uk.xml b/src/chrome/content/rules/spelthorne.gov.uk.xml
index ac52496dd4ef..8d760d5436b2 100644
--- a/src/chrome/content/rules/spelthorne.gov.uk.xml
+++ b/src/chrome/content/rules/spelthorne.gov.uk.xml
@@ -32,7 +32,7 @@ Fetch error: http://larissa.spelthorne.gov.uk/ => https://larissa.spelthorne.gov
 		- www.spelthorne.gov.uk
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/spendvision.com.xml b/src/chrome/content/rules/spendvision.com.xml
deleted file mode 100644
index 49110d392aa9..000000000000
--- a/src/chrome/content/rules/spendvision.com.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/spi-inc.org.xml b/src/chrome/content/rules/spi-inc.org.xml
new file mode 100644
index 000000000000..68381bca0a92
--- /dev/null
+++ b/src/chrome/content/rules/spi-inc.org.xml
@@ -0,0 +1,17 @@
+
+
+	
+	 
+	 
+	 
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/spkrb.de.xml b/src/chrome/content/rules/spkrb.de.xml
index 04e4002d869e..864dbc7caf8b 100644
--- a/src/chrome/content/rules/spkrb.de.xml
+++ b/src/chrome/content/rules/spkrb.de.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.spkrb.de/ => https://info.spkrb.de/: (6, 'Could not reso
 Fetch error: http://info.spkrb.de/ => https://info.spkrb.de/: (6, 'Could not resolve host: info.spkrb.de')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/splitsider.com.xml b/src/chrome/content/rules/splitsider.com.xml
new file mode 100644
index 000000000000..2fd8f03d0127
--- /dev/null
+++ b/src/chrome/content/rules/splitsider.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/sport-express.ru.xml b/src/chrome/content/rules/sport-express.ru.xml
index d4e327890b03..ac258afe46ac 100644
--- a/src/chrome/content/rules/sport-express.ru.xml
+++ b/src/chrome/content/rules/sport-express.ru.xml
@@ -54,7 +54,7 @@ winter.sport-express.ru mixed content
 ⁴ self signed
 ⁶ redirect
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/sport.de.xml b/src/chrome/content/rules/sport.de.xml
new file mode 100644
index 000000000000..882b8ba1c678
--- /dev/null
+++ b/src/chrome/content/rules/sport.de.xml
@@ -0,0 +1,53 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/sportbox.ru.xml b/src/chrome/content/rules/sportbox.ru.xml
index ab03dc2f2b19..2c1f6177e8d8 100644
--- a/src/chrome/content/rules/sportbox.ru.xml
+++ b/src/chrome/content/rules/sportbox.ru.xml
@@ -28,7 +28,7 @@ forum.sportbox.ru mixed content
 ² refused
 ³ timed out
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/sporx.com.xml b/src/chrome/content/rules/sporx.com.xml
index 2159a210d11a..2d5fc0dd2e4c 100644
--- a/src/chrome/content/rules/sporx.com.xml
+++ b/src/chrome/content/rules/sporx.com.xml
@@ -51,7 +51,7 @@ Fetch error: http://www.sporx.com/ => https://www.sporx.com/: (60, 'SSL certific
 	Mixed content:
 
 		- iframes, on:
-		
+
 			- euro2016 from www.sporx.com ˢ
 			- nba from tr.global.nba.com
 			- www from nba.sporx.com
@@ -76,7 +76,7 @@ Fetch error: http://www.sporx.com/ => https://www.sporx.com/: (60, 'SSL certific
 		- favicon on m from $self ˢ
 
 		- Ads / bugs, on:
-		
+
 			- euro2016 from widgets-script.broadagesports.com ˢ
 			- euro2016, nba, turkcell, www from b.scorecardresearch.com ˢ
 			- turkcell, www from gdetr.hit.gemius.pl ˢ
@@ -85,7 +85,7 @@ Fetch error: http://www.sporx.com/ => https://www.sporx.com/: (60, 'SSL certific
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/spotlight-media.xml b/src/chrome/content/rules/spotlight-media.xml
deleted file mode 100644
index 4d86e632b391..000000000000
--- a/src/chrome/content/rules/spotlight-media.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/spreadshirt.at.xml b/src/chrome/content/rules/spreadshirt.at.xml
new file mode 100644
index 000000000000..e47eee937139
--- /dev/null
+++ b/src/chrome/content/rules/spreadshirt.at.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/spreadshirt.be.xml b/src/chrome/content/rules/spreadshirt.be.xml
new file mode 100644
index 000000000000..8319fa6c94f7
--- /dev/null
+++ b/src/chrome/content/rules/spreadshirt.be.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/spreadshirt.ch.xml b/src/chrome/content/rules/spreadshirt.ch.xml
new file mode 100644
index 000000000000..7573533f55af
--- /dev/null
+++ b/src/chrome/content/rules/spreadshirt.ch.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/spreadshirt.co.uk.xml b/src/chrome/content/rules/spreadshirt.co.uk.xml
new file mode 100644
index 000000000000..6698096b37d4
--- /dev/null
+++ b/src/chrome/content/rules/spreadshirt.co.uk.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/spreadshirt.com.au.xml b/src/chrome/content/rules/spreadshirt.com.au.xml
new file mode 100644
index 000000000000..d7e1b004d29f
--- /dev/null
+++ b/src/chrome/content/rules/spreadshirt.com.au.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/spreadshirt.com.xml b/src/chrome/content/rules/spreadshirt.com.xml
new file mode 100644
index 000000000000..90e168c27950
--- /dev/null
+++ b/src/chrome/content/rules/spreadshirt.com.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/spreadshirt.de.xml b/src/chrome/content/rules/spreadshirt.de.xml
new file mode 100644
index 000000000000..072083f30333
--- /dev/null
+++ b/src/chrome/content/rules/spreadshirt.de.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/spreadshirt.dk.xml b/src/chrome/content/rules/spreadshirt.dk.xml
new file mode 100644
index 000000000000..6e7e235c33e3
--- /dev/null
+++ b/src/chrome/content/rules/spreadshirt.dk.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/spreadshirt.es.xml b/src/chrome/content/rules/spreadshirt.es.xml
new file mode 100644
index 000000000000..482a78412cfd
--- /dev/null
+++ b/src/chrome/content/rules/spreadshirt.es.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/spreadshirt.fi.xml b/src/chrome/content/rules/spreadshirt.fi.xml
new file mode 100644
index 000000000000..a04e1011535e
--- /dev/null
+++ b/src/chrome/content/rules/spreadshirt.fi.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/spreadshirt.fr.xml b/src/chrome/content/rules/spreadshirt.fr.xml
new file mode 100644
index 000000000000..0fde6aac45a4
--- /dev/null
+++ b/src/chrome/content/rules/spreadshirt.fr.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/spreadshirt.ie.xml b/src/chrome/content/rules/spreadshirt.ie.xml
new file mode 100644
index 000000000000..1b5da91930f1
--- /dev/null
+++ b/src/chrome/content/rules/spreadshirt.ie.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/spreadshirt.it.xml b/src/chrome/content/rules/spreadshirt.it.xml
new file mode 100644
index 000000000000..717ea345a027
--- /dev/null
+++ b/src/chrome/content/rules/spreadshirt.it.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/spreadshirt.net.xml b/src/chrome/content/rules/spreadshirt.net.xml
new file mode 100644
index 000000000000..00c0a372c9de
--- /dev/null
+++ b/src/chrome/content/rules/spreadshirt.net.xml
@@ -0,0 +1,13 @@
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/spreadshirt.nl.xml b/src/chrome/content/rules/spreadshirt.nl.xml
new file mode 100644
index 000000000000..e182f30b6e28
--- /dev/null
+++ b/src/chrome/content/rules/spreadshirt.nl.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/spreadshirt.no.xml b/src/chrome/content/rules/spreadshirt.no.xml
new file mode 100644
index 000000000000..312f6a61fed1
--- /dev/null
+++ b/src/chrome/content/rules/spreadshirt.no.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/spreadshirt.pl.xml b/src/chrome/content/rules/spreadshirt.pl.xml
new file mode 100644
index 000000000000..8adf495240cb
--- /dev/null
+++ b/src/chrome/content/rules/spreadshirt.pl.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/spreadshirt.se.xml b/src/chrome/content/rules/spreadshirt.se.xml
new file mode 100644
index 000000000000..2d5b6f392e82
--- /dev/null
+++ b/src/chrome/content/rules/spreadshirt.se.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/sprinklecontent.com.xml b/src/chrome/content/rules/sprinklecontent.com.xml
new file mode 100644
index 000000000000..bf6e12e68e0d
--- /dev/null
+++ b/src/chrome/content/rules/sprinklecontent.com.xml
@@ -0,0 +1,12 @@
+
+		
+		
+		
+
+		
+
+		
+
+		
+
diff --git a/src/chrome/content/rules/spydus.co.uk.xml b/src/chrome/content/rules/spydus.co.uk.xml
index 9a6f3560a221..9cdbd5029a0a 100644
--- a/src/chrome/content/rules/spydus.co.uk.xml
+++ b/src/chrome/content/rules/spydus.co.uk.xml
@@ -13,7 +13,7 @@
 	Mixed content:
 
 		- Images, on:
-		
+
 			- argyll-bute from www.argyll-bute.gov.uk
 			- rochdale from www.rochdale.gov.uk
 
diff --git a/src/chrome/content/rules/sql-join.com.xml b/src/chrome/content/rules/sql-join.com.xml
new file mode 100644
index 000000000000..cb016543e8a1
--- /dev/null
+++ b/src/chrome/content/rules/sql-join.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/squarefaction.ru.xml b/src/chrome/content/rules/squarefaction.ru.xml
new file mode 100644
index 000000000000..54b5eb8eca9a
--- /dev/null
+++ b/src/chrome/content/rules/squarefaction.ru.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/squat.gr.xml b/src/chrome/content/rules/squat.gr.xml
deleted file mode 100644
index 9aa8595df2c5..000000000000
--- a/src/chrome/content/rules/squat.gr.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-
-
-
-	
-	
-
-		
-
-			
-			
-			
-
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/sr.ht.xml b/src/chrome/content/rules/sr.ht.xml
new file mode 100644
index 000000000000..3cb3bc925e55
--- /dev/null
+++ b/src/chrome/content/rules/sr.ht.xml
@@ -0,0 +1,47 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/srad.jp.xml b/src/chrome/content/rules/srad.jp.xml
index 0740685ed56d..8f2987ee3d94 100644
--- a/src/chrome/content/rules/srad.jp.xml
+++ b/src/chrome/content/rules/srad.jp.xml
@@ -25,7 +25,7 @@
 	
 	
 	
-	
+
 	
 	
 	
diff --git a/src/chrome/content/rules/ss-iptv.com.xml b/src/chrome/content/rules/ss-iptv.com.xml
new file mode 100644
index 000000000000..f7f2b7e5bb1f
--- /dev/null
+++ b/src/chrome/content/rules/ss-iptv.com.xml
@@ -0,0 +1,12 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/st.uz.xml b/src/chrome/content/rules/st.uz.xml
index f4651b02f48a..7558c0337e09 100644
--- a/src/chrome/content/rules/st.uz.xml
+++ b/src/chrome/content/rules/st.uz.xml
@@ -22,7 +22,7 @@ ns2.st.uz ³
 ⁴ self signed
 ⁷ protocol error
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/st65.ru.xml b/src/chrome/content/rules/st65.ru.xml
index 61f009489a87..a746ea3a50cf 100644
--- a/src/chrome/content/rules/st65.ru.xml
+++ b/src/chrome/content/rules/st65.ru.xml
@@ -6,7 +6,7 @@ Fetch error: http://mail.st65.ru/ => https://mail.st65.ru/: (60, 'SSL certificat
 st65.ru expired
 www.st65.ru expired
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/stackedit.io.xml b/src/chrome/content/rules/stackedit.io.xml
deleted file mode 100644
index 1c6de4cdeb80..000000000000
--- a/src/chrome/content/rules/stackedit.io.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/stackpath.com.xml b/src/chrome/content/rules/stackpath.com.xml
deleted file mode 100644
index 4966aea9b0c0..000000000000
--- a/src/chrome/content/rules/stackpath.com.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-		
-		
-
-			
-			
-			
-
-		
-
-		
-		
-
-
-	
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/staffordbc.gov.uk.xml b/src/chrome/content/rules/staffordbc.gov.uk.xml
index e83257c10c46..c00ebeb15379 100644
--- a/src/chrome/content/rules/staffordbc.gov.uk.xml
+++ b/src/chrome/content/rules/staffordbc.gov.uk.xml
@@ -15,7 +15,7 @@
 
 
 	These altnames do not exist:
-		
+
 		- www.www12.staffordbc.gov.uk
 
 -->
diff --git a/src/chrome/content/rules/stat.fi.xml b/src/chrome/content/rules/stat.fi.xml
new file mode 100644
index 000000000000..ea9226613aa3
--- /dev/null
+++ b/src/chrome/content/rules/stat.fi.xml
@@ -0,0 +1,32 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/static-chomikuj.pl.xml b/src/chrome/content/rules/static-chomikuj.pl.xml
new file mode 100644
index 000000000000..67af69e7f2a1
--- /dev/null
+++ b/src/chrome/content/rules/static-chomikuj.pl.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/static-fra.de.xml b/src/chrome/content/rules/static-fra.de.xml
new file mode 100644
index 000000000000..0d7feba38eba
--- /dev/null
+++ b/src/chrome/content/rules/static-fra.de.xml
@@ -0,0 +1,25 @@
+
+
+
+	
+	
+	
+		
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/status.io.xml b/src/chrome/content/rules/status.io.xml
index 5ddd7f63de1c..24bdeb9c6be8 100644
--- a/src/chrome/content/rules/status.io.xml
+++ b/src/chrome/content/rules/status.io.xml
@@ -1,26 +1,29 @@
+
 
-
-
 	
 	
+	
 	
 	
-	
-	
-	
-	
 	
-	
 	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 	
+
 
diff --git a/src/chrome/content/rules/stavklass.ru.xml b/src/chrome/content/rules/stavklass.ru.xml
index 493f79076aca..3edd776dcefd 100644
--- a/src/chrome/content/rules/stavklass.ru.xml
+++ b/src/chrome/content/rules/stavklass.ru.xml
@@ -1,7 +1,7 @@
 
 	
 	
-	
+
 	
 
 	
diff --git a/src/chrome/content/rules/stealthy.co.xml b/src/chrome/content/rules/stealthy.co.xml
index a47a70410daa..99c5b74f7ca0 100644
--- a/src/chrome/content/rules/stealthy.co.xml
+++ b/src/chrome/content/rules/stealthy.co.xml
@@ -8,11 +8,11 @@ stealthy.co ²
 
 ² refused
 -->
-
+
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/steamstat.ru.xml b/src/chrome/content/rules/steamstat.ru.xml
index 34ff94fff85c..027b162f0930 100644
--- a/src/chrome/content/rules/steamstat.ru.xml
+++ b/src/chrome/content/rules/steamstat.ru.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.steamstat.ru/ => https://www.steamstat.ru/: (51, "SSL: n
 
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/steamstat.us.xml b/src/chrome/content/rules/steamstat.us.xml
deleted file mode 100644
index 1646e08514b4..000000000000
--- a/src/chrome/content/rules/steamstat.us.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/stelladotcdn.com.xml b/src/chrome/content/rules/stelladotcdn.com.xml
deleted file mode 100644
index 34a75da8a049..000000000000
--- a/src/chrome/content/rules/stelladotcdn.com.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/stellarium.org.xml b/src/chrome/content/rules/stellarium.org.xml
new file mode 100644
index 000000000000..561e4e5cda71
--- /dev/null
+++ b/src/chrome/content/rules/stellarium.org.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/stinpriza.org.xml b/src/chrome/content/rules/stinpriza.org.xml
index 8b28eaac9980..dd8dda005243 100644
--- a/src/chrome/content/rules/stinpriza.org.xml
+++ b/src/chrome/content/rules/stinpriza.org.xml
@@ -1,6 +1,6 @@
-
 
diff --git a/src/chrome/content/rules/stockport.gov.uk.xml b/src/chrome/content/rules/stockport.gov.uk.xml
index 3c05f9ee3002..04948d1a664f 100644
--- a/src/chrome/content/rules/stockport.gov.uk.xml
+++ b/src/chrome/content/rules/stockport.gov.uk.xml
@@ -66,9 +66,9 @@
 	
 	
 
-	
 
-	
 
diff --git a/src/chrome/content/rules/stoke.gov.uk.xml b/src/chrome/content/rules/stoke.gov.uk.xml
index 5f80038db5b7..f49589f391ee 100644
--- a/src/chrome/content/rules/stoke.gov.uk.xml
+++ b/src/chrome/content/rules/stoke.gov.uk.xml
@@ -28,7 +28,7 @@ Fetch error: http://planning.stoke.gov.uk/ => https://planning.stoke.gov.uk/: (6
 		- myaccount.stoke.gov.uk
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/store.twentyonepilots.com.xml b/src/chrome/content/rules/store.twentyonepilots.com.xml
new file mode 100644
index 000000000000..2ff06d82dabc
--- /dev/null
+++ b/src/chrome/content/rules/store.twentyonepilots.com.xml
@@ -0,0 +1,11 @@
+
+
+
+	
+	
+
diff --git a/src/chrome/content/rules/storehouse.co.xml b/src/chrome/content/rules/storehouse.co.xml
index c8b9c6d170f6..3743f6504f4f 100644
--- a/src/chrome/content/rules/storehouse.co.xml
+++ b/src/chrome/content/rules/storehouse.co.xml
@@ -11,7 +11,7 @@ Fetch error: http://www.storehouse.co/ => https://www.storehouse.co/: (6, 'Could
 	³ 403
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/storm-chasers.de.xml b/src/chrome/content/rules/storm-chasers.de.xml
deleted file mode 100644
index 47d1e455e855..000000000000
--- a/src/chrome/content/rules/storm-chasers.de.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/strana.ua.xml b/src/chrome/content/rules/strana.ua.xml
index b3b0f9210226..135ea918d422 100644
--- a/src/chrome/content/rules/strana.ua.xml
+++ b/src/chrome/content/rules/strana.ua.xml
@@ -1,5 +1,5 @@
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/streamuk.com.xml b/src/chrome/content/rules/streamuk.com.xml
index a947b1e1de1c..60a87e0e9d68 100644
--- a/src/chrome/content/rules/streamuk.com.xml
+++ b/src/chrome/content/rules/streamuk.com.xml
@@ -15,7 +15,7 @@
 
 		- (www.)? ᵉ ᵘ
 
-	ᵉ Expired 
+	ᵉ Expired
 	ᵘ Untrusted root
 
 
diff --git a/src/chrome/content/rules/stroeerdigitalgroup.de.xml b/src/chrome/content/rules/stroeerdigitalgroup.de.xml
new file mode 100644
index 000000000000..4bc30dfa9e1d
--- /dev/null
+++ b/src/chrome/content/rules/stroeerdigitalgroup.de.xml
@@ -0,0 +1,35 @@
+
+
+
+	
+	
+	
+		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/strongSwan.xml b/src/chrome/content/rules/strongSwan.xml
index e5e0a9fb0ac7..8f3580da2994 100644
--- a/src/chrome/content/rules/strongSwan.xml
+++ b/src/chrome/content/rules/strongSwan.xml
@@ -7,7 +7,7 @@
         - ^wiki
         - ^www
         -->
-    
+    
 
 
     
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/studyjamscn.com.xml b/src/chrome/content/rules/studyjamscn.com.xml
deleted file mode 100644
index cdb092f7ca9b..000000000000
--- a/src/chrome/content/rules/studyjamscn.com.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/sumatrapdfreader.org.xml b/src/chrome/content/rules/sumatrapdfreader.org.xml
index 4530265483a7..104563dbda5f 100644
--- a/src/chrome/content/rules/sumatrapdfreader.org.xml
+++ b/src/chrome/content/rules/sumatrapdfreader.org.xml
@@ -1,5 +1,5 @@
 
-	
+
 	
 	
 
diff --git a/src/chrome/content/rules/sumo.com.xml b/src/chrome/content/rules/sumo.com.xml
index 6c4e1afdf58e..2cd868fc88a3 100644
--- a/src/chrome/content/rules/sumo.com.xml
+++ b/src/chrome/content/rules/sumo.com.xml
@@ -4,7 +4,7 @@
 		gtm.sumo.com
 		page.sumo.com
 
-		email1k.sumome.com	
+		email1k.sumome.com
 -->
 
 	
diff --git a/src/chrome/content/rules/sumtel.ru.xml b/src/chrome/content/rules/sumtel.ru.xml
index f323c57a5739..d2017636390b 100644
--- a/src/chrome/content/rules/sumtel.ru.xml
+++ b/src/chrome/content/rules/sumtel.ru.xml
@@ -80,7 +80,7 @@ wiki.sumtel.ru ⁴
 ⁴ self signed
 ⁷ protocol error
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/sundance.tv.xml b/src/chrome/content/rules/sundance.tv.xml
index 90738bb34a5e..817d354f47f2 100644
--- a/src/chrome/content/rules/sundance.tv.xml
+++ b/src/chrome/content/rules/sundance.tv.xml
@@ -18,7 +18,7 @@
 		- css on www from $self ˢ
 
 		- Images, on:
-		
+
 			- www from $self
 			- www from images.amcnetworks.com ˢ
 
diff --git a/src/chrome/content/rules/sunmotors.co.uk.xml b/src/chrome/content/rules/sunmotors.co.uk.xml
index 4d113f0365d2..8a4d7042de75 100644
--- a/src/chrome/content/rules/sunmotors.co.uk.xml
+++ b/src/chrome/content/rules/sunmotors.co.uk.xml
@@ -29,7 +29,7 @@ Fetch error: http://www.sunmotors.co.uk/motors-cdn/images/icon_search.png => htt
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/sunxdcc.com.xml b/src/chrome/content/rules/sunxdcc.com.xml
new file mode 100644
index 000000000000..9eabda72c8da
--- /dev/null
+++ b/src/chrome/content/rules/sunxdcc.com.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/suomi.fi.xml b/src/chrome/content/rules/suomi.fi.xml
index 148ef5385d01..e440b340c768 100644
--- a/src/chrome/content/rules/suomi.fi.xml
+++ b/src/chrome/content/rules/suomi.fi.xml
@@ -3,13 +3,14 @@
 	
 
 	
-	
+	
+	
+	
 
 
 	
 
 
-	
 
+	
 
diff --git a/src/chrome/content/rules/surina.net.xml b/src/chrome/content/rules/surina.net.xml
new file mode 100644
index 000000000000..92a52a98424b
--- /dev/null
+++ b/src/chrome/content/rules/surina.net.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/surreycc.gov.xml b/src/chrome/content/rules/surreycc.gov.xml
index f47bebb7175f..7c6b8cb1a0dd 100644
--- a/src/chrome/content/rules/surreycc.gov.xml
+++ b/src/chrome/content/rules/surreycc.gov.xml
@@ -48,7 +48,7 @@ Fetch error: http://www2.surreycc.gov.uk/ => https://www2.surreycc.gov.uk/: (6,
 		- www2.surreycc.gov.uk
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/surveyserver.net.xml b/src/chrome/content/rules/surveyserver.net.xml
deleted file mode 100644
index 5be9baef92f2..000000000000
--- a/src/chrome/content/rules/surveyserver.net.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/suumo.com.xml b/src/chrome/content/rules/suumo.com.xml
index 41ffecc03d6a..b6394cb12536 100644
--- a/src/chrome/content/rules/suumo.com.xml
+++ b/src/chrome/content/rules/suumo.com.xml
@@ -17,4 +17,4 @@
 	
 
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/swissnode.ch.xml b/src/chrome/content/rules/swissnode.ch.xml
new file mode 100644
index 000000000000..fdebda1e7c66
--- /dev/null
+++ b/src/chrome/content/rules/swissnode.ch.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/sydney.edu.au.xml b/src/chrome/content/rules/sydney.edu.au.xml
index 0814929d7b9f..7d050d097d56 100644
--- a/src/chrome/content/rules/sydney.edu.au.xml
+++ b/src/chrome/content/rules/sydney.edu.au.xml
@@ -54,7 +54,7 @@ Fetch error: http://www.sydney.edu.au/ => https://www.sydney.edu.au/: Too many r
 	ˢ Secured by us
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/symphonyos.com.xml b/src/chrome/content/rules/symphonyos.com.xml
deleted file mode 100644
index c1c3311bf4bf..000000000000
--- a/src/chrome/content/rules/symphonyos.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-	
-	
-	
-
diff --git a/src/chrome/content/rules/syncaccess.net.xml b/src/chrome/content/rules/syncaccess.net.xml
deleted file mode 100644
index 0246caec37c9..000000000000
--- a/src/chrome/content/rules/syncaccess.net.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/synonymer.se.xml b/src/chrome/content/rules/synonymer.se.xml
new file mode 100644
index 000000000000..3f00d86134a0
--- /dev/null
+++ b/src/chrome/content/rules/synonymer.se.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/syrianmalware.com.xml b/src/chrome/content/rules/syrianmalware.com.xml
new file mode 100644
index 000000000000..2a7054d65962
--- /dev/null
+++ b/src/chrome/content/rules/syrianmalware.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/sysax.com.xml b/src/chrome/content/rules/sysax.com.xml
index ef8dde0d0d22..b5cea86661f6 100644
--- a/src/chrome/content/rules/sysax.com.xml
+++ b/src/chrome/content/rules/sysax.com.xml
@@ -13,7 +13,7 @@
 		- Images on (www.)? from www.sysax.com ˢ
 
 		- Bug, on:
-		
+
 			- (www.)? from static.getclicky.com ˢ
 			- (www.)? from www.sysax.com ˢ
 
diff --git a/src/chrome/content/rules/syscan360.org.xml b/src/chrome/content/rules/syscan360.org.xml
deleted file mode 100644
index f243f7c2a7c5..000000000000
--- a/src/chrome/content/rules/syscan360.org.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/system-rescue-cd.org.xml b/src/chrome/content/rules/system-rescue-cd.org.xml
index 02d1611487e0..52f4e52b7d25 100644
--- a/src/chrome/content/rules/system-rescue-cd.org.xml
+++ b/src/chrome/content/rules/system-rescue-cd.org.xml
@@ -9,7 +9,7 @@ Fetch error: http://www.sysresccd.org/ => https://www.sysresccd.org/: Too many r
 beta.system-rescue-cd.org self signed
 beta.sysresccd.org broken because it redirects to https://beta.system-rescue-cd.org
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/systemd.io.xml b/src/chrome/content/rules/systemd.io.xml
new file mode 100644
index 000000000000..c7389ba5040f
--- /dev/null
+++ b/src/chrome/content/rules/systemd.io.xml
@@ -0,0 +1,15 @@
+
+
+
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/t-mobilebankowe.pl.xml b/src/chrome/content/rules/t-mobilebankowe.pl.xml
index c8ccf4e4c078..a785514fdfb4 100644
--- a/src/chrome/content/rules/t-mobilebankowe.pl.xml
+++ b/src/chrome/content/rules/t-mobilebankowe.pl.xml
@@ -34,7 +34,7 @@ Non-2xx HTTP code: http://konto.t-mobilebankowe.pl/ (200) => https://www.t-mobil
 		- www.t-mobilebankowe.pl
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/t.me.xml b/src/chrome/content/rules/t.me.xml
new file mode 100644
index 000000000000..2aca98d8fc5f
--- /dev/null
+++ b/src/chrome/content/rules/t.me.xml
@@ -0,0 +1,11 @@
+
+
+
+		
+		
+
+		
+
diff --git a/src/chrome/content/rules/t3n.de.xml b/src/chrome/content/rules/t3n.de.xml
new file mode 100644
index 000000000000..b4b580822f19
--- /dev/null
+++ b/src/chrome/content/rules/t3n.de.xml
@@ -0,0 +1,22 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/tagesschau.de.xml b/src/chrome/content/rules/tagesschau.de.xml
index 19b3edb77e5c..bf23f764c3a5 100644
--- a/src/chrome/content/rules/tagesschau.de.xml
+++ b/src/chrome/content/rules/tagesschau.de.xml
@@ -1,53 +1,65 @@
 
 
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
-	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
 
 
diff --git a/src/chrome/content/rules/tagilka.ru.xml b/src/chrome/content/rules/tagilka.ru.xml
deleted file mode 100644
index f8d3f898093e..000000000000
--- a/src/chrome/content/rules/tagilka.ru.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-	
-	
-	
-
diff --git a/src/chrome/content/rules/taihe.com.xml b/src/chrome/content/rules/taihe.com.xml
new file mode 100644
index 000000000000..ace1b06c7154
--- /dev/null
+++ b/src/chrome/content/rules/taihe.com.xml
@@ -0,0 +1,40 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/tameside.gov.uk-falsemixed.xml b/src/chrome/content/rules/tameside.gov.uk-falsemixed.xml
deleted file mode 100644
index aa2c3189a01c..000000000000
--- a/src/chrome/content/rules/tameside.gov.uk-falsemixed.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/tameside.gov.uk.xml b/src/chrome/content/rules/tameside.gov.uk.xml
index 54c6c96b9023..c742bda3e273 100644
--- a/src/chrome/content/rules/tameside.gov.uk.xml
+++ b/src/chrome/content/rules/tameside.gov.uk.xml
@@ -53,7 +53,7 @@ Fetch error: http://ecitizen.tameside.gov.uk/ => https://ecitizen.tameside.gov.u
 		- css on web from www.tameside.gov.uk ʳ
 
 		- Images, on:
-		
+
 			- web from public.tameside.gov.uk ᵈ
 			- web, whatson from www.tameside.gov.uk ʳ
 
@@ -61,7 +61,7 @@ Fetch error: http://ecitizen.tameside.gov.uk/ => https://ecitizen.tameside.gov.u
 	ʳ Unsecurable <= refused
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/tamworth.gov.uk.xml b/src/chrome/content/rules/tamworth.gov.uk.xml
index 0275552322af..ff4a702403ba 100644
--- a/src/chrome/content/rules/tamworth.gov.uk.xml
+++ b/src/chrome/content/rules/tamworth.gov.uk.xml
@@ -29,7 +29,7 @@ Fetch error: http://benefits.tamworth.gov.uk/ => https://benefits.tamworth.gov.u
 		- benefits.tamworth.gov.uk
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/tanx.com.xml b/src/chrome/content/rules/tanx.com.xml
index 5fb90a760a07..bd1ae9b1281c 100644
--- a/src/chrome/content/rules/tanx.com.xml
+++ b/src/chrome/content/rules/tanx.com.xml
@@ -4,7 +4,7 @@
 		dmp
 		ex
 		monitor
-	
+
 	Redirect to http:
 		^
 		ade
@@ -31,19 +31,18 @@
 	
 		
 	
-	
+
 	
-		
 	
 	
 		
-	
+
 	
 		
 	
 		
 	
-	
+
 	
 		
 	
diff --git a/src/chrome/content/rules/taw.org.uk.xml b/src/chrome/content/rules/taw.org.uk.xml
deleted file mode 100644
index a1d12c706ce7..000000000000
--- a/src/chrome/content/rules/taw.org.uk.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/tbz.ch.xml b/src/chrome/content/rules/tbz.ch.xml
new file mode 100644
index 000000000000..0ce7e55d2a42
--- /dev/null
+++ b/src/chrome/content/rules/tbz.ch.xml
@@ -0,0 +1,17 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/teacherspensions.co.uk.xml b/src/chrome/content/rules/teacherspensions.co.uk.xml
index 1cd9f9dbaabd..6eeedbe00d7f 100644
--- a/src/chrome/content/rules/teacherspensions.co.uk.xml
+++ b/src/chrome/content/rules/teacherspensions.co.uk.xml
@@ -10,7 +10,7 @@ Fetch error: http://teacherspensions.co.uk/ => https://www.www.teacherspensions.
 	ʳ Refused
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/teamup.com.xml b/src/chrome/content/rules/teamup.com.xml
deleted file mode 100644
index bdfdefc0110d..000000000000
--- a/src/chrome/content/rules/teamup.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/technet-cz.xml b/src/chrome/content/rules/technet-cz.xml
new file mode 100644
index 000000000000..77ff185467c9
--- /dev/null
+++ b/src/chrome/content/rules/technet-cz.xml
@@ -0,0 +1,6 @@
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/technical-service.net.xml b/src/chrome/content/rules/technical-service.net.xml
new file mode 100644
index 000000000000..9611c6facd3e
--- /dev/null
+++ b/src/chrome/content/rules/technical-service.net.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/techpowerup.org.xml b/src/chrome/content/rules/techpowerup.org.xml
new file mode 100644
index 000000000000..a9b4cfe17cd9
--- /dev/null
+++ b/src/chrome/content/rules/techpowerup.org.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/tehsausage.com.xml b/src/chrome/content/rules/tehsausage.com.xml
new file mode 100644
index 000000000000..706b0fe525ef
--- /dev/null
+++ b/src/chrome/content/rules/tehsausage.com.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/tekram.com.xml b/src/chrome/content/rules/tekram.com.xml
new file mode 100644
index 000000000000..f72dfe0b953b
--- /dev/null
+++ b/src/chrome/content/rules/tekram.com.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/teleguide.info.xml b/src/chrome/content/rules/teleguide.info.xml
index 2b9ff676cc9e..bd9df621fce4 100644
--- a/src/chrome/content/rules/teleguide.info.xml
+++ b/src/chrome/content/rules/teleguide.info.xml
@@ -9,7 +9,7 @@ rt.teleguide.info ¹
 
 ¹ mismatch
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/telenet.ru.xml b/src/chrome/content/rules/telenet.ru.xml
deleted file mode 100644
index 32b69582994f..000000000000
--- a/src/chrome/content/rules/telenet.ru.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/telesign.com.xml b/src/chrome/content/rules/telesign.com.xml
index d917e0b08c26..fe36a6f66cd3 100644
--- a/src/chrome/content/rules/telesign.com.xml
+++ b/src/chrome/content/rules/telesign.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.telesign.com/ => https://www.telesign.com/: (60, 'SSL ce
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/termbin.com.xml b/src/chrome/content/rules/termbin.com.xml
new file mode 100644
index 000000000000..f392d7cd152a
--- /dev/null
+++ b/src/chrome/content/rules/termbin.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/tersee.xml b/src/chrome/content/rules/tersee.xml
deleted file mode 100644
index 351bbbb65dc0..000000000000
--- a/src/chrome/content/rules/tersee.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-	
-	
-	
-	
-
diff --git a/src/chrome/content/rules/tesglobal.com.xml b/src/chrome/content/rules/tesglobal.com.xml
index ff26182151fd..e1f9313dad60 100644
--- a/src/chrome/content/rules/tesglobal.com.xml
+++ b/src/chrome/content/rules/tesglobal.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://tesglobal.com/ => https://tesglobal.com/: (28, 'Connection timed out after 20000 milliseconds')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/test-smoke.org.xml b/src/chrome/content/rules/test-smoke.org.xml
new file mode 100644
index 000000000000..bae453b6a435
--- /dev/null
+++ b/src/chrome/content/rules/test-smoke.org.xml
@@ -0,0 +1,23 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/tested.com.xml b/src/chrome/content/rules/tested.com.xml
new file mode 100644
index 000000000000..548998dbbba6
--- /dev/null
+++ b/src/chrome/content/rules/tested.com.xml
@@ -0,0 +1,13 @@
+
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/tgstation13.org.xml b/src/chrome/content/rules/tgstation13.org.xml
index e5f56b084832..cab054fe8a76 100644
--- a/src/chrome/content/rules/tgstation13.org.xml
+++ b/src/chrome/content/rules/tgstation13.org.xml
@@ -4,8 +4,6 @@
 	
 
 	
-		
 		
 		
-		
 
diff --git a/src/chrome/content/rules/the-eye.eu.xml b/src/chrome/content/rules/the-eye.eu.xml
new file mode 100644
index 000000000000..9dde6a9b5d18
--- /dev/null
+++ b/src/chrome/content/rules/the-eye.eu.xml
@@ -0,0 +1,35 @@
+
+
+	
+	
+	
+	
+	
+ 	
+	
+	
+	
+	
+	
+	
+	
+ 	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/thebay.tv.xml b/src/chrome/content/rules/thebay.tv.xml
deleted file mode 100644
index 3c1d43323693..000000000000
--- a/src/chrome/content/rules/thebay.tv.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/thebodyshop.co.id.xml b/src/chrome/content/rules/thebodyshop.co.id.xml
index f9975ba15ff3..c2c93d657552 100644
--- a/src/chrome/content/rules/thebodyshop.co.id.xml
+++ b/src/chrome/content/rules/thebodyshop.co.id.xml
@@ -17,7 +17,7 @@ Fetch error: http://thebodyshop.co.id/ => https://thebodyshop.co.id/: (28, 'Conn
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/thecustomizewindows.net.xml b/src/chrome/content/rules/thecustomizewindows.net.xml
deleted file mode 100644
index cc61b4382a7e..000000000000
--- a/src/chrome/content/rules/thecustomizewindows.net.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-	
-	
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/thedarkmod.com.xml b/src/chrome/content/rules/thedarkmod.com.xml
new file mode 100644
index 000000000000..197a99fbbbcc
--- /dev/null
+++ b/src/chrome/content/rules/thedarkmod.com.xml
@@ -0,0 +1,23 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	  
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/thedebrief.co.uk.xml b/src/chrome/content/rules/thedebrief.co.uk.xml
index 7aaefa89de9d..5ba7a69cd8d4 100644
--- a/src/chrome/content/rules/thedebrief.co.uk.xml
+++ b/src/chrome/content/rules/thedebrief.co.uk.xml
@@ -10,7 +10,7 @@ Fetch error: http://thedebrief.co.uk/ => https://thedebrief.co.uk/: (7, 'Failed
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/thediplomat.com-resources.xml b/src/chrome/content/rules/thediplomat.com-resources.xml
deleted file mode 100644
index 95549e47d5c5..000000000000
--- a/src/chrome/content/rules/thediplomat.com-resources.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-	
-	
-
-		
-
-			
-			
-			
-			
-			
-			
-			
-			
-
-			
-			
-			
-			
-			
-			
-			
-			
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/theeca.com.xml b/src/chrome/content/rules/theeca.com.xml
new file mode 100644
index 000000000000..bd753e06b928
--- /dev/null
+++ b/src/chrome/content/rules/theeca.com.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/thegeekblog.co.uk.xml b/src/chrome/content/rules/thegeekblog.co.uk.xml
new file mode 100644
index 000000000000..518337385473
--- /dev/null
+++ b/src/chrome/content/rules/thegeekblog.co.uk.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/thehiddenbay.xyz.xml b/src/chrome/content/rules/thehiddenbay.xyz.xml
deleted file mode 100644
index df55aa95b633..000000000000
--- a/src/chrome/content/rules/thehiddenbay.xyz.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/theindigokitchen.com.xml b/src/chrome/content/rules/theindigokitchen.com.xml
new file mode 100644
index 000000000000..43847fa2cf60
--- /dev/null
+++ b/src/chrome/content/rules/theindigokitchen.com.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/theinquirer.net.xml b/src/chrome/content/rules/theinquirer.net.xml
index b9bcab0fab24..b89819bfa293 100644
--- a/src/chrome/content/rules/theinquirer.net.xml
+++ b/src/chrome/content/rules/theinquirer.net.xml
@@ -10,7 +10,7 @@ Invalid certificate:
 	research.theinquirer.net
 	tour.theinquirer.net
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/thekelleys.org.uk.xml b/src/chrome/content/rules/thekelleys.org.uk.xml
new file mode 100644
index 000000000000..bdb7967181a8
--- /dev/null
+++ b/src/chrome/content/rules/thekelleys.org.uk.xml
@@ -0,0 +1,6 @@
+
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/thepbay.ga.xml b/src/chrome/content/rules/thepbay.ga.xml
deleted file mode 100644
index d8350cb2ca23..000000000000
--- a/src/chrome/content/rules/thepbay.ga.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/thephoenixbay.com.xml b/src/chrome/content/rules/thephoenixbay.com.xml
deleted file mode 100644
index 0d31c6848e70..000000000000
--- a/src/chrome/content/rules/thephoenixbay.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/thepiratebay-legacy.xml b/src/chrome/content/rules/thepiratebay-legacy.xml
index dc8b0043570e..8c1f11130f9d 100644
--- a/src/chrome/content/rules/thepiratebay-legacy.xml
+++ b/src/chrome/content/rules/thepiratebay-legacy.xml
@@ -54,7 +54,7 @@ www.thepiratebay.is mismatch
 	
 	
 	
-	
+
 	
 	
 
diff --git a/src/chrome/content/rules/thepiratebay-proxy.com.xml b/src/chrome/content/rules/thepiratebay-proxy.com.xml
deleted file mode 100644
index 309ae6d75f1b..000000000000
--- a/src/chrome/content/rules/thepiratebay-proxy.com.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/thepiratebay24.ga.xml b/src/chrome/content/rules/thepiratebay24.ga.xml
deleted file mode 100644
index ffe00fced45d..000000000000
--- a/src/chrome/content/rules/thepiratebay24.ga.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/thepirateproxy.gq.xml b/src/chrome/content/rules/thepirateproxy.gq.xml
deleted file mode 100644
index ff7a6af9011a..000000000000
--- a/src/chrome/content/rules/thepirateproxy.gq.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/theses.fr.xml b/src/chrome/content/rules/theses.fr.xml
index 9db04dcc5267..824d33db4309 100644
--- a/src/chrome/content/rules/theses.fr.xml
+++ b/src/chrome/content/rules/theses.fr.xml
@@ -1,7 +1,7 @@
 
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/thezoo.com.au.xml b/src/chrome/content/rules/thezoo.com.au.xml
new file mode 100644
index 000000000000..a9336e5b5470
--- /dev/null
+++ b/src/chrome/content/rules/thezoo.com.au.xml
@@ -0,0 +1,21 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/thom-designstudio.com.xml b/src/chrome/content/rules/thom-designstudio.com.xml
new file mode 100644
index 000000000000..e2c424b302ba
--- /dev/null
+++ b/src/chrome/content/rules/thom-designstudio.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/thomashunter.name.xml b/src/chrome/content/rules/thomashunter.name.xml
index 9a99817d566e..31273ba3bff3 100644
--- a/src/chrome/content/rules/thomashunter.name.xml
+++ b/src/chrome/content/rules/thomashunter.name.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.thomashunter.name/ => https://www.thomashunter.name/: (5
 	STS header includes includeSubdomains
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/threatmatrix.com.xml b/src/chrome/content/rules/threatmatrix.com.xml
index 9f0ed1ae07c1..9fc227ce7a2c 100644
--- a/src/chrome/content/rules/threatmatrix.com.xml
+++ b/src/chrome/content/rules/threatmatrix.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.threatmatrix.com/ => https://www.threatmatrix.com/: (51,
 		- www.threatmatrix.com
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/thrysoee.dk.xml b/src/chrome/content/rules/thrysoee.dk.xml
new file mode 100644
index 000000000000..e28e3e375268
--- /dev/null
+++ b/src/chrome/content/rules/thrysoee.dk.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/tianya.cn-mixedcontent.xml b/src/chrome/content/rules/tianya.cn-mixedcontent.xml
new file mode 100644
index 000000000000..ff11b8926c5f
--- /dev/null
+++ b/src/chrome/content/rules/tianya.cn-mixedcontent.xml
@@ -0,0 +1,10 @@
+
+
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/tianya.cn.xml b/src/chrome/content/rules/tianya.cn.xml
new file mode 100644
index 000000000000..e535c003852b
--- /dev/null
+++ b/src/chrome/content/rules/tianya.cn.xml
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+	
+		
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/tibia.com.xml b/src/chrome/content/rules/tibia.com.xml
index b60d935adc9f..225ff004e73a 100644
--- a/src/chrome/content/rules/tibia.com.xml
+++ b/src/chrome/content/rules/tibia.com.xml
@@ -2,23 +2,25 @@
 	
 	
 	
+		to="https://www.tibia.com/forum/" />
 	
+		to="https://www.tibia.com/" />
 	
 
 	
 	
 	
+		to="https://www.test.tibia.com/forum/" />
 	
+		to="https://www.test.tibia.com/" />
 	
 
 	
 	
 
-	
+	
 
 	
+	
+	
 
diff --git a/src/chrome/content/rules/ticket4u.xml b/src/chrome/content/rules/ticket4u.xml
index a4de61600159..aad469aa708e 100644
--- a/src/chrome/content/rules/ticket4u.xml
+++ b/src/chrome/content/rules/ticket4u.xml
@@ -5,7 +5,7 @@ Fetch error: http://ticket4u.com.my/ => https://ticket4u.com.my/: (7, 'Failed to
 Fetch error: http://www.ticket4u.com.my/ => https://www.ticket4u.com.my/: (7, 'Failed to connect to www.ticket4u.com.my port 443: No route to host')
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/tilda.cc.xml b/src/chrome/content/rules/tilda.cc.xml
new file mode 100644
index 000000000000..e2165720af03
--- /dev/null
+++ b/src/chrome/content/rules/tilda.cc.xml
@@ -0,0 +1,32 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/tildeslash.com.xml b/src/chrome/content/rules/tildeslash.com.xml
new file mode 100644
index 000000000000..8f01cab617ff
--- /dev/null
+++ b/src/chrome/content/rules/tildeslash.com.xml
@@ -0,0 +1,14 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/timus.online.xml b/src/chrome/content/rules/timus.online.xml
new file mode 100644
index 000000000000..19514d920973
--- /dev/null
+++ b/src/chrome/content/rules/timus.online.xml
@@ -0,0 +1,12 @@
+
+
+    
+
+    
+
diff --git a/src/chrome/content/rules/tinkernut.com.xml b/src/chrome/content/rules/tinkernut.com.xml
index 86fb129d7eab..3464457202d5 100644
--- a/src/chrome/content/rules/tinkernut.com.xml
+++ b/src/chrome/content/rules/tinkernut.com.xml
@@ -1,4 +1,4 @@
-
 
diff --git a/src/chrome/content/rules/tinyimg.io.xml b/src/chrome/content/rules/tinyimg.io.xml
new file mode 100644
index 000000000000..9ec0fb10c9ce
--- /dev/null
+++ b/src/chrome/content/rules/tinyimg.io.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/tkgorod.ru.xml b/src/chrome/content/rules/tkgorod.ru.xml
index 243b289a988a..c95248dbe398 100644
--- a/src/chrome/content/rules/tkgorod.ru.xml
+++ b/src/chrome/content/rules/tkgorod.ru.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://tkgorod.ru/ => https://tkgorod.ru/: Too many redirects while fetching 'https://tkgorod.ru/'
 Fetch error: http://www.tkgorod.ru/ => https://tkgorod.ru/: Too many redirects while fetching 'https://tkgorod.ru/'
 www. to many redirects-->
-
+
 	
 	
 	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/tldrio.xml b/src/chrome/content/rules/tldrio.xml
index 6f2de0b50c02..f7c567cff819 100644
--- a/src/chrome/content/rules/tldrio.xml
+++ b/src/chrome/content/rules/tldrio.xml
@@ -15,7 +15,7 @@
 		- www.api.tldr.io
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/tmp.ninja.xml b/src/chrome/content/rules/tmp.ninja.xml
new file mode 100644
index 000000000000..8417a06d59c8
--- /dev/null
+++ b/src/chrome/content/rules/tmp.ninja.xml
@@ -0,0 +1,8 @@
+
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/tms-media.co.uk.xml b/src/chrome/content/rules/tms-media.co.uk.xml
index 7b69b7aab2d3..0a62325c5a4a 100644
--- a/src/chrome/content/rules/tms-media.co.uk.xml
+++ b/src/chrome/content/rules/tms-media.co.uk.xml
@@ -6,7 +6,7 @@ Fetch error: http://agilisys.tms-media.co.uk/ => https://agilisys.tms-media.co.u
 	(www.)?tms-media.co.uk: Mismatched
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/tms.pl.xml b/src/chrome/content/rules/tms.pl.xml
index 6e1c3808b853..f136c9d5933c 100644
--- a/src/chrome/content/rules/tms.pl.xml
+++ b/src/chrome/content/rules/tms.pl.xml
@@ -1,18 +1,15 @@
 
 
 
 	
 	
-	
 	
 	
 	
@@ -20,15 +17,7 @@
 	
 	
 
-
-	
-	
-	
-
-	
-	
-
+	
 
 	
diff --git a/src/chrome/content/rules/tns-cs.net.xml b/src/chrome/content/rules/tns-cs.net.xml
index 154e6badc91e..e4d5dc3a9309 100644
--- a/src/chrome/content/rules/tns-cs.net.xml
+++ b/src/chrome/content/rules/tns-cs.net.xml
@@ -18,14 +18,10 @@
 
 	
-	
-	
 	
 
 	
-	
-	
 	
 
 
@@ -37,10 +33,9 @@
 	
 
 
-	
+	
 
-		
 		
 
 	
-	
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/toaruos.org.xml b/src/chrome/content/rules/toaruos.org.xml
new file mode 100644
index 000000000000..f2ba87427b88
--- /dev/null
+++ b/src/chrome/content/rules/toaruos.org.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/tokyo2020.jp.xml b/src/chrome/content/rules/tokyo2020.jp.xml
index f944e995f5be..b4b5fe5de2e3 100644
--- a/src/chrome/content/rules/tokyo2020.jp.xml
+++ b/src/chrome/content/rules/tokyo2020.jp.xml
@@ -10,7 +10,7 @@ sorry.tokyo2020.jp mismatch
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/topekazoo.org.xml b/src/chrome/content/rules/topekazoo.org.xml
new file mode 100644
index 000000000000..f31ec99b4125
--- /dev/null
+++ b/src/chrome/content/rules/topekazoo.org.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/topicbox.com.xml b/src/chrome/content/rules/topicbox.com.xml
index 100bdf72be3a..10da918a6f8c 100644
--- a/src/chrome/content/rules/topicbox.com.xml
+++ b/src/chrome/content/rules/topicbox.com.xml
@@ -1,7 +1,31 @@
+
+
 
 	
 	
+
+	
+	
+	
+	
+	
+	
 	
+	
+	
+	
+	
+	
+	
+
+	
+	
 
 	
 
diff --git a/src/chrome/content/rules/topshop.com.xml b/src/chrome/content/rules/topshop.com.xml
index 98b6b7cce2fb..90ce694afb41 100644
--- a/src/chrome/content/rules/topshop.com.xml
+++ b/src/chrome/content/rules/topshop.com.xml
@@ -56,7 +56,7 @@ Non-2xx HTTP code: http://insideout.topshop.com/ (200) => https://www.topshop.co
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/tori.net.xml b/src/chrome/content/rules/tori.net.xml
index 4e38ca44ccf8..d2963c2aa886 100644
--- a/src/chrome/content/rules/tori.net.xml
+++ b/src/chrome/content/rules/tori.net.xml
@@ -6,7 +6,6 @@
 
 	CDN buckets:
 
-		- ??????????????.cloudfront.net	← media
 		- d38a5rkle4vfil.cloudfront.net	← static
 
 
@@ -16,7 +15,6 @@
 	Problematic hosts in *tori.net:
 
 		- cp ᶜ
-		- media ᵐ
 		- static ᵐ
 		- www2 ᵉ ᵘ
 
@@ -39,7 +37,7 @@
 		- Images on cp from www.tori.fi ᵈ
 
 		- Bugs, on:
-		
+
 			- cp from logc183.xiti.com ˢ
 			- www2 from tori.spring-tns.net ˢ
 
@@ -66,8 +64,7 @@
 	
 
 
-	
+	
 
 		
 
diff --git a/src/chrome/content/rules/torrentz.ht.xml b/src/chrome/content/rules/torrentz.ht.xml
deleted file mode 100644
index ec820e135b5e..000000000000
--- a/src/chrome/content/rules/torrentz.ht.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/torrentz.site.xml b/src/chrome/content/rules/torrentz.site.xml
deleted file mode 100644
index 3221606a019c..000000000000
--- a/src/chrome/content/rules/torrentz.site.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/torrentz2.eu.xml b/src/chrome/content/rules/torrentz2.eu.xml
deleted file mode 100644
index 62869b25f8de..000000000000
--- a/src/chrome/content/rules/torrentz2.eu.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/tortall.net.xml b/src/chrome/content/rules/tortall.net.xml
new file mode 100644
index 000000000000..33874b754536
--- /dev/null
+++ b/src/chrome/content/rules/tortall.net.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/toshiba-tec.com.cn.xml b/src/chrome/content/rules/toshiba-tec.com.cn.xml
deleted file mode 100644
index 12ed53df7914..000000000000
--- a/src/chrome/content/rules/toshiba-tec.com.cn.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	
-	
-	
-	
-	
-	
-
-
diff --git a/src/chrome/content/rules/towelroot.xml b/src/chrome/content/rules/towelroot.xml
index 15930f56fec6..dec7d1e72850 100644
--- a/src/chrome/content/rules/towelroot.xml
+++ b/src/chrome/content/rules/towelroot.xml
@@ -1,6 +1,6 @@
 
 	
-	
+	
 
 	
diff --git a/src/chrome/content/rules/toxstats.com.xml b/src/chrome/content/rules/toxstats.com.xml
deleted file mode 100644
index 6421531c5b32..000000000000
--- a/src/chrome/content/rules/toxstats.com.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-	
-
-		
-		
-
-			
-			
-
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/tpb.dashitz.com.xml b/src/chrome/content/rules/tpb.dashitz.com.xml
deleted file mode 100644
index 7afbb000afe5..000000000000
--- a/src/chrome/content/rules/tpb.dashitz.com.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/tpb.patatje.eu.xml b/src/chrome/content/rules/tpb.patatje.eu.xml
deleted file mode 100644
index f100de1feefd..000000000000
--- a/src/chrome/content/rules/tpb.patatje.eu.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/tpb.pm.xml b/src/chrome/content/rules/tpb.pm.xml
deleted file mode 100644
index 94b7a3091dce..000000000000
--- a/src/chrome/content/rules/tpb.pm.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/tpblist.xyz.xml b/src/chrome/content/rules/tpblist.xyz.xml
index 212661de4d89..2a435c79eaa3 100644
--- a/src/chrome/content/rules/tpblist.xyz.xml
+++ b/src/chrome/content/rules/tpblist.xyz.xml
@@ -29,7 +29,7 @@ tpb.proxyduck.net self signed
 www.pbp.rocks refused
 -->
 
-
+
 	
 	
 	
@@ -79,4 +79,4 @@ www.pbp.rocks refused
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/tpbmirror.us.xml b/src/chrome/content/rules/tpbmirror.us.xml
deleted file mode 100644
index 578e7a7de4ce..000000000000
--- a/src/chrome/content/rules/tpbmirror.us.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/transfermarkt.de.xml b/src/chrome/content/rules/transfermarkt.de.xml
new file mode 100644
index 000000000000..b2c8d5257d91
--- /dev/null
+++ b/src/chrome/content/rules/transfermarkt.de.xml
@@ -0,0 +1,19 @@
+
+
+
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/translations.com.xml b/src/chrome/content/rules/translations.com.xml
index f3dae53db7ed..a6f3f5dcef01 100644
--- a/src/chrome/content/rules/translations.com.xml
+++ b/src/chrome/content/rules/translations.com.xml
@@ -19,11 +19,11 @@ Fetch error: http://translations.com/ => https://www.translations.com/: (60, 'SS
 		- Images on www from cdn.transperfect.com ˡ
 		- Bug on www from a.analytics.yahoo.com *
 
-	ˡ Unsecurable <= redirect loop 
+	ˡ Unsecurable <= redirect loop
 	* See https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/transperfect.com-problematic.xml b/src/chrome/content/rules/transperfect.com-problematic.xml
index de5370c5c1b7..6cb7011b3ef1 100644
--- a/src/chrome/content/rules/transperfect.com-problematic.xml
+++ b/src/chrome/content/rules/transperfect.com-problematic.xml
@@ -5,7 +5,7 @@
 	NB: see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/travel-assets.com.xml b/src/chrome/content/rules/travel-assets.com.xml
index 9bc882c4d22a..25927f21aa5d 100644
--- a/src/chrome/content/rules/travel-assets.com.xml
+++ b/src/chrome/content/rules/travel-assets.com.xml
@@ -12,7 +12,7 @@
 	
 	
 
-	
 
 
diff --git a/src/chrome/content/rules/trbo.com.xml b/src/chrome/content/rules/trbo.com.xml
new file mode 100644
index 000000000000..b7a998db644b
--- /dev/null
+++ b/src/chrome/content/rules/trbo.com.xml
@@ -0,0 +1,38 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/trezor.io.xml b/src/chrome/content/rules/trezor.io.xml
deleted file mode 100644
index 2e102803b28c..000000000000
--- a/src/chrome/content/rules/trezor.io.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/trimble.com.xml b/src/chrome/content/rules/trimble.com.xml
new file mode 100644
index 000000000000..95d6428a94b5
--- /dev/null
+++ b/src/chrome/content/rules/trimble.com.xml
@@ -0,0 +1,16 @@
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+	
+
+
diff --git a/src/chrome/content/rules/troid.ca.xml b/src/chrome/content/rules/troid.ca.xml
deleted file mode 100644
index 847c07f4c6bc..000000000000
--- a/src/chrome/content/rules/troid.ca.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/truebsd.pw.xml b/src/chrome/content/rules/truebsd.pw.xml
deleted file mode 100644
index 3bfbb2715d88..000000000000
--- a/src/chrome/content/rules/truebsd.pw.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	
-	
-
diff --git a/src/chrome/content/rules/trust.org.xml b/src/chrome/content/rules/trust.org.xml
new file mode 100644
index 000000000000..a6be33384f02
--- /dev/null
+++ b/src/chrome/content/rules/trust.org.xml
@@ -0,0 +1,17 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		
+		
+	
+	
+
diff --git a/src/chrome/content/rules/trvl-media.com.xml b/src/chrome/content/rules/trvl-media.com.xml
index 5a42186ed3b6..becb31c82828 100644
--- a/src/chrome/content/rules/trvl-media.com.xml
+++ b/src/chrome/content/rules/trvl-media.com.xml
@@ -9,6 +9,6 @@
 	
 	
 
-	
 
diff --git a/src/chrome/content/rules/trvl-px.com.xml b/src/chrome/content/rules/trvl-px.com.xml
index 64da1dc14e46..bee9a6e42da7 100644
--- a/src/chrome/content/rules/trvl-px.com.xml
+++ b/src/chrome/content/rules/trvl-px.com.xml
@@ -20,7 +20,7 @@
 
 	
 
-	
 
 
diff --git a/src/chrome/content/rules/tset.de.xml b/src/chrome/content/rules/tset.de.xml
new file mode 100644
index 000000000000..8228128f73d6
--- /dev/null
+++ b/src/chrome/content/rules/tset.de.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/tsowell.xml b/src/chrome/content/rules/tsowell.xml
new file mode 100644
index 000000000000..e0856caa8aea
--- /dev/null
+++ b/src/chrome/content/rules/tsowell.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ttk-chita.ru.xml b/src/chrome/content/rules/ttk-chita.ru.xml
index cfba28790d14..d41ded6477ca 100644
--- a/src/chrome/content/rules/ttk-chita.ru.xml
+++ b/src/chrome/content/rules/ttk-chita.ru.xml
@@ -9,7 +9,7 @@ kodar.ttk-chita.ru timed out
 ttk-chita.ru different content
 www.ttk-chita.ru different content
 -->
-
+
 	
 
 	
diff --git a/src/chrome/content/rules/tugatech.com.pt.xml b/src/chrome/content/rules/tugatech.com.pt.xml
index a2bb714f6b21..876bb439cad2 100644
--- a/src/chrome/content/rules/tugatech.com.pt.xml
+++ b/src/chrome/content/rules/tugatech.com.pt.xml
@@ -13,5 +13,5 @@
 	
 
 	
-	
+
 
diff --git a/src/chrome/content/rules/tumba.ch.xml b/src/chrome/content/rules/tumba.ch.xml
index aae8e1f257d7..7021b2555083 100644
--- a/src/chrome/content/rules/tumba.ch.xml
+++ b/src/chrome/content/rules/tumba.ch.xml
@@ -6,7 +6,7 @@ Fetch error: http://les.tumba.ch/ => https://les.tumba.ch/: (51, "SSL: no altern
 Fetch error: http://u.tumba.ch/ => https://u.tumba.ch/: (51, "SSL: no alternative certificate subject name matches target host name 'u.tumba.ch'")
 
 -->
-
+
         
         
         
diff --git a/src/chrome/content/rules/tunbridgewells.gov.uk.xml b/src/chrome/content/rules/tunbridgewells.gov.uk.xml
deleted file mode 100644
index dede68145523..000000000000
--- a/src/chrome/content/rules/tunbridgewells.gov.uk.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/tune.com.xml b/src/chrome/content/rules/tune.com.xml
index 0a6e522342fa..ae8352a2009b 100644
--- a/src/chrome/content/rules/tune.com.xml
+++ b/src/chrome/content/rules/tune.com.xml
@@ -1,8 +1,14 @@
+
 
+	
 	
 	
-	
+	
 	
 	
 
diff --git a/src/chrome/content/rules/turku.fi.xml b/src/chrome/content/rules/turku.fi.xml
index c322fc7d18ba..3653ba300ee7 100644
--- a/src/chrome/content/rules/turku.fi.xml
+++ b/src/chrome/content/rules/turku.fi.xml
@@ -9,7 +9,7 @@ Non-2xx HTTP code: http://www.bussit.turku.fi/ (200) => https://www.turku.fi/pub
 		- www.turku.fi/(ahtela|bussar|busses|bussit|paikalla|paplats|
 		ippe|nuorikulttuuri|sustainable-city|...)
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/tushuku.net.xml b/src/chrome/content/rules/tushuku.net.xml
deleted file mode 100644
index 569e91eb1480..000000000000
--- a/src/chrome/content/rules/tushuku.net.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/tuxfamily.org-falsemixed.xml b/src/chrome/content/rules/tuxfamily.org-falsemixed.xml
index 618dbb311be6..226bcdf1c83f 100644
--- a/src/chrome/content/rules/tuxfamily.org-falsemixed.xml
+++ b/src/chrome/content/rules/tuxfamily.org-falsemixed.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.gimpphoto.tuxfamily.org/ => https://gimpphoto.tuxfamily.
 	NB: see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/tvc.ru.xml b/src/chrome/content/rules/tvc.ru.xml
index 85d2e4e94dd8..0d05328c5c2a 100644
--- a/src/chrome/content/rules/tvc.ru.xml
+++ b/src/chrome/content/rules/tvc.ru.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://cdn.tvc.ru/ => https://cdn.tvc.ru/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/tvtv.de.xml b/src/chrome/content/rules/tvtv.de.xml
new file mode 100644
index 000000000000..1b6af9e0ec03
--- /dev/null
+++ b/src/chrome/content/rules/tvtv.de.xml
@@ -0,0 +1,26 @@
+
+
+
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/typescriptlang.org.xml b/src/chrome/content/rules/typescriptlang.org.xml
new file mode 100644
index 000000000000..9fa1e2e06e36
--- /dev/null
+++ b/src/chrome/content/rules/typescriptlang.org.xml
@@ -0,0 +1,13 @@
+
+		
+		
+
+
+		
+		
+		
+
diff --git a/src/chrome/content/rules/tyresales.com.au.xml b/src/chrome/content/rules/tyresales.com.au.xml
new file mode 100644
index 000000000000..2d3a0a113d1b
--- /dev/null
+++ b/src/chrome/content/rules/tyresales.com.au.xml
@@ -0,0 +1,26 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/tyumedia.ru.xml b/src/chrome/content/rules/tyumedia.ru.xml
index 21a16c027c83..f45a9d2832ba 100644
--- a/src/chrome/content/rules/tyumedia.ru.xml
+++ b/src/chrome/content/rules/tyumedia.ru.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://tyumedia.ru/ => https://tyumedia.ru/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 Fetch error: http://www.tyumedia.ru/ => https://tyumedia.ru/: (60, 'SSL certificate problem: unable to get local issuer certificate')
  www. mismatch -->
-
+
 	
 	
 	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ubuntu-fi.org.xml b/src/chrome/content/rules/ubuntu-fi.org.xml
new file mode 100644
index 000000000000..0cac0153a304
--- /dev/null
+++ b/src/chrome/content/rules/ubuntu-fi.org.xml
@@ -0,0 +1,10 @@
+
+		
+		
+		
+		
+		
+
+		
+
diff --git a/src/chrome/content/rules/ubuntugeek.com.xml b/src/chrome/content/rules/ubuntugeek.com.xml
new file mode 100644
index 000000000000..c2911527b07e
--- /dev/null
+++ b/src/chrome/content/rules/ubuntugeek.com.xml
@@ -0,0 +1,23 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ubuntupodcast.org.xml b/src/chrome/content/rules/ubuntupodcast.org.xml
new file mode 100644
index 000000000000..1de6a3fad8e0
--- /dev/null
+++ b/src/chrome/content/rules/ubuntupodcast.org.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ubuntutheaterproject.com.xml b/src/chrome/content/rules/ubuntutheaterproject.com.xml
new file mode 100644
index 000000000000..d27468ea5d18
--- /dev/null
+++ b/src/chrome/content/rules/ubuntutheaterproject.com.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/ucarp.org.xml b/src/chrome/content/rules/ucarp.org.xml
deleted file mode 100644
index 335c4b10f7ca..000000000000
--- a/src/chrome/content/rules/ucarp.org.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/uclick.com.xml b/src/chrome/content/rules/uclick.com.xml
index 763ee7a1c0bc..758ccc775bea 100644
--- a/src/chrome/content/rules/uclick.com.xml
+++ b/src/chrome/content/rules/uclick.com.xml
@@ -2,7 +2,7 @@
 	These altnames do not exist:
 
 		- www.admin.uclick.com
-	
+
 
 	Mixed content:
 
diff --git a/src/chrome/content/rules/ufanet.ru.xml b/src/chrome/content/rules/ufanet.ru.xml
index 997563a26172..6edd67a7fb07 100644
--- a/src/chrome/content/rules/ufanet.ru.xml
+++ b/src/chrome/content/rules/ufanet.ru.xml
@@ -74,7 +74,7 @@ oren.ufanet.ru different content
 slv.ufanet.ru different content
 str.ufanet.ru different content
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/uhrp.org.xml b/src/chrome/content/rules/uhrp.org.xml
new file mode 100644
index 000000000000..241187e7de16
--- /dev/null
+++ b/src/chrome/content/rules/uhrp.org.xml
@@ -0,0 +1,19 @@
+
+
+
+	
+	
+	
+	
+	
+  
+	
+
diff --git a/src/chrome/content/rules/uhulinux.hu.xml b/src/chrome/content/rules/uhulinux.hu.xml
deleted file mode 100644
index 803fec129fcf..000000000000
--- a/src/chrome/content/rules/uhulinux.hu.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
diff --git a/src/chrome/content/rules/ukpirate.click.xml b/src/chrome/content/rules/ukpirate.click.xml
deleted file mode 100644
index d3a493c9c6b1..000000000000
--- a/src/chrome/content/rules/ukpirate.click.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/ukw.jp.xml b/src/chrome/content/rules/ukw.jp.xml
deleted file mode 100644
index f9a349807581..000000000000
--- a/src/chrome/content/rules/ukw.jp.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-	
-
-	
-
-	
-
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/ukxcam.co.uk.xml b/src/chrome/content/rules/ukxcam.co.uk.xml
index 8e03c0bf243a..4a755c17cbfa 100644
--- a/src/chrome/content/rules/ukxcam.co.uk.xml
+++ b/src/chrome/content/rules/ukxcam.co.uk.xml
@@ -18,7 +18,7 @@ Fetch error: http://www.ukxcam.co.uk/ => https://www.ukxcam.co.uk/: (51, "SSL: n
 	ˢ See https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ultimateeditionoz.com.xml b/src/chrome/content/rules/ultimateeditionoz.com.xml
index ba1a1d509d4c..6e9e9ebca8e0 100644
--- a/src/chrome/content/rules/ultimateeditionoz.com.xml
+++ b/src/chrome/content/rules/ultimateeditionoz.com.xml
@@ -5,7 +5,7 @@ Fetch error: http://ultimateeditionoz.com/ => https://ultimateeditionoz.com/: (7
 Fetch error: http://www.ultimateeditionoz.com/ => https://www.ultimateeditionoz.com/: (7, 'Failed to connect to www.ultimateeditionoz.com port 443: Connection refused')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/umeng.xml b/src/chrome/content/rules/umeng.xml
index ac9754b0e54c..cffc747aac57 100644
--- a/src/chrome/content/rules/umeng.xml
+++ b/src/chrome/content/rules/umeng.xml
@@ -21,7 +21,7 @@ Fetch error: http://umeng.com/ => https://umeng.com/: (7, 'Failed to connect to
 	- huodong.umeng.com
 -->
 
-
+
 	
 	
 	
@@ -35,12 +35,12 @@ Fetch error: http://umeng.com/ => https://umeng.com/: (7, 'Failed to connect to
 	
 	
 	
-	
+
 	
 	
 		
 		
-		
+
 	
 
 
diff --git a/src/chrome/content/rules/umgum.com.xml b/src/chrome/content/rules/umgum.com.xml
new file mode 100644
index 000000000000..bc150dfa1712
--- /dev/null
+++ b/src/chrome/content/rules/umgum.com.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/umontpellier.fr.xml b/src/chrome/content/rules/umontpellier.fr.xml
index bb20f5d74e55..7ada006cfa15 100644
--- a/src/chrome/content/rules/umontpellier.fr.xml
+++ b/src/chrome/content/rules/umontpellier.fr.xml
@@ -34,7 +34,7 @@
 	
 	
 	
-	
+
 	
 
 
diff --git a/src/chrome/content/rules/undraw.co.xml b/src/chrome/content/rules/undraw.co.xml
new file mode 100644
index 000000000000..7d0c8137537b
--- /dev/null
+++ b/src/chrome/content/rules/undraw.co.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/unet.by.xml b/src/chrome/content/rules/unet.by.xml
index 1d94b8198dda..ce375a1eeab5 100644
--- a/src/chrome/content/rules/unet.by.xml
+++ b/src/chrome/content/rules/unet.by.xml
@@ -31,7 +31,7 @@ devmy.unet.by different content
 ⁴ self signed
 ⁵ expired
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/uni-mannheim.de.xml b/src/chrome/content/rules/uni-mannheim.de.xml
index 5140c30f04ff..bd0a71d1e5a2 100644
--- a/src/chrome/content/rules/uni-mannheim.de.xml
+++ b/src/chrome/content/rules/uni-mannheim.de.xml
@@ -35,8 +35,8 @@
 	
 	
 	
-	
+
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/unimatrix.si-resources.xml b/src/chrome/content/rules/unimatrix.si-resources.xml
deleted file mode 100644
index a1c553603a02..000000000000
--- a/src/chrome/content/rules/unimatrix.si-resources.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-	
-
-		
-
-			
-			
-			
-			
-			
-
-			
-			
-			
-
-
-	
-
-
diff --git a/src/chrome/content/rules/unionpacific.jobs.xml b/src/chrome/content/rules/unionpacific.jobs.xml
deleted file mode 100644
index 5d72220a91d1..000000000000
--- a/src/chrome/content/rules/unionpacific.jobs.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/unit4.com-resources.xml b/src/chrome/content/rules/unit4.com-resources.xml
index 303e54ede592..d7d068fbc5c5 100644
--- a/src/chrome/content/rules/unit4.com-resources.xml
+++ b/src/chrome/content/rules/unit4.com-resources.xml
@@ -11,7 +11,7 @@ Non-2xx HTTP code: http://info.unit4.com/rs/900-SZD-631/images/unit4-screen.css
 	and no mixed content secured.
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/unit4.com.xml b/src/chrome/content/rules/unit4.com.xml
index 4ce3ce467069..b97bf2ac11b4 100644
--- a/src/chrome/content/rules/unit4.com.xml
+++ b/src/chrome/content/rules/unit4.com.xml
@@ -41,7 +41,7 @@ Non-2xx HTTP code: http://info.unit4.com/rs/900-SZD-631/images/U4-U4BW-WHO-CS-Ve
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/unterstuetzung-die-ankommt.de.xml b/src/chrome/content/rules/unterstuetzung-die-ankommt.de.xml
new file mode 100644
index 000000000000..97800c1191d5
--- /dev/null
+++ b/src/chrome/content/rules/unterstuetzung-die-ankommt.de.xml
@@ -0,0 +1,8 @@
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/unz.com.xml b/src/chrome/content/rules/unz.com.xml
new file mode 100644
index 000000000000..b1a394494ee8
--- /dev/null
+++ b/src/chrome/content/rules/unz.com.xml
@@ -0,0 +1,11 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/up.com.xml b/src/chrome/content/rules/up.com.xml
index f959357a5ab2..f786e60be6e3 100644
--- a/src/chrome/content/rules/up.com.xml
+++ b/src/chrome/content/rules/up.com.xml
@@ -4,7 +4,6 @@
 	Other Union Pacific Railroad Company rulesets:
 
 		- streamline.com.xml
-		- unionpacific.jobs.xml
 		- up.jobs.xml
 		- upds.com.xml
 		- uprr.com.xml
diff --git a/src/chrome/content/rules/upc-cablecom.xml b/src/chrome/content/rules/upc-cablecom.xml
index 4bf386826464..13355ad45183 100644
--- a/src/chrome/content/rules/upc-cablecom.xml
+++ b/src/chrome/content/rules/upc-cablecom.xml
@@ -17,7 +17,7 @@ Fetch error: http://preprod.it.hispeed.ch/ => https://preprod.it.hispeed.ch/: (2
 Fetch error: http://preprod.en.hispeed.ch/ => https://preprod.en.hispeed.ch/: (28, 'Connection timed out after 20001 milliseconds')
 Fetch error: http://webmail.hispeed.ch/ => https://webmail.hispeed.ch/: (7, 'Failed to connect to webmail.hispeed.ch port 443: Connection refused')
 
-	CDN buckets: 
+	CDN buckets:
 
 		- www.orion.lgi.com.c.footprint.net
 
@@ -38,7 +38,7 @@ Fetch error: http://webmail.hispeed.ch/ => https://webmail.hispeed.ch/: (7, 'Fai
 		- static
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/uprr.com-falsemixed.xml b/src/chrome/content/rules/uprr.com-falsemixed.xml
deleted file mode 100644
index 311255c91a03..000000000000
--- a/src/chrome/content/rules/uprr.com-falsemixed.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/uptimeinstitute.com.xml b/src/chrome/content/rules/uptimeinstitute.com.xml
index 9fd38c62837d..1f1c3c15e9cd 100644
--- a/src/chrome/content/rules/uptimeinstitute.com.xml
+++ b/src/chrome/content/rules/uptimeinstitute.com.xml
@@ -16,7 +16,7 @@ pt-forms.uptimeinstitute.com different content
 ¹ mismatch
 ⁴ self signed
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/urbanproxy.eu.xml b/src/chrome/content/rules/urbanproxy.eu.xml
deleted file mode 100644
index 31a30f0f3fd1..000000000000
--- a/src/chrome/content/rules/urbanproxy.eu.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/url.cn.xml b/src/chrome/content/rules/url.cn.xml
index 5159a24e97f8..0a1bb201cbdc 100644
--- a/src/chrome/content/rules/url.cn.xml
+++ b/src/chrome/content/rules/url.cn.xml
@@ -1,6 +1,6 @@
 
-
+
   
   
   
diff --git a/src/chrome/content/rules/usatodayw7vu5egc.onion.xml b/src/chrome/content/rules/usatodayw7vu5egc.onion.xml
new file mode 100644
index 000000000000..c02c8e8a92fb
--- /dev/null
+++ b/src/chrome/content/rules/usatodayw7vu5egc.onion.xml
@@ -0,0 +1,8 @@
+
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/usembassy.gov.xml b/src/chrome/content/rules/usembassy.gov.xml
index 4cfa3aad1809..8bf6fddbb8bb 100644
--- a/src/chrome/content/rules/usembassy.gov.xml
+++ b/src/chrome/content/rules/usembassy.gov.xml
@@ -110,7 +110,7 @@ Fetch error: http://suva.usembassy.gov/ => https://suva.usembassy.gov/: (6, 'Cou
 		- iframe on macedonia, tanzania from www.youtube.com ˢ
 
 		- Images, on:
-		
+
 			- abudhabi, arabic.algeria, french.algeria, algiers, angola, portuguese.angola, www.antananarivo, armenia, armenian.armenia, russian.ashgabat, turkmen.ashgabat, athens, austria, german.austria, azerbaijan, azeri.azerbaijan, bahrain, bangkok, thai.bangkok, bangui, banjul, barbados, belgium, dutch.belgium, french.belgium, belize, french.benin, bern, bishkek, kyrgyz.bishkek, russian.bishkek, bogota, spanish.bogota, bolivia, spanish.bolivia, botswana, brazzaville, french.brazzaville, brunei, bulgaria, bulgarian.bulgaria, french.burkinafaso, burma, burundi, canberra, caracas, spanish.caracas, french.chad, chile, spanish.chile, conakry, costarica, spanish.costarica, costarica, cotonou, dakar, french.dakar, damascus, denmark, dhaka, djibouti, dushanbe, russian.dushanbe, tajik.dushanbe, ecuador, spanish.ecuador, egypt, eritrea, estonia, estonian.estonia, russian.estonia, ethiopia, finland, freetown, georgetown, georgia, georgian.georgia, ghana, guatemala, spanish.guatemala, french.guinea, haiti, french.haiti, harare, havana, honduras, spanish.honduras, hungary, hungarian.hungary, iceland, iran, persian.iran, iraq, arabic.iraq, islamabad, israel, hebrew.israel, italy, italian.italy, jakarta, jordan, kabul, kazakhstan, kingston, kinshasa, kolonia, kuwait, laos, lebanon, libreville, libya, lilongwe, lima, luxembourg, macedonia, madrid, majuro, malabo, mali, malta, manila, maputo, maseru, mauritania, mauritius, minsk, moldova, mongolia, morocco, nairobi, nassau, ndjamena, nepal, newdelhi, niamey, nicaragua, nigeria, norway, oman, ouagadougou, palau, panama, paraguay, podgorica, portmoresby, portugal, praia, pristina, qatar, riga, latvian.riga, romania, rwanda, sansalvador, santodomingo, sarajevo, seoul, serbia, singapore, slovakia, slovenia, southsudan, srilanka, sudan, suriname, suva, swaziland, tanzania, thehague, tirana, togo, trinidad, tunisia, turkey, turkmenistan, ukraine, uruguay, uzbekistan, vilnius, windhoek, www, yaounde, yemen, zagreb from photos.state.gov ˢ
 			- www.antananarivo, athens, azeri.azerbaijan, belize, belgium, dutch.belgium, bogota, spanish.bogota, bolivia, spanish.bolivia, french.brazzaville, brunei, ghana, dushanbe, french.guinea, harare, honduras, luxembourg, majuro, minsk, moscow, newdelhi, srilanka, sudan, suriname, tanzania, thehague, turkey, vatican, windhoek, yemen from photos.america.gov ˢ
 			- azerbaijan, azeri.azerbaijan from s97095.gridserver.com ᵒ
@@ -143,7 +143,7 @@ Fetch error: http://suva.usembassy.gov/ => https://suva.usembassy.gov/: (6, 'Cou
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/usenetter.nl.xml b/src/chrome/content/rules/usenetter.nl.xml
index c6ee483df329..ea4e994d2cc8 100644
--- a/src/chrome/content/rules/usenetter.nl.xml
+++ b/src/chrome/content/rules/usenetter.nl.xml
@@ -7,7 +7,7 @@ Fetch error: http://usenetter.nl/ => https://www.usenetter.nl/: (60, 'SSL certif
 	^usenetter.nl: Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/user.fm.xml b/src/chrome/content/rules/user.fm.xml
new file mode 100644
index 000000000000..6331ec87d9c6
--- /dev/null
+++ b/src/chrome/content/rules/user.fm.xml
@@ -0,0 +1,16 @@
+
+
+    
+
+    
+
diff --git a/src/chrome/content/rules/userstory.ru.xml b/src/chrome/content/rules/userstory.ru.xml
index 59c63769eddc..909b36709067 100644
--- a/src/chrome/content/rules/userstory.ru.xml
+++ b/src/chrome/content/rules/userstory.ru.xml
@@ -50,7 +50,7 @@ shop.demo1.loko.office.userstory.ru ¹
 ¹ mismatch
 ² refused
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/usyd.edu.au.xml b/src/chrome/content/rules/usyd.edu.au.xml
index 7eb54e8a1d39..6f30439a3aad 100644
--- a/src/chrome/content/rules/usyd.edu.au.xml
+++ b/src/chrome/content/rules/usyd.edu.au.xml
@@ -57,7 +57,7 @@ Fetch error: http://www.alumniandfriends.usyd.edu.au/ => https://www.alumniandfr
 	ˢ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/utf8everywhere.org.xml b/src/chrome/content/rules/utf8everywhere.org.xml
new file mode 100644
index 000000000000..97de1c703ff0
--- /dev/null
+++ b/src/chrome/content/rules/utf8everywhere.org.xml
@@ -0,0 +1,7 @@
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/valgrind.org.xml b/src/chrome/content/rules/valgrind.org.xml
new file mode 100644
index 000000000000..56fbdfe4574d
--- /dev/null
+++ b/src/chrome/content/rules/valgrind.org.xml
@@ -0,0 +1,11 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/valuate.com.xml b/src/chrome/content/rules/valuate.com.xml
deleted file mode 100644
index a67a02ada1d5..000000000000
--- a/src/chrome/content/rules/valuate.com.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/vanguard.xml b/src/chrome/content/rules/vanguard.xml
index b1c6c6a2df19..b70b81c66463 100644
--- a/src/chrome/content/rules/vanguard.xml
+++ b/src/chrome/content/rules/vanguard.xml
@@ -4,9 +4,6 @@
   
   
 
-  
-  
-  
 
   
diff --git a/src/chrome/content/rules/veggiekarte.de.xml b/src/chrome/content/rules/veggiekarte.de.xml
index b3f847cebd91..f59f879e732a 100644
--- a/src/chrome/content/rules/veggiekarte.de.xml
+++ b/src/chrome/content/rules/veggiekarte.de.xml
@@ -5,4 +5,4 @@
 	
 
 	
-  
+
diff --git a/src/chrome/content/rules/vendini.com.xml b/src/chrome/content/rules/vendini.com.xml
index 683a0a64ce58..59bedc328e2e 100644
--- a/src/chrome/content/rules/vendini.com.xml
+++ b/src/chrome/content/rules/vendini.com.xml
@@ -34,7 +34,7 @@ Non-2xx HTTP code: http://landing.vendini.com/rs/vendini/images/nav_bg.jpg (200)
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/verizon.net.xml b/src/chrome/content/rules/verizon.net.xml
index a4499b949ed2..fe76020dc102 100644
--- a/src/chrome/content/rules/verizon.net.xml
+++ b/src/chrome/content/rules/verizon.net.xml
@@ -26,7 +26,7 @@ Fetch error: http://static-business.verizon.net/ => https://static-business.veri
 		- care.verizon.net
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/verseone.com.xml b/src/chrome/content/rules/verseone.com.xml
index 665a6d5b40a7..e30550fa97b0 100644
--- a/src/chrome/content/rules/verseone.com.xml
+++ b/src/chrome/content/rules/verseone.com.xml
@@ -25,7 +25,7 @@ Fetch error: http://hc.verseone.com/ => https://www.howard-cottage.co.uk/: (60,
 	ᵐ Mismatched
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/vevent.com.xml b/src/chrome/content/rules/vevent.com.xml
index 061b984a8473..885fdff560dd 100644
--- a/src/chrome/content/rules/vevent.com.xml
+++ b/src/chrome/content/rules/vevent.com.xml
@@ -10,7 +10,7 @@ Fetch error: http://vevent.com/ => https://vevent.com/: (6, 'Could not resolve h
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/vfl.ru.xml b/src/chrome/content/rules/vfl.ru.xml
new file mode 100644
index 000000000000..86313742e994
--- /dev/null
+++ b/src/chrome/content/rules/vfl.ru.xml
@@ -0,0 +1,32 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/vi-serve.com.xml b/src/chrome/content/rules/vi-serve.com.xml
new file mode 100644
index 000000000000..1184366a06fe
--- /dev/null
+++ b/src/chrome/content/rules/vi-serve.com.xml
@@ -0,0 +1,17 @@
+
+
+	
+	
+	
+	
+	
+		
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/victoriaforms.com.xml b/src/chrome/content/rules/victoriaforms.com.xml
index 7d2c2bcbec97..814def0f283b 100644
--- a/src/chrome/content/rules/victoriaforms.com.xml
+++ b/src/chrome/content/rules/victoriaforms.com.xml
@@ -5,7 +5,7 @@ Non-2xx HTTP code: http://victoriaforms.com/ (200) => https://victoriaforms.com/
 Non-2xx HTTP code: http://www.victoriaforms.com/ (200) => https://www.victoriaforms.com/ (403)
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/videoincloud.com.xml b/src/chrome/content/rules/videoincloud.com.xml
new file mode 100644
index 000000000000..dc44ff62c80c
--- /dev/null
+++ b/src/chrome/content/rules/videoincloud.com.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/viewablemedia.net.xml b/src/chrome/content/rules/viewablemedia.net.xml
index a2d516f67c05..4f740680c8cd 100644
--- a/src/chrome/content/rules/viewablemedia.net.xml
+++ b/src/chrome/content/rules/viewablemedia.net.xml
@@ -7,7 +7,7 @@ Fetch error: http://www.viewablemedia.net/ => https://www.viewablemedia.net/: (7
 	For other Visible Measures coverage, see Visible-Measures.xml.
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/virtmo.com.xml b/src/chrome/content/rules/virtmo.com.xml
new file mode 100644
index 000000000000..3e6c5bb98303
--- /dev/null
+++ b/src/chrome/content/rules/virtmo.com.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+  
+  
+
diff --git a/src/chrome/content/rules/visma.no.xml b/src/chrome/content/rules/visma.no.xml
index 8bb294a0662c..73bad89510ca 100644
--- a/src/chrome/content/rules/visma.no.xml
+++ b/src/chrome/content/rules/visma.no.xml
@@ -30,7 +30,7 @@ Fetch error: http://reportingvsn.visma.no/ => https://reportingvsn.visma.no/: (7
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/viz-info.de.xml b/src/chrome/content/rules/viz-info.de.xml
deleted file mode 100644
index 855d9f00641a..000000000000
--- a/src/chrome/content/rules/viz-info.de.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/vizzion.com.xml b/src/chrome/content/rules/vizzion.com.xml
new file mode 100644
index 000000000000..811b1ac09f02
--- /dev/null
+++ b/src/chrome/content/rules/vizzion.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/vkarpinsk.info.xml b/src/chrome/content/rules/vkarpinsk.info.xml
deleted file mode 100644
index 048e0f322c1a..000000000000
--- a/src/chrome/content/rules/vkarpinsk.info.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-	
-	
-	
-
diff --git a/src/chrome/content/rules/vm.de.xml b/src/chrome/content/rules/vm.de.xml
deleted file mode 100644
index 846a43cd4eb0..000000000000
--- a/src/chrome/content/rules/vm.de.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/vnu.ru.xml b/src/chrome/content/rules/vnu.ru.xml
index 4460a12822b0..7da2ccd0bb6e 100644
--- a/src/chrome/content/rules/vnu.ru.xml
+++ b/src/chrome/content/rules/vnu.ru.xml
@@ -8,7 +8,7 @@ www.vnu.ru mismatch
 equil.vnu.ru mismatch
 mail.vnu.ru mismatch
 -->
-
+
 	
 
 	
diff --git a/src/chrome/content/rules/vodkamethod.com.xml b/src/chrome/content/rules/vodkamethod.com.xml
deleted file mode 100644
index 75d870dc64c8..000000000000
--- a/src/chrome/content/rules/vodkamethod.com.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-        
-
-        
-
\ No newline at end of file
diff --git a/src/chrome/content/rules/vogogo.com.xml b/src/chrome/content/rules/vogogo.com.xml
index aa880a72368e..cb66deccea6c 100644
--- a/src/chrome/content/rules/vogogo.com.xml
+++ b/src/chrome/content/rules/vogogo.com.xml
@@ -6,7 +6,7 @@ Fetch error: http://docs.vogogo.com/ => https://docs.vogogo.com/: (6, 'Could not
 Fetch error: http://interac.vogogo.com/ => https://interac.vogogo.com/: (6, 'Could not resolve host: interac.vogogo.com')
 
 -->
-
+
 
 	
 	
@@ -14,7 +14,7 @@ Fetch error: http://interac.vogogo.com/ => https://interac.vogogo.com/: (6, 'Cou
 	
 	
 
-	
+	
 
 	
diff --git a/src/chrome/content/rules/voidlinux.eu.xml b/src/chrome/content/rules/voidlinux.eu.xml
deleted file mode 100644
index d6cc274b8f0c..000000000000
--- a/src/chrome/content/rules/voidlinux.eu.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-	
-	
-	
-	
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/voidtools.com.xml b/src/chrome/content/rules/voidtools.com.xml
index 43337dea0c65..a4b26d77b73f 100644
--- a/src/chrome/content/rules/voidtools.com.xml
+++ b/src/chrome/content/rules/voidtools.com.xml
@@ -4,8 +4,7 @@
 
 	
 	
-		
-		
+
 	
 
 	
diff --git a/src/chrome/content/rules/voipuserportal.co.uk.xml b/src/chrome/content/rules/voipuserportal.co.uk.xml
index 485d9a2dab96..7e274680621d 100644
--- a/src/chrome/content/rules/voipuserportal.co.uk.xml
+++ b/src/chrome/content/rules/voipuserportal.co.uk.xml
@@ -13,7 +13,7 @@
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/vouchercloud.com.xml b/src/chrome/content/rules/vouchercloud.com.xml
index d70fd22e4eba..e9b9ef2e853a 100644
--- a/src/chrome/content/rules/vouchercloud.com.xml
+++ b/src/chrome/content/rules/vouchercloud.com.xml
@@ -27,7 +27,7 @@ Fetch error: http://media.vouchercloud.com/ => https://media.vouchercloud.com/:
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/voxmedia.com-resources.xml b/src/chrome/content/rules/voxmedia.com-resources.xml
index b45fc79dbc5f..87f7d44b53b2 100644
--- a/src/chrome/content/rules/voxmedia.com-resources.xml
+++ b/src/chrome/content/rules/voxmedia.com-resources.xml
@@ -1,49 +1,22 @@
-
 
-
+
 
-	
 	
 	
-	
 	
 	
-	
-	
-	
 
 		
 		
 		
 		
 
-		
-
-			
-			
-			
-			
-
-			
-			
-			
-			
-			
-			
-
-
 	
 
diff --git a/src/chrome/content/rules/vpn.ac.xml b/src/chrome/content/rules/vpn.ac.xml
index f8c8472bf7e1..5dc07e790c6e 100644
--- a/src/chrome/content/rules/vpn.ac.xml
+++ b/src/chrome/content/rules/vpn.ac.xml
@@ -28,6 +28,6 @@
 	
 
 
-	
 
diff --git a/src/chrome/content/rules/vrijstellingoldtimer.nl.xml b/src/chrome/content/rules/vrijstellingoldtimer.nl.xml
index cfde44fb3920..7998ad9b6649 100644
--- a/src/chrome/content/rules/vrijstellingoldtimer.nl.xml
+++ b/src/chrome/content/rules/vrijstellingoldtimer.nl.xml
@@ -5,7 +5,7 @@ Fetch error: http://vrijstellingoldtimer.nl/ => https://vrijstellingoldtimer.nl/
 Fetch error: http://www.vrijstellingoldtimer.nl/ => https://www.vrijstellingoldtimer.nl/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/vtb24.ru.xml b/src/chrome/content/rules/vtb24.ru.xml
index 9a3843463269..a0e9d17362c0 100644
--- a/src/chrome/content/rules/vtb24.ru.xml
+++ b/src/chrome/content/rules/vtb24.ru.xml
@@ -12,7 +12,7 @@ gb.vtb24.ru mismatch
 trade.vtb24.ru expired
 career.vtb24.ru timed out
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/vulture.com.xml b/src/chrome/content/rules/vulture.com.xml
new file mode 100644
index 000000000000..3dadca162ad3
--- /dev/null
+++ b/src/chrome/content/rules/vulture.com.xml
@@ -0,0 +1,24 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/w3techs.com.xml b/src/chrome/content/rules/w3techs.com.xml
index fbbe74a2bc0e..f8c4e747a1ec 100644
--- a/src/chrome/content/rules/w3techs.com.xml
+++ b/src/chrome/content/rules/w3techs.com.xml
@@ -8,7 +8,7 @@ a.w3techs.com different content
 
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/wadod.com.xml b/src/chrome/content/rules/wadod.com.xml
deleted file mode 100644
index 7e9b46ce0c38..000000000000
--- a/src/chrome/content/rules/wadod.com.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/wadod.net.xml b/src/chrome/content/rules/wadod.net.xml
deleted file mode 100644
index 95c913510cda..000000000000
--- a/src/chrome/content/rules/wadod.net.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/waidelotte.org.xml b/src/chrome/content/rules/waidelotte.org.xml
new file mode 100644
index 000000000000..71481014ac4a
--- /dev/null
+++ b/src/chrome/content/rules/waidelotte.org.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/wakefield.gov.uk.xml b/src/chrome/content/rules/wakefield.gov.uk.xml
index 25d29aa34f22..1b7009d940ef 100644
--- a/src/chrome/content/rules/wakefield.gov.uk.xml
+++ b/src/chrome/content/rules/wakefield.gov.uk.xml
@@ -20,10 +20,11 @@
 
 		- aces *
 		- consult ᵐ
+		- eforms (timeout)
 		- mapping ᶜ
 		- observatory ᵐ
 
-	* ($|\?) 403s
+	* Refused
 	ᶜ Server sends no certificate chain, see https://whatsmychaincert.com
 	ᵐ Mismatched
 
@@ -42,7 +43,7 @@
 	Mixed content:
 
 		- Images, on:
-		
+
 			- eforms from www.wakefield.gov.uk ᵈ
 			- observatory from observatory.bradford.gov.uk ᵐ
 			- observatory from observatory.calderdale.gov.uk ᵐ
@@ -57,46 +58,14 @@
 -->
 
 
-	
-	
 	
 	
-	
 	
 	
 	
 	
 
-	
-	
-	
-
-		
-		
-
-
-	
-	
-	
-	
-	
-
-	
-
-
-	
-	
-
-		
-
-	
+	
 
 	
diff --git a/src/chrome/content/rules/walkit.xml b/src/chrome/content/rules/walkit.xml
deleted file mode 100644
index 8c476acb45fc..000000000000
--- a/src/chrome/content/rules/walkit.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-  
-  
-
-  
-
-
diff --git a/src/chrome/content/rules/walsall.gov.uk.xml b/src/chrome/content/rules/walsall.gov.uk.xml
index f3cd434b0fe3..5a2f8968a5dc 100644
--- a/src/chrome/content/rules/walsall.gov.uk.xml
+++ b/src/chrome/content/rules/walsall.gov.uk.xml
@@ -36,12 +36,12 @@
 	Mixed content:
 
 		- css, on:
-		
+
 			- www2 from cms.walsall.gov.uk ᵖ
 			- www2 from $self ᵖ
 
 		- Images, on:
-		
+
 			- cmispublic, www2, www4 from cms.walsall.gov.uk ᵖ
 			- www4 from www.walsall.gov.uk ᵖ
 
diff --git a/src/chrome/content/rules/wanderreitkarte.de.xml b/src/chrome/content/rules/wanderreitkarte.de.xml
new file mode 100644
index 000000000000..bb61567b42a1
--- /dev/null
+++ b/src/chrome/content/rules/wanderreitkarte.de.xml
@@ -0,0 +1,22 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/wao.gov.uk.xml b/src/chrome/content/rules/wao.gov.uk.xml
index 15f4be569462..72b82c50be67 100644
--- a/src/chrome/content/rules/wao.gov.uk.xml
+++ b/src/chrome/content/rules/wao.gov.uk.xml
@@ -21,7 +21,7 @@ Fetch error: http://email.wao.gov.uk/ => https://email.wao.gov.uk/: (28, 'Connec
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/warwickshire.gov.uk.xml b/src/chrome/content/rules/warwickshire.gov.uk.xml
index 3bec3c6bde03..bab7c1d23297 100644
--- a/src/chrome/content/rules/warwickshire.gov.uk.xml
+++ b/src/chrome/content/rules/warwickshire.gov.uk.xml
@@ -58,14 +58,14 @@
 	Mixed content:
 
 		- iframes, on:
-		
+
 			- countryparks from maps.google.com ˢ
 			- countryparks, news from www.youtube.com ˢ
 
 		- css on countryparks, news from fonts.googleapis.com ˢ
 
 		- Images, on:
-		
+
 			- (www.)?, apps, countryparks from www.warwickshire.gov.uk ˢ
 			- countryparks, heritage, hwb, invest, laf, news, printservices, publichealth, whittlefordpark, wwp from news.warwickshire.gov.uk ˢ
 			- invest, heritage from $self ᵐ
diff --git a/src/chrome/content/rules/wastereduction.gov.hk.xml b/src/chrome/content/rules/wastereduction.gov.hk.xml
new file mode 100644
index 000000000000..ff7506967753
--- /dev/null
+++ b/src/chrome/content/rules/wastereduction.gov.hk.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/watchcurbyourenthusiasm.com.xml b/src/chrome/content/rules/watchcurbyourenthusiasm.com.xml
new file mode 100644
index 000000000000..e95f39240aee
--- /dev/null
+++ b/src/chrome/content/rules/watchcurbyourenthusiasm.com.xml
@@ -0,0 +1,7 @@
+
+
+	
+	
+	
+
+
diff --git a/src/chrome/content/rules/watford.gov.uk.xml b/src/chrome/content/rules/watford.gov.uk.xml
index b2d93d4f199e..69a0e1e1ab6f 100644
--- a/src/chrome/content/rules/watford.gov.uk.xml
+++ b/src/chrome/content/rules/watford.gov.uk.xml
@@ -7,7 +7,7 @@
 	Nonfunctional hosts in *watford.gov.uk:
 
 		- maps ᵈ
-	
+
 	ᵈ Dropped
 
 
diff --git a/src/chrome/content/rules/watson.de.xml b/src/chrome/content/rules/watson.de.xml
new file mode 100644
index 000000000000..1ecfb7c851fd
--- /dev/null
+++ b/src/chrome/content/rules/watson.de.xml
@@ -0,0 +1,20 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/waverly.gov.uk.xml b/src/chrome/content/rules/waverly.gov.uk.xml
index b6e28c42b7c1..abd90b6fde27 100644
--- a/src/chrome/content/rules/waverly.gov.uk.xml
+++ b/src/chrome/content/rules/waverly.gov.uk.xml
@@ -49,7 +49,7 @@ Fetch error: http://www.waverly.gov.uk/ => https://www.waverly.gov.uk/: (6, 'Cou
 	ᵐ Not secured by us <= mismatched
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/way2allah.com.xml b/src/chrome/content/rules/way2allah.com.xml
deleted file mode 100644
index 5c5f4ec73f9e..000000000000
--- a/src/chrome/content/rules/way2allah.com.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-	
-	
-	
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/waywire.com.xml b/src/chrome/content/rules/waywire.com.xml
deleted file mode 100644
index e079dfd3c8f2..000000000000
--- a/src/chrome/content/rules/waywire.com.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/waz.de.xml b/src/chrome/content/rules/waz.de.xml
new file mode 100644
index 000000000000..34658e7b252f
--- /dev/null
+++ b/src/chrome/content/rules/waz.de.xml
@@ -0,0 +1,42 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/wbond.xml b/src/chrome/content/rules/wbond.xml
index 676f851f4b4a..504667ddfe0a 100644
--- a/src/chrome/content/rules/wbond.xml
+++ b/src/chrome/content/rules/wbond.xml
@@ -2,4 +2,4 @@
 	
 
 	
-
\ No newline at end of file
+
diff --git a/src/chrome/content/rules/wclc.com.xml b/src/chrome/content/rules/wclc.com.xml
new file mode 100644
index 000000000000..e3d5c260a311
--- /dev/null
+++ b/src/chrome/content/rules/wclc.com.xml
@@ -0,0 +1,25 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
diff --git a/src/chrome/content/rules/websetnet.com.xml b/src/chrome/content/rules/websetnet.com.xml
deleted file mode 100644
index 9a1526ceba0c..000000000000
--- a/src/chrome/content/rules/websetnet.com.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-	
-	
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-	
-
-
diff --git a/src/chrome/content/rules/weburg.me.xml b/src/chrome/content/rules/weburg.me.xml
index a5f754c22d6d..3dc350ab79f6 100644
--- a/src/chrome/content/rules/weburg.me.xml
+++ b/src/chrome/content/rules/weburg.me.xml
@@ -11,11 +11,10 @@ passport.weburg.net mismatch
 
 	
 	
-	
+
 	
-	
-	
+
 
 	
 
diff --git a/src/chrome/content/rules/wellcome.ac.uk.xml b/src/chrome/content/rules/wellcome.ac.uk.xml
index 9a1df6fea8be..9ab0744cd64b 100644
--- a/src/chrome/content/rules/wellcome.ac.uk.xml
+++ b/src/chrome/content/rules/wellcome.ac.uk.xml
@@ -63,7 +63,7 @@ Fetch error: http://jobs.wellcome.ac.uk/ => https://jobs.wellcome.ac.uk/: (28, '
 		- Images on thecrunch from $self
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/welmers.net.xml b/src/chrome/content/rules/welmers.net.xml
new file mode 100644
index 000000000000..089a826fea54
--- /dev/null
+++ b/src/chrome/content/rules/welmers.net.xml
@@ -0,0 +1,18 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/werkema.com.xml b/src/chrome/content/rules/werkema.com.xml
new file mode 100644
index 000000000000..6ff3537d35ad
--- /dev/null
+++ b/src/chrome/content/rules/werkema.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/westberks.gov.uk.xml b/src/chrome/content/rules/westberks.gov.uk.xml
index 118fd3264712..9b78ea1d7afd 100644
--- a/src/chrome/content/rules/westberks.gov.uk.xml
+++ b/src/chrome/content/rules/westberks.gov.uk.xml
@@ -86,7 +86,6 @@
 			
 			
 			
-			
 			
 
 			
-
-
-	
-
-		
-		
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/whatismyreferer.com.xml b/src/chrome/content/rules/whatismyreferer.com.xml
index 5d80d1d917f4..f590944f5bea 100644
--- a/src/chrome/content/rules/whatismyreferer.com.xml
+++ b/src/chrome/content/rules/whatismyreferer.com.xml
@@ -2,7 +2,7 @@
 
 	
 	
-	
+
 	
 
 
diff --git a/src/chrome/content/rules/whatsappbrand.com.xml b/src/chrome/content/rules/whatsappbrand.com.xml
index e486d9e4e0c4..f2a5df792c65 100644
--- a/src/chrome/content/rules/whatsappbrand.com.xml
+++ b/src/chrome/content/rules/whatsappbrand.com.xml
@@ -1,7 +1,3 @@
-
 
 
 	
diff --git a/src/chrome/content/rules/whisky.de.xml b/src/chrome/content/rules/whisky.de.xml
deleted file mode 100644
index 91c7f7573d2e..000000000000
--- a/src/chrome/content/rules/whisky.de.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/whitehatters.academy.xml b/src/chrome/content/rules/whitehatters.academy.xml
index 8ce33613a031..e8f98f6f58c6 100644
--- a/src/chrome/content/rules/whitehatters.academy.xml
+++ b/src/chrome/content/rules/whitehatters.academy.xml
@@ -5,7 +5,7 @@ Fetch error: http://whitehatters.academy/ => https://whitehatters.academy/: (60,
 Fetch error: http://www.whitehatters.academy/ => https://www.whitehatters.academy/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/whoisds.xml b/src/chrome/content/rules/whoisds.xml
new file mode 100644
index 000000000000..d379c975ec8d
--- /dev/null
+++ b/src/chrome/content/rules/whoisds.xml
@@ -0,0 +1,6 @@
+
+	
+	
+	
+	
+
diff --git a/src/chrome/content/rules/whyopencomputing.xml b/src/chrome/content/rules/whyopencomputing.xml
index 20fec293520d..f89b21fb44ad 100644
--- a/src/chrome/content/rules/whyopencomputing.xml
+++ b/src/chrome/content/rules/whyopencomputing.xml
@@ -5,7 +5,7 @@ Fetch error: http://why-opencomputing.com/ => https://why-opencomputing.com/: (5
 Fetch error: http://www.why-opencomputing.com/ => https://www.why-opencomputing.com/: (51, "SSL: no alternative certificate subject name matches target host name 'www.why-opencomputing.com'")
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/wiki.vg.xml b/src/chrome/content/rules/wiki.vg.xml
new file mode 100644
index 000000000000..f7b7b9c97ebf
--- /dev/null
+++ b/src/chrome/content/rules/wiki.vg.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/wikiHow.com.xml b/src/chrome/content/rules/wikiHow.com.xml
deleted file mode 100644
index 43312f754e9d..000000000000
--- a/src/chrome/content/rules/wikiHow.com.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-	
-	
-
-	
-
-	
-
-	
-	
-
-	
-	
-	
-
diff --git a/src/chrome/content/rules/wikidot.com.xml b/src/chrome/content/rules/wikidot.com.xml
new file mode 100644
index 000000000000..aec74e9bcdfd
--- /dev/null
+++ b/src/chrome/content/rules/wikidot.com.xml
@@ -0,0 +1,55 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/wikipediocracy.com.xml b/src/chrome/content/rules/wikipediocracy.com.xml
new file mode 100644
index 000000000000..7b01a93b8daa
--- /dev/null
+++ b/src/chrome/content/rules/wikipediocracy.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/wiltshire.police.uk-resources.xml b/src/chrome/content/rules/wiltshire.police.uk-resources.xml
index 2e70ca4d9e94..d884e43e77d0 100644
--- a/src/chrome/content/rules/wiltshire.police.uk-resources.xml
+++ b/src/chrome/content/rules/wiltshire.police.uk-resources.xml
@@ -10,7 +10,7 @@ Fetch error: http://www.wiltshire.police.uk/cache/widgetkit/widgetkit-a8627bc1.c
 	and no mixed content secured.
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/windows93.net.xml b/src/chrome/content/rules/windows93.net.xml
new file mode 100644
index 000000000000..e005f30b7f01
--- /dev/null
+++ b/src/chrome/content/rules/windows93.net.xml
@@ -0,0 +1,13 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/winehq.org.ru.xml b/src/chrome/content/rules/winehq.org.ru.xml
new file mode 100644
index 000000000000..8936d6851b41
--- /dev/null
+++ b/src/chrome/content/rules/winehq.org.ru.xml
@@ -0,0 +1,15 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/wipe.de.xml b/src/chrome/content/rules/wipe.de.xml
index 8ecebb3de6da..1fd96ce9a331 100644
--- a/src/chrome/content/rules/wipe.de.xml
+++ b/src/chrome/content/rules/wipe.de.xml
@@ -1,23 +1,23 @@
-
 
 
         
         
-                
+        
 
         
diff --git a/src/chrome/content/rules/wired.co.uk.xml b/src/chrome/content/rules/wired.co.uk.xml
index 32c56bf50cc3..60797809c4e7 100644
--- a/src/chrome/content/rules/wired.co.uk.xml
+++ b/src/chrome/content/rules/wired.co.uk.xml
@@ -28,7 +28,7 @@
 
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/wisdomweb.ru.xml b/src/chrome/content/rules/wisdomweb.ru.xml
new file mode 100644
index 000000000000..14ee1633090e
--- /dev/null
+++ b/src/chrome/content/rules/wisdomweb.ru.xml
@@ -0,0 +1,31 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/wku.edu.xml b/src/chrome/content/rules/wku.edu.xml
index 74897377b5ab..62a2aa261f49 100644
--- a/src/chrome/content/rules/wku.edu.xml
+++ b/src/chrome/content/rules/wku.edu.xml
@@ -60,14 +60,14 @@ Fetch error: http://ecas-sso.wku.edu/ => https://ecas-sso.wku.edu/: (6, 'Could n
 		- Image on (www.)? from img.youtube.com ˢ
 
 		- Bugs, on:
-		
+
 			- alumni from www.facebook.com ˢ
 			- alumni from www.intagme.com ˢ
-		
+
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/wokingham.gov.uk.xml b/src/chrome/content/rules/wokingham.gov.uk.xml
index 83e9b721fad5..55222726ce53 100644
--- a/src/chrome/content/rules/wokingham.gov.uk.xml
+++ b/src/chrome/content/rules/wokingham.gov.uk.xml
@@ -42,7 +42,7 @@ Fetch error: http://www.wokingham.gov.uk/contacts/ => https://www.wokingham.gov.
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/wolfbeast.com.xml b/src/chrome/content/rules/wolfbeast.com.xml
new file mode 100644
index 000000000000..d5e433eba64a
--- /dev/null
+++ b/src/chrome/content/rules/wolfbeast.com.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/wolfssl.com.xml b/src/chrome/content/rules/wolfssl.com.xml
new file mode 100644
index 000000000000..71b73f39af0b
--- /dev/null
+++ b/src/chrome/content/rules/wolfssl.com.xml
@@ -0,0 +1,5 @@
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/word.camera.xml b/src/chrome/content/rules/word.camera.xml
index d331e77ee368..7ef0c50b4a3a 100644
--- a/src/chrome/content/rules/word.camera.xml
+++ b/src/chrome/content/rules/word.camera.xml
@@ -5,7 +5,7 @@ Fetch error: http://word.camera/ => https://word.camera/: (28, 'Connection timed
 Fetch error: http://www.word.camera/ => https://word.camera/: (28, 'Connection timed out after 20000 milliseconds')
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/wordreference.com.xml b/src/chrome/content/rules/wordreference.com.xml
new file mode 100644
index 000000000000..78f278e4c536
--- /dev/null
+++ b/src/chrome/content/rules/wordreference.com.xml
@@ -0,0 +1,19 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/worldofplayers.de.xml b/src/chrome/content/rules/worldofplayers.de.xml
new file mode 100644
index 000000000000..c901c1eb0a31
--- /dev/null
+++ b/src/chrome/content/rules/worldofplayers.de.xml
@@ -0,0 +1,27 @@
+
+
+
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/worldofspectrum.org.xml b/src/chrome/content/rules/worldofspectrum.org.xml
new file mode 100644
index 000000000000..6d50695cef7e
--- /dev/null
+++ b/src/chrome/content/rules/worldofspectrum.org.xml
@@ -0,0 +1,21 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/wpitchoune.net.xml b/src/chrome/content/rules/wpitchoune.net.xml
new file mode 100644
index 000000000000..1b420aaf9d17
--- /dev/null
+++ b/src/chrome/content/rules/wpitchoune.net.xml
@@ -0,0 +1,34 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+
diff --git a/src/chrome/content/rules/wsj.com.xml b/src/chrome/content/rules/wsj.com.xml
deleted file mode 100644
index ac6798cb8ba1..000000000000
--- a/src/chrome/content/rules/wsj.com.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-		
-
-		
-		
-
-
-	
-	
-	
-	
-	
-	
-
-	
-	
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/www.browserscope.org.xml b/src/chrome/content/rules/www.browserscope.org.xml
deleted file mode 100644
index b14ffd8a5da0..000000000000
--- a/src/chrome/content/rules/www.browserscope.org.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-	
-	
-	
-
diff --git a/src/chrome/content/rules/www.inet.no.xml b/src/chrome/content/rules/www.inet.no.xml
new file mode 100644
index 000000000000..de4eed1ddf2b
--- /dev/null
+++ b/src/chrome/content/rules/www.inet.no.xml
@@ -0,0 +1,8 @@
+
+	
+	
+	
+
diff --git a/src/chrome/content/rules/www.tecgraf.puc-rio.br.xml b/src/chrome/content/rules/www.tecgraf.puc-rio.br.xml
new file mode 100644
index 000000000000..fb696f136348
--- /dev/null
+++ b/src/chrome/content/rules/www.tecgraf.puc-rio.br.xml
@@ -0,0 +1,4 @@
+
+	
+	
+
diff --git a/src/chrome/content/rules/wz2100.net.xml b/src/chrome/content/rules/wz2100.net.xml
new file mode 100644
index 000000000000..195c20200343
--- /dev/null
+++ b/src/chrome/content/rules/wz2100.net.xml
@@ -0,0 +1,48 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/x-pay.cc.xml b/src/chrome/content/rules/x-pay.cc.xml
deleted file mode 100644
index 4520c6d6bbba..000000000000
--- a/src/chrome/content/rules/x-pay.cc.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-	
-
-	
-
-	
-
-	
-
diff --git a/src/chrome/content/rules/x-ways.net.xml b/src/chrome/content/rules/x-ways.net.xml
new file mode 100644
index 000000000000..cd0d645afc5d
--- /dev/null
+++ b/src/chrome/content/rules/x-ways.net.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/x360ce.com.xml b/src/chrome/content/rules/x360ce.com.xml
new file mode 100644
index 000000000000..32569540740b
--- /dev/null
+++ b/src/chrome/content/rules/x360ce.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/xael.org.xml b/src/chrome/content/rules/xael.org.xml
new file mode 100644
index 000000000000..4d4237822b00
--- /dev/null
+++ b/src/chrome/content/rules/xael.org.xml
@@ -0,0 +1,24 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/xcelab.net.xml b/src/chrome/content/rules/xcelab.net.xml
new file mode 100644
index 000000000000..624f8c156987
--- /dev/null
+++ b/src/chrome/content/rules/xcelab.net.xml
@@ -0,0 +1,8 @@
+
+
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/xchange.cc.xml b/src/chrome/content/rules/xchange.cc.xml
index 05a788f82c44..1c2afa60b4c2 100644
--- a/src/chrome/content/rules/xchange.cc.xml
+++ b/src/chrome/content/rules/xchange.cc.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.xchange.cc/ => https://www.xchange.cc/: (28, 'Operation
 Fetch error: http://support.xchange.cc/ => https://support.xchange.cc/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/xchange.is.xml b/src/chrome/content/rules/xchange.is.xml
index 6b219601c4e8..a639a48bdd7f 100644
--- a/src/chrome/content/rules/xchange.is.xml
+++ b/src/chrome/content/rules/xchange.is.xml
@@ -5,7 +5,7 @@ Fetch error: http://xchange.is/ => https://xchange.is/: (60, 'SSL certificate pr
 Fetch error: http://www.xchange.is/ => https://www.xchange.is/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 	
 	
 
diff --git a/src/chrome/content/rules/xiala.net.xml b/src/chrome/content/rules/xiala.net.xml
index 270cc3bd1b12..1027a94997fa 100644
--- a/src/chrome/content/rules/xiala.net.xml
+++ b/src/chrome/content/rules/xiala.net.xml
@@ -6,7 +6,7 @@ Fetch error: http://piwik.xiala.net/ => https://piwik.xiala.net/: (60, 'SSL cert
 	(www.)?xiala.net: expired
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/ximalaya.xml b/src/chrome/content/rules/ximalaya.xml
new file mode 100644
index 000000000000..e2bc836cd94a
--- /dev/null
+++ b/src/chrome/content/rules/ximalaya.xml
@@ -0,0 +1,17 @@
+
+	
+	
+	
+	
+	
+
+	
+		
+	
+		
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/xlove.com.xml b/src/chrome/content/rules/xlove.com.xml
index 4c19bf12dbc7..ca73f32e05d4 100644
--- a/src/chrome/content/rules/xlove.com.xml
+++ b/src/chrome/content/rules/xlove.com.xml
@@ -12,7 +12,7 @@ Fetch error: http://www.xlove.com/ => https://www.xlove.com/: (51, "SSL: no alte
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/xn--90aijkdmaud0d.xn--p1ai.xml b/src/chrome/content/rules/xn--90aijkdmaud0d.xn--p1ai.xml
index 45dbf3b18782..990f470f1151 100644
--- a/src/chrome/content/rules/xn--90aijkdmaud0d.xn--p1ai.xml
+++ b/src/chrome/content/rules/xn--90aijkdmaud0d.xn--p1ai.xml
@@ -1,4 +1,4 @@
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/xpda.com.xml b/src/chrome/content/rules/xpda.com.xml
deleted file mode 100644
index 714e6e7b4c06..000000000000
--- a/src/chrome/content/rules/xpda.com.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-	
-	
-
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/xtremegunsandammo.com.xml b/src/chrome/content/rules/xtremegunsandammo.com.xml
index 11fd238f3073..f4f3747bd6ab 100644
--- a/src/chrome/content/rules/xtremegunsandammo.com.xml
+++ b/src/chrome/content/rules/xtremegunsandammo.com.xml
@@ -10,7 +10,7 @@
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/xxxyours.com.xml b/src/chrome/content/rules/xxxyours.com.xml
index 138658e733f0..03a592f9c863 100644
--- a/src/chrome/content/rules/xxxyours.com.xml
+++ b/src/chrome/content/rules/xxxyours.com.xml
@@ -14,7 +14,7 @@ Fetch error: http://srv44c.xxxyours.com/ => https://srv44c.xxxyours.com/: (6, 'C
 	ᶜ See https://owasp.org/index.php/SecureFlag
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/yWorks.com.xml b/src/chrome/content/rules/yWorks.com.xml
index 90a6242fe090..4fd539e7f4da 100644
--- a/src/chrome/content/rules/yWorks.com.xml
+++ b/src/chrome/content/rules/yWorks.com.xml
@@ -1,8 +1,6 @@
 
-
-
-
-
-
+    
+    
+
+    
 
diff --git a/src/chrome/content/rules/yadg.cc.xml b/src/chrome/content/rules/yadg.cc.xml
index 5537f660ac88..8031ac0738b4 100644
--- a/src/chrome/content/rules/yadg.cc.xml
+++ b/src/chrome/content/rules/yadg.cc.xml
@@ -1,6 +1,6 @@
 
   
   
-  
+
 
 
diff --git a/src/chrome/content/rules/yapx.ru.xml b/src/chrome/content/rules/yapx.ru.xml
new file mode 100644
index 000000000000..686a0e2a3df1
--- /dev/null
+++ b/src/chrome/content/rules/yapx.ru.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/yartv.ru.xml b/src/chrome/content/rules/yartv.ru.xml
index f2c9b1d0a1cb..b0ffce84053c 100644
--- a/src/chrome/content/rules/yartv.ru.xml
+++ b/src/chrome/content/rules/yartv.ru.xml
@@ -6,7 +6,7 @@ Fetch error: http://www.yartv.ru/ => https://www.yartv.ru/: (60, 'SSL certificat
 Fetch error: http://cabinet.yartv.ru/ => https://cabinet.yartv.ru/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/yash.osdn.jp.xml b/src/chrome/content/rules/yash.osdn.jp.xml
new file mode 100644
index 000000000000..b6a55b46b26d
--- /dev/null
+++ b/src/chrome/content/rules/yash.osdn.jp.xml
@@ -0,0 +1,5 @@
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/ycbi.org.xml b/src/chrome/content/rules/ycbi.org.xml
index 87e1cc897eec..150294cc2c82 100644
--- a/src/chrome/content/rules/ycbi.org.xml
+++ b/src/chrome/content/rules/ycbi.org.xml
@@ -6,7 +6,7 @@ Fetch error: http://ycbi.org/ => https://ycbi.org/: (60, 'SSL certificate proble
 	www.ycbi.org: Differs from http & ^ycbi.org
 
 -->
-
+
 
 	
 
diff --git a/src/chrome/content/rules/yell.com.xml b/src/chrome/content/rules/yell.com.xml
index 00b89b904c1d..c483a99fa49d 100644
--- a/src/chrome/content/rules/yell.com.xml
+++ b/src/chrome/content/rules/yell.com.xml
@@ -29,7 +29,7 @@ Fetch error: http://st.yell.com/ => https://st.yell.com/: (6, 'Could not resolve
 	ˢ Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/yerkramas.org.xml b/src/chrome/content/rules/yerkramas.org.xml
index 3d4c165ba85d..2dbb5be681aa 100644
--- a/src/chrome/content/rules/yerkramas.org.xml
+++ b/src/chrome/content/rules/yerkramas.org.xml
@@ -5,7 +5,7 @@ Fetch error: http://yerkramas.org/ => https://yerkramas.org/: (51, "SSL: no alte
 Fetch error: http://www.yerkramas.org/ => https://www.yerkramas.org/: (51, "SSL: no alternative certificate subject name matches target host name 'www.yerkramas.org'")
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/yeungrealtors.com.xml b/src/chrome/content/rules/yeungrealtors.com.xml
new file mode 100644
index 000000000000..a3d91ae3897b
--- /dev/null
+++ b/src/chrome/content/rules/yeungrealtors.com.xml
@@ -0,0 +1,16 @@
+
+
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/yfrog.xml b/src/chrome/content/rules/yfrog.xml
index cf015ae3e9f1..072380251a1c 100644
--- a/src/chrome/content/rules/yfrog.xml
+++ b/src/chrome/content/rules/yfrog.xml
@@ -14,7 +14,7 @@ Fetch error: http://www.yfrog.com/ => https://www.yfrog.com/: (28, 'Connection t
 	* Secured by us
 
 -->
-
+
 
 	
diff --git a/src/chrome/content/rules/yikeweiqi.com.xml b/src/chrome/content/rules/yikeweiqi.com.xml
new file mode 100644
index 000000000000..8b177ba86935
--- /dev/null
+++ b/src/chrome/content/rules/yikeweiqi.com.xml
@@ -0,0 +1,35 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+		
+		
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/yilan.io.xml b/src/chrome/content/rules/yilan.io.xml
deleted file mode 100644
index bcd9021ed9e6..000000000000
--- a/src/chrome/content/rules/yilan.io.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/yiwutaro.com.xml b/src/chrome/content/rules/yiwutaro.com.xml
new file mode 100644
index 000000000000..cf8a578927e5
--- /dev/null
+++ b/src/chrome/content/rules/yiwutaro.com.xml
@@ -0,0 +1,10 @@
+
+
+	
+	
+
+
+	
+
+
\ No newline at end of file
diff --git a/src/chrome/content/rules/yoast.com.xml b/src/chrome/content/rules/yoast.com.xml
deleted file mode 100644
index 29496eee6f12..000000000000
--- a/src/chrome/content/rules/yoast.com.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-	
-	
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/yotuku.cn.xml b/src/chrome/content/rules/yotuku.cn.xml
deleted file mode 100644
index 077e15eb0c42..000000000000
--- a/src/chrome/content/rules/yotuku.cn.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-	
-	
-
-	
-
-		
-		
-
-
diff --git a/src/chrome/content/rules/yourcmc.ru.xml b/src/chrome/content/rules/yourcmc.ru.xml
new file mode 100644
index 000000000000..6aa837c20f3a
--- /dev/null
+++ b/src/chrome/content/rules/yourcmc.ru.xml
@@ -0,0 +1,15 @@
+
+
+	
+		
+
+	
+
diff --git a/src/chrome/content/rules/yousuu.com.xml b/src/chrome/content/rules/yousuu.com.xml
index 58fef02408b4..36a6fd3a3cd2 100644
--- a/src/chrome/content/rules/yousuu.com.xml
+++ b/src/chrome/content/rules/yousuu.com.xml
@@ -1,20 +1,15 @@
 
 
-
+
 	
 	
-
 	
-	
 
 	
 
-	
-		
-
 	
 
diff --git a/src/chrome/content/rules/youth.cn.xml b/src/chrome/content/rules/youth.cn.xml
new file mode 100644
index 000000000000..e12f19652176
--- /dev/null
+++ b/src/chrome/content/rules/youth.cn.xml
@@ -0,0 +1,54 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/yoyogames.com.xml b/src/chrome/content/rules/yoyogames.com.xml
index 81ff76cddc31..9e7f06fda7b8 100644
--- a/src/chrome/content/rules/yoyogames.com.xml
+++ b/src/chrome/content/rules/yoyogames.com.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://yoyogames.com/ => https://yoyogames.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
 
 -->
-
+
   
   
 
diff --git a/src/chrome/content/rules/yp.ru.xml b/src/chrome/content/rules/yp.ru.xml
index 9b1838dc4cbf..82b3c31cb3d2 100644
--- a/src/chrome/content/rules/yp.ru.xml
+++ b/src/chrome/content/rules/yp.ru.xml
@@ -4,7 +4,7 @@ Disabled by https-everywhere-checker because:
 Fetch error: http://yp.ru/ => https://yp.ru/: (60, 'SSL certificate problem: certificate has expired')
 
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/yr.no.xml b/src/chrome/content/rules/yr.no.xml
index f2ef88885cd4..063a1d62dd0d 100644
--- a/src/chrome/content/rules/yr.no.xml
+++ b/src/chrome/content/rules/yr.no.xml
@@ -1,44 +1,38 @@
 
 
-
+
 
-	
 	
 	
 	
 	
 	
-
 		
 
 	
+						-->
 	
 
-
 	
 
-
 	
 
diff --git a/src/chrome/content/rules/yuga.ru.xml b/src/chrome/content/rules/yuga.ru.xml
index 76bf882d880b..a1a82fd8b4fd 100644
--- a/src/chrome/content/rules/yuga.ru.xml
+++ b/src/chrome/content/rules/yuga.ru.xml
@@ -9,7 +9,7 @@ biznes. mismatch
 iskra. mismatch
 fckuban. mismatch
 internet. mismatch-->
-
+
 	
 	
 	
diff --git a/src/chrome/content/rules/yuji.ne.jp.xml b/src/chrome/content/rules/yuji.ne.jp.xml
new file mode 100644
index 000000000000..9ccaf13c06e9
--- /dev/null
+++ b/src/chrome/content/rules/yuji.ne.jp.xml
@@ -0,0 +1,10 @@
+
+
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/yunaq.com.xml b/src/chrome/content/rules/yunaq.com.xml
index 72941933a1fc..703e6a0e3ec6 100644
--- a/src/chrome/content/rules/yunaq.com.xml
+++ b/src/chrome/content/rules/yunaq.com.xml
@@ -10,6 +10,6 @@
 	
 	
 	
-	
+
 	
 
diff --git a/src/chrome/content/rules/yuzusushisanmateo.com.xml b/src/chrome/content/rules/yuzusushisanmateo.com.xml
new file mode 100644
index 000000000000..166ab3786514
--- /dev/null
+++ b/src/chrome/content/rules/yuzusushisanmateo.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/yvt.jp.xml b/src/chrome/content/rules/yvt.jp.xml
new file mode 100644
index 000000000000..bb9fa1f650af
--- /dev/null
+++ b/src/chrome/content/rules/yvt.jp.xml
@@ -0,0 +1,21 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	 
+	
+
diff --git a/src/chrome/content/rules/z0r.de.xml b/src/chrome/content/rules/z0r.de.xml
new file mode 100644
index 000000000000..028193f1cdd6
--- /dev/null
+++ b/src/chrome/content/rules/z0r.de.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/zaobao.com.xml b/src/chrome/content/rules/zaobao.com.xml
new file mode 100644
index 000000000000..b843061ce498
--- /dev/null
+++ b/src/chrome/content/rules/zaobao.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/zdf.xml b/src/chrome/content/rules/zdf.xml
index 76f46d5f1634..4e750895ba64 100644
--- a/src/chrome/content/rules/zdf.xml
+++ b/src/chrome/content/rules/zdf.xml
@@ -1,79 +1,76 @@
-
 
-
+
+
 	
 	
 	
 	
+	
 	
+	
 	
-	
-	
+	
 	
 	
 	
 	
 	
 	
+	
 	
 	
 	
 	
 
-	
-	
-
 	
 	
+	
+	
+
+	
+	
+
+	
+	
 
 	
 	
+	
+
+	
+	
+
+	
+	
 
 	
 	
-	
 	
-	
-	
-	
 	
 	
 	
-	
+	
+		
 
 	
 	
 
-	
-	
+	
+	
+
+	
 
diff --git a/src/chrome/content/rules/zerogate.tk.xml b/src/chrome/content/rules/zerogate.tk.xml
deleted file mode 100644
index ab54f37f9ea5..000000000000
--- a/src/chrome/content/rules/zerogate.tk.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-	
-	
-
-	
-
diff --git a/src/chrome/content/rules/zeus-software.com.xml b/src/chrome/content/rules/zeus-software.com.xml
new file mode 100644
index 000000000000..ff4bcb42d939
--- /dev/null
+++ b/src/chrome/content/rules/zeus-software.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/zimuku.la.xml b/src/chrome/content/rules/zimuku.la.xml
new file mode 100644
index 000000000000..265143e934b5
--- /dev/null
+++ b/src/chrome/content/rules/zimuku.la.xml
@@ -0,0 +1,7 @@
+
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/zipPay.com.au.xml b/src/chrome/content/rules/zipPay.com.au.xml
new file mode 100644
index 000000000000..ab571c3d9aeb
--- /dev/null
+++ b/src/chrome/content/rules/zipPay.com.au.xml
@@ -0,0 +1,12 @@
+
+
+	
+	
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/zli.ch.xml b/src/chrome/content/rules/zli.ch.xml
new file mode 100644
index 000000000000..ec102234e2a4
--- /dev/null
+++ b/src/chrome/content/rules/zli.ch.xml
@@ -0,0 +1,8 @@
+
+	
+	
+
+	
+
+	
+
diff --git a/src/chrome/content/rules/zlib.net.xml b/src/chrome/content/rules/zlib.net.xml
new file mode 100644
index 000000000000..7fdb2e50cd61
--- /dev/null
+++ b/src/chrome/content/rules/zlib.net.xml
@@ -0,0 +1,13 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+
+
diff --git a/src/chrome/content/rules/zongheng.com.xml b/src/chrome/content/rules/zongheng.com.xml
index 0c656a979d6d..25175dcc898e 100644
--- a/src/chrome/content/rules/zongheng.com.xml
+++ b/src/chrome/content/rules/zongheng.com.xml
@@ -38,7 +38,7 @@ Fetch error: http://www.zongheng.com/ => https://www.zongheng.com/: (35, 'error:
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
 
 -->
-
+
 
 	
 	
diff --git a/src/chrome/content/rules/zoo-bordeaux-pessac.com.xml b/src/chrome/content/rules/zoo-bordeaux-pessac.com.xml
new file mode 100644
index 000000000000..79c7fe2bdae6
--- /dev/null
+++ b/src/chrome/content/rules/zoo-bordeaux-pessac.com.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/zoo-frankfurt.de.xml b/src/chrome/content/rules/zoo-frankfurt.de.xml
new file mode 100644
index 000000000000..5df4d0d5dbe7
--- /dev/null
+++ b/src/chrome/content/rules/zoo-frankfurt.de.xml
@@ -0,0 +1,6 @@
+
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/zoocdn.com.xml b/src/chrome/content/rules/zoocdn.com.xml
index cfe42d288420..f327635e24a6 100644
--- a/src/chrome/content/rules/zoocdn.com.xml
+++ b/src/chrome/content/rules/zoocdn.com.xml
@@ -7,7 +7,7 @@
 
 
 	
-		
+
 		
 
 
diff --git a/src/chrome/content/rules/zoom.us.xml b/src/chrome/content/rules/zoom.us.xml
deleted file mode 100644
index a333bc168957..000000000000
--- a/src/chrome/content/rules/zoom.us.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-	
-
-		
-		
-
-
-	
-	
-
-	
-
-
-	
-
-
diff --git a/src/chrome/content/rules/zoonegaramalaysia.my.xml b/src/chrome/content/rules/zoonegaramalaysia.my.xml
new file mode 100644
index 000000000000..9fd668018c01
--- /dev/null
+++ b/src/chrome/content/rules/zoonegaramalaysia.my.xml
@@ -0,0 +1,27 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/zrkuban.ru.xml b/src/chrome/content/rules/zrkuban.ru.xml
deleted file mode 100644
index 1853a08160b3..000000000000
--- a/src/chrome/content/rules/zrkuban.ru.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-	
-	
-	
-
diff --git a/src/chrome/content/rules/zsnes.com.xml b/src/chrome/content/rules/zsnes.com.xml
new file mode 100644
index 000000000000..7cef6001a3d7
--- /dev/null
+++ b/src/chrome/content/rules/zsnes.com.xml
@@ -0,0 +1,12 @@
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+
diff --git a/src/chrome/content/rules/zufe.edu.cn.xml b/src/chrome/content/rules/zufe.edu.cn.xml
new file mode 100644
index 000000000000..bd1743c3e7ee
--- /dev/null
+++ b/src/chrome/content/rules/zufe.edu.cn.xml
@@ -0,0 +1,67 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+	
+
\ No newline at end of file
diff --git a/src/chrome/content/rules/zyxel.ru.xml b/src/chrome/content/rules/zyxel.ru.xml
index 5906874baf8f..d65a9e48e081 100644
--- a/src/chrome/content/rules/zyxel.ru.xml
+++ b/src/chrome/content/rules/zyxel.ru.xml
@@ -16,7 +16,7 @@ support.zyxel.ru ⁴
 ¹ mismatch
 ⁴ self signed
 -->
-
+
 	
 	
 	
diff --git a/src/chrome/locale/en/https-everywhere.dtd b/src/chrome/locale/en/https-everywhere.dtd
index e8752886bdc4..cde60e0b4222 100644
--- a/src/chrome/locale/en/https-everywhere.dtd
+++ b/src/chrome/locale/en/https-everywhere.dtd
@@ -2,27 +2,69 @@
 
 
 
+
 
 
 
 
-
-
+
+
+
+
+
+
+
+
+
 
 
 
+
 
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
+
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
 
+
+
 
 
 
@@ -33,3 +75,7 @@
 
 
 
+
+
+
+
diff --git a/src/chrome/locale/en/ssl-observatory.dtd b/src/chrome/locale/en/ssl-observatory.dtd
deleted file mode 100644
index a42567764f7f..000000000000
--- a/src/chrome/locale/en/ssl-observatory.dtd
+++ /dev/null
@@ -1,101 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/test/README.md b/test/README.md
index 2a2dd8709e21..5b4e2441ff27 100644
--- a/test/README.md
+++ b/test/README.md
@@ -1,64 +1,50 @@
-# Tests for HTTPS Everywhere
+# Automated Tests for HTTPS Everywhere
+
+## Running
 
-# Running
     bash test.sh
 
-# Requirements
+## Requirements for Selenium Testing
 
 - Python 3.6
 - Selenium
       - Install Selenium as a python package using ```pip3 install selenium```, or run install-dev-dependencies.sh and it will do the job
 - GeckoDriver
-      - Manually download GeckoDriver from https://github.com/mozilla/geckodriver/releases. Extract the executable to /usr/bin/, so that the pasted executable's full path becomes /usr/bin/geckodriver.
+      - Manually download GeckoDriver from [here](https://github.com/mozilla/geckodriver/releases). Extract the executable to `/usr/bin/`, so that the pasted executable's full path becomes `/usr/bin/geckodriver`.
 
-# Manual tests
+# List of Manual tests
 
-These are test cases to execute manually before a release, and we should
-implement them as automated tests:
+These are integrated into Travis for automated end-to-end testing within Firefox and Chrome/Chromium browsers
 
 # Firefox
-- Visit a site that triggers a ruleset (e.g., Reddit.com). Verify counter appears on HTTPS
-  Everywhere icon.
-- Click HTTPS Everywhere icon menu, click 'show counter'. Verify counter
-  disappears. Verify checkmark disappears from menu item.
-- Click HTTPS Everywhere icon, verify ruleset shows up in green.
-- Click ruleset.
-- Reopen HTTPS Everywhere icon menu, verify ruleset shows up in grey.
-- Reload HTTP version of the site, ensure it doesn't get rewritten now that the
-  ruleset is disabled.
+
+- Visit a site that triggers a ruleset (e.g., Reddit.com).
+- Click HTTPS Everywhere icon, verify ruleset shows up in blue.
+- Click 'show more' text and view ruleset and toggle off ruleset.
+- Reopen HTTPS Everywhere menu, verify ruleset shows up in grey.
+- Reload HTTP version of the site, ensure it doesn't get rewritten now that the ruleset is disabled.
 - Click HTTP Everywhere icon, click ruleset again.
-- Reopen HTTPS Everywhere icon menu, verify ruleset shows up in green.
-- Right-click on a rule, click 'View XML source.' Verify it opens up a dialog
-  box and shows the rule source.
-- Click HTTPS Everywhere icon menu, click 'Block all HTTP requests'. Verify icon
+- Click HTTPS Everywhere icon menu, click 'Encrypt All Sites Eligible'. Verify icon
   turns red.
-- Visit an HTTP site known to not have a rewrite rule. http://amazon.com is a
+- Visit an HTTP site known to not have a rewrite rule. http://http.badssl.com is a
   good example. Verify page does not load.
 - Visit an HTTPS site that contains passive mixed content that is not rewritten
   to HTTPS. https://jacob.hoffman-andrews.com/passive-mixed-content.html is a
   good example. Verify the passive mixed content (e.g., image) does not load.
-- Click icon menu, click 'About HTTPS Everywhere.' Verify dialog opens.
-- Click icon menu, click 'SSL Observatory Preferences.' Verify dialog opens.
-- Click icon menu, click 'Disable HTTPS Everywhere.' Verify icon turns grey.
-- Visit a site that would normally trigger a ruleset. Verify it is not rewritten
-  to HTTPS.
-- Click icon menu, click 'Enable HTTPS Everywhere.' Verify icon turns blue.
-  Verify page reloads and is rewritten to HTTPS.
-- Look at log output, look for errors. Make sure certificates are being
-submitted to SSL Observatory
-- Tools > Web Developer > Browser Toolbox > Console. Check for errors.
-- TODO: Test translations?
+- Click menu, click 'HTTPS Everywhere is ON' to 'HTTPS Everywhere is OFF' Verify icon turns grey.
+- Visit a site that would normally trigger a ruleset. Verify it is not rewritten to HTTPS.
+- Click menu, click 'Enable HTTPS Everywhere.' Verify icon turns blue. Verify page reloads and is rewritten to HTTPS.
+- Look at log output, look for errors.
+- Browser Menu > Web Developer > Web Console. Check for errors.
 
 # Chromium
 
 - Visit a site that triggers a ruleset (e.g., Reddit.com). Verify counter appears
-  on HTTPS Everywhere icon.
-- Click HTTPS Everywhere icon menu. Verify it contains appropriate ruleset.
+  within the HTTPS Everywhere menu under 'show more'.
+- Click HTTPS Everywhere menu. Verify it contains appropriate ruleset.
 - Disable ruleset.
-- Visit HTTP version of the site again. Verify it does not get redirected to
-  HTTPS.
+- Visit HTTP version of the site again. Verify it does not get redirected to HTTPS.
 - Re-enable ruleset.
 - Visit HTTP version of the site again. Verify it does get redirected.
-- Visit site that does not have a ruleset. From icon menu, click 'Add this
-  site', and complete site-adding process.
+- Visit site that does not have a ruleset. Under the 'show more' menu, click 'Add this site', and complete site-adding process.
 - Reload the site. Verify it gets redirected to HTTPS.
diff --git a/test/chromium.sh b/test/chromium.sh
index efc134dba48d..70f6c712a798 100755
--- a/test/chromium.sh
+++ b/test/chromium.sh
@@ -31,11 +31,11 @@ if [ "$1" == "--justrun" ]; then
 	which $BROWSER || BROWSER="chromium"
 	$BROWSER \
 		--user-data-dir="$PROFILE_DIRECTORY" \
-		--load-extension=pkg/crx/ \
+		--load-extension=pkg/crx-cws/ \
 		"$@"
 else
 	./make.sh
 	echo "running tests"
 	CRX_NAME="`ls -tr pkg/*.crx | tail -1`"
-	$XVFB_RUN python3.6 test/script.py Chrome $CRX_NAME
+	$XVFB_RUN python3 test/script.py Chrome $CRX_NAME
 fi
diff --git a/test/fetch.sh b/test/fetch.sh
index 68969e0359bc..6f08359e525b 100755
--- a/test/fetch.sh
+++ b/test/fetch.sh
@@ -19,7 +19,7 @@ if [ "$TO_BE_TESTED" ]; then
   # Do the actual test, using https-everywhere-checker.
   OUTPUT_FILE=`mktemp`
   trap 'rm "$OUTPUT_FILE"' EXIT
-  python3.6 $RULETESTFOLDER/src/https_everywhere_checker/check_rules.py $RULETESTFOLDER/http.checker.config $TO_BE_TESTED 2>&1 | tee $OUTPUT_FILE
+  python3 $RULETESTFOLDER/src/https_everywhere_checker/check_rules.py $RULETESTFOLDER/http.checker.config $TO_BE_TESTED 2>&1 | tee $OUTPUT_FILE
   # Unfortunately, no specific exit codes are available for connection
   # failures, so we catch those with grep.
   if [[ `cat $OUTPUT_FILE | grep ERROR | wc -l` -ge 1 ]]; then
diff --git a/test/firefox.sh b/test/firefox.sh
index 56ec5720ef59..1e99239fdab2 100755
--- a/test/firefox.sh
+++ b/test/firefox.sh
@@ -17,7 +17,7 @@ source utils/mktemp.sh
 # We'll create a Firefox profile here and install HTTPS Everywhere into it.
 PROFILE_DIRECTORY="$(mktemp -d)"
 trap 'rm -r "$PROFILE_DIRECTORY"' EXIT
-HTTPSE_INSTALL_DIRECTORY=$PROFILE_DIRECTORY/extensions/https-everywhere-eff@eff.org
+HTTPSE_INSTALL_FILE=$PROFILE_DIRECTORY/extensions/https-everywhere-eff@eff.org.xpi
 
 # Build the XPI to run all the validations in make.sh, and to ensure that
 # we test what is actually getting built.
@@ -27,15 +27,15 @@ XPI_NAME="`ls -tr pkg/https-everywhere-20*.xpi | tail -1`"
 # Set up a skeleton profile and then install into it.
 # The skeleton contains a few files required to trick Firefox into thinking
 # that the extension was fully installed rather than just unpacked.
-rsync -a test/firefox/test_profile_skeleton/ $PROFILE_DIRECTORY
-unzip -qd $HTTPSE_INSTALL_DIRECTORY $XPI_NAME
+cp -a test/firefox/test_profile_skeleton/* $PROFILE_DIRECTORY
+cp $XPI_NAME $HTTPSE_INSTALL_FILE
 
 die() {
   echo "$@"
   exit 1
 }
 
-if [ ! -d "$HTTPSE_INSTALL_DIRECTORY" ]; then
+if [ ! -f "$HTTPSE_INSTALL_FILE" ]; then
   die "Firefox profile does not have HTTPS Everywhere installed"
 fi
 
@@ -58,8 +58,8 @@ else
 
   PATH=/home/user/geckodriver:$PATH
   if [ -n "$FIREFOX" ]; then
-    $XVFB_RUN python3.6 test/script.py Firefox "$PROFILE_DIRECTORY" $FIREFOX
+    $XVFB_RUN python3 test/script.py Firefox "$PROFILE_DIRECTORY" $FIREFOX
   else
-    $XVFB_RUN python3.6 test/script.py Firefox "$PROFILE_DIRECTORY"
+    $XVFB_RUN python3 test/script.py Firefox "$PROFILE_DIRECTORY"
   fi
 fi
diff --git a/test/firefox/test_profile_skeleton/extensions.json b/test/firefox/test_profile_skeleton/extensions.json
index 5ea29d6ab4dc..471c313bb25c 100644
--- a/test/firefox/test_profile_skeleton/extensions.json
+++ b/test/firefox/test_profile_skeleton/extensions.json
@@ -1,43 +1,48 @@
 {
     "addons": [
         {
-            "aboutURL": "chrome://https-everywhere/content/about.xul",
+            "aboutURL": null,
             "active": true,
             "appDisabled": false,
             "applyBackgroundUpdates": 1,
-            "bootstrap": false,
+            "blocklistState": 0,
+            "blocklistURL": null,
             "defaultLocale": {
-                "creator": "EFF Technologists",
+                "contributors": null,
+                "creator": "extension-devs@eff.org",
                 "description": "Encrypt the Web! Automatically use HTTPS security on many sites.",
+                "developers": null,
                 "homepageURL": "https://www.eff.org/https-everywhere",
-                "name": "HTTPS Everywhere"
+                "name": "HTTPS Everywhere",
+                "translators": null
             },
-            "descriptor": "/tmp/tmp.KvR5nzzEal/extensions/https-everywhere-eff@eff.org",
+            "dependencies": [],
             "foreignInstall": false,
-            "hasBinaryComponents": false,
-            "icon64URL": null,
-            "iconURL": "chrome://https-everywhere/skin/https-everywhere.png",
-            "icons": {},
+            "hidden": false,
+            "iconURL": null,
             "id": "https-everywhere-eff@eff.org",
-            "installDate": 1451269062000,
-            "internalName": null,
-            "locales": [],
+            "installDate": 1559865340000,
+            "installTelemetryInfo": {
+                "method": "link",
+                "source": "unknown"
+            },
+            "loader": null,
             "location": "app-profile",
-            "multiprocessCompatible": true,
-            "optionsType": null,
-            "optionsURL": "chrome://https-everywhere/content/observatory-preferences.xul",
+            "optionsBrowserStyle": true,
+            "optionsType": 5,
             "releaseNotesURI": null,
-            "signedState": 1,
-            "size": 9460335,
+            "seen": true,
+            "signedState": 2,
             "skinnable": false,
             "softDisabled": false,
-            "strictCompatibility": false,
-            "syncGUID": "L3vNFuFgQJ4m",
+            "sourceURI": "https://www.eff.org/files/https-everywhere-latest.xpi",
+            "startupData": null,
+            "strictCompatibility": true,
+            "targetPlatforms": [],
             "type": "extension",
-            "updateDate": 1451269062000,
+            "updateDate": 1559865340000,
             "userDisabled": false,
             "visible": true
         }
-    ],
-    "schemaVersion": 17
+    ]
 }
diff --git a/test/manual.sh b/test/manual.sh
index ccd17286e7ea..d16a977f178c 100755
--- a/test/manual.sh
+++ b/test/manual.sh
@@ -3,4 +3,4 @@
 # coverage for their rules, and performs a network "fetch" test to alert the
 # contributor of potential problems.
 
-exec python3.6 test/rules/src/https_everywhere_checker/check_rules.py test/rules/manual.checker.config "$@"
+exec python3 test/rules/src/https_everywhere_checker/check_rules.py test/rules/manual.checker.config "$@"
diff --git a/test/rules/checker.config.sample b/test/rules/checker.config.sample
index 79bf9191a9bd..d75bbf49f604 100644
--- a/test/rules/checker.config.sample
+++ b/test/rules/checker.config.sample
@@ -34,7 +34,9 @@ connect_timeout = 10
 read_timeout = 15
 redirect_depth = 10
 threads = 10
-#user_agent = Mozilla/5.0 (X11; Linux x86_64; rv:14.0) Gecko/20100101 Firefox/14.0.1
+# user_agent should be that of the latest ESR version on which TBB is based on.
+# https://blog.torproject.org/browser-fingerprinting-introduction-and-challenges-ahead
+#user_agent = Mozilla/5.0 (Windows NT 10.0; rv:68.0) Gecko/20100101 Firefox/68.0
 #curl_verbose = true
 #ssl_version = TLSv1
 fetch_in_subprocess = true
diff --git a/test/rules/coverage.checker.config b/test/rules/coverage.checker.config
index 9979c664513a..8b73bf7cff06 100644
--- a/test/rules/coverage.checker.config
+++ b/test/rules/coverage.checker.config
@@ -8,14 +8,16 @@ check_target_validity = true
 check_nonmatch_groups = true
 check_test_formatting = true
 include_default_off = false
-skiplist = utils/ruleset-whitelist.csv
+skiplist = utils/ruleset-allowlist.csv
 skipfield = 1
 
 [certificates]
 basedir = test/rules/platform_certs
 
 [http]
-user_agent = Mozilla/5.0 (X11; Linux x86_64; rv:36.0) Gecko/20100101 Firefox/36.0
+# user_agent should be that of the latest ESR version on which TBB is based on.
+# https://blog.torproject.org/browser-fingerprinting-introduction-and-challenges-ahead
+user_agent = Mozilla/5.0 (Windows NT 10.0; rv:68.0) Gecko/20100101 Firefox/68.0
 # Don't bother doing HTTP, we are just checking coverage and want it to be fast.
 enabled = false
 connect_timeout = 20
diff --git a/test/rules/disable-broken-rulesets.checker.config b/test/rules/disable-broken-rulesets.checker.config
index 39a5c63bde66..f9156a3e4f62 100644
--- a/test/rules/disable-broken-rulesets.checker.config
+++ b/test/rules/disable-broken-rulesets.checker.config
@@ -18,6 +18,7 @@ read_timeout = 30
 redirect_depth = 10
 threads = 20
 fetch_in_subprocess = false
+ssl_version = TLSv1_2
 
 [log]
 logfile = -
diff --git a/test/rules/http.checker.config b/test/rules/http.checker.config
index 186b55281839..ecdd8e36d802 100644
--- a/test/rules/http.checker.config
+++ b/test/rules/http.checker.config
@@ -8,7 +8,7 @@ check_nonmatch_groups = false
 check_test_formatting = false
 auto_disable = false
 include_default_off = false
-skiplist = utils/ruleset-whitelist.csv
+skiplist = utils/ruleset-allowlist.csv
 skipfield = 2
 
 [certificates]
@@ -16,13 +16,16 @@ skipfield = 2
 basedir = test/rules/platform_certs
 
 [http]
-user_agent = Mozilla/5.0 (X11; Linux x86_64; rv:36.0) Gecko/20100101 Firefox/36.0
+# user_agent should be that of the latest ESR version on which TBB is based on.
+# https://blog.torproject.org/browser-fingerprinting-introduction-and-challenges-ahead
+user_agent = Mozilla/5.0 (Windows NT 10.0; rv:68.0) Gecko/20100101 Firefox/68.0
 enabled = true
 connect_timeout = 20
 read_timeout = 30
 redirect_depth = 10
 threads = 40
 fetch_in_subprocess = false
+ssl_version = TLSv1_2
 
 [log]
 logfile = -
diff --git a/test/rules/manual.checker.config b/test/rules/manual.checker.config
index a043c6269346..74066fc6ae43 100644
--- a/test/rules/manual.checker.config
+++ b/test/rules/manual.checker.config
@@ -13,7 +13,9 @@ check_target_validity = true
 basedir = test/rules/platform_certs
 
 [http]
-user_agent = Mozilla/5.0 (X11; Linux x86_64; rv:36.0) Gecko/20100101 Firefox/36.0
+# user_agent should be that of the latest ESR version on which TBB is based on.
+# https://blog.torproject.org/browser-fingerprinting-introduction-and-challenges-ahead
+user_agent = Mozilla/5.0 (Windows NT 10.0; rv:68.0) Gecko/20100101 Firefox/68.0
 enabled = true
 connect_timeout = 20
 read_timeout = 30
diff --git a/test/rules/platform_certs/FF_transvalid.tar.bz2 b/test/rules/platform_certs/FF_transvalid.tar.bz2
deleted file mode 100644
index a1bebf69560a..000000000000
Binary files a/test/rules/platform_certs/FF_transvalid.tar.bz2 and /dev/null differ
diff --git a/test/rules/platform_certs/cacert/024dc131.0 b/test/rules/platform_certs/cacert/024dc131.0
deleted file mode 120000
index 6d0189fb7b68..000000000000
--- a/test/rules/platform_certs/cacert/024dc131.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-134_Microsec e-Szigno Root CA_Microsec Ltd.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/039c618a.0 b/test/rules/platform_certs/cacert/039c618a.0
deleted file mode 120000
index 9dfccc4f33d9..000000000000
--- a/test/rules/platform_certs/cacert/039c618a.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-063_TÜRKTRUST.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/03f0efa4.0 b/test/rules/platform_certs/cacert/03f0efa4.0
deleted file mode 120000
index 15ddf9aed482..000000000000
--- a/test/rules/platform_certs/cacert/03f0efa4.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-023_Wells Fargo Root Certificate Authority_Wells Fargo.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/062cdee6.0 b/test/rules/platform_certs/cacert/062cdee6.0
deleted file mode 120000
index 47b1577011ef..000000000000
--- a/test/rules/platform_certs/cacert/062cdee6.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-053_GlobalSign_GlobalSign.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/080911ac.0 b/test/rules/platform_certs/cacert/080911ac.0
deleted file mode 120000
index 6bab348d3975..000000000000
--- a/test/rules/platform_certs/cacert/080911ac.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-037_QuoVadis Root Certification Authority_QuoVadis Limited.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/0810ba98.0 b/test/rules/platform_certs/cacert/0810ba98.0
deleted file mode 120000
index 5495374c6604..000000000000
--- a/test/rules/platform_certs/cacert/0810ba98.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-127_Root CA Generalitat Valenciana_Generalitat Valenciana.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/09789157.0 b/test/rules/platform_certs/cacert/09789157.0
deleted file mode 120000
index 5ac973b0d36f..000000000000
--- a/test/rules/platform_certs/cacert/09789157.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-095_Starfield Services Root Certificate Authority - G2_Starfield Technologies, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/0979f948.0 b/test/rules/platform_certs/cacert/0979f948.0
deleted file mode 120000
index 006a77ea8ff5..000000000000
--- a/test/rules/platform_certs/cacert/0979f948.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-001_Akamai Subordinate CA 3_Akamai Technologies Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/0b759015.0 b/test/rules/platform_certs/cacert/0b759015.0
deleted file mode 120000
index b6219d43c3b0..000000000000
--- a/test/rules/platform_certs/cacert/0b759015.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-084_e-Guven Kok Elektronik Sertifika Hizmet Saglayicisi_Elektronik Bilgi Guvenligi A.S.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/0c4c9b6c.0 b/test/rules/platform_certs/cacert/0c4c9b6c.0
deleted file mode 120000
index d7772280e465..000000000000
--- a/test/rules/platform_certs/cacert/0c4c9b6c.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-152_Global Chambersign Root - 2008_AC Camerfirma S.A.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/0d1b923b.0 b/test/rules/platform_certs/cacert/0d1b923b.0
deleted file mode 120000
index d98dd1730a40..000000000000
--- a/test/rules/platform_certs/cacert/0d1b923b.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-058_S-TRUST Authentication and Encryption Root CA 2005-PN_Deutscher Sparkassen Verlag GmbH.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/116bf586.0 b/test/rules/platform_certs/cacert/116bf586.0
deleted file mode 120000
index ff8767595a5c..000000000000
--- a/test/rules/platform_certs/cacert/116bf586.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-096_GeoTrust Primary Certification Authority - G2_GeoTrust Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/157753a5.0 b/test/rules/platform_certs/cacert/157753a5.0
deleted file mode 120000
index 01049dab7cbe..000000000000
--- a/test/rules/platform_certs/cacert/157753a5.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-155_AddTrust External CA Root_AddTrust AB.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/1636090b.0 b/test/rules/platform_certs/cacert/1636090b.0
deleted file mode 120000
index 635418ccc9cf..000000000000
--- a/test/rules/platform_certs/cacert/1636090b.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-040_Hellenic Academic and Research Institutions RootCA 2011_Hellenic Academic and Research Institutions Cert. Authority.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/17974aab.0 b/test/rules/platform_certs/cacert/17974aab.0
deleted file mode 120000
index 31d702dcb1ea..000000000000
--- a/test/rules/platform_certs/cacert/17974aab.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-003_Google Internet Authority_Google Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/18856ac4.0 b/test/rules/platform_certs/cacert/18856ac4.0
deleted file mode 120000
index 18f4ab0b8c59..000000000000
--- a/test/rules/platform_certs/cacert/18856ac4.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-144_SecureSign RootCA11_Japan Certification Services, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/1ec4d31a.0 b/test/rules/platform_certs/cacert/1ec4d31a.0
deleted file mode 120000
index c9323c597ed5..000000000000
--- a/test/rules/platform_certs/cacert/1ec4d31a.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-094_VeriSign, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/201cada0.0 b/test/rules/platform_certs/cacert/201cada0.0
deleted file mode 120000
index a0b20eb3c665..000000000000
--- a/test/rules/platform_certs/cacert/201cada0.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-162_America Online Root Certification Authority 2_America Online Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/20533f91.0 b/test/rules/platform_certs/cacert/20533f91.0
deleted file mode 120000
index ebc335b087a4..000000000000
--- a/test/rules/platform_certs/cacert/20533f91.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-151_DigiNotar Services 1024 CA_DigiNotar.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/20d096ba.0 b/test/rules/platform_certs/cacert/20d096ba.0
deleted file mode 120000
index f20ef6300e72..000000000000
--- a/test/rules/platform_certs/cacert/20d096ba.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-173_http---www.valicert.com-_ValiCert, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/2251b13a.0 b/test/rules/platform_certs/cacert/2251b13a.0
deleted file mode 120000
index 00b2620eae00..000000000000
--- a/test/rules/platform_certs/cacert/2251b13a.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-018_ComSign Secured CA_ComSign.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/244b5494.0 b/test/rules/platform_certs/cacert/244b5494.0
deleted file mode 120000
index b35ec1d89cc5..000000000000
--- a/test/rules/platform_certs/cacert/244b5494.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-150_DigiCert High Assurance EV Root CA_DigiCert Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/24ad0b63.0 b/test/rules/platform_certs/cacert/24ad0b63.0
deleted file mode 120000
index e39ef2280def..000000000000
--- a/test/rules/platform_certs/cacert/24ad0b63.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-086_VeriSign, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/2ab3b959.0 b/test/rules/platform_certs/cacert/2ab3b959.0
deleted file mode 120000
index 6dafc3f28fdb..000000000000
--- a/test/rules/platform_certs/cacert/2ab3b959.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-026_NetLock Expressz (Class C) Tanusitvanykiado_NetLock Halozatbiztonsagi Kft.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/2b349938.0 b/test/rules/platform_certs/cacert/2b349938.0
deleted file mode 120000
index e95f27694487..000000000000
--- a/test/rules/platform_certs/cacert/2b349938.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-008_AffirmTrust Commercial_AffirmTrust.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/2c3e3f84.0 b/test/rules/platform_certs/cacert/2c3e3f84.0
deleted file mode 120000
index 09759c83c900..000000000000
--- a/test/rules/platform_certs/cacert/2c3e3f84.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-109_UTN-USERFirst-Object_The USERTRUST Network.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/2c543cd1.0 b/test/rules/platform_certs/cacert/2c543cd1.0
deleted file mode 120000
index a9f2c096819a..000000000000
--- a/test/rules/platform_certs/cacert/2c543cd1.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-050_GeoTrust Global CA_GeoTrust Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/2cfc4974.0 b/test/rules/platform_certs/cacert/2cfc4974.0
deleted file mode 120000
index b7376048f5fc..000000000000
--- a/test/rules/platform_certs/cacert/2cfc4974.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-057_TDC OCES CA_TDC.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/2e4eed3c.0 b/test/rules/platform_certs/cacert/2e4eed3c.0
deleted file mode 120000
index 92b38bb7f14c..000000000000
--- a/test/rules/platform_certs/cacert/2e4eed3c.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-098_thawte Primary Root CA_thawte, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/2e5ac55d.0 b/test/rules/platform_certs/cacert/2e5ac55d.0
deleted file mode 120000
index 1128f653a65f..000000000000
--- a/test/rules/platform_certs/cacert/2e5ac55d.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-171_DST Root CA X3_Digital Signature Trust Co.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/349f2832.0 b/test/rules/platform_certs/cacert/349f2832.0
deleted file mode 120000
index 12f75068daca..000000000000
--- a/test/rules/platform_certs/cacert/349f2832.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-019_EC-ACC_Agencia Catalana de Certificacio (NIF Q-0801176-I).pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/3513523f.0 b/test/rules/platform_certs/cacert/3513523f.0
deleted file mode 120000
index e496138d8eba..000000000000
--- a/test/rules/platform_certs/cacert/3513523f.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-062_DigiCert Global Root CA_DigiCert Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/381ce4dd.0 b/test/rules/platform_certs/cacert/381ce4dd.0
deleted file mode 120000
index 55c9c41bb996..000000000000
--- a/test/rules/platform_certs/cacert/381ce4dd.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-054_ACEDICOM Root_EDICOM.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/3b2716e5.0 b/test/rules/platform_certs/cacert/3b2716e5.0
deleted file mode 120000
index a4e1338084f5..000000000000
--- a/test/rules/platform_certs/cacert/3b2716e5.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-010_EBG Elektronik Sertifika Hizmet Sağlayıcısı_EBG Bilişim Teknolojileri ve Hizmetleri A.Ş.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/3bde41ac.0 b/test/rules/platform_certs/cacert/3bde41ac.0
deleted file mode 120000
index d74cc2199808..000000000000
--- a/test/rules/platform_certs/cacert/3bde41ac.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-141_Autoridad de Certificacion Firmaprofesional CIF A62634068.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/3e45d192.0 b/test/rules/platform_certs/cacert/3e45d192.0
deleted file mode 120000
index 449759f7648c..000000000000
--- a/test/rules/platform_certs/cacert/3e45d192.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-125_Hongkong Post Root CA 1_Hongkong Post.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/3ee7e181.0 b/test/rules/platform_certs/cacert/3ee7e181.0
deleted file mode 120000
index 9f0fb7c77c45..000000000000
--- a/test/rules/platform_certs/cacert/3ee7e181.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-046_IGC-A_PM-SGDN.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/40547a79.0 b/test/rules/platform_certs/cacert/40547a79.0
deleted file mode 120000
index b57a35f38c46..000000000000
--- a/test/rules/platform_certs/cacert/40547a79.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-132_COMODO Certification Authority_COMODO CA Limited.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/415660c1.0 b/test/rules/platform_certs/cacert/415660c1.0
deleted file mode 120000
index e39b2b21389e..000000000000
--- a/test/rules/platform_certs/cacert/415660c1.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-078_VeriSign, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/415660c1.1 b/test/rules/platform_certs/cacert/415660c1.1
deleted file mode 120000
index ec6c6568c9f5..000000000000
--- a/test/rules/platform_certs/cacert/415660c1.1
+++ /dev/null
@@ -1 +0,0 @@
-Cert-100_VeriSign, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/4304c5e5.0 b/test/rules/platform_certs/cacert/4304c5e5.0
deleted file mode 120000
index bd1e2b934e26..000000000000
--- a/test/rules/platform_certs/cacert/4304c5e5.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-065_Network Solutions Certificate Authority_Network Solutions L.L.C.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/442adcac.0 b/test/rules/platform_certs/cacert/442adcac.0
deleted file mode 120000
index 4e2eeb062ee8..000000000000
--- a/test/rules/platform_certs/cacert/442adcac.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-024_Certum CA_Unizeto Sp. z o.o.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/4597689c.0 b/test/rules/platform_certs/cacert/4597689c.0
deleted file mode 120000
index c132031f8bdd..000000000000
--- a/test/rules/platform_certs/cacert/4597689c.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-059_Equifax Secure.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/46f053f0.0 b/test/rules/platform_certs/cacert/46f053f0.0
deleted file mode 120000
index 68032ae6dc7d..000000000000
--- a/test/rules/platform_certs/cacert/46f053f0.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-106_DigiNotar Root CA_DigiNotar.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/480720ec.0 b/test/rules/platform_certs/cacert/480720ec.0
deleted file mode 120000
index 23ea788c1586..000000000000
--- a/test/rules/platform_certs/cacert/480720ec.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-130_GeoTrust Primary Certification Authority_GeoTrust Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/48bec511.0 b/test/rules/platform_certs/cacert/48bec511.0
deleted file mode 120000
index 4d2a54f0590b..000000000000
--- a/test/rules/platform_certs/cacert/48bec511.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-164_Certum Trusted Network CA_Unizeto Technologies S.A.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/4a6481c9.0 b/test/rules/platform_certs/cacert/4a6481c9.0
deleted file mode 120000
index dbc32b8cce18..000000000000
--- a/test/rules/platform_certs/cacert/4a6481c9.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-066_GlobalSign_GlobalSign.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/4bfab552.0 b/test/rules/platform_certs/cacert/4bfab552.0
deleted file mode 120000
index a18ef4893b2e..000000000000
--- a/test/rules/platform_certs/cacert/4bfab552.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-131_Starfield Root Certificate Authority - G2_Starfield Technologies, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/4f316efb.0 b/test/rules/platform_certs/cacert/4f316efb.0
deleted file mode 120000
index 7ad45aefeeda..000000000000
--- a/test/rules/platform_certs/cacert/4f316efb.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-055_SwissSign Gold CA - G2_SwissSign AG.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/55a10908.0 b/test/rules/platform_certs/cacert/55a10908.0
deleted file mode 120000
index 0d3fdd6939e3..000000000000
--- a/test/rules/platform_certs/cacert/55a10908.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-104_http---www.valicert.com-_ValiCert, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/5620c4aa.0 b/test/rules/platform_certs/cacert/5620c4aa.0
deleted file mode 120000
index a420c57b7792..000000000000
--- a/test/rules/platform_certs/cacert/5620c4aa.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-169_TC TrustCenter Class 3 CA II_TC TrustCenter GmbH.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/56657bde.0 b/test/rules/platform_certs/cacert/56657bde.0
deleted file mode 120000
index 239ef9e6e534..000000000000
--- a/test/rules/platform_certs/cacert/56657bde.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-088_Trusted Certificate Services_Comodo CA Limited.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/578d5c04.0 b/test/rules/platform_certs/cacert/578d5c04.0
deleted file mode 120000
index c75b1d7b72a6..000000000000
--- a/test/rules/platform_certs/cacert/578d5c04.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-165_Equifax.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/57b0f75e.0 b/test/rules/platform_certs/cacert/57b0f75e.0
deleted file mode 120000
index 63f2bf821949..000000000000
--- a/test/rules/platform_certs/cacert/57b0f75e.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-103_UTN-USERFirst-Network Applications_The USERTRUST Network.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/57bbd831.0 b/test/rules/platform_certs/cacert/57bbd831.0
deleted file mode 120000
index 0487e5f8d6a8..000000000000
--- a/test/rules/platform_certs/cacert/57bbd831.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-080_Japanese Government.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/57bcb2da.0 b/test/rules/platform_certs/cacert/57bcb2da.0
deleted file mode 120000
index 1983861b99c6..000000000000
--- a/test/rules/platform_certs/cacert/57bcb2da.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-027_SwissSign Silver CA - G2_SwissSign AG.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/590d426f.0 b/test/rules/platform_certs/cacert/590d426f.0
deleted file mode 120000
index 22ec948bfc8d..000000000000
--- a/test/rules/platform_certs/cacert/590d426f.0
+++ /dev/null
@@ -1 +0,0 @@
-cacert3.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/590d426f.1 b/test/rules/platform_certs/cacert/590d426f.1
deleted file mode 120000
index df704295c595..000000000000
--- a/test/rules/platform_certs/cacert/590d426f.1
+++ /dev/null
@@ -1 +0,0 @@
-cacert2.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/5ad8a5d6.0 b/test/rules/platform_certs/cacert/5ad8a5d6.0
deleted file mode 120000
index 4c23196367c8..000000000000
--- a/test/rules/platform_certs/cacert/5ad8a5d6.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-113_GlobalSign Root CA_GlobalSign nv-sa.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/5c44d531.0 b/test/rules/platform_certs/cacert/5c44d531.0
deleted file mode 120000
index 69de477e60f6..000000000000
--- a/test/rules/platform_certs/cacert/5c44d531.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-145_Staat der Nederlanden Root CA - G2_Staat der Nederlanden.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/5e5a5bcb.0 b/test/rules/platform_certs/cacert/5e5a5bcb.0
deleted file mode 120000
index c3248b5ee689..000000000000
--- a/test/rules/platform_certs/cacert/5e5a5bcb.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-005_GeoTrust SSL CA_GeoTrust, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/5f267794.0 b/test/rules/platform_certs/cacert/5f267794.0
deleted file mode 120000
index 8be8d1c6402b..000000000000
--- a/test/rules/platform_certs/cacert/5f267794.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-112_Entrust.net Secure Server Certification Authority_Entrust.net.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/6410666e.0 b/test/rules/platform_certs/cacert/6410666e.0
deleted file mode 120000
index b3276def52ad..000000000000
--- a/test/rules/platform_certs/cacert/6410666e.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-153_Government Root Certification Authority.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/653b494a.0 b/test/rules/platform_certs/cacert/653b494a.0
deleted file mode 120000
index 96bba44f8e69..000000000000
--- a/test/rules/platform_certs/cacert/653b494a.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-157_Baltimore CyberTrust Root_Baltimore.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/65b876bd.0 b/test/rules/platform_certs/cacert/65b876bd.0
deleted file mode 120000
index ce22e36fe8c7..000000000000
--- a/test/rules/platform_certs/cacert/65b876bd.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-047_TÜRKTRUST.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/667c66d4.0 b/test/rules/platform_certs/cacert/667c66d4.0
deleted file mode 120000
index 0a77ebf6798e..000000000000
--- a/test/rules/platform_certs/cacert/667c66d4.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-136_Swisscom Root CA 1_Swisscom.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/67d559d1.0 b/test/rules/platform_certs/cacert/67d559d1.0
deleted file mode 120000
index 3c7b543fc037..000000000000
--- a/test/rules/platform_certs/cacert/67d559d1.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-012_Sonera Class1 CA_Sonera.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/6b99d060.0 b/test/rules/platform_certs/cacert/6b99d060.0
deleted file mode 120000
index 8a313193b693..000000000000
--- a/test/rules/platform_certs/cacert/6b99d060.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-138_Entrust Root Certification Authority_Entrust, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/6cc3c4c3.0 b/test/rules/platform_certs/cacert/6cc3c4c3.0
deleted file mode 120000
index 0c2ea8bf5cbf..000000000000
--- a/test/rules/platform_certs/cacert/6cc3c4c3.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-168_Thawte Server CA_Thawte Consulting cc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/6e7f22c1.0 b/test/rules/platform_certs/cacert/6e7f22c1.0
deleted file mode 120000
index 275120cd134f..000000000000
--- a/test/rules/platform_certs/cacert/6e7f22c1.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-002_VeriSign Class 3 Extended Validation SSL CA_VeriSign, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/6f2c1157.0 b/test/rules/platform_certs/cacert/6f2c1157.0
deleted file mode 120000
index 719e7a36fbef..000000000000
--- a/test/rules/platform_certs/cacert/6f2c1157.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-148_AC Raíz Certicámara S.A._Sociedad Cameral de Certificación Digital - Certicámara S.A.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/706f604c.0 b/test/rules/platform_certs/cacert/706f604c.0
deleted file mode 120000
index c3bd5238238d..000000000000
--- a/test/rules/platform_certs/cacert/706f604c.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-032_XRamp Global Certification Authority_XRamp Security Services Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/76cb8f92.0 b/test/rules/platform_certs/cacert/76cb8f92.0
deleted file mode 120000
index 62cf17bc61ea..000000000000
--- a/test/rules/platform_certs/cacert/76cb8f92.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-091_Cybertrust Global Root_Cybertrust, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/76faf6c0.0 b/test/rules/platform_certs/cacert/76faf6c0.0
deleted file mode 120000
index bb754d394010..000000000000
--- a/test/rules/platform_certs/cacert/76faf6c0.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-135_QuoVadis Root CA 3_QuoVadis Limited.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/778e3cb0.0 b/test/rules/platform_certs/cacert/778e3cb0.0
deleted file mode 120000
index 0c4542068b84..000000000000
--- a/test/rules/platform_certs/cacert/778e3cb0.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-064_UTN - DATACorp SGC_The USERTRUST Network.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/790a7190.0 b/test/rules/platform_certs/cacert/790a7190.0
deleted file mode 120000
index e8826c8b6d87..000000000000
--- a/test/rules/platform_certs/cacert/790a7190.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-089_DST ACES CA X6_Digital Signature Trust.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/79ad8b43.0 b/test/rules/platform_certs/cacert/79ad8b43.0
deleted file mode 120000
index 6dcbf591f1ea..000000000000
--- a/test/rules/platform_certs/cacert/79ad8b43.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-092_Equifax Secure eBusiness CA-1_Equifax Secure Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/7d0b38bd.0 b/test/rules/platform_certs/cacert/7d0b38bd.0
deleted file mode 120000
index 0b02810f8557..000000000000
--- a/test/rules/platform_certs/cacert/7d0b38bd.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-007_VeriSign Class 3 Public Primary Certification Authority - G4_VeriSign, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/7d5a75e4.0 b/test/rules/platform_certs/cacert/7d5a75e4.0
deleted file mode 120000
index 0eb8b08ff645..000000000000
--- a/test/rules/platform_certs/cacert/7d5a75e4.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-147_WellsSecure Public Root Certificate Authority_Wells Fargo WellsSecure.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/812e17de.0 b/test/rules/platform_certs/cacert/812e17de.0
deleted file mode 120000
index 86845e20c2fc..000000000000
--- a/test/rules/platform_certs/cacert/812e17de.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-009_Deutsche Telekom Root CA 2_Deutsche Telekom AG.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/8160b96c.0 b/test/rules/platform_certs/cacert/8160b96c.0
deleted file mode 120000
index db8d6a0b720f..000000000000
--- a/test/rules/platform_certs/cacert/8160b96c.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-045_Microsec e-Szigno Root CA 2009_Microsec Ltd.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/84009bc3.0 b/test/rules/platform_certs/cacert/84009bc3.0
deleted file mode 120000
index 49274f2bda8a..000000000000
--- a/test/rules/platform_certs/cacert/84009bc3.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-035_DigiNotar Cyber CA_DigiNotar.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/861a399d.0 b/test/rules/platform_certs/cacert/861a399d.0
deleted file mode 120000
index 7c8ca7c81541..000000000000
--- a/test/rules/platform_certs/cacert/861a399d.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-149_AddTrust Class 1 CA Root_AddTrust AB.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/861e0100.0 b/test/rules/platform_certs/cacert/861e0100.0
deleted file mode 120000
index ef22b886e221..000000000000
--- a/test/rules/platform_certs/cacert/861e0100.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-006_NetLock Minositett Kozjegyzoi (Class QA) Tanusitvanykiado_NetLock Halozatbiztonsagi Kft.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/8867006a.0 b/test/rules/platform_certs/cacert/8867006a.0
deleted file mode 120000
index 88a42363a87c..000000000000
--- a/test/rules/platform_certs/cacert/8867006a.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-166_GeoTrust Universal CA 2_GeoTrust Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/88f89ea7.0 b/test/rules/platform_certs/cacert/88f89ea7.0
deleted file mode 120000
index 550fd007101a..000000000000
--- a/test/rules/platform_certs/cacert/88f89ea7.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-029_TÜRKTRUST.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/8b59b1ad.0 b/test/rules/platform_certs/cacert/8b59b1ad.0
deleted file mode 120000
index 2e6e0bb75fbb..000000000000
--- a/test/rules/platform_certs/cacert/8b59b1ad.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-038_AddTrust Public CA Root_AddTrust AB.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/8d86cdd1.0 b/test/rules/platform_certs/cacert/8d86cdd1.0
deleted file mode 120000
index 94bfc5a438a5..000000000000
--- a/test/rules/platform_certs/cacert/8d86cdd1.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-143_certSIGN.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/8e52d3cd.0 b/test/rules/platform_certs/cacert/8e52d3cd.0
deleted file mode 120000
index 2d6fab7eb3e1..000000000000
--- a/test/rules/platform_certs/cacert/8e52d3cd.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-021_Buypass Class 3 CA 1_Buypass AS-983163327.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/8f111d69.0 b/test/rules/platform_certs/cacert/8f111d69.0
deleted file mode 120000
index 53fad336c0d6..000000000000
--- a/test/rules/platform_certs/cacert/8f111d69.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-049_MD5 Collisions Inc. (http---www.phreedom.org-md5).pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/93bc0acc.0 b/test/rules/platform_certs/cacert/93bc0acc.0
deleted file mode 120000
index ea08bd899e09..000000000000
--- a/test/rules/platform_certs/cacert/93bc0acc.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-117_AffirmTrust Networking_AffirmTrust.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/94010abc.0 b/test/rules/platform_certs/cacert/94010abc.0
deleted file mode 120000
index 893c36266a60..000000000000
--- a/test/rules/platform_certs/cacert/94010abc.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-041_Digisign Server ID - (Enrich)_Digicert Sdn. Bhd.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/9818ca0b.0 b/test/rules/platform_certs/cacert/9818ca0b.0
deleted file mode 120000
index 448e25c3ace6..000000000000
--- a/test/rules/platform_certs/cacert/9818ca0b.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-158_TC TrustCenter Universal CA III_TC TrustCenter GmbH.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/988a38cb.0 b/test/rules/platform_certs/cacert/988a38cb.0
deleted file mode 120000
index 4a66a4eb8992..000000000000
--- a/test/rules/platform_certs/cacert/988a38cb.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-126_NetLock Arany (Class Gold) Főtanúsítvány_NetLock Kft.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/98ec67f0.0 b/test/rules/platform_certs/cacert/98ec67f0.0
deleted file mode 120000
index c0c1bfe10f52..000000000000
--- a/test/rules/platform_certs/cacert/98ec67f0.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-069_Thawte Premium Server CA_Thawte Consulting cc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/99d0fa06.0 b/test/rules/platform_certs/cacert/99d0fa06.0
deleted file mode 120000
index 198d44b6ae78..000000000000
--- a/test/rules/platform_certs/cacert/99d0fa06.0
+++ /dev/null
@@ -1 +0,0 @@
-cacert1.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/9af9f759.0 b/test/rules/platform_certs/cacert/9af9f759.0
deleted file mode 120000
index 87b719840405..000000000000
--- a/test/rules/platform_certs/cacert/9af9f759.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-013_http---www.valicert.com-_ValiCert, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/9b353c9a.0 b/test/rules/platform_certs/cacert/9b353c9a.0
deleted file mode 120000
index 4f0572857da0..000000000000
--- a/test/rules/platform_certs/cacert/9b353c9a.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-076_TDC Internet.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/9c2e7d30.0 b/test/rules/platform_certs/cacert/9c2e7d30.0
deleted file mode 120000
index 9a84fc0ca1b8..000000000000
--- a/test/rules/platform_certs/cacert/9c2e7d30.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-174_Sonera Class2 CA_Sonera.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/9c472bf7.0 b/test/rules/platform_certs/cacert/9c472bf7.0
deleted file mode 120000
index 8bf2d3a7ddc4..000000000000
--- a/test/rules/platform_certs/cacert/9c472bf7.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-163_A-Trust-nQual-03_A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/9c8dfbd4.0 b/test/rules/platform_certs/cacert/9c8dfbd4.0
deleted file mode 120000
index 0c4417258a55..000000000000
--- a/test/rules/platform_certs/cacert/9c8dfbd4.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-102_AffirmTrust Premium ECC_AffirmTrust.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/9d520b32.0 b/test/rules/platform_certs/cacert/9d520b32.0
deleted file mode 120000
index c755a2adad4e..000000000000
--- a/test/rules/platform_certs/cacert/9d520b32.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-074_SECOM Trust Systems CO.,LTD.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/9f541fb4.0 b/test/rules/platform_certs/cacert/9f541fb4.0
deleted file mode 120000
index 98155f6fa84a..000000000000
--- a/test/rules/platform_certs/cacert/9f541fb4.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-075_Digital Signature Trust Co.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/Cert-001_Akamai Subordinate CA 3_Akamai Technologies Inc.pem b/test/rules/platform_certs/cacert/Cert-001_Akamai Subordinate CA 3_Akamai Technologies Inc.pem
deleted file mode 100644
index 132b42c43050..000000000000
--- a/test/rules/platform_certs/cacert/Cert-001_Akamai Subordinate CA 3_Akamai Technologies Inc.pem	
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDxzCCAzCgAwIBAgIEBAAEAzANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJV
-UzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQLEx5HVEUgQ3liZXJU
-cnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0IEds
-b2JhbCBSb290MB4XDTA2MDUxMTE1MzIwMFoXDTEzMDUxMTIzNTkwMFowUTELMAkG
-A1UEBhMCVVMxIDAeBgNVBAoTF0FrYW1haSBUZWNobm9sb2dpZXMgSW5jMSAwHgYD
-VQQDExdBa2FtYWkgU3Vib3JkaW5hdGUgQ0EgMzCBnzANBgkqhkiG9w0BAQEFAAOB
-jQAwgYkCgYEAnTR2c7MmRMRgzHZfj9gvSzoSVoxt1bTirAzhR4qFQxK8A2aFIB1r
-inRyOIVhqXMLV1vbxZ6zZsVR+AqQfPh0FHISgPToWs3IuxEUyUQv7OGvM8FZKd1M
-hXscgN1GpWTPYO9PVZM+BakWJCtI/58Fkt4M559g31Rvpxbu/69hqZ0CAwEAAaOC
-AYYwggGCMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly93d3cucHVibGljLXRydXN0
-LmNvbS9jZ2ktYmluL0NSTC8yMDE4L2NkcC5jcmwwHQYDVR0OBBYEFL45v0Fm+tTO
-i254o0l+3j3ELiv2MFMGA1UdIARMMEowSAYJKwYBBAGxPgEAMDswOQYIKwYBBQUH
-AgEWLWh0dHA6Ly93d3cucHVibGljLXRydXN0LmNvbS9DUFMvT21uaVJvb3QuaHRt
-bDCBoAYDVR0jBIGYMIGVgBSmDB2fYf8HF7W/OEbbQzDVjrBSBqF5pHcwdTELMAkG
-A1UEBhMCVVMxGDAWBgNVBAoTD0dURSBDb3Jwb3JhdGlvbjEnMCUGA1UECxMeR1RF
-IEN5YmVyVHJ1c3QgU29sdXRpb25zLCBJbmMuMSMwIQYDVQQDExpHVEUgQ3liZXJU
-cnVzdCBHbG9iYWwgUm9vdIICAaUwDgYDVR0PAQH/BAQDAgHGMBIGA1UdEwEB/wQI
-MAYBAf8CAQAwDQYJKoZIhvcNAQEFBQADgYEAdofTrk09xGso4VIfeYEe6WIa90/Z
-GsDlBRH6d/n/sSUXXsoZyKzM3HGVzs9mAmDBfv/s2bZw4QNgM0MMNlWNMJddXZcJ
-bZ14M6VWhKYouKEZnaAsSCe+XHsF0haUfOnxpj4p7CZj/DnGZVB8Uh92ORa0lyY5
-q44d/bV6wDodO38=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-002_VeriSign Class 3 Extended Validation SSL CA_VeriSign, Inc.pem b/test/rules/platform_certs/cacert/Cert-002_VeriSign Class 3 Extended Validation SSL CA_VeriSign, Inc.pem
deleted file mode 100644
index c5ab1d9fa04e..000000000000
--- a/test/rules/platform_certs/cacert/Cert-002_VeriSign Class 3 Extended Validation SSL CA_VeriSign, Inc.pem	
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIF5DCCBMygAwIBAgIQW3dZxheE4V7HJ8AylSkoazANBgkqhkiG9w0BAQUFADCB
-yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
-U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
-ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMTYxMTA3MjM1OTU5WjCBujEL
-MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
-ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2UgYXQg
-aHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwNjE0MDIGA1UEAxMrVmVy
-aVNpZ24gQ2xhc3MgMyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNTTCBDQTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJjboFXrnP0XeeOabhQdsVuYI4cWbod2
-nLU4O7WgerQHYwkZ5iqISKnnnbYwWgiXDOyq5BZpcmIjmvt6VCiYxQwtt9citsj5
-OBfH3doxRpqUFI6e7nigtyLUSVSXTeV0W5K87Gws3+fBthsaVWtmCAN/Ra+aM/EQ
-wGyZSpIkMQht3QI+YXZ4eLbtfjeubPOJ4bfh3BXMt1afgKCxBX9ONxX/ty8ejwY4
-P1C3aSijtWZfNhpSSENmUt+ikk/TGGC+4+peGXEFv54cbGhyJW+ze3PJbb0S/5tB
-Ml706H7FC6NMZNFOvCYIZfsZl1h44TO/7Wg+sSdFb8Di7Jdp91zT91ECAwEAAaOC
-AdIwggHOMB0GA1UdDgQWBBT8ilC6nrklWntVhU+VAGOP6VhrQzASBgNVHRMBAf8E
-CDAGAQH/AgEAMD0GA1UdIAQ2MDQwMgYEVR0gADAqMCgGCCsGAQUFBwIBFhxodHRw
-czovL3d3dy52ZXJpc2lnbi5jb20vY3BzMD0GA1UdHwQ2MDQwMqAwoC6GLGh0dHA6
-Ly9FVlNlY3VyZS1jcmwudmVyaXNpZ24uY29tL3BjYTMtZzUuY3JsMA4GA1UdDwEB
-/wQEAwIBBjARBglghkgBhvhCAQEEBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZ
-MFcwVRYJaW1hZ2UvZ2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7
-GS4wJRYjaHR0cDovL2xvZ28udmVyaXNpZ24uY29tL3ZzbG9nby5naWYwKQYDVR0R
-BCIwIKQeMBwxGjAYBgNVBAMTEUNsYXNzM0NBMjA0OC0xLTQ3MD0GCCsGAQUFBwEB
-BDEwLzAtBggrBgEFBQcwAYYhaHR0cDovL0VWU2VjdXJlLW9jc3AudmVyaXNpZ24u
-Y29tMB8GA1UdIwQYMBaAFH/TZafC3ey78DAJ80M5+gKvMzEzMA0GCSqGSIb3DQEB
-BQUAA4IBAQCWovp/5j3t1CvOtxU/wHIDX4u6FpAl98KD2Md1NGNoElMMU4l7yVYJ
-p8M2RE4O0GJis4b66KGbNGeNUyIXPv2s7mcuQ+JdfzOE8qJwwG6Cl8A0/SXGI3/t
-5rDFV0OEst4t8dD2SB8UcVeyrDHhlyQjyRNddOVG7wl8nuGZMQoIeRuPcZ8XZsg4
-z+6Ml7YGuXNG5NOUweVgtSV1LdlpMezNlsOjdv3odESsErlNv1HoudRETifLriDR
-fip8tmNHnna6l9AW5wtsbfdDbzMLKTB3+p359U64drPNGLT5IO892+bKrZvQTtKH
-qQ2mRHNQ3XBb7a1+Srwi1agm5MKFIA3Z
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-003_Google Internet Authority_Google Inc.pem b/test/rules/platform_certs/cacert/Cert-003_Google Internet Authority_Google Inc.pem
deleted file mode 100644
index 7dc5afd883fe..000000000000
--- a/test/rules/platform_certs/cacert/Cert-003_Google Internet Authority_Google Inc.pem	
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICsDCCAhmgAwIBAgIDC2dxMA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVT
-MRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0
-aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDkwNjA4MjA0MzI3WhcNMTMwNjA3MTk0MzI3
-WjBGMQswCQYDVQQGEwJVUzETMBEGA1UEChMKR29vZ2xlIEluYzEiMCAGA1UEAxMZ
-R29vZ2xlIEludGVybmV0IEF1dGhvcml0eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
-gYkCgYEAye23pIucV+eEPkB9hPSP0XFjU5nneXQUr0SZMyCSjXvlKAy6rWxJfoNf
-NFlOCnowzdDXxFdF7dWq1nMmzq0yE7jXDx07393cCDaob1FEm8rWIFJztyaHNWrb
-qeXUWaUr/GcZOfqTGBhs3t0lig4zFEfC7wFQeeT9adGnwKziV28CAwEAAaOBozCB
-oDAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFL/AMOv1QxE+Z7qekfv8atrjaxIk
-MB8GA1UdIwQYMBaAFEjmaPkr0rKV10fYIyAQTzOYkJ/UMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nZW90cnVzdC5jb20v
-Y3Jscy9zZWN1cmVjYS5jcmwwDQYJKoZIhvcNAQEFBQADgYEAuIojxkiWsRF8YHde
-BZqrocb6ghwYB8TrgbCoZutJqOkM0ymt9e8kTP3kS8p/XmOrmSfLnzYhLLkQYGfN
-0rTw8Ktx5YtaiScRhKqOv5nwnQkhClIZmloJ0pC3+gz4fniisIWvXEyZ2VxVKfml
-UUIuOss4jHg7y/j7lYe8vJD5UDI=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-004_Entrust Certification Authority - L1C_Entrust, Inc.pem b/test/rules/platform_certs/cacert/Cert-004_Entrust Certification Authority - L1C_Entrust, Inc.pem
deleted file mode 100644
index 7461ae60ab7c..000000000000
--- a/test/rules/platform_certs/cacert/Cert-004_Entrust Certification Authority - L1C_Entrust, Inc.pem	
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE8jCCA9qgAwIBAgIEOGPp/DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChML
-RW50cnVzdC5uZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBp
-bmNvcnAuIGJ5IHJlZi4gKGxpbWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5
-IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNVBAMTKkVudHJ1c3QubmV0IENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw0wOTEyMTAyMDQzNTRaFw0xOTEy
-MTAyMTEzNTRaMIGxMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5j
-LjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L3JwYSBpcyBpbmNvcnBvcmF0ZWQg
-YnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAwOSBFbnRydXN0LCBJbmMuMS4w
-LAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFDMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl6MtPJ7eBdoTwhGNnY7jf8dL
-flqfs/9iq3PIKGu6EGSChxPNVxj/KM7A5g4GkVApg9Hywyrb2NtOBMwA64u2lty8
-qvpSdwTB2xnkrpz9PIsD7028GgNl+cGxP3KG8jiqGa4QiHgo2nXDPQKCApy5wWV3
-diRMmPdtMTj72/7bNwJ2oRiXpszeIAlJNiRpQvbkN2LxWW2pPO00nKOO29w61/cK
-b+8u2NWTWnrtCElo4kHjWpDBhlX8UUOd4LLEZ7TLMjEl8FSfS9Fv29Td/K9ebHiQ
-ld7KOki5eTybGdZ1BaD5iNfB6KUJ5BoV3IcjqrJ1jGMlh9j4PabCzGb/pWZoVQID
-AQABo4IBCzCCAQcwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wMwYI
-KwYBBQUHAQEEJzAlMCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5lbnRydXN0Lm5l
-dDAyBgNVHR8EKzApMCegJaAjhiFodHRwOi8vY3JsLmVudHJ1c3QubmV0LzIwNDhj
-YS5jcmwwOwYDVR0gBDQwMjAwBgRVHSAAMCgwJgYIKwYBBQUHAgEWGmh0dHA6Ly93
-d3cuZW50cnVzdC5uZXQvcnBhMB0GA1UdDgQWBBQe8auJBvhJDwEzd+4Ueu4ZfJMo
-TTAfBgNVHSMEGDAWgBRV5IHREYC+2Im5CKMx+aEkCRa5cDANBgkqhkiG9w0BAQUF
-AAOCAQEAB/ZfgoR/gEDHkDRGQiQDzi+ruoOeJXMN7awFacaH7aNc8lfBsUl2mk3y
-P93kDv4LPrmY2TKVHTL0Ae6cyMjlP+BTdmL83attPZSQ8sCzPJgnNl4olyL8G0DT
-Kw2ttVdt3w/jS+9zAhBl+hvQrDHV4w/oujIwg+5K0L/fIpB6vuw6G8RJBB3xroB3
-PEII26c7KKaAAQPmOaPr34BZG/MsvtxyRHmgbAelbU1EjkJoypR8Lja6hZ7NqsRe
-PFS+/i/qaZ0cHimbltjI/lGQ8SSmkAaz8Cmi/3gud1xFIdlEADHzvjJP9QoyDfz8
-uhZ2VrLWSJLyi6Y+t6xcaeoLP2ZFuQ==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-005_GeoTrust SSL CA_GeoTrust, Inc.pem b/test/rules/platform_certs/cacert/Cert-005_GeoTrust SSL CA_GeoTrust, Inc.pem
deleted file mode 100644
index a2c26f81ecf2..000000000000
--- a/test/rules/platform_certs/cacert/Cert-005_GeoTrust SSL CA_GeoTrust, Inc.pem	
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID2TCCAsGgAwIBAgIDAjbQMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
-MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
-YWwgQ0EwHhcNMTAwMjE5MjIzOTI2WhcNMjAwMjE4MjIzOTI2WjBAMQswCQYDVQQG
-EwJVUzEXMBUGA1UEChMOR2VvVHJ1c3QsIEluYy4xGDAWBgNVBAMTD0dlb1RydXN0
-IFNTTCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJCzgMHk5Uat
-cGA9uuUU3Z6KXot1WubKbUGlI+g5hSZ6p1V3mkihkn46HhrxJ6ujTDnMyz1Hr4Gu
-FmpcN+9FQf37mpc8oEOdxt8XIdGKolbCA0mEEoE+yQpUYGa5jFTk+eb5lPHgX3UR
-8im55IaisYmtph6DKWOy8FQchQt65+EuDa+kvc3nsVrXjAVaDktzKIt1XTTYdwvh
-dGLicTBi2LyKBeUxY0pUiWozeKdOVSQdl+8a5BLGDzAYtDRN4dgjOyFbLTAZJQ50
-96QhS6CkIMlszZhWwPKoXz4mdaAN+DaIiixafWcwqQ/RmXAueOFRJq9VeiS+jDkN
-d53eAsMMvR8CAwEAAaOB2TCB1jAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFEJ5
-VBthzVUrPmPVPEhX9Z/7Rc5KMB8GA1UdIwQYMBaAFMB6mGiNifurBWQMEX2qfWW4
-ysxOMBIGA1UdEwEB/wQIMAYBAf8CAQAwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDov
-L2NybC5nZW90cnVzdC5jb20vY3Jscy9ndGdsb2JhbC5jcmwwNAYIKwYBBQUHAQEE
-KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5nZW90cnVzdC5jb20wDQYJKoZI
-hvcNAQEFBQADggEBANTvU4ToGr2hiwTAqfVfoRB4RV2yV2pOJMtlTjGXkZrUJPji
-J2ZwMZzBYlQG55cdOprApClICq8kx6jEmlTBfEx4TCtoLF0XplR4TEbigMMfOHES
-0tdT41SFULgCy+5jOvhWiU1Vuy7AyBh3hjELC3DwfjWDpCoTZFZnNF0WX3OsewYk
-2k9QbSqr0E1TQcKOu3EDSSmGGM8hQkx0YlEVxW+o78Qn5Rsz3VqI138S0adhJR/V
-4NwdzxoQ2KDLX4z6DOW/cf/lXUQdpj6HR/oaToODEj+IZpWYeZqF6wJHzSXj8gYE
-TpnKXKBuervdo5AaRTPvvz7SBMS24CqFZUE+ENQ=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-006_NetLock Minositett Kozjegyzoi (Class QA) Tanusitvanykiado_NetLock Halozatbiztonsagi Kft.pem b/test/rules/platform_certs/cacert/Cert-006_NetLock Minositett Kozjegyzoi (Class QA) Tanusitvanykiado_NetLock Halozatbiztonsagi Kft.pem
deleted file mode 100644
index d9368cff33bc..000000000000
--- a/test/rules/platform_certs/cacert/Cert-006_NetLock Minositett Kozjegyzoi (Class QA) Tanusitvanykiado_NetLock Halozatbiztonsagi Kft.pem	
+++ /dev/null
@@ -1,39 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIG0TCCBbmgAwIBAgIBezANBgkqhkiG9w0BAQUFADCByTELMAkGA1UEBhMCSFUx
-ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0
-b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMUIwQAYDVQQD
-EzlOZXRMb2NrIE1pbm9zaXRldHQgS296amVneXpvaSAoQ2xhc3MgUUEpIFRhbnVz
-aXR2YW55a2lhZG8xHjAcBgkqhkiG9w0BCQEWD2luZm9AbmV0bG9jay5odTAeFw0w
-MzAzMzAwMTQ3MTFaFw0yMjEyMTUwMTQ3MTFaMIHJMQswCQYDVQQGEwJIVTERMA8G
-A1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRvbnNh
-Z2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxQjBABgNVBAMTOU5l
-dExvY2sgTWlub3NpdGV0dCBLb3pqZWd5em9pIChDbGFzcyBRQSkgVGFudXNpdHZh
-bnlraWFkbzEeMBwGCSqGSIb3DQEJARYPaW5mb0BuZXRsb2NrLmh1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx1Ilstg91IRVCacbvWy5FPSKAtt2/Goq
-eKvld/Bu4IwjZ9ulZJm53QE+b+8tmjwi8F3JV6BVQX/yQ15YglMxZc4e8ia6AFQe
-r7C8HORSjKAyr7c3sVNnaHRnUPYtLmTeriZ539+Zhqurf4XsoPuAzPS4DB6TRWO5
-3Lhbm+1bOdRfYrCnjnxmOCyqsQhjF2d9zL2z8cM/z1A57dEZgxXbhxInlrfa6uWd
-vLrqOU+L73Sa58XQ0uqGURzk/mQIKAR5BevKxXEOC++r6uwSEaEYBTJp0QwsGj0l
-mT+1fMptsK6ZmfoIYOcZwvK9UdPM0wKswREMgM6r3JSda6M5UzrWhQIDAMV9o4IC
-wDCCArwwEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNVHQ8BAf8EBAMCAQYwggJ1Bglg
-hkgBhvhCAQ0EggJmFoICYkZJR1lFTEVNISBFemVuIHRhbnVzaXR2YW55IGEgTmV0
-TG9jayBLZnQuIE1pbm9zaXRldHQgU3pvbGdhbHRhdGFzaSBTemFiYWx5emF0YWJh
-biBsZWlydCBlbGphcmFzb2sgYWxhcGphbiBrZXN6dWx0LiBBIG1pbm9zaXRldHQg
-ZWxla3Ryb25pa3VzIGFsYWlyYXMgam9naGF0YXMgZXJ2ZW55ZXN1bGVzZW5laywg
-dmFsYW1pbnQgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYSBNaW5vc2l0ZXR0IFN6
-b2xnYWx0YXRhc2kgU3phYmFseXphdGJhbiwgYXogQWx0YWxhbm9zIFN6ZXJ6b2Rl
-c2kgRmVsdGV0ZWxla2JlbiBlbG9pcnQgZWxsZW5vcnplc2kgZWxqYXJhcyBtZWd0
-ZXRlbGUuIEEgZG9rdW1lbnR1bW9rIG1lZ3RhbGFsaGF0b2sgYSBodHRwczovL3d3
-dy5uZXRsb2NrLmh1L2RvY3MvIGNpbWVuIHZhZ3kga2VyaGV0b2sgYXogaW5mb0Bu
-ZXRsb2NrLm5ldCBlLW1haWwgY2ltZW4uIFdBUk5JTkchIFRoZSBpc3N1YW5jZSBh
-bmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGFyZSBzdWJqZWN0IHRvIHRo
-ZSBOZXRMb2NrIFF1YWxpZmllZCBDUFMgYXZhaWxhYmxlIGF0IGh0dHBzOi8vd3d3
-Lm5ldGxvY2suaHUvZG9jcy8gb3IgYnkgZS1tYWlsIGF0IGluZm9AbmV0bG9jay5u
-ZXQwHQYDVR0OBBYEFAlqYhaSsFq7VQ7LdTI6MuWyIckoMA0GCSqGSIb3DQEBBQUA
-A4IBAQCRalCc23iBmz+LQuM7/KbD7kPgz/PigDVJRXYC4uMvBcXxKufAQTPGtpvQ
-MznNwNuhrWw3AkxYQTvyl5LGSKjN5Yo5iWH5Upfpvfb5lHTocQ68d4bDBsxafEp+
-NFAwLvt/MpqNPfMgW/hqyobzMUwsWYACff44yTB1HLdV47yfuqhthCgFdbOLDcCR
-VCHnpgu0mfVRQdzNo0ci2ccBgcTcR08m6h/t280NmPSjnLRzMkqWmf68f8glWPhY
-83ZmiVSkpj7EUFy6iRiCdUgh0k8T6GB+B3bbELVR5qq5aKrN9p2QdRLqOBrKROi3
-macqaJVmlaut74nLYKkGEsaUR+ko
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-007_VeriSign Class 3 Public Primary Certification Authority - G4_VeriSign, Inc.pem b/test/rules/platform_certs/cacert/Cert-007_VeriSign Class 3 Public Primary Certification Authority - G4_VeriSign, Inc.pem
deleted file mode 100644
index e19fdea044a4..000000000000
--- a/test/rules/platform_certs/cacert/Cert-007_VeriSign Class 3 Public Primary Certification Authority - G4_VeriSign, Inc.pem	
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjEL
-MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
-ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
-U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
-aXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjELMAkG
-A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJp
-U2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwg
-SW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2ln
-biBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8Utpkmw4tXNherJI9/gHm
-GUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGzrl0Bp3ve
-fLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUw
-AwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJ
-aW1hZ2UvZ2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYj
-aHR0cDovL2xvZ28udmVyaXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMW
-kf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMDA2gAMGUCMGYhDBgmYFo4e1ZC
-4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIxAJw9SDkjOVga
-FRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-008_AffirmTrust Commercial_AffirmTrust.pem b/test/rules/platform_certs/cacert/Cert-008_AffirmTrust Commercial_AffirmTrust.pem
deleted file mode 100644
index 73a3367437d9..000000000000
--- a/test/rules/platform_certs/cacert/Cert-008_AffirmTrust Commercial_AffirmTrust.pem	
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UE
-BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
-dCBDb21tZXJjaWFsMB4XDTEwMDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDEL
-MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
-cm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6EqdbDuKP
-Hx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yr
-ba0F8PrVC8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPAL
-MeIrJmqbTFeurCA+ukV6BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1
-yHp52UKqK39c/s4mT6NmgTWvRLpUHhwwMmWd5jyTXlBOeuM61G7MGvv50jeuJCqr
-VwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNVHQ4EFgQUnZPGU4teyq8/
-nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
-KoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYG
-XUPGhi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNj
-vbz4YYCanrHOQnDiqX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivt
-Z8SOyUOyXGsViQK8YvxO8rUzqrJv0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9g
-N53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0khsUlHRUe072o0EclNmsxZt9YC
-nlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-009_Deutsche Telekom Root CA 2_Deutsche Telekom AG.pem b/test/rules/platform_certs/cacert/Cert-009_Deutsche Telekom Root CA 2_Deutsche Telekom AG.pem
deleted file mode 100644
index 05879ff35eef..000000000000
--- a/test/rules/platform_certs/cacert/Cert-009_Deutsche Telekom Root CA 2_Deutsche Telekom AG.pem	
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEc
-MBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2Vj
-IFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENB
-IDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5MjM1OTAwWjBxMQswCQYDVQQGEwJE
-RTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxl
-U2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290
-IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEU
-ha88EOQ5bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhC
-QN/Po7qCWWqSG6wcmtoIKyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1Mjwr
-rFDa1sPeg5TKqAyZMg4ISFZbavva4VhYAUlfckE8FQYBjl2tqriTtM2e66foai1S
-NNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aKSe5TBY8ZTNXeWHmb0moc
-QqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTVjlsB9WoH
-txa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAP
-BgNVHRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC
-AQEAlGRZrTlk5ynrE/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756Abrsp
-tJh6sTtU6zkXR34ajgv8HzFZMQSyzhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpa
-IzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8rZ7/gFnkm0W09juwzTkZmDLl
-6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4Gdyd1Lx+4ivn+
-xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
-Cm26OWMohpLzGITY+9HPBVZkVw==
------END CERTIFICATE-----
diff --git "a/test/rules/platform_certs/cacert/Cert-010_EBG Elektronik Sertifika Hizmet Sa\304\237lay\304\261c\304\261s\304\261_EBG Bili\305\237im Teknolojileri ve Hizmetleri A.\305\236.pem" "b/test/rules/platform_certs/cacert/Cert-010_EBG Elektronik Sertifika Hizmet Sa\304\237lay\304\261c\304\261s\304\261_EBG Bili\305\237im Teknolojileri ve Hizmetleri A.\305\236.pem"
deleted file mode 100644
index a684013b93f6..000000000000
--- "a/test/rules/platform_certs/cacert/Cert-010_EBG Elektronik Sertifika Hizmet Sa\304\237lay\304\261c\304\261s\304\261_EBG Bili\305\237im Teknolojileri ve Hizmetleri A.\305\236.pem"	
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIF5zCCA8+gAwIBAgIITK9zQhyOdAIwDQYJKoZIhvcNAQEFBQAwgYAxODA2BgNV
-BAMML0VCRyBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
-c8SxMTcwNQYDVQQKDC5FQkcgQmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXpt
-ZXRsZXJpIEEuxZ4uMQswCQYDVQQGEwJUUjAeFw0wNjA4MTcwMDIxMDlaFw0xNjA4
-MTQwMDMxMDlaMIGAMTgwNgYDVQQDDC9FQkcgRWxla3Ryb25payBTZXJ0aWZpa2Eg
-SGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTE3MDUGA1UECgwuRUJHIEJpbGnFn2ltIFRl
-a25vbG9qaWxlcmkgdmUgSGl6bWV0bGVyaSBBLsWeLjELMAkGA1UEBhMCVFIwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDuoIRh0DpqZhAy2DE4f6en5f2h
-4fuXd7hxlugTlkaDT7byX3JWbhNgpQGR4lvFzVcfd2NR/y8927k/qqk153nQ9dAk
-tiHq6yOU/im/+4mRDGSaBUorzAzu8T2bgmmkTPiab+ci2hC6X5L8GCcKqKpE+i4s
-tPtGmggDg3KriORqcsnlZR9uKg+ds+g75AxuetpX/dfreYteIAbTdgtsApWjluTL
-dlHRKJ2hGvxEok3MenaoDT2/F08iiFD9rrbskFBKW5+VQarKD7JK/oCZTqNGFav4
-c0JqwmZ2sQomFd2TkuzbqV9UIlKRcF0T6kjsbgNs2d1s/OsNA/+mgxKb8amTD8Um
-TDGyY5lhcucqZJnSuOl14nypqZoaqsNW2xCaPINStnuWt6yHd6i58mcLlEOzrz5z
-+kI2sSXFCjEmN1ZnuqMLfdb3ic1nobc6HmZP9qBVFCVMLDMNpkGMvQQxahByCp0O
-Lna9XvNRiYuoP1Vzv9s6xiQFlpJIqkuNKgPlV5EQ9GooFW5Hd4RcUXSfGenmHmMW
-OeMRFeNYGkS9y8RsZteEBt8w9DeiQyJ50hBs37vmExH8nYQKE3vwO9D8owrXieqW
-fo1IhR5kX9tUoqzVegJ5a9KK8GfaZXINFHDk6Y54jzJ0fFfy1tb0Nokb+Clsi7n2
-l9GkLqq+CxnCRelwXQIDAJ3Zo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
-/wQEAwIBBjAdBgNVHQ4EFgQU587GT/wWZ5b6SqMHwQSny2re2kcwHwYDVR0jBBgw
-FoAU587GT/wWZ5b6SqMHwQSny2re2kcwDQYJKoZIhvcNAQEFBQADggIBAJuYml2+
-8ygjdsZs93/mQJ7ANtyVDR2tFcU22NU57/IeIl6zgrRdu0waypIN30ckHrMk2pGI
-6YNw3ZPX6bqz3xZaPt7gyPvT/Wwp+BVGoGgmzJNSroIBk5DKd8pNSe/iWtkqvTDO
-TLKBtjDOWU/aWR1qeqRFsIImgYZ29fUQALjuswnoT4cCB64kXPBfrAowzIpAoHME
-wfuJJPaaHFy3PApnNgUIMbOv2AFoKuB4j3TeuFGkjGwgPaL7s9QJ/XvCgKqTbCmY
-Iai7FvOpEl90tYeY8pUm3zTvilORiF0alKM/fCL414i6poyWqD1SNGKfAB5UVUJn
-xk1Gj7sURT0KlhaOEKGXmdXTMIXM3rRyt7yKPBgpaP3ccQfuJDlq+u2lrDgv+R4Q
-DgZxGhBM/nV+/x5XOULK1+EVoVZVWRvRo68R2E7DpSvvkL/A7IITW43WciyTTo9q
-Kd+FPNMN4KIYEsxVL0e3p5sC/kH2iExt2qkBR4NkJ2IQgtYSe14DHzSpyZH+r11t
-hie3I6p1GMog57AP14kOpmciY/SDQSsGS7tY1dHXt7kQY9iJSrSq3RZj9W6+YKH4
-7ejWkE8axsWgKdOnIaj1Wjz3x0miIZpKlVIglnKaZsv30oZDfCK+lvm9AahH3eU7
-QPl1K5srRmSGjR70j/sHd9DqSaIcjVIUpgqT
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-011_Juur-SK_AS Sertifitseerimiskeskus.pem b/test/rules/platform_certs/cacert/Cert-011_Juur-SK_AS Sertifitseerimiskeskus.pem
deleted file mode 100644
index 269961b598a7..000000000000
--- a/test/rules/platform_certs/cacert/Cert-011_Juur-SK_AS Sertifitseerimiskeskus.pem	
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE5jCCA86gAwIBAgIEO45L/DANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcN
-AQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZp
-dHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLMB4XDTAxMDgzMDE0MjMw
-MVoXDTE2MDgyNjE0MjMwMVowXTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQsw
-CQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEQ
-MA4GA1UEAxMHSnV1ci1TSzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AIFxNj4zB9bjMI0TfncyRsvPGbJgMUaXhvSYRqTCZUXP00B841oiqBB4M8yIsdOB
-SvZiF3tfTQou0M+LI+5PAk676w7KvRhj6IAcjeEcjT3g/1tf6mTll+g/mX8MCgkz
-ABpTpyHhOEvWgxutr2TC+Rx6jGZITWYfGAriPrsfB2WThbkasLnE+w0R9vXW+RvH
-LCu3GFH+4Hv2qEivbDtPL+/40UceJlfwUR0zlv/vWT3aTdEVNMfqPxZIe5EcgEMP
-PbgFPtGzlc3Yyg/CQ2fbt5PgIoIuvvVoKIO5wTtpeyDaTpxt4brNj3pssAki14sL
-2xzVWiZbDcDq5WDQn/413z8CAwEAAaOCAawwggGoMA8GA1UdEwEB/wQFMAMBAf8w
-ggEWBgNVHSAEggENMIIBCTCCAQUGCisGAQQBzh8BAQEwgfYwgdAGCCsGAQUFBwIC
-MIHDHoHAAFMAZQBlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0ACAAbwBuACAAdgDk
-AGwAagBhAHMAdABhAHQAdQBkACAAQQBTAC0AaQBzACAAUwBlAHIAdABpAGYAaQB0
-AHMAZQBlAHIAaQBtAGkAcwBrAGUAcwBrAHUAcwAgAGEAbABhAG0ALQBTAEsAIABz
-AGUAcgB0AGkAZgBpAGsAYQBhAHQAaQBkAGUAIABrAGkAbgBuAGkAdABhAG0AaQBz
-AGUAawBzMCEGCCsGAQUFBwIBFhVodHRwOi8vd3d3LnNrLmVlL2Nwcy8wKwYDVR0f
-BCQwIjAgoB6gHIYaaHR0cDovL3d3dy5zay5lZS9qdXVyL2NybC8wHQYDVR0OBBYE
-FASqekej5ImvGs8KQKcYP2/v6X2+MB8GA1UdIwQYMBaAFASqekej5ImvGs8KQKcY
-P2/v6X2+MA4GA1UdDwEB/wQEAwIB5jANBgkqhkiG9w0BAQUFAAOCAQEAe8EYlFOi
-CfP+JmeaUOTDBS8rNXiRTHyoERF5TElZrMj3hWVcRrs7EKACr81Ptcw2Kuxd/u+g
-kcm2k298gFTsxwhwDY77guwqYHhpNjbRxZyLabVAyJRld/JXIWY7zoVAtjNjGr95
-HvxcHdMdkxuLDF2FvZkwMhgJkVLpfKG6/2SSmuz+Ne6ML678IIbsSt4beDI3poHS
-na9aEhbKmVv8b20OxaAehsmR0FyYgl9jDIpaq9iVpszLita/ZEuOyoqysOkhMp6q
-qIWYNIE5ITuoOlIyPfZrN4YGWhWY3PARZv40ILcD9EEQfTmEeZZyY7aWAuVrua0Z
-TbvGRNs2yyqcjg==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-012_Sonera Class1 CA_Sonera.pem b/test/rules/platform_certs/cacert/Cert-012_Sonera Class1 CA_Sonera.pem
deleted file mode 100644
index c5dad57acee4..000000000000
--- a/test/rules/platform_certs/cacert/Cert-012_Sonera Class1 CA_Sonera.pem	
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDIDCCAgigAwIBAgIBJDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP
-MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MxIENBMB4XDTAx
-MDQwNjEwNDkxM1oXDTIxMDQwNjEwNDkxM1owOTELMAkGA1UEBhMCRkkxDzANBgNV
-BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMSBDQTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALWJHytPZwp5/8Ue+H887dF+2rDNbS82rDTG
-29lkFwhjMDMiikzujrsPDUJVyZ0upe/3p4zDq7mXy47vPxVnqIJyY1MPQYx9EJUk
-oVqlBvqSV536pQHydekfvFYmUk54GWVYVQNYwBSujHxVX3BbdyMGNpfzJLWaRpXk
-3w0LBUXl0fIdgrvGE+D+qnr9aTCU89JFhfzyMlsy3uhsXR/LpCJ0sICOXZT3BgBL
-qdReLjVQCfOAl/QMF6452F/NM8EcyonCIvdFEu1eEpOdY6uCLrnrQkFEy0oaAIIN
-nvmLVz5MxxftLItyM19yejhW1ebZrgUaHXVFsculJRwSVzb9IjcCAwEAAaMzMDEw
-DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQIR+IMi/ZTiFIwCwYDVR0PBAQDAgEG
-MA0GCSqGSIb3DQEBBQUAA4IBAQCLGrLJXWG04bkruVPRsoWdd44W7hE928Jj2VuX
-ZfsSZ9gqXLar5V7DtxYvyOirHYr9qxp81V9jz9yw3Xe5qObSIjiHBxTZ/75Wtf0H
-DjxVyhbMp6Z3N/vbXB9OWQaHowND9Rart4S9Tu+fMTfwRvFAttEMpWT4Y14h21VO
-TzF2nBBhjrZTOqMRvq9tfB69ri3iDGnHhVNoomG6xT60eVR4ngrHAr5i0RGCS2Uv
-kVrCqIexVmiUefkl98HVrhq4uz2PqYo4Ffdz0Fpg0YCw8NzVUM1O7pJIae2yIx4w
-zMiUyLb1O4Z/P6Yun/Y+LLWSlj7fLJOK/4GMDw9ZIRlXvVWa
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-013_http---www.valicert.com-_ValiCert, Inc.pem b/test/rules/platform_certs/cacert/Cert-013_http---www.valicert.com-_ValiCert, Inc.pem
deleted file mode 100644
index 2b60983655c6..000000000000
--- a/test/rules/platform_certs/cacert/Cert-013_http---www.valicert.com-_ValiCert, Inc.pem	
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
-IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
-BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
-aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
-9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMjIzM1oXDTE5MDYy
-NjAwMjIzM1owgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
-azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
-YXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
-Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
-cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjmFGWHOjVsQaBalfD
-cnWTq8+epvzzFlLWLU2fNUSoLgRNB0mKOCn1dzfnt6td3zZxFJmP3MKS8edgkpfs
-2Ejcv8ECIMYkpChMMFp2bbFc893enhBxoYjHW5tBbcqwuI4V7q0zK89HBFx1cQqY
-JJgpp0lZpd34t0NiYfPT4tBVPwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFa7AliE
-Zwgs3x/be0kz9dNnnfS0ChCzycUs4pJqcXgn8nCDQtM+z6lU9PHYkhaM0QTLS6vJ
-n0WuPIqpsHEzXcjFV9+vqDWzf4mH6eglkrh/hXqu1rweN1gqZ8mRzyqBPu3GOd/A
-PhmcGcwTTYJBtYze4D1gCCAPRX5ron+jjBXu
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-014_TC TrustCenter Class 2 CA II_TC TrustCenter GmbH.pem b/test/rules/platform_certs/cacert/Cert-014_TC TrustCenter Class 2 CA II_TC TrustCenter GmbH.pem
deleted file mode 100644
index c28ac18daef0..000000000000
--- a/test/rules/platform_certs/cacert/Cert-014_TC TrustCenter Class 2 CA II_TC TrustCenter GmbH.pem	
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEqjCCA5KgAwIBAgIOLmoAAQACH9dSISwRXDswDQYJKoZIhvcNAQEFBQAwdjEL
-MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNV
-BAsTGVRDIFRydXN0Q2VudGVyIENsYXNzIDIgQ0ExJTAjBgNVBAMTHFRDIFRydXN0
-Q2VudGVyIENsYXNzIDIgQ0EgSUkwHhcNMDYwMTEyMTQzODQzWhcNMjUxMjMxMjI1
-OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIgR21i
-SDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQTElMCMGA1UEAxMc
-VEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKuAh5uO8MN8h9foJIIRszzdQ2Lu+MNF2ujhoF/RKrLqk2jf
-tMjWQ+nEdVl//OEd+DFwIxuInie5e/060smp6RQvkL4DUsFJzfb95AhmC1eKokKg
-uNV/aVyQMrKXDcpK3EY+AlWJU+MaWss2xgdW94zPEfRMuzBwBJWl9jmM/XOBCH2J
-XjIeIqkiRUuwZi4wzJ9l/fzLganx4Duvo4bRierERXlQXa7pIXSSTYtZgo+U4+lK
-8edJsBTj9WLL1XK9H7nSn6DNqPoByNkN39r8R52zyFTfSUrxIan+GE7uSNQZu+99
-5OKdy1u2bv/jzVrndIIFuoAlOMvkaZ6vQaoahPUCAwEAAaOCATQwggEwMA8GA1Ud
-EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTjq1RMgKHbVkO3
-kUrL84J6E1wIqzCB7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRy
-dXN0Y2VudGVyLmRlL2NybC92Mi90Y19jbGFzc18yX2NhX0lJLmNybIaBn2xkYXA6
-Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBUcnVzdENlbnRlciUyMENsYXNz
-JTIwMiUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21iSCxPVT1yb290
-Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
-TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEAjNfffu4bgBCzg/XbEeprS6iS
-GNn3Bzn1LL4GdXpoUxUc6krtXvwjshOg0wn/9vYua0Fxec3ibf2uWWuFHbhOIprt
-ZjluS5TmVfwLG4t3wVMTZonZKNaL80VKY7f9ewthXbhtvsPcW3nS7Yblok2+XnR8
-au0WOB9/WIFaGusyiC2y8zl3gK9etmF1KdsjTYjKUCjLhdLTEKJZbtOTVAB6okaV
-hgWcqRmY5TFyDADiZ9lA4CQze28suVyrZZ0srHbqNZn1l7kPJOzHdiEoZa5X6AeI
-dUpWoNIFOqTmjZKILPPy4cHGYdtBxceb9w4aUUXCYWvcZCcXjFq32nQozZfkvQ==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-015_CNNIC ROOT_CNNIC.pem b/test/rules/platform_certs/cacert/Cert-015_CNNIC ROOT_CNNIC.pem
deleted file mode 100644
index c81744b5f5e3..000000000000
--- a/test/rules/platform_certs/cacert/Cert-015_CNNIC ROOT_CNNIC.pem	
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDVTCCAj2gAwIBAgIESTMAATANBgkqhkiG9w0BAQUFADAyMQswCQYDVQQGEwJD
-TjEOMAwGA1UEChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwHhcNMDcwNDE2
-MDcwOTE0WhcNMjcwNDE2MDcwOTE0WjAyMQswCQYDVQQGEwJDTjEOMAwGA1UEChMF
-Q05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDTNfc/c3et6FtzF8LRb+1VvG7q6KR5smzDo+/hn7E7SIX1mlwh
-IhAsxYLO2uOabjfhhyzcuQxauohV3/2q2x8x6gHx3zkBwRP9SFIhxFXf2tizVHa6
-dLG3fdfA6PZZxU3Iva0fFNrfWEQlMhkqx35+jq44sDB7R3IJMfAw28Mbdim7aXZO
-V/kbZKKTVrdvmW7bCgScEeOAH8tjlBAKqeFkgjH5jCftppkA9nCTGPihNIaj3XrC
-GHn2emU1z5DrvTOTn1OrczvmmzQgLx3vqR1jGqCA2wMv+SYahtKNu6m+UjqHZ0gN
-v7Sg2Ca+I19zN38m5pIEo3/PIKe38zrKy5nLAgMBAAGjczBxMBEGCWCGSAGG+EIB
-AQQEAwIABzAfBgNVHSMEGDAWgBRl8jGtKvf33VKWCscCwQ7vptU7ETAPBgNVHRMB
-Af8EBTADAQH/MAsGA1UdDwQEAwIB/jAdBgNVHQ4EFgQUZfIxrSr3991SlgrHAsEO
-76bVOxEwDQYJKoZIhvcNAQEFBQADggEBAEs17szkrr/Dbq2flTtLP1se31cpolnK
-OOK5Gv+e5m4y3R6u6jW39ZORTtpC4cMXYFDy0VwmuYK36m3knITnA3kXr5g9lNvH
-ugDnuL8BV8F3RTIMO/G0HAiw/VGgod2aHRM2mm23xzy54cXZF/qD1T0VoDy7Hgvi
-yJA/qIYM/PmLXoXLT1tLYhFHxUV8BS9BsZ4QaRuZluBVeftOhpm4lNqGOGqTo+fL
-buXf6iFViZx9fX+Y9QCJ7uOEwFyWtcVG6kbghVW2G8kS1sHNzYDzAgE8yGnLRUhj
-2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5mmxE=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-016_StartCom Certification Authority_StartCom Ltd.pem b/test/rules/platform_certs/cacert/Cert-016_StartCom Certification Authority_StartCom Ltd.pem
deleted file mode 100644
index 960f2657be21..000000000000
--- a/test/rules/platform_certs/cacert/Cert-016_StartCom Certification Authority_StartCom Ltd.pem	
+++ /dev/null
@@ -1,44 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEW
-MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
-Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM2WhcNMzYwOTE3MTk0NjM2WjB9
-MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
-U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
-cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
-A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
-pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
-OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
-Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
-Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
-HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
-Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
-+2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
-Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
-Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
-26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
-AQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
-FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9j
-ZXJ0LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3Js
-LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFM
-BgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUHAgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0
-Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRwOi8vY2VydC5zdGFy
-dGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYgU3Rh
-cnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlh
-YmlsaXR5LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2Yg
-dGhlIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFp
-bGFibGUgYXQgaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL3BvbGljeS5wZGYwEQYJ
-YIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNT
-TCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOCAgEAFmyZ
-9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8
-jhvh3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUW
-FjgKXlf2Ysd6AgXmvB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJz
-ewT4F+irsfMuXGRuczE6Eri8sxHkfY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1
-ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3fsNrarnDy0RLrHiQi+fHLB5L
-EUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZEoalHmdkrQYu
-L6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
-yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuC
-O3NJo2pXh5Tl1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6V
-um0ABj6y6koQOdjQK/W/7HW/lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkySh
-NOsF/5oirpt9P/FlUQqmMGqz9IgcgA38corog14=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-017_Certigna_Dhimyotis.pem b/test/rules/platform_certs/cacert/Cert-017_Certigna_Dhimyotis.pem
deleted file mode 100644
index 220d95f9f49e..000000000000
--- a/test/rules/platform_certs/cacert/Cert-017_Certigna_Dhimyotis.pem
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNV
-BAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4X
-DTA3MDYyOTE1MTMwNVoXDTI3MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQ
-BgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwIQ2VydGlnbmEwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7qXOEm7RFHYeGifBZ4
-QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyHGxny
-gQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbw
-zBfsV1/pogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q
-130yGLMLLGq/jj8UEYkgDncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2
-JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKfIrjxwo1p3Po6WAbfAgMBAAGjgbwwgbkw
-DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQtCRZvgHyUtVF9lo53BEw
-ZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJBgNVBAYT
-AkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzj
-AQ/JSP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG
-9w0BAQUFAAOCAQEAhQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8h
-bV6lUmPOEvjvKtpv6zf+EwLHyzs+ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFnc
-fca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1kluPBS1xp81HlDQwY9qcEQCYsuu
-HWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY1gkIl2PlwS6w
-t0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
-WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-018_ComSign Secured CA_ComSign.pem b/test/rules/platform_certs/cacert/Cert-018_ComSign Secured CA_ComSign.pem
deleted file mode 100644
index 8d80b192041d..000000000000
--- a/test/rules/platform_certs/cacert/Cert-018_ComSign Secured CA_ComSign.pem	
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDqzCCApOgAwIBAgIRAMcoRwmzuGxFjB36JPU2TukwDQYJKoZIhvcNAQEFBQAw
-PDEbMBkGA1UEAxMSQ29tU2lnbiBTZWN1cmVkIENBMRAwDgYDVQQKEwdDb21TaWdu
-MQswCQYDVQQGEwJJTDAeFw0wNDAzMjQxMTM3MjBaFw0yOTAzMTYxNTA0NTZaMDwx
-GzAZBgNVBAMTEkNvbVNpZ24gU2VjdXJlZCBDQTEQMA4GA1UEChMHQ29tU2lnbjEL
-MAkGA1UEBhMCSUwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGtWhf
-HZQVw6QIVS3joFd67+l0Kru5fFdJGhFeTymHDEjWaueP1H5XJLkGieQcPOqs49oh
-gHMhCu95mGwfCP+hUH3ymBvJVG8+pSjsIQQPRbsHPaHA+iqYHU4Gk/v1iDurX8sW
-v+bznkqH7Rnqwp9D5PGBpX8QTz7RSmKtUxvLg/8HZaWSLWapW7ha9B20IZFKF3ue
-Mv5WJDmyVIRD9YTC2LxBkMyd1mja6YJQqTtoz7VdApRgFrFD2UNd3V2Hbuq7s8lr
-9gOUCXDeFhF6K+h2j0kQmHe5Y1yLM5d19guMsqtb3nQgJT/j8xH5h2iGNXHDHYwt
-6+UarA9z1YJZQIDTAgMBAAGjgacwgaQwDAYDVR0TBAUwAwEB/zBEBgNVHR8EPTA7
-MDmgN6A1hjNodHRwOi8vZmVkaXIuY29tc2lnbi5jby5pbC9jcmwvQ29tU2lnblNl
-Y3VyZWRDQS5jcmwwDgYDVR0PAQH/BAQDAgGGMB8GA1UdIwQYMBaAFMFL7XC29z58
-ADsAj8c+DkWfHl3sMB0GA1UdDgQWBBTBS+1wtvc+fAA7AI/HPg5Fnx5d7DANBgkq
-hkiG9w0BAQUFAAOCAQEAFs/ukhNQq3sUnjO2QiBq1BW9Cav8cujvR3qQrFHBZE7p
-iL1DRYHjZiM/EoZNGeQFsOY3wo3aBijJD4mkU6l1P7CW+6tMM1X5eCZGbxs2mPtC
-dsGCuY7e+0X5YxtiOzkGynd6qDwJz2w2PQ8KRUtpFhpFfTMDZflScZAmlaxMDPWL
-kz/MdXSFmLr/YnpNH4n+rr2UAJm/EaXc4HnFFgt9AmEd6oX5AhVP51qJThRv4zdL
-hfXBPGHg/QVBspJ/wx2g0K5SZGBrGMYmnNj1ZOQ2GmKfig8+/21OGVZOIJFsnzQz
-OjRXUDpvgV4GxvU+fE6OK85lBi5d0ipTdF7Tbieejw==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-019_EC-ACC_Agencia Catalana de Certificacio (NIF Q-0801176-I).pem b/test/rules/platform_certs/cacert/Cert-019_EC-ACC_Agencia Catalana de Certificacio (NIF Q-0801176-I).pem
deleted file mode 100644
index 87a13f620b43..000000000000
--- a/test/rules/platform_certs/cacert/Cert-019_EC-ACC_Agencia Catalana de Certificacio (NIF Q-0801176-I).pem	
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB
-8zELMAkGA1UEBhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2Vy
-dGlmaWNhY2lvIChOSUYgUS0wODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1
-YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYDVQQLEyxWZWdldSBodHRwczovL3d3
-dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UECxMsSmVyYXJxdWlh
-IEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMTBkVD
-LUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQG
-EwJFUzE7MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8g
-KE5JRiBRLTA4MDExNzYtSSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBD
-ZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZlZ2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQu
-bmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJhcnF1aWEgRW50aXRhdHMg
-ZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUNDMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R
-85iKw5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm
-4CgPukLjbo73FCeTae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaV
-HMf5NLWUhdWZXqBIoH7nF2W4onW4HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNd
-QlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0aE9jD2z3Il3rucO2n5nzbcc8t
-lGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw0JDnJwIDAQAB
-o4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4
-opvpXY0wfwYDVR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBo
-dHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidW
-ZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAwDQYJKoZIhvcN
-AQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJlF7W2u++AVtd0x7Y
-/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNaAl6k
-SBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhy
-Rp/7SNVel+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOS
-Agu+TGbrIP65y7WZf+a2E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xl
-nJ2lYJU6Un/10asIbvPuW/mIPX64b24D5EI=
------END CERTIFICATE-----
diff --git "a/test/rules/platform_certs/cacert/Cert-020_Certinomis - Autorit\303\251 Racine_Certinomis.pem" "b/test/rules/platform_certs/cacert/Cert-020_Certinomis - Autorit\303\251 Racine_Certinomis.pem"
deleted file mode 100644
index e764de4d2e99..000000000000
--- "a/test/rules/platform_certs/cacert/Cert-020_Certinomis - Autorit\303\251 Racine_Certinomis.pem"	
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFnDCCA4SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjET
-MBEGA1UEChMKQ2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxJjAk
-BgNVBAMMHUNlcnRpbm9taXMgLSBBdXRvcml0w6kgUmFjaW5lMB4XDTA4MDkxNzA4
-Mjg1OVoXDTI4MDkxNzA4Mjg1OVowYzELMAkGA1UEBhMCRlIxEzARBgNVBAoTCkNl
-cnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMSYwJAYDVQQDDB1DZXJ0
-aW5vbWlzIC0gQXV0b3JpdMOpIFJhY2luZTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
-ADCCAgoCggIBAJ2Fn4bT46/HsmtuM+Cet0I0VZ35gb5j2CN2DpdUzZlMGvE5x4jY
-F1AMnmHawE5V3udauHpOd4cN5bjr+p5eex7Ezyh0x5P1FMYiKAT5kcOrJ3NqDi5N
-8y4oH3DfVS9O7cdxbwlyLu3VMpfQ8Vh30WC8Tl7bmoT2R2FFK/ZQpn9qcSdIhDWe
-rP5pqZ56XjUl+rSnSTV3lqc2W+HN3yNw2F1MpQiD8aYkOBOo7C+ooWfHpi2GR+6K
-/OybDnT0K0kCe5B1jPyZOQE51kqJ5Z52qz6WKDgmi92NjMD2AR5vpTESOH2VwnHu
-7XSu5DaiQ3XV8QCb4uTXzEIDS3h65X27uK4uIJPT5GHfceF2Z5c/tt9qc1pkIuVC
-28+BA5PY9OMQ4HL2AHCs8MF6DwV/zzRpRbWT5BnbUhYjBYkOjUjkJW+zeL9i9Qf6
-lSTClrLooyPCXQP8w9PlfMl1I9f09bze5N/NgL+RiH2nE7Q5uiy6vdFrzPOlKO1E
-nn1So2+WLhl+HPNbxxaOu2B9d2ZHVIIAEWBsMsGoOBvrbpgT1u449fCfDu/+MYHB
-0iSVL1N6aaLwD4ZFjliCK0wi1F6g530mJ0jfJUaNSih8hp75mxpZuWW/Bd22Ql09
-5gBIgl4g9xGC3srYn+Y3RyYe63j3YcNBZFgCQfna4NH4+ej9Uji29YnfAgMBAAGj
-WzBZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQN
-jLZh2kS40RR9w759XkjwzspqsDAXBgNVHSAEEDAOMAwGCiqBegFWAgIAAQEwDQYJ
-KoZIhvcNAQEFBQADggIBACQ+YAZ+He86PtvqrxyaLAEL9MW12Ukx9F1BjYkMTv9s
-ov3/4gbIOZ/xWqndIlgVqIrTseYyCYIDbNc/CMf4uboAbbnW/FIyXaR/pDGUu7ZM
-OH8oMDX/nyNTt7buFHAAQCvaR6s0fl6nVjBhK4tDrP22iCj1a7Y+YEq6QpA0Z43q
-619FVDsXrIvkxmUP7tCMXWY5zjKn2BCXwH40nJ+U8/aGH88bc62UeYdocMMzpXDn
-2NU4lG9jeeu/Cg4I58UvD0KgKxRA/yHgBcUn4YQRE7rWhh1BCxMjidPJC+iKunqj
-o3M3NYB9Ergzd0A4wPpeMNLytqOx1qKVl4GbUu1pTP+A5FPbVFsDbVRfsbjvJL1v
-nxHDx2TCDyhihWZeGnuyt++uNckZM6i4J9szVb9o4XVIRFb7zdNIu0eJOqxp9YDG
-5ERQL1TEqkPFMTFYvZbF6nVsmnWxTfj3l/+WFvKXTej28xH5On2KOG4Ey+HTRRWq
-pdEdnV1j6CTmNhTih60bWfVEm/vXd3wfAXBioSAaosUaKPQhA+4u2cGA6rnZgtZb
-dsLLO7XSAPCjDuGtbkD326C00EauFddEwk01+dIL8hf2rGbVJLJP0RyZwG71fet0
-BLj5TXcJ17TPBzAJ8bgAVtkXFhYKK4bfjwEZGuW7gmP/vgt2Fl43N+bYdJeimUV5
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-021_Buypass Class 3 CA 1_Buypass AS-983163327.pem b/test/rules/platform_certs/cacert/Cert-021_Buypass Class 3 CA 1_Buypass AS-983163327.pem
deleted file mode 100644
index 6fdb64399a1b..000000000000
--- a/test/rules/platform_certs/cacert/Cert-021_Buypass Class 3 CA 1_Buypass AS-983163327.pem	
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDUzCCAjugAwIBAgIBAjANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEd
-MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3Mg
-Q2xhc3MgMyBDQSAxMB4XDTA1MDUwOTE0MTMwM1oXDTE1MDUwOTE0MTMwM1owSzEL
-MAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYD
-VQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAKSO13TZKWTeXx+HgJHqTjnmGcZEC4DVC69TB4sSveZn8AKxifZg
-isRbsELRwCGoy+Gb72RRtqfPFfV0gGgEkKBYouZ0plNTVUhjP5JW3SROjvi6K//z
-NIqeKNc0n6wv1g/xpC+9UrJJhW05NfBEMJNGJPO251P7vGGvqaMU+8IXF4Rs4HyI
-+MkcVyzwPX6UvCWThOiaAJpFBUJXgPROztmuOfbIUxAMZTpHe2DC1vqRycZxbL2R
-hzyRhkmr8w+gbCZ2Xhysm3HljbybIR6c1jh+JIAVMYKWsUnTYjdbiAwKYjT+p0h+
-mbEwi5A3lRyoH6UsjfRVyNvdWQrCrXig9IsCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUOBTmyPCppAP0Tj4io1vy1uCtQHQwDgYDVR0PAQH/BAQD
-AgEGMA0GCSqGSIb3DQEBBQUAA4IBAQABZ6OMySU9E2NdFm/soT4JXJEVKirZgCFP
-Bdy7pYmrEzMqnji3jG8CcmPHc3ceCQa6Oyh7pEfJYWsICCD8igWKH7y6xsL+z27s
-EzNxZy5p+qksP2bAEllNC1QCkoS72xLvg3BweMhT+t/Gxv/ciC8HwEmdMldg0/L2
-mSlf56oBzKwzqBwKu5HEA6BvtjT5htOzdlSY9EqBs1OdTUDs5XcTRa9bqh/YL0yC
-e/4qxFi7T/ye/QNlGioOw6UgFpRreaaiErS7GqQjel/wroQk5PMr+4okoyeYZdow
-dXb8GZHo2+ubPzK/QJcHJrrM85SFSnonk8+QQtS4Wxam58tAA915
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-022_GeoTrust Global CA 2_GeoTrust Inc.pem b/test/rules/platform_certs/cacert/Cert-022_GeoTrust Global CA 2_GeoTrust Inc.pem
deleted file mode 100644
index 2031f3edb4eb..000000000000
--- a/test/rules/platform_certs/cacert/Cert-022_GeoTrust Global CA 2_GeoTrust Inc.pem	
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEW
-MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFs
-IENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQG
-EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3Qg
-R2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDvPE1A
-PRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/NTL8
-Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hL
-TytCOb1kLUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL
-5mkWRxHCJ1kDs6ZgwiFAVvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7
-S4wMcoKK+xfNAGw6EzywhIdLFnopsk/bHdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe
-2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
-FHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNHK266ZUap
-EBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6td
-EPx7srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv
-/NgdRN3ggX+d6YvhZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywN
-A0ZF66D0f0hExghAzN4bcLUprbqLOzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0
-abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkCx1YAzUm5s2x7UwQa4qjJqhIF
-I8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqFH4z1Ir+rzoPz
-4iIprn2DQKi6bA==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-023_Wells Fargo Root Certificate Authority_Wells Fargo.pem b/test/rules/platform_certs/cacert/Cert-023_Wells Fargo Root Certificate Authority_Wells Fargo.pem
deleted file mode 100644
index 2ba88cdda792..000000000000
--- a/test/rules/platform_certs/cacert/Cert-023_Wells Fargo Root Certificate Authority_Wells Fargo.pem	
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID5TCCAs2gAwIBAgIEOeSXnjANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMC
-VVMxFDASBgNVBAoTC1dlbGxzIEZhcmdvMSwwKgYDVQQLEyNXZWxscyBGYXJnbyBD
-ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEvMC0GA1UEAxMmV2VsbHMgRmFyZ28gUm9v
-dCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDAxMDExMTY0MTI4WhcNMjEwMTE0
-MTY0MTI4WjCBgjELMAkGA1UEBhMCVVMxFDASBgNVBAoTC1dlbGxzIEZhcmdvMSww
-KgYDVQQLEyNXZWxscyBGYXJnbyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEvMC0G
-A1UEAxMmV2VsbHMgRmFyZ28gUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVqDM7Jvk0/82bfuUER84A4n13
-5zHCLielTWi5MbqNQ1mXx3Oqfz1cQJ4F5aHiidlMuD+b+Qy0yGIZLEWukR5zcUHE
-SxP9cMIlrCL1dQu3U+SlK93OvRw6esP3E48mVJwWa2uv+9iWsWCaSOAlIiR5NM4O
-JgALTqv9i86C1y8IcGjBqAr5dE8Hq6T54oN+J3N0Prj5OEL8pahbSCOz6+MlsoCu
-ltQKnMJ4msZoGK43YjdeUXWoWGPAUe5AeH6orxqg4bB4nVCMe+ez/I4jsNtlAHCE
-AQgAFG5Uhpq6zPk3EPbg3oQtnaSFN9OH4xXQwReQfhkhahKpdv0SAulPIV4XAgMB
-AAGjYTBfMA8GA1UdEwEB/wQFMAMBAf8wTAYDVR0gBEUwQzBBBgtghkgBhvt7hwcB
-CzAyMDAGCCsGAQUFBwIBFiRodHRwOi8vd3d3LndlbGxzZmFyZ28uY29tL2NlcnRw
-b2xpY3kwDQYJKoZIhvcNAQEFBQADggEBANIn3ZwKdyu7IvICtUpKkfnRLb7kuxpo
-7w6kAOnu5+/u9vnldKTC2FJYxHT7zmu1Oyl5GFrvm+0fazbuSCUlFLZWohDo7qd/
-0D+j0MNdJu4HzMPBJCGHHt8qElNvQRbn7a6U+oxy+hNH8Dx+rn0ROhPs7fpvcmR7
-nX1/Jv16+yWt6j4pf0zjAFcysLPp7VMX2YuyFA4w6OXVE8Zkr8QA1dhYJPz1j+zx
-x32l2w8n0cbyQIjmH/ZhqPRCyLk306m+LFZ4wnKbWV01QIroTmMatukgalHizqSQ
-33ZwmVxwQ023tqcZZE6St8WRPH9IFmV7Fv3L/PvZ1dZPIWU7Sn9Ho/s=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-024_Certum CA_Unizeto Sp. z o.o.pem b/test/rules/platform_certs/cacert/Cert-024_Certum CA_Unizeto Sp. z o.o.pem
deleted file mode 100644
index b133fcb49560..000000000000
--- a/test/rules/platform_certs/cacert/Cert-024_Certum CA_Unizeto Sp. z o.o.pem	
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM
-MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
-QTAeFw0wMjA2MTExMDQ2MzlaFw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBM
-MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
-QTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6xwS7TT3zNJc4YPk/E
-jG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdLkKWo
-ePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GI
-ULdtlkIJ89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapu
-Ob7kky/ZR6By6/qmW6/KUz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUg
-AKpoC6EahQGcxEZjgoi2IrHu/qpGWX7PNSzVttpd90gzFFS269lvzs2I1qsb2pY7
-HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA
-uI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+GXYkHAQa
-TOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTg
-xSvgGrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1q
-CjqTE5s7FCMTY5w/0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5x
-O/fIR/RpbxXyEV6DHpx8Uq79AtoSqFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs
-6GAqm4VKQPNriiTsBhYscw==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-025_TWCA Root Certification Authority_TAIWAN-CA.pem b/test/rules/platform_certs/cacert/Cert-025_TWCA Root Certification Authority_TAIWAN-CA.pem
deleted file mode 100644
index 8d39bc6ffe03..000000000000
--- a/test/rules/platform_certs/cacert/Cert-025_TWCA Root Certification Authority_TAIWAN-CA.pem	
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzES
-MBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFU
-V0NBIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMz
-WhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJVEFJV0FO
-LUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlm
-aWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFE
-AcK0HMMxQhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HH
-K3XLfJ+utdGdIzdjp9xCoi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeX
-RfwZVzsrb+RH9JlF/h3x+JejiB03HFyP4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/z
-rX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1ry+UPizgN7gr8/g+YnzAx
-3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
-HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkq
-hkiG9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeC
-MErJk/9q56YAf4lCmtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdls
-XebQ79NqZp4VKIV66IIArB6nCWlWQtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62D
-lhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVYT0bf+215WfKEIlKuD8z7fDvn
-aspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocnyYh0igzyXxfkZ
-YiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-026_NetLock Expressz (Class C) Tanusitvanykiado_NetLock Halozatbiztonsagi Kft.pem b/test/rules/platform_certs/cacert/Cert-026_NetLock Expressz (Class C) Tanusitvanykiado_NetLock Halozatbiztonsagi Kft.pem
deleted file mode 100644
index 5f7c1ce434fa..000000000000
--- a/test/rules/platform_certs/cacert/Cert-026_NetLock Expressz (Class C) Tanusitvanykiado_NetLock Halozatbiztonsagi Kft.pem	
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFTzCCBLigAwIBAgIBaDANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUx
-ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0
-b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTQwMgYDVQQD
-EytOZXRMb2NrIEV4cHJlc3N6IChDbGFzcyBDKSBUYW51c2l0dmFueWtpYWRvMB4X
-DTk5MDIyNTE0MDgxMVoXDTE5MDIyMDE0MDgxMVowgZsxCzAJBgNVBAYTAkhVMREw
-DwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9u
-c2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE0MDIGA1UEAxMr
-TmV0TG9jayBFeHByZXNzeiAoQ2xhc3MgQykgVGFudXNpdHZhbnlraWFkbzCBnzAN
-BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA6+ywbGGKIyWvYCDj2Z/8kwvbXY2wobNA
-OoLO/XXgeDIDhlqGlZHtU/qdQPzm6N3ZW3oDvV3zOwzDUXmbrVWg6dADEK8KuhRC
-2VImESLH0iDMgqSaqf64gXadarfSNnU+sYYJ9m5tfk63euyucYT2BDMIJTLrdKwW
-RMbkQJMdf60CAwEAAaOCAp8wggKbMBIGA1UdEwEB/wQIMAYBAf8CAQQwDgYDVR0P
-AQH/BAQDAgAGMBEGCWCGSAGG+EIBAQQEAwIABzCCAmAGCWCGSAGG+EIBDQSCAlEW
-ggJNRklHWUVMRU0hIEV6ZW4gdGFudXNpdHZhbnkgYSBOZXRMb2NrIEtmdC4gQWx0
-YWxhbm9zIFN6b2xnYWx0YXRhc2kgRmVsdGV0ZWxlaWJlbiBsZWlydCBlbGphcmFz
-b2sgYWxhcGphbiBrZXN6dWx0LiBBIGhpdGVsZXNpdGVzIGZvbHlhbWF0YXQgYSBO
-ZXRMb2NrIEtmdC4gdGVybWVrZmVsZWxvc3NlZy1iaXp0b3NpdGFzYSB2ZWRpLiBB
-IGRpZ2l0YWxpcyBhbGFpcmFzIGVsZm9nYWRhc2FuYWsgZmVsdGV0ZWxlIGF6IGVs
-b2lydCBlbGxlbm9yemVzaSBlbGphcmFzIG1lZ3RldGVsZS4gQXogZWxqYXJhcyBs
-ZWlyYXNhIG1lZ3RhbGFsaGF0byBhIE5ldExvY2sgS2Z0LiBJbnRlcm5ldCBob25s
-YXBqYW4gYSBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIGNpbWVuIHZhZ3kg
-a2VyaGV0byBheiBlbGxlbm9yemVzQG5ldGxvY2submV0IGUtbWFpbCBjaW1lbi4g
-SU1QT1JUQU5UISBUaGUgaXNzdWFuY2UgYW5kIHRoZSB1c2Ugb2YgdGhpcyBjZXJ0
-aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIHRoZSBOZXRMb2NrIENQUyBhdmFpbGFibGUg
-YXQgaHR0cHM6Ly93d3cubmV0bG9jay5uZXQvZG9jcyBvciBieSBlLW1haWwgYXQg
-Y3BzQG5ldGxvY2submV0LjANBgkqhkiG9w0BAQQFAAOBgQAQrX/XDDKACtiG8XmY
-ta3UzbM2xJZIwVzNmtkFLp++UOv0JhQQLdRmF/iewSf98e3ke0ugbLWrmldwpu2g
-pO0u9f38vf5NNwgMvOOWgyL1SRt/Syu0VMGAfJlOHdCM7tCs5ZL6dVb+ZKATj7i4
-Fp1hBWeAyNDYpQcCNJgEjTME1A==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-027_SwissSign Silver CA - G2_SwissSign AG.pem b/test/rules/platform_certs/cacert/Cert-027_SwissSign Silver CA - G2_SwissSign AG.pem
deleted file mode 100644
index 67a172cb6dc0..000000000000
--- a/test/rules/platform_certs/cacert/Cert-027_SwissSign Silver CA - G2_SwissSign AG.pem	
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UE
-BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWdu
-IFNpbHZlciBDQSAtIEcyMB4XDTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0Nlow
-RzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMY
-U3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644N0Mv
-Fz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7br
-YT7QbNHm+/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieF
-nbAVlDLaYQ1HTWBCrpJH6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH
-6ATK72oxh9TAtvmUcXtnZLi2kUpCe2UuMGoM9ZDulebyzYLs2aFK7PayS+VFheZt
-eJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5hqAaEuSh6XzjZG6k4sIN/
-c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5FZGkECwJ
-MoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRH
-HTBsROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTf
-jNFusB3hB48IHpmccelM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb6
-5i/4z3GcRm25xBWNOHkDRUjvxF3XCO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOB
-rDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU
-F6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRBtjpbO8tFnb0c
-wpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
-cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIB
-AHPGgeAn0i0P4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShp
-WJHckRE1qTodvBqlYJ7YH39FkWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9
-xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L3XWgwF15kIwb4FDm3jH+mHtwX6WQ
-2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx/uNncqCxv1yL5PqZ
-IseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFaDGi8
-aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2X
-em1ZqSqPe97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQR
-dAtq/gsD/KNVV4n+SsuuWxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/
-OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJDIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+
-hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ubDgEj8Z+7fNzcbBGXJbLy
-tGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-028_Entrust.net Certification Authority (2048)_Entrust.net.pem b/test/rules/platform_certs/cacert/Cert-028_Entrust.net Certification Authority (2048)_Entrust.net.pem
deleted file mode 100644
index 06926c8e0186..000000000000
--- a/test/rules/platform_certs/cacert/Cert-028_Entrust.net Certification Authority (2048)_Entrust.net.pem	
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEXDCCA0SgAwIBAgIEOGO5ZjANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChML
-RW50cnVzdC5uZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBp
-bmNvcnAuIGJ5IHJlZi4gKGxpbWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5
-IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNVBAMTKkVudHJ1c3QubmV0IENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQxNzUwNTFaFw0xOTEy
-MjQxODIwNTFaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3d3d3
-LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxp
-YWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEG
-A1UEAxMqRW50cnVzdC5uZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgp
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArU1LqRKGsuqjIAcVFmQq
-K0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOLGp18EzoOH1u3Hs/lJBQe
-sYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSrhRSGlVuX
-MlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVT
-XTzWnLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/
-HoZdenoVve8AjhUiVBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH
-4QIDAQABo3QwcjARBglghkgBhvhCAQEEBAMCAAcwHwYDVR0jBBgwFoAUVeSB0RGA
-vtiJuQijMfmhJAkWuXAwHQYDVR0OBBYEFFXkgdERgL7YibkIozH5oSQJFrlwMB0G
-CSqGSIb2fQdBAAQQMA4bCFY1LjA6NC4wAwIEkDANBgkqhkiG9w0BAQUFAAOCAQEA
-WUesIYSKF8mciVMeuoCFGsY8Tj6xnLZ8xpJdGGQC49MGCBFhfGPjK50xA3B20qMo
-oPS7mmNz7W3lKtvtFKkrxjYR0CvrB4ul2p5cGZ1WEvVUKcgF7bISKo30Axv/55IQ
-h7A6tcOdBTcSo8f0FbnVpDkWm1M6I5HxqIKiaohowXkCIryqptau37AUX7iH0N18
-f3v/rxzP5tsHrV7bhZ3QKw0z2wTR5klAEyt2+z7pnIkPFc4YsIV4IU9rTw76NmfN
-B/L/CNDi3tm/Kq+4h4YhPATKt5Rof8886ZjXOP/swNlQ8C5LWK5Gb9Auw2DaclVy
-vUxFnmG6v4SBkgPR0ml8xQ==
------END CERTIFICATE-----
diff --git "a/test/rules/platform_certs/cacert/Cert-029_T\303\234RKTRUST.pem" "b/test/rules/platform_certs/cacert/Cert-029_T\303\234RKTRUST.pem"
deleted file mode 100644
index 4069c783bda8..000000000000
--- "a/test/rules/platform_certs/cacert/Cert-029_T\303\234RKTRUST.pem"
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID+zCCAuOgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBtzE/MD0GA1UEAww2VMOc
-UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
-c8SxMQswCQYDVQQGDAJUUjEPMA0GA1UEBwwGQU5LQVJBMVYwVAYDVQQKDE0oYykg
-MjAwNSBUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8
-dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjAeFw0wNTA1MTMxMDI3MTdaFw0xNTAz
-MjIxMDI3MTdaMIG3MT8wPQYDVQQDDDZUw5xSS1RSVVNUIEVsZWt0cm9uaWsgU2Vy
-dGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLExCzAJBgNVBAYMAlRSMQ8wDQYD
-VQQHDAZBTktBUkExVjBUBgNVBAoMTShjKSAyMDA1IFTDnFJLVFJVU1QgQmlsZ2kg
-xLBsZXRpxZ9pbSB2ZSBCaWxpxZ9pbSBHw7x2ZW5sacSfaSBIaXptZXRsZXJpIEEu
-xZ4uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAylIF1mMD2Bxf3dJ7
-XfIMYGFbazt0K3gNfUW9InTojAPBxhEqPZW8qZSwu5GXyGl8hMW0kWxsE2qkVa2k
-heiVfrMArwDCBRj1cJ02i67L5BuBf5OI+2pVu32Fks66WJ/bMsW9Xe8iSi9BB35J
-YbOG7E6mQW6EvAPs9TscyB/C7qju6hJKjRTP8wrgUDn5CDX4EVmt5yLqS8oUBt5C
-urKZ8y1UiBAG6uEaPj1nH/vO+3yC6BFdSsG5FOpU2WabfIl9BJpiyelSPJ6c79L1
-JuTm5Rh8i27fbMx4W09ysstcP4wFjdFMjK2Sx+F4f2VsSQZQLJ4ywtdKxnWKWU51
-b0dewQIDAQABoxAwDjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAV
-9VX/N5aAWSGk/KEVTCD21F/aAyT8z5Aa9CEKmu46sWrv7/hg0Uw2ZkUd82YCdAR7
-kjCo3gp2D++Vbr3JN+YaDayJSFvMgzbC9UZcWYJWtNX+I7TYVBxEq8Sn5RTOPEFh
-fEPmzcSBCYsk+1Ql1haolgxnB2+zUEfjHCQo3SqYpGH+2+oSN7wBGjSFvW5P55Fy
-B0SFHljKVETd96y5y4khctuPwGkplyqjrhgjlxxBKot8KsF8kOipKMDTkcatKIdA
-aLX/7KfS0zgYnNN9aV3wxqUeJBujR/xpB2jn5Jq07Q+hh4cCzofSSE7hvP/L8XKS
-RGQDJereW26fyfJOrN3H
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-030_UTN-USERFirst-Hardware_The USERTRUST Network.pem b/test/rules/platform_certs/cacert/Cert-030_UTN-USERFirst-Hardware_The USERTRUST Network.pem
deleted file mode 100644
index 46386b734ac4..000000000000
--- a/test/rules/platform_certs/cacert/Cert-030_UTN-USERFirst-Hardware_The USERTRUST Network.pem	
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCB
-lzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
-Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
-dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3Qt
-SGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgxOTIyWjCBlzELMAkG
-A1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEe
-MBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8v
-d3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdh
-cmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn
-0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlIwrthdBKWHTxqctU8EGc6Oe0rE81m65UJ
-M6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFdtqdt++BxF2uiiPsA3/4a
-MXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8i4fDidNd
-oI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqI
-DsjfPe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9Ksy
-oUhbAgMBAAGjgbkwgbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYD
-VR0OBBYEFKFyXyYbKJhDlV0HN9WFlp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0
-dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNFUkZpcnN0LUhhcmR3YXJlLmNy
-bDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUFBwMGBggrBgEF
-BQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM
-//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28Gpgoiskli
-CE7/yMgUsogWXecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gE
-CJChicsZUN/KHAG8HQQZexB2lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t
-3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kniCrVWFCVH/A7HFe7fRQ5YiuayZSS
-KqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67nfhmqA==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-031_VeriSign Class 4 Public Primary Certification Authority - G3_VeriSign, Inc.pem b/test/rules/platform_certs/cacert/Cert-031_VeriSign Class 4 Public Primary Certification Authority - G3_VeriSign, Inc.pem
deleted file mode 100644
index a0c3ef8270a9..000000000000
--- a/test/rules/platform_certs/cacert/Cert-031_VeriSign Class 4 Public Primary Certification Authority - G3_VeriSign, Inc.pem	
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEGjCCAwICEQDsoKeLbnVqAc/EfMwvlF7XMA0GCSqGSIb3DQEBBQUAMIHKMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
-cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
-LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
-aWduIENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
-VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
-aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
-bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
-IENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
-LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK3LpRFpxlmr8Y+1
-GQ9Wzsy1HyDkniYlS+BzZYlZ3tCD5PUPtbut8XzoIfzk6AzufEUiGXaStBO3IFsJ
-+mGuqPKljYXCKtbeZjbSmwL0qJJgfJxptI8kHtCGUvYynEFYHiK9zUVilQhu0Gbd
-U6LM8BDcVHOLBKFGMzNcF0C5nk3T875Vg+ixiY5afJqWIpA7iCXy0lOIAgwLePLm
-NxdLMEYH5IBtptiWLugs+BGzOA1mppvqySNb247i8xOOGlktqgLw7KSHZtzBP/XY
-ufTsgsbSPZUd5cBPhMnZo0QoBmrXRazwa2rvTl/4EYIeOGM0ZlDUPpNz+jDDZq3/
-ky2X7wMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAj/ola09b5KROJ1WrIhVZPMq1
-CtRK26vdoV9TxaBXOcLORyu+OshWv8LZJxA6sQU8wHcxuzrTBXttmhwwjIDLk5Mq
-g6sFUYICABFna/OIYUdfA5PVWw3g8dShMjWFsjrbsIKr0csKvE+MW8VLADsfKoKm
-fjaF3H48ZwC15DtS4KjrXRX5xm3wrR0OhbepmnMUWluPQSjA1egtTaRezarZ7c7c
-2NU8Qh0XwRJdRTjDOPP8hS6DRkiy1yBfkjaP53kPmF6Z6PDQpLv1U70qzlmwr25/
-bLvSHgCwIe34QWKCudiyxLtGUPMxxY8BqHTr9Xgn2uf3ZkPznoM+IKrDNWCRzg==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-032_XRamp Global Certification Authority_XRamp Security Services Inc.pem b/test/rules/platform_certs/cacert/Cert-032_XRamp Global Certification Authority_XRamp Security Services Inc.pem
deleted file mode 100644
index f21e6d8b7ca6..000000000000
--- a/test/rules/platform_certs/cacert/Cert-032_XRamp Global Certification Authority_XRamp Security Services Inc.pem	
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCB
-gjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEk
-MCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRY
-UmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQxMTAxMTcx
-NDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3
-dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2Vy
-dmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS6
-38eMpSe2OAtp87ZOqCwuIR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCP
-KZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMxfoArtYzAQDsRhtDLooY2YKTVMIJt2W7Q
-DxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FEzG+gSqmUsE3a56k0enI4
-qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqsAxcZZPRa
-JSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNVi
-PvryxS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0P
-BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASs
-jVy16bYbMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0
-eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQEwDQYJKoZIhvcNAQEFBQAD
-ggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc/Kh4ZzXxHfAR
-vbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
-qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLa
-IR9NmXmd4c8nnxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSy
-i6mx5O+aGtA9aZnuqCij4Tyz8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQ
-O+7ETPTsJ3xCwnR8gooJybQDJbw=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-034_ComSign CA_ComSign.pem b/test/rules/platform_certs/cacert/Cert-034_ComSign CA_ComSign.pem
deleted file mode 100644
index 35fb5229487f..000000000000
--- a/test/rules/platform_certs/cacert/Cert-034_ComSign CA_ComSign.pem	
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDkzCCAnugAwIBAgIQFBOWgxRVjOp7Y+X8NId3RDANBgkqhkiG9w0BAQUFADA0
-MRMwEQYDVQQDEwpDb21TaWduIENBMRAwDgYDVQQKEwdDb21TaWduMQswCQYDVQQG
-EwJJTDAeFw0wNDAzMjQxMTMyMThaFw0yOTAzMTkxNTAyMThaMDQxEzARBgNVBAMT
-CkNvbVNpZ24gQ0ExEDAOBgNVBAoTB0NvbVNpZ24xCzAJBgNVBAYTAklMMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8ORUaSvTx49qROR+WCf4C9DklBKK
-8Rs4OC8fMZwG1Cyn3gsqrhqg455qv588x26i+YtkbDqthVVRVKU4VbirgwTyP2Q2
-98CNQ0NqZtH3FyrV7zb6MBBC11PN+fozc0yz6YQgitZBJzXkOPqUm7h65HkfM/sb
-2CEJKHxNGGleZIp6GZPKfuzzcuc3B1hZKKxC+cX/zT/npfo4sdAMx9lSGlPWgcxC
-ejVb7Us6eva1jsz/D3zkYDaHL63woSV9/9JLEYhwVKZBqGdTUkJe5DSe5L6j7Kpi
-Xd3DTKaCQeQzC6zJMw9kglcq/QytNuEMrkvF7zuZ2SOzW120V+x0cAwqTwIDAQAB
-o4GgMIGdMAwGA1UdEwQFMAMBAf8wPQYDVR0fBDYwNDAyoDCgLoYsaHR0cDovL2Zl
-ZGlyLmNvbXNpZ24uY28uaWwvY3JsL0NvbVNpZ25DQS5jcmwwDgYDVR0PAQH/BAQD
-AgGGMB8GA1UdIwQYMBaAFEsBmz5WGmU2dst7l6qSBe4y5ygxMB0GA1UdDgQWBBRL
-AZs+VhplNnbLe5eqkgXuMucoMTANBgkqhkiG9w0BAQUFAAOCAQEA0Nmlfv4pYEWd
-foPPbrxHbvUanlR2QnG0PFg/LUAlQvaBnPGJEMgOqnhPOAlXsDzACPw1jvFIUY0M
-cXS6hMTXcpuEfDhOZAYnKuGntewImbQKDdSFc8gS4TXt8QUxHXOZDOuWyt3T5oWq
-8Ir7dcHyCTxlZWTzTNity4hp8+SDtwy9F1qWF8pb/627HOkthIDYIb6FUtnUdLlp
-hbpN7Sgy6/lhSuTENh4Z3G+EER+V9YMoGKgzkkMn3V0TBEVPh9VGzT2ouvDzuFYk
-Res3x+F2T3I5GN9+dHLHcy056mDmrRGiVod7w2ia/viMcKjfZTL0pECMocJEAw6U
-AGegcQCCSA==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-035_DigiNotar Cyber CA_DigiNotar.pem b/test/rules/platform_certs/cacert/Cert-035_DigiNotar Cyber CA_DigiNotar.pem
deleted file mode 100644
index d5c0c43509ba..000000000000
--- a/test/rules/platform_certs/cacert/Cert-035_DigiNotar Cyber CA_DigiNotar.pem	
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFRTCCBK6gAwIBAgIED////zANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJO
-TDESMBAGA1UEChMJRGlnaU5vdGFyMRswGQYDVQQDExJEaWdpTm90YXIgQ3liZXIg
-Q0ExIDAeBgkqhkiG9w0BCQEWEWluZm9AZGlnaW5vdGFyLm5sMB4XDTA2MTAwNDEw
-NTQxMloXDTExMTAwNDEwNTMxMlowYDELMAkGA1UEBhMCTkwxEjAQBgNVBAoTCURp
-Z2lOb3RhcjEbMBkGA1UEAxMSRGlnaU5vdGFyIEN5YmVyIENBMSAwHgYJKoZIhvcN
-AQkBFhFpbmZvQGRpZ2lub3Rhci5ubDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
-AgoCggIBANLOFQotqF6EZ639vu9Gx8i5z3P89DS5+SxD52ATPXrjss87Z2yQrcC5
-P4RS8DVC3HTcKDu9UrSnrHJFF8bwieu0qiXyXUte0dmHutZ9fPXOMp8QM8WxSrte
-kTHC0OlBwpFkfglBO9uLCDdqqspS3rU5HsCIA6U/i5kTYUO1m4Kz7iBvz6FEouov
-a0CfjytXraFTwoUiaZ2gP1HfC0GRDaXhqKpcSQhdvd5wQbEPyWNr0380dAIvNFp4
-dRxoeoFnivPaQPBgY/SSINcDpj2jHmfEhBtBpcmM5r3qSLYFFgizNxJa92E89zhv
-Lpfgb1Y4VNMota0Ubi5LZLUnZbd1JQm2Bz2VVgIKgmCyc0XgMyZRdJq51FAc9k1b
-W1JSE1qmf6cO4ehBVGeYjIfVydNsy9NUkgYJNEH3gW8/nsl8dVWw58Gzd+jDxAA1
-lUBwEEoF3iW7n1mlZLxHYL9g43aLE1Xd4XR6uc8kpmp/3mQiRFhogmoQ+T3lPhu5
-vfwi9GAEibtVbShV+t6OjRshFNc3izR7TfayshDPM7F9HGKZSMsrbHaWVb8ZDR0f
-u2WqG46ZtcYokOWCLXhQIJr9eS8kf/CJKWn0fc1zvrPtTsHR7VJej/e4142HrbLZ
-G1ES/1az4a80fVykeIgQnp0DxqWqoiRR90kUxbHuWUOV36toKDA/AgMBAAGjggGG
-MIIBgjASBgNVHRMBAf8ECDAGAQH/AgEBMFMGA1UdIARMMEowSAYJKwYBBAGxPgEA
-MDswOQYIKwYBBQUHAgEWLWh0dHA6Ly93d3cucHVibGljLXRydXN0LmNvbS9DUFMv
-T21uaVJvb3QuaHRtbDAOBgNVHQ8BAf8EBAMCAQYwgaAGA1UdIwSBmDCBlYAUpgwd
-n2H/Bxe1vzhG20Mw1Y6wUgaheaR3MHUxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9H
-VEUgQ29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNvbHV0aW9u
-cywgSW5jLjEjMCEGA1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJvb3SCAgGl
-MEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly93d3cucHVibGljLXRydXN0LmNvbS9j
-Z2ktYmluL0NSTC8yMDE4L2NkcC5jcmwwHQYDVR0OBBYEFKv5aN/PSjfXe0WMX3Le
-QETDZbvCMA0GCSqGSIb3DQEBBQUAA4GBAI9oa6VbB7pEZg4cqFwwezPkCiYE/O+e
-GjjWLqEf0JlHwnVkJP2eOyh2uSYoYZEMbSz4BJ98UAHV42mv7xXSRZskCSpmBU8l
-gcpdvqrBWSeuM46C9990sFWzjvjnN8huqlZE9r1TgSOWPbT6MopTZkQloiXGpjwl
-jPDgKAYityZB
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-037_QuoVadis Root Certification Authority_QuoVadis Limited.pem b/test/rules/platform_certs/cacert/Cert-037_QuoVadis Root Certification Authority_QuoVadis Limited.pem
deleted file mode 100644
index ffa4dbe4190b..000000000000
--- a/test/rules/platform_certs/cacert/Cert-037_QuoVadis Root Certification Authority_QuoVadis Limited.pem	
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJC
-TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0
-aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0
-aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAzMTkxODMzMzNaFw0yMTAzMTcxODMz
-MzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUw
-IwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVR
-dW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Yp
-li4kVEAkOPcahdxYTMukJ0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2D
-rOpm2RgbaIr1VxqYuvXtdj182d6UajtLF8HVj71lODqV0D1VNk7feVcxKh7YWWVJ
-WCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeLYzcS19Dsw3sgQUSj7cug
-F+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWenAScOospU
-xbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCC
-Ak4wPQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVv
-dmFkaXNvZmZzaG9yZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREw
-ggENMIIBCQYJKwYBBAG+WAABMIH7MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNl
-IG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBh
-c3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFy
-ZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
-Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYI
-KwYBBQUHAgEWFmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3T
-KbkGGew5Oanwl4Rqy+/fMIGuBgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rq
-y+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1p
-dGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYD
-VQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6tlCL
-MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSk
-fnIYj9lofFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf8
-7C9TqnN7Az10buYWnuulLsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1R
-cHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2xgI4JVrmcGmD+XcHXetwReNDWXcG31a0y
-mQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi5upZIof4l/UO/erMkqQW
-xFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi5nrQNiOK
-SnQ2+Q==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-038_AddTrust Public CA Root_AddTrust AB.pem b/test/rules/platform_certs/cacert/Cert-038_AddTrust Public CA Root_AddTrust AB.pem
deleted file mode 100644
index b9665db7c689..000000000000
--- a/test/rules/platform_certs/cacert/Cert-038_AddTrust Public CA Root_AddTrust AB.pem	
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJTRTEU
-MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
-b3JrMSAwHgYDVQQDExdBZGRUcnVzdCBQdWJsaWMgQ0EgUm9vdDAeFw0wMDA1MzAx
-MDQxNTBaFw0yMDA1MzAxMDQxNTBaMGQxCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtB
-ZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIDAeBgNV
-BAMTF0FkZFRydXN0IFB1YmxpYyBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA6Rowj4OIFMEg2Dybjxt+A3S72mnTRqX4jsIMEZBRpS9mVEBV
-6tsfSlbunyNu9DnLoblv8n75XYcmYZ4c+OLspoH4IcUkzBEMP9smcnrHAZcHF/nX
-GCwwfQ56HmIexkvA/X1id9NEHif2P0tEs7c42TkfYNVRknMDtABp4/MUTu7R3AnP
-dzRGULD4EfL+OHn3Bzn+UZKXC1sIXzSGAa2Il+tmzV7R/9x98oTaunet3IAIx6eH
-1lWfl2royBFkuucZKT8Rs3iQhCBSWxHveNCD9tVIkNAwHM+A+WD+eeSI8t0A65RF
-62WUaUC6wNW0uLp9BBGo6zEFlpROWCGOn9Bg/QIDAQABo4HRMIHOMB0GA1UdDgQW
-BBSBPjfYkrAfd59ctKtzquf2NGAv+jALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/BAUw
-AwEB/zCBjgYDVR0jBIGGMIGDgBSBPjfYkrAfd59ctKtzquf2NGAv+qFopGYwZDEL
-MAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRU
-cnVzdCBUVFAgTmV0d29yazEgMB4GA1UEAxMXQWRkVHJ1c3QgUHVibGljIENBIFJv
-b3SCAQEwDQYJKoZIhvcNAQEFBQADggEBAAP3FUr4JNojVhaTdt02KLmuG7jD8WS6
-IBh4lSknVwW8fCr0uVFV2ocC3g8WFzH4qnkuCRO7r7IgGRLlk/lL+YPoRNWyQSW/
-iHVv/xD8SlTQX/D67zZzfRs2RcYhbbQVuE7PnFylPVoAjgbjPGsye/Kf8Lb93/Ao
-GEjwxrzQvzSAlsJKsW2Ox5BF3i9nrEUEo3rcVZLJR2bYGozH7ZxOmuASu7VqTITh
-4SINhwBk/ox9Yjllpu9CtoAlEmEBqCQTcAARJl/6NVDFSMwGR+gn2HCNX2TmoUQm
-XiLsks3/QppEIW1cxeMiHV9HEufOX1362KqxMy3ZdvJOOjMMK7MtkAY=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-040_Hellenic Academic and Research Institutions RootCA 2011_Hellenic Academic and Research Institutions Cert. Authority.pem b/test/rules/platform_certs/cacert/Cert-040_Hellenic Academic and Research Institutions RootCA 2011_Hellenic Academic and Research Institutions Cert. Authority.pem
deleted file mode 100644
index 5ecc81c3675f..000000000000
--- a/test/rules/platform_certs/cacert/Cert-040_Hellenic Academic and Research Institutions RootCA 2011_Hellenic Academic and Research Institutions Cert. Authority.pem	
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1Ix
-RDBCBgNVBAoTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1
-dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1p
-YyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIFJvb3RDQSAyMDExMB4XDTExMTIw
-NjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYTAkdSMUQwQgYDVQQK
-EztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENl
-cnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJl
-c2VhcmNoIEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPz
-dYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJ
-fel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa71HFK9+WXesyHgLacEns
-bgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u8yBRQlqD
-75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSP
-FEDH3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNV
-HRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp
-5dgTBCPuQSUwRwYDVR0eBEAwPqA8MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQu
-b3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQub3JnMA0GCSqGSIb3DQEBBQUA
-A4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVtXdMiKahsog2p
-6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
-TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7
-dIsXRSZMFpGD/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8Acys
-Nnq/onN694/BtZqhFLKPM58N7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXI
-l7WdmplNsDz4SgCbZN2fOUvRJ9e4
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-041_Digisign Server ID - (Enrich)_Digicert Sdn. Bhd.pem b/test/rules/platform_certs/cacert/Cert-041_Digisign Server ID - (Enrich)_Digicert Sdn. Bhd.pem
deleted file mode 100644
index 9e347a56cd05..000000000000
--- a/test/rules/platform_certs/cacert/Cert-041_Digisign Server ID - (Enrich)_Digicert Sdn. Bhd.pem	
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE0DCCA7igAwIBAgIGB///////MA0GCSqGSIb3DQEBBQUAMIG0MRQwEgYDVQQK
-EwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3d3d3LmVudHJ1c3QubmV0L0NQU18yMDQ4
-IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMcKGMpIDE5
-OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5uZXQgQ2Vy
-dGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgpMB4XDTEwMDcxNjE3MjMzOFoXDTE1
-MDcxNjE3NTMzOFowZTELMAkGA1UEBhMCTVkxGzAZBgNVBAoTEkRpZ2ljZXJ0IFNk
-bi4gQmhkLjERMA8GA1UECxMINDU3NjA4LUsxJjAkBgNVBAMTHURpZ2lzaWduIFNl
-cnZlciBJRCAtIChFbnJpY2gpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAxYnk9A0GQJJZxxqzNdEOTCoz+fivyp5/7rmnbWD0VOhv1ZvzG2MxBGhy0TQW
-jLQXLJfec8XYkBWgGiv1y7NIhkTwHYhMzkFCGu/1DN7+QNo5IPcGVTpqnUbB0m+l
-sshXPimjnODphXdm6JinJH6+wFkg5URvtlfYvs7CZXdYxmFB0XQEyH9JQsVyqXIW
-7ozdEl20StTRr1C32Kp1dmitPl2qMG1hqKsQWz4TvzPgr0SdOCJb70wvpnEmFSbK
-KIzZ+o6OqaIUNeKbJIi09H+FnYNPB6G2FJA2xDQcjSZhbRNveL7ojyfHS4SWo4Zo
-DCO+C+yMlACpBIoTkPffhWwMsQIDAQABo4IBNDCCATAwDgYDVR0PAQH/BAQDAgEG
-MBIGA1UdEwEB/wQIMAYBAf8CAQAwJwYDVR0lBCAwHgYIKwYBBQUHAwEGCCsGAQUF
-BwMCBggrBgEFBQcDBDAzBggrBgEFBQcBAQQnMCUwIwYIKwYBBQUHMAGGF2h0dHA6
-Ly9vY3NwLmVudHJ1c3QubmV0MEQGA1UdIAQ9MDswOQYFYINKAQEwMDAuBggrBgEF
-BQcCARYiaHR0cDovL3d3dy5kaWdpY2VydC5jb20ubXkvY3BzLmh0bTAyBgNVHR8E
-KzApMCegJaAjhiFodHRwOi8vY3JsLmVudHJ1c3QubmV0LzIwNDhjYS5jcmwwEQYD
-VR0OBAoECExOzCUoAymBMB8GA1UdIwQYMBaAFFXkgdERgL7YibkIozH5oSQJFrlw
-MA0GCSqGSIb3DQEBBQUAA4IBAQCXTO9KOkmscvwwIGu0KVunxZUEkPky1cKFat4D
-oTf5iQCwWqxVfttDNf/JAfhRvswmyshqpMRUPiYe5wyjzZdnlN2mQutczY85eWsz
-eSEGefqCRBWZzMG3OdNGYnyycOtvziCqPhm36XSCnLSlS01hADfkh9LyFDpkfLip
-e2HgkyLn1Z8+R+Y2dqBT2AADOg+1M/6WytPSgjou3ddI4eSnacwc6ZlK58pwRdcL
-Bw6adRvQL5Jv9qQHw70cS6aEtn2omqnSpynxC1dpHpdXJuwrQ6zURYMFAOnj8EZA
-B/rqsVFzkxyl3VMRN8gqpxUnHbSqzH+qMTD8uEWfSAntEOLF
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-042_Secure Certificate Services_Comodo CA Limited.pem b/test/rules/platform_certs/cacert/Cert-042_Secure Certificate Services_Comodo CA Limited.pem
deleted file mode 100644
index fe804a3777f6..000000000000
--- a/test/rules/platform_certs/cacert/Cert-042_Secure Certificate Services_Comodo CA Limited.pem	
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEb
-MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
-GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRp
-ZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVow
-fjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAiBgNV
-BAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPM
-cm3ye5drswfxdySRXyWP9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3S
-HpR7LZQdqnXXs5jLrLxkU0C8j6ysNstcrbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996
-CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rCoznl2yY4rYsK7hljxxwk
-3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3Vp6ea5EQz
-6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNV
-HQ4EFgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1Ud
-EwEB/wQFMAMBAf8wgYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2Rv
-Y2EuY29tL1NlY3VyZUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRw
-Oi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmww
-DQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm4J4oqF7Tt/Q0
-5qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj
-Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtI
-gKvcnDe4IRRLDXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJ
-aD61JlfutuC23bkpgHl9j6PwpCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDl
-izeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1HRR3B7Hzs/Sk=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-043_SECOM Trust Systems CO.,LTD.pem b/test/rules/platform_certs/cacert/Cert-043_SECOM Trust Systems CO.,LTD.pem
deleted file mode 100644
index 078bd0e33eab..000000000000
--- a/test/rules/platform_certs/cacert/Cert-043_SECOM Trust Systems CO.,LTD.pem	
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDEl
-MCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMe
-U2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoX
-DTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRy
-dXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3VyaXR5IENvbW11bmlj
-YXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAV
-OVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGr
-zbl+dp+++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVM
-VAX3NuRFg3sUZdbcDE3R3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQ
-hNBqyjoGADdH5H5XTz+L62e4iKrFvlNVspHEfbmwhRkGeC7bYRr6hfVKkaHnFtWO
-ojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1KEOtOghY6rCcMU/Gt1SSw
-awNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8QIH4D5cs
-OPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
-DQEBCwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpF
-coJxDjrSzG+ntKEju/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXc
-okgfGT+Ok+vx+hfuzU7jBBJV1uXk3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8
-t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6qtnRGEmyR7jTV7JqR50S+kDFy
-1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29mvVXIwAHIRc/
-SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-044_COMODO ECC Certification Authority_COMODO CA Limited.pem b/test/rules/platform_certs/cacert/Cert-044_COMODO ECC Certification Authority_COMODO CA Limited.pem
deleted file mode 100644
index 546c95e30de7..000000000000
--- a/test/rules/platform_certs/cacert/Cert-044_COMODO ECC Certification Authority_COMODO CA Limited.pem	
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTEL
-MAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
-BxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMT
-IkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwMzA2MDAw
-MDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdy
-ZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09N
-T0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSR
-FtSrYpn1PlILBs5BAH+X4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0J
-cfRK9ChQtP6IHG4/bC8vCVlbpVsLM5niwz2J+Wos77LTBumjQjBAMB0GA1UdDgQW
-BBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
-BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VGFAkK+qDm
-fQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdv
-GDeAU/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-045_Microsec e-Szigno Root CA 2009_Microsec Ltd.pem b/test/rules/platform_certs/cacert/Cert-045_Microsec e-Szigno Root CA 2009_Microsec Ltd.pem
deleted file mode 100644
index aa844e757d2d..000000000000
--- a/test/rules/platform_certs/cacert/Cert-045_Microsec e-Szigno Root CA 2009_Microsec Ltd.pem	
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYD
-VQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0
-ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0G
-CSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTAeFw0wOTA2MTYxMTMwMThaFw0y
-OTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3Qx
-FjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3pp
-Z25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvP
-kd6mJviZpWNwrZuuyjNAfW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tc
-cbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG0IMZfcChEhyVbUr02MelTTMuhTlAdX4U
-fIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKApxn1ntxVUwOXewdI/5n7
-N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm1HxdrtbC
-xkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1
-+rUCAwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
-A1UdDgQWBBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPM
-Pcu1SCOhGnqmKrs0aDAbBgNVHREEFDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqG
-SIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0olZMEyL/azXm4Q5DwpL7v8u8h
-mLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfXI/OMn74dseGk
-ddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
-tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c
-2Pm2G2JwCz02yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5t
-HMN1Rq41Bab2XD0h7lbwyYIiLXpUq3DDfSJlgnCW
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-046_IGC-A_PM-SGDN.pem b/test/rules/platform_certs/cacert/Cert-046_IGC-A_PM-SGDN.pem
deleted file mode 100644
index 8940ef5a010f..000000000000
--- a/test/rules/platform_certs/cacert/Cert-046_IGC-A_PM-SGDN.pem
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEAjCCAuqgAwIBAgIFORFFEJQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYT
-AkZSMQ8wDQYDVQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQ
-TS9TR0ROMQ4wDAYDVQQLEwVEQ1NTSTEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG
-9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMB4XDTAyMTIxMzE0MjkyM1oXDTIw
-MTAxNzE0MjkyMlowgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIEwZGcmFuY2UxDjAM
-BgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NTSTEO
-MAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsh/R0GLFMzvABIaI
-s9z4iPf930Pfeo2aSVz2TqrMHLmh6yeJ8kbpO0px1R2OLc/mratjUMdUC24SyZA2
-xtgv2pGqaMVy/hcKshd+ebUyiHDKcMCWSo7kVc0dJ5S/znIq7Fz5cyD+vfcuiWe4
-u0dzEvfRNWk68gq5rv9GQkaiv6GFGvm/5P9JhfejcIYyHF2fYPepraX/z9E0+X1b
-F8bc1g4oa8Ld8fUzaJ1O/Id8NhLWo4DoQw1VYZTqZDdH6nfK0LJYBcNdfrGoRpAx
-Vs5wKpayMLh35nnAvSk7/ZR3TL0gzUEl4C7HG7vupARB0l2tEmqKm0f7yd1GQOGd
-PDPQtQIDAQABo3cwdTAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBRjAVBgNV
-HSAEDjAMMAoGCCqBegF5AQEBMB0GA1UdDgQWBBSjBS8YYFDCiQrdKyFP/45OqDAx
-NjAfBgNVHSMEGDAWgBSjBS8YYFDCiQrdKyFP/45OqDAxNjANBgkqhkiG9w0BAQUF
-AAOCAQEABdwm2Pp3FURo/C9mOnTgXeQp/wYHE4RKq89toB9RlPhJy3Q2FLwV3duJ
-L92PoF189RLrn544pEfMs5bZvpwlqwN+Mw+VgQ39FuCIvjfwbF3QMZsyK10XZZOY
-YLxuj7GoPB7ZHPOpJkL5ZB3C55L29B5aqhlSXa/oovdgoPaN8In1buAKBQGVyYsg
-Crpa/JosPL3Dt8ldeCUFP1YUmwza+zpI/pdpXsoQhvdOlgQITeywvl3cO45Pwf2a
-NjSaTFR+FwNIlQgRHAdvhQh+XU3Endv7rs6y0bO4g2wdsrN58dhwmX7wEwLOXt1R
-0982gaEbeC9xs/FZTEYYKKuF0mBWWg==
------END CERTIFICATE-----
diff --git "a/test/rules/platform_certs/cacert/Cert-047_T\303\234RKTRUST.pem" "b/test/rules/platform_certs/cacert/Cert-047_T\303\234RKTRUST.pem"
deleted file mode 100644
index ab1606c29ba0..000000000000
--- "a/test/rules/platform_certs/cacert/Cert-047_T\303\234RKTRUST.pem"
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFFzCCA/+gAwIBAgIBETANBgkqhkiG9w0BAQUFADCCASsxCzAJBgNVBAYTAlRS
-MRgwFgYDVQQHDA9HZWJ6ZSAtIEtvY2FlbGkxRzBFBgNVBAoMPlTDvHJraXllIEJp
-bGltc2VsIHZlIFRla25vbG9qaWsgQXJhxZ90xLFybWEgS3VydW11IC0gVMOcQsSw
-VEFLMUgwRgYDVQQLDD9VbHVzYWwgRWxla3Ryb25payB2ZSBLcmlwdG9sb2ppIEFy
-YcWfdMSxcm1hIEVuc3RpdMO8c8O8IC0gVUVLQUUxIzAhBgNVBAsMGkthbXUgU2Vy
-dGlmaWthc3lvbiBNZXJrZXppMUowSAYDVQQDDEFUw5xCxLBUQUsgVUVLQUUgS8O2
-ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSAtIFPDvHLDvG0gMzAe
-Fw0wNzA4MjQxMTM3MDdaFw0xNzA4MjExMTM3MDdaMIIBKzELMAkGA1UEBhMCVFIx
-GDAWBgNVBAcMD0dlYnplIC0gS29jYWVsaTFHMEUGA1UECgw+VMO8cmtpeWUgQmls
-aW1zZWwgdmUgVGVrbm9sb2ppayBBcmHFn3TEsXJtYSBLdXJ1bXUgLSBUw5xCxLBU
-QUsxSDBGBgNVBAsMP1VsdXNhbCBFbGVrdHJvbmlrIHZlIEtyaXB0b2xvamkgQXJh
-xZ90xLFybWEgRW5zdGl0w7xzw7wgLSBVRUtBRTEjMCEGA1UECwwaS2FtdSBTZXJ0
-aWZpa2FzeW9uIE1lcmtlemkxSjBIBgNVBAMMQVTDnELEsFRBSyBVRUtBRSBLw7Zr
-IFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIC0gU8O8csO8bSAzMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAim1L/xCIOsP2fpTo6iBkcK4h
-gb46ezzb8R1Sf1n68yJMlaCQvEhOEav7t7WNeoMojCZG2E6VQIdhn8WebYGHV2yK
-O7Rm6sxA/OOqbLLLAdsyv9Lrhc+hDVXDWzhXcLh1xnnRFDDtG1hba+818qEhTsXO
-fJlfbLm4IpNQp81McGq+agV/E5wrHur+R84EpW+sky58K5+eeROR6Oqeyjh1jmKw
-lZMq5d/pXpduIF9fhHpEORlAHLpVK/swsoHvhOPc7Jg4OQOFCKlUAwUp8MmPi+oL
-hmUZEdPpCSPeaJMDyTYcIW7OjGbxmTDY17PDHfiBLqi9ggtm/oLL4eAagsNAgQID
-AQABo0IwQDAdBgNVHQ4EFgQUvYiHyY/2pAoLquvF/pEjnatKijIwDgYDVR0PAQH/
-BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAB18+kmP
-NOm3JpIWmgV050vQbTlswyb2zrgxvMTfvCr4N5EY3ATIZJkrGG2AA1nJrvhY0D7t
-wyOfaTyGOBye79oneNGEN3GKPEs5z35FBtYt2IpNeBLWrcLTy9LQQfMmNkqblWwM
-7uXRQydmwYj3erMgbOqwaSvHIOgMA8RBBZniP+Rr+KCGgceExh/VS4ESshYhLBOh
-gLJeDEoTniDYYkCrkOpkSi+sDQESeUWoL4cZaMjihccwsnX5OD+ywJO0a+IDRM5n
-oN+J1q2MdqMTw5RhK2vZbMEHCiIHhWyFJEapvj+LeISCfiQMnf2BN+MlqO02TpUs
-yZyQ2uypQjyttgI=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-048_CA Disig_Disig a.s.pem b/test/rules/platform_certs/cacert/Cert-048_CA Disig_Disig a.s.pem
deleted file mode 100644
index 6496d08da565..000000000000
--- a/test/rules/platform_certs/cacert/Cert-048_CA Disig_Disig a.s.pem	
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzET
-MBEGA1UEBxMKQnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UE
-AxMIQ0EgRGlzaWcwHhcNMDYwMzIyMDEzOTM0WhcNMTYwMzIyMDEzOTM0WjBKMQsw
-CQYDVQQGEwJTSzETMBEGA1UEBxMKQnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcg
-YS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCS9jHBfYj9mQGp2HvycXXxMcbzdWb6UShGhJd4NLxs/LxFWYgmGErE
-Nx+hSkS943EE9UQX4j/8SFhvXJ56CbpRNyIjZkMhsDxkovhqFQ4/61HhVKndBpnX
-mjxUizkDPw/Fzsbrg3ICqB9x8y34dQjbYkzo+s7552oftms1grrijxaSfQUMbEYD
-XcDtab86wYqg6I7ZuUUohwjstMoVvoLdtUSLLa2GDGhibYVW8qwUYzrG0ZmsNHhW
-S8+2rT+MitcE5eN4TPWGqvWP+j1scaMtymfraHtuM6kMgiioTGohQBUgDCZbg8Kp
-FhXAJIJdKxatymP2dACw30PEEGBWZ2NFAgMBAAGjgf8wgfwwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUjbJJaJ1yCCW5wCf1UJNWSEZx+Y8wDgYDVR0PAQH/BAQD
-AgEGMDYGA1UdEQQvMC2BE2Nhb3BlcmF0b3JAZGlzaWcuc2uGFmh0dHA6Ly93d3cu
-ZGlzaWcuc2svY2EwZgYDVR0fBF8wXTAtoCugKYYnaHR0cDovL3d3dy5kaXNpZy5z
-ay9jYS9jcmwvY2FfZGlzaWcuY3JsMCygKqAohiZodHRwOi8vY2EuZGlzaWcuc2sv
-Y2EvY3JsL2NhX2Rpc2lnLmNybDAaBgNVHSAEEzARMA8GDSuBHpGT5goAAAABAQEw
-DQYJKoZIhvcNAQEFBQADggEBAF00dGFMrzvY/59tWDYcPQuBDRIrRhCA/ec8J9B6
-yKm2fnQwM6M6int0wHl5QpNt/7EpFIKrIYwvF/k/Ji/1WcbvgAa3mkkp7M5+cTxq
-EEHA9tOasnxakZzArFvITV734VP/Q3f8nktnbNfzg9Gg4H8l37iYC5oyOGwwoPP/
-CBUz91BKez6jPiCp3C9WgArtQVCwyfTssuMmRAAOb54GvCKWU3BlxFAKRmukLyeB
-EicTXxChds6KezfqwzlhA5WYOudsiCUI/HloDYd9Yvi0X/vF2Ey9WLw/Q1vUHgFN
-PGO+I++MzVpQuGhU+QqZMxEA4Z7CRneC9VkGjCFMhwnN5ag=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-049_MD5 Collisions Inc. (http---www.phreedom.org-md5).pem b/test/rules/platform_certs/cacert/Cert-049_MD5 Collisions Inc. (http---www.phreedom.org-md5).pem
deleted file mode 100644
index e59ce9d8549d..000000000000
--- a/test/rules/platform_certs/cacert/Cert-049_MD5 Collisions Inc. (http---www.phreedom.org-md5).pem	
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEMjCCA5ugAwIBAgIBQjANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEc
-MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBT
-ZWN1cmUgR2xvYmFsIGVCdXNpbmVzcyBDQS0xMB4XDTA0MDczMTAwMDAwMVoXDTA0
-MDkwMjAwMDAwMVowPDE6MDgGA1UEAxMxTUQ1IENvbGxpc2lvbnMgSW5jLiAoaHR0
-cDovL3d3dy5waHJlZWRvbS5vcmcvbWQ1KTCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
-gYkCgYEAuqZZySwo1iqw+O2fRqSkN+4OGWhZ0bMDmVHWFppeN2sV4A5L9YRk+KPb
-QW811ZsVH9vEOFJwgZdej6C193458DKsHq1E0rP6SMPOkZvs9Jx84Vr1yDdrmoPe
-58oglzFCcxWRaPSIr/koKMXpD3OwF0sTTJl10ETmfghsGvJPG0ECAwEAAaOCAiQw
-ggIgMAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSnBGAf
-q3JDCMV/CJBVVhzWzuY46zAfBgNVHSMEGDAWgBS+qKB0clBrRLfJI9j7qP+zV2to
-bDCCAb4GCWCGSAGG+EIBDQSCAa8WggGrMwAAACdeOeCJYQ9Oo8VFCza7AdFTqsMI
-j2/4Tz6Hh0QR3GDg35JV+bhzG1STxZ/QRsRgtjVizbmvHKhpGslbPJY3wO1n77v+
-wIucUC8pvYMino4I+qwTcKJYf2JiihH3ifbftmdZcxb7YxaKtJE4zi71tr5MpJRJ
-5GURCkIVycEw4mnVRX2lJru5YexiZPA54ee8aNhQUZ4dYNPRo6cK+AMgoXABF5E2
-TwJwMYaD3fcP2AcdEbMTBKXc8K5QsSgOY2kqDIJvj0cz32yiBpLxT0W+2TA2oyuM
-1neuNWN/Tkyak0g22Z8CAwEAAaOBvTCBujAOBgNVHQ8BAf8EBAMCBPAwHQYDVR0O
-BBYEFM2mg/qlYDf3ljcXKd5BePGHiVXnMDsGA1UdHwQ0MDIwMKAuoCyGKmh0dHA6
-Ly9jcmwuZ2VvdHJ1c3QuY29tL2NybHMvZ2xvYmFsY2ExLmNybDAfBgNVHSMEGDAW
-gBS+qKB0clBrRLfJI9j7qP+zV2tobDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-BQUHAwIwDAYDVR0TAQH/BAIwADANBgkqhkiG9w0BAQQFAAOBgQCnIQKN0Q6igHcl
-/UNgFY/s75BH1IRCFSYRHM3CPBApqbbfq1d1kdrlK7OQRRwwY1Y/itlQ+u1YbMBl
-rGZX3hzGdjv1AA6ORc5/TJDsK8bNs7SPYtD+t8UmckTt9phbrsvRlfXaCL5oRrF1
-yOwdjx56lPGqU3iiRa5U6tGedMh2Zw==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-050_GeoTrust Global CA_GeoTrust Inc.pem b/test/rules/platform_certs/cacert/Cert-050_GeoTrust Global CA_GeoTrust Inc.pem
deleted file mode 100644
index bcb252976103..000000000000
--- a/test/rules/platform_certs/cacert/Cert-050_GeoTrust Global CA_GeoTrust Inc.pem	
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
-MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
-YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
-EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
-R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
-9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
-fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
-iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
-1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
-bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
-MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
-ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
-uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
-Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
-tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
-PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
-hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
-5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-052_UTN-USERFirst-Client Authentication and Email_The USERTRUST Network.pem b/test/rules/platform_certs/cacert/Cert-052_UTN-USERFirst-Client Authentication and Email_The USERTRUST Network.pem
deleted file mode 100644
index 97c392fa4d51..000000000000
--- a/test/rules/platform_certs/cacert/Cert-052_UTN-USERFirst-Client Authentication and Email_The USERTRUST Network.pem	
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEojCCA4qgAwIBAgIQRL4Mi1AAJLQR0zYlJWfJiTANBgkqhkiG9w0BAQUFADCB
-rjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
-Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
-dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xNjA0BgNVBAMTLVVUTi1VU0VSRmlyc3Qt
-Q2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBFbWFpbDAeFw05OTA3MDkxNzI4NTBa
-Fw0xOTA3MDkxNzM2NThaMIGuMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAV
-BgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5l
-dHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRydXN0LmNvbTE2MDQGA1UE
-AxMtVVROLVVTRVJGaXJzdC1DbGllbnQgQXV0aGVudGljYXRpb24gYW5kIEVtYWls
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsjmFpPJ9q0E7YkY3rs3B
-YHW8OWX5ShpHornMSMxqmNVNNRm5pELlzkniii8efNIxB8dOtINknS4p1aJkxIW9
-hVE1eaROaJB7HHqkkqgX8pgV8pPMyaQylbsMTzC9mKALi+VuG6JG+ni8om+rWV6l
-L8/K2m2qL+usobNqqrcuZzWLeeEeaYji5kbNoKXqvgvOdjp6Dpvq/NonWz1zHyLm
-SGHGTPNpsaguG7bUMSAsvIKKjqQOpdeJQ/wWWq8dcdcRWdq6hw2v+vPhwvCkxWeM
-1tZUOt4KpLoDd7NlyP0e03RiqhjKaJMeoYV+9Udly/hNVyh00jT/MLbu9mIwFIws
-6wIDAQABo4G5MIG2MAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud
-DgQWBBSJgmd9xJ0mcABLtFBIfN49rgRufTBYBgNVHR8EUTBPME2gS6BJhkdodHRw
-Oi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLVVTRVJGaXJzdC1DbGllbnRBdXRoZW50
-aWNhdGlvbmFuZEVtYWlsLmNybDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwQwDQYJKoZIhvcNAQEFBQADggEBALFtYV2mGn98q0rkMPxTbyUkxsrt4jFcKw7u
-7mFVbwQ+zznexRtJlOTrIEy05p5QLnLZjfWqo7NK2lYcYJeA3IKirUq9iiv/Cwm0
-xtcgBEXkzYABurorbs6q15L+5K/r9CYdFip/bDCVNy8zEqx/3cfREYxRmLLQo5HQ
-rfafnoOTHh1CuEava2bwm3/q4wMC5QJRwarVNZ1yQAOJujEdxRBoUp7fooXFXAim
-eOZTT7Hot9MUnpOmw2TjrH5xzbyf6QMbzPvprDHBr3wVdAKZw7JHpsIyYdfHb0gk
-USeh1YdV8nuPmD0Wnu51tvjQjvLzxq4oW6fw8zYX/MMF08oDSlQ=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-053_GlobalSign_GlobalSign.pem b/test/rules/platform_certs/cacert/Cert-053_GlobalSign_GlobalSign.pem
deleted file mode 100644
index 8afb219058fb..000000000000
--- a/test/rules/platform_certs/cacert/Cert-053_GlobalSign_GlobalSign.pem
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4G
-A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNp
-Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4
-MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMzETMBEG
-A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWtiHL8
-RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsT
-gHeMCOFJ0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmm
-KPZpO/bLyCiR5Z2KYVc3rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zd
-QQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjlOCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZ
-XriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2xmmFghcCAwEAAaNCMEAw
-DgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFI/wS3+o
-LkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZU
-RUm7lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMp
-jjM5RcOO5LlXbKr8EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK
-6fBdRoyV3XpYKBovHd7NADdBj+1EbddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQX
-mcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18YIvDQVETI53O9zJrlAGomecs
-Mx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7rkpeDMdmztcpH
-WD9f
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-054_ACEDICOM Root_EDICOM.pem b/test/rules/platform_certs/cacert/Cert-054_ACEDICOM Root_EDICOM.pem
deleted file mode 100644
index 44e967354b1a..000000000000
--- a/test/rules/platform_certs/cacert/Cert-054_ACEDICOM Root_EDICOM.pem	
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFtTCCA52gAwIBAgIIYY3HhjsBggUwDQYJKoZIhvcNAQEFBQAwRDEWMBQGA1UE
-AwwNQUNFRElDT00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00x
-CzAJBgNVBAYTAkVTMB4XDTA4MDQxODE2MjQyMloXDTI4MDQxMzE2MjQyMlowRDEW
-MBQGA1UEAwwNQUNFRElDT00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZF
-RElDT00xCzAJBgNVBAYTAkVTMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
-AgEA/5KV4WgGdrQsyFhIyv2AVClVYyT/kGWbEHV7w2rbYgIB8hiGtXxaOLHkWLn7
-09gtn70yN78sFW2+tfQh0hOR2QetAQXW8713zl9CgQr5auODAKgrLlUTY4HKRxx7
-XBZXehuDYAQ6PmXDzQHe3qTWDLqO3tkE7hdWIpuPY/1NFgu3e3eM+SW10W2ZEi5P
-Grjm6gSSrj0RuVFCPYewMYWveVqc/udOXpJPQ/yrOq2lEiZmueIM15jO1FillUAK
-t0SdE3QrwqXrIhWYENiLxQSfHY9g5QYbm8+5eaA9oiM/Qj9r+hwDezCNzmzAv+Yb
-X79nuIQZ1RXve8uQNjFiybwCq0Zfm/4aaJQ0PZCOrfbkHQl/Sog4P75n/TSW9R28
-MHTLOO7VbKvU/PQAtwBbhTIWdjPp2KOZnQUAqhbm84F9b32qhm2tFXTTxKJxqvQU
-fecyuB+81fFOvW8XAjnXDpVCOscAPukmYxHqC9FK/xidstd7LzrZlvvoHpKuE1XI
-2Sf23EgbsCTBheN3nZqk8wwRHQ3ItBTutYJXCb8gWH8vIiPYcMt5bMlL8qkqyPyH
-K9caUPgn6C9D4zq92Fdx/c6mUlv53U3t5fZvie27k5x2IXXwkkwp9y+cAS7+UEae
-ZAwUswdbxcJzbPEHXEUkFDWug/FqTYl6+rPYLWbwNof1K1MCAwEAAaOBqjCBpzAP
-BgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKaz4SsrSbbXc6GqlPUB53NlTKxQ
-MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUprPhKytJttdzoaqU9QHnc2VMrFAw
-RAYDVR0gBD0wOzA5BgRVHSAAMDEwLwYIKwYBBQUHAgEWI2h0dHA6Ly9hY2VkaWNv
-bS5lZGljb21ncm91cC5jb20vZG9jMA0GCSqGSIb3DQEBBQUAA4ICAQDOLAtSUWIm
-fQwng4/F9tqgaHtPkl7qpHMyEVNEskTLnewPeUKzEKbHDZ3Ltvo/Onzqv4hTGzz3
-gvoFNTPhNahXwOf9jU8/kzJPeGYDdwdY6ZXIfj7QeQCM8htRM5u8lOk6e25SLTKe
-I6RF+7YuE7CLGLHdztUdp0J/Vb77W7tH1PwkzQSulgUV1qzOMPPKC8W64iLgpq0i
-5ALudBF/TP94HTXa5gI06xgSYXcGCRZj6hitoocf8seACQl1ThCojz2GuHURwCRi
-ipZ7SkXp7FnFvmuD5uHorLUwHv4FB4D54SMNUI8FmP8sX+g7tq3PgbUhh8oIKiMn
-MCArz+2UW6yyetLHKKGKC5tNSixthT8Jcjxn4tncB7rrZXtaAWPWkFtPF2Y9fwsZ
-o5NjEFIqnxQWWOLcpfShFosOkYuByptZ+thrkQdlVV9SH686+5DdaaVbnG0OLLb6
-zqylfDJKZ0DcMDQj3dcEI2bw/FWAp/tmGYI1Z2JwOV5vx+qQQEQIHriy1tvuWacN
-GHk0vFQYXlPKNFHtRQrmjseCNj6nOGOpMCwXEGCSn1WHElkQwg9naRHMTh5+Spqt
-r0CodaxWkHS4oJyleW/c6RrIaQXpuvoDs3zk4E7Czp3otkYNbn5XOmeUwssfnHdK
-Z05phkOTOPu220+DkdRgfks+KzgHVZhepA==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-055_SwissSign Gold CA - G2_SwissSign AG.pem b/test/rules/platform_certs/cacert/Cert-055_SwissSign Gold CA - G2_SwissSign AG.pem
deleted file mode 100644
index d72118781967..000000000000
--- a/test/rules/platform_certs/cacert/Cert-055_SwissSign Gold CA - G2_SwissSign AG.pem	
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV
-BAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2ln
-biBHb2xkIENBIC0gRzIwHhcNMDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBF
-MQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMR8wHQYDVQQDExZT
-d2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
-CgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUqt2/8
-76LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+
-bbqBHH5CjCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c
-6bM8K8vzARO/Ws/BtQpgvd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqE
-emA8atufK+ze3gE/bk3lUIbLtK/tREDFylqM2tIrfKjuvqblCqoOpd8FUrdVxyJd
-MmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvRAiTysybUa9oEVeXBCsdt
-MDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuendjIj3o02y
-MszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69y
-FGkOpeUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPi
-aG59je883WX0XaxR7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxM
-gI93e2CaHt+28kgeDrpOVG2Y4OGiGqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCB
-qTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUWyV7
-lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64OfPAeGZe6Drn
-8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov
-L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe6
-45R88a7A3hfm5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczO
-UYrHUDFu4Up+GC9pWbY9ZIEr44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5
-O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOfMke6UiI0HTJ6CVanfCU2qT1L2sCC
-bwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6mGu6uLftIdxf+u+yv
-GPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxpmo/a
-77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCC
-hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid3
-92qgQmwLOM7XdVAyksLfKzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEpp
-Ld6leNcG2mqeSz53OiATIgHQv2ieY2BrNU0LbbqhPcCT4H8js1WtciVORvnSFu+w
-ZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+htt
-Qc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-056_Chambers of Commerce Root - 2008_AC Camerfirma S.A.pem b/test/rules/platform_certs/cacert/Cert-056_Chambers of Commerce Root - 2008_AC Camerfirma S.A.pem
deleted file mode 100644
index 7d3a2491a58b..000000000000
--- a/test/rules/platform_certs/cacert/Cert-056_Chambers of Commerce Root - 2008_AC Camerfirma S.A.pem	
+++ /dev/null
@@ -1,42 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
-VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
-IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
-MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xKTAnBgNVBAMTIENoYW1iZXJz
-IG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEyMjk1MFoXDTM4MDcz
-MTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBj
-dXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIw
-EAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEp
-MCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0G
-CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW9
-28sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKAXuFixrYp4YFs8r/lfTJq
-VKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorjh40G072Q
-DuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR
-5gN/ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfL
-ZEFHcpOrUMPrCXZkNNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05a
-Sd+pZgvMPMZ4fKecHePOjlO+Bd5gD2vlGts/4+EhySnB8esHnFIbAURRPHsl18Tl
-UlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331lubKgdaX8ZSD6e2wsWsSaR6s
-+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ0wlf2eOKNcx5
-Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
-ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAx
-hduub+84Mxh2EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNV
-HQ4EFgQU+SSsD7K1+HnA+mCIG8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1
-+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpN
-YWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29t
-L2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVy
-ZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAt
-IDIwMDiCCQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRV
-HSAAMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20w
-DQYJKoZIhvcNAQEFBQADggIBAJASryI1wqM58C7e6bXpeHxIvj99RZJe6dqxGfwW
-PJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH3qLPaYRgM+gQDROpI9CF
-5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbURWpGqOt1
-glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaH
-FoI6M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2
-pSB7+R5KBWIBpih1YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MD
-xvbxrN8y8NmBGuScvfaAFPDRLLmF9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QG
-tjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcKzBIKinmwPQN/aUv0NCB9szTq
-jktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvGnrDQWzilm1De
-fhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
-OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZ
-d0jQ
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-057_TDC OCES CA_TDC.pem b/test/rules/platform_certs/cacert/Cert-057_TDC OCES CA_TDC.pem
deleted file mode 100644
index e1cce316e88a..000000000000
--- a/test/rules/platform_certs/cacert/Cert-057_TDC OCES CA_TDC.pem	
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFGTCCBAGgAwIBAgIEPki9xDANBgkqhkiG9w0BAQUFADAxMQswCQYDVQQGEwJE
-SzEMMAoGA1UEChMDVERDMRQwEgYDVQQDEwtUREMgT0NFUyBDQTAeFw0wMzAyMTEw
-ODM5MzBaFw0zNzAyMTEwOTA5MzBaMDExCzAJBgNVBAYTAkRLMQwwCgYDVQQKEwNU
-REMxFDASBgNVBAMTC1REQyBPQ0VTIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEArGL2YSCyz8DGhdfjeebM7fI5kqSXLmSjhFuHnEz9pPPEXyG9VhDr
-2y5h7JNp46PMvZnDBfwGuMo2HP6QjklMxFaaL1a8z3sM8W9Hpg1DTeLpHTk0zY0s
-2RKY+ePhwUp8hjjEqcRhiNJerxomTdXkoCJHhNlktxmW/OwZ5LKXJk5KTMuPJItU
-GBxIYXvViGjaXbXqzRowwYCDdlCqT9HU3Tjw7xb04QxQBr/q+3pJoSgrHPb8FTKj
-dGqPqcNiKXEx5TukYBdedObaE+3pHx8b0bJoc8YQNHVGEBDjkAB2QMuLt0MJIf+r
-TpPGWOmlgtt3xDqZsXKVSQTwtyv6e1mO3QIDAQABo4ICNzCCAjMwDwYDVR0TAQH/
-BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwgewGA1UdIASB5DCB4TCB3gYIKoFQgSkB
-AQEwgdEwLwYIKwYBBQUHAgEWI2h0dHA6Ly93d3cuY2VydGlmaWthdC5kay9yZXBv
-c2l0b3J5MIGdBggrBgEFBQcCAjCBkDAKFgNUREMwAwIBARqBgUNlcnRpZmlrYXRl
-ciBmcmEgZGVubmUgQ0EgdWRzdGVkZXMgdW5kZXIgT0lEIDEuMi4yMDguMTY5LjEu
-MS4xLiBDZXJ0aWZpY2F0ZXMgZnJvbSB0aGlzIENBIGFyZSBpc3N1ZWQgdW5kZXIg
-T0lEIDEuMi4yMDguMTY5LjEuMS4xLjARBglghkgBhvhCAQEEBAMCAAcwgYEGA1Ud
-HwR6MHgwSKBGoESkQjBAMQswCQYDVQQGEwJESzEMMAoGA1UEChMDVERDMRQwEgYD
-VQQDEwtUREMgT0NFUyBDQTENMAsGA1UEAxMEQ1JMMTAsoCqgKIYmaHR0cDovL2Ny
-bC5vY2VzLmNlcnRpZmlrYXQuZGsvb2Nlcy5jcmwwKwYDVR0QBCQwIoAPMjAwMzAy
-MTEwODM5MzBagQ8yMDM3MDIxMTA5MDkzMFowHwYDVR0jBBgwFoAUYLWF7FZkfhIZ
-J2cdUBVLc647+RIwHQYDVR0OBBYEFGC1hexWZH4SGSdnHVAVS3OuO/kSMB0GCSqG
-SIb2fQdBAAQQMA4bCFY2LjA6NC4wAwIEkDANBgkqhkiG9w0BAQUFAAOCAQEACrom
-JkbTc6gJ82sLMJn9iuFXehHTuJTXCRBuo7E4A9G28kNBKWKnctj7fAXmMXAnVBhO
-inxO5dHKjHiIzxvTkIvmI/gLDjNDfZziChmPyQE+dF10yYscA+UYyAFMP8uXBV2Y
-caaYb7Z8vTd/vuGTJW1v8AqtFxjhA7wHKcitJuj4YfD9IQl+mo6paH1IYnK9AOoB
-mbgGglGBTvH1tJFUuSN6AJqfXY3gPGS5GhKSKseCRHI53OI8xthV9RVOyAUO28bQ
-YqbsFbS1AoLbrIyigfCbmTH1ICCoiGEKB5+U/NDXG8wuF/MEJ3Zn61SD/aSQfgY9
-BKNDLdr8C2LqL19iUw==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-058_S-TRUST Authentication and Encryption Root CA 2005-PN_Deutscher Sparkassen Verlag GmbH.pem b/test/rules/platform_certs/cacert/Cert-058_S-TRUST Authentication and Encryption Root CA 2005-PN_Deutscher Sparkassen Verlag GmbH.pem
deleted file mode 100644
index c0328d0c1257..000000000000
--- a/test/rules/platform_certs/cacert/Cert-058_S-TRUST Authentication and Encryption Root CA 2005-PN_Deutscher Sparkassen Verlag GmbH.pem	
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEezCCA2OgAwIBAgIQNxkY5lNUfBq1uMtZWts1tzANBgkqhkiG9w0BAQUFADCB
-rjELMAkGA1UEBhMCREUxIDAeBgNVBAgTF0JhZGVuLVd1ZXJ0dGVtYmVyZyAoQlcp
-MRIwEAYDVQQHEwlTdHV0dGdhcnQxKTAnBgNVBAoTIERldXRzY2hlciBTcGFya2Fz
-c2VuIFZlcmxhZyBHbWJIMT4wPAYDVQQDEzVTLVRSVVNUIEF1dGhlbnRpY2F0aW9u
-IGFuZCBFbmNyeXB0aW9uIFJvb3QgQ0EgMjAwNTpQTjAeFw0wNTA2MjIwMDAwMDBa
-Fw0zMDA2MjEyMzU5NTlaMIGuMQswCQYDVQQGEwJERTEgMB4GA1UECBMXQmFkZW4t
-V3VlcnR0ZW1iZXJnIChCVykxEjAQBgNVBAcTCVN0dXR0Z2FydDEpMCcGA1UEChMg
-RGV1dHNjaGVyIFNwYXJrYXNzZW4gVmVybGFnIEdtYkgxPjA8BgNVBAMTNVMtVFJV
-U1QgQXV0aGVudGljYXRpb24gYW5kIEVuY3J5cHRpb24gUm9vdCBDQSAyMDA1OlBO
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2bVKwdMz6tNGs9HiTNL1
-toPQb9UY6ZOvJ44TzbUlNlA0EmQpoVXhOmCTnijJ4/Ob4QSwI7+Vio5bG0F/WsPo
-TUzVJBY+h0jUJ67m91MduwwA7z5hca2/OnpYH5Q9XIHV1W/fuJvS9eXLg3KSwlOy
-ggLrra1fFi2SU3bxibYs9cEv4KdKb6AwajLrmnQDaHgTncovmwsdvs91DSaXm8f1
-XgqfeN+zvOyauu9VjxuapgdjKRdZYgkqeQd3peDRF2npW932kKvimAoA0SVtnteF
-hy+S8dF2g08LOlk3KC8zpxdQ1iALCvQm+Z845y2kuJuJja2tyWp9iRe79n+Ag3rm
-7QIDAQABo4GSMIGPMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgEG
-MCkGA1UdEQQiMCCkHjAcMRowGAYDVQQDExFTVFJvbmxpbmUxLTIwNDgtNTAdBgNV
-HQ4EFgQUD8oeXHngovMpttKFswtKtWXsa1IwHwYDVR0jBBgwFoAUD8oeXHngovMp
-ttKFswtKtWXsa1IwDQYJKoZIhvcNAQEFBQADggEBAK8B8O0ZPCjoTVy7pWMciDMD
-pwCHpB8gq9Yc4wYfl35UvbfRssnV2oDsF9eK9XvCAPbpEW+EoFolMeKJ+aQAPzFo
-LtU96G7m1R08P7K9n3frndOMusDXtk3sU5wPBG7qNWdX4wple5A64U8+wwCSersF
-iXOMy6ZNwPv2AtawB6MDwidAnwzkhYItr5pCHdDHjfhA7p0GVxzZotiAFP7hYy0y
-h9WUUpY6RsZxlj33mA6ykaqP2vROJAA5VeitF7nTNCtKqUDMFypVZUF0Qn71wK/I
-k63yGFs9iQzbRzkk+OBM8h+wPQrKBU6JIRrjKpms/H+h8Q8bHz2eBIPdltkdOpQ=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-059_Equifax Secure.pem b/test/rules/platform_certs/cacert/Cert-059_Equifax Secure.pem
deleted file mode 100644
index e29f64ea5c4d..000000000000
--- a/test/rules/platform_certs/cacert/Cert-059_Equifax Secure.pem	
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDIDCCAomgAwIBAgIEN3DPtTANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMORXF1aWZheCBTZWN1cmUxJjAkBgNVBAsTHUVxdWlmYXggU2Vj
-dXJlIGVCdXNpbmVzcyBDQS0yMB4XDTk5MDYyMzEyMTQ0NVoXDTE5MDYyMzEyMTQ0
-NVowTjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDkVxdWlmYXggU2VjdXJlMSYwJAYD
-VQQLEx1FcXVpZmF4IFNlY3VyZSBlQnVzaW5lc3MgQ0EtMjCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEA5Dk5kx5SBhsoNviyoynF7Y6yEb3+6+e0dMKP/wXn2Z0G
-vxLIPw7y1tEkshHe0XMJitSxLJgJDR5QRrKDpkWNYmi7hRsgcDKqQM2mll/EcTc/
-BPO3QSQ5BxoeLmFYoBIL5aXfxavqN3HMHMg3OrmXUqesxWoklE6ce8/AatbfIb0C
-AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEX
-MBUGA1UEChMORXF1aWZheCBTZWN1cmUxJjAkBgNVBAsTHUVxdWlmYXggU2VjdXJl
-IGVCdXNpbmVzcyBDQS0yMQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTkw
-NjIzMTIxNDQ1WjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUUJ4L6q9euSBIplBq
-y/3YIHqngnYwHQYDVR0OBBYEFFCeC+qvXrkgSKZQasv92CB6p4J2MAwGA1UdEwQF
-MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA
-A4GBAAyGgq3oThr1jokn4jVYPSm0B482UJW/bsGe68SQsoWou7dC4A8HOd/7npCy
-0cE+U58DRLB+S/Rv5Hwf5+Kx5Lia78O9zt4LMjTZ3ijtM2vE1Nc9ElirfQkty3D1
-E4qUoSek1nDFbZS1yX2doNLGCEnZZpum0/QL3MUmV+GRMOrN
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-060_DigiCert Assured ID Root CA_DigiCert Inc.pem b/test/rules/platform_certs/cacert/Cert-060_DigiCert Assured ID Root CA_DigiCert Inc.pem
deleted file mode 100644
index 2731638b6ead..000000000000
--- a/test/rules/platform_certs/cacert/Cert-060_DigiCert Assured ID Root CA_DigiCert Inc.pem	
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBl
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJv
-b3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzExMTEwMDAwMDAwWjBlMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl
-cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7c
-JpSIqvTO9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYP
-mDI2dsze3Tyoou9q+yHyUmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+
-wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4
-VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpyoeb6pNnVFzF1roV9Iq4/
-AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whfGHdPAgMB
-AAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW
-BBRF66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYun
-pyGd823IDzANBgkqhkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRC
-dWKuh+vy1dneVrOfzM4UKLkNl2BcEkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTf
-fwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38FnSbNd67IJKusm7Xi+fT8r87cm
-NW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i8b5QZ7dsvfPx
-H2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
-+o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-061_VeriSign Class 3 Public Primary Certification Authority - G5_VeriSign, Inc.pem b/test/rules/platform_certs/cacert/Cert-061_VeriSign Class 3 Public Primary Certification Authority - G5_VeriSign, Inc.pem
deleted file mode 100644
index 707ff085b8d2..000000000000
--- a/test/rules/platform_certs/cacert/Cert-061_VeriSign Class 3 Public Primary Certification Authority - G5_VeriSign, Inc.pem	
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB
-yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
-U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
-ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL
-MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
-ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
-U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
-aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1
-nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex
-t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz
-SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG
-BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+
-rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/
-NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E
-BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH
-BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
-aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv
-MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE
-p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y
-5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK
-WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ
-4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N
-hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-062_DigiCert Global Root CA_DigiCert Inc.pem b/test/rules/platform_certs/cacert/Cert-062_DigiCert Global Root CA_DigiCert Inc.pem
deleted file mode 100644
index fd4341df2663..000000000000
--- a/test/rules/platform_certs/cacert/Cert-062_DigiCert Global Root CA_DigiCert Inc.pem	
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
-QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT
-MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
-b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB
-CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97
-nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt
-43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P
-T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4
-gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO
-BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR
-TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw
-DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr
-hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg
-06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF
-PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls
-YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
-CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
------END CERTIFICATE-----
diff --git "a/test/rules/platform_certs/cacert/Cert-063_T\303\234RKTRUST.pem" "b/test/rules/platform_certs/cacert/Cert-063_T\303\234RKTRUST.pem"
deleted file mode 100644
index 5205c777e5d5..000000000000
--- "a/test/rules/platform_certs/cacert/Cert-063_T\303\234RKTRUST.pem"
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEPDCCAySgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvjE/MD0GA1UEAww2VMOc
-UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
-c8SxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xS
-S1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kg
-SGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwHhcNMDUxMTA3MTAwNzU3
-WhcNMTUwOTE2MTAwNzU3WjCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBFbGVrdHJv
-bmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJU
-UjEPMA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSw
-bGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWe
-LiAoYykgS2FzxLFtIDIwMDUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCpNn7DkUNMwxmYCMjHWHtPFoylzkkBH3MOrHUTpvqeLCDe2JAOCtFp0if7qnef
-J1Il4std2NiDUBd9irWCPwSOtNXwSadktx4uXyCcUHVPr+G1QRT0mJKIx+XlZEdh
-R3n9wFHxwZnn3M5q+6+1ATDcRhzviuyV79z/rxAc653YsKpqhRgNF8k+v/Gb0AmJ
-Qv2gQrSdiVFVKc8bcLyEVK3BEx+Y9C52YItdP5qtygy/p1Zbj3e41Z55SZI/4PGX
-JHpsmxcPbe9TmJEr5A++WXkHeLuXlfSfadRYhwqp48y2WBmfJiGxxFmNskF1wK1p
-zpwACPI2/z7woQ8arBT9pmAPAgMBAAGjQzBBMB0GA1UdDgQWBBTZN7NOBf3Zz58S
-Fq62iS/rJTqIHDAPBgNVHQ8BAf8EBQMDBwYAMA8GA1UdEwEB/wQFMAMBAf8wDQYJ
-KoZIhvcNAQEFBQADggEBAHJglrfJ3NgpXiOFX7KzLXb7iNcX/nttRbj2hWyfIvwq
-ECLsqrkw9qtY1jkQMZkpAL2JZkH7dN6RwRgLn7Vhy506vvWolKMiVW4XSf/SKfE4
-Jl3vpao6+XF75tpYHdN0wgH6PmlYX63LaL4ULptswLbcoCb6dxriJNoaN+BnrdFz
-gw2lGh1uEpJ+hGIAF728JRhX8tepb1mIvDS3LoV4nZbcFMMsilKbloxSZj2GFotH
-uFEJjOp9zYhys2AzsfAKRO8P9Qk3iCQOLGsgOqL6EfJANZxEaGM7rDNvY7wsu/LS
-y3Z9fYjYHcgFHW68lKlmjHdxx/qR+i9Rnuk5UrbnBEI=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-064_UTN - DATACorp SGC_The USERTRUST Network.pem b/test/rules/platform_certs/cacert/Cert-064_UTN - DATACorp SGC_The USERTRUST Network.pem
deleted file mode 100644
index 1c747eb57d07..000000000000
--- a/test/rules/platform_certs/cacert/Cert-064_UTN - DATACorp SGC_The USERTRUST Network.pem	
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCB
-kzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
-Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
-dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZBgNVBAMTElVUTiAtIERBVEFDb3Jw
-IFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBaMIGTMQswCQYDVQQG
-EwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYD
-VQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cu
-dXNlcnRydXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6
-E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ysraP6LnD43m77VkIVni5c7yPeIbkFdicZ
-D0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlowHDyUwDAXlCCpVZvNvlK
-4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA9P4yPykq
-lXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulW
-bfXv33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQAB
-o4GrMIGoMAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRT
-MtGzz3/64PGgXYVOktKeRR20TzA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3Js
-LnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dDLmNybDAqBgNVHSUEIzAhBggr
-BgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3DQEBBQUAA4IB
-AQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft
-Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyj
-j98C5OBxOvG0I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVH
-KWss5nbZqSl9Mt3JNjy9rjXxEZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv
-2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwPDPafepE39peC4N1xaf92P2BNPM/3
-mfnGV/TJVTl4uix5yaaIK/QI
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-065_Network Solutions Certificate Authority_Network Solutions L.L.C.pem b/test/rules/platform_certs/cacert/Cert-065_Network Solutions Certificate Authority_Network Solutions L.L.C.pem
deleted file mode 100644
index 11289bcdf344..000000000000
--- a/test/rules/platform_certs/cacert/Cert-065_Network Solutions Certificate Authority_Network Solutions L.L.C.pem	
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBi
-MQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
-MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
-dHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMxMjM1OTU5WjBiMQswCQYDVQQGEwJV
-UzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydO
-ZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwz
-c7MEL7xxjOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPP
-OCwGJgl6cvf6UDL4wpPTaaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rl
-mGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXTcrA/vGp97Eh/jcOrqnErU2lBUzS1sLnF
-BgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc/Qzpf14Dl847ABSHJ3A4
-qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMBAAGjgZcw
-gZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIB
-BjAPBgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwu
-bmV0c29sc3NsLmNvbS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3Jp
-dHkuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc8
-6fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q4LqILPxFzBiwmZVRDuwduIj/
-h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/GGUsyfJj4akH
-/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
-wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHN
-pGxlaKFJdlxDydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-066_GlobalSign_GlobalSign.pem b/test/rules/platform_certs/cacert/Cert-066_GlobalSign_GlobalSign.pem
deleted file mode 100644
index 6f0f8db0d8f2..000000000000
--- a/test/rules/platform_certs/cacert/Cert-066_GlobalSign_GlobalSign.pem
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4G
-A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNp
-Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1
-MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMjETMBEG
-A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6ErPL
-v4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8
-eoLrvozps6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklq
-tTleiDTsvHgMCJiEbKjNS7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzd
-C9XZzPnqJworc5HGnRusyMvo4KD0L5CLTfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pa
-zq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6CygPCm48CAwEAAaOBnDCB
-mTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUm+IH
-V2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5n
-bG9iYWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG
-3lm0mi3f3BmGLjANBgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4Gs
-J0/WwbgcQ3izDJr86iw8bmEbTUsp9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO
-291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu01yiPqFbQfXf5WRDLenVOavS
-ot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG79G+dwfCMNYxd
-AfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
-TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-067_America Online Root Certification Authority 1_America Online Inc.pem b/test/rules/platform_certs/cacert/Cert-067_America Online Root Certification Authority 1_America Online Inc.pem
deleted file mode 100644
index d6837453dd86..000000000000
--- a/test/rules/platform_certs/cacert/Cert-067_America Online Root Certification Authority 1_America Online Inc.pem	
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDpDCCAoygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEc
-MBoGA1UEChMTQW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBP
-bmxpbmUgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAxMB4XDTAyMDUyODA2
-MDAwMFoXDTM3MTExOTIwNDMwMFowYzELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0Ft
-ZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2EgT25saW5lIFJvb3Qg
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAKgv6KRpBgNHw+kqmP8ZonCaxlCyfqXfaE0bfA+2l2h9LaaLl+lk
-hsmj76CGv2BlnEtUiMJIxUo5vxTjWVXlGbR0yLQFOVwWpeKVBeASrlmLojNoWBym
-1BW32J/X3HGrfpq/m44zDyL9Hy7nBzbvYjnF3cu6JRQj3gzGPTzOggjmZj7aUTsW
-OqMFf6Dch9Wc/HKpoH145LcxVR5lu9RhsCFg7RAycsWSJR74kEoYeEfffjA3PlAb
-2xzTa5qGUwew76wGePiEmf4hjUyAtgyC9mZweRrTT6PP8c9GsEsPPt2IYriMqQko
-O3rHl+Ee5fSfwMCuJKDIodkP1nsmgmkyPacCAwEAAaNjMGEwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUAK3Zo/Z59m50qX8zPYEX10zPM94wHwYDVR0jBBgwFoAU
-AK3Zo/Z59m50qX8zPYEX10zPM94wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB
-BQUAA4IBAQB8itEfGDeC4Liwo+1WlchiYZwFos3CYiZhzRAW18y0ZTTQEYqtqKkF
-Zu90821fnZmv9ov761KyBZiibyrFVL0lvV+uyIbqRizBs73B6UlwGBaXCBOMIOAb
-LjpHyx7kADCVW/RFo8AasAFOq73AI25jP4BKxQft3OJvx8Fi8eNy1gTIdGcL+oir
-oQHIb/AUr9KZzVGTfu0uOMe9zkZQPXLjeSWdm4grECDdpbgyn43gKd8hdIaC2y+C
-MMbHNYaz+ZZfRtsMRf3zUMNvxsNIrUam4SdHCh0Om7bCd39j8uB9Gr784N/Xx6ds
-sPmuujz9dLQR6FgNgLzTqIA6me11zEZ7
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-068_GTE CyberTrust Global Root_GTE Corporation.pem b/test/rules/platform_certs/cacert/Cert-068_GTE CyberTrust Global Root_GTE Corporation.pem
deleted file mode 100644
index 82ae5e1bec73..000000000000
--- a/test/rules/platform_certs/cacert/Cert-068_GTE CyberTrust Global Root_GTE Corporation.pem	
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICWjCCAcMCAgGlMA0GCSqGSIb3DQEBBAUAMHUxCzAJBgNVBAYTAlVTMRgwFgYD
-VQQKEw9HVEUgQ29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNv
-bHV0aW9ucywgSW5jLjEjMCEGA1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJv
-b3QwHhcNOTgwODEzMDAyOTAwWhcNMTgwODEzMjM1OTAwWjB1MQswCQYDVQQGEwJV
-UzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQLEx5HVEUgQ3liZXJU
-cnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0IEds
-b2JhbCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCVD6C28FCc6HrH
-iM3dFw4usJTQGz0O9pTAipTHBsiQl8i4ZBp6fmw8U+E3KHNgf7KXUwefU/ltWJTS
-r41tiGeA5u2ylc9yMcqlHHK6XALnZELn+aks1joNrI1CqiQBOeacPwGFVw1Yh0X4
-04Wqk2kmhXBIgD8SFcd5tB8FLztimQIDAQABMA0GCSqGSIb3DQEBBAUAA4GBAG3r
-GwnpXtlR22ciYaQqPEh346B8pt5zohQDhT37qw4wxYMWM4ETCJ57NE7fQMh017l9
-3PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OFNMQkpw0P
-lZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-069_Thawte Premium Server CA_Thawte Consulting cc.pem b/test/rules/platform_certs/cacert/Cert-069_Thawte Premium Server CA_Thawte Consulting cc.pem
deleted file mode 100644
index 51285e33c2fc..000000000000
--- a/test/rules/platform_certs/cacert/Cert-069_Thawte Premium Server CA_Thawte Consulting cc.pem	
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkEx
-FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
-VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
-biBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2Vy
-dmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29t
-MB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYTAlpB
-MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsG
-A1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRp
-b24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNl
-cnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNv
-bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2aovXwlue2oFBYo847kkE
-VdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIhUdib0GfQ
-ug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMR
-uHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG
-9w0BAQQFAAOBgQAmSCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUI
-hfzJATj/Tb7yFkJD57taRvvBxhEf8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JM
-pAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7tUCemDaYj+bvLpgcUQg==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-070_Equifax Secure Global eBusiness CA-1_Equifax Secure Inc.pem b/test/rules/platform_certs/cacert/Cert-070_Equifax Secure Global eBusiness CA-1_Equifax Secure Inc.pem
deleted file mode 100644
index 03cb845809b0..000000000000
--- a/test/rules/platform_certs/cacert/Cert-070_Equifax Secure Global eBusiness CA-1_Equifax Secure Inc.pem	
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICkDCCAfmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEc
-MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBT
-ZWN1cmUgR2xvYmFsIGVCdXNpbmVzcyBDQS0xMB4XDTk5MDYyMTA0MDAwMFoXDTIw
-MDYyMTA0MDAwMFowWjELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0VxdWlmYXggU2Vj
-dXJlIEluYy4xLTArBgNVBAMTJEVxdWlmYXggU2VjdXJlIEdsb2JhbCBlQnVzaW5l
-c3MgQ0EtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuucXkAJlsTRVPEnC
-UdXfp9E3j9HngXNBUmCbnaEXJnitx7HoJpQytd4zjTov2/KaelpzmKNc6fuKcxtc
-58O/gGzNqfTWK8D3+ZmqY6KxRwIP1ORROhI8bIpaVIRw28HFkM9yRcuoWcDNM50/
-o5brhTMhHD4ePmBudpxnhcXIw2ECAwEAAaNmMGQwEQYJYIZIAYb4QgEBBAQDAgAH
-MA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUvqigdHJQa0S3ySPY+6j/s1dr
-aGwwHQYDVR0OBBYEFL6ooHRyUGtEt8kj2Puo/7NXa2hsMA0GCSqGSIb3DQEBBAUA
-A4GBADDiAVGqx+pf2rnQZQ8w1j7aDRRJbpGTJxQx78T3LUX47Me/okENI7SS+RkA
-Z70Br83gcfxaz2TE4JaY0KNA4gGK7ycH8WUBikQtBmV1UsCGECAhX2xrD2yuCRyv
-8qIYNMR1pHMc8Y3c7635s3a0kr/clRAevsvIO1qEYBlWlKlV
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-071_thawte Primary Root CA - G2_thawte, Inc.pem b/test/rules/platform_certs/cacert/Cert-071_thawte Primary Root CA - G2_thawte, Inc.pem
deleted file mode 100644
index 447ee3d89816..000000000000
--- a/test/rules/platform_certs/cacert/Cert-071_thawte Primary Root CA - G2_thawte, Inc.pem	
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDEL
-MAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMp
-IDIwMDcgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAi
-BgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMjAeFw0wNzExMDUwMDAw
-MDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
-d3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBGb3Ig
-YXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9v
-dCBDQSAtIEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/
-BebfowJPDQfGAFG6DAJSLSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6
-papu+7qzcMBniKI11KOasf2twu8x+qi58/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUmtgAMADna3+FGO6Lts6K
-DPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUNG4k8VIZ3
-KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41ox
-XZ3Krr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-072_Digisign Server ID (Enrich)_Digicert Sdn. Bhd.pem b/test/rules/platform_certs/cacert/Cert-072_Digisign Server ID (Enrich)_Digicert Sdn. Bhd.pem
deleted file mode 100644
index 13316db4f43c..000000000000
--- a/test/rules/platform_certs/cacert/Cert-072_Digisign Server ID (Enrich)_Digicert Sdn. Bhd.pem	
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDzTCCAzagAwIBAgIGB///////MA0GCSqGSIb3DQEBBQUAMHUxCzAJBgNVBAYT
-AlVTMRgwFgYDVQQKEw9HVEUgQ29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJl
-clRydXN0IFNvbHV0aW9ucywgSW5jLjEjMCEGA1UEAxMaR1RFIEN5YmVyVHJ1c3Qg
-R2xvYmFsIFJvb3QwHhcNMDcwNzE3MTUxNzQ5WhcNMTIwNzE3MTUxNjU1WjBjMQsw
-CQYDVQQGEwJNWTEbMBkGA1UEChMSRGlnaWNlcnQgU2RuLiBCaGQuMREwDwYDVQQL
-Ewg0NTc2MDgtSzEkMCIGA1UEAxMbRGlnaXNpZ24gU2VydmVyIElEIChFbnJpY2gp
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCtqGRLTYfHhFm5+5BGoKaJwPH+
-1dpUgjcNmStFJgroVrB/yqj0jkeEAYIp47NqtZHz+5WFvHKoZOgKQJzF9HGue3tq
-B+qQFE+Nia+Uq7IG1AJqe5gfWbk6zVT6IN+yKgrpuN1pkMAp007Ql+1mzMUZSQZ/
-+l4sfHuFGzJC33uVJQIDAQABo4IBeDCCAXQwEgYDVR0TAQH/BAgwBgEB/wIBADBc
-BgNVHSAEVTBTMEgGCSsGAQQBsT4BADA7MDkGCCsGAQUFBwIBFi1odHRwOi8vY3li
-ZXJ0cnVzdC5vbW5pcm9vdC5jb20vcmVwb3NpdG9yeS5jZm0wBwYFYINKAQEwDgYD
-VR0PAQH/BAQDAgHmMIGJBgNVHSMEgYEwf6F5pHcwdTELMAkGA1UEBhMCVVMxGDAW
-BgNVBAoTD0dURSBDb3Jwb3JhdGlvbjEnMCUGA1UECxMeR1RFIEN5YmVyVHJ1c3Qg
-U29sdXRpb25zLCBJbmMuMSMwIQYDVQQDExpHVEUgQ3liZXJUcnVzdCBHbG9iYWwg
-Um9vdIICAaUwRQYDVR0fBD4wPDA6oDigNoY0aHR0cDovL3d3dy5wdWJsaWMtdHJ1
-c3QuY29tL2NnaS1iaW4vQ1JMLzIwMTgvY2RwLmNybDAdBgNVHQ4EFgQUxhaTThYX
-7BaujJR284ZtxXRuhHcwDQYJKoZIhvcNAQEFBQADgYEAdgB7pngrZh2OXjbGpI4F
-8iOSfJNn0/TACn2LLdnq1W8a8+FKKVoihE1QL0sM8v+FwntV1ESCvm2sZ468tB+S
-nFGAGhT2bqthiAutHH/3S1BR1mUbpkdxFV6wcfM1FPI3vWPI1fCTWjRf2D3oXffF
-HsDlzx+GJKk8B2bNwdI2Y1k=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-073_thawte Primary Root CA - G3_thawte, Inc.pem b/test/rules/platform_certs/cacert/Cert-073_thawte Primary Root CA - G3_thawte, Inc.pem
deleted file mode 100644
index acfed9d2c846..000000000000
--- a/test/rules/platform_certs/cacert/Cert-073_thawte Primary Root CA - G3_thawte, Inc.pem	
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCB
-rjELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
-Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
-MDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNV
-BAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0wODA0MDIwMDAwMDBa
-Fw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3Rl
-LCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9u
-MTgwNgYDVQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXpl
-ZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEcz
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsr8nLPvb2FvdeHsbnndm
-gcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2AtP0LMqmsywCPLLEHd5N/8
-YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC+BsUa0Lf
-b1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS9
-9irY7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2S
-zhkGcuYMXDhpxwTWvGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUk
-OQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNV
-HQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJKoZIhvcNAQELBQADggEBABpA
-2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweKA3rD6z8KLFIW
-oCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
-t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7c
-KUGRIjxpp7sC8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fM
-m7v/OeZWYdMKp8RcTGB7BXcmer/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZu
-MdRAGmI0Nj81Aa6sY6A=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-074_SECOM Trust Systems CO.,LTD.pem b/test/rules/platform_certs/cacert/Cert-074_SECOM Trust Systems CO.,LTD.pem
deleted file mode 100644
index de75da583833..000000000000
--- a/test/rules/platform_certs/cacert/Cert-074_SECOM Trust Systems CO.,LTD.pem	
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDfTCCAmWgAwIBAgIBADANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJKUDEl
-MCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMh
-U2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBFViBSb290Q0ExMB4XDTA3MDYwNjAyMTIz
-MloXDTM3MDYwNjAyMTIzMlowYDELMAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09N
-IFRydXN0IFN5c3RlbXMgQ08uLExURC4xKjAoBgNVBAsTIVNlY3VyaXR5IENvbW11
-bmljYXRpb24gRVYgUm9vdENBMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBALx/7FebJOD+nLpCeamIivqA4PUHKUPqjgo0No0c+qe1OXj/l3X3L+SqawSE
-RMqm4miO/VVQYg+kcQ7OBzgtQoVQrTyWb4vVog7P3kmJPdZkLjjlHmy1V4qe70gO
-zXppFodEtZDkBp2uoQSXWHnvIEqCa4wiv+wfD+mEce3xDuS4GBPMVjZd0ZoeUWs5
-bmB2iDQL87PRsJ3KYeJkHcFGB7hj3R4zZbOOCVVSPbW9/wfrrWFVGCypaZhKqkDF
-MxRldAD5kd6vA0jFQFTcD4SQaCDFkpbcLuUCRarAX1T4bepJz11sS6/vmsJWXMY1
-VkJqMF/Cq/biPT+zyRGPMUzXn0kCAwEAAaNCMEAwHQYDVR0OBBYEFDVK9U2vP9eC
-OKyrcWUXdYydVZPmMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0G
-CSqGSIb3DQEBBQUAA4IBAQCoh+ns+EBnXcPBZsdAS5f8hxOQWsTvoMpfi7ent/HW
-tWS3irO4G8za+6xmiEHO6Pzk2x6Ipu0nUBsCMCRGef4Eh3CXQHPRwMFXGZpppSeZ
-q51ihPZRwSzJIxXYKLerJRO1RuGGAv8mjMSIkh1W/hln8lXkgKNrnKt34VFxDSDb
-EJrbvXZ5B3eZKK2aXtqxT0QsNY6llsf9g/BYxnnWmHyojf6GPgcWkuF75x3sM3Z+
-Qi5KhfmRiWiEA4Glm5q+4zfFVKtWOxgtQaQM+ELbmaDgcm+7XeEWT1MKZPlO9L9O
-VL14bIjqv5wTJMJwaaJ/D8g8rQjJsJhAoyrniIPtd490
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-075_Digital Signature Trust Co.pem b/test/rules/platform_certs/cacert/Cert-075_Digital Signature Trust Co.pem
deleted file mode 100644
index 32b72ee3715c..000000000000
--- a/test/rules/platform_certs/cacert/Cert-075_Digital Signature Trust Co.pem	
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDKTCCApKgAwIBAgIENm7TzjANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJV
-UzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQL
-EwhEU1RDQSBFMjAeFw05ODEyMDkxOTE3MjZaFw0xODEyMDkxOTQ3MjZaMEYxCzAJ
-BgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4x
-ETAPBgNVBAsTCERTVENBIEUyMIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQC/
-k48Xku8zExjrEH9OFr//Bo8qhbxe+SSmJIi2A7fBw18DW9Fvrn5C6mYjuGODVvso
-LeE4i7TuqAHhzhy2iCoiRoX7n6dwqUcUP87eZfCocfdPJmyMvMa1795JJ/9IKn3o
-TQPMx7JSxhcxEzu1TdvIxPbDDyQq2gyd55FbgM2UnQIBA6OCASQwggEgMBEGCWCG
-SAGG+EIBAQQEAwIABzBoBgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMx
-JDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0dXJlIFRydXN0IENvLjERMA8GA1UECxMI
-RFNUQ0EgRTIxDTALBgNVBAMTBENSTDEwKwYDVR0QBCQwIoAPMTk5ODEyMDkxOTE3
-MjZagQ8yMDE4MTIwOTE5MTcyNlowCwYDVR0PBAQDAgEGMB8GA1UdIwQYMBaAFB6C
-TShlgDzJQW6sNS5ay97u+DlbMB0GA1UdDgQWBBQegk0oZYA8yUFurDUuWsve7vg5
-WzAMBgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqG
-SIb3DQEBBQUAA4GBAEeNg61i8tuwnkUiBbmi1gMOOHLnnvx75pO2mqWilMg0HZHR
-xdf0CiUPPXiBng+xZ8SQTGPdXqfiup/1902lMXucKS1M/mQ+7LZT/uqb7YLbdHVL
-B3luHtgZg3Pe9T7Qtd7nS2h9Qy4qIOF+oHhEngj1mPnHfxsb1gYgAlihw6ID
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-076_TDC Internet.pem b/test/rules/platform_certs/cacert/Cert-076_TDC Internet.pem
deleted file mode 100644
index 21ccc8f16448..000000000000
--- a/test/rules/platform_certs/cacert/Cert-076_TDC Internet.pem	
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEKzCCAxOgAwIBAgIEOsylTDANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJE
-SzEVMBMGA1UEChMMVERDIEludGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQg
-Um9vdCBDQTAeFw0wMTA0MDUxNjMzMTdaFw0yMTA0MDUxNzAzMTdaMEMxCzAJBgNV
-BAYTAkRLMRUwEwYDVQQKEwxUREMgSW50ZXJuZXQxHTAbBgNVBAsTFFREQyBJbnRl
-cm5ldCBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxLhA
-vJHVYx/XmaCLDEAedLdInUaMArLgJF/wGROnN4NrXceO+YQwzho7+vvOi20jxsNu
-Zp+Jpd/gQlBn+h9sHvTQBda/ytZO5GhgbEaqHF1j4QeGDmUApy6mcca8uYGoOn0a
-0vnRrEvLznWv3Hv6gXPU/Lq9QYjUdLP5Xjg6PEOo0pVOd20TDJ2PeAG3WiAfAzc1
-4izbSysseLlJ28TQx5yc5IogCSEWVmb/Bexb4/DPqyQkXsN/cHoSxNK1EKC2IeGN
-eGlVRGn1ypYcNIUXJXfi9i8nmHj9eQY6otZaQ8H/7AQ77hPv01ha/5Lr7K7a8jcD
-R0G2l8ktCkEiu7vmpwIDAQABo4IBJTCCASEwEQYJYIZIAYb4QgEBBAQDAgAHMGUG
-A1UdHwReMFwwWqBYoFakVDBSMQswCQYDVQQGEwJESzEVMBMGA1UEChMMVERDIElu
-dGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQgUm9vdCBDQTENMAsGA1UEAxME
-Q1JMMTArBgNVHRAEJDAigA8yMDAxMDQwNTE2MzMxN1qBDzIwMjEwNDA1MTcwMzE3
-WjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUbGQBx/2FbazI2p5QCIUItTxWqFAw
-HQYDVR0OBBYEFGxkAcf9hW2syNqeUAiFCLU8VqhQMAwGA1UdEwQFMAMBAf8wHQYJ
-KoZIhvZ9B0EABBAwDhsIVjUuMDo0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4IBAQBO
-Q8zR3R0QGwZ/t6T609lN+yOfI1Rb5osvBCiLtSdtiaHsmGnc540mgwV5dOy0uaOX
-wTUA/RXaOYE6lTGQ3pfphqiZdwzlWqCE/xIWrG64jcN7ksKsLtB9KOy282A4aW8+
-2ARVPp7MVdK6/rtHBNcK2RYKNCn1WBPVT8+PVkuzHu7TmHnaCB4Mb7j4Fifvwm89
-9qNLPg7kbWzbO0ESm70NRyN/PErQr8Cv9u8btRXE64PECV90i9kR+8JWsTz4cMo0
-jUNAE4z9mQNUecYu6oah9jrUCbz0vGbMPVjQV0kK7iXiQe4T+Zs4NNEA9X7nlB38
-aQNiuJkFBT1reBK9sG9l
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-077_DigiNotar Cyber CA_DigiNotar.pem b/test/rules/platform_certs/cacert/Cert-077_DigiNotar Cyber CA_DigiNotar.pem
deleted file mode 100644
index ab9096205e59..000000000000
--- a/test/rules/platform_certs/cacert/Cert-077_DigiNotar Cyber CA_DigiNotar.pem	
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFATCCBGqgAwIBAgIED////zANBgkqhkiG9w0BAQUFADA+MQswCQYDVQQGEwJO
-TDESMBAGA1UEChMJRGlnaU5vdGFyMRswGQYDVQQDExJEaWdpTm90YXIgQ3liZXIg
-Q0EwHhcNMDYwOTI3MTA1MzUzWhcNMTMwOTIwMDk0NDA3WjA+MQswCQYDVQQGEwJO
-TDESMBAGA1UEChMJRGlnaU5vdGFyMRswGQYDVQQDExJEaWdpTm90YXIgQ3liZXIg
-Q0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDSzhUKLahehGet/b7v
-RsfIuc9z/PQ0ufksQ+dgEz1647LPO2dskK3AuT+EUvA1Qtx03Cg7vVK0p6xyRRfG
-8InrtKol8l1LXtHZh7rWfXz1zjKfEDPFsUq7XpExwtDpQcKRZH4JQTvbiwg3aqrK
-Ut61OR7AiAOlP4uZE2FDtZuCs+4gb8+hRKLqL2tAn48rV62hU8KFImmdoD9R3wtB
-kQ2l4aiqXEkIXb3ecEGxD8lja9N/NHQCLzRaeHUcaHqBZ4rz2kDwYGP0kiDXA6Y9
-ox5nxIQbQaXJjOa96ki2BRYIszcSWvdhPPc4by6X4G9WOFTTKLWtFG4uS2S1J2W3
-dSUJtgc9lVYCCoJgsnNF4DMmUXSaudRQHPZNW1tSUhNapn+nDuHoQVRnmIyH1cnT
-bMvTVJIGCTRB94FvP57JfHVVsOfBs3fow8QANZVAcBBKBd4lu59ZpWS8R2C/YON2
-ixNV3eF0ernPJKZqf95kIkRYaIJqEPk95T4bub38IvRgBIm7VW0oVfrejo0bIRTX
-N4s0e032srIQzzOxfRximUjLK2x2llW/GQ0dH7tlqhuOmbXGKJDlgi14UCCa/Xkv
-JH/wiSlp9H3Nc76z7U7B0e1SXo/3uNeNh62y2RtREv9Ws+GvNH1cpHiIEJ6dA8al
-qqIkUfdJFMWx7llDld+raCgwPwIDAQABo4IBhjCCAYIwEgYDVR0TAQH/BAgwBgEB
-/wIBATBTBgNVHSAETDBKMEgGCSsGAQQBsT4BADA7MDkGCCsGAQUFBwIBFi1odHRw
-Oi8vd3d3LnB1YmxpYy10cnVzdC5jb20vQ1BTL09tbmlSb290Lmh0bWwwDgYDVR0P
-AQH/BAQDAgEGMIGgBgNVHSMEgZgwgZWAFKYMHZ9h/wcXtb84RttDMNWOsFIGoXmk
-dzB1MQswCQYDVQQGEwJVUzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYD
-VQQLEx5HVEUgQ3liZXJUcnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdU
-RSBDeWJlclRydXN0IEdsb2JhbCBSb290ggIBpTBFBgNVHR8EPjA8MDqgOKA2hjRo
-dHRwOi8vd3d3LnB1YmxpYy10cnVzdC5jb20vY2dpLWJpbi9DUkwvMjAxOC9jZHAu
-Y3JsMB0GA1UdDgQWBBSr+Wjfz0o313tFjF9y3kBEw2W7wjANBgkqhkiG9w0BAQUF
-AAOBgQAJymIPjbtK4NR6NSsGLdEoYbasAfuDSbyu1C8thq4Zg6XWHRPiF77+MnTp
-ehQ4ypRe9ykBaXEbkRr9o7uqHcp74hb9oaMO8wxfsuEgMZQrXpJ27frptSOmvwo7
-A6lvUmBUzV/pty98oif9QYN1tg37eCbzsUXpMpUqGjUhlcWidQ==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-078_VeriSign, Inc.pem b/test/rules/platform_certs/cacert/Cert-078_VeriSign, Inc.pem
deleted file mode 100644
index d209ab6f8cbf..000000000000
--- a/test/rules/platform_certs/cacert/Cert-078_VeriSign, Inc.pem	
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICPDCCAaUCEDyRMcsf9tAbDpq40ES/Er4wDQYJKoZIhvcNAQEFBQAwXzELMAkG
-A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
-cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
-MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
-BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
-YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
-ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
-BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
-I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
-CSqGSIb3DQEBBQUAA4GBABByUqkFFBkyCEHwxWsKzH4PIRnN5GfcX6kb5sroc50i
-2JhucwNhkcV8sEVAbkSdjbCxlnRhLQ2pRdKkkirWmnWXbj9T/UWZYB2oK0z5XqcJ
-2HUw19JlYD1n1khVdWk/kfVIC0dpImmClr7JyDiGSnoscxlIaU5rfGW/D/xwzoiQ
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-079_SwissSign Platinum CA - G2_SwissSign AG.pem b/test/rules/platform_certs/cacert/Cert-079_SwissSign Platinum CA - G2_SwissSign AG.pem
deleted file mode 100644
index 0aa3e35778df..000000000000
--- a/test/rules/platform_certs/cacert/Cert-079_SwissSign Platinum CA - G2_SwissSign AG.pem	
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFwTCCA6mgAwIBAgIITrIAZwwDXU8wDQYJKoZIhvcNAQEFBQAwSTELMAkGA1UE
-BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEjMCEGA1UEAxMaU3dpc3NTaWdu
-IFBsYXRpbnVtIENBIC0gRzIwHhcNMDYxMDI1MDgzNjAwWhcNMzYxMDI1MDgzNjAw
-WjBJMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMSMwIQYDVQQD
-ExpTd2lzc1NpZ24gUGxhdGludW0gQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAMrfogLi2vj8Bxax3mCq3pZcZB/HL37PZ/pEQtZ2Y5Wu669y
-IIpFR4ZieIbWIDkm9K6j/SPnpZy1IiEZtzeTIsBQnIJ71NUERFzLtMKfkr4k2Htn
-IuJpX+UFeNSH2XFwMyVTtIc7KZAoNppVRDBopIOXfw0enHb/FZ1glwCNioUD7IC+
-6ixuEFGSzH7VozPY1kneWCqv9hbrS3uQMpe5up1Y8fhXSQQeol0GcN1x2/ndi5ob
-jM89o03Oy3z2u5yg+gnOI2Ky6Q0f4nIoj5+saCB9bzuohTEJfwvH6GXp43gOCWcw
-izSC+13gzJ2BbWLuCB4ELE6b7P6pT1/9aXjvCR+htL/68++QHkwFix7qepF6w9fl
-+zC8bBsQWJj3Gl/QKTIDE0ZNYWqFTFJ0LwYfexHihJfGmfNtf9dng34TaNhxKFrY
-zt3oEBSa/m0jh26OWnA81Y0JAKeqvLAxN23IhBQeW71FYyBrS3SMvds6DsHPWhaP
-pZjydomyExI7C3d3rLvlPClKknLKYRorXkzig3R3+jVIeoVNjZpTxN94ypeRSCtF
-KwH3HBqi7Ri6Cr2D+m+8jVeTO9TUps4e8aCxzqv9KyiaTxvXw3LbpMS/XUz13XuW
-ae5ogObnmLo2t/5u7Su9IPhlGdpVCX4l3P5hYnL5fhgC72O00Puv5TtjjGePAgMB
-AAGjgawwgakwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
-BBYEFFCvzAeHFUdvOMW0ZdHelarp35zMMB8GA1UdIwQYMBaAFFCvzAeHFUdvOMW0
-ZdHelarp35zMMEYGA1UdIAQ/MD0wOwYJYIV0AVkBAQEBMC4wLAYIKwYBBQUHAgEW
-IGh0dHA6Ly9yZXBvc2l0b3J5LnN3aXNzc2lnbi5jb20vMA0GCSqGSIb3DQEBBQUA
-A4ICAQAIhab1Fgz8RBrBY+D5VUYI/HAcQiiWjrfFwUF1TglxeeVtlspLpYhg0DB0
-uMoI3LQwnkAHFmtllXcBrqS3NQuB2nEVqXQXOHtYyvkv+8Bldo1bAbl93oI9ZLi+
-FHSjClTTLJUYFzX1UWs/j6KWYTl4a0vlpqD4U99REJNi54Av4tHgvI42Rncz7Lj7
-jposiU0xEQ8mngS7twSNC/K5/FqdOxa3L8iYq/6KUFkuozv8KV2LwUvJ4ooTHbG/
-u0IdUt1O2BReEMYxB+9xJ/cbOQncguqLs5WGXv312l0xpuAxtpTmREl0xRbl9x8D
-YSjFyMsSoEJL+WuICI20MhjzdZ/EfwBPBZWcoxcCw7NTm6ogOSkrZvqdr16zktK1
-puEa+S1BaYEUtLS17Yk9zvupnTVCRLEcFHOBzyoBNZox1S2PbYTfgE1X4z/FhHXa
-icYwu+uPyyIIoK6q8QNsOktNCaUOcsZWayFCTiMlFGiudgp8DAdwZPmaL/YFOSbG
-DI8Zf0NebvRbFS/bYV3mZy8/CJT5YLSYMdp08YSTcU1f+2BY0fvEwW2JorsgH51x
-kcsymxM9Pn2SUjWskpSi0xjCfMfqr3YFFt1nJ8J+HAciIfNAChs0B0QTwoRqjt8Z
-Wr9/6x3iGjjRXK9HkmuAtTClyY3YqzGBH9/CZjfTk6mFhnll0g==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-080_Japanese Government.pem b/test/rules/platform_certs/cacert/Cert-080_Japanese Government.pem
deleted file mode 100644
index c28e86d758ca..000000000000
--- a/test/rules/platform_certs/cacert/Cert-080_Japanese Government.pem	
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJKUDEc
-MBoGA1UEChMTSmFwYW5lc2UgR292ZXJubWVudDEWMBQGA1UECxMNQXBwbGljYXRp
-b25DQTAeFw0wNzEyMTIxNTAwMDBaFw0xNzEyMTIxNTAwMDBaMEMxCzAJBgNVBAYT
-AkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zlcm5tZW50MRYwFAYDVQQLEw1BcHBs
-aWNhdGlvbkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp23gdE6H
-j6UG3mii24aZS2QNcfAKBZuOquHMLtJqO8F6tJdhjYq+xpqcBrSGUeQ3DnR4fl+K
-f5Sk10cI/VBaVuRorChzoHvpfxiSQE8tnfWuREhzNgaeZCw7NCPbXCbkcXmP1G55
-IrmTwcrNwVbtiGrXoDkhBFcsovW8R0FPXjQilbUfKW1eSvNNcr5BViCH/OlQR9cw
-FO5cjFW6WY2H/CPek9AEjP3vbb3QesmlOmpyM8ZKDQUXKi17safY1vC+9D/qDiht
-QWEjdnjDuGWk81quzMKq2edY3rZ+nYVunyoKb58DKTCXKB28t89UKU5RMfkntigm
-/qJj5kEW8DOYRwIDAQABo4GeMIGbMB0GA1UdDgQWBBRUWssmP3HMlEYNllPqa0jQ
-k/5CdTAOBgNVHQ8BAf8EBAMCAQYwWQYDVR0RBFIwUKROMEwxCzAJBgNVBAYTAkpQ
-MRgwFgYDVQQKDA/ml6XmnKzlm73mlL/lupwxIzAhBgNVBAsMGuOCouODl+ODquOC
-seODvOOCt+ODp+ODs0NBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-ggEBADlqRHZ3ODrso2dGD/mLBqj7apAxzn7s2tGJfHrrLgy9mTLnsCTWw//1sogJ
-hyzjVOGjprIIC8CFqMjSnHH2HZ9g/DgzE+Ge3Atf2hZQKXsvcJEPmbo0NI2VdMV+
-eKlmXb3KIXdCEKxmJj3ekav9FfBv7WxfEPjzFvYDio+nEhEMy/0/ecGc/WLuo89U
-DNErXxc+4z6/wCs+CZv+iKZ+tJIX/COUgb1up8WMwusRRdv4QcmWdupwX3kSa+Sj
-B1oF7ydJzyGfikwJcGapJsErEU4z0g781mzSDjJkaP+tBXhfAx2o45CsJOAPQKdL
-rosot4LKGAfmt1t06SAZf7IbiVQ=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-081_OISTE WISeKey Global Root GA CA_WISeKey.pem b/test/rules/platform_certs/cacert/Cert-081_OISTE WISeKey Global Root GA CA_WISeKey.pem
deleted file mode 100644
index a695c21bb456..000000000000
--- a/test/rules/platform_certs/cacert/Cert-081_OISTE WISeKey Global Root GA CA_WISeKey.pem	
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCB
-ijELMAkGA1UEBhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHly
-aWdodCAoYykgMjAwNTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl
-ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQSBDQTAeFw0w
-NTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYDVQQGEwJDSDEQMA4G
-A1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIwIAYD
-VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBX
-SVNlS2V5IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAy0+zAJs9Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxR
-VVuuk+g3/ytr6dTqvirdqFEr12bDYVxgAsj1znJ7O7jyTmUIms2kahnBAbtzptf2
-w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbDd50kc3vkDIzh2TbhmYsF
-mQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ/yxViJGg
-4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t9
-4B3RLoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYw
-DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQw
-EAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOx
-SPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vImMMkQyh2I+3QZH4VFvbBsUfk2
-ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4+vg1YFkCExh8
-vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
-hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZi
-Fj4A4xylNoEYokxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ
-/L7fCg0=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-083_VeriSign Class 3 Public Primary Certification Authority - G3_VeriSign, Inc.pem b/test/rules/platform_certs/cacert/Cert-083_VeriSign Class 3 Public Primary Certification Authority - G3_VeriSign, Inc.pem
deleted file mode 100644
index 688036446e40..000000000000
--- a/test/rules/platform_certs/cacert/Cert-083_VeriSign Class 3 Public Primary Certification Authority - G3_VeriSign, Inc.pem	
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
-cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
-LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
-aWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
-VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
-aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
-bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
-IENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
-LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMu6nFL8eB8aHm8b
-N3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1EUGO+i2t
-KmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGu
-kxUccLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBm
-CC+Vk7+qRy+oRpfwEuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJ
-Xwzw3sJ2zq/3avL6QaaiMxTJ5Xpj055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWu
-imi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAERSWwauSCPc/L8my/uRan2Te
-2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5fj267Cz3qWhMe
-DGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
-/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565p
-F4ErWjfJXir0xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGt
-TxzhT5yvDwyd93gN2PQ1VoDat20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-084_e-Guven Kok Elektronik Sertifika Hizmet Saglayicisi_Elektronik Bilgi Guvenligi A.S.pem b/test/rules/platform_certs/cacert/Cert-084_e-Guven Kok Elektronik Sertifika Hizmet Saglayicisi_Elektronik Bilgi Guvenligi A.S.pem
deleted file mode 100644
index 4d9767dd72d2..000000000000
--- a/test/rules/platform_certs/cacert/Cert-084_e-Guven Kok Elektronik Sertifika Hizmet Saglayicisi_Elektronik Bilgi Guvenligi A.S.pem	
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDtjCCAp6gAwIBAgIQRJmNPMADJ72cdpW56tustTANBgkqhkiG9w0BAQUFADB1
-MQswCQYDVQQGEwJUUjEoMCYGA1UEChMfRWxla3Ryb25payBCaWxnaSBHdXZlbmxp
-Z2kgQS5TLjE8MDoGA1UEAxMzZS1HdXZlbiBLb2sgRWxla3Ryb25payBTZXJ0aWZp
-a2EgSGl6bWV0IFNhZ2xheWljaXNpMB4XDTA3MDEwNDExMzI0OFoXDTE3MDEwNDEx
-MzI0OFowdTELMAkGA1UEBhMCVFIxKDAmBgNVBAoTH0VsZWt0cm9uaWsgQmlsZ2kg
-R3V2ZW5saWdpIEEuUy4xPDA6BgNVBAMTM2UtR3V2ZW4gS29rIEVsZWt0cm9uaWsg
-U2VydGlmaWthIEhpem1ldCBTYWdsYXlpY2lzaTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAMMSIJ6wXgBljU5Gu4Bc6SwGl9XzcslwuedLZYDBS75+PNdU
-MZTe1RK6UxYC6lhj71vY8+0qGqpxSKPcEC1fX+tcS5yWCEIlKBHMilpiAVDV6wlT
-L/jDj/6z/P2douNffb7tC+Bg62nsM+3YjfsSSYMAyYuXjDtzKjKzEve5TfL0TW3H
-5tYmNwjy2f1rXKPlSFxYvEK+A1qBuhw1DADT9SN+cTAIJjjcJRFHLfO6IxClv7wC
-90Nex/6wN1CZew+TzuZDLMN+DfIcQ2Zgy2ExR4ejT669VmxMvLz4Bcpk9Ok0oSy1
-c+HCPujIyTQlCFzz7abHlJ+tiEMl1+E5YP6sOVkCAwEAAaNCMEAwDgYDVR0PAQH/
-BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ/uRLOU1fqRTy7ZVZoE
-VtstxNulMA0GCSqGSIb3DQEBBQUAA4IBAQB/X7lTW2M9dTLn+sR0GstG30ZpHFLP
-qk/CaOv/gKlR6D1id4k9CnU58W5dF4dvaAXBlGzZXd/aslnLpRCKysw5zZ/rTt5S
-/wzw9JKp8mxTq5vSR6AfdPebmvEvFZ96ZDAYBzwqD2fK/A+JYZ1lpTzlvBNbCNvj
-/+27BrtqBrF6T2XGgv0enIu1De5Iu7i9qgi0+6N8y5/NkHZchpZ4Vwpm+Vganf2X
-KWDeEaaQHBkc7gGWIjQ0LpH5t8Qn0Xvmv/uARFoW5evg1Ao4vOSR49XrXMGs3xtq
-fJ7lddK2l4fbzIcrQzqECK+rPNv3PGYxhrCdU3nt+CPeQuMtgvEP5fqX
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-085_VeriSign, Inc.pem b/test/rules/platform_certs/cacert/Cert-085_VeriSign, Inc.pem
deleted file mode 100644
index c7b612a29a4f..000000000000
--- a/test/rules/platform_certs/cacert/Cert-085_VeriSign, Inc.pem	
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDAjCCAmsCEEzH6qqYPnHTkxD4PTqJkZIwDQYJKoZIhvcNAQEFBQAwgcExCzAJ
-BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh
-c3MgMSBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy
-MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp
-emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X
-DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw
-FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMSBQdWJsaWMg
-UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo
-YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5
-MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQCq0Lq+Fi24g9TK0g+8djHKlNgdk4xWArzZbxpvUjZudVYK
-VdPfQ4chEWWKfo+9Id5rMj8bhDSVBZ1BNeuS65bdqlk/AVNtmU/t5eIqWpDBucSm
-Fc/IReumXY6cPvBkJHalzasab7bYe1FhbqZ/h8jit+U03EGI6glAvnOSPWvndQID
-AQABMA0GCSqGSIb3DQEBBQUAA4GBAKlPww3HZ74sy9mozS11534Vnjty637rXC0J
-h9ZrbWB85a7FkCMMXErQr7Fd88e2CtvgFZMN3QO8x3aKtd1Pw5sTdbgBwObJW2ul
-uIncrKTdcu1OofdPvAbT6shkdHvClUGcZXNY8ZCaPGqxmMnEh7zPRW1F4m4iP/68
-DzFc6PLZ
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-086_VeriSign, Inc.pem b/test/rules/platform_certs/cacert/Cert-086_VeriSign, Inc.pem
deleted file mode 100644
index cd0e805fd55d..000000000000
--- a/test/rules/platform_certs/cacert/Cert-086_VeriSign, Inc.pem	
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICPDCCAaUCED9pHoGc8JpK83P/uUii5N0wDQYJKoZIhvcNAQEFBQAwXzELMAkG
-A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
-cyAxIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
-MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
-BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAxIFB1YmxpYyBQcmlt
-YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
-ADCBiQKBgQDlGb9to1ZhLZlIcfZn3rmN67eehoAKkQ76OCWvRoiC5XOooJskXQ0f
-zGVuDLDQVoQYh5oGmxChc9+0WDlrbsH2FdWoqD+qEgaNMax/sDTXjzRniAnNFBHi
-TkVWaR94AoDa3EeRKbs2yWNcxeDXLYd7obcysHswuiovMaruo2fa2wIDAQABMA0G
-CSqGSIb3DQEBBQUAA4GBAFgVKTk8d6PaXCUDfGD67gmZPCcQcMgMCeazh88K4hiW
-NWLMv5sneYlfycQJ9M61Hd8qveXbhpxoJeUwfLaJFf5n0a3hUKw8fGJLj7qE1xIV
-Gx/KXQ/BUpQqEZnae88MNhPVNdwQGVnqlMEAv3WP2fr9dgTbYruQagPZRjXZ+Hxb
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-087_AffirmTrust Premium_AffirmTrust.pem b/test/rules/platform_certs/cacert/Cert-087_AffirmTrust Premium_AffirmTrust.pem
deleted file mode 100644
index 516ecf55ab5e..000000000000
--- a/test/rules/platform_certs/cacert/Cert-087_AffirmTrust Premium_AffirmTrust.pem	
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UE
-BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVz
-dCBQcmVtaXVtMB4XDTEwMDEyOTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkG
-A1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1U
-cnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxBLf
-qV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtnBKAQ
-JG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ
-+jjeRFcV5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrS
-s8PhaJyJ+HoAVt70VZVs+7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5
-HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmdGPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d7
-70O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5Rp9EixAqnOEhss/n/fauG
-V+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NIS+LI+H+S
-qHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S
-5u046uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4Ia
-C1nEWTJ3s7xgaVY5/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TX
-OwF0lkLgAOIua+rF7nKsu7/+6qqo+Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYE
-FJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
-BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByvMiPIs0laUZx2
-KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
-Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B
-8OWycvpEgjNC6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQ
-MKSOyARiqcTtNd56l+0OOF6SL5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc
-0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK+4w1IX2COPKpVJEZNZOUbWo6xbLQ
-u4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmVBtWVyuEklut89pMF
-u+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFgIxpH
-YoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8
-GKa1qF60g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaO
-RtGdFNrHF+QFlozEJLUbzxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6e
-KeC2uAloGRwYQw==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-088_Trusted Certificate Services_Comodo CA Limited.pem b/test/rules/platform_certs/cacert/Cert-088_Trusted Certificate Services_Comodo CA Limited.pem
deleted file mode 100644
index 72cbf561098d..000000000000
--- a/test/rules/platform_certs/cacert/Cert-088_Trusted Certificate Services_Comodo CA Limited.pem	
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEb
-MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
-GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0
-aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEwMDAwMDBaFw0yODEyMzEyMzU5NTla
-MH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
-BgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUwIwYD
-VQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWW
-fnJSoBVC21ndZHoa0Lh73TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMt
-TGo87IvDktJTdyR0nAducPy9C1t2ul/y/9c3S0pgePfw+spwtOpZqqPOSC+pw7IL
-fhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6juljatEPmsbS9Is6FARW
-1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsSivnkBbA7
-kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0G
-A1UdDgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYD
-VR0TAQH/BAUwAwEB/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21v
-ZG9jYS5jb20vVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRo
-dHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMu
-Y3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8NtwuleGFTQQuS9/
-HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32
-pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxIS
-jBc/lDb+XbDABHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+
-xqFx7D+gIIxmOom0jtTYsU0lR+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/Atyjcn
-dBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O9y5Xt5hwXsjEeLBi
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-089_DST ACES CA X6_Digital Signature Trust.pem b/test/rules/platform_certs/cacert/Cert-089_DST ACES CA X6_Digital Signature Trust.pem
deleted file mode 100644
index 13a7df492a81..000000000000
--- a/test/rules/platform_certs/cacert/Cert-089_DST ACES CA X6_Digital Signature Trust.pem	
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIECTCCAvGgAwIBAgIQDV6ZCtadt3js2AdWO4YV2TANBgkqhkiG9w0BAQUFADBb
-MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3Qx
-ETAPBgNVBAsTCERTVCBBQ0VTMRcwFQYDVQQDEw5EU1QgQUNFUyBDQSBYNjAeFw0w
-MzExMjAyMTE5NThaFw0xNzExMjAyMTE5NThaMFsxCzAJBgNVBAYTAlVTMSAwHgYD
-VQQKExdEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdDERMA8GA1UECxMIRFNUIEFDRVMx
-FzAVBgNVBAMTDkRTVCBBQ0VTIENBIFg2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAuT31LMmU3HWKlV1j6IR3dma5WZFcRt2SPp/5DgO0PWGSvSMmtWPu
-ktKe1jzIDZBfZIGxqAgNTNj50wUoUrQBJcWVHAx+PhCEdc/BGZFjz+iokYi5Q1K7
-gLFViYsx+tC3dr5BPTCapCIlF3PoHuLTrCq9Wzgh1SpL11V94zpVvddtawJXa+ZH
-fAjIgrrep4c9oW24MFbCswKBXy314powGCi4ZtPLAZZv6opFVdbgnf9nKxcCpk4a
-ahELfrd755jWjHZvwTvbUJN+5dCOHze4vbrGn2zpfDPyMjwmR/onJALJfh1biEIT
-ajV8fTXpLmaRcpPVMibEdPVTo7NdmvYJywIDAQABo4HIMIHFMA8GA1UdEwEB/wQF
-MAMBAf8wDgYDVR0PAQH/BAQDAgHGMB8GA1UdEQQYMBaBFHBraS1vcHNAdHJ1c3Rk
-c3QuY29tMGIGA1UdIARbMFkwVwYKYIZIAWUDAgEBATBJMEcGCCsGAQUFBwIBFjto
-dHRwOi8vd3d3LnRydXN0ZHN0LmNvbS9jZXJ0aWZpY2F0ZXMvcG9saWN5L0FDRVMt
-aW5kZXguaHRtbDAdBgNVHQ4EFgQUCXIGThhDD+XWzMNqizF7eI+og7gwDQYJKoZI
-hvcNAQEFBQADggEBAKPYjtay284F5zLNAdMEA+V25FYrnJmQ6AgwbN99Pe7lv7Uk
-QIRJ4dEorsTCOlMwiPH1d25Ryvr/ma8kXxug/fKshMrfqfBfBC6tFr8hlxCBPeP/
-h40y3JTlR4peahPJlJU90u7INJXQgNStMgiAVDzgvVJT11J8smk/f3rPanTK+gQq
-nExaBqXpIK1FZg9p8d2/6eMyi/rgwYZNcjwu2JN4Cir42NInPRmJX1p7ijvMDNpR
-rscL9yuwNwXsvFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf2
-9w4LTJxoeHtxMcfrHuBnQfO3oKfN5XozNmr6mis=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-090_Chunghwa Telecom Co., Ltd.pem b/test/rules/platform_certs/cacert/Cert-090_Chunghwa Telecom Co., Ltd.pem
deleted file mode 100644
index 4b5425697dc6..000000000000
--- a/test/rules/platform_certs/cacert/Cert-090_Chunghwa Telecom Co., Ltd.pem	
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBe
-MQswCQYDVQQGEwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0
-ZC4xKjAoBgNVBAsMIWVQS0kgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
-Fw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMxMjdaMF4xCzAJBgNVBAYTAlRXMSMw
-IQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEqMCgGA1UECwwhZVBL
-SSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEF
-AAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAH
-SyZbCUNsIZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAh
-ijHyl3SJCRImHJ7K2RKilTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3X
-DZoTM1PRYfl61dd4s5oz9wCGzh1NlDivqOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1
-TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX12ruOzjjK9SXDrkb5wdJ
-fzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0OWQqraffA
-sgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uU
-WH1+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLS
-nT0IFaUQAS2zMnaolQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pH
-dmX2Os+PYhcZewoozRrSgx4hxyy/vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJip
-NiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXiZo1jDiVN1Rmy5nk3pyKdVDEC
-AwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/QkqiMAwGA1UdEwQF
-MAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
-ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGB
-uvl2ICO1J2B01GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6Yl
-PwZpVnPDimZI+ymBV3QGypzqKOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkP
-JXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdVxrsStZf0X4OFunHB2WyBEXYKCrC/
-gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEPNXubrjlpC2JgQCA2
-j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+rGNm6
-5ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUB
-o2M3IUxExJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS
-/jQ6fbjpKdx2qcgw+BRxgMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2z
-Gp1iro2C6pSe3VkQw63d4k3jMdXH7OjysP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTE
-W9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmODBCEIZ43ygknQW/2xzQ+D
-hNQ+IIX3Sj0rnP0qCglN6oH4EZw=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-091_Cybertrust Global Root_Cybertrust, Inc.pem b/test/rules/platform_certs/cacert/Cert-091_Cybertrust Global Root_Cybertrust, Inc.pem
deleted file mode 100644
index edbeb27e7133..000000000000
--- a/test/rules/platform_certs/cacert/Cert-091_Cybertrust Global Root_Cybertrust, Inc.pem	
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYG
-A1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2Jh
-bCBSb290MB4XDTA2MTIxNTA4MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UE
-ChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBS
-b290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+Mi8vRRQZhP/8NN5
-7CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW0ozS
-J8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2y
-HLtgwEZLAfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iP
-t3sMpTjr3kfb1V05/Iin89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNz
-FtApD0mpSPCzqrdsxacwOUBdrsTiXSZT8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAY
-XSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/
-MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2MDSgMqAw
-hi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3Js
-MB8GA1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUA
-A4IBAQBW7wojoFROlZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMj
-Wqd8BfP9IjsO0QbE2zZMcwSO5bAi5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUx
-XOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2hO0j9n0Hq0V+09+zv+mKts2o
-omcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+TX3EJIrduPuoc
-A06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
-WL1WMRJOEcgh4LMRkWXbtKaIOM5V
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-092_Equifax Secure eBusiness CA-1_Equifax Secure Inc.pem b/test/rules/platform_certs/cacert/Cert-092_Equifax Secure eBusiness CA-1_Equifax Secure Inc.pem
deleted file mode 100644
index 768a9eb97058..000000000000
--- a/test/rules/platform_certs/cacert/Cert-092_Equifax Secure eBusiness CA-1_Equifax Secure Inc.pem	
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICgjCCAeugAwIBAgIBBDANBgkqhkiG9w0BAQQFADBTMQswCQYDVQQGEwJVUzEc
-MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBT
-ZWN1cmUgZUJ1c2luZXNzIENBLTEwHhcNOTkwNjIxMDQwMDAwWhcNMjAwNjIxMDQw
-MDAwWjBTMQswCQYDVQQGEwJVUzEcMBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5j
-LjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNzIENBLTEwgZ8wDQYJ
-KoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vGbwXt3fek6lfWg0XTzQaDJj0ItlZ1MRo
-RvC0NcWFAyDGr0WlIVFFQesWWDYyb+JQYmT5/VGcqiTZ9J2DKocKIdMSODRsjQBu
-WqDZQu4aIZX5UkxVWsUPOE9G+m34LjXWHXzr4vCwdYDIqROsvojvOm6rXyo4YgKw
-Env+j6YDAgMBAAGjZjBkMBEGCWCGSAGG+EIBAQQEAwIABzAPBgNVHRMBAf8EBTAD
-AQH/MB8GA1UdIwQYMBaAFEp4MlIR21kWNl7fwRQ2QGpHfEyhMB0GA1UdDgQWBBRK
-eDJSEdtZFjZe38EUNkBqR3xMoTANBgkqhkiG9w0BAQQFAAOBgQB1W6ibAxHm6VZM
-zfmpTMANmvPMZWnmJXbMWbfWVMMdzZmsGd20hdXgPfxiIKeES1hl8eL5lSE/9dR+
-WB5Hh1Q+WKG1tfgq73HnvMP2sUlG4tega+VWeponmHxGYhTnyfxuAxJ5gDgdSIKN
-/Bf+KpYrtWKmpj29f5JZzVoqgrI3eQ==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-093_Chambers of Commerce Root_AC Camerfirma SA CIF A82743287.pem b/test/rules/platform_certs/cacert/Cert-093_Chambers of Commerce Root_AC Camerfirma SA CIF A82743287.pem
deleted file mode 100644
index b3962515f674..000000000000
--- a/test/rules/platform_certs/cacert/Cert-093_Chambers of Commerce Root_AC Camerfirma SA CIF A82743287.pem	
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEn
-MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL
-ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMg
-b2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAxNjEzNDNaFw0zNzA5MzAxNjEzNDRa
-MH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZpcm1hIFNBIENJRiBB
-ODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3JnMSIw
-IAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0B
-AQEFAAOCAQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtb
-unXF/KGIJPov7coISjlUxFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0d
-BmpAPrMMhe5cG3nCYsS4No41XQEMIwRHNaqbYE6gZj3LJgqcQKH0XZi/caulAGgq
-7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jWDA+wWFjbw2Y3npuRVDM3
-0pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFVd9oKDMyX
-roDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIG
-A1UdEwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5j
-aGFtYmVyc2lnbi5vcmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p
-26EpW1eLTXYGduHRooowDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIA
-BzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hhbWJlcnNpZ24ub3JnMCcGA1Ud
-EgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYDVR0gBFEwTzBN
-BgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz
-aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEB
-AAxBl8IahsAifJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZd
-p0AJPaxJRUXcLo0waLIJuvvDL8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi
-1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wNUPf6s+xCX6ndbcj0dc97wXImsQEc
-XCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/nADydb47kMgkdTXg0
-eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1erfu
-tGWaIZDgqtCYvDi1czyL+Nw=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-094_VeriSign, Inc.pem b/test/rules/platform_certs/cacert/Cert-094_VeriSign, Inc.pem
deleted file mode 100644
index 2202c69287f7..000000000000
--- a/test/rules/platform_certs/cacert/Cert-094_VeriSign, Inc.pem	
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJ
-BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh
-c3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy
-MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp
-emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X
-DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw
-FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMg
-UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo
-YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5
-MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCOFoUgRm1HP9SFIIThbbP4
-pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71lSk8UOg0
-13gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwID
-AQABMA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSk
-U01UbSuvDV1Ai2TT1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7i
-F6YM40AIOw7n60RzKprxaZLvcRTDOaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpY
-oJ2daZH9
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-095_Starfield Services Root Certificate Authority - G2_Starfield Technologies, Inc.pem b/test/rules/platform_certs/cacert/Cert-095_Starfield Services Root Certificate Authority - G2_Starfield Technologies, Inc.pem
deleted file mode 100644
index f7519150cdd7..000000000000
--- a/test/rules/platform_certs/cacert/Cert-095_Starfield Services Root Certificate Authority - G2_Starfield Technologies, Inc.pem	
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMx
-EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT
-HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVs
-ZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
-MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNVBAYTAlVTMRAwDgYD
-VQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFy
-ZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2Vy
-dmljZXMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20p
-OsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm2
-8xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4PahHQUw2eeBGg6345AWh1K
-Ts9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLPLJGmpufe
-hRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk
-6mFBrMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAw
-DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+q
-AdcwKziIorhtSpzyEZGDMA0GCSqGSIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMI
-bw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPPE95Dz+I0swSdHynVv/heyNXB
-ve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTyxQGjhdByPq1z
-qwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
-iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn
-0q23KXB56jzaYyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCN
-sSi6
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-096_GeoTrust Primary Certification Authority - G2_GeoTrust Inc.pem b/test/rules/platform_certs/cacert/Cert-096_GeoTrust Primary Certification Authority - G2_GeoTrust Inc.pem
deleted file mode 100644
index f9364c087ff7..000000000000
--- a/test/rules/platform_certs/cacert/Cert-096_GeoTrust Primary Certification Authority - G2_GeoTrust Inc.pem	
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDEL
-MAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChj
-KSAyMDA3IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2
-MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
-eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1OVowgZgxCzAJBgNV
-BAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykgMjAw
-NyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNV
-BAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH
-MjB2MBAGByqGSM49AgEGBSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcL
-So17VDs6bl8VAsBQps8lL33KSLjHUGMcKiEIfJo22Av+0SbFWDEwKCXzXV2juLal
-tJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO
-BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+EVXVMAoG
-CCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGT
-qQ7mndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBucz
-rD6ogRLQy7rQkgu2npaqBA+K
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-098_thawte Primary Root CA_thawte, Inc.pem b/test/rules/platform_certs/cacert/Cert-098_thawte Primary Root CA_thawte, Inc.pem
deleted file mode 100644
index 998460f1c2d9..000000000000
--- a/test/rules/platform_certs/cacert/Cert-098_thawte Primary Root CA_thawte, Inc.pem	
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCB
-qTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
-Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
-MDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNV
-BAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3MDAwMDAwWhcNMzYw
-NzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5j
-LjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYG
-A1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsoPD7gFnUnMekz52hWXMJEEUMDSxuaPFs
-W0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ1CRfBsDMRJSUjQJib+ta
-3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGcq/gcfomk
-6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6
-Sk/KaAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94J
-NqR32HuHUETVPm4pafs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBA
-MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XP
-r87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUFAAOCAQEAeRHAS7ORtvzw6WfU
-DW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeEuzLlQRHAd9mz
-YJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
-xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2
-/qxAeeWsEG89jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/
-LHbTY5xZ3Y+m4Q6gLkH3LpVHz7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7
-jVaMaA==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-099_Class 2 Primary CA_Certplus.pem b/test/rules/platform_certs/cacert/Cert-099_Class 2 Primary CA_Certplus.pem
deleted file mode 100644
index 6d0133d3543a..000000000000
--- a/test/rules/platform_certs/cacert/Cert-099_Class 2 Primary CA_Certplus.pem	
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAw
-PTELMAkGA1UEBhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFz
-cyAyIFByaW1hcnkgQ0EwHhcNOTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9
-MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2VydHBsdXMxGzAZBgNVBAMTEkNsYXNz
-IDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANxQ
-ltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR5aiR
-VhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyL
-kcAbmXuZVg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCd
-EgETjdyAYveVqUSISnFOYFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yas
-H7WLO7dDWWuwJKZtkIvEcupdM5i3y95ee++U8Rs+yskhwcWYAqqi9lt3m/V+llU0
-HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRMECDAGAQH/AgEKMAsGA1Ud
-DwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJYIZIAYb4
-QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMu
-Y29tL0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/
-AN9WM2K191EBkOvDP9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8
-yfFC82x/xXp8HVGIutIKPidd3i1RTtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMR
-FcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+7UCmnYR0ObncHoUW2ikbhiMA
-ybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW//1IMwrh3KWB
-kJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7
-l7+ijrRU
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-100_VeriSign, Inc.pem b/test/rules/platform_certs/cacert/Cert-100_VeriSign, Inc.pem
deleted file mode 100644
index 87676acf5fc2..000000000000
--- a/test/rules/platform_certs/cacert/Cert-100_VeriSign, Inc.pem	
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkG
-A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
-cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
-MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
-BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
-YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
-ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
-BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
-I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
-CSqGSIb3DQEBAgUAA4GBALtMEivPLCYATxQT3ab7/AoRhIzzKBxnki98tsX63/Do
-lbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59AhWM1pF+NEHJwZRDmJXNyc
-AA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2OmufTqj/ZA1k
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-101_AddTrust Qualified CA Root_AddTrust AB.pem b/test/rules/platform_certs/cacert/Cert-101_AddTrust Qualified CA Root_AddTrust AB.pem
deleted file mode 100644
index ad3800d58b46..000000000000
--- a/test/rules/platform_certs/cacert/Cert-101_AddTrust Qualified CA Root_AddTrust AB.pem	
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEU
-MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
-b3JrMSMwIQYDVQQDExpBZGRUcnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1
-MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcxCzAJBgNVBAYTAlNFMRQwEgYDVQQK
-EwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIzAh
-BgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwq
-xBb/4Oxx64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G
-87B4pfYOQnrjfxvM0PC3KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i
-2O+tCBGaKZnhqkRFmhJePp1tUvznoD1oL/BLcHwTOK28FSXx1s6rosAx1i+f4P8U
-WfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GRwVY18BTcZTYJbqukB8c1
-0cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HUMIHRMB0G
-A1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0T
-AQH/BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6Fr
-pGkwZzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQL
-ExRBZGRUcnVzdCBUVFAgTmV0d29yazEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlm
-aWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBABmrder4i2VhlRO6aQTv
-hsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxGGuoYQ992zPlm
-hpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X
-dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3
-P6CxB9bpT9zeRXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9Y
-iQBCYz95OdBEsIJuQRno3eDBiFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5no
-xqE=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-102_AffirmTrust Premium ECC_AffirmTrust.pem b/test/rules/platform_certs/cacert/Cert-102_AffirmTrust Premium ECC_AffirmTrust.pem
deleted file mode 100644
index 4bcc6a4336d5..000000000000
--- a/test/rules/platform_certs/cacert/Cert-102_AffirmTrust Premium ECC_AffirmTrust.pem	
+++ /dev/null
@@ -1,13 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMC
-VVMxFDASBgNVBAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQ
-cmVtaXVtIEVDQzAeFw0xMDAxMjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJ
-BgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEgMB4GA1UEAwwXQWZmaXJt
-VHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQNMF4bFZ0D
-0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQN8O9
-ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0G
-A1UdDgQWBBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4G
-A1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/Vs
-aobgxCd05DhT1wV/GzTjxi+zygk8N53X57hG8f2h4nECMEJZh0PUUd+60wkyWs6I
-flc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKMeQ==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-103_UTN-USERFirst-Network Applications_The USERTRUST Network.pem b/test/rules/platform_certs/cacert/Cert-103_UTN-USERFirst-Network Applications_The USERTRUST Network.pem
deleted file mode 100644
index 72b576a59a07..000000000000
--- a/test/rules/platform_certs/cacert/Cert-103_UTN-USERFirst-Network Applications_The USERTRUST Network.pem	
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEZDCCA0ygAwIBAgIQRL4Mi1AAJLQR0zYwS8AzdzANBgkqhkiG9w0BAQUFADCB
-ozELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
-Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
-dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xKzApBgNVBAMTIlVUTi1VU0VSRmlyc3Qt
-TmV0d29yayBBcHBsaWNhdGlvbnMwHhcNOTkwNzA5MTg0ODM5WhcNMTkwNzA5MTg1
-NzQ5WjCBozELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0
-IExha2UgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYD
-VQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xKzApBgNVBAMTIlVUTi1VU0VS
-Rmlyc3QtTmV0d29yayBBcHBsaWNhdGlvbnMwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQCz+5Gh5DZVhawGNFugmliy+LUPBXeDrjKxdpJo7CNKyXY/45y2
-N3kDuatpjQclthln5LAbGHNhSuh+zdMvZOOmfAz6F4CjDUeJT1FxL+78P/m4FoCH
-iZMlIJpDgmkkdihZNaEdwH+DBmQWICzTSaSFtMBhf1EI+GgVkYDLpdXuOzr0hARe
-YFmnjDRy7rh4xdE7EkpvfmUnuaRVxblvQ6TFHSyZwFKkeEwVs0CYCGtDxgGwenv1
-axwiP8vv/6jQOkt2FZ7S0cYu49tXGzKiuG/ohqY/cKvlcJKrRB5AUPuco2LkbG6g
-yN7igEL66S/ozjIEj3yNtxyjNTwV3Z7DrpelAgMBAAGjgZEwgY4wCwYDVR0PBAQD
-AgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFPqGydvguul49Uuo1hXf8NPh
-ahQ8ME8GA1UdHwRIMEYwRKBCoECGPmh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9V
-VE4tVVNFUkZpcnN0LU5ldHdvcmtBcHBsaWNhdGlvbnMuY3JsMA0GCSqGSIb3DQEB
-BQUAA4IBAQCk8yXM0dSRgyLQzDKrm5ZONJFUICU0YV8qAhXhi6r/fWRRzwr/vH3Y
-IWp4yy9Rb/hCHTO967V7lMPDqaAt39EpHx3+jz+7qEUqf9FuVSTiuwL7MT++6Lzs
-QCv4AdRWOOTKRIK1YSAhZ2X28AvnNPilwpyjXEAfhZOVBt5P1CeptqX8Fs1zMT+4
-ZSfP1FMa8Kxun08FDAOBp4QpxFq9ZFdyrTvPNximmMatBrTcCKME1SmklpoSZ0qM
-YEWd8SOasACcaLWYUNPvji6SZbFIPiG+FTAqDbUMo2s/rn9X9R+WfN9v3YIwLGUb
-QErNaLly7HF27FSOH4UMAWr6pjisH8SE
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-104_http---www.valicert.com-_ValiCert, Inc.pem b/test/rules/platform_certs/cacert/Cert-104_http---www.valicert.com-_ValiCert, Inc.pem
deleted file mode 100644
index 85a877b873d5..000000000000
--- a/test/rules/platform_certs/cacert/Cert-104_http---www.valicert.com-_ValiCert, Inc.pem	
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
-IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
-BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
-aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
-9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMTk1NFoXDTE5MDYy
-NjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
-azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
-YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
-Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
-cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOOnHK5avIWZJV16vY
-dA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVCCSRrCl6zfN1SLUzm1NZ9
-WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7RfZHM047QS
-v4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9v
-UJSZSWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTu
-IYEZoDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwC
-W/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-106_DigiNotar Root CA_DigiNotar.pem b/test/rules/platform_certs/cacert/Cert-106_DigiNotar Root CA_DigiNotar.pem
deleted file mode 100644
index ab60ad25fe99..000000000000
--- a/test/rules/platform_certs/cacert/Cert-106_DigiNotar Root CA_DigiNotar.pem	
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFijCCA3KgAwIBAgIQD////////////////////zANBgkqhkiG9w0BAQUFADBf
-MQswCQYDVQQGEwJOTDESMBAGA1UEChMJRGlnaU5vdGFyMRowGAYDVQQDExFEaWdp
-Tm90YXIgUm9vdCBDQTEgMB4GCSqGSIb3DQEJARYRaW5mb0BkaWdpbm90YXIubmww
-HhcNMDcwNzI3MTcxOTM3WhcNMjUwMzMxMTgxOTIyWjBfMQswCQYDVQQGEwJOTDES
-MBAGA1UEChMJRGlnaU5vdGFyMRowGAYDVQQDExFEaWdpTm90YXIgUm9vdCBDQTEg
-MB4GCSqGSIb3DQEJARYRaW5mb0BkaWdpbm90YXIubmwwggIiMA0GCSqGSIb3DQEB
-AQUAA4ICDwAwggIKAoICAQCssFjBAL3YIQgLK5r+blYwBZ8bd5AQQVzDDYcRd46B
-8cp86Yxq7Th0Nbva3/m7wAk3tJZzgX0zGpg595NvlX89ubF1h7pRSOiLcD6VBMXY
-tsMW2YiwsYcdcNqGtA8Ui3rPENF0NqISe3eGSnnme98CEWilToauNFibJBN4ViIl
-HgGLS1Fx+4LMWZZpiFpoU8W5DQI3y0u8ZkqQfioLBQftFl9VkHXYRskbg+IIvvEj
-zJkd1ioPgyAVWCeCLvriIsJJsbkBgWqdbZ1Ad2h2TiEqbYRAhU52mXyC8/O3AlnU
-JgEbjt+tUwbRrhjd4rI6y9eIOI6sWym5GdOY+RgDz0iChmYLG2kPyes4iHomGgVM
-ktck1JbyrFIto0fVUvY//s6EBnCmqj6i8rZWNBhXouSBbefK8GrTx5FrAoNBfBXv
-a5pkXuPQPOWx63tdhvvL5ndJzaNl3Pe5nLjkC1+Tz8wwGjIczhxjlaX56uF0i57p
-K6kwe6AYHw4YC+VbqdPRbB4HZ4+RS6mKvNJmqpMBiLKR+jFc1abBUggJzQpjotMi
-puih2TkGl/VujQKQjBR7P4DNG5y6xFhyI6+2Vp/GekIzKQc/gsnmHwUNzUwoNovT
-yD4cxojvXu6JZOkd69qJfjKmadHdzIif0dDJZiHcBmfFlHqabWJMfczgZICynkeO
-owIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNV
-HQ4EFgQUiGi/4I41xDs4a2L3KDuEgcgM100wDQYJKoZIhvcNAQEFBQADggIBADsC
-jcs8MOhuoK3yc7NfniUTBAXT9uOLuwt5zlPe5JbF0a9zvNXD0EBVfEB/zRtfCdXy
-fJ9oHbtdzno5wozWmHvFg1Wo1X1AyuAe94leY12hE8JdiraKfADzI8PthV9xdvBo
-Y6pFITlIYXg23PFDk9Qlx/KAZeFTAnVR/Ho67zerhChXDNjU1JlWbOOi/lmEtDHo
-M/hklJRRl6s5xUvt2t2AC298KQ3EjopyDedTFLJgQT2EkTFoPSdE2+Xe9PpjRchM
-Ppj1P0G6Tss3DbpmmPHdy59c91Q2gmssvBNhl0L4eLvMyKKfyvBovWsdst+Nbwed
-2o5nx0ceyrm/KkKRt2NTZvFCo+H0Wk1Ya7XkpDOtXHAd3ODy63MUkZoDweoAZbwH
-/M8SESIsrqC9OuCiKthZ6SnTGDWkrBFfGbW1G/8iSlzGeuQX7yCpp/Q/rYqnmgQl
-nQ7KN+ZQ/YxCKQSa7LnPS3K94gg2ryMvYuXKAdNw23yCIywWMQzGNgeQerEfZ1jE
-O1hZibCMjFCz2IbLaKPECudpSyDOwR5WS5WpI2jYMNjD67BVUc3l/Su49bsRn1NU
-9jQZjHkJNsphFyUXC4KYcwx3dMPVDceoEkzHp1RxRy4sGn3J4ys7SN4nhKdjNrN9
-j6BkOSQNPXuHr2ZcdBtLc7LljPCGmbjlxd+Ewbfr
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-107_Visa eCommerce Root_VISA.pem b/test/rules/platform_certs/cacert/Cert-107_Visa eCommerce Root_VISA.pem
deleted file mode 100644
index 6e1ccd8ee7b4..000000000000
--- a/test/rules/platform_certs/cacert/Cert-107_Visa eCommerce Root_VISA.pem	
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDojCCAoqgAwIBAgIQE4Y1TR0/BvLB+WUF1ZAcYjANBgkqhkiG9w0BAQUFADBr
-MQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRl
-cm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNv
-bW1lcmNlIFJvb3QwHhcNMDIwNjI2MDIxODM2WhcNMjIwNjI0MDAxNjEyWjBrMQsw
-CQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5h
-dGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNvbW1l
-cmNlIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvV95WHm6h
-2mCxlCfLF9sHP4CFT8icttD0b0/Pmdjh28JIXDqsOTPHH2qLJj0rNfVIsZHBAk4E
-lpF7sDPwsRROEW+1QK8bRaVK7362rPKgH1g/EkZgPI2h4H3PVz4zHvtH8aoVlwdV
-ZqW1LS7YgFmypw23RuwhY/81q6UCzyr0TP579ZRdhE2o8mCP2w4lPJ9zcc+U30rq
-299yOIzzlr3xF7zSujtFWsan9sYXiwGd/BmoKoMWuDpI/k4+oKsGGelT84ATB+0t
-vz8KPFUgOSwsAGl0lUq8ILKpeeUYiZGo3BxN77t+Nwtd/jmliFKMAGzsGHxBvfaL
-dXe6YJ2E5/4tAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD
-AgEGMB0GA1UdDgQWBBQVOIMPPyw/cDMezUb+B4wg4NfDtzANBgkqhkiG9w0BAQUF
-AAOCAQEAX/FBfXxcCLkr4NWSR/pnXKUTwwMhmytMiUbPWU3J/qVAtmPN3XEolWcR
-zCSs00Rsca4BIGsDoo8Ytyk6feUWYFN4PMCvFYP3j1IzJL1kk5fui/fbGKhtcbP3
-LBfQdCVp9/5rPJS+TUtBjE7ic9DjkCJzQ83z7+pzzkWKsKZJ/0x9nXGIxHYdkFsd
-7v3M9+79YKWxehZx0RbQfBI8bGmX265fOZpwLwU8GUYEmSA20GBuYQa7FkKMcPcw
-++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt
-398znM/jra6O1I7mT1GvFpLgXPYHDw==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-108_Digital Signature Trust Co.pem b/test/rules/platform_certs/cacert/Cert-108_Digital Signature Trust Co.pem
deleted file mode 100644
index 4e25ac5df048..000000000000
--- a/test/rules/platform_certs/cacert/Cert-108_Digital Signature Trust Co.pem	
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDKTCCApKgAwIBAgIENnAVljANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJV
-UzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQL
-EwhEU1RDQSBFMTAeFw05ODEyMTAxODEwMjNaFw0xODEyMTAxODQwMjNaMEYxCzAJ
-BgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4x
-ETAPBgNVBAsTCERTVENBIEUxMIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQCg
-bIGpzzQeJN3+hijM3oMv+V7UQtLodGBmE5gGHKlREmlvMVW5SXIACH7TpWJENySZ
-j9mDSI+ZbZUTu0M7LklOiDfBu1h//uG9+LthzfNHwJmm8fOR6Hh8AMthyUQncWlV
-Sn5JTe2io74CTADKAqjuAQIxZA9SLRN0dja1erQtcQIBA6OCASQwggEgMBEGCWCG
-SAGG+EIBAQQEAwIABzBoBgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMx
-JDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0dXJlIFRydXN0IENvLjERMA8GA1UECxMI
-RFNUQ0EgRTExDTALBgNVBAMTBENSTDEwKwYDVR0QBCQwIoAPMTk5ODEyMTAxODEw
-MjNagQ8yMDE4MTIxMDE4MTAyM1owCwYDVR0PBAQDAgEGMB8GA1UdIwQYMBaAFGp5
-fpFpRhgTCgJ3pVlbYJglDqL4MB0GA1UdDgQWBBRqeX6RaUYYEwoCd6VZW2CYJQ6i
-+DAMBgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqG
-SIb3DQEBBQUAA4GBACIS2Hod3IEGtgllsofIH160L+nEHvI8wbsEkBFKg05+k7lN
-QseSJqBcNJo4cvj9axY+IO6CizEqkzaFI4iKPANo08kJD038bKTaKHKTDomAsH3+
-gG9lbRgzl4vCa4nuYD3Im+9/KzJic5PLPON74nZ4RbyhkwS7hp86W0N6w4pl
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-109_UTN-USERFirst-Object_The USERTRUST Network.pem b/test/rules/platform_certs/cacert/Cert-109_UTN-USERFirst-Object_The USERTRUST Network.pem
deleted file mode 100644
index df6caba185dc..000000000000
--- a/test/rules/platform_certs/cacert/Cert-109_UTN-USERFirst-Object_The USERTRUST Network.pem	
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEZjCCA06gAwIBAgIQRL4Mi1AAJLQR0zYt4LNfGzANBgkqhkiG9w0BAQUFADCB
-lTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
-Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
-dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHTAbBgNVBAMTFFVUTi1VU0VSRmlyc3Qt
-T2JqZWN0MB4XDTk5MDcwOTE4MzEyMFoXDTE5MDcwOTE4NDAzNlowgZUxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIEwJVVDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkxHjAc
-BgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEhMB8GA1UECxMYaHR0cDovL3d3
-dy51c2VydHJ1c3QuY29tMR0wGwYDVQQDExRVVE4tVVNFUkZpcnN0LU9iamVjdDCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6qgT+jo2F4qjEAVZURnicP
-HxzfOpuCaDDASmEd8S8O+r5596Uj71VRloTN2+O5bj4x2AogZ8f02b+U60cEPgLO
-KqJdhwQJ9jCdGIqXsqoc/EHSoTbL+z2RuufZcDX65OeQw5ujm9M89RKZd7G3CeBo
-5hy485RjiGpq/gt2yb70IuRnuasaXnfBhQfdDWy/7gbHd2pBnqcP1/vulBe3/IW+
-pKvEHDHd17bR5PDv3xaPslKT16HUiaEHLr/hARJCHhrh2JU022R5KP+6LhHC5ehb
-kkj7RwvCbNqtMoNB86XlQXD9ZZBt+vpRxPm9lisZBCzTbafc8H9vg2XiaquHhnUC
-AwEAAaOBrzCBrDALBgNVHQ8EBAMCAcYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
-FgQU2u1kdBScFDyr3ZmpvVsoTYs8ydgwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDov
-L2NybC51c2VydHJ1c3QuY29tL1VUTi1VU0VSRmlyc3QtT2JqZWN0LmNybDApBgNV
-HSUEIjAgBggrBgEFBQcDAwYIKwYBBQUHAwgGCisGAQQBgjcKAwQwDQYJKoZIhvcN
-AQEFBQADggEBAAgfUrE3RHjb/c652pWWmKpVZIC1WkDdIaXFwfNfLEzIR1pp6ujw
-NTX00CXzyKakh0q9G7FzCL3Uw8q2NbtZhncxzaeAFK4T7/yxSPlrJSUtUbYsbUXB
-mMiKVl0+7kNOPmsnjtA6S4ULX9Ptaqd1y9Fahy85dRNacrACgZ++8A+EVCBibGnU
-4U3GDZlDAQ0Slox4nb9QorFEqmrPF3rPbw/U+CRVX/A0FklmPlBGyWNxODFiuGK5
-81OtbLUrohKqGU8J2l7nk8aOFAj+8DCAGKCGhU3IfdeLA/5u1fedFqySLKAj5ZyR
-Uh+U3xeUc8OzwcFxBSAAeL0TUh2oPs0AH8g=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-110_Go Daddy Root Certificate Authority - G2_GoDaddy.com, Inc.pem b/test/rules/platform_certs/cacert/Cert-110_Go Daddy Root Certificate Authority - G2_GoDaddy.com, Inc.pem
deleted file mode 100644
index c2b2907814c0..000000000000
--- a/test/rules/platform_certs/cacert/Cert-110_Go Daddy Root Certificate Authority - G2_GoDaddy.com, Inc.pem	
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMx
-EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoT
-EUdvRGFkZHkuY29tLCBJbmMuMTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRp
-ZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIz
-NTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQH
-EwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8GA1UE
-AxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKD
-E6bFIEMBO4Tx5oVJnyfq9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH
-/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD+qK+ihVqf94Lw7YZFAXK6sOoBJQ7Rnwy
-DfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutdfMh8+7ArU6SSYmlRJQVh
-GkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMlNAJWJwGR
-tDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEA
-AaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
-FDqahQcQZyi27/a9BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmX
-WWcDYfF+OwYxdS2hII5PZYe096acvNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu
-9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r5N9ss4UXnT3ZJE95kTXWXwTr
-gIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYVN8Gb5DKj7Tjo
-2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
-LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI
-4uJEvlz36hz1
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-111_AAA Certificate Services_Comodo CA Limited.pem b/test/rules/platform_certs/cacert/Cert-111_AAA Certificate Services_Comodo CA Limited.pem
deleted file mode 100644
index 33c71ba9db77..000000000000
--- a/test/rules/platform_certs/cacert/Cert-111_AAA Certificate Services_Comodo CA Limited.pem	
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb
-MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
-GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj
-YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL
-MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
-BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM
-GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua
-BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe
-3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4
-YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR
-rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm
-ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU
-oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
-MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v
-QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t
-b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF
-AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q
-GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
-Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2
-G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi
-l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3
-smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-112_Entrust.net Secure Server Certification Authority_Entrust.net.pem b/test/rules/platform_certs/cacert/Cert-112_Entrust.net Secure Server Certification Authority_Entrust.net.pem
deleted file mode 100644
index 4b8939ccba7f..000000000000
--- a/test/rules/platform_certs/cacert/Cert-112_Entrust.net Secure Server Certification Authority_Entrust.net.pem	
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
-VVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5u
-ZXQvQ1BTIGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMc
-KGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDE6MDgGA1UEAxMxRW50cnVzdC5u
-ZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05OTA1
-MjUxNjA5NDBaFw0xOTA1MjUxNjM5NDBaMIHDMQswCQYDVQQGEwJVUzEUMBIGA1UE
-ChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5j
-b3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBF
-bnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUg
-U2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUA
-A4GLADCBhwKBgQDNKIM0VBuJ8w+vN5Ex/68xYMmo6LIQaO2f55M28Qpku0f1BBc/
-I0dNxScZgSYMVHINiC3ZH5oSn7yzcdOAGT9HZnuMNSjSuQrfJNqc1lB5gXpa0zf3
-wkrYKZImZNHkmGw6AIr1NJtl+O3jEP/9uElY3KDegjlrgbEWGWG5VLbmQwIBA6OC
-AdcwggHTMBEGCWCGSAGG+EIBAQQEAwIABzCCARkGA1UdHwSCARAwggEMMIHeoIHb
-oIHYpIHVMIHSMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxOzA5
-BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1p
-dHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBFbnRydXN0Lm5ldCBMaW1pdGVk
-MTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRp
-b24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCmgJ6AlhiNodHRwOi8vd3d3LmVu
-dHJ1c3QubmV0L0NSTC9uZXQxLmNybDArBgNVHRAEJDAigA8xOTk5MDUyNTE2MDk0
-MFqBDzIwMTkwNTI1MTYwOTQwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8Bdi
-E1U9s/8KAGv7UISX8+1i0BowHQYDVR0OBBYEFPAXYhNVPbP/CgBr+1CEl/PtYtAa
-MAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EABAwwChsEVjQuMAMCBJAwDQYJKoZI
-hvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7Rw7/JXyNEwr75Ji174z4xRAN
-95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9n9cd
-2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-113_GlobalSign Root CA_GlobalSign nv-sa.pem b/test/rules/platform_certs/cacert/Cert-113_GlobalSign Root CA_GlobalSign nv-sa.pem
deleted file mode 100644
index f4ce4ca43dc0..000000000000
--- a/test/rules/platform_certs/cacert/Cert-113_GlobalSign Root CA_GlobalSign nv-sa.pem	
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG
-A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
-b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw
-MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
-YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT
-aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ
-jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp
-xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp
-1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG
-snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ
-U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8
-9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E
-BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B
-AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz
-yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE
-38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP
-AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad
-DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME
-HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-114_Izenpe.com_IZENPE S.A.pem b/test/rules/platform_certs/cacert/Cert-114_Izenpe.com_IZENPE S.A.pem
deleted file mode 100644
index 763832194b91..000000000000
--- a/test/rules/platform_certs/cacert/Cert-114_Izenpe.com_IZENPE S.A.pem	
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4
-MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6
-ZW5wZS5jb20wHhcNMDcxMjEzMTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYD
-VQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5j
-b20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ03rKDx6sp4boFmVq
-scIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAKClaO
-xdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6H
-LmYRY2xU+zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFX
-uaOKmMPsOzTFlUFpfnXCPCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQD
-yCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxTOTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+
-JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbKF7jJeodWLBoBHmy+E60Q
-rLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK0GqfvEyN
-BjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8L
-hij+0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIB
-QFqNeb+Lz0vPqhbBleStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+
-HMh3/1uaD7euBUbl8agW7EekFwIDAQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2lu
-Zm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+SVpFTlBFIFMuQS4gLSBDSUYg
-QTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBGNjIgUzgxQzBB
-BgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
-MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwHQYDVR0OBBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUA
-A4ICAQB4pgwWSp9MiDrAyw6lFn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWb
-laQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbgakEyrkgPH7UIBzg/YsfqikuFgba56
-awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8qhT/AQKM6WfxZSzwo
-JNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Csg1lw
-LDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCT
-VyvehQP5aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGk
-LhObNA5me0mrZJfQRsN5nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJb
-UjWumDqtujWTI6cfSN01RpiyEGjkpTHCClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/
-QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZoQ0iy2+tzJOeRf1SktoA+
-naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1ZWrOZyGls
-QyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-115_Secure Global CA_SecureTrust Corporation.pem b/test/rules/platform_certs/cacert/Cert-115_Secure Global CA_SecureTrust Corporation.pem
deleted file mode 100644
index 1f4574e779f7..000000000000
--- a/test/rules/platform_certs/cacert/Cert-115_Secure Global CA_SecureTrust Corporation.pem	
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBK
-MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x
-GTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkx
-MjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3Qg
-Q29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jxYDiJ
-iQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa
-/FHtaMbQbqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJ
-jnIFHovdRIWCQtBJwB1g8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnI
-HmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYVHDGA76oYa8J719rO+TMg1fW9ajMtgQT7
-sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi0XPnj3pDAgMBAAGjgZ0w
-gZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1UdEwEB/wQF
-MAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCsw
-KaAnoCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsG
-AQQBgjcVAQQDAgEAMA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0L
-URYD7xh8yOOvaliTFGCRsoTciE6+OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXO
-H0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cnCDpOGR86p1hcF895P4vkp9Mm
-I50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/53CYNv6ZHdAbY
-iNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
-f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-117_AffirmTrust Networking_AffirmTrust.pem b/test/rules/platform_certs/cacert/Cert-117_AffirmTrust Networking_AffirmTrust.pem
deleted file mode 100644
index 04f4a812b205..000000000000
--- a/test/rules/platform_certs/cacert/Cert-117_AffirmTrust Networking_AffirmTrust.pem	
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UE
-BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
-dCBOZXR3b3JraW5nMB4XDTEwMDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDEL
-MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
-cm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SEHi3y
-YJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbua
-kCNrmreIdIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRL
-QESxG9fhwoXA3hA/Pe24/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp
-6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gbh+0t+nvujArjqWaJGctB+d1ENmHP4ndG
-yH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNVHQ4EFgQUBx/S55zawm6i
-QLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
-KoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfO
-tDIuUFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzu
-QY0x2+c06lkh1QF612S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZ
-Lgo/bNjR9eUJtGxUAArgFU2HdW23WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4u
-olu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9/ZFvgrG+CJPbFEfxojfHRZ48
-x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-118_SECOM Trust.net.pem b/test/rules/platform_certs/cacert/Cert-118_SECOM Trust.net.pem
deleted file mode 100644
index ad1424ac3565..000000000000
--- a/test/rules/platform_certs/cacert/Cert-118_SECOM Trust.net.pem	
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEY
-MBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21t
-dW5pY2F0aW9uIFJvb3RDQTEwHhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5
-WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYD
-VQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw8yl8
-9f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJ
-DKaVv0uMDPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9
-Ms+k2Y7CI9eNqPPYJayX5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/N
-QV3Is00qVUarH9oe4kA92819uZKAnDfdDJZkndwi92SL32HeFZRSFaB9UslLqCHJ
-xrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2JChzAgMBAAGjPzA9MB0G
-A1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYwDwYDVR0T
-AQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vG
-kl3g0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfr
-Uj94nK9NrvjVT8+amCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5
-Bw+SUEmK3TGXX8npN6o7WWWXlDLJs58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJU
-JRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ6rBK+1YWc26sTfcioU+tHXot
-RSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAiFL39vmwLAw==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-119_VeriSign Class 2 Public Primary Certification Authority - G3_VeriSign, Inc.pem b/test/rules/platform_certs/cacert/Cert-119_VeriSign Class 2 Public Primary Certification Authority - G3_VeriSign, Inc.pem
deleted file mode 100644
index 669281096798..000000000000
--- a/test/rules/platform_certs/cacert/Cert-119_VeriSign Class 2 Public Primary Certification Authority - G3_VeriSign, Inc.pem	
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEGTCCAwECEGFwy0mMX5hFKeewptlQW3owDQYJKoZIhvcNAQEFBQAwgcoxCzAJ
-BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVy
-aVNpZ24gVHJ1c3QgTmV0d29yazE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24s
-IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTFFMEMGA1UEAxM8VmVyaVNp
-Z24gQ2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
-eSAtIEczMB4XDTk5MTAwMTAwMDAwMFoXDTM2MDcxNjIzNTk1OVowgcoxCzAJBgNV
-BAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNp
-Z24gVHJ1c3QgTmV0d29yazE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24sIElu
-Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTFFMEMGA1UEAxM8VmVyaVNpZ24g
-Q2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAt
-IEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArwoNwtUs22e5LeWU
-J92lvuCwTY+zYVY81nzD9M0+hsuiiOLh2KRpxbXiv8GmR1BeRjmL1Za6tW8UvxDO
-JxOeBUebMXoT2B/Z0wI3i60sR/COgQanDTAM6/c8DyAd3HJG7qUCyFvDyVZpTMUY
-wZF7C9UTAJu878NIPkZgIIUq1ZC2zYugzDLdt/1AVbJQHFauzI13TccgTacxdu9o
-koqQHgiBVrKtaaNS0MscxCM9H5n+TOgWY47GCI72MfbS+uV23bUckqNJzc0BzWjN
-qWm6o+sdDZykIKbBoMXRRkwXbdKsZj+WjOCE1Db/IlnF+RFgqF8EffIa9iVCYQ/E
-Srg+iQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA0JhU8wI1NQ0kdvekhktdmnLfe
-xbjQ5F1fdiLAJvmEOjr5jLX77GDx6M4EsMjdpwOPMPOY36TmpDHf0xwLRtxyID+u
-7gU8pDM/CzmscHhzS5kr3zDCVLCoO1Wh/hYozUK9dG6A2ydEp85EXdQbkJgNHkKU
-sQAsBNB0owIFImNjzYO1+8FtYmtpdf1dcEG59b98377BMnMiIYtYgXsVkXq642RI
-sH/7NiXaldDxJBQX3RiAa0YjOVT1jmIJBB2UkKab5iXiQkWquJCtvgiPqQtCGJTP
-cjnhsUPgKM+351psE2tJs//jGHyJizNdrDPXp/naOlXJWBD5qu9ats9LS98q
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-120_QuoVadis Root CA 2_QuoVadis Limited.pem b/test/rules/platform_certs/cacert/Cert-120_QuoVadis Root CA 2_QuoVadis Limited.pem
deleted file mode 100644
index 35cc4eb56e10..000000000000
--- a/test/rules/platform_certs/cacert/Cert-120_QuoVadis Root CA 2_QuoVadis Limited.pem	
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x
-GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv
-b3QgQ0EgMjAeFw0wNjExMjQxODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNV
-BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W
-YWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCa
-GMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6XJxg
-Fyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55J
-WpzmM+Yklvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bB
-rrcCaoF6qUWD4gXmuVbBlDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp
-+ARz8un+XJiM9XOva7R+zdRcAitMOeGylZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1
-ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt66/3FsvbzSUr5R/7mp/i
-Ucw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1JdxnwQ5hYIiz
-PtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og
-/zOhD7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UH
-oycR7hYQe7xFSkyyBNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuI
-yV77zGHcizN300QyNQliBJIWENieJ0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1Ud
-EwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBQahGK8SEwzJQTU7tD2
-A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGUa6FJpEcwRTEL
-MAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
-ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2f
-BluornFdLwUvZ+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzn
-g/iN/Ae42l9NLmeyhP3ZRPx3UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2Bl
-fF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodmVjB3pjd4M1IQWK4/YY7yarHvGH5K
-WWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK+JDSV6IZUaUtl0Ha
-B0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrWIozc
-hLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPR
-TUIZ3Ph1WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWD
-mbA4CD/pXvk1B+TJYm5Xf6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0Z
-ohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y
-4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8VCLAAVBpQ570su9t+Oza
-8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-122_GeoTrust Primary Certification Authority - G3_GeoTrust Inc.pem b/test/rules/platform_certs/cacert/Cert-122_GeoTrust Primary Certification Authority - G3_GeoTrust Inc.pem
deleted file mode 100644
index dc1f859a554e..000000000000
--- a/test/rules/platform_certs/cacert/Cert-122_GeoTrust Primary Certification Authority - G3_GeoTrust Inc.pem	
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCB
-mDELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsT
-MChjKSAyMDA4IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s
-eTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhv
-cml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIzNTk1OVowgZgxCzAJ
-BgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
-MjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0
-BgNVBAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
-LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz
-+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5jK/BGvESyiaHAKAxJcCGVn2TAppMSAmUm
-hsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdEc5IiaacDiGydY8hS2pgn
-5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3CIShwiP/W
-JmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exAL
-DmKudlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZC
-huOl1UcCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
-HQYDVR0OBBYEFMR5yo6hTgMdHNxr2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IB
-AQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9cr5HqQ6XErhK8WTTOd8lNNTB
-zU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbEAp7aDHdlDkQN
-kv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
-AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUH
-SJsMC8tJP33st/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2G
-spki4cErx5z481+oghLrGREt
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-124_Autoridad de Certificacion Firmaprofesional CIF A62634068.pem b/test/rules/platform_certs/cacert/Cert-124_Autoridad de Certificacion Firmaprofesional CIF A62634068.pem
deleted file mode 100644
index 74be49140e8e..000000000000
--- a/test/rules/platform_certs/cacert/Cert-124_Autoridad de Certificacion Firmaprofesional CIF A62634068.pem	
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEVzCCAz+gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCRVMx
-IjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1
-dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
-MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20w
-HhcNMDExMDI0MjIwMDAwWhcNMTMxMDI0MjIwMDAwWjCBnTELMAkGA1UEBhMCRVMx
-IjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1
-dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
-MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20w
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnIwNvbyOlXnjOlSztlB5u
-Cp4Bx+ow0Syd3Tfom5h5VtP8c9/Qit5Vj1H5WuretXDE7aTt/6MNbg9kUDGvASdY
-rv5sp0ovFy3Tc9UTHI9ZpTQsHVQERc1ouKDAA6XPhUJHlShbz++AbOCQl4oBPB3z
-hxAwJkh91/zpnZFx/0GaqUC1N5wpIE8fUuOgfRNtVLcK3ulqTgesrBlf3H5idPay
-BQC6haD9HThuy1q7hryUZzM1gywfI834yJFxzJeL764P3CkDG8A563DtwW4O2GcL
-iam8NeTvtjS0pbbELaW+0MOUJEjb35bTALVmGotmBQ/dPz/LP6pemkr4tErvlTcb
-AgMBAAGjgZ8wgZwwKgYDVR0RBCMwIYYfaHR0cDovL3d3dy5maXJtYXByb2Zlc2lv
-bmFsLmNvbTASBgNVHRMBAf8ECDAGAQH/AgEBMCsGA1UdEAQkMCKADzIwMDExMDI0
-MjIwMDAwWoEPMjAxMzEwMjQyMjAwMDBaMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E
-FgQUMwugZtHq2s7eYpMEKFK1FH84aLcwDQYJKoZIhvcNAQEFBQADggEBAEdz/o0n
-VPD11HecJ3lXV7cVVuzH2Fi3AQL0M+2TUIiefEaxvT8Ub/GzR0iLjJcG1+p+o1wq
-u00vR+L4OQbJnC4xGgN49Lw4xiKLMzHwFgQEffl25EvXwOaD7FnMP97/T2u3Z36m
-hoEyIwOdyPdfwUpgpZKpsaSgYMN4h7Mi8yrrW6ntBas3D7Hi05V2Y1Z0jFhyGzfl
-ZKG+TQyTmAyX9odtsz/ny4Cm7YjHX1BiAuiZdBbQ5rQ58SfLyEDW44YQqSMSkuBp
-QWOnryULwMWSyx6Yo1q6xTMPoJcB3X/ge9YGVM+h4k0460tQtcsm9MracEpqoeJ5
-quGnM/b9Sh/22WA=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-125_Hongkong Post Root CA 1_Hongkong Post.pem b/test/rules/platform_certs/cacert/Cert-125_Hongkong Post Root CA 1_Hongkong Post.pem
deleted file mode 100644
index a28e9a0e49b1..000000000000
--- a/test/rules/platform_certs/cacert/Cert-125_Hongkong Post Root CA 1_Hongkong Post.pem	
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsx
-FjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3Qg
-Um9vdCBDQSAxMB4XDTAzMDUxNTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkG
-A1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdr
-b25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1ApzQ
-jVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEn
-PzlTCeqrauh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjh
-ZY4bXSNmO7ilMlHIhqqhqZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9
-nnV0ttgCXjqQesBCNnLsak3c78QA3xMYV18meMjWCnl3v/evt3a5pQuEF10Q6m/h
-q5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgED
-MA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7ih9legYsC
-mEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI3
-7piol7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clB
-oiMBdDhViw+5LmeiIAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJs
-EhTkYY2sEJCehFC78JZvRZ+K88psT/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpO
-fMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilTc4afU9hDDl3WY4JxHYB0yvbi
-AmvZWg==
------END CERTIFICATE-----
diff --git "a/test/rules/platform_certs/cacert/Cert-126_NetLock Arany (Class Gold) F\305\221tan\303\272s\303\255tv\303\241ny_NetLock Kft.pem" "b/test/rules/platform_certs/cacert/Cert-126_NetLock Arany (Class Gold) F\305\221tan\303\272s\303\255tv\303\241ny_NetLock Kft.pem"
deleted file mode 100644
index 56b9ee4774ee..000000000000
--- "a/test/rules/platform_certs/cacert/Cert-126_NetLock Arany (Class Gold) F\305\221tan\303\272s\303\255tv\303\241ny_NetLock Kft.pem"	
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQG
-EwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3
-MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNl
-cnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBBcmFueSAoQ2xhc3MgR29sZCkgRsWR
-dGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgxMjA2MTUwODIxWjCB
-pzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxOZXRM
-b2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlm
-aWNhdGlvbiBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNz
-IEdvbGQpIEbFkXRhbsO6c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAxCRec75LbRTDofTjl5Bu0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrT
-lF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw/HpYzY6b7cNGbIRwXdrz
-AZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAkH3B5r9s5
-VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRG
-ILdwfzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2
-BJtr+UBdADTHLpl1neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAG
-AQH/AgEEMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2M
-U9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwWqZw8UQCgwBEIBaeZ5m8BiFRh
-bvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTtaYtOUZcTh5m2C
-+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
-bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2F
-uLjbvrW5KfnaNwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2
-XjG4Kvte9nHfRCaexOYNkbQudZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-127_Root CA Generalitat Valenciana_Generalitat Valenciana.pem b/test/rules/platform_certs/cacert/Cert-127_Root CA Generalitat Valenciana_Generalitat Valenciana.pem
deleted file mode 100644
index f001356e3821..000000000000
--- a/test/rules/platform_certs/cacert/Cert-127_Root CA Generalitat Valenciana_Generalitat Valenciana.pem	
+++ /dev/null
@@ -1,37 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIGizCCBXOgAwIBAgIEO0XlaDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJF
-UzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJ
-R1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwHhcN
-MDEwNzA2MTYyMjQ3WhcNMjEwNzAxMTUyMjQ3WjBoMQswCQYDVQQGEwJFUzEfMB0G
-A1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScw
-JQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGKqtXETcvIorKA3Qdyu0togu8M1JAJke+
-WmmmO3I2F0zo37i7L3bhQEZ0ZQKQUgi0/6iMweDHiVYQOTPvaLRfX9ptI6GJXiKj
-SgbwJ/BXufjpTjJ3Cj9BZPPrZe52/lSqfR0grvPXdMIKX/UIKFIIzFVd0g/bmoGl
-u6GzwZTNVOAydTGRGmKy3nXiz0+J2ZGQD0EbtFpKd71ng+CT516nDOeB0/RSrFOy
-A8dEJvt55cs0YFAQexvba9dHq198aMpunUEDEO5rmXteJajCq+TA81yc477OMUxk
-Hl6AovWDfgzWyoxVjr7gvkkHD6MkQXpYHYTqWBLI4bft75PelAgxAgMBAAGjggM7
-MIIDNzAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnBr
-aS5ndmEuZXMwEgYDVR0TAQH/BAgwBgEB/wIBAjCCAjQGA1UdIASCAiswggInMIIC
-IwYKKwYBBAG/VQIBADCCAhMwggHoBggrBgEFBQcCAjCCAdoeggHWAEEAdQB0AG8A
-cgBpAGQAYQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAFIA
-YQDtAHoAIABkAGUAIABsAGEAIABHAGUAbgBlAHIAYQBsAGkAdABhAHQAIABWAGEA
-bABlAG4AYwBpAGEAbgBhAC4ADQAKAEwAYQAgAEQAZQBjAGwAYQByAGEAYwBpAPMA
-bgAgAGQAZQAgAFAAcgDhAGMAdABpAGMAYQBzACAAZABlACAAQwBlAHIAdABpAGYA
-aQBjAGEAYwBpAPMAbgAgAHEAdQBlACAAcgBpAGcAZQAgAGUAbAAgAGYAdQBuAGMA
-aQBvAG4AYQBtAGkAZQBuAHQAbwAgAGQAZQAgAGwAYQAgAHAAcgBlAHMAZQBuAHQA
-ZQAgAEEAdQB0AG8AcgBpAGQAYQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEA
-YwBpAPMAbgAgAHMAZQAgAGUAbgBjAHUAZQBuAHQAcgBhACAAZQBuACAAbABhACAA
-ZABpAHIAZQBjAGMAaQDzAG4AIAB3AGUAYgAgAGgAdAB0AHAAOgAvAC8AdwB3AHcA
-LgBwAGsAaQAuAGcAdgBhAC4AZQBzAC8AYwBwAHMwJQYIKwYBBQUHAgEWGWh0dHA6
-Ly93d3cucGtpLmd2YS5lcy9jcHMwHQYDVR0OBBYEFHs100DSHHgZZu90ECjcPk+y
-eAT8MIGVBgNVHSMEgY0wgYqAFHs100DSHHgZZu90ECjcPk+yeAT8oWykajBoMQsw
-CQYDVQQGEwJFUzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0G
-A1UECxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVu
-Y2lhbmGCBDtF5WgwDQYJKoZIhvcNAQEFBQADggEBACRhTvW1yEICKrNcda3Fbcrn
-lD+laJWIwVTAEGmiEi8YPyVQqHxK6sYJ2fR1xkDar1CdPaUWu20xxsdzCkj+IHLt
-b8zog2EWRpABlUt9jppSCS/2bxzkoXHPjCpaF3ODR00PNvsETUlR4hTJZGH71BTg
-9J63NI8KJr2XXPR5OkowGcytT6CYirQxlyric21+eLj4iIlPsSKRZEv1UN4D2+XF
-ducTZnV+ZfsBn5OHiJ35Rld8TWCvmHMTI6QgkYH60GFmuH3Rr9ZvHmw96RH9qfmC
-IoaZM3Fa6hlXPZHNqcCjbgcTpsnt+GijnsNacgmHKNHEc8RzGF9QdRYxn7fofMM=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-128_NetLock Kozjegyzoi (Class A) Tanusitvanykiado_NetLock Halozatbiztonsagi Kft.pem b/test/rules/platform_certs/cacert/Cert-128_NetLock Kozjegyzoi (Class A) Tanusitvanykiado_NetLock Halozatbiztonsagi Kft.pem
deleted file mode 100644
index c4e610816b42..000000000000
--- a/test/rules/platform_certs/cacert/Cert-128_NetLock Kozjegyzoi (Class A) Tanusitvanykiado_NetLock Halozatbiztonsagi Kft.pem	
+++ /dev/null
@@ -1,37 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhV
-MRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMe
-TmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0
-dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFzcyBB
-KSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oXDTE5MDIxOTIzMTQ0
-N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhC
-dWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQu
-MRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBL
-b3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSMD7tM9DceqQWC2ObhbHDqeLVu0ThEDaiD
-zl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZz+qMkjvN9wfcZnSX9EUi
-3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC/tmwqcm8
-WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LY
-Oph7tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2Esi
-NCubMvJIH5+hCoR64sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCC
-ApswDgYDVR0PAQH/BAQDAgAGMBIGA1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4
-QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1GSUdZRUxFTSEgRXplbiB0
-YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pvbGdhbHRhdGFz
-aSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu
-IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtm
-ZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMg
-ZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVs
-amFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJhc2EgbWVndGFsYWxoYXRv
-IGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBhIGh0dHBzOi8vd3d3
-Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVub3J6
-ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1
-YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3Qg
-dG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRs
-b2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNAbmV0bG9jay5uZXQuMA0G
-CSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5ayZrU3/b39/zcT0mwBQO
-xmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjPytoUMaFP
-0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQ
-QeJBCWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxk
-f1qbFFgBJ34TUMdrKuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK
-8CtmdWOMovsEPoMOmzbwGOQmIMOM8CgHrTwXZoi1/baI
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-129_TC TrustCenter Universal CA I_TC TrustCenter GmbH.pem b/test/rules/platform_certs/cacert/Cert-129_TC TrustCenter Universal CA I_TC TrustCenter GmbH.pem
deleted file mode 100644
index 8b8caf550273..000000000000
--- a/test/rules/platform_certs/cacert/Cert-129_TC TrustCenter Universal CA I_TC TrustCenter GmbH.pem	
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID3TCCAsWgAwIBAgIOHaIAAQAC7LdggHiNtgYwDQYJKoZIhvcNAQEFBQAweTEL
-MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNV
-BAsTG1RDIFRydXN0Q2VudGVyIFVuaXZlcnNhbCBDQTEmMCQGA1UEAxMdVEMgVHJ1
-c3RDZW50ZXIgVW5pdmVyc2FsIENBIEkwHhcNMDYwMzIyMTU1NDI4WhcNMjUxMjMx
-MjI1OTU5WjB5MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIg
-R21iSDEkMCIGA1UECxMbVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBMSYwJAYD
-VQQDEx1UQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0EgSTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKR3I5ZEr5D0MacQ9CaHnPM42Q9e3s9B6DGtxnSR
-JJZ4Hgmgm5qVSkr1YnwCqMqs+1oEdjneX/H5s7/zA1hV0qq34wQi0fiU2iIIAI3T
-fCZdzHd55yx4Oagmcw6iXSVphU9VDprvxrlE4Vc93x9UIuVvZaozhDrzznq+VZeu
-jRIPFDPiUHDDSYcTvFHe15gSWu86gzOSBnWLknwSaHtwag+1m7Z3W0hZneTvWq3z
-wZ7U10VOylY0Ibw+F1tvdwxIAUMpsN0/lm7mlaoMwCC2/T42J5zjXM9OgdwZu5GQ
-fezmlwQek8wiSdeXhrYTCjxDI3d+8NzmzSQfO4ObNDqDNOMCAwEAAaNjMGEwHwYD
-VR0jBBgwFoAUkqR1LKSevoFE63n8isWVpesQdXMwDwYDVR0TAQH/BAUwAwEB/zAO
-BgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFJKkdSyknr6BROt5/IrFlaXrEHVzMA0G
-CSqGSIb3DQEBBQUAA4IBAQAo0uCG1eb4e/CX3CJrO5UUVg8RMKWaTzqwOuAGy2X1
-7caXJ/4l8lfmXpWMPmRgFVp/Lw0BxbFg/UU1z/CyvwbZ71q+s2IhtNerNXxTPqYn
-8aEt2hojnczd7Dwtnic0XQ/CNnm8yUpiLe1r2X1BQ3y2qsrtYbE3ghUJGooWMNjs
-ydZHcnhLEEYUjl8Or+zHL6sQ17bxbuyGssLoDZJz3KL0Dzq/YSMQiZxIQG5wALPT
-ujdEWBF6AmqI8Dc08BnprNRlc/ZpjGSUOnmFKbAWKwyCPwacx/0QK54PLLae4xW/
-2TYcuiUaUj0a7CIMHOCkoj3w6DnPgcB77V0fb8XQC9eY
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-130_GeoTrust Primary Certification Authority_GeoTrust Inc.pem b/test/rules/platform_certs/cacert/Cert-130_GeoTrust Primary Certification Authority_GeoTrust Inc.pem
deleted file mode 100644
index 03c70c70531c..000000000000
--- a/test/rules/platform_certs/cacert/Cert-130_GeoTrust Primary Certification Authority_GeoTrust Inc.pem	
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBY
-MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMo
-R2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEx
-MjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
-Ew1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQcmltYXJ5IENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9
-AWbK7hWNb6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjA
-ZIVcFU2Ix7e64HXprQU9nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE0
-7e9GceBrAqg1cmuXm2bgyxx5X9gaBGgeRwLmnWDiNpcB3841kt++Z8dtd1k7j53W
-kBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGttm/81w7a4DSwDRp35+MI
-mO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G
-A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJ
-KoZIhvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ1
-6CePbJC/kRYkRj5KTs4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl
-4b7UVXGYNTq+k+qurUKykG/g/CFNNWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6K
-oKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHaFloxt/m0cYASSJlyc1pZU8Fj
-UjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG1riR/aYNKxoU
-AT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-131_Starfield Root Certificate Authority - G2_Starfield Technologies, Inc.pem b/test/rules/platform_certs/cacert/Cert-131_Starfield Root Certificate Authority - G2_Starfield Technologies, Inc.pem
deleted file mode 100644
index c1a0a48106a8..000000000000
--- a/test/rules/platform_certs/cacert/Cert-131_Starfield Root Certificate Authority - G2_Starfield Technologies, Inc.pem	
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMx
-EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT
-HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVs
-ZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAw
-MFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
-b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVj
-aG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZp
-Y2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAL3twQP89o/8ArFvW59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMg
-nLRJdzIpVv257IzdIvpy3Cdhl+72WoTsbhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1
-HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNkN3mSwOxGXn/hbVNMYq/N
-Hwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7NfZTD4p7dN
-dloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0
-HZbUJtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO
-BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0G
-CSqGSIb3DQEBCwUAA4IBAQARWfolTwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjU
-sHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx4mcujJUDJi5DnUox9g61DLu3
-4jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUwF5okxBDgBPfg
-8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
-pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1
-mMpYjn0q7pBZc2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-132_COMODO Certification Authority_COMODO CA Limited.pem b/test/rules/platform_certs/cacert/Cert-132_COMODO Certification Authority_COMODO CA Limited.pem
deleted file mode 100644
index 6146dcb571bc..000000000000
--- a/test/rules/platform_certs/cacert/Cert-132_COMODO Certification Authority_COMODO CA Limited.pem	
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCB
-gTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNV
-BAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEyMDEwMDAw
-MDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3Jl
-YXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01P
-RE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3
-UcEbVASY06m/weaKXTuH+7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI
-2GqGd0S7WWaXUF601CxwRM/aN5VCaTwwxHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8
-Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV4EajcNxo2f8ESIl33rXp
-+2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA1KGzqSX+
-DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5O
-nKVIrLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW
-/zAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6g
-PKA6hjhodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9u
-QXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOCAQEAPpiem/Yb6dc5t3iuHXIY
-SdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CPOGEIqB6BCsAv
-IC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
-RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4
-zJVSk/BwJVmcIGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5dd
-BA6+C4OmF4O5MBKgxTMVBbkN+8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IB
-ZQ==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-133_VeriSign Class 1 Public Primary Certification Authority - G3_VeriSign, Inc.pem b/test/rules/platform_certs/cacert/Cert-133_VeriSign Class 1 Public Primary Certification Authority - G3_VeriSign, Inc.pem
deleted file mode 100644
index 3938d8727b94..000000000000
--- a/test/rules/platform_certs/cacert/Cert-133_VeriSign Class 1 Public Primary Certification Authority - G3_VeriSign, Inc.pem	
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEGjCCAwICEQCLW3VWhFSFCwDPrzhIzrGkMA0GCSqGSIb3DQEBBQUAMIHKMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
-cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
-LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
-aWduIENsYXNzIDEgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
-VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
-aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
-bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
-IENsYXNzIDEgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
-LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN2E1Lm0+afY8wR4
-nN493GwTFtl63SRRZsDHJlkNrAYIwpTRMx/wgzUfbhvI3qpuFU5UJ+/EbRrsC+MO
-8ESlV8dAWB6jRx9x7GD2bZTIGDnt/kIYVt/kTEkQeE4BdjVjEjbdZrwBBDajVWjV
-ojYJrKshJlQGrT/KFOCsyq0GHZXi+J3x4GD/wn91K0zM2v6HmSHquv4+VNfSWXjb
-PG7PoBMAGrgnoeS+Z5bKoMWznN3JdZ7rMJpfo83ZrngZPyPpXNspva1VyBtUjGP2
-6KbqxzcSXKMpHgLZ2x87tNcPVkeBFQRKr4Mn0cVYiMHd9qqnoxjaaKptEVHhv2Vr
-n5Z20T0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAq2aN17O6x5q25lXQBfGfMY1a
-qtmqRiYPce2lrVNWYgFHKkTp/j90CxObufRNG7LRX7K20ohcs5/Ny9Sn2WCVhDr4
-wTcdYcrnsMXlkdpUpqwxga6X3s0IrLjAl4B/bnKk52kTlWUfxJM8/XmPBNQ+T+r3
-ns7NZ3xPZQL/kYVUc8f/NveGLezQXk//EZ9yBta4GvFMDSZl4kSAHsef493oCtrs
-pSCAaWihT37ha88HQfqDjrw43bAuEbFrskLMmrz5SCJ5ShkPshw+IHTZasO+8ih4
-E1Z5T21Q6huwtVexN2ZYI/PcD98Kh8TvhgXVOBRgmaNL3gaWcSzy27YfpO8/7g==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-134_Microsec e-Szigno Root CA_Microsec Ltd.pem b/test/rules/platform_certs/cacert/Cert-134_Microsec e-Szigno Root CA_Microsec Ltd.pem
deleted file mode 100644
index 01bb0be01f1b..000000000000
--- a/test/rules/platform_certs/cacert/Cert-134_Microsec e-Szigno Root CA_Microsec Ltd.pem	
+++ /dev/null
@@ -1,43 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIHqDCCBpCgAwIBAgIRAMy4579OKRr9otxmpRwsDxEwDQYJKoZIhvcNAQEFBQAw
-cjELMAkGA1UEBhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MRYwFAYDVQQKEw1NaWNy
-b3NlYyBMdGQuMRQwEgYDVQQLEwtlLVN6aWdubyBDQTEiMCAGA1UEAxMZTWljcm9z
-ZWMgZS1Temlnbm8gUm9vdCBDQTAeFw0wNTA0MDYxMjI4NDRaFw0xNzA0MDYxMjI4
-NDRaMHIxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEWMBQGA1UEChMN
-TWljcm9zZWMgTHRkLjEUMBIGA1UECxMLZS1Temlnbm8gQ0ExIjAgBgNVBAMTGU1p
-Y3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDtyADVgXvNOABHzNuEwSFpLHSQDCHZU4ftPkNEU6+r+ICbPHiN1I2u
-uO/TEdyB5s87lozWbxXGd36hL+BfkrYn13aaHUM86tnsL+4582pnS4uCzyL4ZVX+
-LMsvfUh6PXX5qqAnu3jCBspRwn5mS6/NoqdNAoI/gqyFxuEPkEeZlApxcpMqyabA
-vjxWTHOSJ/FrtfX9/DAFYJLG65Z+AZHCabEeHXtTRbjcQR/Ji3HWVBTji1R4P770
-Yjtb9aPs1ZJ04nQw7wHb4dSrmZsqa/i9phyGI0Jf7Enemotb9HI6QMVJPqW+jqpx
-62z69Rrkav17fVVA71hu5tnVvCSrwe+3AgMBAAGjggQ3MIIEMzBnBggrBgEFBQcB
-AQRbMFkwKAYIKwYBBQUHMAGGHGh0dHBzOi8vcmNhLmUtc3ppZ25vLmh1L29jc3Aw
-LQYIKwYBBQUHMAKGIWh0dHA6Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNydDAP
-BgNVHRMBAf8EBTADAQH/MIIBcwYDVR0gBIIBajCCAWYwggFiBgwrBgEEAYGoGAIB
-AQEwggFQMCgGCCsGAQUFBwIBFhxodHRwOi8vd3d3LmUtc3ppZ25vLmh1L1NaU1ov
-MIIBIgYIKwYBBQUHAgIwggEUHoIBEABBACAAdABhAG4A+gBzAO0AdAB2AOEAbgB5
-ACAA6QByAHQAZQBsAG0AZQB6AOkAcwDpAGgAZQB6ACAA6QBzACAAZQBsAGYAbwBn
-AGEAZADhAHMA4QBoAG8AegAgAGEAIABTAHoAbwBsAGcA4QBsAHQAYQB0APMAIABT
-AHoAbwBsAGcA4QBsAHQAYQB0AOEAcwBpACAAUwB6AGEAYgDhAGwAeQB6AGEAdABh
-ACAAcwB6AGUAcgBpAG4AdAAgAGsAZQBsAGwAIABlAGwAagDhAHIAbgBpADoAIABo
-AHQAdABwADoALwAvAHcAdwB3AC4AZQAtAHMAegBpAGcAbgBvAC4AaAB1AC8AUwBa
-AFMAWgAvMIHIBgNVHR8EgcAwgb0wgbqggbeggbSGIWh0dHA6Ly93d3cuZS1zemln
-bm8uaHUvUm9vdENBLmNybIaBjmxkYXA6Ly9sZGFwLmUtc3ppZ25vLmh1L0NOPU1p
-Y3Jvc2VjJTIwZS1Temlnbm8lMjBSb290JTIwQ0EsT1U9ZS1Temlnbm8lMjBDQSxP
-PU1pY3Jvc2VjJTIwTHRkLixMPUJ1ZGFwZXN0LEM9SFU/Y2VydGlmaWNhdGVSZXZv
-Y2F0aW9uTGlzdDtiaW5hcnkwDgYDVR0PAQH/BAQDAgEGMIGWBgNVHREEgY4wgYuB
-EGluZm9AZS1zemlnbm8uaHWkdzB1MSMwIQYDVQQDDBpNaWNyb3NlYyBlLVN6aWdu
-w7MgUm9vdCBDQTEWMBQGA1UECwwNZS1TemlnbsOzIEhTWjEWMBQGA1UEChMNTWlj
-cm9zZWMgS2Z0LjERMA8GA1UEBxMIQnVkYXBlc3QxCzAJBgNVBAYTAkhVMIGsBgNV
-HSMEgaQwgaGAFMegSXUWYYTbMUuE0vE3QJDvTtz3oXakdDByMQswCQYDVQQGEwJI
-VTERMA8GA1UEBxMIQnVkYXBlc3QxFjAUBgNVBAoTDU1pY3Jvc2VjIEx0ZC4xFDAS
-BgNVBAsTC2UtU3ppZ25vIENBMSIwIAYDVQQDExlNaWNyb3NlYyBlLVN6aWdubyBS
-b290IENBghEAzLjnv04pGv2i3GalHCwPETAdBgNVHQ4EFgQUx6BJdRZhhNsxS4TS
-8TdAkO9O3PcwDQYJKoZIhvcNAQEFBQADggEBANMTnGZjWS7KXHAM/IO8VbH0jgds
-ZifOwTsgqRy7RlRw7lrMoHfqaEQn6/Ip3Xep1fvj1KcExJW4C+FEaGAHQzAxQmHl
-7tnlJNUb3+FKG6qfx1/4ehHqE5MAyopYse7tDk2016g2JnzgOsHVV4Lxdbb9iV/a
-86g4nzUGCM4ilb7N1fy+W955a9x6qWVmvrElWl/tftOsRm1M9DKHtCAE4Gx4sHfR
-hUZLphK3dehKyVZs15KrnfVJONJPU+NVkBHbmJbGSfI+9J8b4PeI3CVimUTYc78/
-MPMMNz7UwiiAc7EBt51alhQBS6kRnSlqLtBdgcDPsiBDxwPgN05dCtxZICU=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-135_QuoVadis Root CA 3_QuoVadis Limited.pem b/test/rules/platform_certs/cacert/Cert-135_QuoVadis Root CA 3_QuoVadis Limited.pem
deleted file mode 100644
index bda7b1aa5923..000000000000
--- a/test/rules/platform_certs/cacert/Cert-135_QuoVadis Root CA 3_QuoVadis Limited.pem	
+++ /dev/null
@@ -1,38 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x
-GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv
-b3QgQ0EgMzAeFw0wNjExMjQxOTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNV
-BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W
-YWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDM
-V0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNggDhoB
-4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUr
-H556VOijKTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd
-8lyyBTNvijbO0BNO/79KDDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9Cabwv
-vWhDFlaJKjdhkf2mrk7AyxRllDdLkgbvBNDInIjbC3uBr7E9KsRlOni27tyAsdLT
-mZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwpp5ijJUMv7/FfJuGITfhe
-btfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8nT8KKdjc
-T5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDt
-WAEXMJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZ
-c6tsgLjoC2SToJyMGf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A
-4iLItLRkT9a6fUg+qGkM17uGcclzuD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYD
-VR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHTBgkrBgEEAb5YAAMwgcUwgZMG
-CCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmljYXRlIGNvbnN0
-aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
-aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVu
-dC4wLQYIKwYBBQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2Nw
-czALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4G
-A1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4ywLQoUmkRzBFMQswCQYDVQQGEwJC
-TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UEAxMSUXVvVmFkaXMg
-Um9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZVqyM0
-7ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSem
-d1o417+shvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd
-+LJ2w/w4E6oM3kJpK27zPOuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B
-4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadN
-t54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp8kokUvd0/bpO5qgdAm6x
-DYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBCbjPsMZ57
-k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6s
-zHXug/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0j
-Wy10QJLZYxkNc91pvGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeT
-mJlglFwjz1onl14LBQaTNx47aTbrqZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK
-4SVhM7JZG+Ju1zdXtg2pEto=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-136_Swisscom Root CA 1_Swisscom.pem b/test/rules/platform_certs/cacert/Cert-136_Swisscom Root CA 1_Swisscom.pem
deleted file mode 100644
index 41b460e752c8..000000000000
--- a/test/rules/platform_certs/cacert/Cert-136_Swisscom Root CA 1_Swisscom.pem	
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIF2TCCA8GgAwIBAgIQXAuFXAvnWUHfV8w/f52oNjANBgkqhkiG9w0BAQUFADBk
-MQswCQYDVQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0
-YWwgQ2VydGlmaWNhdGUgU2VydmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3Qg
-Q0EgMTAeFw0wNTA4MTgxMjA2MjBaFw0yNTA4MTgyMjA2MjBaMGQxCzAJBgNVBAYT
-AmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGlnaXRhbCBDZXJ0aWZp
-Y2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAxMIICIjAN
-BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0LmwqAzZuz8h+BvVM5OAFmUgdbI9
-m2BtRsiMMW8Xw/qabFbtPMWRV8PNq5ZJkCoZSx6jbVfd8StiKHVFXqrWW/oLJdih
-FvkcxC7mlSpnzNApbjyFNDhhSbEAn9Y6cV9Nbc5fuankiX9qUvrKm/LcqfmdmUc/
-TilftKaNXXsLmREDA/7n29uj/x2lzZAeAR81sH8A25Bvxn570e56eqeqDFdvpG3F
-EzuwpdntMhy0XmeLVNxzh+XTF3xmUHJd1BpYwdnP2IkCb6dJtDZd0KTeByy2dbco
-kdaXvij1mB7qWybJvbCXc9qukSbraMH5ORXWZ0sKbU/Lz7DkQnGMU3nn7uHbHaBu
-HYwadzVcFh4rUx80i9Fs/PJnB3r1re3WmquhsUvhzDdf/X/NTa64H5xD+SpYVUNF
-vJbNcA78yeNmuk6NO4HLFWR7uZToXTNShXEuT46iBhFRyePLoW4xCGQMwtI89Tbo
-19AOeCMgkckkKmUpWyL3Ic6DXqTz3kvTaI9GdVyDCW4pa8RwjPWd1yAv/0bSKzjC
-L3UcPX7ape8eYIVpQtPM+GP+HkM5haa2Y0EQs3MevNP6yn0WR+Kn1dCjigoIlmJW
-bjTb2QK5MHXjBNLnj8KwEUAKrNVxAmKLMb7dxiNYMUJDLXT5xp6mig/p/r+D5kNX
-JLrvRjSq1xIBOO0CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0hBBYw
-FDASBgdghXQBUwABBgdghXQBUwABMBIGA1UdEwEB/wQIMAYBAf8CAQcwHwYDVR0j
-BBgwFoAUAyUv3m+CATpcLNwroWm1Z9SM0/0wHQYDVR0OBBYEFAMlL95vggE6XCzc
-K6FptWfUjNP9MA0GCSqGSIb3DQEBBQUAA4ICAQA1EMvspgQNDQ/NwNurqPKIlwzf
-ky9NfEBWMXrrpA9gzXrzvsMnjgM+pN0S734edAY8PzHyHHuRMSG08NBsl9Tpl7Ik
-Vh5WwzW9iAUPWxAaZOHHgjD5Mq2eUCzneAXQMbFamIp1TpBcahQq4FJHgmDmHtqB
-sfsUC1rxn9KVuj7QG9YVHaO+htXbD8BJZLsuUBlL0iT43R4HVtA4oJVwIHaM190e
-3p9xxCPvgxNcoyQVTSlAPGrEqdi3pkSlDfTgnXceQHAm/NrZNuR55LU/vJtlvrsR
-ls/bxig5OgjOR1tTWsWZ/l2p3e9M1MalrQLmjAcSHm8D0W+go/MpvRLHUKKwf4ip
-mXeascClOS5cfGniLLDqN2qk4Vrh9VDlg++luyqI54zb/W1elxmofmZ1a3Hqv7HH
-b6D0jqTsNFFbjCYDcKF31QESVwA12yPeDooomf2xEG9L/zgtYE4snOtnta1J7ksf
-rK/7DZBaZmBwXarNeNQk7shBoJMBkpxqnvy5JMWzFYJ+vq6VK+uxwNrjAWALXmms
-hFZhvnEX/h0TD/7Gh0Xp/jKgGg0TpJRVcaUWi7rKibCyx/yP2FS1k2Kdzs9Z+z0Y
-zirLNRWCXf9UIltxUvu3yf5gmwBBZPCqKuy2QkPOiWaByIufOVQDJdMWNY6E0F/6
-MBr1mmz0DlP5OlvRHA==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-138_Entrust Root Certification Authority_Entrust, Inc.pem b/test/rules/platform_certs/cacert/Cert-138_Entrust Root Certification Authority_Entrust, Inc.pem
deleted file mode 100644
index 855485cfd028..000000000000
--- a/test/rules/platform_certs/cacert/Cert-138_Entrust Root Certification Authority_Entrust, Inc.pem	
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC
-VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0
-Lm5ldC9DUFMgaXMgaW5jb3Jwb3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMW
-KGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsGA1UEAxMkRW50cnVzdCBSb290IENl
-cnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0MloXDTI2MTEyNzIw
-NTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMTkw
-NwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSBy
-ZWZlcmVuY2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNV
-BAMTJEVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALaVtkNC+sZtKm9I35RMOVcF7sN5EUFo
-Nu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYszA9u3g3s+IIRe7bJWKKf4
-4LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOwwCj0Yzfv9
-KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGI
-rb68j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi
-94DkZfs0Nw4pgHBNrziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOB
-sDCBrTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAi
-gA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1MzQyWjAfBgNVHSMEGDAWgBRo
-kORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DHhmak8fdLQ/uE
-vW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
-A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9t
-O1KzKtvn1ISMY/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6Zua
-AGAT/3B+XxFNSRuzFVJ7yVTav52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP
-9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTSW3iDVuycNsMm4hH2Z0kdkquM++v/
-eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0tHuu2guQOHXvgR1m
-0vdXcDazv/wor3ElhVsT/h5/WrQ8
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-139_VeriSign, Inc.pem b/test/rules/platform_certs/cacert/Cert-139_VeriSign, Inc.pem
deleted file mode 100644
index c2e9d2bcf2e2..000000000000
--- a/test/rules/platform_certs/cacert/Cert-139_VeriSign, Inc.pem	
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDAzCCAmwCEQC5L2DMiJ+hekYJuFtwbIqvMA0GCSqGSIb3DQEBBQUAMIHBMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0Ns
-YXNzIDIgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH
-MjE6MDgGA1UECxMxKGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9y
-aXplZCB1c2Ugb25seTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazAe
-Fw05ODA1MTgwMDAwMDBaFw0yODA4MDEyMzU5NTlaMIHBMQswCQYDVQQGEwJVUzEX
-MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0NsYXNzIDIgUHVibGlj
-IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjE6MDgGA1UECxMx
-KGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s
-eTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAp4gBIXQs5xoD8JjhlzwPIQjxnNuX6Zr8wgQGE75fUsjM
-HiwSViy4AWkszJkfrbCWrnkE8hM5wXuYuggs6MKEEyyqaekJ9MepAqRCwiNPStjw
-DqL7MWzJ5m+ZJwf15vRMeJ5t60aG+rmGyVTyssSv1EYcWskVMP8NbPUtDm3Of3cC
-AwEAATANBgkqhkiG9w0BAQUFAAOBgQByLvl/0fFx+8Se9sVeUYpAmLho+Jscg9ji
-nb3/7aHmZuovCfTK1+qlK5X2JGCGTUQug6XELaDTrnhpb3LabK4I8GOSN+a7xDAX
-rXfMSTWqz9iP0b63GJZHc2pUIjRkLbYWm1lbtFFZOrMLFPQS32eg9K0yZF6xRnIn
-jBJ7xUS0rg==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-140_Staat der Nederlanden Root CA_Staat der Nederlanden.pem b/test/rules/platform_certs/cacert/Cert-140_Staat der Nederlanden Root CA_Staat der Nederlanden.pem
deleted file mode 100644
index c4eb117fa250..000000000000
--- a/test/rules/platform_certs/cacert/Cert-140_Staat der Nederlanden Root CA_Staat der Nederlanden.pem	
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJO
-TDEeMBwGA1UEChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFh
-dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEy
-MTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4wHAYDVQQKExVTdGFhdCBkZXIgTmVk
-ZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxhbmRlbiBSb290IENB
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFtvszn
-ExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw71
-9tV2U02PjLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MO
-hXeiD+EwR+4A5zN9RGcaC1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+U
-tFE5A3+y3qcym7RHjm+0Sq7lr7HcsBthvJly3uSJt3omXdozSVtSnA71iq3DuD3o
-BmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn622r+I/q85Ej0ZytqERAh
-SQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRVHSAAMDww
-OgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMv
-cm9vdC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA
-7Jbg0zTBLL9s+DANBgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k
-/rvuFbQvBgwp8qiSpGEN/KtcCFtREytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzm
-eafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbwMVcoEoJz6TMvplW0C5GUR5z6
-u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3ynGQI0DvDKcWy
-7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR
-iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-141_Autoridad de Certificacion Firmaprofesional CIF A62634068.pem b/test/rules/platform_certs/cacert/Cert-141_Autoridad de Certificacion Firmaprofesional CIF A62634068.pem
deleted file mode 100644
index de97f841cbfa..000000000000
--- a/test/rules/platform_certs/cacert/Cert-141_Autoridad de Certificacion Firmaprofesional CIF A62634068.pem	
+++ /dev/null
@@ -1,35 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UE
-BhMCRVMxQjBABgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1h
-cHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEy
-MzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIwQAYDVQQDDDlBdXRvcmlkYWQgZGUg
-Q2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBBNjI2MzQwNjgwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDDUtd9
-thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQM
-cas9UX4PB99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefG
-L9ItWY16Ck6WaVICqjaY7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15i
-NA9wBj4gGFrO93IbJWyTdBSTo3OxDqqHECNZXyAFGUftaI6SEspd/NYrspI8IM/h
-X68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyIplD9amML9ZMWGxmPsu2b
-m8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctXMbScyJCy
-Z/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirja
-EbsXLZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/T
-KI8xWVvTyQKmtFLKbpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF
-6NkBiDkal4ZkQdU7hwxu+g/GvUgUvzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVh
-OSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNHDhpkLzCBpgYD
-VR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
-cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBv
-ACAAZABlACAAbABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBl
-AGwAbwBuAGEAIAAwADgAMAAxADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF
-661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx51tkljYyGOylMnfX40S2wBEqgLk9
-am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qkR71kMrv2JYSiJ0L1
-ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaPT481
-PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS
-3a/DTg4fJl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5k
-SeTy36LssUzAKh3ntLFlosS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF
-3dvd6qJ2gHN99ZwExEWN57kci57q13XRcrHedUTnQn3iV2t93Jm8PYMo6oCTjcVM
-ZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoRsaS8I8nkvof/uZS2+F0g
-StRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTDKCOM/icz
-Q0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQB
-jLMi6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-142_Starfield Technologies, Inc.pem b/test/rules/platform_certs/cacert/Cert-142_Starfield Technologies, Inc.pem
deleted file mode 100644
index d552e65dddb9..000000000000
--- a/test/rules/platform_certs/cacert/Cert-142_Starfield Technologies, Inc.pem	
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzEl
-MCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMp
-U3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQw
-NjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBoMQswCQYDVQQGEwJVUzElMCMGA1UE
-ChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZp
-ZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqGSIb3
-DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf
-8MOh2tTYbitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN
-+lq2cwQlZut3f+dZxkqZJRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0
-X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVmepsZGD3/cVE8MC5fvj13c7JdBmzDI1aa
-K4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSNF4Azbl5KXZnJHoe0nRrA
-1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HFMIHCMB0G
-A1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fR
-zt0fhvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0
-YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBD
-bGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGsafPzWdqbAYcaT1epoXkJKtv3
-L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLMPUxA2IGvd56D
-eruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
-xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynp
-VSJYACPq4xJDKVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEY
-WQPJIrSPnNVeKtelttQKbfi3QBFGmh95DmK/D5fs4C8fF5Q=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-143_certSIGN.pem b/test/rules/platform_certs/cacert/Cert-143_certSIGN.pem
deleted file mode 100644
index 0a38740b432b..000000000000
--- a/test/rules/platform_certs/cacert/Cert-143_certSIGN.pem
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYT
-AlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBD
-QTAeFw0wNjA3MDQxNzIwMDRaFw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJP
-MREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7IJUqOtdu0KBuqV5Do
-0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHHrfAQ
-UySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5d
-RdY4zTW2ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQ
-OA7+j0xbm0bqQfWwCHTD0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwv
-JoIQ4uNllAoEwF73XVv4EOLQunpL+943AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08C
-AwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAcYwHQYDVR0O
-BBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IBAQA+0hyJ
-LjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecY
-MnQ8SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ
-44gx+FkagQnIl6Z0x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6I
-Jd1hJyMctTEHBDa0GpC9oHRxUIltvBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNw
-i/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7NzTogVZ96edhBiIL5VaZVDADlN
-9u6wWk5JRFRYX0KD
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-144_SecureSign RootCA11_Japan Certification Services, Inc.pem b/test/rules/platform_certs/cacert/Cert-144_SecureSign RootCA11_Japan Certification Services, Inc.pem
deleted file mode 100644
index aff52a8e3dd8..000000000000
--- a/test/rules/platform_certs/cacert/Cert-144_SecureSign RootCA11_Japan Certification Services, Inc.pem	
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDEr
-MCkGA1UEChMiSmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoG
-A1UEAxMTU2VjdXJlU2lnbiBSb290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0
-MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSswKQYDVQQKEyJKYXBhbiBDZXJ0aWZp
-Y2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1cmVTaWduIFJvb3RD
-QTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvLTJsz
-i1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8
-h9uuywGOwvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOV
-MdrAG/LuYpmGYz+/3ZMqg6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9
-UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rPO7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni
-8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitAbpSACW22s293bzUIUPsC
-h8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZXt94wDgYD
-VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
-AKChOBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xm
-KbabfSVSSUOrTC4rbnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQ
-X5Ucv+2rIrVls4W6ng+4reV6G4pQOh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWr
-QbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01y8hSyn+B/tlr0/cR7SXf+Of5
-pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061lgeLKBObjBmN
-QSdJQO7e5iNEOdyhIta6A/I=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-145_Staat der Nederlanden Root CA - G2_Staat der Nederlanden.pem b/test/rules/platform_certs/cacert/Cert-145_Staat der Nederlanden Root CA - G2_Staat der Nederlanden.pem
deleted file mode 100644
index cedf5967a80b..000000000000
--- a/test/rules/platform_certs/cacert/Cert-145_Staat der Nederlanden Root CA - G2_Staat der Nederlanden.pem	
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJO
-TDEeMBwGA1UECgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFh
-dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oX
-DTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMCTkwxHjAcBgNVBAoMFVN0YWF0IGRl
-ciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5lZGVybGFuZGVuIFJv
-b3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ5291
-qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8Sp
-uOUfiUtnvWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPU
-Z5uW6M7XxgpT0GtJlvOjCwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvE
-pMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiile7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp
-5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCROME4HYYEhLoaJXhena/M
-UGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpICT0ugpTN
-GmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy
-5V6548r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv
-6q012iDTiIJh8BIitrzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEK
-eN5KzlW/HdXZt1bv8Hb/C3m1r737qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6
-B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMBAAGjgZcwgZQwDwYDVR0TAQH/
-BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcCARYxaHR0cDov
-L3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
-HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqG
-SIb3DQEBCwUAA4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLyS
-CZa59sCrI2AGeYwRTlHSeYAz+51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen
-5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwjf/ST7ZwaUb7dRUG/kSS0H4zpX897
-IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaNkqbG9AclVMwWVxJK
-gnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfkCpYL
-+63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxL
-vJxxcypFURmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkm
-bEgeqmiSBeGCc1qb3AdbCG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvk
-N1trSt8sV4pAWja63XVECDdCcAz+3F4hoKOKwJCcaNpQ5kUQR3i2TtJlycM33+FC
-Y7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoVIPVVYpbtbZNQvOSqeK3Z
-ywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm66+KAQ==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-146_NetLock Uzleti (Class B) Tanusitvanykiado_NetLock Halozatbiztonsagi Kft.pem b/test/rules/platform_certs/cacert/Cert-146_NetLock Uzleti (Class B) Tanusitvanykiado_NetLock Halozatbiztonsagi Kft.pem
deleted file mode 100644
index dd373608e83b..000000000000
--- a/test/rules/platform_certs/cacert/Cert-146_NetLock Uzleti (Class B) Tanusitvanykiado_NetLock Halozatbiztonsagi Kft.pem	
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFSzCCBLSgAwIBAgIBaTANBgkqhkiG9w0BAQQFADCBmTELMAkGA1UEBhMCSFUx
-ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0
-b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTIwMAYDVQQD
-EylOZXRMb2NrIFV6bGV0aSAoQ2xhc3MgQikgVGFudXNpdHZhbnlraWFkbzAeFw05
-OTAyMjUxNDEwMjJaFw0xOTAyMjAxNDEwMjJaMIGZMQswCQYDVQQGEwJIVTERMA8G
-A1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRvbnNh
-Z2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxMjAwBgNVBAMTKU5l
-dExvY2sgVXpsZXRpIChDbGFzcyBCKSBUYW51c2l0dmFueWtpYWRvMIGfMA0GCSqG
-SIb3DQEBAQUAA4GNADCBiQKBgQCx6gTsIKAjwo84YM/HRrPVG/77uZmeBNwcf4xK
-gZjupNTKihe5In+DCnVMm8Bp2GQ5o+2So/1bXHQawEfKOml2mrriRBf8TKPV/riX
-iK+IA4kfpPIEPsgHC+b5sy96YhQJRhTKZPWLgLViqNhr1nGTLbO/CVRY7QbrqHvc
-Q7GhaQIDAQABo4ICnzCCApswEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNVHQ8BAf8E
-BAMCAAYwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1G
-SUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFu
-b3MgU3pvbGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBh
-bGFwamFuIGtlc3p1bHQuIEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExv
-Y2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGln
-aXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0
-IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJh
-c2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGph
-biBhIGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJo
-ZXRvIGF6IGVsbGVub3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBP
-UlRBTlQhIFRoZSBpc3N1YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmlj
-YXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBo
-dHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNA
-bmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4GBAATbrowXr/gOkDFOzT4JwG06
-sPgzTEdM43WIEJessDgVkcYplswhwG08pXTP2IKlOcNl40JwuyKQ433bNXbhoLXa
-n3BukxowOR0w2y7jfLKRstE3Kfq51hdcR0/jHTjrn9V7lagonhVK0dHQKwCXoOKS
-NitjrFgBazMpUIaD8QFI
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-147_WellsSecure Public Root Certificate Authority_Wells Fargo WellsSecure.pem b/test/rules/platform_certs/cacert/Cert-147_WellsSecure Public Root Certificate Authority_Wells Fargo WellsSecure.pem
deleted file mode 100644
index 5a265ef0c8f7..000000000000
--- a/test/rules/platform_certs/cacert/Cert-147_WellsSecure Public Root Certificate Authority_Wells Fargo WellsSecure.pem	
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEvTCCA6WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCVVMx
-IDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxs
-cyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9v
-dCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDcxMjEzMTcwNzU0WhcNMjIxMjE0
-MDAwNzU0WjCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdl
-bGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQD
-DC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDub7S9eeKPCCGeOARBJe+r
-WxxTkqxtnt3CxC5FlAM1iGd0V+PfjLindo8796jE2yljDpFoNoqXjopxaAkH5OjU
-Dk/41itMpBb570OYj7OeUt9tkTmPOL13i0Nj67eT/DBMHAGTthP796EfvyXhdDcs
-HqRePGj4S78NuR4uNuip5Kf4D8uCdXw1LSLWwr8L87T8bJVhHlfXBIEyg1J55oNj
-z7fLY4sR4r1e6/aN7ZVyKLSsEmLpSjPmgzKuBXWVvYSV2ypcm44uDLiBK0HmOFaf
-SZtsdvqKXfcBeYF8wYNABf5x/Qw/zE5gCQ5lRxAvAcAFP4/4s0HvWkJ+We/Slwxl
-AgMBAAGjggE0MIIBMDAPBgNVHRMBAf8EBTADAQH/MDkGA1UdHwQyMDAwLqAsoCqG
-KGh0dHA6Ly9jcmwucGtpLndlbGxzZmFyZ28uY29tL3dzcHJjYS5jcmwwDgYDVR0P
-AQH/BAQDAgHGMB0GA1UdDgQWBBQmlRkQ2eihl5H/3BnZtQQ+0nMKajCBsgYDVR0j
-BIGqMIGngBQmlRkQ2eihl5H/3BnZtQQ+0nMKaqGBi6SBiDCBhTELMAkGA1UEBhMC
-VVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNX
-ZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMg
-Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQEwDQYJKoZIhvcNAQEFBQADggEB
-ALkVsUSRzCPIK0134/iaeycNzXK7mQDKfGYZUMbVmO2rvwNa5U3lHshPcZeG1eMd
-/ZDJPHV3V3p9+N701NX3leZ0bh08rnyd2wIDBSxxSyU+B+NemvVmFymIGjifz6pB
-A4SXa5M4esowRBskRDPQ5NHcKDj0E0M1NSljqHyita04pO2t/caaH/+Xc/77szWn
-k4bGdpEA5qxRFsQnMlzbc9qlk1eOPm01JghZ1edE13YgY+esE2fDbbFwRnzVlhE9
-iW9dqKHrjQrawx0zbKPqZxmamX9LPYNRKh3KL4YMon4QLSvUFpULB6ouFJJJtylv
-2G0xffX8oRAHh84vWdw+WNs=
------END CERTIFICATE-----
diff --git "a/test/rules/platform_certs/cacert/Cert-148_AC Ra\303\255z Certic\303\241mara S.A._Sociedad Cameral de Certificaci\303\263n Digital - Certic\303\241mara S.A.pem" "b/test/rules/platform_certs/cacert/Cert-148_AC Ra\303\255z Certic\303\241mara S.A._Sociedad Cameral de Certificaci\303\263n Digital - Certic\303\241mara S.A.pem"
deleted file mode 100644
index c60cce890180..000000000000
--- "a/test/rules/platform_certs/cacert/Cert-148_AC Ra\303\255z Certic\303\241mara S.A._Sociedad Cameral de Certificaci\303\263n Digital - Certic\303\241mara S.A.pem"	
+++ /dev/null
@@ -1,37 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsx
-CzAJBgNVBAYTAkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRp
-ZmljYWNpw7NuIERpZ2l0YWwgLSBDZXJ0aWPDoW1hcmEgUy5BLjEjMCEGA1UEAwwa
-QUMgUmHDrXogQ2VydGljw6FtYXJhIFMuQS4wHhcNMDYxMTI3MjA0NjI5WhcNMzAw
-NDAyMjE0MjAyWjB7MQswCQYDVQQGEwJDTzFHMEUGA1UECgw+U29jaWVkYWQgQ2Ft
-ZXJhbCBkZSBDZXJ0aWZpY2FjacOzbiBEaWdpdGFsIC0gQ2VydGljw6FtYXJhIFMu
-QS4xIzAhBgNVBAMMGkFDIFJhw616IENlcnRpY8OhbWFyYSBTLkEuMIICIjANBgkq
-hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq2uJo1PMSCMI+8PPUZYILrgIem08kBeG
-qentLhM0R7LQcNzJPNCNyu5LF6vQhbCnIwTLqKL85XXbQMpiiY9QngE9JlsYhBzL
-fDe3fezTf3MZsGqy2IiKLUV0qPezuMDU2s0iiXRNWhU5cxh0T7XrmafBHoi0wpOQ
-Y5fzp6cSsgkiBzPZkc0OnB8OIMfuuzONj8LSWKdf/WU34ojC2I+GdV75LaeHM/J4
-Ny+LvB2GNzmxlPLYvEqcgxhaBvzz1NS6jBUJJfD5to0EfhcSM2tXSExP2yYe68yQ
-54v5aHxwD6Mq0Do43zeX4lvegGHTgNiRg0JaTASJaBE8rF9ogEHMYELODVoqDA+b
-MMCm8Ibbq0nXl21Ii/kDwFJnmxL3wvIumGVC2daa49AZMQyth9VXAnow6IYm+48j
-ilSH5L887uvDdUhfHjlvgWJsxS3EF1QZtzeNnDeRyPYL1epjb4OsOMLzP96a++Ej
-YfDIJss2yKHzMI+ko6Kh3VOz3vCaMh+DkXkwwakfU5tTohVTP92dsxA7SH2JD/zt
-A/X7JWR1DhcZDY8AFmd5ekD8LVkH2ZD6mq093ICK5lw1omdMEWux+IBkAC1vImHF
-rEsm5VoQgpukg3s0956JkSCXjrdCx2bD0Omk1vUgjcTDlaxECp1bczwmPS9KvqfJ
-pxAe+59QafMCAwEAAaOB5jCB4zAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
-AwIBBjAdBgNVHQ4EFgQU0QnQ6dfOeXRU+Tows/RtLAMDG2gwgaAGA1UdIASBmDCB
-lTCBkgYEVR0gADCBiTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5jZXJ0aWNhbWFy
-YS5jb20vZHBjLzBaBggrBgEFBQcCAjBOGkxMaW1pdGFjaW9uZXMgZGUgZ2FyYW50
-7WFzIGRlIGVzdGUgY2VydGlmaWNhZG8gc2UgcHVlZGVuIGVuY29udHJhciBlbiBs
-YSBEUEMuMA0GCSqGSIb3DQEBBQUAA4ICAQBclLW4RZFNjmEfAygPU3zmpFmps4p6
-xbD/CHwso3EcIRNnoZUSQDWDg4902zNc8El2CoFS3UnUmjIz75uny3XlesuXEpBc
-unvFm9+7OSPI/5jOCk0iAUgHforA1SBClETvv3eiiWdIG0ADBaGJ7M9i4z0ldma/
-Jre7Ir5v/zlXdLp6yQGVwZVR6Kss+LGGIOk/yzVb0hfpKv6DExdA7ohiZVvVO2Dp
-ezy4ydV/NgIlqmjCMRW3MGXrfx1IebHPOeJCgBbT9ZMj/EyXyVo3bHwi2ErN0o42
-gzmRkBDI8ck1fj+404HGIGQatlDCIaR43NAvO2STdPCWkPHv+wlaNECW8DYSwaN0
-jJN+Qd53i+yG2dIPPy3RzECiiWZIHiCznCNZc6lEc7wkeZBWN7PGKX6jD/EpOe9+
-XCgycDWs2rjIdWb8m0w5R44bb5tNAlQiM+9hup4phO9OSzNHdpdqy35f/RWmnkJD
-W2ZaiogN9xa5P1FlK2Zqi9E4UqLWRhH6/JocdJ6PlwsCT2TG9WjTSy3/pDceiz+/
-RL5hRqGEPQgnTIEgd4kI6mdAXmwIUV80WoyWaM3X94nCHNMyAK9Sy9NgWyo6R35r
-MDOhYil/SrnhLecUIw4OGEfhefwVVdCx/CVxY3UzHCMrr1zZ7Ud3YA47Dx7SwNxk
-BYn8eNZcLCZDqQ==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-149_AddTrust Class 1 CA Root_AddTrust AB.pem b/test/rules/platform_certs/cacert/Cert-149_AddTrust Class 1 CA Root_AddTrust AB.pem
deleted file mode 100644
index 43b8375f8186..000000000000
--- a/test/rules/platform_certs/cacert/Cert-149_AddTrust Class 1 CA Root_AddTrust AB.pem	
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU
-MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
-b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMw
-MTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
-QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYD
-VQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ul
-CDtbKRY654eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6n
-tGO0/7Gcrjyvd7ZWxbWroulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyl
-dI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1Zmne3yzxbrww2ywkEtvrNTVokMsAsJch
-PXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJuiGMx1I4S+6+JNM3GOGvDC
-+Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8wHQYDVR0O
-BBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8E
-BTADAQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBl
-MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFk
-ZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENB
-IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxtZBsfzQ3duQH6lmM0MkhHma6X
-7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0PhiVYrqW9yTkkz
-43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY
-eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJl
-pz/+0WatC7xrmYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOA
-WiFeIc9TVPC6b4nbqKqVz4vjccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-150_DigiCert High Assurance EV Root CA_DigiCert Inc.pem b/test/rules/platform_certs/cacert/Cert-150_DigiCert High Assurance EV Root CA_DigiCert Inc.pem
deleted file mode 100644
index 9e6810ab70cf..000000000000
--- a/test/rules/platform_certs/cacert/Cert-150_DigiCert High Assurance EV Root CA_DigiCert Inc.pem	
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
-ZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDEL
-MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3
-LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug
-RVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm
-+9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW
-PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEM
-xChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFB
-Ik5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3
-hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsg
-EsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF
-MAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaA
-FLE+w2kD+L9HAdSYJhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3Nec
-nzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6z
-eM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jF
-hS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2
-Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
-vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep
-+OkuE6N36B9K
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-151_DigiNotar Services 1024 CA_DigiNotar.pem b/test/rules/platform_certs/cacert/Cert-151_DigiNotar Services 1024 CA_DigiNotar.pem
deleted file mode 100644
index 332cb8bd3678..000000000000
--- a/test/rules/platform_certs/cacert/Cert-151_DigiNotar Services 1024 CA_DigiNotar.pem	
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDcTCCAtqgAwIBAgIED////zANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJO
-TDESMBAGA1UEChMJRGlnaU5vdGFyMSMwIQYDVQQDExpEaWdpTm90YXIgU2Vydmlj
-ZXMgMTAyNCBDQTEgMB4GCSqGSIb3DQEJARYRaW5mb0BkaWdpbm90YXIubmwwHhcN
-MDcwNzI2MTU1OTAxWhcNMTMwODI2MTYyOTAxWjBoMQswCQYDVQQGEwJOTDESMBAG
-A1UEChMJRGlnaU5vdGFyMSMwIQYDVQQDExpEaWdpTm90YXIgU2VydmljZXMgMTAy
-NCBDQTEgMB4GCSqGSIb3DQEJARYRaW5mb0BkaWdpbm90YXIubmwwgZ8wDQYJKoZI
-hvcNAQEBBQADgY0AMIGJAoGBANqbTV08+dHii8bGCCDF2R5I7GZYZ3liK0Fj9ImN
-aNqvuJQ2ixkkpKCT0pkPsq0tNU3NL2rh+ZsZK7wEGn4tPVJkzfE+Zw+JLujyT66m
-CKGF/qGpCebGqz5D/K96A5HapjmmYe6YTxio07OvZoLpn7zdcvkGBL0S2Rgk56uT
-U4tZAgMBAAGjggEmMIIBIjASBgNVHRMBAf8ECDAGAQH/AgEAMCcGA1UdJQQgMB4G
-CCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwEQYDVR0gBAowCDAGBgRVHSAA
-MDMGCCsGAQUFBwEBBCcwJTAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AuZW50cnVz
-dC5uZXQwMwYDVR0fBCwwKjAooCagJIYiaHR0cDovL2NybC5lbnRydXN0Lm5ldC9z
-ZXJ2ZXIxLmNybDAdBgNVHQ4EFgQU/tyUSQxv71x/xvESmU8WSa37gmUwCwYDVR0P
-BAQDAgEGMB8GA1UdIwQYMBaAFPAXYhNVPbP/CgBr+1CEl/PtYtAaMBkGCSqGSIb2
-fQdBAAQMMAobBFY3LjEDAgCBMA0GCSqGSIb3DQEBBQUAA4GBAGN0ajepP5acZshY
-rAnJ7/VllH+jAsQ4Mb1dI4fs1FayybJu5AUG/Oz1+ohwWdTu5t21eqCjYC8CDKve
-El2v8DVLqopHkRr1hSxCxx3vlUOzXriVk6XaxSiqrXItMa2Za2z/jCEnr62akSvH
-3VjDbgfFn3nSx4xVv0zHJ15RFis+
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-152_Global Chambersign Root - 2008_AC Camerfirma S.A.pem b/test/rules/platform_certs/cacert/Cert-152_Global Chambersign Root - 2008_AC Camerfirma S.A.pem
deleted file mode 100644
index 70b4ce41f214..000000000000
--- a/test/rules/platform_certs/cacert/Cert-152_Global Chambersign Root - 2008_AC Camerfirma S.A.pem	
+++ /dev/null
@@ -1,41 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
-VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
-IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
-MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
-aGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMxNDBaFw0zODA3MzEx
-MjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3Vy
-cmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAG
-A1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAl
-BgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZI
-hvcNAQEBBQADggIPADCCAgoCggIBAMDfVtPkOpt2RbQT2//BthmLN0EYlVJH6xed
-KYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXfXjaOcNFccUMd2drvXNL7
-G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0ZJJ0YPP2
-zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4
-ddPB/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyG
-HoiMvvKRhI9lNNgATH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2
-Id3UwD2ln58fQ1DJu7xsepeY7s2MH/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3V
-yJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfeOx2YItaswTXbo6Al/3K1dh3e
-beksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSFHTynyQbehP9r
-6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
-wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsog
-zCtLkykPAgMBAAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQW
-BBS5CcqcHtvTbDprru1U8VuTBjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDpr
-ru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UEBhMCRVUxQzBBBgNVBAcTOk1hZHJp
-ZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJmaXJtYS5jb20vYWRk
-cmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJmaXJt
-YSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiC
-CQDJzdPp1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCow
-KAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZI
-hvcNAQEFBQADggIBAICIf3DekijZBZRG/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZ
-UohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6ReAJ3spED8IXDneRRXoz
-X1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/sdZ7LoR/x
-fxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVz
-a2Mg9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yyd
-Yhz2rXzdpjEetrHHfoUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMd
-SqlapskD7+3056huirRXhOukP9DuqqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9O
-AP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETrP3iZ8ntxPjzxmKfFGBI/5rso
-M0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVqc5iJWzouE4ge
-v8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
-09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-153_Government Root Certification Authority.pem b/test/rules/platform_certs/cacert/Cert-153_Government Root Certification Authority.pem
deleted file mode 100644
index 51187d8acb1b..000000000000
--- a/test/rules/platform_certs/cacert/Cert-153_Government Root Certification Authority.pem	
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/
-MQswCQYDVQQGEwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5MB4XDTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1ow
-PzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dvdmVybm1lbnQgUm9vdCBDZXJ0aWZp
-Y2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
-AJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qNw8XR
-IePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1q
-gQdW8or5BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKy
-yhwOeYHWtXBiCAEuTk8O1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAts
-F/tnyMKtsc2AtJfcdgEWFelq16TheEfOhtX7MfP6Mb40qij7cEwdScevLJ1tZqa2
-jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wovJ5pGfaENda1UhhXcSTvx
-ls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7Q3hub/FC
-VGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHK
-YS1tB6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoH
-EgKXTiCQ8P8NHuJBO9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThN
-Xo+EHWbNxWCWtFJaBYmOlXqYwZE8lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1Ud
-DgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNVHRMEBTADAQH/MDkGBGcqBwAE
-MTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg209yewDL7MTqK
-UWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
-TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyf
-qzvS/3WXy6TjZwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaK
-ZEk9GhiHkASfQlK3T8v+R0F2Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFE
-JPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlUD7gsL0u8qV1bYH+Mh6XgUmMqvtg7
-hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6QzDxARvBMB1uUO07+1
-EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+HbkZ6Mm
-nD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WX
-udpVBrkk7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44Vbnz
-ssQwmSNOXfJIoRIM3BKQCZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDe
-LMDDav7v3Aun+kbfYNucpllQdSNpc5Oy+fwC00fmcc4QAu4njIT/rEUNE1yDMuAl
-pYYsfPQS
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-154_Buypass Class 2 CA 1_Buypass AS-983163327.pem b/test/rules/platform_certs/cacert/Cert-154_Buypass Class 2 CA 1_Buypass AS-983163327.pem
deleted file mode 100644
index 053f43352638..000000000000
--- a/test/rules/platform_certs/cacert/Cert-154_Buypass Class 2 CA 1_Buypass AS-983163327.pem	
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDUzCCAjugAwIBAgIBATANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEd
-MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3Mg
-Q2xhc3MgMiBDQSAxMB4XDTA2MTAxMzEwMjUwOVoXDTE2MTAxMzEwMjUwOVowSzEL
-MAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYD
-VQQDDBRCdXlwYXNzIENsYXNzIDIgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAIs8B0XY9t/mx8q6jUPFR42wWsE425KEHK8T1A9vNkYgxC7McXA0
-ojTTNy7Y3Tp3L8DrKehc0rWpkTSHIln+zNvnma+WwajHQN2lFYxuyHyXA8vmIPLX
-l18xoS830r7uvqmtqEyeIWZDO6i88wmjONVZJMHCR3axiFyCO7srpgTXjAePzdVB
-HfCuuCkslFJgNJQ72uA40Z0zPhX0kzLFANq1KWYOOngPIVJfAuWSeyXTkh4vFZ2B
-5J2O6O+JzhRMVB0cgRJNcKi+EAUXfh/RuFdV7c27UsKwHnjCTTZoy1YmwVLBvXb3
-WNVyfh9EdrsAiR0WnVE1703CVu9r4Iw7DekCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUP42aWYv8e3uco684sDntkHGA1sgwDgYDVR0PAQH/BAQD
-AgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAVGn4TirnoB6NLJzKyQJHyIdFkhb5jatLP
-gcIV1Xp+DCmsNx4cfHZSldq1fyOhKXdlyTKdqC5Wq2B2zha0jX94wNWZUYN/Xtm+
-DKhQ7SLHrQVMdvvt7h5HZPb3J31cKA9FxVxiXqaakZG3Uxcu3K1gnZZkOb1naLKu
-BctN518fV4bVIJwo+28TOPX2EZL2fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHs
-h7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5wwDX3OaJdZtB7WZ+oRxKaJyOk
-LY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-155_AddTrust External CA Root_AddTrust AB.pem b/test/rules/platform_certs/cacert/Cert-155_AddTrust External CA Root_AddTrust AB.pem
deleted file mode 100644
index 20585f1c01e1..000000000000
--- a/test/rules/platform_certs/cacert/Cert-155_AddTrust External CA Root_AddTrust AB.pem	
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU
-MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs
-IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290
-MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux
-FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h
-bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt
-H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9
-uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX
-mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX
-a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN
-E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0
-WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD
-VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0
-Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU
-cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx
-IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN
-AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH
-YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
-6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC
-Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
-c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
-mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-156_VeriSign Universal Root Certification Authority_VeriSign, Inc.pem b/test/rules/platform_certs/cacert/Cert-156_VeriSign Universal Root Certification Authority_VeriSign, Inc.pem
deleted file mode 100644
index b5f187511d58..000000000000
--- a/test/rules/platform_certs/cacert/Cert-156_VeriSign Universal Root Certification Authority_VeriSign, Inc.pem	
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCB
-vTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJp
-U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MTgwNgYDVQQDEy9W
-ZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
-Fw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJVUzEX
-MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0
-IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9y
-IGF1dGhvcml6ZWQgdXNlIG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNh
-bCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj1mCOkdeQmIN65lgZOIzF
-9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGPMiJhgsWH
-H26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+H
-LL729fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN
-/BMReYTtXlT2NJ8IAfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPT
-rJ9VAMf2CGqUuV/c4DPxhGD5WycRtPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1Ud
-EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0GCCsGAQUFBwEMBGEwX6FdoFsw
-WTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2Oa8PPgGrUSBgs
-exkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
-DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4
-sAPmLGd75JR3Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+
-seQxIcaBlVZaDrHC1LGmWazxY8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz
-4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTxP/jgdFcrGJ2BtMQo2pSXpXDrrB2+
-BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+PwGZsY6rp2aQW9IHR
-lRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4mJO3
-7M2CYfE45k+XmCpajQ==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-157_Baltimore CyberTrust Root_Baltimore.pem b/test/rules/platform_certs/cacert/Cert-157_Baltimore CyberTrust Root_Baltimore.pem
deleted file mode 100644
index 519028c63b21..000000000000
--- a/test/rules/platform_certs/cacert/Cert-157_Baltimore CyberTrust Root_Baltimore.pem	
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ
-RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD
-VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX
-DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y
-ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy
-VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr
-mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr
-IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK
-mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu
-XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy
-dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye
-jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1
-BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3
-DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92
-9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx
-jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0
-Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz
-ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS
-R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-158_TC TrustCenter Universal CA III_TC TrustCenter GmbH.pem b/test/rules/platform_certs/cacert/Cert-158_TC TrustCenter Universal CA III_TC TrustCenter GmbH.pem
deleted file mode 100644
index b7926f15b6cf..000000000000
--- a/test/rules/platform_certs/cacert/Cert-158_TC TrustCenter Universal CA III_TC TrustCenter GmbH.pem	
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID4TCCAsmgAwIBAgIOYyUAAQACFI0zFQLkbPQwDQYJKoZIhvcNAQEFBQAwezEL
-MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNV
-BAsTG1RDIFRydXN0Q2VudGVyIFVuaXZlcnNhbCBDQTEoMCYGA1UEAxMfVEMgVHJ1
-c3RDZW50ZXIgVW5pdmVyc2FsIENBIElJSTAeFw0wOTA5MDkwODE1MjdaFw0yOTEy
-MzEyMzU5NTlaMHsxCzAJBgNVBAYTAkRFMRwwGgYDVQQKExNUQyBUcnVzdENlbnRl
-ciBHbWJIMSQwIgYDVQQLExtUQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0ExKDAm
-BgNVBAMTH1RDIFRydXN0Q2VudGVyIFVuaXZlcnNhbCBDQSBJSUkwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDC2pxisLlxErALyBpXsq6DFJmzNEubkKLF
-5+cvAqBNLaT6hdqbJYUtQCggbergvbFIgyIpRJ9Og+41URNzdNW88jBmlFPAQDYv
-DIRlzg9uwliT6CwLOunBjvvya8o84pxOjuT5fdMnnxvVZ3iHLX8LR7PH6MlIfK8v
-zArZQe+f/prhsq75U7Xl6UafYOPfjdN/+5Z+s7Vy+EutCHnNaYlAJ/Uqwa1D7KRT
-yGG299J5KmcYdkhtWyUB0SbFt1dpIxVbYYqt8Bst2a9c8SaQaanVDED1M4BDj5yj
-dipFtK+/fz6HP3bFzSreIMUWWMv5G/UPyw0RUmS40nZid4PxWJ//AgMBAAGjYzBh
-MB8GA1UdIwQYMBaAFFbn4VslQ4Dg9ozhcbyO5YAvxEjiMA8GA1UdEwEB/wQFMAMB
-Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRW5+FbJUOA4PaM4XG8juWAL8RI
-4jANBgkqhkiG9w0BAQUFAAOCAQEAg8ev6n9NCjw5sWi+e22JLumzCecYV42Fmhfz
-dkJQEw/HkG8zrcVJYCtsSVgZ1OK+t7+rSbyUyKu+KGwWaODIl0YgoGhnYIg5IFHY
-aAERzqf2EQf27OysGh+yZm5WZ2B6dF7AbZc2rrUNXWZzwCUyRdhKBgePxLcHsU0G
-DeGl6/R1yrqc0L2z0zIkTO5+4nYES0lT2PLpVDP85XEfPRRclkvxOvIAu2y0+pZV
-CIgJwcyRGSmwIC3/yzikQOEXvnlhgP8HA4ZMTnsGnxGGjYnuJ8Tb4rwZjgvDwxPH
-LQNjO9Po5KIqwoIIlBZU8O8fJ5AluA0OKBtHd0e9HKgl8ZS0Zg==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-160_SecureTrust CA_SecureTrust Corporation.pem b/test/rules/platform_certs/cacert/Cert-160_SecureTrust CA_SecureTrust Corporation.pem
deleted file mode 100644
index 37400921e539..000000000000
--- a/test/rules/platform_certs/cacert/Cert-160_SecureTrust CA_SecureTrust Corporation.pem	
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBI
-MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x
-FzAVBgNVBAMTDlNlY3VyZVRydXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIz
-MTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAeBgNVBAoTF1NlY3VyZVRydXN0IENv
-cnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQXOZEz
-Zum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO
-0gMdA+9tDWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIao
-wW8xQmxSPmjL8xk037uHGFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj
-7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b01k/unK8RCSc43Oz969XL0Imnal0ugBS
-8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmHursCAwEAAaOBnTCBmjAT
-BgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
-/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCeg
-JYYjaHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGC
-NxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt3
-6Z3q059c4EVlew3KW+JwULKUBRSuSceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/
-3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHfmbx8IVQr5Fiiu1cprp6poxkm
-D5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZnMUFdAvnZyPS
-CPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
-3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-161_GeoTrust Universal CA_GeoTrust Inc.pem b/test/rules/platform_certs/cacert/Cert-161_GeoTrust Universal CA_GeoTrust Inc.pem
deleted file mode 100644
index 6bc288854728..000000000000
--- a/test/rules/platform_certs/cacert/Cert-161_GeoTrust Universal CA_GeoTrust Inc.pem	
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEW
-MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVy
-c2FsIENBMB4XDTA0MDMwNDA1MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UE
-BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xHjAcBgNVBAMTFUdlb1RydXN0
-IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKYV
-VaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9tJPi8
-cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTT
-QjOgNB0eRXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFh
-F7em6fgemdtzbvQKoiFs7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2v
-c7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d8Lsrlh/eezJS/R27tQahsiFepdaVaH/w
-mZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7VqnJNk22CDtucvc+081xd
-VHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3CgaRr0BHdCX
-teGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZ
-f9hBZ3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfRe
-Bi9Fi1jUIxaS5BZuKGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+
-nhutxx9z3SxPGWX9f5NAEC7S8O08ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB
-/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0XG0D08DYj3rWMB8GA1UdIwQY
-MBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG
-9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
-aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fX
-IwjhmF7DWgh2qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzyn
-ANXH/KttgCJwpQzgXQQpAvvLoJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0z
-uzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsKxr2EoyNB3tZ3b4XUhRxQ4K5RirqN
-Pnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxFKyDuSN/n3QmOGKja
-QI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2DFKW
-koRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9
-ER/frslKxfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQt
-DF4JbAiXfKM9fJP/P6EUp8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/Sfuvm
-bJxPgWp6ZKy7PtXny3YuxadIwVyQD8vIP/rmMuGNG2+k5o7Y+SlIis5z/iw=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-162_America Online Root Certification Authority 2_America Online Inc.pem b/test/rules/platform_certs/cacert/Cert-162_America Online Root Certification Authority 2_America Online Inc.pem
deleted file mode 100644
index 492d55a98067..000000000000
--- a/test/rules/platform_certs/cacert/Cert-162_America Online Root Certification Authority 2_America Online Inc.pem	
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFpDCCA4ygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEc
-MBoGA1UEChMTQW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBP
-bmxpbmUgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAyMB4XDTAyMDUyODA2
-MDAwMFoXDTM3MDkyOTE0MDgwMFowYzELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0Ft
-ZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2EgT25saW5lIFJvb3Qg
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIP
-ADCCAgoCggIBAMxBRR3pPU0Q9oyxQcngXssNt79Hc9PwVU3dxgz6sWYFas14tNwC
-206B89enfHG8dWOgXeMHDEjsJcQDIPT/DjsS/5uN4cbVG7RtIuOx238hZK+GvFci
-KtZHgVdEglZTvYYUAQv8f3SkWq7xuhG1m1hagLQ3eAkzfDJHA1zEpYNI9FdWboE2
-JxhP7JsowtS013wMPgwr38oE18aO6lhOqKSlGBxsRZijQdEt0sdtjRnxrXm3gT+9
-BoInLRBYBbV4Bbkv2wxrkJB+FFk4u5QkE+XRnRTf04JNRvCAOVIyD+OEsnpD8l7e
-Xz8d3eOyG6ChKiMDbi4BFYdcpnV1x5dhvt6G3NRI270qv0pV2uh9UPu0gBe4lL8B
-PeraunzgWGcXuVjgiIZGZ2ydEEdYMtA1fHkqkKJaEBEjNa0vzORKW6fIJ/KD3l67
-Xnfn6KVuY8INXWHQjNJsWiEOyiijzirplcdIz5ZvHZIlyMbGwcEMBawmxNJ10uEq
-Z8A9W6Wa6897GqidFEXlD6CaZd4vKL3Ob5Rmg0gp2OpljK+T2WSfVVcmv2/LNzGZ
-o2C7HK2JNDJiuEMhBnIMoVxtRsX6Kc8w3onccVvdtjc+31D1uAclJuW8tf48ArO3
-+L5DwYcRlJ4jbBeKuIonDFRH8KmzwICMoCfrHRnjB453cMor9H124HhnAgMBAAGj
-YzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFE1FwWg4u3OpaaEg5+31IqEj
-FNeeMB8GA1UdIwQYMBaAFE1FwWg4u3OpaaEg5+31IqEjFNeeMA4GA1UdDwEB/wQE
-AwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAZ2sGuV9FOypLM7PmG2tZTiLMubekJcmn
-xPBUlgtk87FYT15R/LKXeydlwuXK5w0MJXti4/qftIe3RUavg6WXSIylvfEWK5t2
-LHo1YGwRgJfMqZJS5ivmae2p+DYtLHe/YUjRYwu5W1LtGLBDQiKmsXeu3mnFzccc
-obGlHBD7GL4acN3Bkku+KVqdPzW+5X1R+FXgJXUjhx5c3LqdsKyzadsXg8n33gy8
-CNyRnqjQ1xU3c6U1uPx+xURABsPr+CKAXEfOAuMRn0T//ZoyzH1kUQ7rVyZ2OuMe
-IjzCpjbdGe+n/BLzJsBZMYVMnNjP36TMzCmT/5RtdlwTCJfy7aULTd3oyWgOZtMA
-DjMSW7yV5TKQqLPGbIOtd+6Lfn6xqavT4fG2wLHqiMDn05DpKJKUe2h7lyoKZy2F
-AjgQ5ANh1NolNscIWC2hp1GvMApJ9aZphwctREZ2jirlmjvXGKL8nDgQzMY70rUX
-Om/9riW99XJZZLF0KjhfGEzfz3EEWjbUvy+ZnOjZurGV5gJLIaFb1cFPj65pbVPb
-AZO1XB4Y3WRayhgoPmMEEf0cjQAPuDffZ4qdZqkCapH/E8ovXYO8h5Ns3CRRFgQl
-Zvqz2cK6Kb6aSDiCmfS/O0oxGfm/jiEzFMpPVF/7zvuPcX/9XhmgD0uRuMRUvAaw
-RY8mkaKO/qk=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-163_A-Trust-nQual-03_A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH.pem b/test/rules/platform_certs/cacert/Cert-163_A-Trust-nQual-03_A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH.pem
deleted file mode 100644
index 23ddad0bd26f..000000000000
--- a/test/rules/platform_certs/cacert/Cert-163_A-Trust-nQual-03_A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH.pem	
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDzzCCAregAwIBAgIDAWweMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJB
-VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp
-bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMRkwFwYDVQQLDBBBLVRydXN0LW5R
-dWFsLTAzMRkwFwYDVQQDDBBBLVRydXN0LW5RdWFsLTAzMB4XDTA1MDgxNzIyMDAw
-MFoXDTE1MDgxNzIyMDAwMFowgY0xCzAJBgNVBAYTAkFUMUgwRgYDVQQKDD9BLVRy
-dXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4gRGF0ZW52
-ZXJrZWhyIEdtYkgxGTAXBgNVBAsMEEEtVHJ1c3QtblF1YWwtMDMxGTAXBgNVBAMM
-EEEtVHJ1c3QtblF1YWwtMDMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCtPWFuA/OQO8BBC4SAzewqo51ru27CQoT3URThoKgtUaNR8t4j8DRE/5TrzAUj
-lUC5B3ilJfYKvUWG6Nm9wASOhURh73+nyfrBJcyFLGM/BWBzSQXgYHiVEEvc+RFZ
-znF/QJuKqiTfC0Li21a8StKlDJu3Qz7dg9MmEALP6iPESU7l0+m0iKsMrmKS1GWH
-2WrX9IWf5DMiJaXlyDO6w8dB3F/GaswADm0yqLaHNgBid5seHzTLkDx4iHQF63n1
-k3Flyp3HaxgtPVxO59X4PzF9j4fsCiIvI+n+u33J4PTs63zEsMMtYrWacdaxaujs
-2e3Vcuy+VwHOBVWf3tFgiBCzAgMBAAGjNjA0MA8GA1UdEwEB/wQFMAMBAf8wEQYD
-VR0OBAoECERqlWdVeRFPMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC
-AQEAVdRU0VlIXLOThaq/Yy/kgM40ozRiPvbY7meIMQQDbwvUB/tOdQ/TLtPAF8fG
-KOwGDREkDg6lXb+MshOWcdzUzg4NCmgybLlBMRmrsQd7TZjTXLDR8KdCoLXEjq/+
-8T/0709GAHbrAvv5ndJAlseIOrifEXnzgGWovR/TeIGgUUw3tKZdJXDRZslo+S4R
-FGjxVJgIrCaSD96JntT6s3kr0qN51OyLrIdTaEJMUVF0HhsnLuP1Hyl0Te2v9+GS
-mYHovjrHF1D2t8b8m7CKa9aIA5GPBnc6hQLdmNVDeD/GMBWsm2vLV7eJUYs66MmE
-DNuxUCAKGkq6ahq97BvIxYSazQ==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-164_Certum Trusted Network CA_Unizeto Technologies S.A.pem b/test/rules/platform_certs/cacert/Cert-164_Certum Trusted Network CA_Unizeto Technologies S.A.pem
deleted file mode 100644
index a04e656d8c41..000000000000
--- a/test/rules/platform_certs/cacert/Cert-164_Certum Trusted Network CA_Unizeto Technologies S.A.pem	
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBM
-MSIwIAYDVQQKExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5D
-ZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBU
-cnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIyMTIwNzM3WhcNMjkxMjMxMTIwNzM3
-WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMg
-Uy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSIw
-IAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rH
-UV+rpDKmYYe2bg+G0jACl/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LM
-TXPb865Px1bVWqeWifrzq2jUI4ZZJ88JJ7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVU
-BBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4fOQtf/WsX+sWn7Et0brM
-kUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0cvW0QM8x
-AcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNV
-HRMBAf8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNV
-HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15y
-sHhE49wcrwn9I0j6vSrEuVUEtRCjjSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfL
-I9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1mS1FhIrlQgnXdAIv94nYmem8
-J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5ajZt3hrvJBW8qY
-VoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
-03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-165_Equifax.pem b/test/rules/platform_certs/cacert/Cert-165_Equifax.pem
deleted file mode 100644
index 676db9759f40..000000000000
--- a/test/rules/platform_certs/cacert/Cert-165_Equifax.pem
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV
-UzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2Vy
-dGlmaWNhdGUgQXV0aG9yaXR5MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1
-MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0VxdWlmYXgxLTArBgNVBAsTJEVx
-dWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPRfM6f
-BeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+A
-cJkVV5MW8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kC
-AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQ
-MA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlm
-aWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTgw
-ODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gj
-IBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQF
-MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA
-A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y
-7qj/WsjTVbJmcVfewCHrPSqnI0kBBIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh
-1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee9570+sB3c4
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-166_GeoTrust Universal CA 2_GeoTrust Inc.pem b/test/rules/platform_certs/cacert/Cert-166_GeoTrust Universal CA 2_GeoTrust Inc.pem
deleted file mode 100644
index bed6cd0dd331..000000000000
--- a/test/rules/platform_certs/cacert/Cert-166_GeoTrust Universal CA 2_GeoTrust Inc.pem	
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEW
-MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVy
-c2FsIENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYD
-VQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1
-c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
-AQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0DE81
-WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUG
-FF+3Qs17j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdq
-XbboW0W63MOhBW9Wjo8QJqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxL
-se4YuU6W3Nx2/zu+z18DwPw76L5GG//aQMJS9/7jOvdqdzXQ2o3rXhhqMcceujwb
-KNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2WP0+GfPtDCapkzj4T8Fd
-IgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP20gaXT73
-y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRt
-hAAnZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgoc
-QIgfksILAAX/8sgCSqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4
-Lt1ZrtmhN79UNdxzMk+MBB4zsslG8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNV
-HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAfBgNV
-HSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8EBAMCAYYwDQYJ
-KoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
-dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQ
-L1EuxBRa3ugZ4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgr
-Fg5fNuH8KrUwJM/gYwx7WBr+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSo
-ag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpqA1Ihn0CoZ1Dy81of398j9tx4TuaY
-T1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpgY+RdM4kX2TGq2tbz
-GDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiPpm8m
-1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJV
-OCiNUW7dFGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH
-6aLcr34YEoP9VhdBLtUpgn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwX
-QMAJKOSLakhT2+zNVVXxxvjpoixMptEmX36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-167_The Go Daddy Group, Inc.pem b/test/rules/platform_certs/cacert/Cert-167_The Go Daddy Group, Inc.pem
deleted file mode 100644
index 42e8d1eef9d0..000000000000
--- a/test/rules/platform_certs/cacert/Cert-167_The Go Daddy Group, Inc.pem	
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEh
-MB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBE
-YWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3
-MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRo
-ZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3Mg
-MiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggEN
-ADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCA
-PVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6w
-wdhFJ2+qN1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXi
-EqITLdiOr18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMY
-avx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+
-YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLE
-sNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h
-/t2oatTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5
-IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-ggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYXMP80kWNy
-OO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKtI3lpjbi2Tc7P
-TMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
-HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mER
-dEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5Cuf
-ReYNnyicsbkqWletNw+vHX/bvZ8=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-168_Thawte Server CA_Thawte Consulting cc.pem b/test/rules/platform_certs/cacert/Cert-168_Thawte Server CA_Thawte Consulting cc.pem
deleted file mode 100644
index 27df192f0d08..000000000000
--- a/test/rules/platform_certs/cacert/Cert-168_Thawte Server CA_Thawte Consulting cc.pem	
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDEzCCAnygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBxDELMAkGA1UEBhMCWkEx
-FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
-VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
-biBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEm
-MCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wHhcNOTYwODAx
-MDAwMDAwWhcNMjAxMjMxMjM1OTU5WjCBxDELMAkGA1UEBhMCWkExFTATBgNVBAgT
-DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3
-dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNl
-cyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3
-DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQAD
-gY0AMIGJAoGBANOkUG7I/1Zr5s9dtuoMaHVHoqrC2oQl/Kj0R1HahbUgdJSGHg91
-yekIYfUGbTBuFRkC6VLAYttNmZ7iagxEOM3+vuNkCXDF/rFrKbYvScg71CcEJRCX
-L+eQbcAoQpnXTEPew/UhbVSfXcNY4cDk2VuwuNy0e982OsK1ZiIS1ocNAgMBAAGj
-EzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAB/pMaVz7lcxG
-7oWDTSEwjsrZqG9JGubaUeNgcGyEYRGhGshIPllDfU+VPaGLtwtimHp1it2ITk6e
-QNuozDJ0uW8NxuOzRAvZim+aKZuZGCg70eNAKJpaPNW15yAbi8qkq43pUdniTCxZ
-qdq5snUb9kLy78fyGPmJvKP/iiMucEc=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-169_TC TrustCenter Class 3 CA II_TC TrustCenter GmbH.pem b/test/rules/platform_certs/cacert/Cert-169_TC TrustCenter Class 3 CA II_TC TrustCenter GmbH.pem
deleted file mode 100644
index 78e6ca59750d..000000000000
--- a/test/rules/platform_certs/cacert/Cert-169_TC TrustCenter Class 3 CA II_TC TrustCenter GmbH.pem	
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEqjCCA5KgAwIBAgIOSkcAAQAC5aBd1j8AUb8wDQYJKoZIhvcNAQEFBQAwdjEL
-MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNV
-BAsTGVRDIFRydXN0Q2VudGVyIENsYXNzIDMgQ0ExJTAjBgNVBAMTHFRDIFRydXN0
-Q2VudGVyIENsYXNzIDMgQ0EgSUkwHhcNMDYwMTEyMTQ0MTU3WhcNMjUxMjMxMjI1
-OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIgR21i
-SDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQTElMCMGA1UEAxMc
-VEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALTgu1G7OVyLBMVMeRwjhjEQY0NVJz/GRcekPewJDRoeIMJW
-Ht4bNwcwIi9v8Qbxq63WyKthoy9DxLCyLfzDlml7forkzMA5EpBCYMnMNWju2l+Q
-Vl/NHE1bWEnrDgFPZPosPIlY2C8u4rBo6SI7dYnWRBpl8huXJh0obazovVkdKyT2
-1oQDZogkAHhg8fir/gKya/si+zXmFtGt9i4S5Po1auUZuV3bOx4a+9P/FRQI2Alq
-ukWdFHlgfa9Aigdzs5OW03Q0jTo3Kd5c7PXuLjHCINy+8U9/I1LZW+Jk2ZyqBwi1
-Rb3R0DHBq1SfqdLDYmAD8bs5SpJKPQq5ncWg/jcCAwEAAaOCATQwggEwMA8GA1Ud
-EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTUovyfs8PYA9NX
-XAek0CSnwPIA1DCB7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRy
-dXN0Y2VudGVyLmRlL2NybC92Mi90Y19jbGFzc18zX2NhX0lJLmNybIaBn2xkYXA6
-Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBUcnVzdENlbnRlciUyMENsYXNz
-JTIwMyUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21iSCxPVT1yb290
-Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
-TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEANmDkcPcGIEPZIxpC8vijsrlN
-irTzwppVMXzEO2eatN9NDoqTSheLG43KieHPOh6sHfGcMrSOWXaiQYUlN6AT0PV8
-TtXqluJucsG7Kv5sbviRmEb8yRtXW+rIGjs/sFGYPAfaLFkB2otE6OF0/ado3VS6
-g0bsyEa1+K+XwDsJHI/OcpY9M1ZwvJbL2NV9IJqDnxrcOfHFcqMRA/07QlIp2+gB
-95tejNaNhk4Z+rwcvsUhpYeeeC422wlxo3I0+GzjBgnyXlal092Y+tTmBvTwtiBj
-S+opvaqCZh77gaqnN60TGOaSw4HBM7uIHqHn4rS9MWwOUT1v+5ZWgOI2F9Hc5A==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-170_RSA Security Inc.pem b/test/rules/platform_certs/cacert/Cert-170_RSA Security Inc.pem
deleted file mode 100644
index 8b30d1101545..000000000000
--- a/test/rules/platform_certs/cacert/Cert-170_RSA Security Inc.pem	
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDYTCCAkmgAwIBAgIQCgEBAQAAAnwAAAAKAAAAAjANBgkqhkiG9w0BAQUFADA6
-MRkwFwYDVQQKExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJp
-dHkgMjA0OCBWMzAeFw0wMTAyMjIyMDM5MjNaFw0yNjAyMjIyMDM5MjNaMDoxGTAX
-BgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAbBgNVBAsTFFJTQSBTZWN1cml0eSAy
-MDQ4IFYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt49VcdKA3Xtp
-eafwGFAyPGJn9gqVB93mG/Oe2dJBVGutn3y+Gc37RqtBaB4Y6lXIL5F4iSj7Jylg
-/9+PjDvJSZu1pJTOAeo+tWN7fyb9Gd3AIb2E0S1PRsNO3Ng3OTsor8udGuorryGl
-wSMiuLgbWhOHV4PR8CDn6E8jQrAApX2J6elhc5SYcSa8LWrg903w8bYqODGBDSnh
-AMFRD0xS+ARaqn1y07iHKrtjEAMqs6FPDVpeRrc9DvV07Jmf+T0kgYim3WBU6JU2
-PcYJk5qjEoAAVZkZR73QpXzDuvsf9/UP+Ky5tfQ3mBMY3oVbtwyCO4dvlTlYMNpu
-AWgXIszACwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
-BjAfBgNVHSMEGDAWgBQHw1EwpKrpRa41JPr/JCwz0LGdjDAdBgNVHQ4EFgQUB8NR
-MKSq6UWuNST6/yQsM9CxnYwwDQYJKoZIhvcNAQEFBQADggEBAF8+hnZuuDU8TjYc
-HnmYv/3VEhF5Ug7uMYm83X/50cYVIeiKAVQNOvtUudZj1LGqlk2iQk3UUx+LEN5/
-Zb5gEydxiKRz44Rj0aRV4VCT5hsOedBnvEbIvz8XDZXmxpBp3ue0L96VfdASPz0+
-f00/FGj1EVDVwfSQpQgdMWD/YIwjVAqv/qFuxdF6Kmh4zx6CCiC0H63lhbJqaHVO
-rSU3lIW+vaHU6rcMSzyd6BIA8F+sDeGscGNz9395nzIlQnQFgCi/vcEkllgVsRch
-6YlL2weIZ/QVrXA+L02FO8K32/6YaCOJ4XQP3vTFhGMpG8zLB8kApKnXwiJPZ9d3
-7CAFYd4=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-171_DST Root CA X3_Digital Signature Trust Co.pem b/test/rules/platform_certs/cacert/Cert-171_DST Root CA X3_Digital Signature Trust Co.pem
deleted file mode 100644
index b2e43c93815b..000000000000
--- a/test/rules/platform_certs/cacert/Cert-171_DST Root CA X3_Digital Signature Trust Co.pem	
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/
-MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow
-PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
-Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O
-rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq
-OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b
-xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw
-7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD
-aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
-HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG
-SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69
-ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr
-AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz
-R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5
-JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo
-Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-172_Global Chambersign Root_AC Camerfirma SA CIF A82743287.pem b/test/rules/platform_certs/cacert/Cert-172_Global Chambersign Root_AC Camerfirma SA CIF A82743287.pem
deleted file mode 100644
index f5053061a4c5..000000000000
--- a/test/rules/platform_certs/cacert/Cert-172_Global Chambersign Root_AC Camerfirma SA CIF A82743287.pem	
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEn
-MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL
-ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENo
-YW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYxNDE4WhcNMzcwOTMwMTYxNDE4WjB9
-MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgy
-NzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4G
-A1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUA
-A4IBDQAwggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0
-Mi+ITaFgCPS3CU6gSS9J1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/s
-QJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8Oby4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpV
-eAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl6DJWk0aJqCWKZQbua795
-B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c8lCrEqWh
-z0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0T
-AQH/BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1i
-ZXJzaWduLm9yZy9jaGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4w
-TcbOX60Qq+UDpfqpFDAOBgNVHQ8BAf8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAH
-MCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBjaGFtYmVyc2lnbi5vcmcwKgYD
-VR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9yZzBbBgNVHSAE
-VDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh
-bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0B
-AQUFAAOCAQEAPDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUM
-bKGKfKX0j//U2K0X1S0E0T9YgOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXi
-ryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJPJ7oKXqJ1/6v/2j1pReQvayZzKWG
-VwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4IBHNfTIzSJRUTN3c
-ecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREest2d/
-AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-173_http---www.valicert.com-_ValiCert, Inc.pem b/test/rules/platform_certs/cacert/Cert-173_http---www.valicert.com-_ValiCert, Inc.pem
deleted file mode 100644
index 3997ac242e83..000000000000
--- a/test/rules/platform_certs/cacert/Cert-173_http---www.valicert.com-_ValiCert, Inc.pem	
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
-IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
-BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
-aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
-9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNTIyMjM0OFoXDTE5MDYy
-NTIyMjM0OFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
-azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
-YXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
-Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
-cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYWYJ6ibiWuqYvaG9Y
-LqdUHAZu9OqNSLwxlBfw8068srg1knaw0KWlAdcAAxIiGQj4/xEjm84H9b9pGib+
-TunRf50sQB1ZaG6m+FiwnRqP0z/x3BkGgagO4DrdyFNFCQbmD3DD+kCmDuJWBQ8Y
-TfwggtFzVXSNdnKgHZ0dwN0/cQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFBoPUn0
-LBwGlN+VYH+Wexf+T3GtZMjdd9LvWVXoP+iOBSoh8gfStadS/pyxtuJbdxdA6nLW
-I8sogTLDAHkY7FkXicnGah5xyf23dKUlRWnFSKsZ4UWKJWsZ7uW7EvV/96aNUcPw
-nXS3qT6gpf+2SQMT2iLM7XGCK5nPOrf1LXLI
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/Cert-174_Sonera Class2 CA_Sonera.pem b/test/rules/platform_certs/cacert/Cert-174_Sonera Class2 CA_Sonera.pem
deleted file mode 100644
index 36a998d225c3..000000000000
--- a/test/rules/platform_certs/cacert/Cert-174_Sonera Class2 CA_Sonera.pem	
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP
-MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAx
-MDQwNjA3Mjk0MFoXDTIxMDQwNjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNV
-BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3/Ei9vX+ALTU74W+o
-Z6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybTdXnt
-5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s
-3TmVToMGf+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2Ej
-vOr7nQKV0ba5cTppCD8PtOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu
-8nYybieDwnPz3BjotJPqdURrBGAgcVeHnfO+oJAjPYok4doh28MCAwEAAaMzMDEw
-DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITTXjwwCwYDVR0PBAQDAgEG
-MA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt0jSv9zil
-zqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/
-3DEIcbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvD
-FNr450kkkdAdavphOe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6
-Tk6ezAyNlNzZRZxe7EJQY670XcSxEtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2
-ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLHllpwrN9M
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/a5fd78f0.0 b/test/rules/platform_certs/cacert/a5fd78f0.0
deleted file mode 120000
index 19369beecfa9..000000000000
--- a/test/rules/platform_certs/cacert/a5fd78f0.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-014_TC TrustCenter Class 2 CA II_TC TrustCenter GmbH.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/a6a593ba.0 b/test/rules/platform_certs/cacert/a6a593ba.0
deleted file mode 120000
index b09ce3813321..000000000000
--- a/test/rules/platform_certs/cacert/a6a593ba.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-108_Digital Signature Trust Co.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/a760e1bd.0 b/test/rules/platform_certs/cacert/a760e1bd.0
deleted file mode 120000
index 4b12cf93e787..000000000000
--- a/test/rules/platform_certs/cacert/a760e1bd.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-107_Visa eCommerce Root_VISA.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/a8dee976.0 b/test/rules/platform_certs/cacert/a8dee976.0
deleted file mode 120000
index 3f091786e1ca..000000000000
--- a/test/rules/platform_certs/cacert/a8dee976.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-079_SwissSign Platinum CA - G2_SwissSign AG.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/ad088e1d.0 b/test/rules/platform_certs/cacert/ad088e1d.0
deleted file mode 120000
index f465ade2bab8..000000000000
--- a/test/rules/platform_certs/cacert/ad088e1d.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-161_GeoTrust Universal CA_GeoTrust Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/ae8153b9.0 b/test/rules/platform_certs/cacert/ae8153b9.0
deleted file mode 120000
index ddcd234bde18..000000000000
--- a/test/rules/platform_certs/cacert/ae8153b9.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-016_StartCom Certification Authority_StartCom Ltd.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/aee5f10d.0 b/test/rules/platform_certs/cacert/aee5f10d.0
deleted file mode 120000
index 660618d78682..000000000000
--- a/test/rules/platform_certs/cacert/aee5f10d.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-028_Entrust.net Certification Authority (2048)_Entrust.net.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/b1159c4c.0 b/test/rules/platform_certs/cacert/b1159c4c.0
deleted file mode 120000
index 4898ba751831..000000000000
--- a/test/rules/platform_certs/cacert/b1159c4c.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-060_DigiCert Assured ID Root CA_DigiCert Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/b13cc6df.0 b/test/rules/platform_certs/cacert/b13cc6df.0
deleted file mode 120000
index 62c5920d4e5f..000000000000
--- a/test/rules/platform_certs/cacert/b13cc6df.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-030_UTN-USERFirst-Hardware_The USERTRUST Network.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/b1b8a7f3.0 b/test/rules/platform_certs/cacert/b1b8a7f3.0
deleted file mode 120000
index 4997164fd91c..000000000000
--- a/test/rules/platform_certs/cacert/b1b8a7f3.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-081_OISTE WISeKey Global Root GA CA_WISeKey.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/b204d74a.0 b/test/rules/platform_certs/cacert/b204d74a.0
deleted file mode 120000
index 597eb47a10d0..000000000000
--- a/test/rules/platform_certs/cacert/b204d74a.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-061_VeriSign Class 3 Public Primary Certification Authority - G5_VeriSign, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/b42ff584.0 b/test/rules/platform_certs/cacert/b42ff584.0
deleted file mode 120000
index a1c3cdd36d3b..000000000000
--- a/test/rules/platform_certs/cacert/b42ff584.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-140_Staat der Nederlanden Root CA_Staat der Nederlanden.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/b66938e9.0 b/test/rules/platform_certs/cacert/b66938e9.0
deleted file mode 120000
index 8552f2e34c04..000000000000
--- a/test/rules/platform_certs/cacert/b66938e9.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-115_Secure Global CA_SecureTrust Corporation.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/b6c5745d.0 b/test/rules/platform_certs/cacert/b6c5745d.0
deleted file mode 120000
index be9b08c329fa..000000000000
--- a/test/rules/platform_certs/cacert/b6c5745d.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-048_CA Disig_Disig a.s.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/b727005e.0 b/test/rules/platform_certs/cacert/b727005e.0
deleted file mode 120000
index 9373beb805da..000000000000
--- a/test/rules/platform_certs/cacert/b727005e.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-087_AffirmTrust Premium_AffirmTrust.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/b7a5b843.0 b/test/rules/platform_certs/cacert/b7a5b843.0
deleted file mode 120000
index 4275da499297..000000000000
--- a/test/rules/platform_certs/cacert/b7a5b843.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-025_TWCA Root Certification Authority_TAIWAN-CA.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/b7e7231a.0 b/test/rules/platform_certs/cacert/b7e7231a.0
deleted file mode 120000
index 0ead3d12cb1c..000000000000
--- a/test/rules/platform_certs/cacert/b7e7231a.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-146_NetLock Uzleti (Class B) Tanusitvanykiado_NetLock Halozatbiztonsagi Kft.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/b8e83700.0 b/test/rules/platform_certs/cacert/b8e83700.0
deleted file mode 120000
index 9611fc1e75a2..000000000000
--- a/test/rules/platform_certs/cacert/b8e83700.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-085_VeriSign, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/ba89ed3b.0 b/test/rules/platform_certs/cacert/ba89ed3b.0
deleted file mode 120000
index bad483d7e47f..000000000000
--- a/test/rules/platform_certs/cacert/ba89ed3b.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-073_thawte Primary Root CA - G3_thawte, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/bad35b78.0 b/test/rules/platform_certs/cacert/bad35b78.0
deleted file mode 120000
index a9a596ed3c08..000000000000
--- a/test/rules/platform_certs/cacert/bad35b78.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-031_VeriSign Class 4 Public Primary Certification Authority - G3_VeriSign, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/bb2d49a0.0 b/test/rules/platform_certs/cacert/bb2d49a0.0
deleted file mode 120000
index d3828c88bca2..000000000000
--- a/test/rules/platform_certs/cacert/bb2d49a0.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-034_ComSign CA_ComSign.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/bd1910d4.0 b/test/rules/platform_certs/cacert/bd1910d4.0
deleted file mode 120000
index 40ddaeacd932..000000000000
--- a/test/rules/platform_certs/cacert/bd1910d4.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-015_CNNIC ROOT_CNNIC.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/c01cdfa2.0 b/test/rules/platform_certs/cacert/c01cdfa2.0
deleted file mode 120000
index 37dc434dbf18..000000000000
--- a/test/rules/platform_certs/cacert/c01cdfa2.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-156_VeriSign Universal Root Certification Authority_VeriSign, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/c089bbbd.0 b/test/rules/platform_certs/cacert/c089bbbd.0
deleted file mode 120000
index 20c0b7d05f38..000000000000
--- a/test/rules/platform_certs/cacert/c089bbbd.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-071_thawte Primary Root CA - G2_thawte, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/c0ff1f52.0 b/test/rules/platform_certs/cacert/c0ff1f52.0
deleted file mode 120000
index b28f734e7fec..000000000000
--- a/test/rules/platform_certs/cacert/c0ff1f52.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-083_VeriSign Class 3 Public Primary Certification Authority - G3_VeriSign, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/c47d9980.0 b/test/rules/platform_certs/cacert/c47d9980.0
deleted file mode 120000
index 118fa94e282a..000000000000
--- a/test/rules/platform_certs/cacert/c47d9980.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-056_Chambers of Commerce Root - 2008_AC Camerfirma S.A.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/c5e082db.0 b/test/rules/platform_certs/cacert/c5e082db.0
deleted file mode 120000
index 81b82f2ff151..000000000000
--- a/test/rules/platform_certs/cacert/c5e082db.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-052_UTN-USERFirst-Client Authentication and Email_The USERTRUST Network.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/c692a373.0 b/test/rules/platform_certs/cacert/c692a373.0
deleted file mode 120000
index 379807c53de5..000000000000
--- a/test/rules/platform_certs/cacert/c692a373.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-068_GTE CyberTrust Global Root_GTE Corporation.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/c8841d13.0 b/test/rules/platform_certs/cacert/c8841d13.0
deleted file mode 120000
index 12f2b5ac1f5a..000000000000
--- a/test/rules/platform_certs/cacert/c8841d13.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-129_TC TrustCenter Universal CA I_TC TrustCenter GmbH.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/c99398f3.0 b/test/rules/platform_certs/cacert/c99398f3.0
deleted file mode 120000
index 4eba0b514e2c..000000000000
--- a/test/rules/platform_certs/cacert/c99398f3.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-170_RSA Security Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/c9f83a1c.0 b/test/rules/platform_certs/cacert/c9f83a1c.0
deleted file mode 120000
index da46cca2d791..000000000000
--- a/test/rules/platform_certs/cacert/c9f83a1c.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-042_Secure Certificate Services_Comodo CA Limited.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/ca6e4ad9.0 b/test/rules/platform_certs/cacert/ca6e4ad9.0
deleted file mode 120000
index 393ccb56cdf2..000000000000
--- a/test/rules/platform_certs/cacert/ca6e4ad9.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-090_Chunghwa Telecom Co., Ltd.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/cacert1.pem b/test/rules/platform_certs/cacert/cacert1.pem
deleted file mode 100644
index e7dfc82947e3..000000000000
--- a/test/rules/platform_certs/cacert/cacert1.pem
+++ /dev/null
@@ -1,41 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIHPTCCBSWgAwIBAgIBADANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290
-IENBMR4wHAYDVQQLExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNB
-IENlcnQgU2lnbmluZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRA
-Y2FjZXJ0Lm9yZzAeFw0wMzAzMzAxMjI5NDlaFw0zMzAzMjkxMjI5NDlaMHkxEDAO
-BgNVBAoTB1Jvb3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEi
-MCAGA1UEAxMZQ0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJ
-ARYSc3VwcG9ydEBjYWNlcnQub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
-CgKCAgEAziLA4kZ97DYoB1CW8qAzQIxL8TtmPzHlawI229Z89vGIj053NgVBlfkJ
-8BLPRoZzYLdufujAWGSuzbCtRRcMY/pnCujW0r8+55jE8Ez64AO7NV1sId6eINm6
-zWYyN3L69wj1x81YyY7nDl7qPv4coRQKFWyGhFtkZip6qUtTefWIonvuLwphK42y
-fk1WpRPs6tqSnqxEQR5YYGUFZvjARL3LlPdCfgv3ZWiYUQXw8wWRBB0bF4LsyFe7
-w2t6iPGwcswlWyCR7BYCEo8y6RcYSNDHBS4CMEK4JZwFaz+qOqfrU0j36NK2B5jc
-G8Y0f3/JHIJ6BVgrCFvzOKKrF11myZjXnhCLotLddJr3cQxyYN/Nb5gznZY0dj4k
-epKwDpUeb+agRThHqtdB7Uq3EvbXG4OKDy7YCbZZ16oE/9KTfWgu3YtLq1i6L43q
-laegw1SJpfvbi1EinbLDvhG+LJGGi5Z4rSDTii8aP8bQUWWHIbEZAWV/RRyH9XzQ
-QUxPKZgh/TMfdQwEUfoZd9vUFBzugcMd9Zi3aQaRIt0AUMyBMawSB3s42mhb5ivU
-fslfrejrckzzAeVLIL+aplfKkQABi6F1ITe1Yw1nPkZPcCBnzsXWWdsC4PDSy826
-YreQQejdIOQpvGQpQsgi3Hia/0PsmBsJUUtaWsJx8cTLc6nloQsCAwEAAaOCAc4w
-ggHKMB0GA1UdDgQWBBQWtTIb1Mfz4OaO873SsDrusjkY0TCBowYDVR0jBIGbMIGY
-gBQWtTIb1Mfz4OaO873SsDrusjkY0aF9pHsweTEQMA4GA1UEChMHUm9vdCBDQTEe
-MBwGA1UECxMVaHR0cDovL3d3dy5jYWNlcnQub3JnMSIwIAYDVQQDExlDQSBDZXJ0
-IFNpZ25pbmcgQXV0aG9yaXR5MSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGNhY2Vy
-dC5vcmeCAQAwDwYDVR0TAQH/BAUwAwEB/zAyBgNVHR8EKzApMCegJaAjhiFodHRw
-czovL3d3dy5jYWNlcnQub3JnL3Jldm9rZS5jcmwwMAYJYIZIAYb4QgEEBCMWIWh0
-dHBzOi8vd3d3LmNhY2VydC5vcmcvcmV2b2tlLmNybDA0BglghkgBhvhCAQgEJxYl
-aHR0cDovL3d3dy5jYWNlcnQub3JnL2luZGV4LnBocD9pZD0xMDBWBglghkgBhvhC
-AQ0ESRZHVG8gZ2V0IHlvdXIgb3duIGNlcnRpZmljYXRlIGZvciBGUkVFIGhlYWQg
-b3ZlciB0byBodHRwOi8vd3d3LmNhY2VydC5vcmcwDQYJKoZIhvcNAQEEBQADggIB
-ACjH7pyCArpcgBLKNQodgW+JapnM8mgPf6fhjViVPr3yBsOQWqy1YPaZQwGjiHCc
-nWKdpIevZ1gNMDY75q1I08t0AoZxPuIrA2jxNGJARjtT6ij0rPtmlVOKTV39O9lg
-18p5aTuxZZKmxoGCXJzN600BiqXfEVWqFcofN8CCmHBh22p8lqOOLlQ+TyGpkO/c
-gr/c6EWtTZBzCDyUZbAEmXZ/4rzCahWqlwQ3JNgelE5tDlG+1sSPypZt90Pf6DBl
-Jzt7u0NDY8RD97LsaMzhGY4i+5jhe1o+ATc7iwiwovOVThrLm82asduycPAtStvY
-sONvRUgzEv/+PDIqVPfE94rwiCPCR/5kenHA0R6mY7AHfqQv0wGP3J8rtsYIqQ+T
-SCX8Ev2fQtzzxD72V7DX3WnRBnc0CkvSyqD/HMaMyRa+xMwyN2hzXwj7UfdJUzYF
-CpUCTPJ5GhD22Dp1nPMd8aINcGeGG7MW9S/lpOt5hvk9C8JzC6WZrG/8Z7jlLwum
-GCSNe9FINSkYQKyTYOGWhlC0elnYjyELn8+CkcY7v2vcB5G5l1YjqrZslMZIBjzk
-zk6q5PYvCdxTby78dOs6Y5nCpqyJvKeyRKANihDjbPIky/qbn3BHLt4Ui9SyIAmW
-omTxJBzcoTWcFbLUvFUufQb1nA5V9FrWk9p2rSVzTMVD
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/cacert2.pem b/test/rules/platform_certs/cacert/cacert2.pem
deleted file mode 100644
index 35e2689d98ff..000000000000
--- a/test/rules/platform_certs/cacert/cacert2.pem
+++ /dev/null
@@ -1,35 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIGCDCCA/CgAwIBAgIBATANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290
-IENBMR4wHAYDVQQLExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNB
-IENlcnQgU2lnbmluZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRA
-Y2FjZXJ0Lm9yZzAeFw0wNTEwMTQwNzM2NTVaFw0zMzAzMjgwNzM2NTVaMFQxFDAS
-BgNVBAoTC0NBY2VydCBJbmMuMR4wHAYDVQQLExVodHRwOi8vd3d3LkNBY2VydC5v
-cmcxHDAaBgNVBAMTE0NBY2VydCBDbGFzcyAzIFJvb3QwggIiMA0GCSqGSIb3DQEB
-AQUAA4ICDwAwggIKAoICAQCrSTURSHzSJn5TlM9Dqd0o10Iqi/OHeBlYfA+e2ol9
-4fvrcpANdKGWZKufoCSZc9riVXbHF3v1BKxGuMO+f2SNEGwk82GcwPKQ+lHm9WkB
-Y8MPVuJKQs/iRIwlKKjFeQl9RrmK8+nzNCkIReQcn8uUBByBqBSzmGXEQ+xOgo0J
-0b2qW42S0OzekMV/CsLj6+YxWl50PpczWejDAz1gM7/30W9HxM3uYoNSbi4ImqTZ
-FRiRpoWSR7CuSOtttyHshRpocjWr//AQXcD0lKdq1TuSfkyQBX6TwSyLpI5idBVx
-bgtxA+qvFTia1NIFcm+M+SvrWnIl+TlG43IbPgTDZCciECqKT1inA62+tC4T7V2q
-SNfVfdQqe1z6RgRQ5MwOQluM7dvyz/yWk+DbETZUYjQ4jwxgmzuXVjit89Jbi6Bb
-6k6WuHzX1aCGcEDTkSm3ojyt9Yy7zxqSiuQ0e8DYbF/pCsLDpyCaWt8sXVJcukfV
-m+8kKHA4IC/VfynAskEDaJLM4JzMl0tF7zoQCqtwOpiVcK01seqFK6QcgCExqa5g
-eoAmSAC4AcCTY1UikTxW56/bOiXzjzFU6iaLgVn5odFTEcV7nQP2dBHgbbEsPyyG
-kZlxmqZ3izRg0RS0LKydr4wQ05/EavhvE/xzWfdmQnQeiuP43NJvmJzLR5iVQAX7
-6QIDAQABo4G/MIG8MA8GA1UdEwEB/wQFMAMBAf8wXQYIKwYBBQUHAQEEUTBPMCMG
-CCsGAQUFBzABhhdodHRwOi8vb2NzcC5DQWNlcnQub3JnLzAoBggrBgEFBQcwAoYc
-aHR0cDovL3d3dy5DQWNlcnQub3JnL2NhLmNydDBKBgNVHSAEQzBBMD8GCCsGAQQB
-gZBKMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuQ0FjZXJ0Lm9yZy9pbmRleC5w
-aHA/aWQ9MTAwDQYJKoZIhvcNAQEEBQADggIBAH8IiKHaGlBJ2on7oQhy84r3HsQ6
-tHlbIDCxRd7CXdNlafHCXVRUPIVfuXtCkcKZ/RtRm6tGpaEQU55tiKxzbiwzpvD0
-nuB1wT6IRanhZkP+VlrRekF490DaSjrxC1uluxYG5sLnk7mFTZdPsR44Q4Dvmw2M
-77inYACHV30eRBzLI++bPJmdr7UpHEV5FpZNJ23xHGzDwlVks7wU4vOkHx4y/CcV
-Bc/dLq4+gmF78CEQGPZE6lM5+dzQmiDgxrvgu1pPxJnIB721vaLbLmINQjRBvP+L
-ivVRIqqIMADisNS8vmW61QNXeZvo3MhN+FDtkaVSKKKs+zZYPumUK5FQhxvWXtaM
-zPcPEAxSTtAWYeXlCmy/F8dyRlecmPVsYGN6b165Ti/Iubm7aoW8mA3t+T6XhDSU
-rgCvoeXnkm5OvfPi2RSLXNLrAWygF6UtEOucekq9ve7O/e0iQKtwOIj1CodqwqsF
-YMlIBdpTwd5Ed2qz8zw87YC8pjhKKSRf/lk7myV6VmMAZLldpGJ9VzZPrYPvH5JT
-oI53V93lYRE9IwCQTDz6o2CTBKOvNfYOao9PSmCnhQVsRqGP9Md246FZV/dxssRu
-FFxtbUFm3xuTsdQAw+7Lzzw9IYCpX2Nl/N3gX6T0K/CFcUHUZyX7GrGXrtaZghNB
-0m6lG5kngOcLqagA
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/cacert3.pem b/test/rules/platform_certs/cacert/cacert3.pem
deleted file mode 100644
index 087ca0e52a57..000000000000
--- a/test/rules/platform_certs/cacert/cacert3.pem
+++ /dev/null
@@ -1,42 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIHWTCCBUGgAwIBAgIDCkGKMA0GCSqGSIb3DQEBCwUAMHkxEDAOBgNVBAoTB1Jv
-b3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEiMCAGA1UEAxMZ
-Q0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYSc3VwcG9y
-dEBjYWNlcnQub3JnMB4XDTExMDUyMzE3NDgwMloXDTIxMDUyMDE3NDgwMlowVDEU
-MBIGA1UEChMLQ0FjZXJ0IEluYy4xHjAcBgNVBAsTFWh0dHA6Ly93d3cuQ0FjZXJ0
-Lm9yZzEcMBoGA1UEAxMTQ0FjZXJ0IENsYXNzIDMgUm9vdDCCAiIwDQYJKoZIhvcN
-AQEBBQADggIPADCCAgoCggIBAKtJNRFIfNImflOUz0Op3SjXQiqL84d4GVh8D57a
-iX3h++tykA10oZZkq5+gJJlz2uJVdscXe/UErEa4w75/ZI0QbCTzYZzA8pD6Ueb1
-aQFjww9W4kpCz+JEjCUoqMV5CX1GuYrz6fM0KQhF5Byfy5QEHIGoFLOYZcRD7E6C
-jQnRvapbjZLQ7N6QxX8KwuPr5jFaXnQ+lzNZ6MMDPWAzv/fRb0fEze5ig1JuLgia
-pNkVGJGmhZJHsK5I6223IeyFGmhyNav/8BBdwPSUp2rVO5J+TJAFfpPBLIukjmJ0
-FXFuC3ED6q8VOJrU0gVyb4z5K+taciX5OUbjchs+BMNkJyIQKopPWKcDrb60LhPt
-XapI19V91Cp7XPpGBFDkzA5CW4zt2/LP/JaT4NsRNlRiNDiPDGCbO5dWOK3z0luL
-oFvqTpa4fNfVoIZwQNORKbeiPK31jLvPGpKK5DR7wNhsX+kKwsOnIJpa3yxdUly6
-R9Wb7yQocDggL9V/KcCyQQNokszgnMyXS0XvOhAKq3A6mJVwrTWx6oUrpByAITGp
-rmB6gCZIALgBwJNjVSKRPFbnr9s6JfOPMVTqJouBWfmh0VMRxXudA/Z0EeBtsSw/
-LIaRmXGapneLNGDRFLQsrJ2vjBDTn8Rq+G8T/HNZ92ZCdB6K4/jc0m+YnMtHmJVA
-BfvpAgMBAAGjggINMIICCTAdBgNVHQ4EFgQUdahxYEyIE/B42Yl3tW3Fid+8sXow
-gaMGA1UdIwSBmzCBmIAUFrUyG9TH8+DmjvO90rA67rI5GNGhfaR7MHkxEDAOBgNV
-BAoTB1Jvb3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEiMCAG
-A1UEAxMZQ0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYS
-c3VwcG9ydEBjYWNlcnQub3JnggEAMA8GA1UdEwEB/wQFMAMBAf8wXQYIKwYBBQUH
-AQEEUTBPMCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5DQWNlcnQub3JnLzAoBggr
-BgEFBQcwAoYcaHR0cDovL3d3dy5DQWNlcnQub3JnL2NhLmNydDBKBgNVHSAEQzBB
-MD8GCCsGAQQBgZBKMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuQ0FjZXJ0Lm9y
-Zy9pbmRleC5waHA/aWQ9MTAwNAYJYIZIAYb4QgEIBCcWJWh0dHA6Ly93d3cuQ0Fj
-ZXJ0Lm9yZy9pbmRleC5waHA/aWQ9MTAwUAYJYIZIAYb4QgENBEMWQVRvIGdldCB5
-b3VyIG93biBjZXJ0aWZpY2F0ZSBmb3IgRlJFRSwgZ28gdG8gaHR0cDovL3d3dy5D
-QWNlcnQub3JnMA0GCSqGSIb3DQEBCwUAA4ICAQApKIWuRKm5r6R5E/CooyuXYPNc
-7uMvwfbiZqARrjY3OnYVBFPqQvX56sAV2KaC2eRhrnILKVyQQ+hBsuF32wITRHhH
-Va9Y/MyY9kW50SD42CEH/m2qc9SzxgfpCYXMO/K2viwcJdVxjDm1Luq+GIG6sJO4
-D+Pm1yaMMVpyA4RS5qb1MyJFCsgLDYq4Nm+QCaGrvdfVTi5xotSu+qdUK+s1jVq3
-VIgv7nSf7UgWyg1I0JTTrKSi9iTfkuO960NAkW4cGI5WtIIS86mTn9S8nK2cde5a
-lxuV53QtHA+wLJef+6kzOXrnAzqSjiL2jA3k2X4Ndhj3AfnvlpaiVXPAPHG0HRpW
-Q7fDCo1y/OIQCQtBzoyUoPkD/XFzS4pXM+WOdH4VAQDmzEoc53+VGS3FpQyLu7Xt
-hbNc09+4ufLKxw0BFKxwWMWMjTPUnWajGlCVI/xI4AZDEtnNp4Y5LzZyo4AQ5OHz
-0ctbGsDkgJp8E3MGT9ujayQKurMcvEp4u+XjdTilSKeiHq921F73OIZWWonO1sOn
-ebJSoMbxhbQljPI/lrMQ2Y1sVzufb4Y6GIIiNsiwkTjbKqGTqoQ/9SdlrnPVyNXT
-d+pLncdBu8fA46A/5H2kjXPmEkvfoXNzczqA6NXLji/L6hOn1kGLrPo8idck9U60
-4GGSt/M3mMS+lqO3ig==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/cacert/cb357862.0 b/test/rules/platform_certs/cacert/cb357862.0
deleted file mode 120000
index a8d81fb13be4..000000000000
--- a/test/rules/platform_certs/cacert/cb357862.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-139_VeriSign, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/cb59f961.0 b/test/rules/platform_certs/cacert/cb59f961.0
deleted file mode 120000
index 77c468093ddd..000000000000
--- a/test/rules/platform_certs/cacert/cb59f961.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-172_Global Chambersign Root_AC Camerfirma SA CIF A82743287.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/cbeee9e2.0 b/test/rules/platform_certs/cacert/cbeee9e2.0
deleted file mode 120000
index a0b90c3e57c2..000000000000
--- a/test/rules/platform_certs/cacert/cbeee9e2.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-022_GeoTrust Global CA 2_GeoTrust Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/cbf06781.0 b/test/rules/platform_certs/cacert/cbf06781.0
deleted file mode 120000
index 98eac305753c..000000000000
--- a/test/rules/platform_certs/cacert/cbf06781.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-110_Go Daddy Root Certificate Authority - G2_GoDaddy.com, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/cc154c6e.0 b/test/rules/platform_certs/cacert/cc154c6e.0
deleted file mode 120000
index 5ad715366f5f..000000000000
--- a/test/rules/platform_certs/cacert/cc154c6e.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-077_DigiNotar Cyber CA_DigiNotar.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/cc450945.0 b/test/rules/platform_certs/cacert/cc450945.0
deleted file mode 120000
index 8c73f5c95447..000000000000
--- a/test/rules/platform_certs/cacert/cc450945.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-114_Izenpe.com_IZENPE S.A.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/cd58d51e.0 b/test/rules/platform_certs/cacert/cd58d51e.0
deleted file mode 120000
index 2dab0be63664..000000000000
--- a/test/rules/platform_certs/cacert/cd58d51e.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-043_SECOM Trust Systems CO.,LTD.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/ce026bf8.0 b/test/rules/platform_certs/cacert/ce026bf8.0
deleted file mode 120000
index 0d6f0008adf7..000000000000
--- a/test/rules/platform_certs/cacert/ce026bf8.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-124_Autoridad de Certificacion Firmaprofesional CIF A62634068.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/ce486240.0 b/test/rules/platform_certs/cacert/ce486240.0
deleted file mode 120000
index 68000e43de5e..000000000000
--- a/test/rules/platform_certs/cacert/ce486240.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-072_Digisign Server ID (Enrich)_Digicert Sdn. Bhd.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/cfa1c2ee.0 b/test/rules/platform_certs/cacert/cfa1c2ee.0
deleted file mode 120000
index f7580a2b9943..000000000000
--- a/test/rules/platform_certs/cacert/cfa1c2ee.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-154_Buypass Class 2 CA 1_Buypass AS-983163327.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/d7e8dc79.0 b/test/rules/platform_certs/cacert/d7e8dc79.0
deleted file mode 120000
index 31e488f9ffc1..000000000000
--- a/test/rules/platform_certs/cacert/d7e8dc79.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-120_QuoVadis Root CA 2_QuoVadis Limited.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/d957f522.0 b/test/rules/platform_certs/cacert/d957f522.0
deleted file mode 120000
index c7e5a91b8c6f..000000000000
--- a/test/rules/platform_certs/cacert/d957f522.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-020_Certinomis - Autorité Racine_Certinomis.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/d9d12c58.0 b/test/rules/platform_certs/cacert/d9d12c58.0
deleted file mode 120000
index 8957f8a75670..000000000000
--- a/test/rules/platform_certs/cacert/d9d12c58.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-128_NetLock Kozjegyzoi (Class A) Tanusitvanykiado_NetLock Halozatbiztonsagi Kft.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/dc45b0bd.0 b/test/rules/platform_certs/cacert/dc45b0bd.0
deleted file mode 120000
index 770d1522a6ed..000000000000
--- a/test/rules/platform_certs/cacert/dc45b0bd.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-119_VeriSign Class 2 Public Primary Certification Authority - G3_VeriSign, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/e113c810.0 b/test/rules/platform_certs/cacert/e113c810.0
deleted file mode 120000
index 97fc3fc5832f..000000000000
--- a/test/rules/platform_certs/cacert/e113c810.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-017_Certigna_Dhimyotis.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/e2799e36.0 b/test/rules/platform_certs/cacert/e2799e36.0
deleted file mode 120000
index f64f16e9d909..000000000000
--- a/test/rules/platform_certs/cacert/e2799e36.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-122_GeoTrust Primary Certification Authority - G3_GeoTrust Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/e536d871.0 b/test/rules/platform_certs/cacert/e536d871.0
deleted file mode 120000
index 28f802a30e37..000000000000
--- a/test/rules/platform_certs/cacert/e536d871.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-101_AddTrust Qualified CA Root_AddTrust AB.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/eacdeb40.0 b/test/rules/platform_certs/cacert/eacdeb40.0
deleted file mode 120000
index 21beaeb05c08..000000000000
--- a/test/rules/platform_certs/cacert/eacdeb40.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-067_America Online Root Certification Authority 1_America Online Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/ed574ed8.0 b/test/rules/platform_certs/cacert/ed574ed8.0
deleted file mode 120000
index afa9c5acc74f..000000000000
--- a/test/rules/platform_certs/cacert/ed574ed8.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-004_Entrust Certification Authority - L1C_Entrust, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/ee1365c0.0 b/test/rules/platform_certs/cacert/ee1365c0.0
deleted file mode 120000
index c6ffe7666db1..000000000000
--- a/test/rules/platform_certs/cacert/ee1365c0.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-133_VeriSign Class 1 Public Primary Certification Authority - G3_VeriSign, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/ee64a828.0 b/test/rules/platform_certs/cacert/ee64a828.0
deleted file mode 120000
index 8b3f1d983298..000000000000
--- a/test/rules/platform_certs/cacert/ee64a828.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-111_AAA Certificate Services_Comodo CA Limited.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/eed8c118.0 b/test/rules/platform_certs/cacert/eed8c118.0
deleted file mode 120000
index 68bd7005bb3b..000000000000
--- a/test/rules/platform_certs/cacert/eed8c118.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-044_COMODO ECC Certification Authority_COMODO CA Limited.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/ef2f636c.0 b/test/rules/platform_certs/cacert/ef2f636c.0
deleted file mode 120000
index ed146d06a5e2..000000000000
--- a/test/rules/platform_certs/cacert/ef2f636c.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-070_Equifax Secure Global eBusiness CA-1_Equifax Secure Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/f060240e.0 b/test/rules/platform_certs/cacert/f060240e.0
deleted file mode 120000
index de569bca3364..000000000000
--- a/test/rules/platform_certs/cacert/f060240e.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-099_Class 2 Primary CA_Certplus.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/f081611a.0 b/test/rules/platform_certs/cacert/f081611a.0
deleted file mode 120000
index 3ede621d5068..000000000000
--- a/test/rules/platform_certs/cacert/f081611a.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-167_The Go Daddy Group, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/f3377b1b.0 b/test/rules/platform_certs/cacert/f3377b1b.0
deleted file mode 120000
index b34cb450d721..000000000000
--- a/test/rules/platform_certs/cacert/f3377b1b.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-118_SECOM Trust.net.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/f387163d.0 b/test/rules/platform_certs/cacert/f387163d.0
deleted file mode 120000
index 03e95784f6f2..000000000000
--- a/test/rules/platform_certs/cacert/f387163d.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-142_Starfield Technologies, Inc.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/f39fc864.0 b/test/rules/platform_certs/cacert/f39fc864.0
deleted file mode 120000
index 6bbbda5876bd..000000000000
--- a/test/rules/platform_certs/cacert/f39fc864.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-160_SecureTrust CA_SecureTrust Corporation.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/f90208f7.0 b/test/rules/platform_certs/cacert/f90208f7.0
deleted file mode 120000
index 9ff02fb9ffb0..000000000000
--- a/test/rules/platform_certs/cacert/f90208f7.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-093_Chambers of Commerce Root_AC Camerfirma SA CIF A82743287.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/cacert/fcac10e3.0 b/test/rules/platform_certs/cacert/fcac10e3.0
deleted file mode 120000
index 37f148aa5a28..000000000000
--- a/test/rules/platform_certs/cacert/fcac10e3.0
+++ /dev/null
@@ -1 +0,0 @@
-Cert-011_Juur-SK_AS Sertifitseerimiskeskus.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/chromium b/test/rules/platform_certs/chromium
deleted file mode 120000
index 331d858ce9b1..000000000000
--- a/test/rules/platform_certs/chromium
+++ /dev/null
@@ -1 +0,0 @@
-default
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/00673b5b.0 b/test/rules/platform_certs/default/00673b5b.0
new file mode 120000
index 000000000000..302405f29057
--- /dev/null
+++ b/test/rules/platform_certs/default/00673b5b.0
@@ -0,0 +1 @@
+cert028.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/02265526.0 b/test/rules/platform_certs/default/02265526.0
new file mode 120000
index 000000000000..62f8be0348c9
--- /dev/null
+++ b/test/rules/platform_certs/default/02265526.0
@@ -0,0 +1 @@
+cert100.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/03179a64.0 b/test/rules/platform_certs/default/03179a64.0
new file mode 120000
index 000000000000..fecfe84b3ea3
--- /dev/null
+++ b/test/rules/platform_certs/default/03179a64.0
@@ -0,0 +1 @@
+cert097.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/04f60c28.0 b/test/rules/platform_certs/default/04f60c28.0
new file mode 120000
index 000000000000..fe8b7f684bf0
--- /dev/null
+++ b/test/rules/platform_certs/default/04f60c28.0
@@ -0,0 +1 @@
+cert093.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/062cdee6.0 b/test/rules/platform_certs/default/062cdee6.0
new file mode 120000
index 000000000000..07df9b5eca3e
--- /dev/null
+++ b/test/rules/platform_certs/default/062cdee6.0
@@ -0,0 +1 @@
+cert051.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/064e0aa9.0 b/test/rules/platform_certs/default/064e0aa9.0
new file mode 120000
index 000000000000..b81347e699c8
--- /dev/null
+++ b/test/rules/platform_certs/default/064e0aa9.0
@@ -0,0 +1 @@
+cert084.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/06dc52d5.0 b/test/rules/platform_certs/default/06dc52d5.0
new file mode 120000
index 000000000000..d358a74650d5
--- /dev/null
+++ b/test/rules/platform_certs/default/06dc52d5.0
@@ -0,0 +1 @@
+cert122.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/080911ac.0 b/test/rules/platform_certs/default/080911ac.0
new file mode 120000
index 000000000000..d752b5b008b5
--- /dev/null
+++ b/test/rules/platform_certs/default/080911ac.0
@@ -0,0 +1 @@
+cert012.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/09789157.0 b/test/rules/platform_certs/default/09789157.0
new file mode 120000
index 000000000000..0413f9be7825
--- /dev/null
+++ b/test/rules/platform_certs/default/09789157.0
@@ -0,0 +1 @@
+cert058.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/0a775a30.0 b/test/rules/platform_certs/default/0a775a30.0
new file mode 120000
index 000000000000..158192fc7dde
--- /dev/null
+++ b/test/rules/platform_certs/default/0a775a30.0
@@ -0,0 +1 @@
+cert128.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/0b1b94ef.0 b/test/rules/platform_certs/default/0b1b94ef.0
new file mode 120000
index 000000000000..92d55d0abb91
--- /dev/null
+++ b/test/rules/platform_certs/default/0b1b94ef.0
@@ -0,0 +1 @@
+cert102.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/0bf05006.0 b/test/rules/platform_certs/default/0bf05006.0
new file mode 120000
index 000000000000..fbeb5ff12554
--- /dev/null
+++ b/test/rules/platform_certs/default/0bf05006.0
@@ -0,0 +1 @@
+cert121.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/0c4c9b6c.0 b/test/rules/platform_certs/default/0c4c9b6c.0
new file mode 120000
index 000000000000..426310756475
--- /dev/null
+++ b/test/rules/platform_certs/default/0c4c9b6c.0
@@ -0,0 +1 @@
+cert055.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/0d69c7e1.0 b/test/rules/platform_certs/default/0d69c7e1.0
new file mode 120000
index 000000000000..6d6bdec5e46b
--- /dev/null
+++ b/test/rules/platform_certs/default/0d69c7e1.0
@@ -0,0 +1 @@
+cert094.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/0f5dc4f3.0 b/test/rules/platform_certs/default/0f5dc4f3.0
new file mode 120000
index 000000000000..68fd619a62a8
--- /dev/null
+++ b/test/rules/platform_certs/default/0f5dc4f3.0
@@ -0,0 +1 @@
+cert131.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/0f6fa695.0 b/test/rules/platform_certs/default/0f6fa695.0
new file mode 120000
index 000000000000..dc215b21fff3
--- /dev/null
+++ b/test/rules/platform_certs/default/0f6fa695.0
@@ -0,0 +1 @@
+cert116.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/1001acf7.0 b/test/rules/platform_certs/default/1001acf7.0
new file mode 120000
index 000000000000..4cb45c9ec0e0
--- /dev/null
+++ b/test/rules/platform_certs/default/1001acf7.0
@@ -0,0 +1 @@
+cert126.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/10531352.0 b/test/rules/platform_certs/default/10531352.0
new file mode 120000
index 000000000000..0413f9be7825
--- /dev/null
+++ b/test/rules/platform_certs/default/10531352.0
@@ -0,0 +1 @@
+cert058.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/106f3e4d.0 b/test/rules/platform_certs/default/106f3e4d.0
new file mode 120000
index 000000000000..ecbee746f069
--- /dev/null
+++ b/test/rules/platform_certs/default/106f3e4d.0
@@ -0,0 +1 @@
+cert101.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/111e6273.0 b/test/rules/platform_certs/default/111e6273.0
new file mode 120000
index 000000000000..97e8273eff0f
--- /dev/null
+++ b/test/rules/platform_certs/default/111e6273.0
@@ -0,0 +1 @@
+cert002.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/116bf586.0 b/test/rules/platform_certs/default/116bf586.0
new file mode 120000
index 000000000000..cf064caaea2f
--- /dev/null
+++ b/test/rules/platform_certs/default/116bf586.0
@@ -0,0 +1 @@
+cert043.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/128805a3.0 b/test/rules/platform_certs/default/128805a3.0
new file mode 120000
index 000000000000..3cae6c5e8d73
--- /dev/null
+++ b/test/rules/platform_certs/default/128805a3.0
@@ -0,0 +1 @@
+cert073.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/12d55845.0 b/test/rules/platform_certs/default/12d55845.0
new file mode 120000
index 000000000000..bae4f779ba1e
--- /dev/null
+++ b/test/rules/platform_certs/default/12d55845.0
@@ -0,0 +1 @@
+cert024.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/14bc7599.0 b/test/rules/platform_certs/default/14bc7599.0
new file mode 120000
index 000000000000..ac3fdcd6aae6
--- /dev/null
+++ b/test/rules/platform_certs/default/14bc7599.0
@@ -0,0 +1 @@
+cert134.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/157753a5.0 b/test/rules/platform_certs/default/157753a5.0
new file mode 120000
index 000000000000..62d8c8df6ceb
--- /dev/null
+++ b/test/rules/platform_certs/default/157753a5.0
@@ -0,0 +1 @@
+cert006.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/1636090b.0 b/test/rules/platform_certs/default/1636090b.0
new file mode 120000
index 000000000000..fd0b85b2c438
--- /dev/null
+++ b/test/rules/platform_certs/default/1636090b.0
@@ -0,0 +1 @@
+cert067.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/18856ac4.0 b/test/rules/platform_certs/default/18856ac4.0
new file mode 120000
index 000000000000..a569193e45b9
--- /dev/null
+++ b/test/rules/platform_certs/default/18856ac4.0
@@ -0,0 +1 @@
+cert049.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/1d3472b9.0 b/test/rules/platform_certs/default/1d3472b9.0
new file mode 120000
index 000000000000..8e9e075e0404
--- /dev/null
+++ b/test/rules/platform_certs/default/1d3472b9.0
@@ -0,0 +1 @@
+cert095.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/1dcd6f4c.0 b/test/rules/platform_certs/default/1dcd6f4c.0
new file mode 120000
index 000000000000..73fc246f6c27
--- /dev/null
+++ b/test/rules/platform_certs/default/1dcd6f4c.0
@@ -0,0 +1 @@
+cert020.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/1df5a75f.0 b/test/rules/platform_certs/default/1df5a75f.0
new file mode 120000
index 000000000000..924725c67632
--- /dev/null
+++ b/test/rules/platform_certs/default/1df5a75f.0
@@ -0,0 +1 @@
+cert074.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/1e08bfd1.0 b/test/rules/platform_certs/default/1e08bfd1.0
new file mode 120000
index 000000000000..14cb25329686
--- /dev/null
+++ b/test/rules/platform_certs/default/1e08bfd1.0
@@ -0,0 +1 @@
+cert099.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/1e09d511.0 b/test/rules/platform_certs/default/1e09d511.0
new file mode 120000
index 000000000000..68c876e8ea1b
--- /dev/null
+++ b/test/rules/platform_certs/default/1e09d511.0
@@ -0,0 +1 @@
+cert081.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/1e1eab7c.0 b/test/rules/platform_certs/default/1e1eab7c.0
new file mode 120000
index 000000000000..590f09763ca0
--- /dev/null
+++ b/test/rules/platform_certs/default/1e1eab7c.0
@@ -0,0 +1 @@
+cert072.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/1e8e7201.0 b/test/rules/platform_certs/default/1e8e7201.0
new file mode 120000
index 000000000000..07df9b5eca3e
--- /dev/null
+++ b/test/rules/platform_certs/default/1e8e7201.0
@@ -0,0 +1 @@
+cert051.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/1eb37bdf.0 b/test/rules/platform_certs/default/1eb37bdf.0
new file mode 120000
index 000000000000..14745ca2234d
--- /dev/null
+++ b/test/rules/platform_certs/default/1eb37bdf.0
@@ -0,0 +1 @@
+cert054.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/1f58a078.0 b/test/rules/platform_certs/default/1f58a078.0
new file mode 120000
index 000000000000..b81347e699c8
--- /dev/null
+++ b/test/rules/platform_certs/default/1f58a078.0
@@ -0,0 +1 @@
+cert084.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/219d9499.0 b/test/rules/platform_certs/default/219d9499.0
new file mode 120000
index 000000000000..a5914a9ae27a
--- /dev/null
+++ b/test/rules/platform_certs/default/219d9499.0
@@ -0,0 +1 @@
+cert018.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/23f4c490.0 b/test/rules/platform_certs/default/23f4c490.0
new file mode 120000
index 000000000000..6d3afc9f7b75
--- /dev/null
+++ b/test/rules/platform_certs/default/23f4c490.0
@@ -0,0 +1 @@
+cert019.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/244b5494.0 b/test/rules/platform_certs/default/244b5494.0
new file mode 120000
index 000000000000..5ba8f65d5e5e
--- /dev/null
+++ b/test/rules/platform_certs/default/244b5494.0
@@ -0,0 +1 @@
+cert023.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/27af790d.0 b/test/rules/platform_certs/default/27af790d.0
new file mode 120000
index 000000000000..cf064caaea2f
--- /dev/null
+++ b/test/rules/platform_certs/default/27af790d.0
@@ -0,0 +1 @@
+cert043.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/2923b3f9.0 b/test/rules/platform_certs/default/2923b3f9.0
new file mode 120000
index 000000000000..fe08ce674247
--- /dev/null
+++ b/test/rules/platform_certs/default/2923b3f9.0
@@ -0,0 +1 @@
+cert133.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/2add47b6.0 b/test/rules/platform_certs/default/2add47b6.0
new file mode 120000
index 000000000000..8e9e075e0404
--- /dev/null
+++ b/test/rules/platform_certs/default/2add47b6.0
@@ -0,0 +1 @@
+cert095.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/2ae6433e.0 b/test/rules/platform_certs/default/2ae6433e.0
new file mode 120000
index 000000000000..dcfdea4695e9
--- /dev/null
+++ b/test/rules/platform_certs/default/2ae6433e.0
@@ -0,0 +1 @@
+cert076.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/2b349938.0 b/test/rules/platform_certs/default/2b349938.0
new file mode 120000
index 000000000000..fa7fca3f2ea3
--- /dev/null
+++ b/test/rules/platform_certs/default/2b349938.0
@@ -0,0 +1 @@
+cert059.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/2c543cd1.0 b/test/rules/platform_certs/default/2c543cd1.0
new file mode 120000
index 000000000000..7cabe938c30a
--- /dev/null
+++ b/test/rules/platform_certs/default/2c543cd1.0
@@ -0,0 +1 @@
+cert008.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/2d9dafe4.0 b/test/rules/platform_certs/default/2d9dafe4.0
new file mode 120000
index 000000000000..234aa2b2c2cc
--- /dev/null
+++ b/test/rules/platform_certs/default/2d9dafe4.0
@@ -0,0 +1 @@
+cert071.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/2e4eed3c.0 b/test/rules/platform_certs/default/2e4eed3c.0
new file mode 120000
index 000000000000..302405f29057
--- /dev/null
+++ b/test/rules/platform_certs/default/2e4eed3c.0
@@ -0,0 +1 @@
+cert028.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/2e5ac55d.0 b/test/rules/platform_certs/default/2e5ac55d.0
new file mode 120000
index 000000000000..bae4f779ba1e
--- /dev/null
+++ b/test/rules/platform_certs/default/2e5ac55d.0
@@ -0,0 +1 @@
+cert024.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/2fa87019.0 b/test/rules/platform_certs/default/2fa87019.0
new file mode 120000
index 000000000000..2089bf3e0005
--- /dev/null
+++ b/test/rules/platform_certs/default/2fa87019.0
@@ -0,0 +1 @@
+cert033.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/302904dd.0 b/test/rules/platform_certs/default/302904dd.0
new file mode 120000
index 000000000000..bbce6c435741
--- /dev/null
+++ b/test/rules/platform_certs/default/302904dd.0
@@ -0,0 +1 @@
+cert132.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/304d27c3.0 b/test/rules/platform_certs/default/304d27c3.0
new file mode 120000
index 000000000000..3b86526d9425
--- /dev/null
+++ b/test/rules/platform_certs/default/304d27c3.0
@@ -0,0 +1 @@
+cert130.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/31188b5e.0 b/test/rules/platform_certs/default/31188b5e.0
new file mode 120000
index 000000000000..d3d34182b0b4
--- /dev/null
+++ b/test/rules/platform_certs/default/31188b5e.0
@@ -0,0 +1 @@
+cert115.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/32888f65.0 b/test/rules/platform_certs/default/32888f65.0
new file mode 120000
index 000000000000..ad1a2c9e4e96
--- /dev/null
+++ b/test/rules/platform_certs/default/32888f65.0
@@ -0,0 +1 @@
+cert106.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/33ee480d.0 b/test/rules/platform_certs/default/33ee480d.0
new file mode 120000
index 000000000000..498662811fe8
--- /dev/null
+++ b/test/rules/platform_certs/default/33ee480d.0
@@ -0,0 +1 @@
+cert120.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/343eb6cb.0 b/test/rules/platform_certs/default/343eb6cb.0
new file mode 120000
index 000000000000..565938c977ad
--- /dev/null
+++ b/test/rules/platform_certs/default/343eb6cb.0
@@ -0,0 +1 @@
+cert037.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/349f2832.0 b/test/rules/platform_certs/default/349f2832.0
new file mode 120000
index 000000000000..5b97615af165
--- /dev/null
+++ b/test/rules/platform_certs/default/349f2832.0
@@ -0,0 +1 @@
+cert066.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/35105088.0 b/test/rules/platform_certs/default/35105088.0
new file mode 120000
index 000000000000..4d799e74ef9e
--- /dev/null
+++ b/test/rules/platform_certs/default/35105088.0
@@ -0,0 +1 @@
+cert092.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/3513523f.0 b/test/rules/platform_certs/default/3513523f.0
new file mode 120000
index 000000000000..cb763a0db33c
--- /dev/null
+++ b/test/rules/platform_certs/default/3513523f.0
@@ -0,0 +1 @@
+cert022.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/399e7759.0 b/test/rules/platform_certs/default/399e7759.0
new file mode 120000
index 000000000000..cb763a0db33c
--- /dev/null
+++ b/test/rules/platform_certs/default/399e7759.0
@@ -0,0 +1 @@
+cert022.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/3a3b02ce.0 b/test/rules/platform_certs/default/3a3b02ce.0
new file mode 120000
index 000000000000..dfc09b96e7a1
--- /dev/null
+++ b/test/rules/platform_certs/default/3a3b02ce.0
@@ -0,0 +1 @@
+cert035.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/3ad48a91.0 b/test/rules/platform_certs/default/3ad48a91.0
new file mode 120000
index 000000000000..d4fbe1793401
--- /dev/null
+++ b/test/rules/platform_certs/default/3ad48a91.0
@@ -0,0 +1 @@
+cert005.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/3bde41ac.0 b/test/rules/platform_certs/default/3bde41ac.0
new file mode 120000
index 000000000000..caeacfb82a92
--- /dev/null
+++ b/test/rules/platform_certs/default/3bde41ac.0
@@ -0,0 +1 @@
+cert052.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/3c58f906.0 b/test/rules/platform_certs/default/3c58f906.0
new file mode 120000
index 000000000000..62d8c8df6ceb
--- /dev/null
+++ b/test/rules/platform_certs/default/3c58f906.0
@@ -0,0 +1 @@
+cert006.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/3c6676aa.0 b/test/rules/platform_certs/default/3c6676aa.0
new file mode 120000
index 000000000000..fecfe84b3ea3
--- /dev/null
+++ b/test/rules/platform_certs/default/3c6676aa.0
@@ -0,0 +1 @@
+cert097.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/3c860d51.0 b/test/rules/platform_certs/default/3c860d51.0
new file mode 120000
index 000000000000..e71a9e353763
--- /dev/null
+++ b/test/rules/platform_certs/default/3c860d51.0
@@ -0,0 +1 @@
+cert025.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/3c899c73.0 b/test/rules/platform_certs/default/3c899c73.0
new file mode 120000
index 000000000000..be63f53484ff
--- /dev/null
+++ b/test/rules/platform_certs/default/3c899c73.0
@@ -0,0 +1 @@
+cert125.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/3c9a4d3b.0 b/test/rules/platform_certs/default/3c9a4d3b.0
new file mode 120000
index 000000000000..31b630c7c1ed
--- /dev/null
+++ b/test/rules/platform_certs/default/3c9a4d3b.0
@@ -0,0 +1 @@
+cert077.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/3d441de8.0 b/test/rules/platform_certs/default/3d441de8.0
new file mode 120000
index 000000000000..91faf4e1386e
--- /dev/null
+++ b/test/rules/platform_certs/default/3d441de8.0
@@ -0,0 +1 @@
+cert047.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/3e44d2f7.0 b/test/rules/platform_certs/default/3e44d2f7.0
new file mode 120000
index 000000000000..09d377c2dbdf
--- /dev/null
+++ b/test/rules/platform_certs/default/3e44d2f7.0
@@ -0,0 +1 @@
+cert118.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/3e45d192.0 b/test/rules/platform_certs/default/3e45d192.0
new file mode 120000
index 000000000000..48214313f446
--- /dev/null
+++ b/test/rules/platform_certs/default/3e45d192.0
@@ -0,0 +1 @@
+cert048.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/3e7271e8.0 b/test/rules/platform_certs/default/3e7271e8.0
new file mode 120000
index 000000000000..b7bed8af659f
--- /dev/null
+++ b/test/rules/platform_certs/default/3e7271e8.0
@@ -0,0 +1 @@
+cert004.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/40193066.0 b/test/rules/platform_certs/default/40193066.0
new file mode 120000
index 000000000000..2d41f6757f8c
--- /dev/null
+++ b/test/rules/platform_certs/default/40193066.0
@@ -0,0 +1 @@
+cert105.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/4042bcee.0 b/test/rules/platform_certs/default/4042bcee.0
new file mode 120000
index 000000000000..b07ab0a7620c
--- /dev/null
+++ b/test/rules/platform_certs/default/4042bcee.0
@@ -0,0 +1 @@
+cert108.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/40547a79.0 b/test/rules/platform_certs/default/40547a79.0
new file mode 120000
index 000000000000..94b886e2cf5d
--- /dev/null
+++ b/test/rules/platform_certs/default/40547a79.0
@@ -0,0 +1 @@
+cert032.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/406c9bb1.0 b/test/rules/platform_certs/default/406c9bb1.0
new file mode 120000
index 000000000000..c64998b14fa3
--- /dev/null
+++ b/test/rules/platform_certs/default/406c9bb1.0
@@ -0,0 +1 @@
+cert135.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/40dc992e.0 b/test/rules/platform_certs/default/40dc992e.0
new file mode 120000
index 000000000000..fd0b85b2c438
--- /dev/null
+++ b/test/rules/platform_certs/default/40dc992e.0
@@ -0,0 +1 @@
+cert067.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/4304c5e5.0 b/test/rules/platform_certs/default/4304c5e5.0
new file mode 120000
index 000000000000..2089bf3e0005
--- /dev/null
+++ b/test/rules/platform_certs/default/4304c5e5.0
@@ -0,0 +1 @@
+cert033.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/455f1b52.0 b/test/rules/platform_certs/default/455f1b52.0
new file mode 120000
index 000000000000..62f8be0348c9
--- /dev/null
+++ b/test/rules/platform_certs/default/455f1b52.0
@@ -0,0 +1 @@
+cert100.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/480720ec.0 b/test/rules/platform_certs/default/480720ec.0
new file mode 120000
index 000000000000..184c078f7fc0
--- /dev/null
+++ b/test/rules/platform_certs/default/480720ec.0
@@ -0,0 +1 @@
+cert027.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/48a195d8.0 b/test/rules/platform_certs/default/48a195d8.0
new file mode 120000
index 000000000000..4509178e43b6
--- /dev/null
+++ b/test/rules/platform_certs/default/48a195d8.0
@@ -0,0 +1 @@
+cert053.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/48bec511.0 b/test/rules/platform_certs/default/48bec511.0
new file mode 120000
index 000000000000..eec3208f5839
--- /dev/null
+++ b/test/rules/platform_certs/default/48bec511.0
@@ -0,0 +1 @@
+cert063.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/4a6481c9.0 b/test/rules/platform_certs/default/4a6481c9.0
new file mode 120000
index 000000000000..97e8273eff0f
--- /dev/null
+++ b/test/rules/platform_certs/default/4a6481c9.0
@@ -0,0 +1 @@
+cert002.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/4b718d9b.0 b/test/rules/platform_certs/default/4b718d9b.0
new file mode 120000
index 000000000000..2707f01ae817
--- /dev/null
+++ b/test/rules/platform_certs/default/4b718d9b.0
@@ -0,0 +1 @@
+cert136.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/4be590e0.0 b/test/rules/platform_certs/default/4be590e0.0
new file mode 120000
index 000000000000..14cb25329686
--- /dev/null
+++ b/test/rules/platform_certs/default/4be590e0.0
@@ -0,0 +1 @@
+cert099.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/4bfab552.0 b/test/rules/platform_certs/default/4bfab552.0
new file mode 120000
index 000000000000..07968211a11f
--- /dev/null
+++ b/test/rules/platform_certs/default/4bfab552.0
@@ -0,0 +1 @@
+cert057.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/4f316efb.0 b/test/rules/platform_certs/default/4f316efb.0
new file mode 120000
index 000000000000..e71a9e353763
--- /dev/null
+++ b/test/rules/platform_certs/default/4f316efb.0
@@ -0,0 +1 @@
+cert025.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/5046c355.0 b/test/rules/platform_certs/default/5046c355.0
new file mode 120000
index 000000000000..3b6c44b909cc
--- /dev/null
+++ b/test/rules/platform_certs/default/5046c355.0
@@ -0,0 +1 @@
+cert026.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/524d9b43.0 b/test/rules/platform_certs/default/524d9b43.0
new file mode 120000
index 000000000000..f70c743200ef
--- /dev/null
+++ b/test/rules/platform_certs/default/524d9b43.0
@@ -0,0 +1 @@
+cert044.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/5273a94c.0 b/test/rules/platform_certs/default/5273a94c.0
new file mode 120000
index 000000000000..62897b262628
--- /dev/null
+++ b/test/rules/platform_certs/default/5273a94c.0
@@ -0,0 +1 @@
+cert080.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/52b525c7.0 b/test/rules/platform_certs/default/52b525c7.0
new file mode 120000
index 000000000000..5d47613f1135
--- /dev/null
+++ b/test/rules/platform_certs/default/52b525c7.0
@@ -0,0 +1 @@
+cert083.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/5443e9e3.0 b/test/rules/platform_certs/default/5443e9e3.0
new file mode 120000
index 000000000000..590f09763ca0
--- /dev/null
+++ b/test/rules/platform_certs/default/5443e9e3.0
@@ -0,0 +1 @@
+cert072.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/54657681.0 b/test/rules/platform_certs/default/54657681.0
new file mode 120000
index 000000000000..fd8f34d766f4
--- /dev/null
+++ b/test/rules/platform_certs/default/54657681.0
@@ -0,0 +1 @@
+cert070.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/57bcb2da.0 b/test/rules/platform_certs/default/57bcb2da.0
new file mode 120000
index 000000000000..3b6c44b909cc
--- /dev/null
+++ b/test/rules/platform_certs/default/57bcb2da.0
@@ -0,0 +1 @@
+cert026.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/583d0756.0 b/test/rules/platform_certs/default/583d0756.0
new file mode 120000
index 000000000000..d358a74650d5
--- /dev/null
+++ b/test/rules/platform_certs/default/583d0756.0
@@ -0,0 +1 @@
+cert122.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/5a250ea7.0 b/test/rules/platform_certs/default/5a250ea7.0
new file mode 120000
index 000000000000..aa04b7c3f5bf
--- /dev/null
+++ b/test/rules/platform_certs/default/5a250ea7.0
@@ -0,0 +1 @@
+cert096.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/5a3f0ff8.0 b/test/rules/platform_certs/default/5a3f0ff8.0
new file mode 120000
index 000000000000..94b886e2cf5d
--- /dev/null
+++ b/test/rules/platform_certs/default/5a3f0ff8.0
@@ -0,0 +1 @@
+cert032.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/5a4d6896.0 b/test/rules/platform_certs/default/5a4d6896.0
new file mode 120000
index 000000000000..aa04b7c3f5bf
--- /dev/null
+++ b/test/rules/platform_certs/default/5a4d6896.0
@@ -0,0 +1 @@
+cert096.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/5acf816d.0 b/test/rules/platform_certs/default/5acf816d.0
new file mode 120000
index 000000000000..b293d2f9656d
--- /dev/null
+++ b/test/rules/platform_certs/default/5acf816d.0
@@ -0,0 +1 @@
+cert129.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/5ad8a5d6.0 b/test/rules/platform_certs/default/5ad8a5d6.0
new file mode 120000
index 000000000000..bbd07385c8a6
--- /dev/null
+++ b/test/rules/platform_certs/default/5ad8a5d6.0
@@ -0,0 +1 @@
+cert001.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/5c44d531.0 b/test/rules/platform_certs/default/5c44d531.0
new file mode 120000
index 000000000000..91faf4e1386e
--- /dev/null
+++ b/test/rules/platform_certs/default/5c44d531.0
@@ -0,0 +1 @@
+cert047.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/5cd81ad7.0 b/test/rules/platform_certs/default/5cd81ad7.0
new file mode 120000
index 000000000000..b4ef283ffd60
--- /dev/null
+++ b/test/rules/platform_certs/default/5cd81ad7.0
@@ -0,0 +1 @@
+cert079.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/5cf9d536.0 b/test/rules/platform_certs/default/5cf9d536.0
new file mode 120000
index 000000000000..d752b5b008b5
--- /dev/null
+++ b/test/rules/platform_certs/default/5cf9d536.0
@@ -0,0 +1 @@
+cert012.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/5d3033c5.0 b/test/rules/platform_certs/default/5d3033c5.0
new file mode 120000
index 000000000000..3f7d7d6c2ac4
--- /dev/null
+++ b/test/rules/platform_certs/default/5d3033c5.0
@@ -0,0 +1 @@
+cert117.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/5e4e69e7.0 b/test/rules/platform_certs/default/5e4e69e7.0
new file mode 120000
index 000000000000..a151a41100d0
--- /dev/null
+++ b/test/rules/platform_certs/default/5e4e69e7.0
@@ -0,0 +1 @@
+cert045.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/5e98733a.0 b/test/rules/platform_certs/default/5e98733a.0
new file mode 120000
index 000000000000..b02322a14ba4
--- /dev/null
+++ b/test/rules/platform_certs/default/5e98733a.0
@@ -0,0 +1 @@
+cert138.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/5f15c80c.0 b/test/rules/platform_certs/default/5f15c80c.0
new file mode 120000
index 000000000000..6c367fd21202
--- /dev/null
+++ b/test/rules/platform_certs/default/5f15c80c.0
@@ -0,0 +1 @@
+cert078.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/5f47b495.0 b/test/rules/platform_certs/default/5f47b495.0
new file mode 120000
index 000000000000..cd5cecffb316
--- /dev/null
+++ b/test/rules/platform_certs/default/5f47b495.0
@@ -0,0 +1 @@
+cert068.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/607986c7.0 b/test/rules/platform_certs/default/607986c7.0
new file mode 120000
index 000000000000..20b6b56b9c5f
--- /dev/null
+++ b/test/rules/platform_certs/default/607986c7.0
@@ -0,0 +1 @@
+cert088.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/60afe812.0 b/test/rules/platform_certs/default/60afe812.0
new file mode 120000
index 000000000000..ad82a9029e39
--- /dev/null
+++ b/test/rules/platform_certs/default/60afe812.0
@@ -0,0 +1 @@
+cert046.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/6187b673.0 b/test/rules/platform_certs/default/6187b673.0
new file mode 120000
index 000000000000..b07ab0a7620c
--- /dev/null
+++ b/test/rules/platform_certs/default/6187b673.0
@@ -0,0 +1 @@
+cert108.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/626dceaf.0 b/test/rules/platform_certs/default/626dceaf.0
new file mode 120000
index 000000000000..d5f16f42cfce
--- /dev/null
+++ b/test/rules/platform_certs/default/626dceaf.0
@@ -0,0 +1 @@
+cert127.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/63a2c897.0 b/test/rules/platform_certs/default/63a2c897.0
new file mode 120000
index 000000000000..b4ef283ffd60
--- /dev/null
+++ b/test/rules/platform_certs/default/63a2c897.0
@@ -0,0 +1 @@
+cert079.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/6410666e.0 b/test/rules/platform_certs/default/6410666e.0
new file mode 120000
index 000000000000..73fc246f6c27
--- /dev/null
+++ b/test/rules/platform_certs/default/6410666e.0
@@ -0,0 +1 @@
+cert020.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/653b494a.0 b/test/rules/platform_certs/default/653b494a.0
new file mode 120000
index 000000000000..d4fbe1793401
--- /dev/null
+++ b/test/rules/platform_certs/default/653b494a.0
@@ -0,0 +1 @@
+cert005.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/67495436.0 b/test/rules/platform_certs/default/67495436.0
new file mode 120000
index 000000000000..214c9452624b
--- /dev/null
+++ b/test/rules/platform_certs/default/67495436.0
@@ -0,0 +1 @@
+cert042.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/68dd7389.0 b/test/rules/platform_certs/default/68dd7389.0
new file mode 120000
index 000000000000..2a40c649daa9
--- /dev/null
+++ b/test/rules/platform_certs/default/68dd7389.0
@@ -0,0 +1 @@
+cert137.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/69105f4f.0 b/test/rules/platform_certs/default/69105f4f.0
new file mode 120000
index 000000000000..1a4e06971594
--- /dev/null
+++ b/test/rules/platform_certs/default/69105f4f.0
@@ -0,0 +1 @@
+cert021.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/6b03dec0.0 b/test/rules/platform_certs/default/6b03dec0.0
new file mode 120000
index 000000000000..158192fc7dde
--- /dev/null
+++ b/test/rules/platform_certs/default/6b03dec0.0
@@ -0,0 +1 @@
+cert128.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/6b99d060.0 b/test/rules/platform_certs/default/6b99d060.0
new file mode 120000
index 000000000000..b7c6ac77893d
--- /dev/null
+++ b/test/rules/platform_certs/default/6b99d060.0
@@ -0,0 +1 @@
+cert007.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/6d41d539.0 b/test/rules/platform_certs/default/6d41d539.0
new file mode 120000
index 000000000000..f79cc53a1883
--- /dev/null
+++ b/test/rules/platform_certs/default/6d41d539.0
@@ -0,0 +1 @@
+cert111.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/6fa5da56.0 b/test/rules/platform_certs/default/6fa5da56.0
new file mode 120000
index 000000000000..498662811fe8
--- /dev/null
+++ b/test/rules/platform_certs/default/6fa5da56.0
@@ -0,0 +1 @@
+cert120.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/706f604c.0 b/test/rules/platform_certs/default/706f604c.0
new file mode 120000
index 000000000000..5717d782c0b8
--- /dev/null
+++ b/test/rules/platform_certs/default/706f604c.0
@@ -0,0 +1 @@
+cert017.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/749e9e03.0 b/test/rules/platform_certs/default/749e9e03.0
new file mode 120000
index 000000000000..5d47613f1135
--- /dev/null
+++ b/test/rules/platform_certs/default/749e9e03.0
@@ -0,0 +1 @@
+cert083.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/75680d2e.0 b/test/rules/platform_certs/default/75680d2e.0
new file mode 120000
index 000000000000..f3d65f9515d0
--- /dev/null
+++ b/test/rules/platform_certs/default/75680d2e.0
@@ -0,0 +1 @@
+cert011.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/75d1b2ed.0 b/test/rules/platform_certs/default/75d1b2ed.0
new file mode 120000
index 000000000000..5d5f80e33054
--- /dev/null
+++ b/test/rules/platform_certs/default/75d1b2ed.0
@@ -0,0 +1 @@
+cert090.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/76579174.0 b/test/rules/platform_certs/default/76579174.0
new file mode 120000
index 000000000000..5717d782c0b8
--- /dev/null
+++ b/test/rules/platform_certs/default/76579174.0
@@ -0,0 +1 @@
+cert017.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/76cb8f92.0 b/test/rules/platform_certs/default/76cb8f92.0
new file mode 120000
index 000000000000..565938c977ad
--- /dev/null
+++ b/test/rules/platform_certs/default/76cb8f92.0
@@ -0,0 +1 @@
+cert037.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/76faf6c0.0 b/test/rules/platform_certs/default/76faf6c0.0
new file mode 120000
index 000000000000..be14627b585c
--- /dev/null
+++ b/test/rules/platform_certs/default/76faf6c0.0
@@ -0,0 +1 @@
+cert014.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/7719f463.0 b/test/rules/platform_certs/default/7719f463.0
new file mode 120000
index 000000000000..ee2dc90a4912
--- /dev/null
+++ b/test/rules/platform_certs/default/7719f463.0
@@ -0,0 +1 @@
+cert107.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/773e07ad.0 b/test/rules/platform_certs/default/773e07ad.0
new file mode 120000
index 000000000000..be63f53484ff
--- /dev/null
+++ b/test/rules/platform_certs/default/773e07ad.0
@@ -0,0 +1 @@
+cert125.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/7892ad52.0 b/test/rules/platform_certs/default/7892ad52.0
new file mode 120000
index 000000000000..8e03fa2ac01b
--- /dev/null
+++ b/test/rules/platform_certs/default/7892ad52.0
@@ -0,0 +1 @@
+cert123.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/7999be0d.0 b/test/rules/platform_certs/default/7999be0d.0
new file mode 120000
index 000000000000..7cabe938c30a
--- /dev/null
+++ b/test/rules/platform_certs/default/7999be0d.0
@@ -0,0 +1 @@
+cert008.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/7a7c655d.0 b/test/rules/platform_certs/default/7a7c655d.0
new file mode 120000
index 000000000000..4e69bf016efd
--- /dev/null
+++ b/test/rules/platform_certs/default/7a7c655d.0
@@ -0,0 +1 @@
+cert112.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/7a819ef2.0 b/test/rules/platform_certs/default/7a819ef2.0
new file mode 120000
index 000000000000..9d25f0e60cb0
--- /dev/null
+++ b/test/rules/platform_certs/default/7a819ef2.0
@@ -0,0 +1 @@
+cert013.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/7aaf71c0.0 b/test/rules/platform_certs/default/7aaf71c0.0
new file mode 120000
index 000000000000..5b20fc4c4385
--- /dev/null
+++ b/test/rules/platform_certs/default/7aaf71c0.0
@@ -0,0 +1 @@
+cert119.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/7c302982.0 b/test/rules/platform_certs/default/7c302982.0
new file mode 120000
index 000000000000..3f7d7d6c2ac4
--- /dev/null
+++ b/test/rules/platform_certs/default/7c302982.0
@@ -0,0 +1 @@
+cert117.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/7d0b38bd.0 b/test/rules/platform_certs/default/7d0b38bd.0
new file mode 120000
index 000000000000..a151a41100d0
--- /dev/null
+++ b/test/rules/platform_certs/default/7d0b38bd.0
@@ -0,0 +1 @@
+cert045.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/7d453d8f.0 b/test/rules/platform_certs/default/7d453d8f.0
new file mode 120000
index 000000000000..48fb898242bc
--- /dev/null
+++ b/test/rules/platform_certs/default/7d453d8f.0
@@ -0,0 +1 @@
+cert003.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/7f3d5d1d.0 b/test/rules/platform_certs/default/7f3d5d1d.0
new file mode 120000
index 000000000000..f43f71de09a2
--- /dev/null
+++ b/test/rules/platform_certs/default/7f3d5d1d.0
@@ -0,0 +1 @@
+cert087.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/8160b96c.0 b/test/rules/platform_certs/default/8160b96c.0
new file mode 120000
index 000000000000..f8a471e0b6e2
--- /dev/null
+++ b/test/rules/platform_certs/default/8160b96c.0
@@ -0,0 +1 @@
+cert050.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/81b9768f.0 b/test/rules/platform_certs/default/81b9768f.0
new file mode 120000
index 000000000000..5ba8f65d5e5e
--- /dev/null
+++ b/test/rules/platform_certs/default/81b9768f.0
@@ -0,0 +1 @@
+cert023.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/82223c44.0 b/test/rules/platform_certs/default/82223c44.0
new file mode 120000
index 000000000000..fd8f34d766f4
--- /dev/null
+++ b/test/rules/platform_certs/default/82223c44.0
@@ -0,0 +1 @@
+cert070.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/85cde254.0 b/test/rules/platform_certs/default/85cde254.0
new file mode 120000
index 000000000000..07968211a11f
--- /dev/null
+++ b/test/rules/platform_certs/default/85cde254.0
@@ -0,0 +1 @@
+cert057.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/86212b19.0 b/test/rules/platform_certs/default/86212b19.0
new file mode 120000
index 000000000000..d521e6e25fa9
--- /dev/null
+++ b/test/rules/platform_certs/default/86212b19.0
@@ -0,0 +1 @@
+cert060.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/869fbf79.0 b/test/rules/platform_certs/default/869fbf79.0
new file mode 120000
index 000000000000..2707f01ae817
--- /dev/null
+++ b/test/rules/platform_certs/default/869fbf79.0
@@ -0,0 +1 @@
+cert136.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/87753b0d.0 b/test/rules/platform_certs/default/87753b0d.0
new file mode 120000
index 000000000000..cd459c934ec9
--- /dev/null
+++ b/test/rules/platform_certs/default/87753b0d.0
@@ -0,0 +1 @@
+cert010.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/882de061.0 b/test/rules/platform_certs/default/882de061.0
new file mode 120000
index 000000000000..d0902e3730e9
--- /dev/null
+++ b/test/rules/platform_certs/default/882de061.0
@@ -0,0 +1 @@
+cert039.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/8867006a.0 b/test/rules/platform_certs/default/8867006a.0
new file mode 120000
index 000000000000..cd459c934ec9
--- /dev/null
+++ b/test/rules/platform_certs/default/8867006a.0
@@ -0,0 +1 @@
+cert010.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/88950faa.0 b/test/rules/platform_certs/default/88950faa.0
new file mode 120000
index 000000000000..fbeb5ff12554
--- /dev/null
+++ b/test/rules/platform_certs/default/88950faa.0
@@ -0,0 +1 @@
+cert121.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/89c02a45.0 b/test/rules/platform_certs/default/89c02a45.0
new file mode 120000
index 000000000000..cc53c2682802
--- /dev/null
+++ b/test/rules/platform_certs/default/89c02a45.0
@@ -0,0 +1 @@
+cert034.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/8cb5ee0f.0 b/test/rules/platform_certs/default/8cb5ee0f.0
new file mode 120000
index 000000000000..4e69bf016efd
--- /dev/null
+++ b/test/rules/platform_certs/default/8cb5ee0f.0
@@ -0,0 +1 @@
+cert112.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/8d6437c3.0 b/test/rules/platform_certs/default/8d6437c3.0
new file mode 120000
index 000000000000..e5bfdc4fd316
--- /dev/null
+++ b/test/rules/platform_certs/default/8d6437c3.0
@@ -0,0 +1 @@
+cert086.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/8d86cdd1.0 b/test/rules/platform_certs/default/8d86cdd1.0
new file mode 120000
index 000000000000..d0902e3730e9
--- /dev/null
+++ b/test/rules/platform_certs/default/8d86cdd1.0
@@ -0,0 +1 @@
+cert039.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/91739615.0 b/test/rules/platform_certs/default/91739615.0
new file mode 120000
index 000000000000..3cae6c5e8d73
--- /dev/null
+++ b/test/rules/platform_certs/default/91739615.0
@@ -0,0 +1 @@
+cert073.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/9282e51c.0 b/test/rules/platform_certs/default/9282e51c.0
new file mode 120000
index 000000000000..92d55d0abb91
--- /dev/null
+++ b/test/rules/platform_certs/default/9282e51c.0
@@ -0,0 +1 @@
+cert102.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/930ac5d2.0 b/test/rules/platform_certs/default/930ac5d2.0
new file mode 120000
index 000000000000..cd5cecffb316
--- /dev/null
+++ b/test/rules/platform_certs/default/930ac5d2.0
@@ -0,0 +1 @@
+cert068.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/9339512a.0 b/test/rules/platform_certs/default/9339512a.0
new file mode 120000
index 000000000000..be14627b585c
--- /dev/null
+++ b/test/rules/platform_certs/default/9339512a.0
@@ -0,0 +1 @@
+cert014.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/93bc0acc.0 b/test/rules/platform_certs/default/93bc0acc.0
new file mode 120000
index 000000000000..d521e6e25fa9
--- /dev/null
+++ b/test/rules/platform_certs/default/93bc0acc.0
@@ -0,0 +1 @@
+cert060.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/9479c8c3.0 b/test/rules/platform_certs/default/9479c8c3.0
new file mode 120000
index 000000000000..ee2dc90a4912
--- /dev/null
+++ b/test/rules/platform_certs/default/9479c8c3.0
@@ -0,0 +1 @@
+cert107.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/9576d26b.0 b/test/rules/platform_certs/default/9576d26b.0
new file mode 120000
index 000000000000..dcfdea4695e9
--- /dev/null
+++ b/test/rules/platform_certs/default/9576d26b.0
@@ -0,0 +1 @@
+cert076.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/95aff9e3.0 b/test/rules/platform_certs/default/95aff9e3.0
new file mode 120000
index 000000000000..eec3208f5839
--- /dev/null
+++ b/test/rules/platform_certs/default/95aff9e3.0
@@ -0,0 +1 @@
+cert063.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/9685a493.0 b/test/rules/platform_certs/default/9685a493.0
new file mode 120000
index 000000000000..48214313f446
--- /dev/null
+++ b/test/rules/platform_certs/default/9685a493.0
@@ -0,0 +1 @@
+cert048.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/9772ca32.0 b/test/rules/platform_certs/default/9772ca32.0
new file mode 120000
index 000000000000..184c078f7fc0
--- /dev/null
+++ b/test/rules/platform_certs/default/9772ca32.0
@@ -0,0 +1 @@
+cert027.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/985c1f52.0 b/test/rules/platform_certs/default/985c1f52.0
new file mode 120000
index 000000000000..4d3818fc7c3e
--- /dev/null
+++ b/test/rules/platform_certs/default/985c1f52.0
@@ -0,0 +1 @@
+cert124.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/988a38cb.0 b/test/rules/platform_certs/default/988a38cb.0
new file mode 120000
index 000000000000..ad82a9029e39
--- /dev/null
+++ b/test/rules/platform_certs/default/988a38cb.0
@@ -0,0 +1 @@
+cert046.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/9c2e7d30.0 b/test/rules/platform_certs/default/9c2e7d30.0
new file mode 120000
index 000000000000..80f821db43c6
--- /dev/null
+++ b/test/rules/platform_certs/default/9c2e7d30.0
@@ -0,0 +1 @@
+cert016.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/9c8dfbd4.0 b/test/rules/platform_certs/default/9c8dfbd4.0
new file mode 120000
index 000000000000..089e357b6505
--- /dev/null
+++ b/test/rules/platform_certs/default/9c8dfbd4.0
@@ -0,0 +1 @@
+cert062.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/9d04f354.0 b/test/rules/platform_certs/default/9d04f354.0
new file mode 120000
index 000000000000..e5bfdc4fd316
--- /dev/null
+++ b/test/rules/platform_certs/default/9d04f354.0
@@ -0,0 +1 @@
+cert086.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/9d6523ce.0 b/test/rules/platform_certs/default/9d6523ce.0
new file mode 120000
index 000000000000..00871c6d7da0
--- /dev/null
+++ b/test/rules/platform_certs/default/9d6523ce.0
@@ -0,0 +1 @@
+cert038.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/9f533518.0 b/test/rules/platform_certs/default/9f533518.0
new file mode 120000
index 000000000000..426310756475
--- /dev/null
+++ b/test/rules/platform_certs/default/9f533518.0
@@ -0,0 +1 @@
+cert055.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/AAACertificateServices.crt b/test/rules/platform_certs/default/AAACertificateServices.crt
deleted file mode 100644
index 6f41df89dff3..000000000000
--- a/test/rules/platform_certs/default/AAACertificateServices.crt
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb
-MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
-GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj
-YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL
-MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
-BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM
-GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua
-BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe
-3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4
-YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR
-rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm
-ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU
-oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
-MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v
-QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t
-b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF
-AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q
-GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
-Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2
-G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi
-l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3
-smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/ACCVRAIZ1.crt b/test/rules/platform_certs/default/ACCVRAIZ1.crt
deleted file mode 100644
index f036381f4959..000000000000
--- a/test/rules/platform_certs/default/ACCVRAIZ1.crt
+++ /dev/null
@@ -1,44 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UE
-AwwJQUNDVlJBSVoxMRAwDgYDVQQLDAdQS0lBQ0NWMQ0wCwYDVQQKDARBQ0NWMQsw
-CQYDVQQGEwJFUzAeFw0xMTA1MDUwOTM3MzdaFw0zMDEyMzEwOTM3MzdaMEIxEjAQ
-BgNVBAMMCUFDQ1ZSQUlaMTEQMA4GA1UECwwHUEtJQUNDVjENMAsGA1UECgwEQUND
-VjELMAkGA1UEBhMCRVMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCb
-qau/YUqXry+XZpp0X9DZlv3P4uRm7x8fRzPCRKPfmt4ftVTdFXxpNRFvu8gMjmoY
-HtiP2Ra8EEg2XPBjs5BaXCQ316PWywlxufEBcoSwfdtNgM3802/J+Nq2DoLSRYWo
-G2ioPej0RGy9ocLLA76MPhMAhN9KSMDjIgro6TenGEyxCQ0jVn8ETdkXhBilyNpA
-lHPrzg5XPAOBOp0KoVdDaaxXbXmQeOW1tDvYvEyNKKGno6e6Ak4l0Squ7a4DIrhr
-IA8wKFSVf+DuzgpmndFALW4ir50awQUZ0m/A8p/4e7MCQvtQqR0tkw8jq8bBD5L/
-0KIV9VMJcRz/RROE5iZe+OCIHAr8Fraocwa48GOEAqDGWuzndN9wrqODJerWx5eH
-k6fGioozl2A3ED6XPm4pFdahD9GILBKfb6qkxkLrQaLjlUPTAYVtjrs78yM2x/47
-4KElB0iryYl0/wiPgL/AlmXz7uxLaL2diMMxs0Dx6M/2OLuc5NF/1OVYm3z61PMO
-m3WR5LpSLhl+0fXNWhn8ugb2+1KoS5kE3fj5tItQo05iifCHJPqDQsGH+tUtKSpa
-cXpkatcnYGMN285J9Y0fkIkyF/hzQ7jSWpOGYdbhdQrqeWZ2iE9x6wQl1gpaepPl
-uUsXQA+xtrn13k/c4LOsOxFwYIRKQ26ZIMApcQrAZQIDAQABo4ICyzCCAscwfQYI
-KwYBBQUHAQEEcTBvMEwGCCsGAQUFBzAChkBodHRwOi8vd3d3LmFjY3YuZXMvZmls
-ZWFkbWluL0FyY2hpdm9zL2NlcnRpZmljYWRvcy9yYWl6YWNjdjEuY3J0MB8GCCsG
-AQUFBzABhhNodHRwOi8vb2NzcC5hY2N2LmVzMB0GA1UdDgQWBBTSh7Tj3zcnk1X2
-VuqB5TbMjB4/vTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNKHtOPfNyeT
-VfZW6oHlNsyMHj+9MIIBcwYDVR0gBIIBajCCAWYwggFiBgRVHSAAMIIBWDCCASIG
-CCsGAQUFBwICMIIBFB6CARAAQQB1AHQAbwByAGkAZABhAGQAIABkAGUAIABDAGUA
-cgB0AGkAZgBpAGMAYQBjAGkA8wBuACAAUgBhAO0AegAgAGQAZQAgAGwAYQAgAEEA
-QwBDAFYAIAAoAEEAZwBlAG4AYwBpAGEAIABkAGUAIABUAGUAYwBuAG8AbABvAGcA
-7QBhACAAeQAgAEMAZQByAHQAaQBmAGkAYwBhAGMAaQDzAG4AIABFAGwAZQBjAHQA
-cgDzAG4AaQBjAGEALAAgAEMASQBGACAAUQA0ADYAMAAxADEANQA2AEUAKQAuACAA
-QwBQAFMAIABlAG4AIABoAHQAdABwADoALwAvAHcAdwB3AC4AYQBjAGMAdgAuAGUA
-czAwBggrBgEFBQcCARYkaHR0cDovL3d3dy5hY2N2LmVzL2xlZ2lzbGFjaW9uX2Mu
-aHRtMFUGA1UdHwROMEwwSqBIoEaGRGh0dHA6Ly93d3cuYWNjdi5lcy9maWxlYWRt
-aW4vQXJjaGl2b3MvY2VydGlmaWNhZG9zL3JhaXphY2N2MV9kZXIuY3JsMA4GA1Ud
-DwEB/wQEAwIBBjAXBgNVHREEEDAOgQxhY2N2QGFjY3YuZXMwDQYJKoZIhvcNAQEF
-BQADggIBAJcxAp/n/UNnSEQU5CmH7UwoZtCPNdpNYbdKl02125DgBS4OxnnQ8pdp
-D70ER9m+27Up2pvZrqmZ1dM8MJP1jaGo/AaNRPTKFpV8M9xii6g3+CfYCS0b78gU
-JyCpZET/LtZ1qmxNYEAZSUNUY9rizLpm5U9EelvZaoErQNV/+QEnWCzI7UiRfD+m
-AM/EKXMRNt6GGT6d7hmKG9Ww7Y49nCrADdg9ZuM8Db3VlFzi4qc1GwQA9j9ajepD
-vV+JHanBsMyZ4k0ACtrJJ1vnE5Bc5PUzolVt3OAJTS+xJlsndQAJxGJ3KQhfnlms
-tn6tn1QwIgPBHnFk/vk4CpYY3QIUrCPLBhwepH2NDd4nQeit2hW3sCPdK6jT2iWH
-7ehVRE2I9DZ+hJp4rPcOVkkO1jMl1oRQQmwgEh0q1b688nCBpHBgvgW1m54ERL5h
-I6zppSSMEYCUWqKiuUnSwdzRp+0xESyeGabu4VXhwOrPDYTkF7eifKXeVSUG7szA
-h1xA2syVP1XgNce4hL60Xc16gwFy7ofmXx2utYXGJt/mwZrpHgJHnyqobalbz+xF
-d3+YJ5oyXSrjhO7FmGYvliAd3djDJ9ew+f7Zfc3Qn48LFFhRny+Lwzgt3uiP1o2H
-pPVWQxaZLPSkVrQ0uGE3ycJYgBugl6H8WY3pEfbRD0tVNEYqi4Y7
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/ACEDICOMRoot.crt b/test/rules/platform_certs/default/ACEDICOMRoot.crt
deleted file mode 100644
index a85bacba5c06..000000000000
--- a/test/rules/platform_certs/default/ACEDICOMRoot.crt
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFtTCCA52gAwIBAgIIYY3HhjsBggUwDQYJKoZIhvcNAQEFBQAwRDEWMBQGA1UE
-AwwNQUNFRElDT00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00x
-CzAJBgNVBAYTAkVTMB4XDTA4MDQxODE2MjQyMloXDTI4MDQxMzE2MjQyMlowRDEW
-MBQGA1UEAwwNQUNFRElDT00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZF
-RElDT00xCzAJBgNVBAYTAkVTMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
-AgEA/5KV4WgGdrQsyFhIyv2AVClVYyT/kGWbEHV7w2rbYgIB8hiGtXxaOLHkWLn7
-09gtn70yN78sFW2+tfQh0hOR2QetAQXW8713zl9CgQr5auODAKgrLlUTY4HKRxx7
-XBZXehuDYAQ6PmXDzQHe3qTWDLqO3tkE7hdWIpuPY/1NFgu3e3eM+SW10W2ZEi5P
-Grjm6gSSrj0RuVFCPYewMYWveVqc/udOXpJPQ/yrOq2lEiZmueIM15jO1FillUAK
-t0SdE3QrwqXrIhWYENiLxQSfHY9g5QYbm8+5eaA9oiM/Qj9r+hwDezCNzmzAv+Yb
-X79nuIQZ1RXve8uQNjFiybwCq0Zfm/4aaJQ0PZCOrfbkHQl/Sog4P75n/TSW9R28
-MHTLOO7VbKvU/PQAtwBbhTIWdjPp2KOZnQUAqhbm84F9b32qhm2tFXTTxKJxqvQU
-fecyuB+81fFOvW8XAjnXDpVCOscAPukmYxHqC9FK/xidstd7LzrZlvvoHpKuE1XI
-2Sf23EgbsCTBheN3nZqk8wwRHQ3ItBTutYJXCb8gWH8vIiPYcMt5bMlL8qkqyPyH
-K9caUPgn6C9D4zq92Fdx/c6mUlv53U3t5fZvie27k5x2IXXwkkwp9y+cAS7+UEae
-ZAwUswdbxcJzbPEHXEUkFDWug/FqTYl6+rPYLWbwNof1K1MCAwEAAaOBqjCBpzAP
-BgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKaz4SsrSbbXc6GqlPUB53NlTKxQ
-MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUprPhKytJttdzoaqU9QHnc2VMrFAw
-RAYDVR0gBD0wOzA5BgRVHSAAMDEwLwYIKwYBBQUHAgEWI2h0dHA6Ly9hY2VkaWNv
-bS5lZGljb21ncm91cC5jb20vZG9jMA0GCSqGSIb3DQEBBQUAA4ICAQDOLAtSUWIm
-fQwng4/F9tqgaHtPkl7qpHMyEVNEskTLnewPeUKzEKbHDZ3Ltvo/Onzqv4hTGzz3
-gvoFNTPhNahXwOf9jU8/kzJPeGYDdwdY6ZXIfj7QeQCM8htRM5u8lOk6e25SLTKe
-I6RF+7YuE7CLGLHdztUdp0J/Vb77W7tH1PwkzQSulgUV1qzOMPPKC8W64iLgpq0i
-5ALudBF/TP94HTXa5gI06xgSYXcGCRZj6hitoocf8seACQl1ThCojz2GuHURwCRi
-ipZ7SkXp7FnFvmuD5uHorLUwHv4FB4D54SMNUI8FmP8sX+g7tq3PgbUhh8oIKiMn
-MCArz+2UW6yyetLHKKGKC5tNSixthT8Jcjxn4tncB7rrZXtaAWPWkFtPF2Y9fwsZ
-o5NjEFIqnxQWWOLcpfShFosOkYuByptZ+thrkQdlVV9SH686+5DdaaVbnG0OLLb6
-zqylfDJKZ0DcMDQj3dcEI2bw/FWAp/tmGYI1Z2JwOV5vx+qQQEQIHriy1tvuWacN
-GHk0vFQYXlPKNFHtRQrmjseCNj6nOGOpMCwXEGCSn1WHElkQwg9naRHMTh5+Spqt
-r0CodaxWkHS4oJyleW/c6RrIaQXpuvoDs3zk4E7Czp3otkYNbn5XOmeUwssfnHdK
-Z05phkOTOPu220+DkdRgfks+KzgHVZhepA==
------END CERTIFICATE-----
diff --git "a/test/rules/platform_certs/default/ACRa\303\255zCertic\303\241maraS.A..crt" "b/test/rules/platform_certs/default/ACRa\303\255zCertic\303\241maraS.A..crt"
deleted file mode 100644
index ad2819f71109..000000000000
--- "a/test/rules/platform_certs/default/ACRa\303\255zCertic\303\241maraS.A..crt"
+++ /dev/null
@@ -1,37 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsx
-CzAJBgNVBAYTAkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRp
-ZmljYWNpw7NuIERpZ2l0YWwgLSBDZXJ0aWPDoW1hcmEgUy5BLjEjMCEGA1UEAwwa
-QUMgUmHDrXogQ2VydGljw6FtYXJhIFMuQS4wHhcNMDYxMTI3MjA0NjI5WhcNMzAw
-NDAyMjE0MjAyWjB7MQswCQYDVQQGEwJDTzFHMEUGA1UECgw+U29jaWVkYWQgQ2Ft
-ZXJhbCBkZSBDZXJ0aWZpY2FjacOzbiBEaWdpdGFsIC0gQ2VydGljw6FtYXJhIFMu
-QS4xIzAhBgNVBAMMGkFDIFJhw616IENlcnRpY8OhbWFyYSBTLkEuMIICIjANBgkq
-hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq2uJo1PMSCMI+8PPUZYILrgIem08kBeG
-qentLhM0R7LQcNzJPNCNyu5LF6vQhbCnIwTLqKL85XXbQMpiiY9QngE9JlsYhBzL
-fDe3fezTf3MZsGqy2IiKLUV0qPezuMDU2s0iiXRNWhU5cxh0T7XrmafBHoi0wpOQ
-Y5fzp6cSsgkiBzPZkc0OnB8OIMfuuzONj8LSWKdf/WU34ojC2I+GdV75LaeHM/J4
-Ny+LvB2GNzmxlPLYvEqcgxhaBvzz1NS6jBUJJfD5to0EfhcSM2tXSExP2yYe68yQ
-54v5aHxwD6Mq0Do43zeX4lvegGHTgNiRg0JaTASJaBE8rF9ogEHMYELODVoqDA+b
-MMCm8Ibbq0nXl21Ii/kDwFJnmxL3wvIumGVC2daa49AZMQyth9VXAnow6IYm+48j
-ilSH5L887uvDdUhfHjlvgWJsxS3EF1QZtzeNnDeRyPYL1epjb4OsOMLzP96a++Ej
-YfDIJss2yKHzMI+ko6Kh3VOz3vCaMh+DkXkwwakfU5tTohVTP92dsxA7SH2JD/zt
-A/X7JWR1DhcZDY8AFmd5ekD8LVkH2ZD6mq093ICK5lw1omdMEWux+IBkAC1vImHF
-rEsm5VoQgpukg3s0956JkSCXjrdCx2bD0Omk1vUgjcTDlaxECp1bczwmPS9KvqfJ
-pxAe+59QafMCAwEAAaOB5jCB4zAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
-AwIBBjAdBgNVHQ4EFgQU0QnQ6dfOeXRU+Tows/RtLAMDG2gwgaAGA1UdIASBmDCB
-lTCBkgYEVR0gADCBiTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5jZXJ0aWNhbWFy
-YS5jb20vZHBjLzBaBggrBgEFBQcCAjBOGkxMaW1pdGFjaW9uZXMgZGUgZ2FyYW50
-7WFzIGRlIGVzdGUgY2VydGlmaWNhZG8gc2UgcHVlZGVuIGVuY29udHJhciBlbiBs
-YSBEUEMuMA0GCSqGSIb3DQEBBQUAA4ICAQBclLW4RZFNjmEfAygPU3zmpFmps4p6
-xbD/CHwso3EcIRNnoZUSQDWDg4902zNc8El2CoFS3UnUmjIz75uny3XlesuXEpBc
-unvFm9+7OSPI/5jOCk0iAUgHforA1SBClETvv3eiiWdIG0ADBaGJ7M9i4z0ldma/
-Jre7Ir5v/zlXdLp6yQGVwZVR6Kss+LGGIOk/yzVb0hfpKv6DExdA7ohiZVvVO2Dp
-ezy4ydV/NgIlqmjCMRW3MGXrfx1IebHPOeJCgBbT9ZMj/EyXyVo3bHwi2ErN0o42
-gzmRkBDI8ck1fj+404HGIGQatlDCIaR43NAvO2STdPCWkPHv+wlaNECW8DYSwaN0
-jJN+Qd53i+yG2dIPPy3RzECiiWZIHiCznCNZc6lEc7wkeZBWN7PGKX6jD/EpOe9+
-XCgycDWs2rjIdWb8m0w5R44bb5tNAlQiM+9hup4phO9OSzNHdpdqy35f/RWmnkJD
-W2ZaiogN9xa5P1FlK2Zqi9E4UqLWRhH6/JocdJ6PlwsCT2TG9WjTSy3/pDceiz+/
-RL5hRqGEPQgnTIEgd4kI6mdAXmwIUV80WoyWaM3X94nCHNMyAK9Sy9NgWyo6R35r
-MDOhYil/SrnhLecUIw4OGEfhefwVVdCx/CVxY3UzHCMrr1zZ7Ud3YA47Dx7SwNxk
-BYn8eNZcLCZDqQ==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/ActalisAuthenticationRootCA.crt b/test/rules/platform_certs/default/ActalisAuthenticationRootCA.crt
deleted file mode 100644
index 0eeac36ff541..000000000000
--- a/test/rules/platform_certs/default/ActalisAuthenticationRootCA.crt
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UE
-BhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8w
-MzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290
-IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDkyMjExMjIwMlowazELMAkGA1UEBhMC
-SVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1
-ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENB
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNv
-UTufClrJwkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX
-4ay8IMKx4INRimlNAJZaby/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9
-KK3giq0itFZljoZUj5NDKd45RnijMCO6zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/
-gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1fYVEiVRvjRuPjPdA1Yprb
-rxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2oxgkg4YQ
-51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2F
-be8lEfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxe
-KF+w6D9Fz8+vm2/7hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4F
-v6MGn8i1zeQf1xcGDXqVdFUNaBr8EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbn
-fpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5jF66CyCU3nuDuP/jVo23Eek7
-jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLYiDrIn3hm7Ynz
-ezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt
-ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQAL
-e3KHwGCmSUyIWOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70
-jsNjLiNmsGe+b7bAEzlgqqI0JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDz
-WochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKxK3JCaKygvU5a2hi/a5iB0P2avl4V
-SM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+Xlff1ANATIGk0k9j
-pwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC4yyX
-X04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+Ok
-fcvHlXHo2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7R
-K4X9p2jIugErsWx0Hbhzlefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btU
-ZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXemOR/qnuOf0GZvBeyqdn6/axag67XH/JJU
-LysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9vwGYT7JZVEc+NHt4bVaT
-LnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/AddTrustClass1CARoot.crt b/test/rules/platform_certs/default/AddTrustClass1CARoot.crt
deleted file mode 100644
index bb8232b6031d..000000000000
--- a/test/rules/platform_certs/default/AddTrustClass1CARoot.crt
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU
-MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
-b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMw
-MTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
-QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYD
-VQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ul
-CDtbKRY654eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6n
-tGO0/7Gcrjyvd7ZWxbWroulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyl
-dI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1Zmne3yzxbrww2ywkEtvrNTVokMsAsJch
-PXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJuiGMx1I4S+6+JNM3GOGvDC
-+Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8wHQYDVR0O
-BBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8E
-BTADAQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBl
-MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFk
-ZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENB
-IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxtZBsfzQ3duQH6lmM0MkhHma6X
-7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0PhiVYrqW9yTkkz
-43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY
-eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJl
-pz/+0WatC7xrmYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOA
-WiFeIc9TVPC6b4nbqKqVz4vjccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/AddTrustExternalCARoot.crt b/test/rules/platform_certs/default/AddTrustExternalCARoot.crt
deleted file mode 100644
index a6fdaa32a57d..000000000000
--- a/test/rules/platform_certs/default/AddTrustExternalCARoot.crt
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU
-MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs
-IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290
-MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux
-FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h
-bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt
-H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9
-uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX
-mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX
-a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN
-E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0
-WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD
-VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0
-Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU
-cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx
-IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN
-AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH
-YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
-6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC
-Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
-c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
-mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/AddTrustPublicCARoot.crt b/test/rules/platform_certs/default/AddTrustPublicCARoot.crt
deleted file mode 100644
index 3b4484513e40..000000000000
--- a/test/rules/platform_certs/default/AddTrustPublicCARoot.crt
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJTRTEU
-MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
-b3JrMSAwHgYDVQQDExdBZGRUcnVzdCBQdWJsaWMgQ0EgUm9vdDAeFw0wMDA1MzAx
-MDQxNTBaFw0yMDA1MzAxMDQxNTBaMGQxCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtB
-ZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIDAeBgNV
-BAMTF0FkZFRydXN0IFB1YmxpYyBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA6Rowj4OIFMEg2Dybjxt+A3S72mnTRqX4jsIMEZBRpS9mVEBV
-6tsfSlbunyNu9DnLoblv8n75XYcmYZ4c+OLspoH4IcUkzBEMP9smcnrHAZcHF/nX
-GCwwfQ56HmIexkvA/X1id9NEHif2P0tEs7c42TkfYNVRknMDtABp4/MUTu7R3AnP
-dzRGULD4EfL+OHn3Bzn+UZKXC1sIXzSGAa2Il+tmzV7R/9x98oTaunet3IAIx6eH
-1lWfl2royBFkuucZKT8Rs3iQhCBSWxHveNCD9tVIkNAwHM+A+WD+eeSI8t0A65RF
-62WUaUC6wNW0uLp9BBGo6zEFlpROWCGOn9Bg/QIDAQABo4HRMIHOMB0GA1UdDgQW
-BBSBPjfYkrAfd59ctKtzquf2NGAv+jALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/BAUw
-AwEB/zCBjgYDVR0jBIGGMIGDgBSBPjfYkrAfd59ctKtzquf2NGAv+qFopGYwZDEL
-MAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRU
-cnVzdCBUVFAgTmV0d29yazEgMB4GA1UEAxMXQWRkVHJ1c3QgUHVibGljIENBIFJv
-b3SCAQEwDQYJKoZIhvcNAQEFBQADggEBAAP3FUr4JNojVhaTdt02KLmuG7jD8WS6
-IBh4lSknVwW8fCr0uVFV2ocC3g8WFzH4qnkuCRO7r7IgGRLlk/lL+YPoRNWyQSW/
-iHVv/xD8SlTQX/D67zZzfRs2RcYhbbQVuE7PnFylPVoAjgbjPGsye/Kf8Lb93/Ao
-GEjwxrzQvzSAlsJKsW2Ox5BF3i9nrEUEo3rcVZLJR2bYGozH7ZxOmuASu7VqTITh
-4SINhwBk/ox9Yjllpu9CtoAlEmEBqCQTcAARJl/6NVDFSMwGR+gn2HCNX2TmoUQm
-XiLsks3/QppEIW1cxeMiHV9HEufOX1362KqxMy3ZdvJOOjMMK7MtkAY=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/AddTrustQualifiedCARoot.crt b/test/rules/platform_certs/default/AddTrustQualifiedCARoot.crt
deleted file mode 100644
index 8f8a434071c0..000000000000
--- a/test/rules/platform_certs/default/AddTrustQualifiedCARoot.crt
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEU
-MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
-b3JrMSMwIQYDVQQDExpBZGRUcnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1
-MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcxCzAJBgNVBAYTAlNFMRQwEgYDVQQK
-EwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIzAh
-BgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwq
-xBb/4Oxx64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G
-87B4pfYOQnrjfxvM0PC3KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i
-2O+tCBGaKZnhqkRFmhJePp1tUvznoD1oL/BLcHwTOK28FSXx1s6rosAx1i+f4P8U
-WfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GRwVY18BTcZTYJbqukB8c1
-0cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HUMIHRMB0G
-A1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0T
-AQH/BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6Fr
-pGkwZzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQL
-ExRBZGRUcnVzdCBUVFAgTmV0d29yazEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlm
-aWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBABmrder4i2VhlRO6aQTv
-hsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxGGuoYQ992zPlm
-hpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X
-dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3
-P6CxB9bpT9zeRXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9Y
-iQBCYz95OdBEsIJuQRno3eDBiFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5no
-xqE=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/AffirmTrustCommercial.crt b/test/rules/platform_certs/default/AffirmTrustCommercial.crt
deleted file mode 100644
index fcabc6f551ea..000000000000
--- a/test/rules/platform_certs/default/AffirmTrustCommercial.crt
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UE
-BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
-dCBDb21tZXJjaWFsMB4XDTEwMDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDEL
-MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
-cm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6EqdbDuKP
-Hx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yr
-ba0F8PrVC8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPAL
-MeIrJmqbTFeurCA+ukV6BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1
-yHp52UKqK39c/s4mT6NmgTWvRLpUHhwwMmWd5jyTXlBOeuM61G7MGvv50jeuJCqr
-VwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNVHQ4EFgQUnZPGU4teyq8/
-nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
-KoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYG
-XUPGhi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNj
-vbz4YYCanrHOQnDiqX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivt
-Z8SOyUOyXGsViQK8YvxO8rUzqrJv0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9g
-N53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0khsUlHRUe072o0EclNmsxZt9YC
-nlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/AffirmTrustNetworking.crt b/test/rules/platform_certs/default/AffirmTrustNetworking.crt
deleted file mode 100644
index 58899648c7fe..000000000000
--- a/test/rules/platform_certs/default/AffirmTrustNetworking.crt
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UE
-BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
-dCBOZXR3b3JraW5nMB4XDTEwMDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDEL
-MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
-cm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SEHi3y
-YJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbua
-kCNrmreIdIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRL
-QESxG9fhwoXA3hA/Pe24/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp
-6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gbh+0t+nvujArjqWaJGctB+d1ENmHP4ndG
-yH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNVHQ4EFgQUBx/S55zawm6i
-QLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
-KoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfO
-tDIuUFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzu
-QY0x2+c06lkh1QF612S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZ
-Lgo/bNjR9eUJtGxUAArgFU2HdW23WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4u
-olu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9/ZFvgrG+CJPbFEfxojfHRZ48
-x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/AffirmTrustPremium.crt b/test/rules/platform_certs/default/AffirmTrustPremium.crt
deleted file mode 100644
index 4331fbb453b7..000000000000
--- a/test/rules/platform_certs/default/AffirmTrustPremium.crt
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UE
-BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVz
-dCBQcmVtaXVtMB4XDTEwMDEyOTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkG
-A1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1U
-cnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxBLf
-qV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtnBKAQ
-JG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ
-+jjeRFcV5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrS
-s8PhaJyJ+HoAVt70VZVs+7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5
-HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmdGPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d7
-70O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5Rp9EixAqnOEhss/n/fauG
-V+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NIS+LI+H+S
-qHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S
-5u046uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4Ia
-C1nEWTJ3s7xgaVY5/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TX
-OwF0lkLgAOIua+rF7nKsu7/+6qqo+Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYE
-FJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
-BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByvMiPIs0laUZx2
-KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
-Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B
-8OWycvpEgjNC6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQ
-MKSOyARiqcTtNd56l+0OOF6SL5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc
-0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK+4w1IX2COPKpVJEZNZOUbWo6xbLQ
-u4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmVBtWVyuEklut89pMF
-u+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFgIxpH
-YoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8
-GKa1qF60g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaO
-RtGdFNrHF+QFlozEJLUbzxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6e
-KeC2uAloGRwYQw==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/AffirmTrustPremiumECC.crt b/test/rules/platform_certs/default/AffirmTrustPremiumECC.crt
deleted file mode 100644
index 76a3afffd940..000000000000
--- a/test/rules/platform_certs/default/AffirmTrustPremiumECC.crt
+++ /dev/null
@@ -1,13 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMC
-VVMxFDASBgNVBAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQ
-cmVtaXVtIEVDQzAeFw0xMDAxMjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJ
-BgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEgMB4GA1UEAwwXQWZmaXJt
-VHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQNMF4bFZ0D
-0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQN8O9
-ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0G
-A1UdDgQWBBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4G
-A1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/Vs
-aobgxCd05DhT1wV/GzTjxi+zygk8N53X57hG8f2h4nECMEJZh0PUUd+60wkyWs6I
-flc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKMeQ==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/ApplicationCA-JapaneseGovernment.crt b/test/rules/platform_certs/default/ApplicationCA-JapaneseGovernment.crt
deleted file mode 100644
index 99e3addabae9..000000000000
--- a/test/rules/platform_certs/default/ApplicationCA-JapaneseGovernment.crt
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJKUDEc
-MBoGA1UEChMTSmFwYW5lc2UgR292ZXJubWVudDEWMBQGA1UECxMNQXBwbGljYXRp
-b25DQTAeFw0wNzEyMTIxNTAwMDBaFw0xNzEyMTIxNTAwMDBaMEMxCzAJBgNVBAYT
-AkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zlcm5tZW50MRYwFAYDVQQLEw1BcHBs
-aWNhdGlvbkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp23gdE6H
-j6UG3mii24aZS2QNcfAKBZuOquHMLtJqO8F6tJdhjYq+xpqcBrSGUeQ3DnR4fl+K
-f5Sk10cI/VBaVuRorChzoHvpfxiSQE8tnfWuREhzNgaeZCw7NCPbXCbkcXmP1G55
-IrmTwcrNwVbtiGrXoDkhBFcsovW8R0FPXjQilbUfKW1eSvNNcr5BViCH/OlQR9cw
-FO5cjFW6WY2H/CPek9AEjP3vbb3QesmlOmpyM8ZKDQUXKi17safY1vC+9D/qDiht
-QWEjdnjDuGWk81quzMKq2edY3rZ+nYVunyoKb58DKTCXKB28t89UKU5RMfkntigm
-/qJj5kEW8DOYRwIDAQABo4GeMIGbMB0GA1UdDgQWBBRUWssmP3HMlEYNllPqa0jQ
-k/5CdTAOBgNVHQ8BAf8EBAMCAQYwWQYDVR0RBFIwUKROMEwxCzAJBgNVBAYTAkpQ
-MRgwFgYDVQQKDA/ml6XmnKzlm73mlL/lupwxIzAhBgNVBAsMGuOCouODl+ODquOC
-seODvOOCt+ODp+ODs0NBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-ggEBADlqRHZ3ODrso2dGD/mLBqj7apAxzn7s2tGJfHrrLgy9mTLnsCTWw//1sogJ
-hyzjVOGjprIIC8CFqMjSnHH2HZ9g/DgzE+Ge3Atf2hZQKXsvcJEPmbo0NI2VdMV+
-eKlmXb3KIXdCEKxmJj3ekav9FfBv7WxfEPjzFvYDio+nEhEMy/0/ecGc/WLuo89U
-DNErXxc+4z6/wCs+CZv+iKZ+tJIX/COUgb1up8WMwusRRdv4QcmWdupwX3kSa+Sj
-B1oF7ydJzyGfikwJcGapJsErEU4z0g781mzSDjJkaP+tBXhfAx2o45CsJOAPQKdL
-rosot4LKGAfmt1t06SAZf7IbiVQ=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/AtosTrustedRoot2011.crt b/test/rules/platform_certs/default/AtosTrustedRoot2011.crt
deleted file mode 100644
index 4a04a0222c94..000000000000
--- a/test/rules/platform_certs/default/AtosTrustedRoot2011.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIIXDPLYixfszIwDQYJKoZIhvcNAQELBQAwPDEeMBwGA1UE
-AwwVQXRvcyBUcnVzdGVkUm9vdCAyMDExMQ0wCwYDVQQKDARBdG9zMQswCQYDVQQG
-EwJERTAeFw0xMTA3MDcxNDU4MzBaFw0zMDEyMzEyMzU5NTlaMDwxHjAcBgNVBAMM
-FUF0b3MgVHJ1c3RlZFJvb3QgMjAxMTENMAsGA1UECgwEQXRvczELMAkGA1UEBhMC
-REUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCVhTuXbyo7LjvPpvMp
-Nb7PGKw+qtn4TaA+Gke5vJrf8v7MPkfoepbCJI419KkM/IL9bcFyYie96mvr54rM
-VD6QUM+A1JX76LWC1BTFtqlVJVfbsVD2sGBkWXppzwO3bw2+yj5vdHLqqjAqc2K+
-SZFhyBH+DgMq92og3AIVDV4VavzjgsG1xZ1kCWyjWZgHJ8cblithdHFsQ/H3NYkQ
-4J7sVaE3IqKHBAUsR320HLliKWYoyrfhk/WklAOZuXCFteZI6o1Q/NnezG8HDt0L
-cp2AMBYHlT8oDv3FdU9T1nSatCQujgKRz3bFmx5VdJx4IbHwLfELn8LVlhgf8FQi
-eowHAgMBAAGjfTB7MB0GA1UdDgQWBBSnpQaxLKYJYO7Rl+lwrrw7GWzbITAPBgNV
-HRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKelBrEspglg7tGX6XCuvDsZbNshMBgG
-A1UdIAQRMA8wDQYLKwYBBAGwLQMEAQEwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3
-DQEBCwUAA4IBAQAmdzTblEiGKkGdLD4GkGDEjKwLVLgfuXvTBznk+j57sj1O7Z8j
-vZfza1zv7v1Apt+hk6EKhqzvINB5Ab149xnYJDE0BAGmuhWawyfc2E8PzBhj/5kP
-DpFrdRbhIfzYJsdHt6bPWHJxfrrhTZVHO8mvbaG0weyJ9rQPOLXiZNwlz6bb65pc
-maHFCN795trV1lpFDMS3wrUU77QR/w4VtfX128a961qn8FYiqTxlVMYVqL2Gns2D
-lmh6cYGJ4Qvh6hEbaAjMaZ7snkGeRDImeuKHCnE96+RapNLbxc3G3mB/ufNPRJLv
-KrcYPqcZ2Qt9sTdBQrC6YB3y/gkRsPCHe6ed
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/AutoridaddeCertificacionFirmaprofesionalCIFA62634068.crt b/test/rules/platform_certs/default/AutoridaddeCertificacionFirmaprofesionalCIFA62634068.crt
deleted file mode 100644
index 53263650e9a6..000000000000
--- a/test/rules/platform_certs/default/AutoridaddeCertificacionFirmaprofesionalCIFA62634068.crt
+++ /dev/null
@@ -1,35 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UE
-BhMCRVMxQjBABgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1h
-cHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEy
-MzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIwQAYDVQQDDDlBdXRvcmlkYWQgZGUg
-Q2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBBNjI2MzQwNjgwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDDUtd9
-thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQM
-cas9UX4PB99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefG
-L9ItWY16Ck6WaVICqjaY7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15i
-NA9wBj4gGFrO93IbJWyTdBSTo3OxDqqHECNZXyAFGUftaI6SEspd/NYrspI8IM/h
-X68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyIplD9amML9ZMWGxmPsu2b
-m8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctXMbScyJCy
-Z/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirja
-EbsXLZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/T
-KI8xWVvTyQKmtFLKbpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF
-6NkBiDkal4ZkQdU7hwxu+g/GvUgUvzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVh
-OSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNHDhpkLzCBpgYD
-VR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
-cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBv
-ACAAZABlACAAbABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBl
-AGwAbwBuAGEAIAAwADgAMAAxADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF
-661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx51tkljYyGOylMnfX40S2wBEqgLk9
-am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qkR71kMrv2JYSiJ0L1
-ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaPT481
-PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS
-3a/DTg4fJl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5k
-SeTy36LssUzAKh3ntLFlosS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF
-3dvd6qJ2gHN99ZwExEWN57kci57q13XRcrHedUTnQn3iV2t93Jm8PYMo6oCTjcVM
-ZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoRsaS8I8nkvof/uZS2+F0g
-StRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTDKCOM/icz
-Q0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQB
-jLMi6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/BaltimoreCyberTrustRoot.crt b/test/rules/platform_certs/default/BaltimoreCyberTrustRoot.crt
deleted file mode 100644
index 13487ad2f90a..000000000000
--- a/test/rules/platform_certs/default/BaltimoreCyberTrustRoot.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ
-RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD
-VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX
-DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y
-ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy
-VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr
-mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr
-IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK
-mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu
-XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy
-dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye
-jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1
-BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3
-DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92
-9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx
-jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0
-Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz
-ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS
-R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/BuypassClass2CA1.crt b/test/rules/platform_certs/default/BuypassClass2CA1.crt
deleted file mode 100644
index d40cef14c5b5..000000000000
--- a/test/rules/platform_certs/default/BuypassClass2CA1.crt
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDUzCCAjugAwIBAgIBATANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEd
-MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3Mg
-Q2xhc3MgMiBDQSAxMB4XDTA2MTAxMzEwMjUwOVoXDTE2MTAxMzEwMjUwOVowSzEL
-MAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYD
-VQQDDBRCdXlwYXNzIENsYXNzIDIgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAIs8B0XY9t/mx8q6jUPFR42wWsE425KEHK8T1A9vNkYgxC7McXA0
-ojTTNy7Y3Tp3L8DrKehc0rWpkTSHIln+zNvnma+WwajHQN2lFYxuyHyXA8vmIPLX
-l18xoS830r7uvqmtqEyeIWZDO6i88wmjONVZJMHCR3axiFyCO7srpgTXjAePzdVB
-HfCuuCkslFJgNJQ72uA40Z0zPhX0kzLFANq1KWYOOngPIVJfAuWSeyXTkh4vFZ2B
-5J2O6O+JzhRMVB0cgRJNcKi+EAUXfh/RuFdV7c27UsKwHnjCTTZoy1YmwVLBvXb3
-WNVyfh9EdrsAiR0WnVE1703CVu9r4Iw7DekCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUP42aWYv8e3uco684sDntkHGA1sgwDgYDVR0PAQH/BAQD
-AgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAVGn4TirnoB6NLJzKyQJHyIdFkhb5jatLP
-gcIV1Xp+DCmsNx4cfHZSldq1fyOhKXdlyTKdqC5Wq2B2zha0jX94wNWZUYN/Xtm+
-DKhQ7SLHrQVMdvvt7h5HZPb3J31cKA9FxVxiXqaakZG3Uxcu3K1gnZZkOb1naLKu
-BctN518fV4bVIJwo+28TOPX2EZL2fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHs
-h7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5wwDX3OaJdZtB7WZ+oRxKaJyOk
-LY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/BuypassClass2RootCA.crt b/test/rules/platform_certs/default/BuypassClass2RootCA.crt
deleted file mode 100644
index e8aa9742d63f..000000000000
--- a/test/rules/platform_certs/default/BuypassClass2RootCA.crt
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEd
-MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3Mg
-Q2xhc3MgMiBSb290IENBMB4XDTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1ow
-TjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MSAw
-HgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEB
-BQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1g1Lr
-6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPV
-L4O2fuPn9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC91
-1K2GScuVr1QGbNgGE41b/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHx
-MlAQTn/0hpPshNOOvEu/XAFOBz3cFIqUCqTqc/sLUegTBxj6DvEr0VQVfTzh97QZ
-QmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeffawrbD02TTqigzXsu8lkB
-arcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgIzRFo1clr
-Us3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLi
-FRhnBkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRS
-P/TizPJhk9H9Z2vXUq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN
-9SG9dKpN6nIDSdvHXx1iY8f93ZHsM+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxP
-AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMmAd+BikoL1Rpzz
-uvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAU18h
-9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
-A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3t
-OluwlN5E40EIosHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo
-+fsicdl9sz1Gv7SEr5AcD48Saq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7
-KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYdDnkM/crqJIByw5c/8nerQyIKx+u2
-DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWDLfJ6v9r9jv6ly0Us
-H8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0oyLQ
-I+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK7
-5t98biGCwWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h
-3PFaTWwyI0PurKju7koSCTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPz
-Y11aWOIv4x3kqdbQCtCev9eBCfHJxyYNrJgWVqA=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/BuypassClass3RootCA.crt b/test/rules/platform_certs/default/BuypassClass3RootCA.crt
deleted file mode 100644
index 43529c9a5791..000000000000
--- a/test/rules/platform_certs/default/BuypassClass3RootCA.crt
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEd
-MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3Mg
-Q2xhc3MgMyBSb290IENBMB4XDTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFow
-TjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MSAw
-HgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEB
-BQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRHsJ8Y
-ZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3E
-N3coTRiR5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9
-tznDDgFHmV0ST9tD+leh7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX
-0DJq1l1sDPGzbjniazEuOQAnFN44wOwZZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c
-/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH2xc519woe2v1n/MuwU8X
-KhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV/afmiSTY
-zIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvS
-O1UQRwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D
-34xFMFbG02SrZvPAXpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgP
-K9Dx2hzLabjKSWJtyNBjYt1gD1iqj6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3
-AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFEe4zf/lb+74suwv
-Tg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAACAj
-QTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
-cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXS
-IGrs/CIBKM+GuIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2
-HJLw5QY33KbmkJs4j1xrG0aGQ0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsa
-O5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8ZORK15FTAaggiG6cX0S5y2CBNOxv
-033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2KSb12tjE8nVhz36u
-dmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz6MkE
-kbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg41
-3OEMXbugUZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvD
-u79leNKGef9JOxqDDPDeeOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq
-4/g7u9xN12TyUb7mqqta6THuBrxzvxNiCp/HuZc=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/CADisigRootR1.crt b/test/rules/platform_certs/default/CADisigRootR1.crt
deleted file mode 100644
index 2169ad2b3e27..000000000000
--- a/test/rules/platform_certs/default/CADisigRootR1.crt
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFaTCCA1GgAwIBAgIJAMMDmu5QkG4oMA0GCSqGSIb3DQEBBQUAMFIxCzAJBgNV
-BAYTAlNLMRMwEQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMu
-MRkwFwYDVQQDExBDQSBEaXNpZyBSb290IFIxMB4XDTEyMDcxOTA5MDY1NloXDTQy
-MDcxOTA5MDY1NlowUjELMAkGA1UEBhMCU0sxEzARBgNVBAcTCkJyYXRpc2xhdmEx
-EzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERpc2lnIFJvb3QgUjEw
-ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCqw3j33Jijp1pedxiy3QRk
-D2P9m5YJgNXoqqXinCaUOuiZc4yd39ffg/N4T0Dhf9Kn0uXKE5Pn7cZ3Xza1lK/o
-OI7bm+V8u8yN63Vz4STN5qctGS7Y1oprFOsIYgrY3LMATcMjfF9DCCMyEtztDK3A
-fQ+lekLZWnDZv6fXARz2m6uOt0qGeKAeVjGu74IKgEH3G8muqzIm1Cxr7X1r5OJe
-IgpFy4QxTaz+29FHuvlglzmxZcfe+5nkCiKxLU3lSCZpq+Kq8/v8kiky6bM+TR8n
-oc2OuRf7JT7JbvN32g0S9l3HuzYQ1VTW8+DiR0jm3hTaYVKvJrT1cU/J19IG32PK
-/yHoWQbgCNWEFVP3Q+V8xaCJmGtzxmjOZd69fwX3se72V6FglcXM6pM6vpmumwKj
-rckWtc7dXpl4fho5frLABaTAgqWjR56M6ly2vGfb5ipN0gTco65F97yLnByn1tUD
-3AjLLhbKXEAz6GfDLuemROoRRRw1ZS0eRWEkG4IupZ0zXWX4Qfkuy5Q/H6MMMSRE
-7cderVC6xkGbrPAXZcD4XW9boAo0PO7X6oifmPmvTiT6l7Jkdtqr9O3jw2Dv1fkC
-yC2fg69naQanMVXVz0tv/wQFx1isXxYb5dKj6zHbHzMVTdDypVP1y+E9Tmgt2BLd
-qvLmTZtJ5cUoobqwWsagtQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
-DwEB/wQEAwIBBjAdBgNVHQ4EFgQUiQq0OJMa5qvum5EY+fU8PjXQ04IwDQYJKoZI
-hvcNAQEFBQADggIBADKL9p1Kyb4U5YysOMo6CdQbzoaz3evUuii+Eq5FLAR0rBNR
-xVgYZk2C2tXck8An4b58n1KeElb21Zyp9HWc+jcSjxyT7Ff+Bw+r1RL3D65hXlaA
-SfX8MPWbTx9BLxyE04nH4toCdu0Jz2zBuByDHBb6lM19oMgY0sidbvW9adRtPTXo
-HqJPYNcHKfyyo6SdbhWSVhlMCrDpfNIZTUJG7L399ldb3Zh+pE3McgODWF3vkzpB
-emOqfDqo9ayk0d2iLbYq/J8BjuIQscTK5GfbVSUZP/3oNn6z4eGBrxEWi1CXYBmC
-AMBrTXO40RMHPuq2MU/wQppt4hF05ZSsjYSVPCGvxdpHyN85YmLLW1AL14FABZyb
-7bq2ix4Eb5YgOe2kfSnbSM6C3NQCjR0EMVrHS/BsYVLXtFHCgWzN4funodKSds+x
-DzdYpPJScWc/DIh4gInByLUfkmO+p3qKViwaqKactV2zY9ATIKHrkWzQjX2v3wvk
-F7mGnjixlAxYjOBVqjtjbZqJYLhkKpLGN/R+Q0O3c+gB53+XD9fyexn9GtePyfqF
-a3qdnom2piiZk4hA9z7NUaPK6u95RyG1/jLix8NRb76AdPCkwzryT+lf3xkK8jsT
-Q6wxpLPn6/wY1gGp8yqPNg7rtLG8t0zJa7+h89n07eLw4+1knj0vllJPgFOL
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/CADisigRootR2.crt b/test/rules/platform_certs/default/CADisigRootR2.crt
deleted file mode 100644
index 6c6eddc6c079..000000000000
--- a/test/rules/platform_certs/default/CADisigRootR2.crt
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFaTCCA1GgAwIBAgIJAJK4iNuwisFjMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNV
-BAYTAlNLMRMwEQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMu
-MRkwFwYDVQQDExBDQSBEaXNpZyBSb290IFIyMB4XDTEyMDcxOTA5MTUzMFoXDTQy
-MDcxOTA5MTUzMFowUjELMAkGA1UEBhMCU0sxEzARBgNVBAcTCkJyYXRpc2xhdmEx
-EzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERpc2lnIFJvb3QgUjIw
-ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCio8QACdaFXS1tFPbCw3Oe
-NcJxVX6B+6tGUODBfEl45qt5WDza/3wcn9iXAng+a0EE6UG9vgMsRfYvZNSrXaNH
-PWSb6WiaxswbP7q+sos0Ai6YVRn8jG+qX9pMzk0DIaPY0jSTVpbLTAwAFjxfGs3I
-x2ymrdMxp7zo5eFm1tL7A7RBZckQrg4FY8aAamkw/dLukO8NJ9+flXP04SXabBbe
-QTg06ov80egEFGEtQX6sx3dOy1FU+16SGBsEWmjGycT6txOgmLcRK7fWV8x8nhfR
-yyX+hk4kLlYMeE2eARKmK6cBZW58Yh2EhN/qwGu1pSqVg8NTEQxzHQuyRpDRQjrO
-QG6Vrf/GlK1ul4SOfW+eioANSW1z4nuSHsPzwfPrLgVv2RvPN3YEyLRa5Beny912
-H9AZdugsBbPWnDTYltxhh5EF5EQIM8HauQhl1K6yNg3ruji6DOWbnuuNZt2Zz9aJ
-QfYEkoopKW1rOhzndX0CcQ7zwOe9yxndnWCywmZgtrEE7snmhrmaZkCo5xHtgUUD
-i/ZnWejBBhG93c+AAk9lQHhcR1DIm+YfgXvkRKhbhZri3lrVx/k6RGZL5DJUfORs
-nLMOPReisjQS1n6yqEm70XooQL6iFh/f5DcfEXP7kAplQ6INfPgGAVUzfbANuPT1
-rqVCV3w2EYx7XsQDnYx5nQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
-DwEB/wQEAwIBBjAdBgNVHQ4EFgQUtZn4r7CU9eMg1gqtzk5WpC5uQu0wDQYJKoZI
-hvcNAQELBQADggIBACYGXnDnZTPIgm7ZnBc6G3pmsgH2eDtpXi/q/075KMOYKmFM
-tCQSin1tERT3nLXK5ryeJ45MGcipvXrA1zYObYVybqjGom32+nNjf7xueQgcnYqf
-GopTpti72TVVsRHFqQOzVju5hJMiXn7B9hJSi+osZ7z+Nkz1uM/Rs0mSO9MpDpkb
-lvdhuDvEK7Z4bLQjb/D907JedR+Zlais9trhxTF7+9FGs9K8Z7RiVLoJ92Owk6Ka
-+elSLotgEqv89WBW7xBci8QaQtyDW2QOy7W81k/BfDxujRNt+3vrMNDcTa/F1bal
-TFtxyegxvug4BkihGuLq0t4SOVga/4AOgnXmt8kHbA7v/zjxmHHEt38OFdAlab0i
-nSvtBfZGR6ztwPDUO+Ls7pZbkBNOHlY667DvlruWIxG68kOGdGSVyCh13x01utI3
-gzhTODY7z2zp+WsO0PsE6E9312UBeIYMej4hYvF/Y3EMyZ9E26gnonW+boE+18Dr
-G5gPcFw0sorMwIUY6256s/daoQe/qUKS82Ail+QUoQebTnbAjn39pCXHR+3/H3Os
-zMOl6W8KjptlwlCFtaOgUxLMVYdh84GuEEZhvUQhuMI9dM9+JDX6HAcOmz0iyu8x
-L4ysEr3vQCj8KWefshNPZiTEUxnpHikV7+ZtsH8tZ/3zbBt1RqPlShfppNcL
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/CAWoSignECCRoot.crt b/test/rules/platform_certs/default/CAWoSignECCRoot.crt
deleted file mode 100644
index b7e8b5c6a6ef..000000000000
--- a/test/rules/platform_certs/default/CAWoSignECCRoot.crt
+++ /dev/null
@@ -1,13 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICCTCCAY+gAwIBAgIQaEpYcIBr8I8C+vbe6LCQkDAKBggqhkjOPQQDAzBGMQsw
-CQYDVQQGEwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxGzAZBgNVBAMT
-EkNBIFdvU2lnbiBFQ0MgUm9vdDAeFw0xNDExMDgwMDU4NThaFw00NDExMDgwMDU4
-NThaMEYxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEb
-MBkGA1UEAxMSQ0EgV29TaWduIEVDQyBSb290MHYwEAYHKoZIzj0CAQYFK4EEACID
-YgAE4f2OuEMkq5Z7hcK6C62N4DrjJLnSsb6IOsq/Srj57ywvr1FQPEd1bPiUt5v8
-KB7FVMxjnRZLU8HnIKvNrCXSf4/CwVqCXjCLelTOA7WRf6qU0NGKSMyCBSah1VES
-1ns2o0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
-FgQUqv3VWqP2h4syhf3RMluARZPzA7gwCgYIKoZIzj0EAwMDaAAwZQIxAOSkhLCB
-1T2wdKyUpOgOPQB0TKGXa/kNUTyh2Tv0Daupn75OcsqF1NnstTJFGG+rrQIwfcf3
-aWMvoeGY7xMQ0Xk/0f7qO3/eVvSQsRUR2LIiFdAvwyYua/GRspBl9JrmkO5K
------END CERTIFICATE-----
diff --git "a/test/rules/platform_certs/default/CA\346\262\203\351\200\232\346\240\271\350\257\201\344\271\246.crt" "b/test/rules/platform_certs/default/CA\346\262\203\351\200\232\346\240\271\350\257\201\344\271\246.crt"
deleted file mode 100644
index 4e3440ff3d5a..000000000000
--- "a/test/rules/platform_certs/default/CA\346\262\203\351\200\232\346\240\271\350\257\201\344\271\246.crt"
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFWDCCA0CgAwIBAgIQUHBrzdgT/BtOOzNy0hFIjTANBgkqhkiG9w0BAQsFADBG
-MQswCQYDVQQGEwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxGzAZBgNV
-BAMMEkNBIOayg+mAmuagueivgeS5pjAeFw0wOTA4MDgwMTAwMDFaFw0zOTA4MDgw
-MTAwMDFaMEYxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRl
-ZDEbMBkGA1UEAwwSQ0Eg5rKD6YCa5qC56K+B5LmmMIICIjANBgkqhkiG9w0BAQEF
-AAOCAg8AMIICCgKCAgEA0EkhHiX8h8EqwqzbdoYGTufQdDTc7WU1/FDWiD+k8H/r
-D195L4mx/bxjWDeTmzj4t1up+thxx7S8gJeNbEvxUNUqKaqoGXqW5pWOdO2XCld1
-9AXbbQs5uQF/qvbW2mzmBeCkTVL829B0txGMe41P/4eDrv8FAxNXUDf+jJZSEExf
-v5RxadmWPgxDT74wwJ85dE8GRV2j1lY5aAfMh09Qd5Nx2UQIsYo06Yms25tO4dnk
-UkWMLhQfkWsZHWgpLFbE4h4TV2TwYeO5Ed+w4VegG63XX9Gv2ystP9Bojg/qnw+L
-NVgbExz03jWhCl3W6t8Sb8D7aQdGctyB9gQjF+BNdeFyb7Ao65vh4YOhn0pdr8yb
-+gIgthhid5E7o9Vlrdx8kHccREGkSovrlXLp9glk3Kgtn3R46MGiCWOc76DbT52V
-qyBPt7D3h1ymoOQ3OMdc4zUPLK2jgKLsLl3Az+2LBcLmc272idX10kaO6m1jGx6K
-yX2m+Jzr5dVjhU1zZmkR/sgO9MHHZklTfuQZa/HpelmjbX7FF+Ynxu8b22/8DU0G
-AbQOXDBGVWCvOGU6yke6rCzMRh+yRpY/8+0mBe53oWprfi1tWFxK1I5nuPHa1UaK
-J/kR8slC/k7e3x9cxKSGhxYzoacXGKUN5AXlK8IrC6KVkLn9YDxOiT7nnO4fuwEC
-AwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
-BBYEFOBNv9ybQV0T6GTwp+kVpOGBwboxMA0GCSqGSIb3DQEBCwUAA4ICAQBqinA4
-WbbaixjIvirTthnVZil6Xc1bL3McJk6jfW+rtylNpumlEYOnOXOvEESS5iVdT2H6
-yAa+Tkvv/vMx/sZ8cApBWNromUuWyXi8mHwCKe0JgOYKOoICKuLJL8hWGSbueBwj
-/feTZU7n85iYr83d2Z5AiDEoOqsuC7CsDCT6eiaY8xJhEPRdF/d+4niXVOKM6Cm6
-jBAyvd0zaziGfjk9DgNyp115j0WKWa5bIW4xRtVZjc8VX90xJc/bYNaBRHIpAlf2
-ltTW/+op2znFuCyKGo3Oy+dCMYYFaA6eFN0AkLppRQjbbpCBhqcqBT/mhDn4t/lX
-X0ykeVoQDF7Va/81XwVRHmyjdanPUIPTfPRm94KNPQx96N97qA4bLJyuQHCH2u2n
-FoJavjVsIE4iYdm8UXrNemHcSxH5/mc0zy4EZmFcV5cjjPOGG0jfKq+nwf/Yjj4D
-u9gqsPoUJbJRa4ZDhS4HIxaAjUz7tGM7zMN07RujHv41D198HRaG9Q7DlfEvr10l
-O1Hm13ZBONFLAzkopR6RctR9q5czxNM+4Gm2KHmgCY0c0f9BckgG/Jou5yD5m6Le
-ie2uPAmvylezkolwQOQvT8Jwg0DXJCxr5wkf09XHwQj02w47HAcLQxGEIYbpgNR1
-2KvxAmLBsX5VYc8T1yaw15zLKYs4SgsOkI26oQ==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/CFCAEVROOT.crt b/test/rules/platform_certs/default/CFCAEVROOT.crt
deleted file mode 100644
index 7d8be66e5583..000000000000
--- a/test/rules/platform_certs/default/CFCAEVROOT.crt
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFjTCCA3WgAwIBAgIEGErM1jANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJD
-TjEwMC4GA1UECgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9y
-aXR5MRUwEwYDVQQDDAxDRkNBIEVWIFJPT1QwHhcNMTIwODA4MDMwNzAxWhcNMjkx
-MjMxMDMwNzAxWjBWMQswCQYDVQQGEwJDTjEwMC4GA1UECgwnQ2hpbmEgRmluYW5j
-aWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQDDAxDRkNBIEVWIFJP
-T1QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDXXWvNED8fBVnVBU03
-sQ7smCuOFR36k0sXgiFxEFLXUWRwFsJVaU2OFW2fvwwbwuCjZ9YMrM8irq93VCpL
-TIpTUnrD7i7es3ElweldPe6hL6P3KjzJIx1qqx2hp/Hz7KDVRM8Vz3IvHWOX6Jn5
-/ZOkVIBMUtRSqy5J35DNuF++P96hyk0g1CXohClTt7GIH//62pCfCqktQT+x8Rgp
-7hZZLDRJGqgG16iI0gNyejLi6mhNbiyWZXvKWfry4t3uMCz7zEasxGPrb382KzRz
-EpR/38wmnvFyXVBlWY9ps4deMm/DGIq1lY+wejfeWkU7xzbh72fROdOXW3NiGUgt
-hxwG+3SYIElz8AXSG7Ggo7cbcNOIabla1jj0Ytwli3i/+Oh+uFzJlU9fpy25IGvP
-a931DfSCt/SyZi4QKPaXWnuWFo8BGS1sbn85WAZkgwGDg8NNkt0yxoekN+kWzqot
-aK8KgWU6cMGbrU1tVMoqLUuFG7OA5nBFDWteNfB/O7ic5ARwiRIlk9oKmSJgamNg
-TnYGmE69g60dWIolhdLHZR4tjsbftsbhf4oEIRUpdPA+nJCdDC7xij5aqgwJHsfV
-PKPtl8MeNPo4+QgO48BdK4PRVmrJtqhUUy54Mmc9gn900PvhtgVguXDbjgv5E1hv
-cWAQUhC5wUEJ73IfZzF4/5YFjQIDAQABo2MwYTAfBgNVHSMEGDAWgBTj/i39KNAL
-tbq2osS/BqoFjJP7LzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAd
-BgNVHQ4EFgQU4/4t/SjQC7W6tqLEvwaqBYyT+y8wDQYJKoZIhvcNAQELBQADggIB
-ACXGumvrh8vegjmWPfBEp2uEcwPenStPuiB/vHiyz5ewG5zz13ku9Ui20vsXiObT
-ej/tUxPQ4i9qecsAIyjmHjdXNYmEwnZPNDatZ8POQQaIxffu2Bq41gt/UP+TqhdL
-jOztUmCypAbqTuv0axn96/Ua4CUqmtzHQTb3yHQFhDmVOdYLO6Qn+gjYXB74BGBS
-ESgoA//vU2YApUo0FmZ8/Qmkrp5nGm9BC2sGE5uPhnEFtC+NiWYzKXZUmhH4J/qy
-P5Hgzg0b8zAarb8iXRvTvyUFTeGSGn+ZnzxEk8rUQElsgIfXBDrDMlI1Dlb4pd19
-xIsNER9Tyx6yF7Zod1rg1MvIB671Oi6ON7fQAUtDKXeMOZePglr4UeWJoBjnaH9d
-Ci77o0cOPaYjesYBx4/IXr9tgFa+iiS6M+qf4TIRnvHST4D2G0CvOJ4RUHlzEhLN
-5mydLIhyPDCBBpEi6lmt2hkuIsKNuYyH4Ga8cyNfIWRjgEj1oDwYPZTISEEdQLpe
-/v5WOaHIz16eGWRGENoXkbcFgKyLmZJ956LYBws2J+dIeWCKw9cTXPhyQN9Ky8+Z
-AAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3CekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ
-5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/CNNICROOT.crt b/test/rules/platform_certs/default/CNNICROOT.crt
deleted file mode 100644
index 2f1be9a1cf9f..000000000000
--- a/test/rules/platform_certs/default/CNNICROOT.crt
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDVTCCAj2gAwIBAgIESTMAATANBgkqhkiG9w0BAQUFADAyMQswCQYDVQQGEwJD
-TjEOMAwGA1UEChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwHhcNMDcwNDE2
-MDcwOTE0WhcNMjcwNDE2MDcwOTE0WjAyMQswCQYDVQQGEwJDTjEOMAwGA1UEChMF
-Q05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDTNfc/c3et6FtzF8LRb+1VvG7q6KR5smzDo+/hn7E7SIX1mlwh
-IhAsxYLO2uOabjfhhyzcuQxauohV3/2q2x8x6gHx3zkBwRP9SFIhxFXf2tizVHa6
-dLG3fdfA6PZZxU3Iva0fFNrfWEQlMhkqx35+jq44sDB7R3IJMfAw28Mbdim7aXZO
-V/kbZKKTVrdvmW7bCgScEeOAH8tjlBAKqeFkgjH5jCftppkA9nCTGPihNIaj3XrC
-GHn2emU1z5DrvTOTn1OrczvmmzQgLx3vqR1jGqCA2wMv+SYahtKNu6m+UjqHZ0gN
-v7Sg2Ca+I19zN38m5pIEo3/PIKe38zrKy5nLAgMBAAGjczBxMBEGCWCGSAGG+EIB
-AQQEAwIABzAfBgNVHSMEGDAWgBRl8jGtKvf33VKWCscCwQ7vptU7ETAPBgNVHRMB
-Af8EBTADAQH/MAsGA1UdDwQEAwIB/jAdBgNVHQ4EFgQUZfIxrSr3991SlgrHAsEO
-76bVOxEwDQYJKoZIhvcNAQEFBQADggEBAEs17szkrr/Dbq2flTtLP1se31cpolnK
-OOK5Gv+e5m4y3R6u6jW39ZORTtpC4cMXYFDy0VwmuYK36m3knITnA3kXr5g9lNvH
-ugDnuL8BV8F3RTIMO/G0HAiw/VGgod2aHRM2mm23xzy54cXZF/qD1T0VoDy7Hgvi
-yJA/qIYM/PmLXoXLT1tLYhFHxUV8BS9BsZ4QaRuZluBVeftOhpm4lNqGOGqTo+fL
-buXf6iFViZx9fX+Y9QCJ7uOEwFyWtcVG6kbghVW2G8kS1sHNzYDzAgE8yGnLRUhj
-2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5mmxE=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/COMODOCertificationAuthority.crt b/test/rules/platform_certs/default/COMODOCertificationAuthority.crt
deleted file mode 100644
index d21c7aaee05f..000000000000
--- a/test/rules/platform_certs/default/COMODOCertificationAuthority.crt
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCB
-gTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNV
-BAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEyMDEwMDAw
-MDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3Jl
-YXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01P
-RE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3
-UcEbVASY06m/weaKXTuH+7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI
-2GqGd0S7WWaXUF601CxwRM/aN5VCaTwwxHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8
-Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV4EajcNxo2f8ESIl33rXp
-+2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA1KGzqSX+
-DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5O
-nKVIrLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW
-/zAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6g
-PKA6hjhodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9u
-QXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOCAQEAPpiem/Yb6dc5t3iuHXIY
-SdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CPOGEIqB6BCsAv
-IC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
-RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4
-zJVSk/BwJVmcIGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5dd
-BA6+C4OmF4O5MBKgxTMVBbkN+8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IB
-ZQ==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/COMODOECCCertificationAuthority.crt b/test/rules/platform_certs/default/COMODOECCCertificationAuthority.crt
deleted file mode 100644
index 566164795ef4..000000000000
--- a/test/rules/platform_certs/default/COMODOECCCertificationAuthority.crt
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTEL
-MAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
-BxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMT
-IkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwMzA2MDAw
-MDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdy
-ZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09N
-T0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSR
-FtSrYpn1PlILBs5BAH+X4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0J
-cfRK9ChQtP6IHG4/bC8vCVlbpVsLM5niwz2J+Wos77LTBumjQjBAMB0GA1UdDgQW
-BBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
-BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VGFAkK+qDm
-fQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdv
-GDeAU/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/COMODORSACertificationAuthority.crt b/test/rules/platform_certs/default/COMODORSACertificationAuthority.crt
deleted file mode 100644
index 1f6cf6122365..000000000000
--- a/test/rules/platform_certs/default/COMODORSACertificationAuthority.crt
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIF2DCCA8CgAwIBAgIQTKr5yttjb+Af907YWwOGnTANBgkqhkiG9w0BAQwFADCB
-hTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNV
-BAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAwMTE5
-MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgT
-EkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
-Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCR
-6FSS0gpWsawNJN3Fz0RndJkrN6N9I3AAcbxT38T6KhKPS38QVr2fcHK3YX/JSw8X
-pz3jsARh7v8Rl8f0hj4K+j5c+ZPmNHrZFGvnnLOFoIJ6dq9xkNfs/Q36nGz637CC
-9BR++b7Epi9Pf5l/tfxnQ3K9DADWietrLNPtj5gcFKt+5eNu/Nio5JIk2kNrYrhV
-/erBvGy2i/MOjZrkm2xpmfh4SDBF1a3hDTxFYPwyllEnvGfDyi62a+pGx8cgoLEf
-Zd5ICLqkTqnyg0Y3hOvozIFIQ2dOciqbXL1MGyiKXCJ7tKuY2e7gUYPDCUZObT6Z
-+pUX2nwzV0E8jVHtC7ZcryxjGt9XyD+86V3Em69FmeKjWiS0uqlWPc9vqv9JWL7w
-qP/0uK3pN/u6uPQLOvnoQ0IeidiEyxPx2bvhiWC4jChWrBQdnArncevPDt09qZah
-SL0896+1DSJMwBGB7FY79tOi4lu3sgQiUpWAk2nojkxl8ZEDLXB0AuqLZxUpaVIC
-u9ffUGpVRr+goyhhf3DQw6KqLCGqR84onAZFdr+CGCe01a60y1Dma/RMhnEw6abf
-Fobg2P9A3fvQQoh/ozM6LlweQRGBY84YcWsr7KaKtzFcOmpH4MN5WdYgGq/yapiq
-crxXStJLnbsQ/LBMQeXtHT1eKJ2czL+zUdqnR+WEUwIDAQABo0IwQDAdBgNVHQ4E
-FgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB
-/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAArx1UaEt65Ru2yyTUEUAJNMnMvl
-wFTPoCWOAvn9sKIN9SCYPBMtrFaisNZ+EZLpLrqeLppysb0ZRGxhNaKatBYSaVqM
-4dc+pBroLwP0rmEdEBsqpIt6xf4FpuHA1sj+nq6PK7o9mfjYcwlYRm6mnPTXJ9OV
-2jeDchzTc+CiR5kDOF3VSXkAKRzH7JsgHAckaVd4sjn8OoSgtZx8jb8uk2Intzna
-FxiuvTwJaP+EmzzV1gsD41eeFPfR60/IvYcjt7ZJQ3mFXLrrkguhxuhoqEwWsRqZ
-CuhTLJK7oQkYdQxlqHvLI7cawiiFwxv/0Cti76R7CZGYZ4wUAc1oBmpjIXUDgIiK
-boHGhfKppC3n9KUkEEeDys30jXlYsQab5xoq2Z0B15R97QNKyvDb6KkBPvVWmcke
-jkk9u+UJueBPSZI9FoJAzMxZxuY67RIuaTxslbH9qh17f4a+Hg4yRvv7E491f0yL
-S0Zj/gA0QHDBw7mh3aZw4gSzQbzpgJHqZJx64SIDqZxubw5lT2yHh17zbqD5daWb
-QOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk527RH89elWsn2/x20Kk4yl
-0MC2Hb46TpSi125sC8KKfPog88Tk5c0NqMuRkrF8hey1FGlmDoLnzc7ILaZRfyHB
-NVOFBkpdn627G190
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/CertificationAuthorityofWoSign.crt b/test/rules/platform_certs/default/CertificationAuthorityofWoSign.crt
deleted file mode 100644
index a9e2b86ac0f4..000000000000
--- a/test/rules/platform_certs/default/CertificationAuthorityofWoSign.crt
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFdjCCA16gAwIBAgIQXmjWEXGUY1BWAGjzPsnFkTANBgkqhkiG9w0BAQUFADBV
-MQswCQYDVQQGEwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxKjAoBgNV
-BAMTIUNlcnRpZmljYXRpb24gQXV0aG9yaXR5IG9mIFdvU2lnbjAeFw0wOTA4MDgw
-MTAwMDFaFw0zOTA4MDgwMTAwMDFaMFUxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFX
-b1NpZ24gQ0EgTGltaXRlZDEqMCgGA1UEAxMhQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkgb2YgV29TaWduMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvcqN
-rLiRFVaXe2tcesLea9mhsMMQI/qnobLMMfo+2aYpbxY94Gv4uEBf2zmoAHqLoE1U
-fcIiePyOCbiohdfMlZdLdNiefvAA5A6JrkkoRBoQmTIPJYhTpA2zDxIIFgsDcScc
-f+Hb0v1naMQFXQoOXXDX2JegvFNBmpGN9J42Znp+VsGQX+axaCA2pIwkLCxHC1l2
-ZjC1vt7tj/id07sBMOby8w7gLJKA84X5KIq0VC6a7fd2/BVoFutKbOsuEo/Uz/4M
-x1wdC34FMr5esAkqQtXJTpCzWQ27en7N1QhatH/YHGkR+ScPewavVIMYe+HdVHpR
-aG53/Ma/UkpmRqGyZxq7o093oL5d//xWC0Nyd5DKnvnyOfUNqfTq1+ezEC8wQjch
-zDBwyYaYD8xYTYO7feUapTeNtqwylwA6Y3EkHp43xP901DfA4v6IRmAR3Qg/UDar
-uHqklWJqbrDKaiFaafPz+x1wOZXzp26mgYmhiMU7ccqjUu6Du/2gd/Tkb+dC221K
-mYo0SLwX3OSACCK28jHAPwQ+658geda4BmRkAjHXqc1S+4RFaQkAKtxVi8QGRkvA
-Sh0JWzko/amrzgD5LkhLJuYwTKVYyrREgk/nkR4zw7CT/xH8gdLKH3Ep3XZPkiWv
-HYG3Dy+MwwbMLyejSuQOmbp8HkUff6oZRZb9/D0CAwEAAaNCMEAwDgYDVR0PAQH/
-BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFOFmzw7R8bNLtwYgFP6H
-EtX2/vs+MA0GCSqGSIb3DQEBBQUAA4ICAQCoy3JAsnbBfnv8rWTjMnvMPLZdRtP1
-LOJwXcgu2AZ9mNELIaCJWSQBnfmvCX0KI4I01fx8cpm5o9dU9OpScA7F9dY74ToJ
-MuYhOZO9sxXqT2r09Ys/L3yNWC7F4TmgPsc9SnOeQHrAK2GpZ8nzJLmzbVUsWh2e
-JXLOC62qx1ViC777Y7NhRCOjy+EaDveaBk3e1CNOIZZbOVtXHS9dCF4Jef98l7VN
-g64N1uajeeAz0JmWAjCnPv/So0M/BVoG6kQC2nz4SNAzqfkHx5Xh9T71XXG68pWp
-dIhhWeO/yloTunK0jF02h+mmxTwTv97QRCbut+wucPrXnbes5cVAWubXbHssw1ab
-R80LzvobtCHXt2a49CUwi1wNuepnsvRtrtWhnk/Yn+knArAdBtaP4/tIEp9/EaEQ
-PkxROpaw0RPxx9gmrjrKkcRpnd8BKWRRb2jaFOwIQZeQjdCygPLPwj2/kWjFgGce
-xGATVdVhmVd8upUPYUk6ynW8yQqTP2cOEvIo4jEbwFcW3wh8GcF+Dx+FHgo2fFt+
-J7x6v+Db9NpSvd4MVHAxkUOVyLzwPt0JfjBkUO1/AaQzZ01oT74V77D2AhGiGxMl
-OtzCWfHjXEa7ZywCRuoeSKbmW9m1vFGikpbbqsY3Iqb+zCB0oy2pLmvLwIIRIbWT
-ee5Ehr7XHuQe+w==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/CertificationAuthorityofWoSignG2.crt b/test/rules/platform_certs/default/CertificationAuthorityofWoSignG2.crt
deleted file mode 100644
index d16f4e90bb38..000000000000
--- a/test/rules/platform_certs/default/CertificationAuthorityofWoSignG2.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDfDCCAmSgAwIBAgIQayXaioidfLwPBbOxemFFRDANBgkqhkiG9w0BAQsFADBY
-MQswCQYDVQQGEwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxLTArBgNV
-BAMTJENlcnRpZmljYXRpb24gQXV0aG9yaXR5IG9mIFdvU2lnbiBHMjAeFw0xNDEx
-MDgwMDU4NThaFw00NDExMDgwMDU4NThaMFgxCzAJBgNVBAYTAkNOMRowGAYDVQQK
-ExFXb1NpZ24gQ0EgTGltaXRlZDEtMCsGA1UEAxMkQ2VydGlmaWNhdGlvbiBBdXRo
-b3JpdHkgb2YgV29TaWduIEcyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAvsXEoCKASU+/2YcRxlPhuw+9YH+v9oIOH9ywjj2X4FA8jzrvZjtFB5sg+OPX
-JYY1kBaiXW8wGQiHC38Gsp1ij96vkqVg1CuAmlI/9ZqD6TRay9nVYlzmDuDfBpgO
-gHzKtB0TiGsOqCR3A9DuW/PKaZE1OVbFbeP3PU9ekzgkyhjpJMuSA93MHD0JcOQg
-5PGurLtzaaNjOg9FD6FKmsLRY6zLEPg95k4ot+vElbGs/V6r+kHLXZ1L3PR8du9n
-fwB6jdKgGlxNIuG12t12s9R23164i5jIFFTMaxeSt+BKv0mUYQs4kI9dJGwlezt5
-2eJ+na2fmKEG/HgUYFf47oB3sQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
-VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU+mCp62XF3RYUCE4MD42b4Pdkr2cwDQYJ
-KoZIhvcNAQELBQADggEBAFfDejaCnI2Y4qtAqkePx6db7XznPWZaOzG73/MWM5H8
-fHulwqZm46qwtyeYP0nXYGdnPzZPSsvxFPpahygc7Y9BMsaV+X3avXtbwrAh449G
-3CE4Q3RM+zD4F3LBMvzIkRfEzFg3TgvMWvchNSiDbGAtROtSjFA9tWwS1/oJu2yy
-SrHFieT801LYYRf+epSEj3m2M1m6D8QL4nCgS3gu+sif/a+RZQp4OBXllxcU3fng
-LDT4ONCEIgDAFFEYKwLcMFrw6AF8NTojrwjkr6qOKEJJLvD1mTS+7Q9LGOHSJDy7
-XUe3IfKN0QqZjuNuPq1w4I+5ysxugTH2e5x6eeRncRg=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/Certigna.crt b/test/rules/platform_certs/default/Certigna.crt
deleted file mode 100644
index 2adee5705e34..000000000000
--- a/test/rules/platform_certs/default/Certigna.crt
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNV
-BAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4X
-DTA3MDYyOTE1MTMwNVoXDTI3MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQ
-BgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwIQ2VydGlnbmEwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7qXOEm7RFHYeGifBZ4
-QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyHGxny
-gQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbw
-zBfsV1/pogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q
-130yGLMLLGq/jj8UEYkgDncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2
-JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKfIrjxwo1p3Po6WAbfAgMBAAGjgbwwgbkw
-DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQtCRZvgHyUtVF9lo53BEw
-ZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJBgNVBAYT
-AkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzj
-AQ/JSP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG
-9w0BAQUFAAOCAQEAhQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8h
-bV6lUmPOEvjvKtpv6zf+EwLHyzs+ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFnc
-fca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1kluPBS1xp81HlDQwY9qcEQCYsuu
-HWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY1gkIl2PlwS6w
-t0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
-WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
------END CERTIFICATE-----
diff --git "a/test/rules/platform_certs/default/Certinomis-Autorit\303\251Racine.crt" "b/test/rules/platform_certs/default/Certinomis-Autorit\303\251Racine.crt"
deleted file mode 100644
index 419df1041ee2..000000000000
--- "a/test/rules/platform_certs/default/Certinomis-Autorit\303\251Racine.crt"
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFnDCCA4SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjET
-MBEGA1UEChMKQ2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxJjAk
-BgNVBAMMHUNlcnRpbm9taXMgLSBBdXRvcml0w6kgUmFjaW5lMB4XDTA4MDkxNzA4
-Mjg1OVoXDTI4MDkxNzA4Mjg1OVowYzELMAkGA1UEBhMCRlIxEzARBgNVBAoTCkNl
-cnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMSYwJAYDVQQDDB1DZXJ0
-aW5vbWlzIC0gQXV0b3JpdMOpIFJhY2luZTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
-ADCCAgoCggIBAJ2Fn4bT46/HsmtuM+Cet0I0VZ35gb5j2CN2DpdUzZlMGvE5x4jY
-F1AMnmHawE5V3udauHpOd4cN5bjr+p5eex7Ezyh0x5P1FMYiKAT5kcOrJ3NqDi5N
-8y4oH3DfVS9O7cdxbwlyLu3VMpfQ8Vh30WC8Tl7bmoT2R2FFK/ZQpn9qcSdIhDWe
-rP5pqZ56XjUl+rSnSTV3lqc2W+HN3yNw2F1MpQiD8aYkOBOo7C+ooWfHpi2GR+6K
-/OybDnT0K0kCe5B1jPyZOQE51kqJ5Z52qz6WKDgmi92NjMD2AR5vpTESOH2VwnHu
-7XSu5DaiQ3XV8QCb4uTXzEIDS3h65X27uK4uIJPT5GHfceF2Z5c/tt9qc1pkIuVC
-28+BA5PY9OMQ4HL2AHCs8MF6DwV/zzRpRbWT5BnbUhYjBYkOjUjkJW+zeL9i9Qf6
-lSTClrLooyPCXQP8w9PlfMl1I9f09bze5N/NgL+RiH2nE7Q5uiy6vdFrzPOlKO1E
-nn1So2+WLhl+HPNbxxaOu2B9d2ZHVIIAEWBsMsGoOBvrbpgT1u449fCfDu/+MYHB
-0iSVL1N6aaLwD4ZFjliCK0wi1F6g530mJ0jfJUaNSih8hp75mxpZuWW/Bd22Ql09
-5gBIgl4g9xGC3srYn+Y3RyYe63j3YcNBZFgCQfna4NH4+ej9Uji29YnfAgMBAAGj
-WzBZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQN
-jLZh2kS40RR9w759XkjwzspqsDAXBgNVHSAEEDAOMAwGCiqBegFWAgIAAQEwDQYJ
-KoZIhvcNAQEFBQADggIBACQ+YAZ+He86PtvqrxyaLAEL9MW12Ukx9F1BjYkMTv9s
-ov3/4gbIOZ/xWqndIlgVqIrTseYyCYIDbNc/CMf4uboAbbnW/FIyXaR/pDGUu7ZM
-OH8oMDX/nyNTt7buFHAAQCvaR6s0fl6nVjBhK4tDrP22iCj1a7Y+YEq6QpA0Z43q
-619FVDsXrIvkxmUP7tCMXWY5zjKn2BCXwH40nJ+U8/aGH88bc62UeYdocMMzpXDn
-2NU4lG9jeeu/Cg4I58UvD0KgKxRA/yHgBcUn4YQRE7rWhh1BCxMjidPJC+iKunqj
-o3M3NYB9Ergzd0A4wPpeMNLytqOx1qKVl4GbUu1pTP+A5FPbVFsDbVRfsbjvJL1v
-nxHDx2TCDyhihWZeGnuyt++uNckZM6i4J9szVb9o4XVIRFb7zdNIu0eJOqxp9YDG
-5ERQL1TEqkPFMTFYvZbF6nVsmnWxTfj3l/+WFvKXTej28xH5On2KOG4Ey+HTRRWq
-pdEdnV1j6CTmNhTih60bWfVEm/vXd3wfAXBioSAaosUaKPQhA+4u2cGA6rnZgtZb
-dsLLO7XSAPCjDuGtbkD326C00EauFddEwk01+dIL8hf2rGbVJLJP0RyZwG71fet0
-BLj5TXcJ17TPBzAJ8bgAVtkXFhYKK4bfjwEZGuW7gmP/vgt2Fl43N+bYdJeimUV5
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/Certinomis-RootCA.crt b/test/rules/platform_certs/default/Certinomis-RootCA.crt
deleted file mode 100644
index 9fb14f640591..000000000000
--- a/test/rules/platform_certs/default/Certinomis-RootCA.crt
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFkjCCA3qgAwIBAgIBATANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJGUjET
-MBEGA1UEChMKQ2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxHTAb
-BgNVBAMTFENlcnRpbm9taXMgLSBSb290IENBMB4XDTEzMTAyMTA5MTcxOFoXDTMz
-MTAyMTA5MTcxOFowWjELMAkGA1UEBhMCRlIxEzARBgNVBAoTCkNlcnRpbm9taXMx
-FzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMR0wGwYDVQQDExRDZXJ0aW5vbWlzIC0g
-Um9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANTMCQosP5L2
-fxSeC5yaah1AMGT9qt8OHgZbn1CF6s2Nq0Nn3rD6foCWnoR4kkjW4znuzuRZWJfl
-LieY6pOod5tK8O90gC3rMB+12ceAnGInkYjwSond3IjmFPnVAy//ldu9n+ws+hQV
-WZUKxkd8aRi5pwP5ynapz8dvtF4F/u7BUrJ1Mofs7SlmO/NKFoL21prbcpjp3vDF
-TKWrteoB4owuZH9kb/2jJZOLyKIOSY008B/sWEUuNKqEUL3nskoTuLAPrjhdsKkb
-5nPJWqHZZkCqqU2mNAKthH6yI8H7KsZn9DS2sJVqM09xRLWtwHkziOC/7aOgFLSc
-CbAK42C++PhmiM1b8XcF4LVzbsF9Ri6OSyemzTUK/eVNfaoqoynHWmgE6OXWk6Ri
-wsXm9E/G+Z8ajYJJGYrKWUM66A0ywfRMEwNvbqY/kXPLynNvEiCL7sCCeN5LLsJJ
-wx3tFvYk9CcbXFcx3FXuqB5vbKziRcxXV4p1VxngtViZSTYxPDMBbRZKzbgqg4SG
-m/lg0h9tkQPTYKbVPZrdd5A9NaSfD171UkRpucC63M9933zZxKyGIjK8e2uR73r4
-F2iw4lNVYC2vPsKD2NkJK/DAZNuHi5HMkesE/Xa0lZrmFAYb1TQdvtj/dBxThZng
-WVJKYe2InmtJiUZ+IFrZ50rlau7SZRFDAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIB
-BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTvkUz1pcMw6C8I6tNxIqSSaHh0
-2TAfBgNVHSMEGDAWgBTvkUz1pcMw6C8I6tNxIqSSaHh02TANBgkqhkiG9w0BAQsF
-AAOCAgEAfj1U2iJdGlg+O1QnurrMyOMaauo++RLrVl89UM7g6kgmJs95Vn6RHJk/
-0KGRHCwPT5iVWVO90CLYiF2cN/z7ZMF4jIuaYAnq1fohX9B0ZedQxb8uuQsLrbWw
-F6YSjNRieOpWauwK0kDDPAUwPk2Ut59KA9N9J0u2/kTO+hkzGm2kQtHdzMjI1xZS
-g081lLMSVX3l4kLr5JyTCcBMWwerx20RoFAXlCOotQqSD7J6wWAsOMwaplv/8gzj
-qh8c3LigkyfeY+N/IZ865Z764BNqdeuWXGKRlI5nU7aJ+BIJy29SWwNyhlCVCNSN
-h4YVH5Uk2KRvms6knZtt0rJ2BobGVgjF6wnaNsIbW0G+YSrjcOa4pvi2WsS9Iff/
-ql+hbHY5ZtbqTFXhADObE5hjyW/QASAJN1LnDE8+zbz1X5YnpyACleAu6AdBBR8V
-btaw5BngDwKTACdyxYvRVB9dSsNAl35VpnzBMwQUAR1JIGkLGZOdblgi90AMRgwj
-Y/M50n92Uaf0yKHxDHYiI0ZSKS3io0EHVmmY0gUJvGnHWmHNj4FgFU2A3ZDifcRQ
-8ow7bkrHxuaAKzyBvBGAFhAn1/DNP3nMcyrDflOR1m749fPH0FFNjkulW+YZFzvW
-gQncItzujrnEj1PhZ7szuIgVRs/taTX/dQ1G885x4cVrhkIGuUE=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/CertumCA.crt b/test/rules/platform_certs/default/CertumCA.crt
deleted file mode 100644
index 5d522d111a9f..000000000000
--- a/test/rules/platform_certs/default/CertumCA.crt
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM
-MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
-QTAeFw0wMjA2MTExMDQ2MzlaFw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBM
-MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
-QTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6xwS7TT3zNJc4YPk/E
-jG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdLkKWo
-ePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GI
-ULdtlkIJ89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapu
-Ob7kky/ZR6By6/qmW6/KUz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUg
-AKpoC6EahQGcxEZjgoi2IrHu/qpGWX7PNSzVttpd90gzFFS269lvzs2I1qsb2pY7
-HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA
-uI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+GXYkHAQa
-TOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTg
-xSvgGrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1q
-CjqTE5s7FCMTY5w/0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5x
-O/fIR/RpbxXyEV6DHpx8Uq79AtoSqFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs
-6GAqm4VKQPNriiTsBhYscw==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/CertumTrustedNetworkCA.crt b/test/rules/platform_certs/default/CertumTrustedNetworkCA.crt
deleted file mode 100644
index b35b4a549a86..000000000000
--- a/test/rules/platform_certs/default/CertumTrustedNetworkCA.crt
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBM
-MSIwIAYDVQQKExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5D
-ZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBU
-cnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIyMTIwNzM3WhcNMjkxMjMxMTIwNzM3
-WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMg
-Uy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSIw
-IAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rH
-UV+rpDKmYYe2bg+G0jACl/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LM
-TXPb865Px1bVWqeWifrzq2jUI4ZZJ88JJ7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVU
-BBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4fOQtf/WsX+sWn7Et0brM
-kUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0cvW0QM8x
-AcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNV
-HRMBAf8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNV
-HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15y
-sHhE49wcrwn9I0j6vSrEuVUEtRCjjSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfL
-I9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1mS1FhIrlQgnXdAIv94nYmem8
-J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5ajZt3hrvJBW8qY
-VoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
-03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/CertumTrustedNetworkCA2.crt b/test/rules/platform_certs/default/CertumTrustedNetworkCA2.crt
deleted file mode 100644
index ff9764c06e88..000000000000
--- a/test/rules/platform_certs/default/CertumTrustedNetworkCA2.crt
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIF0jCCA7qgAwIBAgIQIdbQSk8lD8kyN/yqXhKN6TANBgkqhkiG9w0BAQ0FADCB
-gDELMAkGA1UEBhMCUEwxIjAgBgNVBAoTGVVuaXpldG8gVGVjaG5vbG9naWVzIFMu
-QS4xJzAlBgNVBAsTHkNlcnR1bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEkMCIG
-A1UEAxMbQ2VydHVtIFRydXN0ZWQgTmV0d29yayBDQSAyMCIYDzIwMTExMDA2MDgz
-OTU2WhgPMjA0NjEwMDYwODM5NTZaMIGAMQswCQYDVQQGEwJQTDEiMCAGA1UEChMZ
-VW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5MSQwIgYDVQQDExtDZXJ0dW0gVHJ1c3RlZCBOZXR3
-b3JrIENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC9+Xj45tWA
-DGSdhhuWZGc/IjoedQF97/tcZ4zJzFxrqZHmuULlIEub2pt7uZld2ZuAS9eEQCsn
-0+i6MLs+CRqnSZXvK0AkwpfHp+6bJe+oCgCXhVqqndwpyeI1B+twTUrWwbNWuKFB
-OJvR+zF/j+Bf4bE/D44WSWDXBo0Y+aomEKsq09DRZ40bRr5HMNUuctHFY9rnY3lE
-fktjJImGLjQ/KUxSiyqnwOKRKIm5wFv5HdnnJ63/mgKXwcZQkpsCLL2puTRZCr+E
-Sv/f/rOf69me4Jgj7KZrdxYq28ytOxykh9xGc14ZYmhFV+SQgkK7QtbwYeDBoz1m
-o130GO6IyY0XRSmZMnUCMe4pJshrAua1YkV/NxVaI2iJ1D7eTiew8EAMvE0Xy02i
-sx7QBlrd9pPPV3WZ9fqGGmd4s7+W/jTcvedSVuWz5XV710GRBdxdaeOVDUO5/IOW
-OZV7bIBaTxNyxtd9KXpEulKkKtVBRgkg/iKgtlswjbyJDNXXcPiHUv3a76xRLgez
-Tv7QCdpw75j6VuZt27VXS9zlLCUVyJ4ueE742pyehizKV/Ma5ciSixqClnrDvFAS
-adgOWkaLOusm+iPJtrCBvkIApPjW/jAux9JG9uWOdf3yzLnQh1vMBhBgu4M1t15n
-3kfsmUjxpKEV/q2MYo45VU85FrmxY53/twIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MB0GA1UdDgQWBBS2oVQ5AsOgP46KvPrU+Bym0ToO/TAOBgNVHQ8BAf8EBAMC
-AQYwDQYJKoZIhvcNAQENBQADggIBAHGlDs7k6b8/ONWJWsQCYftMxRQXLYtPU2sQ
-F/xlhMcQSZDe28cmk4gmb3DWAl45oPePq5a1pRNcgRRtDoGCERuKTsZPpd1iHkTf
-CVn0W3cLN+mLIMb4Ck4uWBzrM9DPhmDJ2vuAL55MYIR4PSFk1vtBHxgP58l1cb29
-XN40hz5BsA72udY/CROWFC/emh1auVbONTqwX3BNXuMp8SMoclm2q8KMZiYcdywm
-djWLKKdpoPk79SPdhRB0yZADVpHnr7pH1BKXESLjokmUbOe3lEu6LaTaM4tMpkT/
-WjzGHWTYtTHkpjx6qFcL2+1hGsvxznN3Y6SHb0xRONbkX8eftoEq5IVIeVheO/jb
-AoJnwTnbw3RLPTYe+SmTiGhbqEQZIfCn6IENLOiTNrQ3ssqwGyZ6miUfmpqAnksq
-P/ujmv5zMnHCnsZy4YpoJ/HkD7TETKVhk/iXEAcqMCWpuchxuO9ozC1+9eB+D4Ko
-b7a6bINDd82Kkhehnlt4Fj1F4jNy3eFmypnTycUm/Q1oBEauttmbjL4ZvrHG8hnj
-XALKLNhvSgfZyTXaQHXyxKcZb55CEJh15pWLYLztxRLXis7VmFxWlgPF7ncGNf/P
-5O4/E2Hu29othfDNrp2yGAlFw5Khchf8R7agCyzxxN5DaAhqXzvwdmP7zAYspsbi
-DrW5viSP
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/ChambersofCommerceRoot-2008.crt b/test/rules/platform_certs/default/ChambersofCommerceRoot-2008.crt
deleted file mode 100644
index 42e1e39c4ac5..000000000000
--- a/test/rules/platform_certs/default/ChambersofCommerceRoot-2008.crt
+++ /dev/null
@@ -1,42 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
-VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
-IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
-MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xKTAnBgNVBAMTIENoYW1iZXJz
-IG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEyMjk1MFoXDTM4MDcz
-MTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBj
-dXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIw
-EAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEp
-MCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0G
-CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW9
-28sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKAXuFixrYp4YFs8r/lfTJq
-VKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorjh40G072Q
-DuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR
-5gN/ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfL
-ZEFHcpOrUMPrCXZkNNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05a
-Sd+pZgvMPMZ4fKecHePOjlO+Bd5gD2vlGts/4+EhySnB8esHnFIbAURRPHsl18Tl
-UlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331lubKgdaX8ZSD6e2wsWsSaR6s
-+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ0wlf2eOKNcx5
-Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
-ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAx
-hduub+84Mxh2EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNV
-HQ4EFgQU+SSsD7K1+HnA+mCIG8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1
-+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpN
-YWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29t
-L2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVy
-ZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAt
-IDIwMDiCCQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRV
-HSAAMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20w
-DQYJKoZIhvcNAQEFBQADggIBAJASryI1wqM58C7e6bXpeHxIvj99RZJe6dqxGfwW
-PJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH3qLPaYRgM+gQDROpI9CF
-5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbURWpGqOt1
-glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaH
-FoI6M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2
-pSB7+R5KBWIBpih1YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MD
-xvbxrN8y8NmBGuScvfaAFPDRLLmF9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QG
-tjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcKzBIKinmwPQN/aUv0NCB9szTq
-jktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvGnrDQWzilm1De
-fhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
-OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZ
-d0jQ
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/ChambersofCommerceRoot.crt b/test/rules/platform_certs/default/ChambersofCommerceRoot.crt
deleted file mode 100644
index 36a51a1c0f99..000000000000
--- a/test/rules/platform_certs/default/ChambersofCommerceRoot.crt
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEn
-MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL
-ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMg
-b2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAxNjEzNDNaFw0zNzA5MzAxNjEzNDRa
-MH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZpcm1hIFNBIENJRiBB
-ODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3JnMSIw
-IAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0B
-AQEFAAOCAQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtb
-unXF/KGIJPov7coISjlUxFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0d
-BmpAPrMMhe5cG3nCYsS4No41XQEMIwRHNaqbYE6gZj3LJgqcQKH0XZi/caulAGgq
-7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jWDA+wWFjbw2Y3npuRVDM3
-0pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFVd9oKDMyX
-roDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIG
-A1UdEwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5j
-aGFtYmVyc2lnbi5vcmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p
-26EpW1eLTXYGduHRooowDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIA
-BzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hhbWJlcnNpZ24ub3JnMCcGA1Ud
-EgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYDVR0gBFEwTzBN
-BgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz
-aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEB
-AAxBl8IahsAifJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZd
-p0AJPaxJRUXcLo0waLIJuvvDL8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi
-1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wNUPf6s+xCX6ndbcj0dc97wXImsQEc
-XCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/nADydb47kMgkdTXg0
-eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1erfu
-tGWaIZDgqtCYvDi1czyL+Nw=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/ChinaInternetNetworkInformationCenterEVCertificatesRoot.crt b/test/rules/platform_certs/default/ChinaInternetNetworkInformationCenterEVCertificatesRoot.crt
deleted file mode 100644
index 5ec4ff6fcd54..000000000000
--- a/test/rules/platform_certs/default/ChinaInternetNetworkInformationCenterEVCertificatesRoot.crt
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID9zCCAt+gAwIBAgIESJ8AATANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMC
-Q04xMjAwBgNVBAoMKUNoaW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24g
-Q2VudGVyMUcwRQYDVQQDDD5DaGluYSBJbnRlcm5ldCBOZXR3b3JrIEluZm9ybWF0
-aW9uIENlbnRlciBFViBDZXJ0aWZpY2F0ZXMgUm9vdDAeFw0xMDA4MzEwNzExMjVa
-Fw0zMDA4MzEwNzExMjVaMIGKMQswCQYDVQQGEwJDTjEyMDAGA1UECgwpQ2hpbmEg
-SW50ZXJuZXQgTmV0d29yayBJbmZvcm1hdGlvbiBDZW50ZXIxRzBFBgNVBAMMPkNo
-aW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24gQ2VudGVyIEVWIENlcnRp
-ZmljYXRlcyBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm35z
-7r07eKpkQ0H1UN+U8i6yjUqORlTSIRLIOTJCBumD1Z9S7eVnAztUwYyZmczpwA//
-DdmEEbK40ctb3B75aDFk4Zv6dOtouSCV98YPjUesWgbdYavi7NifFy2cyjw1l1Vx
-zUOFsUcW9SxTgHbP0wBkvUCZ3czY28Sf1hNfQYOL+Q2HklY0bBoQCxfVWhyXWIQ8
-hBouXJE0bhlffxdpxWXvayHG1VA6v2G5BY3vbzQ6sm8UY78WO5upKv23KzhmBsUs
-4qpnHkWnjQRmQvaPK++IIGmPMowUc9orhpFjIpryp9vOiYurXccUwVswah+xt54u
-gQEC7c+WXmPbqOY4twIDAQABo2MwYTAfBgNVHSMEGDAWgBR8cks5x8DbYqVPm6oY
-NJKiyoOCWTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E
-FgQUfHJLOcfA22KlT5uqGDSSosqDglkwDQYJKoZIhvcNAQEFBQADggEBACrDx0M3
-j92tpLIM7twUbY8opJhJywyA6vPtI2Z1fcXTIWd50XPFtQO3WKwMVC/GVhMPMdoG
-52U7HW8228gd+f2ABsqjPWYWqJ1MFn3AlUa1UeTiH9fqBk1jjZaM7+czV0I664zB
-echNdn3e9rG3geCg+aF4RhcaVpjwTj2rHO3sOdwHSPdj/gauwqRcalsyiMXHM4Ws
-ZkJHwlgkmeHlPuV1LI5D1l08eB6olYIpUNHRFrrvwb562bTYzB5MRuF3sTGrvSrI
-zo9uoV1/A3U05K2JRVRevq4opbs/eHnrc7MKDf2+yfdWrPa37S+bISnHOLaVxATy
-wy39FCqQmbkHzJ8=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/Class2PrimaryCA.crt b/test/rules/platform_certs/default/Class2PrimaryCA.crt
deleted file mode 100644
index 20d5dd59214c..000000000000
--- a/test/rules/platform_certs/default/Class2PrimaryCA.crt
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAw
-PTELMAkGA1UEBhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFz
-cyAyIFByaW1hcnkgQ0EwHhcNOTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9
-MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2VydHBsdXMxGzAZBgNVBAMTEkNsYXNz
-IDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANxQ
-ltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR5aiR
-VhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyL
-kcAbmXuZVg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCd
-EgETjdyAYveVqUSISnFOYFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yas
-H7WLO7dDWWuwJKZtkIvEcupdM5i3y95ee++U8Rs+yskhwcWYAqqi9lt3m/V+llU0
-HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRMECDAGAQH/AgEKMAsGA1Ud
-DwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJYIZIAYb4
-QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMu
-Y29tL0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/
-AN9WM2K191EBkOvDP9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8
-yfFC82x/xXp8HVGIutIKPidd3i1RTtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMR
-FcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+7UCmnYR0ObncHoUW2ikbhiMA
-ybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW//1IMwrh3KWB
-kJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7
-l7+ijrRU
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/ComSignCA.crt b/test/rules/platform_certs/default/ComSignCA.crt
deleted file mode 100644
index 49a279eb7db7..000000000000
--- a/test/rules/platform_certs/default/ComSignCA.crt
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDkzCCAnugAwIBAgIQFBOWgxRVjOp7Y+X8NId3RDANBgkqhkiG9w0BAQUFADA0
-MRMwEQYDVQQDEwpDb21TaWduIENBMRAwDgYDVQQKEwdDb21TaWduMQswCQYDVQQG
-EwJJTDAeFw0wNDAzMjQxMTMyMThaFw0yOTAzMTkxNTAyMThaMDQxEzARBgNVBAMT
-CkNvbVNpZ24gQ0ExEDAOBgNVBAoTB0NvbVNpZ24xCzAJBgNVBAYTAklMMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8ORUaSvTx49qROR+WCf4C9DklBKK
-8Rs4OC8fMZwG1Cyn3gsqrhqg455qv588x26i+YtkbDqthVVRVKU4VbirgwTyP2Q2
-98CNQ0NqZtH3FyrV7zb6MBBC11PN+fozc0yz6YQgitZBJzXkOPqUm7h65HkfM/sb
-2CEJKHxNGGleZIp6GZPKfuzzcuc3B1hZKKxC+cX/zT/npfo4sdAMx9lSGlPWgcxC
-ejVb7Us6eva1jsz/D3zkYDaHL63woSV9/9JLEYhwVKZBqGdTUkJe5DSe5L6j7Kpi
-Xd3DTKaCQeQzC6zJMw9kglcq/QytNuEMrkvF7zuZ2SOzW120V+x0cAwqTwIDAQAB
-o4GgMIGdMAwGA1UdEwQFMAMBAf8wPQYDVR0fBDYwNDAyoDCgLoYsaHR0cDovL2Zl
-ZGlyLmNvbXNpZ24uY28uaWwvY3JsL0NvbVNpZ25DQS5jcmwwDgYDVR0PAQH/BAQD
-AgGGMB8GA1UdIwQYMBaAFEsBmz5WGmU2dst7l6qSBe4y5ygxMB0GA1UdDgQWBBRL
-AZs+VhplNnbLe5eqkgXuMucoMTANBgkqhkiG9w0BAQUFAAOCAQEA0Nmlfv4pYEWd
-foPPbrxHbvUanlR2QnG0PFg/LUAlQvaBnPGJEMgOqnhPOAlXsDzACPw1jvFIUY0M
-cXS6hMTXcpuEfDhOZAYnKuGntewImbQKDdSFc8gS4TXt8QUxHXOZDOuWyt3T5oWq
-8Ir7dcHyCTxlZWTzTNity4hp8+SDtwy9F1qWF8pb/627HOkthIDYIb6FUtnUdLlp
-hbpN7Sgy6/lhSuTENh4Z3G+EER+V9YMoGKgzkkMn3V0TBEVPh9VGzT2ouvDzuFYk
-Res3x+F2T3I5GN9+dHLHcy056mDmrRGiVod7w2ia/viMcKjfZTL0pECMocJEAw6U
-AGegcQCCSA==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/ComSignSecuredCA.crt b/test/rules/platform_certs/default/ComSignSecuredCA.crt
deleted file mode 100644
index f5a7dbb50cb8..000000000000
--- a/test/rules/platform_certs/default/ComSignSecuredCA.crt
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDqzCCApOgAwIBAgIRAMcoRwmzuGxFjB36JPU2TukwDQYJKoZIhvcNAQEFBQAw
-PDEbMBkGA1UEAxMSQ29tU2lnbiBTZWN1cmVkIENBMRAwDgYDVQQKEwdDb21TaWdu
-MQswCQYDVQQGEwJJTDAeFw0wNDAzMjQxMTM3MjBaFw0yOTAzMTYxNTA0NTZaMDwx
-GzAZBgNVBAMTEkNvbVNpZ24gU2VjdXJlZCBDQTEQMA4GA1UEChMHQ29tU2lnbjEL
-MAkGA1UEBhMCSUwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGtWhf
-HZQVw6QIVS3joFd67+l0Kru5fFdJGhFeTymHDEjWaueP1H5XJLkGieQcPOqs49oh
-gHMhCu95mGwfCP+hUH3ymBvJVG8+pSjsIQQPRbsHPaHA+iqYHU4Gk/v1iDurX8sW
-v+bznkqH7Rnqwp9D5PGBpX8QTz7RSmKtUxvLg/8HZaWSLWapW7ha9B20IZFKF3ue
-Mv5WJDmyVIRD9YTC2LxBkMyd1mja6YJQqTtoz7VdApRgFrFD2UNd3V2Hbuq7s8lr
-9gOUCXDeFhF6K+h2j0kQmHe5Y1yLM5d19guMsqtb3nQgJT/j8xH5h2iGNXHDHYwt
-6+UarA9z1YJZQIDTAgMBAAGjgacwgaQwDAYDVR0TBAUwAwEB/zBEBgNVHR8EPTA7
-MDmgN6A1hjNodHRwOi8vZmVkaXIuY29tc2lnbi5jby5pbC9jcmwvQ29tU2lnblNl
-Y3VyZWRDQS5jcmwwDgYDVR0PAQH/BAQDAgGGMB8GA1UdIwQYMBaAFMFL7XC29z58
-ADsAj8c+DkWfHl3sMB0GA1UdDgQWBBTBS+1wtvc+fAA7AI/HPg5Fnx5d7DANBgkq
-hkiG9w0BAQUFAAOCAQEAFs/ukhNQq3sUnjO2QiBq1BW9Cav8cujvR3qQrFHBZE7p
-iL1DRYHjZiM/EoZNGeQFsOY3wo3aBijJD4mkU6l1P7CW+6tMM1X5eCZGbxs2mPtC
-dsGCuY7e+0X5YxtiOzkGynd6qDwJz2w2PQ8KRUtpFhpFfTMDZflScZAmlaxMDPWL
-kz/MdXSFmLr/YnpNH4n+rr2UAJm/EaXc4HnFFgt9AmEd6oX5AhVP51qJThRv4zdL
-hfXBPGHg/QVBspJ/wx2g0K5SZGBrGMYmnNj1ZOQ2GmKfig8+/21OGVZOIJFsnzQz
-OjRXUDpvgV4GxvU+fE6OK85lBi5d0ipTdF7Tbieejw==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/CybertrustGlobalRoot.crt b/test/rules/platform_certs/default/CybertrustGlobalRoot.crt
deleted file mode 100644
index 40390e55a6b1..000000000000
--- a/test/rules/platform_certs/default/CybertrustGlobalRoot.crt
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYG
-A1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2Jh
-bCBSb290MB4XDTA2MTIxNTA4MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UE
-ChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBS
-b290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+Mi8vRRQZhP/8NN5
-7CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW0ozS
-J8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2y
-HLtgwEZLAfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iP
-t3sMpTjr3kfb1V05/Iin89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNz
-FtApD0mpSPCzqrdsxacwOUBdrsTiXSZT8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAY
-XSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/
-MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2MDSgMqAw
-hi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3Js
-MB8GA1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUA
-A4IBAQBW7wojoFROlZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMj
-Wqd8BfP9IjsO0QbE2zZMcwSO5bAi5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUx
-XOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2hO0j9n0Hq0V+09+zv+mKts2o
-omcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+TX3EJIrduPuoc
-A06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
-WL1WMRJOEcgh4LMRkWXbtKaIOM5V
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/D-TRUSTRootClass3CA22009.crt b/test/rules/platform_certs/default/D-TRUSTRootClass3CA22009.crt
deleted file mode 100644
index d8e4fab3bc2f..000000000000
--- a/test/rules/platform_certs/default/D-TRUSTRootClass3CA22009.crt
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEMzCCAxugAwIBAgIDCYPzMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAkRF
-MRUwEwYDVQQKDAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBD
-bGFzcyAzIENBIDIgMjAwOTAeFw0wOTExMDUwODM1NThaFw0yOTExMDUwODM1NTha
-ME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxJzAlBgNVBAMM
-HkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBANOySs96R+91myP6Oi/WUEWJNTrGa9v+2wBoqOADER03
-UAifTUpolDWzU9GUY6cgVq/eUXjsKj3zSEhQPgrfRlWLJ23DEE0NkVJD2IfgXU42
-tSHKXzlABF9bfsyjxiupQB7ZNoTWSPOSHjRGICTBpFGOShrvUD9pXRl/RcPHAY9R
-ySPocq60vFYJfxLLHLGvKZAKyVXMD9O0Gu1HNVpK7ZxzBCHQqr0ME7UAyiZsxGsM
-lFqVlNpQmvH/pStmMaTJOKDfHR+4CS7zp+hnUquVH+BGPtikw8paxTGA6Eian5Rp
-/hnd2HN8gcqW3o7tszIFZYQ05ub9VxC1X3a/L7AQDcUCAwEAAaOCARowggEWMA8G
-A1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP3aFMSfMN4hvR5COfyrYyNJ4PGEMA4G
-A1UdDwEB/wQEAwIBBjCB0wYDVR0fBIHLMIHIMIGAoH6gfIZ6bGRhcDovL2RpcmVj
-dG9yeS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwUm9vdCUyMENsYXNzJTIwMyUy
-MENBJTIwMiUyMDIwMDksTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRl
-cmV2b2NhdGlvbmxpc3QwQ6BBoD+GPWh0dHA6Ly93d3cuZC10cnVzdC5uZXQvY3Js
-L2QtdHJ1c3Rfcm9vdF9jbGFzc18zX2NhXzJfMjAwOS5jcmwwDQYJKoZIhvcNAQEL
-BQADggEBAH+X2zDI36ScfSF6gHDOFBJpiBSVYEQBrLLpME+bUMJm2H6NMLVwMeni
-acfzcNsgFYbQDfC+rAF1hM5+n02/t2A7nPPKHeJeaNijnZflQGDSNiH+0LS4F9p0
-o3/U37CYAqxva2ssJSRyoWXuJVrl5jLn8t+rSfrzkGkj2wTZ51xY/GXUl77M/C4K
-zCUqNQT4YJEVdT1B/yMfGchs64JTBKbkTCJNjYy6zltz7GRUUG3RnFX7acM2w4y8
-PIWmawomDeCTmGCufsYkl4phX5GOZpIJhzbNi5stPvZR1FDUWSi9g/LMKHtThm3Y
-Johw1+qRzT65ysCQblrGXnRl11z+o+I=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/D-TRUSTRootClass3CA2EV2009.crt b/test/rules/platform_certs/default/D-TRUSTRootClass3CA2EV2009.crt
deleted file mode 100644
index 95a7bff737b6..000000000000
--- a/test/rules/platform_certs/default/D-TRUSTRootClass3CA2EV2009.crt
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEQzCCAyugAwIBAgIDCYP0MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkRF
-MRUwEwYDVQQKDAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBD
-bGFzcyAzIENBIDIgRVYgMjAwOTAeFw0wOTExMDUwODUwNDZaFw0yOTExMDUwODUw
-NDZaMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxKjAoBgNV
-BAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAwOTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJnxhDRwui+3MKCOvXwEz75ivJn9gpfSegpn
-ljgJ9hBOlSJzmY3aFS3nBfwZcyK3jpgAvDw9rKFs+9Z5JUut8Mxk2og+KbgPCdM0
-3TP1YtHhzRnp7hhPTFiu4h7WDFsVWtg6uMQYZB7jM7K1iXdODL/ZlGsTl28So/6Z
-qQTMFexgaDbtCHu39b+T7WYxg4zGcTSHThfqr4uRjRxWQa4iN1438h3Z0S0NL2lR
-p75mpoo6Kr3HGrHhFPC+Oh25z1uxav60sUYgovseO3Dvk5h9jHOW8sXvhXCtKSb8
-HgQ+HKDYD8tSg2J87otTlZCpV6LqYQXY+U3EJ/pure3511H3a6UCAwEAAaOCASQw
-ggEgMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNOUikxiEyoZLsyvcop9Ntea
-HNxnMA4GA1UdDwEB/wQEAwIBBjCB3QYDVR0fBIHVMIHSMIGHoIGEoIGBhn9sZGFw
-Oi8vZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBSb290JTIwQ2xh
-c3MlMjAzJTIwQ0ElMjAyJTIwRVYlMjAyMDA5LE89RC1UcnVzdCUyMEdtYkgsQz1E
-RT9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0MEagRKBChkBodHRwOi8vd3d3LmQt
-dHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2xhc3NfM19jYV8yX2V2XzIwMDku
-Y3JsMA0GCSqGSIb3DQEBCwUAA4IBAQA07XtaPKSUiO8aEXUHL7P+PPoeUSbrh/Yp
-3uDx1MYkCenBz1UbtDDZzhr+BlGmFaQt77JLvyAoJUnRpjZ3NOhk31KxEcdzes05
-nsKtjHEh8lprr988TlWvsoRlFIm5d8sqMb7Po23Pb0iUMkZv53GMoKaEGTcH8gNF
-CSuGdXzfX2lXANtu2KZyIktQ1HWYVt+3GP9DQ1CuekR78HlR10M9p9OB0/DJT7na
-xpeG0ILD5EJt/rDiZE4OJudANCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqX
-KVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVvw9y4AyHqnxbxLFS1
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/DSTACESCAX6.crt b/test/rules/platform_certs/default/DSTACESCAX6.crt
deleted file mode 100644
index 6e13a319ef35..000000000000
--- a/test/rules/platform_certs/default/DSTACESCAX6.crt
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIECTCCAvGgAwIBAgIQDV6ZCtadt3js2AdWO4YV2TANBgkqhkiG9w0BAQUFADBb
-MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3Qx
-ETAPBgNVBAsTCERTVCBBQ0VTMRcwFQYDVQQDEw5EU1QgQUNFUyBDQSBYNjAeFw0w
-MzExMjAyMTE5NThaFw0xNzExMjAyMTE5NThaMFsxCzAJBgNVBAYTAlVTMSAwHgYD
-VQQKExdEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdDERMA8GA1UECxMIRFNUIEFDRVMx
-FzAVBgNVBAMTDkRTVCBBQ0VTIENBIFg2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAuT31LMmU3HWKlV1j6IR3dma5WZFcRt2SPp/5DgO0PWGSvSMmtWPu
-ktKe1jzIDZBfZIGxqAgNTNj50wUoUrQBJcWVHAx+PhCEdc/BGZFjz+iokYi5Q1K7
-gLFViYsx+tC3dr5BPTCapCIlF3PoHuLTrCq9Wzgh1SpL11V94zpVvddtawJXa+ZH
-fAjIgrrep4c9oW24MFbCswKBXy314powGCi4ZtPLAZZv6opFVdbgnf9nKxcCpk4a
-ahELfrd755jWjHZvwTvbUJN+5dCOHze4vbrGn2zpfDPyMjwmR/onJALJfh1biEIT
-ajV8fTXpLmaRcpPVMibEdPVTo7NdmvYJywIDAQABo4HIMIHFMA8GA1UdEwEB/wQF
-MAMBAf8wDgYDVR0PAQH/BAQDAgHGMB8GA1UdEQQYMBaBFHBraS1vcHNAdHJ1c3Rk
-c3QuY29tMGIGA1UdIARbMFkwVwYKYIZIAWUDAgEBATBJMEcGCCsGAQUFBwIBFjto
-dHRwOi8vd3d3LnRydXN0ZHN0LmNvbS9jZXJ0aWZpY2F0ZXMvcG9saWN5L0FDRVMt
-aW5kZXguaHRtbDAdBgNVHQ4EFgQUCXIGThhDD+XWzMNqizF7eI+og7gwDQYJKoZI
-hvcNAQEFBQADggEBAKPYjtay284F5zLNAdMEA+V25FYrnJmQ6AgwbN99Pe7lv7Uk
-QIRJ4dEorsTCOlMwiPH1d25Ryvr/ma8kXxug/fKshMrfqfBfBC6tFr8hlxCBPeP/
-h40y3JTlR4peahPJlJU90u7INJXQgNStMgiAVDzgvVJT11J8smk/f3rPanTK+gQq
-nExaBqXpIK1FZg9p8d2/6eMyi/rgwYZNcjwu2JN4Cir42NInPRmJX1p7ijvMDNpR
-rscL9yuwNwXsvFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf2
-9w4LTJxoeHtxMcfrHuBnQfO3oKfN5XozNmr6mis=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/DSTRootCAX3.crt b/test/rules/platform_certs/default/DSTRootCAX3.crt
deleted file mode 100644
index ea08d57a29af..000000000000
--- a/test/rules/platform_certs/default/DSTRootCAX3.crt
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/
-MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow
-PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
-Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O
-rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq
-OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b
-xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw
-7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD
-aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
-HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG
-SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69
-ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr
-AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz
-R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5
-JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo
-Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/DeutscheTelekomRootCA2.crt b/test/rules/platform_certs/default/DeutscheTelekomRootCA2.crt
deleted file mode 100644
index b841079db36f..000000000000
--- a/test/rules/platform_certs/default/DeutscheTelekomRootCA2.crt
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEc
-MBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2Vj
-IFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENB
-IDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5MjM1OTAwWjBxMQswCQYDVQQGEwJE
-RTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxl
-U2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290
-IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEU
-ha88EOQ5bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhC
-QN/Po7qCWWqSG6wcmtoIKyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1Mjwr
-rFDa1sPeg5TKqAyZMg4ISFZbavva4VhYAUlfckE8FQYBjl2tqriTtM2e66foai1S
-NNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aKSe5TBY8ZTNXeWHmb0moc
-QqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTVjlsB9WoH
-txa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAP
-BgNVHRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC
-AQEAlGRZrTlk5ynrE/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756Abrsp
-tJh6sTtU6zkXR34ajgv8HzFZMQSyzhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpa
-IzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8rZ7/gFnkm0W09juwzTkZmDLl
-6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4Gdyd1Lx+4ivn+
-xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
-Cm26OWMohpLzGITY+9HPBVZkVw==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/DigiCertAssuredIDRootCA.crt b/test/rules/platform_certs/default/DigiCertAssuredIDRootCA.crt
deleted file mode 100644
index eb187336a1e0..000000000000
--- a/test/rules/platform_certs/default/DigiCertAssuredIDRootCA.crt
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBl
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJv
-b3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzExMTEwMDAwMDAwWjBlMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl
-cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7c
-JpSIqvTO9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYP
-mDI2dsze3Tyoou9q+yHyUmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+
-wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4
-VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpyoeb6pNnVFzF1roV9Iq4/
-AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whfGHdPAgMB
-AAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW
-BBRF66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYun
-pyGd823IDzANBgkqhkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRC
-dWKuh+vy1dneVrOfzM4UKLkNl2BcEkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTf
-fwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38FnSbNd67IJKusm7Xi+fT8r87cm
-NW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i8b5QZ7dsvfPx
-H2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
-+o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/DigiCertAssuredIDRootG2.crt b/test/rules/platform_certs/default/DigiCertAssuredIDRootG2.crt
deleted file mode 100644
index ce440b875f4d..000000000000
--- a/test/rules/platform_certs/default/DigiCertAssuredIDRootG2.crt
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDljCCAn6gAwIBAgIQC5McOtY5Z+pnI7/Dr5r0SzANBgkqhkiG9w0BAQsFADBl
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJv
-b3QgRzIwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1MTIwMDAwWjBlMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl
-cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ5ygvUj82ckmIkzTz+GoeMVSA
-n61UQbVH35ao1K+ALbkKz3X9iaV9JPrjIgwrvJUXCzO/GU1BBpAAvQxNEP4Htecc
-biJVMWWXvdMX0h5i89vqbFCMP4QMls+3ywPgym2hFEwbid3tALBSfK+RbLE4E9Hp
-EgjAALAcKxHad3A2m67OeYfcgnDmCXRwVWmvo2ifv922ebPynXApVfSr/5Vh88lA
-bx3RvpO704gqu52/clpWcTs/1PPRCv4o76Pu2ZmvA9OPYLfykqGxvYmJHzDNw6Yu
-YjOuFgJ3RFrngQo8p0Quebg/BLxcoIfhG69Rjs3sLPr4/m3wOnyqi+RnlTGNAgMB
-AAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQW
-BBTOw0q5mVXyuNtgv6l+vVa1lzan1jANBgkqhkiG9w0BAQsFAAOCAQEAyqVVjOPI
-QW5pJ6d1Ee88hjZv0p3GeDgdaZaikmkuOGybfQTUiaWxMTeKySHMq2zNixya1r9I
-0jJmwYrA8y8678Dj1JGG0VDjA9tzd29KOVPt3ibHtX2vK0LRdWLjSisCx1BL4Gni
-lmwORGYQRI+tBev4eaymG+g3NJ1TyWGqolKvSnAWhsI6yLETcDbYz+70CjTVW0z9
-B5yiutkBclzzTcHdDrEcDcRjvq30FPuJ7KJBDkzMyFdA0G4Dqs0MjomZmWzwPDCv
-ON9vvKO+KSAnq3T/EyJ43pdSVR6DtVQgA+6uwE9W3jfMw3+qBCe703e4YtsXfJwo
-IhNzbM8m9Yop5w==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/DigiCertAssuredIDRootG3.crt b/test/rules/platform_certs/default/DigiCertAssuredIDRootG3.crt
deleted file mode 100644
index 77ef563f4660..000000000000
--- a/test/rules/platform_certs/default/DigiCertAssuredIDRootG3.crt
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICRjCCAc2gAwIBAgIQC6Fa+h3foLVJRK/NJKBs7DAKBggqhkjOPQQDAzBlMQsw
-CQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cu
-ZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3Qg
-RzMwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1MTIwMDAwWjBlMQswCQYDVQQGEwJV
-UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQu
-Y29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwdjAQBgcq
-hkjOPQIBBgUrgQQAIgNiAAQZ57ysRGXtzbg/WPuNsVepRC0FFfLvC/8QdJ+1YlJf
-Zn4f5dwbRXkLzMZTCp2NXQLZqVneAlr2lSoOjThKiknGvMYDOAdfVdp+CW7if17Q
-RSAPWXYQ1qAk8C3eNvJsKTmjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
-BAQDAgGGMB0GA1UdDgQWBBTL0L2p4ZgFUaFNN6KDec6NHSrkhDAKBggqhkjOPQQD
-AwNnADBkAjAlpIFFAmsSS3V0T8gj43DydXLefInwz5FyYZ5eEJJZVrmDxxDnOOlY
-JjZ91eQ0hjkCMHw2U/Aw5WJjOpnitqM7mzT6HtoQknFekROn3aRukswy1vUhZscv
-6pZjamVFkpUBtA==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/DigiCertGlobalRootCA.crt b/test/rules/platform_certs/default/DigiCertGlobalRootCA.crt
deleted file mode 100644
index 342ecfe41055..000000000000
--- a/test/rules/platform_certs/default/DigiCertGlobalRootCA.crt
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
-QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT
-MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
-b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB
-CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97
-nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt
-43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P
-T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4
-gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO
-BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR
-TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw
-DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr
-hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg
-06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF
-PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls
-YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
-CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/DigiCertGlobalRootG2.crt b/test/rules/platform_certs/default/DigiCertGlobalRootG2.crt
deleted file mode 100644
index 3188acc7d6ea..000000000000
--- a/test/rules/platform_certs/default/DigiCertGlobalRootG2.crt
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBh
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH
-MjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVT
-MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
-b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI
-2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx
-1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQ
-q2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5Wz
-tCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQ
-vIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo0IwQDAP
-BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV
-5uNu5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY
-1Yl9PMWLSn/pvtsrF9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4
-NeF22d+mQrvHRAiGfzZ0JFrabA0UWTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NG
-Fdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBHQRFXGU7Aj64GxJUTFy8bJZ91
-8rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/iyK5S9kJRaTe
-pLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
-MrY=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/DigiCertGlobalRootG3.crt b/test/rules/platform_certs/default/DigiCertGlobalRootG3.crt
deleted file mode 100644
index 8b2ac1c4df72..000000000000
--- a/test/rules/platform_certs/default/DigiCertGlobalRootG3.crt
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICPzCCAcWgAwIBAgIQBVVWvPJepDU1w6QP1atFcjAKBggqhkjOPQQDAzBhMQsw
-CQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cu
-ZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMzAe
-Fw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVTMRUw
-EwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20x
-IDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEczMHYwEAYHKoZIzj0CAQYF
-K4EEACIDYgAE3afZu4q4C/sLfyHS8L6+c/MzXRq8NOrexpu80JX28MzQC7phW1FG
-fp4tn+6OYwwX7Adw9c+ELkCDnOg/QW07rdOkFFk2eJ0DQ+4QE2xy3q6Ip6FrtUPO
-Z9wj/wMco+I+o0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAd
-BgNVHQ4EFgQUs9tIpPmhxdiuNkHMEWNpYim8S8YwCgYIKoZIzj0EAwMDaAAwZQIx
-AK288mw/EkrRLTnDCgmXc/SINoyIJ7vmiI1Qhadj+Z4y3maTD/HMsQmP3Wyr+mt/
-oAIwOWZbwmSNuJ5Q3KjVSaLtx9zRSX8XAbjIho9OjIgrqJqpisXRAL34VOKa5Vt8
-sycX
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/DigiCertHighAssuranceEVRootCA.crt b/test/rules/platform_certs/default/DigiCertHighAssuranceEVRootCA.crt
deleted file mode 100644
index 4b1bc66be0f7..000000000000
--- a/test/rules/platform_certs/default/DigiCertHighAssuranceEVRootCA.crt
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
-ZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDEL
-MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3
-LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug
-RVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm
-+9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW
-PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEM
-xChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFB
-Ik5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3
-hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsg
-EsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF
-MAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaA
-FLE+w2kD+L9HAdSYJhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3Nec
-nzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6z
-eM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jF
-hS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2
-Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
-vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep
-+OkuE6N36B9K
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/DigiCertSHA2ExtendedValidationServerCA.crt b/test/rules/platform_certs/default/DigiCertSHA2ExtendedValidationServerCA.crt
deleted file mode 100644
index b6013e6791fc..000000000000
--- a/test/rules/platform_certs/default/DigiCertSHA2ExtendedValidationServerCA.crt
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEtjCCA56gAwIBAgIQDHmpRLCMEZUgkmFf4msdgzANBgkqhkiG9w0BAQsFADBs
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
-ZSBFViBSb290IENBMB4XDTEzMTAyMjEyMDAwMFoXDTI4MTAyMjEyMDAwMFowdTEL
-MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3
-LmRpZ2ljZXJ0LmNvbTE0MDIGA1UEAxMrRGlnaUNlcnQgU0hBMiBFeHRlbmRlZCBW
-YWxpZGF0aW9uIFNlcnZlciBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBANdTpARR+JmmFkhLZyeqk0nQOe0MsLAAh/FnKIaFjI5j2ryxQDji0/XspQUY
-uD0+xZkXMuwYjPrxDKZkIYXLBxA0sFKIKx9om9KxjxKws9LniB8f7zh3VFNfgHk/
-LhqqqB5LKw2rt2O5Nbd9FLxZS99RStKh4gzikIKHaq7q12TWmFXo/a8aUGxUvBHy
-/Urynbt/DvTVvo4WiRJV2MBxNO723C3sxIclho3YIeSwTQyJ3DkmF93215SF2AQh
-cJ1vb/9cuhnhRctWVyh+HA1BV6q3uCe7seT6Ku8hI3UarS2bhjWMnHe1c63YlC3k
-8wyd7sFOYn4XwHGeLN7x+RAoGTMCAwEAAaOCAUkwggFFMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRp
-Z2ljZXJ0LmNvbTBLBgNVHR8ERDBCMECgPqA8hjpodHRwOi8vY3JsNC5kaWdpY2Vy
-dC5jb20vRGlnaUNlcnRIaWdoQXNzdXJhbmNlRVZSb290Q0EuY3JsMD0GA1UdIAQ2
-MDQwMgYEVR0gADAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5j
-b20vQ1BTMB0GA1UdDgQWBBQ901Cl1qCt7vNKYApl0yHU+PjWDzAfBgNVHSMEGDAW
-gBSxPsNpA/i/RwHUmCYaCALvY2QrwzANBgkqhkiG9w0BAQsFAAOCAQEAnbbQkIbh
-hgLtxaDwNBx0wY12zIYKqPBKikLWP8ipTa18CK3mtlC4ohpNiAexKSHc59rGPCHg
-4xFJcKx6HQGkyhE6V6t9VypAdP3THYUYUN9XR3WhfVUgLkc3UHKMf4Ib0mKPLQNa
-2sPIoc4sUqIAY+tzunHISScjl2SFnjgOrWNoPLpSgVh5oywM395t6zHyuqB8bPEs
-1OG9d4Q3A84ytciagRpKkk47RpqF/oOi+Z6Mo8wNXrM9zwR4jxQUezKcxwCmXMS1
-oVWNWlZopCJwqjyBcdmdqEU79OX2olHdx3ti6G8MdOu42vi/hw15UJGQmxg7kVkn
-8TUoE6smftX3eg==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/DigiCertSHA2SecureServerCA.crt b/test/rules/platform_certs/default/DigiCertSHA2SecureServerCA.crt
deleted file mode 100644
index 22be53bea4b5..000000000000
--- a/test/rules/platform_certs/default/DigiCertSHA2SecureServerCA.crt
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIElDCCA3ygAwIBAgIQAf2j627KdciIQ4tyS8+8kTANBgkqhkiG9w0BAQsFADBh
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
-QTAeFw0xMzAzMDgxMjAwMDBaFw0yMzAzMDgxMjAwMDBaME0xCzAJBgNVBAYTAlVT
-MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJzAlBgNVBAMTHkRpZ2lDZXJ0IFNIQTIg
-U2VjdXJlIFNlcnZlciBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ANyuWJBNwcQwFZA1W248ghX1LFy949v/cUP6ZCWA1O4Yok3wZtAKc24RmDYXZK83
-nf36QYSvx6+M/hpzTc8zl5CilodTgyu5pnVILR1WN3vaMTIa16yrBvSqXUu3R0bd
-KpPDkC55gIDvEwRqFDu1m5K+wgdlTvza/P96rtxcflUxDOg5B6TXvi/TC2rSsd9f
-/ld0Uzs1gN2ujkSYs58O09rg1/RrKatEp0tYhG2SS4HD2nOLEpdIkARFdRrdNzGX
-kujNVA075ME/OV4uuPNcfhCOhkEAjUVmR7ChZc6gqikJTvOX6+guqw9ypzAO+sf0
-/RR3w6RbKFfCs/mC/bdFWJsCAwEAAaOCAVowggFWMBIGA1UdEwEB/wQIMAYBAf8C
-AQAwDgYDVR0PAQH/BAQDAgGGMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYY
-aHR0cDovL29jc3AuZGlnaWNlcnQuY29tMHsGA1UdHwR0MHIwN6A1oDOGMWh0dHA6
-Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEdsb2JhbFJvb3RDQS5jcmwwN6A1
-oDOGMWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEdsb2JhbFJvb3RD
-QS5jcmwwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUHAgEWHGh0dHBzOi8v
-d3d3LmRpZ2ljZXJ0LmNvbS9DUFMwHQYDVR0OBBYEFA+AYRyCMWHVLyjnjUY4tCzh
-xtniMB8GA1UdIwQYMBaAFAPeUDVW0Uy7ZvCj4hsbw5eyPdFVMA0GCSqGSIb3DQEB
-CwUAA4IBAQAjPt9L0jFCpbZ+QlwaRMxp0Wi0XUvgBCFsS+JtzLHgl4+mUwnNqipl
-5TlPHoOlblyYoiQm5vuh7ZPHLgLGTUq/sELfeNqzqPlt/yGFUzZgTHbO7Djc1lGA
-8MXW5dRNJ2Srm8c+cftIl7gzbckTB+6WohsYFfZcTEDts8Ls/3HB40f/1LkAtDdC
-2iDJ6m6K7hQGrn2iWZiIqBtvLfTyyRRfJs8sjX7tN8Cp1Tm5gr8ZDOo0rwAhaPit
-c+LJMto4JQtV05od8GiG7S5BNO98pVAdvzr508EIDObtHopYJeS4d60tbvVS3bR0
-j6tJLp07kzQoH3jOlOrHvdPJbRzeXDLz
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/DigiCertTrustedRootG4.crt b/test/rules/platform_certs/default/DigiCertTrustedRootG4.crt
deleted file mode 100644
index 1a1e4fbc801e..000000000000
--- a/test/rules/platform_certs/default/DigiCertTrustedRootG4.crt
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFkDCCA3igAwIBAgIQBZsbV56OITLiOQe9p3d1XDANBgkqhkiG9w0BAQwFADBi
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3Qg
-RzQwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1MTIwMDAwWjBiMQswCQYDVQQGEwJV
-UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQu
-Y29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz7MKnJS7JIT3y
-ithZwuEppz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS5F/WBTxSD1If
-xp4VpX6+n6lXFllVcq9ok3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7bXHiLQwb7iDV
-ySAdYyktzuxeTsiT+CFhmzTrBcZe7FsavOvJz82sNEBfsXpm7nfISKhmV1efVFiO
-DCu3T6cw2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGYQJB5w3jHtrHEtWoYOAMQ
-jdjUN6QuBX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14Ztk6MUSaM0C/
-CNdaSaTC5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2h4mXaXpI8OCi
-EhtmmnTK3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt6zPZxd9LBADM
-fRyVw4/3IbKyEbe7f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPRiQfhvbfmQ6QY
-uKZ3AeEPlAwhHbJUKSWJbOUOUlFHdL4mrLZBdd56rF+NP8m800ERElvlEFDrMcXK
-chYiCd98THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8oR7FwI+isX4KJpn15GkvmB0t
-9dmpsh3lGwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
-hjAdBgNVHQ4EFgQU7NfjgtJxXWRM3y5nP+e6mK4cD08wDQYJKoZIhvcNAQEMBQAD
-ggIBALth2X2pbL4XxJEbw6GiAI3jZGgPVs93rnD5/ZpKmbnJeFwMDF/k5hQpVgs2
-SV1EY+CtnJYYZhsjDT156W1r1lT40jzBQ0CuHVD1UvyQO7uYmWlrx8GnqGikJ9yd
-+SeuMIW59mdNOj6PWTkiU0TryF0Dyu1Qen1iIQqAyHNm0aAFYF/opbSnr6j3bTWc
-fFqK1qI4mfN4i/RN0iAL3gTujJtHgXINwBQy7zBZLq7gcfJW5GqXb5JQbZaNaHqa
-sjYUegbyJLkJEVDXCLG4iXqEI2FCKeWjzaIgQdfRnGTZ6iahixTXTBmyUEFxPT9N
-cCOGDErcgdLMMpSEDQgJlxxPwO5rIHQw0uA5NBCFIRUBCOhVMt5xSdkoF1BN5r5N
-0XWs0Mr7QbhDparTwwVETyw2m+L64kW4I1NsBm9nVX9GtUw/bihaeSbSpKhil9Ie
-4u1Ki7wb/UdKDd9nZn6yW0HQO+T0O/QEY+nvwlQAUaCKKsnOeMzV6ocEGLPOr0mI
-r/OSmbaz5mEP0oUA51Aa5BuVnRmhuZyxm7EAHu/QD09CbMkKvO5D+jpxpchNJqU1
-/YldvIViHTLSoCtU7ZpXwdv6EM8Zt4tKG48BtieVU+i2iW1bvGjUI+iLUaJW+fCm
-gKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP82Z+
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/E-TugraCertificationAuthority.crt b/test/rules/platform_certs/default/E-TugraCertificationAuthority.crt
deleted file mode 100644
index 5696e22513bb..000000000000
--- a/test/rules/platform_certs/default/E-TugraCertificationAuthority.crt
+++ /dev/null
@@ -1,36 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIGSzCCBDOgAwIBAgIIamg+nFGby1MwDQYJKoZIhvcNAQELBQAwgbIxCzAJBgNV
-BAYTAlRSMQ8wDQYDVQQHDAZBbmthcmExQDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBC
-aWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhpem1ldGxlcmkgQS7Fni4xJjAkBgNV
-BAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBNZXJrZXppMSgwJgYDVQQDDB9FLVR1
-Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMDMwNTEyMDk0OFoXDTIz
-MDMwMzEyMDk0OFowgbIxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmExQDA+
-BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhp
-em1ldGxlcmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBN
-ZXJrZXppMSgwJgYDVQQDDB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4vU/kwVRHoViVF56C/UY
-B4Oufq9899SKa6VjQzm5S/fDxmSJPZQuVIBSOTkHS0vdhQd2h8y/L5VMzH2nPbxH
-D5hw+IyFHnSOkm0bQNGZDbt1bsipa5rAhDGvykPL6ys06I+XawGb1Q5KCKpbknSF
-Q9OArqGIW66z6l7LFpp3RMih9lRozt6Plyu6W0ACDGQXwLWTzeHxE2bODHnv0ZEo
-q1+gElIwcxmOj+GMB6LDu0rw6h8VqO4lzKRG+Bsi77MOQ7osJLjFLFzUHPhdZL3D
-k14opz8n8Y4e0ypQBaNV2cvnOVPAmJ6MVGKLJrD3fY185MaeZkJVgkfnsliNZvcH
-fC425lAcP9tDJMW/hkd5s3kc91r0E+xs+D/iWR+V7kI+ua2oMoVJl0b+SzGPWsut
-dEcf6ZG33ygEIqDUD13ieU/qbIWGvaimzuT6w+Gzrt48Ue7LE3wBf4QOXVGUnhMM
-ti6lTPk5cDZvlsouDERVxcr6XQKj39ZkjFqzAQqptQpHF//vkUAqjqFGOjGY5RH8
-zLtJVor8udBhmm9lbObDyz51Sf6Pp+KJxWfXnUYTTjF2OySznhFlhqt/7x3U+Lzn
-rFpct1pHXFXOVbQicVtbC/DP3KBhZOqp12gKY6fgDT+gr9Oq0n7vUaDmUStVkhUX
-U8u3Zg5mTPj5dUyQ5xJwx0UCAwEAAaNjMGEwHQYDVR0OBBYEFC7j27JJ0JxUeVz6
-Jyr+zE7S6E5UMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAULuPbsknQnFR5
-XPonKv7MTtLoTlQwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQAF
-Nzr0TbdF4kV1JI+2d1LoHNgQk2Xz8lkGpD4eKexd0dCrfOAKkEh47U6YA5n+KGCR
-HTAduGN8qOY1tfrTYXbm1gdLymmasoR6d5NFFxWfJNCYExL/u6Au/U5Mh/jOXKqY
-GwXgAEZKgoClM4so3O0409/lPun++1ndYYRP0lSWE2ETPo+Aab6TR7U1Q9Jauz1c
-77NCR807VRMGsAnb/WP2OogKmW9+4c4bU2pEZiNRCHu8W1Ki/QY3OEBhj0qWuJA3
-+GbHeJAAFS6LrVE1Uweoa2iu+U48BybNCAVwzDk/dr2l02cmAYamU9JgO3xDf1WK
-vJUawSg5TB9D0pH0clmKuVb8P7Sd2nCcdlqMQ1DujjByTd//SffGqWfZbawCEeI6
-FiWnWAjLb1NBnEg4R2gz0dfHj9R0IdTDBZB6/86WiLEVKV0jq9BgoRJP3vQXzTLl
-yb/IQ639Lo7xr+L0mPoSHyDYwKcMhcWQ9DstliaxLL5Mq+ux0orJ23gTDx4JnW2P
-AJ8C2sH6H3p6CcRK5ogql5+Ji/03X186zjhZhkuvcQu02PJwT58yE+Owp1fl2tpD
-y4Q08ijE6m30Ku/Ba3ba+367hTzSU8JNvnHhRdH9I2cNE3X7z2VnIp2usAnRCf8d
-NL/+I5c30jn6PQ0GC7TbO6Orb1wdtn7os4I07QZcJA==
------END CERTIFICATE-----
diff --git "a/test/rules/platform_certs/default/EBGElektronikSertifikaHizmetSa\304\237lay\304\261c\304\261s\304\261.crt" "b/test/rules/platform_certs/default/EBGElektronikSertifikaHizmetSa\304\237lay\304\261c\304\261s\304\261.crt"
deleted file mode 100644
index d0c5e43ef337..000000000000
--- "a/test/rules/platform_certs/default/EBGElektronikSertifikaHizmetSa\304\237lay\304\261c\304\261s\304\261.crt"
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIF5zCCA8+gAwIBAgIITK9zQhyOdAIwDQYJKoZIhvcNAQEFBQAwgYAxODA2BgNV
-BAMML0VCRyBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
-c8SxMTcwNQYDVQQKDC5FQkcgQmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXpt
-ZXRsZXJpIEEuxZ4uMQswCQYDVQQGEwJUUjAeFw0wNjA4MTcwMDIxMDlaFw0xNjA4
-MTQwMDMxMDlaMIGAMTgwNgYDVQQDDC9FQkcgRWxla3Ryb25payBTZXJ0aWZpa2Eg
-SGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTE3MDUGA1UECgwuRUJHIEJpbGnFn2ltIFRl
-a25vbG9qaWxlcmkgdmUgSGl6bWV0bGVyaSBBLsWeLjELMAkGA1UEBhMCVFIwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDuoIRh0DpqZhAy2DE4f6en5f2h
-4fuXd7hxlugTlkaDT7byX3JWbhNgpQGR4lvFzVcfd2NR/y8927k/qqk153nQ9dAk
-tiHq6yOU/im/+4mRDGSaBUorzAzu8T2bgmmkTPiab+ci2hC6X5L8GCcKqKpE+i4s
-tPtGmggDg3KriORqcsnlZR9uKg+ds+g75AxuetpX/dfreYteIAbTdgtsApWjluTL
-dlHRKJ2hGvxEok3MenaoDT2/F08iiFD9rrbskFBKW5+VQarKD7JK/oCZTqNGFav4
-c0JqwmZ2sQomFd2TkuzbqV9UIlKRcF0T6kjsbgNs2d1s/OsNA/+mgxKb8amTD8Um
-TDGyY5lhcucqZJnSuOl14nypqZoaqsNW2xCaPINStnuWt6yHd6i58mcLlEOzrz5z
-+kI2sSXFCjEmN1ZnuqMLfdb3ic1nobc6HmZP9qBVFCVMLDMNpkGMvQQxahByCp0O
-Lna9XvNRiYuoP1Vzv9s6xiQFlpJIqkuNKgPlV5EQ9GooFW5Hd4RcUXSfGenmHmMW
-OeMRFeNYGkS9y8RsZteEBt8w9DeiQyJ50hBs37vmExH8nYQKE3vwO9D8owrXieqW
-fo1IhR5kX9tUoqzVegJ5a9KK8GfaZXINFHDk6Y54jzJ0fFfy1tb0Nokb+Clsi7n2
-l9GkLqq+CxnCRelwXQIDAJ3Zo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
-/wQEAwIBBjAdBgNVHQ4EFgQU587GT/wWZ5b6SqMHwQSny2re2kcwHwYDVR0jBBgw
-FoAU587GT/wWZ5b6SqMHwQSny2re2kcwDQYJKoZIhvcNAQEFBQADggIBAJuYml2+
-8ygjdsZs93/mQJ7ANtyVDR2tFcU22NU57/IeIl6zgrRdu0waypIN30ckHrMk2pGI
-6YNw3ZPX6bqz3xZaPt7gyPvT/Wwp+BVGoGgmzJNSroIBk5DKd8pNSe/iWtkqvTDO
-TLKBtjDOWU/aWR1qeqRFsIImgYZ29fUQALjuswnoT4cCB64kXPBfrAowzIpAoHME
-wfuJJPaaHFy3PApnNgUIMbOv2AFoKuB4j3TeuFGkjGwgPaL7s9QJ/XvCgKqTbCmY
-Iai7FvOpEl90tYeY8pUm3zTvilORiF0alKM/fCL414i6poyWqD1SNGKfAB5UVUJn
-xk1Gj7sURT0KlhaOEKGXmdXTMIXM3rRyt7yKPBgpaP3ccQfuJDlq+u2lrDgv+R4Q
-DgZxGhBM/nV+/x5XOULK1+EVoVZVWRvRo68R2E7DpSvvkL/A7IITW43WciyTTo9q
-Kd+FPNMN4KIYEsxVL0e3p5sC/kH2iExt2qkBR4NkJ2IQgtYSe14DHzSpyZH+r11t
-hie3I6p1GMog57AP14kOpmciY/SDQSsGS7tY1dHXt7kQY9iJSrSq3RZj9W6+YKH4
-7ejWkE8axsWgKdOnIaj1Wjz3x0miIZpKlVIglnKaZsv30oZDfCK+lvm9AahH3eU7
-QPl1K5srRmSGjR70j/sHd9DqSaIcjVIUpgqT
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/EC-ACC.crt b/test/rules/platform_certs/default/EC-ACC.crt
deleted file mode 100644
index cc97a101161a..000000000000
--- a/test/rules/platform_certs/default/EC-ACC.crt
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB
-8zELMAkGA1UEBhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2Vy
-dGlmaWNhY2lvIChOSUYgUS0wODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1
-YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYDVQQLEyxWZWdldSBodHRwczovL3d3
-dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UECxMsSmVyYXJxdWlh
-IEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMTBkVD
-LUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQG
-EwJFUzE7MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8g
-KE5JRiBRLTA4MDExNzYtSSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBD
-ZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZlZ2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQu
-bmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJhcnF1aWEgRW50aXRhdHMg
-ZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUNDMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R
-85iKw5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm
-4CgPukLjbo73FCeTae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaV
-HMf5NLWUhdWZXqBIoH7nF2W4onW4HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNd
-QlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0aE9jD2z3Il3rucO2n5nzbcc8t
-lGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw0JDnJwIDAQAB
-o4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4
-opvpXY0wfwYDVR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBo
-dHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidW
-ZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAwDQYJKoZIhvcN
-AQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJlF7W2u++AVtd0x7Y
-/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNaAl6k
-SBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhy
-Rp/7SNVel+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOS
-Agu+TGbrIP65y7WZf+a2E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xl
-nJ2lYJU6Un/10asIbvPuW/mIPX64b24D5EI=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/EECertificationCentreRootCA.crt b/test/rules/platform_certs/default/EECertificationCentreRootCA.crt
deleted file mode 100644
index 5032e1db83bb..000000000000
--- a/test/rules/platform_certs/default/EECertificationCentreRootCA.crt
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1
-MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1
-czEoMCYGA1UEAwwfRUUgQ2VydGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYG
-CSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIwMTAxMDMwMTAxMDMwWhgPMjAzMDEy
-MTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlBUyBTZXJ0aWZpdHNl
-ZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRyZSBS
-b290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUy
-euuOF0+W2Ap7kaJjbMeMTC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvO
-bntl8jixwKIy72KyaOBhU8E2lf/slLo2rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIw
-WFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw93X2PaRka9ZP585ArQ/d
-MtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtNP2MbRMNE
-1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYD
-VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/
-zQas8fElyalL1BSZMEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYB
-BQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEF
-BQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+RjxY6hUFaTlrg4wCQiZrxTFGGV
-v9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqMlIpPnTX/dqQG
-E5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u
-uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIW
-iAYLtqZLICjU3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/v
-GVCJYMzpJJUPwssd8m92kMfMdcGWxZ0=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/Entrust.netCertificationAuthority(2048).crt b/test/rules/platform_certs/default/Entrust.netCertificationAuthority(2048).crt
deleted file mode 100644
index 064c12762748..000000000000
--- a/test/rules/platform_certs/default/Entrust.netCertificationAuthority(2048).crt
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChML
-RW50cnVzdC5uZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBp
-bmNvcnAuIGJ5IHJlZi4gKGxpbWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5
-IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNVBAMTKkVudHJ1c3QubmV0IENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQxNzUwNTFaFw0yOTA3
-MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3d3d3
-LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxp
-YWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEG
-A1UEAxMqRW50cnVzdC5uZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgp
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArU1LqRKGsuqjIAcVFmQq
-K0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOLGp18EzoOH1u3Hs/lJBQe
-sYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSrhRSGlVuX
-MlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVT
-XTzWnLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/
-HoZdenoVve8AjhUiVBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH
-4QIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
-HQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJKoZIhvcNAQEFBQADggEBADub
-j1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPyT/4xmf3IDExo
-U8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf
-zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5b
-u/8j72gZyxKTJ1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+
-bYQLCIt+jerXmCHG8+c8eS9enNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/Er
-fF6adulZkMV8gzURZVE=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/EntrustRootCertificationAuthority-EC1.crt b/test/rules/platform_certs/default/EntrustRootCertificationAuthority-EC1.crt
deleted file mode 100644
index 5721c403392b..000000000000
--- a/test/rules/platform_certs/default/EntrustRootCertificationAuthority-EC1.crt
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC+TCCAoCgAwIBAgINAKaLeSkAAAAAUNCR+TAKBggqhkjOPQQDAzCBvzELMAkG
-A1UEBhMCVVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3
-d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDEyIEVu
-dHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25seTEzMDEGA1UEAxMq
-RW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRUMxMB4XDTEy
-MTIxODE1MjUzNloXDTM3MTIxODE1NTUzNlowgb8xCzAJBgNVBAYTAlVTMRYwFAYD
-VQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0
-L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxMiBFbnRydXN0LCBJbmMuIC0g
-Zm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMzAxBgNVBAMTKkVudHJ1c3QgUm9vdCBD
-ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEVDMTB2MBAGByqGSM49AgEGBSuBBAAi
-A2IABIQTydC6bUF74mzQ61VfZgIaJPRbiWlH47jCffHyAsWfoPZb1YsGGYZPUxBt
-ByQnoaD41UcZYUx9ypMn6nQM72+WCf5j7HBdNq1nd67JnXxVRDqiY1Ef9eNi1KlH
-Bz7MIKNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
-BBYEFLdj5xrdjekIplWDpOBqUEFlEUJJMAoGCCqGSM49BAMDA2cAMGQCMGF52OVC
-R98crlOZF7ZvHH3hvxGU0QOIdeSNiaSKd0bebWHvAvX7td/M/k7//qnmpwIwW5nX
-hTcGtXsI/esni0qU+eH6p44mCOh8kmhtc9hvJqwhAriZtyZBWyVgrtBIGu4G
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/EntrustRootCertificationAuthority-G2.crt b/test/rules/platform_certs/default/EntrustRootCertificationAuthority-G2.crt
deleted file mode 100644
index b0846cdf3ed8..000000000000
--- a/test/rules/platform_certs/default/EntrustRootCertificationAuthority-G2.crt
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMC
-VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50
-cnVzdC5uZXQvbGVnYWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3Qs
-IEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25seTEyMDAGA1UEAxMpRW50cnVz
-dCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwHhcNMDkwNzA3MTcy
-NTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUVu
-dHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwt
-dGVybXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0
-aG9yaXplZCB1c2Ugb25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5IC0gRzIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP/vaCeb9zYQYKpSfYs1/T
-RU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXzHHfV1IWN
-cCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hW
-wcKUs/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1
-U1+cPvQXLOZprE4yTGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0
-jaWvYkxN4FisZDQSA/i2jZRjJKRxAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAP
-BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ60B7vfec7aVHUbI2fkBJmqzAN
-BgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5ZiXMRrEPR9RP/
-jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ
-Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v
-1fN2D807iDginWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4R
-nAuknZoh8/CbCzB428Hch0P+vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmH
-VHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xOe4pIb4tF9g==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/EntrustRootCertificationAuthority.crt b/test/rules/platform_certs/default/EntrustRootCertificationAuthority.crt
deleted file mode 100644
index 51ac4fd68a27..000000000000
--- a/test/rules/platform_certs/default/EntrustRootCertificationAuthority.crt
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC
-VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0
-Lm5ldC9DUFMgaXMgaW5jb3Jwb3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMW
-KGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsGA1UEAxMkRW50cnVzdCBSb290IENl
-cnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0MloXDTI2MTEyNzIw
-NTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMTkw
-NwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSBy
-ZWZlcmVuY2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNV
-BAMTJEVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALaVtkNC+sZtKm9I35RMOVcF7sN5EUFo
-Nu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYszA9u3g3s+IIRe7bJWKKf4
-4LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOwwCj0Yzfv9
-KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGI
-rb68j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi
-94DkZfs0Nw4pgHBNrziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOB
-sDCBrTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAi
-gA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1MzQyWjAfBgNVHSMEGDAWgBRo
-kORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DHhmak8fdLQ/uE
-vW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
-A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9t
-O1KzKtvn1ISMY/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6Zua
-AGAT/3B+XxFNSRuzFVJ7yVTav52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP
-9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTSW3iDVuycNsMm4hH2Z0kdkquM++v/
-eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0tHuu2guQOHXvgR1m
-0vdXcDazv/wor3ElhVsT/h5/WrQ8
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/EquifaxSecureCA.crt b/test/rules/platform_certs/default/EquifaxSecureCA.crt
deleted file mode 100644
index ed0bd764f851..000000000000
--- a/test/rules/platform_certs/default/EquifaxSecureCA.crt
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV
-UzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2Vy
-dGlmaWNhdGUgQXV0aG9yaXR5MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1
-MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0VxdWlmYXgxLTArBgNVBAsTJEVx
-dWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPRfM6f
-BeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+A
-cJkVV5MW8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kC
-AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQ
-MA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlm
-aWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTgw
-ODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gj
-IBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQF
-MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA
-A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y
-7qj/WsjTVbJmcVfewCHrPSqnI0kBBIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh
-1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee9570+sB3c4
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/EquifaxSecureGlobaleBusinessCA-1.crt b/test/rules/platform_certs/default/EquifaxSecureGlobaleBusinessCA-1.crt
deleted file mode 100644
index ce04aeb25db4..000000000000
--- a/test/rules/platform_certs/default/EquifaxSecureGlobaleBusinessCA-1.crt
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICkDCCAfmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEc
-MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBT
-ZWN1cmUgR2xvYmFsIGVCdXNpbmVzcyBDQS0xMB4XDTk5MDYyMTA0MDAwMFoXDTIw
-MDYyMTA0MDAwMFowWjELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0VxdWlmYXggU2Vj
-dXJlIEluYy4xLTArBgNVBAMTJEVxdWlmYXggU2VjdXJlIEdsb2JhbCBlQnVzaW5l
-c3MgQ0EtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuucXkAJlsTRVPEnC
-UdXfp9E3j9HngXNBUmCbnaEXJnitx7HoJpQytd4zjTov2/KaelpzmKNc6fuKcxtc
-58O/gGzNqfTWK8D3+ZmqY6KxRwIP1ORROhI8bIpaVIRw28HFkM9yRcuoWcDNM50/
-o5brhTMhHD4ePmBudpxnhcXIw2ECAwEAAaNmMGQwEQYJYIZIAYb4QgEBBAQDAgAH
-MA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUvqigdHJQa0S3ySPY+6j/s1dr
-aGwwHQYDVR0OBBYEFL6ooHRyUGtEt8kj2Puo/7NXa2hsMA0GCSqGSIb3DQEBBAUA
-A4GBADDiAVGqx+pf2rnQZQ8w1j7aDRRJbpGTJxQx78T3LUX47Me/okENI7SS+RkA
-Z70Br83gcfxaz2TE4JaY0KNA4gGK7ycH8WUBikQtBmV1UsCGECAhX2xrD2yuCRyv
-8qIYNMR1pHMc8Y3c7635s3a0kr/clRAevsvIO1qEYBlWlKlV
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/EquifaxSecureeBusinessCA-1.crt b/test/rules/platform_certs/default/EquifaxSecureeBusinessCA-1.crt
deleted file mode 100644
index 5e0d8c714fe7..000000000000
--- a/test/rules/platform_certs/default/EquifaxSecureeBusinessCA-1.crt
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICgjCCAeugAwIBAgIBBDANBgkqhkiG9w0BAQQFADBTMQswCQYDVQQGEwJVUzEc
-MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBT
-ZWN1cmUgZUJ1c2luZXNzIENBLTEwHhcNOTkwNjIxMDQwMDAwWhcNMjAwNjIxMDQw
-MDAwWjBTMQswCQYDVQQGEwJVUzEcMBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5j
-LjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNzIENBLTEwgZ8wDQYJ
-KoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vGbwXt3fek6lfWg0XTzQaDJj0ItlZ1MRo
-RvC0NcWFAyDGr0WlIVFFQesWWDYyb+JQYmT5/VGcqiTZ9J2DKocKIdMSODRsjQBu
-WqDZQu4aIZX5UkxVWsUPOE9G+m34LjXWHXzr4vCwdYDIqROsvojvOm6rXyo4YgKw
-Env+j6YDAgMBAAGjZjBkMBEGCWCGSAGG+EIBAQQEAwIABzAPBgNVHRMBAf8EBTAD
-AQH/MB8GA1UdIwQYMBaAFEp4MlIR21kWNl7fwRQ2QGpHfEyhMB0GA1UdDgQWBBRK
-eDJSEdtZFjZe38EUNkBqR3xMoTANBgkqhkiG9w0BAQQFAAOBgQB1W6ibAxHm6VZM
-zfmpTMANmvPMZWnmJXbMWbfWVMMdzZmsGd20hdXgPfxiIKeES1hl8eL5lSE/9dR+
-WB5Hh1Q+WKG1tfgq73HnvMP2sUlG4tega+VWeponmHxGYhTnyfxuAxJ5gDgdSIKN
-/Bf+KpYrtWKmpj29f5JZzVoqgrI3eQ==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/GeoTrustGlobalCA.crt b/test/rules/platform_certs/default/GeoTrustGlobalCA.crt
deleted file mode 100644
index b69f0029b89b..000000000000
--- a/test/rules/platform_certs/default/GeoTrustGlobalCA.crt
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
-MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
-YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
-EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
-R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
-9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
-fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
-iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
-1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
-bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
-MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
-ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
-uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
-Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
-tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
-PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
-hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
-5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/GeoTrustGlobalCA2.crt b/test/rules/platform_certs/default/GeoTrustGlobalCA2.crt
deleted file mode 100644
index 2fb960492e83..000000000000
--- a/test/rules/platform_certs/default/GeoTrustGlobalCA2.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEW
-MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFs
-IENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQG
-EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3Qg
-R2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDvPE1A
-PRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/NTL8
-Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hL
-TytCOb1kLUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL
-5mkWRxHCJ1kDs6ZgwiFAVvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7
-S4wMcoKK+xfNAGw6EzywhIdLFnopsk/bHdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe
-2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
-FHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNHK266ZUap
-EBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6td
-EPx7srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv
-/NgdRN3ggX+d6YvhZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywN
-A0ZF66D0f0hExghAzN4bcLUprbqLOzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0
-abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkCx1YAzUm5s2x7UwQa4qjJqhIF
-I8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqFH4z1Ir+rzoPz
-4iIprn2DQKi6bA==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/GeoTrustPrimaryCertificationAuthority-G2.crt b/test/rules/platform_certs/default/GeoTrustPrimaryCertificationAuthority-G2.crt
deleted file mode 100644
index 6c18b2fef357..000000000000
--- a/test/rules/platform_certs/default/GeoTrustPrimaryCertificationAuthority-G2.crt
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDEL
-MAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChj
-KSAyMDA3IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2
-MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
-eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1OVowgZgxCzAJBgNV
-BAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykgMjAw
-NyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNV
-BAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH
-MjB2MBAGByqGSM49AgEGBSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcL
-So17VDs6bl8VAsBQps8lL33KSLjHUGMcKiEIfJo22Av+0SbFWDEwKCXzXV2juLal
-tJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO
-BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+EVXVMAoG
-CCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGT
-qQ7mndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBucz
-rD6ogRLQy7rQkgu2npaqBA+K
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/GeoTrustPrimaryCertificationAuthority-G3.crt b/test/rules/platform_certs/default/GeoTrustPrimaryCertificationAuthority-G3.crt
deleted file mode 100644
index 243e48ba250f..000000000000
--- a/test/rules/platform_certs/default/GeoTrustPrimaryCertificationAuthority-G3.crt
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCB
-mDELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsT
-MChjKSAyMDA4IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s
-eTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhv
-cml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIzNTk1OVowgZgxCzAJ
-BgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
-MjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0
-BgNVBAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
-LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz
-+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5jK/BGvESyiaHAKAxJcCGVn2TAppMSAmUm
-hsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdEc5IiaacDiGydY8hS2pgn
-5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3CIShwiP/W
-JmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exAL
-DmKudlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZC
-huOl1UcCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
-HQYDVR0OBBYEFMR5yo6hTgMdHNxr2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IB
-AQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9cr5HqQ6XErhK8WTTOd8lNNTB
-zU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbEAp7aDHdlDkQN
-kv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
-AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUH
-SJsMC8tJP33st/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2G
-spki4cErx5z481+oghLrGREt
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/GeoTrustPrimaryCertificationAuthority.crt b/test/rules/platform_certs/default/GeoTrustPrimaryCertificationAuthority.crt
deleted file mode 100644
index 41372438b0f6..000000000000
--- a/test/rules/platform_certs/default/GeoTrustPrimaryCertificationAuthority.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBY
-MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMo
-R2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEx
-MjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
-Ew1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQcmltYXJ5IENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9
-AWbK7hWNb6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjA
-ZIVcFU2Ix7e64HXprQU9nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE0
-7e9GceBrAqg1cmuXm2bgyxx5X9gaBGgeRwLmnWDiNpcB3841kt++Z8dtd1k7j53W
-kBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGttm/81w7a4DSwDRp35+MI
-mO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G
-A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJ
-KoZIhvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ1
-6CePbJC/kRYkRj5KTs4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl
-4b7UVXGYNTq+k+qurUKykG/g/CFNNWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6K
-oKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHaFloxt/m0cYASSJlyc1pZU8Fj
-UjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG1riR/aYNKxoU
-AT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/GeoTrustUniversalCA.crt b/test/rules/platform_certs/default/GeoTrustUniversalCA.crt
deleted file mode 100644
index 3a61e49124cd..000000000000
--- a/test/rules/platform_certs/default/GeoTrustUniversalCA.crt
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEW
-MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVy
-c2FsIENBMB4XDTA0MDMwNDA1MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UE
-BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xHjAcBgNVBAMTFUdlb1RydXN0
-IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKYV
-VaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9tJPi8
-cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTT
-QjOgNB0eRXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFh
-F7em6fgemdtzbvQKoiFs7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2v
-c7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d8Lsrlh/eezJS/R27tQahsiFepdaVaH/w
-mZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7VqnJNk22CDtucvc+081xd
-VHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3CgaRr0BHdCX
-teGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZ
-f9hBZ3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfRe
-Bi9Fi1jUIxaS5BZuKGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+
-nhutxx9z3SxPGWX9f5NAEC7S8O08ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB
-/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0XG0D08DYj3rWMB8GA1UdIwQY
-MBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG
-9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
-aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fX
-IwjhmF7DWgh2qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzyn
-ANXH/KttgCJwpQzgXQQpAvvLoJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0z
-uzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsKxr2EoyNB3tZ3b4XUhRxQ4K5RirqN
-Pnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxFKyDuSN/n3QmOGKja
-QI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2DFKW
-koRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9
-ER/frslKxfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQt
-DF4JbAiXfKM9fJP/P6EUp8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/Sfuvm
-bJxPgWp6ZKy7PtXny3YuxadIwVyQD8vIP/rmMuGNG2+k5o7Y+SlIis5z/iw=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/GeoTrustUniversalCA2.crt b/test/rules/platform_certs/default/GeoTrustUniversalCA2.crt
deleted file mode 100644
index 7ace610f9486..000000000000
--- a/test/rules/platform_certs/default/GeoTrustUniversalCA2.crt
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEW
-MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVy
-c2FsIENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYD
-VQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1
-c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
-AQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0DE81
-WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUG
-FF+3Qs17j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdq
-XbboW0W63MOhBW9Wjo8QJqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxL
-se4YuU6W3Nx2/zu+z18DwPw76L5GG//aQMJS9/7jOvdqdzXQ2o3rXhhqMcceujwb
-KNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2WP0+GfPtDCapkzj4T8Fd
-IgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP20gaXT73
-y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRt
-hAAnZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgoc
-QIgfksILAAX/8sgCSqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4
-Lt1ZrtmhN79UNdxzMk+MBB4zsslG8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNV
-HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAfBgNV
-HSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8EBAMCAYYwDQYJ
-KoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
-dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQ
-L1EuxBRa3ugZ4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgr
-Fg5fNuH8KrUwJM/gYwx7WBr+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSo
-ag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpqA1Ihn0CoZ1Dy81of398j9tx4TuaY
-T1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpgY+RdM4kX2TGq2tbz
-GDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiPpm8m
-1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJV
-OCiNUW7dFGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH
-6aLcr34YEoP9VhdBLtUpgn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwX
-QMAJKOSLakhT2+zNVVXxxvjpoixMptEmX36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/GlobalChambersignRoot-2008.crt b/test/rules/platform_certs/default/GlobalChambersignRoot-2008.crt
deleted file mode 100644
index 4b2ff6235f49..000000000000
--- a/test/rules/platform_certs/default/GlobalChambersignRoot-2008.crt
+++ /dev/null
@@ -1,41 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
-VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
-IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
-MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
-aGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMxNDBaFw0zODA3MzEx
-MjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3Vy
-cmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAG
-A1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAl
-BgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZI
-hvcNAQEBBQADggIPADCCAgoCggIBAMDfVtPkOpt2RbQT2//BthmLN0EYlVJH6xed
-KYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXfXjaOcNFccUMd2drvXNL7
-G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0ZJJ0YPP2
-zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4
-ddPB/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyG
-HoiMvvKRhI9lNNgATH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2
-Id3UwD2ln58fQ1DJu7xsepeY7s2MH/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3V
-yJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfeOx2YItaswTXbo6Al/3K1dh3e
-beksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSFHTynyQbehP9r
-6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
-wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsog
-zCtLkykPAgMBAAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQW
-BBS5CcqcHtvTbDprru1U8VuTBjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDpr
-ru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UEBhMCRVUxQzBBBgNVBAcTOk1hZHJp
-ZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJmaXJtYS5jb20vYWRk
-cmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJmaXJt
-YSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiC
-CQDJzdPp1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCow
-KAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZI
-hvcNAQEFBQADggIBAICIf3DekijZBZRG/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZ
-UohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6ReAJ3spED8IXDneRRXoz
-X1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/sdZ7LoR/x
-fxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVz
-a2Mg9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yyd
-Yhz2rXzdpjEetrHHfoUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMd
-SqlapskD7+3056huirRXhOukP9DuqqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9O
-AP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETrP3iZ8ntxPjzxmKfFGBI/5rso
-M0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVqc5iJWzouE4ge
-v8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
-09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/GlobalChambersignRoot.crt b/test/rules/platform_certs/default/GlobalChambersignRoot.crt
deleted file mode 100644
index 41d725abdcf3..000000000000
--- a/test/rules/platform_certs/default/GlobalChambersignRoot.crt
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEn
-MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL
-ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENo
-YW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYxNDE4WhcNMzcwOTMwMTYxNDE4WjB9
-MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgy
-NzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4G
-A1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUA
-A4IBDQAwggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0
-Mi+ITaFgCPS3CU6gSS9J1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/s
-QJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8Oby4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpV
-eAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl6DJWk0aJqCWKZQbua795
-B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c8lCrEqWh
-z0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0T
-AQH/BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1i
-ZXJzaWduLm9yZy9jaGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4w
-TcbOX60Qq+UDpfqpFDAOBgNVHQ8BAf8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAH
-MCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBjaGFtYmVyc2lnbi5vcmcwKgYD
-VR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9yZzBbBgNVHSAE
-VDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh
-bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0B
-AQUFAAOCAQEAPDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUM
-bKGKfKX0j//U2K0X1S0E0T9YgOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXi
-ryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJPJ7oKXqJ1/6v/2j1pReQvayZzKWG
-VwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4IBHNfTIzSJRUTN3c
-ecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREest2d/
-AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/GlobalSign.crt b/test/rules/platform_certs/default/GlobalSign.crt
deleted file mode 100644
index 55ddeb02e261..000000000000
--- a/test/rules/platform_certs/default/GlobalSign.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4G
-A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNp
-Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4
-MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMzETMBEG
-A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWtiHL8
-RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsT
-gHeMCOFJ0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmm
-KPZpO/bLyCiR5Z2KYVc3rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zd
-QQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjlOCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZ
-XriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2xmmFghcCAwEAAaNCMEAw
-DgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFI/wS3+o
-LkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZU
-RUm7lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMp
-jjM5RcOO5LlXbKr8EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK
-6fBdRoyV3XpYKBovHd7NADdBj+1EbddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQX
-mcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18YIvDQVETI53O9zJrlAGomecs
-Mx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7rkpeDMdmztcpH
-WD9f
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/GlobalSignRootCA.crt b/test/rules/platform_certs/default/GlobalSignRootCA.crt
deleted file mode 100644
index 8523875624b5..000000000000
--- a/test/rules/platform_certs/default/GlobalSignRootCA.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG
-A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
-b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw
-MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
-YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT
-aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ
-jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp
-xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp
-1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG
-snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ
-U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8
-9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E
-BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B
-AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz
-yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE
-38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP
-AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad
-DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME
-HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/GlobalSign_2.crt b/test/rules/platform_certs/default/GlobalSign_2.crt
deleted file mode 100644
index 6ebf7bec0eb9..000000000000
--- a/test/rules/platform_certs/default/GlobalSign_2.crt
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4G
-A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNp
-Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1
-MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMjETMBEG
-A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6ErPL
-v4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8
-eoLrvozps6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklq
-tTleiDTsvHgMCJiEbKjNS7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzd
-C9XZzPnqJworc5HGnRusyMvo4KD0L5CLTfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pa
-zq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6CygPCm48CAwEAAaOBnDCB
-mTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUm+IH
-V2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5n
-bG9iYWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG
-3lm0mi3f3BmGLjANBgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4Gs
-J0/WwbgcQ3izDJr86iw8bmEbTUsp9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO
-291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu01yiPqFbQfXf5WRDLenVOavS
-ot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG79G+dwfCMNYxd
-AfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
-TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/GlobalSign_3.crt b/test/rules/platform_certs/default/GlobalSign_3.crt
deleted file mode 100644
index 6b4fa4c6321b..000000000000
--- a/test/rules/platform_certs/default/GlobalSign_3.crt
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICHjCCAaSgAwIBAgIRYFlJ4CYuu1X5CneKcflK2GwwCgYIKoZIzj0EAwMwUDEk
-MCIGA1UECxMbR2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpH
-bG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoX
-DTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMbR2xvYmFsU2lnbiBFQ0MgUm9vdCBD
-QSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWdu
-MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAER0UOlvt9Xb/pOdEh+J8LttV7HpI6SFkc
-8GIxLcB6KP4ap1yztsyX50XUWPrRd21DosCHZTQKH3rd6zwzocWdTaRvQZU4f8ke
-hOvRnkmSh5SHDDqFSmafnVmTTZdhBoZKo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
-VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUPeYpSJvqB8ohREom3m7e0oPQn1kwCgYI
-KoZIzj0EAwMDaAAwZQIxAOVpEslu28YxuglB4Zf4+/2a4n0Sye18ZNPLBSWLVtmg
-515dTguDnFt2KaAJJiFqYgIwcdK1j1zqO+F4CYWodZI7yFz9SO8NdCKoCOJuxUnO
-xwy8p2Fp8fc74SrL+SvzZpA3
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/GlobalSign_4.crt b/test/rules/platform_certs/default/GlobalSign_4.crt
deleted file mode 100644
index 77ec580465c5..000000000000
--- a/test/rules/platform_certs/default/GlobalSign_4.crt
+++ /dev/null
@@ -1,13 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIB4TCCAYegAwIBAgIRKjikHJYKBN5CsiilC+g0mAIwCgYIKoZIzj0EAwIwUDEk
-MCIGA1UECxMbR2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpH
-bG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoX
-DTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMbR2xvYmFsU2lnbiBFQ0MgUm9vdCBD
-QSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWdu
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEuMZ5049sJQ6fLjkZHAOkrprlOQcJ
-FspjsbmG+IpXwVfOQvpzofdlQv8ewQCybnMO/8ch5RikqtlxP6jUuc6MHaNCMEAw
-DgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFSwe61F
-uOJAf/sKbvu+M8k8o4TVMAoGCCqGSM49BAMCA0gAMEUCIQDckqGgE6bPA7DmxCGX
-kPoUVy0D7O48027KqGx2vKLeuwIgJ6iFJzWbVsaj8kfSt24bAgAXqmemFZHe+pTs
-ewv4n4Q=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/GoDaddyClass2CA.crt b/test/rules/platform_certs/default/GoDaddyClass2CA.crt
deleted file mode 100644
index 44d4e39200ea..000000000000
--- a/test/rules/platform_certs/default/GoDaddyClass2CA.crt
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEh
-MB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBE
-YWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3
-MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRo
-ZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3Mg
-MiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggEN
-ADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCA
-PVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6w
-wdhFJ2+qN1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXi
-EqITLdiOr18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMY
-avx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+
-YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLE
-sNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h
-/t2oatTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5
-IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-ggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYXMP80kWNy
-OO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKtI3lpjbi2Tc7P
-TMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
-HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mER
-dEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5Cuf
-ReYNnyicsbkqWletNw+vHX/bvZ8=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/GoDaddyRootCertificateAuthority-G2.crt b/test/rules/platform_certs/default/GoDaddyRootCertificateAuthority-G2.crt
deleted file mode 100644
index b0fe8aa03cbc..000000000000
--- a/test/rules/platform_certs/default/GoDaddyRootCertificateAuthority-G2.crt
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMx
-EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoT
-EUdvRGFkZHkuY29tLCBJbmMuMTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRp
-ZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIz
-NTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQH
-EwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8GA1UE
-AxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKD
-E6bFIEMBO4Tx5oVJnyfq9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH
-/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD+qK+ihVqf94Lw7YZFAXK6sOoBJQ7Rnwy
-DfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutdfMh8+7ArU6SSYmlRJQVh
-GkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMlNAJWJwGR
-tDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEA
-AaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
-FDqahQcQZyi27/a9BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmX
-WWcDYfF+OwYxdS2hII5PZYe096acvNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu
-9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r5N9ss4UXnT3ZJE95kTXWXwTr
-gIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYVN8Gb5DKj7Tjo
-2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
-LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI
-4uJEvlz36hz1
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/GoogleInternetAuthorityG2.crt b/test/rules/platform_certs/default/GoogleInternetAuthorityG2.crt
deleted file mode 100644
index 8e545ca70aa7..000000000000
--- a/test/rules/platform_certs/default/GoogleInternetAuthorityG2.crt
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID8DCCAtigAwIBAgIDAjqSMA0GCSqGSIb3DQEBCwUAMEIxCzAJBgNVBAYTAlVT
-MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
-YWwgQ0EwHhcNMTUwNDAxMDAwMDAwWhcNMTcxMjMxMjM1OTU5WjBJMQswCQYDVQQG
-EwJVUzETMBEGA1UEChMKR29vZ2xlIEluYzElMCMGA1UEAxMcR29vZ2xlIEludGVy
-bmV0IEF1dGhvcml0eSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AJwqBHdc2FCROgajguDYUEi8iT/xGXAaiEZ+4I/F8YnOIe5a/mENtzJEiaB0C1NP
-VaTOgmKV7utZX8bhBYASxF6UP7xbSDj0U/ck5vuR6RXEz/RTDfRK/J9U3n2+oGtv
-h8DQUB8oMANA2ghzUWx//zo8pzcGjr1LEQTrfSTe5vn8MXH7lNVg8y5Kr0LSy+rE
-ahqyzFPdFUuLH8gZYR/Nnag+YyuENWllhMgZxUYi+FOVvuOAShDGKuy6lyARxzmZ
-EASg8GF6lSWMTlJ14rbtCMoU/M4iarNOz0YDl5cDfsCx3nuvRTPPuj5xt970JSXC
-DTWJnZ37DhF5iR43xa+OcmkCAwEAAaOB5zCB5DAfBgNVHSMEGDAWgBTAephojYn7
-qwVkDBF9qn1luMrMTjAdBgNVHQ4EFgQUSt0GFhu89mi1dvWBtrtiGrpagS8wDgYD
-VR0PAQH/BAQDAgEGMC4GCCsGAQUFBwEBBCIwIDAeBggrBgEFBQcwAYYSaHR0cDov
-L2cuc3ltY2QuY29tMBIGA1UdEwEB/wQIMAYBAf8CAQAwNQYDVR0fBC4wLDAqoCig
-JoYkaHR0cDovL2cuc3ltY2IuY29tL2NybHMvZ3RnbG9iYWwuY3JsMBcGA1UdIAQQ
-MA4wDAYKKwYBBAHWeQIFATANBgkqhkiG9w0BAQsFAAOCAQEACE4Ep4B/EBZDXgKt
-10KA9LCO0q6z6xF9kIQYfeeQFftJf6iZBZG7esnWPDcYCZq2x5IgBzUzCeQoY3IN
-tOAynIeYxBt2iWfBUFiwE6oTGhsypb7qEZVMSGNJ6ZldIDfM/ippURaVS6neSYLA
-EHD0LPPsvCQk0E6spdleHm2SwaesSDWB+eXknGVpzYekQVA/LlelkVESWA6MCaGs
-eqQSpSfzmhCXfVUDBvdmWF9fZOGrXW2lOUh1mEwpWjqN0yvKnFUEv/TmFNWArCbt
-F4mmk2xcpMy48GaOZON9muIAs0nH5Aqq3VuDx3CQRk6+0NtZlmwu9RY23nHMAcIS
-wSHGFg==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/HellenicAcademicandResearchInstitutionsRootCA2011.crt b/test/rules/platform_certs/default/HellenicAcademicandResearchInstitutionsRootCA2011.crt
deleted file mode 100644
index 9c47dec4aa78..000000000000
--- a/test/rules/platform_certs/default/HellenicAcademicandResearchInstitutionsRootCA2011.crt
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1Ix
-RDBCBgNVBAoTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1
-dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1p
-YyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIFJvb3RDQSAyMDExMB4XDTExMTIw
-NjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYTAkdSMUQwQgYDVQQK
-EztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENl
-cnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJl
-c2VhcmNoIEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPz
-dYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJ
-fel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa71HFK9+WXesyHgLacEns
-bgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u8yBRQlqD
-75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSP
-FEDH3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNV
-HRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp
-5dgTBCPuQSUwRwYDVR0eBEAwPqA8MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQu
-b3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQub3JnMA0GCSqGSIb3DQEBBQUA
-A4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVtXdMiKahsog2p
-6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
-TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7
-dIsXRSZMFpGD/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8Acys
-Nnq/onN694/BtZqhFLKPM58N7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXI
-l7WdmplNsDz4SgCbZN2fOUvRJ9e4
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/HongkongPostRootCA1.crt b/test/rules/platform_certs/default/HongkongPostRootCA1.crt
deleted file mode 100644
index 810fbe95f84e..000000000000
--- a/test/rules/platform_certs/default/HongkongPostRootCA1.crt
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsx
-FjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3Qg
-Um9vdCBDQSAxMB4XDTAzMDUxNTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkG
-A1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdr
-b25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1ApzQ
-jVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEn
-PzlTCeqrauh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjh
-ZY4bXSNmO7ilMlHIhqqhqZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9
-nnV0ttgCXjqQesBCNnLsak3c78QA3xMYV18meMjWCnl3v/evt3a5pQuEF10Q6m/h
-q5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgED
-MA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7ih9legYsC
-mEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI3
-7piol7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clB
-oiMBdDhViw+5LmeiIAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJs
-EhTkYY2sEJCehFC78JZvRZ+K88psT/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpO
-fMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilTc4afU9hDDl3WY4JxHYB0yvbi
-AmvZWg==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/IGC_A.crt b/test/rules/platform_certs/default/IGC_A.crt
deleted file mode 100644
index 4e4b86b1f679..000000000000
--- a/test/rules/platform_certs/default/IGC_A.crt
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEAjCCAuqgAwIBAgIFORFFEJQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYT
-AkZSMQ8wDQYDVQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQ
-TS9TR0ROMQ4wDAYDVQQLEwVEQ1NTSTEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG
-9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMB4XDTAyMTIxMzE0MjkyM1oXDTIw
-MTAxNzE0MjkyMlowgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIEwZGcmFuY2UxDjAM
-BgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NTSTEO
-MAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsh/R0GLFMzvABIaI
-s9z4iPf930Pfeo2aSVz2TqrMHLmh6yeJ8kbpO0px1R2OLc/mratjUMdUC24SyZA2
-xtgv2pGqaMVy/hcKshd+ebUyiHDKcMCWSo7kVc0dJ5S/znIq7Fz5cyD+vfcuiWe4
-u0dzEvfRNWk68gq5rv9GQkaiv6GFGvm/5P9JhfejcIYyHF2fYPepraX/z9E0+X1b
-F8bc1g4oa8Ld8fUzaJ1O/Id8NhLWo4DoQw1VYZTqZDdH6nfK0LJYBcNdfrGoRpAx
-Vs5wKpayMLh35nnAvSk7/ZR3TL0gzUEl4C7HG7vupARB0l2tEmqKm0f7yd1GQOGd
-PDPQtQIDAQABo3cwdTAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBRjAVBgNV
-HSAEDjAMMAoGCCqBegF5AQEBMB0GA1UdDgQWBBSjBS8YYFDCiQrdKyFP/45OqDAx
-NjAfBgNVHSMEGDAWgBSjBS8YYFDCiQrdKyFP/45OqDAxNjANBgkqhkiG9w0BAQUF
-AAOCAQEABdwm2Pp3FURo/C9mOnTgXeQp/wYHE4RKq89toB9RlPhJy3Q2FLwV3duJ
-L92PoF189RLrn544pEfMs5bZvpwlqwN+Mw+VgQ39FuCIvjfwbF3QMZsyK10XZZOY
-YLxuj7GoPB7ZHPOpJkL5ZB3C55L29B5aqhlSXa/oovdgoPaN8In1buAKBQGVyYsg
-Crpa/JosPL3Dt8ldeCUFP1YUmwza+zpI/pdpXsoQhvdOlgQITeywvl3cO45Pwf2a
-NjSaTFR+FwNIlQgRHAdvhQh+XU3Endv7rs6y0bO4g2wdsrN58dhwmX7wEwLOXt1R
-0982gaEbeC9xs/FZTEYYKKuF0mBWWg==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/IdenTrustCommercialRootCA1.crt b/test/rules/platform_certs/default/IdenTrustCommercialRootCA1.crt
deleted file mode 100644
index f173772ed037..000000000000
--- a/test/rules/platform_certs/default/IdenTrustCommercialRootCA1.crt
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIQCgFCgAAAAUUjyES1AAAAAjANBgkqhkiG9w0BAQsFADBK
-MQswCQYDVQQGEwJVUzESMBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVu
-VHJ1c3QgQ29tbWVyY2lhbCBSb290IENBIDEwHhcNMTQwMTE2MTgxMjIzWhcNMzQw
-MTE2MTgxMjIzWjBKMQswCQYDVQQGEwJVUzESMBAGA1UEChMJSWRlblRydXN0MScw
-JQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBSb290IENBIDEwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQCnUBneP5k91DNG8W9RYYKyqU+PZ4ldhNlT
-3Qwo2dfw/66VQ3KZ+bVdfIrBQuExUHTRgQ18zZshq0PirK1ehm7zCYofWjK9ouuU
-+ehcCuz/mNKvcbO0U59Oh++SvL3sTzIwiEsXXlfEU8L2ApeN2WIrvyQfYo3fw7gp
-S0l4PJNgiCL8mdo2yMKi1CxUAGc1bnO/AljwpN3lsKImesrgNqUZFvX9t++uP0D1
-bVoE/c40yiTcdCMbXTMTEl3EASX2MN0CXZ/g1Ue9tOsbobtJSdifWwLziuQkkORi
-T0/Br4sOdBeo0XKIanoBScy0RnnGF7HamB4HWfp1IYVl3ZBWzvurpWCdxJ35UrCL
-vYf5jysjCiN2O/cz4ckA82n5S6LgTrx+kzmEB/dEcH7+B1rlsazRGMzyNeVJSQjK
-Vsk9+w8YfYs7wRPCTY/JTw436R+hDmrfYi7LNQZReSzIJTj0+kuniVyc0uMNOYZK
-dHzVWYfCP04MXFL0PfdSgvHqo6z9STQaKPNBiDoT7uje/5kdX7rL6B7yuVBgwDHT
-c+XvvqDtMwt0viAgxGds8AgDelWAf0ZOlqf0Hj7h9tgJ4TNkK2PXMl6f+cB7D3hv
-l7yTmvmcEpB4eoCHFddydJxVdHixuuFucAS6T6C6aMN7/zHwcz09lCqxC0EOoP5N
-iGVreTO01wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
-/zAdBgNVHQ4EFgQU7UQZwNPwBovupHu+QucmVMiONnYwDQYJKoZIhvcNAQELBQAD
-ggIBAA2ukDL2pkt8RHYZYR4nKM1eVO8lvOMIkPkp165oCOGUAFjvLi5+U1KMtlwH
-6oi6mYtQlNeCgN9hCQCTrQ0U5s7B8jeUeLBfnLOic7iPBZM4zY0+sLj7wM+x8uwt
-LRvM7Kqas6pgghstO8OEPVeKlh6cdbjTMM1gCIOQ045U8U1mwF10A0Cj7oV+wh93
-nAbowacYXVKV7cndJZ5t+qntozo00Fl72u1Q8zW/7esUTTHHYPTa8Yec4kjixsU3
-+wYQ+nVZZjFHKdp2mhzpgq7vmrlR94gjmmmVYjzlVYA211QC//G5Xc7UI2/YRYRK
-W2XviQzdFKcgyxilJbQN+QHwotL0AMh0jqEqSI5l2xPE4iUXfeu+h1sXIFRRk0pT
-AwvsXcoz7WL9RccvW9xYoIA55vrX/hMUpu09lEpCdNTDd1lzzY9GvlU47/rokTLq
-l1gEIt44w8y8bckzOmoKaT+gyOpyj4xjhiO9bTyWnpXgSUyqorkqG5w2gXjtw+hG
-4iZZRHUe2XWJUc0QhJ1hYMtd+ZciTY6Y5uN/9lu7rs3KSoFrXgvzUeF0K+l+J6fZ
-mUlO+KWA2yUPHGNiiskzZ2s8EIPGrd6ozRaOjfAHN3Gf8qv8QfXBi+wAN10J5U6A
-7/qxXDgGpRtK4dw4LTzcqx+QGtVKnO7RcGzM7vRX+Bi6hG6H
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/IdenTrustPublicSectorRootCA1.crt b/test/rules/platform_certs/default/IdenTrustPublicSectorRootCA1.crt
deleted file mode 100644
index bc54d38b7997..000000000000
--- a/test/rules/platform_certs/default/IdenTrustPublicSectorRootCA1.crt
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFZjCCA06gAwIBAgIQCgFCgAAAAUUjz0Z8AAAAAjANBgkqhkiG9w0BAQsFADBN
-MQswCQYDVQQGEwJVUzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVu
-VHJ1c3QgUHVibGljIFNlY3RvciBSb290IENBIDEwHhcNMTQwMTE2MTc1MzMyWhcN
-MzQwMTE2MTc1MzMyWjBNMQswCQYDVQQGEwJVUzESMBAGA1UEChMJSWRlblRydXN0
-MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3RvciBSb290IENBIDEwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2IpT8pEiv6EdrCvsnduTyP4o7
-ekosMSqMjbCpwzFrqHd2hCa2rIFCDQjrVVi7evi8ZX3yoG2LqEfpYnYeEe4IFNGy
-RBb06tD6Hi9e28tzQa68ALBKK0CyrOE7S8ItneShm+waOh7wCLPQ5CQ1B5+ctMlS
-bdsHyo+1W/CD80/HLaXIrcuVIKQxKFdYWuSNG5qrng0M8gozOSI5Cpcu81N3uURF
-/YTLNiCBWS2ab21ISGHKTN9T0a9SvESfqy9rg3LvdYDaBjMbXcjaY8ZNzaxmMc3R
-3j6HEDbhuaR672BQssvKplbgN6+rNBM5Jeg5ZuSYeqoSmJxZZoY+rfGwyj4GD3vw
-EUs3oERte8uojHH01bWRNszwFcYr3lEXsZdMUD2xlVl8BX0tIdUAvwFnol57plzy
-9yLxkA2T26pEUWbMfXYD62qoKjgZl3YNa4ph+bz27nb9cCvdKTz4Ch5bQhyLVi9V
-GxyhLrXHFub4qjySjmm2AcG1hp2JDws4lFTo6tyePSW8Uybt1as5qsVATFSrsrTZ
-2fjXctscvG29ZV/viDUqZi/u9rNl8DONfJhBaUYPQxxp+pu10GFqzcpL2UyQRqsV
-WaFHVCkugyhfHMKiq3IXAAaOReyL4jM9f9oZRORicsPfIsbyVtTdX5Vy7W1f90gD
-W/3FKqD2cyOEEBsB5wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
-BAUwAwEB/zAdBgNVHQ4EFgQU43HgntinQtnbcZFrlJPrw6PRFKMwDQYJKoZIhvcN
-AQELBQADggIBAEf63QqwEZE4rU1d9+UOl1QZgkiHVIyqZJnYWv6IAcVYpZmxI1Qj
-t2odIFflAWJBF9MJ23XLblSQdf4an4EKwt3X9wnQW3IV5B4Jaj0z8yGa5hV+rVHV
-DRDtfULAj+7AmgjVQdZcDiFpboBhDhXAuM/FSRJSzL46zNQuOAXeNf0fb7iAaJg9
-TaDKQGXSc3z1i9kKlT/YPyNtGtEqJBnZhbMX73huqVjRI9PHE+1yJX9dsXNw0H8G
-lwmEKYBhHfpe/3OsoOOJuBxxFcbeMX8S3OFtm6/n6J91eEyrRjuazr8FGF1NFTwW
-mhlQBJqymm9li1JfPFgEKCXAZmExfrngdbkaqIHWchezxQMxNRF4eKLg6TCMf4Df
-WN88uieW4oA0beOY02QnrEh+KHdcxiVhJfiFDGX6xDIvpZgF5PgLZxYWxoK4Mhn5
-+bl53B/N66+rDt0b20XkeucC4pVd/GnwU2lhlXV5C15V5jgclKlZM57IcXR5f1GJ
-tshquDDIajjDbp7hNxbqBWJMWxJH7ae0s1hWx0nzfxJoCTFx8G34Tkf71oXuxVhA
-GaQdp/lLQzfcaFpPz+vCZHTetBXZ9FRUGi8c15dxVJCO2SCdUyt/q4/i6jC8UDfv
-8Ue1fXwsBOxonbRJRBD0ckscZOf85muQ3Wl9af0AVqW3rLatt8o+Ae+c
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/Izenpe.com.crt b/test/rules/platform_certs/default/Izenpe.com.crt
deleted file mode 100644
index 25f6f360dd28..000000000000
--- a/test/rules/platform_certs/default/Izenpe.com.crt
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4
-MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6
-ZW5wZS5jb20wHhcNMDcxMjEzMTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYD
-VQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5j
-b20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ03rKDx6sp4boFmVq
-scIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAKClaO
-xdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6H
-LmYRY2xU+zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFX
-uaOKmMPsOzTFlUFpfnXCPCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQD
-yCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxTOTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+
-JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbKF7jJeodWLBoBHmy+E60Q
-rLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK0GqfvEyN
-BjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8L
-hij+0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIB
-QFqNeb+Lz0vPqhbBleStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+
-HMh3/1uaD7euBUbl8agW7EekFwIDAQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2lu
-Zm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+SVpFTlBFIFMuQS4gLSBDSUYg
-QTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBGNjIgUzgxQzBB
-BgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
-MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwHQYDVR0OBBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUA
-A4ICAQB4pgwWSp9MiDrAyw6lFn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWb
-laQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbgakEyrkgPH7UIBzg/YsfqikuFgba56
-awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8qhT/AQKM6WfxZSzwo
-JNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Csg1lw
-LDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCT
-VyvehQP5aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGk
-LhObNA5me0mrZJfQRsN5nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJb
-UjWumDqtujWTI6cfSN01RpiyEGjkpTHCClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/
-QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZoQ0iy2+tzJOeRf1SktoA+
-naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1ZWrOZyGls
-QyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/Juur-SK.crt b/test/rules/platform_certs/default/Juur-SK.crt
deleted file mode 100644
index 4fb7be1a334d..000000000000
--- a/test/rules/platform_certs/default/Juur-SK.crt
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE5jCCA86gAwIBAgIEO45L/DANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcN
-AQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZp
-dHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLMB4XDTAxMDgzMDE0MjMw
-MVoXDTE2MDgyNjE0MjMwMVowXTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQsw
-CQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEQ
-MA4GA1UEAxMHSnV1ci1TSzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AIFxNj4zB9bjMI0TfncyRsvPGbJgMUaXhvSYRqTCZUXP00B841oiqBB4M8yIsdOB
-SvZiF3tfTQou0M+LI+5PAk676w7KvRhj6IAcjeEcjT3g/1tf6mTll+g/mX8MCgkz
-ABpTpyHhOEvWgxutr2TC+Rx6jGZITWYfGAriPrsfB2WThbkasLnE+w0R9vXW+RvH
-LCu3GFH+4Hv2qEivbDtPL+/40UceJlfwUR0zlv/vWT3aTdEVNMfqPxZIe5EcgEMP
-PbgFPtGzlc3Yyg/CQ2fbt5PgIoIuvvVoKIO5wTtpeyDaTpxt4brNj3pssAki14sL
-2xzVWiZbDcDq5WDQn/413z8CAwEAAaOCAawwggGoMA8GA1UdEwEB/wQFMAMBAf8w
-ggEWBgNVHSAEggENMIIBCTCCAQUGCisGAQQBzh8BAQEwgfYwgdAGCCsGAQUFBwIC
-MIHDHoHAAFMAZQBlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0ACAAbwBuACAAdgDk
-AGwAagBhAHMAdABhAHQAdQBkACAAQQBTAC0AaQBzACAAUwBlAHIAdABpAGYAaQB0
-AHMAZQBlAHIAaQBtAGkAcwBrAGUAcwBrAHUAcwAgAGEAbABhAG0ALQBTAEsAIABz
-AGUAcgB0AGkAZgBpAGsAYQBhAHQAaQBkAGUAIABrAGkAbgBuAGkAdABhAG0AaQBz
-AGUAawBzMCEGCCsGAQUFBwIBFhVodHRwOi8vd3d3LnNrLmVlL2Nwcy8wKwYDVR0f
-BCQwIjAgoB6gHIYaaHR0cDovL3d3dy5zay5lZS9qdXVyL2NybC8wHQYDVR0OBBYE
-FASqekej5ImvGs8KQKcYP2/v6X2+MB8GA1UdIwQYMBaAFASqekej5ImvGs8KQKcY
-P2/v6X2+MA4GA1UdDwEB/wQEAwIB5jANBgkqhkiG9w0BAQUFAAOCAQEAe8EYlFOi
-CfP+JmeaUOTDBS8rNXiRTHyoERF5TElZrMj3hWVcRrs7EKACr81Ptcw2Kuxd/u+g
-kcm2k298gFTsxwhwDY77guwqYHhpNjbRxZyLabVAyJRld/JXIWY7zoVAtjNjGr95
-HvxcHdMdkxuLDF2FvZkwMhgJkVLpfKG6/2SSmuz+Ne6ML678IIbsSt4beDI3poHS
-na9aEhbKmVv8b20OxaAehsmR0FyYgl9jDIpaq9iVpszLita/ZEuOyoqysOkhMp6q
-qIWYNIE5ITuoOlIyPfZrN4YGWhWY3PARZv40ILcD9EEQfTmEeZZyY7aWAuVrua0Z
-TbvGRNs2yyqcjg==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/Microsece-SzignoRootCA.crt b/test/rules/platform_certs/default/Microsece-SzignoRootCA.crt
deleted file mode 100644
index 5d2cbe78655c..000000000000
--- a/test/rules/platform_certs/default/Microsece-SzignoRootCA.crt
+++ /dev/null
@@ -1,43 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIHqDCCBpCgAwIBAgIRAMy4579OKRr9otxmpRwsDxEwDQYJKoZIhvcNAQEFBQAw
-cjELMAkGA1UEBhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MRYwFAYDVQQKEw1NaWNy
-b3NlYyBMdGQuMRQwEgYDVQQLEwtlLVN6aWdubyBDQTEiMCAGA1UEAxMZTWljcm9z
-ZWMgZS1Temlnbm8gUm9vdCBDQTAeFw0wNTA0MDYxMjI4NDRaFw0xNzA0MDYxMjI4
-NDRaMHIxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEWMBQGA1UEChMN
-TWljcm9zZWMgTHRkLjEUMBIGA1UECxMLZS1Temlnbm8gQ0ExIjAgBgNVBAMTGU1p
-Y3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDtyADVgXvNOABHzNuEwSFpLHSQDCHZU4ftPkNEU6+r+ICbPHiN1I2u
-uO/TEdyB5s87lozWbxXGd36hL+BfkrYn13aaHUM86tnsL+4582pnS4uCzyL4ZVX+
-LMsvfUh6PXX5qqAnu3jCBspRwn5mS6/NoqdNAoI/gqyFxuEPkEeZlApxcpMqyabA
-vjxWTHOSJ/FrtfX9/DAFYJLG65Z+AZHCabEeHXtTRbjcQR/Ji3HWVBTji1R4P770
-Yjtb9aPs1ZJ04nQw7wHb4dSrmZsqa/i9phyGI0Jf7Enemotb9HI6QMVJPqW+jqpx
-62z69Rrkav17fVVA71hu5tnVvCSrwe+3AgMBAAGjggQ3MIIEMzBnBggrBgEFBQcB
-AQRbMFkwKAYIKwYBBQUHMAGGHGh0dHBzOi8vcmNhLmUtc3ppZ25vLmh1L29jc3Aw
-LQYIKwYBBQUHMAKGIWh0dHA6Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNydDAP
-BgNVHRMBAf8EBTADAQH/MIIBcwYDVR0gBIIBajCCAWYwggFiBgwrBgEEAYGoGAIB
-AQEwggFQMCgGCCsGAQUFBwIBFhxodHRwOi8vd3d3LmUtc3ppZ25vLmh1L1NaU1ov
-MIIBIgYIKwYBBQUHAgIwggEUHoIBEABBACAAdABhAG4A+gBzAO0AdAB2AOEAbgB5
-ACAA6QByAHQAZQBsAG0AZQB6AOkAcwDpAGgAZQB6ACAA6QBzACAAZQBsAGYAbwBn
-AGEAZADhAHMA4QBoAG8AegAgAGEAIABTAHoAbwBsAGcA4QBsAHQAYQB0APMAIABT
-AHoAbwBsAGcA4QBsAHQAYQB0AOEAcwBpACAAUwB6AGEAYgDhAGwAeQB6AGEAdABh
-ACAAcwB6AGUAcgBpAG4AdAAgAGsAZQBsAGwAIABlAGwAagDhAHIAbgBpADoAIABo
-AHQAdABwADoALwAvAHcAdwB3AC4AZQAtAHMAegBpAGcAbgBvAC4AaAB1AC8AUwBa
-AFMAWgAvMIHIBgNVHR8EgcAwgb0wgbqggbeggbSGIWh0dHA6Ly93d3cuZS1zemln
-bm8uaHUvUm9vdENBLmNybIaBjmxkYXA6Ly9sZGFwLmUtc3ppZ25vLmh1L0NOPU1p
-Y3Jvc2VjJTIwZS1Temlnbm8lMjBSb290JTIwQ0EsT1U9ZS1Temlnbm8lMjBDQSxP
-PU1pY3Jvc2VjJTIwTHRkLixMPUJ1ZGFwZXN0LEM9SFU/Y2VydGlmaWNhdGVSZXZv
-Y2F0aW9uTGlzdDtiaW5hcnkwDgYDVR0PAQH/BAQDAgEGMIGWBgNVHREEgY4wgYuB
-EGluZm9AZS1zemlnbm8uaHWkdzB1MSMwIQYDVQQDDBpNaWNyb3NlYyBlLVN6aWdu
-w7MgUm9vdCBDQTEWMBQGA1UECwwNZS1TemlnbsOzIEhTWjEWMBQGA1UEChMNTWlj
-cm9zZWMgS2Z0LjERMA8GA1UEBxMIQnVkYXBlc3QxCzAJBgNVBAYTAkhVMIGsBgNV
-HSMEgaQwgaGAFMegSXUWYYTbMUuE0vE3QJDvTtz3oXakdDByMQswCQYDVQQGEwJI
-VTERMA8GA1UEBxMIQnVkYXBlc3QxFjAUBgNVBAoTDU1pY3Jvc2VjIEx0ZC4xFDAS
-BgNVBAsTC2UtU3ppZ25vIENBMSIwIAYDVQQDExlNaWNyb3NlYyBlLVN6aWdubyBS
-b290IENBghEAzLjnv04pGv2i3GalHCwPETAdBgNVHQ4EFgQUx6BJdRZhhNsxS4TS
-8TdAkO9O3PcwDQYJKoZIhvcNAQEFBQADggEBANMTnGZjWS7KXHAM/IO8VbH0jgds
-ZifOwTsgqRy7RlRw7lrMoHfqaEQn6/Ip3Xep1fvj1KcExJW4C+FEaGAHQzAxQmHl
-7tnlJNUb3+FKG6qfx1/4ehHqE5MAyopYse7tDk2016g2JnzgOsHVV4Lxdbb9iV/a
-86g4nzUGCM4ilb7N1fy+W955a9x6qWVmvrElWl/tftOsRm1M9DKHtCAE4Gx4sHfR
-hUZLphK3dehKyVZs15KrnfVJONJPU+NVkBHbmJbGSfI+9J8b4PeI3CVimUTYc78/
-MPMMNz7UwiiAc7EBt51alhQBS6kRnSlqLtBdgcDPsiBDxwPgN05dCtxZICU=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/Microsece-SzignoRootCA2009.crt b/test/rules/platform_certs/default/Microsece-SzignoRootCA2009.crt
deleted file mode 100644
index 6bada5131106..000000000000
--- a/test/rules/platform_certs/default/Microsece-SzignoRootCA2009.crt
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYD
-VQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0
-ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0G
-CSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTAeFw0wOTA2MTYxMTMwMThaFw0y
-OTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3Qx
-FjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3pp
-Z25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvP
-kd6mJviZpWNwrZuuyjNAfW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tc
-cbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG0IMZfcChEhyVbUr02MelTTMuhTlAdX4U
-fIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKApxn1ntxVUwOXewdI/5n7
-N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm1HxdrtbC
-xkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1
-+rUCAwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
-A1UdDgQWBBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPM
-Pcu1SCOhGnqmKrs0aDAbBgNVHREEFDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqG
-SIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0olZMEyL/azXm4Q5DwpL7v8u8h
-mLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfXI/OMn74dseGk
-ddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
-tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c
-2Pm2G2JwCz02yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5t
-HMN1Rq41Bab2XD0h7lbwyYIiLXpUq3DDfSJlgnCW
------END CERTIFICATE-----
diff --git "a/test/rules/platform_certs/default/NetLockArany(ClassGold)F\305\221tan\303\272s\303\255tv\303\241ny.crt" "b/test/rules/platform_certs/default/NetLockArany(ClassGold)F\305\221tan\303\272s\303\255tv\303\241ny.crt"
deleted file mode 100644
index 691bb2420c35..000000000000
--- "a/test/rules/platform_certs/default/NetLockArany(ClassGold)F\305\221tan\303\272s\303\255tv\303\241ny.crt"
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQG
-EwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3
-MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNl
-cnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBBcmFueSAoQ2xhc3MgR29sZCkgRsWR
-dGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgxMjA2MTUwODIxWjCB
-pzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxOZXRM
-b2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlm
-aWNhdGlvbiBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNz
-IEdvbGQpIEbFkXRhbsO6c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAxCRec75LbRTDofTjl5Bu0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrT
-lF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw/HpYzY6b7cNGbIRwXdrz
-AZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAkH3B5r9s5
-VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRG
-ILdwfzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2
-BJtr+UBdADTHLpl1neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAG
-AQH/AgEEMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2M
-U9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwWqZw8UQCgwBEIBaeZ5m8BiFRh
-bvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTtaYtOUZcTh5m2C
-+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
-bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2F
-uLjbvrW5KfnaNwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2
-XjG4Kvte9nHfRCaexOYNkbQudZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/NetworkSolutionsCertificateAuthority.crt b/test/rules/platform_certs/default/NetworkSolutionsCertificateAuthority.crt
deleted file mode 100644
index 4a28bfac8d3e..000000000000
--- a/test/rules/platform_certs/default/NetworkSolutionsCertificateAuthority.crt
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBi
-MQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
-MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
-dHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMxMjM1OTU5WjBiMQswCQYDVQQGEwJV
-UzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydO
-ZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwz
-c7MEL7xxjOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPP
-OCwGJgl6cvf6UDL4wpPTaaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rl
-mGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXTcrA/vGp97Eh/jcOrqnErU2lBUzS1sLnF
-BgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc/Qzpf14Dl847ABSHJ3A4
-qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMBAAGjgZcw
-gZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIB
-BjAPBgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwu
-bmV0c29sc3NsLmNvbS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3Jp
-dHkuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc8
-6fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q4LqILPxFzBiwmZVRDuwduIj/
-h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/GGUsyfJj4akH
-/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
-wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHN
-pGxlaKFJdlxDydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/OISTEWISeKeyGlobalRootGACA.crt b/test/rules/platform_certs/default/OISTEWISeKeyGlobalRootGACA.crt
deleted file mode 100644
index df2f73c51173..000000000000
--- a/test/rules/platform_certs/default/OISTEWISeKeyGlobalRootGACA.crt
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCB
-ijELMAkGA1UEBhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHly
-aWdodCAoYykgMjAwNTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl
-ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQSBDQTAeFw0w
-NTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYDVQQGEwJDSDEQMA4G
-A1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIwIAYD
-VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBX
-SVNlS2V5IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAy0+zAJs9Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxR
-VVuuk+g3/ytr6dTqvirdqFEr12bDYVxgAsj1znJ7O7jyTmUIms2kahnBAbtzptf2
-w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbDd50kc3vkDIzh2TbhmYsF
-mQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ/yxViJGg
-4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t9
-4B3RLoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYw
-DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQw
-EAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOx
-SPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vImMMkQyh2I+3QZH4VFvbBsUfk2
-ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4+vg1YFkCExh8
-vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
-hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZi
-Fj4A4xylNoEYokxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ
-/L7fCg0=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/OISTEWISeKeyGlobalRootGBCA.crt b/test/rules/platform_certs/default/OISTEWISeKeyGlobalRootGBCA.crt
deleted file mode 100644
index 7d7ff0387bfb..000000000000
--- a/test/rules/platform_certs/default/OISTEWISeKeyGlobalRootGBCA.crt
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDtTCCAp2gAwIBAgIQdrEgUnTwhYdGs/gjGvbCwDANBgkqhkiG9w0BAQsFADBt
-MQswCQYDVQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUg
-Rm91bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9i
-YWwgUm9vdCBHQiBDQTAeFw0xNDEyMDExNTAwMzJaFw0zOTEyMDExNTEwMzFaMG0x
-CzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYDVQQLExlPSVNURSBG
-b3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEdsb2Jh
-bCBSb290IEdCIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Be3
-HEokKtaXscriHvt9OO+Y9bI5mE4nuBFde9IllIiCFSZqGzG7qFshISvYD06fWvGx
-WuR51jIjK+FTzJlFXHtPrby/h0oLS5daqPZI7H17Dc0hBt+eFf1Biki3IPShehtX
-1F1Q/7pn2COZH8g/497/b1t3sWtuuMlk9+HKQUYOKXHQuSP8yYFfTvdv37+ErXNk
-u7dCjmn21HYdfp2nuFeKUWdy19SouJVUQHMD9ur06/4oQnc/nSMbsrY9gBQHTC5P
-99UKFg29ZkM3fiNDecNAhvVMKdqOmq0NpQSHiB6F4+lT1ZvIiwNjeOvgGUpuuy9r
-M2RYk61pv48b74JIxwIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUNQ/INmNe4qPs+TtmFc5RUuORmj0wEAYJKwYBBAGCNxUB
-BAMCAQAwDQYJKoZIhvcNAQELBQADggEBAEBM+4eymYGQfp3FsLAmzYh7KzKNbrgh
-cViXfa43FK8+5/ea4n32cZiZBKpDdHij40lhPnOMTZTg+XHEthYOU3gf1qKHLwI5
-gSk8rxWYITD+KJAAjNHhy/peyP34EEY7onhCkRd0VQreUGdNZtGn//3ZwLWoo4rO
-ZvUPQ82nK1d7Y0Zqqi5S2PTt4W2tKZB4SLrhI6qjiey1q5bAtEuiHZeeevJuQHHf
-aPFlTc58Bd9TZaml8LGXBHAVRgOY1NK/VLSgWH1Sb9pWJmLU2NuJMW8c8CLC02Ic
-Nc1MaRVUGpCY3useX8p3x8uOPUNpnJpY0CQ73xtAln41rYHHTnG6iBM=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/PSCProcert.crt b/test/rules/platform_certs/default/PSCProcert.crt
deleted file mode 100644
index 3ed7c0525ba0..000000000000
--- a/test/rules/platform_certs/default/PSCProcert.crt
+++ /dev/null
@@ -1,53 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIJhjCCB26gAwIBAgIBCzANBgkqhkiG9w0BAQsFADCCAR4xPjA8BgNVBAMTNUF1
-dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIFJhaXogZGVsIEVzdGFkbyBWZW5lem9s
-YW5vMQswCQYDVQQGEwJWRTEQMA4GA1UEBxMHQ2FyYWNhczEZMBcGA1UECBMQRGlz
-dHJpdG8gQ2FwaXRhbDE2MDQGA1UEChMtU2lzdGVtYSBOYWNpb25hbCBkZSBDZXJ0
-aWZpY2FjaW9uIEVsZWN0cm9uaWNhMUMwQQYDVQQLEzpTdXBlcmludGVuZGVuY2lh
-IGRlIFNlcnZpY2lvcyBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9uaWNhMSUwIwYJ
-KoZIhvcNAQkBFhZhY3JhaXpAc3VzY2VydGUuZ29iLnZlMB4XDTEwMTIyODE2NTEw
-MFoXDTIwMTIyNTIzNTk1OVowgdExJjAkBgkqhkiG9w0BCQEWF2NvbnRhY3RvQHBy
-b2NlcnQubmV0LnZlMQ8wDQYDVQQHEwZDaGFjYW8xEDAOBgNVBAgTB01pcmFuZGEx
-KjAoBgNVBAsTIVByb3ZlZWRvciBkZSBDZXJ0aWZpY2Fkb3MgUFJPQ0VSVDE2MDQG
-A1UEChMtU2lzdGVtYSBOYWNpb25hbCBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9u
-aWNhMQswCQYDVQQGEwJWRTETMBEGA1UEAxMKUFNDUHJvY2VydDCCAiIwDQYJKoZI
-hvcNAQEBBQADggIPADCCAgoCggIBANW39KOUM6FGqVVhSQ2oh3NekS1wwQYalNo9
-7BVCwfWMrmoX8Yqt/ICV6oNEolt6Vc5Pp6XVurgfoCfAUFM+jbnADrgV3NZs+J74
-BCXfgI8Qhd19L3uA3VcAZCP4bsm+lU/hdezgfl6VzbHvvnpC2Mks0+saGiKLt38G
-ieU89RLAu9MLmV+QfI4tL3czkkohRqipCKzx9hEC2ZUWno0vluYC3XXCFCpa1sl9
-JcLB/KpnheLsvtF8PPqv1W7/U0HU9TI4seJfxPmOEO8GqQKJ/+MMbpfg353bIdD0
-PghpbNjU5Db4g7ayNo+c7zo3Fn2/omnXO1ty0K+qP1xmk6wKImG20qCZyFSTXai2
-0b1dCl53lKItwIKOvMoDKjSuc/HUtQy9vmebVOvh+qBa7Dh+PsHMosdEMXXqP+UH
-0quhJZb25uSgXTcYOWEAM11G1ADEtMo88aKjPvM6/2kwLkDd9p+cJsmWN63nOaK/
-6mnbVSKVUyqUtd+tFjiBdWbjxywbk5yqjKPK2Ww8F22c3HxT4CAnQzb5EuE8XL1m
-v6JpIzi4mWCZDlZTOpx+FIywBm/xhnaQr/2v/pDGj59/i5IjnOcVdo/Vi5QTcmn7
-K2FjiO/mpF7moxdqWEfLcU8UC17IAggmosvpr2uKGcfLFFb14dq12fy/czja+eev
-bqQ34gcnAgMBAAGjggMXMIIDEzASBgNVHRMBAf8ECDAGAQH/AgEBMDcGA1UdEgQw
-MC6CD3N1c2NlcnRlLmdvYi52ZaAbBgVghl4CAqASDBBSSUYtRy0yMDAwNDAzNi0w
-MB0GA1UdDgQWBBRBDxk4qpl/Qguk1yeYVKIXTC1RVDCCAVAGA1UdIwSCAUcwggFD
-gBStuyIdxuDSAaj9dlBSk+2YwU2u06GCASakggEiMIIBHjE+MDwGA1UEAxM1QXV0
-b3JpZGFkIGRlIENlcnRpZmljYWNpb24gUmFpeiBkZWwgRXN0YWRvIFZlbmV6b2xh
-bm8xCzAJBgNVBAYTAlZFMRAwDgYDVQQHEwdDYXJhY2FzMRkwFwYDVQQIExBEaXN0
-cml0byBDYXBpdGFsMTYwNAYDVQQKEy1TaXN0ZW1hIE5hY2lvbmFsIGRlIENlcnRp
-ZmljYWNpb24gRWxlY3Ryb25pY2ExQzBBBgNVBAsTOlN1cGVyaW50ZW5kZW5jaWEg
-ZGUgU2VydmljaW9zIGRlIENlcnRpZmljYWNpb24gRWxlY3Ryb25pY2ExJTAjBgkq
-hkiG9w0BCQEWFmFjcmFpekBzdXNjZXJ0ZS5nb2IudmWCAQowDgYDVR0PAQH/BAQD
-AgEGME0GA1UdEQRGMESCDnByb2NlcnQubmV0LnZloBUGBWCGXgIBoAwMClBTQy0w
-MDAwMDKgGwYFYIZeAgKgEgwQUklGLUotMzE2MzUzNzMtNzB2BgNVHR8EbzBtMEag
-RKBChkBodHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52ZS9sY3IvQ0VSVElGSUNBRE8t
-UkFJWi1TSEEzODRDUkxERVIuY3JsMCOgIaAfhh1sZGFwOi8vYWNyYWl6LnN1c2Nl
-cnRlLmdvYi52ZTA3BggrBgEFBQcBAQQrMCkwJwYIKwYBBQUHMAGGG2h0dHA6Ly9v
-Y3NwLnN1c2NlcnRlLmdvYi52ZTBBBgNVHSAEOjA4MDYGBmCGXgMBAjAsMCoGCCsG
-AQUFBwIBFh5odHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52ZS9kcGMwDQYJKoZIhvcN
-AQELBQADggIBACtZ6yKZu4SqT96QxtGGcSOeSwORR3C7wJJg7ODU523G0+1ng3dS
-1fLld6c2suNUvtm7CpsR72H0xpkzmfWvADmNg7+mvTV+LFwxNG9s2/NkAZiqlCxB
-3RWGymspThbASfzXg0gTB1GEMVKIu4YXx2sviiCtxQuPcD4quxtxj7mkoP3Yldmv
-Wb8lK5jpY5MvYB7Eqvh39YtsL+1+LrVPQA3uvFd359m21D+VJzog1eWuq2w1n8Gh
-HVnchIHuTQfiSLaeS5UtQbHh6N5+LwUeaO6/u5BlOsju6rEYNxxik6SgMexxbJHm
-pHmJWhSnFFAFTKQAVzAswbVhltw+HoSvOULP5dAssSS830DD7X9jSr3hTxJkhpXz
-sOfIt+FTvZLm8wyWuevo5pLtp4EJFAv8lXrPj9Y0TzYS3F7RNHXGRoAvlQSMx4bE
-qCaJqD8Zm4G7UaRKhqsLEQ+xrmNTbSjq3TNWOByyrYDT13K9mmyZY+gAu0F2Bbdb
-mRiKw7gSXFbPVgx96OLP7bx0R/vu0xdOIk9W/1DzLuY5poLWccret9W6aAjtmcz9
-opLLabid+Qqkpj5PkygqYWwHJgD/ll9ohri4zspV4KuxPX+Y1zMOWj3YeMLEYC/H
-YvBhkdI4sPaeVdtAgAUSM84dkpvRabP/v/GSCmE1P93+hvS84Bpxs2Km
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/QuoVadisRootCA1G3.crt b/test/rules/platform_certs/default/QuoVadisRootCA1G3.crt
deleted file mode 100644
index a06de458e4a3..000000000000
--- a/test/rules/platform_certs/default/QuoVadisRootCA1G3.crt
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIUeFhfLq0sGUvjNwc1NBMotZbUZZMwDQYJKoZIhvcNAQEL
-BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc
-BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMSBHMzAeFw0xMjAxMTIxNzI3NDRaFw00
-MjAxMTIxNzI3NDRaMEgxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDEgRzMwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQCgvlAQjunybEC0BJyFuTHK3C3kEakEPBtV
-wedYMB0ktMPvhd6MLOHBPd+C5k+tR4ds7FtJwUrVu4/sh6x/gpqG7D0DmVIB0jWe
-rNrwU8lmPNSsAgHaJNM7qAJGr6Qc4/hzWHa39g6QDbXwz8z6+cZM5cOGMAqNF341
-68Xfuw6cwI2H44g4hWf6Pser4BOcBRiYz5P1sZK0/CPTz9XEJ0ngnjybCKOLXSoh
-4Pw5qlPafX7PGglTvF0FBM+hSo+LdoINofjSxxR3W5A2B4GbPgb6Ul5jxaYA/qXp
-UhtStZI5cgMJYr2wYBZupt0lwgNm3fME0UDiTouG9G/lg6AnhF4EwfWQvTA9xO+o
-abw4m6SkltFi2mnAAZauy8RRNOoMqv8hjlmPSlzkYZqn0ukqeI1RPToV7qJZjqlc
-3sX5kCLliEVx3ZGZbHqfPT2YfF72vhZooF6uCyP8Wg+qInYtyaEQHeTTRCOQiJ/G
-KubX9ZqzWB4vMIkIG1SitZgj7Ah3HJVdYdHLiZxfokqRmu8hqkkWCKi9YSgxyXSt
-hfbZxbGL0eUQMk1fiyA6PEkfM4VZDdvLCXVDaXP7a3F98N/ETH3Goy7IlXnLc6KO
-Tk0k+17kBL5yG6YnLUlamXrXXAkgt3+UuU/xDRxeiEIbEbfnkduebPRq34wGmAOt
-zCjvpUfzUwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
-BjAdBgNVHQ4EFgQUo5fW816iEOGrRZ88F2Q87gFwnMwwDQYJKoZIhvcNAQELBQAD
-ggIBABj6W3X8PnrHX3fHyt/PX8MSxEBd1DKquGrX1RUVRpgjpeaQWxiZTOOtQqOC
-MTaIzen7xASWSIsBx40Bz1szBpZGZnQdT+3Btrm0DWHMY37XLneMlhwqI2hrhVd2
-cDMT/uFPpiN3GPoajOi9ZcnPP/TJF9zrx7zABC4tRi9pZsMbj/7sPtPKlL92CiUN
-qXsCHKnQO18LwIE6PWThv6ctTr1NxNgpxiIY0MWscgKCP6o6ojoilzHdCGPDdRS5
-YCgtW2jgFqlmgiNR9etT2DGbe+m3nUvriBbP+V04ikkwj+3x6xn0dxoxGE1nVGwv
-b2X52z3sIexe9PSLymBlVNFxZPT5pqOBMzYzcfCkeF9OrYMh3jRJjehZrJ3ydlo2
-8hP0r+AJx2EqbPfgna67hkooby7utHnNkDPDs3b69fBsnQGQ+p6Q9pxyz0fawx/k
-NSBT8lTR32GDpgLiJTjehTItXnOQUl1CxM49S+H5GYQd1aJQzEH7QRTDvdbJWqNj
-ZgKAvQU6O0ec7AAmTPWIUb+oI38YB7AL7YsmoWTTYUrrXJ/es69nA7Mf3W1daWhp
-q1467HxpvMc7hU6eFbm0FU/DlXpY18ls6Wy58yljXrQs8C097Vpl4KlbQMJImYFt
-nh8GKjwStIsPm6Ik8KaN1nrgS7ZklmOVhMJKzRwuJIczYOXD
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/QuoVadisRootCA2.crt b/test/rules/platform_certs/default/QuoVadisRootCA2.crt
deleted file mode 100644
index 0ad44ffcd69c..000000000000
--- a/test/rules/platform_certs/default/QuoVadisRootCA2.crt
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x
-GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv
-b3QgQ0EgMjAeFw0wNjExMjQxODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNV
-BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W
-YWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCa
-GMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6XJxg
-Fyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55J
-WpzmM+Yklvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bB
-rrcCaoF6qUWD4gXmuVbBlDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp
-+ARz8un+XJiM9XOva7R+zdRcAitMOeGylZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1
-ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt66/3FsvbzSUr5R/7mp/i
-Ucw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1JdxnwQ5hYIiz
-PtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og
-/zOhD7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UH
-oycR7hYQe7xFSkyyBNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuI
-yV77zGHcizN300QyNQliBJIWENieJ0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1Ud
-EwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBQahGK8SEwzJQTU7tD2
-A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGUa6FJpEcwRTEL
-MAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
-ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2f
-BluornFdLwUvZ+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzn
-g/iN/Ae42l9NLmeyhP3ZRPx3UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2Bl
-fF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodmVjB3pjd4M1IQWK4/YY7yarHvGH5K
-WWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK+JDSV6IZUaUtl0Ha
-B0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrWIozc
-hLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPR
-TUIZ3Ph1WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWD
-mbA4CD/pXvk1B+TJYm5Xf6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0Z
-ohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y
-4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8VCLAAVBpQ570su9t+Oza
-8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/QuoVadisRootCA2G3.crt b/test/rules/platform_certs/default/QuoVadisRootCA2G3.crt
deleted file mode 100644
index d30f409aafd7..000000000000
--- a/test/rules/platform_certs/default/QuoVadisRootCA2G3.crt
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIURFc0JFuBiZs18s64KztbpybwdSgwDQYJKoZIhvcNAQEL
-BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc
-BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMiBHMzAeFw0xMjAxMTIxODU5MzJaFw00
-MjAxMTIxODU5MzJaMEgxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDIgRzMwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQChriWyARjcV4g/Ruv5r+LrI3HimtFhZiFf
-qq8nUeVuGxbULX1QsFN3vXg6YOJkApt8hpvWGo6t/x8Vf9WVHhLL5hSEBMHfNrMW
-n4rjyduYNM7YMxcoRvynyfDStNVNCXJJ+fKH46nafaF9a7I6JaltUkSs+L5u+9ym
-c5GQYaYDFCDy54ejiK2toIz/pgslUiXnFgHVy7g1gQyjO/Dh4fxaXc6AcW34Sas+
-O7q414AB+6XrW7PFXmAqMaCvN+ggOp+oMiwMzAkd056OXbxMmO7FGmh77FOm6RQ1
-o9/NgJ8MSPsc9PG/Srj61YxxSscfrf5BmrODXfKEVu+lV0POKa2Mq1W/xPtbAd0j
-IaFYAI7D0GoT7RPjEiuA3GfmlbLNHiJuKvhB1PLKFAeNilUSxmn1uIZoL1NesNKq
-IcGY5jDjZ1XHm26sGahVpkUG0CM62+tlXSoREfA7T8pt9DTEceT/AFr2XK4jYIVz
-8eQQsSWu1ZK7E8EM4DnatDlXtas1qnIhO4M15zHfeiFuuDIIfR0ykRVKYnLP43eh
-vNURG3YBZwjgQQvD6xVu+KQZ2aKrr+InUlYrAoosFCT5v0ICvybIxo/gbjh9Uy3l
-7ZizlWNof/k19N+IxWA1ksB8aRxhlRbQ694Lrz4EEEVlWFA4r0jyWbYW8jwNkALG
-cC4BrTwV1wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
-BjAdBgNVHQ4EFgQU7edvdlq/YOxJW8ald7tyFnGbxD0wDQYJKoZIhvcNAQELBQAD
-ggIBAJHfgD9DCX5xwvfrs4iP4VGyvD11+ShdyLyZm3tdquXK4Qr36LLTn91nMX66
-AarHakE7kNQIXLJgapDwyM4DYvmL7ftuKtwGTTwpD4kWilhMSA/ohGHqPHKmd+RC
-roijQ1h5fq7KpVMNqT1wvSAZYaRsOPxDMuHBR//47PERIjKWnML2W2mWeyAMQ0Ga
-W/ZZGYjeVYg3UQt4XAoeo0L9x52ID8DyeAIkVJOviYeIyUqAHerQbj5hLja7NQ4n
-lv1mNDthcnPxFlxHBlRJAHpYErAK74X9sbgzdWqTHBLmYF5vHX/JHyPLhGGfHoJE
-+V+tYlUkmlKY7VHnoX6XOuYvHxHaU4AshZ6rNRDbIl9qxV6XU/IyAgkwo1jwDQHV
-csaxfGl7w/U2Rcxhbl5MlMVerugOXou/983g7aEOGzPuVBj+D77vfoRrQ+NwmNtd
-dbINWQeFFSM51vHfqSYP1kjHs6Yi9TM3WpVHn3u6GBVv/9YUZINJ0gpnIdsPNWNg
-KCLjsZWDzYWm3S8P52dSbrsvhXz1SnPnxT7AvSESBT/8twNJAlvIJebiVDj1eYeM
-HVOyToV7BjjHLPj4sHKNJeV3UvQDHEimUF+IIDBu8oJDqz2XhOdT+yHBTw8imoa4
-WSr2Rz0ZiC3oheGe7IUIarFsNMkd7EgrO3jtZsSOeWmD3n+M
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/QuoVadisRootCA3.crt b/test/rules/platform_certs/default/QuoVadisRootCA3.crt
deleted file mode 100644
index 969322b95e13..000000000000
--- a/test/rules/platform_certs/default/QuoVadisRootCA3.crt
+++ /dev/null
@@ -1,38 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x
-GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv
-b3QgQ0EgMzAeFw0wNjExMjQxOTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNV
-BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W
-YWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDM
-V0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNggDhoB
-4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUr
-H556VOijKTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd
-8lyyBTNvijbO0BNO/79KDDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9Cabwv
-vWhDFlaJKjdhkf2mrk7AyxRllDdLkgbvBNDInIjbC3uBr7E9KsRlOni27tyAsdLT
-mZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwpp5ijJUMv7/FfJuGITfhe
-btfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8nT8KKdjc
-T5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDt
-WAEXMJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZ
-c6tsgLjoC2SToJyMGf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A
-4iLItLRkT9a6fUg+qGkM17uGcclzuD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYD
-VR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHTBgkrBgEEAb5YAAMwgcUwgZMG
-CCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmljYXRlIGNvbnN0
-aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
-aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVu
-dC4wLQYIKwYBBQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2Nw
-czALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4G
-A1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4ywLQoUmkRzBFMQswCQYDVQQGEwJC
-TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UEAxMSUXVvVmFkaXMg
-Um9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZVqyM0
-7ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSem
-d1o417+shvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd
-+LJ2w/w4E6oM3kJpK27zPOuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B
-4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadN
-t54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp8kokUvd0/bpO5qgdAm6x
-DYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBCbjPsMZ57
-k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6s
-zHXug/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0j
-Wy10QJLZYxkNc91pvGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeT
-mJlglFwjz1onl14LBQaTNx47aTbrqZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK
-4SVhM7JZG+Ju1zdXtg2pEto=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/QuoVadisRootCA3G3.crt b/test/rules/platform_certs/default/QuoVadisRootCA3G3.crt
deleted file mode 100644
index 279a719c1ca9..000000000000
--- a/test/rules/platform_certs/default/QuoVadisRootCA3G3.crt
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIULvWbAiin23r/1aOp7r0DoM8Sah0wDQYJKoZIhvcNAQEL
-BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc
-BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMyBHMzAeFw0xMjAxMTIyMDI2MzJaFw00
-MjAxMTIyMDI2MzJaMEgxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDMgRzMwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQCzyw4QZ47qFJenMioKVjZ/aEzHs286IxSR
-/xl/pcqs7rN2nXrpixurazHb+gtTTK/FpRp5PIpM/6zfJd5O2YIyC0TeytuMrKNu
-FoM7pmRLMon7FhY4futD4tN0SsJiCnMK3UmzV9KwCoWdcTzeo8vAMvMBOSBDGzXR
-U7Ox7sWTaYI+FrUoRqHe6okJ7UO4BUaKhvVZR74bbwEhELn9qdIoyhA5CcoTNs+c
-ra1AdHkrAj80//ogaX3T7mH1urPnMNA3I4ZyYUUpSFlob3emLoG+B01vr87ERROR
-FHAGjx+f+IdpsQ7vw4kZ6+ocYfx6bIrc1gMLnia6Et3UVDmrJqMz6nWB2i3ND0/k
-A9HvFZcba5DFApCTZgIhsUfei5pKgLlVj7WiL8DWM2fafsSntARE60f75li59wzw
-eyuxwHApw0BiLTtIadwjPEjrewl5qW3aqDCYz4ByA4imW0aucnl8CAMhZa634Ryl
-sSqiMd5mBPfAdOhx3v89WcyWJhKLhZVXGqtrdQtEPREoPHtht+KPZ0/l7DxMYIBp
-VzgeAVuNVejH38DMdyM0SXV89pgR6y3e7UEuFAUCf+D+IOs15xGsIs5XPd7JMG0Q
-A4XN8f+MFrXBsj6IbGB/kE+V9/YtrQE5BwT6dYB9v0lQ7e/JxHwc64B+27bQ3RP+
-ydOc17KXqQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
-BjAdBgNVHQ4EFgQUxhfQvKjqAkPyGwaZXSuQILnXnOQwDQYJKoZIhvcNAQELBQAD
-ggIBADRh2Va1EodVTd2jNTFGu6QHcrxfYWLopfsLN7E8trP6KZ1/AvWkyaiTt3px
-KGmPc+FSkNrVvjrlt3ZqVoAh313m6Tqe5T72omnHKgqwGEfcIHB9UqM+WXzBusnI
-FUBhynLWcKzSt/Ac5IYp8M7vaGPQtSCKFWGafoaYtMnCdvvMujAWzKNhxnQT5Wvv
-oxXqA/4Ti2Tk08HS6IT7SdEQTXlm66r99I0xHnAUrdzeZxNMgRVhvLfZkXdxGYFg
-u/BYpbWcC/ePIlUnwEsBbTuZDdQdm2NnL9DuDcpmvJRPpq3t/O5jrFc/ZSXPsoaP
-0Aj/uHYUbt7lJ+yreLVTubY/6CD50qi+YUbKh4yE8/nxoGibIh6BJpsQBJFxwAYf
-3KDTuVan45gtf4Od34wrnDKOMpTwATwiKp9Dwi7DmDkHOHv8XgBCH/MyJnmDhPbl
-8MFREsALHgQjDFSlTC9JxUrRtm5gDWv8a4uFJGS3iQ6rJUdbPM9+Sb3H6QrG2vd+
-DhcI00iX0HGS8A85PjRqHH3Y8iKuu2n0M7SmSFXRDw4m6Oy2Cy2nhTXN/VnIn9HN
-PlopNLk9hM6xZdRZkZFWdSHBd575euFgndOtBBj0fOtek49TSiIp+EgrPk2GrFt/
-ywaZWWDYWGWVjUTR939+J399roD1B0y2PpxxVJkES/1Y+Zj0
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/QuoVadisRootCertificationAuthority.crt b/test/rules/platform_certs/default/QuoVadisRootCertificationAuthority.crt
deleted file mode 100644
index ea68f8876e1b..000000000000
--- a/test/rules/platform_certs/default/QuoVadisRootCertificationAuthority.crt
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJC
-TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0
-aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0
-aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAzMTkxODMzMzNaFw0yMTAzMTcxODMz
-MzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUw
-IwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVR
-dW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Yp
-li4kVEAkOPcahdxYTMukJ0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2D
-rOpm2RgbaIr1VxqYuvXtdj182d6UajtLF8HVj71lODqV0D1VNk7feVcxKh7YWWVJ
-WCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeLYzcS19Dsw3sgQUSj7cug
-F+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWenAScOospU
-xbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCC
-Ak4wPQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVv
-dmFkaXNvZmZzaG9yZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREw
-ggENMIIBCQYJKwYBBAG+WAABMIH7MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNl
-IG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBh
-c3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFy
-ZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
-Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYI
-KwYBBQUHAgEWFmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3T
-KbkGGew5Oanwl4Rqy+/fMIGuBgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rq
-y+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1p
-dGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYD
-VQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6tlCL
-MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSk
-fnIYj9lofFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf8
-7C9TqnN7Az10buYWnuulLsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1R
-cHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2xgI4JVrmcGmD+XcHXetwReNDWXcG31a0y
-mQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi5upZIof4l/UO/erMkqQW
-xFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi5nrQNiOK
-SnQ2+Q==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/RSASecurity2048v3.crt b/test/rules/platform_certs/default/RSASecurity2048v3.crt
deleted file mode 100644
index 634521d4c638..000000000000
--- a/test/rules/platform_certs/default/RSASecurity2048v3.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDYTCCAkmgAwIBAgIQCgEBAQAAAnwAAAAKAAAAAjANBgkqhkiG9w0BAQUFADA6
-MRkwFwYDVQQKExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJp
-dHkgMjA0OCBWMzAeFw0wMTAyMjIyMDM5MjNaFw0yNjAyMjIyMDM5MjNaMDoxGTAX
-BgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAbBgNVBAsTFFJTQSBTZWN1cml0eSAy
-MDQ4IFYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt49VcdKA3Xtp
-eafwGFAyPGJn9gqVB93mG/Oe2dJBVGutn3y+Gc37RqtBaB4Y6lXIL5F4iSj7Jylg
-/9+PjDvJSZu1pJTOAeo+tWN7fyb9Gd3AIb2E0S1PRsNO3Ng3OTsor8udGuorryGl
-wSMiuLgbWhOHV4PR8CDn6E8jQrAApX2J6elhc5SYcSa8LWrg903w8bYqODGBDSnh
-AMFRD0xS+ARaqn1y07iHKrtjEAMqs6FPDVpeRrc9DvV07Jmf+T0kgYim3WBU6JU2
-PcYJk5qjEoAAVZkZR73QpXzDuvsf9/UP+Ky5tfQ3mBMY3oVbtwyCO4dvlTlYMNpu
-AWgXIszACwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
-BjAfBgNVHSMEGDAWgBQHw1EwpKrpRa41JPr/JCwz0LGdjDAdBgNVHQ4EFgQUB8NR
-MKSq6UWuNST6/yQsM9CxnYwwDQYJKoZIhvcNAQEFBQADggEBAF8+hnZuuDU8TjYc
-HnmYv/3VEhF5Ug7uMYm83X/50cYVIeiKAVQNOvtUudZj1LGqlk2iQk3UUx+LEN5/
-Zb5gEydxiKRz44Rj0aRV4VCT5hsOedBnvEbIvz8XDZXmxpBp3ue0L96VfdASPz0+
-f00/FGj1EVDVwfSQpQgdMWD/YIwjVAqv/qFuxdF6Kmh4zx6CCiC0H63lhbJqaHVO
-rSU3lIW+vaHU6rcMSzyd6BIA8F+sDeGscGNz9395nzIlQnQFgCi/vcEkllgVsRch
-6YlL2weIZ/QVrXA+L02FO8K32/6YaCOJ4XQP3vTFhGMpG8zLB8kApKnXwiJPZ9d3
-7CAFYd4=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/RootCAGeneralitatValenciana.crt b/test/rules/platform_certs/default/RootCAGeneralitatValenciana.crt
deleted file mode 100644
index 999dff65a647..000000000000
--- a/test/rules/platform_certs/default/RootCAGeneralitatValenciana.crt
+++ /dev/null
@@ -1,37 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIGizCCBXOgAwIBAgIEO0XlaDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJF
-UzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJ
-R1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwHhcN
-MDEwNzA2MTYyMjQ3WhcNMjEwNzAxMTUyMjQ3WjBoMQswCQYDVQQGEwJFUzEfMB0G
-A1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScw
-JQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGKqtXETcvIorKA3Qdyu0togu8M1JAJke+
-WmmmO3I2F0zo37i7L3bhQEZ0ZQKQUgi0/6iMweDHiVYQOTPvaLRfX9ptI6GJXiKj
-SgbwJ/BXufjpTjJ3Cj9BZPPrZe52/lSqfR0grvPXdMIKX/UIKFIIzFVd0g/bmoGl
-u6GzwZTNVOAydTGRGmKy3nXiz0+J2ZGQD0EbtFpKd71ng+CT516nDOeB0/RSrFOy
-A8dEJvt55cs0YFAQexvba9dHq198aMpunUEDEO5rmXteJajCq+TA81yc477OMUxk
-Hl6AovWDfgzWyoxVjr7gvkkHD6MkQXpYHYTqWBLI4bft75PelAgxAgMBAAGjggM7
-MIIDNzAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnBr
-aS5ndmEuZXMwEgYDVR0TAQH/BAgwBgEB/wIBAjCCAjQGA1UdIASCAiswggInMIIC
-IwYKKwYBBAG/VQIBADCCAhMwggHoBggrBgEFBQcCAjCCAdoeggHWAEEAdQB0AG8A
-cgBpAGQAYQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAFIA
-YQDtAHoAIABkAGUAIABsAGEAIABHAGUAbgBlAHIAYQBsAGkAdABhAHQAIABWAGEA
-bABlAG4AYwBpAGEAbgBhAC4ADQAKAEwAYQAgAEQAZQBjAGwAYQByAGEAYwBpAPMA
-bgAgAGQAZQAgAFAAcgDhAGMAdABpAGMAYQBzACAAZABlACAAQwBlAHIAdABpAGYA
-aQBjAGEAYwBpAPMAbgAgAHEAdQBlACAAcgBpAGcAZQAgAGUAbAAgAGYAdQBuAGMA
-aQBvAG4AYQBtAGkAZQBuAHQAbwAgAGQAZQAgAGwAYQAgAHAAcgBlAHMAZQBuAHQA
-ZQAgAEEAdQB0AG8AcgBpAGQAYQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEA
-YwBpAPMAbgAgAHMAZQAgAGUAbgBjAHUAZQBuAHQAcgBhACAAZQBuACAAbABhACAA
-ZABpAHIAZQBjAGMAaQDzAG4AIAB3AGUAYgAgAGgAdAB0AHAAOgAvAC8AdwB3AHcA
-LgBwAGsAaQAuAGcAdgBhAC4AZQBzAC8AYwBwAHMwJQYIKwYBBQUHAgEWGWh0dHA6
-Ly93d3cucGtpLmd2YS5lcy9jcHMwHQYDVR0OBBYEFHs100DSHHgZZu90ECjcPk+y
-eAT8MIGVBgNVHSMEgY0wgYqAFHs100DSHHgZZu90ECjcPk+yeAT8oWykajBoMQsw
-CQYDVQQGEwJFUzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0G
-A1UECxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVu
-Y2lhbmGCBDtF5WgwDQYJKoZIhvcNAQEFBQADggEBACRhTvW1yEICKrNcda3Fbcrn
-lD+laJWIwVTAEGmiEi8YPyVQqHxK6sYJ2fR1xkDar1CdPaUWu20xxsdzCkj+IHLt
-b8zog2EWRpABlUt9jppSCS/2bxzkoXHPjCpaF3ODR00PNvsETUlR4hTJZGH71BTg
-9J63NI8KJr2XXPR5OkowGcytT6CYirQxlyric21+eLj4iIlPsSKRZEv1UN4D2+XF
-ducTZnV+ZfsBn5OHiJ35Rld8TWCvmHMTI6QgkYH60GFmuH3Rr9ZvHmw96RH9qfmC
-IoaZM3Fa6hlXPZHNqcCjbgcTpsnt+GijnsNacgmHKNHEc8RzGF9QdRYxn7fofMM=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/S-TRUSTAuthenticationandEncryptionRootCA2005.crt b/test/rules/platform_certs/default/S-TRUSTAuthenticationandEncryptionRootCA2005.crt
deleted file mode 100644
index ef5e4b89719d..000000000000
--- a/test/rules/platform_certs/default/S-TRUSTAuthenticationandEncryptionRootCA2005.crt
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEezCCA2OgAwIBAgIQNxkY5lNUfBq1uMtZWts1tzANBgkqhkiG9w0BAQUFADCB
-rjELMAkGA1UEBhMCREUxIDAeBgNVBAgTF0JhZGVuLVd1ZXJ0dGVtYmVyZyAoQlcp
-MRIwEAYDVQQHEwlTdHV0dGdhcnQxKTAnBgNVBAoTIERldXRzY2hlciBTcGFya2Fz
-c2VuIFZlcmxhZyBHbWJIMT4wPAYDVQQDEzVTLVRSVVNUIEF1dGhlbnRpY2F0aW9u
-IGFuZCBFbmNyeXB0aW9uIFJvb3QgQ0EgMjAwNTpQTjAeFw0wNTA2MjIwMDAwMDBa
-Fw0zMDA2MjEyMzU5NTlaMIGuMQswCQYDVQQGEwJERTEgMB4GA1UECBMXQmFkZW4t
-V3VlcnR0ZW1iZXJnIChCVykxEjAQBgNVBAcTCVN0dXR0Z2FydDEpMCcGA1UEChMg
-RGV1dHNjaGVyIFNwYXJrYXNzZW4gVmVybGFnIEdtYkgxPjA8BgNVBAMTNVMtVFJV
-U1QgQXV0aGVudGljYXRpb24gYW5kIEVuY3J5cHRpb24gUm9vdCBDQSAyMDA1OlBO
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2bVKwdMz6tNGs9HiTNL1
-toPQb9UY6ZOvJ44TzbUlNlA0EmQpoVXhOmCTnijJ4/Ob4QSwI7+Vio5bG0F/WsPo
-TUzVJBY+h0jUJ67m91MduwwA7z5hca2/OnpYH5Q9XIHV1W/fuJvS9eXLg3KSwlOy
-ggLrra1fFi2SU3bxibYs9cEv4KdKb6AwajLrmnQDaHgTncovmwsdvs91DSaXm8f1
-XgqfeN+zvOyauu9VjxuapgdjKRdZYgkqeQd3peDRF2npW932kKvimAoA0SVtnteF
-hy+S8dF2g08LOlk3KC8zpxdQ1iALCvQm+Z845y2kuJuJja2tyWp9iRe79n+Ag3rm
-7QIDAQABo4GSMIGPMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgEG
-MCkGA1UdEQQiMCCkHjAcMRowGAYDVQQDExFTVFJvbmxpbmUxLTIwNDgtNTAdBgNV
-HQ4EFgQUD8oeXHngovMpttKFswtKtWXsa1IwHwYDVR0jBBgwFoAUD8oeXHngovMp
-ttKFswtKtWXsa1IwDQYJKoZIhvcNAQEFBQADggEBAK8B8O0ZPCjoTVy7pWMciDMD
-pwCHpB8gq9Yc4wYfl35UvbfRssnV2oDsF9eK9XvCAPbpEW+EoFolMeKJ+aQAPzFo
-LtU96G7m1R08P7K9n3frndOMusDXtk3sU5wPBG7qNWdX4wple5A64U8+wwCSersF
-iXOMy6ZNwPv2AtawB6MDwidAnwzkhYItr5pCHdDHjfhA7p0GVxzZotiAFP7hYy0y
-h9WUUpY6RsZxlj33mA6ykaqP2vROJAA5VeitF7nTNCtKqUDMFypVZUF0Qn71wK/I
-k63yGFs9iQzbRzkk+OBM8h+wPQrKBU6JIRrjKpms/H+h8Q8bHz2eBIPdltkdOpQ=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/S-TRUSTUniversalRootCA.crt b/test/rules/platform_certs/default/S-TRUSTUniversalRootCA.crt
deleted file mode 100644
index b2510a981650..000000000000
--- a/test/rules/platform_certs/default/S-TRUSTUniversalRootCA.crt
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID2DCCAsCgAwIBAgIQYFbFSyNAW2TU7SXa2dYeHjANBgkqhkiG9w0BAQsFADCB
-hTELMAkGA1UEBhMCREUxKTAnBgNVBAoTIERldXRzY2hlciBTcGFya2Fzc2VuIFZl
-cmxhZyBHbWJIMScwJQYDVQQLEx5TLVRSVVNUIENlcnRpZmljYXRpb24gU2Vydmlj
-ZXMxIjAgBgNVBAMTGVMtVFJVU1QgVW5pdmVyc2FsIFJvb3QgQ0EwHhcNMTMxMDIy
-MDAwMDAwWhcNMzgxMDIxMjM1OTU5WjCBhTELMAkGA1UEBhMCREUxKTAnBgNVBAoT
-IERldXRzY2hlciBTcGFya2Fzc2VuIFZlcmxhZyBHbWJIMScwJQYDVQQLEx5TLVRS
-VVNUIENlcnRpZmljYXRpb24gU2VydmljZXMxIjAgBgNVBAMTGVMtVFJVU1QgVW5p
-dmVyc2FsIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCo
-4wvfETeFgpq1bGZ8YT/ARxodRuOwVWTluII5KAd+F//0m4rwkYHqOD8heGxI7Gsv
-otOKcrKn19nqf7TASWswJYmM67fVQGGY4tw8IJLNZUpynxqOjPolFb/zIYMoDYuv
-WRGCQ1ybTSVRf1gYY2A7s7WKi1hjN0hIkETCQN1d90NpKZhcEmVeq5CSS2bf1XUS
-U1QYpt6K1rtXAzlZmRgFDPn9FcaQZEYXgtfCSkE9/QC+V3IYlHcbU1qJAfYzcg6T
-OtzoHv0FBda8c+CI3KtP7LUYhk95hA5IKmYq3TLIeGXIC51YAQVx7YH1aBduyw20
-S9ih7K446xxYL6FlAzQvAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P
-AQH/BAQDAgEGMB0GA1UdDgQWBBSafdfr639UmEUptCCrbQuWIxmkwjANBgkqhkiG
-9w0BAQsFAAOCAQEATpYS2353XpInniEXGIJ22D+8pQkEZoiJrdtVszNqxmXEj03z
-MjbceQSWqXcy0Zf1GGuMuu3OEdBEx5LxtESO7YhSSJ7V/Vn4ox5R+wFS5V/let2q
-JE8ii912RvaloA812MoPmLkwXSBvwoEevb3A/hXTOCoJk5gnG5N70Cs0XmilFU/R
-UsOgyqCDRR319bdZc11ZAY+qwkcvFHHVKeMQtUeTJcwjKdq3ctiR1OwbSIoi5MEq
-9zpok59FGW5Dt8z+uJGaYRo2aWNkkijzb2GShROfyQcsi1fc65551cLeCNVUsldO
-KjKNoeI60RAgIjl9NEVvcTvDHfz/sk+o4vYwHg==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/SZAFIRROOTCA2.crt b/test/rules/platform_certs/default/SZAFIRROOTCA2.crt
deleted file mode 100644
index 7dd0e73ca876..000000000000
--- a/test/rules/platform_certs/default/SZAFIRROOTCA2.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDcjCCAlqgAwIBAgIUPopdB+xV0jLVt+O2XwHrLdzk1uQwDQYJKoZIhvcNAQEL
-BQAwUTELMAkGA1UEBhMCUEwxKDAmBgNVBAoMH0tyYWpvd2EgSXpiYSBSb3psaWN6
-ZW5pb3dhIFMuQS4xGDAWBgNVBAMMD1NaQUZJUiBST09UIENBMjAeFw0xNTEwMTkw
-NzQzMzBaFw0zNTEwMTkwNzQzMzBaMFExCzAJBgNVBAYTAlBMMSgwJgYDVQQKDB9L
-cmFqb3dhIEl6YmEgUm96bGljemVuaW93YSBTLkEuMRgwFgYDVQQDDA9TWkFGSVIg
-Uk9PVCBDQTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3vD5QqEvN
-QLXOYeeWyrSh2gwisPq1e3YAd4wLz32ohswmUeQgPYUM1ljj5/QqGJ3a0a4m7utT
-3PSQ1hNKDJA8w/Ta0o4NkjrcsbH/ON7Dui1fgLkCvUqdGw+0w8LBZwPd3BucPbOw
-3gAeqDRHu5rr/gsUvTaE2g0gv/pby6kWIK05YO4vdbbnl5z5Pv1+TW9NL++IDWr6
-3fE9biCloBK0TXC5ztdyO4mTp4CEHCdJckm1/zuVnsHMyAHs6A6KCpbns6aH5db5
-BSsNl0BwPLqsdVqc1U2dAgrSS5tmS0YHF2Wtn2yIANwiieDhZNRnvDF5YTy7ykHN
-XGoAyDw4jlivAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD
-AgEGMB0GA1UdDgQWBBQuFqlKGLXLzPVvUPMjX/hd56zwyDANBgkqhkiG9w0BAQsF
-AAOCAQEAtXP4A9xZWx126aMqe5Aosk3AM0+qmrHUuOQn/6mWmc5G4G18TKI4pAZw
-8PRBEew/R40/cof5O/2kbytTAOD/OblqBw7rHRz2onKQy4I9EYKL0rufKq8h5mOG
-nXkZ7/e7DDWQw4rtTw/1zBLZpD67oPwglV9PJi8RI4NOdQcPv5vRtB3pEAT+ymCP
-oky4rc/hkA/NrgrHXXu3UNLUYfrVFdvXn4dRVOul4+vJhaAlIDf7js4MNIThPIGy
-d05DpYhfhmehPea0XGG2Ptv+tyjFogeutcrKjSoS75ftwjCkySp6+/NNIxuZMzSg
-LvWpCz/UXeHPhJ/iGcJfitYgHuNztw==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/SecureCertificateServices.crt b/test/rules/platform_certs/default/SecureCertificateServices.crt
deleted file mode 100644
index a996968e093d..000000000000
--- a/test/rules/platform_certs/default/SecureCertificateServices.crt
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEb
-MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
-GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRp
-ZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVow
-fjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAiBgNV
-BAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPM
-cm3ye5drswfxdySRXyWP9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3S
-HpR7LZQdqnXXs5jLrLxkU0C8j6ysNstcrbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996
-CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rCoznl2yY4rYsK7hljxxwk
-3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3Vp6ea5EQz
-6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNV
-HQ4EFgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1Ud
-EwEB/wQFMAMBAf8wgYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2Rv
-Y2EuY29tL1NlY3VyZUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRw
-Oi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmww
-DQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm4J4oqF7Tt/Q0
-5qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj
-Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtI
-gKvcnDe4IRRLDXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJ
-aD61JlfutuC23bkpgHl9j6PwpCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDl
-izeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1HRR3B7Hzs/Sk=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/SecureGlobalCA.crt b/test/rules/platform_certs/default/SecureGlobalCA.crt
deleted file mode 100644
index f1572d26e650..000000000000
--- a/test/rules/platform_certs/default/SecureGlobalCA.crt
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBK
-MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x
-GTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkx
-MjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3Qg
-Q29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jxYDiJ
-iQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa
-/FHtaMbQbqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJ
-jnIFHovdRIWCQtBJwB1g8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnI
-HmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYVHDGA76oYa8J719rO+TMg1fW9ajMtgQT7
-sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi0XPnj3pDAgMBAAGjgZ0w
-gZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1UdEwEB/wQF
-MAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCsw
-KaAnoCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsG
-AQQBgjcVAQQDAgEAMA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0L
-URYD7xh8yOOvaliTFGCRsoTciE6+OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXO
-H0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cnCDpOGR86p1hcF895P4vkp9Mm
-I50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/53CYNv6ZHdAbY
-iNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
-f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/SecureSignRootCA11.crt b/test/rules/platform_certs/default/SecureSignRootCA11.crt
deleted file mode 100644
index 33e6d539fd3c..000000000000
--- a/test/rules/platform_certs/default/SecureSignRootCA11.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDEr
-MCkGA1UEChMiSmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoG
-A1UEAxMTU2VjdXJlU2lnbiBSb290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0
-MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSswKQYDVQQKEyJKYXBhbiBDZXJ0aWZp
-Y2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1cmVTaWduIFJvb3RD
-QTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvLTJsz
-i1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8
-h9uuywGOwvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOV
-MdrAG/LuYpmGYz+/3ZMqg6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9
-UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rPO7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni
-8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitAbpSACW22s293bzUIUPsC
-h8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZXt94wDgYD
-VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
-AKChOBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xm
-KbabfSVSSUOrTC4rbnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQ
-X5Ucv+2rIrVls4W6ng+4reV6G4pQOh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWr
-QbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01y8hSyn+B/tlr0/cR7SXf+Of5
-pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061lgeLKBObjBmN
-QSdJQO7e5iNEOdyhIta6A/I=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/SecureTrustCA.crt b/test/rules/platform_certs/default/SecureTrustCA.crt
deleted file mode 100644
index e5156e36ad7d..000000000000
--- a/test/rules/platform_certs/default/SecureTrustCA.crt
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBI
-MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x
-FzAVBgNVBAMTDlNlY3VyZVRydXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIz
-MTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAeBgNVBAoTF1NlY3VyZVRydXN0IENv
-cnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQXOZEz
-Zum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO
-0gMdA+9tDWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIao
-wW8xQmxSPmjL8xk037uHGFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj
-7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b01k/unK8RCSc43Oz969XL0Imnal0ugBS
-8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmHursCAwEAAaOBnTCBmjAT
-BgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
-/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCeg
-JYYjaHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGC
-NxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt3
-6Z3q059c4EVlew3KW+JwULKUBRSuSceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/
-3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHfmbx8IVQr5Fiiu1cprp6poxkm
-D5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZnMUFdAvnZyPS
-CPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
-3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/SecurityCommunicationEVRootCA1.crt b/test/rules/platform_certs/default/SecurityCommunicationEVRootCA1.crt
deleted file mode 100644
index c30e5bc5060b..000000000000
--- a/test/rules/platform_certs/default/SecurityCommunicationEVRootCA1.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDfTCCAmWgAwIBAgIBADANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJKUDEl
-MCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMh
-U2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBFViBSb290Q0ExMB4XDTA3MDYwNjAyMTIz
-MloXDTM3MDYwNjAyMTIzMlowYDELMAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09N
-IFRydXN0IFN5c3RlbXMgQ08uLExURC4xKjAoBgNVBAsTIVNlY3VyaXR5IENvbW11
-bmljYXRpb24gRVYgUm9vdENBMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBALx/7FebJOD+nLpCeamIivqA4PUHKUPqjgo0No0c+qe1OXj/l3X3L+SqawSE
-RMqm4miO/VVQYg+kcQ7OBzgtQoVQrTyWb4vVog7P3kmJPdZkLjjlHmy1V4qe70gO
-zXppFodEtZDkBp2uoQSXWHnvIEqCa4wiv+wfD+mEce3xDuS4GBPMVjZd0ZoeUWs5
-bmB2iDQL87PRsJ3KYeJkHcFGB7hj3R4zZbOOCVVSPbW9/wfrrWFVGCypaZhKqkDF
-MxRldAD5kd6vA0jFQFTcD4SQaCDFkpbcLuUCRarAX1T4bepJz11sS6/vmsJWXMY1
-VkJqMF/Cq/biPT+zyRGPMUzXn0kCAwEAAaNCMEAwHQYDVR0OBBYEFDVK9U2vP9eC
-OKyrcWUXdYydVZPmMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0G
-CSqGSIb3DQEBBQUAA4IBAQCoh+ns+EBnXcPBZsdAS5f8hxOQWsTvoMpfi7ent/HW
-tWS3irO4G8za+6xmiEHO6Pzk2x6Ipu0nUBsCMCRGef4Eh3CXQHPRwMFXGZpppSeZ
-q51ihPZRwSzJIxXYKLerJRO1RuGGAv8mjMSIkh1W/hln8lXkgKNrnKt34VFxDSDb
-EJrbvXZ5B3eZKK2aXtqxT0QsNY6llsf9g/BYxnnWmHyojf6GPgcWkuF75x3sM3Z+
-Qi5KhfmRiWiEA4Glm5q+4zfFVKtWOxgtQaQM+ELbmaDgcm+7XeEWT1MKZPlO9L9O
-VL14bIjqv5wTJMJwaaJ/D8g8rQjJsJhAoyrniIPtd490
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/SecurityCommunicationRootCA.crt b/test/rules/platform_certs/default/SecurityCommunicationRootCA.crt
deleted file mode 100644
index 1b78732e1c85..000000000000
--- a/test/rules/platform_certs/default/SecurityCommunicationRootCA.crt
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEY
-MBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21t
-dW5pY2F0aW9uIFJvb3RDQTEwHhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5
-WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYD
-VQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw8yl8
-9f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJ
-DKaVv0uMDPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9
-Ms+k2Y7CI9eNqPPYJayX5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/N
-QV3Is00qVUarH9oe4kA92819uZKAnDfdDJZkndwi92SL32HeFZRSFaB9UslLqCHJ
-xrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2JChzAgMBAAGjPzA9MB0G
-A1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYwDwYDVR0T
-AQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vG
-kl3g0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfr
-Uj94nK9NrvjVT8+amCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5
-Bw+SUEmK3TGXX8npN6o7WWWXlDLJs58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJU
-JRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ6rBK+1YWc26sTfcioU+tHXot
-RSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAiFL39vmwLAw==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/SecurityCommunicationRootCA2.crt b/test/rules/platform_certs/default/SecurityCommunicationRootCA2.crt
deleted file mode 100644
index e1111838698b..000000000000
--- a/test/rules/platform_certs/default/SecurityCommunicationRootCA2.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDEl
-MCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMe
-U2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoX
-DTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRy
-dXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3VyaXR5IENvbW11bmlj
-YXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAV
-OVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGr
-zbl+dp+++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVM
-VAX3NuRFg3sUZdbcDE3R3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQ
-hNBqyjoGADdH5H5XTz+L62e4iKrFvlNVspHEfbmwhRkGeC7bYRr6hfVKkaHnFtWO
-ojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1KEOtOghY6rCcMU/Gt1SSw
-awNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8QIH4D5cs
-OPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
-DQEBCwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpF
-coJxDjrSzG+ntKEju/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXc
-okgfGT+Ok+vx+hfuzU7jBBJV1uXk3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8
-t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6qtnRGEmyR7jTV7JqR50S+kDFy
-1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29mvVXIwAHIRc/
-SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/SoneraClass1CA.crt b/test/rules/platform_certs/default/SoneraClass1CA.crt
deleted file mode 100644
index a3dd6dec4966..000000000000
--- a/test/rules/platform_certs/default/SoneraClass1CA.crt
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDIDCCAgigAwIBAgIBJDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP
-MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MxIENBMB4XDTAx
-MDQwNjEwNDkxM1oXDTIxMDQwNjEwNDkxM1owOTELMAkGA1UEBhMCRkkxDzANBgNV
-BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMSBDQTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALWJHytPZwp5/8Ue+H887dF+2rDNbS82rDTG
-29lkFwhjMDMiikzujrsPDUJVyZ0upe/3p4zDq7mXy47vPxVnqIJyY1MPQYx9EJUk
-oVqlBvqSV536pQHydekfvFYmUk54GWVYVQNYwBSujHxVX3BbdyMGNpfzJLWaRpXk
-3w0LBUXl0fIdgrvGE+D+qnr9aTCU89JFhfzyMlsy3uhsXR/LpCJ0sICOXZT3BgBL
-qdReLjVQCfOAl/QMF6452F/NM8EcyonCIvdFEu1eEpOdY6uCLrnrQkFEy0oaAIIN
-nvmLVz5MxxftLItyM19yejhW1ebZrgUaHXVFsculJRwSVzb9IjcCAwEAAaMzMDEw
-DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQIR+IMi/ZTiFIwCwYDVR0PBAQDAgEG
-MA0GCSqGSIb3DQEBBQUAA4IBAQCLGrLJXWG04bkruVPRsoWdd44W7hE928Jj2VuX
-ZfsSZ9gqXLar5V7DtxYvyOirHYr9qxp81V9jz9yw3Xe5qObSIjiHBxTZ/75Wtf0H
-DjxVyhbMp6Z3N/vbXB9OWQaHowND9Rart4S9Tu+fMTfwRvFAttEMpWT4Y14h21VO
-TzF2nBBhjrZTOqMRvq9tfB69ri3iDGnHhVNoomG6xT60eVR4ngrHAr5i0RGCS2Uv
-kVrCqIexVmiUefkl98HVrhq4uz2PqYo4Ffdz0Fpg0YCw8NzVUM1O7pJIae2yIx4w
-zMiUyLb1O4Z/P6Yun/Y+LLWSlj7fLJOK/4GMDw9ZIRlXvVWa
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/SoneraClass2CA.crt b/test/rules/platform_certs/default/SoneraClass2CA.crt
deleted file mode 100644
index 56b0aed4565f..000000000000
--- a/test/rules/platform_certs/default/SoneraClass2CA.crt
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP
-MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAx
-MDQwNjA3Mjk0MFoXDTIxMDQwNjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNV
-BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3/Ei9vX+ALTU74W+o
-Z6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybTdXnt
-5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s
-3TmVToMGf+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2Ej
-vOr7nQKV0ba5cTppCD8PtOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu
-8nYybieDwnPz3BjotJPqdURrBGAgcVeHnfO+oJAjPYok4doh28MCAwEAAaMzMDEw
-DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITTXjwwCwYDVR0PBAQDAgEG
-MA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt0jSv9zil
-zqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/
-3DEIcbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvD
-FNr450kkkdAdavphOe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6
-Tk6ezAyNlNzZRZxe7EJQY670XcSxEtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2
-ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLHllpwrN9M
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/StaatderNederlandenEVRootCA.crt b/test/rules/platform_certs/default/StaatderNederlandenEVRootCA.crt
deleted file mode 100644
index b60741c225c1..000000000000
--- a/test/rules/platform_certs/default/StaatderNederlandenEVRootCA.crt
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFcDCCA1igAwIBAgIEAJiWjTANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQGEwJO
-TDEeMBwGA1UECgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSkwJwYDVQQDDCBTdGFh
-dCBkZXIgTmVkZXJsYW5kZW4gRVYgUm9vdCBDQTAeFw0xMDEyMDgxMTE5MjlaFw0y
-MjEyMDgxMTEwMjhaMFgxCzAJBgNVBAYTAk5MMR4wHAYDVQQKDBVTdGFhdCBkZXIg
-TmVkZXJsYW5kZW4xKTAnBgNVBAMMIFN0YWF0IGRlciBOZWRlcmxhbmRlbiBFViBS
-b290IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA48d+ifkkSzrS
-M4M1LGns3Amk41GoJSt5uAg94JG6hIXGhaTK5skuU6TJJB79VWZxXSzFYGgEt9nC
-UiY4iKTWO0Cmws0/zZiTs1QUWJZV1VD+hq2kY39ch/aO5ieSZxeSAgMs3NZmdO3d
-Z//BYY1jTw+bbRcwJu+r0h8QoPnFfxZpgQNH7R5ojXKhTbImxrpsX23Wr9GxE46p
-rfNeaXUmGD5BKyF/7otdBwadQ8QpCiv8Kj6GyzyDOvnJDdrFmeK8eEEzduG/L13l
-pJhQDBXd4Pqcfzho0LKmeqfRMb1+ilgnQ7O6M5HTp5gVXJrm0w912fxBmJc+qiXb
-j5IusHsMX/FjqTf5m3VpTCgmJdrV8hJwRVXj33NeN/UhbJCONVrJ0yPr08C+eKxC
-KFhmpUZtcALXEPlLVPxdhkqHz3/KRawRWrUgUY0viEeXOcDPusBCAUCZSCELa6fS
-/ZbV0b5GnUngC6agIk440ME8MLxwjyx1zNDFjFE7PZQIZCZhfbnDZY8UnCHQqv0X
-cgOPvZuM5l5Tnrmd74K74bzickFbIZTTRTeU0d8JOV3nI6qaHcptqAqGhYqCvkIH
-1vI4gnPah1vlPNOePqc7nvQDs/nxfRN0Av+7oeX6AHkcpmZBiFxgV6YuCcS6/ZrP
-px9Aw7vMWgpVSzs4dlG4Y4uElBbmVvMCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB
-/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFP6rAJCYniT8qcwaivsnuL8wbqg7
-MA0GCSqGSIb3DQEBCwUAA4ICAQDPdyxuVr5Os7aEAJSrR8kN0nbHhp8dB9O2tLsI
-eK9p0gtJ3jPFrK3CiAJ9Brc1AsFgyb/E6JTe1NOpEyVa/m6irn0F3H3zbPB+po3u
-2dfOWBfoqSmuc0iH55vKbimhZF8ZE/euBhD/UcabTVUlT5OZEAFTdfETzsemQUHS
-v4ilf0X8rLiltTMMgsT7B/Zq5SWEXwbKwYY5EdtYzXc7LMJMD16a4/CrPmEbUCTC
-wPTxGfARKbalGAKb12NMcIxHowNDXLldRqANb/9Zjr7dn3LDWyvfjFvO5QxGbJKy
-CqNMVEIYFRIYvdr8unRu/8G2oGTYqV9Vrp9canaW2HNnh/tNf1zuacpzEPuKqf2e
-vTY4SUmH9A4U8OmHuD+nT3pajnnUk+S7aFKErGzp85hwVXIy+TSrK0m1zSBi5Dp6
-Z2Orltxtrpfs/J92VoguZs9btsmksNcFuuEnL5O7Jiqik7Ab846+HUCjuTaPPoIa
-Gl6I6lD4WeKDRikL40Rc4ZW2aZCaFG+XroHPaO+Zmr615+F/+PoTRxZMzG0IQOeL
-eG9QgkRQP2YGiqtDhFZKDyAthg710tvSeopLzaXoTvFeJiUBWSOgftL2fiFX1ye8
-FVdMpEbB4IMeDExNH08GGeL5qPQ6gqGyeUN51q1veieQA6TqJIc/2b3Z6fJfUEkc
-7uzXLg==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/StaatderNederlandenRootCA-G2.crt b/test/rules/platform_certs/default/StaatderNederlandenRootCA-G2.crt
deleted file mode 100644
index ec1d8f7c2941..000000000000
--- a/test/rules/platform_certs/default/StaatderNederlandenRootCA-G2.crt
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJO
-TDEeMBwGA1UECgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFh
-dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oX
-DTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMCTkwxHjAcBgNVBAoMFVN0YWF0IGRl
-ciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5lZGVybGFuZGVuIFJv
-b3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ5291
-qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8Sp
-uOUfiUtnvWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPU
-Z5uW6M7XxgpT0GtJlvOjCwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvE
-pMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiile7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp
-5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCROME4HYYEhLoaJXhena/M
-UGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpICT0ugpTN
-GmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy
-5V6548r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv
-6q012iDTiIJh8BIitrzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEK
-eN5KzlW/HdXZt1bv8Hb/C3m1r737qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6
-B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMBAAGjgZcwgZQwDwYDVR0TAQH/
-BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcCARYxaHR0cDov
-L3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
-HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqG
-SIb3DQEBCwUAA4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLyS
-CZa59sCrI2AGeYwRTlHSeYAz+51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen
-5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwjf/ST7ZwaUb7dRUG/kSS0H4zpX897
-IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaNkqbG9AclVMwWVxJK
-gnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfkCpYL
-+63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxL
-vJxxcypFURmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkm
-bEgeqmiSBeGCc1qb3AdbCG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvk
-N1trSt8sV4pAWja63XVECDdCcAz+3F4hoKOKwJCcaNpQ5kUQR3i2TtJlycM33+FC
-Y7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoVIPVVYpbtbZNQvOSqeK3Z
-ywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm66+KAQ==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/StaatderNederlandenRootCA-G3.crt b/test/rules/platform_certs/default/StaatderNederlandenRootCA-G3.crt
deleted file mode 100644
index 9f3d25093082..000000000000
--- a/test/rules/platform_certs/default/StaatderNederlandenRootCA-G3.crt
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFdDCCA1ygAwIBAgIEAJiiOTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJO
-TDEeMBwGA1UECgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFh
-dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQSAtIEczMB4XDTEzMTExNDExMjg0MloX
-DTI4MTExMzIzMDAwMFowWjELMAkGA1UEBhMCTkwxHjAcBgNVBAoMFVN0YWF0IGRl
-ciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5lZGVybGFuZGVuIFJv
-b3QgQ0EgLSBHMzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL4yolQP
-cPssXFnrbMSkUeiFKrPMSjTysF/zDsccPVMeiAho2G89rcKezIJnByeHaHE6n3WW
-IkYFsO2tx1ueKt6c/DrGlaf1F2cY5y9JCAxcz+bMNO14+1Cx3Gsy8KL+tjzk7FqX
-xz8ecAgwoNzFs21v0IJyEavSgWhZghe3eJJg+szeP4TrjTgzkApyI/o1zCZxMdFy
-KJLZWyNtZrVtB0LrpjPOktvA9mxjeM3KTj215VKb8b475lRgsGYeCasH/lSJEULR
-9yS6YHgamPfJEf0WwTUaVHXvQ9Plrk7O53vDxk5hUUurmkVLoR9BvUhTFXFkC4az
-5S6+zqQbwSmEorXLCCN2QyIkHxcE1G6cxvx/K2Ya7Irl1s9N9WMJtxU51nus6+N8
-6U78dULI7ViVDAZCopz35HCz33JvWjdAidiFpNfxC95DGdRKWCyMijmev4SH8RY7
-Ngzp07TKbBlBUgmhHbBqv4LvcFEhMtwFdozL92TkA1CvjJFnq8Xy7ljY3r735zHP
-bMk7ccHViLVlvMDoFxcHErVc0qsgk7TmgoNwNsXNo42ti+yjwUOH5kPiNL6VizXt
-BznaqB16nzaeErAMZRKQFWDZJkBE41ZgpRDUajz9QdwOWke275dhdU/Z/seyHdTt
-XUmzqWrLZoQT1Vyg3N9udwbRcXXIV2+vD3dbAgMBAAGjQjBAMA8GA1UdEwEB/wQF
-MAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRUrfrHkleuyjWcLhL75Lpd
-INyUVzANBgkqhkiG9w0BAQsFAAOCAgEAMJmdBTLIXg47mAE6iqTnB/d6+Oea31BD
-U5cqPco8R5gu4RV78ZLzYdqQJRZlwJ9UXQ4DO1t3ApyEtg2YXzTdO2PCwyiBwpwp
-LiniyMMB8jPqKqrMCQj3ZWfGzd/TtiunvczRDnBfuCPRy5FOCvTIeuXZYzbB1N/8
-Ipf3YF3qKS9Ysr1YvY2WTxB1v0h7PVGHoTx0IsL8B3+A3MSs/mrBcDCw6Y5p4ixp
-gZQJut3+TcCDjJRYwEYgr5wfAvg1VUkvRtTA8KCWAg8zxXHzniN9lLf9OtMJgwYh
-/WA9rjLA0u6NpvDntIJ8CsxwyXmA+P5M9zWEGYox+wrZ13+b8KKaa8MFSu1BYBQw
-0aoRQm7TIwIEC8Zl3d1Sd9qBa7Ko+gE4uZbqKmxnl4mUnrzhVNXkanjvSr0rmj1A
-fsbAddJu+2gw7OyLnflJNZoaLNmzlTnVHpL3prllL+U9bTpITAjc5CgSKL59NVzq
-4BZ+Extq1z7XnvwtdbLBFNUjA9tbbws+eC8N3jONFrdI54OagQ97wUNNVQQXOEpR
-1VmiiXTTn74eS9fGbbeIJG9gkaSChVtWQbzQRKtqE77RLFi3EjNYsjdj3BP1lB0/
-QFH1T/U67cjF68IeHRaVesd+QnGTbksVtzDfqu1XhUisHWrdOWnk4Xl4vs4Fv6EM
-94B7IWcnMFk=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/StarfieldClass2CA.crt b/test/rules/platform_certs/default/StarfieldClass2CA.crt
deleted file mode 100644
index 84905b337dee..000000000000
--- a/test/rules/platform_certs/default/StarfieldClass2CA.crt
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzEl
-MCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMp
-U3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQw
-NjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBoMQswCQYDVQQGEwJVUzElMCMGA1UE
-ChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZp
-ZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqGSIb3
-DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf
-8MOh2tTYbitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN
-+lq2cwQlZut3f+dZxkqZJRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0
-X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVmepsZGD3/cVE8MC5fvj13c7JdBmzDI1aa
-K4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSNF4Azbl5KXZnJHoe0nRrA
-1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HFMIHCMB0G
-A1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fR
-zt0fhvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0
-YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBD
-bGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGsafPzWdqbAYcaT1epoXkJKtv3
-L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLMPUxA2IGvd56D
-eruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
-xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynp
-VSJYACPq4xJDKVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEY
-WQPJIrSPnNVeKtelttQKbfi3QBFGmh95DmK/D5fs4C8fF5Q=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/StarfieldRootCertificateAuthority-G2.crt b/test/rules/platform_certs/default/StarfieldRootCertificateAuthority-G2.crt
deleted file mode 100644
index cdab763e535f..000000000000
--- a/test/rules/platform_certs/default/StarfieldRootCertificateAuthority-G2.crt
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMx
-EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT
-HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVs
-ZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAw
-MFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
-b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVj
-aG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZp
-Y2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAL3twQP89o/8ArFvW59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMg
-nLRJdzIpVv257IzdIvpy3Cdhl+72WoTsbhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1
-HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNkN3mSwOxGXn/hbVNMYq/N
-Hwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7NfZTD4p7dN
-dloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0
-HZbUJtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO
-BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0G
-CSqGSIb3DQEBCwUAA4IBAQARWfolTwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjU
-sHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx4mcujJUDJi5DnUox9g61DLu3
-4jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUwF5okxBDgBPfg
-8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
-pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1
-mMpYjn0q7pBZc2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/StarfieldServicesRootCertificateAuthority-G2.crt b/test/rules/platform_certs/default/StarfieldServicesRootCertificateAuthority-G2.crt
deleted file mode 100644
index 7ef6022c1cee..000000000000
--- a/test/rules/platform_certs/default/StarfieldServicesRootCertificateAuthority-G2.crt
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMx
-EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT
-HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVs
-ZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
-MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNVBAYTAlVTMRAwDgYD
-VQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFy
-ZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2Vy
-dmljZXMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20p
-OsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm2
-8xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4PahHQUw2eeBGg6345AWh1K
-Ts9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLPLJGmpufe
-hRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk
-6mFBrMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAw
-DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+q
-AdcwKziIorhtSpzyEZGDMA0GCSqGSIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMI
-bw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPPE95Dz+I0swSdHynVv/heyNXB
-ve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTyxQGjhdByPq1z
-qwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
-iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn
-0q23KXB56jzaYyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCN
-sSi6
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/StartComCertificationAuthority.crt b/test/rules/platform_certs/default/StartComCertificationAuthority.crt
deleted file mode 100644
index cf5abe631c8e..000000000000
--- a/test/rules/platform_certs/default/StartComCertificationAuthority.crt
+++ /dev/null
@@ -1,44 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEW
-MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
-Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM2WhcNMzYwOTE3MTk0NjM2WjB9
-MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
-U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
-cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
-A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
-pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
-OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
-Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
-Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
-HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
-Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
-+2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
-Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
-Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
-26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
-AQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
-FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9j
-ZXJ0LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3Js
-LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFM
-BgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUHAgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0
-Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRwOi8vY2VydC5zdGFy
-dGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYgU3Rh
-cnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlh
-YmlsaXR5LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2Yg
-dGhlIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFp
-bGFibGUgYXQgaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL3BvbGljeS5wZGYwEQYJ
-YIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNT
-TCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOCAgEAFmyZ
-9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8
-jhvh3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUW
-FjgKXlf2Ysd6AgXmvB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJz
-ewT4F+irsfMuXGRuczE6Eri8sxHkfY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1
-ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3fsNrarnDy0RLrHiQi+fHLB5L
-EUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZEoalHmdkrQYu
-L6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
-yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuC
-O3NJo2pXh5Tl1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6V
-um0ABj6y6koQOdjQK/W/7HW/lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkySh
-NOsF/5oirpt9P/FlUQqmMGqz9IgcgA38corog14=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/StartComCertificationAuthorityG2.crt b/test/rules/platform_certs/default/StartComCertificationAuthorityG2.crt
deleted file mode 100644
index cdb854e2c774..000000000000
--- a/test/rules/platform_certs/default/StartComCertificationAuthorityG2.crt
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFYzCCA0ugAwIBAgIBOzANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJJTDEW
-MBQGA1UEChMNU3RhcnRDb20gTHRkLjEsMCoGA1UEAxMjU3RhcnRDb20gQ2VydGlm
-aWNhdGlvbiBBdXRob3JpdHkgRzIwHhcNMTAwMTAxMDEwMDAxWhcNMzkxMjMxMjM1
-OTAxWjBTMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjEsMCoG
-A1UEAxMjU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgRzIwggIiMA0G
-CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2iTZbB7cgNr2Cu+EWIAOVeq8Oo1XJ
-JZlKxdBWQYeQTSFgpBSHO839sj60ZwNq7eEPS8CRhXBF4EKe3ikj1AENoBB5uNsD
-vfOpL9HG4A/LnooUCri99lZi8cVytjIl2bLzvWXFDSxu1ZJvGIsAQRSCb0AgJnoo
-D/Uefyf3lLE3PbfHkffiAez9lInhzG7TNtYKGXmu1zSCZf98Qru23QumNK9LYP5/
-Q0kGi4xDuFby2X8hQxfqp0iVAXV16iulQ5XqFYSdCI0mblWbq9zSOdIxHWDirMxW
-RST1HFSr7obdljKF+ExP6JV2tgXdNiNnvP8V4so75qbsO+wmETRIjfaAKxojAuuK
-HDp2KntWFhxyKrOq42ClAJ8Em+JvHhRYW6Vsi1g8w7pOOlz34ZYrPu8HvKTlXcxN
-nw3h3Kq74W4a7I/htkxNeXJdFzULHdfBR9qWJODQcqhaX2YtENwvKhOuJv4KHBnM
-0D4LnMgJLvlblnpHnOl68wVQdJVznjAJ85eCXuaPOQgeWeU1FEIT/wCc976qUM/i
-UUjXuG+v+E5+M5iSFGI6dWPPe/regjupuznixL0sAA7IF6wT700ljtizkC+p2il9
-Ha90OrInwMEePnWjFqmveiJdnxMaz6eg6+OGCtP95paV1yPIN93EfKo2rJgaErHg
-TuixO/XWb/Ew1wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
-AwIBBjAdBgNVHQ4EFgQUS8W0QGutHLOlHGVuRjaJhwUMDrYwDQYJKoZIhvcNAQEL
-BQADggIBAHNXPyzVlTJ+N9uWkusZXn5T50HsEbZH77Xe7XRcxfGOSeD8bpkTzZ+K
-2s06Ctg6Wgk/XzTQLwPSZh0avZyQN8gMjgdalEVGKua+etqhqaRpEpKwfTbURIfX
-UfEpY9Z1zRbkJ4kd+MIySP3bmdCPX1R0zKxnNBFi2QwKN4fRoxdIjtIXHfbX/dtl
-6/2o1PXWT6RbdejF0mCy2wl+JYt7ulKSnj7oxXehPOBKc2thz4bcQ///If4jXSRK
-9dNtD2IEBVeC2m6kMyV5Sy5UGYvMLD0w6dEG/+gyRr61M3Z3qAFdlsHB1b6uJcDJ
-HgoJIIihDsnzb02CVAAgp9KP5DlUFy6NHrgbuxu9mk47EDTcnIhT76IxW1hPkWLI
-wpqazRVdOKnWvvgTtZ8SafJQYqz7Fzf07rh1Z2AQ+4NQ+US1dZxAF7L+/XldblhY
-XzD8AK6vM8EOTmy6p6ahfzLbOOCxchcKK5HsamMm7YnUeMx0HgX4a/6ManY5Ka5l
-IxKVCCIcl85bBu4M4ru8H0ST9tg4RQUh7eStqxK2A6RCLi3ECToDZ2mEmuFZkIoo
-hdVddLHRDiBYmxOlsGOm7XtH/UVVMKTumtTm4ofvmMkyghEpIrwACjFeLQ/Ajulr
-so8uBtjRkcfGEvRM/TAXw8HaOFvjqermobp573PYtlNXLfbQ4ddI
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/StartComCertificationAuthority_2.crt b/test/rules/platform_certs/default/StartComCertificationAuthority_2.crt
deleted file mode 100644
index 7317e09e07f3..000000000000
--- a/test/rules/platform_certs/default/StartComCertificationAuthority_2.crt
+++ /dev/null
@@ -1,43 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIHhzCCBW+gAwIBAgIBLTANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJJTDEW
-MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
-Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM3WhcNMzYwOTE3MTk0NjM2WjB9
-MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
-U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
-cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
-A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
-pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
-OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
-Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
-Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
-HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
-Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
-+2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
-Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
-Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
-26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
-AQABo4ICEDCCAgwwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
-VR0OBBYEFE4L7xqkQFulF2mHMMo0aEPQQa7yMB8GA1UdIwQYMBaAFE4L7xqkQFul
-F2mHMMo0aEPQQa7yMIIBWgYDVR0gBIIBUTCCAU0wggFJBgsrBgEEAYG1NwEBATCC
-ATgwLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5w
-ZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVybWVk
-aWF0ZS5wZGYwgc8GCCsGAQUFBwICMIHCMCcWIFN0YXJ0IENvbW1lcmNpYWwgKFN0
-YXJ0Q29tKSBMdGQuMAMCAQEagZZMaW1pdGVkIExpYWJpbGl0eSwgcmVhZCB0aGUg
-c2VjdGlvbiAqTGVnYWwgTGltaXRhdGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0
-aWZpY2F0aW9uIEF1dGhvcml0eSBQb2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93
-d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgG
-CWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1
-dGhvcml0eTANBgkqhkiG9w0BAQsFAAOCAgEAjo/n3JR5fPGFf59Jb2vKXfuM/gTF
-wWLRfUKKvFO3lANmMD+x5wqnUCBVJX92ehQN6wQOQOY+2IirByeDqXWmN3PH/UvS
-Ta0XQMhGvjt/UfzDtgUx3M2FIk5xt/JxXrAaxrqTi3iSSoX4eA+D/i+tLPfkpLst
-0OcNOrg+zvZ49q5HJMqjNTbOx8aHmNrs++myziebiMMEofYLWWivydsQD032ZGNc
-pRJvkrKTlMeIFw6Ttn5ii5B/q06f/ON1FE8qMt9bDeD1e5MNq6HPh+GlBEXoPBKl
-CcWw0bdT82AUuoVpaiF8H3VhFyAXe2w7QSlc4axa0c2Mm+tgHRns9+Ww2vl5GKVF
-P0lDV9LdJNUso/2RjSe15esUBppMeyG7Oq0wBhjA2MFrLH9ZXF2RsXAiV+uKa0hK
-1Q8p7MZAwC+ITGgBF3f0JBlPvfrhsiAhS90a2Cl9qrjeVOwhVYBsHvUwyKMQ5bLm
-KhQxw4UtjJixhlpPiVktucf3HMiKf8CdBUrmQk9io20ppB+Fq9vlgcitKj1MXVuE
-JnHEhV5xJMqlG2zYYdMa4FTbzrqpMrUi9nNBCV24F10OD5mQ1kfabwo6YigUZ4LZ
-8dCAWZvLMdibD4x3TrVoivJs9iQOLWxwxXPR3hTQcY+203sC9uO41Alua551hDnm
-fyWl8kgAwKQB2j8=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/SwissSignGoldCA-G2.crt b/test/rules/platform_certs/default/SwissSignGoldCA-G2.crt
deleted file mode 100644
index a0b5f261a6a2..000000000000
--- a/test/rules/platform_certs/default/SwissSignGoldCA-G2.crt
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV
-BAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2ln
-biBHb2xkIENBIC0gRzIwHhcNMDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBF
-MQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMR8wHQYDVQQDExZT
-d2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
-CgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUqt2/8
-76LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+
-bbqBHH5CjCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c
-6bM8K8vzARO/Ws/BtQpgvd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqE
-emA8atufK+ze3gE/bk3lUIbLtK/tREDFylqM2tIrfKjuvqblCqoOpd8FUrdVxyJd
-MmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvRAiTysybUa9oEVeXBCsdt
-MDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuendjIj3o02y
-MszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69y
-FGkOpeUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPi
-aG59je883WX0XaxR7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxM
-gI93e2CaHt+28kgeDrpOVG2Y4OGiGqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCB
-qTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUWyV7
-lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64OfPAeGZe6Drn
-8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov
-L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe6
-45R88a7A3hfm5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczO
-UYrHUDFu4Up+GC9pWbY9ZIEr44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5
-O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOfMke6UiI0HTJ6CVanfCU2qT1L2sCC
-bwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6mGu6uLftIdxf+u+yv
-GPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxpmo/a
-77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCC
-hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid3
-92qgQmwLOM7XdVAyksLfKzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEpp
-Ld6leNcG2mqeSz53OiATIgHQv2ieY2BrNU0LbbqhPcCT4H8js1WtciVORvnSFu+w
-ZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+htt
-Qc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/SwissSignPlatinumCA-G2.crt b/test/rules/platform_certs/default/SwissSignPlatinumCA-G2.crt
deleted file mode 100644
index c2a02010e334..000000000000
--- a/test/rules/platform_certs/default/SwissSignPlatinumCA-G2.crt
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFwTCCA6mgAwIBAgIITrIAZwwDXU8wDQYJKoZIhvcNAQEFBQAwSTELMAkGA1UE
-BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEjMCEGA1UEAxMaU3dpc3NTaWdu
-IFBsYXRpbnVtIENBIC0gRzIwHhcNMDYxMDI1MDgzNjAwWhcNMzYxMDI1MDgzNjAw
-WjBJMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMSMwIQYDVQQD
-ExpTd2lzc1NpZ24gUGxhdGludW0gQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAMrfogLi2vj8Bxax3mCq3pZcZB/HL37PZ/pEQtZ2Y5Wu669y
-IIpFR4ZieIbWIDkm9K6j/SPnpZy1IiEZtzeTIsBQnIJ71NUERFzLtMKfkr4k2Htn
-IuJpX+UFeNSH2XFwMyVTtIc7KZAoNppVRDBopIOXfw0enHb/FZ1glwCNioUD7IC+
-6ixuEFGSzH7VozPY1kneWCqv9hbrS3uQMpe5up1Y8fhXSQQeol0GcN1x2/ndi5ob
-jM89o03Oy3z2u5yg+gnOI2Ky6Q0f4nIoj5+saCB9bzuohTEJfwvH6GXp43gOCWcw
-izSC+13gzJ2BbWLuCB4ELE6b7P6pT1/9aXjvCR+htL/68++QHkwFix7qepF6w9fl
-+zC8bBsQWJj3Gl/QKTIDE0ZNYWqFTFJ0LwYfexHihJfGmfNtf9dng34TaNhxKFrY
-zt3oEBSa/m0jh26OWnA81Y0JAKeqvLAxN23IhBQeW71FYyBrS3SMvds6DsHPWhaP
-pZjydomyExI7C3d3rLvlPClKknLKYRorXkzig3R3+jVIeoVNjZpTxN94ypeRSCtF
-KwH3HBqi7Ri6Cr2D+m+8jVeTO9TUps4e8aCxzqv9KyiaTxvXw3LbpMS/XUz13XuW
-ae5ogObnmLo2t/5u7Su9IPhlGdpVCX4l3P5hYnL5fhgC72O00Puv5TtjjGePAgMB
-AAGjgawwgakwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
-BBYEFFCvzAeHFUdvOMW0ZdHelarp35zMMB8GA1UdIwQYMBaAFFCvzAeHFUdvOMW0
-ZdHelarp35zMMEYGA1UdIAQ/MD0wOwYJYIV0AVkBAQEBMC4wLAYIKwYBBQUHAgEW
-IGh0dHA6Ly9yZXBvc2l0b3J5LnN3aXNzc2lnbi5jb20vMA0GCSqGSIb3DQEBBQUA
-A4ICAQAIhab1Fgz8RBrBY+D5VUYI/HAcQiiWjrfFwUF1TglxeeVtlspLpYhg0DB0
-uMoI3LQwnkAHFmtllXcBrqS3NQuB2nEVqXQXOHtYyvkv+8Bldo1bAbl93oI9ZLi+
-FHSjClTTLJUYFzX1UWs/j6KWYTl4a0vlpqD4U99REJNi54Av4tHgvI42Rncz7Lj7
-jposiU0xEQ8mngS7twSNC/K5/FqdOxa3L8iYq/6KUFkuozv8KV2LwUvJ4ooTHbG/
-u0IdUt1O2BReEMYxB+9xJ/cbOQncguqLs5WGXv312l0xpuAxtpTmREl0xRbl9x8D
-YSjFyMsSoEJL+WuICI20MhjzdZ/EfwBPBZWcoxcCw7NTm6ogOSkrZvqdr16zktK1
-puEa+S1BaYEUtLS17Yk9zvupnTVCRLEcFHOBzyoBNZox1S2PbYTfgE1X4z/FhHXa
-icYwu+uPyyIIoK6q8QNsOktNCaUOcsZWayFCTiMlFGiudgp8DAdwZPmaL/YFOSbG
-DI8Zf0NebvRbFS/bYV3mZy8/CJT5YLSYMdp08YSTcU1f+2BY0fvEwW2JorsgH51x
-kcsymxM9Pn2SUjWskpSi0xjCfMfqr3YFFt1nJ8J+HAciIfNAChs0B0QTwoRqjt8Z
-Wr9/6x3iGjjRXK9HkmuAtTClyY3YqzGBH9/CZjfTk6mFhnll0g==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/SwissSignSilverCA-G2.crt b/test/rules/platform_certs/default/SwissSignSilverCA-G2.crt
deleted file mode 100644
index 7ef7c8bc9c0d..000000000000
--- a/test/rules/platform_certs/default/SwissSignSilverCA-G2.crt
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UE
-BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWdu
-IFNpbHZlciBDQSAtIEcyMB4XDTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0Nlow
-RzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMY
-U3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644N0Mv
-Fz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7br
-YT7QbNHm+/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieF
-nbAVlDLaYQ1HTWBCrpJH6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH
-6ATK72oxh9TAtvmUcXtnZLi2kUpCe2UuMGoM9ZDulebyzYLs2aFK7PayS+VFheZt
-eJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5hqAaEuSh6XzjZG6k4sIN/
-c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5FZGkECwJ
-MoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRH
-HTBsROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTf
-jNFusB3hB48IHpmccelM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb6
-5i/4z3GcRm25xBWNOHkDRUjvxF3XCO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOB
-rDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU
-F6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRBtjpbO8tFnb0c
-wpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
-cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIB
-AHPGgeAn0i0P4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShp
-WJHckRE1qTodvBqlYJ7YH39FkWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9
-xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L3XWgwF15kIwb4FDm3jH+mHtwX6WQ
-2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx/uNncqCxv1yL5PqZ
-IseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFaDGi8
-aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2X
-em1ZqSqPe97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQR
-dAtq/gsD/KNVV4n+SsuuWxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/
-OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJDIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+
-hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ubDgEj8Z+7fNzcbBGXJbLy
-tGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/SwisscomRootCA1.crt b/test/rules/platform_certs/default/SwisscomRootCA1.crt
deleted file mode 100644
index f1414ffdf4f7..000000000000
--- a/test/rules/platform_certs/default/SwisscomRootCA1.crt
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIF2TCCA8GgAwIBAgIQXAuFXAvnWUHfV8w/f52oNjANBgkqhkiG9w0BAQUFADBk
-MQswCQYDVQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0
-YWwgQ2VydGlmaWNhdGUgU2VydmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3Qg
-Q0EgMTAeFw0wNTA4MTgxMjA2MjBaFw0yNTA4MTgyMjA2MjBaMGQxCzAJBgNVBAYT
-AmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGlnaXRhbCBDZXJ0aWZp
-Y2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAxMIICIjAN
-BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0LmwqAzZuz8h+BvVM5OAFmUgdbI9
-m2BtRsiMMW8Xw/qabFbtPMWRV8PNq5ZJkCoZSx6jbVfd8StiKHVFXqrWW/oLJdih
-FvkcxC7mlSpnzNApbjyFNDhhSbEAn9Y6cV9Nbc5fuankiX9qUvrKm/LcqfmdmUc/
-TilftKaNXXsLmREDA/7n29uj/x2lzZAeAR81sH8A25Bvxn570e56eqeqDFdvpG3F
-EzuwpdntMhy0XmeLVNxzh+XTF3xmUHJd1BpYwdnP2IkCb6dJtDZd0KTeByy2dbco
-kdaXvij1mB7qWybJvbCXc9qukSbraMH5ORXWZ0sKbU/Lz7DkQnGMU3nn7uHbHaBu
-HYwadzVcFh4rUx80i9Fs/PJnB3r1re3WmquhsUvhzDdf/X/NTa64H5xD+SpYVUNF
-vJbNcA78yeNmuk6NO4HLFWR7uZToXTNShXEuT46iBhFRyePLoW4xCGQMwtI89Tbo
-19AOeCMgkckkKmUpWyL3Ic6DXqTz3kvTaI9GdVyDCW4pa8RwjPWd1yAv/0bSKzjC
-L3UcPX7ape8eYIVpQtPM+GP+HkM5haa2Y0EQs3MevNP6yn0WR+Kn1dCjigoIlmJW
-bjTb2QK5MHXjBNLnj8KwEUAKrNVxAmKLMb7dxiNYMUJDLXT5xp6mig/p/r+D5kNX
-JLrvRjSq1xIBOO0CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0hBBYw
-FDASBgdghXQBUwABBgdghXQBUwABMBIGA1UdEwEB/wQIMAYBAf8CAQcwHwYDVR0j
-BBgwFoAUAyUv3m+CATpcLNwroWm1Z9SM0/0wHQYDVR0OBBYEFAMlL95vggE6XCzc
-K6FptWfUjNP9MA0GCSqGSIb3DQEBBQUAA4ICAQA1EMvspgQNDQ/NwNurqPKIlwzf
-ky9NfEBWMXrrpA9gzXrzvsMnjgM+pN0S734edAY8PzHyHHuRMSG08NBsl9Tpl7Ik
-Vh5WwzW9iAUPWxAaZOHHgjD5Mq2eUCzneAXQMbFamIp1TpBcahQq4FJHgmDmHtqB
-sfsUC1rxn9KVuj7QG9YVHaO+htXbD8BJZLsuUBlL0iT43R4HVtA4oJVwIHaM190e
-3p9xxCPvgxNcoyQVTSlAPGrEqdi3pkSlDfTgnXceQHAm/NrZNuR55LU/vJtlvrsR
-ls/bxig5OgjOR1tTWsWZ/l2p3e9M1MalrQLmjAcSHm8D0W+go/MpvRLHUKKwf4ip
-mXeascClOS5cfGniLLDqN2qk4Vrh9VDlg++luyqI54zb/W1elxmofmZ1a3Hqv7HH
-b6D0jqTsNFFbjCYDcKF31QESVwA12yPeDooomf2xEG9L/zgtYE4snOtnta1J7ksf
-rK/7DZBaZmBwXarNeNQk7shBoJMBkpxqnvy5JMWzFYJ+vq6VK+uxwNrjAWALXmms
-hFZhvnEX/h0TD/7Gh0Xp/jKgGg0TpJRVcaUWi7rKibCyx/yP2FS1k2Kdzs9Z+z0Y
-zirLNRWCXf9UIltxUvu3yf5gmwBBZPCqKuy2QkPOiWaByIufOVQDJdMWNY6E0F/6
-MBr1mmz0DlP5OlvRHA==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/SwisscomRootCA2.crt b/test/rules/platform_certs/default/SwisscomRootCA2.crt
deleted file mode 100644
index 96860feb3094..000000000000
--- a/test/rules/platform_certs/default/SwisscomRootCA2.crt
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIF2TCCA8GgAwIBAgIQHp4o6Ejy5e/DfEoeWhhntjANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0
-YWwgQ2VydGlmaWNhdGUgU2VydmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3Qg
-Q0EgMjAeFw0xMTA2MjQwODM4MTRaFw0zMTA2MjUwNzM4MTRaMGQxCzAJBgNVBAYT
-AmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGlnaXRhbCBDZXJ0aWZp
-Y2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAyMIICIjAN
-BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAlUJOhJ1R5tMJ6HJaI2nbeHCOFvEr
-jw0DzpPMLgAIe6szjPTpQOYXTKueuEcUMncy3SgM3hhLX3af+Dk7/E6J2HzFZ++r
-0rk0X2s682Q2zsKwzxNoysjL67XiPS4h3+os1OD5cJZM/2pYmLcX5BtS5X4HAB1f
-2uY+lQS3aYg5oUFgJWFLlTloYhyxCwWJwDaCFCE/rtuh/bxvHGCGtlOUSbkrRsVP
-ACu/obvLP+DHVxxX6NZp+MEkUp2IVd3Chy50I9AU/SpHWrumnf2U5NGKpV+GY3aF
-y6//SSj8gO1MedK75MDvAe5QQQg1I3ArqRa0jG6F6bYRzzHdUyYb3y1aSgJA/MTA
-tukxGggo5WDDH8SQjhBiYEQN7Aq+VRhxLKX0srwVYv8c474d2h5Xszx+zYIdkeNL
-6yxSNLCK/RJOlrDrcH+eOfdmQrGrrFLadkBXeyq96G4DsguAhYidDMfCd7Camlf0
-uPoTXGiTOmekl9AbmbeGMktg2M7v0Ax/lZ9vh0+Hio5fCHyqW/xavqGRn1V9TrAL
-acywlKinh/LTSlDcX3KwFnUey7QYYpqwpzmqm59m2I2mbJYV4+by+PGDYmy7Velh
-k6M99bFXi08jsJvllGov34zflVEpYKELKeRcVVi3qPyZ7iVNTA6z00yPhOgpD/0Q
-VAKFyPnlw4vP5w8CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0hBBYw
-FDASBgdghXQBUwIBBgdghXQBUwIBMBIGA1UdEwEB/wQIMAYBAf8CAQcwHQYDVR0O
-BBYEFE0mICKJS9PVpAqhb97iEoHF8TwuMB8GA1UdIwQYMBaAFE0mICKJS9PVpAqh
-b97iEoHF8TwuMA0GCSqGSIb3DQEBCwUAA4ICAQAyCrKkG8t9voJXiblqf/P0wS4R
-fbgZPnm3qKhyN2abGu2sEzsOv2LwnN+ee6FTSA5BesogpxcbtnjsQJHzQq0Qw1zv
-/2BZf82Fo4s9SBwlAjxnffUy6S8w5X2lejjQ82YqZh6NM4OKb3xuqFp1mrjX2lhI
-REeoTPpMSQpKwhI3qEAMw8jh0FcNlzKVxzqfl9NX+Ave5XLzo9v/tdhZsnPdTSpx
-srpJ9csc1fV5yJmz/MFMdOO0vSk3FQQoHt5FRnDsr7p4DooqzgB53MBfGWcsa0vv
-aGgLQ+OswWIJ76bdZWGgr4RVSJFSHMYlkSrQwSIjYVmvRRGFHQEkNI/Ps/8XciAT
-woCqISxxOQ7Qj1zB09GOInJGTB2Wrk9xseEFKZZZ9LuedT3PDTcNYtsmjGOpI99n
-Bjx8Oto0QuFmtEYE3saWmA9LSHokMnWRn6z3aOkquVVlzl1h0ydw2Df+n7mvoC5W
-t6NlUe07qxS/TFED6F+KBZvuim6c779o+sjaC+NCydAXFJy3SuCvkychVSa1ZC+N
-8f+mQAWFBVzKBxlcCxMoTFh/wqXvRdpg065lYZ1Tg3TCrvJcwhbtkj6EPnNgiLx2
-9CzP0H1907he0ZESEOnN3col49XtmS++dYFLJPlFRpTJKSFTnCZFqhMX5OfNeOI5
-wSsSnqaeG8XmDtkx2Q==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/SwisscomRootEVCA2.crt b/test/rules/platform_certs/default/SwisscomRootEVCA2.crt
deleted file mode 100644
index 7575d46f42d8..000000000000
--- a/test/rules/platform_certs/default/SwisscomRootEVCA2.crt
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIF4DCCA8igAwIBAgIRAPL6ZOJ0Y9ON/RAdBB92ylgwDQYJKoZIhvcNAQELBQAw
-ZzELMAkGA1UEBhMCY2gxETAPBgNVBAoTCFN3aXNzY29tMSUwIwYDVQQLExxEaWdp
-dGFsIENlcnRpZmljYXRlIFNlcnZpY2VzMR4wHAYDVQQDExVTd2lzc2NvbSBSb290
-IEVWIENBIDIwHhcNMTEwNjI0MDk0NTA4WhcNMzEwNjI1MDg0NTA4WjBnMQswCQYD
-VQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0YWwgQ2Vy
-dGlmaWNhdGUgU2VydmljZXMxHjAcBgNVBAMTFVN3aXNzY29tIFJvb3QgRVYgQ0Eg
-MjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMT3HS9X6lds93BdY7Bx
-UglgRCgzo3pOCvrY6myLURYaVa5UJsTMRQdBTxB5f3HSek4/OE6zAMaVylvNwSqD
-1ycfMQ4jFrclyxy0uYAyXhqdk/HoPGAsp15XGVhRXrwsVgu42O+LgrQ8uMIkqBPH
-oCE2G3pXKSinLr9xJZDzRINpUKTk4RtiGZQJo/PDvO/0vezbE53PnUgJUmfANykR
-HvvSEaeFGHR55E+FFOtSN+KxRdjMDUN/rhPSays/p8LiqG12W0OfvrSdsyaGOx9/
-5fLoZigWJdBLlzin5M8J0TbDC77aO0RYjb7xnglrPvMyxyuHxuxenPaHZa0zKcQv
-idm5y8kDnftslFGXEBuGCxobP/YCfnvUxVFkKJ3106yDgYjTdLRZncHrYTNaRdHL
-OdAGalNgHa/2+2m8atwBz735j9m9W8E6X47aD0upm50qKGsaCnw8qyIL5XctcfaC
-NYGu+HuB5ur+rPQam3Rc6I8k9l2dRsQs0h4rIWqDJ2dVSqTjyDKXZpBy2uPUZC5f
-46Fq9mDU5zXNysRojddxyNMkM3OxbPlq4SjbX8Y96L5V5jcb7STZDxmPX2MYWFCB
-UWVv8p9+agTnNCRxunZLWB4ZvRVgRaoMEkABnRDixzgHcgplwLa7JSnaFp6LNYth
-7eVxV4O1PHGf40+/fh6Bn0GXAgMBAAGjgYYwgYMwDgYDVR0PAQH/BAQDAgGGMB0G
-A1UdIQQWMBQwEgYHYIV0AVMCAgYHYIV0AVMCAjASBgNVHRMBAf8ECDAGAQH/AgED
-MB0GA1UdDgQWBBRF2aWBbj2ITY1x0kbBbkUe88SAnTAfBgNVHSMEGDAWgBRF2aWB
-bj2ITY1x0kbBbkUe88SAnTANBgkqhkiG9w0BAQsFAAOCAgEAlDpzBp9SSzBc1P6x
-XCX5145v9Ydkn+0UjrgEjihLj6p7jjm02Vj2e6E1CqGdivdj5eu9OYLU43otb98T
-PLr+flaYC/NUn81ETm484T4VvwYmneTwkLbUwp4wLh/vx3rEUMfqe9pQy3omywC0
-Wqu1kx+AiYQElY2NfwmTv9SoqORjbdlk5LgpWgi/UOGED1V7XwgiG/W9mR4U9s70
-WBCCswo9GcG/W6uqmdjyMb3lOGbcWAXH7WMaLgqXfIeTK7KK4/HsGOV1timH59yL
-Gn602MnTihdsfSlEvoqq9X46Lmgxk7lq2prg2+kupYTNHAq4Sgj5nPFhJpiTt3tm
-7JFe3VE/23MPrQRYCd0EApUKPtN236YQHoA96M2kZNEzx5LH4k5E4wnJTsJdhw4S
-nr8PyQUQ3nqjsTzyP6WqJ3mtMX0f/fwZacXduT98zca0wjAefm6S139hdlqP65VN
-vBFuIXxZN5nQBrz5Bm0yFqXZaajh3DyAHmBR3NdUIR7KYndP+tiPsys6DXhyyWhB
-WkdKwqPrGtcKqzwyVcgKEZzfdNbwQBUdyLmPtTbFr/giuMod89a2GQ+fYWVq6nTI
-fI/DT11lgh/ZDYnadXL77/FHZxOzyNEZiCcmmpl5fx7kLD977vHeTYuWl8PVP3wb
-I+2ksx0WckNLIOFZfsLorSa/ovc=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/SymantecClass3SecureServerCA-G4.crt b/test/rules/platform_certs/default/SymantecClass3SecureServerCA-G4.crt
deleted file mode 100644
index bc1667940847..000000000000
--- a/test/rules/platform_certs/default/SymantecClass3SecureServerCA-G4.crt
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFODCCBCCgAwIBAgIQUT+5dDhwtzRAQY0wkwaZ/zANBgkqhkiG9w0BAQsFADCB
-yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
-U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
-ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5IC0gRzUwHhcNMTMxMDMxMDAwMDAwWhcNMjMxMDMwMjM1OTU5WjB+MQsw
-CQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNV
-BAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxLzAtBgNVBAMTJlN5bWFudGVjIENs
-YXNzIDMgU2VjdXJlIFNlcnZlciBDQSAtIEc0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAstgFyhx0LbUXVjnFSlIJluhL2AzxaJ+aQihiw6UwU35VEYJb
-A3oNL+F5BMm0lncZgQGUWfm893qZJ4Itt4PdWid/sgN6nFMl6UgfRk/InSn4vnlW
-9vf92Tpo2otLgjNBEsPIPMzWlnqEIRoiBAMnF4scaGGTDw5RgDMdtLXO637QYqzu
-s3sBdO9pNevK1T2p7peYyo2qRA4lmUoVlqTObQJUHypqJuIGOmNIrLRM0XWTUP8T
-L9ba4cYY9Z/JJV3zADreJk20KQnNDz0jbxZKgRb78oMQw7jW2FUyPfG9D72MUpVK
-Fpd6UiFjdS8W+cRmvvW1Cdj/JwDNRHxvSz+w9wIDAQABo4IBYzCCAV8wEgYDVR0T
-AQH/BAgwBgEB/wIBADAwBgNVHR8EKTAnMCWgI6Ahhh9odHRwOi8vczEuc3ltY2Iu
-Y29tL3BjYTMtZzUuY3JsMA4GA1UdDwEB/wQEAwIBBjAvBggrBgEFBQcBAQQjMCEw
-HwYIKwYBBQUHMAGGE2h0dHA6Ly9zMi5zeW1jYi5jb20wawYDVR0gBGQwYjBgBgpg
-hkgBhvhFAQc2MFIwJgYIKwYBBQUHAgEWGmh0dHA6Ly93d3cuc3ltYXV0aC5jb20v
-Y3BzMCgGCCsGAQUFBwICMBwaGmh0dHA6Ly93d3cuc3ltYXV0aC5jb20vcnBhMCkG
-A1UdEQQiMCCkHjAcMRowGAYDVQQDExFTeW1hbnRlY1BLSS0xLTUzNDAdBgNVHQ4E
-FgQUX2DPYZBV34RDFIpgKrL1evRDGO8wHwYDVR0jBBgwFoAUf9Nlp8Ld7LvwMAnz
-Qzn6Aq8zMTMwDQYJKoZIhvcNAQELBQADggEBAF6UVkndji1l9cE2UbYD49qecxny
-H1mrWH5sJgUs+oHXXCMXIiw3k/eG7IXmsKP9H+IyqEVv4dn7ua/ScKAyQmW/hP4W
-Ko8/xabWo5N9Q+l0IZE1KPRj6S7t9/Vcf0uatSDpCr3gRRAMFJSaXaXjS5HoJJtG
-QGX0InLNmfiIEfXzf+YzguaoxX7+0AjiJVgIcWjmzaLmFN5OUiQt/eV5E1PnXi8t
-TRttQBVSK/eHiXgSgW7ZTaoteNTCLD0IX4eRnh8OsN4wUmSGiaqdZpwOdgyA8nTY
-Kvi4Os7X1g8RvmurFPW9QaAiY4nxug9vKWNmLT+sjHLF+8fk1A/yO0+MKcc=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/T-TeleSecGlobalRootClass2.crt b/test/rules/platform_certs/default/T-TeleSecGlobalRootClass2.crt
deleted file mode 100644
index 374b05018228..000000000000
--- a/test/rules/platform_certs/default/T-TeleSecGlobalRootClass2.crt
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUx
-KzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAd
-BgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNl
-YyBHbG9iYWxSb290IENsYXNzIDIwHhcNMDgxMDAxMTA0MDE0WhcNMzMxMDAxMjM1
-OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnBy
-aXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50
-ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqX9obX+hzkeXaXPSi5kfl82hVYAUd
-AqSzm1nzHoqvNK38DcLZSBnuaY/JIPwhqgcZ7bBcrGXHX+0CfHt8LRvWurmAwhiC
-FoT6ZrAIxlQjgeTNuUk/9k9uN0goOA/FvudocP05l03Sx5iRUKrERLMjfTlH6VJi
-1hKTXrcxlkIF+3anHqP1wvzpesVsqXFP6st4vGCvx9702cu+fjOlbpSD8DT6Iavq
-jnKgP6TeMFvvhk1qlVtDRKgQFRzlAVfFmPHmBiiRqiDFt1MmUUOyCxGVWOHAD3bZ
-wI18gfNycJ5v/hqO2V81xrJvNHy+SE/iWjnX2J14np+GPgNeGYtEotXHAgMBAAGj
-QjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS/
-WSA2AHmgoCJrjNXyYdK4LMuCSjANBgkqhkiG9w0BAQsFAAOCAQEAMQOiYQsfdOhy
-NsZt+U2e+iKo4YFWz827n+qrkRk4r6p8FU3ztqONpfSO9kSpp+ghla0+AGIWiPAC
-uvxhI+YzmzB6azZie60EI4RYZeLbK4rnJVM3YlNfvNoBYimipidx5joifsFvHZVw
-IEoHNN/q/xWA5brXethbdXwFeilHfkCoMRN3zUA7tFFHei4R40cR3p1m0IvVVGb6
-g1XqfMIpiRvpb7PO4gWEyS8+eIVibslfwXhjdFjASBgMmTnrpMwatXlajRWc2BQN
-9noHV8cigwUtPJslJj0Ys6lDfMjIq2SPDqO/nBudMNva0Bkuqjzx+zOAduTNrRlP
-BSeOE6Fuwg==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/T-TeleSecGlobalRootClass3.crt b/test/rules/platform_certs/default/T-TeleSecGlobalRootClass3.crt
deleted file mode 100644
index 0e35fc2864cf..000000000000
--- a/test/rules/platform_certs/default/T-TeleSecGlobalRootClass3.crt
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUx
-KzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAd
-BgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNl
-YyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgxMDAxMTAyOTU2WhcNMzMxMDAxMjM1
-OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnBy
-aXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50
-ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN
-8ELg63iIVl6bmlQdTQyK9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/
-RLyTPWGrTs0NvvAgJ1gORH8EGoel15YUNpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4
-hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZFiP0Zf3WHHx+xGwpzJFu5
-ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W0eDrXltM
-EnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGj
-QjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1
-A/d2O2GCahKqGFPrAyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOy
-WL6ukK2YJ5f+AbGwUgC4TeQbIXQbfsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ
-1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzTucpH9sry9uetuUg/vBa3wW30
-6gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7hP0HHRwA11fXT
-91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml
-e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4p
-TpPDpFQUWw==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/TCTrustCenterClass3CAII.crt b/test/rules/platform_certs/default/TCTrustCenterClass3CAII.crt
deleted file mode 100644
index f4e3c9a45b04..000000000000
--- a/test/rules/platform_certs/default/TCTrustCenterClass3CAII.crt
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEqjCCA5KgAwIBAgIOSkcAAQAC5aBd1j8AUb8wDQYJKoZIhvcNAQEFBQAwdjEL
-MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNV
-BAsTGVRDIFRydXN0Q2VudGVyIENsYXNzIDMgQ0ExJTAjBgNVBAMTHFRDIFRydXN0
-Q2VudGVyIENsYXNzIDMgQ0EgSUkwHhcNMDYwMTEyMTQ0MTU3WhcNMjUxMjMxMjI1
-OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIgR21i
-SDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQTElMCMGA1UEAxMc
-VEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALTgu1G7OVyLBMVMeRwjhjEQY0NVJz/GRcekPewJDRoeIMJW
-Ht4bNwcwIi9v8Qbxq63WyKthoy9DxLCyLfzDlml7forkzMA5EpBCYMnMNWju2l+Q
-Vl/NHE1bWEnrDgFPZPosPIlY2C8u4rBo6SI7dYnWRBpl8huXJh0obazovVkdKyT2
-1oQDZogkAHhg8fir/gKya/si+zXmFtGt9i4S5Po1auUZuV3bOx4a+9P/FRQI2Alq
-ukWdFHlgfa9Aigdzs5OW03Q0jTo3Kd5c7PXuLjHCINy+8U9/I1LZW+Jk2ZyqBwi1
-Rb3R0DHBq1SfqdLDYmAD8bs5SpJKPQq5ncWg/jcCAwEAAaOCATQwggEwMA8GA1Ud
-EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTUovyfs8PYA9NX
-XAek0CSnwPIA1DCB7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRy
-dXN0Y2VudGVyLmRlL2NybC92Mi90Y19jbGFzc18zX2NhX0lJLmNybIaBn2xkYXA6
-Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBUcnVzdENlbnRlciUyMENsYXNz
-JTIwMyUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21iSCxPVT1yb290
-Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
-TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEANmDkcPcGIEPZIxpC8vijsrlN
-irTzwppVMXzEO2eatN9NDoqTSheLG43KieHPOh6sHfGcMrSOWXaiQYUlN6AT0PV8
-TtXqluJucsG7Kv5sbviRmEb8yRtXW+rIGjs/sFGYPAfaLFkB2otE6OF0/ado3VS6
-g0bsyEa1+K+XwDsJHI/OcpY9M1ZwvJbL2NV9IJqDnxrcOfHFcqMRA/07QlIp2+gB
-95tejNaNhk4Z+rwcvsUhpYeeeC422wlxo3I0+GzjBgnyXlal092Y+tTmBvTwtiBj
-S+opvaqCZh77gaqnN60TGOaSw4HBM7uIHqHn4rS9MWwOUT1v+5ZWgOI2F9Hc5A==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/TWCAGlobalRootCA.crt b/test/rules/platform_certs/default/TWCAGlobalRootCA.crt
deleted file mode 100644
index caed317a7208..000000000000
--- a/test/rules/platform_certs/default/TWCAGlobalRootCA.crt
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFQTCCAymgAwIBAgICDL4wDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCVFcx
-EjAQBgNVBAoTCVRBSVdBTi1DQTEQMA4GA1UECxMHUm9vdCBDQTEcMBoGA1UEAxMT
-VFdDQSBHbG9iYWwgUm9vdCBDQTAeFw0xMjA2MjcwNjI4MzNaFw0zMDEyMzExNTU5
-NTlaMFExCzAJBgNVBAYTAlRXMRIwEAYDVQQKEwlUQUlXQU4tQ0ExEDAOBgNVBAsT
-B1Jvb3QgQ0ExHDAaBgNVBAMTE1RXQ0EgR2xvYmFsIFJvb3QgQ0EwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQCwBdvI64zEbooh745NnHEKH1Jw7W2CnJfF
-10xORUnLQEK1EjRsGcJ0pDFfhQKX7EMzClPSnIyOt7h52yvVavKOZsTuKwEHktSz
-0ALfUPZVr2YOy+BHYC8rMjk1Ujoog/h7FsYYuGLWRyWRzvAZEk2tY/XTP3VfKfCh
-MBwqoJimFb3u/Rk28OKRQ4/6ytYQJ0lM793B8YVwm8rqqFpD/G2Gb3PpN0Wp8DbH
-zIh1HrtsBv+baz4X7GGqcXzGHaL3SekVtTzWoWH1EfcFbx39Eb7QMAfCKbAJTibc
-46KokWofwpFFiFzlmLhxpRUZyXx1EcxwdE8tmx2RRP1WKKD+u4ZqyPpcC1jcxkt2
-yKsi2XMPpfRaAok/T54igu6idFMqPVMnaR1sjjIsZAAmY2E2TqNGtz99sy2sbZCi
-laLOz9qC5wc0GZbpuCGqKX6mOL6OKUohZnkfs8O1CWfe1tQHRvMq2uYiN2DLgbYP
-oA/pyJV/v1WRBXrPPRXAb94JlAGD1zQbzECl8LibZ9WYkTunhHiVJqRaCPgrdLQA
-BDzfuBSO6N+pjWxnkjMdwLfS7JLIvgm/LCkFbwJrnu+8vyq8W8BQj0FwcYeyTbcE
-qYSjMq+u7msXi7Kx/mzhkIyIqJdIzshNy/MGz19qCkKxHh53L46g5pIOBvwFItIm
-4TFRfTLcDwIDAQABoyMwITAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
-/zANBgkqhkiG9w0BAQsFAAOCAgEAXzSBdu+WHdXltdkCY4QWwa6gcFGn90xHNcgL
-1yg9iXHZqjNB6hQbbCEAwGxCGX6faVsgQt+i0trEfJdLjbDorMjupWkEmQqSpqsn
-LhpNgb+E1HAerUf+/UqdM+DyucRFCCEK2mlpc3INvjT+lIutwx4116KD7+U4x6WF
-H6vPNOw/KP4M8VeGTslV9xzU2KV9Bnpv1d8Q34FOIWWxtuEXeZVFBs5fzNxGiWNo
-RI2T9GRwoD2dKAXDOXC4Ynsg/eTb6QihuJ49CcdP+yz4k3ZB3lLg4VfSnQO8d57+
-nile98FRYB/e2guyLXW3Q0iT5/Z5xoRdgFlglPx4mI88k1HtQJAH32RjJMtOcQWh
-15QaiDLxInQirqWm2BJpTGCjAu4r7NRjkgtevi92a6O2JryPA9gK8kxkRr05YuWW
-6zRjESjMlfGt7+/cgFhI6Uu46mWs6fyAtbXIRfmswZ/ZuepiiI7E8UuDEq3mi4TW
-nsLrgxifarsbJGAzcMzs9zLzXNl5fe+epP7JI8Mk7hWSsT2RTyaGvWZzJBPqpK5j
-wa19hAM8EHiGG3njxPPyBJUgriOCxLM6AGK/5jYk4Ve6xx6QddVfP5VhK8E7zeWz
-aGHQRiapIVJpLesux+t3zqY6tQMzT3bR51xUAV3LePTJDL/PEo4XLSNolOer/qmy
-KwbQBM0=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/TWCARootCertificationAuthority.crt b/test/rules/platform_certs/default/TWCARootCertificationAuthority.crt
deleted file mode 100644
index fb7778e65955..000000000000
--- a/test/rules/platform_certs/default/TWCARootCertificationAuthority.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzES
-MBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFU
-V0NBIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMz
-WhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJVEFJV0FO
-LUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlm
-aWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFE
-AcK0HMMxQhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HH
-K3XLfJ+utdGdIzdjp9xCoi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeX
-RfwZVzsrb+RH9JlF/h3x+JejiB03HFyP4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/z
-rX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1ry+UPizgN7gr8/g+YnzAx
-3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
-HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkq
-hkiG9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeC
-MErJk/9q56YAf4lCmtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdls
-XebQ79NqZp4VKIV66IIArB6nCWlWQtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62D
-lhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVYT0bf+215WfKEIlKuD8z7fDvn
-aspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocnyYh0igzyXxfkZ
-YiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/TaiwanGRCA.crt b/test/rules/platform_certs/default/TaiwanGRCA.crt
deleted file mode 100644
index 3d3fe76392f7..000000000000
--- a/test/rules/platform_certs/default/TaiwanGRCA.crt
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/
-MQswCQYDVQQGEwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5MB4XDTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1ow
-PzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dvdmVybm1lbnQgUm9vdCBDZXJ0aWZp
-Y2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
-AJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qNw8XR
-IePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1q
-gQdW8or5BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKy
-yhwOeYHWtXBiCAEuTk8O1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAts
-F/tnyMKtsc2AtJfcdgEWFelq16TheEfOhtX7MfP6Mb40qij7cEwdScevLJ1tZqa2
-jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wovJ5pGfaENda1UhhXcSTvx
-ls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7Q3hub/FC
-VGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHK
-YS1tB6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoH
-EgKXTiCQ8P8NHuJBO9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThN
-Xo+EHWbNxWCWtFJaBYmOlXqYwZE8lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1Ud
-DgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNVHRMEBTADAQH/MDkGBGcqBwAE
-MTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg209yewDL7MTqK
-UWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
-TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyf
-qzvS/3WXy6TjZwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaK
-ZEk9GhiHkASfQlK3T8v+R0F2Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFE
-JPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlUD7gsL0u8qV1bYH+Mh6XgUmMqvtg7
-hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6QzDxARvBMB1uUO07+1
-EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+HbkZ6Mm
-nD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WX
-udpVBrkk7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44Vbnz
-ssQwmSNOXfJIoRIM3BKQCZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDe
-LMDDav7v3Aun+kbfYNucpllQdSNpc5Oy+fwC00fmcc4QAu4njIT/rEUNE1yDMuAl
-pYYsfPQS
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/TeliaSoneraRootCAv1.crt b/test/rules/platform_certs/default/TeliaSoneraRootCAv1.crt
deleted file mode 100644
index 0decd4be031e..000000000000
--- a/test/rules/platform_certs/default/TeliaSoneraRootCAv1.crt
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFODCCAyCgAwIBAgIRAJW+FqD3LkbxezmCcvqLzZYwDQYJKoZIhvcNAQEFBQAw
-NzEUMBIGA1UECgwLVGVsaWFTb25lcmExHzAdBgNVBAMMFlRlbGlhU29uZXJhIFJv
-b3QgQ0EgdjEwHhcNMDcxMDE4MTIwMDUwWhcNMzIxMDE4MTIwMDUwWjA3MRQwEgYD
-VQQKDAtUZWxpYVNvbmVyYTEfMB0GA1UEAwwWVGVsaWFTb25lcmEgUm9vdCBDQSB2
-MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMK+6yfwIaPzaSZVfp3F
-VRaRXP3vIb9TgHot0pGMYzHw7CTww6XScnwQbfQ3t+XmfHnqjLWCi65ItqwA3GV1
-7CpNX8GH9SBlK4GoRz6JI5UwFpB/6FcHSOcZrr9FZ7E3GwYq/t75rH2D+1665I+X
-Z75Ljo1kB1c4VWk0Nj0TSO9P4tNmHqTPGrdeNjPUtAa9GAH9d4RQAEX1jF3oI7x+
-/jXh7VB7qTCNGdMJjmhnXb88lxhTuylixcpecsHHltTbLaC0H2kD7OriUPEMPPCs
-81Mt8Bz17Ww5OXOAFshSsCPN4D7c3TxHoLs1iuKYaIu+5b9y7tL6pe0S7fyYGKkm
-dtwoSxAgHNN/Fnct7W+A90m7UwW7XWjH1Mh1Fj+JWov3F0fUTPHSiXk+TT2YqGHe
-Oh7S+F4D4MHJHIzTjU3TlTazN19jY5szFPAtJmtTfImMMsJu7D0hADnJoWjiUIMu
-sDor8zagrC/kb2HCUQk5PotTubtn2txTuXZZNp1D5SDgPTJghSJRt8czu90VL6R4
-pgd7gUY2BIbdeTXHlSw7sKMXNeVzH7RcWe/a6hBle3rQf5+ztCo3O3CLm1u5K7fs
-slESl1MpWtTwEhDcTwK7EpIvYtQ/aUN8Ddb8WHUBiJ1YFkveupD/RwGJBmr2X7KQ
-arMCpgKIv7NHfirZ1fpoeDVNAgMBAAGjPzA9MA8GA1UdEwEB/wQFMAMBAf8wCwYD
-VR0PBAQDAgEGMB0GA1UdDgQWBBTwj1k4ALP1j5qWDNXr+nuqF+gTEjANBgkqhkiG
-9w0BAQUFAAOCAgEAvuRcYk4k9AwI//DTDGjkk0kiP0Qnb7tt3oNmzqjMDfz1mgbl
-dxSR651Be5kqhOX//CHBXfDkH1e3damhXwIm/9fH907eT/j3HEbAek9ALCI18Bmx
-0GtnLLCo4MBANzX2hFxc469CeP6nyQ1Q6g2EdvZR74NTxnr/DlZJLo961gzmJ1Tj
-TQpgcmLNkQfWpb/ImWvtxBnmq0wROMVvMeJuScg/doAmAyYp4Db29iBT4xdwNBed
-Y2gea+zDTYa4EzAvXUYNR0PVG6pZDrlcjQZIrXSHX8f8MVRBE+LHIQ6e4B4N4cB7
-Q4WQxYpYxmUKeFfyxiMPAdkgS94P+5KFdSpcc41teyWRyu5FrgZLAMzTsVlQ2jqI
-OylDRl6XK1TOU2+NSueW+r9xDkKLfP0ooNBIytrEgUy7onOTJsjrDNYmiLbAJM+7
-vVvrdX3pCI6GMyx5dwlppYn8s3CQh3aP0yK7Qs69cwsgJirQmz1wHiRszYd2qReW
-t88NkvuOGKmYSdGe/mBEciG5Ge3C9THxOUiIkCR1VBatzvT4aRRkOfujuLpwQMcn
-HL/EVlP6Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVx
-SK236thZiNSQvxaz2emsWWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/TrustedCertificateServices.crt b/test/rules/platform_certs/default/TrustedCertificateServices.crt
deleted file mode 100644
index 883a9b8991b7..000000000000
--- a/test/rules/platform_certs/default/TrustedCertificateServices.crt
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEb
-MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
-GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0
-aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEwMDAwMDBaFw0yODEyMzEyMzU5NTla
-MH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
-BgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUwIwYD
-VQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWW
-fnJSoBVC21ndZHoa0Lh73TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMt
-TGo87IvDktJTdyR0nAducPy9C1t2ul/y/9c3S0pgePfw+spwtOpZqqPOSC+pw7IL
-fhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6juljatEPmsbS9Is6FARW
-1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsSivnkBbA7
-kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0G
-A1UdDgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYD
-VR0TAQH/BAUwAwEB/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21v
-ZG9jYS5jb20vVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRo
-dHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMu
-Y3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8NtwuleGFTQQuS9/
-HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32
-pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxIS
-jBc/lDb+XbDABHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+
-xqFx7D+gIIxmOom0jtTYsU0lR+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/Atyjcn
-dBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O9y5Xt5hwXsjEeLBi
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/TrustisFPSRootCA.crt b/test/rules/platform_certs/default/TrustisFPSRootCA.crt
deleted file mode 100644
index d7155dd31232..000000000000
--- a/test/rules/platform_certs/default/TrustisFPSRootCA.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBF
-MQswCQYDVQQGEwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQL
-ExNUcnVzdGlzIEZQUyBSb290IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTEx
-MzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNVBAoTD1RydXN0aXMgTGltaXRlZDEc
-MBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQRUN+
-AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihH
-iTHcDnlkH5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjj
-vSkCqPoc4Vu5g6hBSLwacY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA
-0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zto3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlB
-OrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEAAaNTMFEwDwYDVR0TAQH/
-BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAdBgNVHQ4E
-FgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01
-GX2cGE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmW
-zaD+vkAMXBJV+JOCyinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP4
-1BIy+Q7DsdwyhEQsb8tGD+pmQQ9P8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZE
-f1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHVl/9D7S3B2l0pKoU/rGXuhg8F
-jZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYliB6XzCGcKQEN
-ZetX2fNXlrtIzYE=
------END CERTIFICATE-----
diff --git "a/test/rules/platform_certs/default/T\303\234B\304\260TAKUEKAEK\303\266kSertifikaHizmetSa\304\237lay\304\261c\304\261s\304\261-S\303\274r\303\274m3.crt" "b/test/rules/platform_certs/default/T\303\234B\304\260TAKUEKAEK\303\266kSertifikaHizmetSa\304\237lay\304\261c\304\261s\304\261-S\303\274r\303\274m3.crt"
deleted file mode 100644
index 3e08348c1806..000000000000
--- "a/test/rules/platform_certs/default/T\303\234B\304\260TAKUEKAEK\303\266kSertifikaHizmetSa\304\237lay\304\261c\304\261s\304\261-S\303\274r\303\274m3.crt"
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFFzCCA/+gAwIBAgIBETANBgkqhkiG9w0BAQUFADCCASsxCzAJBgNVBAYTAlRS
-MRgwFgYDVQQHDA9HZWJ6ZSAtIEtvY2FlbGkxRzBFBgNVBAoMPlTDvHJraXllIEJp
-bGltc2VsIHZlIFRla25vbG9qaWsgQXJhxZ90xLFybWEgS3VydW11IC0gVMOcQsSw
-VEFLMUgwRgYDVQQLDD9VbHVzYWwgRWxla3Ryb25payB2ZSBLcmlwdG9sb2ppIEFy
-YcWfdMSxcm1hIEVuc3RpdMO8c8O8IC0gVUVLQUUxIzAhBgNVBAsMGkthbXUgU2Vy
-dGlmaWthc3lvbiBNZXJrZXppMUowSAYDVQQDDEFUw5xCxLBUQUsgVUVLQUUgS8O2
-ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSAtIFPDvHLDvG0gMzAe
-Fw0wNzA4MjQxMTM3MDdaFw0xNzA4MjExMTM3MDdaMIIBKzELMAkGA1UEBhMCVFIx
-GDAWBgNVBAcMD0dlYnplIC0gS29jYWVsaTFHMEUGA1UECgw+VMO8cmtpeWUgQmls
-aW1zZWwgdmUgVGVrbm9sb2ppayBBcmHFn3TEsXJtYSBLdXJ1bXUgLSBUw5xCxLBU
-QUsxSDBGBgNVBAsMP1VsdXNhbCBFbGVrdHJvbmlrIHZlIEtyaXB0b2xvamkgQXJh
-xZ90xLFybWEgRW5zdGl0w7xzw7wgLSBVRUtBRTEjMCEGA1UECwwaS2FtdSBTZXJ0
-aWZpa2FzeW9uIE1lcmtlemkxSjBIBgNVBAMMQVTDnELEsFRBSyBVRUtBRSBLw7Zr
-IFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIC0gU8O8csO8bSAzMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAim1L/xCIOsP2fpTo6iBkcK4h
-gb46ezzb8R1Sf1n68yJMlaCQvEhOEav7t7WNeoMojCZG2E6VQIdhn8WebYGHV2yK
-O7Rm6sxA/OOqbLLLAdsyv9Lrhc+hDVXDWzhXcLh1xnnRFDDtG1hba+818qEhTsXO
-fJlfbLm4IpNQp81McGq+agV/E5wrHur+R84EpW+sky58K5+eeROR6Oqeyjh1jmKw
-lZMq5d/pXpduIF9fhHpEORlAHLpVK/swsoHvhOPc7Jg4OQOFCKlUAwUp8MmPi+oL
-hmUZEdPpCSPeaJMDyTYcIW7OjGbxmTDY17PDHfiBLqi9ggtm/oLL4eAagsNAgQID
-AQABo0IwQDAdBgNVHQ4EFgQUvYiHyY/2pAoLquvF/pEjnatKijIwDgYDVR0PAQH/
-BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAB18+kmP
-NOm3JpIWmgV050vQbTlswyb2zrgxvMTfvCr4N5EY3ATIZJkrGG2AA1nJrvhY0D7t
-wyOfaTyGOBye79oneNGEN3GKPEs5z35FBtYt2IpNeBLWrcLTy9LQQfMmNkqblWwM
-7uXRQydmwYj3erMgbOqwaSvHIOgMA8RBBZniP+Rr+KCGgceExh/VS4ESshYhLBOh
-gLJeDEoTniDYYkCrkOpkSi+sDQESeUWoL4cZaMjihccwsnX5OD+ywJO0a+IDRM5n
-oN+J1q2MdqMTw5RhK2vZbMEHCiIHhWyFJEapvj+LeISCfiQMnf2BN+MlqO02TpUs
-yZyQ2uypQjyttgI=
------END CERTIFICATE-----
diff --git "a/test/rules/platform_certs/default/T\303\234RKTRUSTElektronikSertifikaHizmetSa\304\237lay\304\261c\304\261s\304\261.crt" "b/test/rules/platform_certs/default/T\303\234RKTRUSTElektronikSertifikaHizmetSa\304\237lay\304\261c\304\261s\304\261.crt"
deleted file mode 100644
index 3ae8c07ca4ee..000000000000
--- "a/test/rules/platform_certs/default/T\303\234RKTRUSTElektronikSertifikaHizmetSa\304\237lay\304\261c\304\261s\304\261.crt"
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEPTCCAyWgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvzE/MD0GA1UEAww2VMOc
-UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
-c8SxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMV4wXAYDVQQKDFVUw5xS
-S1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kg
-SGl6bWV0bGVyaSBBLsWeLiAoYykgQXJhbMSxayAyMDA3MB4XDTA3MTIyNTE4Mzcx
-OVoXDTE3MTIyMjE4MzcxOVowgb8xPzA9BgNVBAMMNlTDnFJLVFJVU1QgRWxla3Ry
-b25payBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTELMAkGA1UEBhMC
-VFIxDzANBgNVBAcMBkFua2FyYTFeMFwGA1UECgxVVMOcUktUUlVTVCBCaWxnaSDE
-sGxldGnFn2ltIHZlIEJpbGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkgQS7F
-ni4gKGMpIEFyYWzEsWsgMjAwNzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAKu3PgqMyKVYFeaK7yc9SrToJdPNM8Ig3BnuiD9NYvDdE3ePYakqtdTyuTFY
-KTsvP2qcb3N2Je40IIDu6rfwxArNK4aUyeNgsURSsloptJGXg9i3phQvKUmi8wUG
-+7RP2qFsmmaf8EMJyupyj+sA1zU511YXRxcw9L6/P8JorzZAwan0qafoEGsIiveG
-HtyaKhUG9qPw9ODHFNRRf8+0222vR5YXm3dx2KdxnSQM9pQ/hTEST7ruToK4uT6P
-IzdezKKqdfcYbwnTrqdUKDT74eA7YH2gvnmJhsifLfkKS8RQouf9eRbHegsYz85M
-733WB2+Y8a+xwXrXgTW4qhe04MsCAwEAAaNCMEAwHQYDVR0OBBYEFCnFkKslrxHk
-Yb+j/4hhkeYO/pyBMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0G
-CSqGSIb3DQEBBQUAA4IBAQAQDdr4Ouwo0RSVgrESLFF6QSU2TJ/sPx+EnWVUXKgW
-AkD6bho3hO9ynYYKVZ1WKKxmLNA6VpM0ByWtCLCPyA8JWcqdmBzlVPi5RX9ql2+I
-aE1KBiY3iAIOtsbWcpnOa3faYjGkVh+uX4132l32iPwa2Z61gfAyuOOI0JzzaqC5
-mxRZNTZPz/OOXl0XrRWV2N2y1RVuAE6zS89mlOTgzbUF2mNXi+WzqtvALhyQRNsa
-XRik7r4EW5nVcV9VZWRi1aKbBFmGyGJ353yCRWo9F7/snXUMrqNvWtMvmDb08PUZ
-qxFdyKbjKlhqQgnDvZImZjINXQhVdP+MmNAKpoRq0Tl9
------END CERTIFICATE-----
diff --git "a/test/rules/platform_certs/default/T\303\234RKTRUSTElektronikSertifikaHizmetSa\304\237lay\304\261c\304\261s\304\261H5.crt" "b/test/rules/platform_certs/default/T\303\234RKTRUSTElektronikSertifikaHizmetSa\304\237lay\304\261c\304\261s\304\261H5.crt"
deleted file mode 100644
index 3e9cb75eac4d..000000000000
--- "a/test/rules/platform_certs/default/T\303\234RKTRUSTElektronikSertifikaHizmetSa\304\237lay\304\261c\304\261s\304\261H5.crt"
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEJzCCAw+gAwIBAgIHAI4X/iQggTANBgkqhkiG9w0BAQsFADCBsTELMAkGA1UE
-BhMCVFIxDzANBgNVBAcMBkFua2FyYTFNMEsGA1UECgxEVMOcUktUUlVTVCBCaWxn
-aSDEsGxldGnFn2ltIHZlIEJpbGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkg
-QS7Fni4xQjBABgNVBAMMOVTDnFJLVFJVU1QgRWxla3Ryb25payBTZXJ0aWZpa2Eg
-SGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSBINTAeFw0xMzA0MzAwODA3MDFaFw0yMzA0
-MjgwODA3MDFaMIGxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMU0wSwYD
-VQQKDERUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8
-dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjFCMEAGA1UEAww5VMOcUktUUlVTVCBF
-bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIEg1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApCUZ4WWe60ghUEoI5RHwWrom
-/4NZzkQqL/7hzmAD/I0Dpe3/a6i6zDQGn1k19uwsu537jVJp45wnEFPzpALFp/kR
-Gml1bsMdi9GYjZOHp3GXDSHHmflS0yxjXVW86B8BSLlg/kJK9siArs1mep5Fimh3
-4khon6La8eHBEJ/rPCmBp+EyCNSgBbGM+42WAA4+Jd9ThiI7/PS98wl+d+yG6w8z
-5UNP9FR1bSmZLmZaQ9/LXMrI5Tjxfjs1nQ/0xVqhzPMggCTTV+wVunUlm+hkS7M0
-hO8EuPbJbKoCPrZV4jI3X/xml1/N1p7HIL9Nxqw/dV8c7TKcfGkAaZHjIxhT6QID
-AQABo0IwQDAdBgNVHQ4EFgQUVpkHHtOsDGlktAxQR95DLL4gwPswDgYDVR0PAQH/
-BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJ5FdnsX
-SDLyOIspve6WSk6BGLFRRyDN0GSxDsnZAdkJzsiZ3GglE9Rc8qPoBP5yCccLqh0l
-VX6Wmle3usURehnmp349hQ71+S4pL+f5bFgWV1Al9j4uPqrtd3GqqpmWRgqujuwq
-URawXs3qZwQcWDD1YIq9pr1N5Za0/EKJAWv2cMhQOQwt1WbZyNKzMrcbGW3LM/nf
-peYVhDfwwvJllpKQd/Ct9JDpEXjXk4nAPQu6KfTomZ1yju2dL+6SfaHx/126M2CF
-Yv4HAqGEVka+lgqaE9chTLd8B59OTj+RdPsnnRHM3eaxynFNExc5JsUpISuTKWqW
-+qtB4Uu2NQvAmxU=
------END CERTIFICATE-----
diff --git "a/test/rules/platform_certs/default/T\303\234RKTRUSTElektronikSertifikaHizmetSa\304\237lay\304\261c\304\261s\304\261H6.crt" "b/test/rules/platform_certs/default/T\303\234RKTRUSTElektronikSertifikaHizmetSa\304\237lay\304\261c\304\261s\304\261H6.crt"
deleted file mode 100644
index bbba14f8006d..000000000000
--- "a/test/rules/platform_certs/default/T\303\234RKTRUSTElektronikSertifikaHizmetSa\304\237lay\304\261c\304\261s\304\261H6.crt"
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEJjCCAw6gAwIBAgIGfaHyZeyKMA0GCSqGSIb3DQEBCwUAMIGxMQswCQYDVQQG
-EwJUUjEPMA0GA1UEBwwGQW5rYXJhMU0wSwYDVQQKDERUw5xSS1RSVVNUIEJpbGdp
-IMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBB
-LsWeLjFCMEAGA1UEAww5VMOcUktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBI
-aXptZXQgU2HEn2xhecSxY8Sxc8SxIEg2MB4XDTEzMTIxODA5MDQxMFoXDTIzMTIx
-NjA5MDQxMFowgbExCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmExTTBLBgNV
-BAoMRFTDnFJLVFJVU1QgQmlsZ2kgxLBsZXRpxZ9pbSB2ZSBCaWxpxZ9pbSBHw7x2
-ZW5sacSfaSBIaXptZXRsZXJpIEEuxZ4uMUIwQAYDVQQDDDlUw5xSS1RSVVNUIEVs
-ZWt0cm9uaWsgU2VydGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLEgSDYwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCdsGjW6L0UlqMACprx9MfMkU1x
-eHe59yEmFXNRFpQJRwXiM/VomjX/3EsvMsew7eKC5W/a2uqsxgbPJQ1BgfbBOCK9
-+bGlprMBvD9QFyv26WZV1DOzXPhDIHiTVRZwGTLmiddk671IUP320EEDwnS3/faA
-z1vFq6TWlRKb55cTMgPp1KtDWxbtMyJkKbbSk60vbNg9tvYdDjTu0n2pVQ8g9P0p
-u5FbHH3GQjhtQiht1AH7zYiXSX6484P4tZgvsycLSF5W506jM7NE1qXyGJTtHB6p
-lVxiSvgNZ1GpryHV+DKdeboaX+UEVU0TRv/yz3THGmNtwx8XEsMeED5gCLMxAgMB
-AAGjQjBAMB0GA1UdDgQWBBTdVRcT9qzoSCHK77Wv0QAy7Z6MtTAOBgNVHQ8BAf8E
-BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAb1gNl0Oq
-FlQ+v6nfkkU/hQu7VtMMUszIv3ZnXuaqs6fvuay0EBQNdH49ba3RfdCaqaXKGDsC
-QC4qnFAUi/5XfldcEQlLNkVS9z2sFP1E34uXI9TDwe7UU5X+LEr+DXCqu4svLcsy
-o4LyVN/Y8t3XSHLuSqMplsNEzm61kod2pLv0kmzOLBQJZo6NrRa1xxsJYTvjIKID
-gI6tflEATseWhvtDmHd9KMeP2Cpu54Rvl0EpABZeTeIT6lnAY2c6RPuY/ATTMHKm
-9ocJV612ph1jmv3XZch4gyt1O6VbuA1df74jrlZVlFjvH4GMKrLN5ptjnhi85WsG
-tAuYSyher4hYyw==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/USERTrustECCCertificationAuthority.crt b/test/rules/platform_certs/default/USERTrustECCCertificationAuthority.crt
deleted file mode 100644
index 8c9cecd586e2..000000000000
--- a/test/rules/platform_certs/default/USERTrustECCCertificationAuthority.crt
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICjzCCAhWgAwIBAgIQXIuZxVqUxdJxVt7NiYDMJjAKBggqhkjOPQQDAzCBiDEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNl
-eSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMT
-JVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAwMjAx
-MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgT
-Ck5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVUaGUg
-VVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlm
-aWNhdGlvbiBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQarFRaqflo
-I+d61SRvU8Za2EurxtW20eZzca7dnNYMYf3boIkDuAUU7FfO7l0/4iGzzvfUinng
-o4N+LZfQYcTxmdwlkWOrfzCjtHDix6EznPO/LlxTsV+zfTJ/ijTjeXmjQjBAMB0G
-A1UdDgQWBBQ64QmG1M8ZwpZ2dEl23OA1xmNjmjAOBgNVHQ8BAf8EBAMCAQYwDwYD
-VR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjA2Z6EWCNzklwBBHU6+4WMB
-zzuqQhFkoJ2UOQIReVx7Hfpkue4WQrO/isIJxOzksU0CMQDpKmFHjFJKS04YcPbW
-RNZu9YO6bVi9JNlWSOrvxKJGgYhqOkbRqZtNyWHa0V1Xahg=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/USERTrustRSACertificationAuthority.crt b/test/rules/platform_certs/default/USERTrustRSACertificationAuthority.crt
deleted file mode 100644
index d193f4821d96..000000000000
--- a/test/rules/platform_certs/default/USERTrustRSACertificationAuthority.crt
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIF3jCCA8agAwIBAgIQAf1tMPyjylGoG7xkDjUDLTANBgkqhkiG9w0BAQwFADCB
-iDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0pl
-cnNleSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNV
-BAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAw
-MjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMCVVMxEzARBgNV
-BAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
-aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2Vy
-dGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK
-AoICAQCAEmUXNg7D2wiz0KxXDXbtzSfTTK1Qg2HiqiBNCS1kCdzOiZ/MPans9s/B
-3PHTsdZ7NygRK0faOca8Ohm0X6a9fZ2jY0K2dvKpOyuR+OJv0OwWIJAJPuLodMkY
-tJHUYmTbf6MG8YgYapAiPLz+E/CHFHv25B+O1ORRxhFnRghRy4YUVD+8M/5+bJz/
-Fp0YvVGONaanZshyZ9shZrHUm3gDwFA66Mzw3LyeTP6vBZY1H1dat//O+T23LLb2
-VN3I5xI6Ta5MirdcmrS3ID3KfyI0rn47aGYBROcBTkZTmzNg95S+UzeQc0PzMsNT
-79uq/nROacdrjGCT3sTHDN/hMq7MkztReJVni+49Vv4M0GkPGw/zJSZrM233bkf6
-c0Plfg6lZrEpfDKEY1WJxA3Bk1QwGROs0303p+tdOmw1XNtB1xLaqUkL39iAigmT
-Yo61Zs8liM2EuLE/pDkP2QKe6xJMlXzzawWpXhaDzLhn4ugTncxbgtNMs+1b/97l
-c6wjOy0AvzVVdAlJ2ElYGn+SNuZRkg7zJn0cTRe8yexDJtC/QV9AqURE9JnnV4ee
-UB9XVKg+/XRjL7FQZQnmWEIuQxpMtPAlR1n6BB6T1CZGSlCBst6+eLf8ZxXhyVeE
-Hg9j1uliutZfVS7qXMYoCAQlObgOK6nyTJccBz8NUvXt7y+CDwIDAQABo0IwQDAd
-BgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rIDZsswDgYDVR0PAQH/BAQDAgEGMA8G
-A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAFzUfA3P9wF9QZllDHPF
-Up/L+M+ZBn8b2kMVn54CVVeWFPFSPCeHlCjtHzoBN6J2/FNQwISbxmtOuowhT6KO
-VWKR82kV2LyI48SqC/3vqOlLVSoGIG1VeCkZ7l8wXEskEVX/JJpuXior7gtNn3/3
-ATiUFJVDBwn7YKnuHKsSjKCaXqeYalltiz8I+8jRRa8YFWSQEg9zKC7F4iRO/Fjs
-8PRF/iKz6y+O0tlFYQXBl2+odnKPi4w2r78NBc5xjeambx9spnFixdjQg3IM8WcR
-iQycE0xyNN+81XHfqnHd4blsjDwSXWXavVcStkNr/+XeTWYRUc+ZruwXtuhxkYze
-Sf7dNXGiFSeUHM9h4ya7b6NnJSFd5t0dCy5oGzuCr+yDZ4XUmFF0sbmZgIn/f3gZ
-XHlKYC6SQK5MNyosycdiyA5d9zZbyuAlJQG03RoHnHcAP9Dc1ew91Pq7P8yF1m9/
-qS3fuQL39ZeatTXaw2ewh0qpKJ4jjv9cJ2vhsE/zB+4ALtRZh8tSQZXq9EfX7mRB
-VXyNWQKV3WKdwrnuWih0hKWbt5DHDAff9Yk2dDLWKMGwsAvgnEzDHNb842m1R0aB
-L6KCq9NjRHDEjf8tM7qtj3u1cIiuPhnPQCjY/MiQu12ZIvVS5ljFH4gxQ+6IHdfG
-jjxDah2nGN59PRbxYvnKkKj9
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/UTN-USERFirst-ClientAuthenticationandEmail.crt b/test/rules/platform_certs/default/UTN-USERFirst-ClientAuthenticationandEmail.crt
deleted file mode 100644
index c883fe325926..000000000000
--- a/test/rules/platform_certs/default/UTN-USERFirst-ClientAuthenticationandEmail.crt
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEojCCA4qgAwIBAgIQRL4Mi1AAJLQR0zYlJWfJiTANBgkqhkiG9w0BAQUFADCB
-rjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
-Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
-dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xNjA0BgNVBAMTLVVUTi1VU0VSRmlyc3Qt
-Q2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBFbWFpbDAeFw05OTA3MDkxNzI4NTBa
-Fw0xOTA3MDkxNzM2NThaMIGuMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAV
-BgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5l
-dHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRydXN0LmNvbTE2MDQGA1UE
-AxMtVVROLVVTRVJGaXJzdC1DbGllbnQgQXV0aGVudGljYXRpb24gYW5kIEVtYWls
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsjmFpPJ9q0E7YkY3rs3B
-YHW8OWX5ShpHornMSMxqmNVNNRm5pELlzkniii8efNIxB8dOtINknS4p1aJkxIW9
-hVE1eaROaJB7HHqkkqgX8pgV8pPMyaQylbsMTzC9mKALi+VuG6JG+ni8om+rWV6l
-L8/K2m2qL+usobNqqrcuZzWLeeEeaYji5kbNoKXqvgvOdjp6Dpvq/NonWz1zHyLm
-SGHGTPNpsaguG7bUMSAsvIKKjqQOpdeJQ/wWWq8dcdcRWdq6hw2v+vPhwvCkxWeM
-1tZUOt4KpLoDd7NlyP0e03RiqhjKaJMeoYV+9Udly/hNVyh00jT/MLbu9mIwFIws
-6wIDAQABo4G5MIG2MAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud
-DgQWBBSJgmd9xJ0mcABLtFBIfN49rgRufTBYBgNVHR8EUTBPME2gS6BJhkdodHRw
-Oi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLVVTRVJGaXJzdC1DbGllbnRBdXRoZW50
-aWNhdGlvbmFuZEVtYWlsLmNybDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwQwDQYJKoZIhvcNAQEFBQADggEBALFtYV2mGn98q0rkMPxTbyUkxsrt4jFcKw7u
-7mFVbwQ+zznexRtJlOTrIEy05p5QLnLZjfWqo7NK2lYcYJeA3IKirUq9iiv/Cwm0
-xtcgBEXkzYABurorbs6q15L+5K/r9CYdFip/bDCVNy8zEqx/3cfREYxRmLLQo5HQ
-rfafnoOTHh1CuEava2bwm3/q4wMC5QJRwarVNZ1yQAOJujEdxRBoUp7fooXFXAim
-eOZTT7Hot9MUnpOmw2TjrH5xzbyf6QMbzPvprDHBr3wVdAKZw7JHpsIyYdfHb0gk
-USeh1YdV8nuPmD0Wnu51tvjQjvLzxq4oW6fw8zYX/MMF08oDSlQ=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/UTN-USERFirst-Hardware.crt b/test/rules/platform_certs/default/UTN-USERFirst-Hardware.crt
deleted file mode 100644
index 3bbbe4d42a51..000000000000
--- a/test/rules/platform_certs/default/UTN-USERFirst-Hardware.crt
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCB
-lzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
-Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
-dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3Qt
-SGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgxOTIyWjCBlzELMAkG
-A1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEe
-MBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8v
-d3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdh
-cmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn
-0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlIwrthdBKWHTxqctU8EGc6Oe0rE81m65UJ
-M6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFdtqdt++BxF2uiiPsA3/4a
-MXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8i4fDidNd
-oI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqI
-DsjfPe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9Ksy
-oUhbAgMBAAGjgbkwgbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYD
-VR0OBBYEFKFyXyYbKJhDlV0HN9WFlp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0
-dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNFUkZpcnN0LUhhcmR3YXJlLmNy
-bDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUFBwMGBggrBgEF
-BQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM
-//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28Gpgoiskli
-CE7/yMgUsogWXecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gE
-CJChicsZUN/KHAG8HQQZexB2lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t
-3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kniCrVWFCVH/A7HFe7fRQ5YiuayZSS
-KqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67nfhmqA==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/UTN-USERFirst-Object.crt b/test/rules/platform_certs/default/UTN-USERFirst-Object.crt
deleted file mode 100644
index dcd10ba51564..000000000000
--- a/test/rules/platform_certs/default/UTN-USERFirst-Object.crt
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEZjCCA06gAwIBAgIQRL4Mi1AAJLQR0zYt4LNfGzANBgkqhkiG9w0BAQUFADCB
-lTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
-Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
-dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHTAbBgNVBAMTFFVUTi1VU0VSRmlyc3Qt
-T2JqZWN0MB4XDTk5MDcwOTE4MzEyMFoXDTE5MDcwOTE4NDAzNlowgZUxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIEwJVVDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkxHjAc
-BgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEhMB8GA1UECxMYaHR0cDovL3d3
-dy51c2VydHJ1c3QuY29tMR0wGwYDVQQDExRVVE4tVVNFUkZpcnN0LU9iamVjdDCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6qgT+jo2F4qjEAVZURnicP
-HxzfOpuCaDDASmEd8S8O+r5596Uj71VRloTN2+O5bj4x2AogZ8f02b+U60cEPgLO
-KqJdhwQJ9jCdGIqXsqoc/EHSoTbL+z2RuufZcDX65OeQw5ujm9M89RKZd7G3CeBo
-5hy485RjiGpq/gt2yb70IuRnuasaXnfBhQfdDWy/7gbHd2pBnqcP1/vulBe3/IW+
-pKvEHDHd17bR5PDv3xaPslKT16HUiaEHLr/hARJCHhrh2JU022R5KP+6LhHC5ehb
-kkj7RwvCbNqtMoNB86XlQXD9ZZBt+vpRxPm9lisZBCzTbafc8H9vg2XiaquHhnUC
-AwEAAaOBrzCBrDALBgNVHQ8EBAMCAcYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
-FgQU2u1kdBScFDyr3ZmpvVsoTYs8ydgwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDov
-L2NybC51c2VydHJ1c3QuY29tL1VUTi1VU0VSRmlyc3QtT2JqZWN0LmNybDApBgNV
-HSUEIjAgBggrBgEFBQcDAwYIKwYBBQUHAwgGCisGAQQBgjcKAwQwDQYJKoZIhvcN
-AQEFBQADggEBAAgfUrE3RHjb/c652pWWmKpVZIC1WkDdIaXFwfNfLEzIR1pp6ujw
-NTX00CXzyKakh0q9G7FzCL3Uw8q2NbtZhncxzaeAFK4T7/yxSPlrJSUtUbYsbUXB
-mMiKVl0+7kNOPmsnjtA6S4ULX9Ptaqd1y9Fahy85dRNacrACgZ++8A+EVCBibGnU
-4U3GDZlDAQ0Slox4nb9QorFEqmrPF3rPbw/U+CRVX/A0FklmPlBGyWNxODFiuGK5
-81OtbLUrohKqGU8J2l7nk8aOFAj+8DCAGKCGhU3IfdeLA/5u1fedFqySLKAj5ZyR
-Uh+U3xeUc8OzwcFxBSAAeL0TUh2oPs0AH8g=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/VeriSignClass1PublicPrimaryCertificationAuthority-G3.crt b/test/rules/platform_certs/default/VeriSignClass1PublicPrimaryCertificationAuthority-G3.crt
deleted file mode 100644
index a0466629878f..000000000000
--- a/test/rules/platform_certs/default/VeriSignClass1PublicPrimaryCertificationAuthority-G3.crt
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEGjCCAwICEQCLW3VWhFSFCwDPrzhIzrGkMA0GCSqGSIb3DQEBBQUAMIHKMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
-cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
-LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
-aWduIENsYXNzIDEgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
-VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
-aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
-bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
-IENsYXNzIDEgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
-LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN2E1Lm0+afY8wR4
-nN493GwTFtl63SRRZsDHJlkNrAYIwpTRMx/wgzUfbhvI3qpuFU5UJ+/EbRrsC+MO
-8ESlV8dAWB6jRx9x7GD2bZTIGDnt/kIYVt/kTEkQeE4BdjVjEjbdZrwBBDajVWjV
-ojYJrKshJlQGrT/KFOCsyq0GHZXi+J3x4GD/wn91K0zM2v6HmSHquv4+VNfSWXjb
-PG7PoBMAGrgnoeS+Z5bKoMWznN3JdZ7rMJpfo83ZrngZPyPpXNspva1VyBtUjGP2
-6KbqxzcSXKMpHgLZ2x87tNcPVkeBFQRKr4Mn0cVYiMHd9qqnoxjaaKptEVHhv2Vr
-n5Z20T0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAq2aN17O6x5q25lXQBfGfMY1a
-qtmqRiYPce2lrVNWYgFHKkTp/j90CxObufRNG7LRX7K20ohcs5/Ny9Sn2WCVhDr4
-wTcdYcrnsMXlkdpUpqwxga6X3s0IrLjAl4B/bnKk52kTlWUfxJM8/XmPBNQ+T+r3
-ns7NZ3xPZQL/kYVUc8f/NveGLezQXk//EZ9yBta4GvFMDSZl4kSAHsef493oCtrs
-pSCAaWihT37ha88HQfqDjrw43bAuEbFrskLMmrz5SCJ5ShkPshw+IHTZasO+8ih4
-E1Z5T21Q6huwtVexN2ZYI/PcD98Kh8TvhgXVOBRgmaNL3gaWcSzy27YfpO8/7g==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/VeriSignClass2PublicPrimaryCertificationAuthority-G3.crt b/test/rules/platform_certs/default/VeriSignClass2PublicPrimaryCertificationAuthority-G3.crt
deleted file mode 100644
index cd160ca6c747..000000000000
--- a/test/rules/platform_certs/default/VeriSignClass2PublicPrimaryCertificationAuthority-G3.crt
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEGTCCAwECEGFwy0mMX5hFKeewptlQW3owDQYJKoZIhvcNAQEFBQAwgcoxCzAJ
-BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVy
-aVNpZ24gVHJ1c3QgTmV0d29yazE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24s
-IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTFFMEMGA1UEAxM8VmVyaVNp
-Z24gQ2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
-eSAtIEczMB4XDTk5MTAwMTAwMDAwMFoXDTM2MDcxNjIzNTk1OVowgcoxCzAJBgNV
-BAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNp
-Z24gVHJ1c3QgTmV0d29yazE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24sIElu
-Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTFFMEMGA1UEAxM8VmVyaVNpZ24g
-Q2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAt
-IEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArwoNwtUs22e5LeWU
-J92lvuCwTY+zYVY81nzD9M0+hsuiiOLh2KRpxbXiv8GmR1BeRjmL1Za6tW8UvxDO
-JxOeBUebMXoT2B/Z0wI3i60sR/COgQanDTAM6/c8DyAd3HJG7qUCyFvDyVZpTMUY
-wZF7C9UTAJu878NIPkZgIIUq1ZC2zYugzDLdt/1AVbJQHFauzI13TccgTacxdu9o
-koqQHgiBVrKtaaNS0MscxCM9H5n+TOgWY47GCI72MfbS+uV23bUckqNJzc0BzWjN
-qWm6o+sdDZykIKbBoMXRRkwXbdKsZj+WjOCE1Db/IlnF+RFgqF8EffIa9iVCYQ/E
-Srg+iQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA0JhU8wI1NQ0kdvekhktdmnLfe
-xbjQ5F1fdiLAJvmEOjr5jLX77GDx6M4EsMjdpwOPMPOY36TmpDHf0xwLRtxyID+u
-7gU8pDM/CzmscHhzS5kr3zDCVLCoO1Wh/hYozUK9dG6A2ydEp85EXdQbkJgNHkKU
-sQAsBNB0owIFImNjzYO1+8FtYmtpdf1dcEG59b98377BMnMiIYtYgXsVkXq642RI
-sH/7NiXaldDxJBQX3RiAa0YjOVT1jmIJBB2UkKab5iXiQkWquJCtvgiPqQtCGJTP
-cjnhsUPgKM+351psE2tJs//jGHyJizNdrDPXp/naOlXJWBD5qu9ats9LS98q
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/VeriSignClass3PublicPrimaryCertificationAuthority-G3.crt b/test/rules/platform_certs/default/VeriSignClass3PublicPrimaryCertificationAuthority-G3.crt
deleted file mode 100644
index ecca55bf4a7e..000000000000
--- a/test/rules/platform_certs/default/VeriSignClass3PublicPrimaryCertificationAuthority-G3.crt
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
-cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
-LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
-aWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
-VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
-aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
-bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
-IENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
-LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMu6nFL8eB8aHm8b
-N3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1EUGO+i2t
-KmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGu
-kxUccLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBm
-CC+Vk7+qRy+oRpfwEuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJ
-Xwzw3sJ2zq/3avL6QaaiMxTJ5Xpj055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWu
-imi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAERSWwauSCPc/L8my/uRan2Te
-2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5fj267Cz3qWhMe
-DGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
-/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565p
-F4ErWjfJXir0xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGt
-TxzhT5yvDwyd93gN2PQ1VoDat20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/VeriSignClass3PublicPrimaryCertificationAuthority-G4.crt b/test/rules/platform_certs/default/VeriSignClass3PublicPrimaryCertificationAuthority-G4.crt
deleted file mode 100644
index 4667705c6a2b..000000000000
--- a/test/rules/platform_certs/default/VeriSignClass3PublicPrimaryCertificationAuthority-G4.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjEL
-MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
-ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
-U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
-aXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjELMAkG
-A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJp
-U2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwg
-SW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2ln
-biBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8Utpkmw4tXNherJI9/gHm
-GUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGzrl0Bp3ve
-fLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUw
-AwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJ
-aW1hZ2UvZ2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYj
-aHR0cDovL2xvZ28udmVyaXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMW
-kf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMDA2gAMGUCMGYhDBgmYFo4e1ZC
-4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIxAJw9SDkjOVga
-FRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/VeriSignClass3PublicPrimaryCertificationAuthority-G5.crt b/test/rules/platform_certs/default/VeriSignClass3PublicPrimaryCertificationAuthority-G5.crt
deleted file mode 100644
index b041f4a51d3e..000000000000
--- a/test/rules/platform_certs/default/VeriSignClass3PublicPrimaryCertificationAuthority-G5.crt
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB
-yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
-U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
-ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL
-MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
-ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
-U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
-aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1
-nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex
-t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz
-SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG
-BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+
-rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/
-NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E
-BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH
-BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
-aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv
-MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE
-p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y
-5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK
-WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ
-4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N
-hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/VeriSignClass3SecureServerCA-G2.crt b/test/rules/platform_certs/default/VeriSignClass3SecureServerCA-G2.crt
deleted file mode 100644
index 402e30d6231d..000000000000
--- a/test/rules/platform_certs/default/VeriSignClass3SecureServerCA-G2.crt
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFOTCCBCGgAwIBAgIQLwBuzRdwZudfo4IKeR8FrjANBgkqhkiG9w0BAQUFADCB
-yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
-U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
-ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5IC0gRzUwHhcNMDkwMzI2MDAwMDAwWhcNMTkwMzI0MjM1OTU5WjCBtTEL
-MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
-ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2UgYXQg
-aHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMmVmVy
-aVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDUVo9XOzcopkBj0pXVBXTatRlqltZxVy/iwDSM
-oJWzjOE3JPMu7UNFBY6J1/raSrX4Po1Ox/lJUEU3QJ90qqBRVWHxYISJpZ6AjS+w
-IapFgsTPtBR/RxUgKIKwaBLArlwH1/ZZzMtiVlxNSf8miKtUUTovStoOmOKJcrn8
-92g8xB85essXgfMMrQ/cYWIbEAsEHikYcV5iy0PevjG6cQIZTiapUdqMZGkD3pz9
-ff17Ybz8hHyIXLTDe+1fK0YS8f0AAZqLW+mjBS6PLlve8xt4+GaRCMBeztWwNsrU
-qHugffkwer/43RlRKyC6/qfPoU6wZ/WAqiuDLtKOVImOHikLAgMBAAGjggEsMIIB
-KDASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjApBgNVHREEIjAg
-pB4wHDEaMBgGA1UEAxMRQ2xhc3MzQ0EyMDQ4LTEtNTIwHQYDVR0OBBYEFKXvCxHO
-wEEDo0plkEiyHOBXLX1HMGYGA1UdIARfMF0wWwYLYIZIAYb4RQEHFwMwTDAjBggr
-BgEFBQcCARYXaHR0cHM6Ly9kLnN5bWNiLmNvbS9jcHMwJQYIKwYBBQUHAgIwGRoX
-aHR0cHM6Ly9kLnN5bWNiLmNvbS9ycGEwLwYDVR0fBCgwJjAkoCKgIIYeaHR0cDov
-L3Muc3ltY2IuY29tL3BjYTMtZzUuY3JsMB8GA1UdIwQYMBaAFH/TZafC3ey78DAJ
-80M5+gKvMzEzMA0GCSqGSIb3DQEBBQUAA4IBAQArjhTM7IYIYDeLbGWJJSHeL1Ki
-B55Y07MWeAGZUZW0E3fMd90LXIE31r72YtYENwsYc5rT9sGiHm2cu4wR5j4SXgdf
-C4NcdALgUPSxJhttxujpv025ARUZ7FCa+RHwgVhDLE0RQLNaRgimXnOhiBI1jP8D
-Or3Wnfrn3Ja5GmQ+xP3ZCrZlnrqlqFj8OyLwolfuildHnHfHJeGsNAVN84J+QSO6
-tFfz58YBZddNiZkcaU1eePbrcnE9ssSVAZ9dDLcvJaZceUHvnsRnPKGdf3E60JWX
-7HhCdJhuvj5oTFc8qJNBhwvkua+R+1BMDLrAJCfRFdtlSCEKL9fcfqDMZX55
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/VeriSignUniversalRootCertificationAuthority.crt b/test/rules/platform_certs/default/VeriSignUniversalRootCertificationAuthority.crt
deleted file mode 100644
index 2d48f0b52cb6..000000000000
--- a/test/rules/platform_certs/default/VeriSignUniversalRootCertificationAuthority.crt
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCB
-vTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJp
-U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MTgwNgYDVQQDEy9W
-ZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
-Fw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJVUzEX
-MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0
-IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9y
-IGF1dGhvcml6ZWQgdXNlIG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNh
-bCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj1mCOkdeQmIN65lgZOIzF
-9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGPMiJhgsWH
-H26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+H
-LL729fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN
-/BMReYTtXlT2NJ8IAfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPT
-rJ9VAMf2CGqUuV/c4DPxhGD5WycRtPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1Ud
-EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0GCCsGAQUFBwEMBGEwX6FdoFsw
-WTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2Oa8PPgGrUSBgs
-exkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
-DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4
-sAPmLGd75JR3Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+
-seQxIcaBlVZaDrHC1LGmWazxY8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz
-4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTxP/jgdFcrGJ2BtMQo2pSXpXDrrB2+
-BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+PwGZsY6rp2aQW9IHR
-lRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4mJO3
-7M2CYfE45k+XmCpajQ==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/VerisignClass1PublicPrimaryCertificationAuthority.crt b/test/rules/platform_certs/default/VerisignClass1PublicPrimaryCertificationAuthority.crt
deleted file mode 100644
index e0102dfe67ff..000000000000
--- a/test/rules/platform_certs/default/VerisignClass1PublicPrimaryCertificationAuthority.crt
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICPDCCAaUCED9pHoGc8JpK83P/uUii5N0wDQYJKoZIhvcNAQEFBQAwXzELMAkG
-A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
-cyAxIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
-MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
-BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAxIFB1YmxpYyBQcmlt
-YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
-ADCBiQKBgQDlGb9to1ZhLZlIcfZn3rmN67eehoAKkQ76OCWvRoiC5XOooJskXQ0f
-zGVuDLDQVoQYh5oGmxChc9+0WDlrbsH2FdWoqD+qEgaNMax/sDTXjzRniAnNFBHi
-TkVWaR94AoDa3EeRKbs2yWNcxeDXLYd7obcysHswuiovMaruo2fa2wIDAQABMA0G
-CSqGSIb3DQEBBQUAA4GBAFgVKTk8d6PaXCUDfGD67gmZPCcQcMgMCeazh88K4hiW
-NWLMv5sneYlfycQJ9M61Hd8qveXbhpxoJeUwfLaJFf5n0a3hUKw8fGJLj7qE1xIV
-Gx/KXQ/BUpQqEZnae88MNhPVNdwQGVnqlMEAv3WP2fr9dgTbYruQagPZRjXZ+Hxb
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/VerisignClass2PublicPrimaryCertificationAuthority-G2.crt b/test/rules/platform_certs/default/VerisignClass2PublicPrimaryCertificationAuthority-G2.crt
deleted file mode 100644
index db8effe0e832..000000000000
--- a/test/rules/platform_certs/default/VerisignClass2PublicPrimaryCertificationAuthority-G2.crt
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDAzCCAmwCEQC5L2DMiJ+hekYJuFtwbIqvMA0GCSqGSIb3DQEBBQUAMIHBMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0Ns
-YXNzIDIgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH
-MjE6MDgGA1UECxMxKGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9y
-aXplZCB1c2Ugb25seTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazAe
-Fw05ODA1MTgwMDAwMDBaFw0yODA4MDEyMzU5NTlaMIHBMQswCQYDVQQGEwJVUzEX
-MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0NsYXNzIDIgUHVibGlj
-IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjE6MDgGA1UECxMx
-KGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s
-eTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAp4gBIXQs5xoD8JjhlzwPIQjxnNuX6Zr8wgQGE75fUsjM
-HiwSViy4AWkszJkfrbCWrnkE8hM5wXuYuggs6MKEEyyqaekJ9MepAqRCwiNPStjw
-DqL7MWzJ5m+ZJwf15vRMeJ5t60aG+rmGyVTyssSv1EYcWskVMP8NbPUtDm3Of3cC
-AwEAATANBgkqhkiG9w0BAQUFAAOBgQByLvl/0fFx+8Se9sVeUYpAmLho+Jscg9ji
-nb3/7aHmZuovCfTK1+qlK5X2JGCGTUQug6XELaDTrnhpb3LabK4I8GOSN+a7xDAX
-rXfMSTWqz9iP0b63GJZHc2pUIjRkLbYWm1lbtFFZOrMLFPQS32eg9K0yZF6xRnIn
-jBJ7xUS0rg==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/VerisignClass3PublicPrimaryCertificationAuthority.crt b/test/rules/platform_certs/default/VerisignClass3PublicPrimaryCertificationAuthority.crt
deleted file mode 100644
index fd7867877f84..000000000000
--- a/test/rules/platform_certs/default/VerisignClass3PublicPrimaryCertificationAuthority.crt
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkG
-A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
-cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
-MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
-BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
-YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
-ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
-BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
-I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
-CSqGSIb3DQEBAgUAA4GBALtMEivPLCYATxQT3ab7/AoRhIzzKBxnki98tsX63/Do
-lbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59AhWM1pF+NEHJwZRDmJXNyc
-AA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2OmufTqj/ZA1k
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/VisaeCommerceRoot.crt b/test/rules/platform_certs/default/VisaeCommerceRoot.crt
deleted file mode 100644
index 2b591aaba376..000000000000
--- a/test/rules/platform_certs/default/VisaeCommerceRoot.crt
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDojCCAoqgAwIBAgIQE4Y1TR0/BvLB+WUF1ZAcYjANBgkqhkiG9w0BAQUFADBr
-MQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRl
-cm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNv
-bW1lcmNlIFJvb3QwHhcNMDIwNjI2MDIxODM2WhcNMjIwNjI0MDAxNjEyWjBrMQsw
-CQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5h
-dGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNvbW1l
-cmNlIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvV95WHm6h
-2mCxlCfLF9sHP4CFT8icttD0b0/Pmdjh28JIXDqsOTPHH2qLJj0rNfVIsZHBAk4E
-lpF7sDPwsRROEW+1QK8bRaVK7362rPKgH1g/EkZgPI2h4H3PVz4zHvtH8aoVlwdV
-ZqW1LS7YgFmypw23RuwhY/81q6UCzyr0TP579ZRdhE2o8mCP2w4lPJ9zcc+U30rq
-299yOIzzlr3xF7zSujtFWsan9sYXiwGd/BmoKoMWuDpI/k4+oKsGGelT84ATB+0t
-vz8KPFUgOSwsAGl0lUq8ILKpeeUYiZGo3BxN77t+Nwtd/jmliFKMAGzsGHxBvfaL
-dXe6YJ2E5/4tAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD
-AgEGMB0GA1UdDgQWBBQVOIMPPyw/cDMezUb+B4wg4NfDtzANBgkqhkiG9w0BAQUF
-AAOCAQEAX/FBfXxcCLkr4NWSR/pnXKUTwwMhmytMiUbPWU3J/qVAtmPN3XEolWcR
-zCSs00Rsca4BIGsDoo8Ytyk6feUWYFN4PMCvFYP3j1IzJL1kk5fui/fbGKhtcbP3
-LBfQdCVp9/5rPJS+TUtBjE7ic9DjkCJzQ83z7+pzzkWKsKZJ/0x9nXGIxHYdkFsd
-7v3M9+79YKWxehZx0RbQfBI8bGmX265fOZpwLwU8GUYEmSA20GBuYQa7FkKMcPcw
-++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt
-398znM/jra6O1I7mT1GvFpLgXPYHDw==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/WellsSecurePublicRootCertificateAuthority.crt b/test/rules/platform_certs/default/WellsSecurePublicRootCertificateAuthority.crt
deleted file mode 100644
index b2bd715f7562..000000000000
--- a/test/rules/platform_certs/default/WellsSecurePublicRootCertificateAuthority.crt
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEvTCCA6WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCVVMx
-IDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxs
-cyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9v
-dCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDcxMjEzMTcwNzU0WhcNMjIxMjE0
-MDAwNzU0WjCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdl
-bGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQD
-DC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDub7S9eeKPCCGeOARBJe+r
-WxxTkqxtnt3CxC5FlAM1iGd0V+PfjLindo8796jE2yljDpFoNoqXjopxaAkH5OjU
-Dk/41itMpBb570OYj7OeUt9tkTmPOL13i0Nj67eT/DBMHAGTthP796EfvyXhdDcs
-HqRePGj4S78NuR4uNuip5Kf4D8uCdXw1LSLWwr8L87T8bJVhHlfXBIEyg1J55oNj
-z7fLY4sR4r1e6/aN7ZVyKLSsEmLpSjPmgzKuBXWVvYSV2ypcm44uDLiBK0HmOFaf
-SZtsdvqKXfcBeYF8wYNABf5x/Qw/zE5gCQ5lRxAvAcAFP4/4s0HvWkJ+We/Slwxl
-AgMBAAGjggE0MIIBMDAPBgNVHRMBAf8EBTADAQH/MDkGA1UdHwQyMDAwLqAsoCqG
-KGh0dHA6Ly9jcmwucGtpLndlbGxzZmFyZ28uY29tL3dzcHJjYS5jcmwwDgYDVR0P
-AQH/BAQDAgHGMB0GA1UdDgQWBBQmlRkQ2eihl5H/3BnZtQQ+0nMKajCBsgYDVR0j
-BIGqMIGngBQmlRkQ2eihl5H/3BnZtQQ+0nMKaqGBi6SBiDCBhTELMAkGA1UEBhMC
-VVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNX
-ZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMg
-Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQEwDQYJKoZIhvcNAQEFBQADggEB
-ALkVsUSRzCPIK0134/iaeycNzXK7mQDKfGYZUMbVmO2rvwNa5U3lHshPcZeG1eMd
-/ZDJPHV3V3p9+N701NX3leZ0bh08rnyd2wIDBSxxSyU+B+NemvVmFymIGjifz6pB
-A4SXa5M4esowRBskRDPQ5NHcKDj0E0M1NSljqHyita04pO2t/caaH/+Xc/77szWn
-k4bGdpEA5qxRFsQnMlzbc9qlk1eOPm01JghZ1edE13YgY+esE2fDbbFwRnzVlhE9
-iW9dqKHrjQrawx0zbKPqZxmamX9LPYNRKh3KL4YMon4QLSvUFpULB6ouFJJJtylv
-2G0xffX8oRAHh84vWdw+WNs=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/XRampGlobalCertificationAuthority.crt b/test/rules/platform_certs/default/XRampGlobalCertificationAuthority.crt
deleted file mode 100644
index 537a44e1eb68..000000000000
--- a/test/rules/platform_certs/default/XRampGlobalCertificationAuthority.crt
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCB
-gjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEk
-MCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRY
-UmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQxMTAxMTcx
-NDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3
-dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2Vy
-dmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS6
-38eMpSe2OAtp87ZOqCwuIR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCP
-KZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMxfoArtYzAQDsRhtDLooY2YKTVMIJt2W7Q
-DxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FEzG+gSqmUsE3a56k0enI4
-qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqsAxcZZPRa
-JSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNVi
-PvryxS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0P
-BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASs
-jVy16bYbMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0
-eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQEwDQYJKoZIhvcNAQEFBQAD
-ggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc/Kh4ZzXxHfAR
-vbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
-qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLa
-IR9NmXmd4c8nnxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSy
-i6mx5O+aGtA9aZnuqCij4Tyz8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQ
-O+7ETPTsJ3xCwnR8gooJybQDJbw=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/a2c66da8.0 b/test/rules/platform_certs/default/a2c66da8.0
new file mode 120000
index 000000000000..5d5f80e33054
--- /dev/null
+++ b/test/rules/platform_certs/default/a2c66da8.0
@@ -0,0 +1 @@
+cert090.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/a3418fda.0 b/test/rules/platform_certs/default/a3418fda.0
new file mode 120000
index 000000000000..b293d2f9656d
--- /dev/null
+++ b/test/rules/platform_certs/default/a3418fda.0
@@ -0,0 +1 @@
+cert129.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/a3896b44.0 b/test/rules/platform_certs/default/a3896b44.0
new file mode 120000
index 000000000000..6b9e3cee1364
--- /dev/null
+++ b/test/rules/platform_certs/default/a3896b44.0
@@ -0,0 +1 @@
+cert015.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/a7605362.0 b/test/rules/platform_certs/default/a7605362.0
new file mode 120000
index 000000000000..80f821db43c6
--- /dev/null
+++ b/test/rules/platform_certs/default/a7605362.0
@@ -0,0 +1 @@
+cert016.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/a7d2cf64.0 b/test/rules/platform_certs/default/a7d2cf64.0
new file mode 120000
index 000000000000..2f975bd5f8dc
--- /dev/null
+++ b/test/rules/platform_certs/default/a7d2cf64.0
@@ -0,0 +1 @@
+cert041.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/a81e292b.0 b/test/rules/platform_certs/default/a81e292b.0
new file mode 120000
index 000000000000..d59e7b0ac35d
--- /dev/null
+++ b/test/rules/platform_certs/default/a81e292b.0
@@ -0,0 +1 @@
+cert104.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/a94d09e5.0 b/test/rules/platform_certs/default/a94d09e5.0
new file mode 120000
index 000000000000..31b630c7c1ed
--- /dev/null
+++ b/test/rules/platform_certs/default/a94d09e5.0
@@ -0,0 +1 @@
+cert077.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/ab5346f4.0 b/test/rules/platform_certs/default/ab5346f4.0
new file mode 120000
index 000000000000..a569193e45b9
--- /dev/null
+++ b/test/rules/platform_certs/default/ab5346f4.0
@@ -0,0 +1 @@
+cert049.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/ab59055e.0 b/test/rules/platform_certs/default/ab59055e.0
new file mode 120000
index 000000000000..dc215b21fff3
--- /dev/null
+++ b/test/rules/platform_certs/default/ab59055e.0
@@ -0,0 +1 @@
+cert116.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/ad088e1d.0 b/test/rules/platform_certs/default/ad088e1d.0
new file mode 120000
index 000000000000..bc0f98e93038
--- /dev/null
+++ b/test/rules/platform_certs/default/ad088e1d.0
@@ -0,0 +1 @@
+cert009.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/aeb67534.0 b/test/rules/platform_certs/default/aeb67534.0
new file mode 120000
index 000000000000..5b97615af165
--- /dev/null
+++ b/test/rules/platform_certs/default/aeb67534.0
@@ -0,0 +1 @@
+cert066.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/aee5f10d.0 b/test/rules/platform_certs/default/aee5f10d.0
new file mode 120000
index 000000000000..b7bed8af659f
--- /dev/null
+++ b/test/rules/platform_certs/default/aee5f10d.0
@@ -0,0 +1 @@
+cert004.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/b0e59380.0 b/test/rules/platform_certs/default/b0e59380.0
new file mode 120000
index 000000000000..6d6bdec5e46b
--- /dev/null
+++ b/test/rules/platform_certs/default/b0e59380.0
@@ -0,0 +1 @@
+cert094.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/b0ed035a.0 b/test/rules/platform_certs/default/b0ed035a.0
new file mode 120000
index 000000000000..6c367fd21202
--- /dev/null
+++ b/test/rules/platform_certs/default/b0ed035a.0
@@ -0,0 +1 @@
+cert078.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/b0f3e76e.0 b/test/rules/platform_certs/default/b0f3e76e.0
new file mode 120000
index 000000000000..bbd07385c8a6
--- /dev/null
+++ b/test/rules/platform_certs/default/b0f3e76e.0
@@ -0,0 +1 @@
+cert001.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/b1159c4c.0 b/test/rules/platform_certs/default/b1159c4c.0
new file mode 120000
index 000000000000..1a4e06971594
--- /dev/null
+++ b/test/rules/platform_certs/default/b1159c4c.0
@@ -0,0 +1 @@
+cert021.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/b1b8a7f3.0 b/test/rules/platform_certs/default/b1b8a7f3.0
new file mode 120000
index 000000000000..dfc09b96e7a1
--- /dev/null
+++ b/test/rules/platform_certs/default/b1b8a7f3.0
@@ -0,0 +1 @@
+cert035.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/b204d74a.0 b/test/rules/platform_certs/default/b204d74a.0
new file mode 120000
index 000000000000..b71513fe981a
--- /dev/null
+++ b/test/rules/platform_certs/default/b204d74a.0
@@ -0,0 +1 @@
+cert029.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/b3fb433b.0 b/test/rules/platform_certs/default/b3fb433b.0
new file mode 120000
index 000000000000..ecbee746f069
--- /dev/null
+++ b/test/rules/platform_certs/default/b3fb433b.0
@@ -0,0 +1 @@
+cert101.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/b66938e9.0 b/test/rules/platform_certs/default/b66938e9.0
new file mode 120000
index 000000000000..98e1e5456f37
--- /dev/null
+++ b/test/rules/platform_certs/default/b66938e9.0
@@ -0,0 +1 @@
+cert031.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/b727005e.0 b/test/rules/platform_certs/default/b727005e.0
new file mode 120000
index 000000000000..78c8c289bffe
--- /dev/null
+++ b/test/rules/platform_certs/default/b727005e.0
@@ -0,0 +1 @@
+cert061.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/b74d2bd5.0 b/test/rules/platform_certs/default/b74d2bd5.0
new file mode 120000
index 000000000000..ac3fdcd6aae6
--- /dev/null
+++ b/test/rules/platform_certs/default/b74d2bd5.0
@@ -0,0 +1 @@
+cert134.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/b7a5b843.0 b/test/rules/platform_certs/default/b7a5b843.0
new file mode 120000
index 000000000000..3c31427efb37
--- /dev/null
+++ b/test/rules/platform_certs/default/b7a5b843.0
@@ -0,0 +1 @@
+cert064.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/b7db1890.0 b/test/rules/platform_certs/default/b7db1890.0
new file mode 120000
index 000000000000..3c31427efb37
--- /dev/null
+++ b/test/rules/platform_certs/default/b7db1890.0
@@ -0,0 +1 @@
+cert064.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/b872f2b4.0 b/test/rules/platform_certs/default/b872f2b4.0
new file mode 120000
index 000000000000..ff9922e53b2d
--- /dev/null
+++ b/test/rules/platform_certs/default/b872f2b4.0
@@ -0,0 +1 @@
+cert082.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/b936d1c6.0 b/test/rules/platform_certs/default/b936d1c6.0
new file mode 120000
index 000000000000..b87664a35dce
--- /dev/null
+++ b/test/rules/platform_certs/default/b936d1c6.0
@@ -0,0 +1 @@
+cert109.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/ba89ed3b.0 b/test/rules/platform_certs/default/ba89ed3b.0
new file mode 120000
index 000000000000..214c9452624b
--- /dev/null
+++ b/test/rules/platform_certs/default/ba89ed3b.0
@@ -0,0 +1 @@
+cert042.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/bc3f2570.0 b/test/rules/platform_certs/default/bc3f2570.0
new file mode 120000
index 000000000000..04e7d30f51b2
--- /dev/null
+++ b/test/rules/platform_certs/default/bc3f2570.0
@@ -0,0 +1 @@
+cert056.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/bd43e1dd.0 b/test/rules/platform_certs/default/bd43e1dd.0
new file mode 120000
index 000000000000..2a40c649daa9
--- /dev/null
+++ b/test/rules/platform_certs/default/bd43e1dd.0
@@ -0,0 +1 @@
+cert137.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/bdacca6f.0 b/test/rules/platform_certs/default/bdacca6f.0
new file mode 120000
index 000000000000..98e1e5456f37
--- /dev/null
+++ b/test/rules/platform_certs/default/bdacca6f.0
@@ -0,0 +1 @@
+cert031.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/bf64f35b.0 b/test/rules/platform_certs/default/bf64f35b.0
new file mode 120000
index 000000000000..b7c6ac77893d
--- /dev/null
+++ b/test/rules/platform_certs/default/bf64f35b.0
@@ -0,0 +1 @@
+cert007.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/c01cdfa2.0 b/test/rules/platform_certs/default/c01cdfa2.0
new file mode 120000
index 000000000000..f70c743200ef
--- /dev/null
+++ b/test/rules/platform_certs/default/c01cdfa2.0
@@ -0,0 +1 @@
+cert044.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/c01eb047.0 b/test/rules/platform_certs/default/c01eb047.0
new file mode 120000
index 000000000000..3b86526d9425
--- /dev/null
+++ b/test/rules/platform_certs/default/c01eb047.0
@@ -0,0 +1 @@
+cert130.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/c089bbbd.0 b/test/rules/platform_certs/default/c089bbbd.0
new file mode 120000
index 000000000000..2f975bd5f8dc
--- /dev/null
+++ b/test/rules/platform_certs/default/c089bbbd.0
@@ -0,0 +1 @@
+cert041.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/c0ff1f52.0 b/test/rules/platform_certs/default/c0ff1f52.0
new file mode 120000
index 000000000000..48fb898242bc
--- /dev/null
+++ b/test/rules/platform_certs/default/c0ff1f52.0
@@ -0,0 +1 @@
+cert003.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/c28a8a30.0 b/test/rules/platform_certs/default/c28a8a30.0
new file mode 120000
index 000000000000..924725c67632
--- /dev/null
+++ b/test/rules/platform_certs/default/c28a8a30.0
@@ -0,0 +1 @@
+cert074.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/c2c1704e.0 b/test/rules/platform_certs/default/c2c1704e.0
new file mode 120000
index 000000000000..5b20fc4c4385
--- /dev/null
+++ b/test/rules/platform_certs/default/c2c1704e.0
@@ -0,0 +1 @@
+cert119.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/c47d9980.0 b/test/rules/platform_certs/default/c47d9980.0
new file mode 120000
index 000000000000..14745ca2234d
--- /dev/null
+++ b/test/rules/platform_certs/default/c47d9980.0
@@ -0,0 +1 @@
+cert054.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/c491639e.0 b/test/rules/platform_certs/default/c491639e.0
new file mode 120000
index 000000000000..f43f71de09a2
--- /dev/null
+++ b/test/rules/platform_certs/default/c491639e.0
@@ -0,0 +1 @@
+cert087.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/c51c224c.0 b/test/rules/platform_certs/default/c51c224c.0
new file mode 120000
index 000000000000..077461e29492
--- /dev/null
+++ b/test/rules/platform_certs/default/c51c224c.0
@@ -0,0 +1 @@
+cert069.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/c559d742.0 b/test/rules/platform_certs/default/c559d742.0
new file mode 120000
index 000000000000..d5f16f42cfce
--- /dev/null
+++ b/test/rules/platform_certs/default/c559d742.0
@@ -0,0 +1 @@
+cert127.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/c7e2a638.0 b/test/rules/platform_certs/default/c7e2a638.0
new file mode 120000
index 000000000000..ae5698946b79
--- /dev/null
+++ b/test/rules/platform_certs/default/c7e2a638.0
@@ -0,0 +1 @@
+cert040.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/c907e29b.0 b/test/rules/platform_certs/default/c907e29b.0
new file mode 120000
index 000000000000..8270bf0a9083
--- /dev/null
+++ b/test/rules/platform_certs/default/c907e29b.0
@@ -0,0 +1 @@
+cert114.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/c90bc37d.0 b/test/rules/platform_certs/default/c90bc37d.0
new file mode 120000
index 000000000000..20b6b56b9c5f
--- /dev/null
+++ b/test/rules/platform_certs/default/c90bc37d.0
@@ -0,0 +1 @@
+cert088.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/ca6e4ad9.0 b/test/rules/platform_certs/default/ca6e4ad9.0
new file mode 120000
index 000000000000..00871c6d7da0
--- /dev/null
+++ b/test/rules/platform_certs/default/ca6e4ad9.0
@@ -0,0 +1 @@
+cert038.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/cb156124.0 b/test/rules/platform_certs/default/cb156124.0
new file mode 120000
index 000000000000..62897b262628
--- /dev/null
+++ b/test/rules/platform_certs/default/cb156124.0
@@ -0,0 +1 @@
+cert080.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/cb1c3204.0 b/test/rules/platform_certs/default/cb1c3204.0
new file mode 120000
index 000000000000..2d41f6757f8c
--- /dev/null
+++ b/test/rules/platform_certs/default/cb1c3204.0
@@ -0,0 +1 @@
+cert105.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/cbf06781.0 b/test/rules/platform_certs/default/cbf06781.0
new file mode 120000
index 000000000000..04e7d30f51b2
--- /dev/null
+++ b/test/rules/platform_certs/default/cbf06781.0
@@ -0,0 +1 @@
+cert056.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/cc450945.0 b/test/rules/platform_certs/default/cc450945.0
new file mode 120000
index 000000000000..4509178e43b6
--- /dev/null
+++ b/test/rules/platform_certs/default/cc450945.0
@@ -0,0 +1 @@
+cert053.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/ccc52f49.0 b/test/rules/platform_certs/default/ccc52f49.0
new file mode 120000
index 000000000000..089e357b6505
--- /dev/null
+++ b/test/rules/platform_certs/default/ccc52f49.0
@@ -0,0 +1 @@
+cert062.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/cd58d51e.0 b/test/rules/platform_certs/default/cd58d51e.0
new file mode 120000
index 000000000000..90c574c79ffc
--- /dev/null
+++ b/test/rules/platform_certs/default/cd58d51e.0
@@ -0,0 +1 @@
+cert065.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/cd8c0d63.0 b/test/rules/platform_certs/default/cd8c0d63.0
new file mode 120000
index 000000000000..b87664a35dce
--- /dev/null
+++ b/test/rules/platform_certs/default/cd8c0d63.0
@@ -0,0 +1 @@
+cert109.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/ce5e74ef.0 b/test/rules/platform_certs/default/ce5e74ef.0
new file mode 120000
index 000000000000..819e00043983
--- /dev/null
+++ b/test/rules/platform_certs/default/ce5e74ef.0
@@ -0,0 +1 @@
+cert110.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/cert001.pem b/test/rules/platform_certs/default/cert001.pem
new file mode 100644
index 000000000000..f6713f2a26f7
--- /dev/null
+++ b/test/rules/platform_certs/default/cert001.pem
@@ -0,0 +1,19 @@
+GlobalSign Root CA
+-----BEGIN CERTIFICATE-----
+MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx
+GTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds
+b2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV
+BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD
+VQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa
+DuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc
+THAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb
+Kk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP
+c1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX
+gzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF
+AAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj
+Y1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG
+j/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH
+hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC
+X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert002.pem b/test/rules/platform_certs/default/cert002.pem
new file mode 100644
index 000000000000..546ef773ef6c
--- /dev/null
+++ b/test/rules/platform_certs/default/cert002.pem
@@ -0,0 +1,20 @@
+GlobalSign Root CA - R2
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4GA1UECxMXR2xv
+YmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
+bFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
+aWduIFJvb3QgQ0EgLSBSMjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6
+ErPLv4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8eoLrvozp
+s6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklqtTleiDTsvHgMCJiEbKjN
+S7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzdC9XZzPnqJworc5HGnRusyMvo4KD0L5CL
+TfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pazq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6C
+ygPCm48CAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
+FgQUm+IHV2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5nbG9i
+YWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG3lm0mi3f3BmGLjAN
+BgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4GsJ0/WwbgcQ3izDJr86iw8bmEbTUsp
+9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu
+01yiPqFbQfXf5WRDLenVOavSot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG7
+9G+dwfCMNYxdAfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
+TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert003.pem b/test/rules/platform_certs/default/cert003.pem
new file mode 100644
index 000000000000..a0efb64ca419
--- /dev/null
+++ b/test/rules/platform_certs/default/cert003.pem
@@ -0,0 +1,22 @@
+Verisign Class 3 Public Primary Certification Authority - G3
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
+dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMu6nFL8eB8aHm8bN3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1
+EUGO+i2tKmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGukxUc
+cLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBmCC+Vk7+qRy+oRpfw
+EuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJXwzw3sJ2zq/3avL6QaaiMxTJ5Xpj
+055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWuimi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+ERSWwauSCPc/L8my/uRan2Te2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5f
+j267Cz3qWhMeDGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
+/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565pF4ErWjfJXir0
+xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGtTxzhT5yvDwyd93gN2PQ1VoDa
+t20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert004.pem b/test/rules/platform_certs/default/cert004.pem
new file mode 100644
index 000000000000..f06211fe06db
--- /dev/null
+++ b/test/rules/platform_certs/default/cert004.pem
@@ -0,0 +1,22 @@
+Entrust.net Premium 2048 Secure Server CA
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChMLRW50cnVzdC5u
+ZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBpbmNvcnAuIGJ5IHJlZi4gKGxp
+bWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV
+BAMTKkVudHJ1c3QubmV0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQx
+NzUwNTFaFw0yOTA3MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3
+d3d3LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTEl
+MCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5u
+ZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEArU1LqRKGsuqjIAcVFmQqK0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOL
+Gp18EzoOH1u3Hs/lJBQesYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSr
+hRSGlVuXMlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVTXTzW
+nLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/HoZdenoVve8AjhUi
+VBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH4QIDAQABo0IwQDAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJ
+KoZIhvcNAQEFBQADggEBADubj1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPy
+T/4xmf3IDExoU8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf
+zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5bu/8j72gZyxKT
+J1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+bYQLCIt+jerXmCHG8+c8eS9e
+nNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/ErfF6adulZkMV8gzURZVE=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert005.pem b/test/rules/platform_certs/default/cert005.pem
new file mode 100644
index 000000000000..a9e4bcdd8c67
--- /dev/null
+++ b/test/rules/platform_certs/default/cert005.pem
@@ -0,0 +1,19 @@
+Baltimore CyberTrust Root
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJRTESMBAGA1UE
+ChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYDVQQDExlCYWx0aW1vcmUgQ3li
+ZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoXDTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMC
+SUUxEjAQBgNVBAoTCUJhbHRpbW9yZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFs
+dGltb3JlIEN5YmVyVHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKME
+uyKrmD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjrIZ3AQSsB
+UnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeKmpYcqWe4PwzV9/lSEy/C
+G9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSuXmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9
+XbIGevOF6uvUA65ehD5f/xXtabz5OTZydc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjpr
+l3RjM71oGDHweI12v/yejl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoI
+VDaGezq1BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB
+BQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT929hkTI7gQCvlYpNRh
+cL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3WgxjkzSswF07r51XgdIGn9w/xZchMB5
+hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsa
+Y71k5h+3zvDyny67G7fyUIhzksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9H
+RCwBXbsdtTLSR9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert006.pem b/test/rules/platform_certs/default/cert006.pem
new file mode 100644
index 000000000000..a8387e86a2f2
--- /dev/null
+++ b/test/rules/platform_certs/default/cert006.pem
@@ -0,0 +1,22 @@
+AddTrust External Root
+-----BEGIN CERTIFICATE-----
+MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYD
+VQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEw
+NDgzOFowbzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRU
+cnVzdCBFeHRlcm5hbCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0Eg
+Um9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvtH7xsD821
++iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9uMq/NzgtHj6RQa1wVsfw
+Tz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzXmk6vBbOmcZSccbNQYArHE504B4YCqOmo
+aSYYkKtMsE8jqzpPhNjfzp/haW+710LXa0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy
+2xSoRcRdKn23tNbE7qzNE0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv7
+7+ldU9U0WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYDVR0P
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0Jvf6xCZU7wO94CTL
+VBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEmMCQGA1UECxMdQWRk
+VHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsxIjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENB
+IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZl
+j7DYd7usQWxHYINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
+6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvCNr4TDea9Y355
+e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEXc4g/VhsxOBi0cQ+azcgOno4u
+G+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5amnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert007.pem b/test/rules/platform_certs/default/cert007.pem
new file mode 100644
index 000000000000..fe45da183c92
--- /dev/null
+++ b/test/rules/platform_certs/default/cert007.pem
@@ -0,0 +1,24 @@
+Entrust Root Certification Authority
+-----BEGIN CERTIFICATE-----
+MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMCVVMxFjAUBgNV
+BAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0Lm5ldC9DUFMgaXMgaW5jb3Jw
+b3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMWKGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsG
+A1UEAxMkRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0
+MloXDTI2MTEyNzIwNTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMu
+MTkwNwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSByZWZlcmVu
+Y2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNVBAMTJEVudHJ1c3QgUm9v
+dCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ALaVtkNC+sZtKm9I35RMOVcF7sN5EUFoNu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYsz
+A9u3g3s+IIRe7bJWKKf44LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOww
+Cj0Yzfv9KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGIrb68
+j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi94DkZfs0Nw4pgHBN
+rziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOBsDCBrTAOBgNVHQ8BAf8EBAMCAQYw
+DwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAigA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1
+MzQyWjAfBgNVHSMEGDAWgBRokORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DH
+hmak8fdLQ/uEvW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
+A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9tO1KzKtvn1ISM
+Y/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6ZuaAGAT/3B+XxFNSRuzFVJ7yVTa
+v52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTS
+W3iDVuycNsMm4hH2Z0kdkquM++v/eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0
+tHuu2guQOHXvgR1m0vdXcDazv/wor3ElhVsT/h5/WrQ8
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert008.pem b/test/rules/platform_certs/default/cert008.pem
new file mode 100644
index 000000000000..f3d39d9e1421
--- /dev/null
+++ b/test/rules/platform_certs/default/cert008.pem
@@ -0,0 +1,19 @@
+GeoTrust Global CA
+-----BEGIN CERTIFICATE-----
+MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
+Ew1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9iYWwgQ0EwHhcNMDIwNTIxMDQw
+MDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
+LjEbMBkGA1UEAxMSR2VvVHJ1c3QgR2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA2swYYzD99BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjo
+BbdqfnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDviS2Aelet
+8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU1XupGc1V3sjs0l44U+Vc
+T4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+bw8HHa8sHo9gOeL6NlMTOdReJivbPagU
+vTLrGAMoUgRx5aszPeE4uwc2hGKceeoWMPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdDgQWBBTAephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVk
+DBF9qn1luMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKInZ57Q
+zxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfStQWVYrmm3ok9Nns4
+d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcFPseKUgzbFbS9bZvlxrFUaKnjaZC2
+mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Unhw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6p
+XE0zX5IJL4hmXXeXxx12E6nV5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvm
+Mw==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert009.pem b/test/rules/platform_certs/default/cert009.pem
new file mode 100644
index 000000000000..199c0cc31e49
--- /dev/null
+++ b/test/rules/platform_certs/default/cert009.pem
@@ -0,0 +1,28 @@
+GeoTrust Universal CA
+-----BEGIN CERTIFICATE-----
+MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVyc2FsIENBMB4XDTA0MDMwNDA1
+MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IElu
+Yy4xHjAcBgNVBAMTFUdlb1RydXN0IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAKYVVaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9t
+JPi8cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTTQjOgNB0e
+RXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFhF7em6fgemdtzbvQKoiFs
+7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2vc7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d
+8Lsrlh/eezJS/R27tQahsiFepdaVaH/wmZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7V
+qnJNk22CDtucvc+081xdVHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3Cga
+Rr0BHdCXteGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZf9hB
+Z3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfReBi9Fi1jUIxaS5BZu
+KGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+nhutxx9z3SxPGWX9f5NAEC7S8O08
+ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0
+XG0D08DYj3rWMB8GA1UdIwQYMBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIB
+hjANBgkqhkiG9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
+aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fXIwjhmF7DWgh2
+qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzynANXH/KttgCJwpQzgXQQpAvvL
+oJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0zuzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsK
+xr2EoyNB3tZ3b4XUhRxQ4K5RirqNPnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxF
+KyDuSN/n3QmOGKjaQI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2
+DFKWkoRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9ER/frslK
+xfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQtDF4JbAiXfKM9fJP/P6EU
+p8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/SfuvmbJxPgWp6ZKy7PtXny3YuxadIwVyQD8vI
+P/rmMuGNG2+k5o7Y+SlIis5z/iw=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert010.pem b/test/rules/platform_certs/default/cert010.pem
new file mode 100644
index 000000000000..38210db06c9b
--- /dev/null
+++ b/test/rules/platform_certs/default/cert010.pem
@@ -0,0 +1,28 @@
+GeoTrust Universal CA 2
+-----BEGIN CERTIFICATE-----
+MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwHhcNMDQwMzA0
+MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3Qg
+SW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0
+DE81WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUGFF+3Qs17
+j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdqXbboW0W63MOhBW9Wjo8Q
+JqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxLse4YuU6W3Nx2/zu+z18DwPw76L5GG//a
+QMJS9/7jOvdqdzXQ2o3rXhhqMcceujwbKNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2
+WP0+GfPtDCapkzj4T8FdIgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP
+20gaXT73y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRthAAn
+ZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgocQIgfksILAAX/8sgC
+SqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4Lt1ZrtmhN79UNdxzMk+MBB4zsslG
+8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2
++/CfXGJx7Tz0RzgQKzAfBgNVHSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8E
+BAMCAYYwDQYJKoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
+dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQL1EuxBRa3ugZ
+4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgrFg5fNuH8KrUwJM/gYwx7WBr+
+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSoag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpq
+A1Ihn0CoZ1Dy81of398j9tx4TuaYT1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpg
+Y+RdM4kX2TGq2tbzGDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiP
+pm8m1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJVOCiNUW7d
+FGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH6aLcr34YEoP9VhdBLtUp
+gn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwXQMAJKOSLakhT2+zNVVXxxvjpoixMptEm
+X36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert011.pem b/test/rules/platform_certs/default/cert011.pem
new file mode 100644
index 000000000000..4bf6108424c9
--- /dev/null
+++ b/test/rules/platform_certs/default/cert011.pem
@@ -0,0 +1,22 @@
+Comodo AAA Services root
+-----BEGIN CERTIFICATE-----
+MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
+R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
+TGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAw
+MFoXDTI4MTIzMTIzNTk1OVowezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hl
+c3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
+BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQuaBtDFcCLNSS1UY8y2bmhG
+C1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe3M/vg4aijJRPn2jymJBGhCfHdr/jzDUs
+i14HZGWCwEiwqJH5YZ92IFCokcdmtet4YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszW
+Y19zjNoFmag4qMsXeDZRrOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjH
+Ypy+g8cmez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQUoBEK
+Iz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wewYDVR0f
+BHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFBQ2VydGlmaWNhdGVTZXJ2aWNl
+cy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29tb2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2Vz
+LmNybDANBgkqhkiG9w0BAQUFAAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm
+7l3sAg9g1o1QGE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
+Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z
+8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsil2D4kF501KKaU73yqWjgom7C
+12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert012.pem b/test/rules/platform_certs/default/cert012.pem
new file mode 100644
index 000000000000..80203eb2fe06
--- /dev/null
+++ b/test/rules/platform_certs/default/cert012.pem
@@ -0,0 +1,30 @@
+QuoVadis Root CA
+-----BEGIN CERTIFICATE-----
+MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJCTTEZMBcGA1UE
+ChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
+eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAz
+MTkxODMzMzNaFw0yMTAzMTcxODMzMzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRp
+cyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQD
+EyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Ypli4kVEAkOPcahdxYTMuk
+J0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2DrOpm2RgbaIr1VxqYuvXtdj182d6UajtL
+F8HVj71lODqV0D1VNk7feVcxKh7YWWVJWCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeL
+YzcS19Dsw3sgQUSj7cugF+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWen
+AScOospUxbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCCAk4w
+PQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVvdmFkaXNvZmZzaG9y
+ZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREwggENMIIBCQYJKwYBBAG+WAABMIH7
+MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNlIG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmlj
+YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJs
+ZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
+Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYIKwYBBQUHAgEW
+Fmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3TKbkGGew5Oanwl4Rqy+/fMIGu
+BgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rqy+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkw
+FwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6
+tlCLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSkfnIYj9lo
+fFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf87C9TqnN7Az10buYWnuul
+LsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1RcHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2x
+gI4JVrmcGmD+XcHXetwReNDWXcG31a0ymQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi
+5upZIof4l/UO/erMkqQWxFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi
+5nrQNiOKSnQ2+Q==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert013.pem b/test/rules/platform_certs/default/cert013.pem
new file mode 100644
index 000000000000..47f65009b98c
--- /dev/null
+++ b/test/rules/platform_certs/default/cert013.pem
@@ -0,0 +1,29 @@
+QuoVadis Root CA 2
+-----BEGIN CERTIFICATE-----
+MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
+EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMjAeFw0wNjExMjQx
+ODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
+aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQCaGMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6
+XJxgFyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55JWpzmM+Yk
+lvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bBrrcCaoF6qUWD4gXmuVbB
+lDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp+ARz8un+XJiM9XOva7R+zdRcAitMOeGy
+lZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt
+66/3FsvbzSUr5R/7mp/iUcw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1Jdxn
+wQ5hYIizPtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og/zOh
+D7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UHoycR7hYQe7xFSkyy
+BNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuIyV77zGHcizN300QyNQliBJIWENie
+J0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1Ud
+DgQWBBQahGK8SEwzJQTU7tD2A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGU
+a6FJpEcwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
+ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2fBluornFdLwUv
+Z+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzng/iN/Ae42l9NLmeyhP3ZRPx3
+UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2BlfF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodm
+VjB3pjd4M1IQWK4/YY7yarHvGH5KWWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK
++JDSV6IZUaUtl0HaB0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrW
+IozchLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPRTUIZ3Ph1
+WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWDmbA4CD/pXvk1B+TJYm5X
+f6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0ZohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II
+4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8
+VCLAAVBpQ570su9t+Oza8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert014.pem b/test/rules/platform_certs/default/cert014.pem
new file mode 100644
index 000000000000..e5e47cf8150e
--- /dev/null
+++ b/test/rules/platform_certs/default/cert014.pem
@@ -0,0 +1,33 @@
+QuoVadis Root CA 3
+-----BEGIN CERTIFICATE-----
+MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
+EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMzAeFw0wNjExMjQx
+OTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
+aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQDMV0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNgg
+DhoB4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUrH556VOij
+KTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd8lyyBTNvijbO0BNO/79K
+DDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9CabwvvWhDFlaJKjdhkf2mrk7AyxRllDdLkgbv
+BNDInIjbC3uBr7E9KsRlOni27tyAsdLTmZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwp
+p5ijJUMv7/FfJuGITfhebtfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8
+nT8KKdjcT5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDtWAEX
+MJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZc6tsgLjoC2SToJyM
+Gf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A4iLItLRkT9a6fUg+qGkM17uGcclz
+uD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYDVR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHT
+BgkrBgEEAb5YAAMwgcUwgZMGCCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmlj
+YXRlIGNvbnN0aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
+aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVudC4wLQYIKwYB
+BQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2NwczALBgNVHQ8EBAMCAQYwHQYD
+VR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4GA1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4
+ywLQoUmkRzBFMQswCQYDVQQGEwJCTTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UE
+AxMSUXVvVmFkaXMgUm9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZV
+qyM07ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSemd1o417+s
+hvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd+LJ2w/w4E6oM3kJpK27z
+POuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2
+Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadNt54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp
+8kokUvd0/bpO5qgdAm6xDYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBC
+bjPsMZ57k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6szHXu
+g/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0jWy10QJLZYxkNc91p
+vGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeTmJlglFwjz1onl14LBQaTNx47aTbr
+qZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK4SVhM7JZG+Ju1zdXtg2pEto=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert015.pem b/test/rules/platform_certs/default/cert015.pem
new file mode 100644
index 000000000000..15b78a463515
--- /dev/null
+++ b/test/rules/platform_certs/default/cert015.pem
@@ -0,0 +1,19 @@
+Security Communication Root CA
+-----BEGIN CERTIFICATE-----
+MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
+U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
+HhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
+U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw
+8yl89f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJDKaVv0uM
+DPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9Ms+k2Y7CI9eNqPPYJayX
+5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/NQV3Is00qVUarH9oe4kA92819uZKAnDfd
+DJZkndwi92SL32HeFZRSFaB9UslLqCHJxrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2
+JChzAgMBAAGjPzA9MB0GA1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYw
+DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vGkl3g
+0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfrUj94nK9NrvjVT8+a
+mCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5Bw+SUEmK3TGXX8npN6o7WWWXlDLJ
+s58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJUJRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ
+6rBK+1YWc26sTfcioU+tHXotRSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAi
+FL39vmwLAw==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert016.pem b/test/rules/platform_certs/default/cert016.pem
new file mode 100644
index 000000000000..141e435e5842
--- /dev/null
+++ b/test/rules/platform_certs/default/cert016.pem
@@ -0,0 +1,18 @@
+Sonera Class 2 Root CA
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG
+U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAxMDQwNjA3Mjk0MFoXDTIxMDQw
+NjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh
+IENsYXNzMiBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3
+/Ei9vX+ALTU74W+oZ6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybT
+dXnt5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s3TmVToMG
+f+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2EjvOr7nQKV0ba5cTppCD8P
+tOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu8nYybieDwnPz3BjotJPqdURrBGAgcVeH
+nfO+oJAjPYok4doh28MCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITT
+XjwwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt
+0jSv9zilzqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/3DEI
+cbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvDFNr450kkkdAdavph
+Oe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6Tk6ezAyNlNzZRZxe7EJQY670XcSx
+EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH
+llpwrN9M
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert017.pem b/test/rules/platform_certs/default/cert017.pem
new file mode 100644
index 000000000000..16d5486f7ec9
--- /dev/null
+++ b/test/rules/platform_certs/default/cert017.pem
@@ -0,0 +1,22 @@
+XRamp Global CA Root
+-----BEGIN CERTIFICATE-----
+MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
+BhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2Vj
+dXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwHhcNMDQxMTAxMTcxNDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMx
+HjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkg
+U2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS638eMpSe2OAtp87ZOqCwu
+IR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCPKZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMx
+foArtYzAQDsRhtDLooY2YKTVMIJt2W7QDxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FE
+zG+gSqmUsE3a56k0enI4qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqs
+AxcZZPRaJSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNViPvry
+xS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASsjVy16bYbMDYGA1UdHwQvMC0wK6Ap
+oCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMC
+AQEwDQYJKoZIhvcNAQEFBQADggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc
+/Kh4ZzXxHfARvbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
+qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLaIR9NmXmd4c8n
+nxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSyi6mx5O+aGtA9aZnuqCij4Tyz
+8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQO+7ETPTsJ3xCwnR8gooJybQDJbw=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert018.pem b/test/rules/platform_certs/default/cert018.pem
new file mode 100644
index 000000000000..7adada8b3ffd
--- /dev/null
+++ b/test/rules/platform_certs/default/cert018.pem
@@ -0,0 +1,22 @@
+Go Daddy Class 2 CA
+-----BEGIN CERTIFICATE-----
+MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMY
+VGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkG
+A1UEBhMCVVMxITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g
+RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQAD
+ggENADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv
+2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+qN1j3hybX2C32
+qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiOr18SPaAIBQi2XKVlOARFmR6j
+YGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmY
+vLEHZ6IVDd2gWMZEewo+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0O
+BBYEFNLEsNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h/t2o
+atTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMu
+MTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wim
+PQoZ+YeAEW5p5JYXMP80kWNyOO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKt
+I3lpjbi2Tc7PTMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
+HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mERdEr/VxqHD3VI
+Ls9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5CufReYNnyicsbkqWletNw+vHX/b
+vZ8=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert019.pem b/test/rules/platform_certs/default/cert019.pem
new file mode 100644
index 000000000000..52679e74119b
--- /dev/null
+++ b/test/rules/platform_certs/default/cert019.pem
@@ -0,0 +1,22 @@
+Starfield Class 2 CA
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzElMCMGA1UEChMc
+U3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZpZWxkIENsYXNzIDIg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwNjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBo
+MQswCQYDVQQGEwJVUzElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAG
+A1UECxMpU3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqG
+SIb3DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf8MOh2tTY
+bitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN+lq2cwQlZut3f+dZxkqZ
+JRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVm
+epsZGD3/cVE8MC5fvj13c7JdBmzDI1aaK4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSN
+F4Azbl5KXZnJHoe0nRrA1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HF
+MIHCMB0GA1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fRzt0f
+hvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNo
+bm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBDbGFzcyAyIENlcnRpZmljYXRpb24g
+QXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGs
+afPzWdqbAYcaT1epoXkJKtv3L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLM
+PUxA2IGvd56Deruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
+xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynpVSJYACPq4xJD
+KVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3
+QBFGmh95DmK/D5fs4C8fF5Q=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert020.pem b/test/rules/platform_certs/default/cert020.pem
new file mode 100644
index 000000000000..b81665fff7f8
--- /dev/null
+++ b/test/rules/platform_certs/default/cert020.pem
@@ -0,0 +1,28 @@
+Taiwan GRCA
+-----BEGIN CERTIFICATE-----
+MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQG
+EwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4X
+DTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1owPzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dv
+dmVybm1lbnQgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qN
+w8XRIePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1qgQdW8or5
+BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKyyhwOeYHWtXBiCAEuTk8O
+1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAtsF/tnyMKtsc2AtJfcdgEWFelq16TheEfO
+htX7MfP6Mb40qij7cEwdScevLJ1tZqa2jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wov
+J5pGfaENda1UhhXcSTvxls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7
+Q3hub/FCVGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHKYS1t
+B6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoHEgKXTiCQ8P8NHuJB
+O9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThNXo+EHWbNxWCWtFJaBYmOlXqYwZE8
+lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1UdDgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNV
+HRMEBTADAQH/MDkGBGcqBwAEMTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg2
+09yewDL7MTqKUWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
+TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyfqzvS/3WXy6Tj
+Zwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaKZEk9GhiHkASfQlK3T8v+R0F2
+Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFEJPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlU
+D7gsL0u8qV1bYH+Mh6XgUmMqvtg7hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6Qz
+DxARvBMB1uUO07+1EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+Hbk
+Z6MmnD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WXudpVBrkk
+7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44VbnzssQwmSNOXfJIoRIM3BKQ
+CZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDeLMDDav7v3Aun+kbfYNucpllQdSNpc5Oy
++fwC00fmcc4QAu4njIT/rEUNE1yDMuAlpYYsfPQS
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert021.pem b/test/rules/platform_certs/default/cert021.pem
new file mode 100644
index 000000000000..95f5124c7c93
--- /dev/null
+++ b/test/rules/platform_certs/default/cert021.pem
@@ -0,0 +1,20 @@
+DigiCert Assured ID Root CA
+-----BEGIN CERTIFICATE-----
+MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
+IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzEx
+MTEwMDAwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
+ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0Ew
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7cJpSIqvTO
+9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYPmDI2dsze3Tyoou9q+yHy
+UmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW
+/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpy
+oeb6pNnVFzF1roV9Iq4/AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whf
+GHdPAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRF
+66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYunpyGd823IDzANBgkq
+hkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRCdWKuh+vy1dneVrOfzM4UKLkNl2Bc
+EkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTffwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38Fn
+SbNd67IJKusm7Xi+fT8r87cmNW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i
+8b5QZ7dsvfPxH2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
++o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert022.pem b/test/rules/platform_certs/default/cert022.pem
new file mode 100644
index 000000000000..838107962066
--- /dev/null
+++ b/test/rules/platform_certs/default/cert022.pem
@@ -0,0 +1,20 @@
+DigiCert Global Root CA
+-----BEGIN CERTIFICATE-----
+MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
+HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBDQTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAw
+MDAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
+dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsBCSDMAZOn
+TjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97nh6Vfe63SKMI2tavegw5
+BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt43C/dxC//AH2hdmoRBBYMql1GNXRor5H
+4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7PT19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y
+7vrTC0LUq7dBMtoM1O/4gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQAB
+o2MwYTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbRTLtm
+8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUwDQYJKoZIhvcNAQEF
+BQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/EsrhMAtudXH/vTBH1jLuG2cenTnmCmr
+EbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIt
+tep3Sp+dWOIrWcBAI+0tKIJFPnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886
+UAb3LujEV0lsYSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
+CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert023.pem b/test/rules/platform_certs/default/cert023.pem
new file mode 100644
index 000000000000..f3b42554e677
--- /dev/null
+++ b/test/rules/platform_certs/default/cert023.pem
@@ -0,0 +1,20 @@
+DigiCert High Assurance EV Root CA
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSsw
+KQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAw
+MFoXDTMxMTExMDAwMDAwMFowbDELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZ
+MBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFu
+Y2UgRVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm+9S75S0t
+Mqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTWPNt0OKRKzE0lgvdKpVMS
+OO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEMxChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3
+MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFBIk5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQ
+NAQTXKFx01p8VdteZOE3hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUe
+h10aUAsgEsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMB
+Af8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaAFLE+w2kD+L9HAdSY
+JhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3NecnzyIZgYIVyHbIUf4KmeqvxgydkAQ
+V8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6zeM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFp
+myPInngiK3BD41VHMWEZ71jFhS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkK
+mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
+vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert024.pem b/test/rules/platform_certs/default/cert024.pem
new file mode 100644
index 000000000000..1063f5be6ac1
--- /dev/null
+++ b/test/rules/platform_certs/default/cert024.pem
@@ -0,0 +1,18 @@
+DST Root CA X3
+-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/MSQwIgYDVQQK
+ExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMTDkRTVCBSb290IENBIFgzMB4X
+DTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVowPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1
+cmUgVHJ1c3QgQ28uMRcwFQYDVQQDEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmT
+rE4Orz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEqOLl5CjH9
+UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9bxiqKqy69cK3FCxolkHRy
+xXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40d
+utolucbY38EVAjqr2m7xPi71XAicPNaDaeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0T
+AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQ
+MA0GCSqGSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69ikug
+dB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXrAvHRAosZy5Q6XkjE
+GB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZzR8srzJmwN0jP41ZL9c8PDHIyh8bw
+RLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubS
+fZGL+T0yjWW06XyxV3bqxbYoOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert025.pem b/test/rules/platform_certs/default/cert025.pem
new file mode 100644
index 000000000000..4bd1dc0739c4
--- /dev/null
+++ b/test/rules/platform_certs/default/cert025.pem
@@ -0,0 +1,29 @@
+SwissSign Gold CA - G2
+-----BEGIN CERTIFICATE-----
+MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkNIMRUw
+EwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2lnbiBHb2xkIENBIC0gRzIwHhcN
+MDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBFMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dp
+c3NTaWduIEFHMR8wHQYDVQQDExZTd2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUq
+t2/876LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+bbqBHH5C
+jCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c6bM8K8vzARO/Ws/BtQpg
+vd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqEemA8atufK+ze3gE/bk3lUIbLtK/tREDF
+ylqM2tIrfKjuvqblCqoOpd8FUrdVxyJdMmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvR
+AiTysybUa9oEVeXBCsdtMDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuend
+jIj3o02yMszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69yFGkO
+peUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPiaG59je883WX0XaxR
+7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxMgI93e2CaHt+28kgeDrpOVG2Y4OGi
+GqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUWyV7lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64
+OfPAeGZe6Drn8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov
+L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe645R88a7A3hfm
+5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczOUYrHUDFu4Up+GC9pWbY9ZIEr
+44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOf
+Mke6UiI0HTJ6CVanfCU2qT1L2sCCbwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6m
+Gu6uLftIdxf+u+yvGPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxp
+mo/a77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCChdiDyyJk
+vC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid392qgQmwLOM7XdVAyksLf
+KzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEppLd6leNcG2mqeSz53OiATIgHQv2ieY2Br
+NU0LbbqhPcCT4H8js1WtciVORvnSFu+wZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6Lqj
+viOvrv1vA+ACOzB2+httQc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert026.pem b/test/rules/platform_certs/default/cert026.pem
new file mode 100644
index 000000000000..62ab3c87b99b
--- /dev/null
+++ b/test/rules/platform_certs/default/cert026.pem
@@ -0,0 +1,29 @@
+SwissSign Silver CA - G2
+-----BEGIN CERTIFICATE-----
+MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCQ0gxFTAT
+BgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMB4X
+DTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0NlowRzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3
+aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644
+N0MvFz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7brYT7QbNHm
++/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieFnbAVlDLaYQ1HTWBCrpJH
+6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH6ATK72oxh9TAtvmUcXtnZLi2kUpCe2Uu
+MGoM9ZDulebyzYLs2aFK7PayS+VFheZteJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5h
+qAaEuSh6XzjZG6k4sIN/c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5
+FZGkECwJMoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRHHTBs
+ROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTfjNFusB3hB48IHpmc
+celM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb65i/4z3GcRm25xBWNOHkDRUjvxF3X
+CO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQUF6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRB
+tjpbO8tFnb0cwpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
+cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBAHPGgeAn0i0P
+4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShpWJHckRE1qTodvBqlYJ7YH39F
+kWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L
+3XWgwF15kIwb4FDm3jH+mHtwX6WQ2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx
+/uNncqCxv1yL5PqZIseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFa
+DGi8aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2Xem1ZqSqP
+e97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQRdAtq/gsD/KNVV4n+Ssuu
+WxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJ
+DIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ub
+DgEj8Z+7fNzcbBGXJbLytGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert027.pem b/test/rules/platform_certs/default/cert027.pem
new file mode 100644
index 000000000000..c9bb1af7e170
--- /dev/null
+++ b/test/rules/platform_certs/default/cert027.pem
@@ -0,0 +1,19 @@
+GeoTrust Primary Certification Authority
+-----BEGIN CERTIFICATE-----
+MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMoR2VvVHJ1c3QgUHJpbWFyeSBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExMjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgx
+CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQ
+cmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9AWbK7hWN
+b6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjAZIVcFU2Ix7e64HXprQU9
+nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE07e9GceBrAqg1cmuXm2bgyxx5X9gaBGge
+RwLmnWDiNpcB3841kt++Z8dtd1k7j53WkBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGt
+tm/81w7a4DSwDRp35+MImO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJKoZI
+hvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ16CePbJC/kRYkRj5K
+Ts4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl4b7UVXGYNTq+k+qurUKykG/g/CFN
+NWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6KoKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHa
+Floxt/m0cYASSJlyc1pZU8FjUjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG
+1riR/aYNKxoUAT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert028.pem b/test/rules/platform_certs/default/cert028.pem
new file mode 100644
index 000000000000..6549fc986a66
--- /dev/null
+++ b/test/rules/platform_certs/default/cert028.pem
@@ -0,0 +1,22 @@
+thawte Primary Root CA
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UE
+BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
+aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3
+MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwg
+SW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMv
+KGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMT
+FnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs
+oPD7gFnUnMekz52hWXMJEEUMDSxuaPFsW0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ
+1CRfBsDMRJSUjQJib+ta3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGc
+q/gcfomk6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6Sk/K
+aAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94JNqR32HuHUETVPm4p
+afs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XPr87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUF
+AAOCAQEAeRHAS7ORtvzw6WfUDW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeE
+uzLlQRHAd9mzYJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
+xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2/qxAeeWsEG89
+jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/LHbTY5xZ3Y+m4Q6gLkH3LpVH
+z7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7jVaMaA==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert029.pem b/test/rules/platform_certs/default/cert029.pem
new file mode 100644
index 000000000000..dab832fb884d
--- /dev/null
+++ b/test/rules/platform_certs/default/cert029.pem
@@ -0,0 +1,25 @@
+VeriSign Class 3 Public Primary Certification Authority - G5
+-----BEGIN CERTIFICATE-----
+MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE
+BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
+ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
+IHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCB
+yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2ln
+biBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBh
+dXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCvJAgIKXo1nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKz
+j/i5Vbext0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIzSdhD
+Y2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQGBO+QueQA5N06tRn/
+Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+rCpSx4/VBEnkjWNHiDxpg8v+R70r
+fk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/
+BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2Uv
+Z2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
+aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKvMzEzMA0GCSqG
+SIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzEp6B4Eq1iDkVwZMXnl2YtmAl+
+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKE
+KQsTb47bDN0lAtukixlE0kF6BWlKWE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiC
+Km0oHw0LxOXnGiYZ4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vE
+ZV8NhnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert030.pem b/test/rules/platform_certs/default/cert030.pem
new file mode 100644
index 000000000000..eebada208adf
--- /dev/null
+++ b/test/rules/platform_certs/default/cert030.pem
@@ -0,0 +1,20 @@
+SecureTrust CA
+-----BEGIN CERTIFICATE-----
+MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBIMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xFzAVBgNVBAMTDlNlY3VyZVRy
+dXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIzMTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAe
+BgNVBAoTF1NlY3VyZVRydXN0IENvcnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQX
+OZEzZum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO0gMdA+9t
+DWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIaowW8xQmxSPmjL8xk037uH
+GFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b
+01k/unK8RCSc43Oz969XL0Imnal0ugBS8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmH
+ursCAwEAAaOBnTCBmjATBgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCegJYYj
+aHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
+KoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt36Z3q059c4EVlew3KW+JwULKUBRSu
+SceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHf
+mbx8IVQr5Fiiu1cprp6poxkmD5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZ
+nMUFdAvnZyPSCPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
+3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert031.pem b/test/rules/platform_certs/default/cert031.pem
new file mode 100644
index 000000000000..5d24e1f3b233
--- /dev/null
+++ b/test/rules/platform_certs/default/cert031.pem
@@ -0,0 +1,20 @@
+Secure Global CA
+-----BEGIN CERTIFICATE-----
+MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBH
+bG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkxMjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEg
+MB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwg
+Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jx
+YDiJiQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa/FHtaMbQ
+bqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJjnIFHovdRIWCQtBJwB1g
+8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnIHmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYV
+HDGA76oYa8J719rO+TMg1fW9ajMtgQT7sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi
+0XPnj3pDAgMBAAGjgZ0wgZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCswKaAn
+oCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsGAQQBgjcVAQQDAgEA
+MA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0LURYD7xh8yOOvaliTFGCRsoTciE6+
+OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXOH0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cn
+CDpOGR86p1hcF895P4vkp9MmI50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/5
+3CYNv6ZHdAbYiNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
+f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert032.pem b/test/rules/platform_certs/default/cert032.pem
new file mode 100644
index 000000000000..993c2b76ecae
--- /dev/null
+++ b/test/rules/platform_certs/default/cert032.pem
@@ -0,0 +1,22 @@
+COMODO Certification Authority
+-----BEGIN CERTIFICATE-----
+MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UE
+BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
+A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNVBAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1
+dGhvcml0eTAeFw0wNjEyMDEwMDAwMDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEb
+MBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFD
+T01PRE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3UcEbVASY06m/weaKXTuH
++7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI2GqGd0S7WWaXUF601CxwRM/aN5VCaTww
+xHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV
+4EajcNxo2f8ESIl33rXp+2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA
+1KGzqSX+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5OnKVI
+rLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW/zAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6gPKA6hjhodHRwOi8vY3JsLmNvbW9k
+b2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOC
+AQEAPpiem/Yb6dc5t3iuHXIYSdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CP
+OGEIqB6BCsAvIC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
+RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4zJVSk/BwJVmc
+IGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5ddBA6+C4OmF4O5MBKgxTMVBbkN
++8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IBZQ==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert033.pem b/test/rules/platform_certs/default/cert033.pem
new file mode 100644
index 000000000000..632f1e71301d
--- /dev/null
+++ b/test/rules/platform_certs/default/cert033.pem
@@ -0,0 +1,21 @@
+Network Solutions Certificate Authority
+-----BEGIN CERTIFICATE-----
+MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQG
+EwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydOZXR3b3Jr
+IFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMx
+MjM1OTU5WjBiMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
+MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwzc7MEL7xx
+jOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPPOCwGJgl6cvf6UDL4wpPT
+aaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rlmGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXT
+crA/vGp97Eh/jcOrqnErU2lBUzS1sLnFBgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc
+/Qzpf14Dl847ABSHJ3A4qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMB
+AAGjgZcwgZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwubmV0c29sc3NsLmNv
+bS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3JpdHkuY3JsMA0GCSqGSIb3DQEBBQUA
+A4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc86fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q
+4LqILPxFzBiwmZVRDuwduIj/h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/
+GGUsyfJj4akH/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
+wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHNpGxlaKFJdlxD
+ydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert034.pem b/test/rules/platform_certs/default/cert034.pem
new file mode 100644
index 000000000000..32011efbc364
--- /dev/null
+++ b/test/rules/platform_certs/default/cert034.pem
@@ -0,0 +1,15 @@
+COMODO ECC Certification Authority
+-----BEGIN CERTIFICATE-----
+MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTELMAkGA1UEBhMC
+R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
+ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwHhcNMDgwMzA2MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0Ix
+GzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
+Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRo
+b3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSRFtSrYpn1PlILBs5BAH+X
+4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0JcfRK9ChQtP6IHG4/bC8vCVlbpVsLM5ni
+wz2J+Wos77LTBumjQjBAMB0GA1UdDgQWBBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VG
+FAkK+qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA
+U/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert035.pem b/test/rules/platform_certs/default/cert035.pem
new file mode 100644
index 000000000000..9ba70f2b4b50
--- /dev/null
+++ b/test/rules/platform_certs/default/cert035.pem
@@ -0,0 +1,21 @@
+OISTE WISeKey Global Root GA CA
+-----BEGIN CERTIFICATE-----
+MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCBijELMAkGA1UE
+BhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHlyaWdodCAoYykgMjAwNTEiMCAG
+A1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBH
+bG9iYWwgUm9vdCBHQSBDQTAeFw0wNTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYD
+VQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIw
+IAYDVQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5
+IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy0+zAJs9
+Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxRVVuuk+g3/ytr6dTqvirdqFEr12bDYVxg
+Asj1znJ7O7jyTmUIms2kahnBAbtzptf2w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbD
+d50kc3vkDIzh2TbhmYsFmQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ
+/yxViJGg4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t94B3R
+LoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
+KoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOxSPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vIm
+MMkQyh2I+3QZH4VFvbBsUfk2ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4
++vg1YFkCExh8vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
+hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZiFj4A4xylNoEY
+okxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ/L7fCg0=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert036.pem b/test/rules/platform_certs/default/cert036.pem
new file mode 100644
index 000000000000..0a6a0cd53972
--- /dev/null
+++ b/test/rules/platform_certs/default/cert036.pem
@@ -0,0 +1,20 @@
+Certigna
+-----BEGIN CERTIFICATE-----
+MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNVBAYTAkZSMRIw
+EAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4XDTA3MDYyOTE1MTMwNVoXDTI3
+MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwI
+Q2VydGlnbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7q
+XOEm7RFHYeGifBZ4QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyH
+GxnygQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbwzBfsV1/p
+ogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q130yGLMLLGq/jj8UEYkg
+DncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKf
+Irjxwo1p3Po6WAbfAgMBAAGjgbwwgbkwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQ
+tCRZvgHyUtVF9lo53BEwZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJ
+BgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzjAQ/J
+SP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG9w0BAQUFAAOCAQEA
+hQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8hbV6lUmPOEvjvKtpv6zf+EwLHyzs+
+ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFncfca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1klu
+PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
+1gkIl2PlwS6wt0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
+WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert037.pem b/test/rules/platform_certs/default/cert037.pem
new file mode 100644
index 000000000000..d14681661ead
--- /dev/null
+++ b/test/rules/platform_certs/default/cert037.pem
@@ -0,0 +1,20 @@
+Cybertrust Global Root
+-----BEGIN CERTIFICATE-----
+MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYGA1UEChMPQ3li
+ZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBSb290MB4XDTA2MTIxNTA4
+MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQD
+ExZDeWJlcnRydXN0IEdsb2JhbCBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
++Mi8vRRQZhP/8NN57CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW
+0ozSJ8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2yHLtgwEZL
+AfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iPt3sMpTjr3kfb1V05/Iin
+89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNzFtApD0mpSPCzqrdsxacwOUBdrsTiXSZT
+8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAYXSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2
+MDSgMqAwhi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3JsMB8G
+A1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUAA4IBAQBW7wojoFRO
+lZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMjWqd8BfP9IjsO0QbE2zZMcwSO5bAi
+5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUxXOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2
+hO0j9n0Hq0V+09+zv+mKts2oomcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+T
+X3EJIrduPuocA06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
+WL1WMRJOEcgh4LMRkWXbtKaIOM5V
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert038.pem b/test/rules/platform_certs/default/cert038.pem
new file mode 100644
index 000000000000..cf2d1496d727
--- /dev/null
+++ b/test/rules/platform_certs/default/cert038.pem
@@ -0,0 +1,29 @@
+ePKI Root Certification Authority
+-----BEGIN CERTIFICATE-----
+MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0ZC4xKjAoBgNVBAsMIWVQS0kg
+Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMx
+MjdaMF4xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEq
+MCgGA1UECwwhZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAHSyZbCUNs
+IZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAhijHyl3SJCRImHJ7K2RKi
+lTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3XDZoTM1PRYfl61dd4s5oz9wCGzh1NlDiv
+qOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX
+12ruOzjjK9SXDrkb5wdJfzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0O
+WQqraffAsgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uUWH1+
+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLSnT0IFaUQAS2zMnao
+lQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pHdmX2Os+PYhcZewoozRrSgx4hxyy/
+vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJipNiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXi
+Zo1jDiVN1Rmy5nk3pyKdVDECAwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/Qkqi
+MAwGA1UdEwQFMAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
+ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGBuvl2ICO1J2B0
+1GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6YlPwZpVnPDimZI+ymBV3QGypzq
+KOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkPJXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdV
+xrsStZf0X4OFunHB2WyBEXYKCrC/gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEP
+NXubrjlpC2JgQCA2j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+r
+GNm65ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUBo2M3IUxE
+xJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS/jQ6fbjpKdx2qcgw+BRx
+gMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2zGp1iro2C6pSe3VkQw63d4k3jMdXH7Ojy
+sP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTEW9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmOD
+BCEIZ43ygknQW/2xzQ+DhNQ+IIX3Sj0rnP0qCglN6oH4EZw=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert039.pem b/test/rules/platform_certs/default/cert039.pem
new file mode 100644
index 000000000000..3f3078052e62
--- /dev/null
+++ b/test/rules/platform_certs/default/cert039.pem
@@ -0,0 +1,18 @@
+certSIGN ROOT CA
+-----BEGIN CERTIFICATE-----
+MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYTAlJPMREwDwYD
+VQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTAeFw0wNjA3MDQxNzIwMDRa
+Fw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UE
+CxMQY2VydFNJR04gUk9PVCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7I
+JUqOtdu0KBuqV5Do0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHH
+rfAQUySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5dRdY4zTW2
+ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQOA7+j0xbm0bqQfWwCHTD
+0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwvJoIQ4uNllAoEwF73XVv4EOLQunpL+943
+AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B
+Af8EBAMCAcYwHQYDVR0OBBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IB
+AQA+0hyJLjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecYMnQ8
+SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ44gx+FkagQnIl6Z0
+x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6IJd1hJyMctTEHBDa0GpC9oHRxUIlt
+vBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNwi/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7Nz
+TogVZ96edhBiIL5VaZVDADlN9u6wWk5JRFRYX0KD
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert040.pem b/test/rules/platform_certs/default/cert040.pem
new file mode 100644
index 000000000000..1c0ff0054c29
--- /dev/null
+++ b/test/rules/platform_certs/default/cert040.pem
@@ -0,0 +1,21 @@
+GeoTrust Primary Certification Authority - G3
+-----BEGIN CERTIFICATE-----
+MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE
+BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA4IEdlb1RydXN0
+IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFy
+eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIz
+NTk1OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAo
+YykgMjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMT
+LUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5j
+K/BGvESyiaHAKAxJcCGVn2TAppMSAmUmhsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdE
+c5IiaacDiGydY8hS2pgn5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3C
+IShwiP/WJmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exALDmKu
+dlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZChuOl1UcCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMR5yo6hTgMdHNxr
+2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IBAQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9
+cr5HqQ6XErhK8WTTOd8lNNTBzU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbE
+Ap7aDHdlDkQNkv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
+AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUHSJsMC8tJP33s
+t/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2Gspki4cErx5z481+oghLrGREt
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert041.pem b/test/rules/platform_certs/default/cert041.pem
new file mode 100644
index 000000000000..35274749ac64
--- /dev/null
+++ b/test/rules/platform_certs/default/cert041.pem
@@ -0,0 +1,15 @@
+thawte Primary Root CA - G2
+-----BEGIN CERTIFICATE-----
+MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDELMAkGA1UEBhMC
+VVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMpIDIwMDcgdGhhd3RlLCBJbmMu
+IC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3Qg
+Q0EgLSBHMjAeFw0wNzExMDUwMDAwMDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEV
+MBMGA1UEChMMdGhhd3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBG
+b3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAt
+IEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/BebfowJPDQfGAFG6DAJS
+LSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6papu+7qzcMBniKI11KOasf2twu8x+qi5
+8/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU
+mtgAMADna3+FGO6Lts6KDPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUN
+G4k8VIZ3KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41oxXZ3K
+rr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert042.pem b/test/rules/platform_certs/default/cert042.pem
new file mode 100644
index 000000000000..c47e14ae28ea
--- /dev/null
+++ b/test/rules/platform_certs/default/cert042.pem
@@ -0,0 +1,22 @@
+thawte Primary Root CA - G3
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
+BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
+aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0w
+ODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
+d3RlLCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9uMTgwNgYD
+VQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIG
+A1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAsr8nLPvb2FvdeHsbnndmgcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2At
+P0LMqmsywCPLLEHd5N/8YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC
++BsUa0Lfb1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS99irY
+7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2SzhkGcuYMXDhpxwTW
+vGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUkOQIDAQABo0IwQDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJ
+KoZIhvcNAQELBQADggEBABpA2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweK
+A3rD6z8KLFIWoCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
+t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7cKUGRIjxpp7sC
+8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fMm7v/OeZWYdMKp8RcTGB7BXcm
+er/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZuMdRAGmI0Nj81Aa6sY6A=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert043.pem b/test/rules/platform_certs/default/cert043.pem
new file mode 100644
index 000000000000..15754c10f138
--- /dev/null
+++ b/test/rules/platform_certs/default/cert043.pem
@@ -0,0 +1,16 @@
+GeoTrust Primary Certification Authority - G2
+-----BEGIN CERTIFICATE-----
+MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDELMAkGA1UEBhMC
+VVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA3IEdlb1RydXN0IElu
+Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1
+OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
+MjAwNyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMTLUdl
+b1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjB2MBAGByqGSM49AgEG
+BSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcLSo17VDs6bl8VAsBQps8lL33KSLjHUGMc
+KiEIfJo22Av+0SbFWDEwKCXzXV2juLaltJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+
+EVXVMAoGCCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGTqQ7m
+ndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBuczrD6ogRLQy7rQkgu2
+npaqBA+K
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert044.pem b/test/rules/platform_certs/default/cert044.pem
new file mode 100644
index 000000000000..570338d6a7ba
--- /dev/null
+++ b/test/rules/platform_certs/default/cert044.pem
@@ -0,0 +1,25 @@
+VeriSign Universal Root Certification Authority
+-----BEGIN CERTIFICATE-----
+MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCBvTELMAkGA1UE
+BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
+ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
+IHVzZSBvbmx5MTgwNgYDVQQDEy9WZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9u
+IEF1dGhvcml0eTAeFw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNhbCBSb290IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj
+1mCOkdeQmIN65lgZOIzF9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGP
+MiJhgsWHH26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+HLL72
+9fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN/BMReYTtXlT2NJ8I
+AfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPTrJ9VAMf2CGqUuV/c4DPxhGD5WycR
+tPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0G
+CCsGAQUFBwEMBGEwX6FdoFswWTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2O
+a8PPgGrUSBgsexkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
+DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4sAPmLGd75JR3
+Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+seQxIcaBlVZaDrHC1LGmWazx
+Y8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTx
+P/jgdFcrGJ2BtMQo2pSXpXDrrB2+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+P
+wGZsY6rp2aQW9IHRlRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4
+mJO37M2CYfE45k+XmCpajQ==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert045.pem b/test/rules/platform_certs/default/cert045.pem
new file mode 100644
index 000000000000..426a600f809d
--- /dev/null
+++ b/test/rules/platform_certs/default/cert045.pem
@@ -0,0 +1,19 @@
+VeriSign Class 3 Public Primary Certification Authority - G4
+-----BEGIN CERTIFICATE-----
+MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjELMAkGA1UEBhMC
+VVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3
+b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVz
+ZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBU
+cnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRo
+b3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8
+Utpkmw4tXNherJI9/gHmGUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGz
+rl0Bp3vefLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUwAwEB
+/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEw
+HzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVyaXNpZ24u
+Y29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMWkf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMD
+A2gAMGUCMGYhDBgmYFo4e1ZC4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIx
+AJw9SDkjOVgaFRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert046.pem b/test/rules/platform_certs/default/cert046.pem
new file mode 100644
index 000000000000..6333238ed5d0
--- /dev/null
+++ b/test/rules/platform_certs/default/cert046.pem
@@ -0,0 +1,22 @@
+NetLock Arany (Class Gold) Főtanúsítvány
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQGEwJIVTERMA8G
+A1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610
+dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBB
+cmFueSAoQ2xhc3MgR29sZCkgRsWRdGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgx
+MjA2MTUwODIxWjCBpzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxO
+ZXRMb2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNzIEdvbGQpIEbFkXRhbsO6
+c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCRec75LbRTDofTjl5Bu
+0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrTlF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw
+/HpYzY6b7cNGbIRwXdrzAZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAk
+H3B5r9s5VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRGILdw
+fzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2BJtr+UBdADTHLpl1
+neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIB
+BjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2MU9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwW
+qZw8UQCgwBEIBaeZ5m8BiFRhbvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTta
+YtOUZcTh5m2C+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
+bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2FuLjbvrW5Kfna
+NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu
+dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert047.pem b/test/rules/platform_certs/default/cert047.pem
new file mode 100644
index 000000000000..a87baf6a45c8
--- /dev/null
+++ b/test/rules/platform_certs/default/cert047.pem
@@ -0,0 +1,30 @@
+Staat der Nederlanden Root CA - G2
+-----BEGIN CERTIFICATE-----
+MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+Um9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oXDTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMC
+TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
+ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ
+5291qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8SpuOUfiUtn
+vWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPUZ5uW6M7XxgpT0GtJlvOj
+CwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvEpMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiil
+e7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCR
+OME4HYYEhLoaJXhena/MUGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpI
+CT0ugpTNGmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy5V65
+48r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv6q012iDTiIJh8BIi
+trzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEKeN5KzlW/HdXZt1bv8Hb/C3m1r737
+qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMB
+AAGjgZcwgZQwDwYDVR0TAQH/BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcC
+ARYxaHR0cDovL3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqGSIb3DQEBCwUA
+A4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLySCZa59sCrI2AGeYwRTlHSeYAz
++51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwj
+f/ST7ZwaUb7dRUG/kSS0H4zpX897IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaN
+kqbG9AclVMwWVxJKgnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfk
+CpYL+63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxLvJxxcypF
+URmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkmbEgeqmiSBeGCc1qb3Adb
+CG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvkN1trSt8sV4pAWja63XVECDdCcAz+3F4h
+oKOKwJCcaNpQ5kUQR3i2TtJlycM33+FCY7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoV
+IPVVYpbtbZNQvOSqeK3Zywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm
+66+KAQ==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert048.pem b/test/rules/platform_certs/default/cert048.pem
new file mode 100644
index 000000000000..7e3c8df25c1a
--- /dev/null
+++ b/test/rules/platform_certs/default/cert048.pem
@@ -0,0 +1,18 @@
+Hongkong Post Root CA 1
+-----BEGIN CERTIFICATE-----
+MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoT
+DUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMB4XDTAzMDUx
+NTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25n
+IFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1
+ApzQjVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEnPzlTCeqr
+auh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjhZY4bXSNmO7ilMlHIhqqh
+qZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9nnV0ttgCXjqQesBCNnLsak3c78QA3xMY
+V18meMjWCnl3v/evt3a5pQuEF10Q6m/hq5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNV
+HRMBAf8ECDAGAQH/AgEDMA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7i
+h9legYsCmEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI37pio
+l7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clBoiMBdDhViw+5Lmei
+IAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJsEhTkYY2sEJCehFC78JZvRZ+K88ps
+T/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpOfMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilT
+c4afU9hDDl3WY4JxHYB0yvbiAmvZWg==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert049.pem b/test/rules/platform_certs/default/cert049.pem
new file mode 100644
index 000000000000..6bea4b13da3d
--- /dev/null
+++ b/test/rules/platform_certs/default/cert049.pem
@@ -0,0 +1,19 @@
+SecureSign RootCA11
+-----BEGIN CERTIFICATE-----
+MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDErMCkGA1UEChMi
+SmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoGA1UEAxMTU2VjdXJlU2lnbiBS
+b290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSsw
+KQYDVQQKEyJKYXBhbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1
+cmVTaWduIFJvb3RDQTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvL
+TJszi1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8h9uuywGO
+wvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOVMdrAG/LuYpmGYz+/3ZMq
+g6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rP
+O7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitA
+bpSACW22s293bzUIUPsCh8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZX
+t94wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKCh
+OBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xmKbabfSVSSUOrTC4r
+bnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQX5Ucv+2rIrVls4W6ng+4reV6G4pQ
+Oh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWrQbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01
+y8hSyn+B/tlr0/cR7SXf+Of5pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061
+lgeLKBObjBmNQSdJQO7e5iNEOdyhIta6A/I=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert050.pem b/test/rules/platform_certs/default/cert050.pem
new file mode 100644
index 000000000000..23de03568974
--- /dev/null
+++ b/test/rules/platform_certs/default/cert050.pem
@@ -0,0 +1,22 @@
+Microsec e-Szigno Root CA 2009
+-----BEGIN CERTIFICATE-----
+MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYDVQQGEwJIVTER
+MA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jv
+c2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
+dTAeFw0wOTA2MTYxMTMwMThaFw0yOTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UE
+BwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUt
+U3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvPkd6mJviZpWNwrZuuyjNA
+fW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tccbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG
+0IMZfcChEhyVbUr02MelTTMuhTlAdX4UfIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKA
+pxn1ntxVUwOXewdI/5n7N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm
+1HxdrtbCxkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1+rUC
+AwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTLD8bf
+QkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAbBgNVHREE
+FDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqGSIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0o
+lZMEyL/azXm4Q5DwpL7v8u8hmLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfX
+I/OMn74dseGkddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
+tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c2Pm2G2JwCz02
+yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5tHMN1Rq41Bab2XD0h7lbwyYIi
+LXpUq3DDfSJlgnCW
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert051.pem b/test/rules/platform_certs/default/cert051.pem
new file mode 100644
index 000000000000..7917400e8383
--- /dev/null
+++ b/test/rules/platform_certs/default/cert051.pem
@@ -0,0 +1,19 @@
+GlobalSign Root CA - R3
+-----BEGIN CERTIFICATE-----
+MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4GA1UECxMXR2xv
+YmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
+bFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
+aWduIFJvb3QgQ0EgLSBSMzETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWt
+iHL8RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsTgHeMCOFJ
+0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmmKPZpO/bLyCiR5Z2KYVc3
+rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zdQQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjl
+OCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZXriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2
+xmmFghcCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FI/wS3+oLkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZURUm7
+lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMpjjM5RcOO5LlXbKr8
+EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK6fBdRoyV3XpYKBovHd7NADdBj+1E
+bddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQXmcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18
+YIvDQVETI53O9zJrlAGomecsMx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7r
+kpeDMdmztcpHWD9f
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert052.pem b/test/rules/platform_certs/default/cert052.pem
new file mode 100644
index 000000000000..751d1d493329
--- /dev/null
+++ b/test/rules/platform_certs/default/cert052.pem
@@ -0,0 +1,31 @@
+Autoridad de Certificacion Firmaprofesional CIF A62634068
+-----BEGIN CERTIFICATE-----
+MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UEBhMCRVMxQjBA
+BgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
+MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEyMzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIw
+QAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBB
+NjI2MzQwNjgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDD
+Utd9thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQMcas9UX4P
+B99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefGL9ItWY16Ck6WaVICqjaY
+7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15iNA9wBj4gGFrO93IbJWyTdBSTo3OxDqqH
+ECNZXyAFGUftaI6SEspd/NYrspI8IM/hX68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyI
+plD9amML9ZMWGxmPsu2bm8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctX
+MbScyJCyZ/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirjaEbsX
+LZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/TKI8xWVvTyQKmtFLK
+bpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF6NkBiDkal4ZkQdU7hwxu+g/GvUgU
+vzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVhOSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1Ud
+EwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNH
+DhpkLzCBpgYDVR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
+cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBvACAAZABlACAA
+bABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBlAGwAbwBuAGEAIAAwADgAMAAx
+ADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx
+51tkljYyGOylMnfX40S2wBEqgLk9am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qk
+R71kMrv2JYSiJ0L1ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaP
+T481PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS3a/DTg4f
+Jl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5kSeTy36LssUzAKh3ntLFl
+osS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF3dvd6qJ2gHN99ZwExEWN57kci57q13XR
+crHedUTnQn3iV2t93Jm8PYMo6oCTjcVMZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoR
+saS8I8nkvof/uZS2+F0gStRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTD
+KCOM/iczQ0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQBjLMi
+6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert053.pem b/test/rules/platform_certs/default/cert053.pem
new file mode 100644
index 000000000000..52e7459c17f3
--- /dev/null
+++ b/test/rules/platform_certs/default/cert053.pem
@@ -0,0 +1,30 @@
+Izenpe.com
+-----BEGIN CERTIFICATE-----
+MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4MQswCQYDVQQG
+EwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wHhcNMDcxMjEz
+MTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMu
+QS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ
+03rKDx6sp4boFmVqscIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAK
+ClaOxdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6HLmYRY2xU
++zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFXuaOKmMPsOzTFlUFpfnXC
+PCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQDyCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxT
+OTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbK
+F7jJeodWLBoBHmy+E60QrLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK
+0GqfvEyNBjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8Lhij+
+0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIBQFqNeb+Lz0vPqhbB
+leStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+HMh3/1uaD7euBUbl8agW7EekFwID
+AQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2luZm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+
+SVpFTlBFIFMuQS4gLSBDSUYgQTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBG
+NjIgUzgxQzBBBgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
+MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
+BBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUAA4ICAQB4pgwWSp9MiDrAyw6l
+Fn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWblaQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbga
+kEyrkgPH7UIBzg/YsfqikuFgba56awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8q
+hT/AQKM6WfxZSzwoJNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Cs
+g1lwLDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCTVyvehQP5
+aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGkLhObNA5me0mrZJfQRsN5
+nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJbUjWumDqtujWTI6cfSN01RpiyEGjkpTHC
+ClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZo
+Q0iy2+tzJOeRf1SktoA+naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1Z
+WrOZyGlsQyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert054.pem b/test/rules/platform_certs/default/cert054.pem
new file mode 100644
index 000000000000..ba9343141530
--- /dev/null
+++ b/test/rules/platform_certs/default/cert054.pem
@@ -0,0 +1,36 @@
+Chambers of Commerce Root - 2008
+-----BEGIN CERTIFICATE-----
+MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYDVQQGEwJFVTFD
+MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
+bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
+QS4xKTAnBgNVBAMTIENoYW1iZXJzIG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEy
+Mjk1MFoXDTM4MDczMTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNl
+ZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQF
+EwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJl
+cnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
+AQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW928sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKA
+XuFixrYp4YFs8r/lfTJqVKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorj
+h40G072QDuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR5gN/
+ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfLZEFHcpOrUMPrCXZk
+NNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05aSd+pZgvMPMZ4fKecHePOjlO+Bd5g
+D2vlGts/4+EhySnB8esHnFIbAURRPHsl18TlUlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331
+lubKgdaX8ZSD6e2wsWsSaR6s+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ
+0wlf2eOKNcx5Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
+ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAxhduub+84Mxh2
+EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNVHQ4EFgQU+SSsD7K1+HnA+mCI
+G8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJ
+BgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNh
+bWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENh
+bWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDiC
+CQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUH
+AgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAJASryI1
+wqM58C7e6bXpeHxIvj99RZJe6dqxGfwWPJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH
+3qLPaYRgM+gQDROpI9CF5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbU
+RWpGqOt1glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaHFoI6
+M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2pSB7+R5KBWIBpih1
+YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MDxvbxrN8y8NmBGuScvfaAFPDRLLmF
+9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QGtjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcK
+zBIKinmwPQN/aUv0NCB9szTqjktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvG
+nrDQWzilm1DefhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
+OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZd0jQ
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert055.pem b/test/rules/platform_certs/default/cert055.pem
new file mode 100644
index 000000000000..45aa496004c0
--- /dev/null
+++ b/test/rules/platform_certs/default/cert055.pem
@@ -0,0 +1,36 @@
+Global Chambersign Root - 2008
+-----BEGIN CERTIFICATE-----
+MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYDVQQGEwJFVTFD
+MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
+bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
+QS4xJzAlBgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMx
+NDBaFw0zODA3MzExMjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUg
+Y3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJ
+QTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
+aGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDf
+VtPkOpt2RbQT2//BthmLN0EYlVJH6xedKYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXf
+XjaOcNFccUMd2drvXNL7G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0
+ZJJ0YPP2zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4ddPB
+/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyGHoiMvvKRhI9lNNgA
+TH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2Id3UwD2ln58fQ1DJu7xsepeY7s2M
+H/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3VyJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfe
+Ox2YItaswTXbo6Al/3K1dh3ebeksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSF
+HTynyQbehP9r6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
+wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsogzCtLkykPAgMB
+AAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQWBBS5CcqcHtvTbDprru1U8VuT
+BjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDprru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UE
+BhMCRVUxQzBBBgNVBAcTOk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJm
+aXJtYS5jb20vYWRkcmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJm
+aXJtYSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiCCQDJzdPp
+1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUHAgEWHGh0
+dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAICIf3DekijZBZRG
+/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZUohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6
+ReAJ3spED8IXDneRRXozX1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/s
+dZ7LoR/xfxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVza2Mg
+9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yydYhz2rXzdpjEetrHH
+foUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMdSqlapskD7+3056huirRXhOukP9Du
+qqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9OAP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETr
+P3iZ8ntxPjzxmKfFGBI/5rsoM0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVq
+c5iJWzouE4gev8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
+09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert056.pem b/test/rules/platform_certs/default/cert056.pem
new file mode 100644
index 000000000000..f95b11bf2c15
--- /dev/null
+++ b/test/rules/platform_certs/default/cert056.pem
@@ -0,0 +1,20 @@
+Go Daddy Root Certificate Authority - G2
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoTEUdvRGFkZHkuY29tLCBJbmMu
+MTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
+MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
+b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8G
+A1UEAxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKDE6bFIEMBO4Tx5oVJnyfq
+9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD
++qK+ihVqf94Lw7YZFAXK6sOoBJQ7RnwyDfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutd
+fMh8+7ArU6SSYmlRJQVhGkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMl
+NAJWJwGRtDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFDqahQcQZyi27/a9
+BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmXWWcDYfF+OwYxdS2hII5PZYe096ac
+vNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r
+5N9ss4UXnT3ZJE95kTXWXwTrgIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYV
+N8Gb5DKj7Tjo2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
+LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI4uJEvlz36hz1
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert057.pem b/test/rules/platform_certs/default/cert057.pem
new file mode 100644
index 000000000000..7d2fb3afa6a5
--- /dev/null
+++ b/test/rules/platform_certs/default/cert057.pem
@@ -0,0 +1,21 @@
+Starfield Root Certificate Authority - G2
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
+b2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVsZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0
+eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAw
+DgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQg
+VGVjaG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZpY2F0ZSBB
+dXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3twQP89o/8ArFv
+W59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMgnLRJdzIpVv257IzdIvpy3Cdhl+72WoTs
+bhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNk
+N3mSwOxGXn/hbVNMYq/NHwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7Nf
+ZTD4p7dNdloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0HZbU
+JtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0GCSqGSIb3DQEBCwUAA4IBAQARWfol
+TwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjUsHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx
+4mcujJUDJi5DnUox9g61DLu34jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUw
+F5okxBDgBPfg8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
+pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1mMpYjn0q7pBZ
+c2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert058.pem b/test/rules/platform_certs/default/cert058.pem
new file mode 100644
index 000000000000..a575ff262332
--- /dev/null
+++ b/test/rules/platform_certs/default/cert058.pem
@@ -0,0 +1,21 @@
+Starfield Services Root Certificate Authority - G2
+-----BEGIN CERTIFICATE-----
+MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
+b2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRl
+IEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNV
+BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxT
+dGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2VydmljZXMg
+Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20pOsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2
+h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm28xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4Pa
+hHQUw2eeBGg6345AWh1KTs9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLP
+LJGmpufehRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk6mFB
+rMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+qAdcwKziIorhtSpzyEZGDMA0GCSqG
+SIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMIbw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPP
+E95Dz+I0swSdHynVv/heyNXBve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTy
+xQGjhdByPq1zqwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
+iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn0q23KXB56jza
+YyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCNsSi6
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert059.pem b/test/rules/platform_certs/default/cert059.pem
new file mode 100644
index 000000000000..0ea335ce36a7
--- /dev/null
+++ b/test/rules/platform_certs/default/cert059.pem
@@ -0,0 +1,18 @@
+AffirmTrust Commercial
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMB4XDTEw
+MDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
+bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6Eqdb
+DuKPHx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yrba0F8PrV
+C8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPALMeIrJmqbTFeurCA+ukV6
+BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1yHp52UKqK39c/s4mT6NmgTWvRLpUHhww
+MmWd5jyTXlBOeuM61G7MGvv50jeuJCqrVwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNV
+HQ4EFgQUnZPGU4teyq8/nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYGXUPG
+hi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNjvbz4YYCanrHOQnDi
+qX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivtZ8SOyUOyXGsViQK8YvxO8rUzqrJv
+0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9gN53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0kh
+sUlHRUe072o0EclNmsxZt9YCnlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert060.pem b/test/rules/platform_certs/default/cert060.pem
new file mode 100644
index 000000000000..d19d4d329d30
--- /dev/null
+++ b/test/rules/platform_certs/default/cert060.pem
@@ -0,0 +1,18 @@
+AffirmTrust Networking
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMB4XDTEw
+MDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
+bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SE
+Hi3yYJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbuakCNrmreI
+dIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRLQESxG9fhwoXA3hA/Pe24
+/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gb
+h+0t+nvujArjqWaJGctB+d1ENmHP4ndGyH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNV
+HQ4EFgQUBx/S55zawm6iQLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfOtDIu
+UFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzuQY0x2+c06lkh1QF6
+12S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZLgo/bNjR9eUJtGxUAArgFU2HdW23
+WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4uolu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9
+/ZFvgrG+CJPbFEfxojfHRZ48x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert061.pem b/test/rules/platform_certs/default/cert061.pem
new file mode 100644
index 000000000000..be39ab5951bd
--- /dev/null
+++ b/test/rules/platform_certs/default/cert061.pem
@@ -0,0 +1,27 @@
+AffirmTrust Premium
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMB4XDTEwMDEy
+OTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRy
+dXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAxBLfqV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtn
+BKAQJG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ+jjeRFcV
+5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrSs8PhaJyJ+HoAVt70VZVs
++7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmd
+GPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d770O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5R
+p9EixAqnOEhss/n/fauGV+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NI
+S+LI+H+SqHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S5u04
+6uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4IaC1nEWTJ3s7xgaVY5
+/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TXOwF0lkLgAOIua+rF7nKsu7/+6qqo
++Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYEFJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB
+/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByv
+MiPIs0laUZx2KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
+Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B8OWycvpEgjNC
+6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQMKSOyARiqcTtNd56l+0OOF6S
+L5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK
++4w1IX2COPKpVJEZNZOUbWo6xbLQu4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmV
+BtWVyuEklut89pMFu+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFg
+IxpHYoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8GKa1qF60
+g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaORtGdFNrHF+QFlozEJLUb
+zxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6eKeC2uAloGRwYQw==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert062.pem b/test/rules/platform_certs/default/cert062.pem
new file mode 100644
index 000000000000..10562b05e1e0
--- /dev/null
+++ b/test/rules/platform_certs/default/cert062.pem
@@ -0,0 +1,13 @@
+AffirmTrust Premium ECC
+-----BEGIN CERTIFICATE-----
+MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMCVVMxFDASBgNV
+BAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQcmVtaXVtIEVDQzAeFw0xMDAx
+MjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1U
+cnVzdDEgMB4GA1UEAwwXQWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQA
+IgNiAAQNMF4bFZ0D0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQ
+N8O9ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0GA1UdDgQW
+BBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAK
+BggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/VsaobgxCd05DhT1wV/GzTjxi+zygk8N53X
+57hG8f2h4nECMEJZh0PUUd+60wkyWs6Iflc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKM
+eQ==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert063.pem b/test/rules/platform_certs/default/cert063.pem
new file mode 100644
index 000000000000..35cdfeebd2f9
--- /dev/null
+++ b/test/rules/platform_certs/default/cert063.pem
@@ -0,0 +1,20 @@
+Certum Trusted Network CA
+-----BEGIN CERTIFICATE-----
+MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBMMSIwIAYDVQQK
+ExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBUcnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIy
+MTIwNzM3WhcNMjkxMjMxMTIwNzM3WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBU
+ZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+MSIwIAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rHUV+rpDKmYYe2bg+G0jAC
+l/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LMTXPb865Px1bVWqeWifrzq2jUI4ZZJ88J
+J7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVUBBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4
+fOQtf/WsX+sWn7Et0brMkUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0
+cvW0QM8xAcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNVHRMB
+Af8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNVHQ8BAf8EBAMCAQYw
+DQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15ysHhE49wcrwn9I0j6vSrEuVUEtRCj
+jSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfLI9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1
+mS1FhIrlQgnXdAIv94nYmem8J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5aj
+Zt3hrvJBW8qYVoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
+03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert064.pem b/test/rules/platform_certs/default/cert064.pem
new file mode 100644
index 000000000000..cc44be1d013d
--- /dev/null
+++ b/test/rules/platform_certs/default/cert064.pem
@@ -0,0 +1,19 @@
+TWCA Root Certification Authority
+-----BEGIN CERTIFICATE-----
+MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJ
+VEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMzWhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQG
+EwJUVzESMBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NB
+IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFEAcK0HMMx
+QhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HHK3XLfJ+utdGdIzdjp9xC
+oi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeXRfwZVzsrb+RH9JlF/h3x+JejiB03HFyP
+4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/zrX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1r
+y+UPizgN7gr8/g+YnzAx3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIB
+BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkqhkiG
+9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeCMErJk/9q56YAf4lC
+mtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdlsXebQ79NqZp4VKIV66IIArB6nCWlW
+QtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62Dlhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVY
+T0bf+215WfKEIlKuD8z7fDvnaspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocny
+Yh0igzyXxfkZYiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert065.pem b/test/rules/platform_certs/default/cert065.pem
new file mode 100644
index 000000000000..b2a190c2cd1a
--- /dev/null
+++ b/test/rules/platform_certs/default/cert065.pem
@@ -0,0 +1,19 @@
+Security Communication RootCA2
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
+U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMeU2VjdXJpdHkgQ29tbXVuaWNh
+dGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoXDTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMC
+SlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3Vy
+aXR5IENvbW11bmljYXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ANAVOVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGrzbl+dp++
++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVMVAX3NuRFg3sUZdbcDE3R
+3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQhNBqyjoGADdH5H5XTz+L62e4iKrFvlNV
+spHEfbmwhRkGeC7bYRr6hfVKkaHnFtWOojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1K
+EOtOghY6rCcMU/Gt1SSwawNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8
+QIH4D5csOPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
+CwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpFcoJxDjrSzG+ntKEj
+u/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXcokgfGT+Ok+vx+hfuzU7jBBJV1uXk
+3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6q
+tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29
+mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert066.pem b/test/rules/platform_certs/default/cert066.pem
new file mode 100644
index 000000000000..3b91dfb65701
--- /dev/null
+++ b/test/rules/platform_certs/default/cert066.pem
@@ -0,0 +1,28 @@
+EC-ACC
+-----BEGIN CERTIFICATE-----
+MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB8zELMAkGA1UE
+BhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0w
+ODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYD
+VQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UE
+CxMsSmVyYXJxdWlhIEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMT
+BkVDLUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQGEwJFUzE7
+MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYt
+SSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZl
+Z2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJh
+cnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUND
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R85iK
+w5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm4CgPukLjbo73FCeT
+ae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaVHMf5NLWUhdWZXqBIoH7nF2W4onW4
+HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNdQlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0a
+E9jD2z3Il3rucO2n5nzbcc8tlGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw
+0JDnJwIDAQABo4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4opvpXY0wfwYD
+VR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBodHRwczovL3d3dy5jYXRjZXJ0
+Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5l
+dC92ZXJhcnJlbCAwDQYJKoZIhvcNAQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJ
+lF7W2u++AVtd0x7Y/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNa
+Al6kSBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhyRp/7SNVe
+l+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOSAgu+TGbrIP65y7WZf+a2
+E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xlnJ2lYJU6Un/10asIbvPuW/mIPX64b24D
+5EI=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert067.pem b/test/rules/platform_certs/default/cert067.pem
new file mode 100644
index 000000000000..2ac1e6674f16
--- /dev/null
+++ b/test/rules/platform_certs/default/cert067.pem
@@ -0,0 +1,22 @@
+Hellenic Academic and Research Institutions RootCA 2011
+-----BEGIN CERTIFICATE-----
+MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1IxRDBCBgNVBAoT
+O0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9y
+aXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
+IFJvb3RDQSAyMDExMB4XDTExMTIwNjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYT
+AkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
+IENlcnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNo
+IEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPzdYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI
+1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJfel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa
+71HFK9+WXesyHgLacEnsbgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u
+8yBRQlqD75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSPFEDH
+3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNVHRMBAf8EBTADAQH/
+MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp5dgTBCPuQSUwRwYDVR0eBEAwPqA8
+MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQub3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQu
+b3JnMA0GCSqGSIb3DQEBBQUAA4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVt
+XdMiKahsog2p6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
+TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7dIsXRSZMFpGD
+/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8AcysNnq/onN694/BtZqhFLKPM58N
+7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXIl7WdmplNsDz4SgCbZN2fOUvRJ9e4
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert068.pem b/test/rules/platform_certs/default/cert068.pem
new file mode 100644
index 000000000000..c3f1c959e3f4
--- /dev/null
+++ b/test/rules/platform_certs/default/cert068.pem
@@ -0,0 +1,29 @@
+Actalis Authentication Root CA
+-----BEGIN CERTIFICATE-----
+MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UEBhMCSVQxDjAM
+BgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UE
+AwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDky
+MjExMjIwMlowazELMAkGA1UEBhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlz
+IFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290
+IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNvUTufClrJ
+wkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX4ay8IMKx4INRimlNAJZa
+by/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9KK3giq0itFZljoZUj5NDKd45RnijMCO6
+zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1f
+YVEiVRvjRuPjPdA1YprbrxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2
+oxgkg4YQ51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2Fbe8l
+EfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxeKF+w6D9Fz8+vm2/7
+hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4Fv6MGn8i1zeQf1xcGDXqVdFUNaBr8
+EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbnfpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5
+jF66CyCU3nuDuP/jVo23Eek7jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLY
+iDrIn3hm7YnzezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt
+ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQALe3KHwGCmSUyI
+WOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70jsNjLiNmsGe+b7bAEzlgqqI0
+JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDzWochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKx
+K3JCaKygvU5a2hi/a5iB0P2avl4VSM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+
+Xlff1ANATIGk0k9jpwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC
+4yyXX04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+OkfcvHlXHo
+2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7RK4X9p2jIugErsWx0Hbhz
+lefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btUZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXem
+OR/qnuOf0GZvBeyqdn6/axag67XH/JJULysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9
+vwGYT7JZVEc+NHt4bVaTLnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert069.pem b/test/rules/platform_certs/default/cert069.pem
new file mode 100644
index 000000000000..9c0aaeb7709f
--- /dev/null
+++ b/test/rules/platform_certs/default/cert069.pem
@@ -0,0 +1,19 @@
+Trustis FPS Root CA
+-----BEGIN CERTIFICATE-----
+MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQG
+EwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQLExNUcnVzdGlzIEZQUyBSb290
+IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTExMzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNV
+BAoTD1RydXN0aXMgTGltaXRlZDEcMBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQ
+RUN+AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihHiTHcDnlk
+H5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjjvSkCqPoc4Vu5g6hBSLwa
+cY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zt
+o3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlBOrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEA
+AaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAd
+BgNVHQ4EFgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01GX2c
+GE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmWzaD+vkAMXBJV+JOC
+yinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP41BIy+Q7DsdwyhEQsb8tGD+pmQQ9P
+8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZEf1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHV
+l/9D7S3B2l0pKoU/rGXuhg8FjZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYl
+iB6XzCGcKQENZetX2fNXlrtIzYE=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert070.pem b/test/rules/platform_certs/default/cert070.pem
new file mode 100644
index 000000000000..2edc96f284d6
--- /dev/null
+++ b/test/rules/platform_certs/default/cert070.pem
@@ -0,0 +1,28 @@
+Buypass Class 2 Root CA
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMiBSb290IENBMB4X
+DTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1owTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
+eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1
+g1Lr6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPVL4O2fuPn
+9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC911K2GScuVr1QGbNgGE41b
+/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHxMlAQTn/0hpPshNOOvEu/XAFOBz3cFIqU
+CqTqc/sLUegTBxj6DvEr0VQVfTzh97QZQmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeff
+awrbD02TTqigzXsu8lkBarcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgI
+zRFo1clrUs3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLiFRhn
+Bkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRSP/TizPJhk9H9Z2vX
+Uq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN9SG9dKpN6nIDSdvHXx1iY8f93ZHs
+M+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxPAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFMmAd+BikoL1RpzzuvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
+AAOCAgEAU18h9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
+A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3tOluwlN5E40EI
+osHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo+fsicdl9sz1Gv7SEr5AcD48S
+aq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYd
+DnkM/crqJIByw5c/8nerQyIKx+u2DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWD
+LfJ6v9r9jv6ly0UsH8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0
+oyLQI+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK75t98biGC
+wWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h3PFaTWwyI0PurKju7koS
+CTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPzY11aWOIv4x3kqdbQCtCev9eBCfHJxyYN
+rJgWVqA=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert071.pem b/test/rules/platform_certs/default/cert071.pem
new file mode 100644
index 000000000000..694db28238e0
--- /dev/null
+++ b/test/rules/platform_certs/default/cert071.pem
@@ -0,0 +1,28 @@
+Buypass Class 3 Root CA
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMyBSb290IENBMB4X
+DTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFowTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
+eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRH
+sJ8YZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3EN3coTRiR
+5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9tznDDgFHmV0ST9tD+leh
+7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX0DJq1l1sDPGzbjniazEuOQAnFN44wOwZ
+ZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH
+2xc519woe2v1n/MuwU8XKhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV
+/afmiSTYzIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvSO1UQ
+RwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D34xFMFbG02SrZvPA
+Xpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgPK9Dx2hzLabjKSWJtyNBjYt1gD1iq
+j6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFEe4zf/lb+74suwvTg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
+AAOCAgEAACAjQTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
+cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXSIGrs/CIBKM+G
+uIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2HJLw5QY33KbmkJs4j1xrG0aG
+Q0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsaO5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8
+ZORK15FTAaggiG6cX0S5y2CBNOxv033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2
+KSb12tjE8nVhz36udmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz
+6MkEkbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg413OEMXbug
+UZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvDu79leNKGef9JOxqDDPDe
+eOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq4/g7u9xN12TyUb7mqqta6THuBrxzvxNi
+Cp/HuZc=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert072.pem b/test/rules/platform_certs/default/cert072.pem
new file mode 100644
index 000000000000..e2232c988acd
--- /dev/null
+++ b/test/rules/platform_certs/default/cert072.pem
@@ -0,0 +1,20 @@
+T-TeleSec GlobalRoot Class 3
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
+IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
+cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgx
+MDAxMTAyOTU2WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
+dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
+ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN8ELg63iIVl6bmlQdTQyK
+9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/RLyTPWGrTs0NvvAgJ1gORH8EGoel15YU
+NpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZF
+iP0Zf3WHHx+xGwpzJFu5ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W
+0eDrXltMEnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1A/d2O2GCahKqGFPr
+AyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOyWL6ukK2YJ5f+AbGwUgC4TeQbIXQb
+fsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzT
+ucpH9sry9uetuUg/vBa3wW306gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7h
+P0HHRwA11fXT91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml
+e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4pTpPDpFQUWw==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert073.pem b/test/rules/platform_certs/default/cert073.pem
new file mode 100644
index 000000000000..b8f77e06a077
--- /dev/null
+++ b/test/rules/platform_certs/default/cert073.pem
@@ -0,0 +1,22 @@
+EE Certification Centre Root CA
+-----BEGIN CERTIFICATE-----
+MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG
+EwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2Vy
+dGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIw
+MTAxMDMwMTAxMDMwWhgPMjAzMDEyMTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlB
+UyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRy
+ZSBSb290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUyeuuOF0+W2Ap7kaJjbMeM
+TC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvObntl8jixwKIy72KyaOBhU8E2lf/slLo2
+rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIwWFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw
+93X2PaRka9ZP585ArQ/dMtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtN
+P2MbRMNE1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYDVR0T
+AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/zQas8fElyalL1BSZ
+MEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEF
+BQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEFBQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+Rj
+xY6hUFaTlrg4wCQiZrxTFGGVv9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqM
+lIpPnTX/dqQGE5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u
+uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIWiAYLtqZLICjU
+3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/vGVCJYMzpJJUPwssd8m92kMfM
+dcGWxZ0=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert074.pem b/test/rules/platform_certs/default/cert074.pem
new file mode 100644
index 000000000000..90d38315809e
--- /dev/null
+++ b/test/rules/platform_certs/default/cert074.pem
@@ -0,0 +1,22 @@
+D-TRUST Root Class 3 CA 2 2009
+-----BEGIN CERTIFICATE-----
+MIIEMzCCAxugAwIBAgIDCYPzMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTAe
+Fw0wOTExMDUwODM1NThaFw0yOTExMDUwODM1NThaME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxE
+LVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOySs96R+91myP6Oi/WUEWJNTrGa9v+2wBoqOAD
+ER03UAifTUpolDWzU9GUY6cgVq/eUXjsKj3zSEhQPgrfRlWLJ23DEE0NkVJD2IfgXU42tSHKXzlA
+BF9bfsyjxiupQB7ZNoTWSPOSHjRGICTBpFGOShrvUD9pXRl/RcPHAY9RySPocq60vFYJfxLLHLGv
+KZAKyVXMD9O0Gu1HNVpK7ZxzBCHQqr0ME7UAyiZsxGsMlFqVlNpQmvH/pStmMaTJOKDfHR+4CS7z
+p+hnUquVH+BGPtikw8paxTGA6Eian5Rp/hnd2HN8gcqW3o7tszIFZYQ05ub9VxC1X3a/L7AQDcUC
+AwEAAaOCARowggEWMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP3aFMSfMN4hvR5COfyrYyNJ
+4PGEMA4GA1UdDwEB/wQEAwIBBjCB0wYDVR0fBIHLMIHIMIGAoH6gfIZ6bGRhcDovL2RpcmVjdG9y
+eS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwUm9vdCUyMENsYXNzJTIwMyUyMENBJTIwMiUyMDIw
+MDksTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3QwQ6BBoD+G
+PWh0dHA6Ly93d3cuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3Rfcm9vdF9jbGFzc18zX2NhXzJfMjAw
+OS5jcmwwDQYJKoZIhvcNAQELBQADggEBAH+X2zDI36ScfSF6gHDOFBJpiBSVYEQBrLLpME+bUMJm
+2H6NMLVwMeniacfzcNsgFYbQDfC+rAF1hM5+n02/t2A7nPPKHeJeaNijnZflQGDSNiH+0LS4F9p0
+o3/U37CYAqxva2ssJSRyoWXuJVrl5jLn8t+rSfrzkGkj2wTZ51xY/GXUl77M/C4KzCUqNQT4YJEV
+dT1B/yMfGchs64JTBKbkTCJNjYy6zltz7GRUUG3RnFX7acM2w4y8PIWmawomDeCTmGCufsYkl4ph
+X5GOZpIJhzbNi5stPvZR1FDUWSi9g/LMKHtThm3YJohw1+qRzT65ysCQblrGXnRl11z+o+I=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert075.pem b/test/rules/platform_certs/default/cert075.pem
new file mode 100644
index 000000000000..cd874b93b2b9
--- /dev/null
+++ b/test/rules/platform_certs/default/cert075.pem
@@ -0,0 +1,23 @@
+D-TRUST Root Class 3 CA 2 EV 2009
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIDCYP0MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
+OTAeFw0wOTExMDUwODUwNDZaFw0yOTExMDUwODUwNDZaMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
+OTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJnxhDRwui+3MKCOvXwEz75ivJn9gpfS
+egpnljgJ9hBOlSJzmY3aFS3nBfwZcyK3jpgAvDw9rKFs+9Z5JUut8Mxk2og+KbgPCdM03TP1YtHh
+zRnp7hhPTFiu4h7WDFsVWtg6uMQYZB7jM7K1iXdODL/ZlGsTl28So/6ZqQTMFexgaDbtCHu39b+T
+7WYxg4zGcTSHThfqr4uRjRxWQa4iN1438h3Z0S0NL2lRp75mpoo6Kr3HGrHhFPC+Oh25z1uxav60
+sUYgovseO3Dvk5h9jHOW8sXvhXCtKSb8HgQ+HKDYD8tSg2J87otTlZCpV6LqYQXY+U3EJ/pure35
+11H3a6UCAwEAAaOCASQwggEgMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNOUikxiEyoZLsyv
+cop9NteaHNxnMA4GA1UdDwEB/wQEAwIBBjCB3QYDVR0fBIHVMIHSMIGHoIGEoIGBhn9sZGFwOi8v
+ZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBSb290JTIwQ2xhc3MlMjAzJTIwQ0El
+MjAyJTIwRVYlMjAyMDA5LE89RC1UcnVzdCUyMEdtYkgsQz1ERT9jZXJ0aWZpY2F0ZXJldm9jYXRp
+b25saXN0MEagRKBChkBodHRwOi8vd3d3LmQtdHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2xh
+c3NfM19jYV8yX2V2XzIwMDkuY3JsMA0GCSqGSIb3DQEBCwUAA4IBAQA07XtaPKSUiO8aEXUHL7P+
+PPoeUSbrh/Yp3uDx1MYkCenBz1UbtDDZzhr+BlGmFaQt77JLvyAoJUnRpjZ3NOhk31KxEcdzes05
+nsKtjHEh8lprr988TlWvsoRlFIm5d8sqMb7Po23Pb0iUMkZv53GMoKaEGTcH8gNFCSuGdXzfX2lX
+ANtu2KZyIktQ1HWYVt+3GP9DQ1CuekR78HlR10M9p9OB0/DJT7naxpeG0ILD5EJt/rDiZE4OJudA
+NCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqXKVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVv
+w9y4AyHqnxbxLFS1
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert076.pem b/test/rules/platform_certs/default/cert076.pem
new file mode 100644
index 000000000000..e1336960f501
--- /dev/null
+++ b/test/rules/platform_certs/default/cert076.pem
@@ -0,0 +1,28 @@
+CA Disig Root R2
+-----BEGIN CERTIFICATE-----
+MIIFaTCCA1GgAwIBAgIJAJK4iNuwisFjMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNVBAYTAlNLMRMw
+EQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMuMRkwFwYDVQQDExBDQSBEaXNp
+ZyBSb290IFIyMB4XDTEyMDcxOTA5MTUzMFoXDTQyMDcxOTA5MTUzMFowUjELMAkGA1UEBhMCU0sx
+EzARBgNVBAcTCkJyYXRpc2xhdmExEzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERp
+c2lnIFJvb3QgUjIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCio8QACdaFXS1tFPbC
+w3OeNcJxVX6B+6tGUODBfEl45qt5WDza/3wcn9iXAng+a0EE6UG9vgMsRfYvZNSrXaNHPWSb6Wia
+xswbP7q+sos0Ai6YVRn8jG+qX9pMzk0DIaPY0jSTVpbLTAwAFjxfGs3Ix2ymrdMxp7zo5eFm1tL7
+A7RBZckQrg4FY8aAamkw/dLukO8NJ9+flXP04SXabBbeQTg06ov80egEFGEtQX6sx3dOy1FU+16S
+GBsEWmjGycT6txOgmLcRK7fWV8x8nhfRyyX+hk4kLlYMeE2eARKmK6cBZW58Yh2EhN/qwGu1pSqV
+g8NTEQxzHQuyRpDRQjrOQG6Vrf/GlK1ul4SOfW+eioANSW1z4nuSHsPzwfPrLgVv2RvPN3YEyLRa
+5Beny912H9AZdugsBbPWnDTYltxhh5EF5EQIM8HauQhl1K6yNg3ruji6DOWbnuuNZt2Zz9aJQfYE
+koopKW1rOhzndX0CcQ7zwOe9yxndnWCywmZgtrEE7snmhrmaZkCo5xHtgUUDi/ZnWejBBhG93c+A
+Ak9lQHhcR1DIm+YfgXvkRKhbhZri3lrVx/k6RGZL5DJUfORsnLMOPReisjQS1n6yqEm70XooQL6i
+Fh/f5DcfEXP7kAplQ6INfPgGAVUzfbANuPT1rqVCV3w2EYx7XsQDnYx5nQIDAQABo0IwQDAPBgNV
+HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUtZn4r7CU9eMg1gqtzk5WpC5u
+Qu0wDQYJKoZIhvcNAQELBQADggIBACYGXnDnZTPIgm7ZnBc6G3pmsgH2eDtpXi/q/075KMOYKmFM
+tCQSin1tERT3nLXK5ryeJ45MGcipvXrA1zYObYVybqjGom32+nNjf7xueQgcnYqfGopTpti72TVV
+sRHFqQOzVju5hJMiXn7B9hJSi+osZ7z+Nkz1uM/Rs0mSO9MpDpkblvdhuDvEK7Z4bLQjb/D907Je
+dR+Zlais9trhxTF7+9FGs9K8Z7RiVLoJ92Owk6Ka+elSLotgEqv89WBW7xBci8QaQtyDW2QOy7W8
+1k/BfDxujRNt+3vrMNDcTa/F1balTFtxyegxvug4BkihGuLq0t4SOVga/4AOgnXmt8kHbA7v/zjx
+mHHEt38OFdAlab0inSvtBfZGR6ztwPDUO+Ls7pZbkBNOHlY667DvlruWIxG68kOGdGSVyCh13x01
+utI3gzhTODY7z2zp+WsO0PsE6E9312UBeIYMej4hYvF/Y3EMyZ9E26gnonW+boE+18DrG5gPcFw0
+sorMwIUY6256s/daoQe/qUKS82Ail+QUoQebTnbAjn39pCXHR+3/H3OszMOl6W8KjptlwlCFtaOg
+UxLMVYdh84GuEEZhvUQhuMI9dM9+JDX6HAcOmz0iyu8xL4ysEr3vQCj8KWefshNPZiTEUxnpHikV
+7+ZtsH8tZ/3zbBt1RqPlShfppNcL
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert077.pem b/test/rules/platform_certs/default/cert077.pem
new file mode 100644
index 000000000000..b261207dbfe6
--- /dev/null
+++ b/test/rules/platform_certs/default/cert077.pem
@@ -0,0 +1,39 @@
+ACCVRAIZ1
+-----BEGIN CERTIFICATE-----
+MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UEAwwJQUNDVlJB
+SVoxMRAwDgYDVQQLDAdQS0lBQ0NWMQ0wCwYDVQQKDARBQ0NWMQswCQYDVQQGEwJFUzAeFw0xMTA1
+MDUwOTM3MzdaFw0zMDEyMzEwOTM3MzdaMEIxEjAQBgNVBAMMCUFDQ1ZSQUlaMTEQMA4GA1UECwwH
+UEtJQUNDVjENMAsGA1UECgwEQUNDVjELMAkGA1UEBhMCRVMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQCbqau/YUqXry+XZpp0X9DZlv3P4uRm7x8fRzPCRKPfmt4ftVTdFXxpNRFvu8gM
+jmoYHtiP2Ra8EEg2XPBjs5BaXCQ316PWywlxufEBcoSwfdtNgM3802/J+Nq2DoLSRYWoG2ioPej0
+RGy9ocLLA76MPhMAhN9KSMDjIgro6TenGEyxCQ0jVn8ETdkXhBilyNpAlHPrzg5XPAOBOp0KoVdD
+aaxXbXmQeOW1tDvYvEyNKKGno6e6Ak4l0Squ7a4DIrhrIA8wKFSVf+DuzgpmndFALW4ir50awQUZ
+0m/A8p/4e7MCQvtQqR0tkw8jq8bBD5L/0KIV9VMJcRz/RROE5iZe+OCIHAr8Fraocwa48GOEAqDG
+WuzndN9wrqODJerWx5eHk6fGioozl2A3ED6XPm4pFdahD9GILBKfb6qkxkLrQaLjlUPTAYVtjrs7
+8yM2x/474KElB0iryYl0/wiPgL/AlmXz7uxLaL2diMMxs0Dx6M/2OLuc5NF/1OVYm3z61PMOm3WR
+5LpSLhl+0fXNWhn8ugb2+1KoS5kE3fj5tItQo05iifCHJPqDQsGH+tUtKSpacXpkatcnYGMN285J
+9Y0fkIkyF/hzQ7jSWpOGYdbhdQrqeWZ2iE9x6wQl1gpaepPluUsXQA+xtrn13k/c4LOsOxFwYIRK
+Q26ZIMApcQrAZQIDAQABo4ICyzCCAscwfQYIKwYBBQUHAQEEcTBvMEwGCCsGAQUFBzAChkBodHRw
+Oi8vd3d3LmFjY3YuZXMvZmlsZWFkbWluL0FyY2hpdm9zL2NlcnRpZmljYWRvcy9yYWl6YWNjdjEu
+Y3J0MB8GCCsGAQUFBzABhhNodHRwOi8vb2NzcC5hY2N2LmVzMB0GA1UdDgQWBBTSh7Tj3zcnk1X2
+VuqB5TbMjB4/vTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNKHtOPfNyeTVfZW6oHlNsyM
+Hj+9MIIBcwYDVR0gBIIBajCCAWYwggFiBgRVHSAAMIIBWDCCASIGCCsGAQUFBwICMIIBFB6CARAA
+QQB1AHQAbwByAGkAZABhAGQAIABkAGUAIABDAGUAcgB0AGkAZgBpAGMAYQBjAGkA8wBuACAAUgBh
+AO0AegAgAGQAZQAgAGwAYQAgAEEAQwBDAFYAIAAoAEEAZwBlAG4AYwBpAGEAIABkAGUAIABUAGUA
+YwBuAG8AbABvAGcA7QBhACAAeQAgAEMAZQByAHQAaQBmAGkAYwBhAGMAaQDzAG4AIABFAGwAZQBj
+AHQAcgDzAG4AaQBjAGEALAAgAEMASQBGACAAUQA0ADYAMAAxADEANQA2AEUAKQAuACAAQwBQAFMA
+IABlAG4AIABoAHQAdABwADoALwAvAHcAdwB3AC4AYQBjAGMAdgAuAGUAczAwBggrBgEFBQcCARYk
+aHR0cDovL3d3dy5hY2N2LmVzL2xlZ2lzbGFjaW9uX2MuaHRtMFUGA1UdHwROMEwwSqBIoEaGRGh0
+dHA6Ly93d3cuYWNjdi5lcy9maWxlYWRtaW4vQXJjaGl2b3MvY2VydGlmaWNhZG9zL3JhaXphY2N2
+MV9kZXIuY3JsMA4GA1UdDwEB/wQEAwIBBjAXBgNVHREEEDAOgQxhY2N2QGFjY3YuZXMwDQYJKoZI
+hvcNAQEFBQADggIBAJcxAp/n/UNnSEQU5CmH7UwoZtCPNdpNYbdKl02125DgBS4OxnnQ8pdpD70E
+R9m+27Up2pvZrqmZ1dM8MJP1jaGo/AaNRPTKFpV8M9xii6g3+CfYCS0b78gUJyCpZET/LtZ1qmxN
+YEAZSUNUY9rizLpm5U9EelvZaoErQNV/+QEnWCzI7UiRfD+mAM/EKXMRNt6GGT6d7hmKG9Ww7Y49
+nCrADdg9ZuM8Db3VlFzi4qc1GwQA9j9ajepDvV+JHanBsMyZ4k0ACtrJJ1vnE5Bc5PUzolVt3OAJ
+TS+xJlsndQAJxGJ3KQhfnlmstn6tn1QwIgPBHnFk/vk4CpYY3QIUrCPLBhwepH2NDd4nQeit2hW3
+sCPdK6jT2iWH7ehVRE2I9DZ+hJp4rPcOVkkO1jMl1oRQQmwgEh0q1b688nCBpHBgvgW1m54ERL5h
+I6zppSSMEYCUWqKiuUnSwdzRp+0xESyeGabu4VXhwOrPDYTkF7eifKXeVSUG7szAh1xA2syVP1Xg
+Nce4hL60Xc16gwFy7ofmXx2utYXGJt/mwZrpHgJHnyqobalbz+xFd3+YJ5oyXSrjhO7FmGYvliAd
+3djDJ9ew+f7Zfc3Qn48LFFhRny+Lwzgt3uiP1o2HpPVWQxaZLPSkVrQ0uGE3ycJYgBugl6H8WY3p
+EfbRD0tVNEYqi4Y7
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert078.pem b/test/rules/platform_certs/default/cert078.pem
new file mode 100644
index 000000000000..7c69ef53587c
--- /dev/null
+++ b/test/rules/platform_certs/default/cert078.pem
@@ -0,0 +1,27 @@
+TWCA Global Root CA
+-----BEGIN CERTIFICATE-----
+MIIFQTCCAymgAwIBAgICDL4wDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCVFcxEjAQBgNVBAoT
+CVRBSVdBTi1DQTEQMA4GA1UECxMHUm9vdCBDQTEcMBoGA1UEAxMTVFdDQSBHbG9iYWwgUm9vdCBD
+QTAeFw0xMjA2MjcwNjI4MzNaFw0zMDEyMzExNTU5NTlaMFExCzAJBgNVBAYTAlRXMRIwEAYDVQQK
+EwlUQUlXQU4tQ0ExEDAOBgNVBAsTB1Jvb3QgQ0ExHDAaBgNVBAMTE1RXQ0EgR2xvYmFsIFJvb3Qg
+Q0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwBdvI64zEbooh745NnHEKH1Jw7W2C
+nJfF10xORUnLQEK1EjRsGcJ0pDFfhQKX7EMzClPSnIyOt7h52yvVavKOZsTuKwEHktSz0ALfUPZV
+r2YOy+BHYC8rMjk1Ujoog/h7FsYYuGLWRyWRzvAZEk2tY/XTP3VfKfChMBwqoJimFb3u/Rk28OKR
+Q4/6ytYQJ0lM793B8YVwm8rqqFpD/G2Gb3PpN0Wp8DbHzIh1HrtsBv+baz4X7GGqcXzGHaL3SekV
+tTzWoWH1EfcFbx39Eb7QMAfCKbAJTibc46KokWofwpFFiFzlmLhxpRUZyXx1EcxwdE8tmx2RRP1W
+KKD+u4ZqyPpcC1jcxkt2yKsi2XMPpfRaAok/T54igu6idFMqPVMnaR1sjjIsZAAmY2E2TqNGtz99
+sy2sbZCilaLOz9qC5wc0GZbpuCGqKX6mOL6OKUohZnkfs8O1CWfe1tQHRvMq2uYiN2DLgbYPoA/p
+yJV/v1WRBXrPPRXAb94JlAGD1zQbzECl8LibZ9WYkTunhHiVJqRaCPgrdLQABDzfuBSO6N+pjWxn
+kjMdwLfS7JLIvgm/LCkFbwJrnu+8vyq8W8BQj0FwcYeyTbcEqYSjMq+u7msXi7Kx/mzhkIyIqJdI
+zshNy/MGz19qCkKxHh53L46g5pIOBvwFItIm4TFRfTLcDwIDAQABoyMwITAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAXzSBdu+WHdXltdkCY4QWwa6g
+cFGn90xHNcgL1yg9iXHZqjNB6hQbbCEAwGxCGX6faVsgQt+i0trEfJdLjbDorMjupWkEmQqSpqsn
+LhpNgb+E1HAerUf+/UqdM+DyucRFCCEK2mlpc3INvjT+lIutwx4116KD7+U4x6WFH6vPNOw/KP4M
+8VeGTslV9xzU2KV9Bnpv1d8Q34FOIWWxtuEXeZVFBs5fzNxGiWNoRI2T9GRwoD2dKAXDOXC4Ynsg
+/eTb6QihuJ49CcdP+yz4k3ZB3lLg4VfSnQO8d57+nile98FRYB/e2guyLXW3Q0iT5/Z5xoRdgFlg
+lPx4mI88k1HtQJAH32RjJMtOcQWh15QaiDLxInQirqWm2BJpTGCjAu4r7NRjkgtevi92a6O2JryP
+A9gK8kxkRr05YuWW6zRjESjMlfGt7+/cgFhI6Uu46mWs6fyAtbXIRfmswZ/ZuepiiI7E8UuDEq3m
+i4TWnsLrgxifarsbJGAzcMzs9zLzXNl5fe+epP7JI8Mk7hWSsT2RTyaGvWZzJBPqpK5jwa19hAM8
+EHiGG3njxPPyBJUgriOCxLM6AGK/5jYk4Ve6xx6QddVfP5VhK8E7zeWzaGHQRiapIVJpLesux+t3
+zqY6tQMzT3bR51xUAV3LePTJDL/PEo4XLSNolOer/qmyKwbQBM0=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert079.pem b/test/rules/platform_certs/default/cert079.pem
new file mode 100644
index 000000000000..f5bd27acb7c2
--- /dev/null
+++ b/test/rules/platform_certs/default/cert079.pem
@@ -0,0 +1,27 @@
+TeliaSonera Root CA v1
+-----BEGIN CERTIFICATE-----
+MIIFODCCAyCgAwIBAgIRAJW+FqD3LkbxezmCcvqLzZYwDQYJKoZIhvcNAQEFBQAwNzEUMBIGA1UE
+CgwLVGVsaWFTb25lcmExHzAdBgNVBAMMFlRlbGlhU29uZXJhIFJvb3QgQ0EgdjEwHhcNMDcxMDE4
+MTIwMDUwWhcNMzIxMDE4MTIwMDUwWjA3MRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEfMB0GA1UEAwwW
+VGVsaWFTb25lcmEgUm9vdCBDQSB2MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMK+
+6yfwIaPzaSZVfp3FVRaRXP3vIb9TgHot0pGMYzHw7CTww6XScnwQbfQ3t+XmfHnqjLWCi65ItqwA
+3GV17CpNX8GH9SBlK4GoRz6JI5UwFpB/6FcHSOcZrr9FZ7E3GwYq/t75rH2D+1665I+XZ75Ljo1k
+B1c4VWk0Nj0TSO9P4tNmHqTPGrdeNjPUtAa9GAH9d4RQAEX1jF3oI7x+/jXh7VB7qTCNGdMJjmhn
+Xb88lxhTuylixcpecsHHltTbLaC0H2kD7OriUPEMPPCs81Mt8Bz17Ww5OXOAFshSsCPN4D7c3TxH
+oLs1iuKYaIu+5b9y7tL6pe0S7fyYGKkmdtwoSxAgHNN/Fnct7W+A90m7UwW7XWjH1Mh1Fj+JWov3
+F0fUTPHSiXk+TT2YqGHeOh7S+F4D4MHJHIzTjU3TlTazN19jY5szFPAtJmtTfImMMsJu7D0hADnJ
+oWjiUIMusDor8zagrC/kb2HCUQk5PotTubtn2txTuXZZNp1D5SDgPTJghSJRt8czu90VL6R4pgd7
+gUY2BIbdeTXHlSw7sKMXNeVzH7RcWe/a6hBle3rQf5+ztCo3O3CLm1u5K7fsslESl1MpWtTwEhDc
+TwK7EpIvYtQ/aUN8Ddb8WHUBiJ1YFkveupD/RwGJBmr2X7KQarMCpgKIv7NHfirZ1fpoeDVNAgMB
+AAGjPzA9MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBTwj1k4ALP1j5qW
+DNXr+nuqF+gTEjANBgkqhkiG9w0BAQUFAAOCAgEAvuRcYk4k9AwI//DTDGjkk0kiP0Qnb7tt3oNm
+zqjMDfz1mgbldxSR651Be5kqhOX//CHBXfDkH1e3damhXwIm/9fH907eT/j3HEbAek9ALCI18Bmx
+0GtnLLCo4MBANzX2hFxc469CeP6nyQ1Q6g2EdvZR74NTxnr/DlZJLo961gzmJ1TjTQpgcmLNkQfW
+pb/ImWvtxBnmq0wROMVvMeJuScg/doAmAyYp4Db29iBT4xdwNBedY2gea+zDTYa4EzAvXUYNR0PV
+G6pZDrlcjQZIrXSHX8f8MVRBE+LHIQ6e4B4N4cB7Q4WQxYpYxmUKeFfyxiMPAdkgS94P+5KFdSpc
+c41teyWRyu5FrgZLAMzTsVlQ2jqIOylDRl6XK1TOU2+NSueW+r9xDkKLfP0ooNBIytrEgUy7onOT
+JsjrDNYmiLbAJM+7vVvrdX3pCI6GMyx5dwlppYn8s3CQh3aP0yK7Qs69cwsgJirQmz1wHiRszYd2
+qReWt88NkvuOGKmYSdGe/mBEciG5Ge3C9THxOUiIkCR1VBatzvT4aRRkOfujuLpwQMcnHL/EVlP6
+Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVxSK236thZiNSQvxaz2ems
+WWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert080.pem b/test/rules/platform_certs/default/cert080.pem
new file mode 100644
index 000000000000..d2dbf23e5cde
--- /dev/null
+++ b/test/rules/platform_certs/default/cert080.pem
@@ -0,0 +1,32 @@
+E-Tugra Certification Authority
+-----BEGIN CERTIFICATE-----
+MIIGSzCCBDOgAwIBAgIIamg+nFGby1MwDQYJKoZIhvcNAQELBQAwgbIxCzAJBgNVBAYTAlRSMQ8w
+DQYDVQQHDAZBbmthcmExQDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamls
+ZXJpIHZlIEhpem1ldGxlcmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBN
+ZXJrZXppMSgwJgYDVQQDDB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMDMw
+NTEyMDk0OFoXDTIzMDMwMzEyMDk0OFowgbIxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmEx
+QDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhpem1ldGxl
+cmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBNZXJrZXppMSgwJgYDVQQD
+DB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEA4vU/kwVRHoViVF56C/UYB4Oufq9899SKa6VjQzm5S/fDxmSJPZQuVIBSOTkHS0vd
+hQd2h8y/L5VMzH2nPbxHD5hw+IyFHnSOkm0bQNGZDbt1bsipa5rAhDGvykPL6ys06I+XawGb1Q5K
+CKpbknSFQ9OArqGIW66z6l7LFpp3RMih9lRozt6Plyu6W0ACDGQXwLWTzeHxE2bODHnv0ZEoq1+g
+ElIwcxmOj+GMB6LDu0rw6h8VqO4lzKRG+Bsi77MOQ7osJLjFLFzUHPhdZL3Dk14opz8n8Y4e0ypQ
+BaNV2cvnOVPAmJ6MVGKLJrD3fY185MaeZkJVgkfnsliNZvcHfC425lAcP9tDJMW/hkd5s3kc91r0
+E+xs+D/iWR+V7kI+ua2oMoVJl0b+SzGPWsutdEcf6ZG33ygEIqDUD13ieU/qbIWGvaimzuT6w+Gz
+rt48Ue7LE3wBf4QOXVGUnhMMti6lTPk5cDZvlsouDERVxcr6XQKj39ZkjFqzAQqptQpHF//vkUAq
+jqFGOjGY5RH8zLtJVor8udBhmm9lbObDyz51Sf6Pp+KJxWfXnUYTTjF2OySznhFlhqt/7x3U+Lzn
+rFpct1pHXFXOVbQicVtbC/DP3KBhZOqp12gKY6fgDT+gr9Oq0n7vUaDmUStVkhUXU8u3Zg5mTPj5
+dUyQ5xJwx0UCAwEAAaNjMGEwHQYDVR0OBBYEFC7j27JJ0JxUeVz6Jyr+zE7S6E5UMA8GA1UdEwEB
+/wQFMAMBAf8wHwYDVR0jBBgwFoAULuPbsknQnFR5XPonKv7MTtLoTlQwDgYDVR0PAQH/BAQDAgEG
+MA0GCSqGSIb3DQEBCwUAA4ICAQAFNzr0TbdF4kV1JI+2d1LoHNgQk2Xz8lkGpD4eKexd0dCrfOAK
+kEh47U6YA5n+KGCRHTAduGN8qOY1tfrTYXbm1gdLymmasoR6d5NFFxWfJNCYExL/u6Au/U5Mh/jO
+XKqYGwXgAEZKgoClM4so3O0409/lPun++1ndYYRP0lSWE2ETPo+Aab6TR7U1Q9Jauz1c77NCR807
+VRMGsAnb/WP2OogKmW9+4c4bU2pEZiNRCHu8W1Ki/QY3OEBhj0qWuJA3+GbHeJAAFS6LrVE1Uweo
+a2iu+U48BybNCAVwzDk/dr2l02cmAYamU9JgO3xDf1WKvJUawSg5TB9D0pH0clmKuVb8P7Sd2nCc
+dlqMQ1DujjByTd//SffGqWfZbawCEeI6FiWnWAjLb1NBnEg4R2gz0dfHj9R0IdTDBZB6/86WiLEV
+KV0jq9BgoRJP3vQXzTLlyb/IQ639Lo7xr+L0mPoSHyDYwKcMhcWQ9DstliaxLL5Mq+ux0orJ23gT
+Dx4JnW2PAJ8C2sH6H3p6CcRK5ogql5+Ji/03X186zjhZhkuvcQu02PJwT58yE+Owp1fl2tpDy4Q0
+8ijE6m30Ku/Ba3ba+367hTzSU8JNvnHhRdH9I2cNE3X7z2VnIp2usAnRCf8dNL/+I5c30jn6PQ0G
+C7TbO6Orb1wdtn7os4I07QZcJA==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert081.pem b/test/rules/platform_certs/default/cert081.pem
new file mode 100644
index 000000000000..71499a1bed01
--- /dev/null
+++ b/test/rules/platform_certs/default/cert081.pem
@@ -0,0 +1,20 @@
+T-TeleSec GlobalRoot Class 2
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
+IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
+cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwHhcNMDgx
+MDAxMTA0MDE0WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
+dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
+ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCqX9obX+hzkeXaXPSi5kfl82hVYAUdAqSzm1nzHoqvNK38DcLZ
+SBnuaY/JIPwhqgcZ7bBcrGXHX+0CfHt8LRvWurmAwhiCFoT6ZrAIxlQjgeTNuUk/9k9uN0goOA/F
+vudocP05l03Sx5iRUKrERLMjfTlH6VJi1hKTXrcxlkIF+3anHqP1wvzpesVsqXFP6st4vGCvx970
+2cu+fjOlbpSD8DT6IavqjnKgP6TeMFvvhk1qlVtDRKgQFRzlAVfFmPHmBiiRqiDFt1MmUUOyCxGV
+WOHAD3bZwI18gfNycJ5v/hqO2V81xrJvNHy+SE/iWjnX2J14np+GPgNeGYtEotXHAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS/WSA2AHmgoCJrjNXy
+YdK4LMuCSjANBgkqhkiG9w0BAQsFAAOCAQEAMQOiYQsfdOhyNsZt+U2e+iKo4YFWz827n+qrkRk4
+r6p8FU3ztqONpfSO9kSpp+ghla0+AGIWiPACuvxhI+YzmzB6azZie60EI4RYZeLbK4rnJVM3YlNf
+vNoBYimipidx5joifsFvHZVwIEoHNN/q/xWA5brXethbdXwFeilHfkCoMRN3zUA7tFFHei4R40cR
+3p1m0IvVVGb6g1XqfMIpiRvpb7PO4gWEyS8+eIVibslfwXhjdFjASBgMmTnrpMwatXlajRWc2BQN
+9noHV8cigwUtPJslJj0Ys6lDfMjIq2SPDqO/nBudMNva0Bkuqjzx+zOAduTNrRlPBSeOE6Fuwg==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert082.pem b/test/rules/platform_certs/default/cert082.pem
new file mode 100644
index 000000000000..2a9b5689940f
--- /dev/null
+++ b/test/rules/platform_certs/default/cert082.pem
@@ -0,0 +1,19 @@
+Atos TrustedRoot 2011
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIIXDPLYixfszIwDQYJKoZIhvcNAQELBQAwPDEeMBwGA1UEAwwVQXRvcyBU
+cnVzdGVkUm9vdCAyMDExMQ0wCwYDVQQKDARBdG9zMQswCQYDVQQGEwJERTAeFw0xMTA3MDcxNDU4
+MzBaFw0zMDEyMzEyMzU5NTlaMDwxHjAcBgNVBAMMFUF0b3MgVHJ1c3RlZFJvb3QgMjAxMTENMAsG
+A1UECgwEQXRvczELMAkGA1UEBhMCREUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCV
+hTuXbyo7LjvPpvMpNb7PGKw+qtn4TaA+Gke5vJrf8v7MPkfoepbCJI419KkM/IL9bcFyYie96mvr
+54rMVD6QUM+A1JX76LWC1BTFtqlVJVfbsVD2sGBkWXppzwO3bw2+yj5vdHLqqjAqc2K+SZFhyBH+
+DgMq92og3AIVDV4VavzjgsG1xZ1kCWyjWZgHJ8cblithdHFsQ/H3NYkQ4J7sVaE3IqKHBAUsR320
+HLliKWYoyrfhk/WklAOZuXCFteZI6o1Q/NnezG8HDt0Lcp2AMBYHlT8oDv3FdU9T1nSatCQujgKR
+z3bFmx5VdJx4IbHwLfELn8LVlhgf8FQieowHAgMBAAGjfTB7MB0GA1UdDgQWBBSnpQaxLKYJYO7R
+l+lwrrw7GWzbITAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKelBrEspglg7tGX6XCuvDsZ
+bNshMBgGA1UdIAQRMA8wDQYLKwYBBAGwLQMEAQEwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB
+CwUAA4IBAQAmdzTblEiGKkGdLD4GkGDEjKwLVLgfuXvTBznk+j57sj1O7Z8jvZfza1zv7v1Apt+h
+k6EKhqzvINB5Ab149xnYJDE0BAGmuhWawyfc2E8PzBhj/5kPDpFrdRbhIfzYJsdHt6bPWHJxfrrh
+TZVHO8mvbaG0weyJ9rQPOLXiZNwlz6bb65pcmaHFCN795trV1lpFDMS3wrUU77QR/w4VtfX128a9
+61qn8FYiqTxlVMYVqL2Gns2Dlmh6cYGJ4Qvh6hEbaAjMaZ7snkGeRDImeuKHCnE96+RapNLbxc3G
+3mB/ufNPRJLvKrcYPqcZ2Qt9sTdBQrC6YB3y/gkRsPCHe6ed
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert083.pem b/test/rules/platform_certs/default/cert083.pem
new file mode 100644
index 000000000000..dd4d451ac717
--- /dev/null
+++ b/test/rules/platform_certs/default/cert083.pem
@@ -0,0 +1,28 @@
+QuoVadis Root CA 1 G3
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIUeFhfLq0sGUvjNwc1NBMotZbUZZMwDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMSBHMzAeFw0xMjAxMTIxNzI3NDRaFw00MjAxMTIxNzI3NDRaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDEg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCgvlAQjunybEC0BJyFuTHK3C3kEakE
+PBtVwedYMB0ktMPvhd6MLOHBPd+C5k+tR4ds7FtJwUrVu4/sh6x/gpqG7D0DmVIB0jWerNrwU8lm
+PNSsAgHaJNM7qAJGr6Qc4/hzWHa39g6QDbXwz8z6+cZM5cOGMAqNF34168Xfuw6cwI2H44g4hWf6
+Pser4BOcBRiYz5P1sZK0/CPTz9XEJ0ngnjybCKOLXSoh4Pw5qlPafX7PGglTvF0FBM+hSo+LdoIN
+ofjSxxR3W5A2B4GbPgb6Ul5jxaYA/qXpUhtStZI5cgMJYr2wYBZupt0lwgNm3fME0UDiTouG9G/l
+g6AnhF4EwfWQvTA9xO+oabw4m6SkltFi2mnAAZauy8RRNOoMqv8hjlmPSlzkYZqn0ukqeI1RPToV
+7qJZjqlc3sX5kCLliEVx3ZGZbHqfPT2YfF72vhZooF6uCyP8Wg+qInYtyaEQHeTTRCOQiJ/GKubX
+9ZqzWB4vMIkIG1SitZgj7Ah3HJVdYdHLiZxfokqRmu8hqkkWCKi9YSgxyXSthfbZxbGL0eUQMk1f
+iyA6PEkfM4VZDdvLCXVDaXP7a3F98N/ETH3Goy7IlXnLc6KOTk0k+17kBL5yG6YnLUlamXrXXAkg
+t3+UuU/xDRxeiEIbEbfnkduebPRq34wGmAOtzCjvpUfzUwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUo5fW816iEOGrRZ88F2Q87gFwnMwwDQYJKoZI
+hvcNAQELBQADggIBABj6W3X8PnrHX3fHyt/PX8MSxEBd1DKquGrX1RUVRpgjpeaQWxiZTOOtQqOC
+MTaIzen7xASWSIsBx40Bz1szBpZGZnQdT+3Btrm0DWHMY37XLneMlhwqI2hrhVd2cDMT/uFPpiN3
+GPoajOi9ZcnPP/TJF9zrx7zABC4tRi9pZsMbj/7sPtPKlL92CiUNqXsCHKnQO18LwIE6PWThv6ct
+Tr1NxNgpxiIY0MWscgKCP6o6ojoilzHdCGPDdRS5YCgtW2jgFqlmgiNR9etT2DGbe+m3nUvriBbP
++V04ikkwj+3x6xn0dxoxGE1nVGwvb2X52z3sIexe9PSLymBlVNFxZPT5pqOBMzYzcfCkeF9OrYMh
+3jRJjehZrJ3ydlo28hP0r+AJx2EqbPfgna67hkooby7utHnNkDPDs3b69fBsnQGQ+p6Q9pxyz0fa
+wx/kNSBT8lTR32GDpgLiJTjehTItXnOQUl1CxM49S+H5GYQd1aJQzEH7QRTDvdbJWqNjZgKAvQU6
+O0ec7AAmTPWIUb+oI38YB7AL7YsmoWTTYUrrXJ/es69nA7Mf3W1daWhpq1467HxpvMc7hU6eFbm0
+FU/DlXpY18ls6Wy58yljXrQs8C097Vpl4KlbQMJImYFtnh8GKjwStIsPm6Ik8KaN1nrgS7ZklmOV
+hMJKzRwuJIczYOXD
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert084.pem b/test/rules/platform_certs/default/cert084.pem
new file mode 100644
index 000000000000..95a5c8c60e12
--- /dev/null
+++ b/test/rules/platform_certs/default/cert084.pem
@@ -0,0 +1,28 @@
+QuoVadis Root CA 2 G3
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIURFc0JFuBiZs18s64KztbpybwdSgwDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMiBHMzAeFw0xMjAxMTIxODU5MzJaFw00MjAxMTIxODU5MzJaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDIg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQChriWyARjcV4g/Ruv5r+LrI3HimtFh
+ZiFfqq8nUeVuGxbULX1QsFN3vXg6YOJkApt8hpvWGo6t/x8Vf9WVHhLL5hSEBMHfNrMWn4rjyduY
+NM7YMxcoRvynyfDStNVNCXJJ+fKH46nafaF9a7I6JaltUkSs+L5u+9ymc5GQYaYDFCDy54ejiK2t
+oIz/pgslUiXnFgHVy7g1gQyjO/Dh4fxaXc6AcW34Sas+O7q414AB+6XrW7PFXmAqMaCvN+ggOp+o
+MiwMzAkd056OXbxMmO7FGmh77FOm6RQ1o9/NgJ8MSPsc9PG/Srj61YxxSscfrf5BmrODXfKEVu+l
+V0POKa2Mq1W/xPtbAd0jIaFYAI7D0GoT7RPjEiuA3GfmlbLNHiJuKvhB1PLKFAeNilUSxmn1uIZo
+L1NesNKqIcGY5jDjZ1XHm26sGahVpkUG0CM62+tlXSoREfA7T8pt9DTEceT/AFr2XK4jYIVz8eQQ
+sSWu1ZK7E8EM4DnatDlXtas1qnIhO4M15zHfeiFuuDIIfR0ykRVKYnLP43ehvNURG3YBZwjgQQvD
+6xVu+KQZ2aKrr+InUlYrAoosFCT5v0ICvybIxo/gbjh9Uy3l7ZizlWNof/k19N+IxWA1ksB8aRxh
+lRbQ694Lrz4EEEVlWFA4r0jyWbYW8jwNkALGcC4BrTwV1wIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU7edvdlq/YOxJW8ald7tyFnGbxD0wDQYJKoZI
+hvcNAQELBQADggIBAJHfgD9DCX5xwvfrs4iP4VGyvD11+ShdyLyZm3tdquXK4Qr36LLTn91nMX66
+AarHakE7kNQIXLJgapDwyM4DYvmL7ftuKtwGTTwpD4kWilhMSA/ohGHqPHKmd+RCroijQ1h5fq7K
+pVMNqT1wvSAZYaRsOPxDMuHBR//47PERIjKWnML2W2mWeyAMQ0GaW/ZZGYjeVYg3UQt4XAoeo0L9
+x52ID8DyeAIkVJOviYeIyUqAHerQbj5hLja7NQ4nlv1mNDthcnPxFlxHBlRJAHpYErAK74X9sbgz
+dWqTHBLmYF5vHX/JHyPLhGGfHoJE+V+tYlUkmlKY7VHnoX6XOuYvHxHaU4AshZ6rNRDbIl9qxV6X
+U/IyAgkwo1jwDQHVcsaxfGl7w/U2Rcxhbl5MlMVerugOXou/983g7aEOGzPuVBj+D77vfoRrQ+Nw
+mNtddbINWQeFFSM51vHfqSYP1kjHs6Yi9TM3WpVHn3u6GBVv/9YUZINJ0gpnIdsPNWNgKCLjsZWD
+zYWm3S8P52dSbrsvhXz1SnPnxT7AvSESBT/8twNJAlvIJebiVDj1eYeMHVOyToV7BjjHLPj4sHKN
+JeV3UvQDHEimUF+IIDBu8oJDqz2XhOdT+yHBTw8imoa4WSr2Rz0ZiC3oheGe7IUIarFsNMkd7Egr
+O3jtZsSOeWmD3n+M
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert085.pem b/test/rules/platform_certs/default/cert085.pem
new file mode 100644
index 000000000000..cd999ae3da64
--- /dev/null
+++ b/test/rules/platform_certs/default/cert085.pem
@@ -0,0 +1,28 @@
+QuoVadis Root CA 3 G3
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIULvWbAiin23r/1aOp7r0DoM8Sah0wDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMyBHMzAeFw0xMjAxMTIyMDI2MzJaFw00MjAxMTIyMDI2MzJaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDMg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCzyw4QZ47qFJenMioKVjZ/aEzHs286
+IxSR/xl/pcqs7rN2nXrpixurazHb+gtTTK/FpRp5PIpM/6zfJd5O2YIyC0TeytuMrKNuFoM7pmRL
+Mon7FhY4futD4tN0SsJiCnMK3UmzV9KwCoWdcTzeo8vAMvMBOSBDGzXRU7Ox7sWTaYI+FrUoRqHe
+6okJ7UO4BUaKhvVZR74bbwEhELn9qdIoyhA5CcoTNs+cra1AdHkrAj80//ogaX3T7mH1urPnMNA3
+I4ZyYUUpSFlob3emLoG+B01vr87ERRORFHAGjx+f+IdpsQ7vw4kZ6+ocYfx6bIrc1gMLnia6Et3U
+VDmrJqMz6nWB2i3ND0/kA9HvFZcba5DFApCTZgIhsUfei5pKgLlVj7WiL8DWM2fafsSntARE60f7
+5li59wzweyuxwHApw0BiLTtIadwjPEjrewl5qW3aqDCYz4ByA4imW0aucnl8CAMhZa634RylsSqi
+Md5mBPfAdOhx3v89WcyWJhKLhZVXGqtrdQtEPREoPHtht+KPZ0/l7DxMYIBpVzgeAVuNVejH38DM
+dyM0SXV89pgR6y3e7UEuFAUCf+D+IOs15xGsIs5XPd7JMG0QA4XN8f+MFrXBsj6IbGB/kE+V9/Yt
+rQE5BwT6dYB9v0lQ7e/JxHwc64B+27bQ3RP+ydOc17KXqQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUxhfQvKjqAkPyGwaZXSuQILnXnOQwDQYJKoZI
+hvcNAQELBQADggIBADRh2Va1EodVTd2jNTFGu6QHcrxfYWLopfsLN7E8trP6KZ1/AvWkyaiTt3px
+KGmPc+FSkNrVvjrlt3ZqVoAh313m6Tqe5T72omnHKgqwGEfcIHB9UqM+WXzBusnIFUBhynLWcKzS
+t/Ac5IYp8M7vaGPQtSCKFWGafoaYtMnCdvvMujAWzKNhxnQT5WvvoxXqA/4Ti2Tk08HS6IT7SdEQ
+TXlm66r99I0xHnAUrdzeZxNMgRVhvLfZkXdxGYFgu/BYpbWcC/ePIlUnwEsBbTuZDdQdm2NnL9Du
+DcpmvJRPpq3t/O5jrFc/ZSXPsoaP0Aj/uHYUbt7lJ+yreLVTubY/6CD50qi+YUbKh4yE8/nxoGib
+Ih6BJpsQBJFxwAYf3KDTuVan45gtf4Od34wrnDKOMpTwATwiKp9Dwi7DmDkHOHv8XgBCH/MyJnmD
+hPbl8MFREsALHgQjDFSlTC9JxUrRtm5gDWv8a4uFJGS3iQ6rJUdbPM9+Sb3H6QrG2vd+DhcI00iX
+0HGS8A85PjRqHH3Y8iKuu2n0M7SmSFXRDw4m6Oy2Cy2nhTXN/VnIn9HNPlopNLk9hM6xZdRZkZFW
+dSHBd575euFgndOtBBj0fOtek49TSiIp+EgrPk2GrFt/ywaZWWDYWGWVjUTR939+J399roD1B0y2
+PpxxVJkES/1Y+Zj0
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert086.pem b/test/rules/platform_certs/default/cert086.pem
new file mode 100644
index 000000000000..0ed774566a19
--- /dev/null
+++ b/test/rules/platform_certs/default/cert086.pem
@@ -0,0 +1,20 @@
+DigiCert Assured ID Root G2
+-----BEGIN CERTIFICATE-----
+MIIDljCCAn6gAwIBAgIQC5McOtY5Z+pnI7/Dr5r0SzANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
+IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIwHhcNMTMwODAxMTIwMDAwWhcNMzgw
+MTE1MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
+ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ5ygvUj82ckmIkzTz+GoeMVSAn61UQbVH
+35ao1K+ALbkKz3X9iaV9JPrjIgwrvJUXCzO/GU1BBpAAvQxNEP4HteccbiJVMWWXvdMX0h5i89vq
+bFCMP4QMls+3ywPgym2hFEwbid3tALBSfK+RbLE4E9HpEgjAALAcKxHad3A2m67OeYfcgnDmCXRw
+VWmvo2ifv922ebPynXApVfSr/5Vh88lAbx3RvpO704gqu52/clpWcTs/1PPRCv4o76Pu2ZmvA9OP
+YLfykqGxvYmJHzDNw6YuYjOuFgJ3RFrngQo8p0Quebg/BLxcoIfhG69Rjs3sLPr4/m3wOnyqi+Rn
+lTGNAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTO
+w0q5mVXyuNtgv6l+vVa1lzan1jANBgkqhkiG9w0BAQsFAAOCAQEAyqVVjOPIQW5pJ6d1Ee88hjZv
+0p3GeDgdaZaikmkuOGybfQTUiaWxMTeKySHMq2zNixya1r9I0jJmwYrA8y8678Dj1JGG0VDjA9tz
+d29KOVPt3ibHtX2vK0LRdWLjSisCx1BL4GnilmwORGYQRI+tBev4eaymG+g3NJ1TyWGqolKvSnAW
+hsI6yLETcDbYz+70CjTVW0z9B5yiutkBclzzTcHdDrEcDcRjvq30FPuJ7KJBDkzMyFdA0G4Dqs0M
+jomZmWzwPDCvON9vvKO+KSAnq3T/EyJ43pdSVR6DtVQgA+6uwE9W3jfMw3+qBCe703e4YtsXfJwo
+IhNzbM8m9Yop5w==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert087.pem b/test/rules/platform_certs/default/cert087.pem
new file mode 100644
index 000000000000..5f893978490b
--- /dev/null
+++ b/test/rules/platform_certs/default/cert087.pem
@@ -0,0 +1,14 @@
+DigiCert Assured ID Root G3
+-----BEGIN CERTIFICATE-----
+MIICRjCCAc2gAwIBAgIQC6Fa+h3foLVJRK/NJKBs7DAKBggqhkjOPQQDAzBlMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYD
+VQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
+MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwdjAQ
+BgcqhkjOPQIBBgUrgQQAIgNiAAQZ57ysRGXtzbg/WPuNsVepRC0FFfLvC/8QdJ+1YlJfZn4f5dwb
+RXkLzMZTCp2NXQLZqVneAlr2lSoOjThKiknGvMYDOAdfVdp+CW7if17QRSAPWXYQ1qAk8C3eNvJs
+KTmjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTL0L2p4ZgF
+UaFNN6KDec6NHSrkhDAKBggqhkjOPQQDAwNnADBkAjAlpIFFAmsSS3V0T8gj43DydXLefInwz5Fy
+YZ5eEJJZVrmDxxDnOOlYJjZ91eQ0hjkCMHw2U/Aw5WJjOpnitqM7mzT6HtoQknFekROn3aRukswy
+1vUhZscv6pZjamVFkpUBtA==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert088.pem b/test/rules/platform_certs/default/cert088.pem
new file mode 100644
index 000000000000..4715cc06e81b
--- /dev/null
+++ b/test/rules/platform_certs/default/cert088.pem
@@ -0,0 +1,20 @@
+DigiCert Global Root G2
+-----BEGIN CERTIFICATE-----
+MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
+HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUx
+MjAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
+dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI2/Ou8jqJ
+kTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx1x7e/dfgy5SDN67sH0NO
+3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQq2EGnI/yuum06ZIya7XzV+hdG82MHauV
+BJVJ8zUtluNJbd134/tJS7SsVQepj5WztCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyM
+UNGPHgm+F6HmIcr9g+UQvIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQAB
+o0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV5uNu
+5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY1Yl9PMWLSn/pvtsr
+F9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4NeF22d+mQrvHRAiGfzZ0JFrabA0U
+WTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NGFdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBH
+QRFXGU7Aj64GxJUTFy8bJZ918rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/
+iyK5S9kJRaTepLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
+MrY=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert089.pem b/test/rules/platform_certs/default/cert089.pem
new file mode 100644
index 000000000000..a01d9ffcf46a
--- /dev/null
+++ b/test/rules/platform_certs/default/cert089.pem
@@ -0,0 +1,14 @@
+DigiCert Global Root G3
+-----BEGIN CERTIFICATE-----
+MIICPzCCAcWgAwIBAgIQBVVWvPJepDU1w6QP1atFcjAKBggqhkjOPQQDAzBhMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAwHgYD
+VQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMzAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAw
+MDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5k
+aWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEczMHYwEAYHKoZIzj0C
+AQYFK4EEACIDYgAE3afZu4q4C/sLfyHS8L6+c/MzXRq8NOrexpu80JX28MzQC7phW1FGfp4tn+6O
+YwwX7Adw9c+ELkCDnOg/QW07rdOkFFk2eJ0DQ+4QE2xy3q6Ip6FrtUPOZ9wj/wMco+I+o0IwQDAP
+BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUs9tIpPmhxdiuNkHMEWNp
+Yim8S8YwCgYIKoZIzj0EAwMDaAAwZQIxAK288mw/EkrRLTnDCgmXc/SINoyIJ7vmiI1Qhadj+Z4y
+3maTD/HMsQmP3Wyr+mt/oAIwOWZbwmSNuJ5Q3KjVSaLtx9zRSX8XAbjIho9OjIgrqJqpisXRAL34
+VOKa5Vt8sycX
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert090.pem b/test/rules/platform_certs/default/cert090.pem
new file mode 100644
index 000000000000..4b7b355f12ee
--- /dev/null
+++ b/test/rules/platform_certs/default/cert090.pem
@@ -0,0 +1,29 @@
+DigiCert Trusted Root G4
+-----BEGIN CERTIFICATE-----
+MIIFkDCCA3igAwIBAgIQBZsbV56OITLiOQe9p3d1XDANBgkqhkiG9w0BAQwFADBiMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSEw
+HwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
+MTIwMDAwWjBiMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz7MKnJS7JIT3yithZwuEp
+pz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS5F/WBTxSD1Ifxp4VpX6+n6lXFllVcq9o
+k3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7bXHiLQwb7iDVySAdYyktzuxeTsiT+CFhmzTrBcZe7Fsa
+vOvJz82sNEBfsXpm7nfISKhmV1efVFiODCu3T6cw2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGY
+QJB5w3jHtrHEtWoYOAMQjdjUN6QuBX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14Ztk6
+MUSaM0C/CNdaSaTC5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2h4mXaXpI8OCiEhtm
+mnTK3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt6zPZxd9LBADMfRyVw4/3IbKyEbe7
+f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPRiQfhvbfmQ6QYuKZ3AeEPlAwhHbJUKSWJbOUOUlFH
+dL4mrLZBdd56rF+NP8m800ERElvlEFDrMcXKchYiCd98THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8
+oR7FwI+isX4KJpn15GkvmB0t9dmpsh3lGwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
+DwEB/wQEAwIBhjAdBgNVHQ4EFgQU7NfjgtJxXWRM3y5nP+e6mK4cD08wDQYJKoZIhvcNAQEMBQAD
+ggIBALth2X2pbL4XxJEbw6GiAI3jZGgPVs93rnD5/ZpKmbnJeFwMDF/k5hQpVgs2SV1EY+CtnJYY
+ZhsjDT156W1r1lT40jzBQ0CuHVD1UvyQO7uYmWlrx8GnqGikJ9yd+SeuMIW59mdNOj6PWTkiU0Tr
+yF0Dyu1Qen1iIQqAyHNm0aAFYF/opbSnr6j3bTWcfFqK1qI4mfN4i/RN0iAL3gTujJtHgXINwBQy
+7zBZLq7gcfJW5GqXb5JQbZaNaHqasjYUegbyJLkJEVDXCLG4iXqEI2FCKeWjzaIgQdfRnGTZ6iah
+ixTXTBmyUEFxPT9NcCOGDErcgdLMMpSEDQgJlxxPwO5rIHQw0uA5NBCFIRUBCOhVMt5xSdkoF1BN
+5r5N0XWs0Mr7QbhDparTwwVETyw2m+L64kW4I1NsBm9nVX9GtUw/bihaeSbSpKhil9Ie4u1Ki7wb
+/UdKDd9nZn6yW0HQO+T0O/QEY+nvwlQAUaCKKsnOeMzV6ocEGLPOr0mIr/OSmbaz5mEP0oUA51Aa
+5BuVnRmhuZyxm7EAHu/QD09CbMkKvO5D+jpxpchNJqU1/YldvIViHTLSoCtU7ZpXwdv6EM8Zt4tK
+G48BtieVU+i2iW1bvGjUI+iLUaJW+fCmgKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP
+82Z+
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert091.pem b/test/rules/platform_certs/default/cert091.pem
new file mode 100644
index 000000000000..88b9cd8335db
--- /dev/null
+++ b/test/rules/platform_certs/default/cert091.pem
@@ -0,0 +1,30 @@
+COMODO RSA Certification Authority
+-----BEGIN CERTIFICATE-----
+MIIF2DCCA8CgAwIBAgIQTKr5yttjb+Af907YWwOGnTANBgkqhkiG9w0BAQwFADCBhTELMAkGA1UE
+BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
+A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwHhcNMTAwMTE5MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMC
+R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
+ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCR6FSS0gpWsawNJN3Fz0Rn
+dJkrN6N9I3AAcbxT38T6KhKPS38QVr2fcHK3YX/JSw8Xpz3jsARh7v8Rl8f0hj4K+j5c+ZPmNHrZ
+FGvnnLOFoIJ6dq9xkNfs/Q36nGz637CC9BR++b7Epi9Pf5l/tfxnQ3K9DADWietrLNPtj5gcFKt+
+5eNu/Nio5JIk2kNrYrhV/erBvGy2i/MOjZrkm2xpmfh4SDBF1a3hDTxFYPwyllEnvGfDyi62a+pG
+x8cgoLEfZd5ICLqkTqnyg0Y3hOvozIFIQ2dOciqbXL1MGyiKXCJ7tKuY2e7gUYPDCUZObT6Z+pUX
+2nwzV0E8jVHtC7ZcryxjGt9XyD+86V3Em69FmeKjWiS0uqlWPc9vqv9JWL7wqP/0uK3pN/u6uPQL
+OvnoQ0IeidiEyxPx2bvhiWC4jChWrBQdnArncevPDt09qZahSL0896+1DSJMwBGB7FY79tOi4lu3
+sgQiUpWAk2nojkxl8ZEDLXB0AuqLZxUpaVICu9ffUGpVRr+goyhhf3DQw6KqLCGqR84onAZFdr+C
+GCe01a60y1Dma/RMhnEw6abfFobg2P9A3fvQQoh/ozM6LlweQRGBY84YcWsr7KaKtzFcOmpH4MN5
+WdYgGq/yapiqcrxXStJLnbsQ/LBMQeXtHT1eKJ2czL+zUdqnR+WEUwIDAQABo0IwQDAdBgNVHQ4E
+FgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
+DQYJKoZIhvcNAQEMBQADggIBAArx1UaEt65Ru2yyTUEUAJNMnMvlwFTPoCWOAvn9sKIN9SCYPBMt
+rFaisNZ+EZLpLrqeLppysb0ZRGxhNaKatBYSaVqM4dc+pBroLwP0rmEdEBsqpIt6xf4FpuHA1sj+
+nq6PK7o9mfjYcwlYRm6mnPTXJ9OV2jeDchzTc+CiR5kDOF3VSXkAKRzH7JsgHAckaVd4sjn8OoSg
+tZx8jb8uk2IntznaFxiuvTwJaP+EmzzV1gsD41eeFPfR60/IvYcjt7ZJQ3mFXLrrkguhxuhoqEwW
+sRqZCuhTLJK7oQkYdQxlqHvLI7cawiiFwxv/0Cti76R7CZGYZ4wUAc1oBmpjIXUDgIiKboHGhfKp
+pC3n9KUkEEeDys30jXlYsQab5xoq2Z0B15R97QNKyvDb6KkBPvVWmckejkk9u+UJueBPSZI9FoJA
+zMxZxuY67RIuaTxslbH9qh17f4a+Hg4yRvv7E491f0yLS0Zj/gA0QHDBw7mh3aZw4gSzQbzpgJHq
+ZJx64SIDqZxubw5lT2yHh17zbqD5daWbQOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk52
+7RH89elWsn2/x20Kk4yl0MC2Hb46TpSi125sC8KKfPog88Tk5c0NqMuRkrF8hey1FGlmDoLnzc7I
+LaZRfyHBNVOFBkpdn627G190
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert092.pem b/test/rules/platform_certs/default/cert092.pem
new file mode 100644
index 000000000000..f3ebdf4ee8e3
--- /dev/null
+++ b/test/rules/platform_certs/default/cert092.pem
@@ -0,0 +1,30 @@
+USERTrust RSA Certification Authority
+-----BEGIN CERTIFICATE-----
+MIIF3jCCA8agAwIBAgIQAf1tMPyjylGoG7xkDjUDLTANBgkqhkiG9w0BAQwFADCBiDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQK
+ExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMTAwMjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQK
+ExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCAEmUXNg7D2wiz
+0KxXDXbtzSfTTK1Qg2HiqiBNCS1kCdzOiZ/MPans9s/B3PHTsdZ7NygRK0faOca8Ohm0X6a9fZ2j
+Y0K2dvKpOyuR+OJv0OwWIJAJPuLodMkYtJHUYmTbf6MG8YgYapAiPLz+E/CHFHv25B+O1ORRxhFn
+RghRy4YUVD+8M/5+bJz/Fp0YvVGONaanZshyZ9shZrHUm3gDwFA66Mzw3LyeTP6vBZY1H1dat//O
++T23LLb2VN3I5xI6Ta5MirdcmrS3ID3KfyI0rn47aGYBROcBTkZTmzNg95S+UzeQc0PzMsNT79uq
+/nROacdrjGCT3sTHDN/hMq7MkztReJVni+49Vv4M0GkPGw/zJSZrM233bkf6c0Plfg6lZrEpfDKE
+Y1WJxA3Bk1QwGROs0303p+tdOmw1XNtB1xLaqUkL39iAigmTYo61Zs8liM2EuLE/pDkP2QKe6xJM
+lXzzawWpXhaDzLhn4ugTncxbgtNMs+1b/97lc6wjOy0AvzVVdAlJ2ElYGn+SNuZRkg7zJn0cTRe8
+yexDJtC/QV9AqURE9JnnV4eeUB9XVKg+/XRjL7FQZQnmWEIuQxpMtPAlR1n6BB6T1CZGSlCBst6+
+eLf8ZxXhyVeEHg9j1uliutZfVS7qXMYoCAQlObgOK6nyTJccBz8NUvXt7y+CDwIDAQABo0IwQDAd
+BgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rIDZsswDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAFzUfA3P9wF9QZllDHPFUp/L+M+ZBn8b2kMVn54CVVeW
+FPFSPCeHlCjtHzoBN6J2/FNQwISbxmtOuowhT6KOVWKR82kV2LyI48SqC/3vqOlLVSoGIG1VeCkZ
+7l8wXEskEVX/JJpuXior7gtNn3/3ATiUFJVDBwn7YKnuHKsSjKCaXqeYalltiz8I+8jRRa8YFWSQ
+Eg9zKC7F4iRO/Fjs8PRF/iKz6y+O0tlFYQXBl2+odnKPi4w2r78NBc5xjeambx9spnFixdjQg3IM
+8WcRiQycE0xyNN+81XHfqnHd4blsjDwSXWXavVcStkNr/+XeTWYRUc+ZruwXtuhxkYzeSf7dNXGi
+FSeUHM9h4ya7b6NnJSFd5t0dCy5oGzuCr+yDZ4XUmFF0sbmZgIn/f3gZXHlKYC6SQK5MNyosycdi
+yA5d9zZbyuAlJQG03RoHnHcAP9Dc1ew91Pq7P8yF1m9/qS3fuQL39ZeatTXaw2ewh0qpKJ4jjv9c
+J2vhsE/zB+4ALtRZh8tSQZXq9EfX7mRBVXyNWQKV3WKdwrnuWih0hKWbt5DHDAff9Yk2dDLWKMGw
+sAvgnEzDHNb842m1R0aBL6KCq9NjRHDEjf8tM7qtj3u1cIiuPhnPQCjY/MiQu12ZIvVS5ljFH4gx
+Q+6IHdfGjjxDah2nGN59PRbxYvnKkKj9
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert093.pem b/test/rules/platform_certs/default/cert093.pem
new file mode 100644
index 000000000000..ce0daaec8095
--- /dev/null
+++ b/test/rules/platform_certs/default/cert093.pem
@@ -0,0 +1,15 @@
+USERTrust ECC Certification Authority
+-----BEGIN CERTIFICATE-----
+MIICjzCCAhWgAwIBAgIQXIuZxVqUxdJxVt7NiYDMJjAKBggqhkjOPQQDAzCBiDELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
+aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwHhcNMTAwMjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
+aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQarFRaqfloI+d61SRvU8Za2EurxtW2
+0eZzca7dnNYMYf3boIkDuAUU7FfO7l0/4iGzzvfUinngo4N+LZfQYcTxmdwlkWOrfzCjtHDix6Ez
+nPO/LlxTsV+zfTJ/ijTjeXmjQjBAMB0GA1UdDgQWBBQ64QmG1M8ZwpZ2dEl23OA1xmNjmjAOBgNV
+HQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjA2Z6EWCNzklwBB
+HU6+4WMBzzuqQhFkoJ2UOQIReVx7Hfpkue4WQrO/isIJxOzksU0CMQDpKmFHjFJKS04YcPbWRNZu
+9YO6bVi9JNlWSOrvxKJGgYhqOkbRqZtNyWHa0V1Xahg=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert094.pem b/test/rules/platform_certs/default/cert094.pem
new file mode 100644
index 000000000000..b05ff11c8649
--- /dev/null
+++ b/test/rules/platform_certs/default/cert094.pem
@@ -0,0 +1,12 @@
+GlobalSign ECC Root CA - R4
+-----BEGIN CERTIFICATE-----
+MIIB4TCCAYegAwIBAgIRKjikHJYKBN5CsiilC+g0mAIwCgYIKoZIzj0EAwIwUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEuMZ5049sJQ6fLjkZHAOkrprl
+OQcJFspjsbmG+IpXwVfOQvpzofdlQv8ewQCybnMO/8ch5RikqtlxP6jUuc6MHaNCMEAwDgYDVR0P
+AQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFSwe61FuOJAf/sKbvu+M8k8o4TV
+MAoGCCqGSM49BAMCA0gAMEUCIQDckqGgE6bPA7DmxCGXkPoUVy0D7O48027KqGx2vKLeuwIgJ6iF
+JzWbVsaj8kfSt24bAgAXqmemFZHe+pTsewv4n4Q=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert095.pem b/test/rules/platform_certs/default/cert095.pem
new file mode 100644
index 000000000000..d6cef1e9cb2c
--- /dev/null
+++ b/test/rules/platform_certs/default/cert095.pem
@@ -0,0 +1,13 @@
+GlobalSign ECC Root CA - R5
+-----BEGIN CERTIFICATE-----
+MIICHjCCAaSgAwIBAgIRYFlJ4CYuu1X5CneKcflK2GwwCgYIKoZIzj0EAwMwUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAER0UOlvt9Xb/pOdEh+J8LttV7HpI6
+SFkc8GIxLcB6KP4ap1yztsyX50XUWPrRd21DosCHZTQKH3rd6zwzocWdTaRvQZU4f8kehOvRnkmS
+h5SHDDqFSmafnVmTTZdhBoZKo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
+BgNVHQ4EFgQUPeYpSJvqB8ohREom3m7e0oPQn1kwCgYIKoZIzj0EAwMDaAAwZQIxAOVpEslu28Yx
+uglB4Zf4+/2a4n0Sye18ZNPLBSWLVtmg515dTguDnFt2KaAJJiFqYgIwcdK1j1zqO+F4CYWodZI7
+yFz9SO8NdCKoCOJuxUnOxwy8p2Fp8fc74SrL+SvzZpA3
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert096.pem b/test/rules/platform_certs/default/cert096.pem
new file mode 100644
index 000000000000..34e8c0665ecb
--- /dev/null
+++ b/test/rules/platform_certs/default/cert096.pem
@@ -0,0 +1,28 @@
+Staat der Nederlanden Root CA - G3
+-----BEGIN CERTIFICATE-----
+MIIFdDCCA1ygAwIBAgIEAJiiOTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+Um9vdCBDQSAtIEczMB4XDTEzMTExNDExMjg0MloXDTI4MTExMzIzMDAwMFowWjELMAkGA1UEBhMC
+TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
+ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL4y
+olQPcPssXFnrbMSkUeiFKrPMSjTysF/zDsccPVMeiAho2G89rcKezIJnByeHaHE6n3WWIkYFsO2t
+x1ueKt6c/DrGlaf1F2cY5y9JCAxcz+bMNO14+1Cx3Gsy8KL+tjzk7FqXxz8ecAgwoNzFs21v0IJy
+EavSgWhZghe3eJJg+szeP4TrjTgzkApyI/o1zCZxMdFyKJLZWyNtZrVtB0LrpjPOktvA9mxjeM3K
+Tj215VKb8b475lRgsGYeCasH/lSJEULR9yS6YHgamPfJEf0WwTUaVHXvQ9Plrk7O53vDxk5hUUur
+mkVLoR9BvUhTFXFkC4az5S6+zqQbwSmEorXLCCN2QyIkHxcE1G6cxvx/K2Ya7Irl1s9N9WMJtxU5
+1nus6+N86U78dULI7ViVDAZCopz35HCz33JvWjdAidiFpNfxC95DGdRKWCyMijmev4SH8RY7Ngzp
+07TKbBlBUgmhHbBqv4LvcFEhMtwFdozL92TkA1CvjJFnq8Xy7ljY3r735zHPbMk7ccHViLVlvMDo
+FxcHErVc0qsgk7TmgoNwNsXNo42ti+yjwUOH5kPiNL6VizXtBznaqB16nzaeErAMZRKQFWDZJkBE
+41ZgpRDUajz9QdwOWke275dhdU/Z/seyHdTtXUmzqWrLZoQT1Vyg3N9udwbRcXXIV2+vD3dbAgMB
+AAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRUrfrHkleu
+yjWcLhL75LpdINyUVzANBgkqhkiG9w0BAQsFAAOCAgEAMJmdBTLIXg47mAE6iqTnB/d6+Oea31BD
+U5cqPco8R5gu4RV78ZLzYdqQJRZlwJ9UXQ4DO1t3ApyEtg2YXzTdO2PCwyiBwpwpLiniyMMB8jPq
+KqrMCQj3ZWfGzd/TtiunvczRDnBfuCPRy5FOCvTIeuXZYzbB1N/8Ipf3YF3qKS9Ysr1YvY2WTxB1
+v0h7PVGHoTx0IsL8B3+A3MSs/mrBcDCw6Y5p4ixpgZQJut3+TcCDjJRYwEYgr5wfAvg1VUkvRtTA
+8KCWAg8zxXHzniN9lLf9OtMJgwYh/WA9rjLA0u6NpvDntIJ8CsxwyXmA+P5M9zWEGYox+wrZ13+b
+8KKaa8MFSu1BYBQw0aoRQm7TIwIEC8Zl3d1Sd9qBa7Ko+gE4uZbqKmxnl4mUnrzhVNXkanjvSr0r
+mj1AfsbAddJu+2gw7OyLnflJNZoaLNmzlTnVHpL3prllL+U9bTpITAjc5CgSKL59NVzq4BZ+Extq
+1z7XnvwtdbLBFNUjA9tbbws+eC8N3jONFrdI54OagQ97wUNNVQQXOEpR1VmiiXTTn74eS9fGbbeI
+JG9gkaSChVtWQbzQRKtqE77RLFi3EjNYsjdj3BP1lB0/QFH1T/U67cjF68IeHRaVesd+QnGTbksV
+tzDfqu1XhUisHWrdOWnk4Xl4vs4Fv6EM94B7IWcnMFk=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert097.pem b/test/rules/platform_certs/default/cert097.pem
new file mode 100644
index 000000000000..32293c551d92
--- /dev/null
+++ b/test/rules/platform_certs/default/cert097.pem
@@ -0,0 +1,28 @@
+Staat der Nederlanden EV Root CA
+-----BEGIN CERTIFICATE-----
+MIIFcDCCA1igAwIBAgIEAJiWjTANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSkwJwYDVQQDDCBTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+RVYgUm9vdCBDQTAeFw0xMDEyMDgxMTE5MjlaFw0yMjEyMDgxMTEwMjhaMFgxCzAJBgNVBAYTAk5M
+MR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xKTAnBgNVBAMMIFN0YWF0IGRlciBOZWRl
+cmxhbmRlbiBFViBSb290IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA48d+ifkk
+SzrSM4M1LGns3Amk41GoJSt5uAg94JG6hIXGhaTK5skuU6TJJB79VWZxXSzFYGgEt9nCUiY4iKTW
+O0Cmws0/zZiTs1QUWJZV1VD+hq2kY39ch/aO5ieSZxeSAgMs3NZmdO3dZ//BYY1jTw+bbRcwJu+r
+0h8QoPnFfxZpgQNH7R5ojXKhTbImxrpsX23Wr9GxE46prfNeaXUmGD5BKyF/7otdBwadQ8QpCiv8
+Kj6GyzyDOvnJDdrFmeK8eEEzduG/L13lpJhQDBXd4Pqcfzho0LKmeqfRMb1+ilgnQ7O6M5HTp5gV
+XJrm0w912fxBmJc+qiXbj5IusHsMX/FjqTf5m3VpTCgmJdrV8hJwRVXj33NeN/UhbJCONVrJ0yPr
+08C+eKxCKFhmpUZtcALXEPlLVPxdhkqHz3/KRawRWrUgUY0viEeXOcDPusBCAUCZSCELa6fS/ZbV
+0b5GnUngC6agIk440ME8MLxwjyx1zNDFjFE7PZQIZCZhfbnDZY8UnCHQqv0XcgOPvZuM5l5Tnrmd
+74K74bzickFbIZTTRTeU0d8JOV3nI6qaHcptqAqGhYqCvkIH1vI4gnPah1vlPNOePqc7nvQDs/nx
+fRN0Av+7oeX6AHkcpmZBiFxgV6YuCcS6/ZrPpx9Aw7vMWgpVSzs4dlG4Y4uElBbmVvMCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFP6rAJCYniT8qcwa
+ivsnuL8wbqg7MA0GCSqGSIb3DQEBCwUAA4ICAQDPdyxuVr5Os7aEAJSrR8kN0nbHhp8dB9O2tLsI
+eK9p0gtJ3jPFrK3CiAJ9Brc1AsFgyb/E6JTe1NOpEyVa/m6irn0F3H3zbPB+po3u2dfOWBfoqSmu
+c0iH55vKbimhZF8ZE/euBhD/UcabTVUlT5OZEAFTdfETzsemQUHSv4ilf0X8rLiltTMMgsT7B/Zq
+5SWEXwbKwYY5EdtYzXc7LMJMD16a4/CrPmEbUCTCwPTxGfARKbalGAKb12NMcIxHowNDXLldRqAN
+b/9Zjr7dn3LDWyvfjFvO5QxGbJKyCqNMVEIYFRIYvdr8unRu/8G2oGTYqV9Vrp9canaW2HNnh/tN
+f1zuacpzEPuKqf2evTY4SUmH9A4U8OmHuD+nT3pajnnUk+S7aFKErGzp85hwVXIy+TSrK0m1zSBi
+5Dp6Z2Orltxtrpfs/J92VoguZs9btsmksNcFuuEnL5O7Jiqik7Ab846+HUCjuTaPPoIaGl6I6lD4
+WeKDRikL40Rc4ZW2aZCaFG+XroHPaO+Zmr615+F/+PoTRxZMzG0IQOeLeG9QgkRQP2YGiqtDhFZK
+DyAthg710tvSeopLzaXoTvFeJiUBWSOgftL2fiFX1ye8FVdMpEbB4IMeDExNH08GGeL5qPQ6gqGy
+eUN51q1veieQA6TqJIc/2b3Z6fJfUEkc7uzXLg==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert098.pem b/test/rules/platform_certs/default/cert098.pem
new file mode 100644
index 000000000000..d14ca1f12bc8
--- /dev/null
+++ b/test/rules/platform_certs/default/cert098.pem
@@ -0,0 +1,28 @@
+IdenTrust Commercial Root CA 1
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIQCgFCgAAAAUUjyES1AAAAAjANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQG
+EwJVUzESMBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBS
+b290IENBIDEwHhcNMTQwMTE2MTgxMjIzWhcNMzQwMTE2MTgxMjIzWjBKMQswCQYDVQQGEwJVUzES
+MBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBSb290IENB
+IDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnUBneP5k91DNG8W9RYYKyqU+PZ4ld
+hNlT3Qwo2dfw/66VQ3KZ+bVdfIrBQuExUHTRgQ18zZshq0PirK1ehm7zCYofWjK9ouuU+ehcCuz/
+mNKvcbO0U59Oh++SvL3sTzIwiEsXXlfEU8L2ApeN2WIrvyQfYo3fw7gpS0l4PJNgiCL8mdo2yMKi
+1CxUAGc1bnO/AljwpN3lsKImesrgNqUZFvX9t++uP0D1bVoE/c40yiTcdCMbXTMTEl3EASX2MN0C
+XZ/g1Ue9tOsbobtJSdifWwLziuQkkORiT0/Br4sOdBeo0XKIanoBScy0RnnGF7HamB4HWfp1IYVl
+3ZBWzvurpWCdxJ35UrCLvYf5jysjCiN2O/cz4ckA82n5S6LgTrx+kzmEB/dEcH7+B1rlsazRGMzy
+NeVJSQjKVsk9+w8YfYs7wRPCTY/JTw436R+hDmrfYi7LNQZReSzIJTj0+kuniVyc0uMNOYZKdHzV
+WYfCP04MXFL0PfdSgvHqo6z9STQaKPNBiDoT7uje/5kdX7rL6B7yuVBgwDHTc+XvvqDtMwt0viAg
+xGds8AgDelWAf0ZOlqf0Hj7h9tgJ4TNkK2PXMl6f+cB7D3hvl7yTmvmcEpB4eoCHFddydJxVdHix
+uuFucAS6T6C6aMN7/zHwcz09lCqxC0EOoP5NiGVreTO01wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU7UQZwNPwBovupHu+QucmVMiONnYwDQYJKoZI
+hvcNAQELBQADggIBAA2ukDL2pkt8RHYZYR4nKM1eVO8lvOMIkPkp165oCOGUAFjvLi5+U1KMtlwH
+6oi6mYtQlNeCgN9hCQCTrQ0U5s7B8jeUeLBfnLOic7iPBZM4zY0+sLj7wM+x8uwtLRvM7Kqas6pg
+ghstO8OEPVeKlh6cdbjTMM1gCIOQ045U8U1mwF10A0Cj7oV+wh93nAbowacYXVKV7cndJZ5t+qnt
+ozo00Fl72u1Q8zW/7esUTTHHYPTa8Yec4kjixsU3+wYQ+nVZZjFHKdp2mhzpgq7vmrlR94gjmmmV
+YjzlVYA211QC//G5Xc7UI2/YRYRKW2XviQzdFKcgyxilJbQN+QHwotL0AMh0jqEqSI5l2xPE4iUX
+feu+h1sXIFRRk0pTAwvsXcoz7WL9RccvW9xYoIA55vrX/hMUpu09lEpCdNTDd1lzzY9GvlU47/ro
+kTLql1gEIt44w8y8bckzOmoKaT+gyOpyj4xjhiO9bTyWnpXgSUyqorkqG5w2gXjtw+hG4iZZRHUe
+2XWJUc0QhJ1hYMtd+ZciTY6Y5uN/9lu7rs3KSoFrXgvzUeF0K+l+J6fZmUlO+KWA2yUPHGNiiskz
+Z2s8EIPGrd6ozRaOjfAHN3Gf8qv8QfXBi+wAN10J5U6A7/qxXDgGpRtK4dw4LTzcqx+QGtVKnO7R
+cGzM7vRX+Bi6hG6H
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert099.pem b/test/rules/platform_certs/default/cert099.pem
new file mode 100644
index 000000000000..294e36711366
--- /dev/null
+++ b/test/rules/platform_certs/default/cert099.pem
@@ -0,0 +1,28 @@
+IdenTrust Public Sector Root CA 1
+-----BEGIN CERTIFICATE-----
+MIIFZjCCA06gAwIBAgIQCgFCgAAAAUUjz0Z8AAAAAjANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQG
+EwJVUzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3Rv
+ciBSb290IENBIDEwHhcNMTQwMTE2MTc1MzMyWhcNMzQwMTE2MTc1MzMyWjBNMQswCQYDVQQGEwJV
+UzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3RvciBS
+b290IENBIDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2IpT8pEiv6EdrCvsnduTy
+P4o7ekosMSqMjbCpwzFrqHd2hCa2rIFCDQjrVVi7evi8ZX3yoG2LqEfpYnYeEe4IFNGyRBb06tD6
+Hi9e28tzQa68ALBKK0CyrOE7S8ItneShm+waOh7wCLPQ5CQ1B5+ctMlSbdsHyo+1W/CD80/HLaXI
+rcuVIKQxKFdYWuSNG5qrng0M8gozOSI5Cpcu81N3uURF/YTLNiCBWS2ab21ISGHKTN9T0a9SvESf
+qy9rg3LvdYDaBjMbXcjaY8ZNzaxmMc3R3j6HEDbhuaR672BQssvKplbgN6+rNBM5Jeg5ZuSYeqoS
+mJxZZoY+rfGwyj4GD3vwEUs3oERte8uojHH01bWRNszwFcYr3lEXsZdMUD2xlVl8BX0tIdUAvwFn
+ol57plzy9yLxkA2T26pEUWbMfXYD62qoKjgZl3YNa4ph+bz27nb9cCvdKTz4Ch5bQhyLVi9VGxyh
+LrXHFub4qjySjmm2AcG1hp2JDws4lFTo6tyePSW8Uybt1as5qsVATFSrsrTZ2fjXctscvG29ZV/v
+iDUqZi/u9rNl8DONfJhBaUYPQxxp+pu10GFqzcpL2UyQRqsVWaFHVCkugyhfHMKiq3IXAAaOReyL
+4jM9f9oZRORicsPfIsbyVtTdX5Vy7W1f90gDW/3FKqD2cyOEEBsB5wIDAQABo0IwQDAOBgNVHQ8B
+Af8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU43HgntinQtnbcZFrlJPrw6PRFKMw
+DQYJKoZIhvcNAQELBQADggIBAEf63QqwEZE4rU1d9+UOl1QZgkiHVIyqZJnYWv6IAcVYpZmxI1Qj
+t2odIFflAWJBF9MJ23XLblSQdf4an4EKwt3X9wnQW3IV5B4Jaj0z8yGa5hV+rVHVDRDtfULAj+7A
+mgjVQdZcDiFpboBhDhXAuM/FSRJSzL46zNQuOAXeNf0fb7iAaJg9TaDKQGXSc3z1i9kKlT/YPyNt
+GtEqJBnZhbMX73huqVjRI9PHE+1yJX9dsXNw0H8GlwmEKYBhHfpe/3OsoOOJuBxxFcbeMX8S3OFt
+m6/n6J91eEyrRjuazr8FGF1NFTwWmhlQBJqymm9li1JfPFgEKCXAZmExfrngdbkaqIHWchezxQMx
+NRF4eKLg6TCMf4DfWN88uieW4oA0beOY02QnrEh+KHdcxiVhJfiFDGX6xDIvpZgF5PgLZxYWxoK4
+Mhn5+bl53B/N66+rDt0b20XkeucC4pVd/GnwU2lhlXV5C15V5jgclKlZM57IcXR5f1GJtshquDDI
+ajjDbp7hNxbqBWJMWxJH7ae0s1hWx0nzfxJoCTFx8G34Tkf71oXuxVhAGaQdp/lLQzfcaFpPz+vC
+ZHTetBXZ9FRUGi8c15dxVJCO2SCdUyt/q4/i6jC8UDfv8Ue1fXwsBOxonbRJRBD0ckscZOf85muQ
+3Wl9af0AVqW3rLatt8o+Ae+c
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert100.pem b/test/rules/platform_certs/default/cert100.pem
new file mode 100644
index 000000000000..af749d22d793
--- /dev/null
+++ b/test/rules/platform_certs/default/cert100.pem
@@ -0,0 +1,23 @@
+Entrust Root Certification Authority - G2
+-----BEGIN CERTIFICATE-----
+MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMCVVMxFjAUBgNV
+BAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVy
+bXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ug
+b25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIw
+HhcNMDkwNzA3MTcyNTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoT
+DUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVybXMx
+OTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25s
+eTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP
+/vaCeb9zYQYKpSfYs1/TRU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXz
+HHfV1IWNcCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hWwcKU
+s/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1U1+cPvQXLOZprE4y
+TGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0jaWvYkxN4FisZDQSA/i2jZRjJKRx
+AgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ6
+0B7vfec7aVHUbI2fkBJmqzANBgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5Z
+iXMRrEPR9RP/jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ
+Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v1fN2D807iDgi
+nWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4RnAuknZoh8/CbCzB428Hch0P+
+vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmHVHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xO
+e4pIb4tF9g==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert101.pem b/test/rules/platform_certs/default/cert101.pem
new file mode 100644
index 000000000000..706aa90b130e
--- /dev/null
+++ b/test/rules/platform_certs/default/cert101.pem
@@ -0,0 +1,17 @@
+Entrust Root Certification Authority - EC1
+-----BEGIN CERTIFICATE-----
+MIIC+TCCAoCgAwIBAgINAKaLeSkAAAAAUNCR+TAKBggqhkjOPQQDAzCBvzELMAkGA1UEBhMCVVMx
+FjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVn
+YWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDEyIEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXpl
+ZCB1c2Ugb25seTEzMDEGA1UEAxMqRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+IC0gRUMxMB4XDTEyMTIxODE1MjUzNloXDTM3MTIxODE1NTUzNlowgb8xCzAJBgNVBAYTAlVTMRYw
+FAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2Fs
+LXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxMiBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQg
+dXNlIG9ubHkxMzAxBgNVBAMTKkVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAt
+IEVDMTB2MBAGByqGSM49AgEGBSuBBAAiA2IABIQTydC6bUF74mzQ61VfZgIaJPRbiWlH47jCffHy
+AsWfoPZb1YsGGYZPUxBtByQnoaD41UcZYUx9ypMn6nQM72+WCf5j7HBdNq1nd67JnXxVRDqiY1Ef
+9eNi1KlHBz7MIKNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FLdj5xrdjekIplWDpOBqUEFlEUJJMAoGCCqGSM49BAMDA2cAMGQCMGF52OVCR98crlOZF7ZvHH3h
+vxGU0QOIdeSNiaSKd0bebWHvAvX7td/M/k7//qnmpwIwW5nXhTcGtXsI/esni0qU+eH6p44mCOh8
+kmhtc9hvJqwhAriZtyZBWyVgrtBIGu4G
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert102.pem b/test/rules/platform_certs/default/cert102.pem
new file mode 100644
index 000000000000..b3a47b9738e2
--- /dev/null
+++ b/test/rules/platform_certs/default/cert102.pem
@@ -0,0 +1,28 @@
+CFCA EV ROOT
+-----BEGIN CERTIFICATE-----
+MIIFjTCCA3WgAwIBAgIEGErM1jANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJDTjEwMC4GA1UE
+CgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQDDAxDRkNB
+IEVWIFJPT1QwHhcNMTIwODA4MDMwNzAxWhcNMjkxMjMxMDMwNzAxWjBWMQswCQYDVQQGEwJDTjEw
+MC4GA1UECgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQD
+DAxDRkNBIEVWIFJPT1QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDXXWvNED8fBVnV
+BU03sQ7smCuOFR36k0sXgiFxEFLXUWRwFsJVaU2OFW2fvwwbwuCjZ9YMrM8irq93VCpLTIpTUnrD
+7i7es3ElweldPe6hL6P3KjzJIx1qqx2hp/Hz7KDVRM8Vz3IvHWOX6Jn5/ZOkVIBMUtRSqy5J35DN
+uF++P96hyk0g1CXohClTt7GIH//62pCfCqktQT+x8Rgp7hZZLDRJGqgG16iI0gNyejLi6mhNbiyW
+ZXvKWfry4t3uMCz7zEasxGPrb382KzRzEpR/38wmnvFyXVBlWY9ps4deMm/DGIq1lY+wejfeWkU7
+xzbh72fROdOXW3NiGUgthxwG+3SYIElz8AXSG7Ggo7cbcNOIabla1jj0Ytwli3i/+Oh+uFzJlU9f
+py25IGvPa931DfSCt/SyZi4QKPaXWnuWFo8BGS1sbn85WAZkgwGDg8NNkt0yxoekN+kWzqotaK8K
+gWU6cMGbrU1tVMoqLUuFG7OA5nBFDWteNfB/O7ic5ARwiRIlk9oKmSJgamNgTnYGmE69g60dWIol
+hdLHZR4tjsbftsbhf4oEIRUpdPA+nJCdDC7xij5aqgwJHsfVPKPtl8MeNPo4+QgO48BdK4PRVmrJ
+tqhUUy54Mmc9gn900PvhtgVguXDbjgv5E1hvcWAQUhC5wUEJ73IfZzF4/5YFjQIDAQABo2MwYTAf
+BgNVHSMEGDAWgBTj/i39KNALtbq2osS/BqoFjJP7LzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
+/wQEAwIBBjAdBgNVHQ4EFgQU4/4t/SjQC7W6tqLEvwaqBYyT+y8wDQYJKoZIhvcNAQELBQADggIB
+ACXGumvrh8vegjmWPfBEp2uEcwPenStPuiB/vHiyz5ewG5zz13ku9Ui20vsXiObTej/tUxPQ4i9q
+ecsAIyjmHjdXNYmEwnZPNDatZ8POQQaIxffu2Bq41gt/UP+TqhdLjOztUmCypAbqTuv0axn96/Ua
+4CUqmtzHQTb3yHQFhDmVOdYLO6Qn+gjYXB74BGBSESgoA//vU2YApUo0FmZ8/Qmkrp5nGm9BC2sG
+E5uPhnEFtC+NiWYzKXZUmhH4J/qyP5Hgzg0b8zAarb8iXRvTvyUFTeGSGn+ZnzxEk8rUQElsgIfX
+BDrDMlI1Dlb4pd19xIsNER9Tyx6yF7Zod1rg1MvIB671Oi6ON7fQAUtDKXeMOZePglr4UeWJoBjn
+aH9dCi77o0cOPaYjesYBx4/IXr9tgFa+iiS6M+qf4TIRnvHST4D2G0CvOJ4RUHlzEhLN5mydLIhy
+PDCBBpEi6lmt2hkuIsKNuYyH4Ga8cyNfIWRjgEj1oDwYPZTISEEdQLpe/v5WOaHIz16eGWRGENoX
+kbcFgKyLmZJ956LYBws2J+dIeWCKw9cTXPhyQN9Ky8+ZAAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3C
+ekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert103.pem b/test/rules/platform_certs/default/cert103.pem
new file mode 100644
index 000000000000..8bd0e06bfcad
--- /dev/null
+++ b/test/rules/platform_certs/default/cert103.pem
@@ -0,0 +1,20 @@
+OISTE WISeKey Global Root GB CA
+-----BEGIN CERTIFICATE-----
+MIIDtTCCAp2gAwIBAgIQdrEgUnTwhYdGs/gjGvbCwDANBgkqhkiG9w0BAQsFADBtMQswCQYDVQQG
+EwJDSDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl
+ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQiBDQTAeFw0xNDEyMDExNTAw
+MzJaFw0zOTEyMDExNTEwMzFaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYD
+VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEds
+b2JhbCBSb290IEdCIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Be3HEokKtaX
+scriHvt9OO+Y9bI5mE4nuBFde9IllIiCFSZqGzG7qFshISvYD06fWvGxWuR51jIjK+FTzJlFXHtP
+rby/h0oLS5daqPZI7H17Dc0hBt+eFf1Biki3IPShehtX1F1Q/7pn2COZH8g/497/b1t3sWtuuMlk
+9+HKQUYOKXHQuSP8yYFfTvdv37+ErXNku7dCjmn21HYdfp2nuFeKUWdy19SouJVUQHMD9ur06/4o
+Qnc/nSMbsrY9gBQHTC5P99UKFg29ZkM3fiNDecNAhvVMKdqOmq0NpQSHiB6F4+lT1ZvIiwNjeOvg
+GUpuuy9rM2RYk61pv48b74JIxwIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUNQ/INmNe4qPs+TtmFc5RUuORmj0wEAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZI
+hvcNAQELBQADggEBAEBM+4eymYGQfp3FsLAmzYh7KzKNbrghcViXfa43FK8+5/ea4n32cZiZBKpD
+dHij40lhPnOMTZTg+XHEthYOU3gf1qKHLwI5gSk8rxWYITD+KJAAjNHhy/peyP34EEY7onhCkRd0
+VQreUGdNZtGn//3ZwLWoo4rOZvUPQ82nK1d7Y0Zqqi5S2PTt4W2tKZB4SLrhI6qjiey1q5bAtEui
+HZeeevJuQHHfaPFlTc58Bd9TZaml8LGXBHAVRgOY1NK/VLSgWH1Sb9pWJmLU2NuJMW8c8CLC02Ic
+Nc1MaRVUGpCY3useX8p3x8uOPUNpnJpY0CQ73xtAln41rYHHTnG6iBM=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert104.pem b/test/rules/platform_certs/default/cert104.pem
new file mode 100644
index 000000000000..e6857a0e56b5
--- /dev/null
+++ b/test/rules/platform_certs/default/cert104.pem
@@ -0,0 +1,19 @@
+SZAFIR ROOT CA2
+-----BEGIN CERTIFICATE-----
+MIIDcjCCAlqgAwIBAgIUPopdB+xV0jLVt+O2XwHrLdzk1uQwDQYJKoZIhvcNAQELBQAwUTELMAkG
+A1UEBhMCUEwxKDAmBgNVBAoMH0tyYWpvd2EgSXpiYSBSb3psaWN6ZW5pb3dhIFMuQS4xGDAWBgNV
+BAMMD1NaQUZJUiBST09UIENBMjAeFw0xNTEwMTkwNzQzMzBaFw0zNTEwMTkwNzQzMzBaMFExCzAJ
+BgNVBAYTAlBMMSgwJgYDVQQKDB9LcmFqb3dhIEl6YmEgUm96bGljemVuaW93YSBTLkEuMRgwFgYD
+VQQDDA9TWkFGSVIgUk9PVCBDQTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3vD5Q
+qEvNQLXOYeeWyrSh2gwisPq1e3YAd4wLz32ohswmUeQgPYUM1ljj5/QqGJ3a0a4m7utT3PSQ1hNK
+DJA8w/Ta0o4NkjrcsbH/ON7Dui1fgLkCvUqdGw+0w8LBZwPd3BucPbOw3gAeqDRHu5rr/gsUvTaE
+2g0gv/pby6kWIK05YO4vdbbnl5z5Pv1+TW9NL++IDWr63fE9biCloBK0TXC5ztdyO4mTp4CEHCdJ
+ckm1/zuVnsHMyAHs6A6KCpbns6aH5db5BSsNl0BwPLqsdVqc1U2dAgrSS5tmS0YHF2Wtn2yIANwi
+ieDhZNRnvDF5YTy7ykHNXGoAyDw4jlivAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P
+AQH/BAQDAgEGMB0GA1UdDgQWBBQuFqlKGLXLzPVvUPMjX/hd56zwyDANBgkqhkiG9w0BAQsFAAOC
+AQEAtXP4A9xZWx126aMqe5Aosk3AM0+qmrHUuOQn/6mWmc5G4G18TKI4pAZw8PRBEew/R40/cof5
+O/2kbytTAOD/OblqBw7rHRz2onKQy4I9EYKL0rufKq8h5mOGnXkZ7/e7DDWQw4rtTw/1zBLZpD67
+oPwglV9PJi8RI4NOdQcPv5vRtB3pEAT+ymCPoky4rc/hkA/NrgrHXXu3UNLUYfrVFdvXn4dRVOul
+4+vJhaAlIDf7js4MNIThPIGyd05DpYhfhmehPea0XGG2Ptv+tyjFogeutcrKjSoS75ftwjCkySp6
++/NNIxuZMzSgLvWpCz/UXeHPhJ/iGcJfitYgHuNztw==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert105.pem b/test/rules/platform_certs/default/cert105.pem
new file mode 100644
index 000000000000..7634cab47ebd
--- /dev/null
+++ b/test/rules/platform_certs/default/cert105.pem
@@ -0,0 +1,30 @@
+Certum Trusted Network CA 2
+-----BEGIN CERTIFICATE-----
+MIIF0jCCA7qgAwIBAgIQIdbQSk8lD8kyN/yqXhKN6TANBgkqhkiG9w0BAQ0FADCBgDELMAkGA1UE
+BhMCUEwxIjAgBgNVBAoTGVVuaXpldG8gVGVjaG5vbG9naWVzIFMuQS4xJzAlBgNVBAsTHkNlcnR1
+bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEkMCIGA1UEAxMbQ2VydHVtIFRydXN0ZWQgTmV0d29y
+ayBDQSAyMCIYDzIwMTExMDA2MDgzOTU2WhgPMjA0NjEwMDYwODM5NTZaMIGAMQswCQYDVQQGEwJQ
+TDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5MSQwIgYDVQQDExtDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENB
+IDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC9+Xj45tWADGSdhhuWZGc/IjoedQF9
+7/tcZ4zJzFxrqZHmuULlIEub2pt7uZld2ZuAS9eEQCsn0+i6MLs+CRqnSZXvK0AkwpfHp+6bJe+o
+CgCXhVqqndwpyeI1B+twTUrWwbNWuKFBOJvR+zF/j+Bf4bE/D44WSWDXBo0Y+aomEKsq09DRZ40b
+Rr5HMNUuctHFY9rnY3lEfktjJImGLjQ/KUxSiyqnwOKRKIm5wFv5HdnnJ63/mgKXwcZQkpsCLL2p
+uTRZCr+ESv/f/rOf69me4Jgj7KZrdxYq28ytOxykh9xGc14ZYmhFV+SQgkK7QtbwYeDBoz1mo130
+GO6IyY0XRSmZMnUCMe4pJshrAua1YkV/NxVaI2iJ1D7eTiew8EAMvE0Xy02isx7QBlrd9pPPV3WZ
+9fqGGmd4s7+W/jTcvedSVuWz5XV710GRBdxdaeOVDUO5/IOWOZV7bIBaTxNyxtd9KXpEulKkKtVB
+Rgkg/iKgtlswjbyJDNXXcPiHUv3a76xRLgezTv7QCdpw75j6VuZt27VXS9zlLCUVyJ4ueE742pye
+hizKV/Ma5ciSixqClnrDvFASadgOWkaLOusm+iPJtrCBvkIApPjW/jAux9JG9uWOdf3yzLnQh1vM
+BhBgu4M1t15n3kfsmUjxpKEV/q2MYo45VU85FrmxY53/twIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdDgQWBBS2oVQ5AsOgP46KvPrU+Bym0ToO/TAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZI
+hvcNAQENBQADggIBAHGlDs7k6b8/ONWJWsQCYftMxRQXLYtPU2sQF/xlhMcQSZDe28cmk4gmb3DW
+Al45oPePq5a1pRNcgRRtDoGCERuKTsZPpd1iHkTfCVn0W3cLN+mLIMb4Ck4uWBzrM9DPhmDJ2vuA
+L55MYIR4PSFk1vtBHxgP58l1cb29XN40hz5BsA72udY/CROWFC/emh1auVbONTqwX3BNXuMp8SMo
+clm2q8KMZiYcdywmdjWLKKdpoPk79SPdhRB0yZADVpHnr7pH1BKXESLjokmUbOe3lEu6LaTaM4tM
+pkT/WjzGHWTYtTHkpjx6qFcL2+1hGsvxznN3Y6SHb0xRONbkX8eftoEq5IVIeVheO/jbAoJnwTnb
+w3RLPTYe+SmTiGhbqEQZIfCn6IENLOiTNrQ3ssqwGyZ6miUfmpqAnksqP/ujmv5zMnHCnsZy4Ypo
+J/HkD7TETKVhk/iXEAcqMCWpuchxuO9ozC1+9eB+D4Kob7a6bINDd82Kkhehnlt4Fj1F4jNy3eFm
+ypnTycUm/Q1oBEauttmbjL4ZvrHG8hnjXALKLNhvSgfZyTXaQHXyxKcZb55CEJh15pWLYLztxRLX
+is7VmFxWlgPF7ncGNf/P5O4/E2Hu29othfDNrp2yGAlFw5Khchf8R7agCyzxxN5DaAhqXzvwdmP7
+zAYspsbiDrW5viSP
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert106.pem b/test/rules/platform_certs/default/cert106.pem
new file mode 100644
index 000000000000..d982ddd9c97c
--- /dev/null
+++ b/test/rules/platform_certs/default/cert106.pem
@@ -0,0 +1,31 @@
+Hellenic Academic and Research Institutions RootCA 2015
+-----BEGIN CERTIFICATE-----
+MIIGCzCCA/OgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcT
+BkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0
+aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNVBAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNl
+YXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIwMTUwHhcNMTUwNzA3MTAxMTIxWhcNNDAwNjMwMTAx
+MTIxWjCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMg
+QWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNV
+BAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIw
+MTUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDC+Kk/G4n8PDwEXT2QNrCROnk8Zlrv
+bTkBSRq0t89/TSNTt5AA4xMqKKYx8ZEA4yjsriFBzh/a/X0SWwGDD7mwX5nh8hKDgE0GPt+sr+eh
+iGsxr/CL0BgzuNtFajT0AoAkKAoCFZVedioNmToUW/bLy1O8E00BiDeUJRtCvCLYjqOWXjrZMts+
+6PAQZe104S+nfK8nNLspfZu2zwnI5dMK/IhlZXQK3HMcXM1AsRzUtoSMTFDPaI6oWa7CJ06CojXd
+FPQf/7J31Ycvqm59JCfnxssm5uX+Zwdj2EUN3TpZZTlYepKZcj2chF6IIbjV9Cz82XBST3i4vTwr
+i5WY9bPRaM8gFH5MXF/ni+X1NYEZN9cRCLdmvtNKzoNXADrDgfgXy5I2XdGj2HUb4Ysn6npIQf1F
+GQatJ5lOwXBH3bWfgVMS5bGMSF0xQxfjjMZ6Y5ZLKTBOhE5iGV48zpeQpX8B653g+IuJ3SWYPZK2
+fu/Z8VFRfS0myGlZYeCsargqNhEEelC9MoS+L9xy1dcdFkfkR2YgP/SWxa+OAXqlD3pk9Q0Yh9mu
+iNX6hME6wGkoLfINaFGq46V3xqSQDqE3izEjR8EJCOtu93ib14L8hCCZSRm2Ekax+0VVFqmjZayc
+Bw/qa9wfLgZy7IaIEuQt218FL+TwA9MmM+eAws1CoRc0CwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUcRVnyMjJvXVdctA4GGqd83EkVAswDQYJKoZI
+hvcNAQELBQADggIBAHW7bVRLqhBYRjTyYtcWNl0IXtVsyIe9tC5G8jH4fOpCtZMWVdyhDBKg2mF+
+D1hYc2Ryx+hFjtyp8iY/xnmMsVMIM4GwVhO+5lFc2JsKT0ucVlMC6U/2DWDqTUJV6HwbISHTGzrM
+d/K4kPFox/la/vot9L/J9UUbzjgQKjeKeaO04wlshYaT/4mWJ3iBj2fjRnRUjtkNaeJK9E10A/+y
+d+2VZ5fkscWrv2oj6NSU4kQoYsRL4vDY4ilrGnB+JGGTe08DMiUNRSQrlrRGar9KC/eaj8GsGsVn
+82800vpzY4zvFrCopEYq+OsS7HK07/grfoxSwIuEVPkvPuNVqNxmsdnhX9izjFk0WaSrT2y7Hxjb
+davYy5LNlDhhDgcGH0tGEPEVvo2FXDtKK4F5D7Rpn0lQl033DlZdwJVqwjbDG2jJ9SrcR5q+ss7F
+Jej6A7na+RZukYT1HCjI/CbM1xyQVqdfbzoEvM14iQuODy+jqk+iGxI9FghAD/FGTNeqewjBCvVt
+J94Cj8rDtSvK6evIIVM4pcw72Hc3MKJP2W/R8kCtQXoXxdZKNYm3QdV8hn9VTYNKpXMgwDqvkPGa
+JI7ZjnHKe7iG2rKPmT4dEw0SEe7Uq/DpFXYC5ODfqiAeW2GFZECpkJcNrVPSWh2HagCXZWK0vm9q
+p/UsQu0yrbYhnr68
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert107.pem b/test/rules/platform_certs/default/cert107.pem
new file mode 100644
index 000000000000..d0602cca4eea
--- /dev/null
+++ b/test/rules/platform_certs/default/cert107.pem
@@ -0,0 +1,16 @@
+Hellenic Academic and Research Institutions ECC RootCA 2015
+-----BEGIN CERTIFICATE-----
+MIICwzCCAkqgAwIBAgIBADAKBggqhkjOPQQDAjCBqjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0
+aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9u
+cyBDZXJ0LiBBdXRob3JpdHkxRDBCBgNVBAMTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJj
+aCBJbnN0aXR1dGlvbnMgRUNDIFJvb3RDQSAyMDE1MB4XDTE1MDcwNzEwMzcxMloXDTQwMDYzMDEw
+MzcxMlowgaoxCzAJBgNVBAYTAkdSMQ8wDQYDVQQHEwZBdGhlbnMxRDBCBgNVBAoTO0hlbGxlbmlj
+IEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUQwQgYD
+VQQDEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIEVDQyBSb290
+Q0EgMjAxNTB2MBAGByqGSM49AgEGBSuBBAAiA2IABJKgQehLgoRc4vgxEZmGZE4JJS+dQS8KrjVP
+dJWyUWRrjWvmP3CV8AVER6ZyOFB2lQJajq4onvktTpnvLEhvTCUp6NFxW98dwXU3tNf6e3pCnGoK
+Vlp8aQuqgAkkbH7BRqNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
+BBYEFLQiC4KZJAEOnLvkDv2/+5cgk5kqMAoGCCqGSM49BAMCA2cAMGQCMGfOFmI4oqxiRaeplSTA
+GiecMjvAwNW6qef4BENThe5SId6d9SWDPp5YSy/XZxMOIQIwBeF1Ad5o7SofTUwJCA3sS61kFyjn
+dc5FZXIhF8siQQ6ME5g4mlRtm8rifOoCWCKR
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert108.pem b/test/rules/platform_certs/default/cert108.pem
new file mode 100644
index 000000000000..1ce7bf748394
--- /dev/null
+++ b/test/rules/platform_certs/default/cert108.pem
@@ -0,0 +1,28 @@
+ISRG Root X1
+-----BEGIN CERTIFICATE-----
+MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAwTzELMAkGA1UE
+BhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2VhcmNoIEdyb3VwMRUwEwYDVQQD
+EwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQG
+EwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMT
+DElTUkcgUm9vdCBYMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54r
+Vygch77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+0TM8ukj1
+3Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6UA5/TR5d8mUgjU+g4rk8K
+b4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sWT8KOEUt+zwvo/7V3LvSye0rgTBIlDHCN
+Aymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyHB5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ
+4Q7e2RCOFvu396j3x+UCB5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf
+1b0SHzUvKBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWnOlFu
+hjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTnjh8BCNAw1FtxNrQH
+usEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbwqHyGO0aoSCqI3Haadr8faqU9GY/r
+OPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CIrU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4G
+A1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY
+9umbbjANBgkqhkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
+ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ3BebYhtF8GaV
+0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KKNFtY2PwByVS5uCbMiogziUwt
+hDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJw
+TdwJx4nLCgdNbOhdjsnvzqvHu7UrTkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nx
+e5AW0wdeRlN8NwdCjNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZA
+JzVcoyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq4RgqsahD
+YVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPAmRGunUHBcnWEvgJBQl9n
+JEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57demyPxgcYxn/eR44/KJ4EBs+lVDR3veyJ
+m+kXQ99b21/+jh5Xos1AnX5iItreGCc=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert109.pem b/test/rules/platform_certs/default/cert109.pem
new file mode 100644
index 000000000000..a0a7df1fbdc5
--- /dev/null
+++ b/test/rules/platform_certs/default/cert109.pem
@@ -0,0 +1,28 @@
+AC RAIZ FNMT-RCM
+-----BEGIN CERTIFICATE-----
+MIIFgzCCA2ugAwIBAgIPXZONMGc2yAYdGsdUhGkHMA0GCSqGSIb3DQEBCwUAMDsxCzAJBgNVBAYT
+AkVTMREwDwYDVQQKDAhGTk1ULVJDTTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTAeFw0wODEw
+MjkxNTU5NTZaFw0zMDAxMDEwMDAwMDBaMDsxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJD
+TTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
+ggIBALpxgHpMhm5/yBNtwMZ9HACXjywMI7sQmkCpGreHiPibVmr75nuOi5KOpyVdWRHbNi63URcf
+qQgfBBckWKo3Shjf5TnUV/3XwSyRAZHiItQDwFj8d0fsjz50Q7qsNI1NOHZnjrDIbzAzWHFctPVr
+btQBULgTfmxKo0nRIBnuvMApGGWn3v7v3QqQIecaZ5JCEJhfTzC8PhxFtBDXaEAUwED653cXeuYL
+j2VbPNmaUtu1vZ5Gzz3rkQUCwJaydkxNEJY7kvqcfw+Z374jNUUeAlz+taibmSXaXvMiwzn15Cou
+08YfxGyqxRxqAQVKL9LFwag0Jl1mpdICIfkYtwb1TplvqKtMUejPUBjFd8g5CSxJkjKZqLsXF3mw
+WsXmo8RZZUc1g16p6DULmbvkzSDGm0oGObVo/CK67lWMK07q87Hj/LaZmtVC+nFNCM+HHmpxffnT
+tOmlcYF7wk5HlqX2doWjKI/pgG6BU6VtX7hI+cL5NqYuSf+4lsKMB7ObiFj86xsc3i1w4peSMKGJ
+47xVqCfWS+2QrYv6YyVZLag13cqXM7zlzced0ezvXg5KkAYmY6252TUtB7p2ZSysV4999AeU14EC
+ll2jB0nVetBX+RvnU0Z1qrB5QstocQjpYL05ac70r8NWQMetUqIJ5G+GR4of6ygnXYMgrwTJbFaa
+i0b1AgMBAAGjgYMwgYAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
+FPd9xf3E6Jobd2Sn9R2gzL+HYJptMD4GA1UdIAQ3MDUwMwYEVR0gADArMCkGCCsGAQUFBwIBFh1o
+dHRwOi8vd3d3LmNlcnQuZm5tdC5lcy9kcGNzLzANBgkqhkiG9w0BAQsFAAOCAgEAB5BK3/MjTvDD
+nFFlm5wioooMhfNzKWtN/gHiqQxjAb8EZ6WdmF/9ARP67Jpi6Yb+tmLSbkyU+8B1RXxlDPiyN8+s
+D8+Nb/kZ94/sHvJwnvDKuO+3/3Y3dlv2bojzr2IyIpMNOmqOFGYMLVN0V2Ue1bLdI4E7pWYjJ2cJ
+j+F3qkPNZVEI7VFY/uY5+ctHhKQV8Xa7pO6kO8Rf77IzlhEYt8llvhjho6Tc+hj507wTmzl6NLrT
+Qfv6MooqtyuGC2mDOL7Nii4LcK2NJpLuHvUBKwrZ1pebbuCoGRw6IYsMHkCtA+fdZn71uSANA+iW
++YJF1DngoABd15jmfZ5nc8OaKveri6E6FO80vFIOiZiaBECEHX5FaZNXzuvO+FB8TxxuBEOb+dY7
+Ixjp6o7RTUaN8Tvkasq6+yO3m/qZASlaWFot4/nUbQ4mrcFuNLwy+AwF+mWj2zs3gyLp1txyM/1d
+8iC9djwj2ij3+RvrWWTV3F9yfiD8zYm1kGdNYno/Tq0dwzn+evQoFt9B9kiABdcPUXmsEKvU7ANm
+5mqwujGSQkBqvjrTcuFqN1W8rB2Vt2lh8kORdOag0wokRqEIr9baRRmW1FMdW4R58MD3R++Lj8UG
+rp1MYp3/RgT408m2ECVAdf4WqslKYIYvuu8wd+RU4riEmViAqhOLUTpPSPaLtrM=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert110.pem b/test/rules/platform_certs/default/cert110.pem
new file mode 100644
index 000000000000..1a2778910e94
--- /dev/null
+++ b/test/rules/platform_certs/default/cert110.pem
@@ -0,0 +1,18 @@
+Amazon Root CA 1
+-----BEGIN CERTIFICATE-----
+MIIDQTCCAimgAwIBAgITBmyfz5m/jAo54vB4ikPmljZbyjANBgkqhkiG9w0BAQsFADA5MQswCQYD
+VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAxMB4XDTE1
+MDUyNjAwMDAwMFoXDTM4MDExNzAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv
+bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALJ4gHHKeNXjca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgH
+FzZM9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qwIFAGbHrQ
+gLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6VOujw5H5SNz/0egwLX0t
+dHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L93FcXmn/6pUCyziKrlA4b9v7LWIbxcce
+VOF34GfID5yHI9Y/QCB/IIDEgEw+OyQmjgSubJrIqg0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB
+/zAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFIQYzIU07LwMlJQuCFmcx7IQTgoIMA0GCSqGSIb3
+DQEBCwUAA4IBAQCY8jdaQZChGsV2USggNiMOruYou6r4lK5IpDB/G/wkjUu0yKGX9rbxenDIU5PM
+CCjjmCXPI6T53iHTfIUJrU6adTrCC2qJeHZERxhlbI1Bjjt/msv0tadQ1wUsN+gDS63pYaACbvXy
+8MWy7Vu33PqUXHeeE6V/Uq2V8viTO96LXFvKWlJbYK8U90vvo/ufQJVtMVT8QtPHRh8jrdkPSHCa
+2XV4cdFyQzR1bldZwgJcJmApzyMZFo6IQ6XU5MsI+yMRQ+hDKXJioaldXgjUkK642M4UwtBV8ob2
+xJNDd2ZhwLnoQdeXeGADbkpyrqXRfboQnoZsG4q5WTP468SQvvG5
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert111.pem b/test/rules/platform_certs/default/cert111.pem
new file mode 100644
index 000000000000..449d424d86b1
--- /dev/null
+++ b/test/rules/platform_certs/default/cert111.pem
@@ -0,0 +1,27 @@
+Amazon Root CA 2
+-----BEGIN CERTIFICATE-----
+MIIFQTCCAymgAwIBAgITBmyf0pY1hp8KD+WGePhbJruKNzANBgkqhkiG9w0BAQwFADA5MQswCQYD
+VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAyMB4XDTE1
+MDUyNjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv
+bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
+ggIBAK2Wny2cSkxKgXlRmeyKy2tgURO8TW0G/LAIjd0ZEGrHJgw12MBvIITplLGbhQPDW9tK6Mj4
+kHbZW0/jTOgGNk3Mmqw9DJArktQGGWCsN0R5hYGCrVo34A3MnaZMUnbqQ523BNFQ9lXg1dKmSYXp
+N+nKfq5clU1Imj+uIFptiJXZNLhSGkOQsL9sBbm2eLfq0OQ6PBJTYv9K8nu+NQWpEjTj82R0Yiw9
+AElaKP4yRLuH3WUnAnE72kr3H9rN9yFVkE8P7K6C4Z9r2UXTu/Bfh+08LDmG2j/e7HJV63mjrdvd
+fLC6HM783k81ds8P+HgfajZRRidhW+mez/CiVX18JYpvL7TFz4QuK/0NURBs+18bvBt+xa47mAEx
+kv8LV/SasrlX6avvDXbR8O70zoan4G7ptGmh32n2M8ZpLpcTnqWHsFcQgTfJU7O7f/aS0ZzQGPSS
+btqDT6ZjmUyl+17vIWR6IF9sZIUVyzfpYgwLKhbcAS4y2j5L9Z469hdAlO+ekQiG+r5jqFoz7Mt0
+Q5X5bGlSNscpb/xVA1wf+5+9R+vnSUeVC06JIglJ4PVhHvG/LopyboBZ/1c6+XUyo05f7O0oYtlN
+c/LMgRdg7c3r3NunysV+Ar3yVAhU/bQtCSwXVEqY0VThUWcI0u1ufm8/0i2BWSlmy5A5lREedCf+
+3euvAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSw
+DPBMMPQFWAJI/TPlUq9LhONmUjANBgkqhkiG9w0BAQwFAAOCAgEAqqiAjw54o+Ci1M3m9Zh6O+oA
+A7CXDpO8Wqj2LIxyh6mx/H9z/WNxeKWHWc8w4Q0QshNabYL1auaAn6AFC2jkR2vHat+2/XcycuUY
++gn0oJMsXdKMdYV2ZZAMA3m3MSNjrXiDCYZohMr/+c8mmpJ5581LxedhpxfL86kSk5Nrp+gvU5LE
+YFiwzAJRGFuFjWJZY7attN6a+yb3ACfAXVU3dJnJUH/jWS5E4ywl7uxMMne0nxrpS10gxdr9HIcW
+xkPo1LsmmkVwXqkLN1PiRnsn/eBG8om3zEK2yygmbtmlyTrIQRNg91CMFa6ybRoVGld45pIq2WWQ
+gj9sAq+uEjonljYE1x2igGOpm/HlurR8FLBOybEfdF849lHqm/osohHUqS0nGkWxr7JOcQ3AWEbW
+aQbLU8uz/mtBzUF+fUwPfHJ5elnNXkoOrJupmHN5fLT0zLm4BwyydFy4x2+IoZCn9Kr5v2c69BoV
+Yh63n749sSmvZ6ES8lgQGVMDMBu4Gon2nL2XA46jCfMdiyHxtN/kHNGfZQIG6lzWE7OE76KlXIx3
+KadowGuuQNKotOrN8I1LOJwZmhsoVLiJkO/KdYE+HvJkJMcYr07/R54H9jVlpNMKVv/1F2Rs76gi
+JUmTtt8AF9pYfl3uxRuw0dFfIRDH+fO6AgonB8Xx1sfT4PsJYGw=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert112.pem b/test/rules/platform_certs/default/cert112.pem
new file mode 100644
index 000000000000..1254c66d4b3a
--- /dev/null
+++ b/test/rules/platform_certs/default/cert112.pem
@@ -0,0 +1,11 @@
+Amazon Root CA 3
+-----BEGIN CERTIFICATE-----
+MIIBtjCCAVugAwIBAgITBmyf1XSXNmY/Owua2eiedgPySjAKBggqhkjOPQQDAjA5MQswCQYDVQQG
+EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAzMB4XDTE1MDUy
+NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ
+MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABCmXp8ZB
+f8ANm+gBG1bG8lKlui2yEujSLtf6ycXYqm0fc4E7O5hrOXwzpcVOho6AF2hiRVd9RFgdszflZwjr
+Zt6jQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSrttvXBp43
+rDCGB5Fwx5zEGbF4wDAKBggqhkjOPQQDAgNJADBGAiEA4IWSoxe3jfkrBqWTrBqYaGFy+uGh0Psc
+eGCmQ5nFuMQCIQCcAu/xlJyzlvnrxir4tiz+OpAUFteMYyRIHN8wfdVoOw==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert113.pem b/test/rules/platform_certs/default/cert113.pem
new file mode 100644
index 000000000000..5473fcd441b4
--- /dev/null
+++ b/test/rules/platform_certs/default/cert113.pem
@@ -0,0 +1,12 @@
+Amazon Root CA 4
+-----BEGIN CERTIFICATE-----
+MIIB8jCCAXigAwIBAgITBmyf18G7EEwpQ+Vxe3ssyBrBDjAKBggqhkjOPQQDAzA5MQswCQYDVQQG
+EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSA0MB4XDTE1MDUy
+NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ
+MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgNDB2MBAGByqGSM49AgEGBSuBBAAiA2IABNKrijdPo1MN
+/sGKe0uoe0ZLY7Bi9i0b2whxIdIA6GO9mif78DluXeo9pcmBqqNbIJhFXRbb/egQbeOc4OO9X4Ri
+83BkM6DLJC9wuoihKqB1+IGuYgbEgds5bimwHvouXKNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
+HQ8BAf8EBAMCAYYwHQYDVR0OBBYEFNPsxzplbszh2naaVvuc84ZtV+WBMAoGCCqGSM49BAMDA2gA
+MGUCMDqLIfG9fhGt0O9Yli/W651+kI0rz2ZVwyzjKKlwCkcO8DdZEv8tmZQoTipPNU0zWgIxAOp1
+AE47xDqUEpHJWEadIRNyp4iciuRMStuW1KyLa2tJElMzrdfkviT8tQp21KW8EA==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert114.pem b/test/rules/platform_certs/default/cert114.pem
new file mode 100644
index 000000000000..95096f8043a7
--- /dev/null
+++ b/test/rules/platform_certs/default/cert114.pem
@@ -0,0 +1,29 @@
+LuxTrust Global Root 2
+-----BEGIN CERTIFICATE-----
+MIIFwzCCA6ugAwIBAgIUCn6m30tEntpqJIWe5rgV0xZ/u7EwDQYJKoZIhvcNAQELBQAwRjELMAkG
+A1UEBhMCTFUxFjAUBgNVBAoMDUx1eFRydXN0IFMuQS4xHzAdBgNVBAMMFkx1eFRydXN0IEdsb2Jh
+bCBSb290IDIwHhcNMTUwMzA1MTMyMTU3WhcNMzUwMzA1MTMyMTU3WjBGMQswCQYDVQQGEwJMVTEW
+MBQGA1UECgwNTHV4VHJ1c3QgUy5BLjEfMB0GA1UEAwwWTHV4VHJ1c3QgR2xvYmFsIFJvb3QgMjCC
+AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANeFl78RmOnwYoNMPIf5U2o3C/IPPIfOb9wm
+Kb3FibrJgz337spbxm1Jc7TJRqMbNBM/wYlFV/TZsfs2ZUv7COJIcRHIbjuend+JZTemhfY7RBi2
+xjcwYkSSl2l9QjAk5A0MiWtj3sXh306pFGxT4GHO9hcvHTy95iJMHZP1EMShduxq3sVs35a0VkBC
+wGKSMKEtFZSg0iAGCW5qbeXrt77U8PEVfIvmTroTzEsnXpk8F12PgX8zPU/TPxvsXD/wPEx1bvKm
+1Z3aLQdjAsZy6ZS8TEmVT4hSyNvoaYL4zDRbIvCGp4m9SAptZoFtyMhk+wHh9OHe2Z7d21vUKpkm
+FRseTJIpgp7VkoGSQXAZ96Tlk0u8d2cx3Rz9MXANF5kM+Qw5GSoXtTBxVdUPrljhPS80m8+f9niF
+wpN6cj5mj5wWEWCPnolvZ77gR1o7DJpni89Gxq44o/KnvObWhWszJHAiS8sIm7vI+AIpHb4gDEa/
+a4ebsypmQjVGbKq6rfmYe+lQVRQxv7HaLe2ArWgk+2mr2HETMOZns4dA/Yl+8kPREd8vZS9kzl8U
+ubG/Mb2HeFpZZYiq/FkySIbWTLkpS5XTdvN3JW1CHDiDTf2jX5t/Lax5Gw5CMZdjpPuKadUiDTSQ
+MC6otOBttpSsvItO13D8xTiOZCXhTTmQzsmHhFhxAgMBAAGjgagwgaUwDwYDVR0TAQH/BAUwAwEB
+/zBCBgNVHSAEOzA5MDcGByuBKwEBAQowLDAqBggrBgEFBQcCARYeaHR0cHM6Ly9yZXBvc2l0b3J5
+Lmx1eHRydXN0Lmx1MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBT/GCh2+UgFLKGu8SsbK7JT
++Et8szAdBgNVHQ4EFgQU/xgodvlIBSyhrvErGyuyU/hLfLMwDQYJKoZIhvcNAQELBQADggIBAGoZ
+FO1uecEsh9QNcH7X9njJCwROxLHOk3D+sFTAMs2ZMGQXvw/l4jP9BzZAcg4atmpZ1gDlaCDdLnIN
+H2pkMSCEfUmmWjfrRcmF9dTHF5kH5ptV5AzoqbTOjFu1EVzPig4N1qx3gf4ynCSecs5U89BvolbW
+7MM3LGVYvlcAGvI1+ut7MV3CwRI9loGIlonBWVx65n9wNOeD4rHh4bhY79SV5GCc8JaXcozrhAIu
+ZY+kt9J/Z93I055cqqmkoCUUBpvsT34tC38ddfEz2O3OuHVtPlu5mB0xDVbYQw8wkbIEa91WvpWA
+VWe+2M2D2RjuLg+GLZKecBPs3lHJQ3gCpU3I+V/EkVhGFndadKpAvAefMLmx9xIX3eP/JEAdemrR
+TxgKqpAd60Ae36EeRJIQmvKN4dFLRp7oRUKX6kWZ8+xm1QL68qZKJKrezrnK+T+Tb/mjuuqlPpmt
+/f97mfVl7vBZKGfXkJWkE4SphMHozs51k2MavDzq1WQfLSoSOcbDWjLtR5EWDrw4wVDej8oqkDQc
+7kGUnF4ZLvhFSZl0kbAEb+MEWrGrKqv+x9CWttrhSmQGbmBNvUJO/3jaJMobtNeWOWyu8Q6qp31I
+iyBMz2TWuJdGsE7RKlY6oJO9r4Ak4Ap+58rVyuiFVdw2KuGUaJPHZnJED4AhMmwlxyOAgwrr
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert115.pem b/test/rules/platform_certs/default/cert115.pem
new file mode 100644
index 000000000000..94a5b2da68f3
--- /dev/null
+++ b/test/rules/platform_certs/default/cert115.pem
@@ -0,0 +1,23 @@
+TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1
+-----BEGIN CERTIFICATE-----
+MIIEYzCCA0ugAwIBAgIBATANBgkqhkiG9w0BAQsFADCB0jELMAkGA1UEBhMCVFIxGDAWBgNVBAcT
+D0dlYnplIC0gS29jYWVsaTFCMEAGA1UEChM5VHVya2l5ZSBCaWxpbXNlbCB2ZSBUZWtub2xvamlr
+IEFyYXN0aXJtYSBLdXJ1bXUgLSBUVUJJVEFLMS0wKwYDVQQLEyRLYW11IFNlcnRpZmlrYXN5b24g
+TWVya2V6aSAtIEthbXUgU00xNjA0BgNVBAMTLVRVQklUQUsgS2FtdSBTTSBTU0wgS29rIFNlcnRp
+ZmlrYXNpIC0gU3VydW0gMTAeFw0xMzExMjUwODI1NTVaFw00MzEwMjUwODI1NTVaMIHSMQswCQYD
+VQQGEwJUUjEYMBYGA1UEBxMPR2ViemUgLSBLb2NhZWxpMUIwQAYDVQQKEzlUdXJraXllIEJpbGlt
+c2VsIHZlIFRla25vbG9qaWsgQXJhc3Rpcm1hIEt1cnVtdSAtIFRVQklUQUsxLTArBgNVBAsTJEth
+bXUgU2VydGlmaWthc3lvbiBNZXJrZXppIC0gS2FtdSBTTTE2MDQGA1UEAxMtVFVCSVRBSyBLYW11
+IFNNIFNTTCBLb2sgU2VydGlmaWthc2kgLSBTdXJ1bSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAr3UwM6q7a9OZLBI3hNmNe5eA027n/5tQlT6QlVZC1xl8JoSNkvoBHToP4mQ4t4y8
+6Ij5iySrLqP1N+RAjhgleYN1Hzv/bKjFxlb4tO2KRKOrbEz8HdDc72i9z+SqzvBV96I01INrN3wc
+wv61A+xXzry0tcXtAA9TNypN9E8Mg/uGz8v+jE69h/mniyFXnHrfA2eJLJ2XYacQuFWQfw4tJzh0
+3+f92k4S400VIgLI4OD8D62K18lUUMw7D8oWgITQUVbDjlZ/iSIzL+aFCr2lqBs23tPcLG07xxO9
+WSMs5uWk99gL7eqQQESolbuT1dCANLZGeA4fAJNG4e7p+exPFwIDAQABo0IwQDAdBgNVHQ4EFgQU
+ZT/HiobGPN08VFw1+DrtUgxHV8gwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJ
+KoZIhvcNAQELBQADggEBACo/4fEyjq7hmFxLXs9rHmoJ0iKpEsdeV31zVmSAhHqT5Am5EM2fKifh
+AHe+SMg1qIGf5LgsyX8OsNJLN13qudULXjS99HMpw+0mFZx+CFOKWI3QSyjfwbPfIPP54+M638yc
+lNhOT8NrF7f3cuitZjO1JVOr4PhMqZ398g26rrnZqsZr+ZO7rqu4lzwDGrpDxpa5RXI4s6ehlj2R
+e37AIVNMh+3yC1SVUZPVIqUNivGTDj5UDrDYyU7c8jEyVupk+eq1nRZmQnLzf9OxMUP8pI4X8W0j
+q5Rm+K37DwhuJi1/FwcJsoz7UMCflo3Ptv0AnVoUmr8CRPXBwp8iXqIPoeM=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert116.pem b/test/rules/platform_certs/default/cert116.pem
new file mode 100644
index 000000000000..ecb51c9a3077
--- /dev/null
+++ b/test/rules/platform_certs/default/cert116.pem
@@ -0,0 +1,28 @@
+GDCA TrustAUTH R5 ROOT
+-----BEGIN CERTIFICATE-----
+MIIFiDCCA3CgAwIBAgIIfQmX/vBH6nowDQYJKoZIhvcNAQELBQAwYjELMAkGA1UEBhMCQ04xMjAw
+BgNVBAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZIENPLixMVEQuMR8wHQYDVQQD
+DBZHRENBIFRydXN0QVVUSCBSNSBST09UMB4XDTE0MTEyNjA1MTMxNVoXDTQwMTIzMTE1NTk1OVow
+YjELMAkGA1UEBhMCQ04xMjAwBgNVBAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZ
+IENPLixMVEQuMR8wHQYDVQQDDBZHRENBIFRydXN0QVVUSCBSNSBST09UMIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEA2aMW8Mh0dHeb7zMNOwZ+Vfy1YI92hhJCfVZmPoiC7XJjDp6L3TQs
+AlFRwxn9WVSEyfFrs0yw6ehGXTjGoqcuEVe6ghWinI9tsJlKCvLriXBjTnnEt1u9ol2x8kECK62p
+OqPseQrsXzrj/e+APK00mxqriCZ7VqKChh/rNYmDf1+uKU49tm7srsHwJ5uu4/Ts765/94Y9cnrr
+pftZTqfrlYwiOXnhLQiPzLyRuEH3FMEjqcOtmkVEs7LXLM3GKeJQEK5cy4KOFxg2fZfmiJqwTTQJ
+9Cy5WmYqsBebnh52nUpmMUHfP/vFBu8btn4aRjb3ZGM74zkYI+dndRTVdVeSN72+ahsmUPI2JgaQ
+xXABZG12ZuGR224HwGGALrIuL4xwp9E7PLOR5G62xDtw8mySlwnNR30YwPO7ng/Wi64HtloPzgsM
+R6flPri9fcebNaBhlzpBdRfMK5Z3KpIhHtmVdiBnaM8Nvd/WHwlqmuLMc3GkL30SgLdTMEZeS1SZ
+D2fJpcjyIMGC7J0R38IC+xo70e0gmu9lZJIQDSri3nDxGGeCjGHeuLzRL5z7D9Ar7Rt2ueQ5Vfj4
+oR24qoAATILnsn8JuLwwoC8N9VKejveSswoAHQBUlwbgsQfZxw9cZX08bVlX5O2ljelAU58VS6Bx
+9hoh49pwBiFYFIeFd3mqgnkCAwEAAaNCMEAwHQYDVR0OBBYEFOLJQJ9NzuiaoXzPDj9lxSmIahlR
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQDRSVfg
+p8xoWLoBDysZzY2wYUWsEe1jUGn4H3++Fo/9nesLqjJHdtJnJO29fDMylyrHBYZmDRd9FBUb1Ov9
+H5r2XpdptxolpAqzkT9fNqyL7FeoPueBihhXOYV0GkLH6VsTX4/5COmSdI31R9KrO9b7eGZONn35
+6ZLpBN79SWP8bfsUcZNnL0dKt7n/HipzcEYwv1ryL3ml4Y0M2fmyYzeMN2WFcGpcWwlyua1jPLHd
++PwyvzeG5LuOmCd+uh8W4XAR8gPfJWIyJyYYMoSf/wA6E7qaTfRPuBRwIrHKK5DOKcFw9C+df/KQ
+HtZa37dG/OaG+svgIHZ6uqbL9XzeYqWxi+7egmaKTjowHz+Ay60nugxe19CxVsp3cbK1daFQqUBD
+F8Io2c9Si1vIY9RCPqAzekYu9wogRlR+ak8x8YF+QnQ4ZXMn7sZ8uI7XpTrXmKGcjBBV09tL7ECQ
+8s1uV9JiDnxXk7Gnbc2dg7sq5+W2O3FYrf3RRbxake5TFW/TRQl1brqQXR4EzzffHqhmsYzmIGrv
+/EhOdJhCrylvLmrH+33RZjEizIYAfmaDDEL0vTSSwxrqT8p+ck0LcIymSLumoRT2+1hEmRSuqguT
+aaApJUqlyyvdimYHFngVV3Eb7PVHhPOeMTd61X8kreS8/f3MboPoDKi3QWwH3b08hpcv0g==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert117.pem b/test/rules/platform_certs/default/cert117.pem
new file mode 100644
index 000000000000..20b597bbe847
--- /dev/null
+++ b/test/rules/platform_certs/default/cert117.pem
@@ -0,0 +1,22 @@
+TrustCor RootCert CA-1
+-----BEGIN CERTIFICATE-----
+MIIEMDCCAxigAwIBAgIJANqb7HHzA7AZMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYDVQQGEwJQQTEP
+MA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3Ig
+U3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+dHkxHzAdBgNVBAMMFlRydXN0Q29yIFJvb3RDZXJ0IENBLTEwHhcNMTYwMjA0MTIzMjE2WhcNMjkx
+MjMxMTcyMzE2WjCBpDELMAkGA1UEBhMCUEExDzANBgNVBAgMBlBhbmFtYTEUMBIGA1UEBwwLUGFu
+YW1hIENpdHkxJDAiBgNVBAoMG1RydXN0Q29yIFN5c3RlbXMgUy4gZGUgUi5MLjEnMCUGA1UECwwe
+VHJ1c3RDb3IgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MR8wHQYDVQQDDBZUcnVzdENvciBSb290Q2Vy
+dCBDQS0xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv463leLCJhJrMxnHQFgKq1mq
+jQCj/IDHUHuO1CAmujIS2CNUSSUQIpidRtLByZ5OGy4sDjjzGiVoHKZaBeYei0i/mJZ0PmnK6bV4
+pQa81QBeCQryJ3pS/C3Vseq0iWEk8xoT26nPUu0MJLq5nux+AHT6k61sKZKuUbS701e/s/OojZz0
+JEsq1pme9J7+wH5COucLlVPat2gOkEz7cD+PSiyU8ybdY2mplNgQTsVHCJCZGxdNuWxu72CVEY4h
+gLW9oHPY0LJ3xEXqWib7ZnZ2+AYfYW0PVcWDtxBWcgYHpfOxGgMFZA6dWorWhnAbJN7+KIor0Gqw
+/Hqi3LJ5DotlDwIDAQABo2MwYTAdBgNVHQ4EFgQU7mtJPHo/DeOxCbeKyKsZn3MzUOcwHwYDVR0j
+BBgwFoAU7mtJPHo/DeOxCbeKyKsZn3MzUOcwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AYYwDQYJKoZIhvcNAQELBQADggEBACUY1JGPE+6PHh0RU9otRCkZoB5rMZ5NDp6tPVxBb5UrJKF5
+mDo4Nvu7Zp5I/5CQ7z3UuJu0h3U/IJvOcs+hVcFNZKIZBqEHMwwLKeXx6quj7LUKdJDHfXLy11yf
+ke+Ri7fc7Waiz45mO7yfOgLgJ90WmMCV1Aqk5IGadZQ1nJBfiDcGrVmVCrDRZ9MZyonnMlo2HD6C
+qFqTvsbQZJG2z9m2GM/bftJlo6bEjhcxwft+dtvTheNYsnd6djtsL1Ac59v2Z3kf9YKVmgenFK+P
+3CghZwnS1k1aHBkcjndcw5QkPTJrS37UeJSDvjdNzl/HHk484IkzlQsPpTLWPFp5LBk=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert118.pem b/test/rules/platform_certs/default/cert118.pem
new file mode 100644
index 000000000000..8bf6d29369df
--- /dev/null
+++ b/test/rules/platform_certs/default/cert118.pem
@@ -0,0 +1,31 @@
+TrustCor RootCert CA-2
+-----BEGIN CERTIFICATE-----
+MIIGLzCCBBegAwIBAgIIJaHfyjPLWQIwDQYJKoZIhvcNAQELBQAwgaQxCzAJBgNVBAYTAlBBMQ8w
+DQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5MSQwIgYDVQQKDBtUcnVzdENvciBT
+eXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRydXN0Q29yIENlcnRpZmljYXRlIEF1dGhvcml0
+eTEfMB0GA1UEAwwWVHJ1c3RDb3IgUm9vdENlcnQgQ0EtMjAeFw0xNjAyMDQxMjMyMjNaFw0zNDEy
+MzExNzI2MzlaMIGkMQswCQYDVQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5h
+bWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3IgU3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5U
+cnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxHzAdBgNVBAMMFlRydXN0Q29yIFJvb3RDZXJ0
+IENBLTIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnIG7CKqJiJJWQdsg4foDSq8Gb
+ZQWU9MEKENUCrO2fk8eHyLAnK0IMPQo+QVqedd2NyuCb7GgypGmSaIwLgQ5WoD4a3SwlFIIvl9Nk
+RvRUqdw6VC0xK5mC8tkq1+9xALgxpL56JAfDQiDyitSSBBtlVkxs1Pu2YVpHI7TYabS3OtB0PAx1
+oYxOdqHp2yqlO/rOsP9+aij9JxzIsekp8VduZLTQwRVtDr4uDkbIXvRR/u8OYzo7cbrPb1nKDOOb
+XUm4TOJXsZiKQlecdu/vvdFoqNL0Cbt3Nb4lggjEFixEIFapRBF37120Hapeaz6LMvYHL1cEksr1
+/p3C6eizjkxLAjHZ5DxIgif3GIJ2SDpxsROhOdUuxTTCHWKF3wP+TfSvPd9cW436cOGlfifHhi5q
+jxLGhF5DUVCcGZt45vz27Ud+ez1m7xMTiF88oWP7+ayHNZ/zgp6kPwqcMWmLmaSISo5uZk3vFsQP
+eSghYA2FFn3XVDjxklb9tTNMg9zXEJ9L/cb4Qr26fHMC4P99zVvh1Kxhe1fVSntb1IVYJ12/+Ctg
+rKAmrhQhJ8Z3mjOAPF5GP/fDsaOGM8boXg25NSyqRsGFAnWAoOsk+xWq5Gd/bnc/9ASKL3x74xdh
+8N0JqSDIvgmk0H5Ew7IwSjiqqewYmgeCK9u4nBit2uBGF6zPXQIDAQABo2MwYTAdBgNVHQ4EFgQU
+2f4hQG6UnrybPZx9mCAZ5YwwYrIwHwYDVR0jBBgwFoAU2f4hQG6UnrybPZx9mCAZ5YwwYrIwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQADggIBAJ5Fngw7tu/h
+Osh80QA9z+LqBrWyOrsGS2h60COXdKcs8AjYeVrXWoSK2BKaG9l9XE1wxaX5q+WjiYndAfrs3fnp
+kpfbsEZC89NiqpX+MWcUaViQCqoL7jcjx1BRtPV+nuN79+TMQjItSQzL/0kMmx40/W5ulop5A7Zv
+2wnL/V9lFDfhOPXzYRZY5LVtDQsEGz9QLX+zx3oaFoBg+Iof6Rsqxvm6ARppv9JYx1RXCI/hOWB3
+S6xZhBqI8d3LT3jX5+EzLfzuQfogsL7L9ziUwOHQhQ+77Sxzq+3+knYaZH9bDTMJBzN7Bj8RpFxw
+PIXAz+OQqIN3+tvmxYxoZxBnpVIt8MSZj3+/0WvitUfW2dCFmU2Umw9Lje4AWkcdEQOsQRivh7dv
+DDqPys/cA8GiCcjl/YBeyGBCARsaU1q7N6a3vLqE6R5sGtRk2tRD/pOLS/IseRYQ1JMLiI+h2IYU
+RpFHmygk71dSTlxCnKr3Sewn6EAes6aJInKc9Q0ztFijMDvd1GpUk74aTfOTlPf8hAs/hCBcNANE
+xdqtvArBAs8e5ZTZ845b2EzwnexhF7sUMlQMAimTHpKG9n/v55IFDlndmQguLvqcAFLTxWYp5KeX
+RKQOKIETNcX2b2TmQcTVL8w0RSXPQQCWPUouwpaYT05KnJe32x+SMsj/D1Fu1uwJ
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert119.pem b/test/rules/platform_certs/default/cert119.pem
new file mode 100644
index 000000000000..ca5310bb3093
--- /dev/null
+++ b/test/rules/platform_certs/default/cert119.pem
@@ -0,0 +1,22 @@
+TrustCor ECA-1
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIJAISCLF8cYtBAMA0GCSqGSIb3DQEBCwUAMIGcMQswCQYDVQQGEwJQQTEP
+MA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3Ig
+U3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+dHkxFzAVBgNVBAMMDlRydXN0Q29yIEVDQS0xMB4XDTE2MDIwNDEyMzIzM1oXDTI5MTIzMTE3Mjgw
+N1owgZwxCzAJBgNVBAYTAlBBMQ8wDQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5
+MSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRydXN0Q29y
+IENlcnRpZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOVHJ1c3RDb3IgRUNBLTEwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPj+ARtZ+odnbb3w9U73NjKYKtR8aja+3+XzP4Q1HpGjOR
+MRegdMTUpwHmspI+ap3tDvl0mEDTPwOABoJA6LHip1GnHYMma6ve+heRK9jGrB6xnhkB1Zem6g23
+xFUfJ3zSCNV2HykVh0A53ThFEXXQmqc04L/NyFIduUd+Dbi7xgz2c1cWWn5DkR9VOsZtRASqnKmc
+p0yJF4OuowReUoCLHhIlERnXDH19MURB6tuvsBzvgdAsxZohmz3tQjtQJvLsznFhBmIhVE5/wZ0+
+fyCMgMsq2JdiyIMzkX2woloPV+g7zPIlstR8L+xNxqE6FXrntl019fZISjZFZtS6mFjBAgMBAAGj
+YzBhMB0GA1UdDgQWBBREnkj1zG1I1KBLf/5ZJC+Dl5mahjAfBgNVHSMEGDAWgBREnkj1zG1I1KBL
+f/5ZJC+Dl5mahjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsF
+AAOCAQEABT41XBVwm8nHc2FvcivUwo/yQ10CzsSUuZQRg2dd4mdsdXa/uwyqNsatR5Nj3B5+1t4u
+/ukZMjgDfxT2AHMsWbEhBuH7rBiVDKP/mZb3Kyeb1STMHd3BOuCYRLDE5D53sXOpZCz2HAF8P11F
+hcCF5yWPldwX8zyfGm6wyuMdKulMY/okYWLW2n62HGz1Ah3UKt1VkOsqEUc8Ll50soIipX1TH0Xs
+J5F95yIW6MBoNtjG8U+ARDL54dHRHareqKucBK+tIA5kmE2la8BIWJZpTdwHjFGTot+fDz2LYLSC
+jaoITmJF4PkL0uDgPFveXHEnJcLmA4GLEFPjx1WitJ/X5g==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert120.pem b/test/rules/platform_certs/default/cert120.pem
new file mode 100644
index 000000000000..333c225c5d8e
--- /dev/null
+++ b/test/rules/platform_certs/default/cert120.pem
@@ -0,0 +1,30 @@
+SSL.com Root Certification Authority RSA
+-----BEGIN CERTIFICATE-----
+MIIF3TCCA8WgAwIBAgIIeyyb0xaAMpkwDQYJKoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVVMxDjAM
+BgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24x
+MTAvBgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBSU0EwHhcNMTYw
+MjEyMTczOTM5WhcNNDEwMjEyMTczOTM5WjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMx
+EDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NM
+LmNvbSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFJTQTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAPkP3aMrfcvQKv7sZ4Wm5y4bunfh4/WvpOz6Sl2RxFdHaxh3a3by/ZPkPQ/C
+Fp4LZsNWlJ4Xg4XOVu/yFv0AYvUiCVToZRdOQbngT0aXqhvIuG5iXmmxX9sqAn78bMrzQdjt0Oj8
+P2FI7bADFB0QDksZ4LtO7IZl/zbzXmcCC52GVWH9ejjt/uIZALdvoVBidXQ8oPrIJZK0bnoix/ge
+oeOy3ZExqysdBP+lSgQ36YWkMyv94tZVNHwZpEpox7Ko07fKoZOI68GXvIz5HdkihCR0xwQ9aqkp
+k8zruFvh/l8lqjRYyMEjVJ0bmBHDOJx+PYZspQ9AhnwC9FwCTyjLrnGfDzrIM/4RJTXq/LrFYD3Z
+fBjVsqnTdXgDciLKOsMf7yzlLqn6niy2UUb9rwPW6mBo6oUWNmuF6R7As93EJNyAKoFBbZQ+yODJ
+gUEAnl6/f8UImKIYLEJAs/lvOCdLToD0PYFH4Ih86hzOtXVcUS4cK38acijnALXRdMbX5J+tB5O2
+UzU1/Dfkw/ZdFr4hc96SCvigY2q8lpJqPvi8ZVWb3vUNiSYE/CUapiVpy8JtynziWV+XrOvvLsi8
+1xtZPCvM8hnIk2snYxnP/Okm+Mpxm3+T/jRnhE6Z6/yzeAkzcLpmpnbtG3PrGqUNxCITIJRWCk4s
+bE6x/c+cCbqiM+2HAgMBAAGjYzBhMB0GA1UdDgQWBBTdBAkHovV6fVJTEpKV7jiAJQ2mWTAPBgNV
+HRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFN0ECQei9Xp9UlMSkpXuOIAlDaZZMA4GA1UdDwEB/wQE
+AwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAIBgRlCn7Jp0cHh5wYfGVcpNxJK1ok1iOMq8bs3AD/CUr
+dIWQPXhq9LmLpZc7tRiRux6n+UBbkflVma8eEdBcHadm47GUBwwyOabqG7B52B2ccETjit3E+ZUf
+ijhDPwGFpUenPUayvOUiaPd7nNgsPgohyC0zrL/FgZkxdMF1ccW+sfAjRfSda/wZY52jvATGGAsl
+u1OJD7OAUN5F7kR/q5R4ZJjT9ijdh9hwZXT7DrkT66cPYakylszeu+1jTBi7qUD3oFRuIIhxdRjq
+erQ0cuAjJ3dctpDqhiVAq+8zD8ufgr6iIPv2tS0a5sKFsXQP+8hlAqRSAUfdSSLBv9jra6x+3uxj
+MxW3IwiPxg+NQVrdjsW5j+VFP3jbutIbQLH+cU0/4IGiul607BXgk90IH37hVZkLId6Tngr75qNJ
+vTYw/ud3sqB1l7UtgYgXZSD32pAAn8lSzDLKNXz1PQ/YK9f1JmzJBjSWFupwWRoyeXkLtoh/D1JI
+Pb9s2KJELtFOt3JY04kTlf5Eq/jXixtunLwsoFvVagCvXzfh1foQC5ichucmj87w7G6KVwuA406y
+wKBjYZC6VWg3dGq2ktufoYYitmUnDuy2n0Jg5GfCtdpBC8TTi2EbvPofkSvXRAdeuims2cXp71NI
+WuuA8ShYIc2wBlX7Jz9TkHCpBB5XJ7k=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert121.pem b/test/rules/platform_certs/default/cert121.pem
new file mode 100644
index 000000000000..682d48f6dca1
--- /dev/null
+++ b/test/rules/platform_certs/default/cert121.pem
@@ -0,0 +1,15 @@
+SSL.com Root Certification Authority ECC
+-----BEGIN CERTIFICATE-----
+MIICjTCCAhSgAwIBAgIIdebfy8FoW6gwCgYIKoZIzj0EAwIwfDELMAkGA1UEBhMCVVMxDjAMBgNV
+BAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24xMTAv
+BgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYwMjEy
+MTgxNDAzWhcNNDEwMjEyMTgxNDAzWjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAO
+BgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NMLmNv
+bSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuBBAAiA2IA
+BEVuqVDEpiM2nl8ojRfLliJkP9x6jh3MCLOicSS6jkm5BBtHllirLZXI7Z4INcgn64mMU1jrYor+
+8FsPazFSY0E7ic3s7LaNGdM0B9y7xgZ/wkWV7Mt/qCPgCemB+vNH06NjMGEwHQYDVR0OBBYEFILR
+hXMw5zUE044CkvvlpNHEIejNMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUgtGFczDnNQTT
+jgKS++Wk0cQh6M0wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2cAMGQCMG/n61kRpGDPYbCW
+e+0F+S8Tkdzt5fxQaxFGRrMcIQBiu77D5+jNB5n5DQtdcj7EqgIwH7y6C+IwJPt8bYBVCpk+gA0z
+5Wajs6O7pdWLjwkspl1+4vAHCGht0nxpbl/f5Wpl
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert122.pem b/test/rules/platform_certs/default/cert122.pem
new file mode 100644
index 000000000000..7ca1878bdb7e
--- /dev/null
+++ b/test/rules/platform_certs/default/cert122.pem
@@ -0,0 +1,30 @@
+SSL.com EV Root Certification Authority RSA R2
+-----BEGIN CERTIFICATE-----
+MIIF6zCCA9OgAwIBAgIIVrYpzTS8ePYwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNVBAYTAlVTMQ4w
+DAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9u
+MTcwNQYDVQQDDC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIy
+MB4XDTE3MDUzMTE4MTQzN1oXDTQyMDUzMDE4MTQzN1owgYIxCzAJBgNVBAYTAlVTMQ4wDAYDVQQI
+DAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMTcwNQYD
+VQQDDC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIyMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjzZlQOHWTcDXtOlG2mvqM0fNTPl9fb69LT3w23jh
+hqXZuglXaO1XPqDQCEGD5yhBJB/jchXQARr7XnAjssufOePPxU7Gkm0mxnu7s9onnQqG6YE3Bf7w
+cXHswxzpY6IXFJ3vG2fThVUCAtZJycxa4bH3bzKfydQ7iEGonL3Lq9ttewkfokxykNorCPzPPFTO
+Zw+oz12WGQvE43LrrdF9HSfvkusQv1vrO6/PgN3B0pYEW3p+pKk8OHakYo6gOV7qd89dAFmPZiw+
+B6KjBSYRaZfqhbcPlgtLyEDhULouisv3D5oi53+aNxPN8k0TayHRwMwi8qFG9kRpnMphNQcAb9Zh
+CBHqurj26bNg5U257J8UZslXWNvNh2n4ioYSA0e/ZhN2rHd9NCSFg83XqpyQGp8hLH94t2S42Oim
+9HizVcuE0jLEeK6jj2HdzghTreyI/BXkmg3mnxp3zkyPuBQVPWKchjgGAGYS5Fl2WlPAApiiECto
+RHuOec4zSnaqW4EWG7WK2NAAe15itAnWhmMOpgWVSbooi4iTsjQc2KRVbrcc0N6ZVTsj9CLg+Slm
+JuwgUHfbSguPvuUCYHBBXtSuUDkiFCbLsjtzdFVHB3mBOagwE0TlBIqulhMlQg+5U8Sb/M3kHN48
++qvWBkofZ6aYMBzdLNvcGJVXZsb/XItW9XcCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNV
+HSMEGDAWgBT5YLvU49U09rj1BoAlp3PbRmmonjAdBgNVHQ4EFgQU+WC71OPVNPa49QaAJadz20Zp
+qJ4wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQBWs47LCp1Jjr+kxJG7ZhcFUZh1
+++VQLHqe8RT6q9OKPv+RKY9ji9i0qVQBDb6Thi/5Sm3HXvVX+cpVHBK+Rw82xd9qt9t1wkclf7nx
+Y/hoLVUE0fKNsKTPvDxeH3jnpaAgcLAExbf3cqfeIg29MyVGjGSSJuM+LmOW2puMPfgYCdcDzH2G
+guDKBAdRUNf/ktUM79qGn5nX67evaOI5JpS6aLe/g9Pqemc9YmeuJeVy6OLk7K4S9ksrPJ/psEDz
+OFSz/bdoyNrGj1E8svuR3Bznm53htw1yj+KkxKl4+esUrMZDBcJlOSgYAsOCsp0FvmXtll9ldDz7
+CTUue5wT/RsPXcdtgTpWD8w74a8CLyKsRspGPKAcTNZEtF4uXBVmCeEmKf7GUmG6sXP/wwyc5Wxq
+lD8UykAWlYTzWamsX0xhk23RO8yilQwipmdnRC652dKKQbNmC1r7fSOl8hqw/96bg5Qu0T/fkreR
+rwU7ZcegbLHNYhLDkBvjJc40vG93drEQw/cFGsDWr3RiSBd3kmmQYRzelYB0VI8YHMPzA9C/pEN1
+hlMYegouCRw2n5H9gooiS9EOUCXdywMMF8mDAAhONU2Ki+3wApRmLER/y5UnlhetCTCstnEXbosX
+9hwJ1C07mKVx01QT2WDz9UtmT/rx7iASjbSsV7FFY6GsdqnC+w==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert123.pem b/test/rules/platform_certs/default/cert123.pem
new file mode 100644
index 000000000000..d6148cd711c0
--- /dev/null
+++ b/test/rules/platform_certs/default/cert123.pem
@@ -0,0 +1,15 @@
+SSL.com EV Root Certification Authority ECC
+-----BEGIN CERTIFICATE-----
+MIIClDCCAhqgAwIBAgIILCmcWxbtBZUwCgYIKoZIzj0EAwIwfzELMAkGA1UEBhMCVVMxDjAMBgNV
+BAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24xNDAy
+BgNVBAMMK1NTTC5jb20gRVYgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYw
+MjEyMTgxNTIzWhcNNDEwMjEyMTgxNTIzWjB/MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMx
+EDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjE0MDIGA1UEAwwrU1NM
+LmNvbSBFViBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuB
+BAAiA2IABKoSR5CYG/vvw0AHgyBO8TCCogbR8pKGYfL2IWjKAMTH6kMAVIbc/R/fALhBYlzccBYy
+3h+Z1MzFB8gIH2EWB1E9fVwHU+M1OIzfzZ/ZLg1KthkuWnBaBu2+8KGwytAJKaNjMGEwHQYDVR0O
+BBYEFFvKXuXe0oGqzagtZFG22XKbl+ZPMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUW8pe
+5d7SgarNqC1kUbbZcpuX5k8wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2gAMGUCMQCK5kCJ
+N+vp1RPZytRrJPOwPYdGWBrssd9v+1a6cGvHOMzosYxPD/fxZ3YOg9AeUY8CMD32IygmTMZgh5Mm
+m7I1HrrW9zzRHM76JTymGoEVW/MSD2zuZYrJh6j5B+BimoxcSg==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert124.pem b/test/rules/platform_certs/default/cert124.pem
new file mode 100644
index 000000000000..d35f07211e31
--- /dev/null
+++ b/test/rules/platform_certs/default/cert124.pem
@@ -0,0 +1,28 @@
+GlobalSign Root CA - R6
+-----BEGIN CERTIFICATE-----
+MIIFgzCCA2ugAwIBAgIORea7A4Mzw4VlSOb/RVEwDQYJKoZIhvcNAQEMBQAwTDEgMB4GA1UECxMX
+R2xvYmFsU2lnbiBSb290IENBIC0gUjYxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkds
+b2JhbFNpZ24wHhcNMTQxMjEwMDAwMDAwWhcNMzQxMjEwMDAwMDAwWjBMMSAwHgYDVQQLExdHbG9i
+YWxTaWduIFJvb3QgQ0EgLSBSNjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFs
+U2lnbjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJUH6HPKZvnsFMp7PPcNCPG0RQss
+grRIxutbPK6DuEGSMxSkb3/pKszGsIhrxbaJ0cay/xTOURQh7ErdG1rG1ofuTToVBu1kZguSgMpE
+3nOUTvOniX9PeGMIyBJQbUJmL025eShNUhqKGoC3GYEOfsSKvGRMIRxDaNc9PIrFsmbVkJq3MQbF
+vuJtMgamHvm566qjuL++gmNQ0PAYid/kD3n16qIfKtJwLnvnvJO7bVPiSHyMEAc4/2ayd2F+4OqM
+PKq0pPbzlUoSB239jLKJz9CgYXfIWHSw1CM69106yqLbnQneXUQtkPGBzVeS+n68UARjNN9rkxi+
+azayOeSsJDa38O+2HBNXk7besvjihbdzorg1qkXy4J02oW9UivFyVm4uiMVRQkQVlO6jxTiWm05O
+WgtH8wY2SXcwvHE35absIQh1/OZhFj931dmRl4QKbNQCTXTAFO39OfuD8l4UoQSwC+n+7o/hbguy
+CLNhZglqsQY6ZZZZwPA1/cnaKI0aEYdwgQqomnUdnjqGBQCe24DWJfncBZ4nWUx2OVvq+aWh2IMP
+0f/fMBH5hc8zSPXKbWQULHpYT9NLCEnFlWQaYw55PfWzjMpYrZxCRXluDocZXFSxZba/jJvcE+kN
+b7gu3GduyYsRtYQUigAZcIN5kZeR1BonvzceMgfYFGM8KEyvAgMBAAGjYzBhMA4GA1UdDwEB/wQE
+AwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSubAWjkxPioufi1xzWx/B/yGdToDAfBgNV
+HSMEGDAWgBSubAWjkxPioufi1xzWx/B/yGdToDANBgkqhkiG9w0BAQwFAAOCAgEAgyXt6NH9lVLN
+nsAEoJFp5lzQhN7craJP6Ed41mWYqVuoPId8AorRbrcWc+ZfwFSY1XS+wc3iEZGtIxg93eFyRJa0
+lV7Ae46ZeBZDE1ZXs6KzO7V33EByrKPrmzU+sQghoefEQzd5Mr6155wsTLxDKZmOMNOsIeDjHfrY
+BzN2VAAiKrlNIC5waNrlU/yDXNOd8v9EDERm8tLjvUYAGm0CuiVdjaExUd1URhxN25mW7xocBFym
+Fe944Hn+Xds+qkxV/ZoVqW/hpvvfcDDpw+5CRu3CkwWJ+n1jez/QcYF8AOiYrg54NMMl+68KnyBr
+3TsTjxKM4kEaSHpzoHdpx7Zcf4LIHv5YGygrqGytXm3ABdJ7t+uA/iU3/gKbaKxCXcPu9czc8FB1
+0jZpnOZ7BN9uBmm23goJSFmH63sUYHpkqmlD75HHTOwY3WzvUy2MmeFe8nI+z1TIvWfspA9MRf/T
+uTAjB0yPEL+GltmZWrSZVxykzLsViVO6LAUP5MSeGbEYNNVMnbrt9x+vJJUEeKgDu+6B5dpffItK
+oZB0JaezPkvILFa9x8jvOOJckvB595yEunQtYQEgfn7R8k8HWV+LLUNS60YMlOH1Zkd5d9VUWx+t
+JDfLRVpOoERIyNiwmcUVhAn21klJwGW45hpxbqCo8YLoRT5s1gLXCmeDBVrJpBA=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert125.pem b/test/rules/platform_certs/default/cert125.pem
new file mode 100644
index 000000000000..53e930be20ca
--- /dev/null
+++ b/test/rules/platform_certs/default/cert125.pem
@@ -0,0 +1,14 @@
+OISTE WISeKey Global Root GC CA
+-----BEGIN CERTIFICATE-----
+MIICaTCCAe+gAwIBAgIQISpWDK7aDKtARb8roi066jAKBggqhkjOPQQDAzBtMQswCQYDVQQGEwJD
+SDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEo
+MCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQyBDQTAeFw0xNzA1MDkwOTQ4MzRa
+Fw00MjA1MDkwOTU4MzNaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYDVQQL
+ExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEdsb2Jh
+bCBSb290IEdDIENBMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAETOlQwMYPchi82PG6s4nieUqjFqdr
+VCTbUf/q9Akkwwsin8tqJ4KBDdLArzHkdIJuyiXZjHWd8dvQmqJLIX4Wp2OQ0jnUsYd4XxiWD1Ab
+NTcPasbc2RNNpI6QN+a9WzGRo1QwUjAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
+BgNVHQ4EFgQUSIcUrOPDnpBgOtfKie7TrYy0UGYwEAYJKwYBBAGCNxUBBAMCAQAwCgYIKoZIzj0E
+AwMDaAAwZQIwJsdpW9zV57LnyAyMjMPdeYwbY9XJUpROTYJKcx6ygISpJcBMWm1JKWB4E+J+SOtk
+AjEA2zQgMgj/mkkCtojeFK9dbJlxjRo/i9fgojaGHAeCOnZT/cKi7e97sIBPWA9LUzm9
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert126.pem b/test/rules/platform_certs/default/cert126.pem
new file mode 100644
index 000000000000..e3bdabc17ee2
--- /dev/null
+++ b/test/rules/platform_certs/default/cert126.pem
@@ -0,0 +1,28 @@
+GTS Root R1
+-----BEGIN CERTIFICATE-----
+MIIFWjCCA0KgAwIBAgIQbkepxUtHDA3sM9CJuRz04TANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQG
+EwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJv
+b3QgUjEwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAG
+A1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjEwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2EQKLHuOhd5s73L+UPreVp0A8of2C+X0yBoJx
+9vaMf/vo27xqLpeXo4xL+Sv2sfnOhB2x+cWX3u+58qPpvBKJXqeqUqv4IyfLpLGcY9vXmX7wCl7r
+aKb0xlpHDU0QM+NOsROjyBhsS+z8CZDfnWQpJSMHobTSPS5g4M/SCYe7zUjwTcLCeoiKu7rPWRnW
+r4+wB7CeMfGCwcDfLqZtbBkOtdh+JhpFAz2weaSUKK0PfyblqAj+lug8aJRT7oM6iCsVlgmy4HqM
+LnXWnOunVmSPlk9orj2XwoSPwLxAwAtcvfaHszVsrBhQf4TgTM2S0yDpM7xSma8ytSmzJSq0SPly
+4cpk9+aCEI3oncKKiPo4Zor8Y/kB+Xj9e1x3+naH+uzfsQ55lVe0vSbv1gHR6xYKu44LtcXFilWr
+06zqkUspzBmkMiVOKvFlRNACzqrOSbTqn3yDsEB750Orp2yjj32JgfpMpf/VjsPOS+C12LOORc92
+wO1AK/1TD7Cn1TsNsYqiA94xrcx36m97PtbfkSIS5r762DL8EGMUUXLeXdYWk70paDPvOmbsB4om
+3xPXV2V4J95eSRQAogB/mqghtqmxlbCluQ0WEdrHbEg8QOB+DVrNVjzRlwW5y0vtOUucxD/SVRNu
+JLDWcfr0wbrM7Rv1/oFB2ACYPTrIrnqYNxgFlQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU5K8rJnEaK0gnhS9SZizv8IkTcT4wDQYJKoZIhvcNAQEM
+BQADggIBADiWCu49tJYeX++dnAsznyvgyv3SjgofQXSlfKqE1OXyHuY3UjKcC9FhHb8owbZEKTV1
+d5iyfNm9dKyKaOOpMQkpAWBz40d8U6iQSifvS9efk+eCNs6aaAyC58/UEBZvXw6ZXPYfcX3v73sv
+fuo21pdwCxXu11xWajOl40k4DLh9+42FpLFZXvRq4d2h9mREruZRgyFmxhE+885H7pwoHyXa/6xm
+ld01D1zvICxi/ZG6qcz8WpyTgYMpl0p8WnK0OdC3d8t5/Wk6kjftbjhlRn7pYL15iJdfOBL07q9b
+gsiG1eGZbYwE8na6SfZu6W0eX6DvJ4J2QPim01hcDyxC2kLGe4g0x8HYRZvBPsVhHdljUEn2NIVq
+4BjFbkerQUIpm/ZgDdIx02OYI5NaAIFItO/Nis3Jz5nu2Z6qNuFoS3FJFDYoOj0dzpqPJeaAcWEr
+tXvM+SUWgeExX6GjfhaknBZqlxi9dnKlC54dNuYvoS++cJEPqOba+MSSQGwlfnuzCdyyF62ARPBo
+pY+Udf90WuioAnwMCeKpSwughQtiue+hMZL77/ZRBIls6Kl0obsXs7X9SQ98POyDGCBDTtWTurQ0
+sR8WNh8M5mQ5Fkzc4P4dyKliPUDqysU0ArSuiYgzNdwsE3PYJ/HQcu51OyLemGhmW/HGY0dVHLql
+CFF1pkgl
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert127.pem b/test/rules/platform_certs/default/cert127.pem
new file mode 100644
index 000000000000..ee03650a975a
--- /dev/null
+++ b/test/rules/platform_certs/default/cert127.pem
@@ -0,0 +1,28 @@
+GTS Root R2
+-----BEGIN CERTIFICATE-----
+MIIFWjCCA0KgAwIBAgIQbkepxlqz5yDFMJo/aFLybzANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQG
+EwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJv
+b3QgUjIwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAG
+A1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjIwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDO3v2m++zsFDQ8BwZabFn3GTXd98GdVarTzTuk
+k3LvCvptnfbwhYBboUhSnznFt+4orO/LdmgUud+tAWyZH8QiHZ/+cnfgLFuv5AS/T3KgGjSY6Dlo
+7JUle3ah5mm5hRm9iYz+re026nO8/4Piy33B0s5Ks40FnotJk9/BW9BuXvAuMC6C/Pq8tBcKSOWI
+m8Wba96wyrQD8Nr0kLhlZPdcTK3ofmZemde4wj7I0BOdre7kRXuJVfeKH2JShBKzwkCX44ofR5Gm
+dFrS+LFjKBC4swm4VndAoiaYecb+3yXuPuWgf9RhD1FLPD+M2uFwdNjCaKH5wQzpoeJ/u1U8dgbu
+ak7MkogwTZq9TwtImoS1mKPV+3PBV2HdKFZ1E66HjucMUQkQdYhMvI35ezzUIkgfKtzra7tEscsz
+cTJGr61K8YzodDqs5xoic4DSMPclQsciOzsSrZYuxsN2B6ogtzVJV+mSSeh2FnIxZyuWfoqjx5RW
+Ir9qS34BIbIjMt/kmkRtWVtd9QCgHJvGeJeNkP+byKq0rxFROV7Z+2et1VsRnTKaG73Vululycsl
+aVNVJ1zgyjbLiGH7HrfQy+4W+9OmTN6SpdTi3/UGVN4unUu0kzCqgc7dGtxRcw1PcOnlthYhGXmy
+5okLdWTK1au8CcEYof/UVKGFPP0UJAOyh9OktwIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUu//KjiOfT5nK2+JopqUVJxce2Q4wDQYJKoZIhvcNAQEM
+BQADggIBALZp8KZ3/p7uC4Gt4cCpx/k1HUCCq+YEtN/L9x0Pg/B+E02NjO7jMyLDOfxA325BS0JT
+vhaI8dI4XsRomRyYUpOM52jtG2pzegVATX9lO9ZY8c6DR2Dj/5epnGB3GFW1fgiTz9D2PGcDFWEJ
++YF59exTpJ/JjwGLc8R3dtyDovUMSRqodt6Sm2T4syzFJ9MHwAiApJiS4wGWAqoC7o87xdFtCjMw
+c3i5T1QWvwsHoaRc5svJXISPD+AVdyx+Jn7axEvbpxZ3B7DNdehyQtaVhJ2Gg/LkkM0JR9SLA3Da
+WsYDQvTtN6LwG1BUSw7YhN4ZKJmBR64JGz9I0cNv4rBgF/XuIwKl2gBbbZCr7qLpGzvpx0QnRY5r
+n/WkhLx3+WuXrD5RRaIRpsyF7gpo8j5QOHokYh4XIDdtak23CZvJ/KRY9bb7nE4Yu5UC56Gtmwfu
+Nmsk0jmGwZODUNKBRqhfYlcsu2xkiAhu7xNUX90txGdj08+JN7+dIPT7eoOboB6BAFDC5AwiWVIQ
+7UNWhwD4FFKnHYuTjKJNRn8nxnGbJN7k2oaLDX5rIMHAnuFl2GqjpuiFizoHCBy69Y9Vmhh1fuXs
+gWbRIXOhNUQLgD1bnF5vKheW0YMjiGZt5obicDIvUiLnyOd/xCxgXS/Dr55FBcOEArf9LAhST4Ld
+o/DUhgkC
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert128.pem b/test/rules/platform_certs/default/cert128.pem
new file mode 100644
index 000000000000..41e3202bf72c
--- /dev/null
+++ b/test/rules/platform_certs/default/cert128.pem
@@ -0,0 +1,13 @@
+GTS Root R3
+-----BEGIN CERTIFICATE-----
+MIICDDCCAZGgAwIBAgIQbkepx2ypcyRAiQ8DVd2NHTAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJV
+UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
+UjMwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
+ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjMwdjAQBgcq
+hkjOPQIBBgUrgQQAIgNiAAQfTzOHMymKoYTey8chWEGJ6ladK0uFxh1MJ7x/JlFyb+Kf1qPKzEUU
+Rout736GjOyxfi//qXGdGIRFBEFVbivqJn+7kAHjSxm65FSWRQmx1WyRRK2EE46ajA2ADDL24Cej
+QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTB8Sa6oC2uhYHP
+0/EqEr24Cmf9vDAKBggqhkjOPQQDAwNpADBmAjEAgFukfCPAlaUs3L6JbyO5o91lAFJekazInXJ0
+glMLfalAvWhgxeG4VDvBNhcl2MG9AjEAnjWSdIUlUfUk7GRSJFClH9voy8l27OyCbvWFGFPouOOa
+KaqW04MjyaR7YbPMAuhd
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert129.pem b/test/rules/platform_certs/default/cert129.pem
new file mode 100644
index 000000000000..18d2d1950a27
--- /dev/null
+++ b/test/rules/platform_certs/default/cert129.pem
@@ -0,0 +1,13 @@
+GTS Root R4
+-----BEGIN CERTIFICATE-----
+MIICCjCCAZGgAwIBAgIQbkepyIuUtui7OyrYorLBmTAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJV
+UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
+UjQwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
+ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjQwdjAQBgcq
+hkjOPQIBBgUrgQQAIgNiAATzdHOnaItgrkO4NcWBMHtLSZ37wWHO5t5GvWvVYRg1rkDdc/eJkTBa
+6zzuhXyiQHY7qca4R9gq55KRanPpsXI5nymfopjTX15YhmUPoYRlBtHci8nHc8iMai/lxKvRHYqj
+QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSATNbrdP9JNqPV
+2Py1PsVq8JQdjDAKBggqhkjOPQQDAwNnADBkAjBqUFJ0CMRw3J5QdCHojXohw0+WbhXRIjVhLfoI
+N+4Zba3bssx9BzT1YBkstTTZbyACMANxsbqjYAuG7ZoIapVon+Kz4ZNkfF6Tpt95LY2F45TPI11x
+zPKwTdb+mciUqXWi4w==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert130.pem b/test/rules/platform_certs/default/cert130.pem
new file mode 100644
index 000000000000..0dacc520e53a
--- /dev/null
+++ b/test/rules/platform_certs/default/cert130.pem
@@ -0,0 +1,27 @@
+UCA Global G2 Root
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIQXd+x2lqj7V2+WmUgZQOQ7zANBgkqhkiG9w0BAQsFADA9MQswCQYDVQQG
+EwJDTjERMA8GA1UECgwIVW5pVHJ1c3QxGzAZBgNVBAMMElVDQSBHbG9iYWwgRzIgUm9vdDAeFw0x
+NjAzMTEwMDAwMDBaFw00MDEyMzEwMDAwMDBaMD0xCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlU
+cnVzdDEbMBkGA1UEAwwSVUNBIEdsb2JhbCBHMiBSb290MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAxeYrb3zvJgUno4Ek2m/LAfmZmqkywiKHYUGRO8vDaBsGxUypK8FnFyIdK+35KYmT
+oni9kmugow2ifsqTs6bRjDXVdfkX9s9FxeV67HeToI8jrg4aA3++1NDtLnurRiNb/yzmVHqUwCoV
+8MmNsHo7JOHXaOIxPAYzRrZUEaalLyJUKlgNAQLx+hVRZ2zA+te2G3/RVogvGjqNO7uCEeBHANBS
+h6v7hn4PJGtAnTRnvI3HLYZveT6OqTwXS3+wmeOwcWDcC/Vkw85DvG1xudLeJ1uK6NjGruFZfc8o
+LTW4lVYa8bJYS7cSN8h8s+1LgOGN+jIjtm+3SJUIsUROhYw6AlQgL9+/V087OpAh18EmNVQg7Mc/
+R+zvWr9LesGtOxdQXGLYD0tK3Cv6brxzks3sx1DoQZbXqX5t2Okdj4q1uViSukqSKwxW/YDrCPBe
+KW4bHAyvj5OJrdu9o54hyokZ7N+1wxrrFv54NkzWbtA+FxyQF2smuvt6L78RHBgOLXMDj6DlNaBa
+4kx1HXHhOThTeEDMg5PXCp6dW4+K5OXgSORIskfNTip1KnvyIvbJvgmRlld6iIis7nCs+dwp4wwc
+OxJORNanTrAmyPPZGpeRaOrvjUYG0lZFWJo8DA+DuAUlwznPO6Q0ibd5Ei9Hxeepl2n8pndntd97
+8XplFeRhVmUCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
+BBYEFIHEjMz15DD/pQwIX4wVZyF0Ad/fMA0GCSqGSIb3DQEBCwUAA4ICAQATZSL1jiutROTL/7lo
+5sOASD0Ee/ojL3rtNtqyzm325p7lX1iPyzcyochltq44PTUbPrw7tgTQvPlJ9Zv3hcU2tsu8+Mg5
+1eRfB70VVJd0ysrtT7q6ZHafgbiERUlMjW+i67HM0cOU2kTC5uLqGOiiHycFutfl1qnN3e92mI0A
+Ds0b+gO3joBYDic/UvuUospeZcnWhNq5NXHzJsBPd+aBJ9J3O5oUb3n09tDh05S60FdRvScFDcH9
+yBIw7m+NESsIndTUv4BFFJqIRNow6rSn4+7vW4LVPtateJLbXDzz2K36uGt/xDYotgIVilQsnLAX
+c47QN6MUPJiVAAwpBVueSUmxX8fjy88nZY41F7dXyDDZQVu5FLbowg+UMaeUmMxq67XhJ/UQqAHo
+jhJi6IjMtX9Gl8CbEGY4GjZGXyJoPd/JxhMnq1MGrKI8hgZlb7F+sSlEmqO6SWkoaY/X5V+tBIZk
+bxqgDMUIYs6Ao9Dz7GjevjPHF1t/gMRMTLGmhIrDO7gJzRSBuhjjVFc2/tsvfEehOjPI+Vg7RE+x
+ygKJBJYoaMVLuCaJu9YzL1DV/pqJuhgyklTGW+Cd+V7lDSKb9triyCGyYiGqhkCyLmTTX8jjfhFn
+RR8F/uOi77Oos/N9j/gMHyIfLXC0uAE0djAA5SN4p1bXUB+K+wb1whnw0A==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert131.pem b/test/rules/platform_certs/default/cert131.pem
new file mode 100644
index 000000000000..b9ffb5d67f20
--- /dev/null
+++ b/test/rules/platform_certs/default/cert131.pem
@@ -0,0 +1,28 @@
+UCA Extended Validation Root
+-----BEGIN CERTIFICATE-----
+MIIFWjCCA0KgAwIBAgIQT9Irj/VkyDOeTzRYZiNwYDANBgkqhkiG9w0BAQsFADBHMQswCQYDVQQG
+EwJDTjERMA8GA1UECgwIVW5pVHJ1c3QxJTAjBgNVBAMMHFVDQSBFeHRlbmRlZCBWYWxpZGF0aW9u
+IFJvb3QwHhcNMTUwMzEzMDAwMDAwWhcNMzgxMjMxMDAwMDAwWjBHMQswCQYDVQQGEwJDTjERMA8G
+A1UECgwIVW5pVHJ1c3QxJTAjBgNVBAMMHFVDQSBFeHRlbmRlZCBWYWxpZGF0aW9uIFJvb3QwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCpCQcoEwKwmeBkqh5DFnpzsZGgdT6o+uM4AHrs
+iWogD4vFsJszA1qGxliG1cGFu0/GnEBNyr7uaZa4rYEwmnySBesFK5pI0Lh2PpbIILvSsPGP2KxF
+Rv+qZ2C0d35qHzwaUnoEPQc8hQ2E0B92CvdqFN9y4zR8V05WAT558aopO2z6+I9tTcg1367r3CTu
+eUWnhbYFiN6IXSV8l2RnCdm/WhUFhvMJHuxYMjMR83dksHYf5BA1FxvyDrFspCqjc/wJHx4yGVMR
+59mzLC52LqGj3n5qiAno8geK+LLNEOfic0CTuwjRP+H8C5SzJe98ptfRr5//lpr1kXuYC3fUfugH
+0mK1lTnj8/FtDw5lhIpjVMWAtuCeS31HJqcBCF3RiJ7XwzJE+oJKCmhUfzhTA8ykADNkUVkLo4KR
+el7sFsLzKuZi2irbWWIQJUoqgQtHB0MGcIfS+pMRKXpITeuUx3BNr2fVUbGAIAEBtHoIppB/TuDv
+B0GHr2qlXov7z1CymlSvw4m6WC31MJixNnI5fkkE/SmnTHnkBVfblLkWU41Gsx2VYVdWf6/wFlth
+WG82UBEL2KwrlRYaDh8IzTY0ZRBiZtWAXxQgXy0MoHgKaNYs1+lvK9JKBZP8nm9rZ/+I8U6laUpS
+NwXqxhaN0sSZ0YIrO7o1dfdRUVjzyAfd5LQDfwIDAQABo0IwQDAdBgNVHQ4EFgQU2XQ65DA9DfcS
+3H5aBZ8eNJr34RQwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQEL
+BQADggIBADaNl8xCFWQpN5smLNb7rhVpLGsaGvdftvkHTFnq88nIua7Mui563MD1sC3AO6+fcAUR
+ap8lTwEpcOPlDOHqWnzcSbvBHiqB9RZLcpHIojG5qtr8nR/zXUACE/xOHAbKsxSQVBcZEhrxH9cM
+aVr2cXj0lH2RC47skFSOvG+hTKv8dGT9cZr4QQehzZHkPJrgmzI5c6sq1WnIeJEmMX3ixzDx/BR4
+dxIOE/TdFpS/S2d7cFOFyrC78zhNLJA5wA3CXWvp4uXViI3WLL+rG761KIcSF3Ru/H38j9CHJrAb
++7lsq+KePRXBOy5nAliRn+/4Qh8st2j1da3Ptfb/EX3C8CSlrdP6oDyp+l3cpaDvRKS+1ujl5BOW
+F3sGPjLtx7dCvHaj2GU4Kzg1USEODm8uNBNA4StnDG1KQTAYI1oyVZnJF+A83vbsea0rWBmirSwi
+GpWOvpaQXUJXxPkUAzUrHC1RVwinOt4/5Mi0A3PCwSaAuwtCH60NryZy2sy+s6ODWA2CxR9GUeOc
+GMyNm43sSet1UNWMKFnKdDTajAshqx7qG+XH/RU+wBeq+yNuJkbL+vmxcmtpzyKEC2IPrNkZAJSi
+djzULZrtBJ4tBmIQN1IchXIbJ+XMxjHsN+xjWZsLHXbMfjKaiJUINlK73nZfdklJrX+9ZSCyycEr
+dhh2n1ax
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert132.pem b/test/rules/platform_certs/default/cert132.pem
new file mode 100644
index 000000000000..fcfc4e9327b0
--- /dev/null
+++ b/test/rules/platform_certs/default/cert132.pem
@@ -0,0 +1,32 @@
+Certigna Root CA
+-----BEGIN CERTIFICATE-----
+MIIGWzCCBEOgAwIBAgIRAMrpG4nxVQMNo+ZBbcTjpuEwDQYJKoZIhvcNAQELBQAwWjELMAkGA1UE
+BhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczEcMBoGA1UECwwTMDAwMiA0ODE0NjMwODEwMDAzNjEZ
+MBcGA1UEAwwQQ2VydGlnbmEgUm9vdCBDQTAeFw0xMzEwMDEwODMyMjdaFw0zMzEwMDEwODMyMjda
+MFoxCzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxHDAaBgNVBAsMEzAwMDIgNDgxNDYz
+MDgxMDAwMzYxGTAXBgNVBAMMEENlcnRpZ25hIFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQDNGDllGlmx6mQWDoyUJJV8g9PFOSbcDO8WV43X2KyjQn+Cyu3NW9sOty3tRQgX
+stmzy9YXUnIo245Onoq2C/mehJpNdt4iKVzSs9IGPjA5qXSjklYcoW9MCiBtnyN6tMbaLOQdLNyz
+KNAT8kxOAkmhVECe5uUFoC2EyP+YbNDrihqECB63aCPuI9Vwzm1RaRDuoXrC0SIxwoKF0vJVdlB8
+JXrJhFwLrN1CTivngqIkicuQstDuI7pmTLtipPlTWmR7fJj6o0ieD5Wupxj0auwuA0Wv8HT4Ks16
+XdG+RCYyKfHx9WzMfgIhC59vpD++nVPiz32pLHxYGpfhPTc3GGYo0kDFUYqMwy3OU4gkWGQwFsWq
+4NYKpkDfePb1BHxpE4S80dGnBs8B92jAqFe7OmGtBIyT46388NtEbVncSVmurJqZNjBBe3YzIoej
+wpKGbvlw7q6Hh5UbxHq9MfPU0uWZ/75I7HX1eBYdpnDBfzwboZL7z8g81sWTCo/1VTp2lc5ZmIoJ
+lXcymoO6LAQ6l73UL77XbJuiyn1tJslV1c/DeVIICZkHJC1kJWumIWmbat10TWuXekG9qxf5kBdI
+jzb5LdXF2+6qhUVB+s06RbFo5jZMm5BX7CO5hwjCxAnxl4YqKE3idMDaxIzb3+KhF1nOJFl0Mdp/
+/TBt2dzhauH8XwIDAQABo4IBGjCCARYwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
+HQYDVR0OBBYEFBiHVuBud+4kNTxOc5of1uHieX4rMB8GA1UdIwQYMBaAFBiHVuBud+4kNTxOc5of
+1uHieX4rMEQGA1UdIAQ9MDswOQYEVR0gADAxMC8GCCsGAQUFBwIBFiNodHRwczovL3d3d3cuY2Vy
+dGlnbmEuZnIvYXV0b3JpdGVzLzBtBgNVHR8EZjBkMC+gLaArhilodHRwOi8vY3JsLmNlcnRpZ25h
+LmZyL2NlcnRpZ25hcm9vdGNhLmNybDAxoC+gLYYraHR0cDovL2NybC5kaGlteW90aXMuY29tL2Nl
+cnRpZ25hcm9vdGNhLmNybDANBgkqhkiG9w0BAQsFAAOCAgEAlLieT/DjlQgi581oQfccVdV8AOIt
+OoldaDgvUSILSo3L6btdPrtcPbEo/uRTVRPPoZAbAh1fZkYJMyjhDSSXcNMQH+pkV5a7XdrnxIxP
+TGRGHVyH41neQtGbqH6mid2PHMkwgu07nM3A6RngatgCdTer9zQoKJHyBApPNeNgJgH60BGM+RFq
+7q89w1DTj18zeTyGqHNFkIwgtnJzFyO+B2XleJINugHA64wcZr+shncBlA2c5uk5jR+mUYyZDDl3
+4bSb+hxnV29qao6pK0xXeXpXIs/NX2NGjVxZOob4Mkdio2cNGJHc+6Zr9UhhcyNZjgKnvETq9Emd
+8VRY+WCv2hikLyhF3HqgiIZd8zvn/yk1gPxkQ5Tm4xxvvq0OKmOZK8l+hfZx6AYDlf7ej0gcWtSS
+6Cvu5zHbugRqh5jnxV/vfaci9wHYTfmJ0A6aBVmknpjZbyvKcL5kwlWj9Omvw5Ip3IgWJJk8jSaY
+tlu3zM63Nwf9JtmYhST/WSMDmu2dnajkXjjO11INb9I/bbEFa0nOipFGc/T2L/Coc3cOZayhjWZS
+aX5LaAzHHjcng6WMxwLkFM1JAbBzs/3GkDpv0mztO+7skb6iQ12LAEpmJURw3kAP+HwV96LOPNde
+E4yBFxgX0b3xdxA61GU5wSesVywlVP+i2k+KYTlerj1KjL0=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert133.pem b/test/rules/platform_certs/default/cert133.pem
new file mode 100644
index 000000000000..056b4b067423
--- /dev/null
+++ b/test/rules/platform_certs/default/cert133.pem
@@ -0,0 +1,20 @@
+emSign Root CA - G1
+-----BEGIN CERTIFICATE-----
+MIIDlDCCAnygAwIBAgIKMfXkYgxsWO3W2DANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQGEwJJTjET
+MBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRl
+ZDEcMBoGA1UEAxMTZW1TaWduIFJvb3QgQ0EgLSBHMTAeFw0xODAyMTgxODMwMDBaFw00MzAyMTgx
+ODMwMDBaMGcxCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVk
+aHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMRwwGgYDVQQDExNlbVNpZ24gUm9vdCBDQSAtIEcxMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk0u76WaK7p1b1TST0Bsew+eeuGQzf2N4aLTN
+LnF115sgxk0pvLZoYIr3IZpWNVrzdr3YzZr/k1ZLpVkGoZM0Kd0WNHVO8oG0x5ZOrRkVUkr+PHB1
+cM2vK6sVmjM8qrOLqs1D/fXqcP/tzxE7lM5OMhbTI0Aqd7OvPAEsbO2ZLIvZTmmYsvePQbAyeGHW
+DV/D+qJAkh1cF+ZwPjXnorfCYuKrpDhMtTk1b+oDafo6VGiFbdbyL0NVHpENDtjVaqSW0RM8LHhQ
+6DqS0hdW5TUaQBw+jSztOd9C4INBdN+jzcKGYEho42kLVACL5HZpIQ15TjQIXhTCzLG3rdd8cIrH
+hQIDAQABo0IwQDAdBgNVHQ4EFgQU++8Nhp6w492pufEhF38+/PB3KxowDgYDVR0PAQH/BAQDAgEG
+MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAFn/8oz1h31xPaOfG1vR2vjTnGs2
+vZupYeveFix0PZ7mddrXuqe8QhfnPZHr5X3dPpzxz5KsbEjMwiI/aTvFthUvozXGaCocV685743Q
+NcMYDHsAVhzNixl03r4PEuDQqqE/AjSxcM6dGNYIAwlG7mDgfrbESQRRfXBgvKqy/3lyeqYdPV8q
++Mri/Tm3R7nrft8EI6/6nAYH6ftjk4BAtcZsCjEozgyfz7MjNYBBjWzEN3uBL4ChQEKF6dk4jeih
+U80Bv2noWgbyRQuQ+q7hv53yrlc8pa6yVvSLZUDp/TGBLPQ5Cdjua6e0ph0VpZj3AYHYhX3zUVxx
+iN66zB+Afko=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert134.pem b/test/rules/platform_certs/default/cert134.pem
new file mode 100644
index 000000000000..c43a67b50c25
--- /dev/null
+++ b/test/rules/platform_certs/default/cert134.pem
@@ -0,0 +1,14 @@
+emSign ECC Root CA - G3
+-----BEGIN CERTIFICATE-----
+MIICTjCCAdOgAwIBAgIKPPYHqWhwDtqLhDAKBggqhkjOPQQDAzBrMQswCQYDVQQGEwJJTjETMBEG
+A1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRlZDEg
+MB4GA1UEAxMXZW1TaWduIEVDQyBSb290IENBIC0gRzMwHhcNMTgwMjE4MTgzMDAwWhcNNDMwMjE4
+MTgzMDAwWjBrMQswCQYDVQQGEwJJTjETMBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11
+ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRlZDEgMB4GA1UEAxMXZW1TaWduIEVDQyBSb290IENBIC0g
+RzMwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQjpQy4LRL1KPOxst3iAhKAnjlfSU2fySU0WXTsuwYc
+58Byr+iuL+FBVIcUqEqy6HyC5ltqtdyzdc6LBtCGI79G1Y4PPwT01xySfvalY8L1X44uT6EYGQIr
+MgqCZH0Wk9GjQjBAMB0GA1UdDgQWBBR8XQKEE9TMipuBzhccLikenEhjQjAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNpADBmAjEAvvNhzwIQHWSVB7gYboiFBS+D
+CBeQyh+KTOgNG3qxrdWBCUfvO6wIBHxcmbHtRwfSAjEAnbpV/KlK6O3t5nYBQnvI+GDZjVGLVTv7
+jHvrZQnD+JbNR6iC8hZVdyR+EhCVBCyj
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert135.pem b/test/rules/platform_certs/default/cert135.pem
new file mode 100644
index 000000000000..04179a44bf1f
--- /dev/null
+++ b/test/rules/platform_certs/default/cert135.pem
@@ -0,0 +1,19 @@
+emSign Root CA - C1
+-----BEGIN CERTIFICATE-----
+MIIDczCCAlugAwIBAgILAK7PALrEzzL4Q7IwDQYJKoZIhvcNAQELBQAwVjELMAkGA1UEBhMCVVMx
+EzARBgNVBAsTCmVtU2lnbiBQS0kxFDASBgNVBAoTC2VNdWRocmEgSW5jMRwwGgYDVQQDExNlbVNp
+Z24gUm9vdCBDQSAtIEMxMB4XDTE4MDIxODE4MzAwMFoXDTQzMDIxODE4MzAwMFowVjELMAkGA1UE
+BhMCVVMxEzARBgNVBAsTCmVtU2lnbiBQS0kxFDASBgNVBAoTC2VNdWRocmEgSW5jMRwwGgYDVQQD
+ExNlbVNpZ24gUm9vdCBDQSAtIEMxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz+up
+ufGZBczYKCFK83M0UYRWEPWgTywS4/oTmifQz/l5GnRfHXk5/Fv4cI7gklL35CX5VIPZHdPIWoU/
+Xse2B+4+wM6ar6xWQio5JXDWv7V7Nq2s9nPczdcdioOl+yuQFTdrHCZH3DspVpNqs8FqOp099cGX
+OFgFixwR4+S0uF2FHYP+eF8LRWgYSKVGczQ7/g/IdrvHGPMF0Ybzhe3nudkyrVWIzqa2kbBPrH4V
+I5b2P/AgNBbeCsbEBEV5f6f9vtKppa+cxSMq9zwhbL2vj07FOrLzNBL834AaSaTUqZX3noleooms
+lMuoaJuvimUnzYnu3Yy1aylwQ6BpC+S5DwIDAQABo0IwQDAdBgNVHQ4EFgQU/qHgcB4qAzlSWkK+
+XJGFehiqTbUwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQAD
+ggEBAMJKVvoVIXsoounlHfv4LcQ5lkFMOycsxGwYFYDGrK9HWS8mC+M2sO87/kOXSTKZEhVb3xEp
+/6tT+LvBeA+snFOvV71ojD1pM/CjoCNjO2RnIkSt1XHLVip4kqNPEjE2NuLe/gDEo2APJ62gsIq1
+NnpSob0n9CAnYuhNlCQT5AoE6TyrLshDCUrGYQTlSTR+08TI9Q/Aqum6VF7zYytPT1DU/rl7mYw9
+wC68AivTxEDkigcxHpvOJpkT+xHqmiIMERnHXhuBUDDIlhJu58tBf5E7oke3VIAb3ADMmpDqw8NQ
+BmIMMMAVSKeoWXzhriKi4gp6D/piq1JM4fHfyr6DDUI=
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert136.pem b/test/rules/platform_certs/default/cert136.pem
new file mode 100644
index 000000000000..5d185a78a22c
--- /dev/null
+++ b/test/rules/platform_certs/default/cert136.pem
@@ -0,0 +1,13 @@
+emSign ECC Root CA - C3
+-----BEGIN CERTIFICATE-----
+MIICKzCCAbGgAwIBAgIKe3G2gla4EnycqDAKBggqhkjOPQQDAzBaMQswCQYDVQQGEwJVUzETMBEG
+A1UECxMKZW1TaWduIFBLSTEUMBIGA1UEChMLZU11ZGhyYSBJbmMxIDAeBgNVBAMTF2VtU2lnbiBF
+Q0MgUm9vdCBDQSAtIEMzMB4XDTE4MDIxODE4MzAwMFoXDTQzMDIxODE4MzAwMFowWjELMAkGA1UE
+BhMCVVMxEzARBgNVBAsTCmVtU2lnbiBQS0kxFDASBgNVBAoTC2VNdWRocmEgSW5jMSAwHgYDVQQD
+ExdlbVNpZ24gRUNDIFJvb3QgQ0EgLSBDMzB2MBAGByqGSM49AgEGBSuBBAAiA2IABP2lYa57JhAd
+6bciMK4G9IGzsUJxlTm801Ljr6/58pc1kjZGDoeVjbk5Wum739D+yAdBPLtVb4OjavtisIGJAnB9
+SMVK4+kiVCJNk7tCDK93nCOmfddhEc5lx/h//vXyqaNCMEAwHQYDVR0OBBYEFPtaSNCAIEDyqOkA
+B2kZd6fmw/TPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMDA2gA
+MGUCMQC02C8Cif22TGK6Q04ThHK1rt0c3ta13FaPWEBaLd4gTCKDypOofu4SQMfWh0/434UCMBwU
+ZOR8loMRnLDRWmFLpg9J0wD8ofzkpf9/rdcw0Md3f76BB1UwUCAU9Vc4CqgxUQ==
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert137.pem b/test/rules/platform_certs/default/cert137.pem
new file mode 100644
index 000000000000..e2132d1d4b14
--- /dev/null
+++ b/test/rules/platform_certs/default/cert137.pem
@@ -0,0 +1,30 @@
+Hongkong Post Root CA 3
+-----BEGIN CERTIFICATE-----
+MIIFzzCCA7egAwIBAgIUCBZfikyl7ADJk0DfxMauI7gcWqQwDQYJKoZIhvcNAQELBQAwbzELMAkG
+A1UEBhMCSEsxEjAQBgNVBAgTCUhvbmcgS29uZzESMBAGA1UEBxMJSG9uZyBLb25nMRYwFAYDVQQK
+Ew1Ib25na29uZyBQb3N0MSAwHgYDVQQDExdIb25na29uZyBQb3N0IFJvb3QgQ0EgMzAeFw0xNzA2
+MDMwMjI5NDZaFw00MjA2MDMwMjI5NDZaMG8xCzAJBgNVBAYTAkhLMRIwEAYDVQQIEwlIb25nIEtv
+bmcxEjAQBgNVBAcTCUhvbmcgS29uZzEWMBQGA1UEChMNSG9uZ2tvbmcgUG9zdDEgMB4GA1UEAxMX
+SG9uZ2tvbmcgUG9zdCBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCz
+iNfqzg8gTr7m1gNt7ln8wlffKWihgw4+aMdoWJwcYEuJQwy51BWy7sFOdem1p+/l6TWZ5Mwc50tf
+jTMwIDNT2aa71T4Tjukfh0mtUC1Qyhi+AViiE3CWu4mIVoBc+L0sPOFMV4i707mV78vH9toxdCim
+5lSJ9UExyuUmGs2C4HDaOym71QP1mbpV9WTRYA6ziUm4ii8F0oRFKHyPaFASePwLtVPLwpgchKOe
+sL4jpNrcyCse2m5FHomY2vkALgbpDDtw1VAliJnLzXNg99X/NWfFobxeq81KuEXryGgeDQ0URhLj
+0mRiikKYvLTGCAj4/ahMZJx2Ab0vqWwzD9g/KLg8aQFChn5pwckGyuV6RmXpwtZQQS4/t+TtbNe/
+JgERohYpSms0BpDsE9K2+2p20jzt8NYt3eEV7KObLyzJPivkaTv/ciWxNoZbx39ri1UbSsUgYT2u
+y1DhCDq+sI9jQVMwCFk8mB13umOResoQUGC/8Ne8lYePl8X+l2oBlKN8W4UdKjk60FSh0Tlxnf0h
++bV78OLgAo9uliQlLKAeLKjEiafv7ZkGL7YKTE/bosw3Gq9HhS2KX8Q0NEwA/RiTZxPRN+ZItIsG
+xVd7GYYKecsAyVKvQv83j+GjHno9UKtjBucVtT+2RTeUN7F+8kjDf8V1/peNRY8apxpyKBpADwID
+AQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBQXnc0e
+i9Y5K3DTXNSguB+wAPzFYTAdBgNVHQ4EFgQUF53NHovWOStw01zUoLgfsAD8xWEwDQYJKoZIhvcN
+AQELBQADggIBAFbVe27mIgHSQpsY1Q7XZiNc4/6gx5LS6ZStS6LG7BJ8dNVI0lkUmcDrudHr9Egw
+W62nV3OZqdPlt9EuWSRY3GguLmLYauRwCy0gUCCkMpXRAJi70/33MvJJrsZ64Ee+bs7Lo3I6LWld
+y8joRTnU+kLBEUx3XZL7av9YROXrgZ6voJmtvqkBZss4HTzfQx/0TW60uhdG/H39h4F5ag0zD/ov
++BS5gLNdTaqX4fnkGMX41TiMJjz98iji7lpJiCzfeT2OnpA8vUFKOt1b9pq0zj8lMH8yfaIDlNDc
+eqFS3m6TjRgm/VWsvY+b0s+v54Ysyx8Jb6NvqYTUc79NoXQbTiNg8swOqn+knEwlqLJmOzj/2ZQw
+9nKEvmhVEA/GcywWaZMH/rFF7buiVWqw2rVKAiUnhde3t4ZEFolsgCs+l6mc1X5VTMbeRRAc6uk7
+nwNT7u56AQIWeNTowr5GdogTPyK7SBIdUgC0An4hGh6cJfTzPV4e0hz5sy229zdcxsshTrD3mUcY
+hcErulWuBurQB7Lcq9CClnXO0lD+mefPL5/ndtFhKvshuzHQqp9HpLIiyhY6UFfEW0NnxWViA0kB
+60PZ2Pierc+xYw5F9KBaLJstxabArahH9CdMOA0uG0k7UvToiIMrVCjU8jVStDKDYmlkDJGcn5fq
+dBb9HxEGmpv0
+-----END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cert138.pem b/test/rules/platform_certs/default/cert138.pem
new file mode 100644
index 000000000000..85ace10ff735
--- /dev/null
+++ b/test/rules/platform_certs/default/cert138.pem
@@ -0,0 +1,33 @@
+Entrust Root Certification Authority - G4
+-----BEGIN CERTIFICATE-----
+MIIGSzCCBDOgAwIBAgIRANm1Q3+vqTkPAAAAAFVlrVgwDQYJKoZIhvcNAQELBQAwgb4xCzAJBgNV
+BAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3Qu
+bmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxNSBFbnRydXN0LCBJbmMuIC0gZm9yIGF1
+dGhvcml6ZWQgdXNlIG9ubHkxMjAwBgNVBAMTKUVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1
+dGhvcml0eSAtIEc0MB4XDTE1MDUyNzExMTExNloXDTM3MTIyNzExNDExNlowgb4xCzAJBgNVBAYT
+AlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0
+L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxNSBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxMjAwBgNVBAMTKUVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhv
+cml0eSAtIEc0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsewsQu7i0TD/pZJH4i3D
+umSXbcr3DbVZwbPLqGgZ2K+EbTBwXX7zLtJTmeH+H17ZSK9dE43b/2MzTdMAArzE+NEGCJR5WIoV
+3imz/f3ET+iq4qA7ec2/a0My3dl0ELn39GjUu9CH1apLiipvKgS1sqbHoHrmSKvS0VnM1n4j5pds
+8ELl3FFLFUHtSUrJ3hCX1nbB76W1NhSXNdh4IjVS70O92yfbYVaCNNzLiGAMC1rlLAHGVK/XqsEQ
+e9IFWrhAnoanw5CGAlZSCXqc0ieCU0plUmr1POeo8pyvi73TDtTUXm6Hnmo9RR3RXRv06QqsYJn7
+ibT/mCzPfB3pAqoEmh643IhuJbNsZvc8kPNXwbMv9W3y+8qh+CmdRouzavbmZwe+LGcKKh9asj5X
+xNMhIWNlUpEbsZmOeX7m640A2Vqq6nPopIICR5b+W45UYaPrL0swsIsjdXJ8ITzI9vF01Bx7owVV
+7rtNOzK+mndmnqxpkCIHH2E6lr7lmk/MBTwoWdPBDFSoWWG9yHJM6Nyfh3+9nEg2XpWjDrk4JFX8
+dWbrAuMINClKxuMrLzOg2qOGpRKX/YAr2hRC45K9PvJdXmd0LhyIRyk0X+IyqJwlN4y6mACXi0mW
+Hv0liqzc2thddG5msP9E36EYxr5ILzeUePiVSj9/E15dWf10hkNjc0kCAwEAAaNCMEAwDwYDVR0T
+AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJ84xFYjwznooHFs6FRM5Og6sb9n
+MA0GCSqGSIb3DQEBCwUAA4ICAQAS5UKme4sPDORGpbZgQIeMJX6tuGguW8ZAdjwD+MlZ9POrYs4Q
+jbRaZIxowLByQzTSGwv2LFPSypBLhmb8qoMi9IsabyZIrHZ3CL/FmFz0Jomee8O5ZDIBf9PD3Vht
+7LGrhFV0d4QEJ1JrhkzO3bll/9bGXp+aEJlLdWr+aumXIOTkdnrG0CSqkM0gkLpHZPt/B7NTeLUK
+YvJzQ85BK4FqLoUWlFPUa19yIqtRLULVAJyZv967lDtX/Zr1hstWO1uIAeV8KEsD+UmDfLJ/fOPt
+jqF/YFOOVZ1QNBIPt5d7bIdKROf1beyAN/BYGW5KaHbwH5Lk6rWS02FREAutp9lfx1/cH6NcjKF+
+m7ee01ZvZl4HliDtC3T7Zk6LERXpgUl+b7DUUH8i119lAg2m9IUe2K4GS0qn0jFmwvjO5QimpAKW
+RGhXxNUzzxkvFMSUHHuk2fCfDrGA4tGeEWSpiBE6doLlYsKA2KSD7ZPvfC+QsDJMlhVoSFLUmQjA
+JOgc47OlIQ6SwJAfzyBfyjs4x7dtOvPmRLgOMWuIjnDrnBdSqEGULoe256YSxXXfW8AKbnuk5F6G
++TaU33fD6Q3AOfF5u0aOq0NZJ7cguyPpVkAh7DE9ZapD8j3fcEThuk0mEDuYn/PIjhs4ViFqUZPT
+kcpG2om3PVODLAgfi49T3f+sHw==
+-----END CERTIFICATE-----
+
diff --git a/test/rules/platform_certs/default/certSIGNROOTCA.crt b/test/rules/platform_certs/default/certSIGNROOTCA.crt
deleted file mode 100644
index d77443cc89d7..000000000000
--- a/test/rules/platform_certs/default/certSIGNROOTCA.crt
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYT
-AlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBD
-QTAeFw0wNjA3MDQxNzIwMDRaFw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJP
-MREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7IJUqOtdu0KBuqV5Do
-0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHHrfAQ
-UySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5d
-RdY4zTW2ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQ
-OA7+j0xbm0bqQfWwCHTD0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwv
-JoIQ4uNllAoEwF73XVv4EOLQunpL+943AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08C
-AwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAcYwHQYDVR0O
-BBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IBAQA+0hyJ
-LjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecY
-MnQ8SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ
-44gx+FkagQnIl6Z0x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6I
-Jd1hJyMctTEHBDa0GpC9oHRxUIltvBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNw
-i/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7NzTogVZ96edhBiIL5VaZVDADlN
-9u6wWk5JRFRYX0KD
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/cf701eeb.0 b/test/rules/platform_certs/default/cf701eeb.0
new file mode 120000
index 000000000000..997960c9a6fd
--- /dev/null
+++ b/test/rules/platform_certs/default/cf701eeb.0
@@ -0,0 +1 @@
+cert030.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/d06393bb.0 b/test/rules/platform_certs/default/d06393bb.0
new file mode 120000
index 000000000000..68c876e8ea1b
--- /dev/null
+++ b/test/rules/platform_certs/default/d06393bb.0
@@ -0,0 +1 @@
+cert081.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/d0cddf45.0 b/test/rules/platform_certs/default/d0cddf45.0
new file mode 120000
index 000000000000..09d377c2dbdf
--- /dev/null
+++ b/test/rules/platform_certs/default/d0cddf45.0
@@ -0,0 +1 @@
+cert118.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/d16a5865.0 b/test/rules/platform_certs/default/d16a5865.0
new file mode 120000
index 000000000000..caeacfb82a92
--- /dev/null
+++ b/test/rules/platform_certs/default/d16a5865.0
@@ -0,0 +1 @@
+cert052.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/d18e9066.0 b/test/rules/platform_certs/default/d18e9066.0
new file mode 120000
index 000000000000..d30fd61516a0
--- /dev/null
+++ b/test/rules/platform_certs/default/d18e9066.0
@@ -0,0 +1 @@
+cert098.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/d41b5e2a.0 b/test/rules/platform_certs/default/d41b5e2a.0
new file mode 120000
index 000000000000..e6f2f7d1094b
--- /dev/null
+++ b/test/rules/platform_certs/default/d41b5e2a.0
@@ -0,0 +1 @@
+cert113.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/d4c339cb.0 b/test/rules/platform_certs/default/d4c339cb.0
new file mode 120000
index 000000000000..3f93be5f29e1
--- /dev/null
+++ b/test/rules/platform_certs/default/d4c339cb.0
@@ -0,0 +1 @@
+cert091.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/d4dae3dd.0 b/test/rules/platform_certs/default/d4dae3dd.0
new file mode 120000
index 000000000000..b6fe338c1eae
--- /dev/null
+++ b/test/rules/platform_certs/default/d4dae3dd.0
@@ -0,0 +1 @@
+cert075.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/d59297b8.0 b/test/rules/platform_certs/default/d59297b8.0
new file mode 120000
index 000000000000..90c574c79ffc
--- /dev/null
+++ b/test/rules/platform_certs/default/d59297b8.0
@@ -0,0 +1 @@
+cert065.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/d6325660.0 b/test/rules/platform_certs/default/d6325660.0
new file mode 120000
index 000000000000..3f93be5f29e1
--- /dev/null
+++ b/test/rules/platform_certs/default/d6325660.0
@@ -0,0 +1 @@
+cert091.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/d7746a63.0 b/test/rules/platform_certs/default/d7746a63.0
new file mode 120000
index 000000000000..b6fe338c1eae
--- /dev/null
+++ b/test/rules/platform_certs/default/d7746a63.0
@@ -0,0 +1 @@
+cert075.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/d7e8dc79.0 b/test/rules/platform_certs/default/d7e8dc79.0
new file mode 120000
index 000000000000..9d25f0e60cb0
--- /dev/null
+++ b/test/rules/platform_certs/default/d7e8dc79.0
@@ -0,0 +1 @@
+cert013.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/d853d49e.0 b/test/rules/platform_certs/default/d853d49e.0
new file mode 120000
index 000000000000..077461e29492
--- /dev/null
+++ b/test/rules/platform_certs/default/d853d49e.0
@@ -0,0 +1 @@
+cert069.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/da7377f6.0 b/test/rules/platform_certs/default/da7377f6.0
new file mode 120000
index 000000000000..68fd619a62a8
--- /dev/null
+++ b/test/rules/platform_certs/default/da7377f6.0
@@ -0,0 +1 @@
+cert131.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/dbc54cab.0 b/test/rules/platform_certs/default/dbc54cab.0
new file mode 120000
index 000000000000..78c8c289bffe
--- /dev/null
+++ b/test/rules/platform_certs/default/dbc54cab.0
@@ -0,0 +1 @@
+cert061.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/dbff3a01.0 b/test/rules/platform_certs/default/dbff3a01.0
new file mode 120000
index 000000000000..c64998b14fa3
--- /dev/null
+++ b/test/rules/platform_certs/default/dbff3a01.0
@@ -0,0 +1 @@
+cert135.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/dc4d6a89.0 b/test/rules/platform_certs/default/dc4d6a89.0
new file mode 120000
index 000000000000..4d3818fc7c3e
--- /dev/null
+++ b/test/rules/platform_certs/default/dc4d6a89.0
@@ -0,0 +1 @@
+cert124.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/dc99f41e.0 b/test/rules/platform_certs/default/dc99f41e.0
new file mode 120000
index 000000000000..ad1a2c9e4e96
--- /dev/null
+++ b/test/rules/platform_certs/default/dc99f41e.0
@@ -0,0 +1 @@
+cert106.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/dd8e9d41.0 b/test/rules/platform_certs/default/dd8e9d41.0
new file mode 120000
index 000000000000..125e20d7689f
--- /dev/null
+++ b/test/rules/platform_certs/default/dd8e9d41.0
@@ -0,0 +1 @@
+cert089.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/de6d66f3.0 b/test/rules/platform_certs/default/de6d66f3.0
new file mode 120000
index 000000000000..e6f2f7d1094b
--- /dev/null
+++ b/test/rules/platform_certs/default/de6d66f3.0
@@ -0,0 +1 @@
+cert113.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/def36a68.0 b/test/rules/platform_certs/default/def36a68.0
new file mode 120000
index 000000000000..8270bf0a9083
--- /dev/null
+++ b/test/rules/platform_certs/default/def36a68.0
@@ -0,0 +1 @@
+cert114.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/dfc0fe80.0 b/test/rules/platform_certs/default/dfc0fe80.0
new file mode 120000
index 000000000000..412847d766b1
--- /dev/null
+++ b/test/rules/platform_certs/default/dfc0fe80.0
@@ -0,0 +1 @@
+cert103.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/e113c810.0 b/test/rules/platform_certs/default/e113c810.0
new file mode 120000
index 000000000000..80aa69139189
--- /dev/null
+++ b/test/rules/platform_certs/default/e113c810.0
@@ -0,0 +1 @@
+cert036.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/e18bfb83.0 b/test/rules/platform_certs/default/e18bfb83.0
new file mode 120000
index 000000000000..b03c490c2905
--- /dev/null
+++ b/test/rules/platform_certs/default/e18bfb83.0
@@ -0,0 +1 @@
+cert085.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/e2799e36.0 b/test/rules/platform_certs/default/e2799e36.0
new file mode 120000
index 000000000000..ae5698946b79
--- /dev/null
+++ b/test/rules/platform_certs/default/e2799e36.0
@@ -0,0 +1 @@
+cert040.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/e36a6752.0 b/test/rules/platform_certs/default/e36a6752.0
new file mode 120000
index 000000000000..ff9922e53b2d
--- /dev/null
+++ b/test/rules/platform_certs/default/e36a6752.0
@@ -0,0 +1 @@
+cert082.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/e442e424.0 b/test/rules/platform_certs/default/e442e424.0
new file mode 120000
index 000000000000..b03c490c2905
--- /dev/null
+++ b/test/rules/platform_certs/default/e442e424.0
@@ -0,0 +1 @@
+cert085.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/e48193cf.0 b/test/rules/platform_certs/default/e48193cf.0
new file mode 120000
index 000000000000..fa7fca3f2ea3
--- /dev/null
+++ b/test/rules/platform_certs/default/e48193cf.0
@@ -0,0 +1 @@
+cert059.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/e73d606e.0 b/test/rules/platform_certs/default/e73d606e.0
new file mode 120000
index 000000000000..412847d766b1
--- /dev/null
+++ b/test/rules/platform_certs/default/e73d606e.0
@@ -0,0 +1 @@
+cert103.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/e775ed2d.0 b/test/rules/platform_certs/default/e775ed2d.0
new file mode 120000
index 000000000000..bc0f98e93038
--- /dev/null
+++ b/test/rules/platform_certs/default/e775ed2d.0
@@ -0,0 +1 @@
+cert009.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/e8651083.0 b/test/rules/platform_certs/default/e8651083.0
new file mode 120000
index 000000000000..f8a471e0b6e2
--- /dev/null
+++ b/test/rules/platform_certs/default/e8651083.0
@@ -0,0 +1 @@
+cert050.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/e8de2f56.0 b/test/rules/platform_certs/default/e8de2f56.0
new file mode 120000
index 000000000000..234aa2b2c2cc
--- /dev/null
+++ b/test/rules/platform_certs/default/e8de2f56.0
@@ -0,0 +1 @@
+cert071.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/ePKIRootCertificationAuthority.crt b/test/rules/platform_certs/default/ePKIRootCertificationAuthority.crt
deleted file mode 100644
index ebfb5451c342..000000000000
--- a/test/rules/platform_certs/default/ePKIRootCertificationAuthority.crt
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBe
-MQswCQYDVQQGEwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0
-ZC4xKjAoBgNVBAsMIWVQS0kgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
-Fw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMxMjdaMF4xCzAJBgNVBAYTAlRXMSMw
-IQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEqMCgGA1UECwwhZVBL
-SSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEF
-AAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAH
-SyZbCUNsIZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAh
-ijHyl3SJCRImHJ7K2RKilTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3X
-DZoTM1PRYfl61dd4s5oz9wCGzh1NlDivqOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1
-TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX12ruOzjjK9SXDrkb5wdJ
-fzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0OWQqraffA
-sgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uU
-WH1+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLS
-nT0IFaUQAS2zMnaolQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pH
-dmX2Os+PYhcZewoozRrSgx4hxyy/vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJip
-NiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXiZo1jDiVN1Rmy5nk3pyKdVDEC
-AwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/QkqiMAwGA1UdEwQF
-MAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
-ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGB
-uvl2ICO1J2B01GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6Yl
-PwZpVnPDimZI+ymBV3QGypzqKOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkP
-JXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdVxrsStZf0X4OFunHB2WyBEXYKCrC/
-gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEPNXubrjlpC2JgQCA2
-j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+rGNm6
-5ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUB
-o2M3IUxExJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS
-/jQ6fbjpKdx2qcgw+BRxgMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2z
-Gp1iro2C6pSe3VkQw63d4k3jMdXH7OjysP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTE
-W9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmODBCEIZ43ygknQW/2xzQ+D
-hNQ+IIX3Sj0rnP0qCglN6oH4EZw=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/ed39abd0.0 b/test/rules/platform_certs/default/ed39abd0.0
new file mode 120000
index 000000000000..125e20d7689f
--- /dev/null
+++ b/test/rules/platform_certs/default/ed39abd0.0
@@ -0,0 +1 @@
+cert089.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/ee64a828.0 b/test/rules/platform_certs/default/ee64a828.0
new file mode 120000
index 000000000000..f3d65f9515d0
--- /dev/null
+++ b/test/rules/platform_certs/default/ee64a828.0
@@ -0,0 +1 @@
+cert011.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/eed8c118.0 b/test/rules/platform_certs/default/eed8c118.0
new file mode 120000
index 000000000000..cc53c2682802
--- /dev/null
+++ b/test/rules/platform_certs/default/eed8c118.0
@@ -0,0 +1 @@
+cert034.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/ef954a4e.0 b/test/rules/platform_certs/default/ef954a4e.0
new file mode 120000
index 000000000000..d30fd61516a0
--- /dev/null
+++ b/test/rules/platform_certs/default/ef954a4e.0
@@ -0,0 +1 @@
+cert098.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/f013ecaf.0 b/test/rules/platform_certs/default/f013ecaf.0
new file mode 120000
index 000000000000..4cb45c9ec0e0
--- /dev/null
+++ b/test/rules/platform_certs/default/f013ecaf.0
@@ -0,0 +1 @@
+cert126.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/f081611a.0 b/test/rules/platform_certs/default/f081611a.0
new file mode 120000
index 000000000000..a5914a9ae27a
--- /dev/null
+++ b/test/rules/platform_certs/default/f081611a.0
@@ -0,0 +1 @@
+cert018.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/f0c70a8d.0 b/test/rules/platform_certs/default/f0c70a8d.0
new file mode 120000
index 000000000000..8e03fa2ac01b
--- /dev/null
+++ b/test/rules/platform_certs/default/f0c70a8d.0
@@ -0,0 +1 @@
+cert123.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/f0cd152c.0 b/test/rules/platform_certs/default/f0cd152c.0
new file mode 120000
index 000000000000..b02322a14ba4
--- /dev/null
+++ b/test/rules/platform_certs/default/f0cd152c.0
@@ -0,0 +1 @@
+cert138.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/f30dd6ad.0 b/test/rules/platform_certs/default/f30dd6ad.0
new file mode 120000
index 000000000000..fe8b7f684bf0
--- /dev/null
+++ b/test/rules/platform_certs/default/f30dd6ad.0
@@ -0,0 +1 @@
+cert093.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/f3377b1b.0 b/test/rules/platform_certs/default/f3377b1b.0
new file mode 120000
index 000000000000..6b9e3cee1364
--- /dev/null
+++ b/test/rules/platform_certs/default/f3377b1b.0
@@ -0,0 +1 @@
+cert015.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/f387163d.0 b/test/rules/platform_certs/default/f387163d.0
new file mode 120000
index 000000000000..6d3afc9f7b75
--- /dev/null
+++ b/test/rules/platform_certs/default/f387163d.0
@@ -0,0 +1 @@
+cert019.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/f39fc864.0 b/test/rules/platform_certs/default/f39fc864.0
new file mode 120000
index 000000000000..997960c9a6fd
--- /dev/null
+++ b/test/rules/platform_certs/default/f39fc864.0
@@ -0,0 +1 @@
+cert030.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/f459871d.0 b/test/rules/platform_certs/default/f459871d.0
new file mode 120000
index 000000000000..fe08ce674247
--- /dev/null
+++ b/test/rules/platform_certs/default/f459871d.0
@@ -0,0 +1 @@
+cert133.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/f51bb24c.0 b/test/rules/platform_certs/default/f51bb24c.0
new file mode 120000
index 000000000000..bbce6c435741
--- /dev/null
+++ b/test/rules/platform_certs/default/f51bb24c.0
@@ -0,0 +1 @@
+cert132.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/facacbc6.0 b/test/rules/platform_certs/default/facacbc6.0
new file mode 120000
index 000000000000..b71513fe981a
--- /dev/null
+++ b/test/rules/platform_certs/default/facacbc6.0
@@ -0,0 +1 @@
+cert029.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/fb5fa911.0 b/test/rules/platform_certs/default/fb5fa911.0
new file mode 120000
index 000000000000..f79cc53a1883
--- /dev/null
+++ b/test/rules/platform_certs/default/fb5fa911.0
@@ -0,0 +1 @@
+cert111.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/fc5a8f99.0 b/test/rules/platform_certs/default/fc5a8f99.0
new file mode 120000
index 000000000000..4d799e74ef9e
--- /dev/null
+++ b/test/rules/platform_certs/default/fc5a8f99.0
@@ -0,0 +1 @@
+cert092.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/fd08c599.0 b/test/rules/platform_certs/default/fd08c599.0
new file mode 120000
index 000000000000..819e00043983
--- /dev/null
+++ b/test/rules/platform_certs/default/fd08c599.0
@@ -0,0 +1 @@
+cert110.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/fde84897.0 b/test/rules/platform_certs/default/fde84897.0
new file mode 120000
index 000000000000..80aa69139189
--- /dev/null
+++ b/test/rules/platform_certs/default/fde84897.0
@@ -0,0 +1 @@
+cert036.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/fe8a2cd8.0 b/test/rules/platform_certs/default/fe8a2cd8.0
new file mode 120000
index 000000000000..d59e7b0ac35d
--- /dev/null
+++ b/test/rules/platform_certs/default/fe8a2cd8.0
@@ -0,0 +1 @@
+cert104.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/ff34af3f.0 b/test/rules/platform_certs/default/ff34af3f.0
new file mode 120000
index 000000000000..d3d34182b0b4
--- /dev/null
+++ b/test/rules/platform_certs/default/ff34af3f.0
@@ -0,0 +1 @@
+cert115.pem
\ No newline at end of file
diff --git a/test/rules/platform_certs/default/thawtePrimaryRootCA-G2.crt b/test/rules/platform_certs/default/thawtePrimaryRootCA-G2.crt
deleted file mode 100644
index 027ce1c8b4cc..000000000000
--- a/test/rules/platform_certs/default/thawtePrimaryRootCA-G2.crt
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDEL
-MAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMp
-IDIwMDcgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAi
-BgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMjAeFw0wNzExMDUwMDAw
-MDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
-d3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBGb3Ig
-YXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9v
-dCBDQSAtIEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/
-BebfowJPDQfGAFG6DAJSLSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6
-papu+7qzcMBniKI11KOasf2twu8x+qi58/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUmtgAMADna3+FGO6Lts6K
-DPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUNG4k8VIZ3
-KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41ox
-XZ3Krr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/thawtePrimaryRootCA-G3.crt b/test/rules/platform_certs/default/thawtePrimaryRootCA-G3.crt
deleted file mode 100644
index 34af29e3ccd9..000000000000
--- a/test/rules/platform_certs/default/thawtePrimaryRootCA-G3.crt
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCB
-rjELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
-Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
-MDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNV
-BAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0wODA0MDIwMDAwMDBa
-Fw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3Rl
-LCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9u
-MTgwNgYDVQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXpl
-ZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEcz
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsr8nLPvb2FvdeHsbnndm
-gcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2AtP0LMqmsywCPLLEHd5N/8
-YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC+BsUa0Lf
-b1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS9
-9irY7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2S
-zhkGcuYMXDhpxwTWvGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUk
-OQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNV
-HQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJKoZIhvcNAQELBQADggEBABpA
-2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweKA3rD6z8KLFIW
-oCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
-t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7c
-KUGRIjxpp7sC8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fM
-m7v/OeZWYdMKp8RcTGB7BXcmer/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZu
-MdRAGmI0Nj81Aa6sY6A=
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/default/thawtePrimaryRootCA.crt b/test/rules/platform_certs/default/thawtePrimaryRootCA.crt
deleted file mode 100644
index b8e9895ab5b0..000000000000
--- a/test/rules/platform_certs/default/thawtePrimaryRootCA.crt
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCB
-qTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
-Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
-MDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNV
-BAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3MDAwMDAwWhcNMzYw
-NzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5j
-LjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYG
-A1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsoPD7gFnUnMekz52hWXMJEEUMDSxuaPFs
-W0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ1CRfBsDMRJSUjQJib+ta
-3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGcq/gcfomk
-6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6
-Sk/KaAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94J
-NqR32HuHUETVPm4pafs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBA
-MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XP
-r87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUFAAOCAQEAeRHAS7ORtvzw6WfU
-DW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeEuzLlQRHAd9mz
-YJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
-xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2
-/qxAeeWsEG89jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/
-LHbTY5xZ3Y+m4Q6gLkH3LpVHz7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7
-jVaMaA==
------END CERTIFICATE-----
diff --git a/test/rules/platform_certs/firefox b/test/rules/platform_certs/firefox
deleted file mode 120000
index 331d858ce9b1..000000000000
--- a/test/rules/platform_certs/firefox
+++ /dev/null
@@ -1 +0,0 @@
-default
\ No newline at end of file
diff --git a/test/rules/platform_certs/get-issuer.sh b/test/rules/platform_certs/get-issuer.sh
deleted file mode 100755
index 1299d9931d2a..000000000000
--- a/test/rules/platform_certs/get-issuer.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash -x
-# Usage: get_issuer.sh example.com
-#
-# If the checker fails with a complaint about a local issuer cert, but Firefox
-# successfully fetches a domain, it's likely because the site left out the
-# intermediate cert, but Firefox included it. This script tries to simplify the
-# process of adding the intermediate so the checker can validate properly.
-cd $(dirname $0)/default
-DOMAIN="${1}"
-ISSUER_URL=$(openssl s_client -connect "${DOMAIN}:443" -servername "${DOMAIN}" -showcerts  "${NAME}.pem"
-if openssl verify -CApath . ${NAME}.pem ; then
-#  c_rehash .
-  curl --capath . "https://${DOMAIN}" >/dev/null
-  echo "Succesfully fetched and verified ${NAME}.pem. Now git add . and commit."
-else
-  echo "Failed to verify ${NAME}.pem, maybe not a proper intermediate?"
-fi
diff --git a/test/rules/src/https_everywhere_checker/check_rules.py b/test/rules/src/https_everywhere_checker/check_rules.py
index 9111239ef022..f3d5baf00152 100644
--- a/test/rules/src/https_everywhere_checker/check_rules.py
+++ b/test/rules/src/https_everywhere_checker/check_rules.py
@@ -1,7 +1,8 @@
-#!/usr/bin/env python3.6
+#!/usr/bin/env python3
 
 import binascii
 import argparse
+import copy
 import json
 import glob
 import hashlib
@@ -13,15 +14,18 @@
 import threading
 import time
 
-from configparser import SafeConfigParser
+from configparser import ConfigParser
 
 from lxml import etree
 
 import http_client
 import metrics
+import urllib.parse
 from rules import Ruleset
 from rule_trie import RuleTrie
+from datetime import datetime
 
+timestamp = datetime.now().replace(microsecond=0)
 
 def convertLoglevel(levelString):
     """Converts string 'debug', 'info', etc. into corresponding
@@ -56,10 +60,10 @@ class ComparisonTask(object):
              associated with a single ruleset.
     """
 
-    def __init__(self, urls, fetcherPlain, fetcherRewriting, ruleset):
+    def __init__(self, urls, fetcherPlain, fetchersRewriting, ruleset):
         self.urls = urls
         self.fetcherPlain = fetcherPlain
-        self.fetcherRewriting = fetcherRewriting
+        self.fetchersRewriting = fetchersRewriting
         self.ruleset = ruleset
         self.ruleFname = ruleset.filename
 
@@ -98,13 +102,14 @@ def processTask(self, task):
         problems = []
         for url in task.urls:
             result = self.processUrl(url, task)
-            if result:
+            if result[0]:
                 problems.append(result)
         if problems:
             for problem in problems:
-                logging.error("{}: {}".format(task.ruleFname, problem))
+                logging.error("{}: {}".format(task.ruleFname, problem[0]))
             if self.autoDisable:
-                disableRuleset(task.ruleset, problems)
+                urlCount = len(task.urls)
+                disableRuleset(task.ruleset, problems, urlCount)
 
     def queue_result(self, result, details, fname, url, https_url=None):
         """
@@ -140,7 +145,7 @@ def fetchUrl(self, plainUrl, transformedUrl, fetcherPlain, fetcherRewriting, rul
         except Exception as e:
             errno, message = e.args
             if errno == 6:
-                message = "Fetch error: {} => {}: {}".format(
+                message = "Time: {}\n Fetch error: {} => {}: {}".format(timestamp,
                     plainUrl, transformedUrl, e)
                 self.queue_result("error", "fetch-error {}".format(e),
                                   ruleFname, plainUrl, https_url=transformedUrl)
@@ -179,7 +184,7 @@ def fetchUrl(self, plainUrl, transformedUrl, fetcherPlain, fetcherRewriting, rul
 
     def processUrl(self, plainUrl, task):
         fetcherPlain = task.fetcherPlain
-        fetcherRewriting = task.fetcherRewriting
+        fetchersRewriting = task.fetchersRewriting
         ruleFname = task.ruleFname
 
         try:
@@ -189,37 +194,51 @@ def processUrl(self, plainUrl, task):
             logging.error("{}: Regex Error {}".format(ruleFname, str(e)))
             return
 
-        try:
-            message = self.fetchUrl(
-                plainUrl, transformedUrl, fetcherPlain, fetcherRewriting, ruleFname)
-
-        except:
-            # Try once more before sending an error result
+        fetchersFailed = 0
+        for fetcherRewriting in fetchersRewriting:
             try:
                 message = self.fetchUrl(
                     plainUrl, transformedUrl, fetcherPlain, fetcherRewriting, ruleFname)
+                break
+
             except Exception as e:
-                message = "Fetch error: {} => {}: {}".format(
-                    plainUrl, transformedUrl, e)
-                self.queue_result("error", "fetch-error {}".format(e),
-                                  ruleFname, plainUrl, https_url=transformedUrl)
-                logging.debug(message)
+                fetchersFailed += 1
+                if fetchersFailed == len(fetchersRewriting):
+                    message = "Fetch error: {} => {}: {}".format(
+                        plainUrl, transformedUrl, e)
+                    self.queue_result("error", "fetch-error {}".format(e),
+                                    ruleFname, plainUrl, https_url=transformedUrl)
+                    logging.debug(message)
 
-        finally:
-            logging.info("Finished comparing {} -> {}. Rulefile: {}.".format(
-                         plainUrl, transformedUrl, ruleFname))
+        logging.info("Finished comparing {} -> {}. Rulefile: {}.".format(
+                    plainUrl, transformedUrl, ruleFname))
 
-        return message
+        return [message, plainUrl]
 
 
-def disableRuleset(ruleset, problems):
-    logging.info("Disabling ruleset {}".format(ruleset.filename))
+def disableRuleset(ruleset, problemRules, urlCount):
+    problems = [problem[0] for problem in problemRules]
+    rules = [problem[1] for problem in problemRules]
     contents = open(ruleset.filename).read()
+
     # Don't bother to disable rulesets that are already disabled
     if re.search("\bdefault_off=", contents):
         return
-    contents = re.sub("(]*)>",
-                      "\\1 default_off='failed ruleset test'>", contents)
+
+    # Go ahead and disable rulset if all targets are problematic
+    if urlCount == len(problemRules):
+        logging.info("Disabling ruleset {}".format(ruleset.filename))
+        disableMessage = "Entire ruleset disabled at {}\n".format(timestamp)
+        contents = re.sub("(]*)>",
+            "\\1 default_off=\"failed ruleset test\">", contents);
+    # If not all targets, just the target
+    else:
+        for rule in rules:
+            disableMessage = "The following targets have been disabled at {}:\n".format(timestamp)
+            host = urllib.parse.urlparse(rule)
+            logging.info("Disabling target {}".format(host.netloc))
+            contents = re.sub('<[ \n]*target[ \n]+host[ \n]*=[ \n]*"{}"[ \n]*/?[ \n]*>'.format(host.netloc),
+                ''.format(host.netloc), contents);
 
     # Since the problems are going to be inserted into an XML comment, they cannot
     # contain "--", or they will generate a parse error. Split up all "--" with a
@@ -230,9 +249,9 @@ def disableRuleset(ruleset, problems):
         contents = "\n" + contents
     problemStatement = ("""
 
-            (\^.*//.*/.*|\^http:)
+            (\^http://.*/.*|\^http:)
           
         
         
diff --git a/test/validations/securecookie/run.py b/test/validations/securecookie/run.py
index da315dd52428..76738dea8b31 100644
--- a/test/validations/securecookie/run.py
+++ b/test/validations/securecookie/run.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.6
+#!/usr/bin/env python3
 
 # This python utility check for wildcard securecookies which
 # can be normalized, warn and exit with non-zero when such
diff --git a/test/validations/special/duplicate-allowlist-cleanup.sh b/test/validations/special/duplicate-allowlist-cleanup.sh
new file mode 100755
index 000000000000..38f58c759b5d
--- /dev/null
+++ b/test/validations/special/duplicate-allowlist-cleanup.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+TMPFILE=`mktemp /tmp/buffer.XXXXXXXX`
+trap 'rm "$TMPFILE"' EXIT
+
+for host in `cat test/validations/special/duplicate-allowlist.txt`; do
+    REGEX_ESCAPED_HOST=`python3 -c "import re; print(re.escape('$host'))"`
+    REPEATS=`egrep -l "" src/chrome/content/rules/*.xml | wc -l`
+    if [ $REPEATS -gt 1 ]; then
+        echo $host
+    fi
+done > $TMPFILE
+
+cp --force $TMPFILE test/validations/special/duplicate-allowlist.txt
diff --git a/test/validations/special/duplicate-allowlist.txt b/test/validations/special/duplicate-allowlist.txt
new file mode 100644
index 000000000000..7d3a62a9b3fc
--- /dev/null
+++ b/test/validations/special/duplicate-allowlist.txt
@@ -0,0 +1,113 @@
+mailing.channel4.com
+training.citrix.com
+drownedinsound.com
+now.eloqua.com
+foxydeal.com
+foxydeal.de
+www.gfi.com
+forum.girlsoutwest.com
+forums.girlsoutwest.com
+gsu.edu
+hostoople.com
+ieeexplore.ieee.org
+infinet.com.au
+ivegotkids.com
+ideas.joomla.org
+jrrt.org.uk
+esat.kuleuven.be
+www.esat.kuleuven.be
+latimes.com
+liberalamerica.org
+liftdna.com
+fundusze-emerytalne.money.pl
+fundusze-inwestycyjne.money.pl
+karty-kredytowe.money.pl
+kredyty-gotowkowe.money.pl
+kredyty-mieszkaniowe.money.pl
+kredyty-samochodowe.money.pl
+lokaty-bankowe.money.pl
+npmawesome.com
+webmail.nyi.net
+nykeurope.com
+careers.peopleclick.com
+www.rackspace.com
+redbullmobile.at
+reddpics.com
+www.cits.ruhr-uni-bochum.de
+www.ruhr-uni-bochum.de
+www2.scribblelive.com
+sparxtrading.com
+thompsonhotels.com
+togevi.com
+blog.trendmicro.com
+countermeasures.trendmicro.eu
+flow.typo3.org
+ul.ie
+businessforums.verizon.net
+digitalcommons.wustl.edu
+openscholarship.wustl.edu
+tpsnews.ca
+www.tpsnews.ca
+pygmyboats.com
+www.pygmyboats.com
+petitions.moveon.org
+email.bild.de
+direct.asda.com
+info.mheducation.com
+www.wiltshire.police.uk
+www.coochey.net
+www.zdv.uni-mainz.de
+go.sirsidynix.com
+amazingcareers.firstdirect.com
+www.amazingcareers.firstdirect.com
+info.unit4.com
+licensing.ofcom.org.uk
+styles.ofcom.org.uk
+www.autotrader.co.uk
+autotrader.co.uk
+nitroflare.com
+www.nitroflare.com
+www.scotland.police.uk
+councilmeetings.lewisham.gov.uk
+files.conferencemanager.dk
+huuto.net
+salattu.huuto.net
+www.huuto.net
+www.thebureauinvestigates.com
+www.upi.com
+blog.sigfig.com
+www.pumo.com.tw
+www.hkyantoyan.com
+www.888173.net
+www.ratfishoil.com
+www.tum.de
+www.filmlinc.com
+shop.look.co.uk
+blog.vungle.com
+www.vungle.com
+www.jeffnabers.com
+www.suppliesfordreams.org
+www.sparxtrading.com
+landing.lyris.com
+www.ebuyer.com
+blog.ebuyer.com
+wiki.sequanux.org
+www.opensrs.com
+www.redbullmobile.at
+k.ilius.net
+stda.ilius.net
+wp-poc.details.com
+www.jrrt.org.uk
+www.ul.ie
+www.hostoople.com
+hostooplecms.hostooplecom.netdna-cdn.com
+www.gsu.edu
+thumbs.dreamstime.com
+support.arpnetworks.com
+jobs.datacenterknowledge.com
+cdn.nejm.org
+guides.thenextweb.com
+jobs.thenextweb.com
+www.liberalamerica.org
+www.latimes.com
+www.thompsonhotels.com
diff --git a/test/validations/special/duplicate-whitelist-cleanup.sh b/test/validations/special/duplicate-whitelist-cleanup.sh
deleted file mode 100755
index 837ca5792460..000000000000
--- a/test/validations/special/duplicate-whitelist-cleanup.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-TMPFILE=`mktemp /tmp/buffer.XXXXXXXX`
-trap 'rm "$TMPFILE"' EXIT
-
-for host in `cat utils/duplicate-whitelist.txt`; do
-    REPEATS=`grep -F "target host=\"$host\"" src/chrome/content/rules/*.xml | wc -l`
-    if [ $REPEATS -gt 1 ]; then
-        echo $host
-    fi
-done > $TMPFILE
-
-cp --force $TMPFILE utils/duplicate-whitelist.txt
diff --git a/test/validations/special/duplicate-whitelist.txt b/test/validations/special/duplicate-whitelist.txt
deleted file mode 100644
index 44d395015706..000000000000
--- a/test/validations/special/duplicate-whitelist.txt
+++ /dev/null
@@ -1,113 +0,0 @@
-portuguese.101domain.com
-spanish.101domain.com
-a.abcnews.com
-abcnews.go.com
-feedback.adroll.com
-adyadvantage.com
-aftenposten.no
-www1.arun.gov.uk
-*.bcvs.ch
-bcvs.ch
-cccure.training
-mailing.channel4.com
-training.citrix.com
-consumerreports.org
-c-spanvideo.org
-davidsontutoring.com
-dell.com
-www.dell.com
-investors.demandware.com
-dice.com
-www.dice.com
-drownedinsound.com
-now.eloqua.com
-emergingthreats.net
-*.eveonline.com
-eveonline.com
-fishwrapper.com
-foxydeal.com
-foxydeal.de
-freeporngif.com
-www.freeporngif.com
-g33kinfo.com
-www.g33kinfo.com
-geocaching.com
-www.geocaching.com
-www.gfi.com
-forum.girlsoutwest.com
-forums.girlsoutwest.com
-a.abcnews.go.com
-gsu.edu
-code.highcharts.com
-hometheaterreview.com
-hostoople.com
-ieeexplore.ieee.org
-inc.com
-inductionsolutions.com
-infinet.com.au
-ivegotkids.com
-ideas.joomla.org
-jrrt.org.uk
-esat.kuleuven.be
-www.esat.kuleuven.be
-latimes.com
-liberalamerica.org
-liftdna.com
-linbit.com
-server.iad.liveperson.net
-mandiant.com
-mediciglobal.com
-mirrorbingo.com
-fundusze-emerytalne.money.pl
-fundusze-inwestycyjne.money.pl
-karty-kredytowe.money.pl
-kredyty-gotowkowe.money.pl
-kredyty-mieszkaniowe.money.pl
-kredyty-samochodowe.money.pl
-lokaty-bankowe.money.pl
-nelonen.fi
-www.nelonen.fi
-npmawesome.com
-nydailynews.com
-webmail.nyi.net
-nykeurope.com
-oag.com
-careers.peopleclick.com
-pdu.edu
-plusme.net
-www.rackspace.com
-redbullmobile.at
-reddpics.com
-www.cits.ruhr-uni-bochum.de
-www.ruhr-uni-bochum.de
-savethechildren.org.uk
-www2.scribblelive.com
-*.shopping.com
-sparxtrading.com
-suppliesfordreams.org
-www.techrepublic.com
-tesco.com
-test-ipv6.cz
-thefederalistpapers.org
-thompsonhotels.com
-ti.com
-www.ti.com
-togevi.com
-www.toplist.cz
-blog.trendmicro.com
-countermeasures.trendmicro.eu
-tripwire.com
-www.tripwire.com
-flow.typo3.org
-ul.ie
-unm.edu
-businessforums.verizon.net
-help.walmart.com
-members.webs.com
-digitalcommons.wustl.edu
-openscholarship.wustl.edu
-www.blogsmithmedia.com
-www.cccure.training
-www.hostingcatalog.com
-zylon.net
-www.zylon.net
diff --git a/test/validations/special/run.py b/test/validations/special/run.py
index 737fea1001ba..14b0ed6ff9ec 100755
--- a/test/validations/special/run.py
+++ b/test/validations/special/run.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.6
+#!/usr/bin/env python3
 
 import glob
 import argparse
@@ -32,9 +32,9 @@ def fail(s):
 xpath_cookie_host_pattern = etree.XPath("/ruleset/securecookie/@host")
 xpath_cookie_name_pattern = etree.XPath("/ruleset/securecookie/@name")
 
-# Load lists of ruleset names whitelisted for duplicate rules
+# Load lists of ruleset names allowlisted for duplicate rules
 thispath = os.path.dirname(os.path.realpath(__file__))
-with open(thispath + '/duplicate-whitelist.txt') as duplicate_fh:
+with open(thispath + '/duplicate-allowlist.txt') as duplicate_fh:
     duplicate_allowed_list = [x.rstrip('\n') for x in duplicate_fh.readlines()]
 
 filenames = glob.glob(thispath + '/../../../src/chrome/content/rules/*')
@@ -157,7 +157,7 @@ def nomes_all(where=sys.argv[1:]):
     xml_parser = etree.XMLParser(remove_blank_text=True)
 
     basename = filename.split(os.path.sep)[-1]
-    if basename == '00README' or basename == 'make-trivial-rule' or basename == 'default.rulesets':
+    if basename == '00README' or basename == 'make-trivial-rule' or basename == 'default.rulesets' or basename == 'default.rulesets.json':
         continue
 
     try:
@@ -180,24 +180,18 @@ def nomes_all(where=sys.argv[1:]):
             failure = 1
             fail("%s failed test: %s" % (filename, test.__doc__))
 
-    platform_list = xpath_ruleset_platform(tree)
-    if len(platform_list) == 0:
-        platform = ''
-    else:
-        platform = platform_list[0]
-
     targets = xpath_host(tree)
     for target in targets:
-        host_counter.update([(target, platform)])
+        host_counter.update([target])
 
 
-for (host, platform), count in host_counter.most_common():
+for host, count in host_counter.most_common():
     if count > 1:
         if host in duplicate_allowed_list:
-            warn("Whitelisted hostname %s with platform '%s' shows up in %d different rulesets." % (host, platform, count))
+            warn("Allowlisted hostname %s shows up in %d different rulesets." % (host, count))
         else:
             failure = 1
-            fail("Hostname %s with platform '%s' shows up in %d different rulesets." % (host, platform, count))
+            fail("Hostname %s shows up in %d different rulesets." % (host, count))
     if not is_valid_target_host(host):
         failure = 1
         fail("%s failed: %s" % (host, is_valid_target_host.__doc__))
diff --git a/test/validations/test-coverage/run.sh b/test/validations/test-coverage/run.sh
index ba1867722f52..953f6008da77 100755
--- a/test/validations/test-coverage/run.sh
+++ b/test/validations/test-coverage/run.sh
@@ -24,10 +24,10 @@ if ! [ -d test/rules ] ; then
   exit 1
 fi
 if [ $# -gt 0 ] ; then
-  exec python3.6 test/rules/src/https_everywhere_checker/check_rules.py \
+  exec python3 test/rules/src/https_everywhere_checker/check_rules.py \
     test/rules/coverage.checker.config "$@"
 fi
-if ! python3.6 test/rules/src/https_everywhere_checker/check_rules.py \
+if ! python3 test/rules/src/https_everywhere_checker/check_rules.py \
       test/rules/coverage.checker.config; then
   echo '
 Ruleset test coverage was insufficient.
diff --git a/translations b/translations
index a318dfa5a476..5885a200bb15 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit a318dfa5a476f063f4e2153dace1a98c9c8fa4d1
+Subproject commit 5885a200bb15b5d7320e8f53293ff067a9943629
diff --git a/utils/android-push.sh b/utils/android-push.sh
index 5a0421326a35..6e09b50c70c4 100755
--- a/utils/android-push.sh
+++ b/utils/android-push.sh
@@ -11,15 +11,32 @@ fi
 
 # Push to Android Firefox if device is connected
 # XXX on some systems, adb may require sudo...
-if type adb > /dev/null 2>/dev/null && adb devices >/dev/null 2>/dev/null ; then
-  ADB_FOUND=`adb devices | grep -v 'offline$' | tail -2 | head -1 | cut -f 1 | sed 's/ *$//g'`
-  if [ "$ADB_FOUND" != "List of devices attached" ]; then
-    echo Pushing "$XPI_NAME" to /sdcard/"$XPI_NAME"
-    adb push "../$XPI_NAME" /sdcard/"$XPI_NAME"
-    adb shell am start -a android.intent.action.VIEW \
-                       -c android.intent.category.DEFAULT \
-                       -d file:///mnt/sdcard/pkg/ \
-                       -n $ANDROID_APP_ID/.App
+if type adb > /dev/null 2>/dev/null ; then
+  #running `adb devices` below will start adb server/daemon if it wasn't running already
+  #we start it and make note if it's us that started it or not, so we can stop it afterwards
+  if adb start-server 2>&1 |grep -qF 'daemon not running' ; then
+    we_started_adb_daemon=1
+  else
+    we_started_adb_daemon=0
+  fi
+  on_exit() {
+    if test "$we_started_adb_daemon" == "1"; then
+      #if we started it we kill it, to avoid constant dmesg PME# spam, see issue 18103
+      adb kill-server
+    fi
+  }
+  trap on_exit EXIT SIGINT
+
+  if adb devices >/dev/null 2>/dev/null ; then
+    ADB_FOUND=`adb devices | grep -v 'offline$' | tail -2 | head -1 | cut -f 1 | sed 's/ *$//g'`
+    if [ "$ADB_FOUND" != "List of devices attached" ]; then
+      echo Pushing "$XPI_NAME" to /sdcard/"$XPI_NAME"
+      adb push "../$XPI_NAME" /sdcard/"$XPI_NAME"
+      adb shell am start -a android.intent.action.VIEW \
+                         -c android.intent.category.DEFAULT \
+                         -d file:///mnt/sdcard/pkg/ \
+                         -n $ANDROID_APP_ID/.App
+    fi
   fi
 fi
 
diff --git a/utils/chromium-translations.py b/utils/chromium-translations.py
index 14ab20c52ff9..a9d7318efc13 100644
--- a/utils/chromium-translations.py
+++ b/utils/chromium-translations.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.6
+#!/usr/bin/env python3
 """
 Given two directories, copy Firefox-style https-everywhere.dtd translations from
 the first directory into appropriately-named Chromium-style messages.json
@@ -15,23 +15,25 @@
 message_regex = re.compile("")
 
 def convert(locale):
-  target_messages = {}
-  with open(os.path.join(source_dir, locale, "https-everywhere.dtd"), 'r', encoding='utf-8') as f:
-    for line in f:
-      m = message_regex.search(line)
-      if m:
-        message_name = m.group(1)
-        message_value = m.group(2)
-        message_name = re.sub("[.-]", "_", message_name)
-        target_messages[message_name] = {
-          "message": message_value
-        }
-  target_dir = os.path.join(dest_dir, locale)
-  if not os.path.isdir(target_dir):
-    os.mkdir(target_dir)
-  with open(os.path.join(target_dir, "messages.json"), "w") as out_file:
-    out_file.write(json.dumps(target_messages, sort_keys=True, indent=4))
+  translation_file = os.path.join(source_dir, locale, "https-everywhere.dtd")
+  if os.path.isfile(translation_file):
+    target_messages = {}
+    with open(translation_file, 'r', encoding='utf-8') as f:
+      for line in f:
+        m = message_regex.search(line)
+        if m:
+          message_name = m.group(1)
+          message_value = m.group(2)
+          message_name = re.sub("[.-]", "_", message_name)
+          target_messages[message_name] = {
+            "message": message_value
+          }
+    target_dir = os.path.join(dest_dir, locale)
+    if not os.path.isdir(target_dir):
+      os.mkdir(target_dir)
+    with open(os.path.join(target_dir, "messages.json"), "w") as out_file:
+      out_file.write(json.dumps(target_messages, sort_keys=True, indent=4))
 
 for locale in os.listdir(source_dir):
   if not "." in locale:
-      convert(locale)
+    convert(locale)
diff --git a/utils/create-platform-certs/.gitignore b/utils/create-platform-certs/.gitignore
new file mode 100644
index 000000000000..45b7a69b29ba
--- /dev/null
+++ b/utils/create-platform-certs/.gitignore
@@ -0,0 +1,2 @@
+certdata.txt
+mk-ca-bundle.pl
diff --git a/utils/create-platform-certs/README.md b/utils/create-platform-certs/README.md
new file mode 100644
index 000000000000..35986902d079
--- /dev/null
+++ b/utils/create-platform-certs/README.md
@@ -0,0 +1,17 @@
+# create-platform-certs
+
+This repository creates and fills `test/rules/platform_certs/default/`.
+
+## Setup
+
+Download `certdata.txt` and `mk-ca-bundle.pl` and put them in this directory.
+You can find the download locations in `SHA256SUMS`.
+
+## Run
+
+You can repopulate the certificates with `create_platform_certs.sh`. The
+certificates should be bit-for-bit identical if you use the same `certdata.txt`
+and `mk-ca-bundle.pl`.
+
+You can update the certificates by using a new `certdata.txt` and
+`mk-ca-bundle.pl`. Be sure to also update `SHA256SUMS`.
diff --git a/utils/create-platform-certs/SHA256SUMS b/utils/create-platform-certs/SHA256SUMS
new file mode 100644
index 000000000000..59c7f8083fe0
--- /dev/null
+++ b/utils/create-platform-certs/SHA256SUMS
@@ -0,0 +1,5 @@
+# Use `curl -I 'https://download.mozilla.org/?product=firefox-latest&os=linux64&lang=en_US'` to determine the latest stable version, and replace the tag in the URL below.
+# https://hg.mozilla.org/releases/mozilla-release/raw-file/FIREFOX_73_0_1_RELEASE/security/nss/lib/ckfw/builtins/certdata.txt
+f3bdcd74612952da8476a9d4147f50b29ad0710b7dd95b4c8690500209986d70  certdata.txt
+# https://raw.githubusercontent.com/curl/curl/curl-7_69_0/lib/mk-ca-bundle.pl
+9d828d97053868907ce6229d132132f0f26772393405dadd037b6f85a5c5b219  mk-ca-bundle.pl
diff --git a/utils/create-platform-certs/create_platform_certs.sh b/utils/create-platform-certs/create_platform_certs.sh
new file mode 100755
index 000000000000..8b2b1739c668
--- /dev/null
+++ b/utils/create-platform-certs/create_platform_certs.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+set -xe
+
+GIT_REPO_TOP_LEVEL="$(git rev-parse --show-toplevel)"
+
+cd "${GIT_REPO_TOP_LEVEL}"/utils/create-platform-certs
+
+COMBINED_CERT_FILE=./ca-bundle.crt
+HASH_FILE=./SHA256SUMS
+MK_CA_BUNDLE_PL_EXEC=./mk-ca-bundle.pl
+SPLIT_CERT_DIR="${GIT_REPO_TOP_LEVEL}"/test/rules/platform_certs/default/
+SPLIT_COMBINED_CERT_FILE_EXEC=./split_combined_cert_file.py
+
+sha256sum -c "${HASH_FILE}"
+
+git rm -r -f -q "${SPLIT_CERT_DIR}"
+
+perl "${MK_CA_BUNDLE_PL_EXEC}" -n "${COMBINED_CERT_FILE}"
+
+python3 "${SPLIT_COMBINED_CERT_FILE_EXEC}" "${COMBINED_CERT_FILE}" "${SPLIT_CERT_DIR}"
+
+c_rehash "${SPLIT_CERT_DIR}" > /dev/null
+
+rm "${COMBINED_CERT_FILE}"
+
+git add "${SPLIT_CERT_DIR}"
diff --git a/utils/create-platform-certs/split_combined_cert_file.py b/utils/create-platform-certs/split_combined_cert_file.py
new file mode 100755
index 000000000000..783d54ebf105
--- /dev/null
+++ b/utils/create-platform-certs/split_combined_cert_file.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python3
+import argparse
+import codecs
+import os
+import pathlib
+import re
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        'cert_file',
+        help='combined crt/pem file to split',
+    )
+    parser.add_argument(
+        'output_dir',
+        help='output directory for split files',
+    )
+    args = parser.parse_args()
+    with codecs.open(args.cert_file, 'r', encoding='utf-8') as cert_file:
+        bundle = cert_file.read()
+        certs = re.compile('\n{2,}').split(bundle)
+
+        # First element of certs is a comment
+        certs = certs[1:]
+        cert_filename_num_width = len(str(len(certs)))
+        pathlib.Path(args.output_dir).mkdir(parents=True, exist_ok=True)
+        for index, cert in enumerate(certs):
+            cert_name, cert_content = re.compile("\n=+\n").split(cert)
+            cert_filename = os.path.join(
+                args.output_dir,
+                "cert{}.pem".format(str(index+1).zfill(cert_filename_num_width))
+            )
+            with codecs.open(
+                    cert_filename, 'w', encoding='utf-8') as cert_file:
+                cert_file.write("%s\n" % cert_name)
+                cert_file.write(cert_content)
+                cert_file.write('\n')
diff --git a/utils/create_zip.py b/utils/create_zip.py
index e4187ade2da2..d8af693fa17b 100755
--- a/utils/create_zip.py
+++ b/utils/create_zip.py
@@ -1,10 +1,10 @@
-#!/usr/bin/env python3.6
+#!/usr/bin/env python3
 
 # Uses the Python zip implementation to create deterministic zip's
 # Author: Yan Zhu, yan@mit.edu
 
 """
-Usage: python3.6 create_zip.py -x  -n  
+Usage: python3 create_zip.py -x  -n  
 """
 
 import argparse
diff --git a/utils/eslint/package-lock.json b/utils/eslint/package-lock.json
new file mode 100644
index 000000000000..066503c6a00e
--- /dev/null
+++ b/utils/eslint/package-lock.json
@@ -0,0 +1,897 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "@babel/code-frame": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+      "dev": true,
+      "requires": {
+        "@babel/highlight": "^7.10.4"
+      }
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+      "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+      "dev": true
+    },
+    "@babel/highlight": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.10.4",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        }
+      }
+    },
+    "@eslint/eslintrc": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.1.0.tgz",
+      "integrity": "sha512-bfL5365QSCmH6cPeFT7Ywclj8C7LiF7sO6mUGzZhtAMV7iID1Euq6740u/SRi4C80NOnVz/CEfK8/HO+nCAPJg==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.12.4",
+        "debug": "^4.1.1",
+        "import-fresh": "^3.2.1",
+        "strip-json-comments": "^3.1.1"
+      }
+    },
+    "@types/color-name": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
+      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
+      "dev": true
+    },
+    "acorn": {
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz",
+      "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==",
+      "dev": true
+    },
+    "acorn-jsx": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz",
+      "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==",
+      "dev": true
+    },
+    "ajv": {
+      "version": "6.12.4",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz",
+      "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==",
+      "dev": true,
+      "requires": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "dev": true
+    },
+    "ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "astral-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
+      "dev": true
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true
+    },
+    "chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "dev": true,
+          "requires": {
+            "@types/color-name": "^1.1.1",
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "requires": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      }
+    },
+    "debug": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+      "dev": true,
+      "requires": {
+        "ms": "^2.1.1"
+      }
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "dev": true
+    },
+    "doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
+    "emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
+    "enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^4.1.1"
+      }
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "eslint": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.8.0.tgz",
+      "integrity": "sha512-qgtVyLZqKd2ZXWnLQA4NtVbOyH56zivOAdBFWE54RFkSZjokzNrcP4Z0eVWsZ+84ByXv+jL9k/wE1ENYe8xRFw==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@eslint/eslintrc": "^0.1.0",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "enquirer": "^2.3.5",
+        "eslint-scope": "^5.1.0",
+        "eslint-utils": "^2.1.0",
+        "eslint-visitor-keys": "^1.3.0",
+        "espree": "^7.3.0",
+        "esquery": "^1.2.0",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^5.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^5.0.0",
+        "globals": "^12.1.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^3.13.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash": "^4.17.19",
+        "minimatch": "^3.0.4",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "progress": "^2.0.0",
+        "regexpp": "^3.1.0",
+        "semver": "^7.2.1",
+        "strip-ansi": "^6.0.0",
+        "strip-json-comments": "^3.1.0",
+        "table": "^5.2.3",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      }
+    },
+    "eslint-scope": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz",
+      "integrity": "sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "eslint-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^1.1.0"
+      }
+    },
+    "eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true
+    },
+    "espree": {
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.0.tgz",
+      "integrity": "sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==",
+      "dev": true,
+      "requires": {
+        "acorn": "^7.4.0",
+        "acorn-jsx": "^5.2.0",
+        "eslint-visitor-keys": "^1.3.0"
+      }
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true
+    },
+    "esquery": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz",
+      "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^5.1.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+          "dev": true
+        }
+      }
+    },
+    "esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^5.2.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+          "dev": true
+        }
+      }
+    },
+    "estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true
+    },
+    "fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
+    "file-entry-cache": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
+      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
+      "dev": true,
+      "requires": {
+        "flat-cache": "^2.0.1"
+      }
+    },
+    "flat-cache": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
+      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
+      "dev": true,
+      "requires": {
+        "flatted": "^2.0.0",
+        "rimraf": "2.6.3",
+        "write": "1.0.3"
+      }
+    },
+    "flatted": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
+      "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
+      "dev": true
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
+    "glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "requires": {
+        "is-glob": "^4.0.1"
+      }
+    },
+    "globals": {
+      "version": "12.4.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
+      "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+      "dev": true,
+      "requires": {
+        "type-fest": "^0.8.1"
+      }
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
+    },
+    "ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "dev": true
+    },
+    "import-fresh": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
+      "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
+      "dev": true,
+      "requires": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true
+    },
+    "is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
+      "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
+      "dev": true,
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
+    "levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      }
+    },
+    "lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+      "dev": true
+    },
+    "mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.5"
+      }
+    },
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dev": true,
+      "requires": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      }
+    },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "requires": {
+        "callsites": "^3.0.0"
+      }
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true
+    },
+    "prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true
+    },
+    "progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true
+    },
+    "regexpp": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
+      "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
+      "dev": true
+    },
+    "resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true
+    },
+    "rimraf": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "semver": {
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+      "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
+      "dev": true
+    },
+    "shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "^3.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true
+    },
+    "slice-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
+      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.0",
+        "astral-regex": "^1.0.0",
+        "is-fullwidth-code-point": "^2.0.0"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "requires": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^5.0.0"
+      }
+    },
+    "strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "table": {
+      "version": "5.4.6",
+      "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
+      "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.10.2",
+        "lodash": "^4.17.14",
+        "slice-ansi": "^2.1.0",
+        "string-width": "^3.0.0"
+      }
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "^1.2.1"
+      }
+    },
+    "type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true
+    },
+    "uri-js": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz",
+      "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "v8-compile-cache": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz",
+      "integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==",
+      "dev": true
+    },
+    "which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "write": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
+      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
+      "dev": true,
+      "requires": {
+        "mkdirp": "^0.5.1"
+      }
+    }
+  }
+}
diff --git a/utils/eslint/package.json b/utils/eslint/package.json
index 8533c5c3b1db..918b95da0ea8 100644
--- a/utils/eslint/package.json
+++ b/utils/eslint/package.json
@@ -1,5 +1,5 @@
 {
   "devDependencies": {
-    "eslint": "^4.1.1"
+    "eslint": "^7.8.0"
   }
 }
diff --git a/utils/hsts-prune/index.js b/utils/hsts-prune/index.js
index c2583b29387e..882aa05c43e6 100644
--- a/utils/hsts-prune/index.js
+++ b/utils/hsts-prune/index.js
@@ -145,7 +145,7 @@ const check_header_directives = (check_domain, cb) => {
         max_age = Number(max_age_match[1]);
       }
       cb(null,
-        preload && include_subdomains && max_age >= 10886400);
+        preload && include_subdomains && max_age >= 31536000);
       sent_callback = true;
     } else {
       cb(null, false);
@@ -182,7 +182,6 @@ const check_https_redirection_and_header_directives = (check_domain, cb) => {
 // Here we begin parsing the XML files and modifying the targets
 
 function remove_target_from_xml(source, target) {
-  let pos;
   // escape the regexp for targets that have a *
   target = escape_string_regexp(target);
 
@@ -314,7 +313,7 @@ async.parallel({
           });
         }
 
-        // After building the additonal checks in the form of the
+        // After building the additional checks in the form of the
         // checks array of functions, run the checks in parallel and
         // perform the appropriate actions based on the results.
 
diff --git a/utils/hsts-prune/package-lock.json b/utils/hsts-prune/package-lock.json
index 29ab5a1d176a..d9a47270e0e6 100644
--- a/utils/hsts-prune/package-lock.json
+++ b/utils/hsts-prune/package-lock.json
@@ -2,26 +2,60 @@
   "name": "hsts-prune",
   "version": "1.0.0",
   "lockfileVersion": 1,
+  "requires": true,
   "dependencies": {
+    "JSONStream": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.4.tgz",
+      "integrity": "sha512-Y7vfi3I5oMOYIr+WxV8NZxDSwcbNgzdKYsTNInmycOq9bUYwGg9ryu57Wg5NLmCjqdFPNUmpMBo3kSJN9tCbXg==",
+      "requires": {
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
+      }
+    },
     "ajv": {
-      "version": "4.11.8",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-      "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY="
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "requires": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "dependencies": {
+        "fast-deep-equal": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+        }
+      }
     },
     "asn1": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "requires": {
+        "safer-buffer": "~2.1.0"
+      }
     },
     "assert-plus": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ="
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
     },
     "async": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
-      "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw=="
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
+      "requires": {
+        "lodash": "^4.17.14"
+      }
     },
     "asynckit": {
       "version": "0.4.0",
@@ -29,66 +63,56 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "aws-sign2": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8="
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
     },
     "aws4": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
+      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
     },
     "base64-stream": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/base64-stream/-/base64-stream-0.1.3.tgz",
-      "integrity": "sha1-drA3C3ebuBbRL9QXZKa4Vz61/sM="
+      "integrity": "sha1-drA3C3ebuBbRL9QXZKa4Vz61/sM=",
+      "requires": {
+        "readable-stream": "^2.0.2"
+      }
     },
     "bcrypt-pbkdf": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-      "optional": true
-    },
-    "boom": {
-      "version": "2.10.1",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "optional": true,
+      "requires": {
+        "tweetnacl": "^0.14.3"
+      }
     },
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
-    "co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
-    },
     "combined-stream": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk="
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
+      "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
     },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
-    "cryptiles": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g="
-    },
     "dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
+      "requires": {
+        "assert-plus": "^1.0.0"
       }
     },
     "delayed-stream": {
@@ -97,10 +121,14 @@
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
     "ecc-jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-      "optional": true
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "optional": true,
+      "requires": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
     },
     "escape-string-regexp": {
       "version": "1.0.5",
@@ -108,66 +136,74 @@
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "extend": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
     },
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
       "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
     },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
+    },
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
       "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
     "form-data": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-      "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE="
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
+      "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "1.0.6",
+        "mime-types": "^2.1.12"
+      }
     },
     "getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
+      "requires": {
+        "assert-plus": "^1.0.0"
       }
     },
     "har-schema": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
-      "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
     },
     "har-validator": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
-      "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio="
-    },
-    "hawk": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ="
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
+      "requires": {
+        "ajv": "^6.12.3",
+        "har-schema": "^2.0.0"
+      }
     },
     "highland": {
-      "version": "2.11.1",
-      "resolved": "https://registry.npmjs.org/highland/-/highland-2.11.1.tgz",
-      "integrity": "sha1-ObTZKZtuB9o9FeeveypvEnUirK8="
-    },
-    "hoek": {
-      "version": "2.16.3",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/highland/-/highland-2.13.0.tgz",
+      "integrity": "sha512-zGZBcgAHPY2Zf9VG9S5IrlcC7CH9ELioXVtp9T5bU2a4fP2zIsA+Y8pV/n/h2lMwbWMHTX0I0xN0ODJ3Pd3aBQ==",
+      "requires": {
+        "util-deprecate": "^1.0.2"
+      }
     },
     "http-signature": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-      "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      }
     },
     "inherits": {
       "version": "2.0.3",
@@ -200,144 +236,176 @@
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
       "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
     },
-    "json-stable-stringify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8="
-    },
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
       "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
-    "jsonify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
-    },
     "jsonparse": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
       "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA="
     },
-    "JSONStream": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz",
-      "integrity": "sha1-cH92HgHa6eFvG8+TcDt4xwlmV5o="
-    },
     "jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
       "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
       }
     },
     "lodash": {
-      "version": "4.17.4",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-      "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "mime-db": {
-      "version": "1.29.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz",
-      "integrity": "sha1-SNJtI1WJZRcErFkWygYAGRQmaHg="
+      "version": "1.35.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz",
+      "integrity": "sha512-JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg=="
     },
     "mime-types": {
-      "version": "2.1.16",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz",
-      "integrity": "sha1-K4WKUuXs1RbbiXrCvodIeDBpjiM="
+      "version": "2.1.19",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz",
+      "integrity": "sha512-P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==",
+      "requires": {
+        "mime-db": "~1.35.0"
+      }
     },
     "oauth-sign": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
     },
     "performance-now": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-      "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "process-nextick-args": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
     },
     "progress": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
       "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74="
     },
+    "psl": {
+      "version": "1.1.29",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz",
+      "integrity": "sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ=="
+    },
     "punycode": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
       "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
     },
     "qs": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-      "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM="
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
     },
     "readable-stream": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ=="
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
     },
     "request": {
-      "version": "2.81.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-      "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA="
+      "version": "2.88.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+      "requires": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.0",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.4.3",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
+      }
     },
     "safe-buffer": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
-    "sntp": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg="
-    },
     "split": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg=="
+      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
+      "requires": {
+        "through": "2"
+      }
     },
     "sshpk": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz",
+      "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=",
+      "requires": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
       }
     },
     "stream-filter": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/stream-filter/-/stream-filter-2.1.0.tgz",
-      "integrity": "sha1-vf9O7jzeTBUl4Ct43ek9gh/lKb0="
+      "integrity": "sha1-vf9O7jzeTBUl4Ct43ek9gh/lKb0=",
+      "requires": {
+        "through2": "^2.0.1",
+        "xtend": "^4.0.1"
+      }
     },
     "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ=="
-    },
-    "stringstream": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
     },
     "through": {
       "version": "2.3.8",
@@ -347,17 +415,28 @@
     "through2": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-      "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4="
+      "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
+      "requires": {
+        "readable-stream": "^2.1.5",
+        "xtend": "~4.0.1"
+      }
     },
     "tough-cookie": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-      "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo="
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+      "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+      "requires": {
+        "psl": "^1.1.24",
+        "punycode": "^1.4.1"
+      }
     },
     "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0="
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
     },
     "tweetnacl": {
       "version": "0.14.5",
@@ -365,37 +444,54 @@
       "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
       "optional": true
     },
+    "uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "requires": {
+        "punycode": "^2.1.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+        }
+      }
+    },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
     "uuid": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-      "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
     },
     "verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
       }
     },
     "xml2js": {
       "version": "0.4.19",
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
-      "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q=="
+      "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
+      "requires": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~9.0.1"
+      }
     },
     "xmlbuilder": {
-      "version": "9.0.4",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.4.tgz",
-      "integrity": "sha1-UZy0ymhtAFqEINNJbz8MruzKWA8="
+      "version": "9.0.7",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
+      "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
     },
     "xtend": {
       "version": "4.0.1",
diff --git a/utils/hsts-prune/package.json b/utils/hsts-prune/package.json
index fb8efdf32678..fcd6741cb985 100644
--- a/utils/hsts-prune/package.json
+++ b/utils/hsts-prune/package.json
@@ -10,7 +10,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "JSONStream": "^1.3.0",
-    "async": "^2.1.4",
+    "async": "^2.6.4",
     "base64-stream": "^0.1.3",
     "escape-string-regexp": "^1.0.5",
     "highland": "^2.10.1",
diff --git a/utils/issue-format-bot/.env.example b/utils/issue-format-bot/.env.example
deleted file mode 100644
index c619b9daedb5..000000000000
--- a/utils/issue-format-bot/.env.example
+++ /dev/null
@@ -1,5 +0,0 @@
-# The ID of your GitHub integration
-APP_ID=
-WEBHOOK_SECRET=development
-# This is the default:
-LOG_LEVEL=info
diff --git a/utils/issue-format-bot/.eslintrc.json b/utils/issue-format-bot/.eslintrc.json
deleted file mode 100644
index da3ef079033a..000000000000
--- a/utils/issue-format-bot/.eslintrc.json
+++ /dev/null
@@ -1,165 +0,0 @@
-{
-    "parserOptions": {
-        "ecmaVersion": 2017
-    },
-    "env": {
-        "es6": true,
-        "node": true
-    },
-    "extends": [
-        "eslint:recommended"
-    ],
-    "rules": {
-        "array-callback-return": "error",
-        "array-element-newline": "off",
-        "arrow-parens": [
-            "error",
-            "as-needed"
-        ],
-        "arrow-spacing": [
-            "error",
-            {
-                "after": true,
-                "before": true
-            }
-        ],
-        "block-spacing": "error",
-        "brace-style": [
-            "error",
-            "1tbs"
-        ],
-        "callback-return": "error",
-        "camelcase": "error",
-        "capitalized-comments": "off",
-        "comma-dangle": "error",
-        "comma-spacing": [
-            "error",
-            {
-                "after": true,
-                "before": false
-            }
-        ],
-        "comma-style": [
-            "error",
-            "last"
-        ],
-        "complexity": "error",
-        "consistent-return": "off",
-        "curly": "off",
-        "default-case": "off",
-        "dot-notation": "error",
-        "eol-last": "error",
-        "eqeqeq": "error",
-        "func-call-spacing": "error",
-        "func-names": "off",
-        "func-style": [
-            "error",
-            "declaration"
-        ],
-        "handle-callback-err": "error",
-        "indent": [2, 2],
-        "key-spacing": "error",
-        "keyword-spacing": [
-            "error",
-            {
-                "after": true,
-                "before": true
-            }
-        ],
-        "linebreak-style": [
-            "error",
-            "unix"
-        ],
-        "lines-around-comment": "error",
-        "no-await-in-loop": "error",
-        "no-bitwise": "error",
-        "no-buffer-constructor": "error",
-        "no-caller": "error",
-        "no-confusing-arrow": "error",
-        "no-continue": "error",
-        "no-eq-null": "error",
-        "no-eval": "error",
-        "no-extend-native": "error",
-        "no-extra-bind": "error",
-        "no-floating-decimal": "error",
-        "no-implied-eval": "error",
-        "no-invalid-this": "error",
-        "no-label-var": "error",
-        "no-labels": "error",
-        "no-lonely-if": "error",
-        "no-loop-func": "error",
-        "no-mixed-operators": "error",
-        "no-mixed-requires": "off",
-        "no-mixed-spaces-and-tabs": "error",
-        "no-multi-spaces": "error",
-        "no-negated-in-lhs": "error",
-        "no-nested-ternary": "error",
-        "no-new": "error",
-        "no-new-func": "error",
-        "no-new-object": "error",
-        "no-new-require": "error",
-        "no-new-wrappers": "error",
-        "no-path-concat": "error",
-        "no-return-await": "error",
-        "no-self-compare": "error",
-        "no-sequences": "error",
-        "no-spaced-func": "error",
-        "no-sync": "error",
-        "no-throw-literal": "error",
-        "no-trailing-spaces": "error",
-        "no-undef-init": "error",
-        "no-unused-expressions": "error",
-        "no-use-before-define": "error",
-        "no-useless-call": "error",
-        "no-useless-concat": "error",
-        "no-var": "error",
-        "no-warning-comments": "off",
-        "no-whitespace-before-property": "error",
-        "nonblock-statement-body-position": "error",
-        "object-curly-spacing": [
-            "error",
-            "never"
-        ],
-        "object-property-newline": "error",
-        "one-var": "off",
-        "one-var-declaration-per-line": "error",
-        "prefer-arrow-callback": "error",
-        "prefer-const": "error",
-        "prefer-promise-reject-errors": "error",
-        "quotes": [
-            "error",
-            "single"
-        ],
-        "require-await": "error",
-        "rest-spread-spacing": "error",
-        "semi": [
-            "error",
-            "always"
-        ],
-        "semi-spacing": "error",
-        "semi-style": [
-            "error",
-            "last"
-        ],
-        "space-before-blocks": "error",
-        "space-in-parens": [
-            "error",
-            "never"
-        ],
-        "space-infix-ops": "error",
-        "spaced-comment": [
-            "error",
-            "always"
-        ],
-        "strict": "error",
-        "unicode-bom": [
-            "error",
-            "never"
-        ],
-        "vars-on-top": "error",
-        "yoda": [
-            "error",
-            "never"
-        ]
-    }
-}
diff --git a/utils/issue-format-bot/.gitignore b/utils/issue-format-bot/.gitignore
deleted file mode 100644
index cfd0495528c5..000000000000
--- a/utils/issue-format-bot/.gitignore
+++ /dev/null
@@ -1,60 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# Typescript v1 declaration files
-typings/
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variables file
-.env
-
-*.pem
diff --git a/utils/issue-format-bot/LICENSE b/utils/issue-format-bot/LICENSE
deleted file mode 100644
index dba13ed2ddf7..000000000000
--- a/utils/issue-format-bot/LICENSE
+++ /dev/null
@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. 
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    
-    Copyright (C)   
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see .
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-.
diff --git a/utils/issue-format-bot/README.md b/utils/issue-format-bot/README.md
deleted file mode 100644
index 5f87c5a578a9..000000000000
--- a/utils/issue-format-bot/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# issue-format-bot
-
-> a GitHub Integration built with [probot](https://github.com/probot/probot) that parses incoming HTTPS Everywhere ruleset bugs
-
-## About
-
-This bot enforces consistency in HTTPS Everywhere issues. All issues are required to have a "type", and for ruleset bugs and new rulesets, the bot also requires issues to have a machine-readable domain.
-
-It then uses this information to label the issue appropriately (e.g. with `top-100`, `top-1k`, etc.).
-
-All the fields are set up in the issue template, so users shouldn't have any trouble if they just follow the instructions they're presented when filing a new issue. That being said, if the bot encounters an error, it will post a comment telling the user what the error was and suggesting they edit their issue. Once the issue is edited, the bot will recognize this and will reparse the issue, posting any followup comments as necessary (in case it encounters more problems).
-
-## Setup
-
-```
-# Install dependencies
-npm install
-
-# Run the bot
-npm start
-```
-
-See [docs/deploy.md](docs/deploy.md) if you would like to run your own instance of this plugin.
diff --git a/utils/issue-format-bot/app.json b/utils/issue-format-bot/app.json
deleted file mode 100644
index b1e40c304624..000000000000
--- a/utils/issue-format-bot/app.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "env": {
-    "PRIVATE_KEY": {
-      "description": "the private key you downloaded when creating the GitHub Integration"
-    },
-    "INTEGRATION_ID": {
-      "description": "the ID of your GitHub Integration"
-    },
-    "WEBHOOK_SECRET": {
-      "description": "the secret configured for your GitHub Integration"
-    }
-  }
-}
diff --git a/utils/issue-format-bot/docs/deploy.md b/utils/issue-format-bot/docs/deploy.md
deleted file mode 100644
index b9205bd114e0..000000000000
--- a/utils/issue-format-bot/docs/deploy.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Deploying
-
-If you would like to run your own instance of this plugin, see the [docs for deploying plugins](https://github.com/probot/probot/blob/master/docs/deployment.md).
-
-This plugin requires these **Permissions & events** for the GitHub Integration:
-
-> **TODO**: List permissions required for deployment here. See [probot/stale](https://github.com/probot/stale/blob/master/docs/deploy.md) for an example.
diff --git a/utils/issue-format-bot/docs/development.md b/utils/issue-format-bot/docs/development.md
deleted file mode 100644
index b6084508f29c..000000000000
--- a/utils/issue-format-bot/docs/development.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Development
-
-To get the bot running against GitHub, see
-https://github.com/probot/probot/blob/master/docs/development.md#configure-a-github-app.
diff --git a/utils/issue-format-bot/index.js b/utils/issue-format-bot/index.js
deleted file mode 100644
index fb5ddce6970e..000000000000
--- a/utils/issue-format-bot/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2017 AJ Jordan, AGPLv3+
-
-'use strict';
-
-const alexa = require('./lib/alexa'),
-  newissue = require('./lib/newissue'),
-  issueedit = require('./lib/issueedit');
-
-module.exports = robot => {
-  robot.log('HTTPS Everywhere ruleset parser started.');
-
-  alexa(robot.log, (err, domains) => {
-    if (err) throw err;
-
-    robot.on('issues.opened', newissue(robot, domains));
-    robot.on('issues.edited', issueedit(robot, domains));
-
-    robot.log('Listening for new issues and issue edits.');
-  });
-};
diff --git a/utils/issue-format-bot/lib/alexa.js b/utils/issue-format-bot/lib/alexa.js
deleted file mode 100644
index 1c1d4af2bbe3..000000000000
--- a/utils/issue-format-bot/lib/alexa.js
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2016 William Budington
-// Copyright 2017 AJ Jordan
-// AGPLv3+
-
-'use strict';
-
-const request = require('request'),
-  unzip = require('unzip');
-
-// (Heavily) modified from code by @Hainish in utils/labeller. Thanks, @Hainish!
-
-// TODO make this return Promises
-// TODO test this file
-
-const DAY = 1000 * 60 * 60 * 24,
-  obj = {data: null};
-
-function retrieveAlexa(cb) {
-
-  const alexa = [];
-  const csvRegex = /^[0-9]+,(.+)/;
-
-  request.get('https://s3.amazonaws.com/alexa-static/top-1m.csv.zip')
-    .on('error', err => {
-      cb(err);
-    })
-  // Dumb ESLint. It's not my fault this person named it like that!?
-    .pipe(unzip.Parse()) // eslint-disable-line new-cap
-    .on('entry', entry => {
-      // TODO this use of readline is super confusing??
-      const lineReader = require('readline').createInterface({
-        input: entry
-      });
-
-      lineReader.on('line', line => {
-        const domain = line.match(csvRegex)[1];
-        alexa.push(domain);
-      });
-
-      lineReader.on('close', () => {
-        cb(null, alexa);
-      });
-    });
-}
-
-module.exports = function getAlexa(log, cb) {
-  // If the data has already been retrieved, just return it
-  if (obj.data) {
-    cb(null, obj);
-    return;
-  }
-
-  // If it hasn't, invoke the retrieval function and schedule
-  // refreshes if we don't run into problems
-  retrieveAlexa((err, data) => {
-    if (err) {
-      cb(err, null);
-      return;
-    }
-
-    log('Retrieved Alexa rankings.');
-
-    // We return an object so that setInterval can change the Array
-    // the `data` property points to
-    obj.data = data;
-
-    setInterval(retrieveAlexa, DAY, (_err, _data) => {
-      // This is the callback function passed to retrieveAlexa()
-
-      if (_err) {
-        cb(_err, null);
-        return;
-      }
-
-      obj.data = _data;
-
-      log('Refreshed Alexa rankings.');
-    });
-
-    cb(null, obj);
-  });
-};
diff --git a/utils/issue-format-bot/lib/issueedit.js b/utils/issue-format-bot/lib/issueedit.js
deleted file mode 100644
index 7ab4d8e39161..000000000000
--- a/utils/issue-format-bot/lib/issueedit.js
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright 2017 AJ Jordan, AGPLv3+
-
-'use strict';
-
-const parse = require('./parse'),
-  validate = require('./validate'),
-  labeler = require('./labeler'),
-  _ = require('lodash');
-
-// We do this outside the event handler to avoid setting up and tearing down this object each time a hook is received
-const botStartDate = new Date('2017-09-25');
-
-// TODO make this share more with newissue.js?
-
-module.exports = function(robot, alexa) {
-  return async context => {
-    robot.log('Issue #' + context.payload.issue.number + ' edited; responding.');
-
-    // Check if the "issue" is really a PR
-    // I can't really tell if GitHub will ever send us something like this, honestly... but bettter safe than sorry.
-    if (_.has(context.payload.issue, 'pull_request')) {
-      robot.log('Issue is a Pull Request; aborting.');
-      return;
-    }
-
-    const createdAt = new Date(context.payload.issue.created_at);
-    if (createdAt <= botStartDate) {
-      robot.log('Ignoring event for a legacy, pre-bot issue.');
-      return;
-    }
-
-    const data = parse(context.payload.issue.body);
-
-    // Check if the data is problematic
-    if (data instanceof Error) {
-      // Dumb `switch` statement cases aren't technically blocks so saying `const params` in both of them causes redeclaration errors
-      let params;
-      switch (data.message) {
-      case 'invalid type':
-        params = context.issue({body: 'Sorry, I still couldn\'t understand the type of issue you specified. Did you look at the issue template?\n\nPlease try again.'});
-        return context.github.issues.createComment(params);
-      case 'multiple types':
-        params = context.issue({body: 'Sorry, but I\'m still seeing more than one type. Can you edit your issue and delete all but one of the types in your issue?'});
-        return context.github.issues.createComment(params);
-      case 'no type':
-        params = context.issue({body: 'I still don\'t see the type of issue in your description. Can you edit your issue to add this (perhaps referring to the [issue template](https://github.com/EFForg/https-everywhere/blob/master/.github/ISSUE_TEMPLATE.md)?)'});
-        return context.github.issues.createComment(params);
-      case 'null description':
-        params = context.issue({body: 'I still don\'t see any text in your description - please edit it to use the issue template. Thank you!'});
-        return context.github.issues.createComment(params);
-      default:
-        throw data;
-      }
-    }
-
-    const problems = validate(data);
-
-    if (problems.length === 0) {
-      // User submission is OK
-
-      let commentedBefore = false;
-
-      // This won't work if the bot comments success past 100 comments
-      // but since this will probably never happen, who cares. Also,
-      // the bot was originally put into production late September, so
-      // only ask for comments after then.
-      //
-      // XXX handle the user screwing up, then fixing it (and getting
-      // the success comment), then screwing up again
-      const _allComments = await context.github.issues.getComments(context.issue({
-        per_page: 100, // eslint-disable-line camelcase
-        since: '2017-09-25'
-      }));
-      const allComments = _allComments.data;
-
-      allComments.forEach(comment => {
-        // 'Your edit helped me out' is here to match legacy comments
-        // before this conditional was put in place
-        if (comment.body.includes('HELPED_COMMENT_POSTED')
-            || comment.body.includes('Your edit helped me out')) {
-          commentedBefore = true;
-        }
-      });
-
-      if (commentedBefore) return;
-
-      const params = context.issue({body: 'Thanks! Your edit helped me out. I\'ll take it from here now. '});
-      await context.github.issues.createComment(params);
-
-      return labeler(context, data, alexa);
-    } else {
-      // Submit a comment telling them what the issues were
-      let comment = 'Thanks for editing!\n\n';
-      comment += 'I\'m sorry, but I still couldn\'t understand your submission. ';
-      comment += 'Here are the problems I ran into this time:\n\n';
-      problems.forEach(problem => comment += ` * ${problem}\n`);
-      comment += '\nIf you edit your issue again, I\'ll try again and report back if I have problems again.';
-      const params = context.issue({body: comment});
-      return context.github.issues.createComment(params);
-
-    }
-  };
-};
diff --git a/utils/issue-format-bot/lib/labeler.js b/utils/issue-format-bot/lib/labeler.js
deleted file mode 100644
index f82a8d64cd3f..000000000000
--- a/utils/issue-format-bot/lib/labeler.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2017 AJ Jordan, AGPLv3+
-
-'use strict';
-
-const alexaLabels = ['top-100', 'top-1k', 'top-10k', 'top-100k', 'top-1m'];
-
-module.exports = function label(context, data, alexa) {
-  const alexaPosition = alexa.data.indexOf(data.domain);
-  const labels = [];
-
-  // TODO remove existing labels in case of edits
-
-  if (alexaPosition === -1) {
-    return;
-  } else if (alexaPosition < 100) {
-    labels.push('top-100');
-  } else if (alexaPosition < 1000) {
-    labels.push('top-1k');
-  } else if (alexaPosition < 10000) {
-    labels.push('top-10k');
-  } else if (alexaPosition < 100000) {
-    labels.push('top-100k');
-  } else if (alexaPosition < 1000000) {
-    labels.push('top-1m');
-  }
-
-  // Every Alexa label *except* our new one
-  const toRemove = alexaLabels.filter(label => label !== labels[0]);
-  toRemove.forEach(label => {
-    const removalParams = context.issue({name: label});
-    // This is racy with addLabels() but honestly who cares
-    context.github.issues.removeLabel(removalParams).catch(err => {
-      // GitHub returns 404 if the label doesn't exist on the issue, so we just swallow those errors
-      // XXX should we query labels and do a diff?
-      if (err.code === 404) return;
-
-      throw err;
-    });
-  });
-
-  const params = context.issue({labels});
-  return context.github.issues.addLabels(params);
-};
diff --git a/utils/issue-format-bot/lib/newissue.js b/utils/issue-format-bot/lib/newissue.js
deleted file mode 100644
index 7e57d69ed98a..000000000000
--- a/utils/issue-format-bot/lib/newissue.js
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2017 AJ Jordan, AGPLv3+
-
-'use strict';
-
-const parse = require('./parse'),
-  validate = require('./validate'),
-  labeler = require('./labeler'),
-  _ = require('lodash');
-
-module.exports = function(robot, alexa) {
-  return context => {
-    robot.log('Issue #' + context.payload.issue.number + ' created; responding.');
-
-    // Check if the "issue" is really a PR
-    // I can't really tell if GitHub will ever send us something like this, honestly... but bettter safe than sorry.
-    if (_.has(context.payload.issue, 'pull_request')) {
-      robot.log('Issue is a Pull Request; aborting.');
-      return;
-    }
-
-    const data = parse(context.payload.issue.body);
-
-    // Check if the data is problematic
-    if (data instanceof Error) {
-      // Dumb `switch` statement cases aren't technically blocks so saying `const params` in both of them causes redeclaration errors
-      let params;
-      switch (data.message) {
-      case 'invalid type':
-        params = context.issue({body: 'Hey there, I didn\'t understand the type of issue you specified. Please edit it and try again.'});
-        return context.github.issues.createComment(params);
-      case 'multiple types':
-        params = context.issue({body: 'Hello! You seem to have specified more than one type. Can you edit your issue and delete all but one of the types in your issue?'});
-        return context.github.issues.createComment(params);
-      case 'no type':
-        params = context.issue({body: 'Hey, I couldn\'t find the type of issue in your description. Can you edit your issue to add this (perhaps referring to the [issue template](https://github.com/EFForg/https-everywhere/blob/master/.github/ISSUE_TEMPLATE.md)?)'});
-        return context.github.issues.createComment(params);
-      case 'null description':
-        params = context.issue({body: 'Hi! I can\'t find any text in your description - please edit it to use the issue template.'});
-        return context.github.issues.createComment(params);
-      default:
-        throw data;
-      }
-    }
-
-    const problems = validate(data);
-
-    if (problems.length === 0) {
-      // User submission is OK
-
-      return labeler(context, data, alexa);
-    } else {
-      // Submit a comment telling them what the issues were
-      let comment = 'Thanks for your contribution to HTTPS Everywhere! ';
-      comment += 'Unfortunately, I wasn\'t able to understand your submission. ';
-      comment += 'Here are the problems I ran into:\n\n';
-      problems.forEach(problem => comment += ` * ${problem}\n`);
-      comment += '\nIf you edit your issue, I\'ll try again and report back if I have problems again.';
-      const params = context.issue({body: comment});
-      return context.github.issues.createComment(params);
-
-    }
-  };
-};
diff --git a/utils/issue-format-bot/lib/parse.js b/utils/issue-format-bot/lib/parse.js
deleted file mode 100644
index b4b52b157960..000000000000
--- a/utils/issue-format-bot/lib/parse.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2017 AJ Jordan, AGPLv3+
-
-// Takes in an issue body and parses it into key-value pairs, normalizes it, and returns an Object
-
-'use strict';
-
-const strip = require('strip-markdown'),
-  remark = require('remark'),
-  processor = remark().use(strip),
-  _ = require('lodash'),
-  domainFromPartialUrl = require('domain-from-partial-url'),
-  Entities = require('html-entities').AllHtmlEntities,
-  decode = (new Entities()).decode;
-
-// XXX should type validation be moved to the validator module?
-const validTypes = ['ruleset issue', 'new ruleset', 'code issue', 'feature request', 'other'];
-
-// XXX the Error API in this module is pretty funky and could use a better design
-
-module.exports = function parseDescription(body) {
-  const plaintext = String(processor.processSync(body)); // eslint-disable-line no-sync
-
-  // Check if there's no description at all
-  if (plaintext.trim().length === 0) return new Error('null description');
-
-  // Split by newlines, filter blanks, split into trimmed key-value and lowercase everything
-  const lines = plaintext.split('\n')
-    .filter(line => _.compact(line).length !== 0)
-    .map(line => line.split(':').map(key => key.trim()))
-    .map(line => [line[0].toLowerCase(), line[1]]);
-
-  const types = lines.filter(line => line[0] === 'type');
-
-  // XXX should we check for duplicates of *all* keys?
-  if (types.length === 0) return new Error('no type');
-  if (types.length > 1) return new Error('multiple types');
-
-  // `types` looks like [ [ 'Type', 'ruleset issue' ] ]
-  const type = types[0][1];
-
-  if (!validTypes.includes(type)) return new Error('invalid type');
-
-  // Convert to object
-  const normalized = _.fromPairs(lines);
-
-  // Markdown mangles full URLs into HTML entities
-  // (e.g. `http://example.com/` instead of
-  // `http://example.com/`). So we decode them again.
-  if (normalized.domain) normalized.domain = domainFromPartialUrl(decode(normalized.domain));
-
-  return normalized;
-};
diff --git a/utils/issue-format-bot/lib/validate.js b/utils/issue-format-bot/lib/validate.js
deleted file mode 100644
index 8806cdf9380c..000000000000
--- a/utils/issue-format-bot/lib/validate.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2017 AJ Jordan, AGPLv3+
-
-'use strict';
-
-module.exports = function validate(data) {
-  const problems = [];
-
-  // Validate that the user submitted all necessary data based on submission type
-  switch (data.type) {
-  case 'new ruleset':
-    if (!data.domain) problems.push('Submission is missing domain information');
-    break;
-  case 'ruleset issue':
-    if (!data.domain) problems.push('Submission is missing domain information');
-    break;
-  }
-
-  return problems;
-};
diff --git a/utils/issue-format-bot/package-lock.json b/utils/issue-format-bot/package-lock.json
deleted file mode 100644
index fab94f6ca930..000000000000
--- a/utils/issue-format-bot/package-lock.json
+++ /dev/null
@@ -1,5678 +0,0 @@
-{
-  "name": "issue-format-bot",
-  "version": "1.0.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "@sinonjs/formatio": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz",
-      "integrity": "sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==",
-      "dev": true,
-      "requires": {
-        "samsam": "1.3.0"
-      }
-    },
-    "accepts": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz",
-      "integrity": "sha1-hiRnWMfdbSGmR0/whKR0DsBesh8=",
-      "requires": {
-        "mime-types": "2.1.17",
-        "negotiator": "0.6.1"
-      }
-    },
-    "acorn": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.4.1.tgz",
-      "integrity": "sha512-XLmq3H/BVvW6/GbxKryGxWORz1ebilSsUDlyC27bXhWGWAZWkGwS6FLHjOlwFXNFoWFQEO/Df4u0YYd0K3BQgQ==",
-      "dev": true
-    },
-    "acorn-jsx": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
-      "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
-      "dev": true,
-      "requires": {
-        "acorn": "3.3.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
-          "dev": true
-        }
-      }
-    },
-    "agent-base": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.0.tgz",
-      "integrity": "sha512-c+R/U5X+2zz2+UCrCFv6odQzJdoqI+YecuhnAJLa1zYaMc13zPfwMwZrr91Pd1DYNo/yPRbiM4WVf9whgwFsIg==",
-      "requires": {
-        "es6-promisify": "5.0.0"
-      }
-    },
-    "ajv": {
-      "version": "5.5.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-      "requires": {
-        "co": "4.6.0",
-        "fast-deep-equal": "1.0.0",
-        "fast-json-stable-stringify": "2.0.0",
-        "json-schema-traverse": "0.3.1"
-      }
-    },
-    "ajv-keywords": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
-      "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=",
-      "dev": true
-    },
-    "align-text": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
-      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
-      "requires": {
-        "kind-of": "3.2.2",
-        "longest": "1.0.1",
-        "repeat-string": "1.6.1"
-      }
-    },
-    "amdefine": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
-    },
-    "ansi-escapes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz",
-      "integrity": "sha512-O/klc27mWNUigtv0F8NJWbLF00OcegQalkqKURWdosW08YZKi4m6CnSUSvIZG1otNJbTWhN01Hhz389DW7mvDQ==",
-      "dev": true
-    },
-    "ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-    },
-    "ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "dev": true
-    },
-    "ansicolors": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/ansicolors/-/ansicolors-0.2.1.tgz",
-      "integrity": "sha1-vgiVmQl7dKXJxKhKDNvNtivYeu8="
-    },
-    "ansistyles": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz",
-      "integrity": "sha1-XeYEFb2gcbs3EnhUyGT0GyMlRTk="
-    },
-    "argparse": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
-      "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
-      "requires": {
-        "sprintf-js": "1.0.3"
-      }
-    },
-    "array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
-    },
-    "array-iterate": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-iterate/-/array-iterate-1.1.1.tgz",
-      "integrity": "sha1-hlv3+K851rCYLGCQKRSsdrwBCPY="
-    },
-    "array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-      "dev": true,
-      "requires": {
-        "array-uniq": "1.0.3"
-      }
-    },
-    "array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true
-    },
-    "arrify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-      "dev": true
-    },
-    "asn1": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
-    },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-    },
-    "async": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
-      "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
-      "dev": true,
-      "requires": {
-        "lodash": "4.17.5"
-      }
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-    },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
-    },
-    "aws4": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
-    },
-    "babel-code-frame": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-      "dev": true,
-      "requires": {
-        "chalk": "1.1.3",
-        "esutils": "2.0.2",
-        "js-tokens": "3.0.2"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          }
-        }
-      }
-    },
-    "bail": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.1.tgz",
-      "integrity": "sha1-kSV53os5Gq3zxf30zSoPwiXfO8I="
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-    },
-    "base64url": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
-      "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs="
-    },
-    "basic-auth": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.0.tgz",
-      "integrity": "sha1-AV2z81PgLlY3d1X5YnQuiYHnu7o=",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
-    "bcrypt-pbkdf": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-      "optional": true,
-      "requires": {
-        "tweetnacl": "0.14.5"
-      }
-    },
-    "binary": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
-      "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=",
-      "requires": {
-        "buffers": "0.1.1",
-        "chainsaw": "0.1.0"
-      }
-    },
-    "bl": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
-      "integrity": "sha1-/cqHGplxOqANGeO7ukHER4emU5g=",
-      "requires": {
-        "readable-stream": "2.0.6"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.0.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-          "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "string_decoder": "0.10.31",
-            "util-deprecate": "1.0.2"
-          },
-          "dependencies": {
-            "process-nextick-args": {
-              "version": "1.0.7",
-              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-              "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
-            }
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
-        }
-      }
-    },
-    "body-parser": {
-      "version": "1.18.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz",
-      "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=",
-      "requires": {
-        "bytes": "3.0.0",
-        "content-type": "1.0.4",
-        "debug": "2.6.9",
-        "depd": "1.1.2",
-        "http-errors": "1.6.2",
-        "iconv-lite": "0.4.19",
-        "on-finished": "2.3.0",
-        "qs": "6.5.1",
-        "raw-body": "2.3.2",
-        "type-is": "1.6.15"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
-    "boom": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
-      "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
-      "requires": {
-        "hoek": "4.2.0"
-      }
-    },
-    "bottleneck": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/bottleneck/-/bottleneck-1.16.0.tgz",
-      "integrity": "sha1-1s4TgIUnr8gLaQkvFWBmVeWyHxo="
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "requires": {
-        "balanced-match": "1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "buffer-equal-constant-time": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-      "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
-    },
-    "buffers": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
-      "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s="
-    },
-    "builtin-modules": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8="
-    },
-    "bunyan": {
-      "version": "1.8.12",
-      "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz",
-      "integrity": "sha1-8VDw9nSKvdcq6uhPBEA74u8RN5c=",
-      "requires": {
-        "dtrace-provider": "0.8.6",
-        "moment": "2.20.1",
-        "mv": "2.1.1",
-        "safe-json-stringify": "1.0.4"
-      }
-    },
-    "bunyan-format": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/bunyan-format/-/bunyan-format-0.2.1.tgz",
-      "integrity": "sha1-pLOw2ABwqGUnlBcmnj8A/wL7y0c=",
-      "requires": {
-        "ansicolors": "0.2.1",
-        "ansistyles": "0.1.3",
-        "xtend": "2.1.2"
-      },
-      "dependencies": {
-        "object-keys": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
-          "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY="
-        },
-        "xtend": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
-          "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
-          "requires": {
-            "object-keys": "0.4.0"
-          }
-        }
-      }
-    },
-    "bunyan-sentry-stream": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/bunyan-sentry-stream/-/bunyan-sentry-stream-1.2.1.tgz",
-      "integrity": "sha1-/dn0L6dYefKiEFeb3CcS+Chc0Ss=",
-      "requires": {
-        "lodash.omit": "4.5.0"
-      }
-    },
-    "bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
-    },
-    "cache-manager": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/cache-manager/-/cache-manager-2.7.0.tgz",
-      "integrity": "sha1-hHeALQole+oNNrkkIKyJmORgsJ0=",
-      "requires": {
-        "async": "1.5.2",
-        "lru-cache": "4.0.0"
-      },
-      "dependencies": {
-        "async": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
-        },
-        "lru-cache": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.0.tgz",
-          "integrity": "sha1-tcvwFVbBaWb+vlTO7A+03JDfbCg=",
-          "requires": {
-            "pseudomap": "1.0.2",
-            "yallist": "2.1.2"
-          }
-        }
-      }
-    },
-    "caller-path": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
-      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
-      "dev": true,
-      "requires": {
-        "callsites": "0.2.0"
-      }
-    },
-    "callsites": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
-      "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
-      "dev": true
-    },
-    "camelcase": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-      "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-      "optional": true
-    },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
-    },
-    "ccount": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.1.tgz",
-      "integrity": "sha1-ZlaHlFFowhjsd/9hpBVa4AInqWw="
-    },
-    "center-align": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
-      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
-      "optional": true,
-      "requires": {
-        "align-text": "0.1.4",
-        "lazy-cache": "1.0.4"
-      }
-    },
-    "chainsaw": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
-      "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=",
-      "requires": {
-        "traverse": "0.3.9"
-      }
-    },
-    "chalk": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz",
-      "integrity": "sha512-QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "3.2.0",
-        "escape-string-regexp": "1.0.5",
-        "supports-color": "5.2.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-          "dev": true,
-          "requires": {
-            "color-convert": "1.9.1"
-          }
-        },
-        "supports-color": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.2.0.tgz",
-          "integrity": "sha512-F39vS48la4YvTZUPVeTqsjsFNrvcMwrV3RLZINsmHo+7djCvuUzSIeXOnZ5hmjef4bajL1dNccN+tg5XAliO5Q==",
-          "dev": true,
-          "requires": {
-            "has-flag": "3.0.0"
-          }
-        }
-      }
-    },
-    "character-entities": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.0.tgz",
-      "integrity": "sha1-poPiz3Xb6LFxljUxNk5Y4YobFV8="
-    },
-    "character-entities-html4": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.0.tgz",
-      "integrity": "sha1-GrCFUdPOH6HfCNAPucod77FHoGw="
-    },
-    "character-entities-legacy": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.0.tgz",
-      "integrity": "sha1-sYqtmPa3vMZGweTIH58ZVjdqVho="
-    },
-    "character-reference-invalid": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.0.tgz",
-      "integrity": "sha1-3smtHfufjQa0/NqircPE/ZevHmg="
-    },
-    "chardet": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
-      "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=",
-      "dev": true
-    },
-    "charenc": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
-      "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc="
-    },
-    "circular-json": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
-      "dev": true
-    },
-    "cli-cursor": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
-      "dev": true,
-      "requires": {
-        "restore-cursor": "2.0.0"
-      }
-    },
-    "cli-width": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
-      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
-      "dev": true
-    },
-    "cliui": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-      "requires": {
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1",
-        "wrap-ansi": "2.1.0"
-      }
-    },
-    "co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
-    },
-    "code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
-    },
-    "coffee-script": {
-      "version": "1.12.7",
-      "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz",
-      "integrity": "sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw=="
-    },
-    "collapse-white-space": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.3.tgz",
-      "integrity": "sha1-S5BvZw5aljqHt2sOFolkM0G2Ajw="
-    },
-    "color-convert": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",
-      "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
-      "dev": true,
-      "requires": {
-        "color-name": "1.1.3"
-      }
-    },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "combined-stream": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
-      "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
-      "requires": {
-        "delayed-stream": "1.0.0"
-      }
-    },
-    "commander": {
-      "version": "2.14.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz",
-      "integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw=="
-    },
-    "component-emitter": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-      "dev": true
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-    },
-    "concat-stream": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
-      "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.4",
-        "typedarray": "0.0.6"
-      }
-    },
-    "content-disposition": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
-      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
-    },
-    "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
-    },
-    "cookie": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
-    },
-    "cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
-    },
-    "cookiejar": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz",
-      "integrity": "sha1-Qa1XsbVVlR7BcUEqgZQrHoIA00o=",
-      "dev": true
-    },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-    },
-    "cross-spawn": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-      "dev": true,
-      "requires": {
-        "lru-cache": "4.1.1",
-        "shebang-command": "1.2.0",
-        "which": "1.3.0"
-      }
-    },
-    "crypt": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
-      "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs="
-    },
-    "cryptiles": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
-      "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
-      "requires": {
-        "boom": "5.2.0"
-      },
-      "dependencies": {
-        "boom": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
-          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
-          "requires": {
-            "hoek": "4.2.0"
-          }
-        }
-      }
-    },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "requires": {
-        "assert-plus": "1.0.0"
-      }
-    },
-    "debug": {
-      "version": "2.6.8",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-      "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
-      "requires": {
-        "ms": "2.0.0"
-      }
-    },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
-    },
-    "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-      "dev": true
-    },
-    "define-properties": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
-      "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
-      "dev": true,
-      "requires": {
-        "foreach": "2.0.5",
-        "object-keys": "1.0.11"
-      }
-    },
-    "del": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
-      "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
-      "dev": true,
-      "requires": {
-        "globby": "5.0.0",
-        "is-path-cwd": "1.0.0",
-        "is-path-in-cwd": "1.0.0",
-        "object-assign": "4.1.1",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1",
-        "rimraf": "2.6.1"
-      }
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
-    },
-    "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
-    },
-    "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
-    },
-    "diff": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz",
-      "integrity": "sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA==",
-      "dev": true
-    },
-    "doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dev": true,
-      "requires": {
-        "esutils": "2.0.2"
-      }
-    },
-    "domain-from-partial-url": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/domain-from-partial-url/-/domain-from-partial-url-1.0.0.tgz",
-      "integrity": "sha512-l3qOjBAqPnHxZZeH/H4Oege3y91p1RfePB7h6iEIrK4YIrVxKKfrQYdkpepUJ3Zx3tgRzdXy7RmRc/4knCZ49A==",
-      "requires": {
-        "perjury": "0.4.3"
-      },
-      "dependencies": {
-        "async": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
-          "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
-          "requires": {
-            "lodash": "4.17.5"
-          }
-        },
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
-        },
-        "perjury": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/perjury/-/perjury-0.4.3.tgz",
-          "integrity": "sha1-DX1rxAH7LtULWISudckYwmZtQEw=",
-          "requires": {
-            "async": "2.5.0",
-            "coffee-script": "1.12.7",
-            "debug": "2.6.8",
-            "lodash": "4.17.5",
-            "yargs": "5.0.0"
-          }
-        },
-        "which-module": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-          "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8="
-        },
-        "window-size": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz",
-          "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU="
-        },
-        "yargs": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz",
-          "integrity": "sha1-M1UUSXfQV1fbuG1uOOwFYSOzpm4=",
-          "requires": {
-            "cliui": "3.2.0",
-            "decamelize": "1.2.0",
-            "get-caller-file": "1.0.2",
-            "lodash.assign": "4.2.0",
-            "os-locale": "1.4.0",
-            "read-pkg-up": "1.0.1",
-            "require-directory": "2.1.1",
-            "require-main-filename": "1.0.1",
-            "set-blocking": "2.0.0",
-            "string-width": "1.0.2",
-            "which-module": "1.0.0",
-            "window-size": "0.2.0",
-            "y18n": "3.2.1",
-            "yargs-parser": "3.2.0"
-          }
-        },
-        "yargs-parser": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz",
-          "integrity": "sha1-UIE1XRnZ0MjF2BrakIy05tGGZk8=",
-          "requires": {
-            "camelcase": "3.0.0",
-            "lodash.assign": "4.2.0"
-          }
-        }
-      }
-    },
-    "dotenv": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-4.0.0.tgz",
-      "integrity": "sha1-hk7xN5rO1Vzm+V3r7NzhefegzR0="
-    },
-    "dtrace-provider": {
-      "version": "0.8.6",
-      "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.6.tgz",
-      "integrity": "sha1-QooiOv4DQl0s1tY0f99AxmkDVj0=",
-      "optional": true,
-      "requires": {
-        "nan": "2.8.0"
-      }
-    },
-    "ecc-jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-      "optional": true,
-      "requires": {
-        "jsbn": "0.1.1"
-      }
-    },
-    "ecdsa-sig-formatter": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
-      "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=",
-      "requires": {
-        "base64url": "2.0.0",
-        "safe-buffer": "5.1.1"
-      }
-    },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
-    },
-    "encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
-    },
-    "error-ex": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
-      "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
-      "requires": {
-        "is-arrayish": "0.2.1"
-      }
-    },
-    "es-abstract": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.7.0.tgz",
-      "integrity": "sha1-363ndOAb/Nl/lhgCmMRJyGI/uUw=",
-      "dev": true,
-      "requires": {
-        "es-to-primitive": "1.1.1",
-        "function-bind": "1.1.0",
-        "is-callable": "1.1.3",
-        "is-regex": "1.0.4"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
-      "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
-      "dev": true,
-      "requires": {
-        "is-callable": "1.1.3",
-        "is-date-object": "1.0.1",
-        "is-symbol": "1.0.1"
-      }
-    },
-    "es6-promise": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz",
-      "integrity": "sha512-/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ=="
-    },
-    "es6-promisify": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
-      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
-      "requires": {
-        "es6-promise": "4.2.4"
-      }
-    },
-    "escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
-    },
-    "eslint": {
-      "version": "4.17.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.17.0.tgz",
-      "integrity": "sha512-AyxBUCANU/o/xC0ijGMKavo5Ls3oK6xykiOITlMdjFjrKOsqLrA7Nf5cnrDgcKrHzBirclAZt63XO7YZlVUPwA==",
-      "dev": true,
-      "requires": {
-        "ajv": "5.5.2",
-        "babel-code-frame": "6.26.0",
-        "chalk": "2.3.1",
-        "concat-stream": "1.6.0",
-        "cross-spawn": "5.1.0",
-        "debug": "3.1.0",
-        "doctrine": "2.1.0",
-        "eslint-scope": "3.7.1",
-        "eslint-visitor-keys": "1.0.0",
-        "espree": "3.5.3",
-        "esquery": "1.0.0",
-        "esutils": "2.0.2",
-        "file-entry-cache": "2.0.0",
-        "functional-red-black-tree": "1.0.1",
-        "glob": "7.1.2",
-        "globals": "11.3.0",
-        "ignore": "3.3.7",
-        "imurmurhash": "0.1.4",
-        "inquirer": "3.3.0",
-        "is-resolvable": "1.1.0",
-        "js-yaml": "3.10.0",
-        "json-stable-stringify-without-jsonify": "1.0.1",
-        "levn": "0.3.0",
-        "lodash": "4.17.5",
-        "minimatch": "3.0.4",
-        "mkdirp": "0.5.1",
-        "natural-compare": "1.4.0",
-        "optionator": "0.8.2",
-        "path-is-inside": "1.0.2",
-        "pluralize": "7.0.0",
-        "progress": "2.0.0",
-        "require-uncached": "1.0.3",
-        "semver": "5.5.0",
-        "strip-ansi": "4.0.0",
-        "strip-json-comments": "2.0.1",
-        "table": "4.0.2",
-        "text-table": "0.2.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "3.0.0"
-          }
-        }
-      }
-    },
-    "eslint-scope": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz",
-      "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
-      "dev": true,
-      "requires": {
-        "esrecurse": "4.2.0",
-        "estraverse": "4.2.0"
-      }
-    },
-    "eslint-visitor-keys": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
-      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==",
-      "dev": true
-    },
-    "espree": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.3.tgz",
-      "integrity": "sha512-Zy3tAJDORxQZLl2baguiRU1syPERAIg0L+JB2MWorORgTu/CplzvxS9WWA7Xh4+Q+eOQihNs/1o1Xep8cvCxWQ==",
-      "dev": true,
-      "requires": {
-        "acorn": "5.4.1",
-        "acorn-jsx": "3.0.1"
-      }
-    },
-    "esprima": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-      "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw=="
-    },
-    "esquery": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz",
-      "integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=",
-      "dev": true,
-      "requires": {
-        "estraverse": "4.2.0"
-      }
-    },
-    "esrecurse": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz",
-      "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=",
-      "dev": true,
-      "requires": {
-        "estraverse": "4.2.0",
-        "object-assign": "4.1.1"
-      }
-    },
-    "estraverse": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-      "dev": true
-    },
-    "esutils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
-      "dev": true
-    },
-    "etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
-    },
-    "eventsource": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.5.tgz",
-      "integrity": "sha512-IzjLaND9GBK3+fBPhmvG/Yq3FhSDGHnucJCDWhNsneLlN+HX5jeaSpl3Folr2PipGmyUsd/T2Vrua+s6I2aTgQ==",
-      "dev": true,
-      "requires": {
-        "original": "1.0.0"
-      }
-    },
-    "execa": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-      "dev": true,
-      "requires": {
-        "cross-spawn": "5.1.0",
-        "get-stream": "3.0.0",
-        "is-stream": "1.1.0",
-        "npm-run-path": "2.0.2",
-        "p-finally": "1.0.0",
-        "signal-exit": "3.0.2",
-        "strip-eof": "1.0.0"
-      }
-    },
-    "expect": {
-      "version": "1.20.2",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-1.20.2.tgz",
-      "integrity": "sha1-1Fj+TFYAQDa64yMkFqP2Nh8E+WU=",
-      "dev": true,
-      "requires": {
-        "define-properties": "1.1.2",
-        "has": "1.0.1",
-        "is-equal": "1.5.5",
-        "is-regex": "1.0.4",
-        "object-inspect": "1.2.2",
-        "object-keys": "1.0.11",
-        "tmatch": "2.0.1"
-      }
-    },
-    "express": {
-      "version": "4.16.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.16.2.tgz",
-      "integrity": "sha1-41xt/i1kt9ygpc1PIXgb4ymeB2w=",
-      "requires": {
-        "accepts": "1.3.4",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.18.2",
-        "content-disposition": "0.5.2",
-        "content-type": "1.0.4",
-        "cookie": "0.3.1",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "1.1.2",
-        "encodeurl": "1.0.2",
-        "escape-html": "1.0.3",
-        "etag": "1.8.1",
-        "finalhandler": "1.1.0",
-        "fresh": "0.5.2",
-        "merge-descriptors": "1.0.1",
-        "methods": "1.1.2",
-        "on-finished": "2.3.0",
-        "parseurl": "1.3.2",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "2.0.2",
-        "qs": "6.5.1",
-        "range-parser": "1.2.0",
-        "safe-buffer": "5.1.1",
-        "send": "0.16.1",
-        "serve-static": "1.13.1",
-        "setprototypeof": "1.1.0",
-        "statuses": "1.3.1",
-        "type-is": "1.6.15",
-        "utils-merge": "1.0.1",
-        "vary": "1.1.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
-    "express-async-errors": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/express-async-errors/-/express-async-errors-2.1.0.tgz",
-      "integrity": "sha512-l32SdF88BOZ3+kpQYERtL9mMHZNFI5flBp+qJeGT6Jt+bz2Ch6qhqQsc1QPTvup9u0+5KmcOjZuBxLROLt49Vg==",
-      "requires": {
-        "express": "4.16.2"
-      }
-    },
-    "extend": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
-    },
-    "external-editor": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.1.0.tgz",
-      "integrity": "sha512-E44iT5QVOUJBKij4IIV3uvxuNlbKS38Tw1HiupxEIHPv9qtC2PrDYohbXV5U+1jnfIXttny8gUhj+oZvflFlzA==",
-      "dev": true,
-      "requires": {
-        "chardet": "0.4.2",
-        "iconv-lite": "0.4.19",
-        "tmp": "0.0.33"
-      }
-    },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
-    },
-    "fast-deep-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
-      "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8="
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
-    },
-    "figures": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
-      "dev": true,
-      "requires": {
-        "escape-string-regexp": "1.0.5"
-      }
-    },
-    "file-entry-cache": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
-      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
-      "dev": true,
-      "requires": {
-        "flat-cache": "1.3.0",
-        "object-assign": "4.1.1"
-      }
-    },
-    "finalhandler": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
-      "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
-      "requires": {
-        "debug": "2.6.9",
-        "encodeurl": "1.0.2",
-        "escape-html": "1.0.3",
-        "on-finished": "2.3.0",
-        "parseurl": "1.3.2",
-        "statuses": "1.3.1",
-        "unpipe": "1.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
-    "find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-      "requires": {
-        "locate-path": "2.0.0"
-      }
-    },
-    "flat-cache": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
-      "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
-      "dev": true,
-      "requires": {
-        "circular-json": "0.3.3",
-        "del": "2.2.2",
-        "graceful-fs": "4.1.11",
-        "write": "0.2.1"
-      }
-    },
-    "follow-redirects": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.6.tgz",
-      "integrity": "sha512-FrMqZ/FONtHnbqO651UPpfRUVukIEwJhXMfdr/JWAmrDbeYBu773b1J6gdWDyRIj4hvvzQEHoEOTrdR8o6KLYA==",
-      "requires": {
-        "debug": "3.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
-    "foreach": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
-      "dev": true
-    },
-    "foreachasync": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz",
-      "integrity": "sha1-VQKYfchxS+M5IJfzLgBxyd7gfPY="
-    },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
-    },
-    "form-data": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
-      "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
-      "requires": {
-        "asynckit": "0.4.0",
-        "combined-stream": "1.0.6",
-        "mime-types": "2.1.17"
-      }
-    },
-    "formidable": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz",
-      "integrity": "sha1-lriIb3w8NQi5Mta9cMTTqI818ak=",
-      "dev": true
-    },
-    "forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
-    },
-    "fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-    },
-    "fstream": {
-      "version": "0.1.31",
-      "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
-      "integrity": "sha1-czfwWPu7vvqMn1YaKMqwhJICyYg=",
-      "requires": {
-        "graceful-fs": "3.0.11",
-        "inherits": "2.0.3",
-        "mkdirp": "0.5.1",
-        "rimraf": "2.6.1"
-      },
-      "dependencies": {
-        "graceful-fs": {
-          "version": "3.0.11",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz",
-          "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=",
-          "requires": {
-            "natives": "1.1.0"
-          }
-        }
-      }
-    },
-    "function-bind": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz",
-      "integrity": "sha1-FhdnFMgBeY5Ojyz391KUZ7tKV3E="
-    },
-    "functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
-    },
-    "get-caller-file": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz",
-      "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U="
-    },
-    "get-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-      "dev": true
-    },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "requires": {
-        "assert-plus": "1.0.0"
-      }
-    },
-    "github": {
-      "version": "12.1.0",
-      "resolved": "https://registry.npmjs.org/github/-/github-12.1.0.tgz",
-      "integrity": "sha512-HhWjhd/OATC4Hjj7xfGjGRtwWzo/fzTc55EkvsRatI9G6Vp47mVcdBIt1lQ56A9Qit/yVQRX1+M9jbWlcJvgug==",
-      "requires": {
-        "dotenv": "4.0.0",
-        "follow-redirects": "1.2.6",
-        "https-proxy-agent": "2.1.1",
-        "lodash": "4.17.5",
-        "mime": "2.2.0",
-        "netrc": "0.1.4"
-      },
-      "dependencies": {
-        "mime": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.2.0.tgz",
-          "integrity": "sha512-0Qz9uF1ATtl8RKJG4VRfOymh7PyEor6NbrI/61lRfuRe4vx9SNATrvAeTj2EWVRKjEQGskrzWkJBBY5NbaVHIA=="
-        }
-      }
-    },
-    "github-webhook-handler": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/github-webhook-handler/-/github-webhook-handler-0.7.1.tgz",
-      "integrity": "sha512-MbNHzZ4CjMOIzhR2PN0G54nANYcgHZNcpDADIOj2xSEzwyKx7N+Rg6fhBHfSnw1Sw3/xLhr2ufZjLXGcHqHcvg==",
-      "requires": {
-        "bl": "1.1.2",
-        "buffer-equal-constant-time": "1.0.1"
-      }
-    },
-    "glob": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
-      "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=",
-      "requires": {
-        "fs.realpath": "1.0.0",
-        "inflight": "1.0.6",
-        "inherits": "2.0.3",
-        "minimatch": "3.0.4",
-        "once": "1.4.0",
-        "path-is-absolute": "1.0.1"
-      }
-    },
-    "globals": {
-      "version": "11.3.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.3.0.tgz",
-      "integrity": "sha512-kkpcKNlmQan9Z5ZmgqKH/SMbSmjxQ7QjyNqfXVc8VJcoBV2UEg+sxQD15GQofGRh2hfpwUb70VC31DR7Rq5Hdw==",
-      "dev": true
-    },
-    "globby": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
-      "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
-      "dev": true,
-      "requires": {
-        "array-union": "1.0.2",
-        "arrify": "1.0.1",
-        "glob": "7.1.1",
-        "object-assign": "4.1.1",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
-      }
-    },
-    "graceful-fs": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
-    },
-    "handlebars": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.5.tgz",
-      "integrity": "sha1-ksbta7FkEQxQ1NjQ+93HCAbG+Oc=",
-      "requires": {
-        "async": "1.5.2",
-        "optimist": "0.6.1",
-        "source-map": "0.4.4",
-        "uglify-js": "2.8.29"
-      },
-      "dependencies": {
-        "async": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
-        }
-      }
-    },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
-    },
-    "har-validator": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
-      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
-      "requires": {
-        "ajv": "5.5.2",
-        "har-schema": "2.0.0"
-      }
-    },
-    "has": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
-      "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
-      "requires": {
-        "function-bind": "1.1.0"
-      }
-    },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "2.1.1"
-      }
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true
-    },
-    "hawk": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
-      "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
-      "requires": {
-        "boom": "4.3.1",
-        "cryptiles": "3.1.2",
-        "hoek": "4.2.0",
-        "sntp": "2.1.0"
-      }
-    },
-    "hbs": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/hbs/-/hbs-4.0.1.tgz",
-      "integrity": "sha1-S/2YZQ3IydrESzyprfnAmOi8M7Y=",
-      "requires": {
-        "handlebars": "4.0.5",
-        "walk": "2.3.9"
-      }
-    },
-    "hoek": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
-      "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ=="
-    },
-    "hosted-git-info": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
-      "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg=="
-    },
-    "html-entities": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
-      "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8="
-    },
-    "http-errors": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
-      "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
-      "requires": {
-        "depd": "1.1.1",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.0.3",
-        "statuses": "1.3.1"
-      },
-      "dependencies": {
-        "depd": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
-          "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k="
-        },
-        "setprototypeof": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
-          "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ="
-        }
-      }
-    },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "requires": {
-        "assert-plus": "1.0.0",
-        "jsprim": "1.4.1",
-        "sshpk": "1.13.1"
-      }
-    },
-    "https-proxy-agent": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.1.tgz",
-      "integrity": "sha512-LK6tQUR/VOkTI6ygAfWUKKP95I+e6M1h7N3PncGu1CATHCnex+CAv9ttR0lbHu1Uk2PXm/WoAHFo6JCGwMjVMw==",
-      "requires": {
-        "agent-base": "4.2.0",
-        "debug": "3.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
-    "iconv-lite": {
-      "version": "0.4.19",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-      "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
-    },
-    "ignore": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz",
-      "integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==",
-      "dev": true
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "requires": {
-        "once": "1.4.0",
-        "wrappy": "1.0.2"
-      }
-    },
-    "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-    },
-    "inquirer": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
-      "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
-      "dev": true,
-      "requires": {
-        "ansi-escapes": "3.0.0",
-        "chalk": "2.3.1",
-        "cli-cursor": "2.1.0",
-        "cli-width": "2.2.0",
-        "external-editor": "2.1.0",
-        "figures": "2.0.0",
-        "lodash": "4.17.5",
-        "mute-stream": "0.0.7",
-        "run-async": "2.3.0",
-        "rx-lite": "4.0.8",
-        "rx-lite-aggregates": "4.0.8",
-        "string-width": "2.1.1",
-        "strip-ansi": "4.0.0",
-        "through": "2.3.8"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "3.0.0"
-          }
-        }
-      }
-    },
-    "invert-kv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
-    },
-    "ipaddr.js": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz",
-      "integrity": "sha1-1LUFvemUaYfM8PxY2QEP+WB+P6A="
-    },
-    "is-alphabetical": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.0.tgz",
-      "integrity": "sha1-4lRMEwWCVfIUTLdXBmzTNCocjEY="
-    },
-    "is-alphanumeric": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz",
-      "integrity": "sha1-Spzvcdr0wAHB2B1j0UDPU/1oifQ="
-    },
-    "is-alphanumerical": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.0.tgz",
-      "integrity": "sha1-4GSS5xnBvxXewjnk8a9fZ7TW578=",
-      "requires": {
-        "is-alphabetical": "1.0.0",
-        "is-decimal": "1.0.0"
-      }
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
-    },
-    "is-arrow-function": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-arrow-function/-/is-arrow-function-2.0.3.tgz",
-      "integrity": "sha1-Kb4sLY2UUIUri7r7Y1unuNjofsI=",
-      "dev": true,
-      "requires": {
-        "is-callable": "1.1.3"
-      }
-    },
-    "is-boolean-object": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.0.0.tgz",
-      "integrity": "sha1-mPiygDBoQhmpXzdc+9iM40Bd/5M=",
-      "dev": true
-    },
-    "is-buffer": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz",
-      "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw="
-    },
-    "is-builtin-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
-      "requires": {
-        "builtin-modules": "1.1.1"
-      }
-    },
-    "is-callable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz",
-      "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=",
-      "dev": true
-    },
-    "is-date-object": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
-      "dev": true
-    },
-    "is-decimal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.0.tgz",
-      "integrity": "sha1-lAV5tupjxigICmnmK9qIyEcLT+A="
-    },
-    "is-equal": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/is-equal/-/is-equal-1.5.5.tgz",
-      "integrity": "sha1-XoXxlX4FKIMkf+s4aWWju6Ffuz0=",
-      "dev": true,
-      "requires": {
-        "has": "1.0.1",
-        "is-arrow-function": "2.0.3",
-        "is-boolean-object": "1.0.0",
-        "is-callable": "1.1.3",
-        "is-date-object": "1.0.1",
-        "is-generator-function": "1.0.6",
-        "is-number-object": "1.0.3",
-        "is-regex": "1.0.4",
-        "is-string": "1.0.4",
-        "is-symbol": "1.0.1",
-        "object.entries": "1.0.4"
-      }
-    },
-    "is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "requires": {
-        "number-is-nan": "1.0.1"
-      }
-    },
-    "is-generator-function": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.6.tgz",
-      "integrity": "sha1-nnFlPNFf/zQcecQVFGChMdMen8Q=",
-      "dev": true
-    },
-    "is-hexadecimal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.0.tgz",
-      "integrity": "sha1-XEWXcdKvmi45Ungf1U/LG8/kETw="
-    },
-    "is-number-object": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.3.tgz",
-      "integrity": "sha1-8mWrian0RQNO9q/xWo8AsA9VF5k=",
-      "dev": true
-    },
-    "is-path-cwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
-      "dev": true
-    },
-    "is-path-in-cwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
-      "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
-      "dev": true,
-      "requires": {
-        "is-path-inside": "1.0.1"
-      }
-    },
-    "is-path-inside": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
-      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
-      "dev": true,
-      "requires": {
-        "path-is-inside": "1.0.2"
-      }
-    },
-    "is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4="
-    },
-    "is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
-      "dev": true
-    },
-    "is-regex": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
-      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
-      "dev": true,
-      "requires": {
-        "has": "1.0.1"
-      }
-    },
-    "is-resolvable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
-      "dev": true
-    },
-    "is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-      "dev": true
-    },
-    "is-string": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.4.tgz",
-      "integrity": "sha1-zDqbaYV9Yh6WNyWiTK7shzuCbmQ=",
-      "dev": true
-    },
-    "is-symbol": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
-      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
-      "dev": true
-    },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-    },
-    "is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
-    },
-    "is-whitespace-character": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.0.tgz",
-      "integrity": "sha1-u/SoN2Tq0NRRvsKlUhjpGWGtwnU="
-    },
-    "is-word-character": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.0.tgz",
-      "integrity": "sha1-o6nl3a1wxcLuNvSpz8mlP0RTUkc="
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-    },
-    "js-tokens": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-      "dev": true
-    },
-    "js-yaml": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
-      "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
-      "requires": {
-        "argparse": "1.0.9",
-        "esprima": "4.0.0"
-      }
-    },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "optional": true
-    },
-    "json-parse-better-errors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz",
-      "integrity": "sha512-xyQpxeWWMKyJps9CuGJYeng6ssI5bpqS9ltQpdVQ90t4ql6NdnxFKh95JcRt2cun/DjMVNrdjniLPuMA69xmCw=="
-    },
-    "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
-    },
-    "json-schema-traverse": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
-    },
-    "json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "dev": true
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
-    },
-    "jsonwebtoken": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.1.1.tgz",
-      "integrity": "sha512-+ijVOtfLMlCII8LJkvabaKX3+8tGrGjiCTfzoed2D1b/ebKTO1hIYBQUJHbd9dJ9Fa4kH+dhYEd1qDwyzDLUUw==",
-      "requires": {
-        "jws": "3.1.4",
-        "lodash.includes": "4.3.0",
-        "lodash.isboolean": "3.0.3",
-        "lodash.isinteger": "4.0.4",
-        "lodash.isnumber": "3.0.3",
-        "lodash.isplainobject": "4.0.6",
-        "lodash.isstring": "4.0.1",
-        "lodash.once": "4.1.1",
-        "ms": "2.1.1",
-        "xtend": "4.0.1"
-      },
-      "dependencies": {
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
-        }
-      }
-    },
-    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
-    },
-    "just-extend": {
-      "version": "1.1.27",
-      "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-1.1.27.tgz",
-      "integrity": "sha512-mJVp13Ix6gFo3SBAy9U/kL+oeZqzlYYYLQBwXVBlVzIsZwBqGREnOro24oC/8s8aox+rJhtZ2DiQof++IrkA+g==",
-      "dev": true
-    },
-    "jwa": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz",
-      "integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=",
-      "requires": {
-        "base64url": "2.0.0",
-        "buffer-equal-constant-time": "1.0.1",
-        "ecdsa-sig-formatter": "1.0.9",
-        "safe-buffer": "5.1.1"
-      }
-    },
-    "jws": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz",
-      "integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=",
-      "requires": {
-        "base64url": "2.0.0",
-        "jwa": "1.1.5",
-        "safe-buffer": "5.1.1"
-      }
-    },
-    "kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "requires": {
-        "is-buffer": "1.1.5"
-      }
-    },
-    "lazy-cache": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
-      "optional": true
-    },
-    "lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "requires": {
-        "invert-kv": "1.0.0"
-      }
-    },
-    "levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "1.1.2",
-        "type-check": "0.3.2"
-      }
-    },
-    "load-json-file": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-      "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "parse-json": "4.0.0",
-        "pify": "3.0.0",
-        "strip-bom": "3.0.0"
-      },
-      "dependencies": {
-        "parse-json": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-          "requires": {
-            "error-ex": "1.3.1",
-            "json-parse-better-errors": "1.0.1"
-          }
-        },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
-        }
-      }
-    },
-    "locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "requires": {
-        "p-locate": "2.0.0",
-        "path-exists": "3.0.0"
-      }
-    },
-    "lodash": {
-      "version": "4.17.5",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz",
-      "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw=="
-    },
-    "lodash.assign": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
-      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc="
-    },
-    "lodash.get": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
-      "dev": true
-    },
-    "lodash.includes": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
-      "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8="
-    },
-    "lodash.isboolean": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
-      "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY="
-    },
-    "lodash.isinteger": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
-      "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M="
-    },
-    "lodash.isnumber": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
-      "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w="
-    },
-    "lodash.isplainobject": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
-    },
-    "lodash.isstring": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-      "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE="
-    },
-    "lodash.omit": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz",
-      "integrity": "sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA="
-    },
-    "lodash.once": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-      "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
-    },
-    "lolex": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz",
-      "integrity": "sha512-A5pN2tkFj7H0dGIAM6MFvHKMJcPnjZsOMvR7ujCjfgW5TbV6H9vb1PgxLtHvjqNZTHsUolz+6/WEO0N1xNx2ng==",
-      "dev": true
-    },
-    "longest": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
-      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc="
-    },
-    "longest-streak": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.1.tgz",
-      "integrity": "sha1-QtKRtUEeQDZcAOYxk0l+IkcxbjU="
-    },
-    "lru-cache": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
-      "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
-      "dev": true,
-      "requires": {
-        "pseudomap": "1.0.2",
-        "yallist": "2.1.2"
-      }
-    },
-    "markdown-escapes": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.0.tgz",
-      "integrity": "sha1-yMoZ8dlNaCRZ4Kk8htsnp+9xayM="
-    },
-    "markdown-table": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-1.1.0.tgz",
-      "integrity": "sha1-H1rmFlnO2ICNiCVUwy6LPzjdEUM="
-    },
-    "match-stream": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz",
-      "integrity": "sha1-mesFAJOzTf+t5CG5rAtBCpz6F88=",
-      "requires": {
-        "buffers": "0.1.1",
-        "readable-stream": "1.0.34"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
-        }
-      }
-    },
-    "md5": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz",
-      "integrity": "sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=",
-      "requires": {
-        "charenc": "0.0.2",
-        "crypt": "0.0.2",
-        "is-buffer": "1.1.5"
-      }
-    },
-    "mdast-util-compact": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-1.0.1.tgz",
-      "integrity": "sha1-zbX4TitqLTEU3zO9BdnLMuPECDo=",
-      "requires": {
-        "unist-util-modify-children": "1.1.1",
-        "unist-util-visit": "1.1.3"
-      }
-    },
-    "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
-    },
-    "mem": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
-      "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
-      "dev": true,
-      "requires": {
-        "mimic-fn": "1.2.0"
-      }
-    },
-    "merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
-    },
-    "methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
-    },
-    "mime": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
-    },
-    "mime-db": {
-      "version": "1.30.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
-      "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE="
-    },
-    "mime-types": {
-      "version": "2.1.17",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
-      "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
-      "requires": {
-        "mime-db": "1.30.0"
-      }
-    },
-    "mimic-fn": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
-      "dev": true
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "requires": {
-        "brace-expansion": "1.1.11"
-      }
-    },
-    "minimist": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
-    },
-    "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "requires": {
-        "minimist": "0.0.8"
-      }
-    },
-    "moment": {
-      "version": "2.20.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz",
-      "integrity": "sha512-Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg==",
-      "optional": true
-    },
-    "morgan": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.9.0.tgz",
-      "integrity": "sha1-0B+mxlhZt2/PMbPLU6OCGjEdgFE=",
-      "dev": true,
-      "requires": {
-        "basic-auth": "2.0.0",
-        "debug": "2.6.9",
-        "depd": "1.1.2",
-        "on-finished": "2.3.0",
-        "on-headers": "1.0.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "mute-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
-      "dev": true
-    },
-    "mv": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz",
-      "integrity": "sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=",
-      "optional": true,
-      "requires": {
-        "mkdirp": "0.5.1",
-        "ncp": "2.0.0",
-        "rimraf": "2.4.5"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "6.0.4",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
-          "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
-          "optional": true,
-          "requires": {
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
-          }
-        },
-        "rimraf": {
-          "version": "2.4.5",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
-          "integrity": "sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=",
-          "optional": true,
-          "requires": {
-            "glob": "6.0.4"
-          }
-        }
-      }
-    },
-    "nan": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz",
-      "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=",
-      "optional": true
-    },
-    "natives": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz",
-      "integrity": "sha1-6f+EFBimsux6SV6TmYT3jxY+bjE="
-    },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
-    },
-    "ncp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
-      "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=",
-      "optional": true
-    },
-    "negotiator": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
-      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
-    },
-    "netrc": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/netrc/-/netrc-0.1.4.tgz",
-      "integrity": "sha1-a+lPysqNd63gqWcNxGCRTJRHJEQ="
-    },
-    "nise": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/nise/-/nise-1.2.5.tgz",
-      "integrity": "sha512-Es4hGuq3lpip5PckrB+Qpuma282M0UJANJ+jxAgI+0wWTL9X6MtNv+M385JgqsAE8hv6NvD3lv8CQtXgEnvlpQ==",
-      "dev": true,
-      "requires": {
-        "@sinonjs/formatio": "2.0.0",
-        "just-extend": "1.1.27",
-        "lolex": "2.3.2",
-        "path-to-regexp": "1.7.0",
-        "text-encoding": "0.6.4"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "path-to-regexp": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
-          "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=",
-          "dev": true,
-          "requires": {
-            "isarray": "0.0.1"
-          }
-        }
-      }
-    },
-    "normalize-package-data": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
-      "requires": {
-        "hosted-git-info": "2.5.0",
-        "is-builtin-module": "1.0.0",
-        "semver": "5.5.0",
-        "validate-npm-package-license": "3.0.1"
-      }
-    },
-    "npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-      "dev": true,
-      "requires": {
-        "path-key": "2.0.1"
-      }
-    },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
-    },
-    "nyc": {
-      "version": "11.4.1",
-      "resolved": "https://registry.npmjs.org/nyc/-/nyc-11.4.1.tgz",
-      "integrity": "sha512-5eCZpvaksFVjP2rt1r60cfXmt3MUtsQDw8bAzNqNEr4WLvUMLgiVENMf/B9bE9YAX0mGVvaGA3v9IS9ekNqB1Q==",
-      "dev": true,
-      "requires": {
-        "archy": "1.0.0",
-        "arrify": "1.0.1",
-        "caching-transform": "1.0.1",
-        "convert-source-map": "1.5.1",
-        "debug-log": "1.0.1",
-        "default-require-extensions": "1.0.0",
-        "find-cache-dir": "0.1.1",
-        "find-up": "2.1.0",
-        "foreground-child": "1.5.6",
-        "glob": "7.1.2",
-        "istanbul-lib-coverage": "1.1.1",
-        "istanbul-lib-hook": "1.1.0",
-        "istanbul-lib-instrument": "1.9.1",
-        "istanbul-lib-report": "1.1.2",
-        "istanbul-lib-source-maps": "1.2.2",
-        "istanbul-reports": "1.1.3",
-        "md5-hex": "1.3.0",
-        "merge-source-map": "1.0.4",
-        "micromatch": "2.3.11",
-        "mkdirp": "0.5.1",
-        "resolve-from": "2.0.0",
-        "rimraf": "2.6.2",
-        "signal-exit": "3.0.2",
-        "spawn-wrap": "1.4.2",
-        "test-exclude": "4.1.1",
-        "yargs": "10.0.3",
-        "yargs-parser": "8.0.0"
-      },
-      "dependencies": {
-        "align-text": {
-          "version": "0.1.4",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "kind-of": "3.2.2",
-            "longest": "1.0.1",
-            "repeat-string": "1.6.1"
-          }
-        },
-        "amdefine": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "bundled": true,
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "bundled": true,
-          "dev": true
-        },
-        "append-transform": {
-          "version": "0.4.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "default-require-extensions": "1.0.0"
-          }
-        },
-        "archy": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "arr-diff": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "arr-flatten": "1.1.0"
-          }
-        },
-        "arr-flatten": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true
-        },
-        "array-unique": {
-          "version": "0.2.1",
-          "bundled": true,
-          "dev": true
-        },
-        "arrify": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "async": {
-          "version": "1.5.2",
-          "bundled": true,
-          "dev": true
-        },
-        "babel-code-frame": {
-          "version": "6.26.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "esutils": "2.0.2",
-            "js-tokens": "3.0.2"
-          }
-        },
-        "babel-generator": {
-          "version": "6.26.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "babel-messages": "6.23.0",
-            "babel-runtime": "6.26.0",
-            "babel-types": "6.26.0",
-            "detect-indent": "4.0.0",
-            "jsesc": "1.3.0",
-            "lodash": "4.17.4",
-            "source-map": "0.5.7",
-            "trim-right": "1.0.1"
-          }
-        },
-        "babel-messages": {
-          "version": "6.23.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "babel-runtime": "6.26.0"
-          }
-        },
-        "babel-runtime": {
-          "version": "6.26.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "core-js": "2.5.3",
-            "regenerator-runtime": "0.11.1"
-          }
-        },
-        "babel-template": {
-          "version": "6.26.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "babel-runtime": "6.26.0",
-            "babel-traverse": "6.26.0",
-            "babel-types": "6.26.0",
-            "babylon": "6.18.0",
-            "lodash": "4.17.4"
-          }
-        },
-        "babel-traverse": {
-          "version": "6.26.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "babel-code-frame": "6.26.0",
-            "babel-messages": "6.23.0",
-            "babel-runtime": "6.26.0",
-            "babel-types": "6.26.0",
-            "babylon": "6.18.0",
-            "debug": "2.6.9",
-            "globals": "9.18.0",
-            "invariant": "2.2.2",
-            "lodash": "4.17.4"
-          }
-        },
-        "babel-types": {
-          "version": "6.26.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "babel-runtime": "6.26.0",
-            "esutils": "2.0.2",
-            "lodash": "4.17.4",
-            "to-fast-properties": "1.0.3"
-          }
-        },
-        "babylon": {
-          "version": "6.18.0",
-          "bundled": true,
-          "dev": true
-        },
-        "balanced-match": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "brace-expansion": {
-          "version": "1.1.8",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "balanced-match": "1.0.0",
-            "concat-map": "0.0.1"
-          }
-        },
-        "braces": {
-          "version": "1.8.5",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "expand-range": "1.8.2",
-            "preserve": "0.2.0",
-            "repeat-element": "1.1.2"
-          }
-        },
-        "builtin-modules": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true
-        },
-        "caching-transform": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "md5-hex": "1.3.0",
-            "mkdirp": "0.5.1",
-            "write-file-atomic": "1.3.4"
-          }
-        },
-        "camelcase": {
-          "version": "1.2.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "center-align": {
-          "version": "0.1.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "align-text": "0.1.4",
-            "lazy-cache": "1.0.4"
-          }
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          }
-        },
-        "cliui": {
-          "version": "2.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "center-align": "0.1.3",
-            "right-align": "0.1.3",
-            "wordwrap": "0.0.2"
-          },
-          "dependencies": {
-            "wordwrap": {
-              "version": "0.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "code-point-at": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true
-        },
-        "commondir": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "convert-source-map": {
-          "version": "1.5.1",
-          "bundled": true,
-          "dev": true
-        },
-        "core-js": {
-          "version": "2.5.3",
-          "bundled": true,
-          "dev": true
-        },
-        "cross-spawn": {
-          "version": "4.0.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "lru-cache": "4.1.1",
-            "which": "1.3.0"
-          }
-        },
-        "debug": {
-          "version": "2.6.9",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "debug-log": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "decamelize": {
-          "version": "1.2.0",
-          "bundled": true,
-          "dev": true
-        },
-        "default-require-extensions": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "strip-bom": "2.0.0"
-          }
-        },
-        "detect-indent": {
-          "version": "4.0.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "repeating": "2.0.1"
-          }
-        },
-        "error-ex": {
-          "version": "1.3.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "is-arrayish": "0.2.1"
-          }
-        },
-        "escape-string-regexp": {
-          "version": "1.0.5",
-          "bundled": true,
-          "dev": true
-        },
-        "esutils": {
-          "version": "2.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "execa": {
-          "version": "0.7.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "cross-spawn": "5.1.0",
-            "get-stream": "3.0.0",
-            "is-stream": "1.1.0",
-            "npm-run-path": "2.0.2",
-            "p-finally": "1.0.0",
-            "signal-exit": "3.0.2",
-            "strip-eof": "1.0.0"
-          },
-          "dependencies": {
-            "cross-spawn": {
-              "version": "5.1.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "lru-cache": "4.1.1",
-                "shebang-command": "1.2.0",
-                "which": "1.3.0"
-              }
-            }
-          }
-        },
-        "expand-brackets": {
-          "version": "0.1.5",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "is-posix-bracket": "0.1.1"
-          }
-        },
-        "expand-range": {
-          "version": "1.8.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "fill-range": "2.2.3"
-          }
-        },
-        "extglob": {
-          "version": "0.3.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "is-extglob": "1.0.0"
-          }
-        },
-        "filename-regex": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "fill-range": {
-          "version": "2.2.3",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "is-number": "2.1.0",
-            "isobject": "2.1.0",
-            "randomatic": "1.1.7",
-            "repeat-element": "1.1.2",
-            "repeat-string": "1.6.1"
-          }
-        },
-        "find-cache-dir": {
-          "version": "0.1.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "commondir": "1.0.1",
-            "mkdirp": "0.5.1",
-            "pkg-dir": "1.0.0"
-          }
-        },
-        "find-up": {
-          "version": "2.1.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "locate-path": "2.0.0"
-          }
-        },
-        "for-in": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "for-own": {
-          "version": "0.1.5",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "for-in": "1.0.2"
-          }
-        },
-        "foreground-child": {
-          "version": "1.5.6",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "cross-spawn": "4.0.2",
-            "signal-exit": "3.0.2"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "get-caller-file": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "get-stream": {
-          "version": "3.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "glob": {
-          "version": "7.1.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
-          }
-        },
-        "glob-base": {
-          "version": "0.3.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "glob-parent": "2.0.0",
-            "is-glob": "2.0.1"
-          }
-        },
-        "glob-parent": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "is-glob": "2.0.1"
-          }
-        },
-        "globals": {
-          "version": "9.18.0",
-          "bundled": true,
-          "dev": true
-        },
-        "graceful-fs": {
-          "version": "4.1.11",
-          "bundled": true,
-          "dev": true
-        },
-        "handlebars": {
-          "version": "4.0.11",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "async": "1.5.2",
-            "optimist": "0.6.1",
-            "source-map": "0.4.4",
-            "uglify-js": "2.8.29"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.4.4",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "amdefine": "1.0.1"
-              }
-            }
-          }
-        },
-        "has-ansi": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "ansi-regex": "2.1.1"
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "hosted-git-info": {
-          "version": "2.5.0",
-          "bundled": true,
-          "dev": true
-        },
-        "imurmurhash": {
-          "version": "0.1.4",
-          "bundled": true,
-          "dev": true
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "once": "1.4.0",
-            "wrappy": "1.0.2"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "bundled": true,
-          "dev": true
-        },
-        "invariant": {
-          "version": "2.2.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "loose-envify": "1.3.1"
-          }
-        },
-        "invert-kv": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "is-arrayish": {
-          "version": "0.2.1",
-          "bundled": true,
-          "dev": true
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "bundled": true,
-          "dev": true
-        },
-        "is-builtin-module": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "builtin-modules": "1.1.1"
-          }
-        },
-        "is-dotfile": {
-          "version": "1.0.3",
-          "bundled": true,
-          "dev": true
-        },
-        "is-equal-shallow": {
-          "version": "0.1.3",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "is-primitive": "2.0.0"
-          }
-        },
-        "is-extendable": {
-          "version": "0.1.1",
-          "bundled": true,
-          "dev": true
-        },
-        "is-extglob": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "is-finite": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "number-is-nan": "1.0.1"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "number-is-nan": "1.0.1"
-          }
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "is-extglob": "1.0.0"
-          }
-        },
-        "is-number": {
-          "version": "2.1.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "kind-of": "3.2.2"
-          }
-        },
-        "is-posix-bracket": {
-          "version": "0.1.1",
-          "bundled": true,
-          "dev": true
-        },
-        "is-primitive": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "is-stream": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true
-        },
-        "is-utf8": {
-          "version": "0.2.1",
-          "bundled": true,
-          "dev": true
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "isexe": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "isobject": {
-          "version": "2.1.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "isarray": "1.0.0"
-          }
-        },
-        "istanbul-lib-coverage": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true
-        },
-        "istanbul-lib-hook": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "append-transform": "0.4.0"
-          }
-        },
-        "istanbul-lib-instrument": {
-          "version": "1.9.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "babel-generator": "6.26.0",
-            "babel-template": "6.26.0",
-            "babel-traverse": "6.26.0",
-            "babel-types": "6.26.0",
-            "babylon": "6.18.0",
-            "istanbul-lib-coverage": "1.1.1",
-            "semver": "5.4.1"
-          }
-        },
-        "istanbul-lib-report": {
-          "version": "1.1.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "istanbul-lib-coverage": "1.1.1",
-            "mkdirp": "0.5.1",
-            "path-parse": "1.0.5",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "3.2.3",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "has-flag": "1.0.0"
-              }
-            }
-          }
-        },
-        "istanbul-lib-source-maps": {
-          "version": "1.2.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "debug": "3.1.0",
-            "istanbul-lib-coverage": "1.1.1",
-            "mkdirp": "0.5.1",
-            "rimraf": "2.6.2",
-            "source-map": "0.5.7"
-          },
-          "dependencies": {
-            "debug": {
-              "version": "3.1.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "ms": "2.0.0"
-              }
-            }
-          }
-        },
-        "istanbul-reports": {
-          "version": "1.1.3",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "handlebars": "4.0.11"
-          }
-        },
-        "js-tokens": {
-          "version": "3.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "jsesc": {
-          "version": "1.3.0",
-          "bundled": true,
-          "dev": true
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "is-buffer": "1.1.6"
-          }
-        },
-        "lazy-cache": {
-          "version": "1.0.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "lcid": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "invert-kv": "1.0.0"
-          }
-        },
-        "load-json-file": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.1.11",
-            "parse-json": "2.2.0",
-            "pify": "2.3.0",
-            "pinkie-promise": "2.0.1",
-            "strip-bom": "2.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "p-locate": "2.0.0",
-            "path-exists": "3.0.0"
-          },
-          "dependencies": {
-            "path-exists": {
-              "version": "3.0.0",
-              "bundled": true,
-              "dev": true
-            }
-          }
-        },
-        "lodash": {
-          "version": "4.17.4",
-          "bundled": true,
-          "dev": true
-        },
-        "longest": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "loose-envify": {
-          "version": "1.3.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "js-tokens": "3.0.2"
-          }
-        },
-        "lru-cache": {
-          "version": "4.1.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "pseudomap": "1.0.2",
-            "yallist": "2.1.2"
-          }
-        },
-        "md5-hex": {
-          "version": "1.3.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "md5-o-matic": "0.1.1"
-          }
-        },
-        "md5-o-matic": {
-          "version": "0.1.1",
-          "bundled": true,
-          "dev": true
-        },
-        "mem": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "mimic-fn": "1.1.0"
-          }
-        },
-        "merge-source-map": {
-          "version": "1.0.4",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "source-map": "0.5.7"
-          }
-        },
-        "micromatch": {
-          "version": "2.3.11",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "arr-diff": "2.0.0",
-            "array-unique": "0.2.1",
-            "braces": "1.8.5",
-            "expand-brackets": "0.1.5",
-            "extglob": "0.3.2",
-            "filename-regex": "2.0.1",
-            "is-extglob": "1.0.0",
-            "is-glob": "2.0.1",
-            "kind-of": "3.2.2",
-            "normalize-path": "2.1.1",
-            "object.omit": "2.0.1",
-            "parse-glob": "3.0.4",
-            "regex-cache": "0.4.4"
-          }
-        },
-        "mimic-fn": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "brace-expansion": "1.1.8"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "bundled": true,
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "normalize-package-data": {
-          "version": "2.4.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "hosted-git-info": "2.5.0",
-            "is-builtin-module": "1.0.0",
-            "semver": "5.4.1",
-            "validate-npm-package-license": "3.0.1"
-          }
-        },
-        "normalize-path": {
-          "version": "2.1.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "remove-trailing-separator": "1.1.0"
-          }
-        },
-        "npm-run-path": {
-          "version": "2.0.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "path-key": "2.0.1"
-          }
-        },
-        "number-is-nan": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "bundled": true,
-          "dev": true
-        },
-        "object.omit": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "for-own": "0.1.5",
-            "is-extendable": "0.1.1"
-          }
-        },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "wrappy": "1.0.2"
-          }
-        },
-        "optimist": {
-          "version": "0.6.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "minimist": "0.0.8",
-            "wordwrap": "0.0.3"
-          }
-        },
-        "os-homedir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "os-locale": {
-          "version": "2.1.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "execa": "0.7.0",
-            "lcid": "1.0.0",
-            "mem": "1.1.0"
-          }
-        },
-        "p-finally": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "p-limit": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true
-        },
-        "p-locate": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "p-limit": "1.1.0"
-          }
-        },
-        "parse-glob": {
-          "version": "3.0.4",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "glob-base": "0.3.0",
-            "is-dotfile": "1.0.3",
-            "is-extglob": "1.0.0",
-            "is-glob": "2.0.1"
-          }
-        },
-        "parse-json": {
-          "version": "2.2.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "error-ex": "1.3.1"
-          }
-        },
-        "path-exists": {
-          "version": "2.1.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "pinkie-promise": "2.0.1"
-          }
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "path-key": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "path-parse": {
-          "version": "1.0.5",
-          "bundled": true,
-          "dev": true
-        },
-        "path-type": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.1.11",
-            "pify": "2.3.0",
-            "pinkie-promise": "2.0.1"
-          }
-        },
-        "pify": {
-          "version": "2.3.0",
-          "bundled": true,
-          "dev": true
-        },
-        "pinkie": {
-          "version": "2.0.4",
-          "bundled": true,
-          "dev": true
-        },
-        "pinkie-promise": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "pinkie": "2.0.4"
-          }
-        },
-        "pkg-dir": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "find-up": "1.1.2"
-          },
-          "dependencies": {
-            "find-up": {
-              "version": "1.1.2",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "path-exists": "2.1.0",
-                "pinkie-promise": "2.0.1"
-              }
-            }
-          }
-        },
-        "preserve": {
-          "version": "0.2.0",
-          "bundled": true,
-          "dev": true
-        },
-        "pseudomap": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "randomatic": {
-          "version": "1.1.7",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "is-number": "3.0.0",
-            "kind-of": "4.0.0"
-          },
-          "dependencies": {
-            "is-number": {
-              "version": "3.0.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "kind-of": "3.2.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "1.1.6"
-                  }
-                }
-              }
-            },
-            "kind-of": {
-              "version": "4.0.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "is-buffer": "1.1.6"
-              }
-            }
-          }
-        },
-        "read-pkg": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "load-json-file": "1.1.0",
-            "normalize-package-data": "2.4.0",
-            "path-type": "1.1.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "find-up": "1.1.2",
-            "read-pkg": "1.1.0"
-          },
-          "dependencies": {
-            "find-up": {
-              "version": "1.1.2",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "path-exists": "2.1.0",
-                "pinkie-promise": "2.0.1"
-              }
-            }
-          }
-        },
-        "regenerator-runtime": {
-          "version": "0.11.1",
-          "bundled": true,
-          "dev": true
-        },
-        "regex-cache": {
-          "version": "0.4.4",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "is-equal-shallow": "0.1.3"
-          }
-        },
-        "remove-trailing-separator": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true
-        },
-        "repeat-element": {
-          "version": "1.1.2",
-          "bundled": true,
-          "dev": true
-        },
-        "repeat-string": {
-          "version": "1.6.1",
-          "bundled": true,
-          "dev": true
-        },
-        "repeating": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "is-finite": "1.0.2"
-          }
-        },
-        "require-directory": {
-          "version": "2.1.1",
-          "bundled": true,
-          "dev": true
-        },
-        "require-main-filename": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "resolve-from": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "right-align": {
-          "version": "0.1.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "align-text": "0.1.4"
-          }
-        },
-        "rimraf": {
-          "version": "2.6.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "glob": "7.1.2"
-          }
-        },
-        "semver": {
-          "version": "5.4.1",
-          "bundled": true,
-          "dev": true
-        },
-        "set-blocking": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "shebang-command": {
-          "version": "1.2.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "shebang-regex": "1.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "signal-exit": {
-          "version": "3.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "slide": {
-          "version": "1.1.6",
-          "bundled": true,
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "bundled": true,
-          "dev": true
-        },
-        "spawn-wrap": {
-          "version": "1.4.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "foreground-child": "1.5.6",
-            "mkdirp": "0.5.1",
-            "os-homedir": "1.0.2",
-            "rimraf": "2.6.2",
-            "signal-exit": "3.0.2",
-            "which": "1.3.0"
-          }
-        },
-        "spdx-correct": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "spdx-license-ids": "1.2.2"
-          }
-        },
-        "spdx-expression-parse": {
-          "version": "1.0.4",
-          "bundled": true,
-          "dev": true
-        },
-        "spdx-license-ids": {
-          "version": "1.2.2",
-          "bundled": true,
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "3.0.0",
-              "bundled": true,
-              "dev": true
-            },
-            "is-fullwidth-code-point": {
-              "version": "2.0.0",
-              "bundled": true,
-              "dev": true
-            },
-            "strip-ansi": {
-              "version": "4.0.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "ansi-regex": "3.0.0"
-              }
-            }
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "ansi-regex": "2.1.1"
-          }
-        },
-        "strip-bom": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "is-utf8": "0.2.1"
-          }
-        },
-        "strip-eof": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "test-exclude": {
-          "version": "4.1.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "arrify": "1.0.1",
-            "micromatch": "2.3.11",
-            "object-assign": "4.1.1",
-            "read-pkg-up": "1.0.1",
-            "require-main-filename": "1.0.1"
-          }
-        },
-        "to-fast-properties": {
-          "version": "1.0.3",
-          "bundled": true,
-          "dev": true
-        },
-        "trim-right": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "uglify-js": {
-          "version": "2.8.29",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "source-map": "0.5.7",
-            "uglify-to-browserify": "1.0.2",
-            "yargs": "3.10.0"
-          },
-          "dependencies": {
-            "yargs": {
-              "version": "3.10.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "camelcase": "1.2.1",
-                "cliui": "2.1.0",
-                "decamelize": "1.2.0",
-                "window-size": "0.1.0"
-              }
-            }
-          }
-        },
-        "uglify-to-browserify": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "validate-npm-package-license": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "spdx-correct": "1.0.2",
-            "spdx-expression-parse": "1.0.4"
-          }
-        },
-        "which": {
-          "version": "1.3.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "isexe": "2.0.0"
-          }
-        },
-        "which-module": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "window-size": {
-          "version": "0.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "wordwrap": {
-          "version": "0.0.3",
-          "bundled": true,
-          "dev": true
-        },
-        "wrap-ansi": {
-          "version": "2.1.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1"
-          },
-          "dependencies": {
-            "string-width": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "code-point-at": "1.1.0",
-                "is-fullwidth-code-point": "1.0.0",
-                "strip-ansi": "3.0.1"
-              }
-            }
-          }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "write-file-atomic": {
-          "version": "1.3.4",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.1.11",
-            "imurmurhash": "0.1.4",
-            "slide": "1.1.6"
-          }
-        },
-        "y18n": {
-          "version": "3.2.1",
-          "bundled": true,
-          "dev": true
-        },
-        "yallist": {
-          "version": "2.1.2",
-          "bundled": true,
-          "dev": true
-        },
-        "yargs": {
-          "version": "10.0.3",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "cliui": "3.2.0",
-            "decamelize": "1.2.0",
-            "find-up": "2.1.0",
-            "get-caller-file": "1.0.2",
-            "os-locale": "2.1.0",
-            "require-directory": "2.1.1",
-            "require-main-filename": "1.0.1",
-            "set-blocking": "2.0.0",
-            "string-width": "2.1.1",
-            "which-module": "2.0.0",
-            "y18n": "3.2.1",
-            "yargs-parser": "8.0.0"
-          },
-          "dependencies": {
-            "cliui": {
-              "version": "3.2.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "string-width": "1.0.2",
-                "strip-ansi": "3.0.1",
-                "wrap-ansi": "2.1.0"
-              },
-              "dependencies": {
-                "string-width": {
-                  "version": "1.0.2",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "code-point-at": "1.1.0",
-                    "is-fullwidth-code-point": "1.0.0",
-                    "strip-ansi": "3.0.1"
-                  }
-                }
-              }
-            }
-          }
-        },
-        "yargs-parser": {
-          "version": "8.0.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "camelcase": "4.1.0"
-          },
-          "dependencies": {
-            "camelcase": {
-              "version": "4.1.0",
-              "bundled": true,
-              "dev": true
-            }
-          }
-        }
-      }
-    },
-    "oauth-sign": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true
-    },
-    "object-inspect": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.2.2.tgz",
-      "integrity": "sha1-yCEV5PzIiK6hTWTCLk8X9qcNXlo=",
-      "dev": true
-    },
-    "object-keys": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
-      "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=",
-      "dev": true
-    },
-    "object.entries": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.0.4.tgz",
-      "integrity": "sha1-G/mk3SKI9bM/Opk9JXZh8F0WGl8=",
-      "dev": true,
-      "requires": {
-        "define-properties": "1.1.2",
-        "es-abstract": "1.7.0",
-        "function-bind": "1.1.0",
-        "has": "1.0.1"
-      }
-    },
-    "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "requires": {
-        "ee-first": "1.1.1"
-      }
-    },
-    "on-headers": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz",
-      "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=",
-      "dev": true
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "requires": {
-        "wrappy": "1.0.2"
-      }
-    },
-    "onetime": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-      "dev": true,
-      "requires": {
-        "mimic-fn": "1.2.0"
-      }
-    },
-    "optimist": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-      "requires": {
-        "minimist": "0.0.8",
-        "wordwrap": "0.0.3"
-      },
-      "dependencies": {
-        "wordwrap": {
-          "version": "0.0.3",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
-        }
-      }
-    },
-    "optionator": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
-      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
-      "dev": true,
-      "requires": {
-        "deep-is": "0.1.3",
-        "fast-levenshtein": "2.0.6",
-        "levn": "0.3.0",
-        "prelude-ls": "1.1.2",
-        "type-check": "0.3.2",
-        "wordwrap": "1.0.0"
-      }
-    },
-    "original": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/original/-/original-1.0.0.tgz",
-      "integrity": "sha1-kUf5P6FpbQS+YeAb1QuurKZWvTs=",
-      "dev": true,
-      "requires": {
-        "url-parse": "1.0.5"
-      }
-    },
-    "os-locale": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-      "requires": {
-        "lcid": "1.0.0"
-      }
-    },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true
-    },
-    "over": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz",
-      "integrity": "sha1-8phS5w/X4l82DgE6jsRMgq7bVwg="
-    },
-    "p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true
-    },
-    "p-limit": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz",
-      "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
-      "requires": {
-        "p-try": "1.0.0"
-      }
-    },
-    "p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "requires": {
-        "p-limit": "1.2.0"
-      }
-    },
-    "p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
-    },
-    "parse-entities": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.1.tgz",
-      "integrity": "sha1-gRLYhHExnyerrk1klksSL+ThuJA=",
-      "requires": {
-        "character-entities": "1.2.0",
-        "character-entities-legacy": "1.1.0",
-        "character-reference-invalid": "1.1.0",
-        "is-alphanumerical": "1.0.0",
-        "is-decimal": "1.0.0",
-        "is-hexadecimal": "1.0.0"
-      }
-    },
-    "parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "requires": {
-        "error-ex": "1.3.1"
-      }
-    },
-    "parseurl": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
-      "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M="
-    },
-    "path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
-    },
-    "path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-      "dev": true
-    },
-    "path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-      "dev": true
-    },
-    "path-parse": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
-      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME="
-    },
-    "path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
-    },
-    "path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
-      }
-    },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
-    },
-    "perjury": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/perjury/-/perjury-1.1.1.tgz",
-      "integrity": "sha512-ajpb3Cf1tQtnLKNB1YDLCpo1zEWCV/JMlWBNOlxK1VNtLikhJkf/FCtA+wVaxtn2Js1Bi/wT+lFDFIZkFnbYNQ==",
-      "dev": true,
-      "requires": {
-        "async": "2.6.0",
-        "coffeescript": "1.12.7",
-        "debug": "3.1.0",
-        "lodash": "4.17.5",
-        "yargs": "11.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "cliui": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.0.0.tgz",
-          "integrity": "sha512-nY3W5Gu2racvdDk//ELReY+dHjb9PlIcVDFXP72nVIhq2Gy3LuVXYwJoPVudwQnv1shtohpgkdCKT2YaKY0CKw==",
-          "dev": true,
-          "requires": {
-            "string-width": "2.1.1",
-            "strip-ansi": "4.0.0",
-            "wrap-ansi": "2.1.0"
-          }
-        },
-        "coffeescript": {
-          "version": "1.12.7",
-          "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-1.12.7.tgz",
-          "integrity": "sha512-pLXHFxQMPklVoEekowk8b3erNynC+DVJzChxS/LCBBgR6/8AJkHivkm//zbowcfc7BTCAjryuhx6gPqPRfsFoA==",
-          "dev": true
-        },
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "os-locale": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
-          "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
-          "dev": true,
-          "requires": {
-            "execa": "0.7.0",
-            "lcid": "1.0.0",
-            "mem": "1.1.0"
-          }
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "3.0.0"
-          }
-        },
-        "yargs": {
-          "version": "11.0.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.0.0.tgz",
-          "integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==",
-          "dev": true,
-          "requires": {
-            "cliui": "4.0.0",
-            "decamelize": "1.2.0",
-            "find-up": "2.1.0",
-            "get-caller-file": "1.0.2",
-            "os-locale": "2.1.0",
-            "require-directory": "2.1.1",
-            "require-main-filename": "1.0.1",
-            "set-blocking": "2.0.0",
-            "string-width": "2.1.1",
-            "which-module": "2.0.0",
-            "y18n": "3.2.1",
-            "yargs-parser": "9.0.2"
-          }
-        }
-      }
-    },
-    "pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
-    },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
-    },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "requires": {
-        "pinkie": "2.0.4"
-      }
-    },
-    "pkg-conf": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-2.1.0.tgz",
-      "integrity": "sha1-ISZRTKbyq/69FoWW3xi6V4Z/AFg=",
-      "requires": {
-        "find-up": "2.1.0",
-        "load-json-file": "4.0.0"
-      }
-    },
-    "pluralize": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
-      "dev": true
-    },
-    "prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true
-    },
-    "probot": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/probot/-/probot-5.0.0.tgz",
-      "integrity": "sha512-/idAAkDJguZWoW2G5lgo9Q2632eG/2wjGcbauqpECAfv9Iyng7qDhfb94PjOYR4w86xE6gOineUJ07TQHIZwpA==",
-      "requires": {
-        "bottleneck": "1.16.0",
-        "bunyan": "1.8.12",
-        "bunyan-format": "0.2.1",
-        "bunyan-sentry-stream": "1.2.1",
-        "cache-manager": "2.7.0",
-        "commander": "2.14.1",
-        "dotenv": "4.0.0",
-        "express": "4.16.2",
-        "express-async-errors": "2.1.0",
-        "github": "12.1.0",
-        "github-webhook-handler": "0.7.1",
-        "hbs": "4.0.1",
-        "js-yaml": "3.10.0",
-        "jsonwebtoken": "8.1.1",
-        "pkg-conf": "2.1.0",
-        "promise-events": "0.1.4",
-        "raven": "2.4.1",
-        "resolve": "1.5.0",
-        "semver": "5.5.0"
-      }
-    },
-    "process-nextick-args": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-      "dev": true
-    },
-    "progress": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
-      "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=",
-      "dev": true
-    },
-    "promise-events": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/promise-events/-/promise-events-0.1.4.tgz",
-      "integrity": "sha1-PIj66X5EjaaPf88Z1O4wjW5DLVs="
-    },
-    "proxy-addr": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.2.tgz",
-      "integrity": "sha1-ZXFQT0e7mI7IGAJT+F3X4UlSvew=",
-      "requires": {
-        "forwarded": "0.1.2",
-        "ipaddr.js": "1.5.2"
-      }
-    },
-    "pseudomap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
-    },
-    "pullstream": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz",
-      "integrity": "sha1-1vs79a7Wl+gxFQ6xACwlo/iuExQ=",
-      "requires": {
-        "over": "0.0.5",
-        "readable-stream": "1.0.34",
-        "setimmediate": "1.0.5",
-        "slice-stream": "1.0.0"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
-        }
-      }
-    },
-    "punycode": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
-    },
-    "qs": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="
-    },
-    "querystringify": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-0.0.4.tgz",
-      "integrity": "sha1-DPf4T5Rj/wrlHExLFC2VvjdyTZw=",
-      "dev": true
-    },
-    "range-parser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
-      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4="
-    },
-    "raven": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/raven/-/raven-2.4.1.tgz",
-      "integrity": "sha512-LLLS8bOJC1q33qszBsLaEtEg7X8G8hYLGcKO4s6EifAce2BN6cTRdBXNvwVNv4kNk82YUZYrj53yEbL4kCmjjw==",
-      "requires": {
-        "cookie": "0.3.1",
-        "md5": "2.2.1",
-        "stack-trace": "0.0.9",
-        "timed-out": "4.0.1",
-        "uuid": "3.0.0"
-      },
-      "dependencies": {
-        "uuid": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz",
-          "integrity": "sha1-Zyj8BFnEUNeWqZwxg3VpvfZy1yg="
-        }
-      }
-    },
-    "raw-body": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
-      "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
-      "requires": {
-        "bytes": "3.0.0",
-        "http-errors": "1.6.2",
-        "iconv-lite": "0.4.19",
-        "unpipe": "1.0.0"
-      }
-    },
-    "read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-      "requires": {
-        "load-json-file": "1.1.0",
-        "normalize-package-data": "2.4.0",
-        "path-type": "1.1.0"
-      },
-      "dependencies": {
-        "load-json-file": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-          "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-          "requires": {
-            "graceful-fs": "4.1.11",
-            "parse-json": "2.2.0",
-            "pify": "2.3.0",
-            "pinkie-promise": "2.0.1",
-            "strip-bom": "2.0.0"
-          }
-        },
-        "strip-bom": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-          "requires": {
-            "is-utf8": "0.2.1"
-          }
-        }
-      }
-    },
-    "read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-      "requires": {
-        "find-up": "1.1.2",
-        "read-pkg": "1.1.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-          "requires": {
-            "path-exists": "2.1.0",
-            "pinkie-promise": "2.0.1"
-          }
-        },
-        "path-exists": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-          "requires": {
-            "pinkie-promise": "2.0.1"
-          }
-        }
-      }
-    },
-    "readable-stream": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.4.tgz",
-      "integrity": "sha512-vuYxeWYM+fde14+rajzqgeohAI7YoJcHE7kXDAc4Nk0EbuKnJfqtY9YtRkLo/tqkuF7MsBQRhPnPeyjYITp3ZQ==",
-      "dev": true,
-      "requires": {
-        "core-util-is": "1.0.2",
-        "inherits": "2.0.3",
-        "isarray": "1.0.0",
-        "process-nextick-args": "2.0.0",
-        "safe-buffer": "5.1.1",
-        "string_decoder": "1.0.3",
-        "util-deprecate": "1.0.2"
-      }
-    },
-    "remark": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/remark/-/remark-7.0.1.tgz",
-      "integrity": "sha1-pd5NrPq/D2CkmCbvJMR5gH+QS/s=",
-      "requires": {
-        "remark-parse": "3.0.1",
-        "remark-stringify": "3.0.1",
-        "unified": "6.1.5"
-      }
-    },
-    "remark-parse": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-3.0.1.tgz",
-      "integrity": "sha1-G5+EGkTY9PvyJGhQJlRZpOs1TIA=",
-      "requires": {
-        "collapse-white-space": "1.0.3",
-        "has": "1.0.1",
-        "is-alphabetical": "1.0.0",
-        "is-decimal": "1.0.0",
-        "is-whitespace-character": "1.0.0",
-        "is-word-character": "1.0.0",
-        "markdown-escapes": "1.0.0",
-        "parse-entities": "1.1.1",
-        "repeat-string": "1.6.1",
-        "state-toggle": "1.0.0",
-        "trim": "0.0.1",
-        "trim-trailing-lines": "1.1.0",
-        "unherit": "1.1.0",
-        "unist-util-remove-position": "1.1.1",
-        "vfile-location": "2.0.1",
-        "xtend": "4.0.1"
-      }
-    },
-    "remark-stringify": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-3.0.1.tgz",
-      "integrity": "sha1-eSQr6+CnUggbWAlRb6DAbt7Aac8=",
-      "requires": {
-        "ccount": "1.0.1",
-        "is-alphanumeric": "1.0.0",
-        "is-decimal": "1.0.0",
-        "is-whitespace-character": "1.0.0",
-        "longest-streak": "2.0.1",
-        "markdown-escapes": "1.0.0",
-        "markdown-table": "1.1.0",
-        "mdast-util-compact": "1.0.1",
-        "parse-entities": "1.1.1",
-        "repeat-string": "1.6.1",
-        "state-toggle": "1.0.0",
-        "stringify-entities": "1.3.1",
-        "unherit": "1.1.0",
-        "xtend": "4.0.1"
-      }
-    },
-    "repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
-    },
-    "replace-ext": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
-      "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs="
-    },
-    "request": {
-      "version": "2.83.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
-      "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
-      "requires": {
-        "aws-sign2": "0.7.0",
-        "aws4": "1.6.0",
-        "caseless": "0.12.0",
-        "combined-stream": "1.0.6",
-        "extend": "3.0.1",
-        "forever-agent": "0.6.1",
-        "form-data": "2.3.2",
-        "har-validator": "5.0.3",
-        "hawk": "6.0.2",
-        "http-signature": "1.2.0",
-        "is-typedarray": "1.0.0",
-        "isstream": "0.1.2",
-        "json-stringify-safe": "5.0.1",
-        "mime-types": "2.1.17",
-        "oauth-sign": "0.8.2",
-        "performance-now": "2.1.0",
-        "qs": "6.5.1",
-        "safe-buffer": "5.1.1",
-        "stringstream": "0.0.5",
-        "tough-cookie": "2.3.3",
-        "tunnel-agent": "0.6.0",
-        "uuid": "3.2.1"
-      }
-    },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
-    },
-    "require-main-filename": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
-    },
-    "require-uncached": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
-      "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
-      "dev": true,
-      "requires": {
-        "caller-path": "0.1.0",
-        "resolve-from": "1.0.1"
-      }
-    },
-    "requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
-      "dev": true
-    },
-    "resolve": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
-      "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
-      "requires": {
-        "path-parse": "1.0.5"
-      }
-    },
-    "resolve-from": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
-      "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
-      "dev": true
-    },
-    "restore-cursor": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
-      "dev": true,
-      "requires": {
-        "onetime": "2.0.1",
-        "signal-exit": "3.0.2"
-      }
-    },
-    "right-align": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
-      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
-      "optional": true,
-      "requires": {
-        "align-text": "0.1.4"
-      }
-    },
-    "rimraf": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
-      "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
-      "requires": {
-        "glob": "7.1.1"
-      }
-    },
-    "run-async": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
-      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
-      "dev": true,
-      "requires": {
-        "is-promise": "2.1.0"
-      }
-    },
-    "rx-lite": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
-      "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
-      "dev": true
-    },
-    "rx-lite-aggregates": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
-      "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
-      "dev": true,
-      "requires": {
-        "rx-lite": "4.0.8"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-    },
-    "safe-json-stringify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.4.tgz",
-      "integrity": "sha1-gaCY9Efku8P/MxKiQ1IbwGDvWRE=",
-      "optional": true
-    },
-    "samsam": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz",
-      "integrity": "sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg==",
-      "dev": true
-    },
-    "semver": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
-    },
-    "send": {
-      "version": "0.16.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.16.1.tgz",
-      "integrity": "sha512-ElCLJdJIKPk6ux/Hocwhk7NFHpI3pVm/IZOYWqUmoxcgeyM+MpxHHKhb8QmlJDX1pU6WrgaHBkVNm73Sv7uc2A==",
-      "requires": {
-        "debug": "2.6.9",
-        "depd": "1.1.2",
-        "destroy": "1.0.4",
-        "encodeurl": "1.0.2",
-        "escape-html": "1.0.3",
-        "etag": "1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "1.6.2",
-        "mime": "1.4.1",
-        "ms": "2.0.0",
-        "on-finished": "2.3.0",
-        "range-parser": "1.2.0",
-        "statuses": "1.3.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
-    "serve-static": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz",
-      "integrity": "sha512-hSMUZrsPa/I09VYFJwa627JJkNs0NrfL1Uzuup+GqHfToR2KcsXFymXSV90hoyw3M+msjFuQly+YzIH/q0MGlQ==",
-      "requires": {
-        "encodeurl": "1.0.2",
-        "escape-html": "1.0.3",
-        "parseurl": "1.3.2",
-        "send": "0.16.1"
-      }
-    },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
-    },
-    "setimmediate": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
-    },
-    "setprototypeof": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
-    },
-    "shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "dev": true,
-      "requires": {
-        "shebang-regex": "1.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-      "dev": true
-    },
-    "signal-exit": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-      "dev": true
-    },
-    "sinon": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-4.3.0.tgz",
-      "integrity": "sha512-pmf05hFgEZUS52AGJcsVjOjqAyJW2yo14cOwVYvzCyw7+inv06YXkLyW75WG6X6p951lzkoKh51L2sNbR9CDvw==",
-      "dev": true,
-      "requires": {
-        "@sinonjs/formatio": "2.0.0",
-        "diff": "3.4.0",
-        "lodash.get": "4.4.2",
-        "lolex": "2.3.2",
-        "nise": "1.2.5",
-        "supports-color": "5.2.0",
-        "type-detect": "4.0.8"
-      },
-      "dependencies": {
-        "supports-color": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.2.0.tgz",
-          "integrity": "sha512-F39vS48la4YvTZUPVeTqsjsFNrvcMwrV3RLZINsmHo+7djCvuUzSIeXOnZ5hmjef4bajL1dNccN+tg5XAliO5Q==",
-          "dev": true,
-          "requires": {
-            "has-flag": "3.0.0"
-          }
-        }
-      }
-    },
-    "slice-ansi": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
-      "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
-      "dev": true,
-      "requires": {
-        "is-fullwidth-code-point": "2.0.0"
-      },
-      "dependencies": {
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        }
-      }
-    },
-    "slice-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz",
-      "integrity": "sha1-WzO9ZvATsaf4ZGCwPUY97DmtPqA=",
-      "requires": {
-        "readable-stream": "1.0.34"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
-        }
-      }
-    },
-    "smee-client": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/smee-client/-/smee-client-1.0.1.tgz",
-      "integrity": "sha512-porkZGtw7sHPuS5w6LW5FX7JY3JQuR52Y1cZoXHMmCzz3JKlFPkFZ3db6sXU+5iTTvexcUZ3U/bGWOMZECev/w==",
-      "dev": true,
-      "requires": {
-        "commander": "2.14.1",
-        "eventsource": "1.0.5",
-        "morgan": "1.9.0",
-        "superagent": "3.8.2"
-      }
-    },
-    "sntp": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
-      "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
-      "requires": {
-        "hoek": "4.2.0"
-      }
-    },
-    "source-map": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-      "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-      "requires": {
-        "amdefine": "1.0.1"
-      }
-    },
-    "spdx-correct": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
-      "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
-      "requires": {
-        "spdx-license-ids": "1.2.2"
-      }
-    },
-    "spdx-expression-parse": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz",
-      "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw="
-    },
-    "spdx-license-ids": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz",
-      "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc="
-    },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
-    },
-    "sshpk": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
-      "requires": {
-        "asn1": "0.2.3",
-        "assert-plus": "1.0.0",
-        "bcrypt-pbkdf": "1.0.1",
-        "dashdash": "1.14.1",
-        "ecc-jsbn": "0.1.1",
-        "getpass": "0.1.7",
-        "jsbn": "0.1.1",
-        "tweetnacl": "0.14.5"
-      }
-    },
-    "stack-trace": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz",
-      "integrity": "sha1-qPbq7KkGdMMz58Q5U/J1tFFRBpU="
-    },
-    "state-toggle": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.0.tgz",
-      "integrity": "sha1-0g+aYWu08MO5i5GSLSW2QKorxCU="
-    },
-    "statuses": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-      "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4="
-    },
-    "string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "requires": {
-        "code-point-at": "1.1.0",
-        "is-fullwidth-code-point": "1.0.0",
-        "strip-ansi": "3.0.1"
-      }
-    },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
-    "stringify-entities": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.1.tgz",
-      "integrity": "sha1-sVDsLXKsTBtfMktR+2soyc3/BYw=",
-      "requires": {
-        "character-entities-html4": "1.1.0",
-        "character-entities-legacy": "1.1.0",
-        "is-alphanumerical": "1.0.0",
-        "is-hexadecimal": "1.0.0"
-      }
-    },
-    "stringstream": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
-    },
-    "strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "requires": {
-        "ansi-regex": "2.1.1"
-      }
-    },
-    "strip-eof": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
-      "dev": true
-    },
-    "strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-      "dev": true
-    },
-    "strip-markdown": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-markdown/-/strip-markdown-3.0.1.tgz",
-      "integrity": "sha512-fvTgE4bDtZoA/NDHldeAyMEbF7d5SLwi9qJAVSCF45zyQPW7d0lINPjrEvNGgQ8dgwJx1eAxvicK+IDiWohuig=="
-    },
-    "superagent": {
-      "version": "3.8.2",
-      "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.8.2.tgz",
-      "integrity": "sha512-gVH4QfYHcY3P0f/BZzavLreHW3T1v7hG9B+hpMQotGQqurOvhv87GcMCd6LWySmBuf+BDR44TQd0aISjVHLeNQ==",
-      "dev": true,
-      "requires": {
-        "component-emitter": "1.2.1",
-        "cookiejar": "2.1.1",
-        "debug": "3.1.0",
-        "extend": "3.0.1",
-        "form-data": "2.3.2",
-        "formidable": "1.1.1",
-        "methods": "1.1.2",
-        "mime": "1.4.1",
-        "qs": "6.5.1",
-        "readable-stream": "2.3.4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
-    "supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "dev": true
-    },
-    "table": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
-      "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
-      "dev": true,
-      "requires": {
-        "ajv": "5.5.2",
-        "ajv-keywords": "2.1.1",
-        "chalk": "2.3.1",
-        "lodash": "4.17.5",
-        "slice-ansi": "1.0.0",
-        "string-width": "2.1.1"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "3.0.0"
-          }
-        }
-      }
-    },
-    "text-encoding": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz",
-      "integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk=",
-      "dev": true
-    },
-    "text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-      "dev": true
-    },
-    "timed-out": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
-      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8="
-    },
-    "tmatch": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/tmatch/-/tmatch-2.0.1.tgz",
-      "integrity": "sha1-DFYkbzPzDaG409colauvFmYPOM8=",
-      "dev": true
-    },
-    "tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "dev": true,
-      "requires": {
-        "os-tmpdir": "1.0.2"
-      }
-    },
-    "tough-cookie": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
-      "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
-      "requires": {
-        "punycode": "1.4.1"
-      }
-    },
-    "traverse": {
-      "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
-      "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk="
-    },
-    "trim": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
-      "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0="
-    },
-    "trim-trailing-lines": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.0.tgz",
-      "integrity": "sha1-eu+7eAjfnWafbaLkOMrIxGradoQ="
-    },
-    "trough": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.0.tgz",
-      "integrity": "sha1-a97f5/KqSabzxDIldodVWVfzQv0="
-    },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "optional": true
-    },
-    "type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "1.1.2"
-      }
-    },
-    "type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true
-    },
-    "type-is": {
-      "version": "1.6.15",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz",
-      "integrity": "sha1-yrEPtJCeRByChC6v4a1kbIGARBA=",
-      "requires": {
-        "media-typer": "0.3.0",
-        "mime-types": "2.1.17"
-      }
-    },
-    "typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-      "dev": true
-    },
-    "uglify-js": {
-      "version": "2.8.29",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
-      "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
-      "optional": true,
-      "requires": {
-        "source-map": "0.5.7",
-        "uglify-to-browserify": "1.0.2",
-        "yargs": "3.10.0"
-      },
-      "dependencies": {
-        "cliui": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-          "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-          "optional": true,
-          "requires": {
-            "center-align": "0.1.3",
-            "right-align": "0.1.3",
-            "wordwrap": "0.0.2"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "optional": true
-        },
-        "window-size": {
-          "version": "0.1.0",
-          "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
-          "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
-          "optional": true
-        },
-        "wordwrap": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
-          "optional": true
-        },
-        "yargs": {
-          "version": "3.10.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
-          "optional": true,
-          "requires": {
-            "camelcase": "1.2.1",
-            "cliui": "2.1.0",
-            "decamelize": "1.2.0",
-            "window-size": "0.1.0"
-          }
-        }
-      }
-    },
-    "uglify-to-browserify": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
-      "optional": true
-    },
-    "unherit": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.0.tgz",
-      "integrity": "sha1-a5qu379z3xdWrZ4xbdmBiFhAzX0=",
-      "requires": {
-        "inherits": "2.0.3",
-        "xtend": "4.0.1"
-      }
-    },
-    "unified": {
-      "version": "6.1.5",
-      "resolved": "https://registry.npmjs.org/unified/-/unified-6.1.5.tgz",
-      "integrity": "sha1-cWk3hyYhpjE15iztLzrGoGPG+4c=",
-      "requires": {
-        "bail": "1.0.1",
-        "extend": "3.0.1",
-        "is-plain-obj": "1.1.0",
-        "trough": "1.0.0",
-        "vfile": "2.1.0",
-        "x-is-function": "1.0.4",
-        "x-is-string": "0.1.0"
-      }
-    },
-    "unist-util-modify-children": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-1.1.1.tgz",
-      "integrity": "sha1-ZtfmpEnm9nIguXarPLi166w55R0=",
-      "requires": {
-        "array-iterate": "1.1.1"
-      }
-    },
-    "unist-util-remove-position": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.1.tgz",
-      "integrity": "sha1-WoXBVV/BugwQG4ZwfRXlD6TIcbs=",
-      "requires": {
-        "unist-util-visit": "1.1.3"
-      }
-    },
-    "unist-util-stringify-position": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-1.1.1.tgz",
-      "integrity": "sha1-PMvcU2ee7W7PN3fdf14yKcG2qjw="
-    },
-    "unist-util-visit": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.1.3.tgz",
-      "integrity": "sha1-7CaOcxudJ3p5pbWqBkOZDkBdYAs="
-    },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
-    },
-    "unzip": {
-      "version": "0.1.11",
-      "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.11.tgz",
-      "integrity": "sha1-iXScY7BY19kNYZ+GuYqhU107l/A=",
-      "requires": {
-        "binary": "0.3.0",
-        "fstream": "0.1.31",
-        "match-stream": "0.0.2",
-        "pullstream": "0.4.1",
-        "readable-stream": "1.0.34",
-        "setimmediate": "1.0.5"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
-        }
-      }
-    },
-    "url-parse": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.0.5.tgz",
-      "integrity": "sha1-CFSGBCKv3P7+tsllxmLUgAFpkns=",
-      "dev": true,
-      "requires": {
-        "querystringify": "0.0.4",
-        "requires-port": "1.0.0"
-      }
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-    },
-    "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
-    },
-    "uuid": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
-      "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA=="
-    },
-    "validate-npm-package-license": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
-      "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
-      "requires": {
-        "spdx-correct": "1.0.2",
-        "spdx-expression-parse": "1.0.4"
-      }
-    },
-    "vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
-    },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "requires": {
-        "assert-plus": "1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "1.3.0"
-      }
-    },
-    "vfile": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-2.1.0.tgz",
-      "integrity": "sha1-086Lgl57jVO4lhZDQSczgZNvAr0=",
-      "requires": {
-        "is-buffer": "1.1.5",
-        "replace-ext": "1.0.0",
-        "unist-util-stringify-position": "1.1.1"
-      }
-    },
-    "vfile-location": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.1.tgz",
-      "integrity": "sha1-C/iBb3MrD4vZAqVv2kxiyOk13FI="
-    },
-    "walk": {
-      "version": "2.3.9",
-      "resolved": "https://registry.npmjs.org/walk/-/walk-2.3.9.tgz",
-      "integrity": "sha1-MbTbZnjyrgHDnqn7hyWpAx5Vins=",
-      "requires": {
-        "foreachasync": "3.0.0"
-      }
-    },
-    "which": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
-      "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
-      "dev": true,
-      "requires": {
-        "isexe": "2.0.0"
-      }
-    },
-    "which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "dev": true
-    },
-    "wordwrap": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-      "dev": true
-    },
-    "wrap-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-      "requires": {
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1"
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-    },
-    "write": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
-      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
-      "dev": true,
-      "requires": {
-        "mkdirp": "0.5.1"
-      }
-    },
-    "x-is-function": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/x-is-function/-/x-is-function-1.0.4.tgz",
-      "integrity": "sha1-XSlNw9Joy90GJYDgxd93o5HR+h4="
-    },
-    "x-is-string": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/x-is-string/-/x-is-string-0.1.0.tgz",
-      "integrity": "sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI="
-    },
-    "xtend": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
-    },
-    "y18n": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE="
-    },
-    "yallist": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
-    },
-    "yargs-parser": {
-      "version": "9.0.2",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz",
-      "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
-      "dev": true,
-      "requires": {
-        "camelcase": "4.1.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-          "dev": true
-        }
-      }
-    }
-  }
-}
diff --git a/utils/issue-format-bot/package.json b/utils/issue-format-bot/package.json
deleted file mode 100644
index b262eed2a885..000000000000
--- a/utils/issue-format-bot/package.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "name": "issue-format-bot",
-  "version": "1.0.0",
-  "description": "GitHub bot to parse ruleset issues",
-  "author": "AJ Jordan ",
-  "main": "index.js",
-  "license": "AGPL-3.0+",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/EFForg/HTTPS-Everywhere.git"
-  },
-  "scripts": {
-    "lint": "eslint index.js test lib",
-    "start": "probot run ./index.js",
-    "test": "npm run lint && nyc perjury test/*-test.js"
-  },
-  "bugs": {
-    "url": "https://github.com/EFForg/HTTPS-Everywhere/issues"
-  },
-  "homepage": "https://github.com/EFForg/HTTPS-Everywhere#readme",
-  "devDependencies": {
-    "eslint": "^4.17.0",
-    "expect": "^1.20.2",
-    "nyc": "^11.4.1",
-    "perjury": "^1.1.1",
-    "sinon": "^4.3.0",
-    "smee-client": "^1.0.1"
-  },
-  "engines": {
-    "node": ">= 7.7.0",
-    "npm": ">= 4.0.0"
-  },
-  "dependencies": {
-    "domain-from-partial-url": "^1.0.0",
-    "html-entities": "^1.2.1",
-    "lodash": "^4.17.5",
-    "probot": "^5.0.0",
-    "remark": "^7.0.1",
-    "request": "^2.83.0",
-    "strip-markdown": "^3.0.1",
-    "unzip": "^0.1.11"
-  }
-}
diff --git a/utils/issue-format-bot/test/.eslintrc b/utils/issue-format-bot/test/.eslintrc
deleted file mode 100644
index 5d02eba7e4da..000000000000
--- a/utils/issue-format-bot/test/.eslintrc
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "rules": {
-    "handle-callback-err": "off"
-  }
-}
diff --git a/utils/issue-format-bot/test/alexa-mock-test.js b/utils/issue-format-bot/test/alexa-mock-test.js
deleted file mode 100644
index 9d1647b98316..000000000000
--- a/utils/issue-format-bot/test/alexa-mock-test.js
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2017 AJ Jordan, AGPLv3+
-
-'use strict';
-
-const vows = require('perjury'),
-  assert = vows.assert;
-
-vows.describe('alexa mock array').addBatch({
-  'When we require the module': {
-    topic: function() {
-      return require('./mocks/alexa');
-    },
-    'it works': function(err) {
-      assert.ifError(err);
-    },
-    'it\'s an object with an array property': function(err, obj) {
-      assert.isObject(obj);
-      assert.isArray(obj.data);
-    },
-    'and we examine just the data property': {
-      topic: function(obj) {
-        return obj.data;
-      },
-      'its length is 1000': function(err, alexa) {
-        assert.equal(alexa.length, 1000);
-      },
-      'its 999th element has the right text': function(err, alexa) {
-        assert.equal(alexa[999], 'domain1000.com');
-      },
-      'its 1000th element is undefined': function(err, alexa) {
-        assert.isUndefined(alexa[1000]);
-      },
-      'and we get a nonexistant property': function(err, alexa) {
-        assert.isUndefined(alexa.foobar);
-      },
-      'and we assign a property': {
-        topic: function(alexa) {
-          alexa.someProp = 'Hello world!';
-          return alexa;
-        },
-        'it works': function(err) {
-          assert.ifError(err);
-        },
-        'the property is there': function(err, alexa) {
-          assert.equal(alexa.someProp, 'Hello world!');
-        }
-      },
-      'and we call Array#indexOf with a domain in the array': {
-        topic: function(alexa) {
-          return alexa.indexOf('domain1000.com');
-        },
-        'it works': function(err) {
-          assert.ifError(err);
-        },
-        'it returns the right position': function(err, index) {
-          assert.equal(index, 999);
-        }
-      },
-      'and we call Array#indexOf with a domain not in the array': {
-        topic: function(alexa) {
-          return alexa.indexOf('domain1000000000.com');
-        },
-        'it works': function(err) {
-          assert.ifError(err);
-        },
-        'it returns no match': function(err, index) {
-          assert.equal(index, -1);
-        }
-      },
-      'and we call Array#indexOf with something not a domain at all': {
-        topic: function(alexa) {
-          return alexa.indexOf('foobar!');
-        },
-        'it works': function(err) {
-          assert.ifError(err);
-        },
-        'it returns no match': function(err, index) {
-          assert.equal(index, -1);
-        }
-      }
-    }
-  }
-}).export(module);
diff --git a/utils/issue-format-bot/test/context-mock-test.js b/utils/issue-format-bot/test/context-mock-test.js
deleted file mode 100644
index 996cc7caf8ee..000000000000
--- a/utils/issue-format-bot/test/context-mock-test.js
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2017 AJ Jordan, AGPLv3+
-
-'use strict';
-
-const vows = require('perjury'),
-  assert = vows.assert,
-  _ = require('lodash');
-
-function assertProp(prop, asserter) {
-  return function(err, context) {
-    assert.isTrue(_.has(context, prop));
-    asserter(_.get(context, prop));
-  };
-}
-
-function assertSinonSpy(prop) {
-  return function(err, context) {
-    assert.isFunction(_.get(context, prop));
-    assert.isDefined(_.get(context, prop).called);
-  };
-}
-
-vows.describe('context mock object').addBatch({
-  'When we require the module': {
-    topic: function() {
-      return require('./mocks/context');
-    },
-    'it works': function(err) {
-      assert.ifError(err);
-    },
-    'it\'s an object': function(err, makeContext) {
-      assert.isObject(makeContext);
-    },
-    'it has an issue() factory function': function(err, makeContext) {
-      assert.isFunction(makeContext.issue);
-    },
-    // TODO test that issue numbers aren't the same
-    'and we call makeContext.issue()': {
-      topic: function(makeContext) {
-        return makeContext.issue('Hello world');
-      },
-      'it works': function(err) {
-        assert.ifError(err);
-      },
-      'it returns an object': function(err, context) {
-        assert.isObject(context);
-      },
-      'context.payload.issue is an object': assertProp('payload.issue', assert.isObject),
-      'context.payload.issue.number is a number': assertProp('payload.issue.number', assert.isNumber),
-      'context.payload.issue.body is a string': assertProp('payload.issue.body', assert.isString),
-      'context.github is an object': assertProp('github', assert.isObject),
-      'context.github.issues is an object': assertProp('github.issues', assert.isObject),
-      'context.github.issues.createComment is a Sinon spy': assertSinonSpy('github.issues.createComment'),
-      'context.github.issues.addLabels is a Sinon spy': assertSinonSpy('github.issues.addLabels'),
-      'context.github.issues.removeLabel returns a Promise': function(err, context) {
-        const promise = context.github.issues.removeLabel();
-        assert.isFunction(promise.then);
-      },
-      'context.github.issues.removeLabel is a Sinon spy': assertSinonSpy('github.issues.removeLabel'),
-      'context.issue is a Sinon spy': assertSinonSpy('issue'),
-      'and we call context.issue()': {
-        topic: function(context) {
-          return context.issue('Wheeee!');
-        },
-        'it returns whatever we passed': function(context, val) {
-          assert.equal(val, 'Wheeee!');
-        }
-      }
-    }
-  }
-}).export(module);
diff --git a/utils/issue-format-bot/test/issueedit-handler-test.js b/utils/issue-format-bot/test/issueedit-handler-test.js
deleted file mode 100644
index 688d2ae14526..000000000000
--- a/utils/issue-format-bot/test/issueedit-handler-test.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2017 AJ Jordan, AGPLv3+
-
-'use strict';
-
-const vows = require('perjury'),
-  handlerutil = require('./lib/handlerutil');
-
-// TODO make this test that the bot doesn't post >1 "you fixed it" comments
-
-vows.describe('issue edit handler').addBatch(
-  handlerutil.setup('../../lib/issueedit', {
-    'and we pass it the context of an issue edit with a null body': handlerutil.nullBody('don\'t see any text'),
-    'and we pass it the context of a issue edit with a bad type': handlerutil.badType('type of issue'),
-    'and we pass it the context of a issue edit with a type of "new ruleset" and a correct body': handlerutil.correctNewRuleset('Type: new ruleset\nDomain: domain10.com', 'take it from here', 'take it from here'),
-    'and we pass it the context of a issue edit with a type of "new ruleset" and a problematic body': handlerutil.problematicNewRuleset('missing domain information'),
-    'and we pass it the context of a new issue with multiple types': handlerutil.multipleTypes('more than one type'),
-    'and we pass it the context of a new issue with no type': handlerutil.noType('see the type of issue')
-  })
-
-).export(module);
diff --git a/utils/issue-format-bot/test/labeler-test.js b/utils/issue-format-bot/test/labeler-test.js
deleted file mode 100644
index 5f494f517d14..000000000000
--- a/utils/issue-format-bot/test/labeler-test.js
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright 2017 AJ Jordan, AGPLv3+
-
-'use strict';
-
-const vows = require('perjury'),
-  assert = vows.assert,
-  makeContext = require('./mocks/context'),
-  alexa = require('./mocks/alexa');
-
-// Note: we only test top 100 and top 1000 because the Alexa mock supports only 1000 items
-// (Or in other words, `new Array(1000000)` hung my Node REPL process when I tried it.)
-
-// We have to do this funky thing so the tests run in serial
-// If they run in parallel, Sinon spies don't reset deterministically and one of the assertions will fail because the spy's been called more than once from another suite
-function setup(name, obj) {
-  const ret = {
-    'When we require the module': {
-      topic: function() {
-        return require('../lib/labeler');
-      },
-      'it works': function(err) {
-        assert.ifError(err);
-      },
-      'it\'s a function': function(err, labeler) {
-        assert.isFunction(labeler);
-      }
-    }
-  };
-
-  ret['When we require the module'][name] = obj;
-
-  return ret;
-}
-
-function resetSpies(context) {
-  return context.github.issues.addLabels.reset();
-}
-
-function addLabelsCalledOnce(err, context) {
-  assert.isTrue(context.github.issues.addLabels.calledOnce);
-}
-
-function assertWhichLabel(label) {
-  return function(err, context) {
-    const args = context.github.issues.addLabels.args[0];
-
-    assert.isObject(args[0]);
-    assert.isArray(args[0].labels);
-    assert.deepEqual(args[0].labels, [label]);
-  };
-}
-
-function assertOtherLabelsRemoved(labels) {
-  return function(err, context) {
-    const calledLabels = context.github.issues.removeLabel.args.map(args => args[0].name);
-    assert.deepEqual(calledLabels, labels);
-  };
-}
-
-vows.describe('issue labeler module').addBatch(setup(
-  'and we pass it an issue in the top 100 domains', {
-    topic: function(labeler) {
-      const context = makeContext.issue();
-      // XXX should we test on the boundaries of different labels instead of in the middle?
-      labeler(context, {domain: 'domain10.com'}, alexa);
-      return context;
-    },
-    teardown: resetSpies,
-    'it works': function(err) {
-      assert.ifError(err);
-    },
-    'it adds labels to the issue only once': addLabelsCalledOnce,
-    'the label was the top-100 label': assertWhichLabel('top-100'),
-    'all other labels were removed': assertOtherLabelsRemoved(['top-1k', 'top-10k', 'top-100k', 'top-1m'])
-  }
-)).addBatch(setup(
-  'and we pass it an issue in the top 1,000 domains', {
-    topic: function(labeler) {
-      const context = makeContext.issue();
-      // XXX should we test on the boundaries of different labels instead of in the middle?
-      labeler(context, {domain: 'domain500.com'}, alexa);
-      return context;
-    },
-    teardown: resetSpies,
-    'it works': function(err) {
-      assert.ifError(err);
-    },
-    'it adds labels to the issue only once': addLabelsCalledOnce,
-    'the label was the top-1k label': assertWhichLabel('top-1k'),
-    'all other labels were removed': assertOtherLabelsRemoved(['top-100', 'top-10k', 'top-100k', 'top-1m'])
-  }
-)).export(module);
diff --git a/utils/issue-format-bot/test/lib/handlerutil.js b/utils/issue-format-bot/test/lib/handlerutil.js
deleted file mode 100644
index 3cee354bc473..000000000000
--- a/utils/issue-format-bot/test/lib/handlerutil.js
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright 2017 AJ Jordan, AGPLv3+
-
-'use strict';
-
-const vows = require('perjury'),
-  assert = vows.assert,
-  robot = require('../mocks/robot'),
-  alexa = require('../mocks/alexa'),
-  makeContext = require('../mocks/context'),
-  _ = require('lodash');
-
-// TODO tests for this file
-
-// INTERNAL UTILITY FUNCTIONS
-
-function itWorks(err) {
-  assert.ifError(err);
-}
-
-function createsOneComment(err, context) {
-  assert.isTrue(context.github.issues.createComment.calledOnce);
-}
-
-function createsCommentWithMessage(text) {
-  return function(err, context) {
-    // args[0] is first call arguments, second [0] is first arg
-    assert.isObject(context.github.issues.createComment.args[0][0]);
-    // TODO try to find a more decoupled way than matching text
-    assert.isTrue(context.github.issues.createComment.args[0][0].body.includes(text));
-  };
-}
-
-// EXPORTS
-
-function setup(path, obj) {
-  return {
-    'When we require the module': {
-      topic: function() {
-        return require(path);
-      },
-      'it works': itWorks,
-      'it\'s a function': function(err, newissue) {
-        assert.isFunction(newissue);
-      },
-      // We insert the provided object here
-      'and we initialize it with a robot': _.assign({
-        topic: function(newissue) {
-          return newissue(robot, alexa);
-        },
-        'it works': function(err) {
-          assert.ifError(err);
-        },
-        'it returns a function': function(err, handler) {
-          assert.isFunction(handler);
-        }
-      }, obj)
-    }
-  };
-}
-
-function nullBody(text) {
-  return {
-    topic: function(handler) {
-      const context = makeContext.issue('');
-
-      handler(context);
-
-      return context;
-    },
-    'it works': itWorks,
-    'it only creates one comment': createsOneComment,
-    'it creates a comment with the right message': createsCommentWithMessage(text)
-  };
-}
-
-function badType(text) {
-  return {
-    topic: function(handler) {
-      const context = makeContext.issue('Type: invalid');
-
-      handler(context);
-
-      return context;
-    },
-    'it works': itWorks,
-    'it only creates one comment': createsOneComment,
-    'it creates a comment with the right message': createsCommentWithMessage(text)
-  };
-}
-
-function multipleTypes(text) {
-  return {
-    topic: function(handler) {
-      const context = makeContext.issue('Type: new ruleset\nType: ruleset issue');
-
-      handler(context);
-
-      return context;
-    },
-    'it works': itWorks,
-    'it only creates one comment': createsOneComment,
-    'it creates a comment with the right message': createsCommentWithMessage(text)
-  };
-}
-
-function noType(text) {
-  return {
-    topic: function(handler) {
-      const context = makeContext.issue('I didn\'t read instructions but I DID find a ruleset issue');
-
-      handler(context);
-
-      return context;
-    },
-    'it works': itWorks,
-    'it only creates one comment': createsOneComment,
-    'it creates a comment with the right message': createsCommentWithMessage(text)
-  };
-}
-
-function correctNewRuleset(issueText, text) {
-  const obj = {
-    topic: function(handler) {
-      const context = makeContext.issue(issueText);
-
-      const result = handler(context);
-
-      // Edit handler is an AsyncFunction, new issue handler is a Function
-      if (result && result.then) {
-        // Perjury doesn't support promises, so we manually invoke the callback
-        result.then(() => {
-          this.callback(null, context);
-        });
-      } else {
-        return context;
-      }
-    },
-    'it works': itWorks,
-    'it labels the issue appropriately': function(err, context) {
-      assert.isTrue(context.github.issues.addLabels.calledOnce);
-
-      const args = context.github.issues.addLabels.args[0];
-
-      assert.isObject(args[0]);
-      assert.isArray(args[0].labels);
-      assert.deepEqual(args[0].labels, ['top-100']);
-    }
-  };
-
-  if (text) {
-    obj['it only creates one comment'] = createsOneComment;
-
-    obj['it says the user fixed it'] = createsCommentWithMessage(text);
-  } else {
-    obj['it doesn\'t comment'] = function(err, context) {
-      assert.isTrue(context.github.issues.createComment.notCalled);
-    };
-  }
-
-  return obj;
-}
-
-function problematicNewRuleset(text) {
-  return {
-    topic: function(handler) {
-      const context = makeContext.issue('Type: new ruleset');
-
-      handler(context);
-
-      return context;
-    },
-    'it works': itWorks,
-    'it only creates one comment': createsOneComment,
-    'it includes the problem': createsCommentWithMessage(text)
-  };
-}
-
-module.exports.setup = setup;
-module.exports.nullBody = nullBody;
-module.exports.badType = badType;
-module.exports.multipleTypes = multipleTypes;
-module.exports.noType = noType;
-module.exports.correctNewRuleset = correctNewRuleset;
-module.exports.problematicNewRuleset = problematicNewRuleset;
diff --git a/utils/issue-format-bot/test/mocks/alexa.js b/utils/issue-format-bot/test/mocks/alexa.js
deleted file mode 100644
index aafacd9bb160..000000000000
--- a/utils/issue-format-bot/test/mocks/alexa.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2017 AJ Jordan, AGPLv3+
-
-'use strict';
-
-const SIZE = 1000;
-
-const regex = /^domain(\d+).com$/;
-
-function indexOf(str) {
-  const match = regex.exec(str);
-
-  if (match && Number(match[1]) <= SIZE) {
-    return Number(match[1]) - 1;
-  } else {
-
-    /*
-      ESLint is too dumb to realize that this always has a
-      bound `this` from the Proxy, so it's not invalid;
-      that Function#apply is clearer here than using
-      Reflect.apply and isn't the usual overly verbose
-      syntax people use; and that using `arguments` is
-      clearer than using spread syntax (and is one of the
-      rare cases where there isn't really a significant
-      advantage to spread syntax). So we disable it for
-      this line.
-
-      TODO: report this upstream
-    */
-
-    /* eslint-disable */
-    return Array.prototype.indexOf.apply(this, arguments);
-    /* eslint-enable */
-  }
-}
-
-const arr = new Proxy(new Array(SIZE), {
-  get: function(target, name) {
-    // Override Array#indexOf
-    if (name === 'indexOf') {
-      return indexOf.bind(target);
-    }
-
-    // Node REPL uses symbols apparently, which throw TypeErrors when isNaN coerces them, so do those first
-    if (typeof name === 'symbol' || isNaN(name) || name >= SIZE) return target[name];
-    return `domain${Number(name) + 1}.com`;
-  }
-});
-
-module.exports = {data: arr};
diff --git a/utils/issue-format-bot/test/mocks/context.js b/utils/issue-format-bot/test/mocks/context.js
deleted file mode 100644
index a2ceb488f71b..000000000000
--- a/utils/issue-format-bot/test/mocks/context.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2017 AJ Jordan, AGPLv3+
-
-'use strict';
-
-const sinon = require('sinon');
-
-let issueNumber = 1;
-
-function noop() {}
-
-module.exports = {
-  // Note: this is NOT the `context.issue` you see in-source
-  // This is used to create `context` itself; `context.issue` is the Sinon spy you see below
-  issue(body) {
-    return {
-      payload: {
-        issue: {
-          number: issueNumber++,
-          body
-        }
-      },
-      github: {
-        issues: {
-          createComment: sinon.spy(),
-          // TODO actually make this keep track of data
-          getComments: function() {
-            return {
-              data: []
-            };
-          },
-          addLabels: sinon.spy(),
-          removeLabel: sinon.spy(() => new Promise(noop))
-        }
-      },
-      // Blindly pass through the first argument as the return value
-      issue: sinon.spy(arg => arg)
-    };
-  }
-};
diff --git a/utils/issue-format-bot/test/mocks/robot.js b/utils/issue-format-bot/test/mocks/robot.js
deleted file mode 100644
index f9f72ec6797a..000000000000
--- a/utils/issue-format-bot/test/mocks/robot.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2017 AJ Jordan, AGPLv3+
-
-'use strict';
-
-function noop() {}
-
-module.exports = {
-  log: noop
-};
diff --git a/utils/issue-format-bot/test/newissue-handler-test.js b/utils/issue-format-bot/test/newissue-handler-test.js
deleted file mode 100644
index 211ff8ba60cf..000000000000
--- a/utils/issue-format-bot/test/newissue-handler-test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2017 AJ Jordan, AGPLv3+
-
-'use strict';
-
-const vows = require('perjury'),
-  handlerutil = require('./lib/handlerutil');
-
-vows.describe('new issue handler').addBatch(
-  handlerutil.setup('../../lib/newissue', {
-    'and we pass it the context of a new issue with a null body': handlerutil.nullBody('can\'t find any text'),
-    'and we pass it the context of a new issue with a bad type': handlerutil.badType('type of issue'),
-    'and we pass it the context of a new issue with a type of "new ruleset" and a correct body': handlerutil.correctNewRuleset('Type: new ruleset\nDomain: domain10.com'),
-    'and we pass it the context of a new issue with a type of "new ruleset" and a problematic body': handlerutil.problematicNewRuleset('missing domain information'),
-    'and we pass it the context of a new issue with multiple types': handlerutil.multipleTypes('more than one type'),
-    'and we pass it the context of a new issue with no type': handlerutil.noType('find the type of issue')
-  })
-).export(module);
diff --git a/utils/issue-format-bot/test/parse-test.js b/utils/issue-format-bot/test/parse-test.js
deleted file mode 100644
index e2ea603c4e3d..000000000000
--- a/utils/issue-format-bot/test/parse-test.js
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright 2017 AJ Jordan, AGPLv3+
-
-'use strict';
-
-const vows = require('perjury'),
-  assert = vows.assert,
-  _ = require('lodash');
-
-function assertCorrectBody(text) {
-  return {
-    topic: function(parse) {
-      return parse(text);
-    },
-    'it returns an object': function(err, obj) {
-      assert.ifError(err);
-      assert.isObject(obj);
-    },
-    'the object has the right data': function(err, obj) {
-      assert.includes(obj, 'domain');
-      assert.equal(obj.domain, 'example.com');
-    }
-  };
-}
-
-function assertTypeSucceeds(type) {
-  return {
-    topic: function(parse) {
-      return parse('Type: ' + type);
-    },
-    'it returns an object': function(err, obj) {
-      assert.ifError(err);
-      assert.isObject(obj);
-    },
-    'the object is normal data': function(err, obj) {
-      assert.equal(obj.type, type);
-    }
-  };
-}
-
-vows.describe('issue parser module').addBatch({
-  'When we require the module': {
-    topic: function() {
-      return require('../lib/parse');
-    },
-    'it works': function(err) {
-      assert.ifError(err);
-    },
-    'it\'s a function': function(err, parse) {
-      assert.isFunction(parse);
-    },
-    'and we pass it a body that\'s a ruleset issue': assertCorrectBody('Type: ruleset issue\nDomain: example.com'),
-    'and we pass it a body with funky capitalization': {
-      topic: function(parse) {
-        return parse('tyPe: ruleset issue\nDoMaIn: example.com');
-      },
-      'it returns an object': function(err, obj) {
-        assert.ifError(err);
-        assert.isObject(obj);
-      },
-      'the capitalization didn\'t matter': function(err, obj) {
-        assert.includes(obj, 'domain');
-        assert.equal(obj.domain, 'example.com');
-      }
-    },
-    'and we pass it a body with out-of-order data': assertCorrectBody('Domain: example.com\nType: ruleset issue'),
-    'and we pass it a body with lots of whitespace': {
-      topic: function(parse) {
-        return parse('Type:  ruleset issue         \nDomain:  \t\t   example.com   \t');
-      },
-      'it returns an object': function(err, obj) {
-        assert.ifError(err);
-        assert.isObject(obj);
-      },
-      'the whitespace was trimmed': function(err, obj) {
-        assert.includes(obj, 'domain');
-        assert.equal(obj.domain, 'example.com');
-      }
-    },
-    'and we pass it a body with many newlines': {
-      topic: function(parse) {
-        return parse('\n\nType: ruleset issue\n\n\n\nDomain: example.com\n\n');
-      },
-      'it returns an object': function(err, obj) {
-        assert.ifError(err);
-        assert.isObject(obj);
-      },
-      'the newlines were ignored': function(err, obj) {
-        assert.equal(_.size(obj), 2);
-      }
-    },
-    'and we pass it a body with some Markdown comments': {
-      topic: function(parse) {
-        // TODO this should test for comments on the same line too, but see wooorm/strip-markdown#14
-        return parse('\nType: ruleset issue\n\nDomain: example.com');
-      },
-      'it returns an object': function(err, obj) {
-        assert.ifError(err);
-        assert.isObject(obj);
-      },
-      'the object has the right data': function(err, obj) {
-        assert.includes(obj, 'domain');
-        assert.equal(obj.domain, 'example.com');
-      },
-      'the object doesn\'t have a bunch of extra keys': function(err, obj) {
-        assert.equal(_.size(obj), 2);
-      }
-    },
-    'and we pass it a body that has a full URL in the domain': {
-      topic: function(parse) {
-        return parse('Type: ruleset issue\nDomain: http://example.com/index.html');
-      },
-      'it returns an object': function(err, obj) {
-        assert.ifError(err);
-        assert.isObject(obj);
-      },
-      'the URL was converted into a bare domain': function(err, obj) {
-        assert.includes(obj, 'domain');
-        assert.equal(obj.domain, 'example.com');
-      }
-    },
-    'and we pass it a body that has a freeform comment': assertCorrectBody('Type: new ruleset\nDomain: example.com\nAnd let me say, what a great GitHub bot HTTPS Everywhere has!'),
-    'and we pass it a body that has a freeform comment with a Markdown link': assertCorrectBody('Type: new ruleset\nDomain: example.com\nPlease add [example.com][].\n\n [example.com]: http://example.com.'),
-    'and we pass it a body that has a freeform comment with colons': assertCorrectBody('Type: new ruleset\nDomain: example.com\nHere\'s a secret: I like colons.'),
-    'and we pass it a body that has a freeform comment with multiple colons': assertCorrectBody('Type: new ruleset\nDomain: example.com\nHere\'s a secret: I like colons. Another secret: I like them a lot.'),
-    'and we pass it a code issue without any other data': assertTypeSucceeds('code issue'),
-    'and we pass it a feature request without any other data': assertTypeSucceeds('feature request'),
-    'and we pass it an issue labeled "other" without any other data': assertTypeSucceeds('other'),
-    'and we pass it a body that isn\'t a valid issue type': {
-      topic: function(parse) {
-        return parse('Type: something else\nDomain: example.com');
-      },
-      'it returns the right error': function(err, obj) {
-        assert.ifError(err);
-        assert.instanceOf(obj, Error);
-        assert.equal(obj.message, 'invalid type');
-      }
-    },
-    'and we pass it a body with more than one type': {
-      topic: function(parse) {
-        return parse('Type: new ruleset\nType: ruleset issue');
-      },
-      'it returns the right error': function(err, obj) {
-        assert.ifError(err);
-        assert.instanceOf(obj, Error);
-        assert.equal(obj.message, 'multiple types');
-      }
-    },
-    'and we pass it a body with no type': {
-      topic: function(parse) {
-        return parse('I tried turning it off and on again and it still doesn\'t work');
-      },
-      'it returns the right error': function(err, obj) {
-        assert.ifError(err);
-        assert.instanceOf(obj, Error);
-        assert.equal(obj.message, 'no type');
-      }
-    },
-    'and we pass it a null body': {
-      topic: function(parse) {
-        return parse('');
-      },
-      'it returns the right error': function(err, obj) {
-        assert.ifError(err);
-        assert.instanceOf(obj, Error);
-        assert.equal(obj.message, 'null description');
-      }
-    }
-  }
-}).export(module);
diff --git a/utils/issue-format-bot/test/robot-mock-test.js b/utils/issue-format-bot/test/robot-mock-test.js
deleted file mode 100644
index f0c488466764..000000000000
--- a/utils/issue-format-bot/test/robot-mock-test.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2017 AJ Jordan, AGPLv3+
-
-'use strict';
-
-const vows = require('perjury'),
-  assert = vows.assert;
-
-vows.describe('robot mock object').addBatch({
-  'When we require the module': {
-    topic: function() {
-      return require('./mocks/robot');
-    },
-    'it works': function(err) {
-      assert.ifError(err);
-    },
-    'it\'s an object': function(err, robot) {
-      assert.isObject(robot);
-    },
-    'we can call log() on it': function(err, robot) {
-      return robot.log('Hello, world!');
-    }
-  }
-}).export(module);
diff --git a/utils/issue-format-bot/test/validate-test.js b/utils/issue-format-bot/test/validate-test.js
deleted file mode 100644
index a3821aac7e5b..000000000000
--- a/utils/issue-format-bot/test/validate-test.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2017 AJ Jordan, AGPLv3+
-
-'use strict';
-
-const vows = require('perjury'),
-  assert = vows.assert;
-
-function missingRequiredDomain(type) {
-  return 	{
-    topic: function(validate) {
-      return validate({
-        type
-      });
-    },
-    'it returns an array': function(err, problems) {
-      assert.ifError(err);
-      assert.isArray(problems);
-    },
-    'the array has only one problem': function(err, problems) {
-      assert.equal(problems.length, 1);
-    },
-    'the array has a missing domain problem': function(err, problems) {
-      assert.isTrue(problems[0].includes('missing domain'));
-    }
-  };
-}
-
-function hasRequiredDomain(type) {
-  return 	{
-    topic: function(validate) {
-      return validate({
-        type,
-        domain: 'example.com'
-      });
-    },
-    'it returns an array': function(err, problems) {
-      assert.ifError(err);
-      assert.isArray(problems);
-    },
-    'the array has no problems': function(err, problems) {
-      assert.equal(problems.length, 0);
-    }
-  };
-}
-
-vows.describe('data validator module').addBatch({
-  'When we require the module': {
-    topic: function() {
-      return require('../lib/validate');
-    },
-    'it works': function(err) {
-      assert.ifError(err);
-    },
-    'it\'s a function': function(err, validate) {
-      assert.isFunction(validate);
-    },
-    'and we pass it a new ruleset without a domain': missingRequiredDomain('new ruleset'),
-    'and we pass it a ruleset issue without a domain': missingRequiredDomain('ruleset issue'),
-    'and we pass it a new ruleset with a domain': hasRequiredDomain('new ruleset'),
-    'and we pass it a ruleset issue with a domain': hasRequiredDomain('ruleset issue')
-  }
-}).export(module);
diff --git a/utils/labeller/.gitignore b/utils/labeller/.gitignore
deleted file mode 100644
index cd13ae6717b9..000000000000
--- a/utils/labeller/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-config.json
-node_modules
-*.swp
diff --git a/utils/labeller/Dockerfile b/utils/labeller/Dockerfile
deleted file mode 100644
index 138b73e12480..000000000000
--- a/utils/labeller/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM node
-MAINTAINER William Budington 
-
-WORKDIR /opt
-
-COPY package.json .
-RUN npm install
-COPY index.js .
-COPY config.json.example .
-RUN mv config.json.example config.json
-
-CMD ["node", "index.js"]
diff --git a/utils/labeller/README.md b/utils/labeller/README.md
deleted file mode 100644
index 4d979e3ecb08..000000000000
--- a/utils/labeller/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# HTTPS Everywhere Labeller
-
-This compares the open PR requests that have ruleset changes to the Alexa top 1M sites, and adds labels corresponding to how they place within Alexa.  Current labels are:
-
-1. `top-100`
-2. `top-1k`
-3. `top-10k`
-4. `top-100k`
-5. `top-1m`
-
-This will work for admins of HTTPS Everywhere that generate a [GitHub token](https://github.com/settings/tokens).
-
-## Setup
-
-### With Docker
-
-    docker build -t labeller .
-
-### Without Docker
-
-Download and install `node` and `npm`, then
-
-    npm install
-    cp config.json.example config.json
-
-Enter your GitHub token info into `config.json`.
-
-## Running
-
-### With Docker
-
-Set your `$GITHUB_TOKEN`, and run
-
-    docker run -it -v $(pwd)/state_dir:/opt/state_dir -e GITHUB_TOKEN=$GITHUB_TOKEN labeller
-
-### Without Docker
-
-    node index.js
diff --git a/utils/labeller/config.json.example b/utils/labeller/config.json.example
deleted file mode 100644
index 8cad030bc425..000000000000
--- a/utils/labeller/config.json.example
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "github_token": "",
-  "github_user": "efforg",
-  "github_repo": "https-everywhere",
-  "state_file": "state_dir/most_recent_pr_checked.state"
-}
diff --git a/utils/labeller/index.js b/utils/labeller/index.js
deleted file mode 100644
index 99da8f848df6..000000000000
--- a/utils/labeller/index.js
+++ /dev/null
@@ -1,216 +0,0 @@
-"use strict";
-
-var fs = require('fs');
-var readline = require('readline');
-
-var GitHubApi = require('github');
-var _ = require('lodash');
-var parseXML = require('xml2js').parseString;
-var async = require('async');
-var request = require('request');
-var unzip = require('unzip');
-var ProgressBar = require('progress');
-
-var config = require('./config');
-
-// Fetch the Alexa top 1M sites and push it to an array `alexa` via streams
-function get_alexa(alexa_cb){
-
-  var alexa = []
-  var csv_regex = /^[0-9]+,(.+)/
-
-  request.get('https://s3.amazonaws.com/alexa-static/top-1m.csv.zip')
-    .on('error', function(err) {
-      alexa_cb(err);
-    })
-    .pipe(unzip.Parse())
-    .on('entry', function (entry) {
-
-      var bar = new ProgressBar('Processing Alexa Top 1M [:bar] :percent :etas', {
-        total: 100
-      });
-
-      var lineReader = require('readline').createInterface({
-        input: entry
-      });
-
-      var x = 0;
-      lineReader.on('line', function (line) {
-        var domain = line.match(csv_regex)[1]
-        alexa.push(domain);
-
-        if(x % 10000 == 0) bar.tick();
-        x++;
-      });
-
-      lineReader.on('close', function(){
-        alexa_cb(null, alexa);
-      });
-
-    });
-};
-
-function get_most_recent_pr(alexa, recent_cb){
-  fs.readFile(config.state_file, function(err, data){
-    if(err){
-      fs.writeFile(config.state_file, '0', function(err){
-        if(err) return recent_cb(err);
-        recent_cb(null, [alexa, 0]);
-      });
-    } else {
-      recent_cb(null, [alexa, Number(data)]);
-    }
-  });
-}
-
-function github_process_prs(res, pr_cb){
-  var alexa = res[0],
-    most_recent_pr_checked = res[1];
-
-  var github = new GitHubApi();
-  var wildcard_www_regex = /^(www|\*)\.(.+)/
-
-  var httpse = {
-    user: config.github_user,
-    repo: config.github_repo
-  }
-
-  github.authenticate({
-    type: "oauth",
-    token: config.github_token || process.env.GITHUB_TOKEN
-  })
-
-  // Label all PRs which meet the criteria for labelling
-  function github_process_pr_page(first_page){
-    return function(err, pull_requests){
-      if(first_page){
-        fs.writeFile(config.state_file, pull_requests[0].number, function(err){
-          if(err) return pr_cb(err);
-        });
-      }
-
-      _.each(pull_requests, function(pull_request){
-
-        if(pull_request.number > most_recent_pr_checked){
-          github.pullRequests.getFiles(_.extend(httpse, {
-            number: pull_request.number
-          }), function(err, files){
-            if(err) return pr_cb(err);
-
-            // Rank a list of target hosts, returning the minimum alexa placing
-            function rank_targets(targets){
-              var minimum_placing = 9999999;
-
-              _.each(targets, function(host){
-                if(host.match(wildcard_www_regex)){
-                  host = host.match(wildcard_www_regex)[2];
-                }
-
-                var alexa_placing = alexa.indexOf(host);
-                if(~alexa_placing && alexa_placing < minimum_placing){
-                  minimum_placing = alexa_placing;
-                }
-              });
-
-              if(minimum_placing != 9999999){
-                return minimum_placing;
-              }
-            }
-
-            // Given the url of an HTTPSE ruleset, return a list of targets to fetch_cb
-            function fetch_url_and_parse_targets(url, fetch_cb){
-              request({url: url}, function(err, res, body){
-                if(err) return fetch_cb(err);
-
-                parseXML(body, function(err, root){
-                  if(err) return fetch_cb(err);
-
-                  fetch_cb(null, _.map(root.ruleset.target, function(target){
-                    return target.$.host;
-                  }));
-                });
-              });
-            }
-
-            var file_fetches = [];
-
-            // Out of the list of files for this PR, figure out the minimum Alexa ranking for each
-            _.each(files, function(file){
-              if(file.filename.match(/^src\/chrome\/content\/rules\//)){
-                file_fetches.push(function(file_cb){
-                  fetch_url_and_parse_targets(file.raw_url, function(err, targets){
-                    if(err) return file_cb(err);
-
-                    console.log("Processing PR: " + pull_request.number + ", file: " + file.filename);
-
-                    var ranking = rank_targets(targets);
-                    if(ranking){
-                      return file_cb(null, {
-                        alexa_placing: ranking,
-                        pr_number: pull_request.number
-                      });
-                    } else {
-                      return file_cb();
-                    }
-                  });
-                });
-              }
-            });
-
-            async.parallel(file_fetches, function(err, res){
-              if(err) pr_cb(err);
-
-              var reduced_pr_ranking =  _.reduce(_.filter(res),
-                function(minimum_file_res, file_res){
-                  if(file_res.alexa_placing < minimum_file_res.alexa_placing){
-                    return file_res;
-                  }
-                  return minimum_file_res;
-                });
-
-              if(reduced_pr_ranking){
-                let label;
-                if(reduced_pr_ranking.alexa_placing < 100){
-                  label = "top-100";
-                } else if(reduced_pr_ranking.alexa_placing < 1000){
-                  label = "top-1k";
-                } else if(reduced_pr_ranking.alexa_placing < 10000){
-                  label = "top-10k";
-                } else if(reduced_pr_ranking.alexa_placing < 100000){
-                  label = "top-100k";
-                } else {
-                  label = "top-1m";
-                }
-                console.log("Applying label `" + label + "` to PR: " + reduced_pr_ranking.pr_number);
-
-                github.issues.addLabels(_.extend(httpse, {
-                  number: reduced_pr_ranking.pr_number,
-                  body: [label]
-                }), function(err, res){
-                  if(err) console.log(err);
-                });
-              }
-            });
-          });
-        }
-      });
-
-      if(github.hasNextPage(pull_requests)){
-        github.getNextPage(pull_requests, github_process_pr_page(false));
-      }
-    }
-  }
-
-  github.pullRequests.getAll(_.extend(httpse, {
-    state: "open",
-    per_page: 100
-  }), github_process_pr_page(true));
-}
-
-async.waterfall([
-  get_alexa,
-  get_most_recent_pr,
-  github_process_prs
-], function(err, result){
-  if(err) console.log(err);
-});
diff --git a/utils/labeller/package.json b/utils/labeller/package.json
deleted file mode 100644
index 98e9ca416c5a..000000000000
--- a/utils/labeller/package.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "name": "https-everywhere-labeller",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "William Budington",
-  "license": "GPL-3.0",
-  "dependencies": {
-    "async": "^2.0.1",
-    "github": "^2.5.1",
-    "lodash": "^4.15.0",
-    "progress": "^1.1.8",
-    "request": "^2.74.0",
-    "unzip": "^0.1.11",
-    "xml2js": "^0.4.17"
-  }
-}
diff --git a/utils/labeller/state_dir/.gitignore b/utils/labeller/state_dir/.gitignore
deleted file mode 100644
index 12a93b415c3e..000000000000
--- a/utils/labeller/state_dir/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-most_recent_pr_checked.state
diff --git a/utils/memusage.js b/utils/memusage.js
new file mode 100644
index 000000000000..7db7faaa1189
--- /dev/null
+++ b/utils/memusage.js
@@ -0,0 +1,50 @@
+/* eslint-env es6, node */
+/* globals gc */
+
+'use strict';
+
+if (typeof gc !== 'function') {
+	throw new Error('Please re-run with `node --expose-gc utils/memusage.js`');
+}
+
+const { RuleSets } = require('../chromium/background-scripts/rules');
+const { readFileSync } = require('fs');
+const json = JSON.parse(readFileSync(`${__dirname}/../rules/default.rulesets`, 'utf-8'));
+
+function memUsage() {
+	gc(); // don't measure garbage
+	return process.memoryUsage().heapUsed;
+}
+
+function memToString(before, after) {
+	return (Math.round((after - before) / (1 << 20) * 10) / 10).toLocaleString() + ' MB';
+}
+
+const start = memUsage();
+let middle, end;
+
+{
+	const ruleSets = new RuleSets(Object.create(null));
+	ruleSets.addFromJson(json);
+	middle = memUsage();
+}
+
+{
+	const oldRegExp = RegExp;
+
+	global.RegExp = function (...args) {
+		let r = new oldRegExp(...args);
+		r.test(''); // force engine to compile RegExp
+		return r;
+	};
+
+	const ruleSets = new RuleSets(Object.create(null));
+	ruleSets.addFromJson(json);
+	end = memUsage();
+}
+
+// rulesets loaded but regexps are not compiled
+console.log('Initial usage:', memToString(start, middle));
+
+// with all regexps compiled
+console.log('Maximum usage:', memToString(middle, end));
diff --git a/utils/merge-rulesets.py b/utils/merge-rulesets.py
index fb9b0f980fcd..efd62cbaf8d8 100644
--- a/utils/merge-rulesets.py
+++ b/utils/merge-rulesets.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.6
+#!/usr/bin/env python3
 
 # Merge all the .xml rulesets into a single "default.rulesets" file -- this
 # prevents inodes from wasting disk space, but more importantly, this works
@@ -15,12 +15,12 @@
 import xml.etree.ElementTree
 
 def normalize(f):
-	"""
-	OSX and Linux filesystems encode composite characters differently in
-	filenames. We should normalize to NFC: http://unicode.org/reports/tr15/
-	"""
-	f = unicodedata.normalize("NFC", f)
-	return f
+    """
+    OSX and Linux filesystems encode composite characters differently in
+    filenames. We should normalize to NFC: http://unicode.org/reports/tr15/
+    """
+    f = unicodedata.normalize("NFC", f)
+    return f
 
 # commandline arguments parsing (nobody use it, though)
 parser = argparse.ArgumentParser(description="Merge rulesets")
@@ -30,13 +30,16 @@ def normalize(f):
 
 # output filename, pointed to the merged ruleset
 ofn = os.path.join(args.source_dir, "default.rulesets")
+ojson = os.path.join(args.source_dir, "default.rulesets.json")
 
 # XML Ruleset Files
 files = map(normalize, glob.glob(os.path.join(args.source_dir, "*.xml")))
 
 # Under git bash, sed -i issues errors and sets the file "read-only".
 if os.path.isfile(ofn):
-	os.system("chmod u+w " + ofn)
+    os.system("chmod u+w " + ofn)
+if os.path.isfile(ojson):
+    os.system("chmod u+w " + ojson)
 
 # Library (JSON Object)
 library = []
@@ -44,48 +47,68 @@ def normalize(f):
 # Parse XML ruleset and construct JSON library
 print(" * Parsing XML ruleset and constructing JSON library...")
 for filename in sorted(files):
-	tree = xml.etree.ElementTree.parse(filename)
-	root = tree.getroot()
-
-	ruleset = {}
-
-	for attr in root.attrib:
-		ruleset[attr] = root.attrib[attr]
-
-	for child in root:
-		if child.tag in ["target", "rule", "securecookie", "exclusion"]:
-			if child.tag not in ruleset:
-				ruleset[child.tag] = []
-		else:
-			continue
-
-		if child.tag == "target":
-			ruleset["target"].append(child.attrib["host"])
-
-		elif child.tag == "rule":
-			ru = {}
-			ru["from"] = child.attrib["from"]
-			ru["to"] = child.attrib["to"]
-
-			ruleset["rule"].append(ru)
-
-		elif child.tag == "securecookie":
-			sc = {}
-			sc["host"] = child.attrib["host"]
-			sc["name"] = child.attrib["name"]
-
-			ruleset["securecookie"].append(sc)
-
-		elif child.tag == "exclusion":
-			ruleset["exclusion"].append(child.attrib["pattern"])
-
-	library.append(ruleset);
+    tree = xml.etree.ElementTree.parse(filename)
+    root = tree.getroot()
+
+    ruleset = {}
+    trivialNameSecureCookie = None
+
+    for attr in root.attrib:
+        ruleset[attr] = root.attrib[attr]
+
+    for child in root:
+        if child.tag in ["target", "rule", "securecookie", "exclusion"]:
+            if child.tag not in ruleset:
+                ruleset[child.tag] = []
+        else:
+            continue
+
+        if child.tag == "target":
+            ruleset["target"].append(child.attrib["host"])
+
+        elif child.tag == "rule":
+            ru = {}
+            ru["from"] = child.attrib["from"]
+            ru["to"] = child.attrib["to"]
+
+            ruleset["rule"].append(ru)
+
+        elif child.tag == "securecookie":
+            if child.attrib["name"] == ".+":
+                if not trivialNameSecureCookie:
+                    trivialNameSecureCookie = {}
+                    trivialNameSecureCookie["host"] = child.attrib["host"]
+                    trivialNameSecureCookie["name"] = ".+"
+                else:
+                    trivialNameSecureCookie["host"] = (trivialNameSecureCookie["host"] + "|" + child.attrib["host"])
+            else:
+                sc = {}
+                sc["host"] = child.attrib["host"]
+                sc["name"] = child.attrib["name"]
+
+                ruleset["securecookie"].append(sc)
+
+        elif child.tag == "exclusion":
+            if len(ruleset["exclusion"]) == 0:
+                ruleset["exclusion"].append(child.attrib["pattern"])
+            else:
+                ruleset["exclusion"][0] = (ruleset["exclusion"][0] + "|" + child.attrib["pattern"])
+
+    if trivialNameSecureCookie:
+        ruleset["securecookie"].insert(0, trivialNameSecureCookie)
+
+    library.append(ruleset);
 
 # Write to default.rulesets
-print(" * Writing JSON library to %s" % ofn)
+print(" * Writing JSON library to %s and %s"% (ofn, ojson) )
 outfile = open(ofn, "w")
-outfile.write(json.dumps(library))
+jsonout = open(ojson, "w")
+
+outfile.write(json.dumps(library, separators=(",", ":")))
+jsonout.write(json.dumps(library, separators=(",", ":")))
+
 outfile.close()
+jsonout.close()
 
 # Everything is okay.
 print(" * Everything is okay.")
diff --git a/utils/mk-client-whitelist/dbconnect.py b/utils/mk-client-whitelist/dbconnect.py
deleted file mode 100644
index e3b9032e20f1..000000000000
--- a/utils/mk-client-whitelist/dbconnect.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env python3.6
-import MySQLdb
-
-try:    from db_private import DB_USER
-except: DB_USER = "root"  # customise for your install
-
-try:    from db_private import DB_PASS
-except: DB_PASS = "root"  # customise
-
-try:    from db_private import DB_NAME
-except: DB_NAME = "observatory_api"
-
-TEST_DB_NAME = "tmp_TESTDB1"
-
-def dbconnect():
-  db = MySQLdb.connect(user=DB_USER, passwd=DB_PASS, db=DB_NAME)
-  dbc = db.cursor()
-  return db,dbc
-
-def dbconnecttest():
-  db = MySQLdb.connect(user=DB_USER, passwd=DB_PASS, db=TEST_DB_NAME)
-  dbc = db.cursor()
-  return db,dbc
-
diff --git a/utils/mk-client-whitelist/run.py b/utils/mk-client-whitelist/run.py
deleted file mode 100755
index 43837d75e80a..000000000000
--- a/utils/mk-client-whitelist/run.py
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env python3.6
-
-# Make a list of the current top 1,000 certs to whitelist from the
-# Decentralized SSL Observatory's client submissions, to live in
-# https-everywhere/src/chrome/content/code/X509ChainWhitelist.js
-
-import dbconnect
-import sys
-
-db, dbc = dbconnect.dbconnect()
-
-import time
-few_days_ago = time.gmtime(time.time() - 3600 * 24 * 3)
-cutoff = time.strftime("%Y-%m-%d", few_days_ago)
-
-# This currently runs on the decentralized observatory server, but will also
-# run on the published datasets and read-only SQL servers too...
-
-q = """
-SELECT hex(reports.chain_fp), count, `Validity:Not After`, Subject
-FROM reports JOIN chains       ON reports.chain_fp = chains.chain_fp
-             JOIN new_parsed_certs ON reports.cert_fp  = new_parsed_certs.cert_fp
-WHERE count > 1000 AND
-      `Validity:Not After` > "{}"
-GROUP BY reports.chain_fp
-ORDER BY count DESC
-LIMIT 1000
-""".format(cutoff)
-
-dbc.execute(q)
-results = dbc.fetchmany(1000)
-
-sys.stderr.write("TOP 1000:\n")
-for n in range(1000):
-    sys.stderr.write(repr(results[n][1:4]) + results[n][0][:4]+ '\n')
-
-header = """
-// These are SHA256 fingerprints for the most common chains observed by the
-// Decentralized SSL Observatory.  These should not be resubmitted.
-// This file is automatically generated by utils/mk_client_whitelist.py
-
-const X509ChainWhitelist = {"""
-
-print(header)
-for chain_fp in sorted([row[0] for row in results]):
-  print("  '{}' : true,".format(chain_fp))
-
-footer = "} ;"
-print(footer)
-
-
diff --git a/rewriter/.gitignore b/utils/rewriter/.gitignore
similarity index 100%
rename from rewriter/.gitignore
rename to utils/rewriter/.gitignore
diff --git a/rewriter/README.md b/utils/rewriter/README.md
similarity index 100%
rename from rewriter/README.md
rename to utils/rewriter/README.md
diff --git a/utils/rewriter/package.json b/utils/rewriter/package.json
new file mode 100644
index 000000000000..a62493ad2762
--- /dev/null
+++ b/utils/rewriter/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "https-everywhere-rewriter",
+  "version": "1.0.0",
+  "dependencies": {
+    "event-stream": "3.0.20",
+    "readdirp": "2.0.1",
+    "urijs": "^1.19.1",
+    "xmldom": "0.1.17"
+  }
+}
diff --git a/rewriter/rewriter.js b/utils/rewriter/rewriter.js
similarity index 91%
rename from rewriter/rewriter.js
rename to utils/rewriter/rewriter.js
index 5cb8ea412a31..5a25d5cdfafe 100644
--- a/rewriter/rewriter.js
+++ b/utils/rewriter/rewriter.js
@@ -14,13 +14,16 @@
 //  cd ~/path/to/my/webapp
 //  git diff
 
+global.self = global;
+require("../../lib-wasm/pkg/https_everywhere_lib_wasm.js");
+
 var path = require("path"),
   fs = require("fs"),
   DOMParser = require('xmldom').DOMParser,
   readdirp = require('readdirp'),
   es = require('event-stream'),
 
-  rules = require("../chromium/rules"),
+  rules = require("../../chromium/background-scripts/rules"),
 
   URI = require("urijs");
 
@@ -34,15 +37,15 @@ var ruleSets = null;
 function processDir(dir) {
   var stream = readdirp({
     root: dir,
-    fileFilter: ['*.html', '*.js', '*.rb', '*.erb', '*.mustache', 
+    fileFilter: ['*.html', '*.js', '*.rb', '*.erb', '*.mustache',
       '*.scala', '*.c', '*.cc', '*.cpp', '*.cxx',
       '*.java', '*.go', '*.php', '*.css', '*.pl', '*.py',
       '*.rhtml', '*.sh', '*.yaml']
   });
 
   stream
-    .on('warn', function (err) { 
-      console.error('non-fatal error', err); 
+    .on('warn', function (err) {
+      console.error('non-fatal error', err);
     // Optionally call stream.destroy() here in order to abort and cause 'close' to be emitted
     })
     .on('error', function (err) { console.error('fatal error', err); })
@@ -94,7 +97,7 @@ function processFile(filename) {
  */
 function loadRuleSets() {
   console.log("Loading rules...");
-  var fileContents = fs.readFileSync(path.join(__dirname, '../pkg/crx/rules/default.rulesets'), 'utf8');
+  var fileContents = fs.readFileSync(path.join(__dirname, '../../pkg/crx-eff/rules/default.rulesets'), 'utf8');
   ruleSets = new rules.RuleSets({});
   ruleSets.addFromJson(JSON.parse(fileContents));
 }
diff --git a/utils/ruleset-allowlist-cleanup.sh b/utils/ruleset-allowlist-cleanup.sh
new file mode 100755
index 000000000000..1975665b41bf
--- /dev/null
+++ b/utils/ruleset-allowlist-cleanup.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+# Remove from ruleset allowlist the filenames of files that
+# no longer exist or have no matching hash sums.
+
+# Change directory to git root; taken from ../test/test.sh
+if [ -n "$GIT_DIR" ]
+then
+    # $GIT_DIR is set, so we're running as a hook.
+    cd $GIT_DIR
+else
+    # Git command exists? Cool, let's CD to the right place.
+    git rev-parse && cd "$(git rev-parse --show-toplevel)"
+fi
+
+# Run from ruleset folder to simplify sha256sum output
+cd src/chrome/content/rules
+WLIST=../../../../utils/ruleset-allowlist.csv
+DELIM=","
+
+(read; while IFS=$DELIM read listed_hash coverage_flag fetch_flag file; do
+  display_hash=$(echo $listed_hash | cut -c-7)
+  # Remove those that no longer exist
+  if [ ! -f $file ]; then
+    sed -i "/$listed_hash$DELIM$coverage_flag$DELIM$fetch_flag$DELIM$file/d" $WLIST
+    echo >&2 "Removed $file ($display_hash): file no longer exists"
+  elif [ "$coverage_flag" == "0" -a "$fetch_flag" == "0" ]; then
+    sed -i "/$listed_hash$DELIM$coverage_flag$DELIM$fetch_flag$DELIM$file/d" $WLIST
+    echo >&2 "Removed $file ($display_hash): obsolete, all flags set to false"
+  else
+    actual_hash=$(sha256sum $file | cut -c-64)
+    # Remove those whose hashes do not match
+    if [ "$listed_hash" != "$actual_hash" ]; then
+      sed -i "/$listed_hash$DELIM$coverage_flag$DELIM$fetch_flag$DELIM$file/d" $WLIST
+      echo >&2 "Removed $file ($display_hash): listed hash does not match actual hash"
+    fi
+  fi
+done) < "$WLIST"
+
+# Sorting by the 4th column (ruleset name)
+TMPFILE=`mktemp`
+(head -n1 "$WLIST" && tail -n +2 "$WLIST" | LC_ALL=C sort -t"," -b -u -k4) > "$TMPFILE"
+mv "$TMPFILE" "$WLIST"
diff --git a/utils/ruleset-allowlist.csv b/utils/ruleset-allowlist.csv
new file mode 100644
index 000000000000..2e3e1c481b91
--- /dev/null
+++ b/utils/ruleset-allowlist.csv
@@ -0,0 +1,2222 @@
+hash,auto-pass coverage test,auto-pass fetch test,filename
+fbb2d56d33f886b53c314eac3446eed8bad7916660ad0709367936fe8335d987,0,1,112_Cafe.com.xml
+5b650e2b6084539440a1b66b5b45f5825a2d61db7812c7521e1a1e0860c4b6a3,1,1,16163.com.xml
+b5c96ae391a5b0971fb2438e3afd37ec7ce439e7dbb271276cf7bbeb0eb61450,1,1,16personalities.com.xml
+55b1ea082e1da07a13ef7bca833f779a23335658d345294a35e4944b90c5c136,0,1,1TW.org.xml
+4d7ea51ecce8ef52d7f14fe3d2196e7647c347ae491a8c51ff84555426f4c05b,0,1,1phads.com.xml
+4209813635498e7b1f9c944d648173507b41e0e3260e16b3fdb6f3f945ffc28a,1,1,24-7-Media.xml
+feb478f3b2f281637dc660c70688a7002af3e4c8643f49bc2a45dc451a2fe450,1,0,2K.com.xml
+106d40535445ceb77ef877d7cd43e68522ee15426bb20391be72da7ee7ed0319,1,0,33Across.xml
+2754710db32540a9e4fc610476d2da4ced0e742af02f5db582aacc553436a822,0,1,37Signals.xml
+0b112de7f3114b9432277ced9283996b39d7d7a9f5f3471fb98545630f674d8f,1,1,3M.com.xml
+3cd9cc0b3921f83d5bea3d5e948e0b95223f24dde3afa2bea2c346aba084eeb7,1,1,3dglassesfree.com.xml
+41753915c41cfe07253511c84b34de0e41983d64ca36ca0dac6922c325573249,0,1,3g2upl4pq6kufc4m.onion.xml
+c82fc176343c2425fb39f152c4819a3c68802a973835817b8fc2ab9cf2462db2,1,1,4gamer.net.xml
+8223ab030d3a507686a55a6d13875fea38888ee6e1aefcb086e0ff99d83116f4,1,1,888173.net.xml
+53ad3f31c9603c3fa9ef4e1737d60c314a2033b5646398e64986f1952d11bb2a,1,1,972mag.com.xml
+7a25ea9f7d589947b91e6c4d54f91fadb6727107093a0154936119eac027ff8b,1,1,A1WebStats.com.xml
+471b1cb8ca62bde3a1c77076ded432fee9ad7a31911abbdb70d99bd5a6c22f0f,0,1,AA.net.uk.xml
+a77b292e0258a8a9a81a8e05fa342741e226a1e024978fe7c6677c7c65150ae3,0,1,AAMC.org.xml
+f97657791892c8df7bdc53f8d0207d699859a190444fbf975e98861d4cf53650,0,1,ABIS-studien.se.xml
+b46e53a6f571bb484c20bd6d6506fdd6616e344cbd8c4ee987994878ba6f28b7,0,1,ACLU-of-Louisiana.xml
+ebb612af087df8278b2f48f19db43fb3cac73d6a4e9b4e1e58e37e1738164c7e,0,1,ACLU-of-Texas.xml
+9dd2d07280b679205432600769a989ace5a9feebe2ab2e5288b509719325be90,0,1,ADP_Screening_and_Selection_Services.xml
+276a2773697e1f02e05064c9caafa4958b2dbab8110457e719a14e3d15db499b,0,1,AEUP.eu.xml
+bde27e017263a64c388195a0091c24f9dffb1c23ce90deb3c63919c75bb5598f,0,1,AFCEA.xml
+9fcb7423caa4b2db65448eea1b798f7a4fa939e5f50cf55d934f37a8a5ea67e7,1,1,AGU.org.xml
+f8154916d6f3d0255e6589d3f054caa5644cf7a8a744c2aae37522463d78d7f0,0,1,ALSOActebis.xml
+a4e558ea2da104b30ed669a14016d712364b596f25b49a9cefc3a339622acd46,0,1,AMMEC.de.xml
+fdb40ffd6a457474b8b7ce3e12667c6fde61187460b7ad9e4cc2f1dc04b89205,1,1,AMetSoc.org.xml
+e0a596183d10f82f7039179e8031bf5d27f2afb43efc173da4c38862d7827142,0,1,AOptix.xml
+264085253948aa5b59a18c70206b9eece60a5099a73c6f8db8cb7fd6ac0c9c99,1,0,APO_Box.com.xml
+1d1610c5c021fe4971a3c73f2a7a718989786ce202bb464ba5e9b226436fd59a,1,0,ARPNetworks.com.xml
+12a54fdd75f8a200b6da25d78514f8ed3e3a3bc516307e3729b9220792921514,1,1,ARRL.xml
+dec3921e5bb388e22d0ecde04515a7263b9df10ecf6107700c79cc618d3a88cc,0,1,ATNAME.xml
+2b730c5435e15989ce7cd5f714b20fe9bc36f3ca56b78c1e4d85b4ba01bd3222,0,1,ATrpms.net.xml
+3e632fd55a29b917584ac35e60d0bdba0adc9d707aba3d7c541c79db1bd81da8,1,1,AVG.com.xml
+406d709a4fd37483cfbd763d8d6a17a98f3ecfede0fcee4a9a7405093b5dce6b,1,1,AXA_Winterthur.xml
+a60c7c65acc781e40afc32649894a7aff53c245970ca91c85743ae9df637539e,1,1,Aart_de_Vos.xml
+0010505a729eaac27f576a7f3f1b3648a21f0847103d8c00d9aa511b4758eae9,0,1,Abercrombie.xml
+dfde2866b7ef90b4edd3ff9e03fa9f1d4ba62b14864a901eecb7e8246de39024,1,1,Academy-of-Model-Aeronautics.xml
+3ace3b65a3c533db55345e50ccdb151b967e0d65a029286b8a9951fa9273646f,1,1,Accessorize.xml
+e870aa56bf0a79c94302665c8deb5aaf19aef59a030513d4bcfcb2741be474ad,1,0,Accordance_Bible.com.xml
+e3a863c01dd5fdfa2b204b371f9a16ce8fcc136e0a65241a9bf0f41ac3454b60,1,1,Account_Online.com.xml
+c058b6077ff1338a785e3e7bfd003eaaf0eda151b28e81cb76e4bacd3d25e116,1,1,Accountservergroup.com.xml
+299017a21aa2f2d62f8a3e289cb80398b46a3a649ccdad3b34b2c0660e68c3ac,1,1,Ace_Hotel.com.xml
+b3dfd66a48d1e541fee3ed314b832e2b039e191c04e5563fce8ee3ab71054925,1,1,Acenet.xml
+f377ffea5847776bd076e6e8fa38cd0e4153de88f0e331ed9836465441efb0f1,1,0,Acessoseguro.net.xml
+5306a00bbba97f3edf93cd3bfe9f2231ba896ddf81fda180d35b3d7d44ebcd89,1,1,Acro-Media.xml
+456fd4d09e6c35ce998d9bc48a14678c06ca3daeb0c273e23232d8736b734e18,1,0,Act-On-Software.xml
+15a0856f0603c5730add28e9a2e6a36acc432c7704a7bb007517f496cd35fc65,1,1,ActionKit.com.xml
+7d7739709de4be107d5f32d7bb0c84ece7761f864e6d9b434b3c239db0b247c9,1,0,Active-Events.xml
+c60221ccd829ab0724101819b906f5c4ccd5b873d62b7bcdd15c5bd0003d6ef1,1,0,Active.com.xml
+8f3e75367b17bc3d389eacda994ed6cd57fd7334cb2c82a30d58d44c2051710e,1,0,Active_Melody.xml
+d35917ccc23128fe80d44bcd2ad4bdddf8487d216e51525f54e75977ec52e1d2,1,1,Active_Network.com.xml
+fc7c90d849f4bb81243211a9562b2c2b9a56cd5bbbdfe376a1c891c0c3fce0e2,1,1,Activision_Blizzard.com.xml
+e87c8a23db52372be00ffa86181ccc6e32cea7ff5f646f884a452187c543f2d3,0,1,AdJuggler-problematic.xml
+5dffa6059f25b1934cbcb4b3c3cadfc7f0c45711cf7a3940141fe366c1dc632a,1,1,AdJuggler.xml
+c781e81a341599aecb674a36f114512b59f5f7930fc309097a456c71e28db902,1,1,Adaptavist.com.xml
+41cb473fd48fd1426473a4b354e411f72cbd21f785e70587407d0d76eb4b1439,1,0,Adbooth.net.xml
+92c3d1535f321874ed0ae5dc36c44342c32dbe4fd19e1d86d8bc5b1c9887204e,1,1,Addison.com.hk.xml
+fb4bb543e6864dac40ac3c6bd5bd334eafeb53da00be2cd0100eb00f4cded31b,1,0,Addison_Lee.xml
+e0ff242fb2ed135c25e1a448a2daca9cf95a16e57c989bfdfeed1bd97b32667e,0,1,Adelaide.edu.au.xml
+a739830eca763ae9a818d8ab8919a0fc8c20a857877dab194e0424ee0644cc1b,0,1,Adestra.xml
+f5baecc41e25a8692ba863429d14c3bf84e8dc68684d8ca4c4fde749996e3c31,0,1,Adkontekst.pl-problematic.xml
+ce56c65406df4436852f26458e9264c88c627758762ab195945b3e30a19353d4,1,1,Adobe_login.com.xml
+55617aacb1813b061771e4f721507b7bd5b63d25478c1725256e12085e03b36a,1,0,Adpay.com.xml
+f914b14018606153a7c24280dff27d29e752c1d4219f548fda58fb25becd3a77,1,0,Adult_Webmaster_Empire.xml
+7cb2786a2b879652734cbb50bbd97b194bdb20a9ee61e7bcad4f2c8f4e0e081f,1,1,AdvertServe.com.xml
+00bc0f8d49ed0c18f7f093f5a131fd8a2c0272abc61fadf67390f165850902e3,1,1,Adverticum.xml
+2e68f7aa2b6c7621049ae1fdb584c4a851715e61e1756605f9fef462365e1e9f,1,1,Adverts.ie.xml
+d739ae917fa93939b84610ee6f929652200a550db28565e5ab38e60f7e82163a,0,1,Advisor_Mailout.com.xml
+94cd248d16402173c247f14ae927f72c16737f5d59fdbe8e789a543bc9c92dac,1,0,AeXp-static.com.xml
+448b66df63589e61859860a7af43ec4fdc1f5e80ef85755b137b966cec8df262,0,1,Aereo.com-problematic.xml
+004141042389a227021f73c7e33b69086d8202034e4e2b387670f82769d6a411,1,1,Affili.net.xml
+d7080434a9f73a06d758696e4ec5e7b3c60968c0c1a4271e70e32cdf4ac1a170,0,1,Afford.com.xml
+0d3d535b12985b71c14e04ad635d3ae2ae6c5b1a869f3b9a2a664dae9492767a,1,0,Agari.xml
+1893f4cc7fcce53078404d3fc8962e0012bf30b9788af805942b6f07a2fb36c4,1,1,Agri_Supply.com.xml
+af6ba8f96429ea0d649275a6cada17a2d691e8d3fb35f37f498f9a11ce1f91f0,1,0,Ahm.com.au.xml
+7cc75135ed0cd3b81ef62e24de4ca2da433caeb54b12aca1bd0d4efdc01f31db,1,0,Akamai.xml
+5e1cdb7d9af34842a8c2b7c7f414caa8b84bafe4072bb7d883f7084dd5edcdfb,0,1,Akban.org.xml
+eb52feaec70c7afe2368ad23be6728e6828280b983a39991d2e31fe51ae6ec17,0,1,Akinator.com.xml
+699895da3cfb27a96f1d6a46ed31aaa29c34653a511057a9ead4861a3722db7f,1,0,Aktion-Deutschland-Hilft.de.xml
+187e9c128e4b4237887a14de2f1efeb6fdf647e2549b0abb4f2fc09112879a59,1,1,Alcatel-Lucent.com.xml
+1a75f296456093e211748b9d5dc4f8c2460d36d5ea29f0a72872e00ccaa93a94,1,1,Aleavia.xml
+a275d12398d9e55d91c2b48ac3733fcbdb64251ff7098b39fc28c2996de573f4,1,1,Alert_Investor_Relations.xml
+691e2338225111a1b09f19c600acdbeb09e900d0ef7595d6a5588fb54c3e37eb,0,1,Alibaba.xml
+e5c67d653dde583fa8a8f5e0afcdbde59247ccdaac71972115bd27b769e469dd,0,1,Allianz_fur_Cyber-Sicherheit.xml
+32f4695b029c352f7dff4eb59d4b5e19a648e8feb3b737878b772bc2a9609176,1,0,AlliedMods.xml
+3ceec0f2763c711f5f4b5b43c4dcb2c58e4e94ddea1fdca51018d4f5b03b4d4f,0,1,Ally_Financial-problematic.xml
+51262d5e1bb4a313c8ac7a866f4b31d429585df60e66a630771066099d190716,1,1,Altera.com.xml
+5d30fe7992767abd2f1648d0508b16d78a0333eda4a987917db02ef25941175e,1,1,Alticore.xml
+50a3d1c2bc7e498fe0d89321f53d144e668803742d1c19b0e3e4d2007621ef6f,1,1,AlumFX.com.xml
+83aae8644fbd60dda604ede8c58cd14dc739f87281bba346cead0c5989ab41df,1,1,Alzforum.org.xml
+4127fbcd8c7aebf2b075ae24d003bd16ecda40badc5e10a43692c51ae9902fdd,1,1,Alzheimers_Association.xml
+b026e083c80c6f98518189b67d38b2e7bddf53fd115db0e144e8bc3ed2c8e933,1,0,Alzheimers_Society.xml
+fd44fb9d85d3ea27ebcf317f6c0529d2dc6862604f82f1f48a03fac77bad06e8,1,1,Amber_Swann_Publishing.xml
+70ac36559fc444a01a91bb411bcbd38d4418bda22a84084bf81b316c42aad7b7,1,0,Amd.co.at.xml
+65f0082277fdcc1873158996ca405d0fb8f7db9a4633b2142ae014a826066f9f,0,1,American-Postal-Workers-Union.xml
+5365603eba6a90d384eef5b01bf8985b659093cca2ddba066b78d06d87ea0ca8,1,0,American_Academy_of_Neurology.xml
+f58f2cd4524af0b47bee314b416ba5ef4be1213d7db98f2a18fdac91492c6e48,1,1,American_Ancestors.org.xml
+92e9a46b0c218161a6977d43f3ad0e2c2e175caa825d293044f5a8f2b00cb13d,1,1,American_Bar_Association.xml
+df85d394f005f959e805ee526de3801708f5c61a2379604202d22c6dcd4742e9,1,0,American_College_of_Radiology.xml
+79271c5ed9f153da84ab9914b1e98622bc8d3b51c30fba7bf0f7047863831247,1,1,American_Heart.org.xml
+f2c64f5833815703ac02cbd11efd4c4e48132a3c81a6196692fb4734580c20b8,1,1,Amiando.xml
+dd70debfd991bb22af84defbd2e2e138ffcb6833abc14c2306ca8a74884adc69,1,1,Analytics.edgesuite.net.xml
+b5ae6c5519ee1727036dbfbaed594fec60654b0e534350c2799ddde2b1259472,0,1,Anders.com.xml
+0d5ae660c24c66e5c6521950658bbf3130fd5b3803ef7caf0523b80519580e58,1,1,Animoto.com.xml
+97a0818a118c603fb45f76723e857af28aeabe0b668b7ec35e4c554ff9660975,1,0,AnnualCreditReport.com.xml
+160285b816e182481868f37c9b2bc23013ad94a5749227eb6e34be710ec7c57d,0,1,Anonymizer.xml
+af2eac7a517c666c869e80a72d8e077915069bce3435d7d465b60393ed94b4f1,0,1,Antifa.cz.xml
+187ce6d87d040f1cf02412e81bf7864a3981614318d9b91a8b59c39828772b37,0,1,AppThemes.com.xml
+9f93c63514ef6ca29521cf00a0a3c8504c12c8be7dbdaffe3d19a7a837fb28a6,0,1,Applebees.xml
+f6df9862c3d4f316ad29a953c74defc81d73ddcedeb0d88f48ced3d45e7910b6,0,1,Applicom.xml
+d4c84528d88d91dd63d1f67c6fb47e38fbaf8e5a22c2b1c362ffd68c52d449e2,1,0,Aquent.xml
+df29ec4c06bdc5c8adf99c1ac94e4c583a09c800aa6a5befde1dbba03a92694b,1,0,Aquiss.xml
+1b55285393adb6253ffe5d1b8eae0e7ec7a2f09dcc0a10f18cf2c2beb489784b,0,1,Architects_Journal.xml
+420a2671c39d5d7ef278de619e17ed6f0f9530656d2200e35186d8050337e0d0,0,1,Archomedia.xml
+a2afbfa23bd03a416c6835d25abaa56f08f1b958f49b1af5f539d1d805929c98,1,0,Argonne-National-Laboratory.xml
+b7da8eb71bac9196944afa62279d4f6c1143b87a1ba2090b301c1f760164bead,0,1,Arizona_State_University-problematic.xml
+35b8bcb9a8c7ca87094f12b24aba2343a5087db4abc52cf267ca2303b36c2af8,0,1,ArmyTimes.com.xml
+cda60d257787e7061e709192d5cf0a94a4984b46985afa9f3b0cfd0dcef90cee,0,1,Armyoutlet.de.xml
+deaf1f8eefa9c210569f9f4f765b65abc1dfdae41d569ce26661ecc62329ab26,0,1,ArtChristina.xml
+7a27bf5aa36474cdb4f6be7c8acba249c5f15b44c4343b8dbafa8733792b587f,1,1,Art_Lebedev.ru.xml
+9ab5584b55ec935924daf83d9f2ede2f2cebc76604d5465536225d1cd3db786b,1,0,Asahi_Shimbun.xml
+f9990d6c03425415964794d370821ab71b241c42ecb3ca3470f4f68a91c6b753,1,1,Ashford.com.xml
+9df71aa013165efa180c520096902f74771dc83d900cb04ed8c7cb5b82025b8b,0,1,Ask_a_Patient.xml
+c7a5b3c8f14fc542deadaa515a2c62cd7837363313997853f1bcca5c8841ddd9,0,1,Asknet.xml
+ee30c86b81fee828b7b66094087dad1ceada6a09b8846c76e1323017614a41ae,0,1,Asmc.de.xml
+d262fbf653e06eae187698c0fde725bd7227fb6ae69b0f8ed0a579d28ec582d9,0,1,Asnetworks.com.xml
+a1a402d40a355131bf1e37b4c0a6b8c8e084191cd61fe56af0ed34936e72e61b,1,0,Aspen.com.xml
+1d869ec0561b6315e5a76adb6647f320420368539419435c266a2d5fcea3e1e2,1,0,Aspsys.com.xml
+757f6d69b3b210524c02e9568327d146094fea887b981abd5cde8bfc0be27fe9,1,1,Assayassured.co.uk.xml
+ac0e2ffaed6bfd83b89d6afbfc399d307ed3cec22127daf150363ebf87bd19b8,0,1,Assembla-mismatches.xml
+59ed37f0dd3e4eccecd52a1d9870385931f4232c8c206bf38fd5be09ac71c69b,1,0,Assembla.xml
+a5863f348dec427d596329290881cb9c98ae69b9750e221c6671f4d8f71db317,1,1,Association_for_Learning_Technology.xml
+69d39068d71ebbbe56a4f4c895624727b18fd4078a9ca49b5fa171faadbc243a,1,1,Asterisk_Exchange.xml
+3d5ed7f1111c25632f3b7292512a4a9e264500c02ceba089033607e8885f5a87,1,0,Atlantic.net.xml
+895e39745fbfc4d380f4420f1cf25cf081d509a3769b92d74b51ecf096f88d3f,1,0,Atrativa.com.br.xml
+cd59b21753dc080061d890781f4f8b140208a2cbccfbab0f050eb31dbcfc6a21,1,0,Attracta.xml
+a5fdb3bb0c29355ff44f0bf35678043d85d2c9fe07316744efb753c2ceb955a6,1,0,Audible.de.xml
+95bb51781fa963035cd1a58058b9bfdfc9abfbc3ffb4f8d7e21ac08f3339e504,1,1,Audience_IQ.com.xml
+e93b07e0b6cc742be0b8402e08c42fad688a33ab622fc34541ff95d78ab98c84,0,1,AutoTrack.nl.xml
+5c3a3f5275c8e00d18aa36f50a1e4feaf8fe8e703eabc2bb2110c803b7004207,0,1,Automotive-Industries.xml
+8faac2dc54797656378a0a9ae829bb67ee8a653695ad946842dc0e80a9879779,1,0,Avangate.xml
+7f5b9cdfe9276bf67d2a4bbbd009f9f3d2fad527198a2e5f8ce1b8cdc2d3235d,1,0,Avaya.xml
+7e32f6880a2dee58ee25136d1d36244edae86abaa00015db534b174ac543d77f,1,0,Avinc.com.xml
+08bbac27f594c550b305154cc02cc5988b7cc1c6976c6bd6ffddb0fac17bb590,0,1,Avtrade.xml
+9b72647c715ae4fef53f22ce772e79a5dc5853ab6e8dec175bbcdebd769e5c07,0,1,Avue_Digital_Services.xml
+74d92b32d3809a7a7971171faadf4515df67bb8a33af80353a53826a45326e82,1,1,Axantum.com.xml
+aa3e6486761566210c9bfa7fbe3d495a5d7273bfe0632ac3efe0a1793a585671,1,1,Axel-Springer.xml
+f6468f106fec675cba71920bfd2243936771900e9d15bc40349e5d5bbcf0e3c9,1,1,BASE.xml
+bbbfd3e4a82e15d4d89dad020b350321c0fca4e5e8b89075201cc8861f1a7fdc,1,0,BCGolf.com-mismatches.xml
+5a01a4ef9e0b0e572a6d075091320139a3748bb339b996271e71fde911ab68d1,0,1,BHosting.ru.xml
+6844b64d58c80eff8e30edee7d55d176d295fe2294b5220be007c536f929eda7,0,1,BIKT.xml
+a5c928606e0d561e5d440f462785ac080a8573075ecb058ca61d7467dbe1118f,1,1,BLOX.xml
+2f97c8acb30a49ebee76c6baffea70625f0fe101f79860965816b3416940f04e,1,0,BMC.com.xml
+f220626aac6f6f1da031f3bd445bef227d59da713beb06685215af440614d8aa,0,1,BTH.se.xml
+f02719e41dfc1e6cf086314cb5d1b4fdf6495ca9e012de645a3e62bb9fafae95,0,1,BTR_CDN.com.xml
+1f8a223fef58d2230c7688901cd5a2b66dfce9d34b6ebff320e54fa2ca1e9482,0,1,BTR_static.com.xml
+d6eb4f47bb565d059dbdf0ab826d37a817a8e460b4311d411a870bfe8a1d1fa6,1,1,BabyMed.com.xml
+5227426403d71b31d56748097f18c23e1d5a998e3affb1392b16594c57fc9126,1,0,Backcountry.com.xml
+35c9ec0e0c41b6699ae89b448b17ccd757f53a3fcc28c44258f2ac512f44a3b4,0,1,Bahn-BKK.xml
+afe0cb9f879460f9754e11ead8b76e9e36684548dc1f3ba9721da1806ba94ae3,1,0,BalaBit.com.xml
+193bdef49c71f93c783fcc8600a835156cfe321b00943b81cc1c9f4dc048c87d,0,1,Balkongshoppen.se.xml
+ffe89a541e79d166ab51bb9585db0ccad767e29203521e306764c7f0b80cf5e2,1,1,Balsamiq.xml
+4d64f5fbdeb952a226359e530e592e1675a9b5447cf754cb586c11dfffd2611d,0,1,Bangor-University-self-signed.xml
+c0572421747129369f8219d06a95b1e5ba601619dc79095bb4b459458f30850d,1,1,BankofScotland.de.xml
+811e7555f76a87ebeded357e918a1fd67d34f72bd9b7d3dfd6b61f6cc97ae335,1,0,Banque_CIC.xml
+3cfecf241423076e62d74a2ea4fe98ac038526a14652dc28d053e64390218d5f,1,1,Bardwil_Home.xml
+b60d916c30d712566b0fd5b697b4a754a4d7fb05597485109a1c9d92f721dbd4,1,1,BarnesandNoble.xml
+3671a9a071ce22b0d7ebffd007a6164eb32681c72692e4ae734895f4e3592691,0,1,Bartleby.com.xml
+06d7ddc36e464c176e85127f3364705691b70fec942e9163fb78fe4dca6e6ccc,1,1,Battelle.xml
+e53b66541d1bc87544993925566d303fcf2dc85f6fdb84a831b5e548ab65ad22,1,0,Battle.net.xml
+7cf5aadbcf3f8af1e874d034d45865b41f7dd57449aa653220901edcfd4880c7,1,0,Bauhaus-University_Weimar.xml
+8c5c56a3ae46e7b0e0dff2f9c0109cdea46cb5aa1332746944a2fee27c8f993d,0,1,Bayan.ir-expired.xml
+1ca67dd8c8e778bde03249a0ef9d97a48259a2d8261222df72e54d3ad1c63d21,1,1,Bbsey.es.xml
+c34685ecb3fb87f6100e138ac70635fe33ece2a7d6a636ece3d702a2494a45c6,1,1,BeCoquin.com.xml
+2c3ef75bae006356ec0462053c32b3dd70e0486cdb889243746fcd64074d3a3c,1,0,BeNaughty.com.xml
+12129b04f6dd2125cfb4b15ef93ff8bd2d6224ed9430565825912e54a0522176,0,1,BeastNode-problematic.xml
+f538f44371178d2f1c7c9b2956fb6fcf9c453aa7a05700f9c63cd56caf09e196,1,0,Beaverbrooks.co.uk.xml
+72f0100b35813d1d23dd13e8cd8a9b707db6323a37c5528fbba66ac557f3077b,1,0,BeenVerified.xml
+d69ef30208a20afc98cca9bcc5fc6af1b67a7328f3773ddb9f47665539183228,1,1,Belkin.xml
+774ce0054a322ac1ac0ec628ac8fd5905f72750d3c618790d14aff98474fd3f1,0,1,Belly_Button_Biodiversity.xml
+4fa3697cf81af513b6a90b5cedbb048caebd70f8035f36ac80b193d040e0f173,1,1,Belnet.be.xml
+d1cc057906222afeaad9143a7a19f12da584f2301f648e424e38c19394bf0705,1,0,Bennetts.xml
+f8a9517520b6042b8d0106a36de5e62b23ca5f353a9e02558cf495d86b466bb9,1,1,Benzinga.com.xml
+0dc9ce63ba5308df05d72ddd5e472216806bb7c13248cf3ffdaa9c4b66b331b7,0,1,Berliner-Energietisch.xml
+2809c2e484297fa0bc3ec2c02d1e646b272d8f2b9db0af829e6bdac955efc1c2,1,0,Bestcovery.com.xml
+10862e3c350ba15fe9258295149a8f688c3a6669527ba1ddc003efd50b0db2d5,0,1,Better_Sales.se.xml
+85369d0cd3eaa85d5426e92adefe7af4f9f814d1e0e15576cb81373454683ca3,0,1,Biciperros.org.xml
+d68ee3cc47157f440dacfb19f654c89b597cfb31cc7bde24504adfe61ee50c05,1,1,BigCommerce.xml
+ed5df40362cb3e1124a4a48ac5a4c876987e58beeea367a46a912ac59c7288c8,1,1,Big_Concerts.xml
+bc1dce36b45b3964aa4ad44bac9f4f21f9ae6c58f7c538f56ac592aec5e9c56c,0,1,Bild.de-mixed.xml
+dc5adf6c19510d6c30641e13b570ae53d2b027a52bf710efcb332650b99b11b7,1,0,Billiger.de.xml
+66039ca34034afbc98fb093623ea40b2ba4f8fe8f733763a593ba204f4731453,0,1,Binary-Biz.xml
+113777f338466bc6512680297e9af75a0ec7d94855ec4e652710551dfa5be09a,1,1,Binero.se.xml
+59d72a6ec8f9c18c9d47abbb9999d6dba95204101d8492d4d921599bfda7a9fc,1,0,Biotrim_Labs.com.xml
+a0134fe6daf1357222392652186d939db2bff2d536c66f04be36c9cc4d40d016,1,1,Birthday_in_a_Box.xml
+573cba521c4d30634c5a52f669401e6fa01062c2ac6862f3a084d43b566d34e7,1,1,Bishop_Interactive.xml
+0e7aa1032567406b6d90062e0aea70739d396e8df454174215feffc75583274c,0,1,Bitcoin_Plus.xml
+d8ee4c87b0620b6042c91603f08487127062a0a139d668e8c750d02a08fb2a77,0,1,Bitsontherun.com.xml
+08fef6e8d57b0a993adafca479dc40f171557bd674f61c1de7347fe97871ea63,0,1,BlackDiamondEquipment.com.xml
+6601feab3dbc022ef37296d161f15fa92f5d1235d8aebfe882f0e6e447e18775,1,1,BlackTonic.com.xml
+0e454d16adbcb95ee565d998a6275a57e98d6f89d3e261a31ef9b7a006a9f692,1,0,BlackVPN.xml
+488fd6c9aaf93eddc2eb9d2bda98d612269a42d022db8d847eb51910ab0a1595,0,1,Black_Box.co.uk.xml
+3b4d5afa29fc1c08ba4f9bba3efa9c6864ef88073269865673fa63074e5a6ec5,1,0,Black_Duck_Software.com.xml
+26d68e684c4b831a43fedd18972f20da578d54bcd88cefa69adab09d570ffcaa,1,0,Blau.de.xml
+8197a554073f79c50efa6b58339f3d3908a786c5041c7e446e3f94d2e41fe190,0,1,Blaze.com.xml
+d081389526c163f91d221dc4e3f6581207b863cd53970e1880ce0c72f335f5bd,1,0,Blazonco.com.xml
+878916341a96e0461e4eaa31ff855f8bcdcfe3df38c204200f5a4ee26c0ed2c1,0,1,BlimpMe.com.xml
+c532f455966d1864042489e42a050a7d2f7c59dcb18deb69de94d6a18599565b,0,1,BlockScript.xml
+5f627234aca463926eac998ef133407e322eb94921136ef0dcd5acb73423d1c0,0,1,BlockitPocket.com.xml
+f74faa732db51e1226ecbb603ed1bcea00ddb67a6d5ffe2e1b922471ea33a107,0,1,Blog.ir.xml
+1f133fbee8bcb5a78a7b039865a38c14c1e6435f48d93a61a9125ccc4d83f90c,1,1,BlogTalkRadio.xml
+0345c0f4ef1e2c9b07dd7af1ef177809cb3437ca02fe2d6e4eeff5bc45d8c2b9,1,1,Blogg.se.xml
+3958f7571262401df5596dc64eb26c150ccc8e8cb412301000e4c13d5561b13e,0,1,Blottr.xml
+b3fa84409abf942170fa0a73032e4a05a134968155340466e8a776a7b0a7cc77,1,0,BlueSSL.xml
+35530c1de082fe8c03754f797d1dfc1696c62ccde7587877e11be615397e8f50,0,1,BlueZ.xml
+fec60c661c82f9e6973e837a53a3604a7bd2dd503dd1d31b7a6802a84f4db6ca,0,1,Bluegiga.com.xml
+3a9ea6977bb0bec960b933eb5fe45b15527fd66b114e2fcc16db7aac0b0fe105,1,1,Bluehosting.pl.xml
+a9a5d4fddac6d697f375624eaf93768c3830b8f4a02ab875bef448a248632fec,1,0,Bluemix.net.xml
+049d52950b84b0ad4a13c8d019b8a1c0431dcb8134a602dce2de09747b89fed4,0,1,Blutmagie.de.xml
+c9a373826a1033dcb91fe698e08565a239407f4dbe6b4b9e665763369fcf482d,1,1,Boerse_Frankfurt.xml
+42244265357ba444d6ae9d1307d6e2e52b442206eabe091dd84d109cab1c04b9,0,1,Bolagsverket.se.xml
+a553123cfce927b1c373d5ce2380bf609f9d6dca9a8e61d51ecffcc5edece1d3,1,1,Booking.com.xml
+7a7a503d185e2edfd16ea359cf98ccab897c35723e5fabef91c8e3ad9f62ee26,1,0,Boots.com.xml
+45421bcab88efc09f590ba1deb06a30f8ebbfa1178d7061f2c06def617407790,0,1,Boots.ie.xml
+33fdd006644fc9144ab8e95658080cc6a7a02dbd974d3ef819a370534b3af584,1,1,Bosch-Sensortec.com.xml
+cd5d99534f588512306421c08f2731bd2e8f7bf28d34a8ff58ccc0ce90db9d0c,0,1,Bosch.com.xml
+82bd19dea8f72137448543133b8f92a4d5a51ba51ffa09ebb42ff5bbfac4a787,1,1,BoxOffice.xml
+7c899ec80cc19d4ae8e2999849a3624f6891c104df4058edd230652897815e28,0,1,BrainBench.xml
+8d94c07043530873917a955ddc49f56d1004c0fb4c1ff72b6f9d94eca9aa5b03,1,0,Brainshark.xml
+fbf85e04eab9c52f529decf30cd53a57da2d70650241c0116447e78e3f8077ad,1,0,Brainsonic.xml
+3fbe3fba810c1999458523eb42e7066bcacb7f5f134e0b86ea220ab111fc5a73,1,1,Brainstorage.me.xml
+bb99bc99df1c831b11f24c7b67956dc23df65fd60e912ffdcc34ae62d34b5845,0,1,BreNet-mismatches.xml
+c868592f7203fe56cfaf6f91a4c8982cd132e3e09617de3c7d4134a85eb39568,1,1,Breuninger.xml
+0e2a8dc117d3acd6fb19e37f88bfe2027d3f5b253b3a1c1331fcb8a4058db82a,1,1,Briggs_and_Riley.xml
+5fe89f289d284cd7126a18158e7c3fa5d2a7a288112d158836291a8383e0886a,0,1,BrightTag-problematic.xml
+9fbbf43514333a5a4dc5cc25f26f3687485fd24d043af068d148f808a76a894f,1,0,Brightcove.xml
+9450fdcdde9f469e30ea3b62c725b33adc64bd353f99ff52a38c70e42e8cb58f,1,0,Brighton.xml
+07b6e7331097c6a623202e7c864131d2bf7a686411c6f6435e350f50d7ddd29c,0,1,BriteObjects.xml
+087639bc23c5c1d881eb705e36827a4dcaa30a6009a986b030a7b2cae0183aff,1,1,British_National_Formulary.xml
+a511d6d05a4c679cf818c0eb369fd0038cce2736bee09f45e8a018948a3a8b73,1,0,British_Red_Cross.xml
+32b9248b21536ba2f3543da40e005493be51e230f39f5728920e45a5d5afa9f5,1,1,Bronto_Software.xml
+b8a7549d679696fcac931a3b47b361c08b2c57690fa83635ea9ab16907a4c895,1,1,Brown-Paper-Tickets.xml
+4325d39e0e10a221fef89c4c06e91596114b3a730107e98de7d66f473cc3a759,0,1,Browser_Addon.com.xml
+08ccc26490b9f326c737e8ebb878ce2f46f8131fc47bebf0b68051adfc09fbb7,0,1,BruCON.org.xml
+15045b256d3c25cb833b608efdb944f2dbe76c4e7dd2e666e3fe975ca5534e04,0,1,Bruno-Postle.xml
+51249e771817637e82f106f9105c78ae51b0d4f9ea6690ecfccdad8d997f1619,0,1,Bruteforce.gr.xml
+cdfc30bffe359836ae3497140988a0e232b84ec88b89e1173bc7cb0bb0b3bcd4,1,1,BucketListly.com.xml
+8e7f67c2c91f31f555d547b8c28b2fda823f60ac8cbf7343bcf63b2b3279db12,1,1,BuddyPress.org.xml
+dd371551522c75ec9295ca5f17700e00b4ce5487edc6512957a9e66a5329a476,1,1,Budgetkredit.ch.xml
+42207f5a81e9c20cfeffbda745d6b910f88f06740f8d21e3252abfb9ce7fac35,1,1,Bulletproof_Exec.com.xml
+b868f832ff3636c59aa9c3c764058525b955fd7160f2885afa2e1a2a4ab4d1af,1,1,Bundeskanzlerin.xml
+4a993016b9d3017b227427c90e48cd8373fd6134897945f279849307d9f40a77,1,1,Bundespolizei.xml
+729e6bac190e385ebcdcaff9a55511b012dc9487b95fb2db92126227a459d14a,0,1,Bundesverband_IT-Mittelstand.xml
+7a65a358848726715fb7e1ff742b7dc41fd1078f94ffdc4a4963ceae9abbf330,0,1,Burstnet.com.xml
+a7275bcfe771b298e64447d2124dc4b1025079638ada3663ff20283d3e264bb3,1,1,Business_2_Community.xml
+1828776117613179b01abfeeb5c873f8198051e1a751002ee4bc516169072d90,0,1,Business_Catalyst.com.xml
+f84dc3b861bdd8e0606b938940f1acc036781645b2abf5db29d86a81897ba279,1,0,BuySellAds.xml
+7a7763a7ff5ea2984706824337edf735a0b89de74fc26db49e859ecbc4ff0661,1,1,Buy_Veteran.xml
+b538310cfbe7f06f481c733d23a8b41facd488c3a91f0613142b44155369e6db,0,1,BuzzFocus.xml
+97d0a30dada7f04c8cb3429a1048b8ac805bfd37e57920737e76e97124366f38,1,1,Byteark.com.xml
+59445b251d79594d7aa1407e55b9567d488c9dfaf69a539fc55557e142a84ffb,1,0,CAREpackage.xml
+815b13c84f20fa674c550256fd7f0faff27092abe79bb7f6994d68604d6219d3,0,1,CARI.net-self-signed.xml
+cb89627369982908c0f26a2057bfc12a61b87dc3859a7524a6fb20f638d07db2,1,0,CBSIstatic.net.xml
+a753690fd77b86bf61011ed27f054c2415145c25276bde90dfc628846af112d8,0,1,CDN77.com-problematic.xml
+91cd42e26c618a6f255052b9e8f5e45427b3b9a22e5f9fafd9ac51369f9bdf3e,1,1,CDN77.com.xml
+cf5327ce99f02ed18d5249e6578f78a7584c6f43c05d2cd4ddf8a1aef16a1223,0,1,CDWG.xml
+4e62d9366810238d6a5c6c158302001663b2614a37f9ab6051adb058057f5264,1,0,CD_Universe.xml
+d6a8f71386d93781c880b1b2a5745306b956ce7a6e9054a32c8180e1d5882de3,0,1,CED-Magazine.xml
+3ed7d88f741d017d81079b08092a0b75a1bd408adac37b7fb215109394c72deb,1,0,CERT-Bund.xml
+e0bc56896fb53e6613aa9a3f3763ad2d52d4e33cd6df56902ec986f73533f469,1,0,CERT-Verbund.xml
+93dc55d6a222b5dd2fd74e0f6ab9461b388709001769611fda746eaf6cee2f87,1,0,CERT.at.xml
+ba6674337fbbf9905f5cb4804d367cae792ece098bf42cc5d6b97c311edc4ccb,1,1,CEntrance.xml
+fe1cb1da747d4c59487f8561bd5d048a746a615428080805d68bd12f5a45d764,1,0,CHIP-Kiosk.de.xml
+fc08fadbc356c1c170c2e48c51fd76cf1e6238e5c6d1eb71e76f0b9c4def968d,0,1,CHIP-Online-mismatches.xml
+ceec987f3e67e3e7b1f4cec6c706fc9e0dcf3bb51ef908f6a7122b195a9f3e13,0,1,CHL.it.xml
+dbc46881deffd783f88ddcd087523d767b4fbbe2c73a1266479dd4e46670b5d2,1,1,CIBC.xml
+4a3251f6ef0a80747dc6d59dd8975adb0d07942f4babd0fc8ea79048f2be6f24,0,1,CICLOPS.xml
+bbeac73bb5a9ae8cbe2b25f35490c13cabf5cc706ebcd3c7cc334c852bc754b7,1,0,CIO.com.xml
+dac42200d1d949890405596afc238f175edbeaf06a39176b40e16234f5b8ebe9,0,1,CLIC-study.xml
+96a1e4d8a7a151bf30f2ce5bdbcb762f5322add6297e6a17c1d26ede3953146a,1,1,COSMOS_magazine.xml
+7ad4d3c27fac03a257936dd9c380abec312479338110714cb22eb95085035d35,0,1,CTOvision.com.xml
+df7e93723ac3330c2859e73e2c28a08791e41be17d4586f5bb3a610ece41c7a9,1,1,Cabal_WS.xml
+496e7c05fe03d3ef39378a01c47ab48dd3cce74f05ee486588bc569e1a230c29,0,1,CableTV.com.xml
+0cf99299088ed1e5c7b0392b22233d2fae9545c038c78270c6fb8def0df55c32,1,1,CacheFly.xml
+2b9ec7a31a1ef2ecfd802b57c36056e193b665f99ff11b3e612cd7adbd47e056,1,1,Cadence-Design-Systems.xml
+04a9f7119bd93b943ec37555c866274a2f8af7239be84e78388b0ec6fa56eb0c,1,1,Cadw.xml
+e55fdb3ed55be22fc13d061d3ad8574dcb11a1f33a5cbd00f06e08919a187b10,1,1,CainTV.xml
+12623ec61a5d5503db22f3e44b0593f77e1d37e42a5b7223da9649fc4c43a26a,1,0,Calendars.com.xml
+54b9ec4e58489329294ea814503b75b685a861fa36329912f7c5508107aad516,1,1,Caller.com.xml
+213b44c9505b03054a9590a41dd3995d718801ddc16553e2c3e35596e3f301f2,0,1,Campina-mismatches.xml
+528b6476090e1c81a1576d377aa8826d779a297d92403f52bafb36a1b943a5cc,1,1,CanadaHelps.xml
+7361432018d08c1eb212a2c9d1cdb6901fad4a8a2486a3bbc5985dc410d0fcb4,1,1,CanadaPost.xml
+5d08dda7d1b74303183590208bbf76c0a0ea1df76df2b3497beaad6d8f332054,1,1,Canadian_Press.xml
+aa84ff00fbeb0f753bb8fe1414ccdf017caf54f3df9c4ed98bd4c51b34974fd2,1,1,CandH_Lures.com.xml
+90eff7965a6d548ff46af2a7b4047fc367be453a1c2570c6bd022de54509c796,0,1,Capistrano.xml
+8d34adc4fc479c3b59361d7f5e438717feca76f7dca3490ecf92af5dcc75ded1,1,0,Cargo.xml
+b0646f0d9bf56655517ee0319fa8db5608f3c1ef08469771ee6578cf4184709e,1,0,Carl_Zeiss.xml
+3852082463af19e77d7399ccbdb262aadec30307485ede3196168b1ab6c8c05c,1,0,Carleton.ca.xml
+c047260fe241591aff0d21678c993c268a8e8e26a0a9a2bed56c4fc93d6a9d2d,0,1,CarltonBale.com.xml
+141ea88067d92c50d1a74818556a91d19f24ee41f0104520f795975cd83391af,1,0,Carnegie-Mellon-University.xml
+cb7405d2c2753f150dbe71bc0859cfbfabaff2a13093a8408e93bc1c5f5770e2,0,1,Caseking.biz.xml
+8d20c6d30851429f971fef3d1209f0352f9b1bcd5fbe6e3d9c17ab4b4f5b5115,1,1,Cases_Ladder.xml
+811c33d7ad9dde56ad15954e3460969dab20d0f9fa930584443266e21feff865,1,1,Casro.xml
+f20f66759481152d644ac6d66b0beb2c0c6294a7f5c3931b3ddab5c43aa95551,0,1,Cdngeek.net.xml
+e3d1fbf663250b13e6cec1485aa7fe068e14180f6883b42fa9681f007004852f,1,1,Cdnme.se.xml
+b09ee57848b20dc5f0edde7dff31b6dd704d171d7494f0b4e566b62c8587cded,1,1,CeBIT.de.xml
+ff8d40bf74ef03e97bb141833608fd1af15eadf315b3d4375b2f343a6ffe8043,0,1,Center-for-Documentation-of-Violations-in-Syria.xml
+7d22b530e3d76f27ad05eb2b78c570d62bcaf8ae57582777e110f1a5d5c58ae3,1,0,Centre_for_the_Protection_of_National_Infrastructure.xml
+5bd8e0e2fd30fc0a28fd33d451a35b60e7275837c4fd405dfce8bc81af27ead1,1,0,Cfapps.io.xml
+657c3fc76a95e653075c9146e79384f35deb6602ff616d54387921bbab2c83a3,1,1,Chakas_Mmm.com.xml
+a9462ddd5256f9df0f92ac9e68dee69860bc04afeda1ad4ca62d125ba046e723,1,0,ChampionCasino.net.xml
+5af512985fa4e71798ebbb40592cb7de443d76a65e66ac2b270853590d4ec0f0,1,0,Change.org.xml
+b59e3733248b31c4fb739059009c4ecc1cebbaa907e505f9999e0f23b0207b05,0,1,Chapman.edu.xml
+749013b2fc545464572701ed1335b9f6a5592b6a0af3474d9703994874179830,1,0,Chartbeat.net.xml
+f1432b9c958b7d77317856b509738eea679ae9483f0bd86a27b70c5c9b644313,1,1,ChatMe.im.xml
+ae8377ac78832a22be16f277f28a52ef84b854bea59e84c67a206835a35b5b11,1,1,Check24.de.xml
+a661d52f01a655aca11ad14b59ebd2b1dc43fe4ec22803909f5cc80f9f2c7972,1,1,Checkmarx.com.xml
+c35f7c9558325a1c388b1a71d37aa032cbbd2189084eb366243641ba716a9ebc,0,1,Cheema.com.xml
+10fa5a17c9fc13e685fe8cf8b8a631768e81152d63045308597137c3d5f44be0,1,1,ChessBase-shop.com.xml
+a486b3a9a8fdfb5af7161460ce10f22575e2dfbbc388f9e39473a09f526f89f0,1,1,ChipIn.xml
+a55226a41482b55b64ea5dd690a09fe19d0999ccb8131b436b690784d6cf4e0e,1,1,Chlomo.org.xml
+69576d9694982fc30c67473122078602be85d16838123c7ced7cc7bba8715f83,0,1,Christian_Heilmann.xml
+635611ba0802ed40b2ee5b905ce99d4880a24e557dac0278a893e36ff9b3f88a,0,1,Chtah.net.xml
+cfdfa99b1e7ddec951fc52f57172762a09c9666866168b24a750f1f232debd3c,0,1,Church-of-the-SubGenius.xml
+636172dcc21bd3193f15e29b0748bdb46eb069477d946d5c6ff640509c270093,1,1,Church_Hill_Classics.xml
+90dc83350ae58f9b37967bfe33406f3cfbbd9de47f797d5691ae0c64b9dd573a,1,1,Ciao.xml
+47e5ba3bdc841cea4d8839bd57ece724b8fa99abd3d3100bc1f64d9d978b3b18,0,1,CinCHouse.com.xml
+de19403594b073d50fc83ab38402f494cbbbf9920f2d6281eb1865d7096f1e12,0,1,CinemaCon.com.xml
+887f6dedc09d6436d8cb9aebc7ab7f71603ab89ee3a25784273b275fb8f81a60,1,1,Citadium.com.xml
+22f77342cf73bf250f617eef28d1de55cc9d90afa8f099f88ad62444121ca5f5,0,1,Citi_Alumni_Network.xml
+324aa263ab69f494cbd37fe69d6716c07bcd7b46853ae25a5f7377722146afd2,1,1,City-of-Sedona.xml
+f0fdee87d984d3e109fd469af66fea523facd0c39bee4db87ab1bea1f8131570,0,1,City_University_of_New_York-problematic.xml
+88da9400d16c491db6e3d8ec956cc78ecb20de9aae1521da6cc70af4b3918ab6,0,1,Ciuvo.com.xml
+e249278f416d20f664c2601ce481854bc0181db54ee5ec4fc35e1f647bc2cacb,1,0,CivicScience.xml
+b3158d31c71457363975019cab7d54e2a1df3c4704e8ec39284edb1a7599ed71,0,1,Ckom.xml
+e239c746877388cbb5e8bdda31133b3d1bbf51631ba8974d6c07ced5016a01f0,0,1,Clasohlson.se.xml
+11f8b0f6e4735f79afb373f2c312f8f38c01cedf75703145b65f1d4d0ee82933,1,1,Clear-link.com.xml
+3bb97c7edc6c521bfb2d37b3110814bf4e8c754e494817f319fbe8276e46aad3,1,1,ClickBank.xml
+62783dfa5b3b4bddfd71f4d15fcdf1fc88f23205c834446cdb3c76b15d78ffa5,1,0,CloudSwitch.xml
+18667621076275ec475015222a4a65bb0ecd59b5d07234cacc92d5d2e1c2fa89,0,1,CloudWorks.nu.xml
+c954c0e37df82e9c356ad3611313c5aebca46fe4c2ad4291b1fff6ff2c90d3e4,1,1,Cloudforce.com.xml
+5ffb20d9923257da6e73e1909a6d8cf7d68be914c8e160458e60e2914bd758c6,1,1,Cloudimage.io.xml
+299cb39fec29918dea7265b547b0b58d83d9b27c9a8ccf46f35e15369acbf137,0,1,Cloudset.net.xml
+ebe8861f8b01a594f2009032190e254730320f03a4381474c1f43796ab9fe25d,1,1,Cluster_Connection.com.xml
+5df01438ac79becb6644b3dec650a57c8c40b84ecf6939e91896504548a7ccfc,1,0,Codecoop.org.xml
+42ca47ccb9e98d900b89def6bfeae2fcdd7866441c42f053afae64e4885a17c3,1,0,CollabNet.xml
+0338333878edb6a0f6c006f0fc18d49805899c908f920c7e612ac5496c034271,1,1,College-of-Nurses-of-Ontario.xml
+01e3cce2c68b60c53bd29c022fab016da33cfea386c371fe6bd47a6eef0ae66c,0,1,CollegeHumor-mismatches.xml
+339bc36fa7e42abc1eeed143a5bc24c08ce6bcb11d33db4313da65d6eaa08007,0,1,CollegeHumor.xml
+6347c91fce42e33944bf4e68147dded6b142f3f8ab49dd7f90c014502fc0704e,1,1,Colorado_College.edu.xml
+5d2d4e55901909af90f1fd161eee4af4421326bcba3a564b60140a27d843ebc3,1,1,Columbia_University.xml
+ed1a6a91ec23f12636e85fcab140be7b53ce9ead8bcd48f7173655f06843308a,1,1,CommLink.org.xml
+3af3263a9dff6b5035200ebb25481b147aff9690c0599db533b199790dda6708,1,1,CommScope.com.xml
+f4dff27943c317c1cb2a502eff51cf6436170f4688ea0d3a554d16895ded6cf5,1,0,Commission_Junction.xml
+5259790909abd7c2980520d48f3f158799be1f5cc478b835cdb44ad1d6b0e970,1,1,Common-Short-Code-Administration.xml
+0beb4f7db8e69085f900b08bd02e29436a366662c70152be72eb205ae61ab9ee,1,0,Common_Criteria_Portal.xml
+99330baf93c8ae708130f47714837655c0c21bc656cd4d61a4c8ac61f1a60956,0,1,Communicator_Corporation.xml
+a0270496346c1a4d130f64cbf829e15e696d488001d9ead97bb1be95707f088d,1,0,Comparis.xml
+2312684f5e6a7b373e8dc2893216c8f9eade472012cfd4bbca6d9e5e990bd08e,0,1,Competitive_Enterprise_Institute-problematic.xml
+bb4335a9690793a7035cbbb5025258304be703efbb97fb0071f617996808fcdc,0,1,Computer-Steroids.xml
+36639069762c5623cb782a792b17088694f3242fa84db5e8686b431d36d74f07,0,1,Computer_Lab_Solutions.xml
+53750f61d79098ab338a56cff7ac2567092601c8d9861be25e79cebacc73d197,1,1,Computeruniverse.xml
+4f25e864b2b2c8023c72a18c4645f2bc659b9f3efdad9b5a8623fd3becf08780,0,1,Comviq.se.xml
+a718eb8d43a995d416edb0bcdc23ab00e6d92287e72954db9ce67d642b0f9247,0,1,Conde_Nast_Traveler-problematic.xml
+2f7e378568ff6f03f3cc9b31fd1f9528ab7cae735de71354eaebb079bcd85cff,1,1,Conduit-data.com.xml
+02b3153c54aaade0387d2be93976bcd83cec356da2217dfd19b1d5f5bce58703,1,1,Confused.com.xml
+4e4afd9324120965f69988b05d3a414e70fc93ae07c352cd628b10921a166680,0,1,Confuzzled.xml
+c77f628b580660dfba342b2bbfa4a0e22744a48321539828dee5403c32470e4e,0,1,ConnectMyPhone.com.xml
+a79534ae1059876bc76c072c81fee31b3ee5572980bfbe2f87943f023829d2c3,1,1,ConsCallHome.com.xml
+2ceb9721bb2044c6d2d9ec83baea99106fee843c6eda1b90e5d0971dd569593c,0,1,Construx.xml
+436c49a3cd92b2d701c90db91f96cf8ebf3a3bdccf609537f23d6cad31bdd6be,1,1,ContactUs.com.xml
+710d5a714c74db826cade92c25b332038409f800ef616a03360634fac19fbc1c,0,1,Conversions_Box.com.xml
+07aec2b14f80428ac276fa287ea846bfba851a6d46b0f39e4640e6fddbc10a65,0,1,Coochey.net-falsemixed.xml
+650b5d9a73344bcff3834fd3851ffa14e7f810949a518eb27ce679bd4a5704eb,1,1,Coochey.net.xml
+97b344fb4914430115bd4efd7606438c43a7c6370726da90bd5a01f0192d836b,0,1,CoreCommerce.xml
+ff29267634f306a1256ce5fa90a5ad9d7a1f7999b38e535f04492bea224057c6,1,0,Corporate-ir.net.xml
+d1698155b22b3b7f5f0ca643cea078451d79ab6779f6f261d8ca54805b3db3e9,0,1,Costco.xml
+e0c331c927da606cf727ad4d21bdd9cee77632ae77ca1ad11e1f9114b27745be,1,0,Cotera.xml
+80eef43f077304055293c67afa215fccefe31871fe3a6712dd42fcc35c20857e,1,0,Couchbase.xml
+f69f84b0ca4c5b78ea0d15e83d62fd911beacd537eaa929fdf3780ed4b690a7e,1,0,Council_on_Foreign_Relations.xml
+491a52cea147014a5240c15914dfd2ef4040c6038f0b415df00c1a685841dcf3,1,1,CounterPunch.org.xml
+84384d174882086aa3fe03231d81ff90fcf806ea661d48da1c021a02f5c26bfa,0,1,Cox-Digital-Solutions-problematic.xml
+2a5aff5228b1ed8caf97f860b986a5e857043e46610b15cb1dd48f07d1a2a4df,1,0,Cox_Communications.xml
+c22b52fab2d5c0ae1ffb9f2f497672b1680a2a71c5abac5b9e3b11282594d51c,1,1,Cpaptalk.com.xml
+8a95bf245a528fdecd67ee9b2d3703a129581211501d34fa29afaef005287aad,1,0,Craigslist.ca.xml
+08f3749268ecd600f52dc3ed7ee35741b72088fc2b84ff1dcd24aae5d8609410,1,0,Craigslist.co.uk.xml
+7cab090cc110a6382eb16a0807adf568b1fa09d7ddb12325302a3e9480a7c978,0,1,Crain-Communications-mismatches.xml
+45b4b172795ddb3831140e93fc9a820127db515609f13cffb67557d53048f1e2,0,1,Crakpass.xml
+04f0d43bd1ab894b64d8ca6fb5e81b0213a4905c1bbd19bf92700ccada4fc0e4,1,1,Criminal_Justice_Inspectorates.xml
+1cd80467b55158721959b770308681c9e59a37977c7a4581996bb359e14bcd8d,1,1,Croscill.com.xml
+530481264817641a16714b2a38e392549ba9310d3689d7c8b7eaa494b1c73761,0,1,Cross-Pixel-Media-problematic.xml
+e82ff9c3312c6fc9f6904252577429fb985c41637c71dd8f33d25bbce57ebbeb,1,0,Crowd-Science.xml
+cb23a1bd35b86d242a4028ed7f0d6fa55a1b01d620b22f552c54ab3e8aa64562,0,1,CrySyS-Lab.xml
+80ff66109e0038eecb6e67362f210c6d389b69ab1044cf621d1ea28f7b624f19,1,1,Cryout_Creations.eu.xml
+734c847c64dd4746922d7dfd8874f2de5aeb8db469d6165352965bfc43a7d564,1,0,Cryptomonkeys.com.xml
+4c82fb71dd76ecce008a283a688f468dc95758a8b164fd4daac98b747eb1a7a8,0,1,Ctt.xml
+1458bcaba2c8a2abacdb39524deb5de8016181e03ae8030d8933478fb054ee1b,0,1,Cultura.no.xml
+8619973ac3fe5c8a8e4ddd2d2ba0c23acc05568d7ddb6921b33a04ee6cd05cdc,1,1,Cumulus_Networks.xml
+be67733780d14d90de81e3278a87fb4860cb0bbc38b58855980b323a8871b7c2,1,0,Cupid.xml
+a1375ad5b72a20bf94ccf118cc4d2386590687196810774dbd35f29de8b058fd,1,0,Curbed.com.xml
+dccfba7ca231bf88053a8a2e1064bb4d20db77854e80e0bbb0493d4523476062,1,1,CustomWheelConnection.com.xml
+ecb6609b54104e170eccfb8b213b46ef8571ed159691b69cd4e38ef28887120b,1,1,Cyando.xml
+c5f1993198ebf0755d6d2b884f09cca076a78cd635c91810e60e6d0c36938638,1,1,Cyber-Security-Challenge.xml
+62f9443ccedff68a2edfe57cbd28c734eaaa8a90177ec3ef972c51a0a7441715,0,1,CyberAgent.xml
+5c228b42ff2de9fd9ebea0fb810d2775625238e119a70c142cc80385c2aa2e54,1,0,CyberGhost.xml
+760cd650faf849e6b19245755eefd6460eb401ad4e174983e7dc5a28a50cffef,0,1,Cybermill.xml
+1562d48551eb9a11540bf840e1d6029b7332c0b7cfd7f423d305aeecd6f28fef,1,0,Cyberstreetwise.xml
+bc5f40825e2152d2725cd095f0af778875bc307c14701f874a651b3572adab65,0,1,Cybertip.ca.xml
+94ad8baa2a8b8607e45229fe2d5c8c43fdc7b53965d519bf47e075878096f230,0,1,Cyberwar.nl.xml
+514030beaf41176db4804a7febd2de28af67e58ed8bdee64ab5ba3214fa5b9c2,0,1,Cykloteket.se.xml
+33d4a5f51d4ac7bcd520f05e294995d9968d6b68bc8401289bcc9ecb0a94ab5f,0,1,Cyphdbyhiddenbhs.onion.xml
+9beab50432900f8782d6720032b6262671d1a04f960e530d7906e866ee798365,1,1,DE-CIX.xml
+5a3b022a658985b87a1a497348ecdca4dc3c29499681e1371f2793b0ab58bafa,1,1,DFiles.eu.xml
+d014e7330debe4f838f895d1ad269f9f67bf5691aa460a86e070c72357b87e82,1,1,DKB.de.xml
+cab182473bd2a1f12288fbf267de9e6bd6d249ba3f7d561186cc3b9eaca719e3,0,1,DMX-Austria.xml
+fbbe70181d1fe5c14edeb58820cc187697663b7ff1d6330318b52242cad50df7,1,1,DVIDS_Hub.net.xml
+4cd351e987026f37e854bf3ecbfc84ad5838db73d9b06f59ad58d07dac65ce85,1,0,DaWanda.xml
+0b1a6de4023a402b4d79c12a9d2b45c4c7d2d309203536bef8ae9dddb5113e19,1,1,Dabs.xml
+39a0ec5f2284937cc5b8e0cf5d1199fcdc3738146fc296224a8d14e20e4f5a33,0,1,Daft_Media.xml
+48068ffeea3bac8f6607d8b7ef042097a830f1ed5141b71a6b03fd73e2322076,0,1,Daily.xml
+73d5451a0140fc08b3eff45aa5ca92daf2bc964b24eb1e130d457035e85ca92b,0,1,Daily_Mail_and_General_Trust.xml
+607ae42d3906148f643091e3d42025c9ffc9997b3064de7de892580adfbee5dc,0,1,Dakko.us.xml
+0d3faf3da32111974235f26aaa4eb8ddc0f33c008708c891bc5cd95e29172e8c,0,1,Damn_Small_Linux.org.xml
+3d69ae3ebb3046ad3f64e32725de287e186478ede815092da1f5d3b7f43c04a0,1,1,DandB.xml
+9a3a5a84f0e2705bf60fb61037f6fa1f0fb38060008cf271575487aba5f4731f,1,1,Darmstadt_University_of_Applied_Sciences.xml
+2d7db66046578cb426ac52ffa00a0fc9091ea3c478a40f085fbfb2105f24d2ae,1,1,Dartmouth_College.xml
+3403f1624cd1350a9d7db9ccc20fe13619099815c6c6641ef55f4d3160338c78,0,1,Dasource.xml
+1cbda5f0a6ccf9c3000588ec54f6b1df0ba73b6ec3dd96caa6cb03da743d0b54,1,1,Dassault_Systemes.xml
+3313bd09107db392a871be91a9de6944cb93895ae79e67fef855166adef81c96,1,1,DatStat.xml
+1e3a6e9548c4695e497f2c70b8e140a688d130c1aa832f6ee57dc3d40db76f01,0,1,DataSphere.com.xml
+8cc5ce1e1d308f17e685fdf197fad2de85a59a1392d4e9b9097857cc31171c56,1,1,Data_Center_World.com.xml
+949b15687d157c91c170a0b91d4f0e1026caa5c7ddb979926a0464885157d9d7,0,1,Data_Informed.xml
+887c98b7b9913c7fdb123653bfb86245f5c77fe664dcbfbeb5dfe31e1cefd6c8,0,1,Database.com-problematic.xml
+a7d3313bd27112e3b58470d617fa23e5c45dad2250b0d024125b68fba7a5dd36,0,1,Database.com.xml
+1708197efa6250816a0daa89684b23abd5b6ec10424c0e588c4f79759269be34,1,1,Datamonitor.xml
+3c5b4f63385fe6f06d57c28f8318249835ea86a015594291a1208657c8cb87dc,0,1,Datamonitor_Healthcare.xml
+2f44a28ecb1cf5909c3f35c13216ebc02c9e1a66ebf5a48c970e1c3c6f9f4f69,0,1,David_Gold.xml
+a9f30668ad595cffb3d3b98571ccc614175c6c2863828db49ff61c5a35f3a07e,1,0,Davis_Instruments.xml
+a57ae2eea0e68d85ded9207e3de25e2e19bb21187e9ffa2ef3c0c4e1f2e95727,1,1,Davpack.co.uk.xml
+78c92cd9b90932227687233bc92ad00e35daf7021423f88e5d6c6fbf686d3666,0,1,Deater.Net.xml
+a00fc19e2917a733c02ce54c7121d6762fafe902c4501f07bda904ba1f5bcf95,1,0,Debuggable.xml
+99448264eb68a506c083d15fcfeb1d01c1649f8ac86e0631a3f79bea64e530de,0,1,DecisionKey.xml
+8e2fb9b334a1504d2a79b1d59bb0b8aac0c51bb9088960524a6f42af8dbe24ae,0,1,Delaware_Technical_Community_College.xml
+45795b36ce0a095278fa9b311648ccb7f94051ed1f755235fb6e378a766c5e26,1,1,Delaware_Today.com.xml
+4686fb4dd00fdb9a389a6b9da295ceeb432f9c119fd2a14f2f1f327d2d41fafd,0,1,Delico.se.xml
+d29e0712614544a2551a71e3e838262562f66639c28b491deebcda8f0c9e9c1f,1,0,Demdex.net.xml
+4a1ace170db113bed5a1c50a465a331a6a6f0d81e62327e320bc2372d55dc5e3,0,1,DepartmentofEmployment.xml
+df8c580f3fa4016df06bc402e23ba34c57171ad3b4b029d327115effc7be03b3,0,1,Dephormation.org.uk.xml
+ce07c0999500f19ce748e5038f1d502022455155d53ba17d506c6a71c6200f38,1,0,Deposit-Files.xml
+481a8ee74a06cd3978b3bfa1638b10f1a2798dcec48f905fd713f25e2cf5d884,1,0,Details.xml
+27f638b7d6ed66f2545782839032081245ea4c84a2cae5f79c7140249165b200,1,1,DevZing.com.xml
+d3ac7da52f675d22b7fc910eb3ed3c950ac43a8ada57c767bdf2ff42bfac8ce4,1,0,Devever.net.xml
+86a1f9c349c7266714c5d4a26bf9e6674443fae524e040bad4cdf0951f73a988,0,1,DevsBuild.It.xml
+24e1a5389bc35d553f48e0b8f0fecc7168ff63096b9115f3e48184e62f22072b,0,1,Dgl.cx.xml
+8f2ff5fe50e0b8edbb175166a44e2877df47e5951510d8650d18960527196904,0,1,DiaGrid.xml
+450f88fd960579ffa22b42f6e3ce2348be724fb59ce00353d742d078e4996bac,1,0,Dial_Direct.xml
+f58a0d9c1c02012ca40bc00fc4a07a08702af0924e7d8e5055551b57c16e4908,0,1,Digilinux.ru.xml
+3449a7d7da46522205fec252bc4bd787e9dfac2f15e635750d9cfafcc825f3a0,1,1,Digital_Photography_Review.xml
+1ae5023d7b4801aa93edc7b86c769faba82f98f393f917df3f9175b5bc594855,1,0,Digital_River_content.net.xml
+6db802e9310e1d721b92abde951d806fb9c9a2e99182795213ea3e4432e495d5,1,0,Digium.xml
+8f24d6a49faf7ac63a5a48b5dfea5d55a076865183dd5319b9cee2f6e6de8cfb,1,1,DigiumEnterprise.com.xml
+ca8710d2eb4a66d458863fcf716191ef82ed5a669710d97cf69c8573e7893be5,1,1,Dignity_in_Dying.org.uk.xml
+05a99eccf708bca913786f423daaca68b711001bffc0af52e173b0f31a38af30,0,1,Direct123.fi.xml
+65f1777abf53781ec3bebfc418b72e91032db63fd973a751ae810e04d7297016,0,1,Discover.com.xml
+ec9525132f84415de401293436c276fa6cdf29948edde5416665e10270bd8456,0,1,Discover_Card.com.xml
+3344bcc1244a1a002611a746364efee114e9347a0a7303600b89410b381b2475,0,1,Discover_Network.com.xml
+cbdb894eb5bae94156db1210de8033c32d42a877330b14af87c4d2abe5f58e81,1,1,Discshop.se.xml
+283b1ea012e127b576f1a2c847cd342c0e984455f87c5b7811f7c5cc2e8a1dc2,1,0,Divide.xml
+f0ac70f0936b229f6b6748635f259cc1ebb6bbd0c924baf792a792af86295fe3,0,1,DjangoEurope.com-problematic.xml
+ced8f070eeb91948e919fc5b49e98b171ead833df49b97ace89db1a5fa124a1a,1,1,Dmri-library.com.xml
+0c2d0599f841a470c303b8f4bcfffe014c25e51080b8ffa4c794350144ab4fd9,0,1,Docusign.net.xml
+50cdc237ad687503006bdeb50c714cccdf0d0f4d2a710d278a51be0a2a94bd84,1,1,Dolimg.com.xml
+76266350e22043e4d07c4a1389165d1f888e7034121235b75d208d58bfd9a8d3,0,1,DomainTools.xml
+cd9c9d875b77202d9bb64e526dd1ae2ad6b5bafc9d4d6ec0806d6be463f5f53a,1,1,Domaintank.xml
+b24f4ad17b97e8bfa9b40fe9399e2f5623d687f5c9c427b312c206b3c2f17031,0,1,Dominios.xml
+93ede45e0e0378015e32bf7e031f23b7a69174c9fe0023fe462549284e8362e0,1,1,Doncaster_College.xml
+555b32877b269226bbd508537205e4891362f82953796a44980ce54fd36b7dfb,1,0,DotCOM-host.xml
+bf7cc0c7b23f6d7fe047d15bd73388dd41815f6f1f4a922e46ab388b96552af7,1,0,DotMailer.xml
+d51edb2655670ea1a910c1f79a85696274ce6f066ae67700baa6207d60727448,1,1,Dotster.xml
+4c32fb438443d2547b3a3347d3b59eaabcbc53f9250ca6735be7dc6b22b47cf8,1,0,Dozuki.xml
+948fe6c1816bb404b4f3fbc4e1d21dd253cdaf065726cc41a7173f1055edb520,0,1,Dr-qubit.org.xml
+d6f6539911e50377e9ea5612c191b82977ea7723730c19d45293b3769b10abb0,0,1,Dream_News.jp.xml
+1699a3fbc0f1c9f54d828666cdb17e2eb6256e59bb3d752cad54207b3c16fef8,0,1,Dreamstime-problematic.xml
+f85cc97315b7e1d8d7cd5a8df8c238edd9e9303ebeb0f84f0dd57da3be87cf87,1,0,Dreamstime.xml
+4b67855f68d07aa5dd62c7b1470af02d953732516e530646752c5aae632d9baf,1,0,Drinkaware.xml
+6dce143c0bfb94e705a21f78d14dd5898868d1a649224c096ededd8910616adb,0,1,Drowned_In_Sound.com-problematic.xml
+c729946041e980450f9238a1177dbd53bd2d7f6d904444a27ff14817e5a8916b,1,1,Drowned_In_Sound.com.xml
+45c19d94eb666e445b664135d6c6c309c77f37517894e24684d63191cb22669b,0,1,Drug_Forum-problematic.xml
+916ea616d827dc5553528be9b879ed28d91007337b9fccfb593c4e624574feac,1,0,Drugstore.com.xml
+cb19a58271da26e0eb7c687c7d6a412de76bccd82dab5ea43c1adf2d4e9a790e,0,1,Dueling_Aanalogs.com.xml
+d4ed3a03f0dcc445f49c298bded76f72b676629578a5a01bc25d3743aea9c8c6,1,0,Dundee_City.gov.uk.xml
+4b6114f50a7b63eaca3c4072be4f8c98e013bb9e4fe8108b47dbda9a99ce8bad,0,1,Duodecim.fi.xml
+d1d3e7884fb59f03c02efe683d1ab6cd77b8d2fb507b4dca01645071c995b359,1,1,DuraSpace.org.xml
+8496afee88e5b9a35c67bf855d5aa960d9557295c3de825652c49d7666beb252,1,1,Dutch_Data_Protection_Authority.xml
+c97bcab9e6309fdd7047f8506ee40280dca5163ddd1e7e7eafa6ac4d2318360a,1,1,Dwarf_Fortress_Wiki.org.xml
+d0699296c13b7423272e4ae5ee1491a8449e6c95b7e1a769008f06d46fc7586f,0,1,E-Plus-problematic.xml
+80532b82c72bbe46287e9506f392e5378023e6766326380c5f276182502af47e,1,0,E-boks.dk.xml
+30b6cd8e0fb7a044f69d7f54ddc8c2c0739afe862e58f483fcf9e61211c4b27a,1,0,E-prawnik.pl.xml
+a236b2041b6696a94edf8eb10f21f2c384c1fdd022e6f93a2a6e97e0cb1d4bff,1,1,EBSCOhost.xml
+5d9191656ca3651a591a01916031d3f755252d09d09a846ac962918f14ee370a,1,0,EBlastEngine.com.xml
+27d5271339b66f984ea5bca4be574e9faed8825be522c825f5ee4a20e4d74d77,0,1,ECrime_Research.org.xml
+38acc77f3a1684db15405c335ffc2053bbb6959ebded1e53a76102e3972473d1,1,1,EMC.xml
+b82763e9cf1ccf4bfcf7ce931d4971bbd5f5d767431cbe015043bdf2e307f181,0,1,EPA.ie.xml
+21af6451e5293d3c590dba9f14d347d022d8ce5d7a06b8d1960a2d7dffbf76b6,0,1,ERNW.de.xml
+771c90d6313b15fb4d41a8c89ac03ef0029394521c105655c3d1aed1a8f44db4,1,1,EReceptionist.co.uk.xml
+1d0cf4aab6228ae65f34ff4ac5313082087f547d0b773e9403eb9ec40c19e30e,1,0,ESET_static.com.xml
+71d7ddf2c70bffe2c22311b10ac6ccbbcb82d057f298a71285e6e14da667b3c5,0,1,ESF-Works.com.xml
+e14997fcd1b49623692ba6542a019182b6f66628abd718680fbe20fec3725e7b,0,1,ETegro.xml
+9cb060c5bd472740cb08ecfa934b189e19567c4dbd35002501a01ec373dda1e7,1,0,EUKhosting.xml
+88f84319acd57ece012e2e66cc7447a8db701037146b74a839c89a1ddd685432,1,0,EUserv.de.xml
+97898e32a15c85d1f70bb1b15f7201cc03c1ebe0b624949fcd4e27ef48619c89,1,1,EVoice.co.uk.xml
+480256c07545a3dd139fde94d8b794e8f8c8374a48c9f8c02d00b2c6aa5efaf8,0,1,EXiled.xml
+c52705978d36a80cea351d25f4b1131be10c653ee5f7aef9fe661b0de448924c,0,1,Eagle_Rock_Reservation.xml
+f81ba5e26253661e9cd0406b4b538625b6cd39bfd2ce8977a526b67b44b908b8,0,1,Eastbay-problematic.xml
+1c87354f2f51c188db3313c9c68460147571ed92296962e148563e5def8ed4e3,1,1,Eastmon.com.au.xml
+332200909ab116588d0483ac47e1877ead9fcceb221724a8d3fa50251bcf1694,1,1,Easy2coach.net.xml
+0b8829a889f400ac3171d5602ff812f5bbd6559db9d6a3d3b835ed6694ef3e60,0,1,Easyspace-expired.xml
+9248288366ee2fc081c11be98b63d9d79069a3f8000c284e6ece22c53fa383de,1,0,Easyspace.xml
+421ade575e2e1e0e75d6c7bc746c9615bd7fe023bac2e3a21401cc6c61c2ee3e,1,1,Ebi.ac.uk.xml
+3d7ebd12328dce8238e333e2d00f53f314ea41fc6cb532d5f48682229e8ee622,1,1,Ebuyer.com-falsemixed.xml
+9a88de16ac51e357ce386b479d2c3a0d2b1e18a1df431478f16e01acdb1b90f0,0,1,Eclipso.ch.xml
+e831540685d0eb166dbf1cc602fd28389713d447549b60997066e3b2a125203e,1,0,Economic-Policy-Institute.xml
+f9f75c9eeb2e7da3b367c19fc86af398fb052e94c251bc9a22a3d3b8f565b39f,1,0,EdWeek.org.xml
+792f8df60f756ad2505db27b3aedb9034fffc3b05cf532fa9474de3284aa16d5,1,1,Eddie_Izzard.xml
+20aa540654afe4e46d8706423b1bc4b2cae3c3498e1ff6cc63ca93ca6957d59f,1,0,Editmysite.com.xml
+772fc66915c575b5e3c2b9330453da903a06e156fcb452206f0b0db4330ee367,1,1,Efax.co.uk.xml
+9346d6aa681d8272cbe2d56d6ba227156205d162fe3aa1ec83db7cd50ea1a8f3,1,0,Egnyte.xml
+0231502d992426f6dc6c8b6488cfb220c50aa5d5a624b854e956ca7f66269366,1,1,Ehosting.ca.xml
+d3812b45da73e759d3fd7d65bc13e9fc5f75d97bb15dbb0a53c4e9e11e9c7f97,1,1,Eimg.com.tw.xml
+822984ee7464450befd847ba351e2609b8b6b34ce8116ab38c54ddcffede5b5b,1,1,Electronic-Arts-Intermix.xml
+33d19feabaf5d7650acfd2dea5a837a763a632626c755caed1bceeb42ffbb6e9,0,1,Elijah-Laboratories.xml
+8c4ce2e6485d6a92b35ebdf64cfb826516669a9ca8b3ec20c32ea7f2ef0bd679,1,0,Elite_Casting_Network.com.xml
+92b5a0f2765dc0209ee35f20bfbab7f44970126ff686c803d592213acac588f8,0,1,Elitepartner.de.xml
+2ccd031d0b13fdad6fb4ab25d9dec34593ab18cc5f62208dfdb64c6152f654a3,1,1,Elizabeth_Smart_Foundation.xml
+03f6035a0d5cd3824fbc733aee7c1dd0d9a48cca2e3b612a7c2dccbd7920b6f7,1,1,Elle.com.xml
+995c937ddd871c8b758697457a5b14ca6c04d0911197fadd29b617391e49a16a,1,1,Emailsrvr.com.xml
+1d5f53d890008891065d1172327c971c2aac7a7e965e9ffdc3feabbe2d037492,0,1,Emily.St.xml
+13abe2167fec64e991b8e89e9efedca61be565e9d4f3b9802f500be922b9cf08,0,1,Emory_University.xml
+661bd6f53d1accd50024f22541da44cd49f15b58aab9e52418aeadd2bb3b2a22,1,0,Emsisoft.com.xml
+db21ed9907ecd72397a925f1a47e5c99e3d84024370ffb30b87b1b5142880bdb,0,1,Encyclopedia-Astronautica.xml
+431fedb9cd9b68a915890080f1eb4996aa3a6edd00e91b6cbcd6749178cf26cf,0,1,Enecto.com.xml
+6418b8410785f9fade87c96494372065791223e8bc6dbf60a3a6db6717d827fa,1,1,Eniro.xml
+80ef1d15e2f1ed5a951dd080ea0f482e68dbdf69d2d26f37c4db7508e5a6f2ec,1,1,EntroPay.xml
+09a7159cbece935f73ae3747c2c83a12d6852f1820ba99d791f6d6a97515c6ce,1,1,Envato-static.com.xml
+2ca4fd68486c7ed9b2229b029b17f898ba1c99c23e7132da7c15e5d62b8de32a,0,1,Envato.com-problematic.xml
+03342be1f13fcbbb19d8de98a172c33e0ef92b8322766df0743b05820413d7dd,1,1,Envato.com.xml
+d6bcf352b17998cd3dd749252c04696198281490324bcf4223fda56d223960e2,0,1,Eole-Water.xml
+1f7601e66f03a3d82babd1dc7a1d477eb37a567383073864f89ed39a28d0639b,1,1,Epartnershub.com.xml
+52a6b9dc4e013008f58b53424d04e899dbf6110a1d6ce7b5d8eef35a8a399a5f,1,0,Epic_Games.xml
+6b9e08f376753aad2163601f78b5051a819c4f2c54c54be0c231f0d44d20cb26,1,0,Equip.org.xml
+5acbeae1638df64a1e8ab2a261d2b3f810300c376824e2865970d0a1932cf595,0,1,Ergon.ch.xml
+40d2bb3f9270e7cf99f2bf2a446888d4c7162b079f5a196e0fd306ca7ae6c810,1,1,Erowid.xml
+b4ebbea0286d44564b7e8984bfe2fe38ce080b1390a0d6d37315d0993dbedd5d,1,0,Etarget_net.com.xml
+8d9add38a1725f7660e8bc03f9f6181886dfce418c3a726cef21f6672eee6955,0,1,Etipos.sk.xml
+4db319b5a12d2ba768b16e2ffcb6405c1ac8960c7f052decd7ff5c547a334c2c,0,1,Etrade.com.xml
+ae016ec38dd372b50f679c03442479c2df1eee65fa59a7173a1548e4b289409d,1,1,Ettus.com.xml
+b91a2bb082396988a0d23bf4de0e9e620d647828cd7b1abf9ad5d1d522d8fbba,1,0,Eurex_Repo.com.xml
+dd2ca763bc144f188f0dc08bff984e6c5f950860d9fa64ad3840af10bcb40832,1,0,EuroFlorist.no.xml
+eb2c414ae4ec2c034261b3cd828b87ba62ea8fdf6208052149c7cf7fe882bbbf,0,1,EuroPriSe.xml
+c3ce6b72a929adc8d7e227f86884c300979feb2a571c85cc44db4262eaa6881a,0,1,EuroSmartz.xml
+6d3e2a1d8568935ff376e011fa835b0a9c78a06c40eeaf5b9732abbdf0a27808,1,1,Eurodiet.xml
+2469df0235c8a578f6a3574825d70473517e612574f5e517174cd8ef453c46d1,0,1,Euroforum-problematic.xml
+9f07a1cd07e17aaef37455a8e6927200da4633d51836089d790ca00caa2a16a3,1,1,European-Southern-Observatory.xml
+c7d1a78c0d09e8db961d0d711d81b4967193f1692e7a23198a996e9dc8dbfd29,1,0,Eventbrite.co.uk.xml
+1213b9bcc58aef69599cda534a1140050ba6a542bafdadd27e62d1e88b6e3b56,1,0,Everest_Technology.xml
+de69b2a8fe3a9790c9aa7ce6435db3ad238567356e1a46ca1d374aa7944cbe31,0,1,Everyone_is_Gay.com.xml
+946a4fc3e8ca86971f8824a4576d947fc40b7fb4d50852f9604278a3d0f97ec1,1,1,Evo.com.xml
+bb9a0e1c85c28f8f09687aad733547dc640569557197fdb9be79b85d9ce4931c,1,1,Ex_Libris.xml
+83bc5eb214726e5221f5161cde0d085ac4d9c225d08c4611b6b6adebe8ca3c9a,0,1,Exaccess.ru.xml
+6841328fb4f2cbf6061dad6d4e8891fe0cbc9ff71db8155d4a10e3cb15ce1195,0,1,Executive_Interviews.biz.xml
+b164ef892520be08098945612a434b74349844dba5c7fe618b2e9e0b06fe70ca,1,0,Exinda.xml
+53d157231d09238b4b86f5d623b23cafe9e649f542c15ca65c93e4c03da3198d,0,1,ExploitHub.com.xml
+03b6227bca68fc7f7a99a9500fedf38d07361ea41dbf5e823158eda5e600f00f,0,1,Extract_Widget.com.xml
+d08eb1b730ce427a740e4b6366d314802a3b25eaa1ce165588d8df0cbf21fc80,1,0,EzineArticles.xml
+76e1a443721c7c57e7976241d045defbd2218dee42cbdef6a13472e13d9ff63b,1,1,F-CDN.com.xml
+dbcecf1c78f18bfa326267e0ca37f8f94debb98236913d73092883b39df4f204,1,1,F3images.com.xml
+03aee00629e0916b9627f907484ae885e2b9e783dd789c7b928dff3dee8da925,0,1,F9-Distribution.xml
+6635f4155c42dd8f694a85079f66436a3cdd466391b4814ff640259a9a9bd698,0,1,FAPMC.xml
+15e11d918a3d88dbfdd81e7faba1cfa99c5aea57b821c35cf269744465990066,0,1,FC2.com.xml
+b18bfe335ab271a0aa72bbe6836acf7b4a9fa299cf03b54bdca37aa90842ef16,0,1,FIFE.xml
+32dbe7b9807abb304f2779ad2ca7e6d939200e54e61607df80c8cf553ded77a4,1,0,FIGUE.com.xml
+4def65d5306408980eddf9267615a711b000ad48c4e177c6cea446ec6f822a41,0,1,FLOSSManuals.xml
+ea855265939a7763f890048183a4e9b27a37379adaca4db01df723287905e954,0,1,FOM_Networks.com.xml
+d78b9c027b108b40f4020703d1bc5b49e10ad84b7d1feaaa88e6a33d76666cb3,1,1,FORA.tv.xml
+64d7895f2f69cc720e9d958fb3a212eeb0ca68716d33b408daa6721f8ffafcaa,0,1,FOSS.IN.xml
+acf8d20b89b6d86853af14f1e154f2250fea106c13de2229bc831a897513f402,1,0,FOSSBazaar.org.xml
+2becbcde3ded8d4be896e314ef4d27afeb6d4db55cc8e8e2fda9625f47f64d78,0,1,FSU.edu.xml
+b2085754d0d68fe106aebadb88e72508f4e20b666d9e0ce2cdf408ca9e9b2609,0,1,FacebookCoreWWWi.onion.xml
+8767c03d704f5c34d0add741e10a7faca4c8f782e4c1c4e56f154acfc6b1b745,1,1,Faith_in_Motion.com.au.xml
+ab23648bd49cfe3cd9e3192b309fb18e60a64b3e908ea3299ba56583f0f52834,0,1,Falcon-UAV.com.xml
+6e006939a395f81dc649d4340231a869144a3720162e9fb3fadcefe86cbb3509,1,0,Fanatics.xml
+9c51c5f3685da502281c46d976f7ae3bb8b9b2ac9799e41eaf7253c170fecc15,0,1,FastSoft.xml
+e4333c0ffe626bd8aa67b64f9330a2857ad0392362849823d2804fb736b8c1d6,0,1,Fast_and_the_Furious.xml
+cba56bcb5b38b490a1ab63f0244c457a86793a8794c5e7ae60aaf2782c302334,1,0,FatCow-Web-Hosting.xml
+3b9a47db267c9a3cdcbd5b4e803ceac9d44fc713e99b99169b6876e8a5ccb0af,1,1,Fdworlds.net.xml
+1fe4b4c61b741995024b05158f8b082a8da905b3578624c82154a54ec6f692db,1,1,Federal_Emergency_Management_Agency.xml
+8dd2fc317fa4af0eb6299a4d9fa1ae2d4349e162258277903e16e5ccfac8d571,1,0,Federation-of-Small-Businesses.xml
+19c52d9111010e02b10a06aa009124959357ae9508639bb225e3a73989600d3a,1,1,Feedjit.xml
+120bf2c17ec6d85fee4a5bc1857fbe29f7d40ec9243c4da31c47bdcb59d9e96c,0,1,Feefo.xml
+274d8250863f1353526859ae21132138f2b7c29652d8c7e6c2b698a2504ad9f4,0,1,Fenland.gov.uk.xml
+e86d5e3ca3a837e961b2ca3031e5cdf8d15a4297ea12fda82280db4205b00c67,1,0,Feral_Hosting.com.xml
+1b5920ef6d56c0c4eb59282a72ded66e32afb565efe04e5f417a2b3c1acacad9,0,1,Ferris_State_University-problematic.xml
+7000307b3415118c4d10f8b5a68d875b64b0ba75042bc1cdba066376be025eee,1,0,Ferris_State_University.xml
+b415e81d1a66aef7b49d2569612f1ca6eb70cf80ed84d2dfb6137889d95d5a5e,1,1,Fibank.xml
+6c5fc7be0086b16f85edf4e13d77f5bb86d0ff940e14524e7cda87bfd30a7bbd,0,1,FiercePharma.xml
+03cac8045c0788bdb20a69714ad5af1627ecb48ba8e82a9d67ca83e7c1a3fa85,0,1,FilesCrunch.xml
+db02c441a91bd19ec19af65177aa0b1ecc68cecd2b6d10c8c362c6a335ffa284,1,0,FilmTrack.xml
+4b11026e46676ad595688a56f829cd5c7a1c4c1d167d542a02e48452246f919f,1,1,Filmdates.co.uk.xml
+d07188d89e618288aca51dcaffc90b6ed1630596512f0def5d73cf3049bae44c,1,1,Filter.xml
+20ade5eec380ab16ee4861c6086b39ec5beee7c33575e8f1978e5d9e3e8090ce,1,1,Financial_Post.com.xml
+85bcf7d5f5b5493ceae0271fe97f22164c904a463c4f10935274615544b5e4aa,0,1,Financialtrans.com.xml
+efcb4402229ed43863e8ac8eefcfcc9f73cfea6ae53352269795b1760d0e0a90,0,1,Financnahitparada.sk.xml
+e74290fbd951caf49445188e6d7d3d1a5e4f0880f0355ebb3f5461266fcaed5a,1,1,Find-a-Babysitter.xml
+ea59a590e5d74dc8cbc7c6a92cc0ae74cf6e0f509ed0b458580792958410e339,1,1,Finka.pl.xml
+552bd8ab83e0e59b4196d9ae48bbc364136198778d83a89bbc07c068d58618a0,1,1,Finn.xml
+c2a6e87647595dd9487c3959ff5cc3b598bcf08ccbd358f24f90b988c478d8be,1,1,Firedrive.com.xml
+265ad3eacbfd50c7c49f935afb3673fa55071a44114e1ee782e21f8f25a29f84,1,0,First-Central-State-Bank.xml
+711d4855340b3dcaad02671121099aa096bea856730eebec67c4231c89ed2a2f,0,1,Firstfloor-Electronix.xml
+c365305889b7baee90f2f7e899440b24b8c5b3cb994b44c00530cfc22ed52468,1,1,Fitness_Market.xml
+d2e39a36b53ec8c0d0923f33bc1d08dd2c530cb5f8c44ea496ba54c78580dd6b,1,0,Flightglobal.xml
+6522d1c1e1b9929b26a29d9b2ee2d1640b7e2a95d7a1e651e00904212a929095,1,0,Flinto.com.xml
+8ea7a8f22b03f1b163013b35d0ec7061ecf92eeddcaea9df4196738906859924,0,1,Floating_Hospital.org.xml
+b2b785c62c6cc9f4ed815d08e4e8d92e9349e72d303e9ffdcca16b74b380b0ac,1,0,FlokiNET.is.xml
+cb0a3d716d8f22654d96a8efeb32590ddd38adcd3ba9ae62bed7491c5e5486af,1,1,Fluctis_Hosting.com.xml
+3962fca2fa36bc16a4000801f7f7abd4d2ab6f5445da67e238a58fcbe23801b4,1,1,Fluendo.xml
+daa09a73d487052e243c63b74efb4e69273117f17917c6c7c15b8797d2cac930,1,1,Fnac.xml
+67380bbdadbe0ceb6daba1a7b93df6aaf590634e21be8c6162c07e2ce6ba834f,1,1,FoeBuD.xml
+7558cde03eaf45908c8378ed2f8ee64f34b9c3b69f267f128f75cf7e54be4c56,1,1,FogBugz.com.xml
+2c86bb4df074f731101dc6d4c65a35e0e26f30484aa4ade5a0645eb4b3c98715,0,1,Fomori.org.xml
+b50cb36cfc409474b96f6198d97d5229a1392b250965bd62553b174ae393b555,1,1,Fontspring.xml
+8def6206ee5b7f9f38db5c672cf6a64ad53a1217101909377e2fccaff4fc3d61,1,1,Food_Protection_Task_Force.com.xml
+bdeb72219338c7525ff16255af8d59fe4b6e246b5c8f2fce08f927a1b3d343a9,1,1,Football_Fanatics.xml
+a8ef5c027115c72025f427f939fa975f347e05e75001dcebe886fb8e76a5771b,1,1,Footholds.net.xml
+2656476357b57487509d522bdea0c4ad5d18edd3c9c9f2009be8b7e59e5b15c7,0,1,Forbes.com.xml
+ff3b2c2c74f4bae0b08249a9f3f0ba9ef3f45145f13adee065b179af0c366185,1,1,Ford.xml
+983c37c96f4294151ce45eb1842e69f2bf77a7ac3bd869db4c8c5d5983fe673f,1,0,Forensic_Institute.nl.xml
+7e195fc75d5b0faaf7a9fdfa19d0098ca2480cfd7716e492fe87b693279250a1,1,0,ForexCT.xml
+c67682b0fcfb5b328722d84fe8c192e393451f15d3deac0324c37c193edfe68e,1,1,Forgifs.com.xml
+5e8fc987828220c55b34c788b14e05218dd72014343d7d968aa77361601bc7b5,1,1,Forocoches.com.xml
+b6fc958980c2540d31f01eb6ede8ecf78e1430e81c407db0f84972ba310630d3,1,1,Forrester.xml
+863eb0975b9e8a5f88d3c76f5e7a371f31da838afaa684d1ec341add947060df,1,0,Fotki.xml
+1a248675d605c04901e6a2e6ba54332eeacca5a8eadb46a6d405d4a0ea1dadb2,1,1,Fotocommunity.de.xml
+f0fcfab8df8d22bc08e6ee92df4f201538ace2bf944be743223cf251d26c3c46,0,1,Founding_Fathers.xml
+23338597645b4a3ab4ff7b8841fc3efea480fe8444de694630a0462795c8f746,0,1,Fraternal-Order-of-Locksport.xml
+1a364af118ce9c0abcfbaa7635c1e0fba64baeea937b98e2cd06c80447faf42a,0,1,Free_TV_Online.com.xml
+0d48c14e2a05d9f90f4134baff79e48ca1778868b0491e7c7dc3043585d73ae7,1,1,Freedom-from-Religion-Foundation.xml
+dfec799168fd8446708a1540518f2829c0d71890a380ae775ed4b73ef262b88d,0,1,Freedom-to-Connect.xml
+d12551660a3ca3f4980666deff3758cc065dcfd4afa22807e598ead97a27a859,1,0,Freelancer.xml
+d0da63b8cfb124503218f5d2fc8e2f6de394eec88e65d7f44dc5b9e346f235ae,1,1,Freelansim.ru.xml
+5eb2f3c83b0135ef3f3022b665f265cc4c63b9d243d992fb4de5320a1c4a3026,0,1,Freestyle-Capital.xml
+1bc4e86cbfde644d76b06a2d42e53d2d3ad77aa44357b51fc3cda52cc13398f2,0,1,FriBID.se.xml
+74573855013be34cb1230aa388418d4134921cd8cff3db47111c1ec2fd3a386a,1,1,Frontiers.xml
+2ddf3d7696afa689b74e12c2dfa48ef10271c57cf8b52696ee584a5bdb09f03a,0,1,Fukuchi.org.xml
+b21f0fb6b215d5268425723bc75a19b326df831ea863d5a922c93c2edb08f1b8,1,1,FullTraffic.xml
+13a95ea4410e4b787d109639ceb3da60ebe59216893d7531fc6b6d35f2d1e1e1,1,0,FundRazr.com.xml
+0bf864d504b62b444ba798f46ae53acd1fe189b12bffc4c4a3bd9e4d144fb61b,1,1,FundaGeek.xml
+362fe4f58f36e45d49519cf808a46332a95af9c4cc9dd53a40054fe7989e92a6,1,1,Fused.xml
+f8a0422cad5ad0b4a9f2a4836d9b2354bfb7edc7aee9bbdaeda92dc36db5a6c0,0,1,Future-Publishing-mismatches.xml
+f30174c08a98d016d113a5730a45f4bb74099691dd3ef1d1d209d4f6fb7012b9,1,1,Fwdcdn.com.xml
+8426250d81f5cf4ac0d7d28b3c6506aae55186217010e055b523c7dc48639353,0,1,GAME.se.xml
+2da66d8b6b9143da5aa3de021865c3a1bd02324eab8038002e48a2ab8af86185,1,1,GCM_Asia.com.xml
+f7bdaf4a797376040d08fb18652d7cf0eedb8ba7906904146eb43b8a358aa5d5,0,1,GIMP-foo.xml
+8ece7b9a55dcc63fa7784890ada48016392aca3f34f12086284dc2dbbdd0e50f,0,1,GND-Tech.com.xml
+ab1451b0683e0014737f9f57f3e9f414f215dbff35b08fa8cf126e8d83c836c8,1,1,GNOME.xml
+9f9228d01a61c6c36749f43229b861d54f380cbfbf025469bced8cbdc2e08e55,1,0,GOV.UK.xml
+b1eb04822cc82a87c012a5b68622ca2804ddfa57f90165ab739d30d11afae09c,1,1,GO_Transit.xml
+6637d47a74a578146d45ff4f7aa375670d1aea3d1e41ed9a5e90284da437812d,0,1,GSU.edu-falsemixed.xml
+ca4b0f161ae75041c459ce29e5d2966ec73c220edf13d44cd43105509be11b84,1,0,GSU.edu.xml
+2658ea2070b54f5a51b5fed1141337e3b434ac2f1565884145c41b83c8ac6d15,1,1,GUADEC.org.xml
+943674e305df6b496953a700700d1e3301602f43f60cc1cc5c4b75f3d68d4ac3,1,1,GVNTube.com.xml
+37d6faf5ddc13f30dcaddab73cf89f5ade20495ba8ccabacd2a5f421c21a5990,1,1,Gallup.xml
+fbd7a51b3a90aa1e07e2061cece575928087594dbc159fb455b21f690775cd49,1,0,Game-Link.xml
+5d2394c351034dbe321e2c1fc675bd412c945a96aaf98744da20df4db5da97b3,0,1,Game.co.uk.xml
+34f8f5a92ee97baf0e3c14603fa42b65b89edb99a8e71c61877a933811035f4b,1,1,GameDev.net.xml
+51b99e7a6ab7cb4d9587ef4dcc9fd043d88924f3ea6dfc4268711dac06786606,1,0,Gameological_Society.xml
+5e479c67a14059e5d1d97d5c0dfa59efd46a91a731b7fa156731be0b1f9b06ab,0,1,Gamersfirst.com.xml
+3d51538a88733634e8692d273367853c40373ff980e6e63d35b98f1711854c5f,0,1,Gamestar.de.xml
+086c57cd99754d4786c53464fb9d076de23fc5af2127c7c9d534aa9f364b8635,0,1,Gameswelt.de.xml
+e031196f8fb6b2a3483248b387d37371ac587bfa8bf365a6f13ec2aa7c0b0732,1,1,Gamezebo.xml
+f639c545ed1cf318fe0e2bb27a8fff4e7253d59e9f83b06a8364ce5eee77abaf,0,1,Gamona.de.xml
+7a776fb081a9777f2314af66dfdeb753ac52a3124f9c46b7a400de6683ecc2a6,1,1,Gandi.xml
+035809e9f5bd95475a0a9b411c7401dc0cb02d0343ae1da2b72635a1f64ff652,1,0,Garcinia_Cambogia_VitalMend.com.xml
+cb1de2017a67592099d5d9c954c7c56e2e98bf32c7f265b9be519fbf869d98d5,0,1,Garfield.com.xml
+380a8d1eb10fe5a945578e4b2e76ca99abe4e00fde55ff1ba6937f8936dd35ef,1,1,Gasngrills.com.xml
+d282173eebd744c9e5761a975e9b6b5086e86ea8cf51c7803bc78ce8eec8f0c2,0,1,Gate-Crashing-Org.xml
+932651701c5fd6b9c5b272299aac182c260f3d005d9cdd624538ac5055bcd8af,1,0,Gateway-State-Bank.xml
+77d0072c08ac8a2b284de4354a9d9da5d9e3fbd2dd97532fa85c51680c813d5c,1,1,Gatwick_Airport.xml
+c325bbe3f25bde17054d2c65f66528221f834628788ba7c6f8275260b5294347,0,1,Gearhog.xml
+080439aaba8674d999ddba8845e23fa69c525446f11c7005c2bee848774cacc1,0,1,Gearman.xml
+9257553ea02a0d51787652f8f4144143fa4bf995632caca3a620f37e8f422552,0,1,Geekheim.de.xml
+6b70c3919be0ccfa44e991ff4e084fc38f51e4de86c8ce7e70d4e2007089f087,1,0,Gemius.xml
+82a575bfdd7c91f460c75b2c61c90f9b145af743bb17a462df5388d6ff93a9d9,0,1,Gentooexperimental.org.xml
+96c69b44fb2a6ff797e5ee08ae801303f2b36ab16fbd93f5d64a97f4162bde59,1,0,George-Washington-University.xml
+055d3a6e5f8d3e036c6c9f0a2e52b87fb76fdaded2e6768467e5a12f346eacd3,1,1,GetHarvest.com.xml
+10a621bf9199c08e61706800651e79887f7d9ab2eff080fe2c6cb96b6f18d664,1,1,GetResponse.com.xml
+ab59869864ab49f92b5999cf790130235959fe09824d4eb99e217acf4d93c856,1,0,Get_Safe_Online.xml
+682fb5bd1da5ede92efb99ab0044896bfdeed95c4a03ad363f48344f6c992f52,0,1,Gif_Gratis.net.xml
+fd005c94136bf38d49cb6c2e54e2d1eb3a1dcc47b14839e428c31a4e8fee16ad,1,1,Giganews.xml
+1d63e25cc0439afe39fbd853309091e58c612ef16c19421df703557c98780207,1,0,Gigaserver.xml
+f5298b32c824990297a18e92474c36a5d1b344ce7951b529a48dd0d6c2a9e620,0,1,GigeNET_Cloud.com.xml
+51e006dcc0faf9e3d034d633d244bbf7fb278b7f49388c9303bebb5d64d206b5,1,1,Givex.xml
+1d543c058797c2143e84af0016b439cef391b95b81a938a27400534400e3fc5e,0,1,GivingComfort.org.xml
+ed076293b391e63d4e03d8e9d6de8bc45e2e968273c10131468eacee40f1d08e,1,1,Glerups.xml
+745c86661e057217d3f6d9001632956d24085b474525744996044b02aaecade4,1,1,GlitterBank.xml
+9ca0b92729a85ee245177e7a30e4ab554cf09245017b322eb486667b90d30d2a,0,1,Global-Footprint-Network.xml
+bbf4d95e8b1cc5c2a5b862ff0bcae50fd87a7f055d1a085ee68a9f9196b445b3,1,0,Global_Human_Rights.org.xml
+28d1e935698d7bf9cdb4828b3fd4e933daa8cdf6934fe4e06bfc2820be0e81be,0,1,Global_Promote.xml
+2048765e5d20395f03f87f9fab3ec0691426edc106b94970fe052f1a7cb74e9a,1,1,Globaloneteam.com.xml
+5ddfa3a482674b780d4e0cd81e3ba0264703fe2b42c797a132127a132df0f974,0,1,Gnumeric.org.xml
+a274061c2d10fe93f56a7434e7f541897c64f1749bf842bb7d167eed03b32155,1,0,GoGetSSL.com.xml
+b4741f899272079753bb0118f166d0130bbedf31d16434e9b8127821fcc41f50,1,0,GoWork.pl.xml
+8035e4afba24967890b6a797e732159e2a135c28742d91b63f4ee5760fc980dc,1,1,GogoTraining.com.xml
+1857fb8f5f73fff134e4fdda43db8c16d0c9c22dcf0ac20fcf3ee2a846a022b5,1,1,Golden_Charter.xml
+9224e11b4b259be1d60b4d65c3903a9b2fe7403753ce0b1a540bc526cdb8e21c,0,1,Golf_Course_Industry.xml
+7fc9cf927c9b92789e3d57fde87b70aaf938b68e6b71adf4319411e2af1c67f5,1,1,Goodsearch.xml
+29c9afd965ed16539ae8450e714cef305ac462c4e59e30c4d12d85e63ca058f8,1,0,Google.tld_Subdomains.xml
+25c3f0f876658542a6ba1aa3b085d847ca547e3f03f0ece8b6b11ae4e08dcffa,1,0,Google_App_Engine.xml
+fc2c55f71e70b59c18712e3ce183d824f45432bc691882aa9a2990d64c8c0f92,1,1,Gotmerchant.com.xml
+8c2e217fca6c4f32665fceb124225f04edc9b8c01a403aedafd871a33c9d79ce,1,1,Gotraffic.net.xml
+2e29082cb5f6eac2d4995011751e0bef076bd568f46b022684a05e13edd48c7c,1,0,GourmetGiftBaskets.com.xml
+38ea979b7f650765d00622f7919e2589f093c8f0df62b005e1ee37f97e821289,1,1,Government-Security-News.xml
+adce25fe2ad3aaf12d9c15ea4ea6d9cdc060c1c52203c24c4a119f5c27e8c1f7,1,1,Gran-Turismo.com.xml
+7acff386a3f3713706f4533875c469e978d785fa9a072b750d010fe74ee2279f,1,1,Grand_Haven_Tribune.xml
+a86f4c61b5cbb47cfeaf651f2afd0fa4ea39f82dd2e73c927622cedad59f86a8,0,1,Gravatar.xml
+b7d75abaa69773098bd0b108a48aa4cbde2c00a211bacca52b107728f4230fcd,1,1,Grays-of-Westminster.xml
+6320c8a92fc89f7e04d91bd84a2570081ff7ac69ed87e0b5d3ce0055c3361b3c,0,1,Greasy_Fork.org.xml
+e4b6f7597186eff47f30a38f678dfc3d78db9dc04515fd3ee31e8831e0a743d5,1,0,GreenSky_Credit.com.xml
+054ef9c8b5459c29b97998aba9220474e3af78bb8af72316267560fea5174ef3,1,1,Greenmangaming.com.xml
+4988b2fe799481ffac172ac384a3951b46cf89ceda1461bf82522f468dcf566e,1,1,Grenet.fr.xml
+fc54f1280cad1fec94aa76e4bb91b14123e5f45ee89eacc58b0036334fd2d4cc,1,0,Griffith-University.xml
+c7a62209b05fc531978d48bfc38e9e0957dba51b78426f846743ecfe403723cd,0,1,Grok.org.uk.xml
+9fa1fec5b01de3f893162bb05593529fc9b9f40bdf02f4b00b6ffaf7a0d385dc,0,1,Groupon.com.xml
+bd99858b4f66b9655911910da919d75513c6be1606c9164b386c4df7e29819e6,1,1,Growery.xml
+7478de441d512f4f0f07602b17efda7bc4badbf0eee160a17e12c0492e1d6f10,0,1,Gsfn.us.xml
+a7f7e0bd7f195a558edb2fd3065eca2849c73dd757bbbf4f840482bc19781fc3,1,0,GumGum.xml
+f10393a60f224ac6a9127c33276d931066f78669a28786c577f068ac64b77b0c,1,1,Gust.xml
+4b4b09de35ac29ae3cb87642e66c4ae08593682c7847394a93c8d378766b5b41,1,0,Gustavus.edu.xml
+0ecd9594e7b04bdb9476ff3489d64735901f9230617b1d0bc8cbf0b0743ae62c,0,1,HH.se.xml
+6a011c27d3d1eaa622e81bac1766aefa2ef91699ef6e2c335df418719e2b168b,0,1,HIS.se.xml
+b7c742427b63875bf405b4617943b5e508ccf8ff4761279452ce909a2aad22cb,0,1,HKK.de.xml
+d09bb4ef7ae7ddb86f27ef0523b00a1e399bdc19cdaea4c3cb0dd86c6e6afdce,1,1,HK_Yanto_Yan.com.xml
+b1b43be7076c4ec828a14a45a16b5d0ac9427622b8899a87870920e1758b6532,1,0,HMV_Japan.xml
+805072ec20886e155a2c5688d1ed727a1f3f331fb607c2af876e2a5a0950821c,0,1,HSLDA.xml
+335c9d1e25fa8c3299bc8c25a3b21214cee62a69f8d1427fe405ffaaef5e8e90,0,1,HTWG-Konstanz.xml
+160cf059aeeb642add9c979040f1b60282a01c9ee49234f64bd25ed4611583aa,0,1,HUK.de.xml
+d97fb94656263a08627931829f3707297aaad16a2780d7efbc08d9a0e240af5f,0,1,Habbo.fi.xml
+2861461aaf5d9e64c74085dd5b9d240404207f44222cb49f8ba2cb1f0e3c5789,1,0,Hackerschool.xml
+922b403278bc9ae839f646bd231dd9ab11950ec5744da127a5e185b3eb1c20c6,1,1,Hackpad.xml
+51b17752c74062183224769643033cc2727e3263c0af2d83072f8f4fe3d30d51,1,0,Hafner-ips.com.xml
+36f8eada3ef9157fd9135fb2507307fc0a40d90e3f2b9727e1e483301180b35f,1,0,Hammacher-Schlemmer.xml
+c4c6765b82c3995fe1018d07d514748b3b1dc77463bd7f9745d4f81c89729b7f,1,1,Handmade_Kultur.de.xml
+a8183b3aee9c2ef8f331f6d2b4a65f99819fec523ff1df7d10cb69ed6fd7c746,0,1,Handsome_Code.com.xml
+0b7c9ea36c20bcc97958b4e3d5f6937282a35e3029bea14e6dc4fb95b3c17e25,0,1,Hardcore_Teen_Girls.xml
+e6f358268ccbfa9123abd3a38088ea30874f0fc2f7d577d6729117981c403c3b,0,1,Hardwarebug.xml
+33be37ec857b9b80c74e0ee3a9ad566bba7cdf793e076c4103427d1e5413f761,0,1,Hartware.de.xml
+1fcec52d0a6f3e89d64966ba878969749e4df9718a6500d911f5d86169e3beab,1,0,Harvard-University.xml
+db16d5037c30da9f3b7dcdc63eae06752d0a06a2f0cb2d1c16100e634db2a5b7,1,1,HasGeek.xml
+60daf8c2e3d24d7c737cd3ce182129c92f83bb25df7a66564b97abd5e2bced90,1,0,Hatena.xml
+8f3ad2dc6d52fe31fa281ff5c01e682f9275987572f2843458b7fc5dcb0979a2,1,0,Hawaii.gov.xml
+d23e1458e9cf3368a9340b486e4ed69d17fc5adce0d9d1839e7894ca3e5350e7,0,1,Hawk_Host.com.xml
+591930da4df33140beeaa02531b0b95e5f5dd8dd20879f314626f0eb2b187eae,1,1,Healths.Biz.xml
+04b1d51b64b57d6f1e5e899277205f72008d30b2db3cb6e69d40f7e334496bf0,0,1,Healthy_for_Kids.xml
+3edc0a640e42edae30c61c2af5a8e5b77455186e1d04c99b01235e248e320a5a,1,0,Heanet.ie.xml
+e6bd96b0e0f28e843af136c5fcfe7c0242778ff4aebe391eb57b29f2058a4511,0,1,Hearst-Corporation-self-signed.xml
+5a7c989104fae6ba6f4ee2a80242fab2e700357e5136b4e2f3bb235c6455faf5,0,1,Heartbleed.com.xml
+96303816b6d137a8ff22001e5a124d294fca5f073d184f8765d5fdb83f751f1e,0,1,Heimdal_Security.com.xml
+580d999997747a4097f5114244ceb0ed663803d141aa434b26b978c932efd3a1,1,0,Helpdocsonline.com.xml
+d242b4846eb0d61eb9e9d0e22ccb607616353391445d8f19e729ba9fe142a20e,1,1,Helsingin-Sanomat.xml
+820014421008b3ca657f912ac23f3adbdad002254ff6c94d5004483405ae083f,1,1,Hemmingway-Marketing.xml
+8291b5a137d3ec0d772b70f8d45a726e19b73dcc871494c813b61d0440886a7e,1,1,Herdict.xml
+25d4cb3f8b97c04d2b175c9f3d8e42df52bfc92fce67e743f57b5fdb37e86471,0,1,Heritage.org.xml
+69c3d0cdb2cedd4d13e8e4147bf4659509c178c0939ff2d6e9f41f621b55433b,1,0,Hesecure.com.xml
+95365d0076da114c98b41049f775b4e36a52bf8297842da9d533802ef3317761,1,1,Heteml.jp.xml
+93a85fe7954fb1d3f5226dd1ff4a98ba918d5a5f028d76ad0b519796e19ec8fe,1,0,Hetzner-Online.xml
+f335a4751adf7c6786b7521e5a699c6670cc3af8848778a442c82d764f118c7f,1,1,Hexonet.xml
+406fd610e2e705adefb26d72ada5b00607b27dfe683c2256efecea7ba1ed2e21,0,1,Hi-eg.xml
+7d15b6ecaf6ddcc637969553f0be451889bf2e45df35bfcca50aa3be43afc63e,1,1,Hi.nl.xml
+4307221f40a691dd191221761ecca21f6ef5956badce47258674d0cc030e453a,0,1,HideMe.ru.xml
+bc67427308208352d8a5a1fd4410b16fa545f7b9a6925155b05c146708a143b2,1,0,Hidemyass.xml
+f7af86a5eca73af32fc8ee59537226bf655617bc2db7bddc234ec7f3cae47254,1,0,Higher_Education_Academy.xml
+137fdd1f35698ccd261aec56e9aff59539e25dbb1d19b78819c3cc899097468a,0,1,Himediadx.com.xml
+1654debbc84e77392addfff21481c7d0908bb592c819a281a1d59b242d618e9b,0,1,Hitfarm.xml
+9adfaca1c0c2fa22166e4ac6749d4cfa121293e9945cc576b4530ea2d11a6578,1,1,Hobsons-EMT.xml
+8b5a732d5ccf78d73a0256acb161bf426b82ece7d1c75d77cd7b162db7eaedd9,1,1,HomeBello.xml
+2490e07912567101b6b4e07fe81d9ef66dc72ca97e1a8d3653f0cf32e43bf667,0,1,Home_Depot.com-problematic.xml
+7b460dff8a2b02d81df02b9d9ed829deb2dbd3d850c4536babea038ef2968ec4,1,1,Home_Depot.com.xml
+ac2f39b160910dfceaec540d188711e609245b31953c4a7740b9ddc2e7e7bc46,0,1,Home_Depot_Foundation.org.xml
+2d8e92f61fa2c3db92ca33b37933c4c6d7c9f3deaf712dbd4a9a31c4c4a94f51,1,0,Hosting2GO.nl.xml
+f9324749f745dd11d192d3e1b9664f2ca11636d60a9fc0ec77e1f821f39b432b,1,1,Hostmonster.xml
+caa78015c31b2b090cfbf9889caeb1402166faa48b75fd458874a52dbc06fbbd,0,1,Hostname.sk.xml
+d92eaeca0ceba278ae0843bb88be513630b35575dbfca641218c1115fc4651b7,1,0,Hostoople.com.xml
+95fa1eedf4dd91a07eff39c19a55e9ee97fd25a7b0fffb216c4508df91750aa5,1,1,Hotspot_Shield.xml
+e981fb89c3532e8d634681500de73da305cf7da937febc2a2346ce347fe14167,1,1,HousingWire.com.xml
+6c4a837e76f1df70409a02545ca923c1bef94e7a594fbdbb2a7e417e30d97426,1,0,Houston_Chronicle.xml
+79b67385e5095c34090fccb7de8b28850d1a081a776f5aa319318bd9a7c52d7d,1,1,Howard-Hughes-Medical-Institute.xml
+51a4120fc58d65fb2592da7322ae24629f9de9d2f7296ba2492771e06f062f8c,1,1,Hudson_Valley_Host.xml
+ffa9a50df3e8b93b0681cd903f99fceba361d148f82059e0368c5a98a688dad8,1,1,Human_Rights_First.org.xml
+7c965cb2a413ccd64e7ed9dd9044fe709db367844c8a60a4068a5051f7d5f684,0,1,HumanityPlus.xml
+cdf1b44b1b634ef96a8047c2c063237f457522acc532d4512d652ab469e52f32,1,0,Hush-Hush.xml
+0698b9892d4f3615f359bd0de6822c313b88a06ce3e15723d9e213eaf203ce73,1,0,Hwcdn.net.xml
+dbb782ebee6eff8bdb35faa1bf5ed396d62ff117785f233ff4f9a43fe8e82f93,1,1,Hyperspin.xml
+18c086c4defd26a9dd8a3fabcc666503c4ea63b34e95dfae104088cfc9a46347,0,1,I-kiz.de.xml
+5c03066e85c3aaf26417fe02f012ace3c4a4a650cd9c2463a4adad11f3f22f50,1,1,IAmplify.xml
+efe61764f8dfb9aaa617c1e56fcfef173f66aa12328bb32d162bef6d65f12348,0,1,IAnonym.com.xml
+b7cc4fc999d2a76591c5022d7bd3eec8ccb5425dc9312584de2f5cf1f5b4caf8,0,1,ICANN.org-falsemixed.xml
+eed3b45ec6eaadfb8fb4cbac10ee2dd946026c1bb45ab6e9fcc561c11ac565f8,1,0,ICANN.xml
+e158dbc2b1b6f24c03e24e1418e3c388738c260ff02efc428b534caf1185fae1,1,1,ICIMS.com.xml
+f18922a305bc3be951a93339bd0045ab5ca5b9741009636154eea681291cfcee,1,1,ICommons.xml
+211f626e770a4edd6e49ffa0449a7a34f3013a28e2da645b7297e471ff22460d,1,0,IET.xml
+5d1b07df986b4173849427f9c2d1e6a733f7027140bf3b9aaf4696115b704d50,1,0,IGrasp.xml
+eb4940331c51de8d5bea8ff74cf37cb4eed6371c5c5145dc58deb822690e151e,1,1,IHG_PLC.com.xml
+80113e93b37b37a4b5677a3b5f4468ab96198f2e4f1bb6fe82350d086e21e554,1,1,IJReview.com.xml
+612862cba9dcba8f259b40677fbb0dc0c970577a2ec8248d7b4b264723701570,0,1,IKK-Suedwest.xml
+756deaa5ee5b4d4c35a91db9c5e5f8173617434b69dac01f1017b5f33e5e4f74,1,1,ING.xml
+cf27f352065312c50689b9ef199fdaed72ec399f015a5a27984aae4f6eff48dc,1,1,IPCdigital.co.uk.xml
+4cac21996f65a1e7193902b0a88dcce06b2eca129343e5110933dc22fbd12066,1,1,IPXE.org.xml
+a87eccdb4a57249445db1771438e401dbc678d346083aaf5987566f384e5c05d,1,1,IP_check.xml
+8a66c900d13231321bea6872c759548b1dca37b059c7a1e729c7d15613ab0b82,1,1,IPage.xml
+4cab7ad0efb9a81786846b6c973ea525e4bd99e95bca78435ffa6eccac0f3fec,0,1,IRF.se.xml
+533d5759cfdb30ab6272db8f425bf1d563926f1eb157ae717742dc441b3b3d88,0,1,IT-Cube_Systems.xml
+48ea9aa1ebbed6fb580546fdae5f7641f1f6a3694f028f742631ea1213f166da,1,0,ITPC.xml
+3e4b1b3df1d0421acc6e09a8e2535e9d06a2ad1396cc753bb7d868acc64d439f,1,0,ITU.xml
+024f274cd2fb232792acb65a2c2c2b67fe893b6eebefec9da21f017262033102,1,1,ITV.com.xml
+3b48a035ae7e50023f531d8a79f7f41f7b3289b9a214d72ad9191edc5d596e02,1,1,IUPUI.edu.xml
+dfc01c229e85fc0afad8f20207e8aa59ce2ebc362cccd9258859d4c40e7dd75d,1,0,Ibiza-Rocks.xml
+047c2947f163b74bcfa7c71e4cbaf7b19e2c4fb951dc2bf975446720dd35fb3d,0,1,Ideas_on_board.com.xml
+06fa0e873e4bdea3ae9ca0d8ac78f1b8ee1c7785206d7b4cbe4f2b1dabd47abb,1,1,Ignite_Realtime.org.xml
+19a10f5af3e7219c9888aaa8159acd278ec023e7570d6369264dd4ac99b05bcc,0,1,Igolder.com.xml
+df7acefc4fc64903e803b27bb4d75cb6e9923d329711a4f14e2251e82b85f57d,0,1,Ihug.xml
+d3f0a875d56edbc43be1a9550784c2d199a6809baf1ce23c663030c246aa7419,1,0,Imag.fr.xml
+ded349d0e0b6957b6ecb94f4e85ab1dfe7fa03b1a0ed16ba7531ff3b9cda9322,0,1,ImgDino.xml
+f8f1473f26523608f91aefa8d1b68855201582099478a6177deedd9f2fc8bf44,0,1,ImpAct.xml
+2c56a55203e19f8757d1bd3ac5758338c21eb571a322466ddd48a27f99d3ab30,0,1,Improper-Bostonian.xml
+8e6cf93eeb46bce877ab9685359feeb109ad022109bbbf91a21b941519a3006f,1,1,Independent_News.xml
+08fdfcc35d415a8993d8bcba68b0216bb1343e148d736fbedbf61d6de08ff781,1,1,Independent_Voter_Network.xml
+0e11558aa800c2b2eaf87fff2fcaa7801f5bcf2b287180b9ddb86cc5df6cd7c9,0,1,Indian_Express.com.xml
+76196600f67cde4e2a5a69869eae23ded468e8c8ad6837e111b44ce8104cbff1,1,1,Indiegogo.xml
+69f67c7a6a357cbe15b8e565e6d2afc6b8fc2ba6cd3cfd393c4491b3861fa503,1,1,Infinet.com.au-falsemixed.xml
+d885a05161cc68f32429419ba4b53b0936456a6743206734896c8345467193ef,1,0,Infinet.com.au.xml
+3c43448b0f0cb113e11bd417ce99292ae25d977fd5191687aed8be931bb3550e,0,1,Infinity_Tracking.xml
+ff0dd4bb477d5c2b96ce3ca9edc86f4f449b5ad0688c3961ec8fe048f4c7f832,1,1,InfoQ.xml
+39b2c70087da6a223a686f168f6ce3703d48a89dd0d877c4bb175b5facfe0660,1,0,Infolinks.xml
+f4c83a13d0fd8f8e1248e83706d7426b8d5d39543fc0bab2f054bee91240fe66,1,1,Infomaniak-Network.xml
+9872dc9d2e174cbd02c79c23eb0c9c872c10ae2265835cd1cd6f3ab05a8a77f4,1,1,Infosec-Island.xml
+e8686224d76f240dfa05d6cec4525948de3ddbef03b1d39f83908e935f9ada69,0,1,Infused-Systems-mismatches.xml
+c45efd084b0b44e025939e768470d1ad22530fe4be95fd21e94fb53257671f41,1,0,Infused-Systems.xml
+f17275b6e9f48b06e9f1db362a27de41baf0eec5fe34f484f7c141e9266baae2,1,1,Ingentaconnect.xml
+54e572fdfcc270309db864e7098ba422d1eeb909daa2fc7237d77649dfc4f057,0,1,InkFrog.com-problematic.xml
+abf2bf8030eb7da4165548443a622f0f8504acc1c1e6c06821be88d9889ef1b1,1,1,Innovate_UK.org.xml
+f10ba13a6c5177bddaa25ef0a0bd9520f21fe2985c58603ad6938b5350d5ee37,1,1,Innovation-Interactive.xml
+c241d995f6e6793b43f3ae50cc1832289b1de058e929249ac5b3a8418806f8e7,0,1,Innovative_Food_Concepts.xml
+8f7914e006046e349b25fb919f40317c87fdd9ce249931917c24e48ab12247fb,0,1,InsideUniversal.xml
+449ba10b60382b828cd2a22be490c649e442925595d8081dc5f4affb480d3a1e,1,1,Insight.xml
+4858b9af0edd798ddc138ce6c02ddf6674e9be1574cc775864f1eb2da92fc85a,0,1,Institut_fur_Internet-Sicherheit.xml
+340838024acfc70d6deabe9ee17b085b055d4bc9a80120afc800318808c7fe29,1,1,Int_Gov_Forum.org.xml
+b19c12335d9ab9d9597fbd0f61c3445320de83618fd982a461ef2e42400286c9,1,1,Intelli-direct.com.xml
+f8ccce593fb95122a95fe00918c297e77ce818f5d344510362a3a99417f8141a,0,1,Intelligence.org.xml
+405674d9b11e8e289b645154f2352a4401d377c62570898515365300f4a3208a,0,1,Intense_School.xml
+424764bfede4c1ea62a389e05ba765b1a4e36dd7efd03cc193cb8010cc22ffaa,1,0,Interactive_Data_Corporation.xml
+5564ccb4d32a36d5d2c879378d9f261947d8dda7515702dd761615f6fb399fee,1,0,International-Business-Times.xml
+84e7f285a45629181dd08c4280bfa1293bfa38c3565b837ff7fd262a45c3bd35,0,1,International-Finance-Corporation-mismatches.xml
+127ddf485368851d2dc1f1eb1f64bb100f9397b2fbc05b401f2c53bbb0bce88d,0,1,International-Free-and-Open-Source-Software-Law-Review.xml
+0992d1e0fc55d6fe819499e798e99207e0ce9aeecab77981087ba963581e8149,1,0,International_SOS.xml
+7266fc84a1e6e39f0b812bf791d0b4c8f3705a3070bf41196385d46762dc2ca6,1,0,Internet-Archive.xml
+81b3be4036e221a597bf01d58395099db4a6791814c05bfdb666f9dcc2a8088e,0,1,Internet-Governance-Project.xml
+cab358f32e9a489eaa69ccfdefe364cb36fcb5ba3346874889de9fc875050d59,0,1,Internet_Coup.org.xml
+dc6ff49076759df04ad979467bf83cbb0678098f8162268e128a4a1f9b4a93f2,0,1,Internet_Week.jp.xml
+733c0f0956527491bf6a01d35e097c6df6b84c46e102332096a4fb81973f7f9e,1,1,Introversion-Software.xml
+b00472fc653c5118dcba1528fa24b826ac7a3c90f1724d7966bb4c34b237f936,1,1,Introweb.xml
+463310fdb182747ebb4fc15ab8c38a5f573b10b276ab7c3775acd3708408caca,1,1,Intuitiv.xml
+b8b926a42cd2792106cbee833c76f516fe15c33d7b2af468e29ef66a8694a465,1,1,InvestSMART.xml
+4f8f87e94bf9f3220dbf10f449349fcd2b1eb3a5dfcefcf4c64bf1b7fbae73bd,1,0,Invincea.com.xml
+6b83c7249532eaa85681d638f079f8c090c10b2e099714e498d70930e3a2f867,1,1,Invoca.com.xml
+b2ece42a9c773d4376618d1d3848eb747deba70a2de12185f51e1dc9136dbf93,1,0,Invodo.xml
+848e94d75fdc0df47147da78e0fd4d4c6ac21cbd9c9299ad3114f7944d655505,1,0,IoMTT.com.xml
+7e80592d8efa073fe201542cef44704110abe65a2b0132e1a7bbece9e8936f22,1,0,Iplay.com.xml
+333e71526ec644126315f77e20029f262ecd0746c68ff9a2cfbdfcc16b003066,0,1,Ironwhale.com.xml
+d3976d61894e1f8464f930466936d18aac9056ca9b23f7fc23d97382692b81b9,1,1,Isle.jp.xml
+1661e0be935e93fe17283133e908f52a3d73a05c2110ebb4a95d56343122a1ee,1,1,IsyVmon.xml
+36d12ffb1d7bfed62d6ccd2358a9ab1b004782d42a70f8e76255497e56e1ae48,1,1,Iv.lt.xml
+c94cc0f445874d3f294be079e1c4775fefad5e6bb8d6dec007efbfd060276163,1,0,Ivacy.xml
+dc52614b3a33ffebbf5763c7c2a25158699d866af7ceb86ec83fe1750ba742d4,1,1,Ive_Got_Kids.com-falsemixed.xml
+ef2b06228e963b94bc9c0848ac490cd4516d52f2c525f74812dcfdcac93acefe,1,1,Ive_Got_Kids.com.xml
+370755dacb3bb54bef963a118b65067bb321e839d51f337bdbf0448944708cd5,1,1,Ivwbox.de.xml
+2058d895da75a404225168a25a20ed36618333427509d7252de4bb28563c3b70,0,1,Izquierda-unida.es.xml
+20df0251075e227bd026718d531f83021987ee9c14a1438f3cd7e6f9ac12014c,0,1,JF-Shea-Co.xml
+ce1f1dfa4ffbe1de9185c4d5bf81e07ffa6afd0c0b3c16bceaadaa8194659a77,0,1,JSConf.us.xml
+ea862774de9cabd815710f212b32d626a515601e3bcabab24545c2cc190d1650,1,1,Jacobin_Mag.com.xml
+443e8c4948a9bd307012a1b725a0bc64e97ee68ec77972dec6bb036cf4700856,0,1,Jacqueline_Gold.xml
+d2130738c6e895702f300033327d5e273f6564c43c7f71006f8c288f83cc1b9b,0,1,Jansbrug.xml
+62d30f32c383b9005b247851e85115fd358c8ee752b97edc0d020b0ee1bcec88,1,1,Jarian_Gibson.com-falsemixed.xml
+7d850c502197ea8b2e13688d1f2b34c9b7a44ba657c92faa3b3ed2030dfaca66,0,1,Java.xml
+f895874ee61887214f675b5344b3a35cbe34590a6d27c4c9e33b348f590aa2ce,1,0,JavaScriptMVC.xml
+ba3e53a6684fe796317caf126f87f3e326812dbd09a838bade611ee313da196b,1,0,Jawbone.com.xml
+26c1c6b5233bfe9bcaafb3505cc40fe716ffac3309ff08136944f0608c825d1e,0,1,Jba.io.xml
+b77b4b9c609e0f61ab406d1aa62c5d046514aa6581f420374ef0fc4b7a112def,1,1,Jeff_Nabers.com.xml
+c1df2d5758953f29c992ec2598c94e7e73d5aa6c91d2f8eb4d62e0fdf0322a07,1,1,Jinx.com.xml
+aababc62c4dfc22dc8a9e12adc4364b9a0befe9ec0939060924b587747b8bc7b,0,1,Jitscale.com.xml
+80eed726a6c96bd4f97361b7ee9d2fe2e954fb74437a4e800500399676778e61,1,1,JobMatch.xml
+f1a84ec3b3e0e934ce0ee5517ea0b31cb7ba152de5278eb0895bb07023c6628d,1,1,Jobbik.xml
+33d8bda4d79682eae0ad704c6f834650e7054ab4a71d1b64cf62becfabdf42e9,1,0,Jobsgopublic.com.xml
+ff5eb876669cf155eb33966d0cdda8a88942ccf55c814b14addbe51e52db761d,0,1,Jobware.de.xml
+5d2c47c29c532a62ebdc816bdc6dfcbe1e573c4b5e2ad7a35f2288ee3d58c3ae,0,1,JodoHost.xml
+c13076995d5856791ee7814d103be8fb0afc12db160318575e4e35097fe599ba,1,0,JoomlArt.com.xml
+49e14eb4dbfb8cdd922261721b0b57280076bda7b75b59396dcd0a4b67914955,0,1,JoomlaCode.org.xml
+c979cb8a361e3ed2bf5032f85b8aea715a1bcaea1a278635048ec26d4e59240e,1,1,Joseph-Rowntree-Reform-Trust.xml
+101fd87908eecba0acf9700f26880592677e52c7d8edc8638dabd72dc06476c2,0,1,Journal-News.net.xml
+c621d4ba25d54b2ac74584129f4234f43b52d2bb00a11b49ef04dc15848169d7,1,1,Journal-of-Neurosurgery.xml
+878f0efcd4fda30f3821e5362986a41446a368b644fffa970eaadde331595bfa,0,1,Jubii.dk-problematic.xml
+139643e1ab4ac096871a49767ed0ea197a72a6dad80556b93ff55de39a577bf4,1,0,Jubii.dk.xml
+fa67059e40c7d86b9f448f529446594ec9f24e9293365e478a6a9e4a18c0cd29,0,1,Jugendschutzprogramm.de.xml
+21937f0fd2a36647290096e83c0db7202e391611c11760e4cd68edb237a4f7b5,1,1,Jumptap.xml
+4b35e98b981f9df97de267679053b07d243573d98a3b6c6ccb0cd6398c50fd35,0,1,Jusek.se.xml
+4f66a213e609f141d907611e755bf0e4379e737428775635060e8cb0bd91ef8c,0,1,Jussieu.fr-problematic.xml
+fb593e8ddf88bcb1d1508da06196adc76706e4a163a0e8ceabace9e8a5bbf42c,0,1,K2s.cc.xml
+a6a776e8e5901bd6be4af8ae581f0f74106f78b5b05b1b4e1521ff7df28c7fd5,1,1,KAU.se.xml
+7e5171a47befa926139743e6067915bae25cc403dbf0f588f7864ab606739b62,0,1,KKH.se.xml
+a6450ff330b90c225cc405c8f5c623dca8d7a80a0c16a3e58be546feb7ae886f,0,1,KMH.se.xml
+c998b1cafdda9cf06478f163ec72ba97ce710090b671180ceed391173d43a574,0,1,KOP11.com.xml
+c862e0e1a6711961135955912f1b1644c5e9dc31eb2966415367ebd39f434774,0,1,KPN-expired.xml
+18bd1f18f953302be45bf882bd9b3b8f6a738d8f6e1f844dab416d95b018b248,0,1,Kable_Packaging_and_Fulfillment_Services.xml
+f021b6ae3956e22e93e03da6a5ac8de94048821b7a588bde2b55940c9a8e5d17,1,1,Kaiser_Systeme.xml
+6fa233a4df630fb7dcb886a508843290392db8506e73a1a7da94954db2affa58,1,1,Kampyle.xml
+911f9f57dd80af37a918d5c5029a1b4d156298e48a029e7aa9497beeda774ccd,1,1,Kaneva.xml
+0d020e8196630cf58db7acdcfaf794b8eaed3ff489057148c718c3937d8fe03f,0,1,Kantar-Worldpanel.xml
+4d40f0740ed2f847fd8c22c07325ae9fc4a83b1a17668dd707ca61a2bb37af8f,0,1,Kaos.theory.xml
+aa9386df75242bb212ece0a1276439722214b066f3a533f48cd1c9ef722f5f7d,0,1,Kapsobor.de.xml
+cf193dd0623511229492237f7c7a1d06bb27fe241d5bb641cae8994407a54668,1,0,Kariera.gr.xml
+6ad5cc64325504eb05b4d56be62b0a8a17f98847e7f12784b18b75a2326b2393,0,1,Kasimp3.xml
+2533dd6d42cb718667d11a29e50393d300b659dac2e9c62a5954b17aeb915c71,0,1,Kathrein.xml
+8c3308c7790fec725f31e846d418fb1fda636beb525f9631be1cf2c9261f4672,0,1,KatzPorn.xml
+2086ed81e93368551d121b0508a0ae28a1d71f294f1ec7b58fb5d1d21b9380c6,0,1,Kayak.xml
+679dd719d00e4edf268f1937eca8d034fdaeaa5c0a744882e2435f342656a19a,1,0,Kayako-clients.xml
+a18f5ebe00ba0edd8322f6c5bfcb1b9db11fc1a04fa28ef93e2c91fd12bb04cb,1,0,Kayako.xml
+68709a34f51a5fd997ec08d97e2c0aa2330b4ea1134bcc5e11326893c82c9913,0,1,Kdoes.nl.xml
+acd59b926980f2e6a1edc1bd896e12121eb5ddbb7b91328e6ab7dec96b887c3b,1,1,Kei.pl.xml
+b67160a2bcb46424224f756e56dfb804323c2446e2161554d1d1015b64ab32d9,1,1,Kenai.com.xml
+cc4ede67cbb2b5809ac7bb84b1a3e4364ad98f9f3fc139ac38683c67256750a5,1,0,KernelOrg.xml
+911d17e381f38a6bc6ef545f5ca260fc0954922ed63bf05e2f7ca0e6035f4535,1,1,Keymile.com.xml
+5fb3e2cc1c993880a2f59cf36840a623d0d7f329e31b725c711619d78031845b,1,1,Khronos.xml
+12ae40cfc95aaaae2573664fd2fea40b4aa90e5adb75d013953225121bd38361,1,1,King.com.xml
+4b71dc7dbecc49f2b48f869a78b2cea026dc9eab9ee6627a49581d58bbf936a4,1,1,KingHost.xml
+22da148d8b0d0314b3d843781fd3c72bd14fbfa68fe38c808faa9e57f7a56aa3,1,0,Kirjoitusalusta.xml
+c945235a8c454c4c16e6974e30e93b93424b69da591daa36bb76e7fe25157cb5,1,0,Kirkus_Reviews.com.xml
+aac83590b0080a78a0b254d8cef88f132b0d609d2be69b2744903b627e000951,1,1,Kite_Packaging.co.uk.xml
+bd7d290a024a52feeea17c0687d34ed0412dd25138985aeb137ee451ff253b44,1,1,Kmart.com.xml
+8d12f9d79c207c30d5319a01f740f4a73681b5c5b5973fc74c6817ae87f76534,0,1,Knopper.net.xml
+52d6def38db07b96638bcde23b5b25c7872a170f91e482c676b5fd95d92be4ea,1,1,Kobo.xml
+60795a9ecf4a07f3a1a334fb06b698d5019c69bb24c1f395932ba5c6322ff747,1,0,Koding.xml
+900b42c2f9d1ce487f4de696a98cea74e452b7f9cf848de6eb9c8d8254784e64,0,1,Kommunal.se.xml
+7b7771e336e05a84d249ba6c7a5693e82edd32524986654d9f221d8813f93ac1,0,1,Komplett.xml
+796f232394138ee9298ed061fe587c009ab2a399f9d4db5fb77a07baa51c390e,0,1,Konami.com.xml
+d417f481fdbe9c2100592bf164c92feed9e2a9f8c989a8267012fb2bb4a294a1,0,1,Konstfack.se.xml
+c61197b469d6020a7cf8f4aacf5ff2c2af8a4903f35207fdae2fe0f81a370d85,0,1,Kraxel.org.xml
+70ea6a47d4bc8e3031576360df6556486307c552f6262b899f7f5b57dec7fa27,0,1,Kryo.se.xml
+3896c91714231d5364509bb35080579f7e57d4e79635b73e98987a83c0130e0e,1,0,Kryptronic.xml
+318a844861fe3efe2d779a4ebe1fa76f5dd22aa13aa7593b4ca05cd381f4d258,1,0,Kununu.xml
+53f972ce676848f11352f5c892d485ce971910da0814445e0a42662963eff652,0,1,Kuther.net.xml
+a62b1619581ed52ae2af7e41fa9207f1f557d26dad30077504608f30962785eb,0,1,Kvack.org.xml
+885092e6b3fa8f6489a89df450f876ad0eea51159c22f216e787e31b9e8a9ec5,1,1,Kyani.net.xml
+1e8699cf15dba86d69e26fb49441767a96265e2bc93408c5e0a5807e788ddb46,1,0,LF_Hair.com.xml
+c6af0bb28a0493ce2106970a3acdeadfcf1dba65e1f56a3244cc30daa5093c50,1,0,LG.com.xml
+e4115499b76cbc58fd655c147fc8ac7d5f4df58d2d83d0b9e754f04bcae2cc31,0,1,LKD.org.tr.xml
+f180daf50f99e6d294efe3cfa3782b3038ec3c34a48667dc72884554e2d2011a,1,1,LONAP.xml
+6e1614a42fb6bf41f161fb271e2cf441359eefea66a5de92ae60039337adf443,1,1,LPO.org.uk.xml
+7fd1c24a4f4664d94bd4dcbb1b3adf923768304192d282339008431d1e86d086,1,1,LSE.ac.uk.xml
+48d0e26e10e9650974898fbaee4e55861b58e585a8791e91472fc1733ee15d15,1,0,LTER.xml
+d83b6ba8eb9854f82349c1cb570e50cba577fb736a3ac89ef55868ee18f76463,0,1,LTRADIO.com.xml
+d3689ecf97752c8573fd559c68beae3b96bf66cc7a7e045a03f0d1050e6d3b48,1,1,LU.se.xml
+cebe40f289abe5d6a7ba31addbc3a99eee1003e22b2431d7ecaa4a7f2290f151,1,0,LaCaixa.xml
+440e3c3ec61a216fd7754eb08d64a06e73366ddb91e20c952543667a86473e31,1,1,Labels_by_the_Sheet.com.xml
+9cfd769231672625b8576733968b9cdccd500feac77f6f1510f30ed7f70959f2,0,1,Lagen.nu.xml
+82729f42964fb00d0a64961bed6138a79ae1222b15d76cebfc875163b1dee39a,1,1,Language_Perfect.xml
+8fbfb34c2994d782ce1ade635b78401d5a869fce79d309a6a5993640f8e2d552,1,1,Lanistaads.com.xml
+c01f9d5e0f0ef9ec2db156bf19729febd55117a48db33e144075f98a9e96debe,0,1,Lantmateriet.se.xml
+dd011e0f5fe4e3c951182b87f42d4c8da475b71bda1266177397782766a60a3e,1,1,LastPass.com.xml
+1fae5026b085ff0376c53284b2b7536230bd781b79f4be08506d04bdc7ef1286,1,1,LaunchRock.xml
+91ce0132d8fa941a30990cd98fd6a038a48e77a6a0c39d678bcf3823361f9625,1,0,Launchpad.xml
+bf3030ded18c245aa1d051c849660ef9807cbd9259da24dbbd0a5c12cefa65a9,1,1,Lautre.net.xml
+88c874136115bab5c0c463dc21b28c2aec420648b71c12ba9af82c4f86919cb2,1,0,Law_School_Admission_Council.xml
+329b80614b84565bba78c4cf3ebd40f2caf60cf648372f1deda76b93564693c8,0,1,Lawn_and_Landscape.xml
+f649aae090d1c7cb5e6329286ca40bc52e4085fd4d43d022ac986523a689f268,1,1,LboroAcUk.xml
+a6a354b175f07f96a7c2cd4ce4a00e26cde800c6f6176f660a59ae918cb56d91,1,1,LeadLander.xml
+e300d073903c53373ec3c3a839d324681cb79d4032894084c81bc40644863fbf,1,1,Leadwerks.com.xml
+acab086b0a34bf5d315b8292d4bdc886c9c30f77f9009c19417f85feb96438b3,0,1,League_of_Legends.com-problematic.xml
+e6045aab54c1eac855a6ffb4d28436677e5ce1f20039adcfac9475984867a8a8,0,1,LearnShare.com.xml
+e400c587a600d3ea1d156ae3063bc8aba863be12423441d42d9f56bc1c2b0516,0,1,Least_Fixed.com.xml
+9f95173fc7274e64f6258a7fb7e27acc4cf781d5f78efd28ae81ce97465672a6,0,1,Leia_Jung.org.xml
+44da4c65f5edbb2ed09326db6bbfe7bb0dd769545bf2f34f7eb8071d0d78ba3a,1,0,Leiden_Univ.nl.xml
+a3ef9c0d822a74a1fff679e554ac079db0976b0c53fd85a2362de2cf6012812d,1,0,Lelo.com.xml
+eedbe4c1b73b659f65c1b47b6b0a0b08e5e4ce32c8c96b82fa8b6e4ad2f5ead5,1,0,LibCal.com.xml
+6496d6df922c6b28f13e369f2925655f9c927c171bf09ecf6ab284ab28690b75,1,0,Libdems.org.uk.xml
+82d91c9bfd424f34898c9435240f08ba68083edf2a2f14eeaab224ebf245a606,0,1,Libdrc.org.xml
+4da6941625e8c737ccf9de80aadd671b78aab17d09bb0830557256dd8f3a6ca3,1,1,Liberal_America.org.xml
+e4ee080f90c4502d02852289bf7ba13986f2a06816f581dee48cc61cd03a4724,0,1,Libre_Graphics_World.org.xml
+993b07ba4b30101d7b4d133239b7a03ddc0d914cde338040b53d7871bedf04b1,1,1,Life-in-the-Fast-Lane.xml
+ec89dad60d6ad5181f1516398c0f565bca357a82f3e05270eb1f43dfd8283c11,0,1,Liftdna.com-problematic.xml
+91fc0e64deed78bdc5e964c46ad97765ae536dfc279fd42b8828f66653a1157b,1,1,Liftdna.com.xml
+3ff02692d6dee89e9579eee5d73a0e4cdad3e9e7a75ad9d0509b8abcd2fe9f5c,1,1,Limited_2_Art.com.xml
+a8f163ff8c42d612e5f6246df52033522d0264a77b677f2cf6c94219e5822f8c,0,1,Lindy.com.xml
+3058c9207313b250a6cd06db40b80815b52ba3ce969915bf1d4d19e70a5e84d6,1,1,Linn_Records.com.xml
+abed76a1e5201dde504d6396473b2961c66f1362ed13dd21c4805178430d208e,0,1,Linux-Counter-Trac.xml
+7aa31325bf3afc674fef9ff7fd6a022945a077e10cdb903ca73ca0227b01861c,1,1,Linux-Magazine.xml
+8704f5a37ed8b963c85260397289542d0d55eefbe1bf6855bfadf0aef5db1c16,0,1,Linux-New-Media.xml
+b116fbda85f0cb005d48ce4950f6f1c0cf9d1bc136bcc23d488a308c70e6737b,0,1,Linuxpl.com.xml
+ec41d249213aad2809c091e338ddb5eb2d3b97b335598082e618aa5814ce168d,1,0,List.ru.xml
+22ac503a66245c7042a817c200fc8c2a4e63d9e3287eb6d050fcda8623e65eb5,1,0,Listonic.xml
+935c7b3c73fefb6f6980cbfdbc828f2d89cfd8c8f8a51e1de48fcf78822e1316,1,0,ListrakBI.com.xml
+3558ab8db745d3b527d28ab5fc0dce1559dbe191d449b27d09223519354bc135,1,1,LiteSpeed-Technologies.xml
+9797c1484a96176ae9397050a435c54f9d0409368785d4355f14e6d506fe144f,1,1,Litter.com.xml
+36f0e15f0557defe9ac96dfe9ea3853af828688300ff6c438228f0ef4554b97d,0,1,Little_CMS.com.xml
+fe52803da1f703cfe9990e08d740aaba64f6d59c459653376356b5ecce922a7e,0,1,Littlesvr.ca.xml
+9c64457952ecd791e6df609d14cbd6861f04be1850e16fc064b86eb5042d8a75,1,0,Liv.ac.uk.xml
+0d6cb0837aabdd3ca8fbc4de6d3c8b1e60092939708186f1ecc9ca3e38ea0acf,1,0,Live.xml
+fbeaf8dbd06fc62fb6217d020e5d4401df8539e62b29c3d1af073ff07d52ae00,1,0,LiveAgent.xml
+e3d7781eb8af6d39d6b9ce237e46688f6615aec94f65cb2a54a87e167b0c2236,1,0,LiveJasmin.xml
+b39a16b01956252b32328acfd50d93cd04a0a33ea761eec5d5fb9df24a7d56fe,1,0,LivePerson.net.xml
+4df0e6a98068a7e8df85af4cb7248c048fbe6b5fd0bcbffadc7d155d8ce52610,1,0,Live_filestore.com.xml
+627f36782b5c58008a53cd2d0a4161d517705f45ecf809ebcca7aa06a6510fca,1,0,Livestream.xml
+6cf957e7613bc938177a082c0f9ce6b5773892518127b119b3444955c853d542,0,1,Liwenhaosuper.com.xml
+b250fbb7e12444692db8db24a0d8e51c9c16147a0bc0aa62599c05e6730f2c9e,0,1,LockerDome.com.xml
+44259251bea98f85ceb968382de8eca6ae98b9b9f6e42624d084cc06eb06af5b,0,1,Logilab.fr.xml
+097184d64f94a5c2eab91aeafdfc13f46bf7ccfc9d08f93e2524e20cd27bcfe2,1,0,Logitech.com.xml
+fd7e40226e930ab0f0ca06b65135ae1934840ed6077517bc1e3500503d680c78,0,1,Lokus.no.xml
+310690f227575180b1c3d8106079e906ac8c7d09b3301ef20de06c6ef723dde5,1,1,London-School-of-Economics.xml
+e47e410bcc64b4fbf107fcbac795a208e8fef9de4bbb8cfba3021b6a48e973e2,1,0,London_City_Airport.xml
+d7be9fab34a3d4a4aa00274545cedba1d569fd9344b46ecc8c5becb72d65d510,1,1,London_Hackspace.xml
+1952a95014630e2577fe966477723b32b1fe9004fd5ef2614f3717e5f6e5acc9,1,0,London_Review_of_Books.xml
+fdf67ed29757f0b2cc46d0c5beb73423f370f575c3a0192f8521e304f515750a,1,0,Londonist.com.xml
+3a16eb66437b66ca8fcc39076fa6f076e16ac3cb266af78debf75821a00aae3f,1,1,Long_Now.org.xml
+b2995ca65fcee921a0ec6e98a46d58772ef94f15817612627be142ecfd955c22,1,0,Look.co.uk.xml
+57516f8bb0c3c1af21b87b8b56b90f73ba952233ebf84d7dc5b4c697c21d1441,0,1,Look_Dumbass.xml
+eb71a3d0e0dcdf8f11f913ea38de4dbabe6924867384a0e08880c7466ba719da,1,0,Loopia.xml
+050bdb8522be2fed28033b318f7565def40681e0fa6de20d5175f41beaedf4ad,1,1,Loopia_secure.com.xml
+371f6fceb21caebfec3db3964b27141b5e00853315f431211d364301a45318df,0,1,Lords-of-the-Blog.xml
+62696a22e184c3f9a00d284aae7b2d249d58924957d0e8530041d66e0663bdea,1,1,Louhi.net.xml
+b9cf422f24dbcf3ce37fd654d260225348718ebf0ccc95d5060c4548e78e53af,1,0,Louisiana_State_University.xml
+d9d7001e11d2f9b2efc903ec39a8e0f0305f92a906c8f14db83627553e2fd718,1,0,Lovemoney.xml
+eddfa38063cb367bac3f2aebb2046bf5da400a0aef9cabedb9f7c6a4efdece8c,0,1,Lucky2u.net.xml
+fd8b6a9765c43949419ebab9dd91b8ba4dd6e350e7d4e1630edb8fae846fee26,1,0,Lulea_University_of_Technology.xml
+341fdca4778460bf1d7065884806c47c687fa52cc1c0e340eb3e0a53a3a6350c,1,0,Lulu.xml
+2d76724c1ff69dc9e9991ed1fdad701efd342e25431e0ab1689ecf981c350c35,1,1,Lumension.com.xml
+ad8ea5a90b1261249a8fa2448c3ff8165a8f13d73c357d610f16b2887e1df7fc,1,1,LuminoWorld.com.xml
+14531f584541639ca40d261d437c4659136bdb5772123a2527153919ace57ca7,1,0,Lumosity.xml
+bc8d53a934a8e46ead8ace467acdf5066d86d92d2f6f96c50f4cf4fae6d08f0e,0,1,LxCenter.xml
+a1db82defa904faec2c657e6ea22941e1b148f1e81cf35a58c40803424b6b01a,0,1,Lyft.xml
+551b122a2c152e388af55527367654016d5ba842ab144283c167b58436adb58e,0,1,Lynxtech.xml
+a111d5e3f1ad0f13c289431dcfe0282e42a9c88407cacdeca47577730a6a52dc,1,0,M-pathy.xml
+0543d58e7108adf6fe77cb43048db92c7284bed3903d22b30f3eac8c0654bcb4,0,1,M86security.xml
+c3e5082c4e57ed4c21107f5c05ef72a1fb33337c52b189b8360e41d57a8d268c,1,0,MAGIX-Online.com.xml
+377b1c7c98eb1ce1620a59edc315979347cc122ae5db49eaad58682c75f05edd,1,0,MAGIX.xml
+d46b3cb7383190722524604ced70583d6f4b42eaa79759186178b801e97cd05c,0,1,MAH.se.xml
+5cc8e9306a41a8e604a989ddfe777d9a560def287d8d4bd52b66df140610b5e5,1,1,MAPS.xml
+37dcf422788ed62d64197cc94af1c3d370c5936012db3caaee096c660a13bf93,0,1,MASSPIRG.xml
+3735faea1cb252d9a861985d3e2bd384e966b23f262e35d71175a878eac75593,0,1,MASSPIRG_Education_Fund.xml
+f2397e312d6ca68064f4b41df875ac7b7d1119332b020b4dacb6b8791a31bbb4,0,1,MASSPIRG_Students.xml
+a06c502a3fcac95756c576331f195baec2aec53014846bc08ca6f371eabf4d3c,1,0,MAXROAM.xml
+fd45d0e8767e26313781989617a3a068a35913d046a20ae46d47bae9cf5e4078,1,1,MCM_Electronics.com.xml
+e18e7618918c0fbc433386a096fad69825d0d259adb9acccba7661d5214b5221,0,1,MDGx.com.xml
+4ad79cf1cfd79bc4125c5cb83523560dc2c807adc28c3c6eeeae02a263f336a8,0,1,MDH.se.xml
+598f57a1cb07bb40a706984bcd19a35251f2df3b353a3c959d16c5eccd2f043d,1,1,MDNX.xml
+68d5134dd8eead364ed06ef6cc93d0b5177554f68d434f5fc628a3940454bb00,1,0,MGID.com.xml
+09cb67edc92fabdfd6ce3ad9ed0a50a6fe0176b9a963ac378e71b5e28c8eba71,1,1,MIRC.xml
+29fcdaf098e9079dbf7d1962edc0c29be9fcb714083e40a5019e7e6aaaec6320,1,1,MIT_Press_Journals.org.xml
+c4c92a7376681ef0c76224dce112d5b4aa7f3e765e1d94c5065839d75e7066a6,0,1,MIUN.se.xml
+ddc3203f686051186b20b88e459820135eaaf3aa50e5c4816c456d6445eb152a,1,1,MLP_Forums.xml
+03b6f29831d19024dee4e4cb3ac615574e779fae1b58a1c6d24acb91fbe4a850,1,1,MLive.com.xml
+3f5c7ddd043ad508aac3e6159c76e8bd41fcd37abdaa141cda95d8a685e20cbb,1,1,MND_CDN.com.xml
+976d52fd450f842cd7b01a773c0dc0cbfdfccc344170c16f62e8b06fd60b6dc9,1,1,MODX.xml
+16b17f054165cde5317da14eabc04cf40ed40f40f187a46a39a7107e46877ffb,1,1,MOOC-List.com-falsemixed.xml
+d5fd944719061d5c68cad846b8b479a3010bdd26ea072f677c0e77b09ce61746,1,1,MOOC-List.com.xml
+a142071929daf836814bbd8993688ea5e23a307b416df19553b09cf2c0a605b2,1,1,MPI_web.org.xml
+444b4dffc566a507319f9943d574f27c301f9d5a6af47ee6b85c9907886188d7,0,1,MPNewMedia.xml
+9f8863196cae74202e26c3d6ab1e50b57571f3c2ff4c6f8e5f82638ffce63007,1,0,MSN.xml
+15819092534ea0d06610f93be60d08860f430b49dba04ba701dd2ae56358a227,0,1,MTNA.xml
+7378e66420ddee33fe3189f9e9a7d611bc9e15edca5d8ca05c615a4cec99c992,1,1,MXGuarddog.xml
+9d231e863545aa6ab658902eec4a64ef6340e10f2fb03959c1108aab863f0d3f,1,1,MaaS360.com.xml
+342172ba363f805e1ff97d22dbd3b19a94fb46633f0d119ed9c353b5d2c9ebb4,0,1,Mach_Comedy_Fest.co.uk.xml
+c3367a69fe543bb4508508bf1032147b95bfad9809cbacb6f3ad3230024336b5,0,1,Macmillan_Dictionary.com.xml
+5a5895594dc8b6a1eb3ffb163f2949bbf5dd4e4a4608ed0b3fe343888ace6b58,0,1,Madstein.at.xml
+2853bd2dc0ad3ee1682f673571e0f9858829a8503f84673355950412524eb295,1,1,Magento_Go_images.xml
+60989fd88c2086073515182374adc54df5468d6e52b9a4074d0a5458e64b8c1a,0,1,Magictouch.com.xml
+2a0aafbaf384dd862dac3ddd0a7d9f0556cbdf5d5d9261a4a1c2edf12cdddf6d,1,1,Mahomet_Citizen.xml
+a7211ec19cd45b14cc36786884e3f5be9868dd63c1f1d9f2939c44d9a989e4a0,1,1,Mail.ru.xml
+0632beb9d9a8352ccf4e5abf6f4d129079e6be6a8fd030b89b240b9e3e5002ca,1,0,MailChimp.xml
+0574f873d084aeaadad6583735edea0b218b81a37d5205d2139a44ceacb21554,1,1,Majestic-12.xml
+eeb77187de3efc6c07b20bfb15ea4ffb65e95a906590f64bb4e2d85d3841a52d,1,1,Makerble.xml
+b7aef7f65c4126ab478fcc112a410721f9b52c70411e7e3ae239e275a22bc45c,0,1,Malcontents_Gambit.com.xml
+9e5f0fe1c8a73005f1bd9cfe7afa55e8e26908217555a15258c7ee8b389029ef,0,1,ManISec.xml
+3b2860a4494f8922f5b894c16b5c4fb0117cd9d79a785e836ec6683c02e08a93,1,0,Man_Group.xml
+f39f688438cd966643bab96109eb5b3e9d09649cd2913114ddef762b8caa9acf,0,1,Manasource.org.xml
+78acea4433a1367a7a99b78a26aabffb4433a766249b1eb32980e00566bd349a,1,1,Manhattanville_College.xml
+c8f65ca4abddc8b724b21e1aebb0d86f05aafd81c069e4cd368b3742d6b2a59b,1,1,ManuFrog-Webbhotell.xml
+68b4aec318e2003b40efb7bb11ac3dc92a9863d0c3b69a951d7f539a04ade8b2,0,1,MapQuest.xml
+bb36e083bd6761afcf4680ae0c9732d527f76a56e4845282ab8ae582a4024632,1,1,Mapraider.com.xml
+9f234dcd1e04c8b71b11dbfde4ff22c7ddf2e6eaabc3246bea8fc88403c4f1ad,0,1,Marcan.st.xml
+1e46e7c62c3c77d880aee1ddca06b25ec74c1c254f6e60c859a775829b679c50,1,1,Marie-Stopes-Intl-Australia.xml
+ae8efb072ebb5512ceb7e10c26d0b77612b368f5e20fddc50e59b8981fe10fcd,1,1,Marie_Claire.co.uk.xml
+f4c7dfe45cb0e35365300ce654feec069c5f0d57bc74d8f9b3d1941deb81bb17,0,1,Marin_Software-problematic.xml
+38c0e8fefcb929a1f8d50056c8ed0f84d7d885ef51529ad3af864bd78dc50935,1,0,Marine_Depot.com.xml
+72758fe8adfba1c718c27136cec21c089ac97a42aeb402bf9c53299668c72bb7,0,1,MarkMail.xml
+f8d9d668bf042c8eb63d92d924fa41f1b32d844414fdcecaa99a4e1c32fcff2c,1,0,MarkRuler.xml
+122a211832b9a5584f9367eb69489c8ee7323ba094af5a6a9b180971aabe7869,0,1,Mars_One.xml
+1eb3974a972e513bc37156dcd2d9c7e1a5605e957b196e753b5d58125896018c,1,0,Martha-Stewart.xml
+9774fbbc10a1e454d34b8dd2ad71ce16e15b489aae9472cf7c3330bdeb2ad483,1,1,Matalan.co.uk.xml
+4d52d23f40bd3606c43a447009e70e8cc92fb90e447f90988b9e742cbc4eaf62,0,1,Mathias-Kettner.de.xml
+886fdf64e35fbd1865f527901a8f71de87deb8bbfad48644c941b0faeeef73e2,1,1,Matrix_Group.xml
+def0843b236e6cbb3c41ce1e965479cf0c047278de38066a0ddb521e2e0d9490,1,1,Matrox.xml
+3956202a31b39b54bb350eb7c1c8fb2fe4421fa8e9fba93086c592e3727fba26,1,1,Matthews_Marking.com.xml
+2f36b825e79c48a62ca8b028588f001db53ea1c7e5bdeecf33846d6250fd8db0,1,1,MauivaAirCruise.com.xml
+9ebc3ea0b4f8a11d654190593216f2dbc2c849d75bd5d8769ce94ccb904b8032,1,0,McAfee-MX-Logic.xml
+21a0b0ab411510fb0d7f258ff953a606ab9b6cc190ec220254d0093d01a774e2,0,1,McGrhill-Warez.xml
+9f22004e6f050351ce543abd73bf9db38c4bcb4f3f691bc452d9f56362db44f4,0,1,McWhirter.com.au.xml
+54c5176a7393706ba64638cd6640cd03d970cdfe886fb1c292ab5567f5e01372,1,0,Mci.edu.xml
+0a2c162bca04cffbbb71b72948bdf6ea13d25f94c711e7cd851e3e743632476d,1,0,Mci4me.at.xml
+169f5d7a71d2a565c3db9bf616e59ab2c87ba135adcfe1617afdd6ba70db5c26,1,1,Mdgms.com.xml
+5c3f9e9594fd2136e76be06b682e4dcf281c5b4153eaab76026fd527212be1b5,0,1,Mechon-Mamre.org.xml
+cea6114526cc90715d8174513f29d6b7ea23c8a4787b35af2e4b59e41684b60c,0,1,Media-Proweb.de.xml
+2206b712d3da7e0b72ae87eaa7ca8e2c011c0285df551334334b6e6748c9f533,1,1,MediaHub.xml
+b35ab67041d795e2260b394b27c747f3226fe8c571e5a75f32526834f5f63620,1,1,Medialinx-Academy.de.xml
+dfb0575cda4b5cb197cc01897e864d2ed67d34dec1b9289895e7769ca3aacce8,0,1,MeetMe_Corp.xml
+a4aed7603a88fc03be501913cbf43136d92eee09e05a11b14cefe17e6172b515,1,0,Meetrics.xml
+d3b4dcb6411b0768f63f82ae89e15b07f5884e72f0b49398318e885b1bda1c38,0,1,Mega.com-problematic.xml
+0660211f8fcb506370363c91068a9a402402d4b809bd2c2bc61bf456b31c9469,1,0,Mega.xml
+e7034b4d62408593651f88f6fea5b58f9d7ac86cf01b03f8e56adf9ca757a9dc,1,1,MegaFon.xml
+4821002c2dbbe557f459c6cc0cee428616bd727f65f5a071002405e2cb370d7e,0,1,MeinVZ.xml
+b5541e596d343de6ac7f39223a9fc7c06ce47c438d9defe9116ba674062af063,1,1,Mellanox.xml
+eaef01e50024132334d995f459f0f3fcc9e56637833c501e91dcbd8dfec3073b,1,1,MemberClicks.net.xml
+8e0ca904341babe60e7080dd25ed1505f401f65f411e3d2092ff224e89cbeaaf,1,0,Memset.xml
+2271075dae8c3cde242f9bd187beb4e3874b1e3ed1ba167c70316ea7c881ae43,0,1,Mephi.ru.xml
+e036d076a66acf5d8e573b652b5e6ff6639d9ae0972240aae7676cf90e06181b,1,1,Merchant_City_Music.xml
+3e01012f7f40ac9c65f818ec9b1b3436bdaa18caa6c035be148c0630fa78a7ef,1,0,Merchantquest.net.xml
+30a1773b432db408705a3a3b1a5aec86d29006d7dfe739785beecee7b32a5c55,1,0,Merlinbreaks.co.uk.xml
+09478a2ec96acd68be1fe48e5dab2a4efe07075bc2415135c6b53cf64490c562,1,0,MetaPress.com.xml
+fc7e04f2a722f87b5dba20f6a548c1d26df7facfa98be2e09962d0b86506f34b,0,1,Metrotransit.org.xml
+02d77df85e09523445e0e86b04f0bb16c67bf3362b2e30bc29cba2af23ce2a0c,1,1,Miamire.com.xml
+7a9bc6518b843c943c645a850b84955939e8526e622f417732e751f6a6b50edf,0,1,Michigan_Campus_Compact.xml
+7b100b62a23d14a4e21a5f4775ce4f523326901c2464aeb6299fde517c42e32e,0,1,MicroSTER.pl.xml
+2c0230f2cff2ab22e873fccddd77ef7eb067a5af8b1ea6ead19eb11a7fe17e11,0,1,Microchip.com.xml
+575e8ecdacdfef4516413c432243e7a300b6cd70ed2a28fb17cdc28178946f92,1,1,Microchip_Direct.com.xml
+b195c75b64f391be38bc74da007cb9a59fd8a1049291c5f949b5847b16097641,1,1,Micron.xml
+206bb3a607259fe71f807da8d8d846aef174f1b18c220ac4871c6cf75022c4d2,1,1,Microsec.xml
+cc116d939b4a7d55452b99fb630fc82b7551bdea86eb7af4489a004738e16383,1,1,Microtech.xml
+b8f227cec9b319b4ebcc533515996788f2c7b780d487555edc3ac4e0433110b2,1,1,Microtronix.xml
+581745a360a493ced8c8bfa3a0c7a254f8849914d044284b63dd6400ed6f1e53,1,1,Miles-and-more.xml
+ea215ed16accf736366b380b06667a98ae300a6624277cc4c0b00ef82b87d316,0,1,MilkAndMore.xml
+6028c542090a205e31ad2cc71d109b7fa9f689e1d15064565afffa289860de6d,0,1,Millward-Brown.xml
+835ad6f02f0eea1e5a30f1bee9bd82f033b98f98c3e00dccae023635bc45ec84,1,1,Milonic.xml
+add16d917823cae95cb8fd37fa16fc8a30fb8abcb40d7d20317ef40115edaf2a,1,0,Minnesota-Public-Radio.xml
+9a6e79f0a137ef90758d5c9a6f4895963394f6841aee72f9b07fc458f89af5a9,1,0,Minted.xml
+aefdba42206c35b8b4c727e5174beca2cc9054e71405dc1fb04e58935e610c22,1,0,Miranda-IM.xml
+1c912cdd8a192d284723cd6aa022312be9af7d9d0f153ebd9332012212f7edd0,0,1,Miretail.com.xml
+05bdaa40888fb732b2dc4381eaec841becaa28c3a7ce521d309e31d46a5fe535,1,1,Mirror_Image_Internet.xml
+2fab3b5ae13f2fa84cac1b55ad4db417d235bb8c5b29182ba71fed019e20fe3e,0,1,Mirror_Reader_Offers.co.uk.xml
+b9b028b50744e726c2e0c1bba9b6d802bee0564067ab79a12f9f78db5a228efc,1,0,Misco.co.uk.xml
+e554b7787400fbb24420ffbaf18e8720e2711d0d7d5b01d57a6bc870d734678e,1,1,Mises.org.xml
+ef78bc469ee9ca1c5c6b5b7c55101de1b9f2e9bc5cb7635f55f72600da08a9c4,0,1,Mitsubishi.com.xml
+1083e6774f86f72f52db8ee1e5af98ac18d3badfa29f14c9210828dcaac4ffdc,1,0,Mixi.xml
+9445dcde76ee2f34507e683a0d830c835f5bdfa09605a3aa3acb4c5fb20e03eb,1,0,Mktoresp.com.xml
+e275fb63878dce4b9c0f53f39a068de38150abe580c9a232dcd84ead64a5e7f5,1,1,Moana_Surfrider.xml
+8f55bcfefb95327bb770495d7ed62175cffdf74e0a3f0ccd94b4dd42a1f64cdc,1,0,Moat_ads.com.xml
+0fc2d07c9cf4aa5580639fcc5ee5036b64df0422493aec017902367b6f7e10a7,1,0,MobStac.xml
+c7d6720b5f52ce6dbe90284cc5959d66c703a8db5ca33b998dd5821c131ca0c2,0,1,Mobile_Asia_Expo.xml
+089e42772722545c5013f3a48f05429db2991825eadaf29c1b80ccd769f4621a,1,1,Mochimedia.xml
+2aeed5b7608ed2cd5fbf95b9d233412e2b384dcb179cd0cd0b4be180f3a7b1c4,1,1,ModCloth.com.xml
+b0345c7f91042137a6196fc88f878d90cbc0e0621cb180f170e4b740d0230d82,0,1,Model_Mayhem-problematic.xml
+4148c9b370612b0072de8612e1795ff902efa5b5df42e1210c2f55bb0cd1d1f1,0,1,Modernus.xml
+b1e394fc6288df5f9d71a5795a3cfa2d868caf9a2d390259efb4f9a10aaa9e55,1,1,Moevideo.xml
+ffbf6ec6cfeef71b445211a87e4abe5ef1794e3d4fadb7d684ac90ac68533790,1,1,Money_Advice_Service_UK.xml
+4bdaf1c97ff84b0efb5970546093f4f4db2eff4b179667e41f78c050ee8a7f8e,1,1,Money_Saving_Expert.com.xml
+6c048760a7ae095bfd1d6f9fc51c634fb1a957e74f12f507135657c892090544,1,1,Mongabay.com.xml
+5480c8f1066022ccbd76c4cb65300e8f17f92e78c9468941e602eefc9911049f,1,0,Monsoon.xml
+238ba4857662f3a517f6702615d82e0a1789818c3f8e46200e18fbcb940206a9,1,1,Moon-ray.com.xml
+4098104d988c1e099f8131293582ffa74b214c84a0a6993f0dcb47dfdc166957,1,1,Morningstar.co.uk.xml
+06558325d916258454668fd676d1b26c4d0fd1de1413eb5256ef48a1956982bf,0,1,Morrisons-Corporate.com.xml
+e53b3dc48c8ebd8f953aa97db6e25331e51bb2781deac42f66180111e86274c9,1,1,Mosaic_Science.com.xml
+9ff01f7451d40691041ce184f700a74a77d67f31caafb8c3ca51d2afb9c7dc34,0,1,Motherless-media.xml
+6b4d8b8bbca99cd49c35ed81feea4d6f9d114213c670b2fbe7a947c8a7402dcd,1,1,Motherless.xml
+28a1b8fece126fb6620710ba56206bdeaffaa183d651c6c1c73a01a905de9059,0,1,Motigo.xml
+9a396c4dfe639ec6a63950420ebc1efeea0db0b034a9aba8c17a1af27b398352,0,1,Mount_Sinai.org.xml
+a1fa4d3ec8a62b93ed15cb141d7695f212f3dea2ddf0d4bce8654007987fd390,0,1,Mountain_Reservations.xml
+ad4b1e8c1f59d04a31d7c7b38de53205afb93bd575bee9e5353faf1e50cbcbc0,1,0,Mozdev-mismatches.xml
+743d8a5b68767e40138a06b7b5c3a1818337da7cea2ac37a282648b50974d04d,0,1,Mpx.xml
+ec70fa255895ba360493d2626c45911c22b80a49c5df9cb2f8f137846ceb0423,1,1,Msecnd.net.xml
+7976850527330f739448b947975b090d96b2bd01231b0376850a91033b941263,0,1,Muenchen.de.xml
+92c56ceb1370a552004ddf10ce50549f1d2099bbb296a6a414b2c9189cb1628d,0,1,MujBiz.cz.xml
+24a9a73f549eac48c4bd59bf8b2073bbba79cca79d84e3f8740e92c12e109413,0,1,Mullet.se.xml
+d2739263216b14436f55796854cf692ca03d4a305dc16dbe076a0ab077025e27,1,1,MultiSoft.xml
+5bef5c96def6636cfa60ba4bf92f25f9c182090f32130652dc0cbdc42fd505f3,1,1,Muni.cz.xml
+1a7511feb844171b7d853bc0273709cdf66649de2c2534ab1da21d6f5edf4cae,0,1,Museter.com-problematic.xml
+595e5a64455b0b23e67eb68b4e2cea4a6dbf424a07ab0fdb0231ded129adf7c0,1,0,Musicmetric.xml
+f42b8995cf8e8f8bed79d16d7155dea2522c8ba86dbdf63d5d82f88dd55fd614,0,1,Musikerforbundet.se.xml
+58a0fe0af15bd31fe5ec464807b08e208942049af861bb5440dfbba113271ccd,0,1,Mutantbrains.com.xml
+f89912846dc35b7b76c3ffce935c027fc0cfc569f75fd3c46270c260be6c5257,1,0,MyBuys.xml
+858230326c95e8f2e929b75459cc15aa2c7835928ed9db020e30f8f098bff621,1,1,MyTextGraphics.com.xml
+24d8bde990098ee1fed9b972e657433a4c1bf758a46d4063a668d58a2195abe2,1,1,My_Sullivan_News.com.xml
+4b89388d8b0e5f2c3f1114e50a5448bf371c53ea1a0b3bffcc968537df955ee0,0,1,Myhappyoffice.com.xml
+3102bccb45e89458c7d87c9004dd4a8f72ae88d3b01cd06a4ea6180a55036e9d,1,0,Myjobscotland.gov.uk.xml
+6524177cc322ec5eb14b8d9f5dcb0533874470422c2eb6160bbce281b3389fe3,1,0,Myregisteredsite.com.xml
+d9d037ffaa0d96eadc704dcfe9933c34961a4f1df39c800f496cba49c7174775,0,1,Mythical_Creatures_List.xml
+5fe0e1985e02f37e759a7388016c1343216120569d7254393d814adaa23d4f56,0,1,NAB.org.xml
+6b3df5ce283c7db4d6befd6a3c453a717cc7afd37a8737143325fce125e7ce59,1,0,NASA.gov.xml
+c30973dec56755f1de9304259af19b8145a0a571d6f7310a3b11195da023277f,0,1,NAVTEQ-problematic.xml
+83764b0e29046566cd51a6bcb9db58f8f7f8ceb45c59aed3e06e0367402fa2de,1,1,NCRIC.xml
+ef7d0c3649a77dde9f58d11fb9e77a0bce840e89177a6d853a3a50f37d138e78,0,1,NCTA.com.xml
+7f9b052555e00b4547eba435df9b0ada941b3b92146ea4bf7c4f8327179ef236,1,0,NEC_Display.com.xml
+4af8504478403141e13018b68dda2ca244cb990aac167268c0b51b3cbaaf649d,0,1,NIC.ad.jp.xml
+265295ed36d711a85ed56ee0a9984023a73ed3eb8bf449e3b270eda766fc56df,0,1,NIC.br.xml
+4aacfd1dff2d8f973a210019ccddd21d8e41afee921f582573ec8bdece14f27e,0,1,NICTA.xml
+98d863aa4168e437d6e0789f3b254cf5ce81c7bcbfc8df10581a03b33aa934b0,1,1,NJIT.edu.xml
+aeb084ed7d88d7b9e5f5adb3e28ef7b99206c53f4492d6d1b2cfbbd434e8657a,0,1,NJ_Edge.Net.xml
+b8a8048fa9d78e8f49ad9eb38a05c4dd88ad22df91e48f65496580938fde7370,1,1,NPO.nl.xml
+99a479c07d49448c6cd8f8e92d29c3c6ffaef57c428719b97c5fb1abe9ae4e16,1,1,NRAO.edu.xml
+f3161aaef5e1b8c8ff003407b46075792e538cba3c966cb04eae44220d606e5c,1,1,NTI.org.xml
+82b8c6fdce49f6cfec8a5af5a439ab933d6db04d1a96dd8bd79b398fde7ed662,0,1,NTU.xml
+6d5cbfcc8c9be0f7aed82f53f645a4a1aa507fd4bbe1e200a57f541ed33f5951,1,1,NYK_Europe.com.xml
+e839742e70b958a9ba7c9c64e2c25a3ea8b5a8d2acac5ede9eebf815505261dc,0,1,NZ_Herald.co.nz-problematic.xml
+e567c9f23505545a46c3f2094019189ec0bb0753d4042e09b9c3e4e4305ab2fe,1,1,Nandos.com.xml
+87d7cec32a9c98d029b8a7748f45f03a4c405f4b10af0c7dbf63a655a2f2501e,1,1,Nasuni.com.xml
+2025891cb707c5cb4bca8f7cfda7411a3b7c03084986c794c01d9966646ce307,1,1,National-Defense-Industrial-Association.xml
+b403cfeb4dba33d69d8496bb0afcb0815d8c611efce1f202f48a522aa6a258ad,1,0,National-Express.xml
+89e0c10cfdb60707da37a41b1bf06aa0f9db7c9ff759a4cbb8e94d772ca0bf75,1,0,National-Rail-Enquiries.xml
+77df8cd849c8f7755860365c3cb10c51ed391f95ad21327a88546086eb5a29f9,1,0,National-Science-Foundation.xml
+12eaba9bec7055b45b10dbdc36cfee93e480124f3cec55814ebc49fad23ff395,0,1,National-University-of-Ireland-mismatches.xml
+1fdbf03f38170dbf7fcc2e857edff149d2fc104f1cfe992e3346a6eaea3d9801,0,1,National_Priorities.org.xml
+0faca68701fed7d481ef2d407adb2988bb09737e4256fc13d94de4d50be29dcb,0,1,Nationale-IT-Security-Monitor.nl.xml
+c7a70c28854efe3443f37272478b64dc380b698ed063523ca0ae1afb3f3e9e1f,1,1,Nature_Shop.xml
+5fa991b9e337ffa71bfe80e49dcb48b46deac649f5bc33ea192903e0b44e7ca5,0,1,Naturvardsverket.se.xml
+1ce6aeb3e8c850b840ca30e2cc528f96fecf148fcdfcbbf4a0f6a633bb80c139,1,1,Navigant_Research.com.xml
+f1f93c4e6980e6ab9b58509fc5d1798975dc15bbeca4e33e5b90b19b304b8eb2,0,1,NeedMoreHits.com.xml
+53753f70998bf7ad4a70d4bca054a29485a0287e724015af709a44c638f36a3e,1,1,Nelonenmedia.fi.xml
+076624231a6913176a0296ea2fe8a98784d1331620d5cf7ec74230ce6d0ef229,1,1,Neobits.xml
+fe9a3b6a1ac58f6ed1d45edd7cd8aeb302d6a2f11d4db3d7b093b0e24c90c586,1,1,Neobookings.xml
+fb32bb1ec593963f579fc3218ced702def3c8820d295959e6791c1bb63837079,1,1,Nestle.xml
+58abadc12a0456ae8c4b9aed73cc326c59a0deb6cc9149476a1e44258cf308ff,1,1,Nestle_Scholler.xml
+dfb0e98c4fb750595bab6bc5a906c3f761003182e48d125371b2abb097d7377e,1,0,Net-Applications.xml
+3c93eb0d86d7235cf74032dd20892ef50387432c6d0a04bc0c5b2638efbf55d6,0,1,Net-Results.xml
+06a292203f1fb162f9eb6f48a60f5c5cf2fd82e2141c3be9b382da5a1a9580f2,1,1,NetLock.xml
+1d82d222efef097970af2ddde784abc4a54e9f0d7c72273efdd5a365eaadb215,1,1,Netcraft.com.xml
+424e493955331bd50889c4502677e64c6740246f98a855d6c499e2b8a576bd47,0,1,Netdialog.se.xml
+8da4a8d34c363318d78948b6d198a61b8b371b1eceb28751a2abe6a12904f4f0,1,0,Netflix.xml
+5bc65fba1edbd23a2c1127a5c66a01bc20ffc899e4abb0e6f1b4d05a639dd9c1,0,1,NetflixCanada.xml
+a27dc054f220c4e805fa21edb4a88bacd93be2033e19e33559d95a33df0ad418,1,1,Netguava.xml
+9479b1110a9b8792a5adf6e615bf3163bb867be0b95702bc1750af4ea2d6612b,0,1,Netswarm.net.xml
+090825ece5ea8c028837cbad251e6d80c0ab2612a3c5d4a6fdd4e651e24d4e17,1,0,Network-Depot.xml
+856a5e62ba2039659dfd6a0c341644c7cc94edbfcda039c0bbf2934c2fa6e490,0,1,Network-Redux.xml
+e39fb5c2ac9f1e495df9e58f17d8a4d761fe13825842ce000695d72bd0fec453,1,1,Network-Solutions.xml
+f1fcbae55c19d23c37bb4aede7c4f4beb0e2679890986b4e27ff088629f72bb1,1,0,NetworkedBlogs.xml
+dacbd937f1ec4f670a6b0f8e96831e58a65d461d22e0af250d92f241aac97059,1,0,New-York-University.xml
+f1fe546e322fc153e0c39bed532de0adde5d347f9b0785bdbb0212f60735af1d,0,1,New-nations.net.xml
+d47c31823f5affb8112f9b876508ea8cbe9c5c8888dd62fce6e94a49fc97ae7a,0,1,New_England_Journal_of_Medicine-problematic.xml
+f6af7fa84ba50b9a6fa5f194ca8b7eef1d4daeaf336129c15e63e126e516d9bb,1,0,New_England_Journal_of_Medicine.xml
+c726927c171b0ef46e22776ef84b862d65b67640d6bf0c04236116037f7f4658,1,1,New_Look.xml
+0460e9ed532d3f86f91064c6351cdf3910283bf26129ff8b9c0058ff5158759e,1,0,NewsCred.com.xml
+46cd5693a88f0c256c5ac5c5a02a6c0132b2f41f9997f6d98819d7d273b86c10,1,1,News_Funnel.xml
+a441436f47337705595460deaf9fcc0940b86b7e36ebda3cf9d947e0034c458e,1,1,Newsnet5.com.xml
+062c7a379d68a9a26d9445a86c7445b28d7f0c6d37a00280e9a6227855935654,1,1,Next-Update.xml
+3c57c2411ec4710cf0f5d9cf22ba0ce485a6a937aef4636b2fc5d60952aeb49b,0,1,NextRegister.com.xml
+ba5164f38a24d39d86f53ca602a4f7dd6588321e91dd31f3a41900e8235bfd1a,1,1,Nextgen-Gallery.com.xml
+3827f1f331ee1cfd087a75708156fe6dd1d78bf73689aa0e3f05e769f9ae7599,1,1,Nextgen_Auto_Parts.com.xml
+e4c1681bae2ceccfdfaaaffc32bdbedc097bd0b4ce9e484269bc7a8205ac5077,0,1,NiKec_Solutions.xml
+f97765db8ea0f75e2d5ce711e6454cd9b692e372e5e1ef99be2d15f2e44ec290,0,1,Nic.ir.xml
+346f439850c55caca5a78b5fc94710c205fbfdb3058553be31a46f6d12cf57aa,1,1,NiceKicks.com.xml
+5204e3581002355bd1567fa463b03daf14441600b888f345e1bd90bc0bd6644b,1,0,Niden.net.xml
+18ea11350b57bb0d7255c935b1f98fd8e0d7cad093cc814332920b14bd6e26da,0,1,Nightmarish-Dream.ru.xml
+ec01a5ee8630f2b83f7cd7bad3f4f4facf7fc17e717948751dbbf3e5563d3aa5,1,0,Nimbus_Hosting.xml
+a0f578f005779d8470ae10f1de0613020df1cbc8fe7fc5e8631a9fbf80512b1a,1,0,Nimenhuuto.com.xml
+19783adc449fb3c8149fc04770bab48e746409509239b2b416df034b4c5ec8a6,1,0,No_Starch_Press.xml
+debf94c52eec0428247d415d13cd14dbe048783d7ade4dd8ec829dcebbf97b47,0,1,Node_Security.io.xml
+8696b3d48a2371a343e0d10fb94f0310dd4d3e7884a7709d44843cf989d1bb15,1,0,Nokia_Siemens_Networks.xml
+d293276c96add15789fd139b6fb190bd50daf5959c426ddd1f65683c3fddec70,1,1,Non_Profit_Soapbox.com.xml
+8e7d3d54f3b3fcec404bce21849e00674a9584c262546e559d5a5844e6e3e82e,0,1,NordicHardware-mismatches.xml
+aa1619c02d07a8ad0e6e70d89453c9a7ad9b584cbe9f8ddfaea876ab46a59e44,0,1,Nordnet.se.xml
+fa6721f746512e5e4a8c64511e6726f1f815515a40851600355c0cf2cf4d41a7,0,1,Nordu.net.xml
+9c28e75e4e9e205b0480ab3255a05302a1faa57199f1541fe977bb077adb5b45,1,0,Northern_Tool.com.xml
+3c50d2e792ad7f86dfda1549fd4439d310b29f24094476e31666decfe77d9246,1,0,Northwestern_University.xml
+ea5981b9239016c61c8e430bc78234472035d90d5a111c75b5e9c19673d0684d,1,1,Norwalk_Reflector.xml
+ad056a6b989f162bc636a3de58b8064b41555bd6822b91bc47c0fde6a77dd24d,0,1,Novartisart.com.xml
+005d6ae4ecf390a96f0cabfa24bf3542de3358ed187c7d3fb6a9ceae451436c0,1,1,Npmawesome.com.xml
+86f390fef8e11c744e2b29a3ece207146ab8aa3d7d9520bbf034b9eccda38b7e,1,1,Npower.xml
+968ecdfba1b77f1e7d9ad0883bea2141a1bed5e8e66cc17f596f494904f959bc,0,1,Nttxstore.xml
+4389ff81399428de5835dcde6360c9355bd8bb30deca633fdcb442ed80e8279a,1,1,Ntwk45.xml
+8709dffade12885b49fe17396188fea66efa63feec67b4bd6450471210bcf54c,1,1,Nu_Image_Medical.xml
+74ee38c39c1732564c41660c16c36683c46aafc6785922df598dbf2c7d57057c,1,1,Nuclear-Blast.xml
+d16090d0d492da8b08cbedeef767e7654cdd46ac59ea36e79ec69d96672d33c5,1,1,Numato.com.xml
+cc50a9830d7a6ff8d19a2bb287d16061d1c06460547e7751ce3e44db8e3ca24a,0,1,Numergy.com.xml
+3549eafd309d3b4297a5c35cf3a6d5c49609a2369e6b86ec8329e62e9d7e5c18,0,1,Numsys.eu.xml
+d58912467627d4166913d3dcc6dbc6cdeff23bc192ddcde160f7284bc486fc57,0,1,OECD_iLibrary.xml
+604247fbc7405879ce5a0826368eef0b4799ac85361c5fa7ee0f10f961746b8f,1,1,ONEhelp.xml
+9a26195dc6d04b530cd64200f8298b482310e35b4a3186da8fe3b9ec6da3e510,0,1,ONEnews.xml
+c72d15ad574f5ad66d6458b440ecc89bf91f2004f4cc1452e2ebad2cc88ebde0,0,1,ONEweb.xml
+728de152c63f2b49cb0589754e38e8b4871fa8e61d9a6c3232d79574ca4c7241,0,1,OODA.com.xml
+f3b1426c891d64e2e32774be6acd55bc97c1a05d82b1ae8cdb4dfe2100275db0,0,1,OODA_Loop.com.xml
+4d183bce74e88eaa5bb7c8d5a64c015ccb1e76ea1a6737c03f209017aba39a13,1,0,OVPN.xml
+e79232198ecd818d2c8984bcb40357ff099f8916aee9743b4ab5cd29856f0b30,0,1,Obermassing.at.xml
+7a6389ef271a9d5a4dd6cc58ca95d36ee4fd49f8166edb672462ea728bee070d,0,1,Object_Security.xml
+74bd810666ffdb4fb2893f61b6ec93bac1fb8d2bdad9562cde970cece038f8e6,0,1,Ocron_USA.net.xml
+9f666a13d6dedffd0bd201d9a652bbea8f91f6d041de1302d6ebecc12e39cee9,0,1,Odevzdej.cz.xml
+ee9c9295fb3a208cc0b9796284238ad0f8fe79bde323ddb10029757a43887bf2,1,0,Odnoklassniki.ru.xml
+9ee2f486b20494ec87d2a1a4d7a436cb9c9fa66a792615927db08fc465e66923,0,1,Oe24.xml
+df2add100cd65ade870829bb1bca5dc06439fe3f15a4175bf92dc91418442725,1,0,Ofcom.org.uk.xml
+f1b954f78d24f7feeb7e04dac5fcdc774536df6891966380a0a1b2b497f95a92,1,0,Office.net.xml
+513d049368e3e03cb55f62920d316fd1658ff0886d1c98e27d0827055945a5dd,1,1,Office_Depot.xml
+a5b1318588cdcee1f4bdc1f20f342fb7e1e35521d34cd932f1176a1f188e6412,1,0,Officer_Down_Memorial_Page.xml
+5b55ee39e40189e984150ee57a844755de14b0927b9db79c61141d9fd9b1b574,0,1,Officersforbundet.se.xml
+eace07c9f40c8d1d737e1b1bf7ed811a6b93db64bcf35173c0db7463c02177a8,1,1,OmNovia-Technologies.xml
+543885653524b4a430d6bc05d5f0a915f8d2044b4a68210f400556475b617177,0,1,Omar_and_Will.com.xml
+497e4ef7981352ec9ab7c69c941e8dc50397ea32e225ad167258f3394047074d,1,1,Omaze.com.xml
+337868f3fa4ea5f7e775c58846ee41725e2bd31593b02a28804608ae479f4b32,1,1,Omaze.info.xml
+8eb315d424c1f4c13d69aef362350cc4f875291e6999d20d681ff77897022afb,1,0,Omeda.xml
+1d30f88270fece51ca75bad3af5f518d43b171b14e21ccd1166091b75c32bc12,0,1,Omniture.com.xml
+a75d4a62d470552e6ef9bcfecdd60e98f64930d84abca3e881cb3bc45e3f4518,1,0,Omtrdc.net.xml
+b4c5be316c8e413132d05640a58ba95e417021edfc0d625ac68ab4ca83c980bf,1,1,On-web.fr.xml
+1aa14c17aa4ef45659e1c0074208010389305aa5082249d6a70e108b55eb6bce,1,1,OnSugar.xml
+b62ddde7fe33d20f642cf8c4e03631afd45115f0cb94b9cbb7fa935c6cdf7d0e,1,1,One2Buy.xml
+fd71abc09391e0ebe4bbddd07f0e125e4e7d5fa442699c8180d350a0f04f4369,1,0,OneExchange.xml
+6dc92cee48556d89af4e82ce71e74ac9f797208689b7f351b93f2925f1a6529c,1,1,OneTaste.us.xml
+9d8246d0d33f52be5c89b398480ebadc3dc02f64e777daa066468c90a3906f84,1,0,One_Eyed_Man.net.xml
+0fc75f45ec3cbe2a8aae5bfd4d8f7fed37c17715033f2e9fbb3313fa8cfc2dce,0,1,One_in_3_Campaign.xml
+85ec8a42fc22df80efb738d7412c23f20c4270050280b12b13bb675eadedd42c,1,1,Onepager.xml
+02db8653ddfd7b04c789b65fadb6a8f65a56512f0e66a17925d9fc123bdf1c45,0,1,Onion.to.xml
+9200b7fda3c5624a030596856bac74a8aec47aa637d3c572738e3d7cca4556db,1,1,Online-convert.com.xml
+090726845bf1a7336dcf4b17cc5fd367393dc83cd61cb47480c05e9443fa6053,0,1,Onlinecreditcenter6.com.xml
+3ab0f58022ec25cfb953faee2bc9221c0a8440f250efc15d461033ccff06e042,0,1,Onlychange.com.xml
+78bac39af92a9662e70e310bac91bd8199e6836d0d1525f6030ca955bff3b38b,0,1,Onlyoffice.com.xml
+4451bf75cf6c947ca73f64b8deffb43eeea5f8f6bad4de32b40947b6acb816ed,1,1,Onstream_secure.com.xml
+dd51b1a05bce8252c471fe1e9ccc7ad3d295ab21d3f59485bfd45fb9392e1510,0,1,Ontario-Lung-Assoc.xml
+acafd275568454c22d4e6503b39246589eaabbfee280841d01b981a06e280fd6,1,1,Ooshirts.com.xml
+01ebddd2e42156535f850bd17d2855ea4d5cfcee2ac2d2c578e72385980f0182,1,1,OpenAdultDirectory.com.xml
+1dab5d9a056a6da15ef84d7a1cca305a4983a764da763c16c5f100c698f58c95,1,0,OpenCCC.xml
+cde322a388021fd678242253e1553602e42ca30238c48f4c0ae454c292fbe92e,0,1,OpenDZ.xml
+cfb20b50100cb3882d14da48ac922d0c7676fa21a9fa253934642b5cdfe0993d,1,0,OpenSRS.com.xml
+844a36d59938c66a965aa67a15d31a2376a10ff96420716e5c17b03e344822fa,1,1,OpenText.xml
+79b6f8f68eb3378456d604d32e2e10715d3aadf7e63bc6aed8bfe10533de3ff5,1,0,Open_Badges.xml
+52350bbf1f39b4f68721565615079a474494c0e285de5cc9ea08d414c11e3ea0,1,1,Openbaar_Ministerie.xml
+2013ceb768b7fb2e6ae7f5b25d5367595d6e665101205f208b092c0d4280b715,0,1,Opscode.com.xml
+2219f813d8e5729e90465151e21fec4c4983e78603af8a034b308bd1202643c1,0,1,Opsmate.xml
+e679e81cba89cfa6fe912e2750e9b2d63c212e8cfca50d110cad41576febf413,1,0,Optimizely.xml
+0d4d289bd08afe7cf3746463b1583ecbe548148093efba3b9d0c6b284b3d7adf,1,1,Oracle_outsourcing.com.xml
+056eb34319c7780b742ac8b8d770b2d059abdb70c2426b70a7ef35036d71b50b,1,1,Oregon_Live.com.xml
+295f868cf31e0503aa4895b15b142c28ec12e8b41a43dcbc4d22748af91def7a,1,0,Osmo.xml
+9a1ed180ddfce3019a6fe50d73e329c7ea2b0e3496ee5d9970aaae538c11ef17,0,1,Our_Tesco.com.xml
+71e57056b2bb6b821f6d15d459b9e1dab4127b457ef251b5c5e90aa39c09a533,1,1,Out-Law.com.xml
+c50eaa29c08c79598b85124d8472c939cbb08abcd36df7a21512bb92606cb600,1,1,Outernet.is.xml
+ff199168eef28407f5f4ec85c4a28f7c4bb363a2b1902a775788789754cde2e4,0,1,Oversee-mismatches.xml
+54aacde8fa49999c42572bac76d792ea3b489037f2d5b39d010dcad5a198eed1,1,0,Overstock.com.xml
+5e7c404505b85db849540392423e02d918afac5c262a77d56b9c54455c5d3020,0,1,Ovh-mismatches.xml
+b41b819bf65541edbc0cb4992fbf183ebe9a74e28d2eace3e0b7597b9b782dc5,0,1,Ovid.xml
+a2a23af5c2ae4a75d2bc089e535640eeeecc2dc198cd238a388b41feb8da12bb,0,1,Oyunhizmetleri.com.xml
+933469a7c612ed85c345b6b85e40ddc0869c4af696fe8fd142568624b55d602b,0,1,P-tano.com.xml
+ab6e11c74e0a8ed13d35553f3c8de56b8f5d9e134ddf5e600c9d9ccf29d202fc,1,1,PAL_cdn.com.xml
+3754825b11533fbebbb1f5555b448bad53f94dbb64c192d50d991717e48e4f1e,0,1,PANGAEA.xml
+04aa3907bd8de99537bde8f2f79aeb002ba7887efaebee3f1f3a615d4893b320,1,0,PBworks.xml
+57852e0864d16be6b308ff132e6c5d7a81b60be2ce25eefbe8daf25f7b33a7c7,0,1,PET-Portal.eu.xml
+dbd90f2c99bc31ae808344a6087f970e33788e1c8cde66d1768711db380133ff,1,1,PGi.xml
+2801efe212e1b86bd6c0f60c0b6aa71a13e10b92d1b1b35d41c24c8de8bc4fec,1,1,PHP_magazin.xml
+a64aadfc5703638d06d42fb40b03ed571d3553b67c5b8ef1c2ccbb3ca41ed3fc,1,1,PIERS.xml
+e003a3a5770e69050c1accb50e3688d18332e9afc5709c67d6ed37b21143d042,1,1,PJM.com.xml
+10733d148895545263de6b0d9b06e117bfbcc51765f53ce07718badd8ca9932c,1,0,PKWARE.com.xml
+78b114e3756ec21b948939f187308f695fccbaf94f4cc8f588f262d84d44acf5,0,1,PLYmedia.com.xml
+c4e5e8c4a2597b41871e044bfed5428d959056ee54b7e13374e61dd4447e74ba,1,0,POS_Portal.com.xml
+7728e9fa911551ac1d6f4a1e5c915bf7794c3036d4c85a809b2ddbe7b402ccdb,1,1,PPCoin.xml
+05c868c1c858abd8e57044f301b234c281562fb4e81b4b95d3102e61e9eae0da,1,1,PRWeb.xml
+42245e71c26f7b89f3877f043be47ebd89ba171ef04916472adcfd8466b7b5b7,0,1,PS3Crunch.xml
+fca579bef6575b699d2f3239f2aa31a80efc1c780a771e3eabdbd3b67d87d594,1,1,PSZAF.xml
+7bdaad22def9753b5c864b140690cfdb16095e8aa6ace2342abab2bd7847b6ab,1,1,Pabo.xml
+57aed24e9b9918af2c3000fc9dad59aad8643cfa4f4dd7fbd4d1a7ce8bff2ad7,1,1,Pace.com.xml
+eddd4d652f2dee5873d15813e51565a53671c97a859b85ca9b0e15a5fc2e48a8,1,1,Pace2Race.xml
+71054b6da4f4cadf2c038d4b31bb68e148084e4ffa94ee3980f98d6f97a8493c,0,1,Packt_Publishing-problematic.xml
+993dc3f9d1e08eb3a27b37543742ceb167bf5ac80930af48325e4284b0858397,0,1,Paket_de.xml
+e89d28ccda24a3b1cc9b37d3d269747a51d052aad6911ca7870a1b8a85212c3a,0,1,Palgrave.com.xml
+e557b6f440d476e55abb4d57ecc833bd70b1d43508f88aa2a7188c8b517ca1ff,0,1,PamConsult-mismatches.xml
+0e122fc15bd797982d15495539527f1952384f9f0e1d9a4f58ed9121aeccc471,0,1,PamConsult.xml
+2c02f527aac3a3b6ed1c50ccb0cc60f3071cdece9fb572a42d504f1f8507a27b,0,1,Panstwomiasto.xml
+66fd01bbbea23106a839b1b18364ed9781c70ab62c2b2c90fe21e27c02059daf,1,0,Pantheon.xml
+3d66d95fcc8eaff8c7fe025a95dc9990b8682f63e90359a2dce7f7d99117dd31,1,1,Paper_Mart.com.xml
+09cef0ecb2ffb1cb24d69ad9dfe80691d9d4ed827a8bd5256f1fb755ee71e1fc,0,1,Paradysz.xml
+2f11118b0aef6afd296fb8da24c425d5a3cf9142abdb8d48e51173074563d33d,1,1,Parallax.com.xml
+081de7e48c0be2a33abea11175c4af99f366194f21a664648fbd4e196b307f19,0,1,Paramount-Pictures.xml
+34d03a76bac9becd0ff8d0b1731df9311e583642f0e6cd4703b548021f4ac3c5,0,1,Pardot-mismatches.xml
+fdaf728f0d1645316bcb99336155adde2f724bad59b80e1518b30aba749e3ee5,0,1,Pardus.org.tr.xml
+8248f3806e6f85c5e29de65e505f6a5a4ab232d37173b9317ac6ef9fd4a944d5,0,1,Parker_Soft.co.uk.xml
+605051aad6959d5abacd3ea353c7176b9c5d7ae0d17e5792e944bb2948862375,0,1,Parrot.xml
+95355ec4cadb259b3053a38718cc8377c7fedb4b836845d8c3fcbc377a388b9f,1,1,Parse.ly.xml
+733577a614581c6c478432a6ebf5d60213d26161fd6bef61dcbfe441947c7c55,1,1,PassageBank.xml
+4627a7d8ff44d737bfb4c58d14430e8b141ecc16773a5728f4ae45ccf949deb7,1,1,Passion-Radio.com.xml
+7a7079f1bf3bcbaeb2c4d8a2c59f77d25956e4cd3aebab78ab1bc67f3f3df7ab,0,1,Passwd.hu.xml
+54bd67e965c51bf2587b2fc9952c21cb6de9fadf10e2b9554dcbe9da50b06779,1,1,Patexia.xml
+ed6cfba3387faae39123d9d8bcdca58ce96ca56fa36d4e78a0d87de9ebdfd664,1,0,PatientsLikeMe.com.xml
+935e0d2a2d60b5c793084c7a8345d04c58f4522bf9f620b1bcd410b454f23da7,1,0,Patreon.com.xml
+f9b23a9e9264d7f43f499ca056d36506c1c77eb873f333d6b2fd51adaab46c0f,1,1,Paxton_Record.xml
+f5ea970abc9b98f05c5d2d938d268b5f7ee2ffe08896b2732d2873eeaae7920c,1,0,PayGarden.com.xml
+8a4688c9225f39cdbd0bdf2461b215687a6e52fb158187d9cd52f0a794ae3995,1,1,Paymentech.com.xml
+cafaa354707ae4551d9e4cb2418f7693aae919a2b64cb9fd74668ba93ae62471,0,1,Pdadb.net.xml
+b734d20b4fa8db4e550c2063fe1f7571aa9255d4fba08668b7607e9075f9183f,1,1,Peace_Center_for_the_Performing_Arts.xml
+7ace65d7a07d3b5a62cdf6ea0e4d7aaa66e35a4cc4aa08dd49b9cb6410404a06,0,1,Peacefire.org.xml
+7906a49f15a7f530524ab186dccb29610399fda324d86a5e79806978facdfe9a,0,1,Pearson_Computing.net.xml
+caa27cb47eded0e0a39c74eafdd4e7c03be9a837ffebc3ea450bda58327668db,1,0,Pebble.xml
+1eb02087c60fb6dba349d89674f8fa25ac18106e527f762be774f5a3a56e0a6d,1,1,Peepd.xml
+426d215a62ea00ec4b4a5d36dd506982854831af3ee1dda5dac04acf588f886b,0,1,Peerius.com-problematic.xml
+da6ba14b9cc80cecf84262cd3e6035386578d6d27ae3061bf5cae3216eea3959,1,1,Peerius.com.xml
+a130c2186838ac25cf952bcc67cca009371321b3acbe4fc721309b72aad7027c,0,1,Pegelf.de.xml
+5ce21d515b34843606f42926f22d007948926b66c7cecc29c72c4a2753a71e1b,1,0,Pennsylvania-State-University.xml
+540cd8a82fb1de07061e983359475b2cbf144af5a1b98ef4b981f87982f3a7f9,0,1,Pensionsmyndigheten.se.xml
+96ac5d215f1b378cba2ae89c100c0f5c6c3a3ff562a31e622bc2dc04d49a5c69,1,0,Peoples_Choice_Awards.xml
+fb65b454d3712cdee0a55cde951214ff2906d1eecaf62927fc9baf552fe2a25f,0,1,Perfect_Market.com-problematic.xml
+a5c12d8025be3318d62d91387f841317857f79bb9aab652f91d65c755e8e47dc,0,1,Perfect_Sense_Digital.xml
+715bd34f865b02b1fd27059e7e4f542d3fc90d8f50d8bff1bac8666f2197e728,1,0,Personforce.xml
+bfed1f967eb05dabbd243cb0d4d1aa66de3bcb8ac299dfdb7a2d69b385b2a4e1,0,1,Pfizer_pro.com.xml
+aaf2de240b5d11f6a9714d588bbf7638e296302ae88da0d3f838097315d52f86,0,1,Pheedcontent.com.xml
+10c216db9072d4143dfe8c2573933753ef48295f0919f6baf00ca7358984521c,1,1,Philosophers_Guild.com.xml
+45dec8d1365b75a84a445c92227162ccff6526198d3af9b30e06c8c5b7a51e8a,1,1,Photobucket.xml
+016eb2664abc5fd82f5c2b38a525d838a57f2fce95ba0bb099a593c3e38665d0,1,0,PhpBB.xml
+444c82f47f7eac33666d99279e34013195eac91a77c5c4374dd870daa2ef425d,1,0,Phparchitect.xml
+b72e4e9f7d21bbce5b9e2a9ddd1a3b4455b44f2ad25ffc29e34ea737004745f6,1,1,Piatt_County_Journal-Republican.xml
+571e8129bb73ac64284c6a7cd6e8aba1cd9515297417c5d446e4b3f0f8de0f90,1,1,Pickaweb.xml
+cf7b1bd5b721d925da006f39ba1871955f031865f0671ceacc1682158090e92e,0,1,Pictomania.xml
+73228b03209d957e30c9949ed6f98aea5cb7625806c66b5b57d43d5cefe23273,1,1,Pimg.net.xml
+ab2c00ab831d35a95f6146fbb79857b64e431b16a55141848a9c8328c89cc30b,1,1,Pinescharter.net.xml
+351933a4ca393d784a3e0255666cdba8645c9e2d8f56ea3231467b53937a7460,0,1,Ping-Fast.com.xml
+590ab5ee7e510ba33049d5acfa6f332bd51388f0426e3959aace2e6ca7624e5a,1,1,Pingless.xml
+3c5a6453f20a2462fedce8629a68e47c615c8717e7f5934f3271d71bbf3980ee,1,1,Pinme.ru.xml
+662023093afa853230351a22ad3a03d92674583751f67b1c77db57439da389b0,0,1,Pipping.org.xml
+3b0b0f3ce5116f05fed6dc7b33bcff46821f1d46cc867891fc8df9895f83a2df,1,0,Piriform.xml
+44323e2b5b6caf12d77c2d59ec395f05871254633110d9445cfde16de26083d3,1,0,PixelX.de.xml
+0b633c07416948983bdcc4654fc98e5dc569e47c5f8faabf6a37f46efad6c582,1,0,Pixnet.net.xml
+c5c0d23e54473a42d466785be61c4ad691e44f62e710a2a6c9248a694b6cb084,0,1,Planet3dnow.de.xml
+3ea9dd12e12f7ee6c175c6196aefaf9dc366b0b46db96bbc6874afc901c1d2d5,0,1,Plantronics.xml
+89b0a11dabbebe35d43aaae8dc9610c937b3f47dfd4fb47d82777d740bcd65a2,0,1,Plati.ru.xml
+1094a99b5e8a0abb9fb46b17654826e1a8387207caa3278f89949c8b6d0f2ead,1,1,Platinum_Skin_Care.com.xml
+f17442d3412d38817ddf3cdd8ec7f104b45f54d6175505b0a315d5d655d05be6,1,1,Player.FM.xml
+f8eb1c5b920d861d39f2f49cc5b1b5b781034d05a5c5970492e2ca678feefb37,0,1,Playlists.net.xml
+8e4f71f2c21971751b4669d02db149088429c727002101104ba57365f5804531,0,1,PlentyOfFish.xml
+32e4746d265b44c1f5940e78b1102d817e382b19508a7c49699943f6f121a108,1,0,Pogo.xml
+43155ad40eeded32a53d8aa78bdd55503fa6bcb3088a29d92492d07b0ddcdbd4,1,0,Point.im.xml
+82900ee0fbe5e8da617b95011724372fdc7d1a9e68376b6e0b46d6128fc0419c,1,1,Pokemon.com.xml
+b18aaa63b24e4333450a6523704e29e485506972e8fc4be497e890e79ecef4bf,1,0,PoliceUK.xml
+e03dfabf9213efffd81e97ac515e6455cbbe46cff31ded39b41ea0fd787bd7a5,1,0,Police_Mutual.xml
+ed360bd7adf7254dcf2698e30ca35858cbf4cb1e37d305ed814aa2b0781de9c7,0,1,Polisforbundet.se.xml
+a0d5f094a2dfb958545b6baa8ac1a7d52733b10790028f9cfac80ca7766ce209,0,1,Political_Wire.com.xml
+fd7bac449610576bf5a1d87e2277ca130fc15ad1f557c6eb5679ca615b5ccc30,1,1,Polldaddy.xml
+62ba89768f63d01a33108d6612b1439a9dc7e1ebace2ce5c57ec7d72d5f7d562,1,1,PopSugar-assets.com.xml
+b9aeb8140b8c5ae9e60adc1f3189a4fcb72bb245869ab5b17b13eb2f42343f4c,1,1,PopSugar.com.xml
+37875c27e806135f0ac32c517079c7bb99f00e22dc3c2ad828ef0e8455b5d04a,0,1,Popular_Mechanics.com-problematic.xml
+2dff8eae8eb79b0ee7d7d9d03b678d18ab0e80c4f8c642f076169ba45ebde7d8,1,0,Popular_Photography.xml
+9d9f29b0e53a626445a096648cce8a40e721bfaf0c3e45b3066f19e78ae9fdf1,0,1,PortMorgan.com.xml
+4acb2c18ff46d235876ac28da274a69fdbf34c411da8503f46594d59b3f88d6d,0,1,Porteus-Kiosk.org.xml
+6b0d7ddf3bdd5ad91f34402c6d3f7f7d0386490d94b03dd8f129412f4e514d20,0,1,Portner_Press.com.au.xml
+4e5dbe5aef10968d09652fdebf8630baf5f78e41edbdf230238a6a0166985d6e,1,1,Post_Office.xml
+dc3f1b194ab37a2e2ac738b5fbcad32e24454912aafae49f7ac1510b8a2e8db7,1,1,Postlapsaria.xml
+2d4efa164c7dd27c982d9c131018cdbe5d7ffa3fc51b4d819e379a721ac329ff,1,1,Potager.org.xml
+d82fa518dafd334d1106c883a691314a2e188b467209396c7dc32e12db7ace88,1,0,PowerShell_Gallery.com.xml
+e699af2a0de904179a543e2cef6b7f805e123404341dbe5e8d78dac3708fc644,0,1,Powerbuy.co.th.xml
+b689ab0bf3c4612108106e20d8ee8afc95b2459b255b5bafbd243e152e9c0622,1,1,Powerhouse_Museum.com.xml
+b0d4020ae98c0a8792a14d61af286d8da58bdf81adbd1d1e19afc749ef600bc7,0,1,Prad.de.xml
+810fe9624db6579cb589bc5bf86447dc0bba88983b89c993152fd78554898224,0,1,Pressflex-mismatches.xml
+306c91a332845a079f5f867072dee43054fac522e9b377fa3a28dedc5505a88b,1,0,PriceRunner.xml
+302da6e9ef8981e7c9fc640d28274768775d2dcf4e6db959d02538d6b7d061ef,1,1,Priceonomics.com.xml
+a1023dd10e11b82db899a2b1cadad54c2f6ac3e51a4e056c58afc1efb67047d7,1,0,Printfection.com.xml
+44b5f33ecdb9f0c492366882955ceb80db6fab8976dcb2946ab853e344c73062,1,0,Prisma-IT.com.xml
+4aa8187315321bcfae808afacb259caea5d5023b7c2a8203a63daa89fcd25955,1,0,Pritunl.com.xml
+e0519f9b99fd87886edb3fc154d3fc1bb145333aa536966d417433030cd82eda,0,1,Privacy_Not_Prism.org.xml
+9335d8279c8e6c864c1c38fc7e140fa58be572a28ca0841aa83971d4c3a67260,0,1,Privacyscore.com.xml
+311f5788fc38e8633b10d3864ec787d33d6c7bf84e9a9917c01a78cb48ddcfc5,1,1,Pro_Bike_Kit.xml
+7bf89b1d0564666fba76d66df0b0fc2237dc1b92a27c52ace0c1cdd705bd4675,1,0,Prolexic.xml
+ed81e7fc8de7196452e9e9c0821196ba5de17d7274df4054ff5bd95800fe2523,0,1,Prolific.com.tw.xml
+e3ca25a923e2ba846cd50819fc928c44bab543f1f8380b3789c8552933068304,0,1,Prometheus_Global-problematic.xml
+6f67d36a686a32ecee265b2914c9e3145ec7b641e8a2640511a5c2488b510c2d,1,0,Proofpoint.xml
+632de51c809f29f705d7997d3f2b7674ea97aea38bb0678b1de48f0c6cc58bb8,1,1,PropertyInvesting.com.xml
+3a42b5c2052afced4f34ad117e2782af9088b53ebff090ea60bf3aac79562e74,0,1,Protonirockerxow.onion.xml
+cc1db5c4a0f3adeb96bd761fdc1491a0d213d37336cc4fa3301ba9c3ea69ba66,0,1,Proven_Credible.xml
+00e348922788c6e644d51801e5887325fc38759395bdbfe9f9782d6bdb737400,0,1,PrudentBear.xml
+2cb55093e265bb1a2c345613e293ba44500cc31603bd713c6dbe301fde49654b,0,1,Pss.sk.xml
+1c59135a4c622ee99ac387ff84d671258f9556c7ba525b89db979466180d1a46,1,1,PubNub.xml
+83055ef9b302a95dab4a512ce4db64ff78e36c9eceb2902a9fdd1ccf209295a5,0,1,Public-Knowledge.xml
+d9044daa3fa3513400d2990aedc735eceeb815c896b70a96f95d4d79b1c846fd,1,1,Pumo.com.tw.xml
+b2e2a5f8ed45c939a47777f82b4f45f9e6f29434abcd942895047a2926718560,1,1,Purdue_University.xml
+3559850f77b0bc7b063de923ddadd129a1c31e704e27f3318f4dcbb7eeb2d623,1,0,PutLocker.xml
+0c9b2d18c06cc6a3cdf9e3eda7c17efd3932f0a8a10e733cb1e3639b5b367dfc,1,1,QIP.xml
+610d9ca4c64e1044ed49151a455e132dedc6cb288f14f86223b4bfc84d58a368,1,0,Quattroplay.com.xml
+11670da974bdbd3ad8f36d0905cdb3b0a259181f1c2a7082c85c2ba432a1b21b,1,1,Queens_University_Belfast.xml
+9eb9fccf0ae3ad48a892df0a03e6970a5b311b263111bee6f629887307300add,1,0,Queer.de.xml
+3a871414f31ff7c5d2a08897c0f6209ebbfbd6e8e0887f825932d45dc6d26399,1,0,QuizAction.de.xml
+eebcbcbff68650421932b86e64a78ddf9bf0d55c33df14d1b2bda4b5923b3f16,1,0,RAND.xml
+f8be2a2667f90decacf4019ad460037617c4a39be2c437395df2448987ca49c9,0,1,RCA.org.xml
+07e6cd400a7d03ad2aed4557bbde4ef9e1f96248ad05aca16f22375ec65b6a8c,1,0,RE.is.xml
+b91a1ce21dbc933f96a58068120bdda50bd0a150db11f1d8be42f6ea85ec0812,1,1,RF_Parts.com.xml
+bdb3b3e81945ab7499b5313e73595f148c91413e7b947bd3fe699d03a0391c13,1,0,RHUL.ac.uk.xml
+21643040fe18563efb75dae1348aab27c6d7bcafd9d86669b454959072350177,1,1,RH_Cloud.com.xml
+f18741e03f4946bc8a2cc98ae60a581ede581ef9e454c6f0c24d09316b6d853d,1,0,RIKEN.jp.xml
+bf59bcd24750fce1e1b920a8626d7ff5fb298dcb0a958e7397f9068f35214f6b,0,1,RISCOS.com.xml
+e320c9532ea87d88cc1f29dfd2ded7ef50f88897f6fe1c5cb53144af11b7469b,1,0,RNW.nl.xml
+38e182d9a20d3e1d7e7f4e8229a209b0d4c73c76a11d8dc8afc53ce2584a73d5,1,1,RSM_secure.com.xml
+fc8f9a4458d71bfc071d9d7a289693bf39a34d4c48c513b40f8baf719b417370,1,0,RSVP.xml
+3b265196f1568487f91bc203fcea005f88de381527e88a4fcc0d73e927c16d33,0,1,RTK.xml
+43e2885073158c994a17bf0144cf97de1ac45a5f2a412f2d402475d7ae1e84f8,0,1,RU-Golos.xml
+a528fade4ec3280b09242df1f18bf8cf465255be7640d16222810d16da8ca8ff,1,1,RackCDN.com.xml
+b6b80b8e6effda900873a33d7f0c6865be96761af04446b036a54a44ca6376dc,1,1,Rackspace.com-falsemixed.xml
+d33a01659d482e190a861accaf706b98c369e189547a8ad101db63a85fe18e68,1,0,Rackspace_Cloud.com.xml
+53fa3192655dd12fe95df6e4054378b1aa4cee016141ea5b55ff62a0516a3af1,1,1,Radioleaks.xml
+be7e41eeb775ed3a092eb6caa67dece5052bae12be23f72922421af695d2892c,0,1,RailsConf.com.xml
+a8eac7a3ad4bed42d518579dfeddc1ea079e0bf08897a8b890ded2c4911f01c4,1,1,Rantoul_Press.xml
+46fd3ecefccc0ee271b35fdea5f695b5a7a8b821ab9bdbea090ab07e49f49e9a,0,1,RapidBuyr-problematic.xml
+825ab0b71141f945032d9eb9f2d107635184db4b244ab605bda6338a7c83f711,1,0,RapidBuyr.xml
+c141b46bc6e8bb32c9eb0beb311cff1ff66e003fef23f11d8ae1e23e1a308cb8,1,1,RatfishOil.com.xml
+922398c3843dea87e31afabf326f9cd2447344f6aed0f93514f2c98dbe69c9c8,0,1,Rawnet.com.xml
+96d6931dc7ddc1dfae37303fdb58cd0f855ba02abf08cb981aa1e0823513e9f3,0,1,Rayner-Software.xml
+e2125c4ff7f8379155ae1cbe641d8d42fc62ede1add7edc1abf0d519b28b231d,1,1,Razoo.xml
+f4f7f990d573489563d003524c724fac1479711483a0fd0b2a0e62614886a5c1,1,0,Razor_Servers.xml
+79757f97f7b60f450d8440be0d4280a576539dfc57f392ed11818a03876d208d,0,1,ReachLocal.com.xml
+0c7a2b9d81e562263408261a8d2c2132482cce04765bb9bb2dcf2db80bf37d77,1,0,ReactOS.org.xml
+41653b528d317761c5c16423c2e4d33ea37646cec0801764b40f21cd8d7e7d0c,1,1,ReadRobReid.com.xml
+08f10251ac36c100bf8ae7da9eabd18f65b25466f132d6e60138fe800bc19934,1,0,ReadTheDocs.xml
+65002fb8676849739c54b0dd684aae2e36792c16ab5144b1cde089a6561d2f52,0,1,Realtech_VR.xml
+d02d0ef8d9228fb73ed248df5c49f8e5f4ef408e4cd0442057337d7cc00c8537,1,1,Realtime.co.xml
+175a2519105c6a213529364cc7d07291395b1990d6972eda7a6114333639b0f2,1,1,Rec-log.xml
+3d81ab3a1e068cc3e433fb67054d899bfb0de1806dd6a4a04c6960c400ee2403,0,1,Reco.se.xml
+be04e4a5c75ce1b4a49738d3a5e13dd52e2b054f0049b56ae3dc5a96cf3e0bf3,1,1,Record-Store-Day.xml
+f53f48cc8819321f46aed9c297b688b9993d6a9de165e8763d0f37c8ebb26381,1,1,Red-Pill.eu.xml
+3eb21961867734b2a94ad5cf657258520891193e0d3067bb0fb624a4b1a68a18,1,1,RedIRIS.es.xml
+744461d0f9721427cfde87ec8eb72bb0b4af4c61eb03ccc359db7e80eef80e04,1,1,RedState.xml
+b436dee831b87aa69cb3b905bcf593cd7e47ed08820189f8974d4a3e00d98bcf,0,1,Red_Bean_Software.xml
+560d674192e89441ca7d23ecb5fb627f67f2e0ea32ca9a9b78f3b4af11f438c6,0,1,Red_Bull_Media_House.xml
+054b8501acbe0bc72dcc54d95df75e1d0175ade0c306d347daf0e54aa3fbcf15,1,0,Red_Bull_Mobile-falsemixed.xml
+def99e9c52843ab97071e7c51143321c1bc97dc6b2395b2619b4f9ff7d197f2e,1,1,Red_Cross.org.xml
+39eff1aef0a36525f9f373d24e20fa4850fff65d2acb945dae316680b84ed334,0,1,Redbox.xml
+460e113cb4ca654705691e100424c875fecb6c0499791cffccc734ac7f42c46d,0,1,Reebok.ca.xml
+49f413717d683b1902cdc262e5a77d4ac119e9b2c2bd4f19b0139c0298fe0c40,1,1,Reed-Exhibitions.xml
+1bc93887c36392e422e57cf7b8352bd344b1d034cbd78d09da67704520b5ee37,0,1,Reed_Business_Information.xml
+705ec8dbee1342fe705abee9ac8c3156529fc043e439e3ba01087b9c70ca0a9f,1,0,Reef_Builders.xml
+a384778aecfb187e57b08dd0a236b215c892c6ad4ea8053d1aab6307d65b58c9,1,1,ReelSEO.com.xml
+8817ad2ea935c94410c88e741c82b765efd59ae2b929e5adb3e3989fd4ee4351,1,1,ReelVidz.com.xml
+2e8b726961855461d27af664aa198af4386e9a61ea1b25ea9e3f97f1618645c2,0,1,RefinedLabs.xml
+0dca7f8db4e1a34403795e066f569135f7b6a690847e640627fbd4cb613d71c4,0,1,Reflex.cz.xml
+c1eea1a6dd94fbda613525ebeedaafcadf64b579f0a07e74f5585c47fee1041e,1,1,Reformal.xml
+ba5433cc440b527b0ac40a27ca63efa96122103a9bb85d2f90b1bb28c582de62,1,1,Rega.xml
+c1c45efb4372b9f3c19a93e582c93d068d6f86411177f976b1b30fb69f749305,0,1,Reimanpub.com.xml
+c2f8c90c2a61453cf72e9375c5892e7fae5092010e2cf0db37791e2a2b1fd1ac,1,0,Relcom.host.xml
+bedd10752a7feaf458f36cc9139a80e547ffc5cb86cacb4b45f3380b3ea28bc7,1,1,Religion_News.com.xml
+f5fa27df851da300199657c4ddd684050bb637a6a097e6514103fdca757165fc,1,0,Reno_Gazette-Journal.xml
+c71b26997cc7f392de406f1f5ed5f472755a3a42cdc30ab7680c3e7d81967d9c,1,0,Rent_the_Runway.xml
+bc848cf6d199b17cd1490d8ebb34d3cd247a9f7d400583b8e4fdbf3499def618,1,1,ReportLab.xml
+5cb0ade0d5d1dc7e4dd1ccc665dfb4c266ada546964c320112cfa58311fadcde,0,1,Repozitar.cz.xml
+e53aeaa878e3dfdc1fbf1b50f6d16c8951aa396e8023bfa9d521dc9bdb45b3de,1,1,Represent.Us.xml
+88e398ec4597fcd0126db82a9cb9efad999c17cda7de00490943b9ff12551771,1,1,Reputation.com.xml
+97c227a9339f8d2100116d0f78f3795404ff88c9b2af12ba755db9919347253e,0,1,Research-Blogging.xml
+6c3d96b7e739b4b9a319e64168eb7600a742f34a313821c44808c1ac1707f414,1,0,ResellerRatings.xml
+99c54146351ebc37702c69036a7969daf602f88a46a6659feed01e378049e8ee,1,1,Reservation_Counter.xml
+1fa6eb86f60348d8030e0e38d7dda49565e349900dab0bf903d26c35807773c0,1,0,Responsys.xml
+a67a18b5bfaa7dba51643416054612adaee639d425a8edf44b58eda19a4427f9,0,1,Retailhosting.fi.xml
+00acf51b8e95fb8568e1bd246a9339f38f1f950d5b043f1fa28e14ed065ae5a6,1,1,Rfecom.com.xml
+6da80a723a1d1077b1e7a27e1b7cf81d6dc7bd9da2161e9d63fe0c896ae0acb4,1,0,Rfihub.com.xml
+9aa7137976390aa76a522394805ce510e4202c6bb51f3bc80a7c8d84114ecded,1,1,Rhizome.xml
+ec0851667677ff8540dd4ea8454573e8d97df70843756980d2f1d6db93586f8b,0,1,RingtoneMatcher.com.xml
+d27f1b348e71e8e016f36a21025afb61c044ff05ca5b138551ed5218fd33d474,1,0,River_Island.xml
+6b1cbf8f7c764869e3bb58c50ca22966d48a7b7b8f653ced6110336bedce2541,1,1,Rock_Creek_Outfitters.xml
+a3f1aab489ec09b4b991b1a42dfd46871d9372f1a529bef1103a6c8717d1673a,0,1,RockstarGames.xml
+633a5865ee1e5db740e5ead4afef23585998006ac347bdb7a901cdf29a1e4db7,0,1,Roeck-us.net.xml
+5bcfb04034d3fd0eb17aaff546732ddda271ff01aa972f065d149b4db23e78f9,1,0,Roku.com.xml
+47d01b691df5218a1da827d4d17fa384cb3d577b1d8e577d9dae0f3a6ab21e34,1,0,Rolling_Stone.com.xml
+4783a0472b26a08c80e17722e5cafd5c18e160518f72d97c3354cd39fd2d5bcc,0,1,RootBSD.net.xml
+ccbabba764819bd13ef73fc6ffdffdbce63afa730066863a098b3c355bdbf548,1,0,Rother.gov.uk.xml
+22f670057d19b9f795990786abfd398fa7d9731920a97620deb989914fb6e642,1,0,Royal_Mail.xml
+56f318ca6b8f5c51699fba8b627ba828470db3e6b712d3b0aa9d4d1cd284b31d,1,1,Rsync.net.xml
+1f87be8d9de10ec8ee2b9e7fcd42f90979adce40fe8997a80f34313423cf3989,1,1,Rsys.net.xml
+e43729a767c12b46a514cfe5daa294e236ea9768010d72d82e254c32e601f590,0,1,Rue_La_La.com.xml
+a144e99c2ef329b7cf98af652bde5bd6153cb84602d3cce46f95d3a4685cb901,1,0,RugStudio.xml
+148588675e66210914e28a86d10c5f27b71a78517d06a70c423cbdab87bcd083,1,1,Rutgers_University.xml
+018fd6c1ea9077a236d9bb1f7fc10af3b335b662de27731d5d2432ce47859d3b,0,1,S-pankki.xml
+8ea654177b45b0907f63613a7f7a7ff5beea606fb948cbf52b0c513195bb051e,0,1,SAIC.com.xml
+26c41f1beb070887277febb9c002eec5f1824184016b8096316aa592b2d2cae2,0,1,SC.edu.xml
+fd71c353d28fceb8b115719e83bc37fc7f717fa194e03d48d2cabacc00fdcd29,1,1,SDSU.edu.xml
+afb0053160baf8df65cddef2e6252d980f0ae631ddee646810b0c57fcd384402,1,0,SEScoops.xml
+90e39924d85b911e9ab7c92ec676692a6f3cc4253ed1c5cd48ac62b788bd4d08,0,1,SF.se.xml
+e441e43ceff7d30a52ccc2002be68156248c0b3228cb3cf1f3f241567ff8def2,1,0,SFM-Group.xml
+b1ddc8eafc9185d502e8c25fa3239d0ece0bf86bf9dcf471af0dd11ffb792f4a,1,1,SGNO.org.xml
+17d8e1cd7f7e79152b5482c90e28f14bb732d4e3b6e09240171fb7fa0c47c5cd,0,1,SH.se.xml
+0ebfb123ecc0a797ffba53b2ed5e7a7a9def6cefd840ab6e9cadf49d77199d6c,1,1,SHld.net.xml
+ec5ec3032ad870e33ed2aee54e56fc4ddf43e6c2d0842f5b29530fd378212056,0,1,SI.se.xml
+acafdedb2df04d3278f3058d9be43aec8127024a12e89b7cc1d03f54b0b19f95,0,1,SICS.se.xml
+5d608db523d07b5fe5b23fccd9bc91b8c630f5c15ab83910c4a440441068e3fb,1,1,SIL-International.xml
+6846a45bb80c31778df50470a813f4360f4259103d29c032c0fad0dc86ca2e73,0,1,SIL_International-problematic.xml
+5e7ac697dcd343072fbf1e626ae8493b93fb809bc95e882eec2fd50ba4da66ce,1,0,SNCB.xml
+de4e0aad788b737f30398cc734dc7e93a178dffe24c0b73abe4fedd6a42e2015,1,0,SPEC.org.xml
+0541366178a7279745ea561f059b404fe3e0938cf75afa1c0d3c21f89a17a141,1,1,SYW_CDN.net.xml
+d801e51a50153a2119eedcdced489f520458e20b870d160379489582320da934,0,1,Sac.se.xml
+eb4b298e2328c9d3af283306b797b4e07e194584efce78f97c84b249f9339c8f,0,1,Sacred_Crystal_Singing_Bowls.net.xml
+8ca380dd32c44814c1f0d696c3efebf9657bbc01b5a1ee9b5e616c389eb239f4,1,0,Saga-Group.xml
+31910514d896bb6b9c90d691ce06da20594ba849e325fca5513329fe9ab57088,1,0,Sage.xml
+a67b67cba419c9c60f5af4693ade3ab0f4dcb71c0447e14eeccf5d9f8ccce305,1,1,Salesforce.com.xml
+70625d04b2bfb69c56b1dc93d19eed236e18e861c8d0134b164f8a348ade9116,1,1,Salesforce_Live_Agent.com.xml
+223be5286839874afef4638f6b87c51f4cb2d2ecc551bf4e994ba0a022b78fd1,1,1,Salsa-Labs.xml
+4fe8a655c2e05111677d094899b626987d18679aad18ffd1e17ea5447c3818fe,1,1,Sam_Harris.org.xml
+a7cdcfef95e0c16a840a8c72942fcf23944eab6aa4db5f3c02fc89679bdbd241,0,1,San_Francisco_Marathon.xml
+4888cb498299850bc240910cc61c5848296567d65037d0c150565779950679f9,0,1,Sanalika.xml
+045eda1307862552713004aa03d4b9681499d9af2bc7abcadda4a00237734eda,0,1,Santa_Clara_University-problematic.xml
+d6d63b4167f0c17262f7eae3dd84693b68a3caa00feb09bdcd547af74bce75da,1,1,Santa_Clara_University.xml
+e528e24518c3a4fdd013118b9388faf754c8ff65ddb0ff972871d046065998b2,1,1,Sapato.xml
+10dddb4466cc962eaca360f047e7c9b153d4ceaec7caa21507f9327a4d6e94c2,1,1,Sape.xml
+252603fc0bee7ddd0001cd5227b894007ecb583163499a47e384084251fd3e91,0,1,Saurik.xml
+e54714d568b3dc29507fb27dd4934a5192b8c1e397cb97009435a049cb103fc7,1,1,Scanadu.com.xml
+3921f7457145f30994e3e5edb393abe93434cb4cc158b6b77ac30ecc9692bbe9,1,0,Scania.xml
+38fcd3c77ef8529bfa24f39ca1a3031094574f86ec150997c16494f79bec85b2,0,1,Sceper.xml
+d4b3e1cd81bbf83fb126391a949fc64451f079d3c6c71683fac08b3972b86311,0,1,Schneider-Kreuznach-mismatches.xml
+eec14fa49b2eb3ca3cba02c29f921c816f1c59ec37ad0fcf64a2a03c1a79c219,0,1,SchoolLoop.xml
+b820ef0ca9ed892e54ecba43ca9744e3eaa8828238b13d527438029e749de50a,0,1,Schulte.org.xml
+25933077b070dbd4c7fda6d88421b3982c3457ea5b5f008aba6043900f07ca1b,0,1,Schwab_Plan.com.xml
+a7eb0ac9d79d8b16e404ad3a6206a9f19f51294e69b08cccbf4094148ededc22,1,0,Scoop.it.xml
+648bca2cf9de8921e93ab3cdc73e3b84fbd962af85e0c9f0547cf790dc625759,0,1,Scottlinux.com.xml
+78be6deb276806cd5ebb6953953297c789a83e254fef202137f493dc8bb93ae1,0,1,Screen-It.xml
+c95e7e25412c5fbcb4809458f4513a0b6e22552e282fd557a0aea34166e86e25,0,1,Screen_International.xml
+bd4374a901260cd4a63f44d11b6f1048ad380d5925d92b90a7eaaa83337a22dd,1,1,Scribit.xml
+83a8bbc82794caf87711ab36df2c8d9c6dd6bf8a90d4b627370eefc53fcb0882,1,1,ScriptSource.xml
+3ac88c2b6ef1fbebdc4efec463de28b51d4b0891dae3f3337d2142de265d8687,1,1,Scubbly.xml
+17a481d6a4f50aa56d025131da16786066d328c7f11ab915f6d57b39dd4bda23,1,0,Sculpteo.com.xml
+32e7fe0659f10a07ddd9e79c4451377d2794f8c90d679e5e12771ce7f39a24f1,0,1,Sdlcdn.com.xml
+b47e3b0004ed2b922443aa48b3dca1012843ed67610e4f15f881dc0b5d8494a3,1,0,SeaShepherd.org.xml
+47ab71ea32a7522b3aa11275a3fb25467963e52f52cbbd28fbc1e4290c9edbea,0,1,Sealed_Abstract.com.xml
+6835368660d2c2932d163024a8da85984bcaf646184f5eacd658c0fb52a62c5c,1,1,Seattle_Technical_Books.com.xml
+0e8e772f5af7e798a343bc7ffc07367d78688f53fc2b361b9b6f574c3f9bf55f,0,1,Secret-Maryo-Chronicles.xml
+a60519a17ed9b6f9752ad6bbc6a463d50f6640643958d6e615478c9a4a57fa77,1,0,Secunet.xml
+cc8342bcc4c3c676b7bd0cc012b441d3d9c4a7fabfab9b25a8d8146963b4a738,1,1,Secunia.xml
+33814228cd58cf773562cb2b4cca1385b282847778045dec33b0469b1f1ef33b,1,0,Secure-donor.com.xml
+fb80a2a8a1de294899f5a0615851aa20d733698590215f4fa5306b9786ecebe9,1,1,Secure-payment-processing.com.xml
+ef4aa3c48224f9ebd3f7d1957eafe93f20690e4111e7f2bc802943da7b762ee6,1,1,Secure-secure.co.uk.xml
+695d69a740be24d4ed56b02926d38131360b363e580859219aa87843dacf5b1a,1,1,Secure-zone.net.xml
+f7fcc791da39508c7c2f62ccd71aac9c7e345b35bb825469e3bf31fc51fb1fcb,0,1,Secure_in_the_Circle.xml
+2118b0c04b2f228827d360c8c22c50033954206dca3837833c615bf47d8bcdc2,1,0,Securepicssl.com.xml
+6b20be37aeafe97b9c0449d7815f06e73d80c685be3fad2d6d6a97ef625f3727,1,0,Secusmart.xml
+28bdc6b9c0d2041fc5fca0b87c6c88e524efc63ecf62bb07c9433ee7fca42194,1,1,See-Group.xml
+99b22782fcf7be5163da772801b440ea850cc78d175816238aaafa0b018b7c40,1,1,Seguros_Universales.xml
+1b9f7a18950ecc433514f5008b5331d4f139ce0db817e521c01640ec80e8f997,0,1,SendPepper.com.xml
+58cef17a92f366b7e1cde56909c647d27ff2ee35518214d71701a8d109673e17,0,1,Seonet-Multimedia.xml
+853dd75e3e890244ab5c4b515f84235930a5547df1efdda71304300a261a4b31,1,1,Server314.com.xml
+51c74b507fc022bac4558cf0303b02576e0834d66f42bb99c3b93c343ce146d5,1,1,Sferra.xml
+1813cb1da6645470c2e8d31aa8674d7d870457c6d266e17c779adc3beb496215,0,1,ShareThis.xml
+5ef4aa2f5d4f1d0045ff46b16bf66cb827ce05554693a23e46548a584871f44b,1,0,SharpSpring.xml
+52619008e0a398517bd3ed4b130df71beda4b92d61fc2261ebbcb4a4d9489a83,1,0,Shaw.ca.xml
+0d2c3ddd439373407efc3cbc24b6fd7ec6da6563499498590e742b02d87a3fbf,1,1,SheVibe.com.xml
+5a68196b57ecab58d93ad0d0a4e3b7de40fbe516b74708037237d2ad1583fd1a,1,0,Sheet-Music-Plus.xml
+de01005b2439ff85c10a569a5bc9f09b86631fd60af698b3929ffc1a57ce78ab,1,1,Shipto.com.xml
+529faf77dc8341243f94c02e7dcf5dc80f0e558ce630008f7b8a263c8930d80f,1,0,Shmoop.com.xml
+c971c8081e7157bb581cc54157b6169d600b84b01e2e64e7cea95cced39fcdc6,1,0,ShopCo.com.xml
+d651e9791352d0487ad06bac798a6665a3148331d2404a6dc37366e44e92af87,1,1,ShopMania.xml
+278c389123acf69565e494a9910ec501d4c6f9ec22efce8aae9b8b5972359de3,1,1,Shop_Your_Way.com.xml
+faf5c3a2ef00844a11a4fcae50f0b1c010bef569cd59f6458c17223b0306297f,1,1,Shopinfo.net.xml
+cb82ed89532cfe1510504e3f9c48624106a9d0047b71e3470960047b541e577f,1,0,Shoptiques.com.xml
+b76a5cfaaf82a320c34fa385a3226b8a8a4a6a838b84e2ccb701f315b0f3368d,1,0,Shorty_Awards.com.xml
+3184281fdf234480385384607083c2d89814a072d666cb5a27c15c132e4dc56b,1,0,ShowMeCon.com.xml
+e288931dca09be06dde50e2e7e88361e0b3f3a3fd70882d39142d93104d1dd4e,1,1,Shurgard.xml
+9c9167d6a433c5c4c16b5b968040168b122215635d360c94bc5ccce867d8638c,1,1,Shutterfly.xml
+893a6bf3dcbf71cf5e4f1ae4288f7303f13681b9812f5055a788e7acb879f173,1,1,Shutterstock.xml
+c2bdeaa9210ade411015be525d562ea16bedd70da5897af9d239278aa0ca8ae7,0,1,Sickbits.net.xml
+991b526f8347cc2655f4b38ab4579c1ceab9708768f98fb8bfcd68361001b7c1,0,1,Sieciovo.pl.xml
+9b5e1216c793e3384ca0e6d8dd68761986d3613af12b81d640922b982c1179d1,1,0,SigFig.xml
+c6231d1db4ffe805ac881cf622bc409747a3a6be51cf6effdc071baf5b6324aa,0,1,Silicon-Labs.xml
+d15d322b8717f52b79e0b14e43f7ab97ebc53a729183386817f29358a5a8f77d,0,1,Silverflint.xml
+7a69a21a35e8e9851f97fae04e3c2839a53d54cf7a74475af7ebca460b514cf1,0,1,Sim-technik.de.xml
+a49bac6e453d1a6b8658c5d09eb247a7201c2faf23ea278ff090f32c54f237ae,1,1,Sim_City.com.xml
+9c6b97f93cdda86aa2d39ebd6fe5db76c601aba1050ed094c4c8a940e753f3c7,0,1,Simmtester.com.xml
+9194c3e6f904add76fb734e02736c2301f3c218bb8cbdd30ae8a385aecc027bc,1,0,Simosnap.com.xml
+38efd0e81710a352219d2237161c5d0ed645f65fe77fc3cfea190557233de483,1,0,Simplekb.com.xml
+68aa39cfd4b062c20ea2e1bfba9fd71f4fffc47e1ae934649137626e113e2014,1,1,Simply-Stamps.xml
+12389eac2a2319caa3288d448b704e7306cd6aa0908efee8967c8f74e2088600,1,1,Singularity_Hub.xml
+b05ab2299cf4a3552b415ad2bc8898d5e257d28a0e9e38a13402447f5de540ac,0,1,Sinoptik.ua.xml
+d004407eb0d68f3471383f7ecb0506c506135731e203586cb1b04ab24ee9a51b,1,1,Sirportly.xml
+18fca85374104c3c57f5c8d3a82fe19eb00812b410016d9b5c73a8ee8c0e9063,1,1,Site5.xml
+239511aea016e2100b8b88f9afc63f52439c61aac67295ce2055c4945505a27e,1,1,Sitefinity.com.xml
+49cb9933bfe48be26b4838aabacb7026024ee2fa0ed28f3484ed76a96622ce99,1,1,Sitemason.xml
+e7d1ee6d42c793f1ffbf240274c7d7b096831967b41b575bce6593757c287b0c,1,1,Sitemeter.xml
+0a48115cb03ef57a2671772bb06ca76cce108021771e60f0a43e2fbb22a1dc3e,0,1,Skandia.se.xml
+d972951be8af16d4e250056f05a7f4a6e7f123ed0a06b56e879234a2be8a991a,0,1,Skatteministeriet.xml
+20765e85d2fd18909d94526931d694b90b3bc05c6fbc5f5aed8f60ba92192366,0,1,Skillclub.com.xml
+176505bc694962eb998f1de1ba452dbc98547266a6cfdd3e8d32c7e43bd08c55,1,1,Skreened.com.xml
+b6e69a65826e62e9a1cbaa20cd6ffb07fbadb650c80b03b1ef0ae768e2f628b7,0,1,Sky_News.Au.xml
+25157ef56d915eaaefa9f17ad1029535a8613503384273b5d65958dc73d126cb,1,1,Skydsl.eu.xml
+6fdaef17af1ea6490386e9a69d35056586c989cc0efb6ead360199c827556678,0,1,Slac.com.xml
+1613036e5a0687ff4af8fb97b3636dc47fe9cce73cc1e4fc8ac1de9d72c5e182,0,1,Sleviste.cz.xml
+f09f4e1fa797d89d9fded19d8860ca5657f9db89f488eb37b22aa65d09108f05,0,1,SlipFire.xml
+1ff601d9c6793cfd0173c3c5d3c070cf48ad8e661ea28e18658c35214f8a0bc5,1,1,Sloan_Consortium.xml
+8b5991e95bfde9024ae6045f915d2b5d081583abc5876d51c11efe8184570090,1,1,SlovenskaSporitelna.xml
+4be3f8e4caf2704e57b939bd74385ddda2f0fb979fb5af89634bdd72509beb4d,1,1,SmartRecruiters.com.xml
+410889ed15ac9076ccc7d2c95a80e3c71b12fb441d3c2909b41ca6ca149ca9d3,0,1,Smartling-problematic.xml
+b239281baeb1443860e1700cae78069bbe4ec5977f4368787125e5d5a4f0d7a4,1,0,Smartling.xml
+07737e4c4fe88850df4babad790e1d82ee39a0d3055511782be89bb54c85ebd7,0,1,Smith_Monitoring.com.xml
+0bcf0fbf67721c2842b061aa1fe6c94338394637e726ba0268acd5e7690b6a70,0,1,Smjg.xml
+a4b5b9da62123113eecf4398a533bd139de421a9f110e9c5b6d48ed5325bf140,1,0,Snagajob.xml
+f427d8fbc6b8bf77dc8605104bdf8e27ee06eede543ced548f23f22aae1441de,1,1,Snapdeal.com.xml
+b34278b513f81f664edd8653f1bb73fb84209a9625949fcf84364b1dfc0ae9f9,1,1,Snatchly.xml
+3b7f69aaa1c762b112ba9fd30146ba841bd92a50dc25a3849a17a3bb5c9ad048,0,1,Snow_Magazine.xml
+04a8295ed75474c2bac8649b4ed73955e07c6c228000c4539297c32473463223,0,1,SoCal_Linux_Expo.org.xml
+5bf36d6e7610b62e0d338fb24373da34fb83d0882ca9eb1aca333ed563a3c82a,0,1,SoccerWave_UK.com.xml
+8676533486e8956f0db8c6403eb63d4d11dbcdb1aab11b65facc883b596b3834,1,0,Socialbakers.xml
+1704dd273006545bd23e5c0a4a1f7f0cdd4b8ac4aae59268afd81190441f74a3,0,1,Society-of-Light-and-Lighting.xml
+dbfbc5e95c59ca8f5a6817ed26888960e39498fb14738f2ac049c176a530c2d3,0,1,SockShare.com-problematic.xml
+8ffc435a5ee2c8e3df71d5505314b49366e1bc038ffb3ceb5bdb626c0578853c,0,1,SoftLayer-mismatches.xml
+93fa0d5b997eda4d4f1016cbb8a14cc8134ee0f609ce4080dcc13307e7d412f1,1,1,Solid_Cactus.xml
+81582b8a8f659af0e041168acd9fda4d96c18f33acf41defb4bc714f80fd94e3,1,0,Sonatype.com.xml
+5f6ca1d9b19870ad93a58f44dc9ff37c84c4cd7cca95a9859b6af8b5d5ea96e9,0,1,SongColeta.com.xml
+bf0300e1945b14a33128707161ddd15d8744caac395131caebb69d6388005502,1,1,Sonos.com.xml
+f6596e850c1c453085e611473b2611a58f4146e6b34cc4264189a66a0e373e18,1,1,SotT.net.xml
+59cfd7776a8d4bce0bd6e2645e2c76d072a8ff62b965aa2999fea197c839f393,0,1,SoundViz.com.xml
+f141656339ca12f96352ed3819bbbbb35311d5bd2e0d452076254e352d9ff7b3,0,1,Sound_on_Sight.org.xml
+255e5f901544e078566776a84f40d488b808704d36fe4d045d1df074eb3340f9,1,0,Sounds-True.xml
+ed172433b5dd6d87853ced72c67bd31f58eb967d49cf152457fc80dc659c15de,1,1,SourceCoast.xml
+2f8e9d7d6aca7de5ec1b5688166de01b60e3ecafcd0bc3d73fe9dbc984df7dd1,0,1,SourceFed.xml
+49a79924cc9483c9d8b326a1493ea9604d7dd7101e58811cdde9465fd6a9ab7f,1,0,SourceForge.net.xml
+ee75312d7a227efc1996e38f741324c0223b6cd8228f18796f92a93808376065,0,1,Southwest-Research-Institute.xml
+749014fb456fade94fe8410d634d2c35faaa2ac81a812a1743cb742e7fd1ef41,1,1,Sozialdemokratische_Partei_Deutschlands.xml
+180cbbca38aafa09c9781486d20f8e8683c2dceeb2e0418217360acd01e3f7b8,1,1,Space2u.xml
+e962efd4e859976b3ad130f332a2da31aabdae922174ff4cff7dee7360a0484d,0,1,Space_Launch_Report.com.xml
+6b81a9de20423f8a2888e56ce73a7d92a425602713d857ce4e70d72a073ddd7a,1,1,Sparx_Trading.com.xml
+1e5fe1d6ac3f05b8ab1d7bac935cdec1e6aa7214cb1025010f29703a5b9bdb53,0,1,SpatialBuzz.com.xml
+28a4a3b9c096d4d94cf6e2b84461b16ad0da6411132504a02bbdbbc9289b2be4,1,1,Specialized_Products_Company.xml
+b6d12867f7d8012b03d30e3836cd3f71fccc19cdd0bceda42c3b8e3870481d0e,0,1,SpeedCrunch.org.xml
+916dc2183dbbf307a1e01713575b05b2831ece425195929b577b6221ff376ce9,0,1,Spin.de.xml
+4ba75720e6c03c8ab4f8bc95a8657e4b0d67fb91cdb319933829d95517329e60,0,1,SpiritAirlines.xml
+5aa4d692eb37aee5eaa407f998e26c6734bb23e3eda58e1621c549e5fa1a2251,1,1,Spoki.xml
+b440d89b9eed86cd745d0ff23333b7e12af88f7539a35833ee5b6ed2a77b0023,1,1,Sportifik.xml
+2a59ab0331fb5c8c9fcf6d5ea984db8ec59bbcfc92577aac1f79ecca8ccd9cbd,0,1,SpotXchange.com.xml
+ae6cb5584260120ff8f7595d678cef5dea152409c61ec7536200c68a285077c9,1,1,Spylog.com.xml
+1498e2530912c8e73b9cbf1c5284031b51f6e4fa7e37cbad0deb6d6eb290b3b9,1,0,Sqsp.com.xml
+b7c2aa4ee6285d36c77c5e564d09a69f25ec0e2f1c64a041b65a4059555490d0,0,1,SsbKyh.com.xml
+7ec67466391d0bc44bd5a233169801a3d8b68c34118ee890afefa17aa1aead19,1,1,Sslcert35.com.xml
+e7debf41fbb565a05a7830ae950f9bc8c3b24b1ba66090a894fa3db808e8177f,1,0,Ssldomain.com.xml
+554f6e5135b895544437fc3b23f9f06bf5e512318b24b8d13548b8282203e55d,0,1,Stadt-Zuerich.ch.xml
+8026ad04f83be259d2177775e0f798b96ab522511fe1fab28ab64a20387c5738,1,1,StarKist.xml
+1a88c6ce0c2b9a6fea7c476a92a7da09086ac913707d6b938ab618ec6b685f1c,1,0,Starbucks.com.xml
+384e89e4321c54fa7be3b75f19d06b7c029277463bf8cd2f8e0b3bac1cade42f,1,1,State_of_Alaska.xml
+de7a70a735ebdc462b94252b551593be99376fcb2b620ee900a245ed84e9e616,1,1,State_of_Oregon.xml
+cf6c0866d343514b97918cd62089f4191898d1c7c45d993b807f5d7ce291e172,1,1,Statesman_Journal.xml
+5c9829129baf195a9dbfac286a509c36e0e41bb8adafa18e9162034a65c19904,1,1,StaticWars.com.xml
+47c9f0e41ce3c056edcb0554a27d3a8a648782f976f6710cac42f10b6f7cfe8c,0,1,Steaknshake.com.xml
+8329d69c91eb46f21fb87da7033940a740293719013b549b2a04a465178b9c3c,1,1,Stevens.xml
+fcac83bfdb0b66dbe7ee339ad13cbb3784c2b1e9e6129bb33e9123ef6ec50686,1,0,Stirling.gov.uk.xml
+d808f99ff65f220d3830af04647f691f475ce411d11b80e49c43cef26d1d73db,1,1,Stockton_College.xml
+d64ce19ebfba74d32cafef6a02305b8aa5f95e7b4711d7dc988d46b5e2d217a4,1,1,StoreSecured.com.xml
+2f4835be761a19b7ecc69d772d7c194ac2ef0b064e0fcba4d2889f87334ce6b9,0,1,Storebrand.no.xml
+d5f7875b8bee79dfd4adac71fae7bf9d76c8fa8a64d22c110d2c1dbaf8ce4bcb,1,1,Storenvy.xml
+39c3c86ad9f644fd4fbeffc69a4098826e00813ce35787b1d55e4e02ff2ced30,1,1,Storywrite.xml
+3005bfd332932fb4fc56c276038ed76f182d90313ebcdd6ac02fe83589ade0d1,0,1,Stratum_0.xml
+899003a40e7472561a54bc1dd43e28edcea0121392eccad57d8db3f3d52a40d1,0,1,Stroeerdigitalmedia.xml
+b6d669821c47252e7ca26474737e7a99764a62314908a40b4303024e88e5a3d1,1,1,StrongLoop.com.xml
+b0ac2e6a5978ce833c84f82322e462375f44861de28f391b9fac57c75abf272f,0,1,StrongVPN.xml
+9ce00d1019a493c4f78331cd99076362c4233cc11920477c5e416697a6e7351d,0,1,StudiVZ.xml
+f46f2516e99adca54ddd6e9c756b3236597ebc0c14df0cded8b3aad507b93f76,0,1,SubDownloader.net.xml
+1a0921d175cad22ca99421e5d7b116251aeea7157be570e7beec3db83063f13e,0,1,SubPLY.com.xml
+d92a0a64fa96c98af6b520e133f9becfd9c7b105aca69c8a6b9559ff8b90406c,1,1,Subimage.xml
+55b2ac5b82c27a1407e454f90e7fec8950caeec6fd405bd62db2d8b3187a9e6e,1,1,SuccessFactors.xml
+4353ab81e240d88c9a212ec5ecc87fb3c36fe14968a5fa1bba7d26b117ccd9ab,0,1,Suddeutsche_Zeitung_Tickets.xml
+39ee1d4592c1dccceea5d80aa83500d03685d67985cca30f3c17069ef4b11b41,1,1,Sugester.xml
+7493cc3ffce2c67f7fa42f32e1e2408c84f9ebe3bfec0fd23e8c14b853e22d67,0,1,Sukimashita.xml
+34e524cb36278e49dd7e5a8d0a8deb009549cf988ec992a5a5afeb233d94f9c9,0,1,SunGuard-Higher-Education.xml
+ecca6c75485a2e76cabe9b3c426de37bf3550cf0605ad7a2763fc78292832c3d,1,1,Suntec.net.xml
+715dd9ee76e76e36924367d72de96365fb971aa9249de53407a7f80a91523da0,0,1,Super_Hexagon.com.xml
+24eb0ee48fa0e0e523fd9bd0b40ab944a581fc249f21c1ce876352fa21ac56de,0,1,Super_Lawyers.xml
+bbd4fb2f9b45366a2539533ccf4a4886c69022a7064c641de203f1a81b29d94a,0,1,Superstart.se.xml
+d9954e1099bf2f9157ffffeef5dad30cd7bb4f1295a8b47a49459e8f95a2992f,0,1,Supportion.org.xml
+7111b5e56fc1582bf7303824b586b80f95538d9954ed557d9a72dcfbe12a6ae5,1,0,Surfeasy.com.xml
+c364bfc1cc7f038bee4de11860562a5430e9f6e50f4304292877e5852682f36d,0,1,Surprisingly-Free.xml
+1a101eb73dc1657e33f8e9345675e37e389518d109592e299c8d9e6724cf08c9,0,1,SurveyMonkey.xml
+ba6e4c5379bf8c4de10621f7fe7b3df817d4658f9da9f162855fe903858416f4,0,1,Susy_Radio.com.xml
+0fd5d3870f9c3db62e5c4f6a72c986708fc02dd4f79ab555ba603706055e6f43,0,1,SverigesRadio.se.xml
+e503bd2eff7757f37cd05f11b904e0aa7f674a7897657278f0ee5fd2ff6db491,0,1,SweetsLyrics.com.xml
+3ff6f9659519c614788253eca3db799c20989ae2f87676105f096a6e5152d963,1,0,Swtor.com.xml
+b4a26c51885a323376d80c7fc81bd546a674b360d0d6a4f52c9bd1e775ea295b,0,1,Synacor.xml
+801c20d5ad81a56de838fa123adde660b159ae4af5e590107b911431ab7d366c,1,1,Synergy-FOSS.org.xml
+99e0a5b986eda1bcdc23434210e28403c55ed2605888c303241cd8ef83d912dc,1,0,Synopsys.xml
+9dc087e90745d0ea8953d26f82dbf9047cb610d088d94b9a25bd56e093d31a79,1,1,Systembolaget.se.xml
+1bcde0c8645fb6f4f858c9dae6da9a419f2a187914e0d5ea61cf6094bfca9a6b,0,1,TDRevolution.xml
+1de15a8e66a5c09e6729c20185fb9546d5a977f297659a1ac93f1115aa5f7f2e,1,0,TIBCO.com.xml
+77c7317f7b179d59b8c705df9b7962909ab665b313ef95c0b73763e909a80533,1,0,TPG-Capital.xml
+cbc81abedcaee320114fd5e4176a22df18d4f064aec016a1a5d63427f7b54138,0,1,TSMC.com.xml
+8c34838c49630b9434a0c38e5fb83e5f670a928d200746df255b9de2fbbf50f8,0,1,TUHH.de.xml
+08d6b767eb413eeb84fdf85ac2566e4571855734297213911cba0f44ac0bbb1e,1,0,TVNewsCheck.com.xml
+0b6df260724836c32c32d403eb7c8e3b21ebe80f68e4d1dc17c2ab806e9f226a,0,1,Taboolasyndication.com.xml
+07f333e0409ae4f5f9e2d09d26835d0a47da5bf52c535038344c40b71dbad8b0,0,1,Tahina.priv.at.xml
+3ce7dc41c4bc9b6d2e938d273bc5b661865520ab9d08a051ccf09efb1514c203,1,1,Tal.de.xml
+efab25b7fc246b2cde333d8f051380cd133eb4a7f0166145127a27ca555328c7,1,1,TalentSmart.com.xml
+988512d330564df476c731a89222b3e1b6dc5ad89c41132ea73ab78d27081f3c,1,0,Taleo.net.xml
+9a22153dffdb22ee7d1cdc7a9f9e4e292333b7b081d1707128f53aa397863177,0,1,Talk-Active-mismatches.xml
+0a01fbe6d6acec74d0ccd7aef778e02e8c7ac424d57e8e9d42d9729d56001f6a,0,1,Talkoclock.com.xml
+19f7c72edff92f8dcbb0b5c379aa1c9acff032256393f29b902d4e9c4ed08cc0,0,1,Tallinn-University-of-Technology.xml
+b14da75d358e6ae804086aa49d830c8fd9bcf3c257756297a5d1eb8199788a2c,1,1,Tampa_Bay.com.xml
+1640039109c8c2f9643d9d88c5de2572634fa496aa78cb664ef10ce34d04232f,1,1,Tampa_Bay_Sod.com.xml
+5b323dd6373330fb4fd7171ff18c09225a4ce52614e347489a3b08f58279d305,1,1,Tarasic.com.tw.xml
+0e6ce89f0541412c0ae5576d1962471a403777ef0a83778557ed87af872db0b6,0,1,Target.com.au.xml
+a8687053c02430a7161492d975a61c779c42f21172db6d16edca34d5a32fa4fe,1,1,Target.xml
+cfb76e4e7478c507dc48b61f51bdc71ed2176927fed165af863dfdba2d2dd270,0,1,Tau_Day.com.xml
+2239d41720f1c8fd08f8210ca202d9649e5fc4d4ff215f22be7a2be0108a082a,0,1,Tcodevelopment.com.xml
+d66c1d07ddf8eef1a809b0c40b83815ea832bd0e3b6a6fa99c0af49d71b32e47,1,1,Teachers_Assurance.xml
+686d302ec551ffe043988a5eda96e4bf5973b23ebdaf401c40d0ee46c476964e,0,1,TechOnline.com.xml
+872fa19600d84d669e883f58643d21eaa1aa79fffd73cc63f12eb1deca6de7c9,0,1,TechTarget-mismatches.xml
+c925b7818c3b2f8a2440e999deb5c1f156d488ef1d55d6e0564b77517b74af1c,1,1,TechVerse.xml
+0e34171c067993cc756f58f6073b767435fa61d1241b1fc40b4c531f8ff6bc41,0,1,Technical-University-of-Lisbon-Darkstar.xml
+041058b2cfa30630ce7863b511cac60ad6f12bffb7db7c064158d4463cf2bf40,1,1,Technische_Universitat_Berlin.xml
+fa340bfec44c43f86207ca9f60d2b470bd94c4b4b2eb8886e58fd20688f4eea8,0,1,TelVue.com.xml
+70b6adaf6c9bc160045df08164e8d160004bb31280d0e4b0397dc15581feea08,1,1,Tele-TASK.xml
+6d505dbdf780e9107561308221f5e592f1f457e9621b12ead11663533432d2c7,0,1,Tele2.se.xml
+5ddaeea1faff6f9fd577f7f16afc0186ca3620e153194008d51ab695ee84e55c,0,1,Telefonica-mismatches.xml
+cc4942ad4838d473ab3298a049bff85bdefabb58edd758b987111430c44d669e,0,1,Telegr.am.xml
+795a585b4772b8f4457901c8fcd0be1e27340d6e20d899b4eb7b4f8816688d59,1,0,Telegram.com.xml
+e1fc5bdc13beff7ff34e11b741f3a19c1c0d0d78e820291f2fda05897ac569c0,1,1,Telerik.com.xml
+7a1160cec6b54c012ab881841c30849660bbd7b05a827610c7fa4ef686698eb7,1,0,Telfort.nl.xml
+24d43ee30f2b4a41cff1884988065cf8896acb3272a41a97ec13b5c33e43ac34,1,0,Template_Monster.com.xml
+90d8cb4c77769dae735da60d72e3b84f57a93ab7aa48e7a01fe8c56c6edd7451,1,1,Tengient.xml
+8112be0dc26553e6fbf96b5fc8f649635c92a3c7fc30ebd158d447383797b596,0,1,Teracom-Consulting.xml
+068c6ab7bad10838f3256658455b0c882ee2d2cf27415bf6c64b2843c88011ce,0,1,Terveysportti.fi.xml
+1a0f294d147c61084bca26e4d51d13c0f5abe9ae3065b7940718a9a07c9e1b01,1,1,Tesco.com-falsemixed.xml
+80a2b0d54ed1eabf4ff9c4d5b2d7955a37a11eb7ea64736afefe5df15052f142,0,1,Tesco_Bank.com.xml
+0bdd9de6f132176da1797d3ef1d413079dd56859ceb2941d363e9b312ac79103,1,1,Texaco.com.xml
+0cab264afca5779881276b98ce5a5d0adb580cea04d2edc9a00023371a45eaec,0,1,Texas-Instruments.xml
+7852e498386c57ca064423bd91ac2c061cdc69b0d5220b4475cebc0220ee7052,1,1,Texas_A_and_M_University.xml
+501cf24c20b5944e72cdf9ca2922847f3b93a3690cc5a7e5e01be7bd0439f228,1,0,The-Art-Institutes.xml
+773a5b373f466ee72a5c552e6100c3a2a76dcd52853a8fc8aac33f9e03292629,1,1,The-Business-Journals.xml
+f1585d8c49cb634f499a564a2d05e17de79d20e60239838ef2908a0af3e96af4,0,1,The-Event-Diva.xml
+80d1ae41a278db7b4ff0ebc18f7767ff62bb0889bcd3b36f25d20e6adeb2bb24,1,1,The-Great-Courses.xml
+1d80b3f9223fc97c7ac1831cc522b5612049fd50584cc274563a3bdbeb1fd9a5,0,1,The-Lean-Startup.xml
+78316b9c51671aef4a4627a944b7214c571f32b32ccdc03f14972a435820553d,1,0,The-Next-Web.xml
+4c2b9a510b95f4dd85d039e37f92106befbc4313769107941058c4e0172e018a,0,1,The-Vault-Bar.xml
+9b57af0e82c0bb2e67e245c66dad276b711ac193b4e2de95c104d72b380bdd8c,0,1,TheBookPeople.xml
+fb9227ecb093d793a458ff52bfe79a76b3d8005f50dd173bbba33792b780aa16,1,1,TheHut.com.xml
+e3637d3a583d10b55e00af82ce877ace90d2723cb82aa3a9a17df8dc2c0582c5,0,1,ThePirateBay.xml
+398707f5013376b20a3ea329e82ee6e7a476ab7f07f00dc79456c805f0237858,1,0,TheResumator.com.xml
+eef2e6549dad53d5a1b299bac1fca6444fd7760c83753854193c64ecbb342d2f,0,1,The_Bureau_Investigates.com-falsemixed.xml
+9cfc917aed6ae985c5ba1ae46ae05f69bfe557915de4b3fd6464e635aedf118d,1,1,The_Bureau_Investigates.com.xml
+739e66b04c9a5af038011293d8007d404e72821820a1e79f3663a68b7cbffdb0,0,1,The_Center_for_Rights.org.xml
+ac7281798c66f642d911a05d2d0e2f01f254451e85a20f45a63816cc59ee9c97,1,1,The_Daily_Beast.xml
+11319e7025f205267ab92752cf95740a51b58cb9ae6b392d46fba9fc6cf448a8,1,1,The_Drom.com.xml
+6e6dc2a6166f6dcea7828592d5dd1e9c3ac319b0f83f20b90ee01e8cf921cf23,1,0,The_Gazette.xml
+cb6933673ccc5114fd706e250a9198c8581ebffd405f0fe839537110e03d43ff,1,1,The_Grommet.com.xml
+d3cad14d26c563280c4e79db4b0cf3861e3f31b33ca0eeaa23247d90c54d1599,0,1,The_Information.com.xml
+93302fad4ac7439faaeede5bf618c16d5f4b566da61c55fa8333a0a7230f9e27,0,1,The_Next_Web-problematic.xml
+b1cdc01ef33fd2f12c0e05959597fc420da308b364e03ab877ce6d85ca9678cc,1,1,The_Stranger.com.xml
+8c22882ab50988affb25c043bedf30891600e9b01147c502f680981cf767ea39,0,1,The_Theme_Foundry.com.xml
+192c7a558c80f5de13deb92fb4e194cf46e435a55413f27016131a33259fc2ca,0,1,The_Work_Dept.com.xml
+3b89f9f5c32b514122d49ceab4814e47ef0c97aaa9aff40b468aa9387ab4b672,0,1,Thingsquare.xml
+326ede1e13d0a578ad89ace621366155e7f89f408b79ac44b06649be18ad6393,0,1,ThirdPresence.com.xml
+90c675ebf5b3bafe827e2c5d8c63e5b6d2ce67964f4275c74caeef2b879355dc,1,0,Thumbshots.xml
+5c7384430e2a8498ee7650c8045cb2ced1f24318f6fafb4aa5795efd075615e4,1,1,Ticketnet.fr.xml
+df293463db93d5dc463389a7df8fa0780fbce66adf464f1c1a0c60b428469662,0,1,Ticketportal.sk.xml
+62bb7b01e3201ee67e66039114e8c24171c75ad40137c91f5a18e1d28cc72292,1,0,Tictail.com.xml
+298330bca9f99c55c045c6aaacc513f9435fd9b0080ffed0e11618cf2fb8325f,0,1,Tid.al.xml
+196e8b886586ee852fe896324643157d3c48009254fa4351eebad927a6985160,0,1,Timbro.se.xml
+a3bc46589d19e9d694f9bea35551cc18428ce2f98841482a332c2312dd67470a,0,1,TimesofMoney.xml
+9db7d3bda86ebaf938f4cfa084d270d03c123066e59f8572763f02fb7030322a,0,1,Tinder_Foundation.org.xml
+380b22a2edf379e5c07fd2ad78a08eec59587685ed3d0af1462e9dba0bb8bbb5,1,1,Tinkerforge.com.xml
+b7175de4d05adab926380c808c500136163bf0c5a254404e8ff21ff0c820168a,1,1,TinyChat.xml
+2924ac1a948e6361c2623f35a730c8a7bd6b6192a0cc3867cf2e653d654a34cd,1,0,Tjoos.xml
+1531eaa1067b3d3963d8e50104e17514d3379f4dd0c56b01ab934a74c7f57f41,1,1,Tlsfun.de.xml
+5c1a30c2008fc80c0aefdcc559777cdccdaca7d8f3c4c95e5e2d0e238c8a56b2,0,1,To_BTR.com.xml
+736eeb9e5e84ba51627e18d1fc4772582f48cae72c1f1869902e98c8c66808dc,1,1,Toad_Fly.xml
+e092dbaae7609c030309c6b4fa8e509833fa522fa39660e7e1ec1fabaeac8dfc,1,1,Toga_Hotels.xml
+b52667e2e9eba427ac0aa836b4742dcd8b393dc3c84a9c6a33295d44f521943b,0,1,Tokyotosho.xml
+06292948f6ffaada00246a0c636a0518391fbb988861bdfad633af27925787d8,0,1,Tompkins-CortlandCC.xml
+49e3cd62a362f46bf5ec9f889455c88efb9f9d5f854a96c476ce86f258e1022e,1,1,TonerGiant.xml
+22be09653a0cfacd2ab9fc4ba5cc359eb30e5232e0e67023221953ea2b4b30ae,1,1,TopOption.com.xml
+b75b3fb34aa93de7753e90173373e56eb02eaa3df6ca46adfc97e08b035accb5,1,1,TorreyCommerce.xml
+1ea0854c281793e41aeb16fb2951eb5c24d10a497311613b489e45271b4f4f4d,0,1,Torus_Knot.com.xml
+53edb1f24b82e87bfe6dbf9725ea58c151d56d01c93b6ccf402238ddf6dcdc6f,1,1,Toshiba.co.jp.xml
+9925bba044436e099ef9a17c05c3a9dd980c74652aeb939ac34c94ea63b7df57,1,1,Total_Choice_Hosting.xml
+564de255a2fe5b5ef4255de2e2dff1bae6284b29469b7c17d00380d21b9289be,0,1,Totse2.xml
+24758ddd0781ba99a1a9a29e03011c29687c1b5f67dd207daa8d811ea75a4615,1,1,TownNews.com.xml
+7259305af6c4290ae46de7c834ca0762784aab4962d66ab98641d750a83ed803,0,1,TracFone.com.xml
+eb283cec83d4235adac15a53986ce71e8770d0cde0f91ba7279e6b6cb5fab379,1,1,Trackalyzer.xml
+ab5cc8a1755685297bc40b4037f1277d7482417e04e5c520deed1d12e353c4d4,1,1,TrackingPoint.xml
+721009e195644d5540c59a6f42ab2716e35722aabfd718b4dbf487a5f52601c0,0,1,TradeKing.com.xml
+3f6e8ab2b5f0ed70138432ba3f0bfb91451404f1d1c361fcc625d070e4ac4f9b,0,1,Tradelab-problematic.xml
+8ce8022cf79d4e12ff69b3bd4ad3d9cefc94a750bc774c6666dccd1ef6ae7975,1,1,Trademarkia.com.xml
+33fe34b8b34cfe39278bbf256306a09c27ae0943883a0a037b6fe9dd92121893,0,1,Transact_Auto.xml
+8e3bf949537422735fb6201093ec7a14842e44819fa0740fe1fa626eaa61df0f,0,1,Transformationmadeeasy.com.xml
+00dd816c4f9e0a041f07ebf13af88e9eaa4c7c44adc9df183c7807a249bbd35e,0,1,Transformative_Works.org-problematic.xml
+9130f100904f6c25762b32d755c566fe6aa588b19feb0defa4d3473687abbc06,0,1,Transifex.net.xml
+bb06dd6b10f827e1ac23da17549badf7f17b97300d993618cc2e608e66328a1b,0,1,Transportstyrelsen.se.xml
+86a98debc03d6f499891066d33f90a70bd855eacfbbd4d0c90f9a42e2a911b54,1,0,TravelBlog.xml
+7740589641805a971f42b11b01a902297d1a6aac93f7f1ac546422fed26e739e,1,1,Tremor_Video.com.xml
+bfb604fae38480027943a3037882c5528b368486efcdcff8ffb0f9ecb7cb42d0,1,0,TrialPay.xml
+92ab3b2599243d5061be0b6ed2314323d516a7428db0b9d626c9d72ad81472fc,1,0,Tribune.xml
+a3906adccfc4301efbc4cea0a097d22264fa09498b92e9ab18dbe4deb4f9e3e6,0,1,Trinity_Home.org.xml
+2438a19009f61439104d77dce8c63f118c538313647589307aa3496d977ceeb4,1,0,TripAdvisor.xml
+9d1f2028d622611c85867fdb9cce067898baf1b0c8b1cdf76382a435006dee85,1,1,Tripbod.com.xml
+de005b963aa64c38345c6e74999e37867e4acf480ba1ca78a9817391e645eeaa,1,0,Tripodo.de.xml
+583fe8b250539316209b382249de834765d3336b789e278a0290906946a33230,0,1,Troopers.de.xml
+9f13abc038bc4708796c8149ab7a1ed9a3ad9ad1de438b1ee50addeabf4b1645,1,0,TrueLife.com.xml
+cc353d51b4fa9b6eb6e627384ca618e2739233019f262bed49a4e88829a5b8e7,0,1,TrueVault.com.xml
+d068f81127f1484bb4b0c190d455ee641f01a8fddbb6d3303992cc6e6b5339e3,1,1,Trusted_Reviews.xml
+49cbf04c22069b4867cf2dc0c8045ffe051ec0d58d4d1999fc2fc97d1074cd9b,1,1,Tufts.edu.xml
+de7344c2c6d972a368180b62f10774c317ddc037946309fae83d650d4ff4a538,0,1,Tufts_Giving.org.xml
+ed6c9a0705f39a6116bb5846e82ff40a083eb3ce58530524fa2c53c34fa73b2b,0,1,Tufts_Medical_Center.org.xml
+62a29c0411070865d40935c23e4b49d617647b4a7996250d5a97409a69ec3107,1,0,Tugg.com.xml
+5f6902d3fa2b7788a4027df3ebeb27e3970287829ea006dcfe0274ff4b8c557f,1,0,TurboSquid.xml
+bf1654baf8cb84aae5a32734e7779a06756a2e29cf28d765759e21ee1c5675c8,1,0,TutsPlus.com.xml
+910dc09ec17c26a12b275fe2d1282e94a82fbf0163282fe5a5ac496ff9ecbe3a,0,1,Tv-Release.xml
+b35b35365733082ecebdf86f03de9cd93bd738bd52a0239bb07d4507ad792b5d,0,1,Twilight-Laboratories.xml
+deae2b1c6be69bae7b6ec4895e585099a2f5374b53776ed4f075d45f4c1cfa6c,1,1,Typepad.xml
+1da05f6062123d8b368d700a96b0fbb2dc7baa69f14ba72716e3c937a49fdbe7,0,1,Typesafe.com.xml
+9d3134a5ead87b0c73882c2fb945b4ab92ca869e86ea2d8e5b93fe8529eb22df,1,0,Typography.com.xml
+7a670737c4553654c86e065057ee25d27b90472c143fecc08410c0014d408b79,0,1,U-Tokyo.ac.jp-problematic.xml
+ac05de6e9b0cf70e70cd6217887eeae3bb4ccc15153f931d34342766fa116bbe,0,1,U-Tokyo.ac.jp.xml
+d135385bdce6daba2dfa309bc31c7c871832ebfaff81f2c70d4e6fb4bc5e3081,0,1,UA.edu-problematic.xml
+a7fed2aaf25d78080b3ec0d40308a403283fecde51eb4a85208fce48ccefa882,1,1,UA.edu.xml
+27e5f54b8a4bf41f5fa918be6f7d9c4b78d52704aa6b1f7391d75f566760a76b,0,1,UCAR.edu.xml
+49c96678bc86a99b01c12892885c4fcf38f81dd5ff32f582af605567f64fd5b8,1,1,UCLA.edu.xml
+995aa7cdbe60994801ee5330b1ed5f89e56b12fa300fdd71deacc89cb1e21d51,1,1,UCM.es.xml
+080fc622ff8332704b958560b9d0d692594c26964918c2bf3c496602568e761b,1,1,UCalgary.ca.xml
+ea8f9bf69a5d5029ab1c217760e6e27c3b5a4e9672ace704a2f9f7d8332bb497,1,1,UD_Media.de.xml
+609b7137afc6337f00bbaf79031480a007ca9f78079a6f2e4a81e1bca8173090,1,1,UFies.org.xml
+dea8b7526b42b85e25f40701a5b312661473a090bee7bebb61f49ee99a3ee654,0,1,UK-Web-Solutions-Direct.xml
+1c2718eddf3aad2784493ace750680876d5388690df4bc5bb12461bdd2e2b867,0,1,UKLINUX.xml
+96961aa668492fd95b7a45e568a5388a77a045d1a965504e3f4c5cac64f72426,1,1,UK_online_centres.com.xml
+1ee8e426a02b2815dd6a3bacc4e8634e75b799bb770257db43e675ae1bfb1aea,1,1,UOregon.xml
+907266beed4a1d669f500978ddd09c3766b1680e654181dad0525c38e5cbea78,0,1,URLParser.com.xml
+4346e6ad0202aa001cf66c5efaf1326a85c87d9bd396cd1a4c80eac520510db8,0,1,US-military.xml
+7b056903a4f7fcdc8d3d1ed3a57395ada26cfa168d1a9e54829caa29df18a670,1,1,USB.org.xml
+e8405ab7de7e35328c149fde0221a4b584545b98daf10f5cfb5f971a53459403,0,1,USENIX.xml
+e4586a7c8a445349c9c401dfa92b39442b9f192a4b41ef5282bc0021a82e3483,1,0,USF_CA.edu.xml
+8c8a8154bc356f1026c6e659f9ba7a03ed3f31e50db20467d006bddc01827de1,1,1,USFreeads.xml
+37eb6c467058dd4c92fc635e6daa2c37fa7ef6c2d7c24996fafbde8fe43071e6,0,1,USNI.org-problematic.xml
+676d7b6466eddd7c4b84147c9035810f041067ca01a8014b6213dbc78b23b864,1,1,USNI.org.xml
+440f3a2d9cd10cac52a1f6f4b1772df23314784496ca885e1036f6e4c319f48f,1,0,US_Nautic.xml
+7eb29ac9b32f64670a1383ddf5af47ab5c0a520778a95a691f1c0aafcc629eb9,1,0,US_Patent_and_Trademark_Office.xml
+5729da227cb793cab2e8d6e8ae8959f7fe9331a3232249de3150f8dcc9da657e,1,0,UTSanDiego.com.xml
+977266102db9309a7d4170b34745445bc2847c67f8193af518c396ccd96eba71,0,1,UT_Dallas.edu-problematic.xml
+ff2aed5082fa7812f6c0249393b7ef2d75b9b97fff27ee0f75315c7a458a7adb,1,1,UTwente.nl.xml
+356a280f3948c07b7b730b87675e84c63439e43696f295a63f1a89e2ed5aa44b,1,0,UVic.ca.xml
+0c8e6b3534cb476f07b87f282cef2ac6b42a3faed84185a85603d04c6631ff8e,1,1,UWinnipeg.ca.xml
+db0b22a14e4f5c66f02f963504cdcaa35e78ed7f39f42e209b3e0a9b9ba1a593,1,1,Uberspace.xml
+83ef1c74e728e31f46d7c92a9987fb03960c81e1056291d01b6f4cd57f9367fe,1,1,Uhhospitals.org.xml
+254e23a8560db790d5da875d282c4364d6b9004388e55cfb8448ebc4fa3aef8d,0,1,Ukr.net.xml
+dae919c3f6ca4e00376c16f03704d0da1b907a19cf963af16a00b2a813c96c38,1,1,Uline.com.xml
+1fb81f92216ff932aa6f19d86d881e1787d534499a3de722e4422a269e346e35,1,0,Umbel.com.xml
+abde55d39d54436f83a19a822428de73e001bc42b5bf7a6846ecf331b8786696,0,1,Underwear_Expert.xml
+bd135ffdb815d31e79e5509bda7a2a677a86628cc655ca65c214de1b20bb4627,1,1,Uni-Kl.de-falsemixed.xml
+dacf0d738a537ef348d793f0cae29cb8a6767c63e4d352034c73b1ad503936dc,1,1,Uni-Kl.de.xml
+30d8208caf67565a05fffc16600350660f0a51f6d95f84a040b00a9dfbf35370,1,0,Uni-Saarland.de.xml
+bf4cfa2104d71e0ec0e3e930c0d1e9129a08bce034bb8eeaab0d7d12fa1d52e3,1,1,Unimi.it.xml
+a937024d9043a23d94d3d72c6882f07b3961be52ee04344cc3c63f26056138f4,0,1,Unique-Filer.xml
+1293236f4ba0c9ee7f91d8c5818ce140add73b0a4b3bf5b0905e02e8064b3e3b,0,1,Unisys.com.xml
+57f029555c472032caeea71fd0eb7cf643449d1dfbbff331875b4f10222ec2f9,1,0,United-States-Department-of-Energy.xml
+44cc911a17c526d1a8c74161d9d8a8104bd9e4fc2a2626d35a85739c0b7b880c,0,1,UnitedDomains.xml
+c765a715e75a8238ab6e70d332c7f4a2e714adf1164caf136b66b5f6e754e2a4,1,1,United_Republic.xml
+2f42e894be064592af7da170cd603d831acf2d10b0ed05d618b606f1cda08c80,0,1,Univ-Brest.fr.xml
+eac00803dc242cd3e843b8c8af41a0124c77d59a1287ac6a729d4716ec540585,0,1,University-of-Bern-expired.xml
+930135e45407a24b1740c05dc8bbdc963991d4da2ec3acc022b3987bdd097fba,0,1,University-of-California-mismatches.xml
+8c7c2ced844de3b70117b7f7c122c869a969beb3b271c7d5e2090bc1c531079e,1,1,University-of-California.xml
+7fd3d874bc7fcbe51137ef2294ddd5be26f4263b66effb0be5d36e80f947ad79,1,0,University-of-Colorado-at-Boulder.xml
+f89bc86351a2ada00395b41e4b0da61afc5fc5173d7bde7ffff24f463818b909,1,1,University-of-Delaware.xml
+a51b15e6ba94249ba53093ba41ced19ef790ba037bd92e71576e8a8398db2a22,0,1,University-of-Florida-expired.xml
+2f5ac83c903640138b112d1d93ebcb07fdeb3ec4accedd5713575aacee7cb0b5,1,0,University-of-Groningen.xml
+91de4dbc5f2a243b953901c0fa838f4f6887c7710d744e80cae9457e8ef0d115,1,0,University-of-Helsinki.xml
+1d9da1c02f10316311989f868fb5a6a1aadd7e986a2e9eed25b4d061627c492b,1,1,University-of-Hertfordshire.xml
+fb45af1fb5699cab6007d287aa55ed1977fc6ed96e508ed1b9fdb424662d90cb,0,1,University-of-Kansas.xml
+963d8f6c9de69041ea1358f02dab0a26d8da98bb414d1a8d23eeb1dfe16ed004,0,1,University-of-Manitoba.xml
+96dd94cc310e936db76b39b334266d0d30a1679ddd1454f8a839edd3a74c701a,0,1,University-of-Minho-mismatches.xml
+c2f53734fbb96b512f068f719a8a3ef75bfd817273ee5b6f47ad97d34e28ac19,1,1,University-of-North-Texas.xml
+631131e5eb30ce8652a864956ccb34accba494d9848e5cab91ab8a64d054ba45,1,0,University-of-Pennsylvania.xml
+0ab02841a6ead3924af19e98e079cc70a542e0c5c2b22a652846babbc9126383,1,1,University-of-Strasbourg.xml
+71d54122dedd8ad1d74e9ef5180aedf5e6cb470fc77ea84f6b5a61f095665b44,1,1,University-of-Texas-Southwestern-Medical-Center.xml
+f9eb2c0b78dce339b2999b544ae922ba97cc5144da81cc56e2e0f9e746cd8e01,1,1,University-of-Texas-at-Austin.xml
+7b3bd50f223a278de2b4e84cff987ba5ea36aa9a3b3df1d4d97fafaa20791049,1,0,University-of-Virginia.xml
+ed415b19e0e0588a60d6dc04924c1d9e38d3ef0b5f99cf749235132684e9092c,1,1,University_of_Arizona.xml
+e7685c1277c2f651539b00195e143bc7fc60979f5eb7f7c293e1caf9d4e58eec,1,1,University_of_Bath.xml
+63aaa16ef17c9cbf4781fbe89e5072b7f26e6baef4407383f2b715f68422c100,1,0,University_of_Cincinatti.xml
+bd8a650134717d6663fbacda4e3d6566448a7d8559997bc4250cde0b97c37d95,0,1,University_of_Derby-problematic.xml
+1268c589e9541f96345a70e088f7de08a8bfb822b6bea715218f5d06705c35d5,0,1,University_of_Grenada.xml
+6642506b348a157b2fc8b05fec0c40a6c21de1b6f82fdef38eaa1a4e79eb2588,1,1,University_of_Iowa.xml
+3fb888e05ab2904735bac34b2a01c4f80092692bc035c4198dd12055f53cb817,1,1,University_of_Louisville.xml
+ce6883479c26297a48c2cdea26cb8c3c73fd972b03dffa98ae58bd65bd63f221,1,1,University_of_Maine.xml
+7348f47d6e380a9db30b1db471ad9789f8626873de30027ddc17de72d022fb11,0,1,University_of_Maine_System-problematic.xml
+bffcbe68aafccead956b6c6632afd2de03feeb9c08d6b468ddca372bb77abe38,1,1,University_of_Maine_System.xml
+e1515eab7c49ca3ee3c60e48cd94dce063981c37da4ae5b5b5f70229365249db,1,1,University_of_Manchester.xml
+1fb1f0084da48e4529081b175449d4f1538dd7414e453c9d01ea3c70ef0aa662,1,1,University_of_North_Carolina_at_Greensboro.xml
+e53026669dbd17f842a6d23486aa11dbc6e30295e682e5120f8d579007b6d7ec,1,1,University_of_Passau.xml
+261b66202486f2496e38b246af0d33207bd6cc84831026e840ad13abf364b9b5,0,1,University_of_Rostock.xml
+a8c9e1461af5df7c9c40941920372e0bc35028e41dd7d8a00d9a1d927bbd9ebe,0,1,University_of_Salford.xml
+bd8ac3d00a5c2dad7c95051d88787288e4da87f7060a07667fd02ad3e657f482,0,1,University_of_Toronto-problematic.xml
+322408b567a94f9851873cc21f1a44703dc8c15136d9d50f383797a4f1909d27,1,1,University_of_Toronto.xml
+7700fdecad6ee5f90f9a7c20864cedff85fe76ae2fc41752f1fb1c7d3d7a876a,0,1,University_of_Tuebingen-problematic.xml
+a0b9cee829cb6f80e1019c93d840453ab45963bcf91037932c7b08efc680c549,1,0,University_of_Waikato.xml
+b3f88f94bde324c4229ee0cb6b41471a5ab30115bc84e145ee94e5e80edb9d46,1,0,University_of_Warwick.xml
+7fb37f17b8488e80198cde05724e9d3d6da3607d8aa6be2f81a8a7156d28d65d,1,0,Univie.ac.at.xml
+04f4e0a5aa2958d5f9d095cc0148d118aeede6fe8b452d0ce04deb2d05b6ac38,1,0,Unix4lyfe.org.xml
+576febcb2526052cf69c26013f26d075d466d8c57ac8e34d5aa5c60a74f3d1b5,1,0,Up0.net.xml
+82d9a9e33fdc00692b3f32910877b27fce81ce6acc6b01ae16e21dd70a29af12,1,1,UrbanTerror.info.xml
+0459389c2f8fa05a34ad3dc433d7cd0581dd707c79e49429d5ac0aa437f2e7e4,1,1,Us_Magazine.com.xml
+647434d2e73a8e2487a70f4119136be4b5b89886e76e40454907674bddd27130,1,1,Usenet.nl.xml
+37253ac964c42bb2b910621759ce273f910ae0f63f7497db27d5c900555d2a54,0,1,User-agents.org.xml
+624acce46170f956a165171c63c53ceed4292bc051035065d8f5c5b803cbd96d,1,0,UserEcho.com.xml
+572e6c6c3fe2566a715dec30b294a7f34c2e2a9d54a5102f280d5e7b640288c3,1,1,User_Local.xml
+737b235408a8cec2956ac513e3fb5555052b8998d8d48a1ffa90f230bcee8e64,0,1,Utica.xml
+ca9050e78347c6536655c413199565617815b1041ffd409a5a7b80c35a34e6a4,1,1,UvA.nl.xml
+99a979f836e3af45cbded60128ef9c83ca449dcd3ac13695cd75390c1748877a,1,1,UvCDN.com.xml
+afba8b9c6e64ef1168b1715b57188e6c89cc6c9e1873a0b30736c7d46830d4f1,1,1,V3.co.uk.xml
+194a500967109f3650e5c9ba755773ad1cee13caaa0cbefef550290d22cfac10,1,1,VBSEO.xml
+1281de78bff0eacf94857ee21a0721fbd26d8cb2f0faa190c9a5a2d813d3c29e,1,1,VCE.com.xml
+02f195e0534b84f901ed70ae7a9d857a25a6b97dc1c97dd159131c9caa8298c7,1,0,VG-WORT.xml
+248224aa6eae82843e074512ebf52e4bb7134b14410768fdfff5cfc3c684e52e,0,1,VIPserv.org.xml
+f83f5c1c242a7f0c265585689c1c625d357346762617ed2b19a96d108a4dc1c1,1,1,VSCo.co.xml
+51ab02160086d1d0ea7a8f03e7d7f2e1fbfca841b48c29c23a1f956547ddbd0e,0,1,Vantiv.com.xml
+86dac465019aa272c1d7231c6db0e96c17a64e805265e25cb7b4690236103e51,1,0,Vara.nl.xml
+4bcf9831e9ead34160a0f5081787288097fc34a7731e5079d485783f9a2b806d,0,1,Vayabe.com.xml
+4c9ec656775f15d9d294e51708d89c998cc0747d426effffdab33b2cf18cd442,0,1,Ve_Interactive.xml
+25f9fb9ad931eb2633dbf62a790dbef671003bedf05ce0c67a776b430eff60e3,1,1,VehBidz.xml
+28e082d445b8d7a2958d5302733cad7fcbf9f471cb6e8a3ee3a218cfe945add0,1,0,Velaro.xml
+03142920bcbd18f915c755c8a6feb9026a44156731240b30534a05b95fa051c5,0,1,Venuscafem.com.xml
+e12b6d5c3eb3e1115119c50070ef4410f6a1e1bc3dbfc9791bb77cb6d82fc52f,1,1,Verio.xml
+10eaee1c4dfe5667a67587aed27addad4dc47b3433137ba1a04e50087e367b2c,1,0,Verivox.xml
+2789e066bf6ff7755a8656f6d0a5d14fb16a35b40b59a9ce5502398b87ca32d1,1,0,Verizon-Wireless.xml
+eecd0f86d3976af4bc45b163839875219eae631d4620da357e43ff7e62f9a8bf,0,1,Verkkouutiset.fi.xml
+cc4ff6781b3b651943c483800500389937ea92a16b00110f6d5c9f45c44ae100,1,0,Versus-Technologies.xml
+0b2034c782d1f7de7c5c6e8416834dd312d437a0aa984e67fb21399667ebdee8,1,1,Vertical_Response.com.xml
+e99551855f8ef5ad0f4f728e46fb5a4503349c443b6a065609328d7c06fd1cbc,0,1,Vianet-Group.xml
+99311ff381a3405c395ef2792129e07ae1d9b90ad58d6b4e2f4a08c53358fe66,1,1,Vida_y_Salud.com.xml
+dc3cd4d884d6b0380ea5542f768e901c7a5f33e953ba11f49f3c5ba65844134e,0,1,Vidarholen.net.xml
+b9a96bb1e88431f6f508e49e1d99303ad56fb2e9beae2b798f019de7ad65239b,1,1,Viddler.com.xml
+0a02a181ce944e64fe86ee04f13404247e58d11ea4ecd8dc34767110033fa3d6,0,1,Video_Interchange.xml
+3915ca53eeab6ddd05064ddb9138d88de0e7739f67fdf66a67125b9d5830a20d,1,0,Vienna_University_of_Technology.xml
+6c277f1037e46a2a059a8225c98a2f813e5230cc48477cc5b2a1d345db77eb27,0,1,Vindico.com.xml
+4a290a60e295a9a2875c62b516f4417bc6c889a3a50be878acbe5a4f064769b1,1,0,VirginMobile.xml
+f684638888b331ae7388ef7261ca4558d1cfa293cb6df9c0dc71b4dcbd3ccb98,1,1,VirtualTourist.xml
+dbe019114063e2c60b5b435f84d09fec9eaa2780607cf1e0f36a339e7cfbb414,1,1,VisaHQ.xml
+5e9fc0c2fa0ca21f0859501a1e3745231351c916b9357d7e4d5544a9c3c98314,1,0,VisiStat.com.xml
+67cc534b0e9d0609197c2b306df791155c4fec3d7883bf170e5c972417a94f36,1,1,Vision_Art_Forum.com.xml
+00e3f5a241f93c1e5360b76113469ca7da9b076d49b3a1ddaeda9974935886b9,1,0,VisualWebsiteOptimizer.xml
+795e03ffcc375b164646923c72ea5afbf313792e2fd583095a0292d3e4962925,0,1,Visual_Revenue.xml
+75241e3d48e2578f64e46c1f39f4f412ddc4842f0990303c345b99085c18e16d,1,1,VitalMend.com.xml
+17f1c78d50c87022ca1f5898c00fb9e43c7c14237916d34135694a41f7906c2a,0,1,Vital_Gamers.com.xml
+c6920ad0394ef6eb3d8cd9b9d0a5e7cabbb1105a6112acf5f9bae60e97bbe2bb,0,1,Vivaciti.xml
+d8652363747589e0cc4a5b880150b22dee3297bb2f869e7b29a63460845fa6ed,0,1,Vliegtickets.nl.xml
+636420e195fd3296d6a0fbf1aa2af10402c50fd22d6c5070e95b87aa62784f08,1,1,Voices.com.xml
+dbaabb4bf10ca0694445404fa95fa7cd83ab885d560430dc702cf06bb4413113,0,1,Volatile_Systems.com-problematic.xml
+a0332f0bf80ee5d4c420c7e4dd1cfb3b0c509a510caae1711dfee040206be5c2,0,1,Volotea.com.xml
+ec9397d0213499cbc4dae60b3de338b64aa03aeae205a111d2442b7b88498db0,0,1,Volunteer_Centers_of_Michigan.xml
+e8ab747c2c48c350e01e548b2347aa6d96d2c6f4ffad2547a20af7f69075ff8c,0,1,Vonage.xml
+a117ac9f7b8795646b325f5eb086f08c07fc84618a85fe91af96a9527d964301,1,0,Vox_Media.com.xml
+dc251a155c574082098226745187bf67f565df6e3454c56d1cfeb3849c895b53,1,0,Voxer.xml
+08c7f617fb35b113d467230c0090583584709376901b026e6775840dec8c93bd,1,0,Vsexshop.ru.xml
+c4ba9f0a62d433fb9c96fa59cb49227da94382bfe1a0824c59acb53df7e8cefe,1,1,Vueling.xml
+ad403876ea5fa23b4f671bc9e3bfbcb1874b6333780a98c1a4e1cfc0eb960cec,0,1,Vungle.com-falsemixed.xml
+712e9c11fa537727065fc17317b376dbff0841191976892fbf193cb53956d898,1,1,Vungle.xml
+f1651a48bdaad9f31cc77e80136abe27ffcb9ed903a322fc915815f524c140a4,0,1,WD2go.com.xml
+f4f8368d94081e80d2dddbd1f5e8da02883d0a6656d7d23b17e09df9a234295a,1,1,WDWS.xml
+72a7669b29bef1809261b2b6b98b8398424646be1d1b67b956d1503a3fd03562,1,1,WHMS-FM.xml
+ed22ad03a82abe2247c198290494e6b90c1b93eefa050d66ed0b5e1759fa27db,0,1,WHO.int.xml
+5065006d5171a62cff4f927cbf17959479e9a88d39bb4604dfc31bc0f0265318,0,1,WOW_Analytics.co.uk.xml
+9dd9a5720a1895710d5794a11c762e4fc16b0deeaa43a806962bb6c8c39f7fc5,0,1,WP-Engine.xml
+c5112a2a9d8b7eae6e30545b6ee7e9d0a30f9c087bc7b761451e81d9916fc57a,1,1,WSO2.com.xml
+0601000b056c8d7de6c0cb80720f2ea5f7cab0a1011c94bf864532c51a148bd6,1,0,WSWS.xml
+686d52b9e887359a9fb2a3f6eede8bd81fbbba5a1b3d89935e85c4350883fca0,0,1,Wagner.xml
+27404357c723335a40fff088677c65479e073c10b4998506d2e74387d370b113,1,1,Waitrose.com.xml
+f207fc4292023db15237b03f8f5995f5c9584e455d788dcbcd657f9a07fe934d,1,0,Waitrose_Direct.com.xml
+683d274e1fa8a18fd73448d94c4477050828c653cbf8c5196bf212046bcb6943,0,1,Walder_Wyss.com.xml
+8a08efd9f436918f1558eea82c41cfa715b27a7ebc99c8e49c07542a92132620,1,0,Walgreens.xml
+5ea94d4f904b6afb84767bcf3a34ee6f91013b673284cf424d67eb09216a7b58,0,1,Wandoujia.xml
+490f37f964fb9bd7058bb7e2f52ac06bbd076a10428097654ea263efca37f629,0,1,Warner-Artists.xml
+1e26f33749735e34741aeb8c24b83694092d38f61bd183b7b901cbc4b7aa8385,0,1,Washington-Post-Company-mismatches.xml
+2720b91d15f91e446cc3db1e764a500531fa358673a978d012fe96f766757951,1,1,Water-Challenge.com.xml
+71bd62a4e628d4b7c81a282740fbd4a583cb768f21d7d78a815308bba9ec6c03,1,0,Water.org.xml
+345b6b2fae63c61a265a9f34a768f81133caa068af17f61b0a82066f02da1777,0,1,Watsi.org.xml
+1a1e4cb2d91932e0f0cffd605685ef4832d6799eff8507dd97541f2002001df2,0,1,Watson_Institute.org.xml
+52d9cdba31649b9d41912d38370925a9e4c794f6728f436279628fa9246facf6,0,1,Wazapp.xml
+0b818b88c798284cf79298c509cb9c22b7bfbbb1a9a2f8168214c272781633f2,1,1,Weather_Decision_Technologies.xml
+cb4cfbf5a7dd4dbee227dbe806a6b44b7cb7939a5f41c45e5fbacd7cbdfe5117,1,0,Weatherzone.xml
+af5d3235f7f19281f16e236425ecf793d15ae89d5278a12f02a3135bd93f338a,1,0,Web-servers.com.au.xml
+9bee3822b846148f1ab13645d332e7d528edba99136159c599f6c91c077caa78,0,1,Web.com-expired.xml
+af9750e35db542ad03022e8ae5b73065aef4db2aa1a6282597a86180aa3276d4,1,1,Web4U.xml
+7d614409e9e5c1a7376193e7aeb5950c05b532cfcbe43798148117dd94d4c5d0,0,1,WebFaction.xml
+72226cda0dc9050fa7c87ac0b8f99ffec01dc23f4a661d9bfa7c5193701be267,0,1,WebKite.com.xml
+08e726c154569add23e4cb12e8cd8a50626356f91f2a314e5ea30b1f740db4a1,1,1,WebProspector.xml
+fdcb633ebadb7b41aea3f5de3d3b0953dda6fb82a6a8dad164b026e93481d39f,1,1,WebShopRevolution.com.xml
+0b8acf849766096236f7876cf987e5da402f504ffa1eac70d416b07406b3fde8,1,1,WebSocial.ly.xml
+d85201be8c2aa6a431cc5b414d7d51d61497ede18d3fbd1dac4c2da2321be983,1,0,Web_Hosting_Pad.xml
+8e1b8e2644fbc5ea473acc74abe12256d8d73f48272ea58a092eedbb55c64e21,0,1,WebhostOne.xml
+5476efa330deb653c29a6a507a11c146301f583daad0a8346c880b96673b27af,1,1,Webmagazin.de.xml
+0163c1d1541570a0fb9502e3bace76baff044e8ccfade9fdd4a32a469d6cbf7b,1,0,Webroot.com.xml
+dbcc578640c655bb0c695ed4716f13a9fe86cc90b044caff1a3ea7ed0dd7dbbf,0,1,Webropolsurveys.com.xml
+2a440880c552f3116b2f466d4e831d12c295b8cd8defcb4a42e56324cc839936,1,1,Webshopapp.com.xml
+118ee8f7c8e74a35296fd66559a67800ac3e8bea5aba895b70813741955b5204,0,1,Webspace4All.xml
+bc4f58da915f1ffe725f80933f85e072c95b43b0841c879e0db9fc2e3773c4eb,1,1,Webspace4Clans.de.xml
+e1db152bba8aafd77e0943f58ad90ac2f8f8434c46db0f875ce8b67e70509180,1,0,WebtraffIQ.com.xml
+3b00d11eb23e281b78d953139aa17e5cda9e6e581be328d2f477795bbd85582c,0,1,Webtranslateit.xml
+cbbbdc6fb132f2cce52e3bd5d7010ac0c6c59a5c8e1f002542b76530aa712ba6,0,1,Wego_Health.com-problematic.xml
+8edb6acdbf3d70453a1082ad9cbb2b3301dd7a4a0e8aeb391fe10aaee498545e,1,1,Weizmann-Institute-of-Science.xml
+5521b2ce5f7e898bd3ea0d41fdf92bdc76c7af51509e957e7a588c6b8caafb06,0,1,Welk.sc.xml
+14de83ba384dd63e8dd89f465424d81fc6bfe8f69962f348a5d456aa9d713e8a,0,1,West_Orange_History.xml
+4ae3197a0f427caf0222250d811f751f5020e591719b63f3bc5e3e385af14c57,0,1,Westlotto.xml
+ae329e6dccdf72e9be85e53412a7f7a5a53fd44ae853a3e77a20bfeb506b7ea8,1,0,Westoxon.gov.uk.xml
+a8ee7b73785bf6447ac322a7af90fba115d2e75bd6a0ef6e7a90e387727b3035,0,1,Whamcat.xml
+6752c99fd0b439b67c13d1ee1063aad8dcf1eeab6e963e406d5a7d6f60af26ab,0,1,Whatbox.ca.xml
+d7537f7e21858dae64562a4f7e64eb14ad7608c4cd25e133a867f51bfd3a0ac9,1,1,Which.xml
+29211dc5f2d57c9bc61b7b06716d49200976da7aa5bdd47278557c373dce7f6b,1,1,White_Hot_Hair.co.uk.xml
+f5fa1d6e12185fb0d704ada571dcea48bc08869fa2164ecdc5f5ab846888d88c,1,0,Whole_Earth_Lectronic_Link.xml
+ce809b7bfb8a875feace606a959feb0c461732114e07338c99e258968c591b4a,1,1,Wholesale_Labels.com.xml
+230a483aa987f21dbc5a05091cf8551abc09c10b1c540ca8413061dd68578719,0,1,WhosOn.com.xml
+10f17a912f9e030ca1c9c9348ca6335939d638f0e14331165def15e6b14bea48,1,0,Wiggle.xml
+eed9dabd0f3c94d3672ef8638a276da0ef70bdd31c3a170075a161984f711e7a,1,0,Wikispooks.xml
+abacb82abb4afdf07777ea5f54f6ed6bc53e344a39d61dd7c2223eb41a00d636,1,1,Wiley.xml
+28d055e416728d3e566d13dda33e65237ecf5f262d2c6c62c4a59ee11ff83a57,0,1,Willamette_Week.xml
+2a13f6f7f6baa4dfa85c46ddb205c5b4dd5c9f20b736d016668dcc4c9caa7414,1,1,Windows_Secrets.com.xml
+a02a9ba57f217affd4ac0d4c5f2e5173a605af78d0bc5cb8d2e0e62e9b3ea26c,1,1,Windstream_Communications.xml
+32f6f0cc30b35c8976e18ca4ddcce03605753a93b528a5c2a1ca2d30a472d5b3,0,1,Wingolog.org.xml
+3f710d3b7e4222e65768e846825a278130b3648d785354f2cd900cf8aa4c3909,1,0,Winner.com.xml
+0c730c529f3cd69f7b467d504ff460ca46301660b1dcdd88ba8300d4ab7f1d6e,1,0,Withknown.com.xml
+e22b3d745136b4a31c7b3f3a8f65c77a8721c1afe5e2729c6cf848fa07ff8687,1,0,Wolrdssl.net.xml
+c0db25ec810ba107b136de619afd22b9a0ce8d5019e08be5247501fa7d3cedca,1,1,Womens_Health_Specialists.xml
+69427086023cb8659815526a6188f67b519e979df97998a8ef78e590491da187,1,0,WooConf.com.xml
+072d4bc8ac964f1db9fc4b3d1113dbe48d854b975c89839f3d5395226fee2b33,1,1,Woobox.com.xml
+9500afb5ea51aa0371714903801089c740a7955bd157c8bd6001ee5a3b2fcd3e,1,1,Worcester-Polytechnic-Institute.xml
+92fd7c961a4c484497a8ed726fdb7fd9a41968ef735746fd08457c37560bcb75,1,0,Workable.com.xml
+ee8ad00200a94e47b5c9f1552f83a87c7322a0632d7c29ec2c6cdf42edad6475,0,1,WorldOfGames.xml
+86a2e82a42eb0e970bafcb75d441c6fdc7d4dfe2f194f3f5f09a63afee0718ca,0,1,World_e-ID_Congress.xml
+6b2fcdbb1c045a0c1e4ab93e7732fb9b845d97763b4633bc836c46d0fa68ff49,1,0,Wrapadviser.co.uk.xml
+a2668cebf91bd8dde11b73e669c66f440f700c42243f6208ecdf3debcceac65d,1,1,Wservices.ch.xml
+1ed6357a0bb2153b9502ce2da5335e3d0d33a158a40570fc7bd40b6da0e54c5d,1,1,Wtop.com.xml
+6c1a71abc06b206b2553313564a62d2e4f0bc6a5754a6aabcece7ef4748227e2,1,0,Wufoo.xml
+07be9292aa9ca08d70d90978165e5cb8b2c05989adefb5415f8f42b8a93bf799,1,1,Wush.Net.xml
+35b9f9fea8edf91132dec2e801b084b173a58c519fba894e5968418d6e35fbab,1,1,WyzAnt.xml
+26ceb3ed2032542f2075db396734c4cb25ae58347dc7c780364bb100d198c2fd,1,1,Xetum.com.xml
+4d1c9f4983b197a9641abc19de6504d18016dd24ac9175dca499a9e0f8918348,1,1,Xg4ken.com.xml
+645bbf60775e6f22ed51012989302f79d66c599b6b17871b883e33861f497a4d,1,1,Xing.xml
+b925930748b05e603d05bbad9b35c9ada0a990bfe8e44c680ef5838f5f56de9b,1,1,Xperia_Studio.xml
+007ed995d2a01b0b3e02ea8ea01cb085ced95ddad059370171eb6def4f584df0,1,1,Xserver.xml
+a0a5dc3a7228f73e31ff237e89d46f6d9024a162fe2ac4c04d60968f11d0504b,1,1,Xtenit.xml
+033bde8d86b20991608db24d1854b95a54fcc5d4b072c26a0c3e78877283ac43,1,1,YMCMB_Official_Merch.xml
+877bfd008b92154e0bf7b5147d1f41fec35b98f8035ccb91b263c2bf12d4b06f,1,1,Yahoo.net.xml
+da2fd160f5803ed73336a0fcd8df659b18857c624b22cd38b286edef13e6c73e,1,1,Yahoo.xml
+0ae6d35db343a943f6c54011416bbe796435a13c894b5a719d1adc0dd29666e4,1,1,Yandex.st.xml
+60b992138d369e31e85ae939ae0b8c646799f15004d51d8a9b0cee042e6f01ee,0,1,Yard_Digital.com.xml
+4684c5eb2b3e908ba1df47e631a05893af0eede30bc216a2b8dea46d2a78d509,0,1,YellowPages.ca-problematic.xml
+b79a6f7942d60a42026d304ecc887e0471b7c96b27698c0a815f5892e697316d,1,0,Yimg.jp.xml
+e30ef33bc99dda8ab603adee29b3d8e5c06a4f03e54ca5945c4756191fea41b2,1,1,Yottaa.net.xml
+4df0da0257fcf4446e697afc9a01d46babf709f62d1bf6ebf2c099392acd7b69,0,1,Yottaa.xml
+e5702add6d485cbf6b018ea01bbd171656a5cb624d2ac685d7e189a373ab8812,1,1,Yourhosting.xml
+60cb1e358b417c0f4f6836240fbf7ab8356563060e09707ed5c5492b91e9243d,1,1,Zacks_Investment_Research.xml
+58d2ae044a28eabd58e291233ae948d32e97c42c8cf892aeb2deefe4b4e2a21d,1,1,Zappos.xml
+972b3ee4c16a24aab20cca8dfa8399b9353b8a2e5ae04388a24ea4398a10aa9d,1,1,Zendesk.com-clients.xml
+7c12b054111110d274fd3955b238c3c544d8add3805aec8b854d02de700868a2,1,0,Zerista.xml
+1a9195d25a90cc91b40b8849807f44232c624957f6e2f7558f0b2a8bf0732dc5,0,1,ZeroC.com.xml
+1555227474489fb63697ca75177e3558119df8b600b1409d57e3b577ebbf9c16,0,1,Zhaw.ch.xml
+26f56ed3495ccc23c923a63027caa34baef30311b4ddc96994297734293a4e9d,1,0,Zissousecure.com.xml
+1bd3ea0ac5d7e83747e15c8f53558ec863a930f53467de80e6fb2c8318ccbf51,0,1,Zlavy.odpadnes.sk.xml
+9cd38fa17f1cd6833d79cf92cd572c624c70f933e6fc881e52c92f486137b270,0,1,Zocalopublicsquare.xml
+618c143055176140e5517088535d1ca18e01aa1132adc3f546cf5f28d4f1f655,1,0,Zoho.xml
+647ab116fc936ea3096d11681a6105832fc48cbddddb8e105d2a319eefceb71a,1,0,Zoho_static.com.xml
+54f30ba3843ce2be5355b1259c28f6ffe7b3c9feddcbe0de95025bc506e913cf,1,0,Zulius.com.xml
+1e1a3eee124780dc325850e37cbe518f2ddb7fe35d245f00ef4e11a4abdaa67e,1,1,allAfrica.xml
+37c5f0433330fe4c2820d535944f85b15cb868cf41789490373ab03548516068,1,0,autotrader.co.uk.xml
+788abebdab63cc22f25ae5355e414c59ba172eb8398c4cb4068a984b993891a8,0,1,b-linked.bbyo.org.xml
+91bd48e097061265ae45976d057a045d7a8cad9056e27863cf2a9f83a8538128,1,0,bbci.co.uk.xml
+9759911a6cefdae952ef0a3dc425e6f6c5983a783bcb287f9c21631810442357,1,0,bbcimg.co.uk.xml
+c65218c1ca967f9407d41e68d3c1c678985e2e566e4c67fe407ee052c499abf8,1,0,bcebos.com.xml
+bd0efbba30261e92f11877fedb766e52efd5a9c7940b8db5db84c9096bb2ddcc,0,1,benj.cloud.xml
+f065925420ec63800dcfb7b402f1de343c87c37cba1c7dfd20ee956aad8d0dab,1,0,blindseeker.com.xml
+a914aedae4c3ef477c7d49a2d8657d51f774f4a43f9c32b98bf0a23245f9d894,0,1,blockchainbdgpzk.onion.xml
+fb3197e4ecf4999eb193dfaad46f0bc7dd2cce63d703ef7023b773e566af9310,1,0,bury.gov.uk.xml
+318dbfe8f4b7b7a37f1b28eec7d63c4c5be3c7821720a0832651c119bfac1b31,1,0,careplace.org.uk.xml
+7955a0d3d6af6b18aca473a36e0f62d93db444b63e032c8022673c2dae949c0a,1,0,ccczh.ch.xml
+d46688286a01470ae72a7494f809e4f5e3f1aebe8c1106fb90cf66225857e4fd,1,1,ch.ch.xml
+377f6ae7d5e69279a716acf1fa0da1587f111db733037671915e2f140d83ab60,0,1,coinpaymtstgtibr.onion.xml
+4d9de0cd9d5c53dc2e304a882eac29d39dc8ca80b885b56fdda99c3cb261fab1,0,1,comdirect.xml
+d5008a99ca26ac771eae43451d1a3f388ea560836b48126ed51e332c61ef850c,1,0,copyninja.info.xml
+9fe88b19037e7cb59d028c3fd40d30afb5e4db3e3f8b75299d9301245275542d,1,0,craigsmith.net.xml
+ecc5224bdf13e70d53652f6f917ddaf3525b293a3b014583a7e366f04851145c,1,0,cwrap.org.xml
+9a0e82fa2c84784bd866c0cdfcb15b4fde531d057cd5b0b2c2ae287fdb5479b5,1,0,dditservices.com.xml
+1191303496688bd47f3c42d5b9b20e188264588d02657e602a5e6beeaea448eb,0,1,direxion.xml
+115fd43e8f2968793726c7d1e0be246a5da55d02facef89e889c7c4b8106a052,0,1,dns4torpnlfs2ifuz2s2yf3fc7rdmsbhm6rw75euj35pac6ap25zgqad.onion.xml
+69543b744db80de441dc597c4edba83ba4ae47aab02eae703ed5782b59a46796,1,1,eBid.net.xml
+61b46e4fd28004ddfae160ab1527475fa290ebeaf0f756673c86609a431bade5,1,0,eastsussex1space.co.uk.xml
+d365f54ba88e9ee4e13bcfc5e40fee7822bbe84a1b6efce59d4270a6b889f28b,1,0,ehsanakhgari.org.xml
+dfc9384b551dd838583376c78fee9d0f89b5b1c1f4d51166555a7deb12174cc9,1,0,ellislab.com.xml
+3793098713d9b3a938d3f649c355ba4c73571d8206b1fefaac8403766c7053e7,1,0,eriklundblad.com.xml
+fff0a81810a4742d4a22da1c61e87ff21b4ab86f0f104a6d20acdb3c792aa209,1,0,faiumoni.de.xml
+b99040b9b2c0eb7d89f6e06d25fdad08ccf4f807268983bc00e418aa9d8e62c6,1,1,garmin.xml
+c1011922497c8cc64be64ec9a76a83ae794c36dfbe34dab0ef94b0bc3966c2a3,0,1,graylady3jvrrxbe.onion.xml
+7c0db8c41c1dbc742d88dd7432e190afdce29bc241ea958e0e9bb56e318a0040,1,0,hackint.org.xml
+24078831679588ac29d6189a8ce41cd4fd173dabec012d899c84da6ccf896721,1,0,huuto.net.xml
+fbb6f639b5195a93959082581d01bed9f3a7f267a8a19c346d366fef030212bd,1,0,iapc.utwente.nl.xml
+8da5f2bb9c147020134f872bf90cd9012bc6ab274e6c01ccdf3e529412599144,1,1,iway.ch.xml
+ee71a6176b5f92a9c5be034da928fc78ac61ae1948a2b7ebf0b0e65e170e4b63,1,0,lesershop24.de.xml
+f61044e54b7503f5fde78e5d6ca78ff31d5dc8d19a2f78a7fb27ac05d3e6edbb,1,0,letvcdn.xml
+2f66c9ecc06f5e9d323069143ec7b47c7138a47aaf2139866394b3dcca7c6e23,1,0,linuxpenguins.xyz.xml
+4cbc4ab621120f80ed37c2a18c50e6ec3696f80a11f345a8851de3bca3a7ec42,1,0,lukasa.co.uk.xml
+85a9f72b93eb5f52db8da9a4d375b4634d5ad80905a3e95ff143bedfd3b64123,0,1,luosimao.com.xml
+a707f9c2c70c9f5a5bf277f252d22c4253a5dba6988ceace7fd0400fd8f6812e,0,1,m3connect.xml
+c82d167ba8e98b856ae24b467a8695b544fe2d2110ed269675c6b9b5e8a18de5,1,0,myaffiliateprogram.com.xml
+ac2d93e3a82d7cdc5a6643eec162bc3f28d13e242e6038bb03d266cf5bcef17b,0,1,netzclub.xml
+fb92df7c56875eeaba042d251910aa25c63f4b5be19a988ad757d2c1cadd728d,1,0,norsk-tipping.no.xml
+2cf8f8dfbda7e8586efd5437951997d4d46e1f201396e49c7cd40371b19beca7,0,1,nytimes3xbfgragh.onion.xml
+6bd14bb9b62f275c92067c94a821910a1aee22e45e0ce229a5eafb03de195d7d,0,1,nyttips4bmquxfzw.onion.xml
+318ce4a2b8037d291b8eb484d043f90ea831af92859c92c6e2190dafe56c4cda,0,1,osf22p3lmweopgho.onion.xml
+d008a6ff2c3b16c6fbe4d134d1c1aa6b7f333d343d9e3fab3f88f9cd69599cca,1,0,plarium.com.xml
+287e64d55238846fb01707c87d7d0b7620816da9059a63b0eae64cf45e7a0428,1,0,plasso.co.xml
+dd309ed575e2ecbc07475735c3c4f7809acaf572582657ac7537aa116ca38a91,1,0,polyvore.com.xml
+bfc3c3c917777780e10a197d260a120acc3614a32577402968a480fd5b42c106,1,0,privacyintyqcroe.onion.xml
+f55d12ba30d05c9ba088ec96236232acaf987158f1803c65ca82028f8a71de64,0,1,profesia.sk.xml
+f94e3d01b52fe014422bb4d816910528c58234c96b39ebb582a92515c29e16b0,0,1,propub3r6espa33w.onion.xml
+19ff2b0b8ddf39a805465bf40819f9da9068dbae2932e8bd54a4c5a7a7a5a622,1,0,provisu.ch.xml
+f632d8275a444842292dccb0f595343a6ccfe660b36b20735a54fc6c18ce956a,1,0,puhtml.com.xml
+44142aac4ef5dd6b468e630fc477057ccdd3d8d4a5ff029c9ed0bdf85255c47e,1,0,rarbg.xml
+cb8b94399027893807adc9cefd84a64463afce56865fbe8a7cc757ceff822488,1,0,rns.online.xml
+eae3fbc7bf04ad2098b7d4f58372692b54f160c5903a53404535707844706b02,0,1,ruag.xml
+e071d5e6d188b0477ac02337403602d68e6b548c5f0173c6a1687748169e1cca,1,0,ruptureit.com.xml
+48ab8cda95a96123caac4761f3330eae482905dcf00bf964117fccc6f76a9389,1,0,saintcon.org.xml
+c2b375a2419b0bc0c1270e171d832ba53db5212308bc7680b5ee074f1a6b9515,1,0,sharetobuy.com.xml
+444c21385a86d34daa2b74872456cfa5914e7a7f3833bd5ce212611f068c117e,1,0,so36.net.xml
+ae5b536db2ffdf2df62111cb8494384f296eb2f9fb7421e78d623775cf61e64c,1,0,strongSwan.xml
+7a9da5e66bb52c47cedf57033ebd9aecfe74c3b97a8ef687113ff2be4ef8ff49,1,0,sustrans.org.uk.xml
+057b142ca3d2f84f2620bd70122ca28024124fef589ee328145f265a2064ec18,1,1,sysprovide.xml
+8598fa811ec5aad9d12066a3bbd72cc50d31a31ab552fc81406e4f5a980e6afd,0,1,tanx.com.xml
+d0d7cd27a1fad7c507c011633c1ded2d76779f270a18be9a1a600f34bc19f8ac,0,1,tomritterbassljd.onion.xml
+add909870db94aa5bd754824fd291da12cf5a35ef2dc039887e8fbfcf9559504,1,0,trafficjunky.com.xml
+6babe63d9649dc80201a730918427d18fc983abf0ae6aa64ebc751040d874711,1,0,trakt.xml
+6a22ef0685a22c0d02467d71bf60150171f2d9b2ea164bdc7cce9677255d836e,0,1,usatodayw7vu5egc.onion.xml
+dca681ef703ae025e986f1bef45575452df62543baa7a0bde381d6bf9a8ae56b,1,1,v.gd.xml
+b9b0396960be487e61ab263e7341e1fde512be9ce069f219bdfde8c363b7ab60,1,0,vauva.fi.xml
+22a722ad1e155e3bee71bdb1b9a3ae90235e9687c48bd387489dfb3ecb58bc8f,0,1,visitsealife.com.xml
+51cc6deb02fb6a815619bf535d299f9e24f81ab1451428ee479203126090fc4b,1,0,vogogo.com.xml
+7ed531500221bdf06b719c9fc59447357de77faeb9082ee7fac65da7df701332,0,1,wpa_supplicant.xml
+5cdcff57455137ed99e5dbee098da64da25450e307aec99e1edb70ae75f43c24,1,0,yottos.com.xml
diff --git a/utils/ruleset-whitelist-cleanup.sh b/utils/ruleset-whitelist-cleanup.sh
deleted file mode 100755
index 6804d9622765..000000000000
--- a/utils/ruleset-whitelist-cleanup.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-# Remove from ruleset whitelist the filenames of files that
-# no longer exist or have no matching hash sums.
-
-# Change directory to git root; taken from ../test/test.sh
-if [ -n "$GIT_DIR" ]
-then
-    # $GIT_DIR is set, so we're running as a hook.
-    cd $GIT_DIR
-else
-    # Git command exists? Cool, let's CD to the right place.
-    git rev-parse && cd "$(git rev-parse --show-toplevel)"
-fi
-
-# Run from ruleset folder to simplify sha256sum output
-cd src/chrome/content/rules
-WLIST=../../../../utils/ruleset-whitelist.csv
-DELIM=","
-
-(read; while IFS=$DELIM read listed_hash coverage_flag fetch_flag file; do
-  display_hash=$(echo $listed_hash | cut -c-7)
-  # Remove those that no longer exist
-  if [ ! -f $file ]; then
-    sed -i "/$listed_hash$DELIM$coverage_flag$DELIM$fetch_flag$DELIM$file/d" $WLIST
-    echo >&2 "Removed $file ($display_hash): file no longer exists"
-  elif [ "$coverage_flag" == "0" -a "$fetch_flag" == "0" ]; then
-    sed -i "/$listed_hash$DELIM$coverage_flag$DELIM$fetch_flag$DELIM$file/d" $WLIST
-    echo >&2 "Removed $file ($display_hash): obsolete, all flags set to false"
-  else
-    actual_hash=$(sha256sum $file | cut -c-64)
-    # Remove those whose hashes do not match
-    if [ "$listed_hash" != "$actual_hash" ]; then
-      sed -i "/$listed_hash$DELIM$coverage_flag$DELIM$fetch_flag$DELIM$file/d" $WLIST
-      echo >&2 "Removed $file ($display_hash): listed hash does not match actual hash"
-    fi
-  fi
-done) < "$WLIST"
-
-# Sorting by the 4th column (ruleset name)
-TMPFILE=`mktemp`
-(head -n1 "$WLIST" && tail -n +2 "$WLIST" | sort -t"," -b -u -k4) > "$TMPFILE"
-mv "$TMPFILE" "$WLIST"
diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv
deleted file mode 100644
index ed973df1eab1..000000000000
--- a/utils/ruleset-whitelist.csv
+++ /dev/null
@@ -1,3829 +0,0 @@
-hash,auto-pass coverage test,auto-pass fetch test,filename
-fbb2d56d33f886b53c314eac3446eed8bad7916660ad0709367936fe8335d987,0,1,112_Cafe.com.xml
-43a7a917b89600c8dd3495359879ad1dfe468d9a478e63d5bbc6430a31cc41c2,1,1,123-reg.xml
-5b650e2b6084539440a1b66b5b45f5825a2d61db7812c7521e1a1e0860c4b6a3,1,1,16163.com.xml
-880345f59a163743e49c06d4c3b66d508b7d59e75b060052218368c23d604593,1,1,168qiquan.com.xml
-b5c96ae391a5b0971fb2438e3afd37ec7ce439e7dbb271276cf7bbeb0eb61450,1,1,16personalities.com.xml
-b6bdbab95a01ef36c81f06cc64afc02bdaeb2e3eda1a7bb5d08e75723b18d58c,1,1,1c-bitrix.ru.xml
-41003b900cf58a494e7fd80ce52ad63458c5d7b1ca7ef00ca013345bc3897dfb,0,1,1nsk.ru-problematic.xml
-4d7ea51ecce8ef52d7f14fe3d2196e7647c347ae491a8c51ff84555426f4c05b,0,1,1phads.com.xml
-55b1ea082e1da07a13ef7bca833f779a23335658d345294a35e4944b90c5c136,0,1,1TW.org.xml
-d5e0185eea0bec011afe6fbe1b9db732939209a70d73a6bbe38e6b12311282cc,0,1,24-7_Customer.xml
-4209813635498e7b1f9c944d648173507b41e0e3260e16b3fdb6f3f945ffc28a,1,1,24-7-Media.xml
-a17a8a5bd129ea9a79f7c6d799d48fdd65cd41a3d68f588851130e5dab380c89,1,1,2GIS.ru.xml
-feb478f3b2f281637dc660c70688a7002af3e4c8643f49bc2a45dc451a2fe450,1,0,2K.com.xml
-eb32831b72d8e99401053f1a2815b3b34101705ec5c179ca953216f37c889f7f,1,1,2o7.net.xml
-499b05dc40b7451e3ad52d6bb7e8c33a0359e35747772e71cbd40d0762495a1c,1,1,32Red_Online_Casino.xml
-a7d9ec08bb6294184d95da57900409f22eaf2ef1a49b66ea4c9e33cb77829167,1,1,33Across.xml
-7fe27a3812a67c0645171e96582c54e60bf00bc1462eca19b78ae0fe04c70869,1,1,360Cities.xml
-c14bb3f3b4743737ccb198bbbdc8d6e616222da753c44a83ff446a48c4e4e17f,1,1,365_Tickets_Global.com.xml
-2754710db32540a9e4fc610476d2da4ced0e742af02f5db582aacc553436a822,0,1,37Signals.xml
-3cd9cc0b3921f83d5bea3d5e948e0b95223f24dde3afa2bea2c346aba084eeb7,1,1,3dglassesfree.com.xml
-0b112de7f3114b9432277ced9283996b39d7d7a9f5f3471fb98545630f674d8f,1,1,3M.com.xml
-db0bf27bf0163ea780c63c9aae7d1ae5ffd171dd58565648e3b900ac45c4eb6c,1,1,4D.com.xml
-428d486aae24b16281337cccebc6ac6856907362020df20b0179d353b45aee06,1,1,4gamer.net.xml
-32dd0dc5f7e614da1c25863d4d536e64fb98295be76e0cbb5e7986c2dcd29be4,1,0,500px.org.xml
-d73d05ee2e9267666c0ce2efb63b7ea6fb381bef08a0df118e6c1fa5a028d70b,1,1,80s_Purple.com.xml
-ad597f5f278809ecc2bec2dbac2d47ff4937418c90dbb564836cfdb742e7f6bb,1,1,888173.net-falsemixed.xml
-8223ab030d3a507686a55a6d13875fea38888ee6e1aefcb086e0ff99d83116f4,1,1,888173.net.xml
-53ad3f31c9603c3fa9ef4e1737d60c314a2033b5646398e64986f1952d11bb2a,1,1,972mag.com.xml
-d96c5f2244dd8cb35a2293e1420cbe315444a06c0090673f142863f70c2dd55c,1,0,A_1000_Words.com.xml
-7a25ea9f7d589947b91e6c4d54f91fadb6727107093a0154936119eac027ff8b,1,1,A1WebStats.com.xml
-cd8fd181965e5c622afa28c8b6e4ea0a6717ffdff1ab9c55303500f718ccaaae,0,1,A4uexpo.com.xml
-a77b292e0258a8a9a81a8e05fa342741e226a1e024978fe7c6677c7c65150ae3,0,1,AAMC.org.xml
-dd5cc03269cd87827e03b1f87e7af9786948b5373e1e54583e88eef812c9124d,1,1,AA.net.uk.xml
-120510f02eff7ac4388836b4d9547be6e427664b1a2ff124a2d51a3ce225cd73,1,1,Aart_de_Vos.xml
-5951c130bb380082d7bd13a37a99cd0866398fa7bde7d493c63d5dc26dc9f672,1,1,ABC-Online.xml
-f97657791892c8df7bdc53f8d0207d699859a190444fbf975e98861d4cf53650,0,1,ABIS-studien.se.xml
-a3db3682f950ebb592501ae3cc665a1d6b7bede688f6684dc21f08c1f027cfce,0,1,AboutUs-problematic.xml
-178491e2c3fb87be402571e4a6fe685bf054df360389e0f814c48a5f5876414c,0,1,AboutUs.xml
-050cf213164daa2f546888921c9e5c84de00e6cf11075ca0f62033fae0d4b2f2,0,1,Academia-Press.xml
-dfde2866b7ef90b4edd3ff9e03fa9f1d4ba62b14864a901eecb7e8246de39024,1,1,Academy-of-Model-Aeronautics.xml
-8928d54036d7d987c6da6672c12b7a70f74e1304619327e79dd89f1dbccac853,0,1,Accenture.com.xml
-2de3c612cfdf2f4511d5f3d7389f2f87f1ae77f3c0f6ef93a730f858e1020e36,1,1,Accessorize.xml
-81b89878fc3685f7c80dee0152833803561c01b52df32fb3dd7b6dbdd5a9b8a7,1,1,Accordance_Bible.com.xml
-c124a9be102885f879380ad4d50f97c436d7fc47b0e26ad4e75011eb4655ee18,1,1,Account_Online.com.xml
-7861558b369255be4c424cbcf9755adcbf53898951530280e1f853e56380bbd0,1,1,Accountservergroup.com.xml
-299017a21aa2f2d62f8a3e289cb80398b46a3a649ccdad3b34b2c0660e68c3ac,1,1,Ace_Hotel.com.xml
-ed98e82af585f9f326da1304604f69a878becd5307c6a43d812dedfda202ed89,1,1,Acenet.xml
-e016613d3ffb8370988f2a6130e187e527f650f7ecb9c072c2dceba118415d87,1,1,Acessoseguro.net.xml
-b46e53a6f571bb484c20bd6d6506fdd6616e344cbd8c4ee987994878ba6f28b7,0,1,ACLU-of-Louisiana.xml
-011cf245e9f062e7f525989ef2f74fcfa800ca80843a6f752de5237ad2205399,0,1,ACLU-of-Texas.xml
-5306a00bbba97f3edf93cd3bfe9f2231ba896ddf81fda180d35b3d7d44ebcd89,1,1,Acro-Media.xml
-afac00a30771d97a500c173ab56c5b4173bbfe270b792979faddc7f21a41a1b2,1,1,Acronis.com.xml
-034160de8a9bec353b9d019c9a483d5a75c6af5fdb98485df3d67ee8613987d0,1,1,ActBlue.xml
-15a0856f0603c5730add28e9a2e6a36acc432c7704a7bb007517f496cd35fc65,1,1,ActionKit.com.xml
-36f4696ba37079dc47a8aa131a923aa8f4f1647f88320ac16424d61753747390,1,1,Active.com.xml
-8f563f104d1f8ca36dbd4f162e6749d61cddb8a0cc3ed0cced20a0198a5df7a1,1,1,Active-Events.xml
-8f3e75367b17bc3d389eacda994ed6cd57fd7334cb2c82a30d58d44c2051710e,1,0,Active_Melody.xml
-41ceace9d8d7e0b5415d705b5aed152a387bbb2e3e2f121a6e4c98a7a8a0af3d,1,1,Active_Network.com.xml
-881098f72636035033bd336f49a78c043be02647edb3ab3f0b036c4ef5bab188,1,1,ActiveState-Software.xml
-fc7c90d849f4bb81243211a9562b2c2b9a56cd5bbbdfe376a1c891c0c3fce0e2,1,1,Activision_Blizzard.com.xml
-4c2db37d2cbc8d5ae0b47f210c0a2e8f7e6feb0a8f8d6e9c6a7a818c190fe201,1,1,Act-On-Software.xml
-07f5d75d4bb24e06bad963d545c2685ba90ed6b75bbb747d15734146fbc71666,1,1,Ad4Game.xml
-fb0ca273f18259e6a3a5fa830d5935ac5031be61d471a2cc0c6aeecdaea13698,1,1,Adallom.com.xml
-c781e81a341599aecb674a36f114512b59f5f7930fc309097a456c71e28db902,1,1,Adaptavist.com.xml
-79ecbb418c39e3d0dd20ddb11402b52c352a8a4285754d2decdabe3d9239e8fe,1,1,Adbooth.net.xml
-95314fb83ab85e7efb844d3c5b8fe1b85e30b6d827ee6c58845c8eb6b0e55632,0,1,Adbusters.org.xml
-58bab8c45b010c8e4f1b26a3752150319cc93fba598aeb28997ea551164b68e5,1,1,AdButler.xml
-6c704e7633a84752e7d46297f9077c027c9507dfc3ccdbcdd65612c44fdbfcaf,1,1,Addison.com.hk.xml
-7e07fe570f87f45fad1782566e2b13d2990371f8e62d275445705160b998007a,1,1,Addison_Lee.xml
-3cc9ae403b734dc71977ed8ac1f0dd5834918e23868ea196f713283e1c35d9af,1,1,Adelaide.edu.au.xml
-f2cc426fffedd8471262e93aefab650e78e99dc891e47331d45cfbddc8c8c083,0,1,Adestra.xml
-f955c3a0b2957325ada0ce3a857f05c47269d1442a47301c438310a88f3d1e88,0,1,AdExtent.com-problematic.xml
-1564ad6d65baf7742b82aa1d37e57713779da9121d29e4e0db25d66de821b1a6,1,1,AdExtent.com.xml
-8cbbef2c983926ade2910afe291b3718ace41f5d2346612ae1a4f10450719a26,1,1,Adigital.xml
-e87c8a23db52372be00ffa86181ccc6e32cea7ff5f646f884a452187c543f2d3,0,1,AdJuggler-problematic.xml
-5dffa6059f25b1934cbcb4b3c3cadfc7f0c45711cf7a3940141fe366c1dc632a,1,1,AdJuggler.xml
-ad273c17a4272904192c101b9e916e64e8240f604ddee81c1815fda8eaae6256,1,1,Ad-Juster.xml
-59cc2418711440f263b64cf22e74ec08e468f0ae6de3d416baa876f2c2428281,1,1,Adknowledge.xml
-4d1793c09e8a9352a5fa37c834283c51292621120a3f6971f1b612bd8bb7c0ff,0,1,Adkontekst.pl-problematic.xml
-2120b965fbf664a8c9867dc86450029429847392509c410e4518755167e6d9c4,1,1,Adkontekst.pl.xml
-e4477c817d62fa801ebf864f6915ecf10d55aa4ab5fb04ef6ff56fff4b192f93,0,1,Admized.xml
-ce56c65406df4436852f26458e9264c88c627758762ab195945b3e30a19353d4,1,1,Adobe_login.com.xml
-a94c387a1cc8dac116cea1b38e7c24228bf581b3b7ec896c95341ebbc6b0f342,0,1,Adobe-mismatches.xml
-f7c8ef4d7ab6be61e2e18cff902320d25555ece065e991ccf54837a8bbb9adb6,1,0,Adobe.xml
-8b22f1183bf7b4280462551fa192a49e564c169a57a12283426ffed37e2604a7,0,1,Adoyacademy.se.xml
-ef929d8b8e7c668eb8ffc79194639b6e3283d885ee97da5a311ef5f2a6652349,1,1,Adpay.com.xml
-9dd2d07280b679205432600769a989ace5a9feebe2ab2e5288b509719325be90,0,1,ADP_Screening_and_Selection_Services.xml
-0ce36ec76ead790e4c2ec1723a8d5edd8eddedb784497d2a319ff3217dc3bc62,0,1,AdRoll-problematic.xml
-f2b49748607885b9a719b3302763cb5aff743d59bb9d3fe289b5d39ce6c14e1c,0,1,Adseekmedia.xml
-9bcf20ddf58d4853d75b536e82a5b188eb9322a78c2660adc45cf9ed94abfe48,1,1,Adserver01.de.xml
-5514a8bcdc709b386c8ec7b573fb3c03c4f1cd29aa7756877dfc38af086c56df,0,1,Adspdbl.com.xml
-1c0cd7ed2fce20b30da6a7427338c07b544ed8d36f933b7121af72a4537eb154,1,1,Adsrvmedia.com.xml
-87c72f674f27d72d20c7af4c375a804142a48bb10f6089082c199c8c08806cca,1,1,Adtarget.me.xml
-6ae8fc3fcef08cb519f00f685963170d30fade668e47adf81d90df8d23f16caf,1,1,Adtraxx.de.xml
-de7a8a93300f46f919aafc9b2f6962e873e652999304b3e024dc3ffd42abab40,1,1,Adult-Ad-World.xml
-f914b14018606153a7c24280dff27d29e752c1d4219f548fda58fb25becd3a77,1,0,Adult_Webmaster_Empire.xml
-b200dd0d56b09c13b00e907634b3a640946dffc1c2bf8af3e5319ce3f9d88f1b,0,1,Advel.xml
-00bc0f8d49ed0c18f7f093f5a131fd8a2c0272abc61fadf67390f165850902e3,1,1,Adverticum.xml
-2fcd7b4005d206ba767f53c6574cecf4a80560d5dd55e893be60ba745ffcb781,1,1,Advertise.com.xml
-fb596a2c33f507ea76068607562780dcb1a89b86659a3dfe32db305a97ada71e,1,0,Advertising.com.xml
-7cb2786a2b879652734cbb50bbd97b194bdb20a9ee61e7bcad4f2c8f4e0e081f,1,1,AdvertServe.com.xml
-647f17a6552fca35d3f6adcaba796255783f8359bb04e2df772dda1d3bb9e9b7,1,1,Adverts.ie.xml
-21a29c7ad37f2a6859026e8a95f6ddaa54a0880f194d0921801ab9c68aa89da7,1,1,Advert_Stream.xml
-d739ae917fa93939b84610ee6f929652200a550db28565e5ab38e60f7e82163a,0,1,Advisor_Mailout.com.xml
-aeb3aaa75d0f75ddc959ff6d7fa7cdde1a427225fbba8c75f61ddf4b9d020589,1,1,Advocates_for_Youth.xml
-69c1959f487518867ceec94512b46a8f04bb6e284ca29b3fc8a81930bb9eda54,1,1,Advolution.de.xml
-1b02687ac0376030b5cb96f3d9388028a25e67ecab6b507eb80dd327037c6ad1,1,1,Ady_Advantage.com.xml
-914f8b6f0f6a3ecf7b147d7bd91b2919acd02b3d4b43d06f5058983fe692c1a1,0,1,Aea.se.xml
-3435dd3cef40d48473de29a21a80db92f5eefc9339a402eaeca131bf6a888a05,0,1,Aereo.com-problematic.xml
-2bba736076144c6e074447935696b487b2457699ad13c4c0da5036f27408e7a5,1,1,Aeriagames.xml
-276a2773697e1f02e05064c9caafa4958b2dbab8110457e719a14e3d15db499b,0,1,AEUP.eu.xml
-94cd248d16402173c247f14ae927f72c16737f5d59fdbe8e789a543bc9c92dac,1,0,AeXp-static.com.xml
-bde27e017263a64c388195a0091c24f9dffb1c23ce90deb3c63919c75bb5598f,0,1,AFCEA.xml
-4923e5cd7cf41510d3f973470e90f1efb7093453eaea5107392c141781773775,1,1,Affili.net.xml
-d7080434a9f73a06d758696e4ec5e7b3c60968c0c1a4271e70e32cdf4ac1a170,0,1,Afford.com.xml
-a3ba3f02f73ba24665efe468450c2a35de28396ed37b92c0a9528b63d2ed598b,1,1,African-Network-Information-Center.xml
-1a9ad13bfc81df909453c311adf38dd10aaba3caf4c21caacee8d4489ad8f554,1,1,Aftenposten.no-falsemixed.xml
-7e80b6e07f7f5710aebd5148cee70e1784758bf514135d89dc53ba0d6bcc7d7d,1,1,Aftenposten.xml
-9e7924cf6848f1b4a327944ec8f0847966a5b55a63cc6a3c728ae83b72519f3c,1,1,Agari.xml
-31d96df38792a74447a5cfa73761b450e0f56d1f9885dbdd94d11179075bda79,1,1,Agri_Supply.com.xml
-9fcb7423caa4b2db65448eea1b798f7a4fa939e5f50cf55d934f37a8a5ea67e7,1,1,AGU.org.xml
-c12201b83fae7f617d9ae225a59d6b5b6e35b93166c23bce4eaba3b876cde201,1,0,ahcdn.com.xml
-bcbb52268a9bd3b28943b7e1cfe41e7cf506bb0b2a278e52f14074a8ab050da3,1,1,Ahm.com.au.xml
-522e025d2985538ada978fc3207c1ab5e1b2babd2672c5bf7826e242d2a21bae,0,1,Ahnlab.com.xml
-aee8c092d43b19e5d72ec8c69b30072bb2412d73215775a488833c922a9aaaf4,1,1,AIA-Surety.xml
-3795b077a9e02ed07bc05bac637c61549dcd7d90a84a1248bb52fc82a31e5f94,1,1,Airtricity.xml
-034ff7106c791ad8f0fa08fb6d9a415dd04f5fc3a4836accba2e91dc899e54b9,1,1,AkademikerForsakring.se.xml
-a545c25b0283cf517189ce36a6dddce5df2929e18e6ecec11e7d392ded07c12f,1,1,AkademiskaHus.se.xml
-7cc75135ed0cd3b81ef62e24de4ca2da433caeb54b12aca1bd0d4efdc01f31db,1,0,Akamai.xml
-5e1cdb7d9af34842a8c2b7c7f414caa8b84bafe4072bb7d883f7084dd5edcdfb,0,1,Akban.org.xml
-a51944a1bddd9a16f65544770d110e4f3d8db4a39a341d9bdd907a38a5b4d98d,1,1,Aktion-Deutschland-Hilft.de.xml
-4be7e0c8c19b3bc7ce6a228c7f867f4ca8fa474671c4c1a2fa1186e31f0fed06,1,1,AlaskaAirlines.xml
-187e9c128e4b4237887a14de2f1efeb6fdf647e2549b0abb4f2fc09112879a59,1,1,Alcatel-Lucent.com.xml
-1a75f296456093e211748b9d5dc4f8c2460d36d5ea29f0a72872e00ccaa93a94,1,1,Aleavia.xml
-66d40fad37903ccbf81d50fff39b8ecdfae22977877eca18b263ab645462c167,1,1,Alert_Investor_Relations.xml
-2ae6012e55c69725a70ed2c58eefd1c3e572c28fa546dc0dbba2a254d11b6b39,1,1,AlienVault.xml
-db6ae9c06d4334affab2b17ebff06089701359316e8a01796179cecf56e6af3f,1,1,Alivenotdead.com.xml
-1e1a3eee124780dc325850e37cbe518f2ddb7fe35d245f00ef4e11a4abdaa67e,1,1,allAfrica.xml
-6827360f5b76bf1f5c3c862ef052db2452817f026dce69f608d34aded6973ead,0,1,Allegro.xml
-44203d13b19cfdc0327538af844761f8b751d0dd7ccd532df64d5d141ca80db5,0,1,AllianceBernstein.xml
-1e3849dd66ad705c0195117340c17670db0ee819b655850db2ee1d2a7413c0df,0,1,Allianz_fur_Cyber-Sicherheit.xml
-7d754b99dccf2efa202155cbb5d05539eb1de2d13044cf981078eb2f2552d22b,1,1,Allied_Media.org.xml
-65a56ac78693bcdfaaffda41497a02352ed985a9412a8b8f42749aaee081437e,1,1,AlliedMods.xml
-9598c551f4c6adaf8d6ee9c936d2b9c3a07150f6de188ab4bf8da07f9535885a,1,1,AllPlayers.com.xml
-8301f6814674c19485621cb8cdf4f730b6faff112273ebacc1010a1416925279,1,1,AllSeen_Alliance.org.xml
-b125f385993611b00d091c986d7a2502bf486be872598a07e3cdbbe0011826f6,1,1,Alluremedia.xml
-e863f62a6952371b6db38f5add68bc14fe01af002dda37351e1f744c736c138a,0,1,Ally_Financial-problematic.xml
-749daffb5e9c484c524bc2f266612f1bf001e50757fe34b5e03cb326beffeb6d,1,1,All_You_Can_Arcade.com.xml
-03e6e531ec407c355e7658710b5046c418c7268a34be793d6b8ff8866854c059,0,1,Alonetone.xml
-f8154916d6f3d0255e6589d3f054caa5644cf7a8a744c2aae37522463d78d7f0,0,1,ALSOActebis.xml
-f4b1975dc6c0cc76d40a13198af3f6e0c55ade83c2fc0c0fd4ade1c28301c070,1,1,Alta_Ski_Area.xml
-8662563b129fadb5f1c138f5ae357fb4b079659dd729055146780cc37e90feb1,1,1,Altera.com.xml
-5d30fe7992767abd2f1648d0508b16d78a0333eda4a987917db02ef25941175e,1,1,Alticore.xml
-b2b22a603da5fae9c69dba087e64ff715099d1dadc267f06b18d255b6d9c8239,1,1,Altimate_Wellness.xml
-09bea1ea178d71a5ca9e1dbf010d5dcfb52d1040ec035b13b9b3f0224a184766,1,1,AlumFX.com.xml
-83aae8644fbd60dda604ede8c58cd14dc739f87281bba346cead0c5989ab41df,1,1,Alzforum.org.xml
-158c3c93a52e4012afdb9db300a0eb3e2384d666292d478c3f4b8c86077b7474,1,1,Alzheimers_Association.xml
-43da61ca7c1315ad777e6b31da04f79abac68f4305e43112ff45371ce9f06e0e,1,1,Alzheimers_Society.xml
-3c08535791b2507c36a6c02506e8554d4954840c5997dabb6d8d500178e7e41f,1,1,Amber_Swann_Publishing.xml
-745518e102d29ae0f1d16d2601f00f4c64cc0378f34dd891de07b93e8a1b7861,1,1,Amd.co.at.xml
-d5da30ddd6f57e9983db9004f94cef37e0bded49ed095e8b2243d28b85c2d8ca,1,1,American_Academy_of_Neurology.xml
-f58f2cd4524af0b47bee314b416ba5ef4be1213d7db98f2a18fdac91492c6e48,1,1,American_Ancestors.org.xml
-92e9a46b0c218161a6977d43f3ad0e2c2e175caa825d293044f5a8f2b00cb13d,1,1,American_Bar_Association.xml
-0f244153eac85509cc365215b685d204050df6b0d7eab16f9386710dd55efef4,1,1,American_Center_for_Law_and_Justice.xml
-fe4db784ead854b87428ee3ce40e1e5480d89a82139fe2c07521db1b7d3cba79,1,1,American_College_of_Radiology.xml
-79271c5ed9f153da84ab9914b1e98622bc8d3b51c30fba7bf0f7047863831247,1,1,American_Heart.org.xml
-65f0082277fdcc1873158996ca405d0fb8f7db9a4633b2142ae014a826066f9f,0,1,American-Postal-Workers-Union.xml
-73d4b8032eb96f7564c8d0d2979c1adafdf8f192afd01903b104215da432659d,1,1,American_Scientist.org.xml
-82ccc6b9ab73fe9cf556c1513e259d71ff4f15d659a54d013a4dfc33541b9443,1,1,American-University.xml
-fdb40ffd6a457474b8b7ce3e12667c6fde61187460b7ad9e4cc2f1dc04b89205,1,1,AMetSoc.org.xml
-f2c64f5833815703ac02cbd11efd4c4e48132a3c81a6196692fb4734580c20b8,1,1,Amiando.xml
-a4e558ea2da104b30ed669a14016d712364b596f25b49a9cefc3a339622acd46,0,1,AMMEC.de.xml
-a813cbbf5d96b456a1031c12cdf202a72c2bef44fd2200c9d48ead1035a95166,0,1,Analyst_One.com.xml
-dd70debfd991bb22af84defbd2e2e138ffcb6833abc14c2306ca8a74884adc69,1,1,Analytics.edgesuite.net.xml
-6898ae63a1da2d450af8dc14782bd5ffb6df891e574c584666d5ec951a78d8fb,1,1,ANB.xml
-b5ae6c5519ee1727036dbfbaed594fec60654b0e534350c2799ddde2b1259472,0,1,Anders.com.xml
-8047472a9ae9e601ced04246658471d4c4ea46765bdc88d7b6419dad8a95a5f5,1,1,Andyet.com.xml
-b4f10f135c5050b4309695c53b017646cbe49e4f5c938410144017196d1854d7,1,1,Anglomedia.net.xml
-0d5ae660c24c66e5c6521950658bbf3130fd5b3803ef7caf0523b80519580e58,1,1,Animoto.com.xml
-f227d404b5d2d8cf54d3aa5d8feb8fb94ab752756d7b212577b481c328bd5c13,1,1,AnnualCreditReport.com.xml
-a8c38a66afe09dd783fa23ab1e55d0c8aa19c238c1b11b4e35c1cddc20c004bb,0,1,Anonymizer.xml
-af2eac7a517c666c869e80a72d8e077915069bce3435d7d465b60393ed94b4f1,0,1,Antifa.cz.xml
-3745f49e1046863710aa1dcce54d018fe0feebb722a7189433d834809bafc357,1,1,Anti-Phishing_Working_Group.xml
-0d9ea3f9cf9367f2501d165fa0ac48204766ca4b077c9245ae8505a692ca9edb,1,1,Anyoption.com.xml
-1784b67966984894748fefbe7c4d192375a1c1c9214d78a2c9775fd4c87e175e,1,1,AOE.com.xml
-e0a596183d10f82f7039179e8031bf5d27f2afb43efc173da4c38862d7827142,0,1,AOptix.xml
-9ecf7aa1efa116f959087f7a7275c56931e8acdc3814fab130ac37f07abb8eda,0,1,Apache.org-falsemixed.xml
-9548b2b602791d6574d139cf2800ec0e9dafd354ac22fd3eaea748b5f54e1367,1,1,Apica.xml
-66690f71429d584138c832138be145db4f7e649c75bdd889e8f3b3f2f8b001f5,1,1,APO_Box.com.xml
-bf7a2d984c3cd611d185e59b161467d6180116c0f6916f0fb77ed210d61727bb,0,1,Apoteket.se.xml
-5b6fc98b82c39a6ba90614ea5f1e6985107d652372a395e1d4c8adfa90fdcd61,0,1,Applebees.xml
-85678d55a2afe70de801b24433be6a6e8cd0d7c9424181d8dad79d7937002552,1,0,Apple.com.xml
-f6df9862c3d4f316ad29a953c74defc81d73ddcedeb0d88f48ced3d45e7910b6,0,1,Applicom.xml
-1aed229f3420f2d8648fbf65e98fdab75787f2aca9881617052ddb7d94be0daf,1,1,Apply2Jobs.com.xml
-a6301c97b9096aaae77b0214687fef9787a2ed42d3621ae712fe0b56e4b4731c,0,1,Appsec_USA.xml
-bd5750aded57c6b7644711c3c960363e1bd87f028409ab8109947027d2db5f01,0,1,Appsites.com.xml
-187ce6d87d040f1cf02412e81bf7864a3981614318d9b91a8b59c39828772b37,0,1,AppThemes.com.xml
-c521eba4154a31093201ab0b32b32af18b956ff2f097e06d442a3ada9e9d18b5,1,0,AppVault.xml
-28bfd668cc09cd960709f272dad339505739f1cb716cf74bad8b26311f88c89e,1,1,Aquent.xml
-6f75b1e1607f814f39d6543355470ba1cda9285e457297cae27de532bc58f5bb,1,1,Aquiss.xml
-54456b2cf74178980551f6b89ee851a934323dc87592f1c9b4c8a8818247094a,0,1,ArchBang.org.xml
-29dac30e3114f9baab337f6f95a87cba0e868345ade30884e244c23d1e09d1d8,0,1,Architects_Journal.xml
-56b6dcb7ba81fb258e78a7915c3d4e5496f1fc1b4154b24c8d4bd4199333aab7,0,1,Archomedia.xml
-10af3339eea574e0d47b453bfbf797e2de7df61645c6cb254835e1bfc222a830,1,1,ArcorCentralLogin.xml
-2f773ad61103b3b6d059cd1c40933c551262e643f94cbbda4f449541a064faa2,1,1,Ardour.xml
-b071f240dfc145e70278586d55743c6b8ba94f22ead67d2adc986cd82fe7217c,1,1,Argonne-National-Laboratory.xml
-f6c53cd3f54486a90435c53481b8e53539b71475f7d202dcd5dd8b8afb525502,1,1,Argus_Leader.xml
-d8e76464d628f155de649ab36ed52ab3cefcfc493c3873271a9cdf661b6f522a,1,1,Ariejan.net.xml
-b7da8eb71bac9196944afa62279d4f6c1143b87a1ba2090b301c1f760164bead,0,1,Arizona_State_University-problematic.xml
-007251111fd27a7b448f1cb45893cba99e144e7f9014020b1f41d0c65009df3c,1,1,ARM.xml
-cda60d257787e7061e709192d5cf0a94a4984b46985afa9f3b0cfd0dcef90cee,0,1,Armyoutlet.de.xml
-35b8bcb9a8c7ca87094f12b24aba2343a5087db4abc52cf267ca2303b36c2af8,0,1,ArmyTimes.com.xml
-7882aeef7076ea7fb22daabb09500f52d3b89a68d9694c5d1254c7052768e218,1,1,ARPNetworks.com.xml
-8a49cb29d21a368156693ed53b1980f3da2d23f43b5aca1311b92173d3a23810,0,1,Array.is.xml
-12a54fdd75f8a200b6da25d78514f8ed3e3a3bc516307e3729b9220792921514,1,1,ARRL.xml
-af7cc41fbc6105dbbea5b7df053b21431732e64dd0488534a17cd4dfaf828c0c,0,1,ArtChristina.xml
-d98c3afdac5c0cd8de2aed70c17412d3a9453a301feb5dc04e3134e9a77ffb80,1,1,Artfiles_New_Media.xml
-7a27bf5aa36474cdb4f6be7c8acba249c5f15b44c4343b8dbafa8733792b587f,1,1,Art_Lebedev.ru.xml
-cf0babaf0fd8b4dab4da7fda0059116383dcbc97eb50e35f2ef14e052ee5f563,1,1,Arvixe.xml
-4f49a773f2f5ee1e8e66f7c0a39fd01257351b3fde133581e5b173a706d91e70,1,0,ASADA.xml
-61153fb39b8695a25ba7fd3665f491a44c172ed00776bf9e43fc6362070f4f67,1,1,Asahi_Shimbun.xml
-8def583c3ce1bf10c4f99489dfe970aa4329389b26b9a891f5f1366e7acff96a,1,1,AsbestosSafetyandEradicationAgency.xml
-078b934a7613b1f341bdbebbccd3bbb21e15a9198401d089e6394d3199b18fd0,1,0,Asbury_Park_Press.xml
-e41f33c4e79d2c48b0f708bc57c40baa9580c4861870a7ba6af31817c9bb8073,1,0,Asheville_Citizen-Times.xml
-f9990d6c03425415964794d370821ab71b241c42ecb3ca3470f4f68a91c6b753,1,1,Ashford.com.xml
-390512a7764e5445fe7e41098f947203abe722f89620b0eef4a81dfec90c4df2,1,1,ASIC.xml
-9df71aa013165efa180c520096902f74771dc83d900cb04ed8c7cb5b82025b8b,0,1,Ask_a_Patient.xml
-703eac8c842595fc3835a886513cdf71f75049c3b2437236c9d5547c97e94eb6,0,1,Asknet.xml
-ee30c86b81fee828b7b66094087dad1ceada6a09b8846c76e1323017614a41ae,0,1,Asmc.de.xml
-b504c286855250f8f7bbfc14bfb070f4a3a23126c84ed024fc44e84e14ea9051,0,1,Asnetworks.com.xml
-71fd1b63870f6dc056cff4aa33f6e613f2b3e8bd71d0f02fc233fbb14a337ebb,1,1,Aspen.com.xml
-1d869ec0561b6315e5a76adb6647f320420368539419435c266a2d5fcea3e1e2,1,0,Aspsys.com.xml
-7d9e3268d85a9d31d02dbd90403db96712cb0aae9d780c1dcf3e0891b0c14368,1,1,Assayassured.co.uk.xml
-754839829cb4a5ac11b1b10e6249d63473ad763cfce3b7ff9a900bd327aae739,1,1,AsSeenOnTV.com.xml
-5ffdf237bda94882eff2928c40c5520b1fa6653616d25b8f589517985b14389d,0,1,Assembla-mismatches.xml
-961612d01bd36a91b308b7b0f8c4140d32c7fbd32380748985cb7e89229f2804,1,1,Assembla.xml
-38a37045524b715447b3a42a16bd590a7e93dfed0f77448268081ee8e86033ef,1,1,Assembly.com.xml
-00ae81f5653d38ac003dc5f553d9bb8403188e31c51e31a3cef5210ae665557e,0,1,Associated_Press.xml
-c18170b65925b17bcf0c15b4fca81314a208d8626eaba72efa4d2428a0d9b2c8,1,1,Association_for_Learning_Technology.xml
-b7ada52df16ccca038ecc463aa54e0fcce05fc798805cd2babfa0b36bba90325,1,1,Association_of_National_Advertisers.xml
-04a438f4f810655982b4a6c5bb974b0320ea5ea00a02574829cc81327d3d34be,1,1,Asterisk_Exchange.xml
-ad363158e17c58965ddb34609fb859789bc8f6a49ae9dd7380376f044578140f,1,1,ATandT.xml
-d5a8e7314df63bd5e8864a2956c21f792ebfa3ef6b969e398f98c8215383e3b4,1,1,AtariAge.xml
-47849a15006089e082e0568edac0d3b0be633e4dae443fba442ddf54167fa363,1,1,ATG_Web_Commerce.xml
-ac5a54b2ad0e2ef5b7e15c485b7b55e0c6f39db0c92f5786ca8a565e32e243b5,1,1,Atipso.com.xml
-9306e9e08bee07af69b076ebc4f8f3e79c73433fe43734800db41716959b8894,1,1,Atlantic.net.xml
-1c4a668517afeab5af2dcd413c022e0f5651f4daca8f320679cc10c184ddf053,0,1,ATNAME.xml
-222ff7fbdfb781f3ca1853286935bfacae935873462c81165500ecd9604fb476,1,1,Atos.net.xml
-25352655cbb4ae63a91a4708f6dc6a906edd51d4d8d64e8a84cce6543bea79e9,1,1,Atrativa.com.br.xml
-b55717bc37ee20155b475aa7b894c1f0d94913990f90d78845f67e7d7e36cb35,0,1,ATrpms.net.xml
-7daeec92cfabfe03ea028f3a505424a98e5d2839917e297d7ef0ebc87a03e713,1,1,Attorney-GeneralsDepartment.xml
-7e1bd356281faac59994835afd58be5ccda705aabdba47270324bc345f251d8c,1,1,Attracta.xml
-112ebbd49a5e8309a3c97c2a1945bbd23dc9a07093b9b088cd7c83d12c411b4b,0,1,Auctiva.com.xml
-4fc77210623751086453fe0a5d228673843cf6c03d6428b69dddf5b04b37f032,1,0,Audemars_Piguet.com.xml
-9958965c85c1e2203fa9c29932aba3627a4c783c532451f5e361d6eaef334d4c,1,1,Audible.de.xml
-f1e1d94408e9b68398d42e729019d1813b0a87bd4ddde260b6bcab12e5044edc,0,1,Audience_Amplify.com.xml
-95bb51781fa963035cd1a58058b9bfdfc9abfbc3ffb4f8d7e21ac08f3339e504,1,1,Audience_IQ.com.xml
-9849ad86048fd4c9bd8d6d1a1a91dbd18cbeed5bc3d1d73f42adf83a7f8a7def,0,1,Aulani.jobs.xml
-5607a74fe2ce6bd81e188efc8ea2c9f583daac39126630f2f0c1e35e44d08ddc,1,1,Austiners.com.xml
-65a3071e5ca64b4736d413eb6806dc8a7eff765efca653a7ec9eb65921fa1c69,1,1,Austrade.xml
-925eaa0d92ce9fce1f81e14eeb54aee2bc86575f44eea0d8c70ea781c00e9ef4,1,0,AustralianAntarcticDataCentre.xml
-053e7e489750507e59cbea15242d86094b80574b3a013d4020221378d9c94c90,1,1,AustralianBusinessRegister.xml
-89a23a7485cbfa943ea3939c6ec5497517496cf152d696adfebf0b9e88805541,1,1,AustralianClinicalTrials.xml
-46d64c4f78b0907fb96a59f2628115f7107b51b3f1860ee6aceedd10496c19bb,1,1,AustralianCompetitionandConsumerCommission.xml
-3dbe8d16c684d21dd6867e85faee034ca7123625e6099a712179a3415376e128,1,1,AustralianEarlyDevelopmentCensus.xml
-43449f244f6fa424f35e3e6bbae8573b9c46852fbe4e9d8f92bfc8ea44472544,1,1,AustralianEnergyRegulator.xml
-eebcda134e8983488725adac8b59f709930fd6d11ffaff37f18e78a53563842f,1,1,AustralianExportAwards.xml
-0a346c96033bc31f2ed60841ea5793bc19a11e31006fa259afa525d54698078d,1,1,AustralianFinancialSecurityAuthority.xml
-afa22faab446a6430b4ed75de71992ac9e83b72a243f2e46dc508856263676b2,1,1,AustralianGovernmentBoards.xml
-a51140eac588626b028c6d02deca32813249732b41e8fcd988bb9c82704c0011,1,1,AustralianHealthPractitionerRegulationAgency.xml
-9409a519863814c25d04adc6626a55ee559f859d6edced395b2077d1887b14fe,1,1,AustralianHumanRightsCommission.xml
-43000e42607640f9e629c45eff53ffc5b0e728de3110e45af51fd373a72be334,1,1,AustralianLawReformCommission.xml
-6200fd74167c652c5ea687d4e6177170efef75b2edd95be9c074030c2fbd6505,1,1,AustralianMaritimeSafetyAuthority.xml
-64415238e7e59d6731e51410e4d037921547c013716055e0a050b96ca58613a8,1,1,AustralianPassportOffice.xml
-1bf51e3ef550abd0c59d8f80ac7df11966b9af47168872ea5276f1a28408f85b,1,1,AustralianPlantsBotanyandHorticulture.xml
-c983c0862bf5602903b54e280ca8d3f853ac9c9d122bf45fa75b217dc2bfe4e2,1,1,AustralianStrategicPolicyInstitute.xml
-9df077addcfaf82cd685b51c416149a5ad9fd31ff986ad295b3176ceabf1a518,1,1,AustralianTaxationOffice.xml
-c5469dcedc055dfcc9cd2d40d9cbf4336f39510423466b1de26720440b827d58,1,1,AustralianTransportSafetyBureau.xml
-621a2542fe34dd74b2a96f3e6affc0726d164fb0e635f725aa96af563cc933cd,1,0,AustralianWarMemorial.xml
-86a7e2b1df97e9a7acbf7c758f41ea5914d4d9875e5a3224b597dc44e78c11fe,1,1,Authorize.net.xml
-3a729d65dddc8acdfb4059db3ec763fbbe6f4fc96a245592c50b0fcc0f2381e2,0,1,AutoHits.vn.xml
-f83f035a1590a4decc7b11811aff0547a5218aeee50bab0369df90cd83600c50,1,1,Automatic_Data_Processing.xml
-5c3a3f5275c8e00d18aa36f50a1e4feaf8fe8e703eabc2bb2110c803b7004207,0,1,Automotive-Industries.xml
-e93b07e0b6cc742be0b8402e08c42fad688a33ab622fc34541ff95d78ab98c84,0,1,AutoTrack.nl.xml
-fbb41a88b92502a9b8358e141723ef2bf80c2cd23eccf75c0e3d3c171ba51f0b,1,1,AutoTrader.com.xml
-9e2802f1addb0417fc949133180f8381f05600cdbcd29e88976ee845f9297783,1,0,autotrader.co.uk.xml
-bd801f4c9d577c5240b3b01c316623c6aaf168ee3f095aa91d1142d9cd03f95c,1,1,Avangate.xml
-d3c2485ff5968b974797b67e9a030150abebc2dd5e9b903cf1a4bf61845ababe,1,1,Avaya.xml
-7d0245447b6610aa8ee28b70bb13938639693122b0bb4477e7fae3ca86b89568,1,1,Avectra.com.xml
-3e632fd55a29b917584ac35e60d0bdba0adc9d707aba3d7c541c79db1bd81da8,1,1,AVG.com.xml
-52032e7d504c975616a158e71767d5ac8b2cd7208541671797ba3a6660bda036,1,1,Avinc.com.xml
-7fe2c8189b922ca399161ab33c7b90dcacb2ec23e7afde2b28a11a99d372109b,1,1,Avisservices.com.xml
-08bbac27f594c550b305154cc02cc5988b7cc1c6976c6bd6ffddb0fac17bb590,0,1,Avtrade.xml
-9b72647c715ae4fef53f22ce772e79a5dc5853ab6e8dec175bbcdebd769e5c07,0,1,Avue_Digital_Services.xml
-3d2c4746ec441e4eb264c799f0d41e3be998f7790ebc7061d42630dcfb38a333,0,1,AWcloud.net.xml
-04f791d59d4a1acc70c12dda51df330c7683e7fbff5930d899988e95d70726d2,1,1,AWeber.xml
-74d92b32d3809a7a7971171faadf4515df67bb8a33af80353a53826a45326e82,1,1,Axantum.com.xml
-406d709a4fd37483cfbd763d8d6a17a98f3ecfede0fcee4a9a7405093b5dce6b,1,1,AXA_Winterthur.xml
-aa3e6486761566210c9bfa7fbe3d495a5d7273bfe0632ac3efe0a1793a585671,1,1,Axel-Springer.xml
-8643e039b2a27b284c2c44481b7d3514a6fe5010c03269bb5199016039ba5114,1,1,Axis_Bank.xml
-f5d5d7d166569596c72b9e5c8f2c14ae725f4524b504cc0119b1399132f3739c,1,1,BabyMed.com.xml
-040df94b7fa868e85acd8ad3dc51ddbea735e060408e7492e1623e0ab741337e,1,1,Backcountry.com.xml
-2b95fed0050444e42b004245f8d679487274de5d4bac642133fd71ad278df239,0,1,Badgeville.com-problematic.xml
-8e1542c2c82ba0618ce927ed228577d58fe7da017848f5273c059b40eab2ea04,0,1,Badgeville.com.xml
-35c9ec0e0c41b6699ae89b448b17ccd757f53a3fcc28c44258f2ac512f44a3b4,0,1,Bahn-BKK.xml
-afe0cb9f879460f9754e11ead8b76e9e36684548dc1f3ba9721da1806ba94ae3,1,0,BalaBit.com.xml
-193bdef49c71f93c783fcc8600a835156cfe321b00943b81cc1c9f4dc048c87d,0,1,Balkongshoppen.se.xml
-e4610edfe6ffc7101dc20fb7e4933c5752b8b07087096d7174350b85d0c5f15e,1,1,Ballou.xml
-ffe89a541e79d166ab51bb9585db0ccad767e29203521e306764c7f0b80cf5e2,1,1,Balsamiq.xml
-e863f16aeb1d8145d02347a1e3db12adf0b4b3ae5ce2caba184ebc82a5fc2633,1,1,Bangor_Daily_News.xml
-4d64f5fbdeb952a226359e530e592e1675a9b5447cf754cb586c11dfffd2611d,0,1,Bangor-University-self-signed.xml
-0108c4ebfef9ce55ce03afe117fd03c746e56bbbf72033477ce270abcf92029e,1,1,Bangor-University.xml
-c0572421747129369f8219d06a95b1e5ba601619dc79095bb4b459458f30850d,1,1,BankofScotland.de.xml
-e2c6268d7decd2aa0fb7f95a19742c0dc3acef17982e0fd6758cf998d6e86be4,1,1,BannerSnack.com.xml
-4a77f2239ce4d5ec3cdb36fe84620bfb908fb2060e293761df9003e61f4d32ca,1,1,Banque_Cantonale_du_Valais.xml
-6c40038fcccf28a838a7b3c6c4a7e00a3bf68059ea59d7937820661f96fe66d8,1,1,Banque_CIC.xml
-9ab0613fb9ab8ead3eeffad649fd0c091196351c21ff811b8bd9885bfab043ee,1,1,Banu.com.xml
-db116155fe8e1eed410bedd10b9db57847c5b19924012a744c58178bfe383f61,1,1,Bardwil_Home.xml
-749fcce7d89a360728039bbd9c1b7bf3d66d8f9d3ae74ef1b8a19316212391d9,1,1,BareMetal.xml
-b60d916c30d712566b0fd5b697b4a754a4d7fb05597485109a1c9d92f721dbd4,1,1,BarnesandNoble.xml
-3671a9a071ce22b0d7ebffd007a6164eb32681c72692e4ae734895f4e3592691,0,1,Bartleby.com.xml
-f6468f106fec675cba71920bfd2243936771900e9d15bc40349e5d5bbcf0e3c9,1,1,BASE.xml
-bec6f65a19505ee8e6403ff432718f921668b5a3b14eb7fadea5f81eb2caf57f,1,1,Battelle.xml
-ff17d1990795a846a93d09e3f91ffd13d01902677ac23858cbeb002cb3ecb7f1,1,0,Battle_Creek_Enquirer.xml
-b2f414ba6a3ae96322754420aa619271e9cad75ab612252062118f52787f0a3c,1,1,Battle.net.xml
-20ddc9f438015ac2350e6b48cfd8a16e5af96cea36392233f6699be8d5326921,1,1,Bauhaus-University_Weimar.xml
-8ec96d22b16075721e73ff4c7ca18a83abc4f541ddb40b6f3d19645f558e0360,1,0,Baxter_Bulletin.xml
-8c5c56a3ae46e7b0e0dff2f9c0109cdea46cb5aa1332746944a2fee27c8f993d,0,1,Bayan.ir-expired.xml
-aaad51c2a0c8081f059d5983c03823cd8361c012edc1abb59491654ced18c271,1,1,Baylor.edu.xml
-2bf534ad323bfd412be24cdbb1af720fe02b07bbfb3a9f65374e347f7db1c440,1,1,BazzApp.xml
-d51e319be54ebd4d0927e337e1e99397b02394b50227865fce90101e84fa0b18,1,1,BBC.com-falsemixed.xml
-07e968c407197f81426e7c5bf9786241600d4ad9039ee6593e7797d5fbf42cd3,1,0,bbc.co.uk-resources.xml
-91bd48e097061265ae45976d057a045d7a8cad9056e27863cf2a9f83a8538128,1,0,bbci.co.uk.xml
-9759911a6cefdae952ef0a3dc425e6f6c5983a783bcb287f9c21631810442357,1,0,bbcimg.co.uk.xml
-1ca67dd8c8e778bde03249a0ef9d97a48259a2d8261222df72e54d3ad1c63d21,1,1,Bbsey.es.xml
-c65218c1ca967f9407d41e68d3c1c678985e2e566e4c67fe407ee052c499abf8,1,0,bcebos.com.xml
-695b04585db450ff2e4247938210c07a5c39a004e26f99b0a6269e78a8bf910f,1,0,Bdimg.com.xml
-38b24d1672c8f1b7bac6c5019320bebc0519455350844fdab04a10c8c346c7ed,0,1,Beanstock_Media.xml
-12129b04f6dd2125cfb4b15ef93ff8bd2d6224ed9430565825912e54a0522176,0,1,BeastNode-problematic.xml
-719bae99bbf770b99cba1e43a1b688064f96a8dba30a95170bd1d88c9f2f4527,0,1,Beatport.xml
-8e57b60335fd240c6e38c5e2c6aed9f22a6c602db94a1770ee8d650d009dc29b,1,1,Beaverbrooks.co.uk.xml
-c34685ecb3fb87f6100e138ac70635fe33ece2a7d6a636ece3d702a2494a45c6,1,1,BeCoquin.com.xml
-3d78540a88f99cb8a4aede9bda44366bb9abe15a131f4ef94590545f9df464fb,1,1,BeenVerified.xml
-b4d0ca22494e3738d7e205e1e85efd94601776581ed679d3e0f04c48826437a7,1,1,Beetailer.com.xml
-ede819d271af62e829883d80654d5b964200903bda09098a583d9347437138c0,1,1,Behance.xml
-b00bec67e5e3b8c1ae652dfd383407cff1782edfdcd2c635dae39e7197bfa4d2,1,1,Belkin.xml
-86a5252d6bb39543468329b7e012b7752c0dbf17d43027f8360cb5a54f3303fc,1,1,Bellingham_School_District.xml
-774ce0054a322ac1ac0ec628ac8fd5905f72750d3c618790d14aff98474fd3f1,0,1,Belly_Button_Biodiversity.xml
-4fa3697cf81af513b6a90b5cedbb048caebd70f8035f36ac80b193d040e0f173,1,1,Belnet.be.xml
-d861cba5305fbbb465ecc64388ac98a5c4e0b60edfc42475976d48c3fb09a460,1,1,BeNaughty.com.xml
-5a718e75134be6920e13977848a7c9588ebcb5b37eb0e6b617cd15ead37bb031,1,1,BendigoBank.xml
-0e99e63fce4f1293743d01177926d23152963267916175b9737d2803f0478c68,1,0,Benefitsweb.com.xml
-bfcd485c7c6d3391c51e9dce0c730c3881ffbeebe0d47bf25a0d032bc0987da4,1,1,Bennetts.xml
-8bf6913061f07c611a3b7d1088d2b4bfd0a7d7d2e8acb4485130323481795915,1,1,Bentley_University.xml
-f8a9517520b6042b8d0106a36de5e62b23ca5f353a9e02558cf495d86b466bb9,1,1,Benzinga.com.xml
-0367b2ab159ee00969f4318bdf4eb1d55756ba4dcc5d634b9f0534b0689d6fc6,1,1,BE_One_Spark.com.xml
-0dc9ce63ba5308df05d72ddd5e472216806bb7c13248cf3ffdaa9c4b66b331b7,0,1,Berliner-Energietisch.xml
-25e6eaad191ef2c92a1c0375b42bfd2debf88f2457ab889db5ebce27f4e044b9,1,1,B_E_Smith.xml
-ab2caba1568f7b1af63f44f6a84fa1aefc457d1ad155e9a545ecf78034ad8d85,1,1,Best-Buy.xml
-a431b9a38d469ba6429708286562f55c3c396fae15555a0c6cb565cdde151a1c,1,1,Bestcovery.com.xml
-a7f7d7192c8464173c2833fe11a57e2bcee17b349a4e2b60cdfd5f367ce55d46,0,1,Better_Sales.se.xml
-ed0d23cb613203109f49b8ffcbbe67cb30b2e44b979c0a7dd5379d2dc0a9fe55,1,0,beyondbinary.io.xml
-db17a63fba99edd0c8bd9ea88606152ffc260b70a7248cc87c80fccadd879397,1,1,BGPmon.net.xml
-5011d20ba242c270ade1a17b4c0903a8736ca2e71b0e2c24582b0cc387676c71,0,1,Bhiab.se.xml
-dd84a877da499eaa0246cdf0cbe7473182e68191e8e96062f093515f11b5bae8,1,1,BHosted.nl.xml
-88d9168d7c35682e80336e70c63d79bdbec8fcb703067a386082ec59de9bde80,0,1,BHosting.ru.xml
-85369d0cd3eaa85d5426e92adefe7af4f9f814d1e0e15576cb81373454683ca3,0,1,Biciperros.org.xml
-f8da96534024f4b9bb6212efb1244f1f30cd3fe3403a1dbd661247dfe0a4f817,1,1,Big_Brother_Watch.xml
-d68ee3cc47157f440dacfb19f654c89b597cfb31cc7bde24504adfe61ee50c05,1,1,BigCommerce.xml
-ed5df40362cb3e1124a4a48ac5a4c876987e58beeea367a46a912ac59c7288c8,1,1,Big_Concerts.xml
-ffbbc3807331985248685ba1f74b23ac9b7956664f7342569dd05885563fe91f,1,1,BigHugeLabs.xml
-3c63a7c9c797cde29ddb574a27cc85837819111a247ac705ef72e9eab5d40784,1,1,Bigmir.net-falsemixed.xml
-d281385100cbf2c7b36aa5cbfcbcb806dfd9eea74fd0fce297b8227c13e09e2e,0,1,BIKT.xml
-bc1dce36b45b3964aa4ad44bac9f4f21f9ae6c58f7c538f56ac592aec5e9c56c,0,1,Bild.de-mixed.xml
-8cd9a60fda734c59abdb7e677057381c8c7579dbd74cb593a02656a39c151692,1,1,Billiger.de.xml
-66039ca34034afbc98fb093623ea40b2ba4f8fe8f733763a593ba204f4731453,0,1,Binary-Biz.xml
-113777f338466bc6512680297e9af75a0ec7d94855ec4e652710551dfa5be09a,1,1,Binero.se.xml
-c1794e04d3ff8f95075fc73f0fb3a6d04cb3f367a7f83f27ad0d546020ebcb2a,1,1,Bin-Store.com.xml
-59d72a6ec8f9c18c9d47abbb9999d6dba95204101d8492d4d921599bfda7a9fc,1,0,Biotrim_Labs.com.xml
-a0134fe6daf1357222392652186d939db2bff2d536c66f04be36c9cc4d40d016,1,1,Birthday_in_a_Box.xml
-573cba521c4d30634c5a52f669401e6fa01062c2ac6862f3a084d43b566d34e7,1,1,Bishop_Interactive.xml
-e29b32e9560890e842dd89122e52f12751e6f6be8ddfac5601950df7f2c16ad6,0,1,Bitcoin_Plus.xml
-508f2ce6714df34a9face9de0832e7813b20a88420b2012fef6d682bef057712,1,1,Bitlove.xml
-89060e710c9b7da93c51d49146db2b363b1026b3688f74575e8f41b91452e515,0,1,BitRock-mismatches.xml
-d8ee4c87b0620b6042c91603f08487127062a0a139d668e8c750d02a08fb2a77,0,1,Bitsontherun.com.xml
-488fd6c9aaf93eddc2eb9d2bda98d612269a42d022db8d847eb51910ab0a1595,0,1,Black_Box.co.uk.xml
-da7e4b08208ded1c4b767d150ecea18f78b5249f88487de30912e85c607229df,1,1,Black_Duck_Software.com.xml
-88bf35e32fab806cd20aec94ab13e5880ee52e59d5f7bd2a4d9854eaa9a988b9,1,1,BlackMesh.com.xml
-7cf5b0fa7f2aaf5efbef42df44175127c8c1796df9ee10fc970ab86d12f76c62,1,1,Blacknight-Internet-Solutions.xml
-37ba7ccdfba6cbb38f070020e589511eb268bffd0b56eb1a4419bc8944a1323f,1,1,BlackTonic.com.xml
-5587909ff2cecf5dbdfcd2f2e8729ff27a6b8e3218a94a6a2f7edfd440ecd41c,1,1,BlackVPN.xml
-e7d0eb1c5390cf57597a831c2e19b9a57c2eed3f909b501f84db33008c59ca21,1,1,Blau.de.xml
-8197a554073f79c50efa6b58339f3d3908a786c5041c7e446e3f94d2e41fe190,0,1,Blaze.com.xml
-ccc2061f0e821f79ec44d9ee4b85c86173fc8bada051f52e89d0d2de217b76eb,1,1,Blazonco.com.xml
-878916341a96e0461e4eaa31ff855f8bcdcfe3df38c204200f5a4ee26c0ed2c1,0,1,BlimpMe.com.xml
-f065925420ec63800dcfb7b402f1de343c87c37cba1c7dfd20ee956aad8d0dab,1,0,blindseeker.com.xml
-788abebdab63cc22f25ae5355e414c59ba172eb8398c4cb4068a984b993891a8,0,1,b-linked.bbyo.org.xml
-7bf106fda2215a49f9d271828ef890f54a626ee351a4b3e571c790b857741822,0,1,Blinkeye.ch.xml
-5f627234aca463926eac998ef133407e322eb94921136ef0dcd5acb73423d1c0,0,1,BlockitPocket.com.xml
-d7b0b266fc0b07b1774fbf9769816525d742692f7bf3ce8d88c5b41abf79eed5,1,0,Blockr.io.xml
-c532f455966d1864042489e42a050a7d2f7c59dcb18deb69de94d6a18599565b,0,1,BlockScript.xml
-1f156e7ffe3c3a4cd612b99433221f8138dd8f2789dc983bcdcb0d7a373c899e,1,1,BlogCatalog.xml
-0345c0f4ef1e2c9b07dd7af1ef177809cb3437ca02fe2d6e4eeff5bc45d8c2b9,1,1,Blogg.se.xml
-8fbcb0293f6b69cccc5ee005717d13b0c07bdcadeb8d4956cc07ee4ebd189f6f,1,1,Blogo.xml
-b1edb730a701fd91046e91447f3e753ef58801073ef89b3304d6eb080fdf2cd2,1,0,Blogspot.com_blogs.xml
-1f133fbee8bcb5a78a7b039865a38c14c1e6435f48d93a61a9125ccc4d83f90c,1,1,BlogTalkRadio.xml
-3958f7571262401df5596dc64eb26c150ccc8e8cb412301000e4c13d5561b13e,0,1,Blottr.xml
-7f8d5059120ac4bc4b0db885a258acbf9264b9d9c90e64dd3d029ce789fbf078,1,1,BLOX.xml
-dcac29673b164c353d780e5f410be5b5f95f22c352b66ab3de8abcfea2ab287b,1,1,Bluefly.xml
-fec60c661c82f9e6973e837a53a3604a7bd2dd503dd1d31b7a6802a84f4db6ca,0,1,Bluegiga.com.xml
-8688641ddd3db08b9a452029a89b12b858c2456a55c1abeb9f6b2349633dfabc,1,1,Bluehosting.pl.xml
-af811f2a60dbc47f350419078d14c459f937bfba54b7c06a103e15623cb93b04,0,1,BlueKrypt.com.xml
-4ad9f75a22611b4ab5e4ef795b9cf12ca03612d9660ba568e643d036cf97ac8c,1,1,Blue_Man_Ticketing.xml
-a9a5d4fddac6d697f375624eaf93768c3830b8f4a02ab875bef448a248632fec,1,0,Bluemix.net.xml
-b3fa84409abf942170fa0a73032e4a05a134968155340466e8a776a7b0a7cc77,1,0,BlueSSL.xml
-35530c1de082fe8c03754f797d1dfc1696c62ccde7587877e11be615397e8f50,0,1,BlueZ.xml
-cd2fcfbae17073af9078bdb65c85ca7a30c2a9f374dee412d13b88f4fbee3e9a,0,1,Blutmagie.de.xml
-fc757f17d83b594bd2fa2964ab128fc9cda228727fb99e25e67130bc558d6187,1,1,BMC.com.xml
-17477c85c7e67e6a14ff8808cb3e67e3a559079be361af13e394baf8153645c4,1,1,Bmmetrix.com.xml
-bd609d4d6e7d303576887e9d3bc7d86c62e65ed77a70e0c5c0373c11825f2b5c,1,1,BOALT.xml
-6aa8675bae3564c6040d1ee54ee7c6eaa95712ca262cc029f76d35e68c6458a1,0,1,Boards.ie.xml
-f68b970012f85d3fb946f1c8fc28e49641abab46dee63f0a38ded2274e84a880,1,1,BodyBuilding.com.xml
-c9a373826a1033dcb91fe698e08565a239407f4dbe6b4b9e665763369fcf482d,1,1,Boerse_Frankfurt.xml
-42244265357ba444d6ae9d1307d6e2e52b442206eabe091dd84d109cab1c04b9,0,1,Bolagsverket.se.xml
-78197c8a2e67a77706a1986e51953f3de7037b78e86c34de278bffb6681827e7,1,1,Bonneville_Power_Administration.xml
-a553123cfce927b1c373d5ce2380bf609f9d6dca9a8e61d51ecffcc5edece1d3,1,1,Booking.com.xml
-753512d3829e9b9e62dcc389f9d99420918516ba56781b87afd7c7be8938309e,1,1,Booklooker.de.xml
-a7a91664c2f3f4cfa346c95f19188fe5a6fe0760cd45097b011b60729481cde1,0,1,BoordatWork.com.xml
-f296eecd2c233879e94ee233421ee94c619b7d9f30d8c58257bf831d409151a9,1,1,Boots.com.xml
-45421bcab88efc09f590ba1deb06a30f8ebbfa1178d7061f2c06def617407790,0,1,Boots.ie.xml
-f68cbe5a7566d885e719495209b6492cdd2d7f5e9a22cd09912a08a5b9ec6865,1,1,Boots.no.xml
-8d036acb8f3ea77fc6d0de3b31bad87d03a27e89431525640703a170168f68e9,1,1,Booz_Allen.com.xml
-d217680bd681c4891a8a378e8d0cf86ddbb1248ffb73cc4b63499cc5177dd4fd,1,1,Born_This_Way_Foundation.xml
-cd5d99534f588512306421c08f2731bd2e8f7bf28d34a8ff58ccc0ce90db9d0c,0,1,Bosch.com.xml
-33fdd006644fc9144ab8e95658080cc6a7a02dbd974d3ef819a370534b3af584,1,1,Bosch-Sensortec.com.xml
-c6c18a71ab271826941d7f1c532b9b26be9ee8f7dd0c32925bdbe6203746c42f,1,1,Boston_University.xml
-309241ac7c972b6682c8ada9ee98789e395848d7ea1a1f3b6b97eb309be1ac07,1,1,BoxOffice.xml
-7c899ec80cc19d4ae8e2999849a3624f6891c104df4058edd230652897815e28,0,1,BrainBench.xml
-1d53d0a63f2280c5e360c716028d5e3cc3cc47fd94ad17573feed81e5ee2d13a,1,1,Brainshark.xml
-14392c3133833624c5c2aa9b8526be87616bf60db67261dbf03ef4266fb9c066,1,1,Brainsonic.xml
-3fbe3fba810c1999458523eb42e7066bcacb7f5f134e0b86ea220ab111fc5a73,1,1,Brainstorage.me.xml
-62a1ff2660e90d0dcd68205e5755343612031522d32c97ab421b67daaa96c544,1,1,Brand_Embassy.xml
-f27f3262eb1c10688637350e72a736ab929c73f2261f70fca86773051f511cfd,1,1,Branson_Zipline.xml
-bb99bc99df1c831b11f24c7b67956dc23df65fd60e912ffdcc34ae62d34b5845,0,1,BreNet-mismatches.xml
-a27dbef90110010d10e0f93cfa4c2adcf1e1c634ddcb217245a4f4a3d22537fb,1,0,BreNet.xml
-c868592f7203fe56cfaf6f91a4c8982cd132e3e09617de3c7d4134a85eb39568,1,1,Breuninger.xml
-0e2a8dc117d3acd6fb19e37f88bfe2027d3f5b253b3a1c1331fcb8a4058db82a,1,1,Briggs_and_Riley.xml
-9fbbf43514333a5a4dc5cc25f26f3687485fd24d043af068d148f808a76a894f,1,0,Brightcove.xml
-06f864e3d0c6a973238f29dedb5664caea33fd6328547204bcf932a526fecccb,1,1,Brighton.xml
-bbd4b455ba05130f07710e4f11bae4ffffb6a14a2e53d18ab813a9fd1f5b3bfd,0,1,BrightTag-problematic.xml
-3d443a23f560e68a1bb76c5c7f0d19c9a8f60a6037694cbcca8f6d459b66dc44,1,1,Brinkster.com.xml
-48ecf46a4668cf486d0438d95ffa46b614a20b7ffdfe6dd52178ff582b9cd7dc,1,1,Britannica.com.xml
-6b73d0fa74627c65a26aa706658e1cf8dff117006096ca17da297a99c97ee81b,0,1,BriteObjects.xml
-9f2597ff085f3a8b2ee08c90f6c9b46ab1b50a82c8e90cc0349d5687e9c157b6,1,1,British_Airline_Pilots_Association.xml
-90a1e5ea8c14756b091326e1266b7289980ea204f75c2fdf4f474caa4c906a9a,1,1,British_National_Formulary.xml
-b26f2658831b6ff506c560fcb9e8f6f24bb7eb67543a66f647d639de6d5ab8aa,1,1,British_Red_Cross.xml
-d52daee164b0903a9f8789f6965f1db3f02b0f644782ec8247b27645f5cfce1f,0,1,Broadbandchoices.co.uk.xml
-6db9dbcf1e1a9fea5cd3d364216434ebf9b58b709c455021cb34e6e074a1b714,1,1,Broad-Institute.xml
-bbe59d2f766e67a5424a4d77d610322e490c57ef049b835a25d2c7dba5602f94,1,1,Bromley.gov.uk.xml
-566d6b2aa94f016b3acf4842196102e0be36c43d522d19f66d676a771cb879ff,1,1,Bronto_Software.xml
-ce4ed14cd48805aa20f74978e16a4f8096a89c32e172a5e8cc29ba6015e9c98b,1,1,Brown-Paper-Tickets.xml
-4325d39e0e10a221fef89c4c06e91596114b3a730107e98de7d66f473cc3a759,0,1,Browser_Addon.com.xml
-08ccc26490b9f326c737e8ebb878ce2f46f8131fc47bebf0b68051adfc09fbb7,0,1,BruCON.org.xml
-15045b256d3c25cb833b608efdb944f2dbe76c4e7dd2e666e3fe975ca5534e04,0,1,Bruno-Postle.xml
-51249e771817637e82f106f9105c78ae51b0d4f9ea6690ecfccdad8d997f1619,0,1,Bruteforce.gr.xml
-5d3598c7b438001cae822bb1a29df81be12e6c8c239bdd6ba71c68d18953b616,1,1,BTDigg.xml
-9ac4438613bdfa3f8d619731c234b07a2b34659bf4f590ae48328ec71ee73ec6,1,1,BTGuard.com.xml
-f220626aac6f6f1da031f3bd445bef227d59da713beb06685215af440614d8aa,0,1,BTH.se.xml
-f02719e41dfc1e6cf086314cb5d1b4fdf6495ca9e012de645a3e62bb9fafae95,0,1,BTR_CDN.com.xml
-1f8a223fef58d2230c7688901cd5a2b66dfce9d34b6ebff320e54fa2ca1e9482,0,1,BTR_static.com.xml
-0aee3f2f500bafc6e69595947c0826f3bceefbbaf7f34526534b18fc43b678b1,1,1,BT_Wi-fi.xml
-3a248c5939ec368379c6395aba5e0c2f2c755dc94b536df34a66bbca7e8b8321,1,1,Bucket_Explorer.com.xml
-cdfc30bffe359836ae3497140988a0e232b84ec88b89e1173bc7cb0bb0b3bcd4,1,1,BucketListly.com.xml
-a89318bc86466b0829364c742411ad11099ecfa130f4ad651bcdc41aa6f16f35,1,0,Bucyrus_Telegraph_Forum.xml
-8e7f67c2c91f31f555d547b8c28b2fda823f60ac8cbf7343bcf63b2b3279db12,1,1,BuddyPress.org.xml
-28af491a51c5dadccdb59f42e48ae1730be2105d11c838b8c0760bbffbb54c2e,1,1,Budgetkredit.ch.xml
-ad03eaf3f9b975f78ac8b6f3dcfd6f553b47675e27acbcfcf2a0553b239ade5e,0,1,BulkSMS.xml
-4457ac8d24e5fe710f7e52abdf2801b6ca4b33db2b1834da39b104dfb2e7b572,1,1,Bulletin_Messenger.net.xml
-42207f5a81e9c20cfeffbda745d6b910f88f06740f8d21e3252abfb9ce7fac35,1,1,Bulletproof_Exec.com.xml
-b868f832ff3636c59aa9c3c764058525b955fd7160f2885afa2e1a2a4ab4d1af,1,1,Bundeskanzlerin.xml
-4a993016b9d3017b227427c90e48cd8373fd6134897945f279849307d9f40a77,1,1,Bundespolizei.xml
-5bec6c2d467c00384afd762ed482f0809625b471f660521fa6a245e133ba2d30,0,1,Bundesverband_IT-Mittelstand.xml
-6c1748912929e8ac03f059fd54685e44735c7042ec6bad9348aefaaeea188c90,1,1,BureauofInfrastructureTransportandRegionalEconomics.xml
-b26fadd76b5f460cf884b95baa691f59eb3e46b5389b634cd16f8e391fb5ec1c,1,0,Burlington_Free_Press.xml
-fc39c7090cf6ae83d72e9f99d1a229a0ac5002afc76d96e0d4fdcae754fb9352,1,1,Burstnet.com.xml
-c33cea36533235c6c927eec028ea2efde81358f3e8e02d22b65bd3678996d998,0,1,Burt.xml
-fb3197e4ecf4999eb193dfaad46f0bc7dd2cce63d703ef7023b773e566af9310,1,0,bury.gov.uk.xml
-c1abaf345d18d8bb9e8cb2fd125f601177d32d8341f9182c2d276c6b05370f1f,1,1,Business_2_Community.xml
-7393401e7dfd747e876ce15c4fc3b16d6b7da1dc41695903d278c28d097429d2,1,1,BusinessAU.xml
-feef6f5b69ab3cd7c45316fc1aa56978059547bfb188b1efe1410f5aae7e935a,0,1,Business_Catalyst.com-problematic.xml
-1828776117613179b01abfeeb5c873f8198051e1a751002ee4bc516169072d90,0,1,Business_Catalyst.com.xml
-db58ee6861fb737987b143ce6adba2f64f4882c248b49310b3b338040cfab037,1,1,Butterfly_Labs.com.xml
-2562bebc1989b77cb7c8b1d6adc0cbf1652eb1a5cd59324fbe1cdfafb1f85d7f,1,1,BuySellAds.xml
-04cf84a7b713a034133dcfdcc83b5ac527735a654505463ec68591a5b71f8208,1,1,Buy_Veteran.xml
-c427ffdf9436bd51bd0b0c6dc90e4c2892e3fe246e2066682cd6124b3c2d2e0a,1,1,Buzzdock.xml
-b538310cfbe7f06f481c733d23a8b41facd488c3a91f0613142b44155369e6db,0,1,BuzzFocus.xml
-97d0a30dada7f04c8cb3429a1048b8ac805bfd37e57920737e76e97124366f38,1,1,Byteark.com.xml
-13681cfdfec8b977dd61f60dd3b60eeca91129657c6d53be304dfecc8f1dddce,1,1,Cabal_WS.xml
-b971ac80afc454400fb6b63d8cafa6c0e5592acf4c5b1e6919086911b3dda4f5,1,1,Cables.com.xml
-496e7c05fe03d3ef39378a01c47ab48dd3cce74f05ee486588bc569e1a230c29,0,1,CableTV.com.xml
-0cf99299088ed1e5c7b0392b22233d2fae9545c038c78270c6fb8def0df55c32,1,1,CacheFly.xml
-2b9ec7a31a1ef2ecfd802b57c36056e193b665f99ff11b3e612cd7adbd47e056,1,1,Cadence-Design-Systems.xml
-459fe1f8b04ecbb1a5229dbf89c6cea1f2352bfa33303b853688030152f7e37c,1,1,CadSoft.xml
-04a9f7119bd93b943ec37555c866274a2f8af7239be84e78388b0ec6fa56eb0c,1,1,Cadw.xml
-43587ecba7b34b06312fd938651880bd985d3bf058c4d83bbe7a7be9ee4ef3da,1,1,CAGW.org.xml
-d47f7d3a5d91d6d708e424d66a99d709724edcd2ebedc8d4a0cc0f864e714592,1,1,CainTV.xml
-8508bde339e4f9f34f0714309b44c282c41ec30981d2a5be6b520c3ca6a28046,1,0,Calendars.com.xml
-a53839eeb7c5c5c70ec1a7717b0d2736dc7c2ea8627dc48ac79a29a6f4a2fb16,1,1,California_Polytechnic_State_University_Ponoma.xml
-2e3b0741fa907c730d4618c3be0358aea7e9b902cc7d57fb011bf6725a9c1fd1,1,1,California-State-University.xml
-54b9ec4e58489329294ea814503b75b685a861fa36329912f7c5508107aad516,1,1,Caller.com.xml
-b9e4e75c2b53202fbe4ade7add5bf8e42155f0b1de06a85e1c6dc204dd947af7,1,1,Cambridge-University-Press.xml
-970ce1a3226d07a9c9e49bd6240ffbae8eb89fe5247214161a7ac5dc70a51060,1,1,Campaigner.xml
-213b44c9505b03054a9590a41dd3995d718801ddc16553e2c3e35596e3f301f2,0,1,Campina-mismatches.xml
-da60ddf6de25a6c971e013d595396fdd134c7287acef6900c4124f47087b1764,1,1,Camp_Staff_USA.xml
-cee40e08bee1b60dc042a63a2f9eb299b77b9b6e1679d067c5f8a16f64803037,1,1,CanadaHelps.xml
-7361432018d08c1eb212a2c9d1cdb6901fad4a8a2486a3bbc5985dc410d0fcb4,1,1,CanadaPost.xml
-37e7a3d4dc8537d9eba2f6a460ae2cdd3c82388d96102f9edbfd819d69f88603,1,1,Canadian_Broadcasting_Corporation.xml
-5d08dda7d1b74303183590208bbf76c0a0ea1df76df2b3497beaad6d8f332054,1,1,Canadian_Press.xml
-a67a179fce16d36044ed0085846aa4c0473713c03e7e3c554b1e554666bd9707,1,1,Canadian_Security_Intelligence_Service.xml
-da0a056ab56804c9a3bac0d03fe82a66d33d3fae339ca1011083d85f600a1656,1,1,C-and-a.com.xml
-aa84ff00fbeb0f753bb8fe1414ccdf017caf54f3df9c4ed98bd4c51b34974fd2,1,1,CandH_Lures.com.xml
-8c6336cbbb46ed2fc93abeedafbbcee2e6d92674f583d63d16ab1cfd93c434f7,1,1,CanSecWest.xml
-90eff7965a6d548ff46af2a7b4047fc367be453a1c2570c6bd022de54509c796,0,1,Capistrano.xml
-152cba7f043b7103d9f5e7790726caa2e19aee3ba4f2a27c1743b5ff294ee4db,1,1,Captura-Group.xml
-2ad7b8fada5e55c37ccf909ad869d2a25be2ebb22876f85f6adf258f3367b177,1,1,CareerPerfect.xml
-33e6dfff597abff0ac105150b25f2cfaccdb96b8ec030409f47dc46a3fb94ef1,1,1,CAREpackage.xml
-318dbfe8f4b7b7a37f1b28eec7d63c4c5be3c7821720a0832651c119bfac1b31,1,0,careplace.org.uk.xml
-de976e830c778167c1e154b7a2617e0bd1c08431d99c37b516e0e3c57d7dc84d,1,1,Carestream.com.xml
-fbed29456b04f8c636e55a4733cc819f2270bbed8cb8fe3badff7d700c22509b,1,1,Cargo.xml
-815b13c84f20fa674c550256fd7f0faff27092abe79bb7f6994d68604d6219d3,0,1,CARI.net-self-signed.xml
-70d5f18099ed772fde86fb8ddda405cd55112f107922d29f22cef25c7db4f849,1,1,Carleton.ca.xml
-1dc9df8ba5114e4f75aec8f4843d2bf5d7a0598089b3e21cacff834ab3c5aba0,1,1,Carleton_College.xml
-c047260fe241591aff0d21678c993c268a8e8e26a0a9a2bed56c4fc93d6a9d2d,0,1,CarltonBale.com.xml
-b99da0557fefb5908fec709a958aded1b162eca1a262474909bd02b6a6ab20e1,1,1,Carl_Zeiss.xml
-2b58c69b2c2492e4b93afb1c9bbce7493bf8d6ed35940008b005f9e37d318af2,1,1,Carnegie-Mellon-University.xml
-17caeb4c5121ef1b3d80aff4dd32fb0bd1c9c6506e3b8a5b5f7c9f329c005ba9,1,1,CarProMods.com.xml
-cb7405d2c2753f150dbe71bc0859cfbfabaff2a13093a8408e93bc1c5f5770e2,0,1,Caseking.biz.xml
-828d2dbc106378004fcf07a416e73032ef785645efe2fa901d1726f086781a28,1,1,Caseking.de.xml
-02b835adf3271019ab81b1c292ad031f85a01616b4739be3a73d3a3b6ec5c899,1,1,Cases_Ladder.xml
-d2b47ea2675a8e8e5d0b078ad900b23f21f47d90f58b6a1be679c36a9fb814c1,0,1,Case_Western_Reserve_University.xml
-e7e6de259ae2bf37d6c58972538d00e6800146d4aadec503ec1096b562f2ba1f,0,1,Cash_for_Contracts.xml
-811c33d7ad9dde56ad15954e3460969dab20d0f9fa930584443266e21feff865,1,1,Casro.xml
-7fddb9451db47ab6222ff191001fb1904c4ad0b66a8c514d00c049aa91159416,1,1,Castel-Bayart.xml
-0c92ea4b62f6625531d7ede533dfe504353dc616d37b665607cf85923e93e4bd,1,0,Catalog-of-Domestic-Federal-Assistance.xml
-c02c10e83e9544bb3104e6f1485c4a55a2f4706448156f35932caa6318a2d95f,1,1,Catalyst_Host.com.xml
-f57a8aceb54e732b6b3c8fd1648b923d7061e7f2a4e740fa769fe264cf0f317f,1,1,CatN.com.xml
-cb89627369982908c0f26a2057bfc12a61b87dc3859a7524a6fb20f638d07db2,1,1,CBSIstatic.net.xml
-fc23e2bcd6c3abd0e6d5304c0a11e8c3812a60b34809ed8b7b2bb2240b811368,0,1,CBS-Sports-Network.xml
-dce47057289512712f6a81473c0392ebeec435bede445e2418949d20001d4c5b,1,1,CBS_Store.xml
-fa4b5cc10eda4105a919a14355ee198140034cf659b4de8d84c4db1b2e0d0647,1,1,CBS.xml
-30013485574b054268bdaee6655f649027c836449bbea345526fde438960fe73,1,1,CCAvenue.xml
-dded44f856c5b22d92e7be6fc15b90dce78ce9a0c565ef54ba0fe815e78cdbcf,1,1,CC.com.xml
-2d265021229b69c10311b29249bbac63a42cdbbf79f925a44ba9559e7a7f9bf7,1,1,CCCure.training.xml
-7955a0d3d6af6b18aca473a36e0f62d93db444b63e032c8022673c2dae949c0a,1,0,ccczh.ch.xml
-1c4096e30615c3d13b6ecac18f42304e15922a35c07ef669ec8f3dc245701606,0,1,Cchtml.com.xml
-db451c15ae5f229be88b4de367c9a6a0589742ddf7a26b1eacd518efc87527d4,1,1,CCH.xml
-395743d4266969cafec28bb5a7d0ea3df0f409f417bbd5198dac7407dbb6b08e,0,1,CDN77.com-problematic.xml
-dadc27805296e0616502f8dab61f19e1101e29bceeb58be4d7628fffe56f0a8d,1,1,CDN77.com.xml
-12021169f7500a9698c21fb42390772f04504964944dfc3a2e7d709980879cee,1,0,cdngc.net.xml
-f20f66759481152d644ac6d66b0beb2c0c6294a7f5c3931b3ddab5c43aa95551,0,1,Cdngeek.net.xml
-e3d1fbf663250b13e6cec1485aa7fe068e14180f6883b42fa9681f007004852f,1,1,Cdnme.se.xml
-5878f1e899db043e9b127a9e795b3f99e54bbbf4b5edf4087282657af37fa5d9,1,1,CDON.COM.xml
-c2c8b3ebec631dda1317ae648abdb8820843f2008bfb084ddd40867f5942ee35,1,1,CD_Universe.xml
-cf5327ce99f02ed18d5249e6578f78a7584c6f43c05d2cd4ddf8a1aef16a1223,0,1,CDWG.xml
-b09ee57848b20dc5f0edde7dff31b6dd704d171d7494f0b4e566b62c8587cded,1,1,CeBIT.de.xml
-d6a8f71386d93781c880b1b2a5745306b956ce7a6e9054a32c8180e1d5882de3,0,1,CED-Magazine.xml
-08808ea372f1539dbd840591d1adcfdc422bd1b94619e0551fc7cd4f6be484bd,1,1,CeeJay.net.xml
-ff8d40bf74ef03e97bb141833608fd1af15eadf315b3d4375b2f343a6ffe8043,0,1,Center-for-Documentation-of-Violations-in-Syria.xml
-82abab3b4d77995ea39c6a15825d1ac07d0bb03b074f33ae2de20beecafb466e,0,1,Center_for_Land_Use_Interpretation.xml
-8f258fcd95eeb1dee7520a913d54058f13c58eeb187a5f645bd5ef5313658612,1,1,Center-for-Responsive-Politics.xml
-c83379f445fb8f6413686fc0baf7277cefe62eaa3cb2b220bda737675f5c2cda,1,1,CEntrance.xml
-559cc265802aa764ca4e6e05095ba3b2a9cc782e530fcfeff985833279481a05,1,1,Centre_for_the_Protection_of_National_Infrastructure.xml
-590f799c40da3367a91fdba74ef668755f1f6adc00ec8f63a3d601e3ce683b58,0,1,Ceonex.xml
-2ff7637db101bf266c1273e53a85942c10749e6c7da8a13a297d94ab59a204ea,1,1,CERT.at.xml
-5da4b105382e5d0f14ceb6d0df18911d7b18e56047a02be0a804aafd9d900ca9,1,1,CERT-Bund.xml
-750616ddd0ac444afc83069ecdc28a0925767fab767e7bdef1f604c573d8c8ce,1,1,Certified_Secure.com.xml
-61452ba857551759e77d5b513a6490e4c4abc0a88b6c36e32307a0c4fd6ba720,1,1,CERT-UK.xml
-089ad02b4a5def81013ff4c7c638b99eee0fab6ed4e76d99170f1a0d769d088e,1,0,CERT-Verbund.xml
-2bdce0201a1573c28fac0377554b793331d5e242c1dae39ac1879603811f4236,1,1,CETIC.be.xml
-5bd8e0e2fd30fc0a28fd33d451a35b60e7275837c4fd405dfce8bc81af27ead1,1,0,Cfapps.io.xml
-657c3fc76a95e653075c9146e79384f35deb6602ff616d54387921bbab2c83a3,1,1,Chakas_Mmm.com.xml
-6f590753ae8cd04bc98291decbcfd6ec6ea47549166af85cdaa10ef1e818226c,1,1,Chalmers.se.xml
-15cb94615e0109eba10078f5957a09f1928212efd7e6b6fe45f0d5a697c549c2,1,1,Chambal.xml
-ff87ce869010679c515851e36ea32a465192690bc683dd743900d54b38f61374,1,1,ChampionCasino.net.xml
-9cdd926bdd6a036fd0f4c777aa9960f723dee343cf1328e1a7b19ccf1d1fdd61,1,1,Champs_Sports.xml
-b9d0903b811d2fb31c9a37f791cb10e6db214250062ee925367786ed616e8ec3,1,1,Change.org.xml
-dcc49a44fd24bca36885c090e4d53fd2c1f403cc569769e7ea3624c84309dbf9,1,1,ChannelIntelligence.com.xml
-32ed9892ffb10bf2476a20c52bca26c0697bc473e9f07a74e96fa989a70dfae9,1,1,Channelme.tv.xml
-1d429113302dff4c3b08ed76741b98f4a4a8aac62de47bd55c2df5761f2def04,0,1,Chaos-Reigns.xml
-b59e3733248b31c4fb739059009c4ecc1cebbaa907e505f9999e0f23b0207b05,0,1,Chapman.edu.xml
-b4756a81d6fd42b2949d1f110962a6cad39da842d2c322783aa61d1b2e0dcdeb,1,1,CharityWeb.xml
-749013b2fc545464572701ed1335b9f6a5592b6a0af3474d9703994874179830,1,0,Chartbeat.net.xml
-7606270cd555ad7826233b4645f480873fee83602319fcb826d731e8873a9017,1,1,Chatango.com.xml
-f1432b9c958b7d77317856b509738eea679ae9483f0bd86a27b70c5c9b644313,1,1,ChatMe.im.xml
-e05d77b78aef21dd0a8646ef41c248e8c20619e13a951f2419ef7ee9808c2b53,1,1,Chatter.xml
-d46688286a01470ae72a7494f809e4f5e3f1aebe8c1106fb90cf66225857e4fd,1,1,ch.ch.xml
-2a63e3290e8b7a3df8030c54b4a0cde17f935b45c2bc77e8bdb4652e5ed5f0b2,1,0,chcoc.gov.xml
-e4363ff3c9c95bc14779143fc3b9634737158df58162c751d815e79d22a45440,0,1,Cheapass_Fiction.com.xml
-ae8ab9138d1f643d504ce92a7bdb32a25040fb5891eba6e83ceb5825d4fa0300,1,1,Check24.de.xml
-0461c1fa37a51ab04a664f608a0b764ebee6bdb87c9213c7b4935ba63033976f,1,1,CheckM8.xml
-894acd2dc7705d1cf89e082dbdb2e22929fa076885cb12c5839beeea29c47c40,0,1,Checkmarx.com-problematic.xml
-a661d52f01a655aca11ad14b59ebd2b1dc43fe4ec22803909f5cc80f9f2c7972,1,1,Checkmarx.com.xml
-c35f7c9558325a1c388b1a71d37aa032cbbd2189084eb366243641ba716a9ebc,0,1,Cheema.com.xml
-874c0ca58d248cca11347c7709090b7642349d67a5d974b7715f83cf112ef009,1,1,CheetahMail.xml
-830f65a383d7db9aa636b7edb97f0b68dd20836134773d72e567c5814b336945,1,1,Chemical_Abstracts_Service.xml
-5a3386790b6cce0cd8d88a347a1ef83fbc723f44ea336f955ec645ac178f2b4c,1,1,Cherenkov_Telescope_Array.xml
-10fa5a17c9fc13e685fe8cf8b8a631768e81152d63045308597137c3d5f44be0,1,1,ChessBase-shop.com.xml
-aef5145874dd4b4847a2ca76c06993964264c6a392c76c50742a19e2327850f5,1,0,Chillicothe_Gazette.xml
-a486b3a9a8fdfb5af7161460ce10f22575e2dfbbc388f9e39473a09f526f89f0,1,1,ChipIn.xml
-fe1cb1da747d4c59487f8561bd5d048a746a615428080805d68bd12f5a45d764,1,0,CHIP-Kiosk.de.xml
-fc08fadbc356c1c170c2e48c51fd76cf1e6238e5c6d1eb71e76f0b9c4def968d,0,1,CHIP-Online-mismatches.xml
-a7fa8f7491c9051f153f6d88c3b814485b380c83f5d973e5f01dd1325fd1f054,1,1,Chistes_Cortos_Buenos.com.xml
-64f97bfe11304bd506fd36f251d1b3e1500a6471706b7b1244005dbe17633396,1,1,Chitika.net.xml
-ee3a5eba1f9ad709c1faa43e65590b84a77729dc3078a90ee79ff08a5a559e80,1,1,Chitika.xml
-ceec987f3e67e3e7b1f4cec6c706fc9e0dcf3bb51ef908f6a7122b195a9f3e13,0,1,CHL.it.xml
-a55226a41482b55b64ea5dd690a09fe19d0999ccb8131b436b690784d6cf4e0e,1,1,Chlomo.org.xml
-9c34cb141dfb485ac7469918b141086d6382aa0a559d35d52680f73c725b2bb5,1,1,Chrisanthemums.xml
-69576d9694982fc30c67473122078602be85d16838123c7ced7cc7bba8715f83,0,1,Christian_Heilmann.xml
-e96c2a0ef175b7fbcf74f0254fc93a12751c397f36783d2fd0bfc05f3e290f4e,1,1,Chrome_Data.xml
-bc2e4da10ff3031e7c33b25dffdb3092b3cc96c2ae77636c84f55e5fea2e90db,0,1,Chrome_Status.com.xml
-635611ba0802ed40b2ee5b905ce99d4880a24e557dac0278a893e36ff9b3f88a,0,1,Chtah.net.xml
-a2b3aceeb1593746dab6ebf9ea2eb07b7104505e91e610e6df35769399c21b16,1,1,Church_Hill_Classics.xml
-cfdfa99b1e7ddec951fc52f57172762a09c9666866168b24a750f1f232debd3c,0,1,Church-of-the-SubGenius.xml
-90dc83350ae58f9b37967bfe33406f3cfbbd9de47f797d5691ae0c64b9dd573a,1,1,Ciao.xml
-dbc46881deffd783f88ddcd087523d767b4fbbe2c73a1266479dd4e46670b5d2,1,1,CIBC.xml
-4a3251f6ef0a80747dc6d59dd8975adb0d07942f4babd0fc8ea79048f2be6f24,0,1,CICLOPS.xml
-06585660c1b9b9ab503d70c8f9f3d42e020426e91cf49a1e1576cc7273f711f5,0,1,CinCHouse.com.xml
-de19403594b073d50fc83ab38402f494cbbbf9920f2d6281eb1865d7096f1e12,0,1,CinemaCon.com.xml
-5af114e6be10d6fd0a1aaa5b2710a714fd971041a06ea0d64f223e35cc1542d9,1,1,CinemaNow.xml
-4198bc72c0160da3e334943ec412c321de5816400e6afe0cb78239f147e67b8e,1,1,CIO.com.xml
-dc0992a5994c243bf9b18642c9aa62e6d917b8085d300a17eb2c06dff2bfbd80,1,1,Circle_of_Moms.xml
-4acb5a4b23c7741ba5e90fccb7c5fd11eee4edc412da48b012017ceb150adfc3,1,1,Circular_Hub.xml
-f21f4446f17f30b69feb3250d3b29c8b78fd83cfd3ee68842327f2cc9666d0f1,1,1,Citadium.com.xml
-ec0ef6511fc8ac56cade3fc79d5ee556146c78803e5483c3a4c035ee42a1fbf5,0,1,Citi_Alumni_Network.xml
-50528500b771e1f1bd280131b8716d6c7bdd5f860cb235a5193f62df416b3680,1,1,City-Mail.xml
-dc4537168d9525f51022415e645d6e4b73724c9a8e437d33c21b8a5560192207,1,1,City-of-Chicago.xml
-8c337b75ca9d7a8f1ee1a7e41f3b28b1246455da4315b8bb57923f6c1f73f4b3,1,1,City_of_Seattle.xml
-324aa263ab69f494cbd37fe69d6716c07bcd7b46853ae25a5f7377722146afd2,1,1,City-of-Sedona.xml
-63cd65cb442626c55dfd31b5b4d94d346dfa90654eb59fc6fd9bc2ae77b5875c,0,1,Citypaketet.xml
-71784dd9bb7126dd9498a338e25f8bed0189c0799f0fa396793d77ecc3f930ea,0,1,City_University_of_New_York-problematic.xml
-88da9400d16c491db6e3d8ec956cc78ecb20de9aae1521da6cc70af4b3918ab6,0,1,Ciuvo.com.xml
-f1941a4f4eed89d559552d80627858aaf5ce0931a3743c396f8c83c4d6e6b91a,1,1,CivicScience.xml
-b3158d31c71457363975019cab7d54e2a1df3c4704e8ec39284edb1a7599ed71,0,1,Ckom.xml
-9f7ef86f1422fae63e98ff03ec7f5db69e56e9afd5089b95fc71ddb28218c3be,1,0,Clarion-Ledger.xml
-e239c746877388cbb5e8bdda31133b3d1bbf51631ba8974d6c07ced5016a01f0,0,1,Clasohlson.se.xml
-efa035032a8adea946c46ec13d38ae6490099edcb3372778098489a72b0fd465,1,1,CleanEnergyFinanceCorporation.xml
-11f8b0f6e4735f79afb373f2c312f8f38c01cedf75703145b65f1d4d0ee82933,1,1,Clear-link.com.xml
-3bb97c7edc6c521bfb2d37b3110814bf4e8c754e494817f319fbe8276e46aad3,1,1,ClickBank.xml
-4258d5f4b5f7f226cc8e85c2f9a1a73d311e9adc8bc9503998be3c4c2e638f52,1,1,Clicksor.com.xml
-0e6030faa7bd3a535ba16407b701fb5ed96fcfbea25027b86346781aa266abb1,1,1,ClickTale.xml
-c45cf815f97aa9466ea33031ca53e8a92b2a418113ab2d2f1ddc785ec1e8ac92,0,1,CLIC-study.xml
-df851c281b54812ece8405960ab7920e649aa2e9c3941b7696ef4cef6fff0aeb,1,0,clippings.com.xml
-ab257c10ba938df508e131e28c826c94323e85a97d95d4900fcf90399458b6e1,1,1,Cl.ly.xml
-c954c0e37df82e9c356ad3611313c5aebca46fe4c2ad4291b1fff6ff2c90d3e4,1,1,Cloudforce.com.xml
-39fcbaa2a2d5928ab7c8432633965289e06ebb11ebfee5d0d53b4daf9ef4f4d7,1,1,Cloudhexa_Network.xml
-5ffb20d9923257da6e73e1909a6d8cf7d68be914c8e160458e60e2914bd758c6,1,1,Cloudimage.io.xml
-9a3f101243166162958333bd87ca842670c62a2e426ad6ff5c87aa096340360b,0,1,Cloud-Privacy.xml
-299cb39fec29918dea7265b547b0b58d83d9b27c9a8ccf46f35e15369acbf137,0,1,Cloudset.net.xml
-18667621076275ec475015222a4a65bb0ecd59b5d07234cacc92d5d2e1c2fa89,0,1,CloudWorks.nu.xml
-ebe8861f8b01a594f2009032190e254730320f03a4381474c1f43796ab9fe25d,1,1,Cluster_Connection.com.xml
-a5bffa7d7c1a73f9251ab1f7509bd4736925898c6f99b74ea8f3896e5cc09c79,1,1,Clusters.de.xml
-8e944aa7a044e930a694b080696d4c54f28b409d61d04f8125dd5e61c1a2651f,1,0,Cmtt.ru.xml
-3784a183168c22a1a724dd67210129dbcdb35290b9d6d09f2a18f1aa4210c360,1,1,Co3_Sys.com.xml
-5df01438ac79becb6644b3dec650a57c8c40b84ecf6939e91896504548a7ccfc,1,0,Codecoop.org.xml
-e201304121c055892773138ac3235899485bd00ccfa94712d8d872f701901927,1,1,Cognesia.net.xml
-d68ff1b58eab380189c11039120248d45c10926bfd08362be2e3d66ef2d17dd6,1,1,CollabNet.xml
-c72480bf5ff11ba1f7d5466f6ad793fa99e51452150a43d109da8748723ab054,1,1,CollegeBoundfund.xml
-01e3cce2c68b60c53bd29c022fab016da33cfea386c371fe6bd47a6eef0ae66c,0,1,CollegeHumor-mismatches.xml
-339bc36fa7e42abc1eeed143a5bc24c08ce6bcb11d33db4313da65d6eaa08007,0,1,CollegeHumor.xml
-0338333878edb6a0f6c006f0fc18d49805899c908f920c7e612ac5496c034271,1,1,College-of-Nurses-of-Ontario.xml
-bc6a00e617c9db49b07c33c4a774775c1544dc9e002d75dd1709e2253ef33b03,1,0,Coloradoan.xml
-6347c91fce42e33944bf4e68147dded6b142f3f8ab49dd7f90c014502fc0704e,1,1,Colorado_College.edu.xml
-9eda287348de654d0985f0631415a46011e0d266cf27dca8d63b3f552e639dec,1,1,Columbia_University.xml
-4d9de0cd9d5c53dc2e304a882eac29d39dc8ca80b885b56fdda99c3cb261fab1,0,1,comdirect.xml
-9a8d0aa2232288e239f16331bf885c134dcc2f923cc6f61ce6a07c3f7092d56b,1,1,Commission_Junction.xml
-ed1a6a91ec23f12636e85fcab140be7b53ce9ead8bcd48f7173655f06843308a,1,1,CommLink.org.xml
-62c49960652d3e3117d23116a8d544af8d0bc43780cfc963c9704a5d44ed897a,1,0,Common_Criteria_Portal.xml
-5259790909abd7c2980520d48f3f158799be1f5cc478b835cdb44ad1d6b0e970,1,1,Common-Short-Code-Administration.xml
-20da5e6482b3b3be5ed22f4994ad41162a8e2d3e8e6fb81bcb86cfc8966bd64b,1,1,CommonwealthCourtsPortal.xml
-ecd0baaca43fe666a3d384e1fec2a928291378c6f55f6d2a31e9b9873a0cd053,1,1,CommonwealthGrantsCommission.xml
-5dce6c98248d4c5f20c791069b2fad0e0660b5a16a3bffaa270949a92a0cfb0d,1,1,CommonwealthSuperannuationCorporation.xml
-d9678bb694d8e6a00b167f6ba25edeae50f3e143532f4ad5100a818603097a16,1,1,CommScope.com.xml
-99330baf93c8ae708130f47714837655c0c21bc656cd4d61a4c8ac61f1a60956,0,1,Communicator_Corporation.xml
-382e374bed7b8010c07406799fb9f5689f72f60bdaf85e5df9ea6f2aaa3cf232,1,1,CommuniGate.xml
-c4d1e044911fd46c2431ea7167259cfd00dbc48662b1193ad5dc88219f1b43ed,1,1,CommuniGator.co.uk.xml
-c2b3c7d25fc0833e8cad973b30e40d8491ab163fc1d955776100fdd03c0d3274,1,1,Comodo.xml
-50a6c2f20cd09628fa54bcf02403ff8df776e39aa3209172196d821911c157cf,0,1,Compaq.com.xml
-55a6d8b4c3458f1436f516dc128d65941ce8e9deb4e65298d021a128cc208fba,1,1,Comparis.xml
-3a7a3210ef2a6304bc708f0e3ae32ac3795e0cc88a2b8971127bb2d98aebb733,1,0,Compasscard.ca.xml
-312d660ad3756ddc1d8e6e7d329ffc95dd96664ab13533e300fd1f64712c7c5c,1,1,Compendium.xml
-13b7302ab918891c2df88dcd9c929fd32b865828bc7ef07a74d01f5c9542d47e,0,1,Competitive_Enterprise_Institute-problematic.xml
-f15ebe51bbc7e65a292be0191506b39c915e370f344f8d60ea9ae31fe9eb106e,0,1,CompEx.xml
-de35c6263d5168fea6a5c9df899f60d8bfddf708af2110475853f3ae77f2b5df,0,1,Compiz.xml
-502e65e088a01360707e03ffb91f5e96459016af819c164b02bdd59c99eb0bf1,1,1,ComplianceSigns.com.xml
-a1333d20fa847ea8be6f8bde7d218263a5555cd9e9b86cc2c3a138a69a3de71d,1,1,CompraNoExterior.com.br.xml
-36639069762c5623cb782a792b17088694f3242fa84db5e8686b431d36d74f07,0,1,Computer_Lab_Solutions.xml
-bb4335a9690793a7035cbbb5025258304be703efbb97fb0071f617996808fcdc,0,1,Computer-Steroids.xml
-53750f61d79098ab338a56cff7ac2567092601c8d9861be25e79cebacc73d197,1,1,Computeruniverse.xml
-5a428833392820bbe321cfcf8fb2fde2748130d078e0f3f48229d35b6a5f617f,1,1,ComSuper.xml
-4f25e864b2b2c8023c72a18c4645f2bc659b9f3efdad9b5a8623fd3becf08780,0,1,Comviq.se.xml
-9af8592b4c27261897b6cd7deee5f974361b9831a26cef0bb7973f5db0729d61,1,1,Concur.com.xml
-ba07862597c14cbe93a15f25f88819b96a0aa1265d58e078b54ecc0fd208881f,0,1,Conde_Nast_Traveler-problematic.xml
-584074d4e890000c0c180afb290a22138ff376db5118161842c4e5d78bce67ef,1,1,Conde_Nast_Traveler.xml
-a1702eb596ce0c2db770d6553cbc38a621bdb6f795032b4d3e109eea7c7f5e1b,1,1,Conduit-data.com.xml
-87b80ce3f32ffdf19157d20003e9b0455629a9596081bf1351d2da42f56f4477,1,1,Confirmit.xml
-02b3153c54aaade0387d2be93976bcd83cec356da2217dfd19b1d5f5bce58703,1,1,Confused.com.xml
-4e4afd9324120965f69988b05d3a414e70fc93ae07c352cd628b10921a166680,0,1,Confuzzled.xml
-4806cc37a6d166ccc247a5cf2ce5f776e69ac36043d56bb5e2fef406f9ccfea5,0,1,ConnectMyPhone.com.xml
-a79534ae1059876bc76c072c81fee31b3ee5572980bfbe2f87943f023829d2c3,1,1,ConsCallHome.com.xml
-2ceb9721bb2044c6d2d9ec83baea99106fee843c6eda1b90e5d0971dd569593c,0,1,Construx.xml
-971d95639a217ced3de0aa1929e049957c9a897116a85786e403cf71943df656,1,1,Consumer_Reports.com-falsemixed.xml
-4655407c663c2f1c511e2c4bd111edde8000a54a16e3e2ad2aae566769956484,1,1,ConsumerReports.xml
-b0b44d9546df79eec8d67847c7a7719f0c597467cf94fce3585ceb0990649626,1,1,Consumers_Union.org.xml
-2431f9c01be0053096ff548c0c7545cf015bbb68c00d1645e5894a53c26f4a5a,1,1,Contactual.xml
-436c49a3cd92b2d701c90db91f96cf8ebf3a3bdccf609537f23d6cad31bdd6be,1,1,ContactUs.com.xml
-c09155445f0f22805fe2d2894f1f9d0d89cb5d283a0b147412cb4b6c2ed4a1ca,1,1,Content.ad.xml
-62c92737e9ae019baf69a7b8c673c7c9377bf810761f0216cb8d90f4bf53f81c,1,1,ControlScan.com.xml
-710d5a714c74db826cade92c25b332038409f800ef616a03360634fac19fbc1c,0,1,Conversions_Box.com.xml
-07aec2b14f80428ac276fa287ea846bfba851a6d46b0f39e4640e6fddbc10a65,0,1,Coochey.net-falsemixed.xml
-650b5d9a73344bcff3834fd3851ffa14e7f810949a518eb27ce679bd4a5704eb,1,1,Coochey.net.xml
-e89ea7fdf355e007338030ec2084857d7903831a21c76d666113b3cc3068d4b4,1,1,Co-operative-bank.xml
-240dcf8868b04c0cac4e396a54bb5da086a984ed3f3cbead72e67b6d4200c778,1,1,Copernic.com.xml
-3563a8b1e77346e627440c9054303a707a7fe3e6a253708af6fed75051c1256f,1,1,Copy.com.xml
-d5008a99ca26ac771eae43451d1a3f388ea560836b48126ed51e332c61ef850c,1,0,copyninja.info.xml
-ef05036cb7d38b14c929227053805750a7edfe003398e0f4c70e5e8d2f70334a,1,1,CoreCommerce.xml
-d7baeaa6bec397bdc80535854950e1df5da6e87e37f1d852df3fab12c5764f42,1,1,CoreMotives.com.xml
-2da557485b91db2cd8fd822d4f0c1d8c9d260f035f75827b8721576abb34bf18,1,1,Corporate-ir.net.xml
-71251e0392f89cae88afb7ade08bb4679832258a9110d272f04cb4aadd3be46b,1,1,Corporation_Service_Company.xml
-96a1e4d8a7a151bf30f2ce5bdbcb762f5322add6297e6a17c1d26ede3953146a,1,1,COSMOS_magazine.xml
-d1698155b22b3b7f5f0ca643cea078451d79ab6779f6f261d8ca54805b3db3e9,0,1,Costco.xml
-2468f6840c6141631608ec3bf75e9fb94e1704cfd757a0f331ef2d89376cf59e,1,1,Cotera.xml
-14f57a9f712732f4a7d072faea9dd8debb34ac651083459dadd90d2f7b611d3f,1,1,Couchbase.xml
-51e4dfd5e80d3187c34dbae64ea978a12df199da807108618c0db357d608742f,1,1,CouncilofAustralianGovernments.xml
-f66c96d6bf5531963d61883ead19002adca60f493e55c25a7636cba436b79918,1,1,Council_of_Europe.xml
-559b645ee0a32f92fa47772553993a3e839dba0b30267610ac4dd967c96d0fa1,1,1,Council_on_Foreign_Relations.xml
-491a52cea147014a5240c15914dfd2ef4040c6038f0b415df00c1a685841dcf3,1,1,CounterPunch.org.xml
-eab2f29237fae42f6e1b89c197463fc44ff379d43ba735071e74a934a7c73233,1,1,County_Star.xml
-5add301a46b63b39f38c55e680dca3b606b865f52021f0731f6a48367bc5013e,1,1,Coupons-Inc.xml
-6b6befc9f4b41cc1e70a24fdfec110c687dd1a26df822608cc4d662ab3ec31d9,1,1,Covisint.xml
-da9a0a0c9b638547a35e0c9efd4014cb097ef12b7ce99e9013504b0f156ffb01,1,1,Cox_Communications.xml
-47739d2c279c0ef2ee8d961a232b7448176f77f876456a41c30dc157f0034258,0,1,Cox-Digital-Solutions-problematic.xml
-c22b52fab2d5c0ae1ffb9f2f497672b1680a2a71c5abac5b9e3b11282594d51c,1,1,Cpaptalk.com.xml
-efb916c1aa3fb9d918a1417dca8d0b58b3ed0ec7d542fca086b50dec6f3f57f1,1,1,CPSC.xml
-ded355a88fe5073f3e717f77edb9653c6d370ef9447c687269dd7f1e881c3a21,1,1,CraftBanter.xml
-8a95bf245a528fdecd67ee9b2d3703a129581211501d34fa29afaef005287aad,1,0,Craigslist.ca.xml
-08f3749268ecd600f52dc3ed7ee35741b72088fc2b84ff1dcd24aae5d8609410,1,0,Craigslist.co.uk.xml
-9fe88b19037e7cb59d028c3fd40d30afb5e4db3e3f8b75299d9301245275542d,1,0,craigsmith.net.xml
-7cab090cc110a6382eb16a0807adf568b1fa09d7ddb12325302a3e9480a7c978,0,1,Crain-Communications-mismatches.xml
-b326680f30a9e718cfab124855675c6b1d30fd7dc77ce1bcee1994aeb7747451,0,1,Crakpass.xml
-a558785d006e95550a34d309e23f47f79ab251a2b90085a06ef290f9c2a06120,1,1,Crash-Space.xml
-93b54b704f90bf8ffe8721327f19c3ed432124b6ca8c789553ce07022158b91e,1,1,Creative_Little_Readers.com-falsemixed.xml
-6ee9eab4d6c93aeb2754c6b34e841dc18fd6a0a2c8d59f7d546e6db23bb56c52,1,1,CreativePartnershipsAustralia.xml
-04f0d43bd1ab894b64d8ca6fb5e81b0213a4905c1bbd19bf92700ccada4fc0e4,1,1,Criminal_Justice_Inspectorates.xml
-defee8b0ae60e03f8bf6c53e0d3bd312c5daa7d5cde511a0528266d2561a0c99,1,1,Crimtan.xml
-b79d2673063115a953fdbc430f120a2798a09c573c1adfb592b23f0bf05bc411,1,1,Crittercism.com.xml
-1cd80467b55158721959b770308681c9e59a37977c7a4581996bb359e14bcd8d,1,1,Croscill.com.xml
-6d62cfeac329c56785a2de8ed1378f036aa820828ef36c0a94ddbc2f591cb1d5,0,1,Cross-Pixel-Media-problematic.xml
-8b9817171a2f4284abfa8220e171d15c012a0a7e0fbf0167ccf4cf7e305e66ee,1,1,Cross-Pixel-Media.xml
-221dcf657c72d6e40f1a51a91d5ecd09044d123c12802befb0c64e122824d1a3,1,1,Crowd-Science.xml
-81ccb350c19e3026251587982cc7e5d5ca0b369a2b4ad7430bfae069146c13a9,1,1,CrowdTangle.xml
-c027ff29586919b8f684e70f870491c7465d14a49c4d7f4b3d9a891959d006eb,1,0,CruisersForum.com.xml
-f8652acfddf3457e9e0e85b2bd132a38ff68b381f932ddd3b5a21969b2dcee6c,1,1,Cru.org.xml
-80ff66109e0038eecb6e67362f210c6d389b69ab1044cf621d1ea28f7b624f19,1,1,Cryout_Creations.eu.xml
-5c03af15958cb4c8708e01cba17343bc6ff5960e3e4ea5f8b079e6198ecd4080,0,1,Cryptalloy.de-problematic.xml
-262a3534bf8933dc337504760c6503d084ebdbf7cf229ed0bfe3e9f778b0105f,1,1,Crypteia_Networks.com.xml
-734c847c64dd4746922d7dfd8874f2de5aeb8db469d6165352965bfc43a7d564,1,0,Cryptomonkeys.com.xml
-cb23a1bd35b86d242a4028ed7f0d6fa55a1b01d620b22f552c54ab3e8aa64562,0,1,CrySyS-Lab.xml
-372abfbdb2705be196421bfc03d1c8b87e4bd0fda032ac674fbbaed328278fa8,1,1,CSC.xml
-c5c09f646294a95e637a5f083cf0a011f0bdca6a4603d1d102973457588acd74,0,1,CSDb.dk.xml
-27a6af8836f65d1739e68b58c32ab2feb9d4567c111f0ecaf5c95d20e6442040,1,1,CSIS.org.xml
-cbd89ebf0dda04e2e724d28aa789e60106497b41b01593359e833372e862e31d,1,0,CTEP-EBP.com.xml
-7ad4d3c27fac03a257936dd9c380abec312479338110714cb22eb95085035d35,0,1,CTOvision.com.xml
-c176d8858c1e88f8d843269a3f3f99ad7350b4633a7af01212c959df51ac0673,1,1,Ctrl_Alt_Del.xml
-4c82fb71dd76ecce008a283a688f468dc95758a8b164fd4daac98b747eb1a7a8,0,1,Ctt.xml
-417001159887bb430ea3c8e00dc43c7e3b6b1b895e889674a4869c467d6ca0f7,0,1,CUFP.org.xml
-1458bcaba2c8a2abacdb39524deb5de8016181e03ae8030d8933478fb054ee1b,0,1,Cultura.no.xml
-8619973ac3fe5c8a8e4ddd2d2ba0c23acc05568d7ddb6921b33a04ee6cd05cdc,1,1,Cumulus_Networks.xml
-258af092eaa3233c9892e3567c50f656c87ac8d57750c326c01bc6b8417c7d82,1,1,Cupid_plc.com.xml
-075ebb3dfb5aa302007e743e7d34d4a2ada1db88aa6b7875a2e14361eae60ed8,1,1,Cupid.xml
-a1375ad5b72a20bf94ccf118cc4d2386590687196810774dbd35f29de8b058fd,1,0,Curbed.com.xml
-5631d37146e3333b9b113ff5ff7dd6cadfac322d6dd31d5f82a625a911363658,1,1,Curso_de_Italiano.xml
-80d1cbbb7d54bb952be8a2b8316ab8cb80377de2225d9013c390c71185d7cb4d,1,1,Customersaas.com.xml
-94d9f71dfa4e323b8aa8420abd459c4e11a852fc300dae5da00b91af9c61eb36,1,1,CustomWheelConnection.com.xml
-ecc5224bdf13e70d53652f6f917ddaf3525b293a3b014583a7e366f04851145c,1,0,cwrap.org.xml
-b17c5b6f92f191120aa22ec936beae3a2e3d78e5da93467bff6013eba2ad8f25,1,1,Cxt.ms.xml
-ecb6609b54104e170eccfb8b213b46ef8571ed159691b69cd4e38ef28887120b,1,1,Cyando.xml
-62f9443ccedff68a2edfe57cbd28c734eaaa8a90177ec3ef972c51a0a7441715,0,1,CyberAgent.xml
-8d0dee876d4bfab07ec23efe97e2f11fa140c227ec76a08ae9bb6af931ae5b84,0,1,Cyberciti.org.xml
-f31a224781a44616ce4b02e2f73ae07661d790019f81c90b1a0dcba209a1de37,1,1,CyberGhost.xml
-760cd650faf849e6b19245755eefd6460eb401ad4e174983e7dc5a28a50cffef,0,1,Cybermill.xml
-c5f1993198ebf0755d6d2b884f09cca076a78cd635c91810e60e6d0c36938638,1,1,Cyber-Security-Challenge.xml
-0cc7adbb68a40372d01e20b96c40cf03f2f7b4f42c9a42bc08754c5b8b7e6065,1,1,Cyberstreetwise.xml
-bc5f40825e2152d2725cd095f0af778875bc307c14701f874a651b3572adab65,0,1,Cybertip.ca.xml
-94ad8baa2a8b8607e45229fe2d5c8c43fdc7b53965d519bf47e075878096f230,0,1,Cyberwar.nl.xml
-514030beaf41176db4804a7febd2de28af67e58ed8bdee64ab5ba3214fa5b9c2,0,1,Cykloteket.se.xml
-11fbef400109b58c7398e550987a2f5295c4e332df7b32537a5faa80a5d18d49,1,1,Czech-Technical-University-in-Prague.xml
-7635fba229d6993cf9187411c43861a7619dbb2565874ae66dc5767b59aa7533,1,1,D4design_Studios.com.xml
-0b1a6de4023a402b4d79c12a9d2b45c4c7d2d309203536bef8ae9dddb5113e19,1,1,Dabs.xml
-a1049a56c5c2a1cce92f352b76f5c0d5d249dae33f22227864783a80a265606b,0,1,Daft_Media.xml
-fda707e8dada58291ee3866612e09eb478bb59cec4e118d8a3e1322fd624f194,0,1,Daily_Mail_and_General_Trust.xml
-5d520ded6145524b30bb81f0ea3e533faee576e33bc34df3420663a5460eeb39,0,1,Daily_Mail-problematic.xml
-48068ffeea3bac8f6607d8b7ef042097a830f1ed5141b71a6b03fd73e2322076,0,1,Daily.xml
-607ae42d3906148f643091e3d42025c9ffc9997b3064de7de892580adfbee5dc,0,1,Dakko.us.xml
-0d3faf3da32111974235f26aaa4eb8ddc0f33c008708c891bc5cd95e29172e8c,0,1,Damn_Small_Linux.org.xml
-f93e9da945b15136beb53eeabcb53d9d5bf1f31abe20c877ffb727cba27a2f00,1,1,DandB.xml
-d34d3a77ed0a2a71ab5a995bc8bd73f2fdc28bf55c1b78033d5b4dfa546b8cae,1,1,DANTE.net.xml
-fa6bf5ecbf93413bbfdfc339db3977600f5056a2837d15df74fbbb5dfcdcc1b6,1,1,Darmstadt_University_of_Applied_Sciences.xml
-2d7db66046578cb426ac52ffa00a0fc9091ea3c478a40f085fbfb2105f24d2ae,1,1,Dartmouth_College.xml
-3403f1624cd1350a9d7db9ccc20fe13619099815c6c6641ef55f4d3160338c78,0,1,Dasource.xml
-37e58b8592a8107db9688e01f4bb1a6db82fe0f0acdf6c3c1d5ad2f2c83cc99b,1,1,Dassault_Falcon.xml
-9f7e268b3ea25d3e127359a899d7f52149b714c7be091c7c4032933bf7b2aba6,1,1,Dassault_Systemes.xml
-87d166eecc99ba2e4a64419967462f1541253ef4b2778758d1f1b319bb3d1ab8,0,1,Dastelefonbuch.de.xml
-887c98b7b9913c7fdb123653bfb86245f5c77fe664dcbfbeb5dfe31e1cefd6c8,0,1,Database.com-problematic.xml
-a7d3313bd27112e3b58470d617fa23e5c45dad2250b0d024125b68fba7a5dd36,0,1,Database.com.xml
-bc17361035a720b9576f23deebf1796a2e5de6fe1d2f071e12f6f9fc9bd6c7d3,1,1,DataCamp.com.xml
-f601a504e65f5aa8578d007285a8666375288cb1430bba957245b4af3e63b2ce,1,1,Datacard.com.xml
-950dbd13dbd61b89e6072251f1dc0330d8d940503beec8592fb63a1b8c8e7a8f,1,1,DataCell.xml
-8cc5ce1e1d308f17e685fdf197fad2de85a59a1392d4e9b9097857cc31171c56,1,1,Data_Center_World.com.xml
-5686ded37e0b6efacddebf55e0c5d943d2e4dcbe671fe25e6f9622a574e12ed9,1,1,Data.com.xml
-c938b7f96b109a0488d5408bf9ff59dd325df519710ce2a786cc712cb86d951f,1,0,datafile.com-resources.xml
-03b1ba19fc1ef40bae4ed54157546d0a2579da89765a47f4aa7b0112a9a8eddb,1,0,datafile.com.xml
-55aceae12dc21dbe66e294b3e12dd302e841c213ede240122100878003203e7c,0,1,Data_Informed.xml
-5699685d2061d654ee7b7d885cf7e24450d64a375b5d99f70979b5a3d6f65cda,1,1,Datamind.ru.xml
-89488167a1bdaecffde75c48135b59f0f3f4f784e8cfa2a44235efd0c0ca344d,1,1,DataMineLab.com.xml
-3c5b4f63385fe6f06d57c28f8318249835ea86a015594291a1208657c8cb87dc,0,1,Datamonitor_Healthcare.xml
-1708197efa6250816a0daa89684b23abd5b6ec10424c0e588c4f79759269be34,1,1,Datamonitor.xml
-1e3a6e9548c4695e497f2c70b8e140a688d130c1aa832f6ee57dc3d40db76f01,0,1,DataSphere.com.xml
-3313bd09107db392a871be91a9de6944cb93895ae79e67fef855166adef81c96,1,1,DatStat.xml
-61b1cee10b27a9b8e031b2b4ad79ff61d242091833f4dacba9ff9595cf7636b2,0,1,David_Gold.xml
-4629315336c43061242bd362a2e859852e14635f6dd9f83244aad1217bab4681,1,1,Davidson_Tutoring.com-falsemixed.xml
-e1a0066617d2024182cc30bf849782e20e6ba3a89bac047901a2dc961801763e,1,1,Davidson_Tutoring.com.xml
-12910fbfa21be2b1e6c8d237c720fb5b8b6ff1adcee00d90cc7922cccaae0f82,1,1,Davis_Instruments.xml
-a57ae2eea0e68d85ded9207e3de25e2e19bb21187e9ffa2ef3c0c4e1f2e95727,1,1,Davpack.co.uk.xml
-7b9a385cac34756530787bef70a0eb04727c5cdb270609c2e487ffc181f07e2b,1,1,DaWanda.xml
-5c275b107cc2a36516a811b22fa11b25e6436b5dddbea6c8860bb6925964f6e4,0,1,DC_Comics.com.xml
-9a0e82fa2c84784bd866c0cdfcb15b4fde531d057cd5b0b2c2ae287fdb5479b5,1,0,dditservices.com.xml
-91d8f3ac049e23f0bd25000d8113675ea2f41a1a4664c29c008d90178b8f797a,1,0,De17a.com.xml
-e595f6d1b173463543d789b5ae8b3b89220f549321b5c0fbbc439059956b3457,1,1,DealerRater.com.xml
-c4fbe0562ae997ec2fc23fe2f71b63006180071fc88ac126993c9d6c4191cf3a,0,1,DealerTrend.com.xml
-95d539e0b4c808750d82714c8d338dcdacbb8a3896c1884b04db4388a20922d9,1,1,DealExtreme.xml
-78c92cd9b90932227687233bc92ad00e35daf7021423f88e5d6c6fbf686d3666,0,1,Deater.Net.xml
-7616894d0d525e0366ba31271b6947f6e960300ecf2a2b2df6c92d708e710b2b,1,1,Debuggable.xml
-5fc1bb020310df9e528ce80b1199ca050ef0013df776312cd173c8180f2e894c,1,1,Decipher_Inc.com.xml
-6761945842a5270cd2527669b0be5d0f895f99d544f4001c075bbca3b1fe8a7f,1,1,DecisionBriefs.xml
-99448264eb68a506c083d15fcfeb1d01c1649f8ac86e0631a3f79bea64e530de,0,1,DecisionKey.xml
-9beab50432900f8782d6720032b6262671d1a04f960e530d7906e866ee798365,1,1,DE-CIX.xml
-fa2f565bc4d9bed10990aaf12987f1ea6d4cda986c03ab69005c3d0106d86e15,1,1,De_Correspondent.nl.xml
-4135405716e5afa0d5020b47fc28f47d40d248d953c681853f852054053778e2,1,0,DEF_CON_Groups.org.xml
-a500306d72637bae78a1d0b371b9a8f10da6859172ac4827c61b76729cee86f4,1,0,Delaware_Online.xml
-8e2fb9b334a1504d2a79b1d59bb0b8aac0c51bb9088960524a6f42af8dbe24ae,0,1,Delaware_Technical_Community_College.xml
-45795b36ce0a095278fa9b311648ccb7f94051ed1f755235fb6e378a766c5e26,1,1,Delaware_Today.com.xml
-4686fb4dd00fdb9a389a6b9da295ceeb432f9c119fd2a14f2f1f327d2d41fafd,0,1,Delico.se.xml
-891c7562e59b43178bbc09fbe6af5da6175df8e9d5806280f639e1e04fcb4fc6,0,1,Dell.com-falsemixed.xml
-fcba2d58f6859eecc6cc3080160f3838c47e1aa35e768e8f2a919808d6296584,1,0,Dell.xml
-875695dc9d32681fe988b14271f2cf6ef76cec70f4da0f81e13e8d6572b3a0cf,1,0,Demdex.net.xml
-4d76501ee8caee0a5161167058233598eb9fcb502a19f4a492f944e5f042a616,1,1,Democrat_and_Chronicle.xml
-ac394cda45cfe2f76348a565b822a97b95a5aa3b9a9d8183e14388fc44ed86d2,1,1,Denh.am.xml
-611b6385ba2d856e584eeb80d43b70382a9d706ebdbbafb4c8c89a66722f0111,1,1,DepartmentofEducation.xml
-221fa687299221e09b24cb860931141157176f51855450427c065a9aaf6b5645,0,1,DepartmentofEmployment.xml
-7af88ee7a0e2ca327f894f5dc934e17c1c3ac2d4db7220f76edb5839162e9952,1,1,DepartmentofInfrastructureandRegionalDevelopment.xml
-206871eb7e871c35c77af7f7c754a4fee6aa11846a3f18e623110bf7cd1ec706,0,1,Dephormation.org.uk.xml
-1dfe58efe0535612259f322adcdafc6d0384a6f265a528d9916f815c68e35553,1,1,Deposit-Files.xml
-b0cd711464ff673f4b086c2911ab8af7ed3fb5a2c8bdc904cd44c91ba6d153ec,1,1,Derwesten.de.xml
-9dd139c97c93d9025c5588adacc5cdc8bc82a2837957f4f1e055bab121edcf83,1,1,Desert_News.xml
-f96207dbef9f186192e42047c313a1e3926c8f0262c4d5da9984526ff225d598,1,1,Desire2learn.com.xml
-f7ac41f01652f32d4053e7a4b47997e97f8f1aa08c12a01dd72f27276a476fc2,1,1,Desura.xml
-8e0c8d279c34bcd0e90d9c35f1bf31b7f1df755020ffa9341f6155a57fbe59ca,1,1,Details.xml
-97be3b5188364d96f05fa5c7aec1494f7d0ebac7e9639d8c09cdeb9dbf3b566a,1,1,Deutscher_Bundestag.xml
-d3ac7da52f675d22b7fc910eb3ed3c950ac43a8ada57c767bdf2ff42bfac8ce4,1,0,Devever.net.xml
-86a1f9c349c7266714c5d4a26bf9e6674443fae524e040bad4cdf0951f73a988,0,1,DevsBuild.It.xml
-fe8912569f087a1973bb0d9035dc00ab630eefed150c06a51cd6756243af917e,1,1,DevZing.com.xml
-5a3b022a658985b87a1a497348ecdca4dc3c29499681e1371f2793b0ab58bafa,1,1,DFiles.eu.xml
-24e1a5389bc35d553f48e0b8f0fecc7168ff63096b9115f3e48184e62f22072b,0,1,Dgl.cx.xml
-8f2ff5fe50e0b8edbb175166a44e2877df47e5951510d8650d18960527196904,0,1,DiaGrid.xml
-450f88fd960579ffa22b42f6e3ce2348be724fb59ce00353d742d078e4996bac,1,0,Dial_Direct.xml
-3305d9df13dc034d25ba99a814c637f0935a9801f551e418983d7fbf70bbdb63,0,1,Difference_Between.xml
-86d1db5cd3c8d7b3b6193ee894cb23a7ab7d2d5143453fad7947f2a83e15df10,1,1,Digg.xml
-72099e236e3d90ddc3029f251a6bb77bd29d4f63715c940a7953d1a124181c67,0,1,Digilinux.ru.xml
-3449a7d7da46522205fec252bc4bd787e9dfac2f15e635750d9cfafcc825f3a0,1,1,Digital_Photography_Review.xml
-1ae5023d7b4801aa93edc7b86c769faba82f98f393f917df3f9175b5bc594855,1,0,Digital_River_content.net.xml
-e310e63ef6342c335d5e5b08228adcd3af2f0ccdcb966e42cffeb07cfa76a0dc,1,0,Digital-River.xml
-81e06d0984af4aa05d175c084ce819c1859ecbf2bf5717a2336d92f2e26b6450,1,1,Digitaria.xml
-8f24d6a49faf7ac63a5a48b5dfea5d55a076865183dd5319b9cee2f6e6de8cfb,1,1,DigiumEnterprise.com.xml
-c92f784016627bcb6be1548ceefee4680d0a955a0ed387a43ac4df11053d6cbd,1,1,Digium.xml
-21360af8ca2e9b2ca3865b243746eb8a357911741b3ed852a5a85b9bd2e4f7fb,0,1,Digiweb-self-signed.xml
-ca8710d2eb4a66d458863fcf716191ef82ed5a669710d97cf69c8573e7893be5,1,1,Dignity_in_Dying.org.uk.xml
-05a99eccf708bca913786f423daaca68b711001bffc0af52e173b0f31a38af30,0,1,Direct123.fi.xml
-29be7c781f8b8f1abf997430807e02b08c9e9569afcbcb8ec6c8ce05f4593871,1,1,Dirxion.xml
-dd9c9f906d5eb25f5fe364643e0a294cbcc483237b20d765a8c550c2373ee970,0,1,DiscountTheatre.xml
-ec9525132f84415de401293436c276fa6cdf29948edde5416665e10270bd8456,0,1,Discover_Card.com.xml
-65f1777abf53781ec3bebfc418b72e91032db63fd973a751ae810e04d7297016,0,1,Discover.com.xml
-3344bcc1244a1a002611a746364efee114e9347a0a7303600b89410b381b2475,0,1,Discover_Network.com.xml
-cbdb894eb5bae94156db1210de8033c32d42a877330b14af87c4d2abe5f58e81,1,1,Discshop.se.xml
-7966250976cc1f42f14d4d6313179ddcda2f0f277c1a410c2f53eca1b3bdab88,0,1,Diskusjon.xml
-b2d668729a2456115d4b50ec8d011a081e5bb4c285d6ab5396f863801fca2e0f,0,1,Disney_International.com.xml
-e727d1adab1f0aa86e858ee68a4a980686b68a3fef49391b1ca1a03974ca9c11,1,1,Displaymarketplace.com.xml
-e9064e2b477b0b316354b1453c37a477fce1ecb6406e7629b95e388f1026eaf3,1,1,Divide.xml
-bad2483863057b0e50392fb50e8c73710e73abf0a46b947dbad947b8d9493807,1,1,Divshot.xml
-a97ee617ba3cd2e545edd6f11eb667425559acb60bab4cd0fefc060741609420,0,1,Diwi.org.xml
-f0ac70f0936b229f6b6748635f259cc1ebb6bbd0c924baf792a792af86295fe3,0,1,DjangoEurope.com-problematic.xml
-d014e7330debe4f838f895d1ad269f9f67bf5691aa460a86e070c72357b87e82,1,1,DKB.de.xml
-c1e3d22d2772fb3a45e39e36c2e0ca1078fbeed4bde190d21ac187c0fe34c5ce,0,1,Dlisted.com.xml
-8cbcc57225d5b6247f0c0201c325d8b26352295194bed8f69f20b3bab556fac8,1,1,DMCA_Services.xml
-6a73c97f88494ebfa14a1a17162df7e102994241e4a040fae5c5d0ae2e983048,1,1,Dmg_media.xml
-19a1fcb9d48789c17f465155d43b87e4e2655b8fd40defc3e42ba6e42ee70966,1,1,Dmri-library.com.xml
-1ff11bbb2cf7ffa3df6a24e92d5410025131180e1d57acf73299776fa752b687,0,1,DMS-Sweden.com.xml
-e0b18a93cb80b6b7ca26d92cd2ac710b761ce43f663cca0245e3e4f2d60b5306,1,1,DM_tracker.com.xml
-9f9c974327c2bddc9872a54faa945bdf30cb9de895d09dcb8fff62944ae169a0,1,1,DMU.xml
-cab182473bd2a1f12288fbf267de9e6bd6d249ba3f7d561186cc3b9eaca719e3,0,1,DMX-Austria.xml
-e0fdb47b4fe70d449a5936c1e49641e45bba7420d75a229368b820c27ec2a451,0,1,DNTrck.com.xml
-4b40d3fa1bc9cea039b1c056b1b57b0855d958960f06cd8b95924fa830516788,1,1,DNTX.com.xml
-b67718c7d39fa0155577dfedaabcb8f72d069298c5e7257f97b2624e8c016c3e,0,1,Docelu.pl-problematic.xml
-1d34678bb2fa3ee025f7d22e124669984e3cb25f56678c80906333de94ea7b93,1,1,DOCLIX.xml
-377a525a401137d1aaa59693ba7b61e34bb2bb38552a40240cfa0882fef9cccf,1,1,Docstoc.xml
-0623b7bec2930baa151f31cb182bd7e3ab3c7be4a9eaca4bde26f00ff9253dda,1,1,DocumentCloud.xml
-0c2d0599f841a470c303b8f4bcfffe014c25e51080b8ffa4c794350144ab4fd9,0,1,Docusign.net.xml
-28bf2d61e921bf887cc238eb70334a021e74b2b0a838389a9ac7fd30a77ca958,1,0,Dods_People.com.xml
-eac0b528231b34e19f80dd6e12aaf86d9d98092ecfe00e8c89ea59d8f1b19ae4,1,1,Dolimg.com.xml
-4c71f21fd8e201c92293d88d8162ce04dbabbd355ad4c6a2e1dca2704b129be3,1,1,Dolphin-emu.org.xml
-3bc36800ffea953400f0614cc4197c7f05485ba8eb8fb09ab24897a8454375e1,1,1,Domainbox.com.xml
-ab2e39196385d32ba4a9e22a424c627b311c49793e4a1e7027d19d29622e49ad,1,1,Domain.com.xml
-b327b95dd24b4cdae9d002fd5c39eafc73ba00a4d8a76dcc61c9fd189c0051f0,1,1,DomainSponsor.xml
-cd9c9d875b77202d9bb64e526dd1ae2ad6b5bafc9d4d6ec0806d6be463f5f53a,1,1,Domaintank.xml
-b4575808e4836f6bedcf6ca9541730adfa92585b28818a180376e5d8be6ee930,0,1,DomainTools.xml
-b24f4ad17b97e8bfa9b40fe9399e2f5623d687f5c9c427b312c206b3c2f17031,0,1,Dominios.xml
-f1df4015000247c42b9be46c989b59dd51ec2a6d2e7865a3fc7c6ecede114b05,1,1,Doncaster_College.xml
-36d041d4d69a225d35b12544499fe3ba3f53a861fccd2e6271483669e34d94d2,1,1,DoNotCallRegister.xml
-3c447bfc4ba8601142ff1caaa8b79fd8ab02970eb414108e5ef6edcff194c3cb,1,1,Dot429.xml
-73264e0180e021f87aa5b7150f02c3a74c8afca25179be5ee4306802c8f1570e,1,1,Dot5Hosting.xml
-cae36a66501f89c0165313a29e259f2cf36004175cde8a171a0c350bb65a25c4,1,1,DotCOM-host.xml
-687227146330d33670b19929f22fa13bd091a6c8b2aa9e1f25a265ac18247566,1,1,DotMailer.xml
-d51edb2655670ea1a910c1f79a85696274ce6f066ae67700baa6207d60727448,1,1,Dotster.xml
-2551702a656c30adee8da7a255387c0edc0534ac866faf1fde8964939853486c,0,1,Downloadbox.xml
-4c32fb438443d2547b3a3347d3b59eaabcbc53f9250ca6735be7dc6b22b47cf8,1,0,Dozuki.xml
-d6f6539911e50377e9ea5612c191b82977ea7723730c19d45293b3769b10abb0,0,1,Dream_News.jp.xml
-df5c6189185c156286a6de30149293ee2b3900120f2bcb2c7894c8bd0a6aef6a,0,1,Dreamstime-problematic.xml
-8c344d6d4d86bbae7bd97156567bd20fef3e934cbf3f4aed40956e62ec30c5c9,1,0,Dreamstime.xml
-4b67855f68d07aa5dd62c7b1470af02d953732516e530646752c5aae632d9baf,1,0,Drinkaware.xml
-6dce143c0bfb94e705a21f78d14dd5898868d1a649224c096ededd8910616adb,0,1,Drowned_In_Sound.com-problematic.xml
-c729946041e980450f9238a1177dbd53bd2d7f6d904444a27ff14817e5a8916b,1,1,Drowned_In_Sound.com.xml
-948fe6c1816bb404b4f3fbc4e1d21dd253cdaf065726cc41a7173f1055edb520,0,1,Dr-qubit.org.xml
-0240958a5ee854cb671e0f7dd960901e1fdf7284c1d8b0ffa34416a09fdaadf6,0,1,Drug_Forum-problematic.xml
-8a5da91c7d08a6107339674a48075a9cb0983ec7806a02b479d345598380b046,1,1,Drugstore.com.xml
-cad45c7a43cb9bfa7d8a08f92455bea3596f84ca4e3cb7218c4ab6a448448ad3,0,1,DualShockers.com.xml
-773340e22498c15fc86c69c271e1cece77c97ce19e9c4637ff83daf0b875a73a,0,1,Dueling_Aanalogs.com.xml
-d4ed3a03f0dcc445f49c298bded76f72b676629578a5a01bc25d3743aea9c8c6,1,0,Dundee_City.gov.uk.xml
-4b6114f50a7b63eaca3c4072be4f8c98e013bb9e4fe8108b47dbda9a99ce8bad,0,1,Duodecim.fi.xml
-669d76a745ea60b07aa27f159c3238d2b37f8957b30cbf99362f26821edba370,1,1,Duo-Security.xml
-d17805e7a9b4510e4c32168a16a588bd94d7114431a3610e42ef14d7016a5884,1,1,Duracell_Cloud.com.xml
-d1d3e7884fb59f03c02efe683d1ab6cd77b8d2fb507b4dca01645071c995b359,1,1,DuraSpace.org.xml
-8496afee88e5b9a35c67bf855d5aa960d9557295c3de825652c49d7666beb252,1,1,Dutch_Data_Protection_Authority.xml
-fbbe70181d1fe5c14edeb58820cc187697663b7ff1d6330318b52242cad50df7,1,1,DVIDS_Hub.net.xml
-c97bcab9e6309fdd7047f8506ee40280dca5163ddd1e7e7eafa6ac4d2318360a,1,1,Dwarf_Fortress_Wiki.org.xml
-d4930c453a7b73dc9960d7cb990a478dc509b7fa5ba1cbc5c7481b1f7cd3ff3d,0,1,DWheeler.xml
-d2583dfcf899fb4703b6fb048f03528a41c3987cd20ce5fd36595b58aeeac119,0,1,Dynamite-Data-mismatches.xml
-a4c3e69e91d4cf1c315c2a9642509a5effe61c1deb34efb00048759d287ef2c0,1,1,Dynamite-Data.xml
-182a0f534676e66e0bee294637d21c86d4319ff7e22f76205ef04a3e25dbd59c,1,1,E2ma.net.xml
-585eb2c789ad22c3f1aec8f901f4cf97df2f153bf8f979ea5db066e8a3dd0794,1,1,Eager.io.xml
-55717dece8f1f8dd0fdc62b0bf156e07f1d80a578c4b520740316ec4d3e0c073,0,1,Eagle_Rock_Reservation.xml
-517ad60fa0cfaf8b6892c72f664a4911a47a0d8f2b2219572202c2c3b16b9413,1,1,Easily.co.uk.xml
-001600a56e02f6bc26a3d000364b7b9f73c8503aaf1387b7e4ff494bdc79ca90,0,1,Eastbay-problematic.xml
-2385fbc82fc014dc18a066fa66b03595c75b2ec3005ba9d2c2c2ea8828023bf1,1,1,Eastbay.xml
-1c87354f2f51c188db3313c9c68460147571ed92296962e148563e5def8ed4e3,1,1,Eastmon.com.au.xml
-61b46e4fd28004ddfae160ab1527475fa290ebeaf0f756673c86609a431bade5,1,0,eastsussex1space.co.uk.xml
-332200909ab116588d0483ac47e1877ead9fcceb221724a8d3fa50251bcf1694,1,1,Easy2coach.net.xml
-ed4d3f6dffa7d460928531572c4eef1f58a85681ef475721ee5677407ece8f71,0,1,EasyNews.xml
-0b8829a889f400ac3171d5602ff812f5bbd6559db9d6a3d3b835ed6694ef3e60,0,1,Easyspace-expired.xml
-2cae44c9bad27b188bbf6f16bce3b3307d7640b282fac959b5427a800242cee4,1,1,Easyspace.xml
-daeafd482fbd37b61bbba2a8c9c19cb05ff2cbf1422971c4d1132d93a31c2d95,0,1,EasyVoiceBiometrics.xml
-421ade575e2e1e0e75d6c7bc746c9615bd7fe023bac2e3a21401cc6c61c2ee3e,1,1,Ebi.ac.uk.xml
-69543b744db80de441dc597c4edba83ba4ae47aab02eae703ed5782b59a46796,1,1,eBid.net.xml
-c2767020a45a762c9d5b799a7b20f5ea6a1d9e73cc4d4601491870c90cf24360,1,1,E-boks.dk.xml
-a236b2041b6696a94edf8eb10f21f2c384c1fdd022e6f93a2a6e97e0cb1d4bff,1,1,EBSCOhost.xml
-3d7ebd12328dce8238e333e2d00f53f314ea41fc6cb532d5f48682229e8ee622,1,1,Ebuyer.com-falsemixed.xml
-9a88de16ac51e357ce386b479d2c3a0d2b1e18a1df431478f16e01acdb1b90f0,0,1,Eclipso.ch.xml
-d925a3325215118a9689693a8044370e2be4b7e8e0e0a82c80262b6482a18d14,1,1,Economic-Policy-Institute.xml
-8583cd04927bd625a3a729aa8e87b900c34f5eeaf7e2ba0f534600102e6be16e,1,1,ECosCentric.com.xml
-27d5271339b66f984ea5bca4be574e9faed8825be522c825f5ee4a20e4d74d77,0,1,ECrime_Research.org.xml
-fa10b7e1c4419b8a29e8a06c051be882e02d5831c1390ad67e5f814bfbd7447c,1,1,Ecwid.xml
-792f8df60f756ad2505db27b3aedb9034fffc3b05cf532fa9474de3284aa16d5,1,1,Eddie_Izzard.xml
-7a47cd722a2b786301e7dfb9f3f1b1b98e9b990b7db4a515e208bdb341d4fe06,1,1,EDF_Energy.xml
-0fd8b8e00dca36f004c9859eea7c6ea7f89e9c52b5d2787d7da45422a390ae51,1,1,EDI-Health-Group.xml
-b22d6d466e1ec67bc4e26697a8a7832805a3a77e535b228d7761b3e2892e48e1,1,1,Editmysite.com.xml
-a5b0a947f2d00f9695d765c856b547a5c70fce6467f891cbcb0f5d0c374b0bce,1,1,Edublogs.xml
-9cfc2b1590091c32d4f070013b9eff9ee1ea82c6670dbd3e131f58452dc8cb1b,0,1,Education-Next.xml
-468c2afebcd7f360b6366069e6f9f1ff38d3d5289dae2e6a1a628f7cc939d232,1,1,EdWeek.org.xml
-dc82b0c09907f59b1b4951ca409c86aeaa787a206e90aa5e0c437709c2e6ce37,1,1,Eerdmans.com.xml
-772fc66915c575b5e3c2b9330453da903a06e156fcb452206f0b0db4330ee367,1,1,Efax.co.uk.xml
-94e1c564477de76f8aff933faefb566f48715eab8ac5240687d3f2b55cbe5189,1,1,Egg.xml
-36afd0e2b1b50b3355206dc9de254dee4270b7a11d32ba931bcdb9f634040fd6,1,1,Egnyte.xml
-7f2e5e24ced98a20694c8041b07fef96dec1c95f1a1318d9ad77fe2cfd337489,0,1,E-Hentai-Forums.xml
-0231502d992426f6dc6c8b6488cfb220c50aa5d5a624b854e956ca7f66269366,1,1,Ehosting.ca.xml
-a0a7221c1fc66a4102653f74628ce9466583170be080e90469bce515c6d3fc10,1,1,eHow.xml
-0c6fa2d103cc751bbaf39716f8b66ca63684ad1865e79a5736cb526094ead69a,0,1,Ehrensenf.xml
-d365f54ba88e9ee4e13bcfc5e40fee7822bbe84a1b6efce59d4270a6b889f28b,1,0,ehsanakhgari.org.xml
-d3812b45da73e759d3fd7d65bc13e9fc5f75d97bb15dbb0a53c4e9e11e9c7f97,1,1,Eimg.com.tw.xml
-5d5182ee2bf378935e1ca445fe4ae0e66814b9240c28cbf09cbeb842fb1fe04c,1,1,E-junkie.xml
-c851bd0b57e40b94562556a24ed0e8dc16271a0daa395b6007fd064fc748f665,1,1,Ekiga.xml
-822984ee7464450befd847ba351e2609b8b6b34ce8116ab38c54ddcffede5b5b,1,1,Electronic-Arts-Intermix.xml
-dcf1909c9a17902e9562ade0df2e832586acb62e78c714c1778215d0fe043194,1,1,Electronic-Arts.xml
-f106d27639eaf5408a3e9743c4e244ec06a28550d8484f31afbf0090f50897d7,1,1,ElevenPaths.xml
-33d19feabaf5d7650acfd2dea5a837a763a632626c755caed1bceeb42ffbb6e9,0,1,Elijah-Laboratories.xml
-9f6fdd52b76097eacb8c275e74b6e8b4013e25c7971106a229bb3524b614de7c,1,1,Elite_Casting_Network.com.xml
-92b5a0f2765dc0209ee35f20bfbab7f44970126ff686c803d592213acac588f8,0,1,Elitepartner.de.xml
-d6f781131a211360db82ee552f0436ef3008e909b6cdbd9175e60f03ffa56a4a,1,1,Elizabeth_Smart_Foundation.xml
-03f6035a0d5cd3824fbc733aee7c1dd0d9a48cca2e3b612a7c2dccbd7920b6f7,1,1,Elle.com.xml
-dfc9384b551dd838583376c78fee9d0f89b5b1c1f4d51166555a7deb12174cc9,1,0,ellislab.com.xml
-51e806eb424c2a1b930fb7d2f4a05d99d3542c3132395a6d472af21d0988165b,1,1,ELTE.hu.xml
-995c937ddd871c8b758697457a5b14ca6c04d0911197fadd29b617391e49a16a,1,1,Emailsrvr.com.xml
-38acc77f3a1684db15405c335ffc2053bbb6959ebded1e53a76102e3972473d1,1,1,EMC.xml
-1d5f53d890008891065d1172327c971c2aac7a7e965e9ffdc3feabbe2d037492,0,1,Emily.St.xml
-13abe2167fec64e991b8e89e9efedca61be565e9d4f3b9802f500be922b9cf08,0,1,Emory_University.xml
-10adde51388de4b242da1c1b230b141ee9c99df8cb5700a268d6848aeb34769a,1,1,Emsisoft.com.xml
-db21ed9907ecd72397a925f1a47e5c99e3d84024370ffb30b87b1b5142880bdb,0,1,Encyclopedia-Astronautica.xml
-fdc6f35613ca403c67fd77e11e53de8f785438778f401276c80ed5293f37a5b9,1,1,Endace.xml
-431fedb9cd9b68a915890080f1eb4996aa3a6edd00e91b6cbcd6749178cf26cf,0,1,Enecto.com.xml
-f0de518cf0f0eb2e7bd3bc0e7509804840f8bce6126de38ec4210f5602675b57,0,1,Energy_Live_News.com.xml
-1ff6ed01db6ea788c98c9cf3714e01be738e93a7f88a11659cbd8da702bd31b6,1,1,EnergyMadeEasy.xml
-fced7732808ff54602eebf5afa0d78600effd4bcf27494067116c488b28736f9,1,1,Engineering.com.xml
-6418b8410785f9fade87c96494372065791223e8bc6dbf60a3a6db6717d827fa,1,1,Eniro.xml
-1aa1649082f82d7c748a59a29545356dbe9e111f925946cb4fdf5c40cb47c437,1,1,ENomCentral.xml
-f3e10d17d0d05e043b5e1077e372812e787f4b83ea8d7f1aee577163de67b0c7,1,1,Ensighten.xml
-31b251f10e07bc3159c86791dd343f857ffcbc67d3695423c5c5afb8a95023da,0,1,Enterprise_CIO_Forum.com.xml
-1768b65f338ba24a98f9b7bba8b7faef74f031d06b7540529374741f180326c0,1,1,Entertainment-Consumers-Association.xml
-c96dc247749b710dc0ff64ee7c60b721685ccc4272edec7d4f8afdcea9e124b4,0,1,Entertainment_Weekly.xml
-80ef1d15e2f1ed5a951dd080ea0f482e68dbdf69d2d26f37c4db7508e5a6f2ec,1,1,EntroPay.xml
-2ca4fd68486c7ed9b2229b029b17f898ba1c99c23e7132da7c15e5d62b8de32a,0,1,Envato.com-problematic.xml
-03342be1f13fcbbb19d8de98a172c33e0ef92b8322766df0743b05820413d7dd,1,1,Envato.com.xml
-09a7159cbece935f73ae3747c2c83a12d6852f1820ba99d791f6d6a97515c6ce,1,1,Envato-static.com.xml
-a22a72ce5c72dbfa218f9c19758ae903dd5e535bc43527a08d1b1b9b555b6703,0,1,Envirotrend-mismatches.xml
-d6bcf352b17998cd3dd749252c04696198281490324bcf4223fda56d223960e2,0,1,Eole-Water.xml
-679f6ae3966a79efa8f039ddb547c7acfba050eca8a54bea93201fcf268973e2,0,1,E-onlinedata.com.xml
-b82763e9cf1ccf4bfcf7ce931d4971bbd5f5d767431cbe015043bdf2e307f181,0,1,EPA.ie.xml
-05fb77d8a496e98fe1075d4917dc0711291c05f7c72c459a37ab13c193858fb5,1,1,Epartnershub.com.xml
-550a8a98ae139b24fbbee295ece882cc9d0fe46ac017093728e3dc1ef33402cd,1,1,EPB.xml
-bbc9379f3de6ff09603547ccfb9a2db3010598de0ffa419b5a75d696ce451ab1,1,1,EPEAT.xml
-20dd382c301bf79bb6358a31b02140bc49ea783847600c61ab6440c15525823f,1,1,EPFL.xml
-52a6b9dc4e013008f58b53424d04e899dbf6110a1d6ce7b5d8eef35a8a399a5f,1,0,Epic_Games.xml
-7b8ae8c613a3a8af91a71295c4ab70980384910c901ad3418114f71d56e70db3,1,1,Epic-Systems.xml
-dc0702e7cfe81c1f0eb6a0294602a0787e49cd0dab79da2fc7f012a1821a9860,0,1,E-Plus-problematic.xml
-1c6ba142e803510fcc4451fa2ef8a709e1a63176524d82ea851101333e190e8a,0,1,Epoch_Times.xml
-e2f2d077589a9a3ba447a8dfc979933810d9490c5db9fe1d4aff1775114c0714,1,1,E-prawnik.pl.xml
-6534287a0e888534a87b000596d98aba7fce20436b1d87bd32dae355c5c7e76c,1,1,Eprncdn.com.xml
-80e0ac321f52fae12e7289974aaab08e19e64b23680086d9c360ab0f000076c4,1,1,Equip.org.xml
-771c90d6313b15fb4d41a8c89ac03ef0029394521c105655c3d1aed1a8f44db4,1,1,EReceptionist.co.uk.xml
-5acbeae1638df64a1e8ab2a261d2b3f810300c376824e2865970d0a1932cf595,0,1,Ergon.ch.xml
-3793098713d9b3a938d3f649c355ba4c73571d8206b1fefaac8403766c7053e7,1,0,eriklundblad.com.xml
-4c8f9f8e74ca65cf55a0f8fde1c977b2c99f258045a95420add5243cb5ffe8c3,1,1,Ernst-and-Young.xml
-21af6451e5293d3c590dba9f14d347d022d8ce5d7a06b8d1960a2d7dffbf76b6,0,1,ERNW.de.xml
-40d2bb3f9270e7cf99f2bf2a446888d4c7162b079f5a196e0fd306ca7ae6c810,1,1,Erowid.xml
-1d0cf4aab6228ae65f34ff4ac5313082087f547d0b773e9403eb9ec40c19e30e,1,0,ESET_static.com.xml
-d23e25ca118556ffed2201bfe3df6bc1c7469563e1b683f82f65af65b0f738ce,0,1,ESF-Works.com.xml
-8d75ee8e4570e2908b5bcbaaeabb74d36ef0c022034f86565792ac558783c61e,1,1,ESI.xml
-ee65149b865e4f703d13430f142007992a518ed6b41211180268f09bbd5468c1,0,1,E-Sports_Entertainment.xml
-ec6859a3f65afc49a2741962c980c00d5aea61f0f584d527579ff4e4bc1547de,1,1,Esri.xml
-b4ebbea0286d44564b7e8984bfe2fe38ce080b1390a0d6d37315d0993dbedd5d,1,0,Etarget_net.com.xml
-e14997fcd1b49623692ba6542a019182b6f66628abd718680fbe20fec3725e7b,0,1,ETegro.xml
-1bd67e0a0c612c7d6cec4b3e9dae388f7fb4b4b7437030889e7af76a0cecf27c,1,1,Ethn.io.xml
-8d9add38a1725f7660e8bc03f9f6181886dfce418c3a726cef21f6672eee6955,0,1,Etipos.sk.xml
-4db319b5a12d2ba768b16e2ffcb6405c1ac8960c7f052decd7ff5c547a334c2c,0,1,Etrade.com.xml
-4ca176b8da733a7ca42a057b1611a7cbd1aa5d217bd645828cca28a160b12f52,1,1,ETS.xml
-ae016ec38dd372b50f679c03442479c2df1eee65fa59a7173a1548e4b289409d,1,1,Ettus.com.xml
-a09d7487f8ee35e17798818da7d1638ea49a417b28b17ab4fa4d7f48a27d653d,1,1,EUKhosting.xml
-50966d742f6bf11f91d21b8693bb7040c204c0a24c6f4a4ec2e490cd65eaf46a,1,1,Eurexchange.com.xml
-a9dbe1ad67594b75dc7993c7e982d50f8cb7b2a57ec68f5f42fe0aa685152c47,1,1,Eurex_Repo.com.xml
-6d3e2a1d8568935ff376e011fa835b0a9c78a06c40eeaf5b9732abbdf0a27808,1,1,Eurodiet.xml
-42e2dbe48aa84598729db8c890ba39a3840216c87e5e6f467b71dc5ff6f58173,1,1,EuroFlorist.no.xml
-4f002776c4d981ff1f1ecf7c7d24ce1b803258872209f871ef25c0e58cf203c6,0,1,Euroforum-problematic.xml
-c600bb6969b1e2f1ea27f7e6870f47efe67a46c935216b63fd02a5eb03f5e7b3,1,1,Euroforum.xml
-c9efe1af0aefad3c1958f279beaf0aa6eb707bc60bf8172bf57ee2e97c25063e,1,1,European_Energy_Exchange.xml
-9f07a1cd07e17aaef37455a8e6927200da4633d51836089d790ca00caa2a16a3,1,1,European-Southern-Observatory.xml
-fe4a516d3f0f9fe2a5b9b5fb91d194c548e2ba9c241c7a6ff22062229dd6433a,1,1,EuropeanSSL.xml
-1010344043596531b3010f05e41728fbf666944b16f1a0916ab3a7fc1635dce1,0,1,Europe_Miniatures.xml
-eb2c414ae4ec2c034261b3cd828b87ba62ea8fdf6208052149c7cf7fe882bbbf,0,1,EuroPriSe.xml
-c3ce6b72a929adc8d7e227f86884c300979feb2a571c85cc44db4262eaa6881a,0,1,EuroSmartz.xml
-37d22280f426eba13e6ab26c326c626ed45229c4743065d529956265887b4415,1,1,EUSecWest.xml
-ba895fc1fee78f637b19286b6836b2faa3c965363e4f93c02b3c3e4e098d8248,1,1,EUserv.de.xml
-c7d1a78c0d09e8db961d0d711d81b4967193f1692e7a23198a996e9dc8dbfd29,1,0,Eventbrite.co.uk.xml
-efd880c7e0b22e305ac75d6d915f416fa3b695b1d2fd357a8925e9b661215388,1,1,Eventim.xml
-7ddbf472286dea4067fe4c1a3725df3c096d6b0144fe01f43fb8df5db7cf19b0,1,1,eveonline.com.xml
-cd93ab59fa23cbcc434b5a873d291fee6a7f759dabdbf480ee4f6fcebc2c26d6,1,1,EVE_Online.com.xml
-1213b9bcc58aef69599cda534a1140050ba6a542bafdadd27e62d1e88b6e3b56,1,0,Everest_Technology.xml
-d48118988ae9b34e8c0fc3f099cf85308fc8e07127992dc9ec238cea5889ad66,0,1,Everyone_is_Gay.com.xml
-27fc0491cb9c69aa88cb6ef0bf003371c819439f42f957a61091d63168f51139,1,1,Everything_Everywhere.xml
-946a4fc3e8ca86971f8824a4576d947fc40b7fb4d50852f9604278a3d0f97ec1,1,1,Evo.com.xml
-97898e32a15c85d1f70bb1b15f7201cc03c1ebe0b624949fcd4e27ef48619c89,1,1,EVoice.co.uk.xml
-fe922c312e1391c18fdd640a006a0e56d96bee6e5701e0dabb780b3486ef98b5,0,1,Exaccess.ru.xml
-ac7e22f23510bf325b16d279b82208eab1976f2e435c2682562d600384234ae7,1,1,ExactTarget.xml
-1d3186bff2492e46d6ff1324cedec5440076462c9869bdc1eb768bfd23bf9b65,1,1,Excelsior-USA.com.xml
-6841328fb4f2cbf6061dad6d4e8891fe0cbc9ff71db8155d4a10e3cb15ce1195,0,1,Executive_Interviews.biz.xml
-7e58c72f6a66efc1691253ad38821e1e8be96d028e6692d2af8efdb7d5238d81,0,1,Exhale.xml
-8491f4394a13238d21bff945729a1b2853569bf290eaf728ec22aa9045cd2cef,0,1,EXiled.xml
-52c1616395123a53a9cf2873a5e6a9e39b276d552b83a6532ed7b81ecefe28c3,1,1,Exinda.xml
-e1c24f2f143548c3511c57c92626474aece78bfda4b736ef5c912ed1bb7c6bf3,1,1,Ex_Libris.xml
-0a3786f6330146b7315557dd414440c6fd94ad57829627a69c2e3a8201634f42,1,1,Experian.xml
-53d157231d09238b4b86f5d623b23cafe9e649f542c15ca65c93e4c03da3198d,0,1,ExploitHub.com.xml
-3daf6786c230dc5c0c06606b5b009a1fed1ec11c615ed5ef0a212fdd3f6c0c84,0,1,Extabit.xml
-03b6227bca68fc7f7a99a9500fedf38d07361ea41dbf5e823158eda5e600f00f,0,1,Extract_Widget.com.xml
-ba491f922d7f7708c316a6f990fcd9a5182b43ba50bc345390131c93e38d921e,1,1,Extra_Lunch_Money.xml
-2c178f3f33ea32c51ca6e0436e8aa995db80e8648fd9f756bb8a12628734cd68,1,1,Extreme-Dm.com.xml
-eaf38f05e497f0de0bcffe812f663d61fac0de0f17e7a6dc47bd080308c2c72d,0,1,Extreme-Light-Infrastructure.xml
-189373f44fa59efa0ad0bfde91b432b0b0a190d280a82a4ef9712d903a0c12cf,0,1,EXXile.net.xml
-b985a1711868147214c9661f88cc7109f83913c6a81a668a18135b08a570e3af,1,1,EyeReturn_Marketing.com.xml
-e8e7a354cd00f2da91924a2a1dc6bdf3be5cbb231ee46a3e7565b8f6620e5361,1,1,Ezaxess.com.xml
-c3187433dbd4e12c9601d6e430156eeea8288466cb27eff31b4505881707bded,1,1,EzineArticles.xml
-92aa78d6448556122ff7bc0dd0cc005eb9045522e190e1a4148561e72bba79f6,1,1,EZOSHosting.xml
-dbcecf1c78f18bfa326267e0ca37f8f94debb98236913d73092883b39df4f204,1,1,F3images.com.xml
-03aee00629e0916b9627f907484ae885e2b9e783dd789c7b928dff3dee8da925,0,1,F9-Distribution.xml
-b775d1948ffe06ecc74d13e8d848fcf29e33f2acfb5d8c799f86fb300196a02a,1,1,Factory_Expo_Home_Centers.xml
-4a92ff9d921991ed19d736e4a949785ed0d552507c4e119a2d63cdf6451bc9c1,1,1,fail0verflow.xml
-cba3793bd310eece3add728dc772c0c7f787935f717bd45cde44971041dc88b5,1,1,Fairfax_Public_Access.xml
-40df368dc0fe51e760a55b921447ddf863c15c59432124f7871688c0b713239d,1,1,FairWorkCommission.xml
-2720b3927f1899938a11c2ed29befd009d6de512bc85a56b924a91df4778b087,1,1,FairWorkOmbudsman.xml
-8767c03d704f5c34d0add741e10a7faca4c8f782e4c1c4e56f154acfc6b1b745,1,1,Faith_in_Motion.com.au.xml
-fff0a81810a4742d4a22da1c61e87ff21b4ab86f0f104a6d20acdb3c792aa209,1,0,faiumoni.de.xml
-256c0deb96901b3d608ee6814d74975e4e5372b0e20862f76dc0e06114b4b8d0,0,1,Falcon-UAV.com.xml
-bab2a9213692f4d6eae97d27fe7fcb990418aa78751b5666157e744f391734f7,1,1,Fanatics.xml
-6635f4155c42dd8f694a85079f66436a3cdd466391b4814ff640259a9a9bd698,0,1,FAPMC.xml
-c092efaf47353f6eaa1d433b2fc56eac6e8a7d59829fcc9882e1fb777c79b54e,0,1,Fass.se.xml
-391dc7eb6e57eb9a1d3867979fdd3d15cc6a59a605a9523de89750c21f877c72,0,1,Fast_and_the_Furious.xml
-be9a331d03034ba8a740ba7b54b20d6ccb3b852bef352cad65509db3c1e49ed6,1,1,Fasthosts.xml
-9c51c5f3685da502281c46d976f7ae3bb8b9b2ac9799e41eaf7253c170fecc15,0,1,FastSoft.xml
-bc7bc4ce9b7b91da77c0f98905fb9d863d8a97bcb16f1bece114db0fc4b4fe3c,1,1,FatCow-Web-Hosting.xml
-1ab60453a8f85bd25292f19e45deab01a16482933e681f6f43bf43e1287d2f62,1,1,FC2.com.xml
-76e1a443721c7c57e7976241d045defbd2218dee42cbdef6a13472e13d9ff63b,1,1,F-CDN.com.xml
-3b9a47db267c9a3cdcbd5b4e803ceac9d44fc713e99b99169b6876e8a5ccb0af,1,1,Fdworlds.net.xml
-627ffb81ba3f3cd4a9222cf2080e4bf932ff48fea5389704ef267df76aed50b7,1,0,Federal_Business_Opportunities.xml
-6fe541e9fd33bd5062d8428c29e7cd90f9646b54e42ff23bc4b18686804826a8,1,1,Federal-Communications-Commission.xml
-1fe4b4c61b741995024b05158f8b082a8da905b3578624c82154a54ec6f692db,1,1,Federal_Emergency_Management_Agency.xml
-29bd5deeea4e21609ad5ff9955c0b13fd7c22c8e91544b18bf2bc9df30c8d3cc,1,1,Federation-of-Small-Businesses.xml
-4b9913b6e81a1fb71efbdc0bb444bb4d89c7946161191c493c68e2233d018bc6,0,1,FedEx.com-problematic.xml
-4b6b7255ffd9d15030ec0e49ee0e4514641c6c3cf78d1dee3a476216c0f9dcda,1,1,FedEx.com.xml
-4f2bad24caac0aa2a45fa8d8a547c63d07fea7183dbab60d18425389e1600782,1,1,FeedBlitz.xml
-712b5353e478054578fa7c0039cf93e6d946a1188d94215c0bac43df6c957be8,1,1,Feedjit.xml
-120bf2c17ec6d85fee4a5bc1857fbe29f7d40ec9243c4da31c47bdcb59d9e96c,0,1,Feefo.xml
-c0fa3a3a0e5df3a6f3776b5d75dcce98af2458b4caba0e2f10f6f8ae41b205c5,0,1,Fender.com-problematic.xml
-68973e7c4a203cb4b69a924b9701da71a4f7e96dd4624d0a1e6c5db6c65d56a9,1,1,Fender.com.xml
-e86d5e3ca3a837e961b2ca3031e5cdf8d15a4297ea12fda82280db4205b00c67,1,0,Feral_Hosting.com.xml
-548de6901dcd1cb2fa257066a98ba5c36f0c51aed72230d44ec6543e5e3c9c6a,1,1,FernUni-Hagen.de.xml
-c1fb7ec02e6689363f8d40d2cc81a25eb53e3c936f18a74c6131ebbf3e90581e,0,1,Ferris_State_University-problematic.xml
-70b8a27208019d2aaee4bdef4f33f21c8b2795f723dd79dc5e1c3090f6491a0c,1,1,Ferris_State_University.xml
-c1ef55cc3abfb330c375f30f904299acf383d9aed579ba2b95432f8c5acf192d,1,1,FetLife.xml
-387ecea2d464c5de4043428433276de40b08f1d4c2f674c20082c60a1e52bb83,1,1,FetShop.co.uk.xml
-b415e81d1a66aef7b49d2569612f1ca6eb70cf80ed84d2dfb6137889d95d5a5e,1,1,Fibank.xml
-695f2cbb45552fb9b20b3dd59d70843ee1a2ec102625b330d8900d3d149ad8dc,1,1,Fidelity.com.xml
-4fe40f6560c89da3fdcd511a681c9bfab0089ae3e7d791e6150f0314c57845d2,1,1,FierceMarkets.xml
-6c5fc7be0086b16f85edf4e13d77f5bb86d0ff940e14524e7cda87bfd30a7bbd,0,1,FiercePharma.xml
-b18bfe335ab271a0aa72bbe6836acf7b4a9fa299cf03b54bdca37aa90842ef16,0,1,FIFE.xml
-03880d4b9139e6707bcf197915a4fb951af11692b30d0be2875ff60889f45e70,0,1,Fifi.Org.xml
-e661de8e8c435b87060736f94073950e28e5c1757b94e3f5f49ff53fc7b2c15e,0,1,Fight-for-the-Future-mismatches.xml
-684ecab5e0c791e19b1ea95403cf7fa2afd65f3085defd36ace614969daeb338,1,1,FIGUE.com.xml
-03cac8045c0788bdb20a69714ad5af1627ecb48ba8e82a9d67ca83e7c1a3fa85,0,1,FilesCrunch.xml
-3f6387693b8ce15350c75c5e2d9e1e699c7b527f63bad5215b80a466f16a771b,1,1,Filmdates.co.uk.xml
-f76376df115bc0956118c964be3da7e297cbaa87c35bd528f71b283c775cd770,1,1,Film_Linc.com-falsemixed.xml
-59611b24cba1317d9df766af54fb7ec86f7e74e785d7e55aaae75334a59de760,1,1,FilmTrack.xml
-c26d01d28e436054f8013c406a500abe9d928391e09c1795153872f0ca70ee30,1,1,Filter.xml
-e706952754f78c18b405a09848870df80990cf7519c594c69560c200e29c0639,1,1,Final-Score.xml
-20ade5eec380ab16ee4861c6086b39ec5beee7c33575e8f1978e5d9e3e8090ce,1,1,Financial_Post.com.xml
-47b1f8306d27e6bddea226d1bd80cbfe3425d8e5b48d4c4fbc7d1127842135aa,0,1,Financialtrans.com.xml
-efcb4402229ed43863e8ac8eefcfcc9f73cfea6ae53352269795b1760d0e0a90,0,1,Financnahitparada.sk.xml
-4091f876516cee6dd65456d65fc8852ee7d13b81638ac038b35a799cee08dafd,1,1,Finanzberatung_Max_Herbst.xml
-e74290fbd951caf49445188e6d7d3d1a5e4f0880f0355ebb3f5461266fcaed5a,1,1,Find-a-Babysitter.xml
-8945b83b4f5a1585e6c400315aefffa1d1432c3900cfd81e9d838c5a28e3aa05,1,1,Find_a_Grave.xml
-ea59a590e5d74dc8cbc7c6a92cc0ae74cf6e0f509ed0b458580792958410e339,1,1,Finka.pl.xml
-552bd8ab83e0e59b4196d9ae48bbc364136198778d83a89bbc07c068d58618a0,1,1,Finn.xml
-c2a6e87647595dd9487c3959ff5cc3b598bcf08ccbd358f24f90b988c478d8be,1,1,Firedrive.com.xml
-03e5723aabe6c8aaf1cd4f50bfd7796d1434c774178cd04e445714ca33c448d2,1,1,FireEye.xml
-265ad3eacbfd50c7c49f935afb3673fa55071a44114e1ee782e21f8f25a29f84,1,0,First-Central-State-Bank.xml
-711d4855340b3dcaad02671121099aa096bea856730eebec67c4231c89ed2a2f,0,1,Firstfloor-Electronix.xml
-913044ed60c86459293dc58bffb73faafe062040562e99683547bfb0efecdbc0,1,1,Fishwrapper.com.xml
-875a6bee375333a5648a79ae88a5850bc492a276a55fe8d7d13cef47a90784db,1,1,Fitness_Market.xml
-698d76438e1237c5c6c2e2645d5ef1ed3872510a0856110e4576123d8375113a,1,1,Flashtalking.xml
-9eda8209afff61900e1b48f9864a11eba047613312f2a7dc0b644da1e26ed4b8,1,1,Flaska.net.xml
-d70fd53f82da347a3ce16ffe036fd12a6f32ab6b186e14eb6975359d24c5d0bb,1,1,Flightglobal.xml
-ec9d02d41957b37a86d5d2fe66f099b956d084f4f616f2baa74cac3b040d7495,1,1,Flinto.com.xml
-08209bebe2a624ee9c807208227376a322cd6ed48db90991b4b5ad6301e4cc83,1,1,Flite.xml
-8ea7a8f22b03f1b163013b35d0ec7061ecf92eeddcaea9df4196738906859924,0,1,Floating_Hospital.org.xml
-3de483cf9eacbccfaef3a558edb6df3c60ebd7d167cbb9c7744da089487651c4,1,1,Floek.net.xml
-b2b785c62c6cc9f4ed815d08e4e8d92e9349e72d303e9ffdcca16b74b380b0ac,1,0,FlokiNET.is.xml
-4def65d5306408980eddf9267615a711b000ad48c4e177c6cea446ec6f822a41,0,1,FLOSSManuals.xml
-cb0a3d716d8f22654d96a8efeb32590ddd38adcd3ba9ae62bed7491c5e5486af,1,1,Fluctis_Hosting.com.xml
-3962fca2fa36bc16a4000801f7f7abd4d2ab6f5445da67e238a58fcbe23801b4,1,1,Fluendo.xml
-fd60fa35d5377fd82b0c3eea6e25949f63b3cb3ff37721a75fdd89a9181c77a7,1,1,FlutterToday.com.xml
-bb76186780d8d90c0bcec3715e197a685e576f9dc18649a8e7c518698274fe8f,1,1,Flyasite.com.xml
-f8b053f507e3e3c0801356c9285d53bb736caa5a9c78e07514d501c8c07e06be,1,1,Flying_Meat.xml
-3c3c06bc7874b0329a9992798512978930bddbe3bd2fba2c935c8c1d851aa429,1,1,FMyLife.com.xml
-daa09a73d487052e243c63b74efb4e69273117f17917c6c7c15b8797d2cac930,1,1,Fnac.xml
-d72e8aa6782b02db113490d1de8331ed84be8acbb5bfce8bf0f7eea8f44df19b,0,1,FN_Mag.co.xml
-67380bbdadbe0ceb6daba1a7b93df6aaf590634e21be8c6162c07e2ce6ba834f,1,1,FoeBuD.xml
-d5760439b01dce5d6f1b9ed5826fbdd38f6d48fec3e5802c79da627d85a4089a,1,1,FogBugz.com.xml
-6ada6acc4a35d68450a5ad7efcec79e1128dc0491a6e517809217656d16b5a92,0,1,Folksam.se.xml
-92fb7403bf44f0f00f9ec6f04bb16b342e1b8eadf577157595b4dbe7b4a34e77,0,1,FOM_Networks.com.xml
-2c86bb4df074f731101dc6d4c65a35e0e26f30484aa4ade5a0645eb4b3c98715,0,1,Fomori.org.xml
-b50cb36cfc409474b96f6198d97d5229a1392b250965bd62553b174ae393b555,1,1,Fontspring.xml
-53c36aff76d03bc81d48f1d931230ec64bfd21cc1f5e5ac1dd7943ef38bdd2da,1,1,Foodl.org.xml
-53b8be8ed78fd92885df14e5918a7ec2398bb0361e9eface0bbcae3291503198,1,1,Food_Protection_Task_Force.com.xml
-112c78adb523ea5cbeda706d4a5c1f24cf680df7d98fcb85f28e856ac37545ff,1,1,Footaction_USA.xml
-86f0437af80dcbea036078deb4e385792844e1f98493e6600e0ccf8960de1165,1,1,Football_Fanatics.xml
-2f4403eaee67b987bdf91412cc3735edf3990acb8d5443a6b31ed00764ee37fd,1,1,Footholds.net.xml
-9ce5cf4dcf915fc82200c9af860c2f36936b25ac868b19641b3fa80465962a78,1,1,Foot_Locker_Canada.xml
-8dbbd3850eb17caa99123d6f3d9cea15c2b674519f1c6411ec43501ef62d4cd7,1,1,Foot_Locker_Europe.xml
-64f6608fb3a49ed97cc3c98014a60c459d99bd0efe8b7a8c8c9b011deb70c74c,0,1,Foot_Locker_Inc.xml
-d78b9c027b108b40f4020703d1bc5b49e10ad84b7d1feaaa88e6a33d76666cb3,1,1,FORA.tv.xml
-2656476357b57487509d522bdea0c4ad5d18edd3c9c9f2009be8b7e59e5b15c7,0,1,Forbes.com.xml
-8dbdb8d0c33359eca2d3b91a028131ee6f9cb22f6b9e8ae7c6c3fa557418137a,1,1,Ford.xml
-983c37c96f4294151ce45eb1842e69f2bf77a7ac3bd869db4c8c5d5983fe673f,1,0,Forensic_Institute.nl.xml
-477e679288537c878c798c1ab78c81fe0a188e245faf781c5e854edefd9db231,1,1,ForeSee_Results.com.xml
-dd60cb79dca408a6626badb165eae7d91c1c19a529db97cfd40cfdabee2a6c81,1,1,Foresight.org.xml
-3729a2d772256b27c3db2e66decbc91f69abc6f63b619c23b63357475be39f70,1,1,ForexCT.xml
-eaf480051df64d3f3ebc9565092385dede2300b12ccc58d65e53a851b5eddd1e,0,1,ForgeFields.com-problematic.xml
-c67682b0fcfb5b328722d84fe8c192e393451f15d3deac0324c37c193edfe68e,1,1,Forgifs.com.xml
-c95ff5709f173fc8a598a15c85281a04e9be21ddf5917b5683159dc821369808,1,1,ForgottenLands.eu.xml
-5e8fc987828220c55b34c788b14e05218dd72014343d7d968aa77361601bc7b5,1,1,Forocoches.com.xml
-b6fc958980c2540d31f01eb6ede8ecf78e1430e81c407db0f84972ba310630d3,1,1,Forrester.xml
-82301cb8f43959aff28e1754ba6c78856657ca3131b69590a0685b9e81e4913c,1,1,Forums_fur_Naturfotografen.xml
-264f33da785d9e39958caa7f1bf804da75141f518af062069fc1b2c076e7d8a5,1,0,FOSSBazaar.org.xml
-64d7895f2f69cc720e9d958fb3a212eeb0ca68716d33b408daa6721f8ffafcaa,0,1,FOSS.IN.xml
-8cb75710f6b600c1f0538e848002787e88fd11bc32273c2732437c6b51b9503e,1,0,Fotki.xml
-1a248675d605c04901e6a2e6ba54332eeacca5a8eadb46a6d405d4a0ea1dadb2,1,1,Fotocommunity.de.xml
-7266ee61f66b23b99f90aa55949f4a1bce5e9c0b459d10f0dad9ebf218e6d266,1,1,Foundation-Source.xml
-f0fcfab8df8d22bc08e6ee92df4f201538ace2bf944be743223cf251d26c3c46,0,1,Founding_Fathers.xml
-cd2bda2d38e524acf1511b0118c743cd822f7282adf50b18545d5308f2bca617,0,1,FOX-Toolkit.xml
-75d0aaf013542cfe0b5752884c6f03e3c8462920eb045ca6a52b790a27f60d9f,1,1,FoxyCart.com.xml
-86837c3789a29dad59fe1334a80c374a588b9620a0c16e0f783476c87f4a03a4,1,1,Franken.de.xml
-ae74ef43038d642c2f74200ec484b36aff955a03e75315853845ca01bdaeafb6,1,1,Frank_Timis.xml
-23338597645b4a3ab4ff7b8841fc3efea480fe8444de694630a0462795c8f746,0,1,Fraternal-Order-of-Locksport.xml
-bd571d2eabfd6f3604739be824871f11966b43a49812230fb887034c5ca95d8b,1,1,Freedom-from-Religion-Foundation.xml
-dfec799168fd8446708a1540518f2829c0d71890a380ae775ed4b73ef262b88d,0,1,Freedom-to-Connect.xml
-06289ce6c6965c19db4ea384ce01dab040154235213580c51a09ebd7d6513ca2,1,1,Freelancer.xml
-d0da63b8cfb124503218f5d2fc8e2f6de394eec88e65d7f44dc5b9e346f235ae,1,1,Freelansim.ru.xml
-44a4c4d7426d25595b11e3c87bcb86943862cd7fe37c1e05da3951f4377f337a,1,0,Free_Porn_Gif.com.xml
-5eb2f3c83b0135ef3f3022b665f265cc4c63b9d243d992fb4de5320a1c4a3026,0,1,Freestyle-Capital.xml
-1a364af118ce9c0abcfbaa7635c1e0fba64baeea937b98e2cd06c80447faf42a,0,1,Free_TV_Online.com.xml
-cf851867f58cb76f64fdcdc2204f3c7d25f19485183165c810abe31a5ed0e77d,0,1,FreeWheel-problematic.xml
-ca17252eb72c6f0b2056e8e4af0f2adfa73302c3c21aa229200a7abc19b14e35,0,1,Freight_Calculator_Australia.xml
-66d7ab2943eba6c35563a87d17ad66b850b5ca1c7fc354f3df7271d33eecaade,1,1,FreshBooks.xml
-be60c615333e182ce3979e404ab1fe04d9f73a1c60259c59f1daed9cf520dec0,1,1,Freshdesk.xml
-261de79a38338955d2dc593db32764dd61a0b73fd196a3255b89239fa4b569c6,0,1,Freshmilk.de.xml
-b4b923a800b65263a42c953b35b397142e56767dcd84a89a77b2888ac9845053,1,1,Freshmilk.tv.xml
-1bc4e86cbfde644d76b06a2d42e53d2d3ad77aa44357b51fc3cda52cc13398f2,0,1,FriBID.se.xml
-bff947bed72b757afc04cb00721c711a372ed80a005a06146b865dfe0d3db6b3,1,1,Friesland_Bank.nl.xml
-620873621a11c978d24c3a235dd4001a00816baae437632dd14241661f4b9eec,0,1,Frim.nl.xml
-9e65acb551896b99f50fa5cae92b91f30b6ffacb5b5015a4b8d8b22dfdba4c01,1,1,Frontier.co.uk.xml
-74573855013be34cb1230aa388418d4134921cd8cff3db47111c1ec2fd3a386a,1,1,Frontiers.xml
-441b6daf576624389ef1cabfbb3976345111cb4b10a3f63dd90d82c06dc6795b,0,1,FrostWire.xml
-27a1731abec65c4698caee9511324775f70970382a765b5291b1109cf7ee85fb,1,1,Frys.xml
-5da2e7d384561f026710141bdf85ad78caffb625e054d256e104c811b6630ae7,1,1,FSU.edu.xml
-f9410ad9a3bce7ee4416570f0a95641a9aada55c9b553a732744fe64b5e63cf5,1,1,Fujitsu.xml
-78277c5cae43ce4e7ffe27da0cb6e63bc37fc870751d9d5a7d2cd93a84ee9651,0,1,Fukuchi.org.xml
-a4593622babf9334e3005225ebb80955096badbd2184f87e41a6b5ae09b73af8,1,1,Fullerton.edu.xml
-64c526b0e44900f94b42bfd26d2897319ae5881af9e3edcf11db3f7e1f7cdf56,0,1,Full_Signal.xml
-078944b9e1caaf39bcf1748985f81dabe7f11302797852adc891bd3f9cc53c81,1,1,FullTraffic.xml
-0bf864d504b62b444ba798f46ae53acd1fe189b12bffc4c4a3bd9e4d144fb61b,1,1,FundaGeek.xml
-d84e4e70ec493529a30ca443c02cafb76dbfd5d10a03075268c1c0077ba6f35a,1,1,Fundinfo.com.xml
-1ae38bb06302287f4ea2d7c3185e3b2e3d90e202b49f71097c127705f22fc252,1,1,FundRazr.com.xml
-c4e192e5675420c4f0cd23969265b5a4475624a0a1c25bb292d59321c9149d3d,1,1,Furaffinity.xml
-b4e68830f0c9c55b103df47a11c2065a13c302e81e48b7f31da839f0594da0ec,1,1,Further.xml
-362fe4f58f36e45d49519cf808a46332a95af9c4cc9dd53a40054fe7989e92a6,1,1,Fused.xml
-f8a0422cad5ad0b4a9f2a4836d9b2354bfb7edc7aee9bbdaeda92dc36db5a6c0,0,1,Future-Publishing-mismatches.xml
-4e39a8adeaa2417bab0a9f79756e980e0330b6e2c8fd9b0c983f153869861a2c,1,1,Future-Publishing.xml
-f30174c08a98d016d113a5730a45f4bb74099691dd3ef1d1d209d4f6fb7012b9,1,1,Fwdcdn.com.xml
-ebb15ce0e092277453532fa99e2d3180532e4d70076e64e0d79809a0136a886d,1,1,Fxguide.com.xml
-6fa34c84a6c25188815792b833b426bfa62d852b07a980a2edfb1768bb051bbe,1,1,GAIA_Host_Collective.xml
-37d6faf5ddc13f30dcaddab73cf89f5ade20495ba8ccabacd2a5f421c21a5990,1,1,Gallup.xml
-5d2394c351034dbe321e2c1fc675bd412c945a96aaf98744da20df4db5da97b3,0,1,Game.co.uk.xml
-7158c5bcacd6950697d7ec03547f7999be952c2c78930ba8fddeded77b21dd41,1,1,Gamedesire.net.xml
-34f8f5a92ee97baf0e3c14603fa42b65b89edb99a8e71c61877a933811035f4b,1,1,GameDev.net.xml
-50b51796c6055164842ac1fa529a7b14639706c79e2584105d9a92a67b1909cc,1,1,Gamefactory.jp.xml
-5a2974ac3dc84a75ac73ae293a3b2fed397e86f2e10ebac2232dbf7f8d6cefa6,1,1,Game-Link.xml
-7c239da3e17615d3847684526a666c43ecc45d00ec0d922fd8c276e75485cb3a,1,1,Gameological_Society.xml
-5e479c67a14059e5d1d97d5c0dfa59efd46a91a731b7fa156731be0b1f9b06ab,0,1,Gamersfirst.com.xml
-8426250d81f5cf4ac0d7d28b3c6506aae55186217010e055b523c7dc48639353,0,1,GAME.se.xml
-6f6cf432642fe736b53e82043cd39e73b357ebfc0c1e56f25f6dc5bdb8cd1c2d,1,1,GameSports.net.xml
-3d51538a88733634e8692d273367853c40373ff980e6e63d35b98f1711854c5f,0,1,Gamestar.de.xml
-e0b42ca86b5ce5b047eafad5b2a5ede003807cbd4ce714d4fcfd6e726a137cb7,1,1,Gamestar_Mechanic.xml
-c02c42b79ed4d63ca5d6494fb7de947e1b752d40ffeb9b1cbe23fda9f45dac18,0,1,Gameswelt.de.xml
-2e4e279474f5425e00e989364664bb0065d82f8572c7aab925af6acb81598124,1,1,Gamezebo.xml
-e91e9cd10f51ebf135ffe4a90daf5d4852d40563f7b74c35ff8b59bc066e7838,1,0,Gaminator.xml
-144f6fd0feafac80e8f5909a2969f4596bd91962ab8ac100039251aa7958800c,1,1,GammaE.com.xml
-1eb278798f56604f692dea5fbe8917b81ab01689aa20ab5fb1e11a023133a7bd,0,1,Gamma-Group.xml
-f639c545ed1cf318fe0e2bb27a8fff4e7253d59e9f83b06a8364ce5eee77abaf,0,1,Gamona.de.xml
-7a776fb081a9777f2314af66dfdeb753ac52a3124f9c46b7a400de6683ecc2a6,1,1,Gandi.xml
-93bc359d6f9d0478d67854100f77ebe978ea0cd1d999bbd6f92909ae5c1be985,1,1,GannettLocal.xml
-23187a364fc5ff792f8230919ea4465bf81bad7ce4853d3763ca3409f84c0a40,1,1,Ganz_eStore.com.xml
-e9f2e38ec1fb1d6f1b8a54859224c133f1894191f2cfabff31bee6d291015f7b,1,1,Garcinia_Cambogia_VitalMend.com.xml
-582d363d86dd082f505cd33e48adb4388a272dcb551214561cb2ffc7e5e019dd,0,1,Garfield.com.xml
-b99040b9b2c0eb7d89f6e06d25fdad08ccf4f807268983bc00e418aa9d8e62c6,1,1,garmin.xml
-b9ebf0a146004ac18c81f619f24d6b3f454cd13df58b06d4f7550b7db640da5b,1,1,Gasngrills.com.xml
-d282173eebd744c9e5761a975e9b6b5086e86ea8cf51c7803bc78ce8eec8f0c2,0,1,Gate-Crashing-Org.xml
-932651701c5fd6b9c5b272299aac182c260f3d005d9cdd624538ac5055bcd8af,1,0,Gateway-State-Bank.xml
-77d0072c08ac8a2b284de4354a9d9da5d9e3fbd2dd97532fa85c51680c813d5c,1,1,Gatwick_Airport.xml
-01dd4393224a66543bacb8f0726ab93591766c1ed3f4921fed6d765eae2cf957,1,1,GCM_Asia.com.xml
-65b83419032ba39a2c89877111185565f097815b77f52f268053e37202f5e1bb,1,1,GCM_Computers.com.xml
-c325bbe3f25bde17054d2c65f66528221f834628788ba7c6f8275260b5294347,0,1,Gearhog.xml
-080439aaba8674d999ddba8845e23fa69c525446f11c7005c2bee848774cacc1,0,1,Gearman.xml
-b52f87c135f6aecb6dd543bd3212b3d94e8614a06209342bff2a106be6d2de39,0,1,Geekheim.de.xml
-6b70c3919be0ccfa44e991ff4e084fc38f51e4de86c8ce7e70d4e2007089f087,1,0,Gemius.xml
-ef42dcaec37676c59c30cdec3be63707681e45be25541e713cd6e97f789b4110,1,1,General-Electric.xml
-82a575bfdd7c91f460c75b2c61c90f9b145af743bb17a462df5388d6ff93a9d9,0,1,Gentooexperimental.org.xml
-4f82c7ea2dc085db47b62695edaf3959e187bd14a5ddb17ee55d7eae045bafa8,1,1,George-Washington-University.xml
-4d79304666585147b312bcf93055bc3ead6be951fa764d4a8cc7133ea8ea23a3,1,1,GeoTrust.net.xml
-01c4e4e7cac20786d6c0766a316f697d99264d8970118841c77b3795d91d03e7,1,1,Geotrust.xml
-902dd3bf0a3c6f3f594fac3abc660020512b61b0264a9766edb6701cb0d593dc,1,0,German-Academic-Exchange-Service.xml
-5832e8eb6587f76dab2b5c1757c83dd84685b6abbbda41e2908c18b0ece70541,1,1,GetChute.xml
-c0f3f31c0b90e1f5915a5700a29f250f34cb67060b0c8a32ca50c2f5c23c30d8,1,1,Getclicky.xml
-4cbecbcb6231060cbbb5c37e41e69291b60e45a245e6813cb5f5894de780af11,1,1,GetGlue.xml
-94366f38ea5c1910166134df0df239e157918cbfd3c116aae7466e0d14d0af6a,1,1,GetHarvest.com.xml
-60f24d3087fa3342353b77b0c57ee7af994613a5847772ee5047821942d71867,1,1,Get.It.xml
-75d53fa18eb90fc7dd30fd5b0f83ce1fd6136d75b1d48092471246fadc4b77ef,1,1,Get_Out_of_Debt_Guy.xml
-10a621bf9199c08e61706800651e79887f7d9ab2eff080fe2c6cb96b6f18d664,1,1,GetResponse.com.xml
-ab59869864ab49f92b5999cf790130235959fe09824d4eb99e217acf4d93c856,1,0,Get_Safe_Online.xml
-e4598f2d48c999eb9654f64f816dd4fdbd3d8d3d34c5d19ec9a1ec4cc38547d6,1,1,Getty.edu.xml
-bdfe5126712817e915a1648668266d57fa4dc5398a83afd94a19a455b249945e,1,0,GIAC.org.xml
-0cbce2a2dbac106dd1a14e59d66718302f84ad11e31984fac40b868dc6e0e3cb,1,1,Giant_Bomb.com.xml
-682fb5bd1da5ede92efb99ab0044896bfdeed95c4a03ad363f48344f6c992f52,0,1,Gif_Gratis.net.xml
-fd005c94136bf38d49cb6c2e54e2d1eb3a1dcc47b14839e428c31a4e8fee16ad,1,1,Giganews.xml
-abb03feb83a53a9a55e398c11742e2a5d06a3ea599a82d7ec5b50f54dd2a75b1,1,1,Gigaserver.xml
-f5298b32c824990297a18e92474c36a5d1b344ce7951b529a48dd0d6c2a9e620,0,1,GigeNET_Cloud.com.xml
-f7bdaf4a797376040d08fb18652d7cf0eedb8ba7906904146eb43b8a358aa5d5,0,1,GIMP-foo.xml
-f95cfc85dc3b53b7a6d7b57d5cd9edd4c8d182f6cad0e01ab11852c9a00eab12,1,1,Girl_Scouts.xml
-ffd0b0d71cf481ed1ae6a00d3f7d8a6a40e39dbc6a3fb22d7728cbda325f5d00,1,0,Gittigidiyor.xml
-34bb65e5d23c5f437a4b9a09e1b68de6c4f8594ff790bdc3da3aa5824fc3c7c3,1,1,Givex.xml
-1d543c058797c2143e84af0016b439cef391b95b81a938a27400534400e3fc5e,0,1,GivingComfort.org.xml
-256aec87f8aae80c6de962f21fa4b537b2476fec22cedb041638ab7bc5abc7f7,1,1,Gizmodo.com.xml
-ed076293b391e63d4e03d8e9d6de8bc45e2e968273c10131468eacee40f1d08e,1,1,Glerups.xml
-745c86661e057217d3f6d9001632956d24085b474525744996044b02aaecade4,1,1,GlitterBank.xml
-9ca0b92729a85ee245177e7a30e4ab554cf09245017b322eb486667b90d30d2a,0,1,Global-Footprint-Network.xml
-bbf4d95e8b1cc5c2a5b862ff0bcae50fd87a7f055d1a085ee68a9f9196b445b3,1,0,Global_Human_Rights.org.xml
-2048765e5d20395f03f87f9fab3ec0691426edc106b94970fe052f1a7cb74e9a,1,1,Globaloneteam.com.xml
-be8c815a9a7c2029433fc542255094e8083842c1ee37ab849f2a399393506241,0,1,Global_Promote.xml
-9748c65731f2a7d743857a8aca5c1cc2b32d6b0f7f32e8878b0cf3cd1a14f88e,1,1,Global_Voices_Online.org.xml
-0715fbd6c0bf73916c3e5775a10ac61749d164731c8f3d940589f7a5d643463e,1,1,Global-Witness.xml
-f22df2b55cad5bffc0391a605da14db77761721e70442486d6f5824c68d15583,1,1,Globat.xml
-a7560b209af91022474e97ccb8ce8778b611953fd744957f67c8a39339b21d6b,1,1,Gmedianetworks.com.xml
-d89bda534f62eb8d0f44b067500d045c285f41a5c350a4e8e408b557fb6f4a05,1,0,GMO_Internet.xml
-06dbc3577073e0c75700c48d78f46df7f433aae53f2923c96f209393384a849d,0,1,GND-Tech.com-problematic.xml
-8ece7b9a55dcc63fa7784890ada48016392aca3f34f12086284dc2dbbdd0e50f,0,1,GND-Tech.com.xml
-f2dd726fcddd931e373745c28ddd66625748b26773ff8a2dae8b22d683a943f2,1,1,Gngr.info.xml
-cb7a292994a2fc87f1440d181779f6301b3483c21e5df5c3d7e9ffaaff78770c,1,1,GNOME.xml
-5ddfa3a482674b780d4e0cd81e3ba0264703fe2b42c797a132127a132df0f974,0,1,Gnumeric.org.xml
-25d4ef946d891943dc472eedd8411e05c4ba679047a1b058f9aac1c2611d0cd9,0,1,GoAruna.com.xml
-d71b4a621557b40535fbc3c3d25ac92b0529a901b82e9ae46bcd939451ba9f97,1,1,GO.com.xml
-660db2609d3abb3b65508b3a1be7cbb60fc2a1d82309709e5da013a0b009d278,1,0,GoDaddy.xml
-a274061c2d10fe93f56a7434e7f541897c64f1749bf842bb7d167eed03b32155,1,0,GoGetSSL.com.xml
-8035e4afba24967890b6a797e732159e2a135c28742d91b63f4ee5760fc980dc,1,1,GogoTraining.com.xml
-4340d4bdff3b3f5c967e99c6fba0f0af2ae0bba97a64fa1c679b32212e9a2ea0,1,1,Golden_Charter.xml
-93c3b6f14b69a930a2832e96f694fbfae9974bbbad6cfc5a84b6b1bbd8acfbf4,1,1,Goldstar.xml
-9224e11b4b259be1d60b4d65c3903a9b2fe7403753ce0b1a540bc526cdb8e21c,0,1,Golf_Course_Industry.xml
-ae0c17b4f9b2118b92c083f5b024f659a2b5bed3501b6fcfecc889f139b07c95,1,0,GolfLink.com.xml
-7fc9cf927c9b92789e3d57fde87b70aaf938b68e6b71adf4319411e2af1c67f5,1,1,Goodsearch.xml
-4e34d2d1ae795f5f1f4967dc035fea1bffe66c10b9be5c480ef5c479c0e97e18,1,0,GoogleAPIs.xml
-894a38a1bfa54c3a04c42e941902cca0f0710f90f7775aef31e5c27ea9fac6fc,1,0,Google_App_Engine.xml
-0c725c221c4a8e11d3bce46b3913dcc855ff0d8155a559d7dedcb06179079d4b,1,0,Google.tld_Subdomains.xml
-b6f212028d6d4c769e74c2a583a04e9387edf79312d44599a8e9a699554f6f20,1,1,Gotmerchant.com.xml
-8c2e217fca6c4f32665fceb124225f04edc9b8c01a403aedafd871a33c9d79ce,1,1,Gotraffic.net.xml
-dbc8f2862e1855fd07a89a7d842b4ff03b2a93340d912a1f321e8a2c9a0840a8,1,1,GO_Transit.xml
-73cc7eb8fa700154372dbc586aaa1adc8d0c0b86d17f2efcc14b7e9843a09004,1,1,Got_Vape.net.xml
-b2ee2374e3bdc3d03f5d60bd4b00bec95592a38b54a32a8b3097d1ec6cf1c86b,1,1,GourmetGiftBaskets.com.xml
-38ea979b7f650765d00622f7919e2589f093c8f0df62b005e1ee37f97e821289,1,1,Government-Security-News.xml
-4fb6c41a0baf5d2a91ab39618b57d963f6a8052b57c6cd91ffb2585133da7fec,1,0,GOV.UK.xml
-b4741f899272079753bb0118f166d0130bbedf31d16434e9b8127821fcc41f50,1,0,GoWork.pl.xml
-0ee8f20c7adbecd195a0b332aaeb6fa49a1b97192c94840236733f0a29dd5d75,1,0,GQ-magazine.co.uk.xml
-b4936c9408ab836adc37b0b41551860a35d85bd2adb24c2df60cc8fc04084e55,0,1,Grab_Media.xml
-678744c40c10d6ec38ac024bf0192ace16031aadd1ae00c7211b7849dc5f347e,1,1,GrainsResearchandDevelopmentCorporation.xml
-62d6fd8c8d78b6e35e64bb8b0ddd88c5f0b6035ba1e85cd8eaa5453f3fdac189,1,1,Grand_Haven_Tribune.xml
-822586bd2ce770c946eca830521b34e8ce3f2849f7bc8de0138a6452e6c635bc,1,1,Grand-Rapids-Community-Media-Center.xml
-adce25fe2ad3aaf12d9c15ea4ea6d9cdc060c1c52203c24c4a119f5c27e8c1f7,1,1,Gran-Turismo.com.xml
-a86f4c61b5cbb47cfeaf651f2afd0fa4ea39f82dd2e73c927622cedad59f86a8,0,1,Gravatar.xml
-b7d75abaa69773098bd0b108a48aa4cbde2c00a211bacca52b107728f4230fcd,1,1,Grays-of-Westminster.xml
-6320c8a92fc89f7e04d91bd84a2570081ff7ac69ed87e0b5d3ce0055c3361b3c,0,1,Greasy_Fork.org.xml
-b962dc0fc4cdd3b37477649364d935e4b85b585d2ef57e2cbc5ddb88747d430b,1,1,Greek-gov.xml
-79328049f78c86f84bec1ba0d5a332afb45bcdb6dceed202d6edc1d462705dc2,1,0,Greek-travel.xml
-4704688d2ca0cc44223acee755d34638495c889ca6c50e3098929a8c6f43bba4,1,1,Green_Coffee_Bean_Extract.xml
-4dbffe95dbe3bcac36a1f92d4c558b5cb27df8bb6829b5adf9e88243c37dff03,1,1,Greenhouse.io.xml
-054ef9c8b5459c29b97998aba9220474e3af78bb8af72316267560fea5174ef3,1,1,Greenmangaming.com.xml
-82b3a86e904a8ceaf5bae610a3aa874bdaccc10c41fddc17ba98b149ba5b81b6,1,1,GreenSky_Credit.com.xml
-a9e10490d967e86ac3379e2d723ad74c92c56837d53b17ff8f3fce95fbedb54a,1,1,GreenVehicleGuide.xml
-6b5ab215946ae8cb2f2fa182b91e0b1047ab72a8407238510cc75e1afdb11517,1,0,GreenvilleOnline.com.xml
-4988b2fe799481ffac172ac384a3951b46cf89ceda1461bf82522f468dcf566e,1,1,Grenet.fr.xml
-8e5ac9f85e472256086de913fe76439daf56ebcdf56418b5b6d8e5013a8ffff4,0,1,Greystripe.com.xml
-d4175595dc00218a8048ff58a11207b773ac952be4f83ecfc2a71c4f271f4449,0,1,Gridz_Direct.com-falsemixed.xml
-2a4efe96a45f04ce05d27a2049063357d12b358ecdca18eefdeba19caf3381c8,1,1,Griffith-University.xml
-27c88630b6d62594c136ef9f63a2143cd45bdc4ea31ea8f01123f8c228095076,1,1,Grinnell_College.xml
-71f3030e11d49c8922e89dea8d5a86e94e94c45203a8e8017120588f415653bb,1,1,Grocery_Server.com.xml
-c7a62209b05fc531978d48bfc38e9e0957dba51b78426f846743ecfe403723cd,0,1,Grok.org.uk.xml
-9fa1fec5b01de3f893162bb05593529fc9b9f40bdf02f4b00b6ffaf7a0d385dc,0,1,Groupon.com.xml
-37102eaee8fe084f69ddb6c5e2c752055312bdbdc57c4a68e12f0d7be7dd2007,1,1,Growery.xml
-a06c8510285353ee578bd10abfa9d0972ed9a2fe1f7932226a8a15a9b16a148e,0,1,Gsfacket.se.xml
-29ce8f2ba724f8ce41e8c4316e1e9cc5437b25cebc95dd82b9667fade11f988b,0,1,Gsfn.us.xml
-c62d6371f4dc10505beb0234bc024183b8456e967f25891142a4530355aba060,1,1,GS-media.de.xml
-6637d47a74a578146d45ff4f7aa375670d1aea3d1e41ed9a5e90284da437812d,0,1,GSU.edu-falsemixed.xml
-b9f0211b9e4197c02fe47ee764b9b4974a5521bda177a11ad18e7735147d74eb,1,1,GSU.edu.xml
-2658ea2070b54f5a51b5fed1141337e3b434ac2f1565884145c41b83c8ac6d15,1,1,GUADEC.org.xml
-6a3b251fdf1a2490d919bcf5f7cfca9f1e6209377d4b80a465ce522aaf3d4924,1,1,Guild-Wars-2.xml
-84ad063edceb9a5b03e75e51cadb61d4d44818e08c2e0f967f69f21ef00ccfb1,1,1,gulli.com.xml
-5f934b80b6285199332c225529e178243ce8f42b686e6ad724e16d4e48e8a737,1,1,GumGum.xml
-40529df786129410215b79b65aa06ca2e9d73f511230e2061a9c62171b3cc828,1,1,GU.se.xml
-4b4b09de35ac29ae3cb87642e66c4ae08593682c7847394a93c8d378766b5b41,1,0,Gustavus.edu.xml
-da0a114db426909ff41443bd33c9bb16928a81fc773ee7ccf055ad2a35c4f289,1,1,Gust.xml
-2579a80a76f7bcd81412382600f607c79f01e579431ba58125b6ce135442a5ed,1,0,Gutenberg.org.xml
-d90184f044c53a3c1af300fc8dc5c916c34442f92018d8d39b12d633dd11ac95,1,1,GVNTube.com.xml
-d97fb94656263a08627931829f3707297aaad16a2780d7efbc08d9a0e240af5f,0,1,Habbo.fi.xml
-1e3bbcfbb5865e5adaa1bd73e8a07fb72d10b21744cf4413ea84f39c8f2d9bc4,1,1,Haber-Vision.xml
-6c38593560b08fe0ee6bf22c12b01f5045a15d5eba46b8c3e0901255b2dc13d9,1,0,HackerRank.com.xml
-9159bd4d1797515b1cc59d7541c144c2cb9d6b5b4fe15a975cd3316f0df75fb2,1,1,Hackerschool.xml
-7c0db8c41c1dbc742d88dd7432e190afdce29bc241ea958e0e9bb56e318a0040,1,0,hackint.org.xml
-922b403278bc9ae839f646bd231dd9ab11950ec5744da127a5e185b3eb1c20c6,1,1,Hackpad.xml
-51b17752c74062183224769643033cc2727e3263c0af2d83072f8f4fe3d30d51,1,0,Hafner-ips.com.xml
-7e463880670a9bd41e514199bc309e477beb8cd3771cbf8010fe76abacfd1dc5,1,1,Hail_Storm_Products.xml
-7d8606707ee04231db6b0d4851ab973945fabaa28907734507adcacff32f6095,0,1,Halebop.se.xml
-dac5301bebe14f1ee9837b4c5a6625f8cac9103160009bb80208d40085a88c16,1,1,Halifax.xml
-f6db5eb6d184772ca7b3555d4e88f0a3432ec670229ff8901d31ea9fd4ec977d,1,1,Hammacher-Schlemmer.xml
-4d0eaa91de4e6754869abdf15c274f35381f5bf1afe0e9fc9052bf4104b34cf0,0,1,Ham_Radio_Science.com.xml
-c4c6765b82c3995fe1018d07d514748b3b1dc77463bd7f9745d4f81c89729b7f,1,1,Handmade_Kultur.de.xml
-a8183b3aee9c2ef8f331f6d2b4a65f99819fec523ff1df7d10cb69ed6fd7c746,0,1,Handsome_Code.com.xml
-971d2e3a417a2054d72f3c1fc7282cde9352fc682a4d49a41928eb88e1467e4f,1,1,Handy.de.xml
-753c5f07724c79eba8674a18275bf2d6f1a1fdbde5a71f865a7a80645d499116,1,1,Happy_Herbivore.xml
-8441e121fa0b1a4dfa04637d171576101ded23f18b74fc11a216f0c01de33396,1,1,HappyKnowledge.com.xml
-debedb50a821f682f91abdac63c0447b6305961e155d72cc7561e619edc6d631,1,1,Harakahdaily.xml
-0b7c9ea36c20bcc97958b4e3d5f6937282a35e3029bea14e6dc4fb95b3c17e25,0,1,Hardcore_Teen_Girls.xml
-e6f358268ccbfa9123abd3a38088ea30874f0fc2f7d577d6729117981c403c3b,0,1,Hardwarebug.xml
-b0521ede04b3bf030717540eeaf92d05c2703e7827b4e6c13ad3bb1bc9a8e6ee,0,1,Harrenmedianetwork.com.xml
-3d5842731a487972a519115c3260dc2b4838f09cd953ee97f3d9dab894d43dcb,1,1,Harris_Computer.com.xml
-33be37ec857b9b80c74e0ee3a9ad566bba7cdf793e076c4103427d1e5413f761,0,1,Hartware.de.xml
-1fcec52d0a6f3e89d64966ba878969749e4df9718a6500d911f5d86169e3beab,1,0,Harvard-University.xml
-db16d5037c30da9f3b7dcdc63eae06752d0a06a2f0cb2d1c16100e634db2a5b7,1,1,HasGeek.xml
-677a1f137cbdb70fa32b83ca65b999f9929d5401dfa18e5e0f57c289c449ca38,0,1,Haskell_on_Heroku.com.xml
-d2511be1cda9cbf6be4203a788894e4a93801db76e92258e934e735e33ea9321,1,1,HawaiianAirlines.xml
-94f56f0adcdb0437f486e311033927f8128063b2cbe202c4defa9333737078b1,1,1,Hawaii.gov.xml
-37deaa55d5be92cf8e3f10a97c37edcf40589a9594ce3a31421ff3c64b3935b4,1,1,Hawk_Host.com.xml
-d02b9ca4b8f807d3f24f0eceae12d51666e54d27aec59634d864e8688ff2a3b7,0,1,Haymarket-problematic.xml
-a3b27d8217b63ddaa932bb77a6132f96519a3a92048e7486330111c2d0aac76d,1,1,Haymarket.xml
-e01dc2b5f4d3693d2b5ec33bdf24ab3a7add5d8d62d2341abdde9e708f5ce184,1,1,HBAnet.org.xml
-9456c5769b41740b51d29d79ec0b1e582a23ecc327232bbee0086f254aea028f,1,1,HBR.org.xml
-f005b3dc25d33b4f6e9f81663009e2a3a5f8e8c16e11628324086505e21f3df0,1,1,HD.se.xml
-1749f4a98057b2e57d28d985e48fe72cd45b44843ce3758aab64d8280bfd18af,1,1,HealthdirectAustralia.xml
-591930da4df33140beeaa02531b0b95e5f5dd8dd20879f314626f0eb2b187eae,1,1,Healths.Biz.xml
-027a9751e649f8410d3ed6a10f065f47566cc15ac1b3cf41915f722fb96baaca,0,1,Healthy_for_Kids.xml
-3edc0a640e42edae30c61c2af5a8e5b77455186e1d04c99b01235e248e320a5a,1,0,Heanet.ie.xml
-e6bd96b0e0f28e843af136c5fcfe7c0242778ff4aebe391eb57b29f2058a4511,0,1,Hearst-Corporation-self-signed.xml
-5a7c989104fae6ba6f4ee2a80242fab2e700357e5136b4e2f3bb235c6455faf5,0,1,Heartbleed.com.xml
-c1cc9b6e62885034af2391d2c9fd1ae947c8df96feb07b5d0d012eb831aa51c7,1,1,Heart.org.xml
-026cd04456aea4af34b367acf735ad02d1e082aac1b4331c7d36f39414e04816,1,1,Heckrath.net.xml
-e30b40a4583d3ff634b1e242b3b81796878d5004302f63504b634201276effb7,1,1,Hegerys.com.xml
-96303816b6d137a8ff22001e5a124d294fca5f073d184f8765d5fdb83f751f1e,0,1,Heimdal_Security.com.xml
-580d999997747a4097f5114244ceb0ed663803d141aa434b26b978c932efd3a1,1,0,Helpdocsonline.com.xml
-d242b4846eb0d61eb9e9d0e22ccb607616353391445d8f19e729ba9fe142a20e,1,1,Helsingin-Sanomat.xml
-820014421008b3ca657f912ac23f3adbdad002254ff6c94d5004483405ae083f,1,1,Hemmingway-Marketing.xml
-8291b5a137d3ec0d772b70f8d45a726e19b73dcc871494c813b61d0440886a7e,1,1,Herdict.xml
-25d4cb3f8b97c04d2b175c9f3d8e42df52bfc92fce67e743f57b5fdb37e86471,0,1,Heritage.org.xml
-176b9d11a836aa1b104cbe634bc39bf5811b2dbdc744b0087f63e1dd12f2d59a,1,1,Hesecure.com.xml
-95365d0076da114c98b41049f775b4e36a52bf8297842da9d533802ef3317761,1,1,Heteml.jp.xml
-93a85fe7954fb1d3f5226dd1ff4a98ba918d5a5f028d76ad0b519796e19ec8fe,1,0,Hetzner-Online.xml
-06b2349b5143a8ccdb78b8aab23ca394d673ac71c011f3125393bb4cdf0043db,0,1,Hewlett-Packard.xml
-f8c20c76eb24ec2b01bc17da6b72127d6814087d7935290b9744802b6622c490,1,1,Hexonet.xml
-0ecd9594e7b04bdb9476ff3489d64735901f9230617b1d0bc8cbf0b0743ae62c,0,1,HH.se.xml
-87d4a09cda0461698482ef8c7ca7d5fd56427dad34c3e5064e2fd8273ad76444,1,1,Hideman.net.xml
-4307221f40a691dd191221761ecca21f6ef5956badce47258674d0cc030e453a,0,1,HideMe.ru.xml
-bc901fe2f644b61113fcfd562f63822e2d7028165ce857013c23eaf94661a6f8,1,1,Hidemyass.xml
-406fd610e2e705adefb26d72ada5b00607b27dfe683c2256efecea7ba1ed2e21,0,1,Hi-eg.xml
-bcf66d61bb11422f0313f5c0e907ed5eb13c1795a7ddc1e5b45d9f37c650d987,1,1,HiFX.xml
-0f6d80b71bdb6b5ba97ef737fcebdc8b3563c098949d42580308d141f2f8c8ee,1,1,Higher_Education_Academy.xml
-a4c0e90901e40365b963c4bd9f9564adfc8fbdeca4ca93f800e432425650a798,0,1,HighQ_Solutions.xml
-4ad8e5f237288fc4d5a78feb97decdf3eb8183a4c0e99447ff3ec0867f6baf0a,0,1,Himediadx.com.xml
-96c3819b222981bab9612a1959fdf9b0a1437b3362046464cec121bfe80bf3f7,1,1,Hi.nl.xml
-54a8154d1276f56854a0c82402b1b10fae0ef6e711b29e3cba368aeef84845d7,1,1,Hipmunk.com-falsemixed.xml
-6a011c27d3d1eaa622e81bac1766aefa2ef91699ef6e2c335df418719e2b168b,0,1,HIS.se.xml
-36ceba5acc08a983db89a339799ad552d122b296fad56a5c824148a451afac96,1,1,Hitbox.com.xml
-abd24a4a46df8400758c30c1b945c917c290a2b390655e2904955e30bd202fb4,1,1,HitBTC.com.xml
-1654debbc84e77392addfff21481c7d0908bb592c819a281a1d59b242d618e9b,0,1,Hitfarm.xml
-4c48152afafc43474f068a272b78229d1f68611d17adf496ee5e501913d9e5b9,1,1,HJR-Verlag.de.xml
-b7c742427b63875bf405b4617943b5e508ccf8ff4761279452ce909a2aad22cb,0,1,HKK.de.xml
-3c6aa822dc67f0ffe05acfe4cb0adf96d40482f1f0f1a77e5a92b4d51587b401,1,1,HK_Yanto_Yan.com-falsemixed.xml
-d09bb4ef7ae7ddb86f27ef0523b00a1e399bdc19cdaea4c3cb0dd86c6e6afdce,1,1,HK_Yanto_Yan.com.xml
-e4008a97cf78027ed767496be5bd7d90e264f985f040b3b0066d03eed6cb6795,0,1,HM.com.xml
-290ae39513b4c7e08e040aed3509085f3a64ce1bd767324d0812dc0ceab53c44,1,1,HMV_Japan.xml
-9adfaca1c0c2fa22166e4ac6749d4cfa121293e9945cc576b4530ea2d11a6578,1,1,Hobsons-EMT.xml
-f6b2d8963d38550c2dbaf89a83f410d46d2e8a2550e7c10bb6e935323775dda5,1,1,Hochschule-Trier.de.xml
-4687215abfb9bc6c7453e403aa1b1a4eeeda7d7c9e82c03588f7581879f01451,1,1,HomeBello.xml
-84adef685acf6a090177b9d6d465eb2631327c0dd77ee0af9f8b7b203f8cd592,0,1,Home_Depot.com-problematic.xml
-7b460dff8a2b02d81df02b9d9ed829deb2dbd3d850c4536babea038ef2968ec4,1,1,Home_Depot.com.xml
-338e8194a619447d5b6188ffe7ec92abe2edfdb81aaa618a04cb38f9f63635ac,0,1,Home_Depot_Foundation.org.xml
-578f4bb8f6049f8a710575d2cd6745abacdd758fdb9898236fdec1de1eb8435e,1,1,Homeless_Veterans.co.uk-falsemixed.xml
-bb05f17daee3073ec173b76d03df68b328b8f2e002052788c00f83e7d1e25001,1,1,Home.pl.xml
-2a749798febdf66cd6ec4ef005ccf4582f6933089a92ace7e8a16076fa0a020e,1,1,Home_Theater_Review.com-falsemixed.xml
-df969ad273e8172206d03ca88b4364ccf3e6d2a4845c0cf0af679df21643d1e9,1,1,Home_Theater_Review.com.xml
-a259a3473fffa759dda3cebf532eece1bd5c6f0aaa9779ddbc946eff7955f5bc,1,1,Honest.com.xml
-2a0ae89908e8f949c6d795d70f1c330db51e91027ed35620c29c343d7067ffc6,0,1,Hoover_Institution.xml
-8424d16e90d4f392b330a853e9dbba7677c71be3a173955f5f1d593fd5d5afa6,0,1,Hoovers.xml
-a3e17fe9079e5521346a4a3a865c9b5a7944f64e04b8d859e9721211b1f7a24d,1,1,Host1Plus.xml
-2d8e92f61fa2c3db92ca33b37933c4c6d7c9f3deaf712dbd4a9a31c4c4a94f51,1,0,Hosting2GO.nl.xml
-a7d318cbb441e2384b33258ece2d59873ff32386decf70e7eb8fb4ac40a89582,1,1,Hosting_Catalog.com.xml
-f9324749f745dd11d192d3e1b9664f2ca11636d60a9fc0ec77e1f821f39b432b,1,1,Hostmonster.xml
-2e4cb405f959ac23593b4e74d9cb27896899f247ababaec1ab5323c650b6672e,1,1,Hostname.sk.xml
-36d5ba333745b2e704da19cee47aef04a75f6ffc6d869b094ab9ea9de788882f,1,1,Hostoople.com-falsemixed.xml
-dc77c34327b9b7f4f9025979118a7649a7d358c097fe0735f150c7fc10731150,1,1,Hostoople.com.xml
-59fa747d9b4e4193ed6c71b6d587080b6f58f4f358dbbc8441b8b8e12f306441,1,1,Hostpoint.xml
-dd7ca93d6e9bd777586b13f43b20d837677ceee67a53fdd3bcedc29992e4d69e,1,1,Hotels.com.xml
-31db6be8a12a136641f805a8a2bb38d6a4bc82b9af87de00e4ff627841726132,1,1,Hotspot_Shield.xml
-e4a46639d7beec7cf0fc2e372e4bb6286cb79834070624677c3434e08ec078eb,1,1,Hotwire.xml
-923d1f3fa8f532d8228ddbf2ac64704a3bb0d1b08c4431fbf571d5f82f5d638d,1,1,HousingWire.com.xml
-d98c0ee29a753a02120dbdd28356de3914c2c8f3992923f88ca1394ed4c5f334,1,1,Houston_Chronicle.xml
-79b67385e5095c34090fccb7de8b28850d1a081a776f5aa319318bd9a7c52d7d,1,1,Howard-Hughes-Medical-Institute.xml
-f427a838c4a1bbe72c4071e9eda0131670ae90bda5c95b80ba6db7505f8006fe,1,1,HRsmart.xml
-4c5e2eba3bedd089bb299e83c0f11327b85e5451f2a07bfa71c4db0eecf5a6f9,0,1,HSLDA.xml
-8da16eb1d1244028746f9024263468233b176619f7978a7462f9ac6c0434c911,0,1,HTWG-Konstanz.xml
-7675be92f18029bde9ffa5c6455abe5fb26b26d724c706900c67fe3e4f5addf3,1,1,Hudson_Valley_Host.xml
-160cf059aeeb642add9c979040f1b60282a01c9ee49234f64bd25ed4611583aa,0,1,HUK.de.xml
-02c47b91875530c35cdf6a3ae4ec6ec7e564d4c42a07d56a2858bbaa584cbadc,1,1,Human_Brain_Project.eu.xml
-705887bb125e1d3169f3af3c21c199a7d457e5a565cf07d84c8548a004de775c,0,1,HumanityPlus.xml
-ffa9a50df3e8b93b0681cd903f99fceba361d148f82059e0368c5a98a688dad8,1,1,Human_Rights_First.org.xml
-9aad6b65738ba739b982d72c304a22fcc0e8254bcbce14ab856661d924cb71d6,1,1,HurricaneElectric.xml
-3b6e1a51595333472ec9d3d73c050d2ce31132e0b4d77408a77c6ccde64b54d6,1,1,Hush-Hush.xml
-688b5cc17040049d7ee16e5c91fc52540ab48515272bdf4b3fcb06ee884afa21,1,0,huuto.net.xml
-d83b73a4f1df2cf8b81e8c222d8d39221478c28110af0842594d334255fbe89d,1,1,Hwbot.org.xml
-0698b9892d4f3615f359bd0de6822c313b88a06ce3e15723d9e213eaf203ce73,1,0,Hwcdn.net.xml
-b3fb86457543caab9db45f0263c9bd50f8de87f2a9421dd719bfc721945af8de,0,1,HypeMachine.xml
-dbb782ebee6eff8bdb35faa1bf5ed396d62ff117785f233ff4f9a43fe8e82f93,1,1,Hyperspin.xml
-f5cd0db37b8df2fd918472d4fb92858ef4c965d10d7b0b64bfa39964a84ec477,0,1,Hypovereinsbank.de.xml
-f386a523e2c4090d14277e5294549f0102bd2472fd1e3bd5f41e58f0da419044,1,1,I3D.net.xml
-10e86406fd84b296bf96444a468a014069123807a581d9bc92024399217a2c5a,1,1,Iamnoone-solutions.net.xml
-5c03066e85c3aaf26417fe02f012ace3c4a4a650cd9c2463a4adad11f3f22f50,1,1,IAmplify.xml
-efe61764f8dfb9aaa617c1e56fcfef173f66aa12328bb32d162bef6d65f12348,0,1,IAnonym.com.xml
-fbb6f639b5195a93959082581d01bed9f3a7f267a8a19c346d366fef030212bd,1,0,iapc.utwente.nl.xml
-28e92d0f1eb8f22fe94358c90cddc63ab32477d3f78417bd8b00044c1fb6ee2c,1,1,Iberdrola.xml
-b7cc4fc999d2a76591c5022d7bd3eec8ccb5425dc9312584de2f5cf1f5b4caf8,0,1,ICANN.org-falsemixed.xml
-9bfeb0f4626ecc145fff2cd4a6d53ca946f9dce504f7b35536dfd309452ff059,1,1,ICANN.xml
-b8d9ced232caa9d566ece3108bcbb4e5c6301a0d51bc5866808654daa97cec7d,0,1,ICA.se.xml
-e158dbc2b1b6f24c03e24e1418e3c388738c260ff02efc428b534caf1185fae1,1,1,ICIMS.com.xml
-1c97967b381276b238871d3eb2c8319319846a14bc511b78fe847122460b2fb7,1,1,Icinga.xml
-d44de59e34457e8ca6ea85aef7ac9db366d5bf1f0f174e5089aad9fb97ef6407,1,1,IClick_Interactive.xml
-0874c6fcbfbd986ae122b4156e7fc703bc6355e124debe35361da13211a6e5ac,1,1,Ic-live.com.xml
-827a6db7e98321d0d3138c28defabb914f53e4992681735b6cda4f11ac487edc,1,1,ICMail.xml
-f18922a305bc3be951a93339bd0045ab5ca5b9741009636154eea681291cfcee,1,1,ICommons.xml
-459c2616c37ab24f3cb76f67f308f3e275f69c7f57af5d4d277720641f62c078,1,1,Icsdelivery.com.xml
-01ce71e4cc4fb37d2563eb033d05b04889e3c8838cb8acc1e9c464bfaf632235,1,1,IDC.xml
-9cd416d67882d8ca5a6a85768c1e9efe5851c8547886e0a5ef64f3537d9bd5d1,1,1,Idea_Fit.com.xml
-047c2947f163b74bcfa7c71e4cbaf7b19e2c4fb951dc2bf975446720dd35fb3d,0,1,Ideas_on_board.com.xml
-201db5adb55514cb0d85c5312456f1e1aae6e433e9831a3ef712d9dd524186f5,1,1,IDG.com.au.xml
-068471ee0af35f0b5f19a2fbce1c23d98772d18b84d8c2f3ca2de29249535c68,0,1,I-Do-Foundation.xml
-9186c7a3d33d3e8c9b84ef577fdaebbb7036679efd20a6f499c1bb54f1c870c2,1,1,iEntry.xml
-cb088854b0d354c353d1a9d42563206b86ae3f1bfe59fc44bf13a6d1bfcd11aa,1,1,IET.xml
-6881743a8428767ade8fc317663de00eeae5a905bfd84594e5bf0f4d5241986a,1,1,IFriends.xml
-bd86bda4c45c1b4e02662210240b5a7aef0b4461be87168e8788aa8e0e00ae9e,0,1,Igalia-self-signed.xml
-82295f0f37667d5dbc790d8b5a0bee3f00924ef47cd50d271a122a363aec0299,0,1,IGaming-mismatches.xml
-e10e32c1563d58a09039d5791af232a81ba0e8274b0e02662bbf3034a4b2cd7b,1,1,IGaming.xml
-cc39f5caaf462c4141e27247c63b3a0684d4d0cd9441251fb7b1518c33671a07,1,1,IgHome.com.xml
-06fa0e873e4bdea3ae9ca0d8ac78f1b8ee1c7785206d7b4cbe4f2b1dabd47abb,1,1,Ignite_Realtime.org.xml
-e661e8e3425302863a2ff1dd7df7e88ac787d0c5a965cac6676095b40a25c9e4,0,1,IGN-problematic.xml
-78b3f2c3b9ef06aa38e6bb81bf7d3dc39d939c9867b337910fe9128ae6cfd261,1,1,IGoDigital.com.xml
-19a10f5af3e7219c9888aaa8159acd278ec023e7570d6369264dd4ac99b05bcc,0,1,Igolder.com.xml
-6cfaee980fe03658863de2bbdf930efbcd465989f5a1ee7f18cba58b70d08cb5,1,1,IGrasp.xml
-6774ad8f24a5832d8817201ecc506d7d7f408240b32e33df9aa347abc5c0fd43,1,1,IHeart.com.xml
-320e3e6dcd6288115acadbe27e811f9cb7acf7e55980fdea21670d81eef77c7f,1,1,IHG_Merlin.com.xml
-eb4940331c51de8d5bea8ff74cf37cb4eed6371c5c5145dc58deb822690e151e,1,1,IHG_PLC.com.xml
-d551e70ed83e94f2b613016237978dcfeacb473f32cb4910f52a3a1474bcd8da,0,1,iHub_-Nairobi.xml
-df7acefc4fc64903e803b27bb4d75cb6e9923d329711a4f14e2251e82b85f57d,0,1,Ihug.xml
-33f9b407bc2c2091c62ccb04a9eea01a09f4944124458fb00c299863545b2584,1,1,IiNet.net.au.xml
-b4bd3fac40e22f2ccdfa1dc53580558319724a3dcb4f7900de372df7cf166ed6,1,1,IISP.org.xml
-0f2fa11910da62cff20887412e60da43b9783f3232f5165975279d0c8164028d,1,1,IJM_Freedom_Maker.xml
-804e2810b1654261f05dcf2ea76703b9d25a9fcc8ec5f079e7bc5e33a49bfddd,1,1,IJReview.com-falsemixed.xml
-80113e93b37b37a4b5677a3b5f4468ab96198f2e4f1bb6fe82350d086e21e554,1,1,IJReview.com.xml
-1ae2002f507f80800b3968e0bc3795d7456b2cfb93bfe14dbd0cec7aae9c2823,1,0,Ikea.com.xml
-18c086c4defd26a9dd8a3fabcc666503c4ea63b34e95dfae104088cfc9a46347,0,1,I-kiz.de.xml
-612862cba9dcba8f259b40677fbb0dc0c970577a2ec8248d7b4b264723701570,0,1,IKK-Suedwest.xml
-305defdaeaa1aeb9ce051ed44aa41c881340f8e1774fe491a4d37027a055c844,1,1,Illuminated_Pots.xml
-57701c65a4e54e3947700aa9326b7305c81bc60f028ebe63acf0e3d337d58c06,1,1,ImagesBN.com.xml
-4d457c3fd0cfb53e3d9a1079bbaf815dab5490d75536dbaee729b3dc6f4339fe,1,1,Imag.fr.xml
-ded349d0e0b6957b6ecb94f4e85ab1dfe7fa03b1a0ed16ba7531ff3b9cda9322,0,1,ImgDino.xml
-aa7a719029440b57ae3a2fd4be68f59f2ca9902cf9f3febec8b7a11c818720cb,1,1,Imgflip.com.xml
-0c27d12b989107700856764b1fffb8ef0992363f2b56d119d82268f894fc1631,1,1,ImpAct.xml
-d63109c1bda717546892ddf2e5b7b43230f77a743589f6003cf2eca75b704f87,1,1,Imperative_Ideas.com.xml
-2c56a55203e19f8757d1bd3ac5758338c21eb571a322466ddd48a27f99d3ab30,0,1,Improper-Bostonian.xml
-7c4e3f65b1a1e58939f785bdba4bb2487bfa92c5170529d0fefa377d2ce45779,1,1,Inburke.com.xml
-034e99986704d76d7c6fd2ae501a2b425217dff50e15198a4b104177ab674c51,0,1,Inc.com-falsemixed.xml
-ee5d005e74a1dbe3fd0401d33e9c45e14eeb64eb544ba268659c58d5fa88183c,1,1,Inc.com.xml
-4f07793724f22d51354cf995ac9f58512230808fbdcfbd964ed035443fd297a4,1,1,Indaba_Music.com.xml
-006659bbdcfec962cb0dfd03975d3c2fdb44e8040f54b2a4d4761cde87fec5a9,1,1,Independent_News.xml
-08fdfcc35d415a8993d8bcba68b0216bb1343e148d736fbedbf61d6de08ff781,1,1,Independent_Voter_Network.xml
-eee5c5f88e318b3229556d8238bfa8045c1ea90aea6e29ac6f28a9e7c2007205,1,1,IndiaMART.xml
-c6bb0755884827f0d4922e9721c56eeb37aaa515ba1aafc1ab435e75c5921b3b,0,1,Indianapolis_Star.xml
-f7be09e50039754ab05a181f2ad5b773554692b297b5b92027c9494b92e725c4,1,1,Indiana_State_University.xml
-0e11558aa800c2b2eaf87fff2fcaa7801f5bcf2b287180b9ddb86cc5df6cd7c9,0,1,Indian_Express.com.xml
-76196600f67cde4e2a5a69869eae23ded468e8c8ad6837e111b44ce8104cbff1,1,1,Indiegogo.xml
-c52fdbd3af9fbb35bba313c6057070eb43dbb148646763f82bbfffe9fe643211,1,1,IndieMerch.xml
-8f065e04d6bf03937cb8af0c1e8ca08925d3ef8f1b1fb681688cc3d5983cd356,1,1,Induction_Solutions.com-falsemixed.xml
-0d4727dd514988748b9ce48c4b407c7b52ca4cf4aaca1d13f867067eae1de9a2,1,1,Induction_Solutions.com.xml
-6943e0bf9fc5a32b2be598a64a25b6a4d8ee059154c859dd15d2da7b3c9889cc,1,0,Indymedia.xml
-69f67c7a6a357cbe15b8e565e6d2afc6b8fc2ba6cd3cfd393c4491b3861fa503,1,1,Infinet.com.au-falsemixed.xml
-d351705e0117a8e33adc3e40e369f3a6e85d99b78bc1e1486fe5694a271ecfc2,1,1,Infinet.com.au.xml
-cad2b10fe0161e74f2301a13c05b8d772df9cf00cb27e9a79ee57252ac2d644e,0,1,Infinity_Tracking.xml
-6938e47eaedda9b1548fb6fc8efffbb1069f8c9a229b2bd61a97d7da4f5a3804,1,1,InfluAds.xml
-80cec67f64924c4aa283209f631550d6181bc868b8762c22b13dd0a9a1aaf5ef,1,1,InfoJobs.net.xml
-b9f548ee8e7918ad26faf3926404d6aa68e13dfd092ab8435127ab975dee2f28,1,1,Infolinks.xml
-f4c83a13d0fd8f8e1248e83706d7426b8d5d39543fc0bab2f054bee91240fe66,1,1,Infomaniak-Network.xml
-f1c3666f04ae859c18c7bde24a595c493cee78f72121a2985a4d81a862b0fb83,1,1,Infopaginas.xml
-ff0dd4bb477d5c2b96ce3ca9edc86f4f449b5ad0688c3961ec8fe048f4c7f832,1,1,InfoQ.xml
-25891dc59b340e346a4a2e2e4a23e78b43ea8eaa67eda1c232173700188989d7,1,1,InformIT.xml
-9872dc9d2e174cbd02c79c23eb0c9c872c10ae2265835cd1cd6f3ab05a8a77f4,1,1,Infosec-Island.xml
-e8686224d76f240dfa05d6cec4525948de3ddbef03b1d39f83908e935f9ada69,0,1,Infused-Systems-mismatches.xml
-90de72a369527e8905105747fff3653c94e3e708fda69f1fd70aad8b7c940ea7,1,1,Infused-Systems.xml
-f17275b6e9f48b06e9f1db362a27de41baf0eec5fe34f484f7c141e9266baae2,1,1,Ingentaconnect.xml
-9d256f22c646c9cf9f4a5fa5c9d055d3c07ed937025bb19d659da8d5595c1496,1,1,Ingenuity_Hosting.xml
-756deaa5ee5b4d4c35a91db9c5e5f8173617434b69dac01f1017b5f33e5e4f74,1,1,ING.xml
-54e572fdfcc270309db864e7098ba422d1eeb909daa2fc7237d77649dfc4f057,0,1,InkFrog.com-problematic.xml
-b0674aba431f6f84a1712c31e7d36a881470fe0a99682fd24229399252192f13,1,1,InkFrog.com.xml
-abf2bf8030eb7da4165548443a622f0f8504acc1c1e6c06821be88d9889ef1b1,1,1,Innovate_UK.org.xml
-f10ba13a6c5177bddaa25ef0a0bd9520f21fe2985c58603ad6938b5350d5ee37,1,1,Innovation-Interactive.xml
-c241d995f6e6793b43f3ae50cc1832289b1de058e929249ac5b3a8418806f8e7,0,1,Innovative_Food_Concepts.xml
-58c664b5ec717524f57a805ba2b423e0c583d9c94790029ea85c3a95138d3853,0,1,Inphi.xml
-494365c0b35d941cbaf840b921de5804bb2ee88034120ed208b667ba42f246d1,0,1,Inpros.net.xml
-449ba10b60382b828cd2a22be490c649e442925595d8081dc5f4affb480d3a1e,1,1,Insight.xml
-3db6c007feed4eef242703bbb8c70c6a243aa6f7506fe28374fad1164fd7732c,0,1,Instaemail.net.xml
-3a03187d574c9fe24331701f80708d8147ebf6a27cf267cf0fdf56089a616b92,1,1,Instart_Logic.com.xml
-1baf2e625f3311d8b200e79db4e4cfb5bbdab56df4285363e0d62826e90ab2bb,1,1,Instella_Platform.xml
-60f96117bac88d3bb5266f939904e1cde7fe10a4916c497d52dde1dab8ff57dd,0,1,Institut_fur_Internet-Sicherheit.xml
-703b4eb285554ac4a7e183ae77ad699b8ff9a62556247c0adeebea8b1d78c348,0,1,Integral-Marketing.com.xml
-2bb7983307be40cb4a5ca7e5d5529b3340e7d47029a8746c7f7efb4f43874ca9,1,1,Intel.co.uk.xml
-8f38ef172cf9cab85abb4a5a08fe5d04dbdd83984c4450911f539ff89dfb4f39,1,1,Intelli-direct.com.xml
-f8ccce593fb95122a95fe00918c297e77ce818f5d344510362a3a99417f8141a,0,1,Intelligence.org.xml
-a2935104eeec79044ee7c456a5a86422d95f7df2c84328b097f07605e5b49683,1,1,Intelliworks_Chat.com.xml
-be276a4a23f73ee611e562b8dcb27311a8ece7c3868a76c47460fdf8eb08c8ba,1,0,Intel.xml
-405674d9b11e8e289b645154f2352a4401d377c62570898515365300f4a3208a,0,1,Intense_School.xml
-06883949df82e37533d58f8dd286eaafafe833eb20c063807312fc6bf4ee779a,1,1,Interactive_Data_Corporation.xml
-0219e661837e8a5fa7cfe309f9ad82fce9b1ed9266884e2068ca3d9a5b720e16,1,1,Interactive_Online.xml
-6cb9b826d0dcd0221d18fc0d787cbdfc243c280c51fdf4d8d64114b2e62be95a,1,1,International-Business-Times.xml
-d35125abddfa06c2e8d5b27927b2295b4eca89fedc189825d08015be71e3e49e,1,1,International-Components-for-Unicode.xml
-84e7f285a45629181dd08c4280bfa1293bfa38c3565b837ff7fd262a45c3bd35,0,1,International-Finance-Corporation-mismatches.xml
-127ddf485368851d2dc1f1eb1f64bb100f9397b2fbc05b401f2c53bbb0bce88d,0,1,International-Free-and-Open-Source-Software-Law-Review.xml
-0992d1e0fc55d6fe819499e798e99207e0ce9aeecab77981087ba963581e8149,1,0,International_SOS.xml
-7266fc84a1e6e39f0b812bf791d0b4c8f3705a3070bf41196385d46762dc2ca6,1,0,Internet-Archive.xml
-a0c3cfd823c709fe004ca38155708cd2ac9a21d7ad93be993a7c6f9464613c9b,1,1,Internet_Brands.xml
-664ae47fc3b398908ca534aee5d9fe34be83c9cc3f4b480c41a79a767f5fa49b,1,1,Internet.bs.xml
-cab358f32e9a489eaa69ccfdefe364cb36fcb5ba3346874889de9fc875050d59,0,1,Internet_Coup.org.xml
-81b3be4036e221a597bf01d58395099db4a6791814c05bfdb666f9dcc2a8088e,0,1,Internet-Governance-Project.xml
-3cefe2aca575fe4b14a4d0ae67ac6298463405b6f5514e0f95e0c3f2cdb7007b,0,1,Internet_Video_Archive.com.xml
-dc6ff49076759df04ad979467bf83cbb0678098f8162268e128a4a1f9b4a93f2,0,1,Internet_Week.jp.xml
-e6ca399f916312a92f2ccce14a32e982e49cae08a6ff48889a3e31297ddce53a,1,1,InterNetworX.xml
-340838024acfc70d6deabe9ee17b085b055d4bc9a80120afc800318808c7fe29,1,1,Int_Gov_Forum.org.xml
-733c0f0956527491bf6a01d35e097c6df6b84c46e102332096a4fb81973f7f9e,1,1,Introversion-Software.xml
-b00472fc653c5118dcba1528fa24b826ac7a3c90f1724d7966bb4c34b237f936,1,1,Introweb.xml
-c4773cdd0de0de2a990f3a7cbf574661da1e3c493e451b122ec2b1690d9154e3,1,1,Intuitive_Password.com.xml
-463310fdb182747ebb4fc15ab8c38a5f573b10b276ab7c3775acd3708408caca,1,1,Intuitiv.xml
-25975eeed6ce6e43517091794c5bdef087ecbbd76d1c2a039db67f6e30580f40,0,1,Intuit-problematic.xml
-17da245bf7911e07d9084e78490fa63191f406d7ce3c80f1355c8e58339f6ea8,1,1,Investing-Channel.xml
-b8b926a42cd2792106cbee833c76f516fe15c33d7b2af468e29ef66a8694a465,1,1,InvestSMART.xml
-3ebb442ec50843a304373e65a510d15fc576c54cb6b978fd86163eecaa6037c8,1,1,Invincea.com.xml
-991eb3720ab9da46c16c4b7b6cf83c0e7b071ef94e46111466e8a8b533b7cf71,1,0,invincealabs.com.xml
-2cef6443a46e25e2a577b7f671c5ac7118e0ac946d1344c36ab0570a54d09e05,1,1,Invitel.xml
-eadb5a61f34eb39970c0bb4c3754caae00fbd74671073ae8b4823e675a114c01,1,1,Invite_Media.xml
-6b83c7249532eaa85681d638f079f8c090c10b2e099714e498d70930e3a2f867,1,1,Invoca.com.xml
-0728b84ff919181262a365a363cd4e287be13bebf0c60e86ab74874d79a8418c,1,1,Invoca.net.xml
-dd1426ca3f72068c95e13c9f408c7a528f5dfcff829707f3bae398b7e98c669c,1,1,Invodo.xml
-0ef3df0ecd4ba16179db2b0be8075006eb68c43cc12e3a0859365ad8bb4030f0,0,1,IOCCC.org.xml
-99434a574dd224c386513e2ca4e72a9cae93fbf45ec511c4ad8acb80d499e3e2,1,1,IoMTT.com.xml
-509153f087cceff4ff6515158dc7433b329863e3820103b361d5ee92206da1ab,1,1,ION-Audio.xml
-8a66c900d13231321bea6872c759548b1dca37b059c7a1e729c7d15613ab0b82,1,1,IPage.xml
-93a3e92e0c71bd5f275730c91594b9d376221d33e2b18b16800d142fe6a5a638,1,1,IPCdigital.co.uk.xml
-98f538b907ef6e97fe0c479b1d7a75eb7c586807658f58ed57899aba56ea3479,1,1,IP_check.xml
-8b8f247af30a7f3dfbc9c1dacb53733f86a161b3c88beb69b43a8078dd19325b,1,1,Iplay.com.xml
-e2ec18a444e45c297a850fcde370401808f82a6183edb3750963f46f38365281,1,1,IPXE.org.xml
-4cab7ad0efb9a81786846b6c973ea525e4bd99e95bca78435ffa6eccac0f3fec,0,1,IRF.se.xml
-ef823b5bbb7fb55775a4d1d1f07ebbe73247b0e6bf88f7b38dd40a8a0d604313,1,1,Ironwhale.com.xml
-d3976d61894e1f8464f930466936d18aac9056ca9b23f7fc23d97382692b81b9,1,1,Isle.jp.xml
-e8e870aa2f1aef2264b5f4c2a02ebfa701b49355957dd1425fe4d2751f165b21,0,1,Isorno.com.xml
-45675b547bcf43e12c38c6a557d8d12cc9102d62b8fcd338037a1c667b5f5d51,1,0,istheinternetonfire.com.xml
-25311515967c690251425b45e19fd0952f87a56714aac8d249e10c2e91bec453,1,1,IsyVmon.xml
-9a3d20d51558662095b984f95252e8d9efd995b5ad19df125290e26d72177be8,0,1,IT-Cube_Systems.xml
-764508623d243afc9149bf564450909e3f48fee5a51e40221fe9c7a43640495e,1,1,Itex.xml
-8a630c86ec28d5f7c1c289c2470e843c30781cba6d81c12adcec6f925c971b5e,1,1,ITPC.xml
-ac43b9af8ced88db4ff0bb0c3603ac8a3f7a9542b9e087ee8a6c6c33a1aa327f,1,1,ItsAnHonour.xml
-81c8d9fead672ff52549aa53b8306ba03eb208607c9e65e2a186182ca6693c7f,1,1,IT_Toolbox.com.xml
-dafc7bbece1bee56d94c8660d05f9d015319ad221ec2f56682b00a1a0d26dcc9,1,1,IT-University-of-Copenhagen.xml
-e2165b1edeb24280f7d97d06d1d92c4fc582a0f814d7c38c2116090c7e7f5f7d,1,1,ITU.xml
-024f274cd2fb232792acb65a2c2c2b67fe893b6eebefec9da21f017262033102,1,1,ITV.com.xml
-30fdc0bbded9c8027b90c01f25e0c69bd106ff85533a3d6ab57a451e85b23314,0,1,IUCNredlist.org.xml
-3b48a035ae7e50023f531d8a79f7f41f7b3289b9a214d72ad9191edc5d596e02,1,1,IUPUI.edu.xml
-4aa279ddd137572939877944efb5a83bc521d1f8e83cc6250fec7f9150b55043,1,0,ius.io.xml
-c94cc0f445874d3f294be079e1c4775fefad5e6bb8d6dec007efbfd060276163,1,0,Ivacy.xml
-dc52614b3a33ffebbf5763c7c2a25158699d866af7ceb86ec83fe1750ba742d4,1,1,Ive_Got_Kids.com-falsemixed.xml
-ef2b06228e963b94bc9c0848ac490cd4516d52f2c525f74812dcfdcac93acefe,1,1,Ive_Got_Kids.com.xml
-2de2eccdeca2c24e616299050f3aca9ea8681114502166db1e5fd88a83b08eb8,1,1,Iv.lt.xml
-72d5a938721e66ba26e62c852e8a6f46fede3b30c5340cdb79debd18b8dbc856,1,1,Ivwbox.de.xml
-8da5f2bb9c147020134f872bf90cd9012bc6ab274e6c01ccdf3e529412599144,1,1,iway.ch.xml
-2263f261442b3b22981e232a1de6e33f81358b3b3482400f0fadf5ee89d20763,1,1,IWebReader.xml
-2058d895da75a404225168a25a20ed36618333427509d7252de4bb28563c3b70,0,1,Izquierda-unida.es.xml
-f23044af3f74a7dfb084dd7dd217b138db5a4e66f859b0575345d364a1fb14ea,1,1,Jack_Imaging.com.xml
-ba819463f4dbf2557d7812f7a8358bdf87a57b9532ca6a05176f4ffb833f7274,1,0,Jackson_Sun.xml
-24e0fa0948d392408855de200e7a99c76b078055a0474cdccd491d8fea8b7d0f,1,1,Jacksonville.com.xml
-ea862774de9cabd815710f212b32d626a515601e3bcabab24545c2cc190d1650,1,1,Jacobin_Mag.com.xml
-b47a736395c65ea89d9753b7ee9ab5f755255b762d556e9113209ed034fc27c8,0,1,Jacqueline_Gold.xml
-d57c8c4e76a1ec4b5e8e38d8c6926e563a12b4f14ccc77eb69ba031d9eeb025b,1,1,JAMA-Network.xml
-10cb0af4bf6e24534d3a29773b5ee04776b93e8cb098ba9f1f80ba715329446c,0,1,Jamendo.xml
-ff9ec4d4ef3a1b3bce5e071c90838d8ffed730fc68e2f67b160984cf5759830e,1,1,Janalta.com.xml
-1485a52f719f2d27837c6be64889c7d9aab1ca439b32d3ad0f9b0953031c1750,1,1,JANET.xml
-8f17280f7430b1eb693559fda1ddca0a950a1fa35ee40610a67589d2860adedd,1,1,JanRain.xml
-d2130738c6e895702f300033327d5e273f6564c43c7f71006f8c288f83cc1b9b,0,1,Jansbrug.xml
-b11452e21255ea71512405b587dbd976452139b101003f4a10cf8b928005f3c6,0,1,JapanAirlines.xml
-62d30f32c383b9005b247851e85115fd358c8ee752b97edc0d020b0ee1bcec88,1,1,Jarian_Gibson.com-falsemixed.xml
-022c9c4086d6343d3fcd40c03a32097127dc93e706d6fa1c86ea0aced6541537,1,1,JavaScriptMVC.xml
-7d850c502197ea8b2e13688d1f2b34c9b7a44ba657c92faa3b3ed2030dfaca66,0,1,Java.xml
-8a7eeb71c6b48d0f19f91fbf3bcc845d29d94cd19e62672faa47548ccee7fc96,1,1,Javelin_Strategy.com.xml
-d85b36c7e5f7e55d3ffcdf72e91172f450349bcfa61385e2d97633ddd49b1780,1,1,Jawbone.com.xml
-26c1c6b5233bfe9bcaafb3505cc40fe716ffac3309ff08136944f0608c825d1e,0,1,Jba.io.xml
-7f6cd4f2e205b70be904505666dcc5ed6d32064fd765306addc44050e9f42d81,1,1,Jeena.net.xml
-36a6e1369155457e9635e5550744e2c1c13bcf2be9e8eab0fe4bfeea9ca471b9,1,1,Jeff_Nabers.com-falsemixed.xml
-b77b4b9c609e0f61ab406d1aa62c5d046514aa6581f420374ef0fc4b7a112def,1,1,Jeff_Nabers.com.xml
-20df0251075e227bd026718d531f83021987ee9c14a1438f3cd7e6f9ac12014c,0,1,JF-Shea-Co.xml
-fc360bc4c51c542d702e0cf9e1b9dc0dac71c9f6dbac2502eee7e4f382db5214,1,1,Jigsaw.xml
-c1df2d5758953f29c992ec2598c94e7e73d5aa6c91d2f8eb4d62e0fdf0322a07,1,1,Jinx.com.xml
-36aa494d6b1aadbb11d28e5f2733e4713688279504b61da9fa6e8e33c2129aca,0,1,Jitscale.com.xml
-f1a84ec3b3e0e934ce0ee5517ea0b31cb7ba152de5278eb0895bb07023c6628d,1,1,Jobbik.xml
-80eed726a6c96bd4f97361b7ee9d2fe2e954fb74437a4e800500399676778e61,1,1,JobMatch.xml
-64fc460060a393b978731d56d9f0e88902ca46fff05a9ea7bf778c7e0dd6b53a,1,0,jobs.ch.xml
-717e4a4f64aaad464e54a20dcdc4230ead9ca7cfb70b862703a039714cdc53f2,1,1,Jobsgopublic.com.xml
-ff5eb876669cf155eb33966d0cdda8a88942ccf55c814b14addbe51e52db761d,0,1,Jobware.de.xml
-944f796f90772d6565585be75ad9816a221c0c79c96e10bf0b2a41002fc0b0d8,1,1,JodoHost.xml
-c4b2113774001111b1f55f866cb7af429b19f4ac9e7a78dcfc985766de58305b,1,1,Joomag.com.xml
-7dd138cef7ffe127cd6fdbcb63cc7d3f0836b4b118cfd9773d5d3b2e1d681de0,0,1,JoomlaCode.org.xml
-5e6433cbef1434f17f2acba5cf2a74be3bce1861e88539b729f3827729ac597c,0,1,Joomlancers.com.xml
-c8894784a81d8e8acef0d34262fd1721fec1d497829fb2a165a0310c5cf8d22c,1,1,JoomlArt.com.xml
-c979cb8a361e3ed2bf5032f85b8aea715a1bcaea1a278635048ec26d4e59240e,1,1,Joseph-Rowntree-Reform-Trust.xml
-3a2cee590643793464daa4b4023de6bfb6ab8ef1b0bfde93a6bb29cfd8ac5691,1,1,JotForm.xml
-62027605d5213769d6815e6644e5e9d2c45a71dc2db060935e91f44e93efbbbc,0,1,Journal-News.net-problematic.xml
-101fd87908eecba0acf9700f26880592677e52c7d8edc8638dabd72dc06476c2,0,1,Journal-News.net.xml
-034d3eb71d4ee7fe858c1d07f27de44c75498f70699d0cea1ff8a24f7c94a50c,0,1,Journal_of_Affective_Disorders.xml
-c621d4ba25d54b2ac74584129f4234f43b52d2bb00a11b49ef04dc15848169d7,1,1,Journal-of-Neurosurgery.xml
-ce1f1dfa4ffbe1de9185c4d5bf81e07ffa6afd0c0b3c16bceaadaa8194659a77,0,1,JSConf.us.xml
-878f0efcd4fda30f3821e5362986a41446a368b644fffa970eaadde331595bfa,0,1,Jubii.dk-problematic.xml
-65d10d09f2078c9271d6437eae33d9e7d6ecae9a2b2364670ad60d98d0279f83,1,1,Jubii.dk.xml
-71b79ae041f784ef340990b3a3a1a16a07f041a87b95f9d6f235eedb89a75a08,0,1,Jugendschutzprogramm.de.xml
-b31ea973c4bb7c2d240cb7dff9a5a13174e7e473cee758844d9cf827dfafad13,1,1,Jugger.ru.xml
-21937f0fd2a36647290096e83c0db7202e391611c11760e4cd68edb237a4f7b5,1,1,Jumptap.xml
-65013129a4da8f42ff367111b3f7813b706c8e37023236e8536ba2dda8957fe2,1,1,JunoDownload.xml
-a6ca9f9ad95e7e241678458d14169a02757c470fbb891504853b72a2ce450cb7,1,1,JunoRecords.xml
-4b35e98b981f9df97de267679053b07d243573d98a3b6c6ccb0cd6398c50fd35,0,1,Jusek.se.xml
-4f66a213e609f141d907611e755bf0e4379e737428775635060e8cb0bd91ef8c,0,1,Jussieu.fr-problematic.xml
-8e25f54e02aadf3128841a9ea2f14f2096a975a4cb6578297be4bb2d78e4d9a1,1,1,Justia.xml
-3ffc4c90eb55a5902906b2548756880e99f8852f53cc333c8771882eda6e392c,1,0,JW_Platform.com.xml
-fb593e8ddf88bcb1d1508da06196adc76706e4a163a0e8ceabace9e8a5bbf42c,0,1,K2s.cc.xml
-18bd1f18f953302be45bf882bd9b3b8f6a738d8f6e1f844dab416d95b018b248,0,1,Kable_Packaging_and_Fulfillment_Services.xml
-8f18453e3c720bfbebfb1708243a5a25fb7434df4e016246e8ea288eca398952,1,1,Kaiser_Systeme.xml
-6fa233a4df630fb7dcb886a508843290392db8506e73a1a7da94954db2affa58,1,1,Kampyle.xml
-911f9f57dd80af37a918d5c5029a1b4d156298e48a029e7aa9497beeda774ccd,1,1,Kaneva.xml
-0d020e8196630cf58db7acdcfaf794b8eaed3ff489057148c718c3937d8fe03f,0,1,Kantar-Worldpanel.xml
-4d40f0740ed2f847fd8c22c07325ae9fc4a83b1a17668dd707ca61a2bb37af8f,0,1,Kaos.theory.xml
-aa9386df75242bb212ece0a1276439722214b066f3a533f48cd1c9ef722f5f7d,0,1,Kapsobor.de.xml
-77a004132ec7407b90b185625d1a4610a071d6dfa8d9d607d3a63bbc76ae876a,1,1,Kariera.gr.xml
-d9cea3e0f991e145ab25ca5b1ceecb16bdbea19a6e13bfaa3f7d8aa6a7a043cd,0,1,Kasimp3.xml
-2533dd6d42cb718667d11a29e50393d300b659dac2e9c62a5954b17aeb915c71,0,1,Kathrein.xml
-8c3308c7790fec725f31e846d418fb1fda636beb525f9631be1cf2c9261f4672,0,1,KatzPorn.xml
-3841a0cb434fad889b90822e10a5a9c583a405751ba0c83798a22a12fd35be4f,0,1,KAU.se-problematic.xml
-a6a776e8e5901bd6be4af8ae581f0f74106f78b5b05b1b4e1521ff7df28c7fd5,1,1,KAU.se.xml
-10c58bdfcba0984977230b7e1f4b7b735e1a4886eec5ad9c0797437718d4fee2,1,1,Kayako.xml
-2086ed81e93368551d121b0508a0ae28a1d71f294f1ec7b58fb5d1d21b9380c6,0,1,Kayak.xml
-68709a34f51a5fd997ec08d97e2c0aa2330b4ea1134bcc5e11326893c82c9913,0,1,Kdoes.nl.xml
-acd59b926980f2e6a1edc1bd896e12121eb5ddbb7b91328e6ab7dec96b887c3b,1,1,Kei.pl.xml
-b67160a2bcb46424224f756e56dfb804323c2446e2161554d1d1015b64ab32d9,1,1,Kenai.com.xml
-cc4ede67cbb2b5809ac7bb84b1a3e4364ad98f9f3fc139ac38683c67256750a5,1,0,KernelOrg.xml
-499d9c70a8be988de7982c15bb9281ed6e9f1076f26f255574f0f958b3739537,1,1,Ketchum.com.xml
-911d17e381f38a6bc6ef545f5ca260fc0954922ed63bf05e2f7ca0e6035f4535,1,1,Keymile.com.xml
-c61b499fb7ce7de7eb4bc86bb6c047a202cbb60c30b6c78110b36e0e0ccec9d4,1,1,KHN.nl.xml
-5fb3e2cc1c993880a2f59cf36840a623d0d7f329e31b725c711619d78031845b,1,1,Khronos.xml
-e71f0286187bd70833f0c421f31b4c23780d670da9ba33e8487b66ae4229a629,1,1,Kids_Foot_Locker.xml
-12ae40cfc95aaaae2573664fd2fea40b4aa90e5adb75d013953225121bd38361,1,1,King.com.xml
-4b71dc7dbecc49f2b48f869a78b2cea026dc9eab9ee6627a49581d58bbf936a4,1,1,KingHost.xml
-01c0a3410f1b8f8fdb8a81ca937b4fa59a074300e02076422a033046087436dc,1,1,Kings_Road_Merch.xml
-50a1bfcd49aea8cf2afe04bcce6707b612e0429a3e5a16f1cb98cfc567603682,1,1,Kintera-Network.xml
-3e76458a93fcb8f50402743736e5f6916231f558b33c9c37bbe4dcda9f8c05f9,1,0,Kirjoitusalusta.xml
-c945235a8c454c4c16e6974e30e93b93424b69da591daa36bb76e7fe25157cb5,1,0,Kirkus_Reviews.com.xml
-aac83590b0080a78a0b254d8cef88f132b0d609d2be69b2744903b627e000951,1,1,Kite_Packaging.co.uk.xml
-3574082b8db6a3c2f542c57d0331d7afb46c1a93edd6b3856b447bcab2d0ad8e,1,1,KIXEYE.xml
-7e5171a47befa926139743e6067915bae25cc403dbf0f588f7864ab606739b62,0,1,KKH.se.xml
-bd7d290a024a52feeea17c0687d34ed0412dd25138985aeb137ee451ff253b44,1,1,Kmart.com.xml
-a6450ff330b90c225cc405c8f5c623dca8d7a80a0c16a3e58be546feb7ae886f,0,1,KMH.se.xml
-34acadabac69f1b030653f41e147c1baac9ed50038fd4d241b1cbf73e085bb5b,0,1,Kneon.com-problematic.xml
-8d12f9d79c207c30d5319a01f740f4a73681b5c5b5973fc74c6817ae87f76534,0,1,Knopper.net.xml
-a5358a29ca8a284d6821ad4bbdf89644562bc632a9704dc698ba5b954f1e298d,1,1,Kobo.xml
-6e1e8a06a97847e7a33147d96c3b62c45a7afadf7c76dd4cebe302059a7c6bfe,1,1,Koding.xml
-900b42c2f9d1ce487f4de696a98cea74e452b7f9cf848de6eb9c8d8254784e64,0,1,Kommunal.se.xml
-7b7771e336e05a84d249ba6c7a5693e82edd32524986654d9f221d8813f93ac1,0,1,Komplett.xml
-796f232394138ee9298ed061fe587c009ab2a399f9d4db5fb77a07baa51c390e,0,1,Konami.com.xml
-d417f481fdbe9c2100592bf164c92feed9e2a9f8c989a8267012fb2bb4a294a1,0,1,Konstfack.se.xml
-c998b1cafdda9cf06478f163ec72ba97ce710090b671180ceed391173d43a574,0,1,KOP11.com.xml
-107594077e634f421f2ba1f553e1a3504bcdf06c2f2470d5ee6a362c0a9c584f,1,1,Kopiosto.xml
-c3a61d031c07fa780173a1aa2a7c1c9272eeee8ca43da6848ca80775ab1887a2,1,1,KPN.com.xml
-c862e0e1a6711961135955912f1b1644c5e9dc31eb2966415367ebd39f434774,0,1,KPN-expired.xml
-d16ac097dcebab4087ec6f9bdb4bc0077ddd598d58299bdaf99a538e491ae85c,0,1,KPT.ch.xml
-c61197b469d6020a7cf8f4aacf5ff2c2af8a4903f35207fdae2fe0f81a370d85,0,1,Kraxel.org.xml
-6ab41a14718447df02b8c045716eb7adcabf5af5e48a7e76680f7ff2f1ca1ed8,0,1,Kriminalvarden.se.xml
-70ea6a47d4bc8e3031576360df6556486307c552f6262b899f7f5b57dec7fa27,0,1,Kryo.se.xml
-3ae3c3f965df54365567effeabe4ce328c7f31b9e4cb31009167fbb52fb793f1,1,1,Kryptronic.xml
-93904c0d10667169302962673004c767a5771c73c1918644c02a55dacf0ee33e,1,1,KSL.xml
-3d448b9e0ba2764d10230a6f260149dd3417ea3d92b4879013c4fd4505aa1192,1,1,Kununu.xml
-19bea2ed759325c97ae924c94404176e90f5621cb27805a2a1b51de8895d0e93,0,1,Kursbuero.de.xml
-5c1a6004ad48bd3390f16c7fdbead17ceb2c1a81e0c6454a304111d33a3d6c59,0,1,Kuruc.info.xml
-53f972ce676848f11352f5c892d485ce971910da0814445e0a42662963eff652,0,1,Kuther.net.xml
-4abf335db60c53d57b3601fbf32a77fb3fee97723ff0841f3bef1b4556880872,0,1,Kvack.org.xml
-a658ddc8846508fa73546b9b15f07e6d146d50826591eefd1a4235b65d059d93,1,1,Kyani.net.xml
-440e3c3ec61a216fd7754eb08d64a06e73366ddb91e20c952543667a86473e31,1,1,Labels_by_the_Sheet.com.xml
-20b19fd39640726a8449a52c8b6be51dccb571c5daef707a0b27da31b0d86b99,1,1,LaCaixa.xml
-9ebf6098aa72ec0fbe266bee38c2cf864855a3a43e95d50d086fba124afe74df,1,1,Lady_Foot_Locker.xml
-9cfd769231672625b8576733968b9cdccd500feac77f6f1510f30ed7f70959f2,0,1,Lagen.nu.xml
-1adff119276f79344cddcd84d7b6f5719baf21515f657c08ed38afaebe12334d,1,1,Language_Perfect.xml
-8fbfb34c2994d782ce1ade635b78401d5a869fce79d309a6a5993640f8e2d552,1,1,Lanistaads.com.xml
-0a40620d4ea61a892d580fc446a4e37d5a586834722d4993ce7e58ed4e08295d,0,1,LANsquared.xml
-c01f9d5e0f0ef9ec2db156bf19729febd55117a48db33e144075f98a9e96debe,0,1,Lantmateriet.se.xml
-4df842d254e1cc740e7b97bc6d828dc1474f0db76929eaa6b94998280180b752,1,1,Lanyrd.xml
-dd011e0f5fe4e3c951182b87f42d4c8da475b71bda1266177397782766a60a3e,1,1,LastPass.com.xml
-039059c27353ecb1cf62261e3235a7a84dc14e83e40391f19559f70a9c8960ce,1,0,Launchpad.xml
-1fae5026b085ff0376c53284b2b7536230bd781b79f4be08506d04bdc7ef1286,1,1,LaunchRock.xml
-bf3030ded18c245aa1d051c849660ef9807cbd9259da24dbbd0a5c12cefa65a9,1,1,Lautre.net.xml
-7098e2aa85525682fcab29572d0e6389dc4f3f869a192b4b9b3f4ea292cfed3a,1,1,Laverna.xml
-8c502c0ac28620fa9c8085df27334248b1c141a4448a9193fe9e17dc1258e0d9,0,1,Law_Business_Research_CDN.xml
-329b80614b84565bba78c4cf3ebd40f2caf60cf648372f1deda76b93564693c8,0,1,Lawn_and_Landscape.xml
-f649aae090d1c7cb5e6329286ca40bc52e4085fd4d43d022ac986523a689f268,1,1,LboroAcUk.xml
-93aae2db3d2e73312ed4250f95b9291ebe956e90fd2ba447cf665c751d93293c,1,1,Leader.xml
-a6a354b175f07f96a7c2cd4ce4a00e26cde800c6f6176f660a59ae918cb56d91,1,1,LeadLander.xml
-aa7a5898b6ee0435abc8a2325c8d26e1e7e45375c7707911d8651a1d4bcdedbb,1,1,Leadwerks.com.xml
-acab086b0a34bf5d315b8292d4bdc886c9c30f77f9009c19417f85feb96438b3,0,1,League_of_Legends.com-problematic.xml
-24851fbc627fd1e1910448fa382bdd31744479e3a3018e5acacfd363e338c140,1,1,Leanpub.com.xml
-e400c587a600d3ea1d156ae3063bc8aba863be12423441d42d9f56bc1c2b0516,0,1,Least_Fixed.com.xml
-93487386bd9cf5af49555cdcec23409fcad92e770785bf4b3e91d44805b75f03,0,1,Lef.org.xml
-efa43c344ca7034b8aa477d8a545cc618ba0b193ecde88f68cc54b605c903585,1,1,Legolas-Media.xml
-90a6479744e53e950b50a5618374c41aaea9b48c8808815cd181f6ccf7f4452c,0,1,Leia_Jung.org.xml
-da17170681a3bd56795ccebed4692911af60a64bbcbcebc201e15fe5d3c99329,1,1,Leiden_Univ.nl.xml
-a3ef9c0d822a74a1fff679e554ac079db0976b0c53fd85a2362de2cf6012812d,1,0,Lelo.com.xml
-c654e688d0010234dc5bb91f672333455c7ca1235884add140d3d4f9d17f3173,1,1,Lendo.se.xml
-0db5c093f93156a5764c5d52f71bf860cfee58c6bb7be818f235a9061ac8801b,1,1,Leroy_Farmer_City_Press.xml
-ee71a6176b5f92a9c5be034da928fc78ac61ae1948a2b7ebf0b0e65e170e4b63,1,0,lesershop24.de.xml
-5f40aad7f0e3df3f88bc274955f3bcf58402003b751c2afda19c418e44ba78d4,0,1,LesFurets.com.xml
-39642f205be4ffeabd15f24667759913eecedab67cfad0724f101565cac7dcac,0,1,LessThan3.xml
-7a1bfc739351f99895900ce0516234da64b65c93204a5ae3de8b247d64d86f63,1,0,letvcdn.xml
-a68ae22f6144a808a21f54d1483174f49482b23ca66fd63899ba9b4e8e0e77e4,1,1,LExpress.fr.xml
-b250c290c3d7b18c9f1ebd437cbf511bacfb023999b8931ba5fad91da27a1946,1,1,LF_Hair.com.xml
-c6af0bb28a0493ce2106970a3acdeadfcf1dba65e1f56a3244cc30daa5093c50,1,0,LG.com.xml
-eedbe4c1b73b659f65c1b47b6b0a0b08e5e4ce32c8c96b82fa8b6e4ad2f5ead5,1,0,LibCal.com.xml
-874dc6ae083039030d5a7f604921e9e914368e4748f0c62ffbc1ebff9500dc3b,1,1,Libdems.org.uk.xml
-82d91c9bfd424f34898c9435240f08ba68083edf2a2f14eeaab224ebf245a606,0,1,Libdrc.org.xml
-ca3651e464527f1cda0d1059fdc27e8bc7ec56c6cc326d8ba5be30aa145a3751,1,1,Liberal_America.org-falsemixed.xml
-4da6941625e8c737ccf9de80aadd671b78aab17d09bb0830557256dd8f3a6ca3,1,1,Liberal_America.org.xml
-2024f5bf8b3fc81e834b022b2c34f31669e1dd151a163c304d135218ac2fb74a,0,1,Libre_Graphics_World.org.xml
-feb248073503e6b89a199631eeb2f81de397fbe8033003f7c16aa4219b3d4663,1,1,Libri.de.xml
-993b07ba4b30101d7b4d133239b7a03ddc0d914cde338040b53d7871bedf04b1,1,1,Life-in-the-Fast-Lane.xml
-9f97b658b03e53823ffe3d24b38c30fb95796b04381506571cc2e179795bb8c7,0,1,Lift-conference.xml
-72fbe1881d78b24fb19fb901ec9921826c040eb78be5fbecb1eb2a54302d7393,0,1,Liftdna.com-problematic.xml
-91fc0e64deed78bdc5e964c46ad97765ae536dfc279fd42b8828f66653a1157b,1,1,Liftdna.com.xml
-45220faf6deafa7ec3e94a2117116c46efe13829982abc1343ef2839b8bace5a,1,1,Lift_Security.io.xml
-1549a4c4ddc5b672182806fdc65a451b26a62f21bca0fbb9b2dc023109b2e6dd,0,1,Light_the_Night.org.xml
-48c01e2f0374af16870b407630c136624e52c60d4a5706f5d33427a6d4fa2326,1,1,Likes.xml
-6caec6c16c8be5429cc654964d31f3d2a2990e0592b6402b994232621eb3c0d8,1,1,LiLux.lu.xml
-422032715cbce1794ee2f55f9bf167382377dfe69ee9056150227870c39d08c1,1,1,Limelight-Networks.xml
-6407a4a785f0eae1a43553d7d66ff1e4b15c06f54178294df3f832a9e65f4fa1,1,1,Limited_2_Art.com.xml
-c30be63bb86f2df95e80aa3c9e44123e42903fe609d1a1f184a249b07dd12f9a,1,1,LINBIT.xml
-65246edbb55b7f559bd4179548795ee732dcbc4cbd487d6e2d22609d2bf8e274,0,1,Lindy.com.xml
-a3179f5b1209fb9d30b10fc5fd8c7f0c9ce63f4fe2b87acf503c9df4312827a4,1,1,Linear.com.xml
-4a2fc0b779342d0c2d637197cac377d2f4f63c057426bdd6ad89db396579087f,1,1,Linerunner.xml
-e1606d594c70f4772ad90387bb7fbefb7e95f0e6a25c0cae0ab2957ae91e988d,1,1,Linkbucks.xml
-acdaaba99ef19c3f731ecfe8d04a19d7c62640ed18b3049f9149173e4d03f739,1,1,Linn_Records.com.xml
-a476e2dba22601391ac2096fae96ee94279b2cf203437e354b16f0aa8d51bcc0,0,1,Linuxaudio.org.xml
-abed76a1e5201dde504d6396473b2961c66f1362ed13dd21c4805178430d208e,0,1,Linux-Counter-Trac.xml
-7d1927f332504cdabc27f72275e37d352cf089a1db33f8739a2db002eb16e4a0,1,1,Linux.lu.xml
-7aa31325bf3afc674fef9ff7fd6a022945a077e10cdb903ca73ca0227b01861c,1,1,Linux-Magazine.xml
-53cf30c2c9ea211f8de47c6261d61a26d647cf394988339a5a9f1ff97bebdce6,1,1,Linux-New-Media.xml
-2f66c9ecc06f5e9d323069143ec7b47c7138a47aaf2139866394b3dcca7c6e23,1,0,linuxpenguins.xyz.xml
-a71ab050c710bfd47b7eccb18fd7d8424887e9ecc866ac04e2d00be0d779b029,1,1,Linuxpl.com.xml
-8902b915d4af12ec2c7859275ed6c3b5d60f224efbf7472033ad11e994d62824,1,1,LinuxQuestions.xml
-8df9f56194e2055e0b615a3cc7cc471d6231250d7c1bc7d7858e2ec1b1ff8db0,1,1,Lippincott_Williams_and_Wilkins.xml
-fd66ffe9d36bf4eb6da6930a5d7a4f647aa492e25111acecb037c54669d7f042,1,1,Liquid-Web.xml
-88381b0c6fb222168e09344b22387cf75ffb53d4e9ec8efe1affbefbb9d386d2,1,1,Listonic.xml
-64cb5698f01ea133be093f245d645f3845fd50c41f2eaa00c28f6726f8ac6a2e,1,1,ListrakBI.com.xml
-ec41d249213aad2809c091e338ddb5eb2d3b97b335598082e618aa5814ce168d,1,0,List.ru.xml
-462bdf73b53950b24e70bf000e5ea02bd8807aab7420b6914d87170c18893be1,0,1,LiteSpeed-Technologies-mismatches.xml
-3558ab8db745d3b527d28ab5fc0dce1559dbe191d449b27d09223519354bc135,1,1,LiteSpeed-Technologies.xml
-51bf5b2255960e679a19cbde576deb19b76428e52af65f87832df323b34789ca,1,1,LitHive.com.xml
-1f30497a466a8216630a5b5a2818521394d6cf178b8db54382480e0645d85c94,1,1,Litter.com.xml
-0cbe29f915f493df49e068f6287eb8759e6433cf42cbb2cefb203c8d3d8af634,0,1,Little_CMS.com.xml
-fe52803da1f703cfe9990e08d740aaba64f6d59c459653376356b5ecce922a7e,0,1,Littlesvr.ca.xml
-50d1020d66cf6e6fde0f34c4ed117ed2ee0f79676b779a5a7affa216de3abe55,1,1,Liv.ac.uk.xml
-fbeaf8dbd06fc62fb6217d020e5d4401df8539e62b29c3d1af073ff07d52ae00,1,0,LiveAgent.xml
-4df0e6a98068a7e8df85af4cb7248c048fbe6b5fd0bcbffadc7d155d8ce52610,1,0,Live_filestore.com.xml
-e3d7781eb8af6d39d6b9ce237e46688f6615aec94f65cb2a54a87e167b0c2236,1,0,LiveJasmin.xml
-657622e6f0195b2dfe3210112b7ab0e1e31a00717ffb3d40d8659fa04b74d5b0,0,1,Livermores-Centennial-Light-Live-Cam.xml
-70ffd66c918dddc6e24325ef9851aab98064bc9054887498b0b1ee96ee1c57c6,1,1,Livestatserver.com.xml
-42955f3e20090e82cebb057f5b3834f31c28d0a05cea87cb1ebd75cac55e7d32,1,0,Livestream.xml
-0d6cb0837aabdd3ca8fbc4de6d3c8b1e60092939708186f1ecc9ca3e38ea0acf,1,0,Live.xml
-6cf957e7613bc938177a082c0f9ce6b5773892518127b119b3444955c853d542,0,1,Liwenhaosuper.com.xml
-e4115499b76cbc58fd655c147fc8ac7d5f4df58d2d83d0b9e754f04bcae2cc31,0,1,LKD.org.tr.xml
-988f051e3c35548f5f6606b7d89433aacc683cbff4e87298fe4148496caa2cd1,1,0,Lloydsbank.com.xml
-e794213f13ad4f699ae02ea5fbe2e58eb1626983ea722ba3391d4ee3ab059a9a,1,1,Loan_Science.xml
-ca014caa8ef288a36307bf7b12e0fadefadcd7ef1e2194b8f67426ab622c96a6,1,1,LocalEdge.xml
-b250fbb7e12444692db8db24a0d8e51c9c16147a0bc0aa62599c05e6730f2c9e,0,1,LockerDome.com.xml
-cf76a87a558fbdddf2957a265d8139135c74bc5f0edff05648870f6d4b97a876,1,1,LogicBox_Software.xml
-9b0a0112349ef2f150eb1de92abe9c839528a05d55b3ca16a4af9fc84dd3f0a3,1,1,Logitech.com.xml
-6deda1ab7e95f5c5cabdc5d3adb376b1e7092973ff36965d47b7f5dfa9fd8d77,1,1,Lohud.com.xml
-7a3d8f03db190439c6f191d3f8878dc98ba3cf0e33297e1ebc537f49a4f55073,0,1,Lokus.no.xml
-305dcaeec81ae8e2872c0b18311bbcd20a1b5641373762c273cb84108dee4c41,1,1,Lokus.se.xml
-f180daf50f99e6d294efe3cfa3782b3038ec3c34a48667dc72884554e2d2011a,1,1,LONAP.xml
-5f1345067ca3653c26e9212d2b42a2afc42ccaeb0afc2d48bce1170d430618aa,1,1,London_City_Airport.xml
-d7be9fab34a3d4a4aa00274545cedba1d569fd9344b46ecc8c5becb72d65d510,1,1,London_Hackspace.xml
-a0d83b08c193b773273d200ff0d57cd582f21c6be981c08af4be54cf897a109f,1,1,Londonist.com.xml
-75ab8da3db1a0f6b262b1b786c199a861aee0bc84b5e0f1042460816881a43b4,0,1,London-Nano.com.xml
-1ff33f43e6de573dc4f1dfa3ceb046e97ae6e8fd6eb063984bc1bb42beb0f234,1,1,London_Review_of_Books.xml
-310690f227575180b1c3d8106079e906ac8c7d09b3301ef20de06c6ef723dde5,1,1,London-School-of-Economics.xml
-3a16eb66437b66ca8fcc39076fa6f076e16ac3cb266af78debf75821a00aae3f,1,1,Long_Now.org.xml
-c29a217770ac145e47759e1ab82324ca64df25044d4101151e76ed94317168c6,1,1,Look.co.uk.xml
-355836c860ec876fbed29a5a9279df80239a4e299228dc0de7809ddfd9b5be43,0,1,Look_Dumbass.xml
-050bdb8522be2fed28033b318f7565def40681e0fa6de20d5175f41beaedf4ad,1,1,Loopia_secure.com.xml
-c8167eed0704567afe03129c8f520733afe29916e6be584119b1311cbfad431e,1,1,Loopia.xml
-371f6fceb21caebfec3db3964b27141b5e00853315f431211d364301a45318df,0,1,Lords-of-the-Blog.xml
-869cc6be96443dc2b9b8321d6714bef81a254bc8a244f9ee09e55ba6141f2e7a,1,1,Los_Angeles_Times.xml
-59551041618f1d126bdd5fc15d2d35d372b41e8876daa1e6f4be5365da3f0475,0,1,Louder_Than_War.com.xml
-b801cd50beb9a47c8ab0f24b1edba458f886679322efb69e9babb30a544623b6,1,1,Louhi.net.xml
-1f01f25bda4f1789a1f4ab02aeba5b9eb966b9a5ca627f5744c06b5de09c4c5f,1,1,Louisiana_State_University.xml
-214c9459b53619d48be2f0f57bd4ef4465e22265b3642436b8aa746d487aec9f,1,1,LoveHoney.xml
-40dd4d714fcf83eb7fd375a823fb0706c3156c270350bfcc624fc3799d64033c,1,1,Lovemoney.xml
-6e1614a42fb6bf41f161fb271e2cf441359eefea66a5de92ae60039337adf443,1,1,LPO.org.uk.xml
-7fd1c24a4f4664d94bd4dcbb1b3adf923768304192d282339008431d1e86d086,1,1,LSE.ac.uk.xml
-da5fdd9d6a699effa230e866fc65358766ebf58c0810894f0308cdc47c1bed47,1,1,LTER.xml
-f658183981b04e371b234df5e21f9f2a92039ed4243d6084956ed82b5718c812,0,1,LTRADIO.com.xml
-b500bb1c4a87c4413bbe8680a36ed3249eb62ed0c8848b02877d287e67ceb517,1,1,LTTng_Project.xml
-8294fabf3dacdbe9dd045d04f49b312ae7299ce985995ea10fbde1d4e970209f,0,1,Lucky2u.net.xml
-4cbc4ab621120f80ed37c2a18c50e6ec3696f80a11f345a8851de3bca3a7ec42,1,0,lukasa.co.uk.xml
-e87fdd018e7d16e13d4ec9f6c5ab6fd7ba7302b44b9ed081aa06a0d67c257ccb,1,1,Lulea_University_of_Technology.xml
-743e2d966f98d25ee6df9e10236138341a27e9e63106a8c629b26ce53d41b3b8,1,1,Lulu.xml
-2d76724c1ff69dc9e9991ed1fdad701efd342e25431e0ab1689ecf981c350c35,1,1,Lumension.com.xml
-f3cbc85de356243ff65885250d8b80c5b5d0b5d3667e602287c009e26d289fe7,1,1,LuminoWorld.com.xml
-708a610e442b2f4088d699b384afbb24dc05dd13d0bcef2afdaaef8d3a93b387,1,1,Lumosity.xml
-d3689ecf97752c8573fd559c68beae3b96bf66cc7a7e045a03f0d1050e6d3b48,1,1,LU.se.xml
-c23ac8c12c30952a7c7245142352b841c4ab69c73825477b198de20e0cbd6a25,0,1,LUV.asn.au.xml
-bc8d53a934a8e46ead8ace467acdf5066d86d92d2f6f96c50f4cf4fae6d08f0e,0,1,LxCenter.xml
-a1db82defa904faec2c657e6ea22941e1b148f1e81cf35a58c40803424b6b01a,0,1,Lyft.xml
-551b122a2c152e388af55527367654016d5ba842ab144283c167b58436adb58e,0,1,Lynxtech.xml
-7a79a8db4e9722be79a45338c6d8683d263af712c3c45c1401930489ea51314c,1,1,Lyrk.de.xml
-69a66bfa688b75501e36d3ae7dff90d3511846689a28d3757aab2b290821439e,1,1,M01.eu.xml
-7d19eb00dbdee30aac81a088c9fac36ac6683bed08617800e01ec52bb96c0cd2,1,1,M2pub.com.xml
-a707f9c2c70c9f5a5bf277f252d22c4253a5dba6988ceace7fd0400fd8f6812e,0,1,m3connect.xml
-0543d58e7108adf6fe77cb43048db92c7284bed3903d22b30f3eac8c0654bcb4,0,1,M86security.xml
-9d231e863545aa6ab658902eec4a64ef6340e10f2fb03959c1108aab863f0d3f,1,1,MaaS360.com.xml
-20823e5e3e39d1711d7d3e497af580311915aeb144811168d32f76cd959a2b10,1,0,Macfarlane_Packaging.com.xml
-342172ba363f805e1ff97d22dbd3b19a94fb46633f0d119ed9c353b5d2c9ebb4,0,1,Mach_Comedy_Fest.co.uk.xml
-c3367a69fe543bb4508508bf1032147b95bfad9809cbacb6f3ad3230024336b5,0,1,Macmillan_Dictionary.com.xml
-3c431c443fc150f08132c0e1c4b571f85b6a1ccc75f4d95b1fb9d56db0102992,1,1,Madison-Logic.xml
-0adbdfc84201e88870ec14e19807ed1b98dd4d6acf6cd57a2b4a2ef5e499be74,1,1,Mad_Mimi.com.xml
-5a5895594dc8b6a1eb3ffb163f2949bbf5dd4e4a4608ed0b3fe343888ace6b58,0,1,Madstein.at.xml
-e03e360aef39d86fde3123cde69e5bd5648d1db6f2f040f49a530539f34aa36a,1,1,Magento_Go_images.xml
-60989fd88c2086073515182374adc54df5468d6e52b9a4074d0a5458e64b8c1a,0,1,Magictouch.com.xml
-c3e5082c4e57ed4c21107f5c05ef72a1fb33337c52b189b8360e41d57a8d268c,1,0,MAGIX-Online.com.xml
-377b1c7c98eb1ce1620a59edc315979347cc122ae5db49eaad58682c75f05edd,1,0,MAGIX.xml
-cb8b26661745c578a303c3a1ca8b6914a557bf051b16097d49e2f716c00616a5,1,1,Magnatune.xml
-f6f2de6998253677b226bc645050c46027dab02da53e3d24628a1d5847ec904f,1,1,Magserv.com.xml
-cda6279b1a0e24c543371d806f5ab537d8aef68a7bc8b6222ebffe86a4789b7e,1,1,Mahomet_Citizen.xml
-d46b3cb7383190722524604ced70583d6f4b42eaa79759186178b801e97cd05c,0,1,MAH.se.xml
-04a4a2f8ef61c049e466473d0c78414c97511eb5c244089ef20e750447016611,1,0,MailChimp.xml
-a7211ec19cd45b14cc36786884e3f5be9868dd63c1f1d9f2939c44d9a989e4a0,1,1,Mail.ru.xml
-dda469d5096a493c56a1e85663ffaa5b77b6a75df79abd44acc5edbe9d1f7b09,1,1,Mailstation.de.xml
-0574f873d084aeaadad6583735edea0b218b81a37d5205d2139a44ceacb21554,1,1,Majestic-12.xml
-2e200f25fb2be8994964167b2584db302e43a9261093f035bcab3fbe1921da4f,1,1,MakeMyTrip.xml
-eeb77187de3efc6c07b20bfb15ea4ffb65e95a906590f64bb4e2d85d3841a52d,1,1,Makerble.xml
-622c233a65089f420260b03de125a2446577be65dee4a203ff665364d3641aaf,1,1,Makerbot.xml
-e7649318375434c924601e2a5a85c3a14283669c07d5b9ed3fa83672ea3140ea,1,1,MakeUseOf.xml
-b7aef7f65c4126ab478fcc112a410721f9b52c70411e7e3ae239e275a22bc45c,0,1,Malcontents_Gambit.com.xml
-6a208a46a48e2e35f981bb13dc52c80ef32b213e4b961d795ece62dac8c5e8ce,1,1,Malware_Tracker.com.xml
-f39f688438cd966643bab96109eb5b3e9d09649cd2913114ddef762b8caa9acf,0,1,Manasource.org.xml
-98f88c611a69e2f367885323fca14d81e93a2cc45e1561d76b7af758e20bd7a0,1,1,MandS.xml
-462e6ebb21ef66442067fd68f872d0452ad48d7d36d0ae995b4405a64b36ccb0,1,1,M-and-T_Bank.xml
-48c6594a17bd3f925b65a1907339d25c506241b80e9c39572cb150b7d1e472f3,1,1,Mango.xml
-05cd7c117b65d0376e7f6274f686d544317159d63337b9b1e88185d142a14c72,1,1,Man_Group.xml
-c3f94737ab062a69d0440878fddb581b018f5c706219fe996cca6d375791bf87,1,1,Manhattanville_College.xml
-9e5f0fe1c8a73005f1bd9cfe7afa55e8e26908217555a15258c7ee8b389029ef,0,1,ManISec.xml
-49770bea4facaffc3223f5b925e5951cd5934cb932956923de356d544702d50a,1,1,Manitu.de.xml
-e7c7fe5c3205f716a0b60b6ad0c88ae9ba5c0a08e3d70fad2c0afca28bf69386,1,1,Manticore.xml
-c8f65ca4abddc8b724b21e1aebb0d86f05aafd81c069e4cd368b3742d6b2a59b,1,1,ManuFrog-Webbhotell.xml
-68b4aec318e2003b40efb7bb11ac3dc92a9863d0c3b69a951d7f539a04ade8b2,0,1,MapQuest.xml
-bb36e083bd6761afcf4680ae0c9732d527f76a56e4845282ab8ae582a4024632,1,1,Mapraider.com.xml
-5cc8e9306a41a8e604a989ddfe777d9a560def287d8d4bd52b66df140610b5e5,1,1,MAPS.xml
-00b7672052625447a20fe86cc3662d4fb83703b86f39a8739c74e01061b9da44,1,1,Marathon_Bet.com.xml
-9f234dcd1e04c8b71b11dbfde4ff22c7ddf2e6eaabc3246bea8fc88403c4f1ad,0,1,Marcan.st.xml
-064f0cdc7c6fc4fbf48825501a4380592a4b33d4378c27a342c513e614cb4a1d,1,1,March_for_Babies.org.xml
-c8b5c7b186921b43f6f217b4537a5e34274c01f4cba224f5f8445caa0ff49848,1,1,Marhab.xml
-35238a009a14694b40953379153a7035d2be06b2b8872143b984448d1ca0fe8f,1,1,Maricopa-Community-Colleges.xml
-65c226fdfa499b85417d89b4bf57ccec0be7d3a7390086e189e393d67b672ab7,1,1,Marie_Claire.co.uk.xml
-1e46e7c62c3c77d880aee1ddca06b25ec74c1c254f6e60c859a775829b679c50,1,1,Marie-Stopes-Intl-Australia.xml
-2658bf7f38a46434eeef112a4b9328865c836fedc7fc259a64b32be55fffc76f,1,1,Marine_Depot.com.xml
-f4c7dfe45cb0e35365300ce654feec069c5f0d57bc74d8f9b3d1941deb81bb17,0,1,Marin_Software-problematic.xml
-436092e1ffa47dad3268c7eb947182f310a5a508ca1cee26ae21bbba3d5b9b53,1,0,Marion_Star.xml
-97435eabdafcf77b3bcd2029cd54c28639f180acf84a9467028ad76cabd18a85,0,1,Marketing_Research.org.xml
-64b6ab2fb92685c4fbdea5730dbef5157ace91ff93b8245409e165d4782e7774,1,1,Marketplace_Used.xml
-c966c24740e3028c38630b589d743614fa07ea77e00b5a7d89f32e986300f570,1,1,Markit_On_Demand.xml
-c5dbfd25c948f08f782ca4e9f6122fa389c6648c836933e17b32275d95a7b10e,1,1,Markit.xml
-dc2d529ddeeda9cf9a007f2ffaac310105626c1af7c1e72455cbf4f75436054b,0,1,MarkMail.xml
-2ae425c78980cfd9132d6589c13a154bea8cf0b44036d78a1e61c301a2049ea3,1,1,Mark-Monitor.xml
-bf7cbed17ad5c7fbf32749386ebf39fd4a33dd4a049ebd991f17beea5da040bf,1,1,MarkRuler.xml
-122a211832b9a5584f9367eb69489c8ee7323ba094af5a6a9b180971aabe7869,0,1,Mars_One.xml
-6a87d0a4f45f3df6dbeadd66865e6a5493419079f1f9c73c69f607eb9e1a123d,0,1,Marsupi.org.xml
-3808030ee7f2c64ec5a0e3ab47b44c3895bdc3555f223357127614a0e1373877,0,1,Martha-Stewart-mismatches.xml
-1cc2f26786d6abe9ba489bce8fabd3892852373125e04f5866e20bcd67b9ccdc,1,1,Martha-Stewart.xml
-f9e847272113d7bfa60d8586f775224646a00ba06774a30839c593aa560696c1,1,1,Marvel_Heroes.com.xml
-2fc584cde07ef3c0d98aa14462e45efbd6029fdadb6148864ba6ce0504f9bbc4,1,1,Marvell.xml
-a88f1f117d08242472b485c257849d5aad3c979025f7e4076a675b91840aaf6c,0,1,MASSPIRG_Education_Fund.xml
-fad1e9456277753a46db2b67fc5d40b19184cffbfcbd358329cccb0a4c405f8c,0,1,MASSPIRG_Students.xml
-ea61200c48a6a1c14bc3982023c6cb008c8d6da025ff04da161cd4100d4396a6,0,1,MASSPIRG.xml
-1723ef3cabdc0053e8c43935870345801f1e7a394402aee29efb2939596afae3,1,1,Mass_Relevance.xml
-9774fbbc10a1e454d34b8dd2ad71ce16e15b489aae9472cf7c3330bdeb2ad483,1,1,Matalan.co.uk.xml
-4d52d23f40bd3606c43a447009e70e8cc92fb90e447f90988b9e742cbc4eaf62,0,1,Mathias-Kettner.de.xml
-6d04bb07541498ec67175fe7e43d0d4cb844e28517e4676127e992f3be342756,1,1,Matomy_Market.xml
-9b9632b20358c6d8f81e3f52001b26d75789c8cf5d6e14f513e48b6f3131b0dc,0,1,Matomy-Media.xml
-45179df1cde238ae36a71879f7303efb5d0cedf80977d8d192fd27d06a803982,1,1,Matrix_Group.xml
-4e1a21e32516e0deccef6719c5b8c727b6ff242b3635c6cad7edb4d94100e376,1,1,Matrox.xml
-3956202a31b39b54bb350eb7c1c8fb2fe4421fa8e9fba93086c592e3727fba26,1,1,Matthews_Marking.com.xml
-deb159cf55ae50055c8d8f69ba99cff5cbf35e49066ca55d32f4c122697b87e5,1,1,MauivaAirCruise.com.xml
-f76d439b99fdba6dbce1cf23c8a505d5a615dd39f3ebae455c04ebb15a201acf,0,1,Max-Planck-Institute-for-Software-Systems.xml
-b65dd89cf3648324c4f06b6b8342d6aa4546ccaade7ebecf435e62af3ca25f3b,1,1,MAXROAM.xml
-5cbdc6e67bad56cd587dfb13e05490386384d6ca8dd977c2091e5926de935608,1,0,Mbl.is.xml
-578a245189bd6c31652cc2097e80cec15625f3fbb84eec75ef275f2c84f667be,1,1,MBSportsWeb.xml
-9ebc3ea0b4f8a11d654190593216f2dbc2c849d75bd5d8769ce94ccb904b8032,1,0,McAfee-MX-Logic.xml
-21a0b0ab411510fb0d7f258ff953a606ab9b6cc190ec220254d0093d01a774e2,0,1,McGrhill-Warez.xml
-0a2c162bca04cffbbb71b72948bdf6ea13d25f94c711e7cd851e3e743632476d,1,0,Mci4me.at.xml
-54c5176a7393706ba64638cd6640cd03d970cdfe886fb1c292ab5567f5e01372,1,0,Mci.edu.xml
-8b75b95117b75f47d69e396a5e201cb0b857a57778404db2b56305b43ce6b565,1,1,MCM_Electronics.com.xml
-9f22004e6f050351ce543abd73bf9db38c4bcb4f3f691bc452d9f56362db44f4,0,1,McWhirter.com.au.xml
-169f5d7a71d2a565c3db9bf616e59ab2c87ba135adcfe1617afdd6ba70db5c26,1,1,Mdgms.com.xml
-e18e7618918c0fbc433386a096fad69825d0d259adb9acccba7661d5214b5221,0,1,MDGx.com.xml
-4ad79cf1cfd79bc4125c5cb83523560dc2c807adc28c3c6eeeae02a263f336a8,0,1,MDH.se.xml
-598f57a1cb07bb40a706984bcd19a35251f2df3b353a3c959d16c5eccd2f043d,1,1,MDNX.xml
-9fcf975a9d4381ccaa7ec46373ee44478d1bf60af363e5323ec3093f41bf0130,1,1,MeatandLivestockAustralia.xml
-5c3f9e9594fd2136e76be06b682e4dcf281c5b4153eaab76026fd527212be1b5,0,1,Mechon-Mamre.org.xml
-b2066dd1bd47ff8a7a6259d3a4059070156b77a661991127cf21001b109551c5,1,1,Media6degrees.xml
-a3b6aeef083db1241e1b5239cc11c3c70a3990a2d409b93c85726bde3a266f42,1,1,Media_Factory.xml
-2206b712d3da7e0b72ae87eaa7ca8e2c011c0285df551334334b6e6748c9f533,1,1,MediaHub.xml
-b35ab67041d795e2260b394b27c747f3226fe8c571e5a75f32526834f5f63620,1,1,Medialinx-Academy.de.xml
-16df074dd91eba1e388ee4cd5452f790bc68dcefa11e471e90f3be62c5a91fab,1,1,MediaMatters.org.xml
-fa0cde033e24e44be649f80463f985138e11a00759e33d35de6bc5087b340a77,1,1,MediaMind.xml
-f38f5fe8efdfba7942c6fa3b8ed22d343afc0724d6e38be81636ed96a8a3a0ea,1,1,Media.net.xml
-7e8cd0fef72f1bb5972a779936adc763921cf5217a3dfc91d1f1062c34c80170,1,1,MediaPost.xml
-cea6114526cc90715d8174513f29d6b7ea23c8a4787b35af2e4b59e41684b60c,0,1,Media-Proweb.de.xml
-60c9e32c0146ed82c87bbf283217fe42f404096edba91ef1956a91111b23296b,1,1,Media-Storehouse.xml
-5736e8f375e41f54c191847f1710da2a6de24cedbc2e4da90f40f9df6767ab2f,0,1,MediaTakeOut.com.xml
-c5d0870a4d83044988f3c3af47c75b8426331527ebf751558c6bc1b2ce727c99,1,1,MedibankHealthSolutions.xml
-4e15cd343d166cdc0e7dad5577646f29611e10d19bfa10f04ed589f908384b99,1,0,Medical_Treatments_Management.xml
-9efc0a08fbf61eb312d49a952a8dcbe26c844315ed708749c8ff7cfc4eafdf4f,1,1,Medscape.xml
-be7930d5a9381f9779306bd4abfa902055e5493794a7a2c3009edab45f568804,0,1,Meetic-problematic.xml
-85ccf33e1f9c7ccba62d5c31f22ac1a4e2f5e6065626088021fb606095cde46a,0,1,MeetMe_Corp.xml
-b2320f22433256d2906f8c2e90cdbb2b21162bdfb5b54867968b657e8ee86baa,1,0,Meetrics.xml
-d3b4dcb6411b0768f63f82ae89e15b07f5884e72f0b49398318e885b1bda1c38,0,1,Mega.com-problematic.xml
-e7034b4d62408593651f88f6fea5b58f9d7ac86cf01b03f8e56adf9ca757a9dc,1,1,MegaFon.xml
-0660211f8fcb506370363c91068a9a402402d4b809bd2c2bc61bf456b31c9469,1,0,Mega.xml
-4821002c2dbbe557f459c6cc0cee428616bd727f65f5a071002405e2cb370d7e,0,1,MeinVZ.xml
-74b5070caf233a0bf2f96418a8500663c7c40bd21da665d673642fb212de08f0,1,1,MeiTuan.com.xml
-b5541e596d343de6ac7f39223a9fc7c06ce47c438d9defe9116ba674062af063,1,1,Mellanox.xml
-eaef01e50024132334d995f459f0f3fcc9e56637833c501e91dcbd8dfec3073b,1,1,MemberClicks.net.xml
-e47e56fc2167bb71faaff4eaf4662649906521bd26184dcb825797080cda7f60,1,1,Meme_Center.xml
-a7b15f22f33f9e813d7f180f35ff06455b5e6e0edeeef8c25afe80d49275ddf6,1,0,Memset.xml
-c5de1e13613e8eeb7384ecf45b27d4803aade3abba654ca1905db8daa2b0db54,1,1,Mendiant.com.xml
-794669fb05be6a00a168ef208dd01ff274bf97b4fceb70bbd042f028553962c0,1,1,Meningitis_Trust.xml
-83b98fb018f5e976e289dfcefce50a3c9760aa54f0559c78e653a3091594d38d,1,1,Mentalhealth.asn.au.xml
-d9d780181e6b685923ce463960f139165dd4b6a6abb333a07572740b8eb10ef7,1,1,MentalHealthServicesinAustralia.xml
-b6ac17c4eb8e7ef94bfc420b28afa15310ad85f56084302c595ebdd204b039be,1,1,Mentor-Graphics.xml
-1c68d8e52e630e6191f64a996760ac08bb1b930793b0bcde74dea65442456168,1,1,Mephi.ru.xml
-e036d076a66acf5d8e573b652b5e6ff6639d9ae0972240aae7676cf90e06181b,1,1,Merchant_City_Music.xml
-877fcbeb87d8752e0984aa73905b050c69cbf5faa500f100474a7036869f5df3,1,1,Merchantquest.net.xml
-d7fe742bef816c1f59e0dc28fb8ec39b08763d1dbe56f438fb36337f475c8523,1,1,Meritrust_CU.org.xml
-30a1773b432db408705a3a3b1a5aec86d29006d7dfe739785beecee7b32a5c55,1,0,Merlinbreaks.co.uk.xml
-0b56c064295b03dec2f3dc1af92546c87ea03a06b6c5e753299e85472284ca71,0,1,Merlinux.xml
-0b8ca11675436a12840843509bb920731eebb1cf9966122143c0423e93c5e209,1,1,Mesh-Internet.xml
-7c1cdd78f922226f062a491726c2899cff4d9cb136293cae3f70adfaea4e1ee0,1,1,Messagingengine.com.xml
-46f31409aa718eb62a9d2d208bbd65bb5e6419929c17b15f2fdc33c4afb82c4a,1,1,MetaPress.com.xml
-fc7e04f2a722f87b5dba20f6a548c1d26df7facfa98be2e09962d0b86506f34b,0,1,Metrotransit.org.xml
-b8a15f5d604708c21a54d044df0a1a5ee65bda391dd5e5735eb7d92a01ab1830,0,1,Metro.xml
-aa95afb8c908b99e7c357547b29a1f19f3a93bd37683c2f68049f39ba6d9df48,1,1,MGID.com.xml
-02d77df85e09523445e0e86b04f0bb16c67bf3362b2e30bc29cba2af23ce2a0c,1,1,Miamire.com.xml
-6553c866a3a71f279bb47db3e534b087b632e066c667803ff7109186d146ec25,1,1,MIC-Gadget.xml
-5da974eba7d7838e07957ab4c9f72058e303025137f837907f1491e0f47d5ba0,1,1,Michelle-Bridges-12-Week-Body-Transformation.xml
-205f20658715836d564c522da3c9c42cb547bce9bda250653c498c414a02ea0b,0,1,Michigan_Campus_Compact.xml
-53433d7e1702b0941bd5125a116ec281041d9ee92618f306c103d832de51dea4,1,1,Michigan_Nonprofit_Association.xml
-2c0230f2cff2ab22e873fccddd77ef7eb067a5af8b1ea6ead19eb11a7fe17e11,0,1,Microchip.com.xml
-575e8ecdacdfef4516413c432243e7a300b6cd70ed2a28fb17cdc28178946f92,1,1,Microchip_Direct.com.xml
-b195c75b64f391be38bc74da007cb9a59fd8a1049291c5f949b5847b16097641,1,1,Micron.xml
-206bb3a607259fe71f807da8d8d846aef174f1b18c220ac4871c6cf75022c4d2,1,1,Microsec.xml
-61a08db1e2d9a9f6fee6d55625614ee1fcc76f3add39fb2a350a70d2971fac6e,1,0,Microsoft_Store.xml
-25b79bea559bf54ad4546a28b11974228fed40fe7affb6127e28bb9e20cc57f8,1,0,Microsoft.xml
-7b100b62a23d14a4e21a5f4775ce4f523326901c2464aeb6299fde517c42e32e,0,1,MicroSTER.pl.xml
-932d417bf9aed6efd5b4080c9c8f7e62b7199abd4c943b07084833fc763af1aa,1,1,Microtech.xml
-fb9361e5f9e26090b2ca7030c712c7ea214e7a531c650819ad8d7769a2538e0e,1,1,Microtronix.xml
-cdf7d74ca7ea2e828d716f9762ed2310bcddb76841f0d99e451bbaf039987e4f,1,1,Mietek.io.xml
-581745a360a493ced8c8bfa3a0c7a254f8849914d044284b63dd6400ed6f1e53,1,1,Miles-and-more.xml
-201682a0f3417cb1a03e22e0fff8bd95f5eee3fbd4f91d305149f69ec3103858,1,1,MilitarySuper.xml
-ea215ed16accf736366b380b06667a98ae300a6624277cc4c0b00ef82b87d316,0,1,MilkAndMore.xml
-e4b8ae811aedc4e4e389b6b173e370b7981160efa506affe23d0d3c424007843,1,1,Millennium_Seating.xml
-6028c542090a205e31ad2cc71d109b7fa9f689e1d15064565afffa289860de6d,0,1,Millward-Brown.xml
-835ad6f02f0eea1e5a30f1bee9bd82f033b98f98c3e00dccae023635bc45ec84,1,1,Milonic.xml
-647b632484bffafe1511b446ba5ba4cea8cea793bca7ba324612bcad00520e73,0,1,Minalyzer.com.xml
-7fa83c532ebdbd2a1ce3359dd51bde4e957d0d673fb2f96b9a25f750da9c5b8d,1,1,Mindhealthconnect.xml
-6cab69315be3b7f7e6693df20e4640474b93ac96f52a9c84553f237661f97434,0,1,Minix3.org.xml
-f3a697540aaef0be6325b039f1a9ba7dc726832ee3eb7f859294443cebc119f0,1,1,Minnesota-Public-Radio.xml
-8cbc58bf98c78566cb40523279933230c7fce27400613090fa2a02476ef60301,1,1,Minted.xml
-2d95c01c2dba90c6e4e2c7294d36d63fb8c410645c9baf905737268445494ef6,0,1,Mint.xml
-46490c5c8559b7f9935f08f0a20b7efd343bd76579416bc98e7af749e673743f,1,1,Miranda-IM.xml
-6c223b9ce65007f261214b35fcf2159a01f0f18dce768bf330106f9a954a07db,1,1,Mirantis.com.xml
-09cb67edc92fabdfd6ce3ad9ed0a50a6fe0176b9a963ac378e71b5e28c8eba71,1,1,MIRC.xml
-1c912cdd8a192d284723cd6aa022312be9af7d9d0f153ebd9332012212f7edd0,0,1,Miretail.com.xml
-061236d61478786e14d8053a3363db41586052cc3c914520a4abd6853467f347,1,1,Mirror_Bingo.com.xml
-9d8fab8adee46ed120024adf277f77a07f8b7e20949e017f80f9697faee06667,1,1,Mirror_Image_Internet.xml
-2fab3b5ae13f2fa84cac1b55ad4db417d235bb8c5b29182ba71fed019e20fe3e,0,1,Mirror_Reader_Offers.co.uk.xml
-2ff3585db12a09dcc7ce2218ddb43eba82e33b365d5f9071f14ca094566b0f6a,1,1,Misco.co.uk.xml
-e554b7787400fbb24420ffbaf18e8720e2711d0d7d5b01d57a6bc870d734678e,1,1,Mises.org.xml
-29fcdaf098e9079dbf7d1962edc0c29be9fcb714083e40a5019e7e6aaaec6320,1,1,MIT_Press_Journals.org.xml
-ef78bc469ee9ca1c5c6b5b7c55101de1b9f2e9bc5cb7635f55f72600da08a9c4,0,1,Mitsubishi.com.xml
-c4c92a7376681ef0c76224dce112d5b4aa7f3e765e1d94c5065839d75e7066a6,0,1,MIUN.se.xml
-76d41aa2beb0e3913754d27e3ef4e21e3c585b31fe36dffeba8dd340621e276c,1,1,Mixi.xml
-5a4eb33fa51c3ba4f64d634403848627ba898f024f0cbf4c19b166d0e5d1a235,1,1,Mktoresp.com.xml
-03b6f29831d19024dee4e4cb3ac615574e779fae1b58a1c6d24acb91fbe4a850,1,1,MLive.com.xml
-ddc3203f686051186b20b88e459820135eaaf3aa50e5c4816c456d6445eb152a,1,1,MLP_Forums.xml
-62e11962e97bd26df73d38491e0bd3cba32f9a80f6d367b2e9566eb0df735548,1,1,MMAHQ.xml
-a98f3b935a1d51aa8298b5a80e4caacf1b00888e0a75089f6f3db0bdd4e738ef,1,1,MMOGA.xml
-3f5c7ddd043ad508aac3e6159c76e8bd41fcd37abdaa141cda95d8a685e20cbb,1,1,MND_CDN.com.xml
-18343449d95db648bfa46a15c08f85c4932f5492977307f2437d1a58faf006dc,1,1,Moana_Surfrider.xml
-574400b2fd7e2050dd2171c8ace92ba75b77ae7d9b28c311d6799026ec6b2126,1,0,Moat_ads.com.xml
-f7aa20d5eb594ad6714f0aecedf5b55b6d9b6cf8be092160dc89d631b1ca89ac,0,1,Mobile_Asia_Expo.xml
-13a518ff8ae813aa66e2eb9ec67f34ecc7aead4a78e95046d18eddf8d039795f,0,1,Mobile_Enterprise_360.com.xml
-c50a74b47e0a1ffe551d97307b99d692a4d15c4f6d6eb27fc150f54b660ad90d,1,1,Mobile_Nations.xml
-ee597a30968e3fcc5470ceeef5b7ab18cdac35b691c708119fc085e555c39d7c,1,1,MOBIUS_Catalog.xml
-6740d71dc20cb018a8808cf1fdff3032705b1fd79b467a42f4489233e0fed651,1,1,MobStac.xml
-089e42772722545c5013f3a48f05429db2991825eadaf29c1b80ccd769f4621a,1,1,Mochimedia.xml
-2aeed5b7608ed2cd5fbf95b9d233412e2b384dcb179cd0cd0b4be180f3a7b1c4,1,1,ModCloth.com.xml
-92ade4bf454341ea607fc18eda3f160e13336fa1303c20d35e270b4624e40036,1,1,Mod_DB.com.xml
-c3214ec163aa9df0dd6712d7d99aaa8b60ace6ccf4ee9cf6a18dc8d5f030a6a7,0,1,Model_Mayhem-problematic.xml
-85220eca1233070b88064de78be2824584bd455896a606944ce325d89bff9bfc,1,1,Model_Mayhem.xml
-0793455bd3ba8b593cba9ee56c0a879f77b05bb7b8215f1bf959ae28379f7d3a,1,0,Modern_Giver.xml
-3d42a6bf70f67cb35c65572c88cda75ce36688b8e54d46910eb6b64a18d93c3b,0,1,Modernus.xml
-976d52fd450f842cd7b01a773c0dc0cbfdfccc344170c16f62e8b06fd60b6dc9,1,1,MODX.xml
-b1e394fc6288df5f9d71a5795a3cfa2d868caf9a2d390259efb4f9a10aaa9e55,1,1,Moevideo.xml
-5719e7ed8ea7aaa4f6c252a07860fb7fa0750f3fa47c52596721331852b215b6,1,1,Mofobian.com.xml
-4decd848d6ead12ebc698302e49ca1bb187ff1a6f1894ac4c46e6c9903432125,1,1,Mommys_Little_Sunshine.com.xml
-0461d301d68302af16379e815c6fb5de2b4caacf79ffaa20aba851753b388ff2,1,1,Monetate.xml
-ffbf6ec6cfeef71b445211a87e4abe5ef1794e3d4fadb7d684ac90ac68533790,1,1,Money_Advice_Service_UK.xml
-617ca8a16ef9c021485cfd02e955e5bc0c3e0f71ae01a9028c3045bc17becaa5,1,1,Moneybookers.xml
-273e682828872867f92a2d55ad5b000fa076476731cc087f220bf003816625b9,1,1,Money_Saving_Expert.com.xml
-36b5b18cec1c6053b839b2494fe6a9cc04677550a912ae7c47a8798e061720df,1,1,Mongabay.com.xml
-5815a878524ef05df0e2e12eac100fdbb8ed34fde5bb861c2cd87813d647d42c,1,1,Monoprice.xml
-aae2b974d06ff8cada6f693625e967c89ed2c4dbfcac0885da285be6b1f2a4b5,1,1,Monsoon.xml
-45ca54c8645155a251323a04e5676b32605facc832b8ac1d3cbdb11fd1257ef4,1,0,Monster.xml
-16b17f054165cde5317da14eabc04cf40ed40f40f187a46a39a7107e46877ffb,1,1,MOOC-List.com-falsemixed.xml
-d5fd944719061d5c68cad846b8b479a3010bdd26ea072f677c0e77b09ce61746,1,1,MOOC-List.com.xml
-d81ecd8589db295fffab19937fe47ed705feaee2204af4290985b544c6f36cf4,1,1,Moonfruit.com.xml
-238ba4857662f3a517f6702615d82e0a1789818c3f8e46200e18fbcb940206a9,1,1,Moon-ray.com.xml
-ba26e7795767013528cc1125b6156b270e1ef4e425ccd4b7b20f10da339c45f2,1,1,Mooshi.com.au.xml
-012a310f74cef0d3cf2d8670ba22d9fa800b99881a8e3f9509003bce5f7e7bbc,1,1,Moot.it.xml
-99fe0b38d28ebb79cfe8d3888f28334dcdca278aa8a45fcb3a9a397c95708509,1,1,Moovweb.xml
-b5945e6598755cc7fdfb240bd5db03c4db2255b7ce9f7c214febf94f4f5c13bf,1,1,Moreover-Technologies.xml
-4098104d988c1e099f8131293582ffa74b214c84a0a6993f0dcb47dfdc166957,1,1,Morningstar.co.uk.xml
-06558325d916258454668fd676d1b26c4d0fd1de1413eb5256ef48a1956982bf,0,1,Morrisons-Corporate.com.xml
-7f9c532f1e7717d4f19719fef2a3c541c6ce15cecc5ece2b5ff81ec48d07d55e,1,1,Morrisons.xml
-e53b3dc48c8ebd8f953aa97db6e25331e51bb2781deac42f66180111e86274c9,1,1,Mosaic_Science.com.xml
-ee288ed07a36d6c17d809e2591baafe858ef2b23ab7e56858879a37ad619d2e6,1,1,MotherJones.com.xml
-9ff01f7451d40691041ce184f700a74a77d67f31caafb8c3ca51d2afb9c7dc34,0,1,Motherless-media.xml
-6b4d8b8bbca99cd49c35ed81feea4d6f9d114213c670b2fbe7a947c8a7402dcd,1,1,Motherless.xml
-28a1b8fece126fb6620710ba56206bdeaffaa183d651c6c1c73a01a905de9059,0,1,Motigo.xml
-a1fa4d3ec8a62b93ed15cb141d7695f212f3dea2ddf0d4bce8654007987fd390,0,1,Mountain_Reservations.xml
-bd3a39ce9e5a7fb31ee47d855f36ae946d9d5b113b5ea350c06fde10c670d27b,1,1,Mount_Sinai.org.xml
-df311b887c2c65e850add51b2982b95756f8fc94a387f649cc42fdcbba52c557,1,0,MoveOn.org-falsemixed.xml
-3dd9d23169efedd2951c904390b77b6a927282737d4a7a7918f7bd44cf3a8e2f,1,1,MovieTH.com.xml
-bf92f91a29f1233ad7de9d82343a31399b0e448c76c6c9bfb7d4ac5a2645a4c0,1,1,Mozdev_Group.com.xml
-20079f5b48d92ad4a1814d88cf89b1455e4f1f9c1aee39a76aa2655d23dd1dc5,1,1,Mozilla-Russia.org.xml
-486132cff3ff4030623747d692d77310df3fcf8ac494edd8d735d87a60af69c7,1,1,M-pathy.xml
-a142071929daf836814bbd8993688ea5e23a307b416df19553b09cf2c0a605b2,1,1,MPI_web.org.xml
-444b4dffc566a507319f9943d574f27c301f9d5a6af47ee6b85c9907886188d7,0,1,MPNewMedia.xml
-d312ff3b4882a3d3cd9d90cb2048e06cf8212a73f8512337ecd11d21ca3fbd7e,1,1,M-privacy.xml
-743d8a5b68767e40138a06b7b5c3a1818337da7cea2ac37a282648b50974d04d,0,1,Mpx.xml
-ec70fa255895ba360493d2626c45911c22b80a49c5df9cb2f8f137846ceb0423,1,1,Msecnd.net.xml
-61a664cfbfde67d011b2d89090d5f653cfc303633f10a938cd2640cf4dcc5c7a,1,0,MSN.xml
-87ff406c6b33ebe5d35f3a06f6021c850baa6d4213079c76289b17c467c1ad13,1,0,MTAC.xml
-15819092534ea0d06610f93be60d08860f430b49dba04ba701dd2ae56358a227,0,1,MTNA.xml
-7976850527330f739448b947975b090d96b2bd01231b0376850a91033b941263,0,1,Muenchen.de.xml
-1412a1bdf9c4cad6758e44c6d3bc30db0cb31d47c471aaafc86e53fbc539201a,0,1,MujBiz.cz.xml
-24a9a73f549eac48c4bd59bf8b2073bbba79cca79d84e3f8740e92c12e109413,0,1,Mullet.se.xml
-8f659a5f020643a95f497c317d70dffe3c1085456659c8852641169423677997,1,1,MultiSoft.xml
-cae69694a0462be465484bb959ca0f4154bbc5abb9d0666da3cc9da777142bfb,1,0,Mumzworld.com.xml
-8f1f380d1c8e4873b031a62de7a1fa17e2e1e79940cff1863075fa097b1bd2f3,1,1,Muni.cz.xml
-1a7511feb844171b7d853bc0273709cdf66649de2c2534ab1da21d6f5edf4cae,0,1,Museter.com-problematic.xml
-edd7abe5934e45e58d30278955e07deb2f6876e86b6554a2aec782f86e6bf134,1,1,Musicnotes.xml
-f42b8995cf8e8f8bed79d16d7155dea2522c8ba86dbdf63d5d82f88dd55fd614,0,1,Musikerforbundet.se.xml
-58a0fe0af15bd31fe5ec464807b08e208942049af861bb5440dfbba113271ccd,0,1,Mutantbrains.com.xml
-79c31135f565720f20ee06fd013d3d7cf6d5c1bae58fcec294f31978abe1f21d,1,1,MVG-mobil.de.xml
-a8acbcf986630e56ad99d3109909ed9dee8e0f5f59a3ec701b7f2636e414cb76,1,1,Mwave.xml
-7378e66420ddee33fe3189f9e9a7d611bc9e15edca5d8ca05c615a4cec99c992,1,1,MXGuarddog.xml
-c82d167ba8e98b856ae24b467a8695b544fe2d2110ed269675c6b9b5e8a18de5,1,0,myaffiliateprogram.com.xml
-ea72f3def37242b5bc428988bec9b0cdfec40c244aebaad1a852d2bee897a864,1,1,My_Aloe_Cleanse.com.xml
-f12f85ad980c55abd2b90de5179b44d8b8b2c8fbb5e5d6059197772225ccd701,1,1,MyBuys.xml
-9e11b6c72dbccadae998b9fdf1060261e924cb5c79d3feb8beb3ebe60c399ae8,0,1,MyCalendar.xml
-f6888bc491b4d47632b596404111b60304432c3fdebdd396bdbc31ba6b6a8b39,1,1,MyChart.xml
-6537c184cc2e52884ba673b1185e8f64a2f41edd030ebc01a7a13c1f34014729,1,1,MyComputer.com.xml
-0094ef73a6696418c9a0ea52eb29426222d2a64d8cd64ba9224dbdc676f9f832,1,1,Mydrive.xml
-d11a91908efe163ed8f7dc3d6a99ec8fbfe0e9ca75eadf18ad1602291a1984b6,0,1,MyFreeCopyright.com-problematic.xml
-cc88b41661c869975a35a7af8b045c82199f2ccc487165fff368523fbcf09dd0,0,1,MyFreeCopyright.com.xml
-9feda71a258878a709043575247de979591811963f7390f7654774021e2d1479,0,1,Myftp.utechsoft.com.xml
-4b89388d8b0e5f2c3f1114e50a5448bf371c53ea1a0b3bffcc968537df955ee0,0,1,Myhappyoffice.com.xml
-80b320c6f12e507e8698c067c13bf68374db62c7e5547f066af0e321fb466088,1,1,My_Healthcare_Contacts.xml
-49975169395b70634d47f96fd0d6677edbf07c3bc360a2916e23f6e1d789f02d,1,1,My_InMon.com.xml
-3102bccb45e89458c7d87c9004dd4a8f72ae88d3b01cd06a4ea6180a55036e9d,1,0,Myjobscotland.gov.uk.xml
-b3dc3da4b0b353f094678552e0f8cbcc05c69441269c041cbed4789ff47d67e3,1,1,MyLeague.xml
-a4a4dce3306b45f0e6763f4f8ab14a3af545aea5c1b68ece9e51af9170b4350f,1,1,Myregisteredsite.com.xml
-63b6503ce3552c3905c6d65270d50d66a99a226b53dcec2a0ab8197f1ef38a4a,1,0,MyStockOptions.com.xml
-24d8bde990098ee1fed9b972e657433a4c1bf758a46d4063a668d58a2195abe2,1,1,My_Sullivan_News.com.xml
-f51808872e4046d42a80693cc74331e1533a48c8b74ce198626b0140b7ede4c5,1,1,mytalkdesk.com.xml
-d616a9d05e8a5cc6f7994b9a4ce02521e006de2138695c1fb9881ab0504b0b9c,1,1,MyTextGraphics.com.xml
-d9d037ffaa0d96eadc704dcfe9933c34961a4f1df39c800f496cba49c7174775,0,1,Mythical_Creatures_List.xml
-b913e55dc6bfbc9c01edc498bcc25103959427038f9fc37e934e0277146ae617,0,1,NAB.org.xml
-e48ccb0c3c859a8f8e5da027cbe4fb8ff796b9df830eefd2bc522c187857ea6a,1,0,NADAguides.xml
-7e5dcacd8b9a9510641a366d85b5a9b5e751db6e8f2997cfad3d6392a1ed5778,1,1,Nagra.com.xml
-b2e1614a26dac3ab47eac3a6dbd3805451790c9cc1ed2047d68bbbfb61de9663,1,1,NameMedia.xml
-e567c9f23505545a46c3f2094019189ec0bb0753d4042e09b9c3e4e4305ab2fe,1,1,Nandos.com.xml
-d92c53fd75de88d409d1be6a18c1ae9f05cbbe380e8bb8b9443249c9768453f4,1,0,NASA.gov-falsemixed.xml
-8b0e9837bb092fba613041ee2cc273782833a14db5e27a3c629d07af2d60eae3,1,1,NASDAQ.xml
-87d7cec32a9c98d029b8a7748f45f03a4c405f4b10af0c7dbf63a655a2f2501e,1,1,Nasuni.com.xml
-611a187fc26079b456f29744b2310f6cc461c01572b0056ab59a95cff0d7eae4,1,1,National-Academies.xml
-28d8e299d8e8d33ce97bb491934ffbf5d64acdb80543135f009bd43f4ad4c66b,0,1,National_Academy_of_Engineering.xml
-0c7a3d152e2a0809e1d00da01c544f68c2a1b7fd5e5457ed7fef0255b1c8b33d,1,1,NationalCapitalAuthority.xml
-2025891cb707c5cb4bca8f7cfda7411a3b7c03084986c794c01d9966646ce307,1,1,National-Defense-Industrial-Association.xml
-b8317133e03efaee48297bdb5c09b95e33a56f9c20cd60e6edac0a1a4d86661a,1,1,NationalE-HealthTransitionAuthority.xml
-0faca68701fed7d481ef2d407adb2988bb09737e4256fc13d94de4d50be29dcb,0,1,Nationale-IT-Security-Monitor.nl.xml
-9bf2816c0496a7066972ea5e7225f77e2646848ad425e3082748636dfe26f41c,1,1,National-Express.xml
-0adab8b5195c92dd558b96a6d77403d62b64dee59bfdd95a01838d8684e32da1,1,1,NationalHealthandMedicalResearchCouncil.xml
-4f3d0dc561b1d5aa8256a5c6b3836f1d624a29142b47bb7d9229916c2abc6aed,1,1,NationalLibraryofAustralia.xml
-1fdbf03f38170dbf7fcc2e857edff149d2fc104f1cfe992e3346a6eaea3d9801,0,1,National_Priorities.org.xml
-3eeda47a0d58e2fa12af871efccefb70709c9aa4a94f25da447e491a58e6f231,1,1,National-Rail-Enquiries.xml
-85d3619ee98960417573a2614c707f30d2920c4a638dfd712362a70c3a2fcd50,1,1,National-Renewable-Energy-Laboratory.xml
-77df8cd849c8f7755860365c3cb10c51ed391f95ad21327a88546086eb5a29f9,1,0,National-Science-Foundation.xml
-12eaba9bec7055b45b10dbdc36cfee93e480124f3cec55814ebc49fad23ff395,0,1,National-University-of-Ireland-mismatches.xml
-ebcc8d760dad213f091f650b11dbd48341e8039af99e39d0e1ea98115899e204,0,1,NatMonitor.com.xml
-d6c033cb1812b3eb35f78584497ebc3e7ba242d128036064f93cb32fbd54c5d9,1,1,Nature_Shop.xml
-5fa991b9e337ffa71bfe80e49dcb48b46deac649f5bc33ea192903e0b44e7ca5,0,1,Naturvardsverket.se.xml
-92305d7d6923ab049957e8eda6b1a3145f480f0f7c1a26f25e40df7ec06cbb0a,1,1,Nautil.us.xml
-6f7d7a37ac11fcb1be6e29f4d1b0f049754ea7e64beec41ada9c54ef6dd6c939,1,1,Naver.com.xml
-cca9679d08747b3a6f8f2ba6a4075140929b47237347a3c6703c51e22846f71c,1,1,Naver.net.xml
-a06696fc40595b3cde47899254b84ec14c5e2a2209a07205aaafee889961886f,1,1,Navigant_Research.com.xml
-bceb342f096bc915324ab7926b62ae2039efebd5f1655264a42e5499bfa890dc,0,1,NAVTEQ-problematic.xml
-a3d13f121877abb34ed48dcec8fe9ea59e7ae9e78ae8f7358ad45fe3bbbe3931,1,0,ncar.cc.xml
-66f0388e44e97d0c5975fc8abd57d7013078e37e14b34e5a6046e4d6d2a68488,1,1,NCRIC.xml
-ef7d0c3649a77dde9f58d11fb9e77a0bce840e89177a6d853a3a50f37d138e78,0,1,NCTA.com.xml
-e0829fc2c9fb85755c4629310398373a852a49f9ec43b1bc36a49c8853a37eec,1,1,NDCHost.com.xml
-a165bf80ecefdded1625bea8feca7f701dad131dca4397ad3ed84ae9117bac61,1,1,NDI.org.xml
-21b9c0692a5feacebae65169aad071113d4e9bc961c8f43176bd928e517ff480,0,1,NDN_media_services.com.xml
-63d21f2608464533de4ad58940f7c773a7b6be67d11f7a50b58fbacf45148485,1,1,NeatoShop.xml
-14cc64ef3bdf4c87251ebf375e569781b15e8c8bb1703f789c72c57608546227,1,1,NEC_Display.com.xml
-aae1dd28949eb63e1518412b3063cd8db7fb5d1e2fcd31af51b4d9a7e28582ec,1,1,Necuhb.xml
-47b8afcf1806ab5c8cdaac1b92d0c335bdd3bbb0f39bab049d17fa39230c7d21,0,1,NedLinux.com.xml
-4b39488723281f877212d4e81540a4e52eb4a713db6fc8599e8022b11d720381,0,1,NeedMoreHits.com.xml
-d422448b645008deecee31292384b1779d0b472035926333edf3ee7b98d51d35,1,1,Nelonenmedia.fi.xml
-076624231a6913176a0296ea2fe8a98784d1331620d5cf7ec74230ce6d0ef229,1,1,Neobits.xml
-fe9a3b6a1ac58f6ed1d45edd7cd8aeb302d6a2f11d4db3d7b093b0e24c90c586,1,1,Neobookings.xml
-af1e542c1ea14c9dbe26ce321998cb9be7c96f88529088bd44771735c585c088,1,1,NeonMob.com.xml
-98d5cc127fd21d56427af9318d74a4324bf673e7b9d15ee33f27e6281edae825,1,1,NeoSmart.com.xml
-58abadc12a0456ae8c4b9aed73cc326c59a0deb6cc9149476a1e44258cf308ff,1,1,Nestle_Scholler.xml
-fb32bb1ec593963f579fc3218ced702def3c8820d295959e6791c1bb63837079,1,1,Nestle.xml
-1d82d222efef097970af2ddde784abc4a54e9f0d7c72273efdd5a365eaadb215,1,1,Netcraft.com.xml
-dabaddf8009499437a20746961eed8aed99136385bbd85df42500cc0e8f7fd07,0,1,Netdialog.se.xml
-67eb38023a08fec2e55c37dbc7882eb1facd6cbe24bfad8d680d49fd4e3283d9,1,1,Netfirms.xml
-5bc65fba1edbd23a2c1127a5c66a01bc20ffc899e4abb0e6f1b4d05a639dd9c1,0,1,NetflixCanada.xml
-8da4a8d34c363318d78948b6d198a61b8b371b1eceb28751a2abe6a12904f4f0,1,0,Netflix.xml
-a95094078fd0cc6f72a082b156e813374c9dc87a138755d752a4b9ea66773850,1,1,Netguava.xml
-05ba937904b0635e9a5a4ad5afb6f044026bb673c12eeb989146d9a2ab4dce2f,0,1,Net_Index.xml
-f4e958dc0f835a536048412ddc2724200f00c0e93cbe1672d10fdce9dbd77cec,1,1,Netline.com.xml
-06a292203f1fb162f9eb6f48a60f5c5cf2fd82e2141c3be9b382da5a1a9580f2,1,1,NetLock.xml
-8ffdd2456c30dafce460c2ac55f69982ab0e8776a7dcdb2d3b6d955080cc9ffa,1,1,Netmarble.xml
-806784f5df0f188a432397f11c65b89fc7e4b5c0fb00e08c766280743fcb9713,1,1,Netnod.se.xml
-05ef41699e7db4706bfa024c7a337ea730a9c22cc2eac8f8ce35f5181a19bb06,1,1,Net-Results.xml
-b34cfa24a5d99c53cb889604a566fcb954fcf2edba8fe603a27b047c537b36f9,1,1,NetSeer.xml
-47fcbd21bb94ba1037778af9ea7c2e8a21ad1a57759e8caadbc97f7c2d553837,0,1,Netswarm.net.xml
-44363372269bbf2df2c23d28f206b728ec20d7dd27493ea1e2c1ddb49c1e4820,0,1,Network_Computing.xml
-b92200943566111cfe625c992f069402f97fd97337fc836e8f1aab8caaf93ddb,1,1,Network-Depot.xml
-ada451184c4c1e9443d9b548f760725d0bdd50de0d1c5daf97294f4e60d41c69,1,1,NetworkedBlogs.xml
-1046eb858f3bd6d3cfd736bda77b14238d08ac9faab95f854e90106de0fce7ee,0,1,Networkhm.com.xml
-856a5e62ba2039659dfd6a0c341644c7cc94edbfcda039c0bbf2934c2fa6e490,0,1,Network-Redux.xml
-1665687899c59f8d350320538710d50189f98c510f2a3a15d70d094aacf36150,1,0,NetWorks_Group.com.xml
-e39fb5c2ac9f1e495df9e58f17d8a4d761fe13825842ce000695d72bd0fec453,1,1,Network-Solutions.xml
-d9e483a264abb9bf1922d75c3b5417d10f4cb06f37fac341ad809eb66652c8c4,0,1,netzclub.xml
-37f2e0e19946edd55166e52ca91554e9482b18037fd0df2e6177b68af1be5b54,1,1,Netzguerilla.net.xml
-d47c31823f5affb8112f9b876508ea8cbe9c5c8888dd62fce6e94a49fc97ae7a,0,1,New_England_Journal_of_Medicine-problematic.xml
-ade523b4cb15ed350b10463b931b77cf0d98fb8dfeeff46f8ae12bafb519e8bf,1,1,New_England_Journal_of_Medicine.xml
-c726927c171b0ef46e22776ef84b862d65b67640d6bf0c04236116037f7f4658,1,1,New_Look.xml
-f1fe546e322fc153e0c39bed532de0adde5d347f9b0785bdbb0212f60735af1d,0,1,New-nations.net.xml
-17888394abba29aa8aa30d79c30cd4e08159dc8baca993e10abde6b6f6a7b5da,1,1,NewsCred.com.xml
-3494b3975033ab3683385dbdc1fceb067d9af08c054f9d5db857ac14678d2a39,1,1,Newsday.com.xml
-f4b6043442410054e68bad0ebf7106e2cc7147b2c0f9e9d484406aa292344f5e,1,1,News_Funnel.xml
-33e0ef33f129b4bf61f87001d1bdc46d186cd05e3a95c7ee8e6c3d0cde5a1340,1,1,News-Gazette.xml
-5c27173b7d7afa1b073f275eb2ad36e0834ea09a371f69377443379723a891b7,1,1,NewsLook.xml
-a441436f47337705595460deaf9fcc0940b86b7e36ebda3cf9d947e0034c458e,1,1,Newsnet5.com.xml
-d778b682dc606f5a46dfb17fc9887c165e6aacdcca215bd7dad3ad16d9757401,1,1,New-York-University.xml
-4125362bf733c54e5b36ab62a6355215cf05593529ad90d1f864127871552ee4,1,1,Nexaway.xml
-3827f1f331ee1cfd087a75708156fe6dd1d78bf73689aa0e3f05e769f9ae7599,1,1,Nextgen_Auto_Parts.com.xml
-ba5164f38a24d39d86f53ca602a4f7dd6588321e91dd31f3a41900e8235bfd1a,1,1,Nextgen-Gallery.com.xml
-878678bb92243d6117ca6b9852399304d42d5f29f5db90d58186bab9f7999130,0,1,NextRegister.com.xml
-062c7a379d68a9a26d9445a86c7445b28d7f0c6d37a00280e9a6227855935654,1,1,Next-Update.xml
-40707c074f1604a6e59072a96bcea4eea833a8140187abdc12b8e4a02b5af23e,1,1,NGP_VAN.xml
-b96be1768c31667d57cfe63b816da5694252eeaef0c8f6bb9a8a682c2ab677a9,1,1,NIBC_Direct.nl.xml
-4af8504478403141e13018b68dda2ca244cb990aac167268c0b51b3cbaaf649d,0,1,NIC.ad.jp.xml
-d736b4403c08de43b1380fb0bb896d84478ff2254f2c4e12c579e5d175c60552,1,1,NIC.br.xml
-346f439850c55caca5a78b5fc94710c205fbfdb3058553be31a46f6d12cf57aa,1,1,NiceKicks.com.xml
-61a9f6011715fc48d87a94067f3fe5cdc9c02640e9bdab07fdd2ea4311d7c121,1,1,Nicholas_Ranallo.xml
-6d06d1aa85b280082752fb7db909cbd17a8af89885ee11c7a44a2171667d5a58,1,1,Nicky_Hager.xml
-4aacfd1dff2d8f973a210019ccddd21d8e41afee921f582573ec8bdece14f27e,0,1,NICTA.xml
-5204e3581002355bd1567fa463b03daf14441600b888f345e1bd90bc0bd6644b,1,0,Niden.net.xml
-288576142560c33bdaf2b96181fe28dbc85187f23bb504d2958eba24e227fe60,0,1,NIFTY.xml
-44b84456a3c3fc5557e72977cf9ce16026b8e0af2962ec95d2f3cc49f60e4f0c,1,1,Nijyuyon-Bimuunzu.xml
-51f9018faee4b5f25dad5c45d9d8df8a7787758c25d2251ca366c3f08f0e9120,0,1,NiKec_Solutions.xml
-de1c97a6ba1ece72e2b39d5bda73f089c9ae9e6e375e7b1e4370865d4ee29b31,1,1,Nimbus_Hosting.xml
-a0f578f005779d8470ae10f1de0613020df1cbc8fe7fc5e8631a9fbf80512b1a,1,0,Nimenhuuto.com.xml
-ec7461b5fefdbc43198d8930f6decae4c9bcc93d2473eaef2a528d1affffb111,0,1,NJ_Edge.Net.xml
-a326164b9ad2dd7ad25a529f70cb78f363ffb0e58a2f59ea413248aade1be980,1,1,NJIT.edu.xml
-fb9bea6dae32ac882a6da54f728aeb39babc12fdb1939dcac84bc3536733e69f,1,1,NMU.xml
-73d593bc40d8180d71f00994e3736e917129f868ecfdddbeb5bc4e0775769b12,1,1,Nocdirect.com.xml
-debf94c52eec0428247d415d13cd14dbe048783d7ade4dd8ec829dcebbf97b47,0,1,Node_Security.io.xml
-43a70191727669db16c25ec225fa95130168fefdf70c4a256681e235b724b02d,1,1,Nokia_Siemens_Networks.xml
-3836f63808d07a7d2fac347ce4d1b6b936a66ec55a0bf5263b98077b65ed1361,1,1,Nomadesk.xml
-57c82e25267e839ecaef720073776fa50c2fa424d0186817cc21af93356b2651,1,1,Nonexiste.net.xml
-d293276c96add15789fd139b6fb190bd50daf5959c426ddd1f65683c3fddec70,1,1,Non_Profit_Soapbox.com.xml
-8e7d3d54f3b3fcec404bce21849e00674a9584c262546e559d5a5844e6e3e82e,0,1,NordicHardware-mismatches.xml
-aa1619c02d07a8ad0e6e70d89453c9a7ad9b584cbe9f8ddfaea876ab46a59e44,0,1,Nordnet.se.xml
-fa6721f746512e5e4a8c64511e6726f1f815515a40851600355c0cf2cf4d41a7,0,1,Nordu.net.xml
-47d1a59e4a5bc7f49dc15f74073e44df0b352aaa188b8b2c98cdea00d826266f,1,1,Norid.no.xml
-bb16c2bcbadb4544c85460c9389829d2b7aad4d7b3963dc246c25f59ffafd360,1,1,Noris.org.xml
-1abdc9682defa48ce60ed8b8676ddaaf7243890d23ff2c5829e2a1846129b4ae,1,1,Norrgruppen.se.xml
-fb92df7c56875eeaba042d251910aa25c63f4b5be19a988ad757d2c1cadd728d,1,0,norsk-tipping.no.xml
-6d1fb00a3de83ff2fd0b8ff200d191bb37b269eadb0570c50f4c57c637ea09e6,1,0,NorthClicks.xml
-8de08df9643eef3febf2af8ce2f91d34e166a642b43ceb2bddf266e335a0cd84,1,1,Northern_Tool.com.xml
-c4a531ac4df8aae49d972831bbd8ea349b8e413c750c18b15fd55a98ad422603,1,1,Northwestern_University.xml
-e5e9c8fba237ed6d57e7648a12033fda436f40959a5876ec4fed7b1fe419f112,0,1,Northwest_Swim_Shop.xml
-d88941553216a375019bef623617831cfed119f7e9a45de9c09e31cf9259c4ca,1,1,Norton_Online_Backup.xml
-208eea5047faaae533aa5050a7401770c5aa48183eb4835ec2d044898c666123,1,1,Norwalk_Reflector.xml
-70ff96450eacf3dc60037726f4a4fb075c8227e7d102758ec4d3860dc3fde0a1,1,1,No_Starch_Press.xml
-810d45a0584894225fd3c3e66c707a791528729a596c246aeba0b1e69c5ffe68,1,1,NoTex.xml
-0c6c06f058c319c6c3d20b95c033c01e344f10179b032110a16706bc2333d3a1,0,1,Novartisart.com.xml
-65f54df3f15bdf0f223df2a16aee88e2f7c86595a22855e25e02f5bfd8fe209a,0,1,Nowy_BIP.xml
-6c9a823e3a18a17c3ecc62249c7849fb7205d4a3914bd90a63a55d388f44b207,1,1,NPario.xml
-dd6b12c407efb9469efb6c2428ba486570a3468515291282c02b52f6a9d8eb4a,1,1,NPD_Group.xml
-005d6ae4ecf390a96f0cabfa24bf3542de3358ed187c7d3fb6a9ceae451436c0,1,1,Npmawesome.com.xml
-b8a8048fa9d78e8f49ad9eb38a05c4dd88ad22df91e48f65496580938fde7370,1,1,NPO.nl.xml
-93abbbfe95c5f2789122bf430613904b390913856f75d7d1ef193233b5dc40d4,1,1,Npower.xml
-5d4444592b404ba94813e1d8cf9e708f3ad212fce590b1c1e86f65db9cc72c86,1,1,NPR.org.xml
-99a479c07d49448c6cd8f8e92d29c3c6ffaef57c428719b97c5fb1abe9ae4e16,1,1,NRAO.edu.xml
-9639623e2600862914a9fb119f73d7508c6e062cafd70f4e5cb8873c0ae266d1,1,1,Nrelate.xml
-f3161aaef5e1b8c8ff003407b46075792e538cba3c966cb04eae44220d606e5c,1,1,NTI.org.xml
-968ecdfba1b77f1e7d9ad0883bea2141a1bed5e8e66cc17f596f494904f959bc,0,1,Nttxstore.xml
-82b8c6fdce49f6cfec8a5af5a439ab933d6db04d1a96dd8bd79b398fde7ed662,0,1,NTU.xml
-4389ff81399428de5835dcde6360c9355bd8bb30deca633fdcb442ed80e8279a,1,1,Ntwk45.xml
-74ee38c39c1732564c41660c16c36683c46aafc6785922df598dbf2c7d57057c,1,1,Nuclear-Blast.xml
-7328e524a9f2fd1921fd2af6072701475390df737de382f10470a108df06d252,0,1,Nudevista.com.xml
-0749f8a0080a8e3e25f93d805c9b506ec3a519c7756757e9c3d5b0743d0c1db6,1,1,Nu_Image_Medical.xml
-769b97bce11210d969f4d10ab4639bfef1b69b4ec1cffd3d0e954ad77c8749bd,1,1,Nulab-Inc.com.xml
-d16090d0d492da8b08cbedeef767e7654cdd46ac59ea36e79ec69d96672d33c5,1,1,Numato.com.xml
-cc50a9830d7a6ff8d19a2bb287d16061d1c06460547e7751ce3e44db8e3ca24a,0,1,Numergy.com.xml
-3549eafd309d3b4297a5c35cf3a6d5c49609a2369e6b86ec8329e62e9d7e5c18,0,1,Numsys.eu.xml
-abdf7c3d9a2a343830e5249d3df8cedeb901479020f51d82dd4b814d2d309f08,1,1,NYDailyNews.xml
-6d5cbfcc8c9be0f7aed82f53f645a4a1aa507fd4bbe1e200a57f541ed33f5951,1,1,NYK_Europe.com.xml
-5c89823371187d2f4ce51cd50e123987b1ef5759c98b3696c3e6634fbcf9a373,1,1,NZBMatrix.xml
-de36e0b17ee514a0df985867ae86c2d541221b07758c981e8cb0531f6f05fc5a,0,1,NZ_Herald.co.nz-problematic.xml
-e1a3d986985d25415f778a47600e667ad8e9bd40fc84210cf071cc8402d01060,1,1,O2_online.de.xml
-51d4745d946951d441a19db2b3ca4b677f850270df45f0241565bb8950527710,1,1,OAG.xml
-e79232198ecd818d2c8984bcb40357ff099f8916aee9743b4ab5cd29856f0b30,0,1,Obermassing.at.xml
-7a6389ef271a9d5a4dd6cc58ca95d36ee4fd49f8166edb672462ea728bee070d,0,1,Object_Security.xml
-74bd810666ffdb4fb2893f61b6ec93bac1fb8d2bdad9562cde970cece038f8e6,0,1,Ocron_USA.net.xml
-6d1f0a2604285d2dce5c3b74a90dcbf026e0f0d9762ff8e273c989f4c2012d4a,1,1,Oculu.com.xml
-9f666a13d6dedffd0bd201d9a652bbea8f91f6d041de1302d6ebecc12e39cee9,0,1,Odevzdej.cz.xml
-ee9c9295fb3a208cc0b9796284238ad0f8fe79bde323ddb10029757a43887bf2,1,0,Odnoklassniki.ru.xml
-9ee2f486b20494ec87d2a1a4d7a436cb9c9fa66a792615927db08fc465e66923,0,1,Oe24.xml
-d58912467627d4166913d3dcc6dbc6cdeff23bc192ddcde160f7284bc486fc57,0,1,OECD_iLibrary.xml
-df2add100cd65ade870829bb1bca5dc06439fe3f15a4175bf92dc91418442725,1,0,Ofcom.org.uk.xml
-45d99e8a02a0e2e8b6fadc671ec6fc9defef235fcbdbef400c5e5f6059b803f8,1,1,Offers_CDN.net.xml
-f2266e1bf3c4072508e918b98d2698af89f9e70bbafb738158b17f861d5049eb,1,1,Office_Depot.xml
-f1b954f78d24f7feeb7e04dac5fcdc774536df6891966380a0a1b2b497f95a92,1,0,Office.net.xml
-a7d75aec8e21ecf112e479ba71608e304ce069f7ad65780423fe6f6e3a882245,1,0,OfficeofNationalAssessments.xml
-c6325fdb39f3806727a88efb1c81e7245e545d76d22550261f220dcf7e312210,1,1,OfficeoftheMigrationAgentsRegistrationAuthority.xml
-7bd7472b864382c42a9f3801de953047d3789a93f17f117f9d8b246f89a46318,1,1,Officer_Down_Memorial_Page.xml
-5b55ee39e40189e984150ee57a844755de14b0927b9db79c61141d9fd9b1b574,0,1,Officersforbundet.se.xml
-25dcde901d9747daba2772ee4cb554d1246804ff52d34d003ad64b56df4fafb9,1,1,OHeffernan.xml
-28f5e6e876dae0659adffc120b0a68303c4d6f09a78cee0be7f61551bcb5e271,1,1,Ohloh.xml
-d153eb0f3b7524d4f4c67272e63a5427237f47277866092e9fbc72186aaf5653,1,1,OKPAY.com.xml
-fc2297b2e6b8c26a7c28893a30d9b79ae7e46d662d08f888bd40104166634c81,0,1,Ology.com-problematic.xml
-c986cde89bee26ebcdf729bc707f57a426b23e537c9833ac3b2b1d6604c3a171,0,1,Ology.com.xml
-543885653524b4a430d6bc05d5f0a915f8d2044b4a68210f400556475b617177,0,1,Omar_and_Will.com.xml
-497e4ef7981352ec9ab7c69c941e8dc50397ea32e225ad167258f3394047074d,1,1,Omaze.com.xml
-337868f3fa4ea5f7e775c58846ee41725e2bd31593b02a28804608ae479f4b32,1,1,Omaze.info.xml
-ded3ddf6a16ed5efd94edbcc6481468106bb1d5b2fc8a059873813f181bb2848,1,1,Omeda.xml
-56a510c39541171f7b06d9e5142c7c58974a7c3e5dbd4933acd2b78380d54369,1,1,OmniUpdate.com.xml
-eace07c9f40c8d1d737e1b1bf7ed811a6b93db64bcf35173c0db7463c02177a8,1,1,OmNovia-Technologies.xml
-0a5c5ef21136aec6f45e299d2bb76f6f3b291b2973c4ac27391a779221078902,1,0,Omtrdc.net.xml
-3f6416373d690a4ae3684ccbd983903c201ca6c64da36bad3b682e808637301d,1,1,ON24.xml
-1972d6c5905736d5cc17e3723d36bbafb0f8424f655c05a760b036726a9cdc20,1,1,Onamae.com.xml
-da177a5a62f5b28245ec5ae8feb54d6784053304cc353685b5e97c71142d6e52,1,1,One2Buy.xml
-38f608b4181bbcd0e2ef43bd34fb19ab09145bac5ac63c9a9b53c28199b23b12,1,0,OneExchange.xml
-9d8246d0d33f52be5c89b398480ebadc3dc02f64e777daa066468c90a3906f84,1,0,One_Eyed_Man.net.xml
-11c59e652dbeb5c89673a0bf1c14c96d925d032b9f838a8c3e1825706e5992f6,1,1,ONEhelp.xml
-f633eda70bf6a833c1b0f34d615bac9af7dde4e6611be3256dddf73293ad073b,0,1,One_in_3_Campaign.xml
-878eeaf89383b2d78eeae460acabcc26346fbf04e3f4cc9950a95597dddb5b76,0,1,ONEnews.xml
-2113833f401561eca9a76e4b866132bacc3b798521c30ce0af42c4a70d7f5854,1,1,ONE.org.xml
-7a86e66aa354558aa5ac3ca347ee08212e9edffc6adabc52fecea2a43d39ecec,1,1,Onepager.xml
-d6085737afde36c4be842c941f607237028ef8aa700604a9d19425e6f4b1d5a5,1,1,ONEsite.xml
-6dc92cee48556d89af4e82ce71e74ac9f797208689b7f351b93f2925f1a6529c,1,1,OneTaste.us.xml
-0a3d44381e241385148df130a14beeb2b5bf3363441a7fb3f7edd82e4b313915,0,1,ONEweb.xml
-20c6fcb2955fbc55f711d50ac5e82b05b6103e0adc66ed06d2c981b5d6997765,0,1,Onion.to.xml
-2788b4c9876a9915dbd3ac3f42d6ff8b87f8d874118c22806a6051a093187c18,1,1,Online-convert.com.xml
-090726845bf1a7336dcf4b17cc5fd367393dc83cd61cb47480c05e9443fa6053,0,1,Onlinecreditcenter6.com.xml
-eba9cf6de0668533759ecd0c36f82a6c449930302e3fb4e801ea327b491f3362,1,1,Online.nl.xml
-4fa2e7411d1c81beac34235e3fc37f2d67820e87f2b362680c5f2024fdb64090,0,1,Onlychange.com.xml
-e82460278082d6dd45d68e33b70bbca8e6bfe3798d9dd81b621e220e90df8d49,1,1,OnSecure.xml
-4451bf75cf6c947ca73f64b8deffb43eeea5f8f6bad4de32b40947b6acb816ed,1,1,Onstream_secure.com.xml
-1aa14c17aa4ef45659e1c0074208010389305aa5082249d6a70e108b55eb6bce,1,1,OnSugar.xml
-fc272ddb7df80aa257e5ca875c84d9229fea7d8355ac2a4fc8ed8943bff73694,1,1,Onswipe.xml
-dd51b1a05bce8252c471fe1e9ccc7ad3d295ab21d3f59485bfd45fb9392e1510,0,1,Ontario-Lung-Assoc.xml
-fbaf204007a81363eaaa94c37bc15ab4199113aa8b2eaa0716748f2d3d3b90f1,1,1,On-web.fr.xml
-80c93942c09bd0fc6bdc7a745fadde44ad620aafbbdbe3eec6187a6f211ab638,0,1,OODA.com.xml
-54099f634ae421e4359d5f5b6cbdcafe9668f66f2e6eb3a55f5084a21579ac24,0,1,OODA_Loop.com.xml
-acafd275568454c22d4e6503b39246589eaabbfee280841d01b981a06e280fd6,1,1,Ooshirts.com.xml
-44c2f4b20d087566d810f2abb555d682470754c52a4150254fa07f9124d3b8ef,1,1,OpenAdultDirectory.com.xml
-f28e83160c984f6ff05bc0df04ba6a174084eabf65407155967e6d040006b732,1,1,Openbaar_Ministerie.xml
-e4a39f7fb4896d07ce86d9a6db8a169943bc9bed2d1ee021c6df3e1215b0ebf5,0,1,OpenBSDEurope.com.xml
-97b2e736ade074beaeb62dd42fb1fe9672cfc13f4867f2f40ba03053683f78f4,1,0,OpenCCC.xml
-cde322a388021fd678242253e1553602e42ca30238c48f4c0ae454c292fbe92e,0,1,OpenDZ.xml
-90874a039013b1b29192288e6adfb66974cb6b5a2b1d725476540b45c256e725,1,1,OpenF2.org.xml
-23cfc517ee6ca72edf14bb84eea7ac61561a7b4350b58e293607b6d27f713d95,1,1,OpenSRS.com.xml
-844a36d59938c66a965aa67a15d31a2376a10ff96420716e5c17b03e344822fa,1,1,OpenText.xml
-eedd01238a5abf30c938d81a49922b5649a3a094393fe0e507920fa094f65d2c,1,1,OpenTTD.xml
-9463fc3e7893128c1b827bc2b8dca47a65679342f09db55a5f8cfadac96cae90,1,0,OpenX_Enterprise.com.xml
-604fe7231f1c25ddf6e9800bfcd98f75742214f5577db7d180515bf2faaab196,1,1,Opinionmeter.xml
-7c80b0633a59b7e17d4626e0c70daddb55ab24bd056de01d8c526dc482222af4,0,1,OPML.xml
-2013ceb768b7fb2e6ae7f5b25d5367595d6e665101205f208b092c0d4280b715,0,1,Opscode.com.xml
-2219f813d8e5729e90465151e21fec4c4983e78603af8a034b308bd1202643c1,0,1,Opsmate.xml
-e679e81cba89cfa6fe912e2750e9b2d63c212e8cfca50d110cad41576febf413,1,0,Optimizely.xml
-a0f2899f9469ea740ed8c77f5b23bd3714e4eaf6e351ffff4c9533a8597aaab4,1,1,Optimost.xml
-a5676729731514a16aeb134e6988d1e6bbbc14f748020d3de623bf8358feac57,1,1,Optorb.com.xml
-0d4d289bd08afe7cf3746463b1583ecbe548148093efba3b9d0c6b284b3d7adf,1,1,Oracle_outsourcing.com.xml
-056eb34319c7780b742ac8b8d770b2d059abdb70c2426b70a7ef35036d71b50b,1,1,Oregon_Live.com.xml
-59f3e0d2f845ba355058ea169801f53e02ccda46b1ef93dc43b207a41e34dfbd,0,1,OReilly-Media-mismatches.xml
-e0db41e1e47fc6247b7f8626f1f03bb2faf03e004051c8c6052bfa3ea5cb0709,1,1,OReilly-Media.xml
-e5357c1ffc74896189b011f0a42a965aa17e2380d43948c51fa3f1cbc4bfd34b,1,1,Organization_of_American_States.xml
-cecaf6ce7d12344ef5d11cea214e4e35a5830d63ebb2c06196d809186beea2dd,1,1,Orion_Magazine.org.xml
-d401c7f7f5c1176c51af573b2a7682fed96347dd92441fd17310f7862899da44,0,1,Orion.xml
-c82a64b885d2aa50ad002489c3b176f01daa34468fae4faf020096c5a998359b,1,0,OSGeo.org.xml
-8179beb66e449859d77703cdbfd13118c0486e1838bc34014eca63c16facb6fb,0,1,Ostel.co.xml
-20863b5a1eef280a516f941549c3fa23fd4677b761c598b34df09d9711807461,1,1,OSVDB.org.xml
-94dd37fc173d12370132dffa8f69db887cdb8ceda32a887bd09f68e45f0b1476,1,1,Otsuka-shokai.co.jp.xml
-1fae3240ae5ca7a9a6aec496dd35dca2c08790c7d20049fe1a7f103c46efa94c,1,1,OU.edu.xml
-9a1ed180ddfce3019a6fe50d73e329c7ea2b0e3496ee5d9970aaae538c11ef17,0,1,Our_Tesco.com.xml
-b6f59d89974e8d4dc8e7975ab5c8b9fd552f2678054747da8edfd0f61c7ce96c,1,1,Outernet.is.xml
-71e57056b2bb6b821f6d15d459b9e1dab4127b457ef251b5c5e90aa39c09a533,1,1,Out-Law.com.xml
-de1e27eb47786a3bf894fd5a8763bdb40aef0ea4e18148cc72682d2afa0327ee,1,1,OutWit.com.xml
-96eed2b53e5e3c9e71f961cf70b87da6a609b4f611bd7cfd5bdc1b35e526c2bf,1,1,OUYA.xml
-92fc52d7bb490975b655af9bea6487d3450afa1de920dcb2d3e129a2710362f7,1,1,OvercastFM.xml
-d8dfd4daa157d444dcfe0fcba5b88427f1188d5d086da3a7296700100eaedfa1,0,1,Overclockers.com.xml
-bdd3f592ecd63b5901777ec0167288e71dba360e36f5f838e8b637ff4a6a8707,0,1,Overclock.net-problematic.xml
-d036d978d59b2c6b627a707f62492e3914b334f5b8a47011c0c3b7522952bd11,0,1,Overclock.net.xml
-c82c5d7795a29482c59e69e8008da2dd1b9e7169397a140f15bbf490c8f65283,1,1,Overlake-Hospital.xml
-ff199168eef28407f5f4ec85c4a28f7c4bb363a2b1902a775788789754cde2e4,0,1,Oversee-mismatches.xml
-2996ca6e33df7a1c79b34fb4d22f94b102e5203184fee44a139fdc6d245469b8,1,1,Overstock.com.xml
-5e7c404505b85db849540392423e02d918afac5c262a77d56b9c54455c5d3020,0,1,Ovh-mismatches.xml
-ec9f53ceaec2456fb948c8a5eb1457115b6493829f0c3924f3c8b9191462efcb,1,1,Ovi.com.xml
-abd84a1bd03337f09f42247bb9513e11cd227c36a62e212ffcf035388923e208,0,1,Ovid.xml
-3ef27ffb6b59429f3141e44fa25d541563857b34023b5af2a3f1c54676b1181b,1,1,OVPN.xml
-ad5542092112d567a1f242111e90dc2478c0f9f27ac6c47613f6869b716b0d32,0,1,Owl.English.Purdue.edu.xml
-b3811d1dffe75b829ae7b3e3502df1a9e74bf01a4f58bc96f863e6ff5a7c5a78,0,1,Ow.ly.xml
-85829651a7aac63d0796f06fce34bc598e0db69ee307923c0dd4a4a0988b83e0,0,1,oyoony.xml
-a2a23af5c2ae4a75d2bc089e535640eeeecc2dc198cd238a388b41feb8da12bb,0,1,Oyunhizmetleri.com.xml
-166b9a29d094400dd90a8a552efdcd6e3b3c658b621d14949def9970d42c9661,1,1,Pabo.xml
-8ee04de0f957a1a7ef55bc97217988dbd46188d93422333933badbdc3c421d44,1,1,Pace2Race.xml
-57aed24e9b9918af2c3000fc9dad59aad8643cfa4f4dd7fbd4d1a7ce8bff2ad7,1,1,Pace.com.xml
-5a7edf49dea118f92b324829c0a372bd62cbc80e1cac4b4687acaa902b08e0df,0,1,Packt_Publishing-problematic.xml
-0f719310c45ca090e2e9a64db0fd93eb7c422307b95c10ff81f2a3cd55085165,1,1,Packt_Publishing.xml
-2942c293649a231016bdaf6d94a045f8053ecb1754c56e9360c0db8a69d22a35,1,1,Pair-Networks.xml
-993dc3f9d1e08eb3a27b37543742ceb167bf5ac80930af48325e4284b0858397,0,1,Paket_de.xml
-15cd68db5c4a3915cd30994308964c68800643eec33f9faacaad09390b3977dc,1,1,Palbin.com.xml
-ab6e11c74e0a8ed13d35553f3c8de56b8f5d9e134ddf5e600c9d9ccf29d202fc,1,1,PAL_cdn.com.xml
-e89d28ccda24a3b1cc9b37d3d269747a51d052aad6911ca7870a1b8a85212c3a,0,1,Palgrave.com.xml
-e557b6f440d476e55abb4d57ecc833bd70b1d43508f88aa2a7188c8b517ca1ff,0,1,PamConsult-mismatches.xml
-0e122fc15bd797982d15495539527f1952384f9f0e1d9a4f58ed9121aeccc471,0,1,PamConsult.xml
-0c07953d9067779a3afb141662a89ffe6712fe0a8ed080815cd3b7d515ff2964,1,1,Panasonic.com.xml
-3754825b11533fbebbb1f5555b448bad53f94dbb64c192d50d991717e48e4f1e,0,1,PANGAEA.xml
-2c02f527aac3a3b6ed1c50ccb0cc60f3071cdece9fb572a42d504f1f8507a27b,0,1,Panstwomiasto.xml
-66fd01bbbea23106a839b1b18364ed9781c70ab62c2b2c90fe21e27c02059daf,1,0,Pantheon.xml
-3d66d95fcc8eaff8c7fe025a95dc9990b8682f63e90359a2dce7f7d99117dd31,1,1,Paper_Mart.com.xml
-64436422939f25d69a11657a209e6448090f41f78c76a534ef7b29fda740fe67,1,1,Paradysz.xml
-2f11118b0aef6afd296fb8da24c425d5a3cf9142abdb8d48e51173074563d33d,1,1,Parallax.com.xml
-081de7e48c0be2a33abea11175c4af99f366194f21a664648fbd4e196b307f19,0,1,Paramount-Pictures.xml
-0849261d180bf5007e6904f9dedbef66c86b810331e023a436c861a45eb9b1ba,1,1,Parcelforce.xml
-34d03a76bac9becd0ff8d0b1731df9311e583642f0e6cd4703b548021f4ac3c5,0,1,Pardot-mismatches.xml
-fdaf728f0d1645316bcb99336155adde2f724bad59b80e1518b30aba749e3ee5,0,1,Pardus.org.tr.xml
-8248f3806e6f85c5e29de65e505f6a5a4ab232d37173b9317ac6ef9fd4a944d5,0,1,Parker_Soft.co.uk.xml
-bf9dab15a6423695a11bb8cfe9c4c544e6b94733b6b9059f152489bc396cdd5d,1,1,Parrable.com.xml
-2f7f5f9e4e3d9e8cdee57872ad5ed329a74729aa1da99eae8b09b9f0405a9520,0,1,Parrot.xml
-95355ec4cadb259b3053a38718cc8377c7fedb4b836845d8c3fcbc377a388b9f,1,1,Parse.ly.xml
-711047b87476094652dc5cfc13c671233df723abefe56d8d0985964be3cf1ef0,1,1,Partypoker.com.xml
-bd77d8f6ae3b12a11e511c42eb1334c5b6ed2ce407a4ab7ffb987d3aaabbefcd,1,1,PassageBank.xml
-4627a7d8ff44d737bfb4c58d14430e8b141ecc16773a5728f4ae45ccf949deb7,1,1,Passion-Radio.com.xml
-75a025fdf82ffe68b0374b63078929152bf48ac57d054441e0159befbfef8a8b,0,1,Passwd.hu.xml
-54bd67e965c51bf2587b2fc9952c21cb6de9fadf10e2b9554dcbe9da50b06779,1,1,Patexia.xml
-0b5ce15002341f0db27efdb5ecd92be9831b315c94d0e13fa1a0f40feb366041,1,0,Path_of_Exile.com.xml
-4bfbc60b942980ff3bc84cc72b58e923d53c44ac8545f4dd49a805be4abb3e85,1,1,PatientsLikeMe.com.xml
-febf08e54b5ffa88d16aac719b71fbe7f63848d993f5c4a2c9595f6ec7bae477,1,1,Patreon.com.xml
-98b8a9258598a273055f0ec78eb8de613f8dd0d9551ccecfdf8b94019cc4d53c,0,1,Patriotsuperbowl.us.xml
-4118c49b435dffa12fcd46cfabe3003d5fe4f800cff164ced1fc5613328f6680,1,1,Paxton_Record.xml
-17ba14a288b96c6c89e41390228dec05c1c7fd2289f797b79422b8be14d9d01d,1,1,Pay.gov.xml
-8a4688c9225f39cdbd0bdf2461b215687a6e52fb158187d9cd52f0a794ae3995,1,1,Paymentech.com.xml
-f57d5ca4919b3d58dbe5a864ea0feecbb99e330bea27b1aa204af72223c9a014,0,1,PaymentsSource.com.xml
-264085f330d2586114a4df09c28816ae62d1983cc4641f960c140367bf8d6a7e,1,1,Paysafecard.com.xml
-592b9c9cf654a401553f5aaf1093c2ed115e9ebd1d5583e2b6fb121ca249bd98,1,1,Payson.xml
-ef17044a8b78f51176d9b7505143648c8b23fb317b03cb15409a80d3400f3016,1,1,Payza.xml
-9602ed3addac75485c0ceea57c20a84d4a827c6d365762d3811f5666b6523b32,1,1,PBase.xml
-d97442855190363a210925b4af5c69eb7279ee85fbc38a2926f0ea8290c6e55a,1,1,PBS.xml
-06db9841f3c63227883eae4e5c4bc63477f1666d4a9ddcc3e6b754c98af4eeaf,1,1,PBwiki.xml
-8a1b127e8f05e0f2eec350c40c6a8fb03b4471e340cb20cb6b73eb79253edeb9,1,1,PBworks.xml
-cd261c31586178eb701aaa6bfdcf87175167cf04a5ee3f713646b349be74f608,1,1,PC_Booster.xml
-cafaa354707ae4551d9e4cb2418f7693aae919a2b64cb9fd74668ba93ae62471,0,1,Pdadb.net.xml
-9c31ea91bf0665d863307a542568b94e24b338bc12cb9bf1ece43b585c8fd393,1,1,Peace_Center_for_the_Performing_Arts.xml
-7ace65d7a07d3b5a62cdf6ea0e4d7aaa66e35a4cc4aa08dd49b9cb6410404a06,0,1,Peacefire.org.xml
-7906a49f15a7f530524ab186dccb29610399fda324d86a5e79806978facdfe9a,0,1,Pearson_Computing.net.xml
-eaa0b56f0d798eb856140dddec98c9e8cefeaf3d28704e57d7e14eeeca2a9bee,1,1,Pearson.xml
-842e549d619b0380eeb17b1efcfec6e7549e441523a844b09c96dbe09b405593,1,1,Pebble.xml
-1eb02087c60fb6dba349d89674f8fa25ac18106e527f762be774f5a3a56e0a6d,1,1,Peepd.xml
-9758dc26bfd158498a12c009b879a638ea94cc3924cccd0f0dc8fa4d84ec53da,1,1,Peer1.ca.xml
-64c4c6f9c393cc844503446036d366ab4de78bb4741c80a09d300d9f594c4615,0,1,Peerius.com-problematic.xml
-64a7ed454d800a12208277f538434e1e0b2c6ac9d315c87b208c0c00b72a1fdb,1,1,Peerius.com.xml
-271945f92399adf841cebf957bdb08cc89874f91442eb2544ea96f9fd5fed9f7,1,1,Pega.xml
-a130c2186838ac25cf952bcc67cca009371321b3acbe4fc721309b72aad7027c,0,1,Pegelf.de.xml
-5a52d53e9ffeb92c8b6362d7aa244eda1cf7464f87eaba6e7c4fcd95315e53bb,1,1,Pennsylvania-State-University.xml
-540cd8a82fb1de07061e983359475b2cbf144af5a1b98ef4b981f87982f3a7f9,0,1,Pensionsmyndigheten.se.xml
-d32196850dffa1814571345636359745e555a8ccd3ca87b50a1ef380380292ed,1,0,Penton_Media.xml
-c701f76f6f266e844c32dc5290854d98e913ea2c5006495b203d27a915336213,0,1,People.com-problematic.xml
-166164dcf3c3d6d1e3762fbb94fecde448c60817a32fbda5dcea58510bab18a5,1,1,Peoples_Choice_Awards.xml
-4f739239b0b8c6773946ca4faf240e443e09ac76ea98e300f81e45be2d32bbee,1,1,PepperJam_Exchange.xml
-0bfcf99110e28c27fac8359fa56d2d15eb9a6bc51b7f19c801f48d848eaff667,0,1,Perfect_Market.com-problematic.xml
-7b78550930456bd1f52a35ff060fcf4bd5600361784386ac7b055825567697d1,0,1,Perfect_Sense_Digital.xml
-900c3a50d140a65f8eeffd335f0dfa3a879cda47460d82d990a5e3f2c74d9e2c,1,1,Performance-Horizon-Group.xml
-f0b6d7c9e50a64809b5eaf88b7b4d7dce6e87dc879278206a8aab29b18c5f8d7,1,1,Perl.org.xml
-a1da8d050501f472ff514b7c95a98a842e5c44be10267004c30e596b5ad1ba04,1,1,Personal_Data_Ecosystem_Consortium.xml
-5da6f392c8c9d1934378d6c298a208df2a58294ac300696a84f5d7bd547757ea,1,1,Personforce.xml
-4fb878e36f15569bb8694cc8779748db363c8f11ad0e6b134fec28c19d2518bd,0,1,PET-Portal.eu.xml
-e99ec492c45d9f36374209f65aa64728ab835eaebba4922de1d940a0a9946394,0,1,Petridish.xml
-f4c10865e40293cb75f67a03a2e5e63ca730b698b6cf48fe2d0a9c32ed35050f,1,1,Petteri-Raty.xml
-1ade8367471ea44282c77b6f43bab43cbc8a08af4bb0d26e855c46605f2d909e,0,1,PGi-problematic.xml
-dbd90f2c99bc31ae808344a6087f970e33788e1c8cde66d1768711db380133ff,1,1,PGi.xml
-af476a463bc44c5c542011579e55ccf8a7e325700b91a1a70e1ddb333f6dc3ae,0,1,Pheedcontent.com.xml
-1c3c79bd15ea38a9fc9fce5b15e750591f5947684bc7d09ffe2fd842ab55973f,1,1,Pheedo.com.xml
-10c216db9072d4143dfe8c2573933753ef48295f0919f6baf00ca7358984521c,1,1,Philosophers_Guild.com.xml
-f7ab888270798948dd057e5883a6f5c955abaf3808fb756524e1fc1d86a0b5ed,1,1,Phoenix.edu.xml
-d61d04f65a6fd2d43073d79cdc7beed25f611fff7e88332b8996bef471ba9113,1,1,Photobucket.xml
-53c7d5a4a7c980d606e95998d9ebb2bac6595fd8ca882341ac9c15747387ffd5,1,1,Photoprintit.com.xml
-2bd8e53696537c5812bd23b9c6628a3d0af06be72233ef810040f3b23c8588ad,1,1,PhotoShelter.xml
-674a0b637afbdaa73b2bfdfcab99c5b3d71a384787d9e031a134f792f3fe1613,1,1,PhotoSugar.com.xml
-f9670b9d0e9d920a70d4ec7b2dc8179a84dc5990178b6b342a670d15fd172d3f,1,1,Phparchitect.xml
-3af24510a340798c94b74d84d83b8d97c908a99c176285f01e01b9233257c6eb,1,1,PhpBB.xml
-d207479c61bae758355d66740cccc5b8933c177ed185600cfd2383ca44b07048,1,1,PHP_magazin.xml
-2b45bb4e70e3004d0fcf9b51b953876fe7fd98e5b0d739600cc8c69a90899014,1,1,Piatt_County_Journal-Republican.xml
-70a3d36ac63cc90318f72a656baf1d5dac0def5b77a5bf6057985fedde3c9bf1,1,1,Pickaweb.xml
-cf7b1bd5b721d925da006f39ba1871955f031865f0671ceacc1682158090e92e,0,1,Pictomania.xml
-a64aadfc5703638d06d42fb40b03ed571d3553b67c5b8ef1c2ccbb3ca41ed3fc,1,1,PIERS.xml
-73228b03209d957e30c9949ed6f98aea5cb7625806c66b5b57d43d5cefe23273,1,1,Pimg.net.xml
-5c642d04588720a0e664a199e104302b390ea9164d5f94679eb3071cc419e6d7,1,1,Pinescharter.net.xml
-351933a4ca393d784a3e0255666cdba8645c9e2d8f56ea3231467b53937a7460,0,1,Ping-Fast.com.xml
-6febccf9fd5fedb160b70b5cf4e5d7e19082b4e6fcdc034cd95799ff16389bad,1,1,Ping_Identity.xml
-afedb6420fe0dc9246a1e3704d1b06967e04611e72032e5103d6937ad97798de,1,1,Pingless.xml
-3c5a6453f20a2462fedce8629a68e47c615c8717e7f5934f3271d71bbf3980ee,1,1,Pinme.ru.xml
-662023093afa853230351a22ad3a03d92674583751f67b1c77db57439da389b0,0,1,Pipping.org.xml
-ad561bda1b21a7cd37292fe6517ed7450fb842455e660f2900652724949f6f2b,1,1,Piriform.xml
-dcae5488ec16f197e07694590aa54be513815984fa0b5d5ea1bc08ab3557ed5e,1,1,Pivotal_Labs.xml
-44323e2b5b6caf12d77c2d59ec395f05871254633110d9445cfde16de26083d3,1,0,PixelX.de.xml
-ad971bf2c77b4ec56dff4b1ebd768b42d166804aa93c19a70dcba398a4045a3b,1,1,PixFuture.xml
-92ad78a298b8f4be0d0b4aff2d5f19fb6c7c82f5d6f8567694da3e0c68edd3e4,1,1,PIXinsight.com.tw.xml
-f271d90bb31a2cb8dc0f62f9df2f17b575beea0dd022090c0960f28a92ad8ad6,1,1,Pixiq.xml
-0994464e966ec0d215837bc39c1acb79ac32b8467aa507afe6b562eab05a44d4,1,1,Pixlr.xml
-78052284fbb334289d9e752193c08b0c8ff5c8fc92a3b39307337c8ba09d2c55,1,1,Pixnet.cc.xml
-b84ada13e6f5cf133253dbdcc57309d22aca26b01618f3a9595216affc6ecdca,1,1,Pixnet.net.xml
-e003a3a5770e69050c1accb50e3688d18332e9afc5709c67d6ed37b21143d042,1,1,PJM.com.xml
-31dd3078d2a271e9a9168331e24039ca47fcd957172cb2b1ba0c51e17fe9ae67,1,1,PJTV.com.xml
-2045d71578ef2f543876076c1cb5ded21813374804dabe5658b6d948243abdf6,1,1,PKWARE.com.xml
-c5c0d23e54473a42d466785be61c4ad691e44f62e710a2a6c9248a694b6cb084,0,1,Planet3dnow.de.xml
-56c3e1cac4182da64d08f8022f8c7a23d5c7b289bd16d8121a188b07e140df46,0,1,Planet_Emu.net.xml
-17825c9a9cd2db7a5d13875ea74970ece1ddae9a9a557ce3c3630c583be0e8d1,0,1,Planet_Minecraft.com-problematic.xml
-3ea9dd12e12f7ee6c175c6196aefaf9dc366b0b46db96bbc6874afc901c1d2d5,0,1,Plantronics.xml
-d008a6ff2c3b16c6fbe4d134d1c1aa6b7f333d343d9e3fab3f88f9cd69599cca,1,0,plarium.com.xml
-287e64d55238846fb01707c87d7d0b7620816da9059a63b0eae64cf45e7a0428,1,0,plasso.co.xml
-1094a99b5e8a0abb9fb46b17654826e1a8387207caa3278f89949c8b6d0f2ead,1,1,Platinum_Skin_Care.com.xml
-41ffeb380bd1fb5d7972c790667fa5c0d2ccd2afda7a269651a65372b52cfe04,0,1,Plati.ru.xml
-af326d89812059824699a52128eb9ce5c046bdd8157ba00fb9a306927ba82aef,1,1,Player-Attack.xml
-f17442d3412d38817ddf3cdd8ec7f104b45f54d6175505b0a315d5d655d05be6,1,1,Player.FM.xml
-f8eb1c5b920d861d39f2f49cc5b1b5b781034d05a5c5970492e2ca678feefb37,0,1,Playlists.net.xml
-5ad21240dc02ce7be71f92e97e1f63262e6e839d605135c4b82ca69d20115d56,1,1,Please_Ignore.com.xml
-8e4f71f2c21971751b4669d02db149088429c727002101104ba57365f5804531,0,1,PlentyOfFish.xml
-5ce86ee0da32f6c5981cb7475e0a8380312600efe02838ba40dc8dbfdff5afed,1,1,Plimus.com.xml
-276a6de950c7d1e713a52f2dfbaf55d94c612fee0ce7f69d5ba868c1d48ae719,1,1,Plone.org.xml
-b24301ccfdb27055ea2218f9e9ebfbfad89e7b0293b3f4ef1ec8175e7f32c945,1,1,Plus.xml
-78b114e3756ec21b948939f187308f695fccbaf94f4cc8f588f262d84d44acf5,0,1,PLYmedia.com.xml
-3d08fca17433ab0e7184bb76c5f404e164a09d77c2cb1f2093f7b3d9c6cf823d,1,1,PNC.xml
-ca77e2b2c075769fb2c776c97327a8a6c831244e01334d877779d6f34e0c6df4,0,1,PocketMatrix.com.xml
-de183d823652107d6817148ef14f0624ab67e95e1440808e1f12a41e1d52c324,1,1,Pogo.xml
-865ac521a7afec106bd224887358f9e23d61c993285ec52b7b79a8a58565171a,1,0,Point.im.xml
-82900ee0fbe5e8da617b95011724372fdc7d1a9e68376b6e0b46d6128fc0419c,1,1,Pokemon.com.xml
-5e4613a8d4934b780820038bd26d9e3632dff93efb90d248dcace0ea4bf72d74,1,1,Police_Mutual.xml
-b18aaa63b24e4333450a6523704e29e485506972e8fc4be497e890e79ecef4bf,1,0,PoliceUK.xml
-ed360bd7adf7254dcf2698e30ca35858cbf4cb1e37d305ed814aa2b0781de9c7,0,1,Polisforbundet.se.xml
-8a694f9c1bef8cd1ce70799ac5df18b9394b1745015d1e1158f6dc8a723a7e46,0,1,Political_Wire.com.xml
-43181b1b84a18736b971fd4cf9fbca2035adf94aee0ae9653867e767aa753f82,1,1,PolitiFact.xml
-fd7bac449610576bf5a1d87e2277ca130fc15ad1f557c6eb5679ca615b5ccc30,1,1,Polldaddy.xml
-848cbae8bb8a671970b1bd5597d466ef0342bfa39ab0ebe89e31527cda1eb383,1,1,Polytechnic-University-of-Catalonia.xml
-dd309ed575e2ecbc07475735c3c4f7809acaf572582657ac7537aa116ca38a91,1,0,polyvore.com.xml
-b46978f0c40602b94013fc4a0c72aacf4cb3d7af3c47ea54e3dd4b563634f914,0,1,PopCrunch.com.xml
-62ba89768f63d01a33108d6612b1439a9dc7e1ebace2ce5c57ec7d72d5f7d562,1,1,PopSugar-assets.com.xml
-b9aeb8140b8c5ae9e60adc1f3189a4fcb72bb245869ab5b17b13eb2f42343f4c,1,1,PopSugar.com.xml
-39b3fb002be2f0c21eedeb789fefdd1c97156871429ac6565235eb9132373fe2,0,1,Popular.com.tw.xml
-37875c27e806135f0ac32c517079c7bb99f00e22dc3c2ad828ef0e8455b5d04a,0,1,Popular_Mechanics.com-problematic.xml
-1ca3755dac15857a47afeb3ac8234d1bf0e8095c43772a5151a5c9641ce3ca69,1,1,Popular_Photography.xml
-194c1c4951fa6df2bd486ece185ee8106c0319cc7355fdfe365bee8bd286fe98,1,1,Populis_Engage.com.xml
-e80eec223937d00477f33bea225ad1396cc725ba489e205a3cc07aaeeeced790,0,1,Porlaputa.com.xml
-4acb2c18ff46d235876ac28da274a69fdbf34c411da8503f46594d59b3f88d6d,0,1,Porteus-Kiosk.org.xml
-1f51c92f408edb3aafc43d5be80a659c5df57ef10b9a02f96649458ecdc25f2f,1,1,PortForward.com.xml
-4a41e0b110b0169599c19812065cb38f34e8fb0ab2aacf0937089d1ff9f662c4,1,1,Portland_Mercury.com.xml
-a9497c487231592a8acc567050cf06845efd8df27df3744d693335fb25ae803b,1,1,Portland_State_University.xml
-9d9f29b0e53a626445a096648cce8a40e721bfaf0c3e45b3066f19e78ae9fdf1,0,1,PortMorgan.com.xml
-6b0d7ddf3bdd5ad91f34402c6d3f7f7d0386490d94b03dd8f129412f4e514d20,0,1,Portner_Press.com.au.xml
-a3e9889f1fab89464f2a4ef9b23b21eb9b2a6aeed3b4f6ab8558529e4741a0e5,1,1,POS_Portal.com.xml
-19d456c372cae14406899cbba5abba4c69579ab946d75d80912d6ff588c45182,1,1,PostgreSQL.xml
-291f134543859ee92992b451afa2071cc6380c39e54f763bab95948f81d48090,0,1,Posthaven.com-problematic.xml
-2b0380c97fe0ac0c2108d328fac3d9f3bc16c3f397edda9b1e5e8c49a8e77bd1,1,1,Postlapsaria.xml
-4e5dbe5aef10968d09652fdebf8630baf5f78e41edbdf230238a6a0166985d6e,1,1,Post_Office.xml
-e35657f0aa0e705372342c6752ec5e6066031b10738c8f518a73babdfae1bfe1,1,1,Potager.org.xml
-e699af2a0de904179a543e2cef6b7f805e123404341dbe5e8d78dac3708fc644,0,1,Powerbuy.co.th.xml
-6a46cc87c3f3402eb83b4e1cbef69cebd0aefc4750fbd15d5b07586c56ce9f3b,1,1,Powerhosting.dk.xml
-b689ab0bf3c4612108106e20d8ee8afc95b2459b255b5bafbd243e152e9c0622,1,1,Powerhouse_Museum.com.xml
-d82fa518dafd334d1106c883a691314a2e188b467209396c7dc32e12db7ace88,1,0,PowerShell_Gallery.com.xml
-2a30f5e260bff8373ffe5d690009e39ff598593f90911bf842b7c1973b1502a9,1,0,Power_Speaking.com.xml
-5af0d3449d3939e8524205c2452115b5fb24c3d8a60e44f166539afdd1629fa0,1,1,PowWeb.xml
-e168b54c858e4cec5e942a544bf7028f787812923143341bba305f08f256c7fa,1,1,PPCoin.xml
-b0d4020ae98c0a8792a14d61af286d8da58bdf81adbd1d1e19afc749ef600bc7,0,1,Prad.de.xml
-f18bc789e6e2be483cf21a6e3d87792904f8bf4ddbc6ef59bd608ed84438cc19,1,1,Pragmatic_Marketing.com.xml
-2b40b4e8450bec409fdb41f54f635e7e70f9ade4e37971cb92487b2aeae72499,1,1,PreCharge.net.xml
-810fe9624db6579cb589bc5bf86447dc0bba88983b89c993152fd78554898224,0,1,Pressflex-mismatches.xml
-26ec6458d0c71bf9419469a4ebe2762e81ca89eca106acd1f4a0d9bacfdf0111,1,1,PressPlus.xml
-302da6e9ef8981e7c9fc640d28274768775d2dcf4e6db959d02538d6b7d061ef,1,1,Priceonomics.com.xml
-65f6f65113526347d5525105773a7579d9301a6d87adf13fa18499373b18db13,1,1,PriceRunner.xml
-a1023dd10e11b82db899a2b1cadad54c2f6ac3e51a4e056c58afc1efb67047d7,1,0,Printfection.com.xml
-44b5f33ecdb9f0c492366882955ceb80db6fab8976dcb2946ab853e344c73062,1,0,Prisma-IT.com.xml
-bfc3c3c917777780e10a197d260a120acc3614a32577402968a480fd5b42c106,1,0,privacyintyqcroe.onion.xml
-e0519f9b99fd87886edb3fc154d3fc1bb145333aa536966d417433030cd82eda,0,1,Privacy_Not_Prism.org.xml
-9335d8279c8e6c864c1c38fc7e140fa58be572a28ca0841aa83971d4c3a67260,0,1,Privacyscore.com.xml
-311f5788fc38e8633b10d3864ec787d33d6c7bf84e9a9917c01a78cb48ddcfc5,1,1,Pro_Bike_Kit.xml
-10d5ac3edf7cc569773b8371ceaeeb01c4542035eebda8b9081b42b47e0e7af4,1,1,Process-One.net.xml
-431af17050e405d37c9019bb57c2e8f09692adcab9a1f2d3893cc2567dfd8b52,1,1,Product_Safety.gov.au.xml
-65363f76c540fc9b7840db82c23f305190d9717d9ab3635647e72a9f8e0c3529,1,1,ProductSafetyRecallsAustralia.xml
-f55d12ba30d05c9ba088ec96236232acaf987158f1803c65ca82028f8a71de64,0,1,profesia.sk.xml
-7d0bb1e445127b3cb363d2c68fed4fc72b02ec0b62d2a42a4ea07d00479584c8,1,1,Prolexic.xml
-ed81e7fc8de7196452e9e9c0821196ba5de17d7274df4054ff5bd95800fe2523,0,1,Prolific.com.tw.xml
-f55011e0710b45f52baf018585014c8aa7ee3e0b1b57153b7f85f8082a8a8ece,0,1,Prometheus_Global-problematic.xml
-246a93f2f00b5aefc746d0e660c9d24ed00e877579176df74b4bf35d0f61214f,1,1,Proofpoint.xml
-632de51c809f29f705d7997d3f2b7674ea97aea38bb0678b1de48f0c6cc58bb8,1,1,PropertyInvesting.com.xml
-71f8f356d4fd12cb9d96e54d17f0024a34d8b3a2420045f5a8fa66976ef86572,1,1,ProPublica.org.xml
-34825b9e2d9746c75d16c7309e4313f84a65bf12a2cf2b33e091c74d09248ef8,1,1,Prosystemfx.com.xml
-9160453c23cbeb770466903a505a29052420b516cbb19a4246f079a10e77d731,1,1,Provantage.xml
-1cb843c4e551e1fa8ebdc15a2b493d0153e987fb85724bb426e5bde21ad44634,0,1,Proven_Credible.xml
-ff6cfba26a607be1269e2823c57e5fb5e5c4735d85954762fa935239600e8aed,1,1,ProVenue.net.xml
-19ff2b0b8ddf39a805465bf40819f9da9068dbae2932e8bd54a4c5a7a7a5a622,1,0,provisu.ch.xml
-00e348922788c6e644d51801e5887325fc38759395bdbfe9f9782d6bdb737400,0,1,PrudentBear.xml
-50adf025049aca05b11b491f2b307bf1ecb7a4beaffbf9022f4bdfd30cbe7b2b,0,1,PRV.se.xml
-05c868c1c858abd8e57044f301b234c281562fb4e81b4b95d3102e61e9eae0da,1,1,PRWeb.xml
-f5a7ecd99e9368048750e1de2badf731fd32eb5b21fd471651dd12d33c400e34,1,1,PRX.xml
-7529864ddad3be2820b1392717c117aac200b5cbc51f3233089a2d53cd46e498,0,1,PS3Crunch.xml
-2cb55093e265bb1a2c345613e293ba44500cc31603bd713c6dbe301fde49654b,0,1,Pss.sk.xml
-4165710cf8b6760a43eb078fd0356fe1ef7285687e1c23205c829ab8c0eb8ed0,0,1,PSX-Extreme.xml
-fca579bef6575b699d2f3239f2aa31a80efc1c780a771e3eabdbd3b67d87d594,1,1,PSZAF.xml
-933469a7c612ed85c345b6b85e40ddc0869c4af696fe8fd142568624b55d602b,0,1,P-tano.com.xml
-cfc805519f9d0fdd5d11d39b342c75d6e42a900cc286328efb02b358bbbc8c3a,1,1,Ptpimg.me.xml
-d7154776e888ffc460ac2b6ca7dd308983bdd3a0cd65ad5b84320624acd6e145,1,1,Pubdirecte.com.xml
-810833bdb010d1707fedd1f43e0ba19c69971c8e9d4392bb396e3f757f0e45ee,1,1,PublicCitizen.xml
-83055ef9b302a95dab4a512ce4db64ff78e36c9eceb2902a9fdd1ccf209295a5,0,1,Public-Knowledge.xml
-852468fe12db8c0e0c8e3fdd229d180bd4489a4447e8fe43de6e8cad0bd09c46,1,1,PublicSectorSuperannuationAccumulationPlan.xml
-23a44647cf11328fc8ec23513bdfa9ec5b4f1b9decd9a81450815c7f28ec8e78,1,1,PublicSectorSuperannuationScheme.xml
-2caa8440433b504450c68818dc369cfde301056780069cefc9626beb1afaee23,1,1,Publiekeomroep.nl.xml
-60a22ba8003d4e7d3bf1a9c0dc45895ee4288e30b0e2a6e3e56b09f29a9248b3,1,1,PubNub.xml
-f7e6aec7d24758aea2fab342b5c55455874ed2bf6684a972c6c10033a0a42f70,1,1,Puhkaeestis.ee.xml
-f632d8275a444842292dccb0f595343a6ccfe660b36b20735a54fc6c18ce956a,1,0,puhtml.com.xml
-6587098fca3427a565525e04cd45ce14229ce1b566449f425f9e52b078cb3f07,1,1,Pumo.com.tw-falsemixed.xml
-d9044daa3fa3513400d2990aedc735eceeb815c896b70a96f95d4d79b1c846fd,1,1,Pumo.com.tw.xml
-acd28dcb80d57ad032fa2e32b4154408acff51b7c1e05dab11ca64ec95cb11b8,1,1,Purdue_University.xml
-b6057520488d6305bdb6398f415267cf8feba6274d26eea30399d35a52e778c4,0,1,Pusher.com.xml
-2317a054e72ed73a054c0d1e5c505c7c97ae00d25e29d21227133c03009fa96b,1,1,Pusher.xml
-3c9d06d9ffd5caf007fd991a4ca268b1926234e5dea0ef57ead2e7659476c1ab,1,1,PutLocker.xml
-0c9b2d18c06cc6a3cdf9e3eda7c17efd3932f0a8a10e733cb1e3639b5b367dfc,1,1,QIP.xml
-78ee275f600fe0cc6ca08bde49676513aed08a6f12a2fcf54d052c869ad16e4c,1,1,Qoo10.cn.xml
-79f1b222e500c7165dd88c82e66606279d4408c77dbb1ea93a8ba80ed67f13d3,1,1,Qoo10.com.xml
-de96109bb8138c3932d1def5e147223642ddeff5063f85352049f89b8dbe0d07,1,0,Qrobe.it.xml
-d504299fce0101a535923de9eb5d3f07457141683d375bfb12bf5f7fe0884a61,1,1,Quattroplay.com.xml
-11670da974bdbd3ad8f36d0905cdb3b0a259181f1c2a7082c85c2ba432a1b21b,1,1,Queens_University_Belfast.xml
-2ae041292bca7ebd5b5676a257408e8a2939fe02f95f73acd9d06efdfec45480,1,0,Queer.de.xml
-5058b2dd73026b5888467dc6f0cdcf7e8024d92ddc8d685351be4b1d6ec61559,1,1,QuizAction.de.xml
-4d0a6169323a0ec0a1c485935648058dfacae4fa77af279c293153a83a520b3f,0,1,Quizsnack.com.xml
-b967b81ca4a1fc41bc902c58021ea8f529562d532b2347dfd0470315fdde97bb,1,1,Quora.xml
-78134572161adfaecbfcba6b4bf05bbcf24d0ad58ec347b99f9526dd94032a7e,1,1,R01.xml
-a528fade4ec3280b09242df1f18bf8cf465255be7640d16222810d16da8ca8ff,1,1,RackCDN.com.xml
-d33a01659d482e190a861accaf706b98c369e189547a8ad101db63a85fe18e68,1,0,Rackspace_Cloud.com.xml
-b6b80b8e6effda900873a33d7f0c6865be96761af04446b036a54a44ca6376dc,1,1,Rackspace.com-falsemixed.xml
-2de96c7071367eacdc5e8080355b4ed90690feb25878286f20ebbc18e524a624,1,1,Radical_Designs.xml
-e408f97c754819fa64101412feb9718b316520a601ffa448d5abd67c8a59fbcb,1,1,Radikal.com.tr.xml
-53fa3192655dd12fe95df6e4054378b1aa4cee016141ea5b55ff62a0516a3af1,1,1,Radioleaks.xml
-62cfb3725049ab3b681e9224924540fb6ec9b50600bbe7a5322150895e4ab29f,1,1,Radiological_Society_of_North_America.xml
-38e57a4f0a709af70a0501e083bedc8f72d5b148dab4a3742cfe8ca0f43230c4,1,1,Radio_Woodstock.com.xml
-be7e41eeb775ed3a092eb6caa67dece5052bae12be23f72922421af695d2892c,0,1,RailsConf.com.xml
-55f4964baf295795b80f42cefa274988cb22da02a9760a06a78d6107ab393de2,1,1,RAINN.org.xml
-7a68ddc00697bc7d0b4422a68146bbcca499badafa24994a54de1b6eb906888e,1,1,RaKdigital.xml
-5b516f82635c029d35e6b0a3aec6b385b41d572e5987f9b91aa880f578afaa48,1,1,RamNode.com.xml
-39770eee73097be9257c52d47336b260bfc65aa25d2fbb5919ffbb579b40c664,1,1,RAND.xml
-479d1186013787d5ad5824cdc9301533cb83e4f3c5c43fcaeaf337803bb39d09,1,1,Rantoul_Press.xml
-6820ab945ffd54ae99020d3062ba48f678bdfc42242e90d26cab37120ad201ca,0,1,RapidBuyr-problematic.xml
-b3cb715eac83bcbb6afb997b6c18efe760bc90aef242f1d57a403d457bef9864,1,1,RapidBuyr.xml
-9aac5d3270231d33c21bc9959aad7f193dfc44b9c36e643c45396829531ef2c0,1,0,Rapidgator.net.xml
-44142aac4ef5dd6b468e630fc477057ccdd3d8d4a5ff029c9ed0bdf85255c47e,1,0,rarbg.xml
-b28c129edcb211f427fb481fb7ea2d1984f834dd5a41d7b035c41490c04cdd25,1,1,RatfishOil.com-falsemixed.xml
-c141b46bc6e8bb32c9eb0beb311cff1ff66e003fef23f11d8ae1e23e1a308cb8,1,1,RatfishOil.com.xml
-5c5fb50995421b0bb87a4f58d9c8ffd66a5ea62694117f12aac728f970c3a536,1,1,RaumZeitLabor.de.xml
-a5f312197dfaebed7e4ba8ccf0b32d481943f1f01a13b3050dc70cccad69133e,0,1,Raven_Software.xml
-922398c3843dea87e31afabf326f9cd2447344f6aed0f93514f2c98dbe69c9c8,0,1,Rawnet.com.xml
-96d6931dc7ddc1dfae37303fdb58cd0f855ba02abf08cb981aa1e0823513e9f3,0,1,Rayner-Software.xml
-e2125c4ff7f8379155ae1cbe641d8d42fc62ede1add7edc1abf0d519b28b231d,1,1,Razoo.xml
-1f625b9e5210e4cdaeb0374adefc086916f2485e59f4b862a1c4be2490652773,1,1,Razor_Servers.xml
-f8be2a2667f90decacf4019ad460037617c4a39be2c437395df2448987ca49c9,0,1,RCA.org.xml
-79757f97f7b60f450d8440be0d4280a576539dfc57f392ed11818a03876d208d,0,1,ReachLocal.com.xml
-26f7ebee5d1496c39f57930c112e3e28dd99088d89c265e52efb5a4cc1dfd0fd,1,1,ReactOS.org.xml
-13efbd657c5c64ecbdbee93b603d0bb76368716dff6e66366bc86e60c82235e6,1,1,Readability.com.xml
-e113693a7093f79a8d7f790d4c5f5f7f957e467aeef8a6894f6a67b07f796d72,1,1,Readers_Digest.com.xml
-41653b528d317761c5c16423c2e4d33ea37646cec0801764b40f21cd8d7e7d0c,1,1,ReadRobReid.com.xml
-acf5a59353875766b55b4fff82786b045afce50cd102aecd40a6c45a7813a153,1,0,ReadTheDocs.xml
-3062eef28b7e7c5139893d742c58e9f5311e82b6d822d49da082db570374f0b5,1,1,ReadyHosting.com.xml
-8505d26fe4d69ad974a9ef7d0220858a70a0353a998a8f103389b0dac8f6a721,0,1,RealClearPolitics.com.xml
-65002fb8676849739c54b0dd684aae2e36792c16ab5144b1cde089a6561d2f52,0,1,Realtech_VR.xml
-d02d0ef8d9228fb73ed248df5c49f8e5f4ef408e4cd0442057337d7cc00c8537,1,1,Realtime.co.xml
-175a2519105c6a213529364cc7d07291395b1990d6972eda7a6114333639b0f2,1,1,Rec-log.xml
-be04e4a5c75ce1b4a49738d3a5e13dd52e2b054f0049b56ae3dc5a96cf3e0bf3,1,1,Record-Store-Day.xml
-3d81ab3a1e068cc3e433fb67054d899bfb0de1806dd6a4a04c6960c400ee2403,0,1,Reco.se.xml
-e9fb62effa61feb3005f0865f352c6f471bb6ca0318c690e1fb91c6983e5214e,1,1,RECRegistry.xml
-b436dee831b87aa69cb3b905bcf593cd7e47ed08820189f8974d4a3e00d98bcf,0,1,Red_Bean_Software.xml
-39eff1aef0a36525f9f373d24e20fa4850fff65d2acb945dae316680b84ed334,0,1,Redbox.xml
-60738cb7402596b4df80fcb816ccd0b7201ddfe28519ea5eac14032d977020f0,1,1,Red_Bull_Content_Pool.xml
-358a803e6694670ce113cbe84d04335e6323f745631712ee5c92a2b27b3011c4,1,1,Red_Bull_Media_House.xml
-f5f4e5770ef84894d68b4743033e33f2907eef674a04342f07a6b1e2a6c1cb5f,1,1,Red_Bull_Mobile-falsemixed.xml
-0cf1955ace195c6b0ddc0b5bffed0f41bc193291ea29da0f979575ea65eaf195,1,1,Red_Bull_TV.xml
-d782a5646c87d8158dcba9e72345ff2d288306d579cabd36d16ff1ba3385584a,1,1,Redcats.xml
-def99e9c52843ab97071e7c51143321c1bc97dc6b2395b2619b4f9ff7d197f2e,1,1,Red_Cross.org.xml
-8a9ce238b75007715b95538b35b88e0d8169d1475b57b620e773b70eb86be3c3,0,1,Red.es.xml
-5131e656638f11fb4593a02bb49c601f5bced0eae41d40fa23204eb04587c50d,1,1,Red_Ferret.xml
-3eb21961867734b2a94ad5cf657258520891193e0d3067bb0fb624a4b1a68a18,1,1,RedIRIS.es.xml
-520f55fa37450f41727427b048bfe020b5a1da2fee5f4123e3279c77806aafa8,0,1,Rednerd.com.xml
-f53f48cc8819321f46aed9c297b688b9993d6a9de165e8763d0f37c8ebb26381,1,1,Red-Pill.eu.xml
-022f64e1fd961e6dddd0b67103a9bfb71b2750a20f5f80cdc08c5f3c40d386ad,1,1,RedState.xml
-1bc93887c36392e422e57cf7b8352bd344b1d034cbd78d09da67704520b5ee37,0,1,Reed_Business_Information.xml
-49f413717d683b1902cdc262e5a77d4ac119e9b2c2bd4f19b0139c0298fe0c40,1,1,Reed-Exhibitions.xml
-9367d9ee8b8400372e7835f87118ef96688a260d514b8f8a520517d7eb83f792,1,1,Reef_Builders.xml
-b5b101eca488fc7adebe10a24464658ad959ecb4abeab89e78f1301ae07bd338,1,1,ReelSEO.com.xml
-f67b6b6fb72b8f527e63914337cfb4af1ca315cc6c3000de73b72663e0257c0a,1,1,ReelVidz.com.xml
-0fde1b026ce9f57fe5f54946d80e89bbf4b6493f09229decc85fbfb2430fc674,1,1,Reethi_Beach.com.xml
-2e8b726961855461d27af664aa198af4386e9a61ea1b25ea9e3f97f1618645c2,0,1,RefinedLabs.xml
-0dca7f8db4e1a34403795e066f569135f7b6a690847e640627fbd4cb613d71c4,0,1,Reflex.cz.xml
-ed697b644563bc08f7a64bcb2d4b2d64353594ee7dbb57727ac8ae94403b5dee,1,1,Reformal.xml
-ba5433cc440b527b0ac40a27ca63efa96122103a9bb85d2f90b1bb28c582de62,1,1,Rega.xml
-c74512d5ad6cb05e8d017ffa2610ef5f62f3a5aff3630c7100c0cdf66a7c75a4,1,1,Reg.ru.xml
-5e83188980d3c2b83146dcb31b2d9ae630cf2eb06ef26bd1697234ddb7101112,0,1,Reifman.org.xml
-5d23454687669a3d598689f9418756c861eb66b5cbb714a30247a8fb9f4836a9,1,1,Reimanpub.com.xml
-888ad874942b60996a054e52ce5277cece76bd84e05af6d197f19dc3004870ab,1,1,RE.is.xml
-c3043eb5c205e1fd21c28f12f4069dcd7fad8f3d130f25a52f90be3e6abaefa0,1,0,Relcom.host.xml
-4b05c5b070f01fdc1f28d3a4c0a35e23aa9df4fb04ee079240a766db5db1ce3e,1,1,Religion_News.com.xml
-0d62ce91032aa0e22743e303909eb3373413706cded1921272fd64960c979b52,1,1,RememberTheMilk.xml
-9f6215580d0f68d5a791503d13f1a5de3e4253f8ed4a29cad1cf1d1c7912a6b8,1,1,Reno_Gazette-Journal.xml
-08478a26158e294caed24907e5709a73b5047c7e02a233c59ba375cd81e06608,1,1,Rent_the_Runway.xml
-4694a9c81d65b951a54741e724dcbf6ae71e205fad3f2a1ccf028916a8801eb6,1,1,ReportLab.xml
-5cb0ade0d5d1dc7e4dd1ccc665dfb4c266ada546964c320112cfa58311fadcde,0,1,Repozitar.cz.xml
-df6a1cd7bd092eab928286a2ea29b97e9e2d85f9fc6388079ee843d43b1da80c,1,1,Represent.Us.xml
-88e398ec4597fcd0126db82a9cb9efad999c17cda7de00490943b9ff12551771,1,1,Reputation.com.xml
-97c227a9339f8d2100116d0f78f3795404ff88c9b2af12ba755db9919347253e,0,1,Research-Blogging.xml
-d922f4c00cf45c0402b3cd984a423ae4c8d6ef7dbb9ce8df071542923929f42a,1,1,ResellerRatings.xml
-99c54146351ebc37702c69036a7969daf602f88a46a6659feed01e378049e8ee,1,1,Reservation_Counter.xml
-a9c53c0ba950280c63d2d6998471101d1958e391a7f09492303906f91efb4b88,1,1,Reservation-Desk.com.xml
-1fa6eb86f60348d8030e0e38d7dda49565e349900dab0bf903d26c35807773c0,1,0,Responsys.xml
-a67a18b5bfaa7dba51643416054612adaee639d425a8edf44b58eda19a4427f9,0,1,Retailhosting.fi.xml
-672a32774503073c3a3f1285df5bd70708a580f4d2c28a0251c0d710f23664ce,1,1,Retail-Link.gr.xml
-f3ae0d8caa7ef6fc7eedd81112ae2aced0abb9849739b0f32ad9cfea8b90a8d3,1,1,Revision3.xml
-00acf51b8e95fb8568e1bd246a9339f38f1f950d5b043f1fa28e14ed065ae5a6,1,1,Rfecom.com.xml
-6da80a723a1d1077b1e7a27e1b7cf81d6dc7bd9da2161e9d63fe0c896ae0acb4,1,0,Rfihub.com.xml
-b91a1ce21dbc933f96a58068120bdda50bd0a150db11f1d8be42f6ea85ec0812,1,1,RF_Parts.com.xml
-21643040fe18563efb75dae1348aab27c6d7bcafd9d86669b454959072350177,1,1,RH_Cloud.com.xml
-458526dd2d66909f6257f8880513e449f963626bf7a8ac59850c5f5661194aad,1,1,Rhizome.xml
-ac063b2055bee50d03408a58042831dbed04f36cfe06e464a9ab053b262db8a2,1,1,RHUL.ac.uk.xml
-25155b462d893b369645ad541a0c3da4ac5b6c4052fc36002b54919fd1607808,1,0,RIA.ua.xml
-9e9125cf9d8f5ff4f94224047b66493c65feed4cca9d091b2b419e671e66baaf,0,1,Richard_Dawkins_Foundation-problematic.xml
-715f8d339dd77745daf37065dce3cb3d430573d7b6f1bcbc30b96675fc6ca9b2,1,1,RightScale.com.xml
-ee3295274e717ecaaf0d99b9b99610049b00df35e27bbd1d91b219c65a5be2e9,0,1,Riksgalden.se.xml
-ec0851667677ff8540dd4ea8454573e8d97df70843756980d2f1d6db93586f8b,0,1,RingtoneMatcher.com.xml
-bf59bcd24750fce1e1b920a8626d7ff5fb298dcb0a958e7397f9068f35214f6b,0,1,RISCOS.com.xml
-40c3057198595bd588d189d5177158b4d586158746d3bc7e1e215fc7ebd553af,0,1,RISI.xml
-6e88581ddeba07d75b4981e54492a29299b1f8156fd7ba4e99081b05d53288ff,1,1,River_Island.xml
-cb8b94399027893807adc9cefd84a64463afce56865fbe8a7cc757ceff822488,1,0,rns.online.xml
-1c4ecd5ee6961bc004080667e3b8d84872a002463135edc292ff5bd8faf7d6dd,1,1,RNW.nl.xml
-133294ce743bd36c7b3904c485a88dd7007ceff186ea8b1ade553710a39c0fe4,1,1,Robin_Rabard.xml
-482450f4055a5f8619a8ef1691e4b5ec5b92512f33c7b5e8afd8a616d685df54,1,0,Roblox.xml
-1978095d76ebb339233bac9451b1aca7f3255aaa0ec1eda3a8ea9daf0a80e0fc,1,1,Rock_Creek_Outfitters.xml
-a3f1aab489ec09b4b991b1a42dfd46871d9372f1a529bef1103a6c8717d1673a,0,1,RockstarGames.xml
-130f616ac2efbb8cba01914448ce223537e604cf673fc37e1d2a09cf1d8d7241,1,1,Roe.ch.xml
-393e61fb89e40c646ec71da37210de51852eb2752a1ec8209e70fb6a91b0b2a5,0,1,Roeck-us.net.xml
-435a81f1ab7f49f5a49a16bfab4d5b1f43c4ec9e817e01c308bf5e25633e8cd2,1,1,Roem.ru.xml
-e5deac478ea7e83ca7a4c7b845dd564c9251dd746cd7971279cc1a7f8b3dfe3a,1,1,ROI.ru.xml
-4f5311686f84bb8b3e0a5a9d3ba754641d54e55e83b23f80d371e7da702271d4,1,1,Roku.com.xml
-15fd22478b3ddd570748276ccce4c5a9e76a61ce6d87144c32ac0698d74fa016,1,1,Rolling_Stone.com.xml
-d1b515fa4493b56aa98bc7fda6e2bfcff690ed8d16d9093a80f2be053fd8f860,1,1,Rolling_Stone_Subscriptions.com.xml
-d301808d796f362d956ded340a0b7ad0f0aa188f4d80a7c9f2fa6f86ab4a6644,1,1,Roloil.xml
-5c826733e1a5cf68d3ba88e93c9f33495e92703368a613e87bc714fdeb5de955,1,1,RootBSD.net.xml
-c87744af4d5def5fef8ab80355bb8d7c4cc8133ec9f7aa2a624772c3a73997cc,0,1,Roster-Teeth.xml
-ccbabba764819bd13ef73fc6ffdffdbce63afa730066863a098b3c355bdbf548,1,0,Rother.gov.uk.xml
-f5e35863be73c99b72d562cc0e45705722fc3c6b18a8e3ec0b67e9c16a4ea941,0,1,Roundhouse.xml
-a6f07b425c4a7c8ba2f45dfeaf4255fa8f2265a53a53696445dbba9c6752d8a0,1,1,Royal_Mail_Group.xml
-13e779dd2e174bd59c5618b852074ec9b052d94eb96acd1f767ff2bad95c8b26,1,1,Royal_Mail.xml
-c55d356dc2d403ce15812dd99f885b445f03cad42d0b83778c0dfe75f254495e,0,1,Royal-Society-of-Chemistry-mismatches.xml
-d3ce65bab0d7793ce9fc93156bd88def3be554f17c7a782c9d7b037648c6dd37,1,1,Royal-Society-of-Chemistry.xml
-7c2d3622febefeb76fff99f0bb065042a9900bc2470c7b3353f0869e624914b4,1,1,RRTS.com.xml
-bc80489023f922c3e5bb0a352200e46301242afd3c3c9366f1fb87e218e28fb8,1,1,RSA.xml
-38e182d9a20d3e1d7e7f4e8229a209b0d4c73c76a11d8dc8afc53ce2584a73d5,1,1,RSM_secure.com.xml
-cae95a19f94841750a3ed9dc99916ec18692ec4ee42322135c74775a25f30c6e,0,1,RSSing.com.xml
-f2167cc23e9d326313100d016ebb168ceed861e8a6b07f8a4b86ae3ad66961b7,1,1,RSVP.xml
-56f318ca6b8f5c51699fba8b627ba828470db3e6b712d3b0aa9d4d1cd284b31d,1,1,Rsync.net.xml
-1f87be8d9de10ec8ee2b9e7fcd42f90979adce40fe8997a80f34313423cf3989,1,1,Rsys.net.xml
-2101e5c6efed4ff0ba17ad362d92bc6063140b16c5824a7c947a44378093fea1,1,0,RTEMS.xml
-3b265196f1568487f91bc203fcea005f88de381527e88a4fcc0d73e927c16d33,0,1,RTK.xml
-394c7ab363fe3bf75f17a3c9c601b05ac92d9ea15479149b6a00b0bbf3a43795,1,0,RTP.vc.xml
-eae3fbc7bf04ad2098b7d4f58372692b54f160c5903a53404535707844706b02,0,1,ruag.xml
-64e4602b0f4e073c32a0e831ca509066a33948d7ff879a84e640b88b86b829ef,1,1,RUDI.net.xml
-2321ecc3aded3835fcba2f4229ea020963e1b4aa5ad813e1219d670cb923e69d,0,1,Rue_La_La.com.xml
-135a7460acbb6f1402ff7a60ef7c1602e91a2ba838d16daeef62b558845c8230,0,1,RU-Golos.xml
-baa1f252920fe202d06adf87a756621b3c98bfc56cad2bfb6ce10c7af796a9a8,1,1,RugStudio.xml
-e071d5e6d188b0477ac02337403602d68e6b548c5f0173c6a1687748169e1cca,1,0,ruptureit.com.xml
-268d863dd6ffa69f7bb31169fdd2c1e5f30b100c2272b8b572ce5e32392a8449,1,1,Russia.ru.xml
-148588675e66210914e28a86d10c5f27b71a78517d06a70c423cbdab87bcd083,1,1,Rutgers_University.xml
-8d13b2ab9a579065e2dcb65201ac8e2985f1c7733f45d612b80a0401e553d4a9,1,1,Ryanair.com.xml
-65bf378e57ce4f358c039824abb7a7fa26b1022a74ff9eafb7567274d4334c68,1,0,Sabnzbd.xml
-eb4b298e2328c9d3af283306b797b4e07e194584efce78f97c84b249f9339c8f,0,1,Sacred_Crystal_Singing_Bowls.net.xml
-d801e51a50153a2119eedcdced489f520458e20b870d160379489582320da934,0,1,Sac.se.xml
-10f98eee68097e6dc070f54588fb589bf4297dbb844e29f9b538977ef278887c,1,1,Saga-Group.xml
-bc98665967f7c0e25a2565abe90d863d8c33275c5d8f4068f7280d8415930a65,1,1,Sage.xml
-8ea654177b45b0907f63613a7f7a7ff5beea606fb948cbf52b0c513195bb051e,0,1,SAIC.com.xml
-f63a6ea74e32500fa23e7e6c33d5b88cf6e5055f226cf73fae995bb6ca13f268,1,1,SailfishOS.org.xml
-3e283d9ffab44db4b1e454079b16b0106309794cedef15c988884f436e6e3bd3,1,1,Sailthru-Horizon.xml
-48ab8cda95a96123caac4761f3330eae482905dcf00bf964117fccc6f76a9389,1,0,saintcon.org.xml
-9753141c4b315466fcf1676d6596c79059901e009633b0ed59b2241cc6a3cba4,1,1,SaleCycle.xml
-a67b67cba419c9c60f5af4693ade3ab0f4dcb71c0447e14eeccf5d9f8ccce305,1,1,Salesforce.com.xml
-70625d04b2bfb69c56b1dc93d19eed236e18e861c8d0134b164f8a348ade9116,1,1,Salesforce_Live_Agent.com.xml
-223be5286839874afef4638f6b87c51f4cb2d2ecc551bf4e994ba0a022b78fd1,1,1,Salsa-Labs.xml
-f92e7fb57b22d52399e4c0d35b3dbe0c92199f74c3dd8e162c1471c1e129cfdd,1,0,saltpack.org.xml
-75108b7344354283a053208b4b002cfb64ca61e7a0fa3ac8932dae09d438e700,1,1,SAMBA.xml
-4fe8a655c2e05111677d094899b626987d18679aad18ffd1e17ea5447c3818fe,1,1,Sam_Harris.org.xml
-01dba19f9f9788ae453c69f33547f44f9ce790306025dca03d3a164d40a62dd6,1,0,Sam_Whited.com.xml
-483717975adf1fd493dfac11a3e80e12decb594dfb2f9eae941c55ba1264baaf,1,1,Sanalika.xml
-14b6b1c17986ddec66b196acfb515220845321dc72e60fac397b930ceb964917,1,1,San_Francisco_Marathon.xml
-d7f1369b6839df22fbb3576e521a3ec88864a035b188488731f4f1a1c5607a0a,1,1,Sankaty_Advisors.xml
-68289a8f6aa333ed77cd20e6c71c249aae478b04581bd9b94d07572257287bdb,0,1,Santa_Clara_University-problematic.xml
-d6d63b4167f0c17262f7eae3dd84693b68a3caa00feb09bdcd547af74bce75da,1,1,Santa_Clara_University.xml
-1daafae19033dae9cba707a24a15543422ab28ca5271ab1ca7ac17fb9874a6f6,1,0,Santander_BillPayment.co.uk.xml
-e528e24518c3a4fdd013118b9388faf754c8ff65ddb0ff972871d046065998b2,1,1,Sapato.xml
-10dddb4466cc962eaca360f047e7c9b153d4ceaec7caa21507f9327a4d6e94c2,1,1,Sape.xml
-1d4010dfa8dd5170542627798099f6ec4cb72d00bcf97f44fbeaeab4ebae1fde,1,1,Sarenza.xml
-b52b0ddba9698cb1e97744d5ef0dfb71ea5119b8986d1ae92fb430afbc3d3b42,0,1,Saurik.xml
-e52ec5b1932e746c036fe7a72538a8954be45621d516444cf4958671d1b7d805,0,1,Save_the_Children.org.uk-falsemixed.xml
-5a0c30080e411f8991edd2676b22684c6da570733fa7d81940b6c13a0b41b2ba,1,1,Save_the_Children.org.uk.xml
-5bfb16c2cce8680768c1e2d4499f24736825e0ba573cfba364b327748d133744,0,1,SB-Innovation.de.xml
-7387ea4c591d310a85c46831a13948c324f3026eb223185f34593b68359f03f0,1,1,Scanadu.com.xml
-da820e29c3c3739b63680876d982384c0e0bfaf46951c319b2e26806cb55be3b,1,1,Scania.xml
-26c41f1beb070887277febb9c002eec5f1824184016b8096316aa592b2d2cae2,0,1,SC.edu.xml
-38fcd3c77ef8529bfa24f39ca1a3031094574f86ec150997c16494f79bec85b2,0,1,Sceper.xml
-b7953290b4b5d45f612798a07c12362d172fbe10c7dcdd5c76318faabe9f81d9,1,1,Sched.org.xml
-8d31291b938ff81cd0e8f7ca0e8dd487ae4c224fee199cb922802fba33880d67,1,1,Schetu.net.xml
-aeb87d5cbf77f76e1e013b3f5a7ebd0809f26fa074080f5eac5a66127a7d13e0,1,1,Schibsted.xml
-979e440e028b0f6784865012f67f4fa6d947abbd1d1501e74d30a1fdc1ec8c69,1,1,Schlossberg_Store.xml
-26869a9d99c74c39e56b00301496099ec561255b0b69c49662e33fbf0b348b0a,1,1,Schneider-Electric.com.xml
-d4b3e1cd81bbf83fb126391a949fc64451f079d3c6c71683fac08b3972b86311,0,1,Schneider-Kreuznach-mismatches.xml
-eec14fa49b2eb3ca3cba02c29f921c816f1c59ec37ad0fcf64a2a03c1a79c219,0,1,SchoolLoop.xml
-b820ef0ca9ed892e54ecba43ca9744e3eaa8828238b13d527438029e749de50a,0,1,Schulte.org.xml
-25933077b070dbd4c7fda6d88421b3982c3457ea5b5f008aba6043900f07ca1b,0,1,Schwab_Plan.com.xml
-1003ef16bddb7ae96152b0fcb50ec0dd943917ec265fc5191f12b0c3c2fc37dc,1,1,Scoop.it.xml
-648bca2cf9de8921e93ab3cdc73e3b84fbd962af85e0c9f0547cf790dc625759,0,1,Scottlinux.com.xml
-69e1437f87a72fb32ac0583f1109659ab8ffd8795fb2d2e5880523d4c25930f0,0,1,Screen_International.xml
-78be6deb276806cd5ebb6953953297c789a83e254fef202137f493dc8bb93ae1,0,1,Screen-It.xml
-d06c01b8882b8f674d8cc10791d7b535ccf61c67091e253b3df40dcb03c872fa,1,1,Scribd.com.xml
-bd4374a901260cd4a63f44d11b6f1048ad380d5925d92b90a7eaaa83337a22dd,1,1,Scribit.xml
-793c02ae066b179d7011e2dce5579d2b6a5269ab7937925a7c94b92090fad50c,1,1,Scribol.xml
-908dead9cb9b4e421cf9a97d75b732af29814249060e0f1749c52742b732029d,0,1,Scripting-News.xml
-a1db6659789650d6aaea4817d02852a738dc46925e02c225db6306765ddd257d,1,1,ScriptSource.xml
-fb0037642b36cfc3cf0a9262ad622d08b497f5837f2bb2d4514eb4241214e62e,0,1,Scsstatic.ch.xml
-bfe859693482c899676018d969664e82a033df4eb41f6ac81534dbae7d5096cc,1,1,Scubbly.xml
-f9d6bcf44dbcc10b354910f43ace3fb992ad105f9743b1db2855084e40ffaf1a,1,1,Sculpteo.com.xml
-32e7fe0659f10a07ddd9e79c4451377d2794f8c90d679e5e12771ce7f39a24f1,0,1,Sdlcdn.com.xml
-fd71c353d28fceb8b115719e83bc37fc7f717fa194e03d48d2cabacc00fdcd29,1,1,SDSU.edu.xml
-2006782a2d8e1e624b4bb2de5dd7b71127a36079937f0225de4ca18017d3c6f6,0,1,Sealed_Abstract.com.xml
-a72eadb29ac48aacf0a5061a3796f94df5f1b7f5a2663a192baccdde97ef757e,1,1,Searchmarketing.com.xml
-54ddc0c71bfceb9e4d8b41198da88bf0cdd4dbf92bfe8635c398204f8c188847,1,1,Sears.com.xml
-b47e3b0004ed2b922443aa48b3dca1012843ed67610e4f15f881dc0b5d8494a3,1,0,SeaShepherd.org.xml
-6835368660d2c2932d163024a8da85984bcaf646184f5eacd658c0fb52a62c5c,1,1,Seattle_Technical_Books.com.xml
-0e8e772f5af7e798a343bc7ffc07367d78688f53fc2b361b9b6f574c3f9bf55f,0,1,Secret-Maryo-Chronicles.xml
-31907b29c65f95dd9b5c236415e2871f016ad5406d1b0ccac0eaaa02c03d0793,1,1,Secunet.xml
-cc8342bcc4c3c676b7bd0cc012b441d3d9c4a7fabfab9b25a8d8146963b4a738,1,1,Secunia.xml
-33814228cd58cf773562cb2b4cca1385b282847778045dec33b0469b1f1ef33b,1,0,Secure-donor.com.xml
-f7fcc791da39508c7c2f62ccd71aac9c7e345b35bb825469e3bf31fc51fb1fcb,0,1,Secure_in_the_Circle.xml
-fb80a2a8a1de294899f5a0615851aa20d733698590215f4fa5306b9786ecebe9,1,1,Secure-payment-processing.com.xml
-9525a6188a7e9f5b3c1c275dd102918e5bf2e0be9561ce805c76515560e3686b,1,1,Securepicssl.com.xml
-e90bb893efdea1ec9c5bb9495ee3f16b99b88f068d8ebbe8577bb184967d07aa,1,1,Secure-secure.co.uk.xml
-5168a7a30822faffc7e43d14f7f2914acefdd418f2e49375600c5efe60117cb9,1,1,Secure-zone.net.xml
-8d5924a73c465922a620bb20ca5434c669b38cdb4d64fbbceaa5d6d5a4ba81eb,0,1,Security-Database.com.xml
-6b20be37aeafe97b9c0449d7815f06e73d80c685be3fad2d6d6a97ef625f3727,1,0,Secusmart.xml
-28bdc6b9c0d2041fc5fca0b87c6c88e524efc63ecf62bb07c9433ee7fca42194,1,1,See-Group.xml
-016140d2cd3e7f46335c1e8c10c52d963c71a2c4cfcf2c5de0773d0304ee8b84,1,1,Seguros_Universales.xml
-3499fe01409a66db98d6762ccf5048da5b2f2b00f05309cba4dd609665103886,1,1,Selfhost.de.xml
-ac1ed464f262ef1a7c52301ab0d83ee2ca7d7679c0b13bc74d22998f76370845,1,1,SemiAccurate.xml
-1b9f7a18950ecc433514f5008b5331d4f139ce0db817e521c01640ec80e8f997,0,1,SendPepper.com.xml
-58cef17a92f366b7e1cde56909c647d27ff2ee35518214d71701a8d109673e17,0,1,Seonet-Multimedia.xml
-d871287827ed10bf530370fb95f6e2cc1c4a83f33207d1c7cf0c5a7b6a1e32d0,0,1,Sequanux.org.xml
-36ba74f8a65f050fcebd3bbbbbbc98e68a75a411b050d1e81edcf201edf4ccb6,1,1,Serato.com.xml
-cd05db84988daea1c881dee30b0b7740466add73e1bf1be3dd44496cdb2a48fe,1,0,Serienjunkies.de.xml
-80c5c466f3a3270fdd5ba6db7c396b72da465108aecb6df2287271ced2e64e96,1,1,Server314.com.xml
-812db0b2551534929fc4781c2c823d559047c287e7f840ac2e71bad9b7abe1fe,1,1,ServerCrate.com.xml
-e6ef39254b78f986f8a493f1193e680946b392769ca04089330fbdbc01eab49d,1,1,ServerExpress.co.il.xml
-a2ba3422fb880b78a61c81716398b2797cabd5f6f65bc83d4450238081bc6aa0,1,1,Server_Express.xml
-61ec565235a014eb7654f46b6ecfb587d8860b2cd2887b24c493836f6247484d,1,1,ServiceTick.com.xml
-fc3deb7ca3952c3742f2df096a9fae08831c7795b64d08f4f8e529983ad12581,1,0,SEScoops.xml
-26f40a260a0fba7f9b4581f77eae1a63a5bca7792d7a5e578ebe2ae9a64cdbf0,0,1,SEstatic.fi.xml
-d81422829b52421b14bfca59b79fb365db842a0b397034e091479e98b3b20992,1,1,Sferra.xml
-918a1e0571e6f44defc2bf02af57fbf8810a3d199b9c410689c99fad66b3f10b,1,1,SFM-Group.xml
-90e39924d85b911e9ab7c92ec676692a6f3cc4253ed1c5cd48ac62b788bd4d08,0,1,SF.se.xml
-b1ddc8eafc9185d502e8c25fa3239d0ece0bf86bf9dcf471af0dd11ffb792f4a,1,1,SGNO.org.xml
-4879203052c968a23bf9bd2d905629b0e4f1673d8261980d38548edfe94f8e99,0,1,Sharedcount.com-API.xml
-c63ba028a20f75448202f03fb3e41640315b2ed13e1688c1d3de758805546912,1,1,sharetobuy.com.xml
-52619008e0a398517bd3ed4b130df71beda4b92d61fc2261ebbcb4a4d9489a83,1,0,Shaw.ca.xml
-7da57b9006c6ffa8d0b351327d1fe45ebf7c956d087d4428afe41f92f6525389,1,1,Sheet-Music-Plus.xml
-0d2c3ddd439373407efc3cbc24b6fd7ec6da6563499498590e742b02d87a3fbf,1,1,SheVibe.com.xml
-e09cb7f8a0963b23e365c3866d3955ff243c34f81b4333e67b5b574833b4a0c7,1,1,Shipto.com.xml
-0ebfb123ecc0a797ffba53b2ed5e7a7a9def6cefd840ab6e9cadf49d77199d6c,1,1,SHld.net.xml
-29da94b661c0ec149cc098fc4f9c75c98bff787cf4b996d572c6321f7e2114d8,1,1,Shmoop.com.xml
-70c2e8ce0b946c9232e77e2bb98a3d51f882260294be0a2f2354c687fd6f7dd2,1,1,Shock_Media.nl.xml
-be10ed26c4dd7232d2380a060e9c232e43fb567bf291f524c4e581b4925da5f3,1,1,ShopCo.com.xml
-faf5c3a2ef00844a11a4fcae50f0b1c010bef569cd59f6458c17223b0306297f,1,1,Shopinfo.net.xml
-d4503d3f06952327bd9c9552907ef2313bc6d29c108b6253a7a08bf1fef1b3ab,1,1,ShopLocal.xml
-d651e9791352d0487ad06bac798a6665a3148331d2404a6dc37366e44e92af87,1,1,ShopMania.xml
-be7b8010946b7507599c364d23a08acc86e603da4edebb7170bc0f355e719c90,1,1,Shopping.com.xml
-7f43dba8179391649e4b3e8121372e07d1035d29e2fa636f238b0c3470cda162,0,1,Shoppingshadow.com.xml
-d872ed802d9b549e860aab8bb78c8b54f3d1b801090cb77fcdec3e3100f092ae,1,1,Shoptiques.com.xml
-0dc10520e0aa53e2960a1efa33c61abd0e7dec6d72e7bcabefc5c0ff7376e807,1,1,Shopware.de.xml
-f30aca861916483333aee8f04079946c2d04e333081088438b4079d39736e621,1,1,ShopWiki.xml
-278c389123acf69565e494a9910ec501d4c6f9ec22efce8aae9b8b5972359de3,1,1,Shop_Your_Way.com.xml
-5e77585db1f9cc625d221191bebd1a5529553804a196f0ce02cb4c0491ecf57b,1,1,Shorty_Awards.com.xml
-6392a77acaf6437e67b6a383c750a729226e61fd0d2ac2713ba968ab0cf0524d,0,1,Showcase.ca-problematic.xml
-7d59c151c428de88652c9856b90d200a107f942999539370bdd1b9f77bcfbf37,1,1,Showing_Cloud.com.xml
-bff8c34d08e21b8eac44b98294a00fe95b54fa4a06104172f6c4931ec7e13627,1,1,ShowMeCon.com.xml
-b9746912eda090240cae1148d66f3a8fbe40ccb0feb0831a868e5b20a7481378,1,0,Shpock.xml
-17d8e1cd7f7e79152b5482c90e28f14bb732d4e3b6e09240171fb7fa0c47c5cd,0,1,SH.se.xml
-e288931dca09be06dde50e2e7e88361e0b3f3a3fd70882d39142d93104d1dd4e,1,1,Shurgard.xml
-9c9167d6a433c5c4c16b5b968040168b122215635d360c94bc5ccce867d8638c,1,1,Shutterfly.xml
-893a6bf3dcbf71cf5e4f1ae4288f7303f13681b9812f5055a788e7acb879f173,1,1,Shutterstock.xml
-c2bdeaa9210ade411015be525d562ea16bedd70da5897af9d239278aa0ca8ae7,0,1,Sickbits.net.xml
-acafdedb2df04d3278f3058d9be43aec8127024a12e89b7cc1d03f54b0b19f95,0,1,SICS.se.xml
-4b189e0297eca742379d06edfd7c888b4dbe2e61ab4382ee551273f56789fd1d,0,1,Sidearm_Sports-problematic.xml
-669f2a6082ea886ed609297ae811da92a2644d3005d22301b01c388515fe9c32,1,1,SideReel.xml
-991b526f8347cc2655f4b38ab4579c1ceab9708768f98fb8bfcd68361001b7c1,0,1,Sieciovo.pl.xml
-a9836e0d2c8ff7572aa8d363270cad70924ac622587ce84f202943f3d647a4e3,0,1,SIFF.xml
-644bb5b151de6fc4b15572be1988b7a7e01356e4969423d79c44c4e6737d78fe,1,1,SigFig.xml
-986bff28cf20c7a981f4f7cbccbd178b9cf3500d1b86dfd46726f50ac739243c,0,1,Siggraph.org.xml
-fe356405a24e79d3823307bc7518ceca3a65b4b0a9f94f00e4fc0a2d1e040e63,1,1,Signals.xml
-c6231d1db4ffe805ac881cf622bc409747a3a6be51cf6effdc071baf5b6324aa,0,1,Silicon-Labs.xml
-d2125a37bed62edb1f8834b4f89c3c735007b7b870595115c0a44a2c2bfccdbf,0,1,SIL_International-problematic.xml
-11386ae96a8d6499f2c55fa8307ef60e8b9b1e77976aca74f1f746de55d9b083,1,1,SIL-International.xml
-8b970f7899654c140d3614f8986b53ad4ccaa767df5fbef89ff59a31e07429ab,1,1,Silkroad_WS.xml
-e6fe519fb7cfb9e096c6fd81d6b248a401d3bc05e87054a63e10848e60d71ca2,1,1,Silobreaker.xml
-b3a7c4808e8e908fdc88b83b785434221414dd3d77ed4b0983647f3684647803,0,1,Silverflint.xml
-a49bac6e453d1a6b8658c5d09eb247a7201c2faf23ea278ff090f32c54f237ae,1,1,Sim_City.com.xml
-d7dbe998551244001c5fa297a7ce58839135045a3ca8288f7eb21e696cfa296c,1,1,SimFlight.xml
-9c6b97f93cdda86aa2d39ebd6fe5db76c601aba1050ed094c4c8a940e753f3c7,0,1,Simmtester.com.xml
-f0bb3a7abc4a6cd556969d6a151e19d22c3c36cbd391ae059e2ac162fcbae68e,1,1,Simosnap.com.xml
-38efd0e81710a352219d2237161c5d0ed645f65fe77fc3cfea190557233de483,1,0,Simplekb.com.xml
-2adaaaa6f35e60652acc4c341f34ff8e7c9e1875d2a8114dba48a64932acf34c,1,1,SimpleReach.com.xml
-68aa39cfd4b062c20ea2e1bfba9fd71f4fffc47e1ae934649137626e113e2014,1,1,Simply-Stamps.xml
-942113027bde669125efea9cf0af192443b885277a43ee9f90e9e091d1f92031,0,1,Sim-technik.de.xml
-1be06f2f09df6998fcb50fe266e0b7d879c54044a7a0dcebdb21aed05d1a251d,1,1,Simyo.xml
-afab1e82bc1c116a61d6c7f40b47b4cc1043ebc2ce969d1a3ea70cb673da5597,1,1,Sinefa.com.xml
-771bad8f3383d191bb74b2a525477e78420b8b19b17850a3a51b1a24973302ef,1,1,Singlefeed.xml
-4831d72c4a1921ba81961a3a46e7464bd14d1c94346549abd74d897cbb0a37a8,1,1,Singularity_Hub.xml
-e98874923aaf25fe0de0e60028227e91eeab0edd00d0aedd5b83327c2d50c31f,1,1,Sinica.edu.tw.xml
-b05ab2299cf4a3552b415ad2bc8898d5e257d28a0e9e38a13402447f5de540ac,0,1,Sinoptik.ua.xml
-2f477e70c52c5626a19d5e6fe1edaf4f4708a9c4068bac811cb6b68c34ad4e21,1,1,Sirportly.xml
-ec5ec3032ad870e33ed2aee54e56fc4ddf43e6c2d0842f5b29530fd378212056,0,1,SI.se.xml
-18fca85374104c3c57f5c8d3a82fe19eb00812b410016d9b5c73a8ee8c0e9063,1,1,Site5.xml
-438ffbfcffbe33803fe8586c0df414fda6a95e54b3b0a5c7a11f3c4d7881b426,1,1,Site_Blindado.xml
-239511aea016e2100b8b88f9afc63f52439c61aac67295ce2055c4945505a27e,1,1,Sitefinity.com.xml
-49cb9933bfe48be26b4838aabacb7026024ee2fa0ed28f3484ed76a96622ce99,1,1,Sitemason.xml
-e7d1ee6d42c793f1ffbf240274c7d7b096831967b41b575bce6593757c287b0c,1,1,Sitemeter.xml
-1f1e6c361c6ad504b740df7437665827bfa88e9464b4dc1ab0ec9a2acd8d376f,1,1,Siteor.xml
-0d95e0a127a7b1b2b0d12711535af57a7dfda8becd7ea102cfd4c91ed58aa66f,1,1,SitePen.com.xml
-6c947fcbc29609bdf91af629852af3dae2317fd23aa7941c65f4ad36b985e3de,1,1,SJ.se.xml
-0a48115cb03ef57a2671772bb06ca76cce108021771e60f0a43e2fbb22a1dc3e,0,1,Skandia.se.xml
-947bbb082ae9c5e81c647914275acedd8ed8fc609716d4ee44119e53e160160d,1,1,SkateMall.xml
-d972951be8af16d4e250056f05a7f4a6e7f123ed0a06b56e879234a2be8a991a,0,1,Skatteministeriet.xml
-befca524a909c8e7e9dcd2f75207590d63474b0865489ceaedb792a4419bc18a,0,1,Skch.me.xml
-20765e85d2fd18909d94526931d694b90b3bc05c6fbc5f5aed8f60ba92192366,0,1,Skillclub.com.xml
-4bb6314e9db02ff92aea2ef82727681c4bb079a4b9c29a8eff82b93e15866106,1,1,Skitch.xml
-b18695709bb1eee1cd6c29b924c9367351e4033f9f70b829b58820f7971d762a,1,1,SKNVibes.xml
-176505bc694962eb998f1de1ba452dbc98547266a6cfdd3e8d32c7e43bd08c55,1,1,Skreened.com.xml
-33508243de3dc70539bd595467320f01abf4dd5aa4261ed323fac06ae7c07ae5,1,1,Skroutz.gr.xml
-25157ef56d915eaaefa9f17ad1029535a8613503384273b5d65958dc73d126cb,1,1,Skydsl.eu.xml
-b6e69a65826e62e9a1cbaa20cd6ffb07fbadb650c80b03b1ef0ae768e2f628b7,0,1,Sky_News.Au.xml
-6fdaef17af1ea6490386e9a69d35056586c989cc0efb6ead360199c827556678,0,1,Slac.com.xml
-1613036e5a0687ff4af8fb97b3636dc47fe9cce73cc1e4fc8ac1de9d72c5e182,0,1,Sleviste.cz.xml
-7203257ff65c870f2699be86502bd2fa626bb190219dea6f9b2341f18b86e133,1,1,Slickdeals.xml
-f09f4e1fa797d89d9fded19d8860ca5657f9db89f488eb37b22aa65d09108f05,0,1,SlipFire.xml
-cd71aea85aa03c0248d8d701f65addf30f688b6b6db34571b13a7a02d50b022b,0,1,SliTaz.org.xml
-1ff601d9c6793cfd0173c3c5d3c070cf48ad8e661ea28e18658c35214f8a0bc5,1,1,Sloan_Consortium.xml
-7694aae9b96d3499bd5a004bcdb36287cf90773cf7ffd2f9a653576c28ab3417,1,1,SLOOH.xml
-8b5991e95bfde9024ae6045f915d2b5d081583abc5876d51c11efe8184570090,1,1,SlovenskaSporitelna.xml
-c39e9beea53bf1895ee161b25b0823f6b832200e1102f9064a0678835d6ff805,1,0,smart-DSL.xml
-410889ed15ac9076ccc7d2c95a80e3c71b12fb441d3c2909b41ca6ca149ca9d3,0,1,Smartling-problematic.xml
-b31dd4575b41f628862708e9c5a768247f6feab15645af1269bda5fc2e5817b9,1,1,Smartling.xml
-7f663ac26ff264199574abc4829da5786a5e97d828ebe1bab77b818ff6a00199,1,1,Smartphone_Experts.xml
-4be3f8e4caf2704e57b939bd74385ddda2f0fb979fb5af89634bdd72509beb4d,1,1,SmartRecruiters.com.xml
-e078c3024d3b5529f4c294f0e39ad9d4ba97cfb5229c0101d6107900d6ffc349,0,1,Smdg.ca.xml
-569936ce41440e853be11ecde95efbdbf9c9f7dbaf90181ee859f74970c5c322,1,1,SMF_for_Free.xml
-07737e4c4fe88850df4babad790e1d82ee39a0d3055511782be89bb54c85ebd7,0,1,Smith_Monitoring.com.xml
-0bcf0fbf67721c2842b061aa1fe6c94338394637e726ba0268acd5e7690b6a70,0,1,Smjg.xml
-7c3c25c9b51eefd062d159e28cfe427e98af331ab05fdc4d46ffb1169e45375d,1,1,Smowtion.xml
-a68e51f185e02cab3123b408b3ad7b4849ff4a2e0db98c8c0194d352c725c55b,0,1,SnackTools.com.xml
-368d7e67d2755bd816d3d9a15930fed3a5445200577effa10f2a1e12dd9e5237,1,1,Snagajob.xml
-f427d8fbc6b8bf77dc8605104bdf8e27ee06eede543ced548f23f22aae1441de,1,1,Snapdeal.com.xml
-b34278b513f81f664edd8653f1bb73fb84209a9625949fcf84364b1dfc0ae9f9,1,1,Snatchly.xml
-24b42f8ce479698fbd81d426abbea3be8b5913ccd9ff53b61660f0c49bb66c7e,1,1,SNCB.xml
-3b7f69aaa1c762b112ba9fd30146ba841bd92a50dc25a3849a17a3bb5c9ad048,0,1,Snow_Magazine.xml
-444c21385a86d34daa2b74872456cfa5914e7a7f3833bd5ce212611f068c117e,1,0,so36.net.xml
-7bfa8ba2d7daded6d4e0055295e3931b0d226f507238fb1ace2be11611936ca0,1,1,SoCal_Linux_Expo.org.xml
-5bf36d6e7610b62e0d338fb24373da34fb83d0882ca9eb1aca333ed563a3c82a,0,1,SoccerWave_UK.com.xml
-6247ade57de33a90ef47bd3f3700f4579946fd7ec77f63cd5191d8d2b72e4431,1,1,Socialbakers.xml
-591ee3bfe6b2d0c5c3cf6363267329c82a8838ce5cae5f470214191b865d3431,0,1,Society-for-Technical-Communication.xml
-1704dd273006545bd23e5c0a4a1f7f0cdd4b8ac4aae59268afd81190441f74a3,0,1,Society-of-Light-and-Lighting.xml
-dbfbc5e95c59ca8f5a6817ed26888960e39498fb14738f2ac049c176a530c2d3,0,1,SockShare.com-problematic.xml
-49210ac2c7f23d1ec5bdff953d0b1d716568c2c5b26f78b9385dfa830f0cd91f,0,1,SoftLayer-mismatches.xml
-55a4d4cf5f34e4628304df22b8bb098a52f3828e43b2ad6efed87c95d76bfa01,0,1,Software-in-the-Public-Interest.xml
-24f2f18c8774e7336eb85a921d919a8fb4cfa53eb88f19aeecaadac46b8be159,0,1,SoFurry.xml
-ad360d4d5b2044dcbb786ca8fa222a8afa781a62f25db20a5f15fe4fa27a60b0,1,1,Solarbotics.com.xml
-bd537b9721c863fed02d90b71128900946f448013e0d1810e1c57d495f466f55,1,1,SolarCity.xml
-4558772a9ec991bbc170faa5c1653494329c3bbc55539c8c467049646b3b5733,1,1,Solid_Cactus.xml
-81582b8a8f659af0e041168acd9fda4d96c18f33acf41defb4bc714f80fd94e3,1,0,Sonatype.com.xml
-ea23e5837831b8e22bf6fd56db158686abcc8d13df4a37f020b30966205a9048,0,1,SongColeta.com.xml
-341c81c94739a10d3f04db7a1e9772379e51888a11353fdc3cabd0d04cfeb476,1,1,Songsterr.com.xml
-b5fef9d252b9d468bb4a06cb784eb0689306edb43caf7f52fa0924fb9124a51c,1,1,Sonic.net.xml
-230faec861b0025bce390a56187b04f3f5ef65394a69cdd069cf9a12679ec3df,1,1,SonicWALL.xml
-6766c32a439f111909c94b0b5163ba1e366876e90ce629e2df21a22cd9fcf582,1,1,Sonnet_Tech.com.xml
-bf0300e1945b14a33128707161ddd15d8744caac395131caebb69d6388005502,1,1,Sonos.com.xml
-f6596e850c1c453085e611473b2611a58f4146e6b34cc4264189a66a0e373e18,1,1,SotT.net.xml
-f141656339ca12f96352ed3819bbbbb35311d5bd2e0d452076254e352d9ff7b3,0,1,Sound_on_Sight.org.xml
-619dcaab20e0e5e15a6a0431ff33a3c370287dad679d9e71056e1c3adec4068e,0,1,Soundowl.net.xml
-332bd57c7b60f5d23b775ce135ca931d9d5c37508ac7295cc655e0f90f5b0f37,1,1,Sounds-True.xml
-59cfd7776a8d4bce0bd6e2645e2c76d072a8ff62b965aa2999fea197c839f393,0,1,SoundViz.com.xml
-b92e96074327a0dcca5d00643ed1fd4a4e5cc464d810283d4c9e9295a3eb5190,1,1,SourceCoast.xml
-2f8e9d7d6aca7de5ec1b5688166de01b60e3ecafcd0bc3d73fe9dbc984df7dd1,0,1,SourceFed.xml
-49a79924cc9483c9d8b326a1493ea9604d7dd7101e58811cdde9465fd6a9ab7f,1,0,SourceForge.net.xml
-ee75312d7a227efc1996e38f741324c0223b6cd8228f18796f92a93808376065,0,1,Southwest-Research-Institute.xml
-749014fb456fade94fe8410d634d2c35faaa2ac81a812a1743cb742e7fd1ef41,1,1,Sozialdemokratische_Partei_Deutschlands.xml
-8f78212ef19628124bb5ad477f507ed626f454854b499a189e8efb0187912c4a,1,1,Space2u.xml
-e962efd4e859976b3ad130f332a2da31aabdae922174ff4cff7dee7360a0484d,0,1,Space_Launch_Report.com.xml
-4f5afd28fc7b6c403dda9c120786dcc43c37fab22b1c9c9c36edeba5b15b5704,0,1,SPajIT.xml
-018fd6c1ea9077a236d9bb1f7fc10af3b335b662de27731d5d2432ce47859d3b,0,1,S-pankki.xml
-0246b709c13f24606600678c52b51ff35c7a73d78bb08e3edfb248a76d863a27,1,1,Sparx_Trading.com-falsemixed.xml
-6b81a9de20423f8a2888e56ce73a7d92a425602713d857ce4e70d72a073ddd7a,1,1,Sparx_Trading.com.xml
-d2a6a9cd4875bfe1265795c63f0c0c9144571c1debe74ba0bf76f4a1151bcfe1,1,1,SpatialBuzz.com.xml
-27dd7d2747a44908e31a333cd79a06d9824e99c5b9cdb239f6073da104e30b41,1,1,SpeakyChat.com.xml
-28a4a3b9c096d4d94cf6e2b84461b16ad0da6411132504a02bbdbbc9289b2be4,1,1,Specialized_Products_Company.xml
-3064aa268e87aa6d1e3cb4835582cb4d4aff1ef2063e411e98be68091854ca1a,0,1,Specific-Media-mismatches.xml
-de4e0aad788b737f30398cc734dc7e93a178dffe24c0b73abe4fedd6a42e2015,1,0,SPEC.org.xml
-b6d12867f7d8012b03d30e3836cd3f71fccc19cdd0bceda42c3b8e3870481d0e,0,1,SpeedCrunch.org.xml
-7c8589237e407b7751c1d2ffa43036657cbc5cfbaf47ad26936b6a7f31c13753,0,1,Spench.net.xml
-916dc2183dbbf307a1e01713575b05b2831ece425195929b577b6221ff376ce9,0,1,Spin.de.xml
-c3e07335bd1b82f18bdbde816e5c585021d5bcbc372eded55ec982c12e85059d,0,1,SpiritAirlines.xml
-5aa4d692eb37aee5eaa407f998e26c6734bb23e3eda58e1621c549e5fa1a2251,1,1,Spoki.xml
-b440d89b9eed86cd745d0ff23333b7e12af88f7539a35833ee5b6ed2a77b0023,1,1,Sportifik.xml
-2a59ab0331fb5c8c9fcf6d5ea984db8ec59bbcfc92577aac1f79ecca8ccd9cbd,0,1,SpotXchange.com.xml
-92237fe3d6d3c3df0171c873b6b24123441cb54f5f84a5df5da39699afffe685,1,1,Sprint.com.xml
-253556ba3da235ccae4816b5cbd370cf73caaf49b9c5b2f43d99d915c2b86a91,1,0,Spriza.com.xml
-26c56acd3375b007eeddac9957b0ee0ea8e4b5e98b298cbfd7d7cf7a37e49bd6,1,1,SP_Times.com.xml
-b7a7b9f22aeb326e6b248f75737fc12c991167149fa21745a3906868ee8a1ee1,1,1,Spylog.com.xml
-1498e2530912c8e73b9cbf1c5284031b51f6e4fa7e37cbad0deb6d6eb290b3b9,1,0,Sqsp.com.xml
-3065941486049e23107d2dfa67d90123e019bf6620e1ef73ad062e93127cae62,0,1,SsbKyh.com.xml
-5b2ae8372ee680924f485171855f912baab88452cab3e87b63bc97e0c74f3477,1,1,Sslcert35.com.xml
-30c468e73931001c0f71231bbbd291991dc454a378b2bd2c371b8a5d91c61ce0,1,1,Ssldomain.com.xml
-c9ad023f61c9cd1d3706e52cc669f633d12053fa22c25c9701e36c06d5fc5cdf,1,1,SSSup.it.xml
-554f6e5135b895544437fc3b23f9f06bf5e512318b24b8d13548b8282203e55d,0,1,Stadt-Zuerich.ch.xml
-8eb71df98a37614be3236f2aec4609cb758615cff4e90ab829b3788a54250c03,1,1,St-Andrews.ac.uk.xml
-7fd7d42fe5e4995046763502a683cc64de0f0ad3a28e7cc679173f829085bb98,1,0,Staples.com.xml
-39dda4283cb40d94908fb128dd404e8fb0d4dfa2d144a24ff4d2426f42a1cb7d,1,1,Starbucks.com.xml
-8026ad04f83be259d2177775e0f798b96ab522511fe1fab28ab64a20387c5738,1,1,StarKist.xml
-4a47876ffa751efbad85a86c2d0d727c1734f56b1631423fc965d5688df0168b,1,1,StarMoney.de.xml
-381196de76f2d06ac7750a54a67955f6a9c21f42684821726b416cafbe9523e9,1,1,StarNet.com.xml
-3b5efcc0655b092166135f0d8a73a056e123f866749e1f0906706cb39a477d51,1,1,Star_Search_Casting.com.xml
-8480112d641417373b992fc7826912df693685423668683e9f2dc4d9dbc5dfa1,1,1,Starwood-Hotels-and-Resorts.xml
-384e89e4321c54fa7be3b75f19d06b7c029277463bf8cd2f8e0b3bac1cade42f,1,1,State_of_Alaska.xml
-cbb59c8fb32a2a5ea0cf3b3fd7d70b6add8a46094a11757de3c678d5e61aeb3d,1,1,State_of_Oregon.xml
-cf6c0866d343514b97918cd62089f4191898d1c7c45d993b807f5d7ce291e172,1,1,Statesman_Journal.xml
-7500f592127c32a25e139992a6e1e067e488031164d9d8ba29173471e81d26e1,1,1,Static_Site_Generators.net.xml
-5c9829129baf195a9dbfac286a509c36e0e41bb8adafa18e9162034a65c19904,1,1,StaticWars.com.xml
-345a6c93371fa2331f18898d3b61c6f8ea3b9a66af9653bedc4cdbf85d888777,1,1,Stayfriends.xml
-745937303fa58c940d29358280eb28ec941dd676d6ffaf9d27b6f9a2f353b943,1,0,StaySmartOnline.xml
-47c9f0e41ce3c056edcb0554a27d3a8a648782f976f6710cac42f10b6f7cfe8c,0,1,Steaknshake.com.xml
-3078153e01d7a43f3cee88d6213dff492f1e5a7dd0bc3ba3898aacea56fd386b,1,1,Steganos.com.xml
-8329d69c91eb46f21fb87da7033940a740293719013b549b2a04a465178b9c3c,1,1,Stevens.xml
-fcac83bfdb0b66dbe7ee339ad13cbb3784c2b1e9e6129bb33e9123ef6ec50686,1,0,Stirling.gov.uk.xml
-d0927c5a374e77c75d1dc3dddbf424cac62c0bc8036cc9301b2540e9fb6ad9f0,1,1,STLinux.com.xml
-0710fa36fe1a462a08964813d48f6b1d399ec3b7a721414956f7b99c87b6e165,1,1,Stockton_College.xml
-c7758f9f247af4a807809da7c975ba1113dd999e47fd382f67ca993672d549e7,1,1,StockTwits.xml
-af088ec57a0a58dcc709653e7bc7c388fb2ec11901bdaddf44b6a9eb56cfc09c,1,1,Storage-Bin.com.xml
-2f4835be761a19b7ecc69d772d7c194ac2ef0b064e0fcba4d2889f87334ce6b9,0,1,Storebrand.no.xml
-b3ae4b6850a307c9433da62f014e0867e66069ff2f3884f4aae6b16ed3ca8747,1,1,Storenvy.xml
-d64ce19ebfba74d32cafef6a02305b8aa5f95e7b4711d7dc988d46b5e2d217a4,1,1,StoreSecured.com.xml
-7403a5757527d035874e48069484b155e1c23a5d8087481ce356b2ff7ddc8666,1,1,Storywrite.xml
-12588f5afc97dd86b5084a913cfedb08bcca50fbb06428f5a21f2d1f45353f87,0,1,Stratum_0.xml
-796a57d9c1b84c656d28bf399cfb683c83437ec69fdd2eee0c2f83712755d53c,0,1,Stroeerdigitalmedia.xml
-b6d669821c47252e7ca26474737e7a99764a62314908a40b4303024e88e5a3d1,1,1,StrongLoop.com.xml
-07af8a3bf04feafc187b94867929fc2a1fa28c2d9c627bb9af41b8bc403df181,1,1,strongSwan.xml
-b0ac2e6a5978ce833c84f82322e462375f44861de28f391b9fac57c75abf272f,0,1,StrongVPN.xml
-d2302191ae1a8f125183b63e27520d15a645d1386f1c5c1f28958179f28941a2,0,1,STSDB.com.xml
-93988c7f0ff008e7ef5108c730894d4e105b47db481c2e8c3f148842946f5136,1,1,Student_Aid_Calculator.com.xml
-9ce00d1019a493c4f78331cd99076362c4233cc11920477c5e416697a6e7351d,0,1,StudiVZ.xml
-178c493fb5c612d7752155e414931a6fa954aae70c5e06b164e18856083d2004,1,1,StudyinAustralia.xml
-011d96bc9ab9a8cfea82d26bffe4a01598c8d65d074172966bfc40f197883bb7,0,1,SubDownloader.net.xml
-d92a0a64fa96c98af6b520e133f9becfd9c7b105aca69c8a6b9559ff8b90406c,1,1,Subimage.xml
-b320316c624d6dd638692140b4fbabc3882b3379d6a0a5dbeb4bc1d8a0952ef6,0,1,SublimeGit.net.xml
-1a0921d175cad22ca99421e5d7b116251aeea7157be570e7beec3db83063f13e,0,1,SubPLY.com.xml
-17ffed1ff7f81deb84f970b016cc3f707b748dcfda273a6e07f8540665ee221a,1,1,SuccessFactors.xml
-ce8a1e19ec87649974633ae2554d98d9e219359e9144bb59dbbc37c68f52450f,1,1,Sudbury_Neutrino_Observatory_Institute.xml
-8d351ea640bfb631540f409cdd9920eaee4b16167229a9ff127e7f5955b1ff8d,0,1,Suddeutsche_Zeitung-problematic.xml
-4353ab81e240d88c9a212ec5ecc87fb3c36fe14968a5fa1bba7d26b117ccd9ab,0,1,Suddeutsche_Zeitung_Tickets.xml
-39ee1d4592c1dccceea5d80aa83500d03685d67985cca30f3c17069ef4b11b41,1,1,Sugester.xml
-7493cc3ffce2c67f7fa42f32e1e2408c84f9ebe3bfec0fd23e8c14b853e22d67,0,1,Sukimashita.xml
-a718bdd3790b64a8c009cf4f3357e3b2254d3c577d64d37727eab8860affdfc3,0,1,SummitPost.xml
-34e524cb36278e49dd7e5a8d0a8deb009549cf988ec992a5a5afeb233d94f9c9,0,1,SunGuard-Higher-Education.xml
-14bede590218ee03241a00abe20fa3bb8f0f700da444b4c3c87691a91ed5a88f,1,1,Sunrise.xml
-a0bb91556168f0e98a0cccca8d2a6f1fd1cdc431f5c638c7e0bb609cb5bf394e,1,1,Suntec.net.xml
-c3085f8ae3518ec1b9c1336416c2c56c3cb38d4419c4bc0c012b03337adb07ae,1,1,SunTrust.xml
-cc283c50627b185ede55a22178b07b119401c1bb33681efb74f3c84a18d3a5f6,1,1,suomi.fi.xml
-cee503c087181433e78fc7a633a0ea13e071e35ff01247a73fdcb4e56a5cd2e3,1,1,SupaDupa.xml
-fc7fea4b9413421e1d068183f889dee6db63ffab1d49d7b357ff1b649e18c5da,1,1,SuperannuationComplaintsTribunal.xml
-715dd9ee76e76e36924367d72de96365fb971aa9249de53407a7f80a91523da0,0,1,Super_Hexagon.com.xml
-24eb0ee48fa0e0e523fd9bd0b40ab944a581fc249f21c1ce876352fa21ac56de,0,1,Super_Lawyers.xml
-d52211b33aba177689b636040670e9673139a3ae675f621ec98e5226f6662b87,0,1,Super_Pet_USA.com.xml
-bbd4fb2f9b45366a2539533ccf4a4886c69022a7064c641de203f1a81b29d94a,0,1,Superstart.se.xml
-45cbe2d0bc74d07effc9f86d955fdfc0b57fd320f15b0fdf37d13ed31836a4bb,1,1,SuperStats.com.xml
-278667426f721deeca09a629b703857edbbc9e6b5203fffc6eef77c7cf9c1201,1,1,Supplies_for_Dreams.org-falsemixed.xml
-f57b822a7d90c0045f7154b767dfaa622bb10b5d356c373b274ec269ab77dcbd,1,1,Supplies_for_Dreams.org.xml
-87fe4de9ab80a4e0a4d3f7e9348cd944198e2070144b65cd096f18f8e64cd38a,0,1,Supportion.org.xml
-607a14e523d4eb67d2e0470af4a11351e618235cf31197773d466373e9a3e4b3,1,1,SureSupport.xml
-f481149bc80e6ba1e137f87fc2f844ac46657ecb592c17c27ca3aa18cadcaf3c,0,1,Surfcanyon.com.xml
-c364bfc1cc7f038bee4de11860562a5430e9f6e50f4304292877e5852682f36d,0,1,Surprisingly-Free.xml
-1db721c32254a0f6cc5fa01d09570b574ea1aa05e031b63484c204705489266f,1,1,SurveyGizmo.com.xml
-1a101eb73dc1657e33f8e9345675e37e389518d109592e299c8d9e6724cf08c9,0,1,SurveyMonkey.xml
-7a9da5e66bb52c47cedf57033ebd9aecfe74c3b97a8ef687113ff2be4ef8ff49,1,0,sustrans.org.uk.xml
-ba6e4c5379bf8c4de10621f7fe7b3df817d4658f9da9f162855fe903858416f4,0,1,Susy_Radio.com.xml
-e1591b4d88ea0eb3485157d9832b975937e8c9a5208259ef3268d3f61119b2d7,0,1,Svenskakyrkan.se.xml
-10dbae31205437166ee6a42e3bf15e68a6c67d2901100bd86647780f09f78fea,1,1,Svenskaspel.se.xml
-0fd5d3870f9c3db62e5c4f6a72c986708fc02dd4f79ab555ba603706055e6f43,0,1,SverigesRadio.se.xml
-7592bd6d42bef1d6c458ce973aaac4a651cabd709c57c80b03ac37008f308308,0,1,Swapspace.net.xml
-e503bd2eff7757f37cd05f11b904e0aa7f674a7897657278f0ee5fd2ff6db491,0,1,SweetsLyrics.com.xml
-d40dbdface540ac54e9294701124dfe11fe73756383e3532be4426e6907faa0d,1,1,SwetsWise.xml
-841f596ca9d82b008cb1ef633402bf36289814a8bdcf2b50a24273ffd9d40784,1,1,Swin.edu.au.xml
-afaea307d6e731d22dc922a3068dee4ee008047207deacb123eb43f9beb4ba7f,1,1,Switchplus.ch.xml
-990a0708e1c15ff5dd64f56851007141150234700afb723ace3d4c802c19bd39,1,1,SWT.com.xml
-1dcaacd80b958fe4f931ee5e4659e02192f09cd5340f02820d03ca9755a5cadf,1,1,Swtor.com.xml
-0617c3149707ed6e38daaea5b27352082f326ab63f295a829ca49f19b179afd2,0,1,Synacor.xml
-40dafb3f220b08075e139b863e7ec589677a218a7f6fa0d83ac90e82046137d9,1,1,SyncBoss.xml
-801c20d5ad81a56de838fa123adde660b159ae4af5e590107b911431ab7d366c,1,1,Synergy-FOSS.org.xml
-6cc895d5acc0f42fc2422d99fd5c7c330fc898da1b36d815d38baf9c071e9ce1,1,1,Synopsys.xml
-39e34220f1747228c89f65bf85e1341261dd9bf9fa7103a6f05f7b5cf7c0ddf1,0,1,Synthetix.info.xml
-057b142ca3d2f84f2620bd70122ca28024124fef589ee328145f265a2064ec18,1,1,sysprovide.xml
-9dc087e90745d0ea8953d26f82dbf9047cb610d088d94b9a25bd56e093d31a79,1,1,Systembolaget.se.xml
-13c55abfa115cdf89adbb92f03e79b91b3bbc08919f6c023c799c5dfcc880b7f,1,1,SysWard.com.xml
-0541366178a7279745ea561f059b404fe3e0938cf75afa1c0d3c21f89a17a141,1,1,SYW_CDN.net.xml
-d2b1e6a3516a331655c9634cebe11092ddf2b0d2b513b04760fa10c2ea5598af,0,1,T3Blog.com.xml
-0b6df260724836c32c32d403eb7c8e3b21ebe80f68e4d1dc17c2ab806e9f226a,0,1,Taboolasyndication.com.xml
-41fddb51756b20157843356a7ee2decaa552a5c8859d0e10d52eb83dd42e5373,1,1,TaDst.com.xml
-07f333e0409ae4f5f9e2d09d26835d0a47da5bf52c535038344c40b71dbad8b0,0,1,Tahina.priv.at.xml
-3ce7dc41c4bc9b6d2e938d273bc5b661865520ab9d08a051ccf09efb1514c203,1,1,Tal.de.xml
-efab25b7fc246b2cde333d8f051380cd133eb4a7f0166145127a27ca555328c7,1,1,TalentSmart.com.xml
-988512d330564df476c731a89222b3e1b6dc5ad89c41132ea73ab78d27081f3c,1,0,Taleo.net.xml
-9a22153dffdb22ee7d1cdc7a9f9e4e292333b7b081d1707128f53aa397863177,0,1,Talk-Active-mismatches.xml
-3f39a0ede32fc9c7b9ea2e81a147362ded59f0939ca9803db7fc3b7be695331d,1,1,Talk-Active.xml
-b746223f8060cbb1f6cdf08f5b7adfd6bf0aef960614695746d58290b49c5800,0,1,Talking_Points_Memo.com.xml
-0a01fbe6d6acec74d0ccd7aef778e02e8c7ac424d57e8e9d42d9729d56001f6a,0,1,Talkoclock.com.xml
-19f7c72edff92f8dcbb0b5c379aa1c9acff032256393f29b902d4e9c4ed08cc0,0,1,Tallinn-University-of-Technology.xml
-b14da75d358e6ae804086aa49d830c8fd9bcf3c257756297a5d1eb8199788a2c,1,1,Tampa_Bay.com.xml
-1640039109c8c2f9643d9d88c5de2572634fa496aa78cb664ef10ce34d04232f,1,1,Tampa_Bay_Sod.com.xml
-1bc78da98c0a9dd3deef3d253bace5b2f67371d3aeb7d34181ec3fc516bac37d,1,1,Tarasic.com.tw.xml
-6944277ec988e47878a9e1a7cc8a7f6436496b66e16f6c35235ec00c973900f3,1,1,Target_Performance.xml
-a8687053c02430a7161492d975a61c779c42f21172db6d16edca34d5a32fa4fe,1,1,Target.xml
-e4d80cc754656ada5ba1f98779688c87f5fb61a08791f713ceea95d6cb84b2d9,1,1,TAU.ac.il.xml
-cfb76e4e7478c507dc48b61f51bdc71ed2176927fed165af863dfdba2d2dd270,0,1,Tau_Day.com.xml
-2239d41720f1c8fd08f8210ca202d9649e5fc4d4ff215f22be7a2be0108a082a,0,1,Tcodevelopment.com.xml
-1bcde0c8645fb6f4f858c9dae6da9a419f2a187914e0d5ea61cf6094bfca9a6b,0,1,TDRevolution.xml
-80cda9034d8a00e18d2a3ec378fd95fea0c4fcb0abdd052208d10f433b9621e9,1,1,Teachers_Assurance.xml
-044c8f6f62258a7ad63256b776f7390d63ba1777531821f3cdcacffc26bc7a89,1,1,Techendo.com.xml
-0e34171c067993cc756f58f6073b767435fa61d1241b1fc40b4c531f8ff6bc41,0,1,Technical-University-of-Lisbon-Darkstar.xml
-97fcbaf5577c88218e445c6a64314951b53dc48269897f9e64f6317b4b9e775d,1,1,Technische_Universitat_Berlin.xml
-686d302ec551ffe043988a5eda96e4bf5973b23ebdaf401c40d0ee46c476964e,0,1,TechOnline.com.xml
-2e40b58c77233713b2739af1ecb63ac0b98a69885ce54e4e3e53aff88d0296a0,1,1,Techopedia.com.xml
-872fa19600d84d669e883f58643d21eaa1aa79fffd73cc63f12eb1deca6de7c9,0,1,TechTarget-mismatches.xml
-ad2b580f1b685ae4da97e09f4cb918ba9c991eaf3198f58ec7551e5d6cf73d0c,1,1,TechVerse.xml
-8979f123bf494887cf5839268426018ef6d601541e9c675c24dce1a98ba29f77,0,1,Teen_Revenue.com.xml
-6d505dbdf780e9107561308221f5e592f1f457e9621b12ead11663533432d2c7,0,1,Tele2.se.xml
-5ddaeea1faff6f9fd577f7f16afc0186ca3620e153194008d51ab695ee84e55c,0,1,Telefonica-mismatches.xml
-12f6643c8dfe320400138e5c29a9c04ef46fc6860f5e1649d665ebaa1a60dfe0,1,1,Telegram.com.xml
-a657c4abf2697000def80e5c9b26c70b9c5315a1a34a6ed8b21f197a5cfd4e06,1,1,Telegr.am.xml
-954837d7349122208fd7a070285f1c255bb47bc922e5fbd9b371666720929085,1,1,Telemetry.xml
-32b38e97307552cbc942d5d4b47024f66842b715dadec3868879317c7b066871,1,1,Telerik.com.xml
-29dd308967fb0a8ed3bbc3eb9cae036fbad5ae7ba501ba89a27a6cab0197476d,1,1,Tele-TASK.xml
-1aa65afe0a962f7a7bd626ac702673a51fc6f55ed21d1700e45e5e5a640070b0,1,1,Telfort.nl.xml
-47c4d924cba640f836148343df0c9bd6b0ab764e9c4ea521ed6d37dd0f1fb5ae,1,1,Telia.se.xml
-fa340bfec44c43f86207ca9f60d2b470bd94c4b4b2eb8886e58fd20688f4eea8,0,1,TelVue.com.xml
-4e16750265f2c9d5bc7bf41760be8f2c4bc672e92398a6d635c4bc69ebe5e4e7,1,1,Template_Monster.com.xml
-90d8cb4c77769dae735da60d72e3b84f57a93ab7aa48e7a01fe8c56c6edd7451,1,1,Tengient.xml
-8112be0dc26553e6fbf96b5fc8f649635c92a3c7fc30ebd158d447383797b596,0,1,Teracom-Consulting.xml
-570e72df57965e83919c4deb86edaec58101c64b5bfd1e407b57365d95673904,1,1,Terres_Oubliees.com.xml
-068c6ab7bad10838f3256658455b0c882ee2d2cf27415bf6c64b2843c88011ce,0,1,Terveysportti.fi.xml
-80a2b0d54ed1eabf4ff9c4d5b2d7955a37a11eb7ea64736afefe5df15052f142,0,1,Tesco_Bank.com.xml
-1a0f294d147c61084bca26e4d51d13c0f5abe9ae3065b7940718a9a07c9e1b01,1,1,Tesco.com-falsemixed.xml
-575eb3af9769d0ce1f20cc9cee5ff5acb28ab6f44ec60d859178a256e6100862,1,1,Test-IPv6.cz-falsemixed.xml
-31e9f9460a5bda894fb347fb2f5530ebe65a74bc06abce265502c32a8ecad2fa,1,1,Test-IPv6.cz.xml
-0bdd9de6f132176da1797d3ef1d413079dd56859ceb2941d363e9b312ac79103,1,1,Texaco.com.xml
-33075ff0e10375dbb062e8d90fd798a3f81191feb017bbfb5528f1b7187da08e,1,1,Texas_A_and_M_University.xml
-1b947bc4c20e6b67ba9c208a49aa0e2fbeaafa70ed3000d9c30e43f07ee54eca,1,1,Texas-Association-of-School-Boards.xml
-262e6cb6ef646356d5c6c57e854eacfc0f22e63e990780b26f8310c490cc089f,1,1,Texas-State-Library-and-Archives-Commission.xml
-173d372e6a46e7c85336e34d91346e9061affc5bfd1760bb6aba49186caa09e4,1,1,Texas_Tribune.org.xml
-f0a9bcf00ac545e20fdfb5bef2d5f29197d95b6f8ca97c696a5b3d57e324a4ce,1,1,Textbooks.com.xml
-1e4218f40674c65cb64d74d7823c45fea8ceb1071a2b58243ce1b8626eda5f0e,1,1,The-Art-Institutes.xml
-506962b48cc81ba9fd9b78cbb56252315201bb710cb7eff070b294891c748af6,0,1,TheBookPeople.xml
-eef2e6549dad53d5a1b299bac1fca6444fd7760c83753854193c64ecbb342d2f,0,1,The_Bureau_Investigates.com-falsemixed.xml
-9cfc917aed6ae985c5ba1ae46ae05f69bfe557915de4b3fd6464e635aedf118d,1,1,The_Bureau_Investigates.com.xml
-6197f3d72a71901267ef26b5a0109ac64fd257baf72aa2f3583d0690bd1aad02,1,1,The-Business-Journals.xml
-739e66b04c9a5af038011293d8007d404e72821820a1e79f3663a68b7cbffdb0,0,1,The_Center_for_Rights.org.xml
-ac7281798c66f642d911a05d2d0e2f01f254451e85a20f45a63816cc59ee9c97,1,1,The_Daily_Beast.xml
-1e09998b77998a3f2fcb4fd74272df20935f2693cd1aa0e2b5a7d84aeceac408,1,0,thediplomat.com-resources.xml
-bf4dbec048a54caed039c4b34e5f8ee581ffac5a2cac1ce0125e682531b38f18,1,0,The-Diplomat.xml
-11319e7025f205267ab92752cf95740a51b58cb9ae6b392d46fba9fc6cf448a8,1,1,The_Drom.com.xml
-f1585d8c49cb634f499a564a2d05e17de79d20e60239838ef2908a0af3e96af4,0,1,The-Event-Diva.xml
-6e6dc2a6166f6dcea7828592d5dd1e9c3ac319b0f83f20b90ee01e8cf921cf23,1,0,The_Gazette.xml
-80d1ae41a278db7b4ff0ebc18f7767ff62bb0889bcd3b36f25d20e6adeb2bb24,1,1,The-Great-Courses.xml
-cb6933673ccc5114fd706e250a9198c8581ebffd405f0fe839537110e03d43ff,1,1,The_Grommet.com.xml
-fb9227ecb093d793a458ff52bfe79a76b3d8005f50dd173bbba33792b780aa16,1,1,TheHut.com.xml
-d3cad14d26c563280c4e79db4b0cf3861e3f31b33ca0eeaa23247d90c54d1599,0,1,The_Information.com.xml
-bc559f7f7fe275293bdc42f77ec7dba0a0b75fdd72e4b83b608dbe459d214730,0,1,The-Inspiration-Room.xml
-1d80b3f9223fc97c7ac1831cc522b5612049fd50584cc274563a3bdbeb1fd9a5,0,1,The-Lean-Startup.xml
-4f158ff1af963a5d9ed0faa1f3aa8f8468024a10fc64fb7abf96745f5e827fec,1,1,Themes_and_Co.com.xml
-9159da5c56b45fa828245a576a31dea754f4c4ef4e3948635da41a8aa6faa259,0,1,The_Next_Web-problematic.xml
-0eaa13eb00dfa89e920c20033aac3643c377713df15945b2afaef3b4fb13d8e4,1,1,The-Next-Web.xml
-983716987e3f3cb0412ca136d09307bc387c9580e59488401f9d78dd6906ef83,1,1,The-Open-Group.xml
-6ce3ac8cd6caa5c805e60c651cb1b5c5b00eca8e306e9731b6929a39f26e06d5,1,1,The_Patriot_Post.xml
-47a59b2dd91d2cfdf21e5a9dc3e4d41cf42a9b52c99dba572e95b1f39c1d3a34,0,1,The-Public-Index.xml
-74543ac90a7b3e191da32cd7f530d15156c29648ac63f8d327ea72726dacb6cd,1,1,The-Republic.xml
-b25179d086cd6a6c48f103b9c4c193475fa0a01aeeb863dc74df7e662c1467ce,1,1,TheResumator.com.xml
-f9638be0d1a2a1db5b98ab2f49f22351bde30a6e6b79b12c660266ba0522c858,0,1,The_Satanic_Temple.com.xml
-954be849d06f47930f52059ecbb4936af3374b9918df17dd7a833b62e679951b,0,1,The_Security_Practice.com.xml
-c509400770d72466f1fb4941a005dc52756f9f8bc456551c5c58535c12f03cfb,0,1,Theses.cz.xml
-87f87974eae4c8be63d24bc12dc2fd9009669d3d060a0743887bc4eb890dc0ef,0,1,Thesn.net.xml
-b1cdc01ef33fd2f12c0e05959597fc420da308b364e03ab877ce6d85ca9678cc,1,1,The_Stranger.com.xml
-8c22882ab50988affb25c043bedf30891600e9b01147c502f680981cf767ea39,0,1,The_Theme_Foundry.com.xml
-4c2b9a510b95f4dd85d039e37f92106befbc4313769107941058c4e0172e018a,0,1,The-Vault-Bar.xml
-1e997761983dcf6997b046c5bf9493f25422bfdbbd5b693560808da05f441d76,0,1,The-Washington-Examiner.xml
-45c734084bac83b8336e3bf8061aac11ca6981f7602889d5ec0cd6e81c37d95b,1,1,The_Watershed.xml
-192c7a558c80f5de13deb92fb4e194cf46e435a55413f27016131a33259fc2ca,0,1,The_Work_Dept.com.xml
-db18010d3ca83f79d1da1c4c2a9116e1daa3edf759a3d5577a331408ff530253,1,1,The_World_According_to_Nouns.xml
-ce6f22b9ed24c147da5f48267f937fba3c0bb3f14968eab75678d2ec9faed984,1,0,The-Wrap.xml
-1de271ad79954cdd301eee7bf7e1ac0c5f0938fecb5c8aae0391c7ab3e4f8778,0,1,Thing.net.xml
-3b89f9f5c32b514122d49ceab4814e47ef0c97aaa9aff40b468aa9387ab4b672,0,1,Thingsquare.xml
-5b749d138506b4643584035985a91b9b4f5a552603235113574d6d47d6ebe8a9,1,1,ThinkGeek.xml
-a9de1d33f1d38bbc31b35dc0963ce198eb843d292d2ee9fa9f6341d54b993f8b,1,1,Thinking_Christian.xml
-7ebfe09e0a8949490a8587707a0432e4c9ecc6b38305d3f11014c757c302672c,0,1,ThirdPresence.com.xml
-f984c8bfe7914af11862ac7153e159855cb7d3e1a595680c956728afbcde57fa,1,1,Thirty_Meter_Telescope.xml
-67e41bce1db89ec4e09f46c662ca6a2c7b126f6d57052abfebdd25316a9282c1,1,1,Thomas-Krenn.com.xml
-4a9d2df9e9f0b9bcefb9c1e2b49d8279f452e0519f697004dd78004126488f2a,1,1,Thompson_Hotels.com.xml
-eb2a659b523e5b8dc3ed7f51cce652abac536d52c86bfc6aa421408330b64963,0,1,Thp.io.xml
-ed8e09d2aa2ec5b033c3c629ff5848b8ccaf666077a033ff24db674a987c002d,1,0,Thumbshots.xml
-c572a5c33cd5817863bcea276085297977e5d272aec438c1c73c00d1c85efc35,1,1,TIBCO.com.xml
-1691cb662b5c92e39543967f4ac52f86fc7b12c3172eea43a64100e699ffc7a4,1,1,TickerTech.com.xml
-5c7384430e2a8498ee7650c8045cb2ced1f24318f6fafb4aa5795efd075615e4,1,1,Ticketnet.fr.xml
-df293463db93d5dc463389a7df8fa0780fbce66adf464f1c1a0c60b428469662,0,1,Ticketportal.sk.xml
-22c5dc554eff33120154420db28400e7a9175540628808fcab68127ceaa53846,1,1,Tickets.com.xml
-712dddaccf05631bfed526e1399aef6f227c79d7a1119e96b541a8011da420a9,1,1,Tictail.com.xml
-41988eca7e169dae42c7fccbbd264d521110b7614836be80ddbd275ee14b39c1,1,1,Tidal_HiFi.com.xml
-298330bca9f99c55c045c6aaacc513f9435fd9b0080ffed0e11618cf2fb8325f,0,1,Tid.al.xml
-f04cf9c56366906e30a204e2341fa70b05f62b3e574680255d82571ec98d8384,0,1,Tidningsnatet.se.xml
-070cfd36e966dcbc299d6c7d3e4ba8e379d29a0a6aff7ebeb84c86618d638b68,1,1,Tieto.com.xml
-6cbf926c454fac45ccc753b40326e634ace92275c4d7996f9341ff7a5e8afceb,1,0,Tilt.com.xml
-196e8b886586ee852fe896324643157d3c48009254fa4351eebad927a6985160,0,1,Timbro.se.xml
-c586112a934e1ef6f587d2316e13cb55a85f4d574f0684e6cf3ed636a8ddb4bc,0,1,TimesofMoney.xml
-2b3408a8f89589faac295e5b1dc0a601d01e1ac73f50e1449b04767930bfedbf,1,1,Times_Record_News.xml
-9dc9221fe34a8c545ba4dea34f0708f5866bcc311121a9db998c9052846ff99c,0,1,Tim_Minchin.com.xml
-9db7d3bda86ebaf938f4cfa084d270d03c123066e59f8572763f02fb7030322a,0,1,Tinder_Foundation.org.xml
-85b8494673adc5c9e891bbd25e7c5cd4811f32ab63c983fe90dc3bda9a5c0f89,1,1,Ting.com.xml
-38a2a7782d9995cb1e7876f8da2c1e5ef501780bab6bf2f46421e90534c3030a,1,1,Tinkerforge.com.xml
-a407efadf8c8bfb21c17958f5f652b9cb5411bbc15fbe70baaaed6954ae29b9a,1,1,TinyChat.xml
-d4cbd7eb4aa005be2400ad4737c5843fc9d8a2643965f0f265c11f4a8cc4f3a8,1,1,Tinypass.com-falsemixed.xml
-7733cc60835882b3bbc58eba042035e3883ccd9a100903c2081fe12b9967dd00,1,1,Tinypass.com.xml
-25afd3e07a9f15f6fa54c339945304d271543551b8260f2a0da34e636bb3b84c,1,1,Tjoos.xml
-1531eaa1067b3d3963d8e50104e17514d3379f4dd0c56b01ab934a74c7f57f41,1,1,Tlsfun.de.xml
-23b9c63df64d2b2cdd537f8b37898f1b804ce4609e22d55edaef4b6df837ade0,1,1,TMP.xml
-6a99040539c10ec98df1183e1f8e9c05b1b5260a83054891477939a63e66f33b,1,1,TNNet.xml
-62916b98805af0abbe50e636012ec27558205fbc6815e8450bd5d7d03a80ac1c,1,1,Toad_Fly.xml
-5c1a30c2008fc80c0aefdcc559777cdccdaca7d8f3c4c95e5e2d0e238c8a56b2,0,1,To_BTR.com.xml
-e4bc5dcae265ed51b716b9b2b1efd571adb056a59812d122bca82e7b2d780d44,0,1,Todoly.xml
-b95fb934bfc621da8d176b0c91ec765f6f7d67e0c5275aed5ec3f85c42a5fed4,1,1,Toga_Hotels.xml
-e14a4862724980b67d442efe8ef5b7f430e088387580c43053c8b848df81ca68,0,1,Tokyo-Linux-Users-Group.xml
-b52667e2e9eba427ac0aa836b4742dcd8b393dc3c84a9c6a33295d44f521943b,0,1,Tokyotosho.xml
-06292948f6ffaada00246a0c636a0518391fbb988861bdfad633af27925787d8,0,1,Tompkins-CortlandCC.xml
-fb58cd9be4869f8b8ae49ce4318039d17605071cc8c2d30d303c8702ae6cfcb8,1,1,TonerGiant.xml
-2a1ab23b0f35df2faa362e2939a2b5e696220bf1cf274ab16ad190ed3c8b94d7,1,1,TopOption.com.xml
-7ad44939a8ea5bcd0d4fafc588effdede3cad62252fd2b97dda63d9277aca3b7,0,1,Tornado_Web.org.xml
-b75b3fb34aa93de7753e90173373e56eb02eaa3df6ca46adfc97e08b035accb5,1,1,TorreyCommerce.xml
-c9bd9b74399ec69382386ba54a8d04866e6120cbbddea2d7f46adf56bb13ea4d,0,1,Torus_Knot.com.xml
-a81d9a77c859f37c8f6530d57c0e782524fcebb38d9e986f8c18fb555a046ef6,1,1,Toshiba.co.jp.xml
-9925bba044436e099ef9a17c05c3a9dd980c74652aeb939ac34c94ea63b7df57,1,1,Total_Choice_Hosting.xml
-5bf3e44d7370894cf0d2c45a95172e3d25a007c4018b5ea8d71eab69acc9512d,1,1,Total_Investor.xml
-564de255a2fe5b5ef4255de2e2dff1bae6284b29469b7c17d00380d21b9289be,0,1,Totse2.xml
-d87cdcb3d834b578712903370180da19f04204d5362c9a8164b772b55a18037b,1,1,TouchCommerce.xml
-2eaa64ff59a989726785d161525d3e175bdaee01ccdc10086578716e4c7bb8fe,1,1,towelroot.xml
-24758ddd0781ba99a1a9a29e03011c29687c1b5f67dd207daa8d811ea75a4615,1,1,TownNews.com.xml
-32aec643ca2d71d6f9b43c8ba58b37481cd2a55c76968565a60f8c6621fdc5fe,1,0,toxstats.com.xml
-f6d6a14f6e730ee446729955986056e9a930783180f0dec99991bc4109622951,1,1,Toys_R_Us.com.xml
-2917eb742e4f7f15db7b7566a266e73ba37df2d9e6a64de292ebbfa4ee904707,1,1,TPG-Capital.xml
-7259305af6c4290ae46de7c834ca0762784aab4962d66ab98641d750a83ed803,0,1,TracFone.com.xml
-087f60834326225dc58d57d93e7c6bf7227792865bdecd91cb5b2a6ea8a2ede2,0,1,Trachtenshop24.de.xml
-eb283cec83d4235adac15a53986ce71e8770d0cde0f91ba7279e6b6cb5fab379,1,1,Trackalyzer.xml
-ab5cc8a1755685297bc40b4037f1277d7482417e04e5c520deed1d12e353c4d4,1,1,TrackingPoint.xml
-7673cbf09b22e7a38503a783d546a3ba3f19e5b9c67aff9d90d0daf9c5f0c346,1,1,Traction-Digital.com.xml
-721009e195644d5540c59a6f42ab2716e35722aabfd718b4dbf487a5f52601c0,0,1,TradeKing.com.xml
-3f6e8ab2b5f0ed70138432ba3f0bfb91451404f1d1c361fcc625d070e4ac4f9b,0,1,Tradelab-problematic.xml
-8ce8022cf79d4e12ff69b3bd4ad3d9cefc94a750bc774c6666dccd1ef6ae7975,1,1,Trademarkia.com.xml
-add909870db94aa5bd754824fd291da12cf5a35ef2dc039887e8fbfcf9559504,1,0,trafficjunky.com.xml
-6babe63d9649dc80201a730918427d18fc983abf0ae6aa64ebc751040d874711,1,0,trakt.xml
-33fe34b8b34cfe39278bbf256306a09c27ae0943883a0a037b6fe9dd92121893,0,1,Transact_Auto.xml
-67fd8d9314a487120d3522c34835214140da57158a1bb42ab2326a7c793aff1c,0,1,Transformationmadeeasy.com.xml
-00dd816c4f9e0a041f07ebf13af88e9eaa4c7c44adc9df183c7807a249bbd35e,0,1,Transformative_Works.org-problematic.xml
-9130f100904f6c25762b32d755c566fe6aa588b19feb0defa4d3473687abbc06,0,1,Transifex.net.xml
-777f11b4f28a54995931f58c3cb671d7296d74e65426869d388c85faed8c4515,1,0,Translink.xml
-bb06dd6b10f827e1ac23da17549badf7f17b97300d993618cc2e608e66328a1b,0,1,Transportstyrelsen.se.xml
-e146c7bca657938ee542242397d6ba4457b7451ddb4fc64f0f8b12cd6cbba2af,1,1,Trauer.de.xml
-33d321574ba20c37ee80ba79c6ee1bd2c28ca890cc82599a1799072cc2e3b47d,1,1,TravelDoctor.xml
-f29c66a5f213e6258665d3ecfbcd498dbac77cd5137244c85589a8b85ea02ec5,1,1,Travelingnuker.com.xml
-c7c57b65cd13e5ed94238a546ff86f9af27333129ec503e4d00067eb5444a4c0,1,1,Travelzoo.com.xml
-a40a21c802bc8c74243e4a5b17bf171b8a9de5be9ea9d04bba0aaae7097c90c2,1,1,Trefis.xml
-a15f218ce90ba990333edd6061220b58b4bb4d762e26e307fa0e5d583ea93fce,1,1,Trekaroo.xml
-bcfd7bce8a3d673291b87c3c62f821290d4ff89c2e1da623e08109eb8c8449f8,1,1,Tremor_Video.com.xml
-315c8baf521d9edb49a5a49a91630711255a5f86162562bfc5e31a56198a1176,1,1,TrialPay.xml
-6f858769c48e6e19db4faf2b056420773d9e9c936e6a28322c04e068a115cfc6,1,0,Tribune.xml
-a3906adccfc4301efbc4cea0a097d22264fa09498b92e9ab18dbe4deb4f9e3e6,0,1,Trinity_Home.org.xml
-2438a19009f61439104d77dce8c63f118c538313647589307aa3496d977ceeb4,1,0,TripAdvisor.xml
-9d1f2028d622611c85867fdb9cce067898baf1b0c8b1cdf76382a435006dee85,1,1,Tripbod.com.xml
-659f54d49c0a1bc37385587c4594dff783cfeb3dae3463d6d9d48e95b14fe1d4,1,1,TripIt.com.xml
-9f80f4c773e05e5db20f7513412915c567bdf50c721475bb389bce9376a923ae,1,1,Tripodo.de.xml
-95f16dded418621ad47b6a14df059990d2ad3ee3e541ab18302119286c416dfe,1,1,Trkclk.net.xml
-583fe8b250539316209b382249de834765d3336b789e278a0290906946a33230,0,1,Troopers.de.xml
-5c5ea0a5d52a71e0d7cd988d3a6d77c836f498d8ec6683da96890eba5bba1665,1,1,TrueCrypt.ch.xml
-9f13abc038bc4708796c8149ab7a1ed9a3ad9ad1de438b1ee50addeabf4b1645,1,0,TrueLife.com.xml
-cc353d51b4fa9b6eb6e627384ca618e2739233019f262bed49a4e88829a5b8e7,0,1,TrueVault.com.xml
-88e8486dab5c9ed14e91e57247a0e53a17a334d00c34825f710f942157ca28cb,0,1,Trust_Dale.com.xml
-d068f81127f1484bb4b0c190d455ee641f01a8fddbb6d3303992cc6e6b5339e3,1,1,Trusted_Reviews.xml
-515209532db991dbc23f669a73b6d3038e7a91fef1a2e5149ca310c24b2ae27a,1,1,Tsgstatic.com.xml
-cbc81abedcaee320114fd5e4176a22df18d4f064aec016a1a5d63427f7b54138,0,1,TSMC.com.xml
-1ecbe1da69a1a1aa49979faaf3c97bee997651c4b0e9e33f7f23c61d14ac7f7d,0,1,TT.se.xml
-075aef1c9852855dc15b59f6f2eaf4f8bc106a7c822d7197794d05262618007a,1,1,TU-Chemnitz.de.xml
-160d9378e69345661bba9146be715619c926f9e42473146b07d8dcdc1473d772,1,1,TU-Darmstadt.de.xml
-0d46f84abc248fe7b3d684098a6e460a96a51180be156f15686b5ae6018f4c2f,1,1,Tufts.edu.xml
-de7344c2c6d972a368180b62f10774c317ddc037946309fae83d650d4ff4a538,0,1,Tufts_Giving.org.xml
-ed6c9a0705f39a6116bb5846e82ff40a083eb3ce58530524fa2c53c34fa73b2b,0,1,Tufts_Medical_Center.org.xml
-695f190bc96a78e91af3de7108e3a22bba1d1121c39b6ff01d00dfd94f100b8b,1,1,Tugg.com.xml
-21937f94bc991fadf00aef8c9ed502c53352946bf0f2e251098b8e7b39461d3f,0,1,TUHH.de.xml
-7437c1971594aa265eb53fa94c228ce212257cb485c529ca827783fe23e05afe,1,1,TU-Ilmenau.de.xml
-076f75e0cec1e5ee6f4c1b4bfba86da4123cfe0cd911148ee9a2de0b23e9c0bc,1,1,Tunespeak.com.xml
-327ec385173956e4fa7b6204764c2a58eee10c8090e1779b533ca1a82264a2ca,1,1,TurboSquid.xml
-ccbcdfbfe69533254836bf4d2e39ddbc984fb6533ea86fc7d641840140ecadcc,1,1,TUT.fi.xml
-009541f9142f0e8f7a467b8d9d9e5011b7a317f34acc6243d7c3b6bd672426cd,1,1,TutsPlus.com.xml
-51ea91a129109ca65e344037ce0b32acecb58ec90aecd8e2a9e9be59efea8837,0,1,TVBrowser.org.xml
-d4e0cb9416ccb4d5be104989ae950dc51fbc53f08dbb903a9b457d09c83415de,1,1,TVLinks.xml
-0c003aedc335a6535515697f9b8d5339d490581d357a0afaab7f8a578c830944,1,1,TVNewsCheck.com.xml
-910dc09ec17c26a12b275fe2d1282e94a82fbf0163282fe5a5ac496ff9ecbe3a,0,1,Tv-Release.xml
-e1f76e0ccf48b6a764b85cb52644e4f2f569d08b74ea01ff28e0eb4d99111b19,0,1,TV_Tropes.xml
-f7a7f84964606d6b282ed6ab65426dfa6346cfb73485ac1eaf47e4225014932e,1,0,Tweakers.net.xml
-b35b35365733082ecebdf86f03de9cd93bd738bd52a0239bb07d4507ad792b5d,0,1,Twilight-Laboratories.xml
-7b77852a18ebceedc2978095db85af92d28db9913d71634ba4d68a5f64802c08,1,1,Two_Roads.xml
-b6e20e58a85db551dc6b49cef5e67546f73246773c61d31d86c69986ef9a489a,1,1,Tyndall.ie.xml
-deae2b1c6be69bae7b6ec4895e585099a2f5374b53776ed4f075d45f4c1cfa6c,1,1,Typepad.xml
-1da05f6062123d8b368d700a96b0fbb2dc7baa69f14ba72716e3c937a49fdbe7,0,1,Typesafe.com.xml
-217e0a47c79b13bcf8a182ff48275e6d041cde28d82aac6157bc99c1d60493e7,1,1,Typography.com.xml
-d135385bdce6daba2dfa309bc31c7c871832ebfaff81f2c70d4e6fb4bc5e3081,0,1,UA.edu-problematic.xml
-a7fed2aaf25d78080b3ec0d40308a403283fecde51eb4a85208fce48ccefa882,1,1,UA.edu.xml
-db0b22a14e4f5c66f02f963504cdcaa35e78ed7f39f42e209b3e0a9b9ba1a593,1,1,Uberspace.xml
-d34257489620d9704f3ec14ff12a39809baeb7c02949733582eb599f0de93e07,0,1,UberTags.xml
-080fc622ff8332704b958560b9d0d692594c26964918c2bf3c496602568e761b,1,1,UCalgary.ca.xml
-0b1b418c73486bc0dadc747306a39b269d9cda91ef3292cc4149aab30e0f43b1,1,1,UCAR.edu.xml
-49c96678bc86a99b01c12892885c4fcf38f81dd5ff32f582af605567f64fd5b8,1,1,UCLA.edu.xml
-995aa7cdbe60994801ee5330b1ed5f89e56b12fa300fdd71deacc89cb1e21d51,1,1,UCM.es.xml
-3edef7d6624a72e587670864119d5587024b70b17a9d360dd391cf6163afb74d,0,1,UCSD.edu-self-signed.xml
-ea8f9bf69a5d5029ab1c217760e6e27c3b5a4e9672ace704a2f9f7d8332bb497,1,1,UD_Media.de.xml
-de858af31abe4402e1eaa36359f7c8b42140cd93c64fe782cff904c0d017796e,1,1,UFies.org.xml
-eb6933d91ead523edc38dbd9150d966f34dec36a99de379f08e2df51f1e94139,0,1,Ugandan-government.xml
-4a7f864a3f854fe826e6a3dc007063a9ece15703ee80ae969882a1b8ccccc97f,1,1,Uhhospitals.org.xml
-f2b63947f9470794e4a28d994af0b354ecc071f5af85945d25045c72109a1928,1,1,UImserv.net.xml
-1c2718eddf3aad2784493ace750680876d5388690df4bc5bb12461bdd2e2b867,0,1,UKLINUX.xml
-b1fa590a3d235ea98e687c16eb278312a6ebdbace39393517a0bb26cc3767b59,1,1,UK_Ministry_of_Defence.xml
-96961aa668492fd95b7a45e568a5388a77a045d1a965504e3f4c5cac64f72426,1,1,UK_online_centres.com.xml
-254e23a8560db790d5da875d282c4364d6b9004388e55cfb8448ebc4fa3aef8d,0,1,Ukr.net.xml
-0b44ce46a58cfaebca7e63776807e71e756a15a477888271bf96d1bcb2db4d30,1,1,Uksrv.co.uk.xml
-dea8b7526b42b85e25f40701a5b312661473a090bee7bebb61f49ee99a3ee654,0,1,UK-Web-Solutions-Direct.xml
-c3e80e630bb200fc2c1ab0e7f3c3e3358531cab8aef87f657c79dc12fcf4cdcd,0,1,ULAKBIM.gov.tr.xml
-dae919c3f6ca4e00376c16f03704d0da1b907a19cf963af16a00b2a813c96c38,1,1,Uline.com.xml
-d4aebf02f3bc14f99eb5edd840295f9a9ea83a9da8590405750ad92cd27a399b,1,1,Uma.es.xml
-43bedfb524907eff167ef1568f7c8032cb2d63d2281b865befeaa3a1e2049eb6,1,1,UMBC.edu.xml
-1fb81f92216ff932aa6f19d86d881e1787d534499a3de722e4422a269e346e35,1,0,Umbel.com.xml
-d0c3484003d83f62d4d3a818a40dcc0d92ab8c1ccc926cb54c42bd7270d80cd7,1,1,Umea_University.xml
-5b2e32e00cef0ba0a625b106e51304e2f1432b8eec6915189e2c20ff889b4210,1,1,UMonitor.xml
-a75901d1280859f2ba4c333fdf95af3c18e54c071710400658d67851599372a7,0,1,Unblocked.xml
-828127811d074dc9ef16975754dad838fa0174cc97ebcbdbd4dad31574e584f7,1,1,UNC.edu.xml
-abde55d39d54436f83a19a822428de73e001bc42b5bf7a6846ecf331b8786696,0,1,Underwear_Expert.xml
-3980ab0dcdb98b47939dfb35d9b10c9b1ed6266f4a7f93aedb305004afb8e550,0,1,Uniblue.xml
-ab746cbd444c8485fab5294c21bac38c403d0a694040c95732260829bc2c3a3a,1,1,Unigine.xml
-bd135ffdb815d31e79e5509bda7a2a677a86628cc655ca65c214de1b20bb4627,1,1,Uni-Kl.de-falsemixed.xml
-dacf0d738a537ef348d793f0cae29cb8a6767c63e4d352034c73b1ad503936dc,1,1,Uni-Kl.de.xml
-2b76ca2f6ddc6c96299e6dc5ecfda3b24949bd7e2a6fdb7c826506d455743da6,1,1,Uni.Lu.xml
-bf4cfa2104d71e0ec0e3e930c0d1e9129a08bce034bb8eeaab0d7d12fa1d52e3,1,1,Unimi.it.xml
-a937024d9043a23d94d3d72c6882f07b3961be52ee04344cc3c63f26056138f4,0,1,Unique-Filer.xml
-36b4425eb2b57da6c91f6ad1591de700d09741a417d589899f68fc99cf5b4bb4,1,1,Unique_Vintage.xml
-9e94b61af5a0fb8bab661dcdfd4a5aeecfb7389ba484b07f8ee0c2736af3b5e4,1,1,Uni-Saarland.de.xml
-65b7eb7c22e45c48ae0a322d87971966cac604fac7b7350f8165d49c87556572,0,1,Unister.xml
-50528247279d89e79ae139a869b96c7274b1d6b3a324745992c9fc3d9490307a,1,1,Unisys.com.xml
-44cc911a17c526d1a8c74161d9d8a8104bd9e4fc2a2626d35a85739c0b7b880c,0,1,UnitedDomains.xml
-5e429b727ca2318f54fb23303a5f3a3819a70ce22afd33c7829771ff1ce6dd46,1,1,United_Republic.xml
-a54f076011544a5b6dbf25864d034eec0868cd7a969d8f5b847c0f899b723169,1,1,United-San-Antonio-Fed-Credit-Union.xml
-9cd634c84b94dfc1e800e51326c04a4286ad760338cf337b704a316ff74cfbdc,1,1,United-States-Department-of-Energy.xml
-c5fbbe636496cb6f91e2cd50b9bfff0d708bd992beb718f6133fb44c2ff44e51,1,1,United_Stationers.xml
-2f42e894be064592af7da170cd603d831acf2d10b0ed05d618b606f1cda08c80,0,1,Univ-Brest.fr.xml
-03d526949445b07094448c452d80c8cf2df4c3103f874f7aedfaf3f7a612fb3f,1,1,Universite_catholique_de_Louvain.xml
-1b63de944b3dc6cfdcfff47840c4151bd742825eaca36dfd0385e151f396ae94,1,1,University_of_Applied_Sciences_Kiel.xml
-49843f351b754288574de5cb73a2473a5542ef67e3897eb216c61e9f97c1b8bc,1,1,University-of-Applied-Sciences-Rapperswil.xml
-ed415b19e0e0588a60d6dc04924c1d9e38d3ef0b5f99cf749235132684e9092c,1,1,University_of_Arizona.xml
-0ac8ec3397382662ddbf64902f9624855b252c9576998a73380c0c914f6f1bda,1,1,University_of_Bath.xml
-eac00803dc242cd3e843b8c8af41a0124c77d59a1287ac6a729d4716ec540585,0,1,University-of-Bern-expired.xml
-c0189f896165a111a06c5095aceb5c0ad42dd0d6706a7d1778eb14fae61e0ae9,1,1,University-of-Bern.xml
-5c04aa6f34bbde72ebdc5146ce783f31bb9eb4da7525abec541c527f722a766d,1,1,University_of_Bristol.xml
-930135e45407a24b1740c05dc8bbdc963991d4da2ec3acc022b3987bdd097fba,0,1,University-of-California-mismatches.xml
-40ef91002ef5179a4499618eafbb0ea6d063ff7ea503869acfd32eac9438fa17,0,1,University_of_California_San_Francisco-problematic.xml
-c2dac718151331da92c798abb24423fbbdc99c292e9cf2fca58166a22e429288,1,1,University_of_California_San_Francisco.xml
-0d8c654ff8c103639408a7666814cd3aa6670ded256ce28fbedcdba9a96900cb,0,1,University_of_California_Santa_Cruz-problematic.xml
-8c7c2ced844de3b70117b7f7c122c869a969beb3b271c7d5e2090bc1c531079e,1,1,University-of-California.xml
-9cf40f9716994fa5ce46c2f61060e3a26a12548e8e7135fe2b60659831e06ef5,1,1,University_of_Cincinatti.xml
-8a596b813df7ce8c33efa16d18d91bbd0ec416a1eed9449c8187f41ccc242431,1,1,University-of-Colorado-at-Boulder.xml
-9c79f3954325411a593b4431ad9a91850f63d21f41bcf993c9aaa8325069145c,1,1,University-of-Delaware.xml
-bd8a650134717d6663fbacda4e3d6566448a7d8559997bc4250cde0b97c37d95,0,1,University_of_Derby-problematic.xml
-17c4e3c658e8a6d4d64c2233f55627ebd82eddb7a5a6bd31f2c90145c3f9eabd,1,1,University_of_Derby.xml
-cc0fff29bc6a07633bd7ccb70628ef7bcf9763c09eecf7be5ba961a3fb2111ed,1,0,University-of-Exeter.xml
-a51b15e6ba94249ba53093ba41ced19ef790ba037bd92e71576e8a8398db2a22,0,1,University-of-Florida-expired.xml
-04a7e6fd8cb3f35e53a258ff9ef6364156096f79f89a6bbfc3ab4a562c7cabae,1,1,University_of_Greifswald.xml
-43ad4ec0941692425b76936f5d10f1e866849052ac5f6b537d796e4beb0b3bdb,1,1,University_of_Grenada.xml
-b575e760bd6ba5050468054cf07c4ecfb955e4671bc898d8e0ae781edfcf6ee5,1,1,University-of-Groningen.xml
-54816021249161dd67c1e063f262f60bdb650932a82e351028717bb50347c9a9,1,1,University-of-Helsinki.xml
-1d9da1c02f10316311989f868fb5a6a1aadd7e986a2e9eed25b4d061627c492b,1,1,University-of-Hertfordshire.xml
-0151d50e71cd4f0c608fd5d6ccff49862cbd3c9da6e910cba7d5bc7b136edf1a,1,1,University_of_Houston.xml
-6642506b348a157b2fc8b05fec0c40a6c21de1b6f82fdef38eaa1a4e79eb2588,1,1,University_of_Iowa.xml
-fb45af1fb5699cab6007d287aa55ed1977fc6ed96e508ed1b9fdb424662d90cb,0,1,University-of-Kansas.xml
-cbeda63cbc139d567c3968e82e57cdfa0f4ada356e844f2e9c96793eed1d7665,1,1,University_of_Leicester.xml
-3fb888e05ab2904735bac34b2a01c4f80092692bc035c4198dd12055f53cb817,1,1,University_of_Louisville.xml
-7348f47d6e380a9db30b1db471ad9789f8626873de30027ddc17de72d022fb11,0,1,University_of_Maine_System-problematic.xml
-bffcbe68aafccead956b6c6632afd2de03feeb9c08d6b468ddca372bb77abe38,1,1,University_of_Maine_System.xml
-ce6883479c26297a48c2cdea26cb8c3c73fd972b03dffa98ae58bd65bd63f221,1,1,University_of_Maine.xml
-e1515eab7c49ca3ee3c60e48cd94dce063981c37da4ae5b5b5f70229365249db,1,1,University_of_Manchester.xml
-026b7f74d856185d5d794296c4fb768463bc197c78434bd1137b57468a9c1fde,0,1,University-of-Manitoba.xml
-879f2555db5876717333c179bbb7e96a702c4daabcb42cd50cf45f916803faa8,1,1,University-of-Massachusetts-Amherst.xml
-96dd94cc310e936db76b39b334266d0d30a1679ddd1454f8a839edd3a74c701a,0,1,University-of-Minho-mismatches.xml
-f593cb0581c01e5ce42694956e88944412789b720c6a8921184183c3522ec110,1,1,University_of_North_Carolina_at_Greensboro.xml
-c2f53734fbb96b512f068f719a8a3ef75bfd817273ee5b6f47ad97d34e28ac19,1,1,University-of-North-Texas.xml
-d509521a3c1738dc49e0a3ce7c886a42703544a89019b1c8b37bd10e0a4e5662,1,1,University_of_Passau.xml
-7611ad10b797bdca195db4227d555d26e83df42183ef7e4acb1a3b6fcb13ffbe,1,1,University-of-Pennsylvania.xml
-484808a58abb59322bc7b7356e703f9a5e15ccd8114d038d439e39d2a356986a,1,1,University_of_Pittsburgh.xml
-5b27e3b98b43a7f49b1d48c729c9e1ce0d96eafe1d633f559a3993e3cd8b2965,1,1,University_of_Rostock.xml
-b86be48cbba40d49e2a4a11c5cc8645f58573bc57ee7286cb4261e98ca0a9cd5,1,1,University_of_Salford.xml
-a2c417f59890cee4ef34f1988379f010489bb2aecea4acec123336e98d409172,1,1,University_of_Sheffield.xml
-9284dd0302537c6d05bc76bef1eae1a57e3cd1dfa56ed498ba91eef1d9a3c577,1,0,University-of-Southampton.xml
-d81ab6e36bc204f9bb4fb99fe02d12e007595791ff05af8d7c681eba9dad8c42,0,1,University-of-South-Florida-mismatches.xml
-0ab02841a6ead3924af19e98e079cc70a542e0c5c2b22a652846babbc9126383,1,1,University-of-Strasbourg.xml
-15a0a423022f67dc61d0566c74e5c9ac88a9550bdc0b76f0af473ff839ba9b34,1,1,University_of_Tampa.xml
-8dd3fe0367f6eca6fb2f7323bd4298e08b7dea54b2217889d02a1dedefd011a1,1,1,University_of_Tennessee_System.xml
-db0928eec5b4a635be138187bc8de4356c5e0761ff8288d4c2cbf8354df1200c,0,1,University-of-Texas-at-Austin-mismatches.xml
-f9eb2c0b78dce339b2999b544ae922ba97cc5144da81cc56e2e0f9e746cd8e01,1,1,University-of-Texas-at-Austin.xml
-2d7e488b3e4a90a34b5f5181e6268c777769b5f52d9bb2ee98586ee0619106b2,1,1,University-of-Texas-at-Dallas.xml
-71d54122dedd8ad1d74e9ef5180aedf5e6cb470fc77ea84f6b5a61f095665b44,1,1,University-of-Texas-Southwestern-Medical-Center.xml
-bd8ac3d00a5c2dad7c95051d88787288e4da87f7060a07667fd02ad3e657f482,0,1,University_of_Toronto-problematic.xml
-322408b567a94f9851873cc21f1a44703dc8c15136d9d50f383797a4f1909d27,1,1,University_of_Toronto.xml
-050eae4257fadecddc7ff779e88ce596400e9eb49d9b61c8393620e5d07a073f,0,1,University_of_Tuebingen-problematic.xml
-30da65cf0fab77298ff7de648a318a979257d48dddf7e1e388cd1a330dd3c84b,1,1,University_of_Tuebingen.xml
-5271bdc47d196a50d523472c3ba3697315cc4c4b479292a05633ea7220861395,1,1,University-of-Virginia.xml
-6e8e81f563f6c50e976dd1ae1db5b503c26104a75885e97918201b45854dcd52,1,1,University_of_Waikato.xml
-02408ea5408aaa7adf7869ff7c78bac86d09985ee8a0213155a69b386037fe25,1,1,University_of_Warwick.xml
-6d3ec302fd6822f515d5cd489c4c5cea3f6da3e437e4d5760b30558c0e9fb055,1,1,Univie.ac.at.xml
-187c1e105e934ff0a29bb9c458fdd622e27178e97e11d2d4d7ae9566342284c9,1,1,Uni-Wuerzburg.de.xml
-04f4e0a5aa2958d5f9d095cc0148d118aeede6fe8b452d0ce04deb2d05b6ac38,1,0,Unix4lyfe.org.xml
-4f67e8e759cc42d720be78fd43a371f8dc9b31e1cfc85c6fda9868ab6420819e,0,1,UNM.edu-falsemixed.xml
-b06cabbae0f74749486d8544b4d72fed988b03e0e75b52db4090e6419fa5b4d5,0,1,UNM.edu-problematic.xml
-fd1cb2c416147864863495c30b4145bfc3f79cf52df275cd0c7557bd26e2d441,1,1,UN_Multimedia.org.xml
-78883fd089717176950d088e72542402b9e44a55a6019bc7ed8149ef3253cf76,1,1,UNM.xml
-585574c84903b25c25dc8e125b8221e69f1bfb10b063bd5cc76ee06fc20391f6,1,1,UnoEuro.com.xml
-8b36ed5e4f3113f750b1ff0929bd2c08f4bede76606e629e394abaea7bf4d265,0,1,Unvanquished.net.xml
-d417d78e437661c9259bfbe32547faaaf287ae000924de8748d7eb9be3b679b4,1,1,UOregon.xml
-576febcb2526052cf69c26013f26d075d466d8c57ac8e34d5aa5c60a74f3d1b5,1,0,Up0.net.xml
-1e7afb2d07a0fe5df0bcd6714c690bc64c65aba0a312c0f229d7bc2fd91eb702,1,1,Upic.me.xml
-b2652fb3b6a3a5c4e03de6e5664c7d55e4121e4776e9eb005cb5dd5f94cdc372,0,1,UpsideOut.com.xml
-d3e479ef9630aac9aec35c14a8096015fc3e647819741c43cc11e1d2f1c3f478,1,1,Upstart.xml
-1b3b0accece6234eefb92d4632d6d10abf6df83bf13b92c30ba732540a087bc1,1,1,Uptilo.xml
-7a8af06077ef6a8685b605edd0960eb6918591aeed504b275f00a52b17ce8743,0,1,Upxth.com.xml
-82d9a9e33fdc00692b3f32910877b27fce81ce6acc6b01ae16e21dd70a29af12,1,1,UrbanTerror.info.xml
-907266beed4a1d669f500978ddd09c3766b1680e654181dad0525c38e5cbea78,0,1,URLParser.com.xml
-33ab26a088d63978966e38721dd24779df0e72a6fa927c56b1ef9c8fe606849b,1,1,USBank.xml
-7b056903a4f7fcdc8d3d1ed3a57395ada26cfa168d1a9e54829caa29df18a670,1,1,USB.org.xml
-0119c6af7375f199b2abe6be9120a24e34e92f152065cca868f1bf2423f9b0bc,1,1,US_Citizenship_and_Immigration_Services.xml
-0c69356202bfd59745aa70de4633d7f8d9718fc6d322676b6c8c068cf038b799,1,1,USConstitution.net.xml
-647434d2e73a8e2487a70f4119136be4b5b89886e76e40454907674bddd27130,1,1,Usenet.nl.xml
-fb7ce621ebf160185b59dc717d05f7593714e3010dbd34bf5e8033da1c28a73e,1,1,UsenetServer.xml
-e8405ab7de7e35328c149fde0221a4b584545b98daf10f5cfb5f971a53459403,0,1,USENIX.xml
-37253ac964c42bb2b910621759ce273f910ae0f63f7497db27d5c900555d2a54,0,1,User-agents.org.xml
-624acce46170f956a165171c63c53ceed4292bc051035065d8f5c5b803cbd96d,1,0,UserEcho.com.xml
-572e6c6c3fe2566a715dec30b294a7f34c2e2a9d54a5102f280d5e7b640288c3,1,1,User_Local.xml
-8b9757d610171917073c32268fe0d7bc7631fcd4761316ed92b54dfd74745172,1,1,USF_CA.edu.xml
-95ef65e8f7f8431c9ae9dd2559d1b8c7885adcd11940c6f0136c7b1c83660bc2,1,1,USFreeads.xml
-0459389c2f8fa05a34ad3dc433d7cd0581dd707c79e49429d5ac0aa437f2e7e4,1,1,Us_Magazine.com.xml
-2b171e0c1a41d6836b6b5fbbf97b98892b673ce3d96d1edaf8fd033833627cde,0,1,US-military.xml
-f2618d5b46589e1746a59effbf739199baa32d0664a676bcfc167b580f51633e,1,1,US_Nautic.xml
-37eb6c467058dd4c92fc635e6daa2c37fa7ef6c2d7c24996fafbde8fe43071e6,0,1,USNI.org-problematic.xml
-676d7b6466eddd7c4b84147c9035810f041067ca01a8014b6213dbc78b23b864,1,1,USNI.org.xml
-7117752a2c7d1607ec5f301ee4727caa857502b7e5f40939a9a34aaa2698a7d8,1,1,US_Patent_and_Trademark_Office.xml
-9d520a1203c22dbdf80ac93b50a27e29dcfe41ac276cf4c24653b145620aaf1c,1,1,USPS.xml
-6ab570d720487086e1a4fb4c35ba8e83ac78224aabaedeb775d563a64fec4413,0,1,UsrJoy.xml
-7c6d86624be6982826202f069e40c5a9c7992de1a1f5fb59172b7b189de759a0,1,1,USRowing.xml
-a2167040bff3e730b2f6a598f15f30e67a28d023d57d3054367faaba4c6413b1,0,1,USTC.edu.cn.xml
-e0196dc5cfda4c44d00ccc948be4625928702a756f853982d6f30cea49c299ee,0,1,Us_Weekly_subscriptions.com.xml
-977266102db9309a7d4170b34745445bc2847c67f8193af518c396ccd96eba71,0,1,UT_Dallas.edu-problematic.xml
-737b235408a8cec2956ac513e3fb5555052b8998d8d48a1ffa90f230bcee8e64,0,1,Utica.xml
-7a670737c4553654c86e065057ee25d27b90472c143fecc08410c0014d408b79,0,1,U-Tokyo.ac.jp-problematic.xml
-9930b44adf309fe470f7236b05c0214ffa54b766b220153cc20c6efbc73bad04,1,1,U-Tokyo.ac.jp.xml
-7e3668c85a13398c1e069e3af4a15b183ea5e25893919d05c9db98c7cdf76bed,1,1,UTSanDiego.com.xml
-ff2aed5082fa7812f6c0249393b7ef2d75b9b97fff27ee0f75315c7a458a7adb,1,1,UTwente.nl.xml
-64e8196b342796d56261c72b9f1bdd3490a6e752cbae1d28121a7c94681f4569,1,1,UU.nl.xml
-ca9050e78347c6536655c413199565617815b1041ffd409a5a7b80c35a34e6a4,1,1,UvA.nl.xml
-99a979f836e3af45cbded60128ef9c83ca449dcd3ac13695cd75390c1748877a,1,1,UvCDN.com.xml
-fe5d16ef6cbe84e3d548ff490cc33a18e29fc54aab9808654bd8fc214838ec70,1,1,UVic.ca.xml
-0c8e6b3534cb476f07b87f282cef2ac6b42a3faed84185a85603d04c6631ff8e,1,1,UWinnipeg.ca.xml
-028839a97af7c9fab87ab0d04ad22a5b1c97cfeac28db5e1c420d0aefe23b836,1,1,V2-Cigs.xml
-9e79e53b9d27933407e25b6ae48564d41c019cf08df1fd18b7c1ac3ef857efcf,1,1,V3.co.uk.xml
-d3f445382899ca09c99404bce4c0dc739768f0dc907d78284b8034baabde4256,1,1,Vacenza.com.xml
-cfdc69c8d2f893965541cb488516d85a43ee5b586763e49a22328f70b5dca311,0,1,ValueClick-mismatches.xml
-d070a6afe739d131285eb87df1c11305e469cd1a3d8bfe9a57e223b4b76b9830,1,1,Valued_Opinions.xml
-7bc889588443078f59821e9233c63c1334358fef4969ad55f578fe0809548e27,1,1,Vanilla-Forums.xml
-4531034e48f47841a5b548ec7e196b850d8fb1d87b7cdd691f035dadfb2b8c15,1,1,Vanity-Fair.xml
-51ab02160086d1d0ea7a8f03e7d7f2e1fbfca841b48c29c23a1f956547ddbd0e,0,1,Vantiv.com.xml
-541f99103984b2d16a34d46579e10aabe0ea10f4d140bfe8366add23b98d39e4,1,1,Vara.nl.xml
-b9b0396960be487e61ab263e7341e1fde512be9ce069f219bdfde8c363b7ab60,1,0,vauva.fi.xml
-9b71ab6abe5802fb80f50cbfa9f44e41447ff19cd5acc611b5e951a99164dacc,0,1,Vayabe.com.xml
-3245df25fb7f2b5a07f1885682e18b5c92d8f9512d1500cfb30c49b351418d20,1,1,VBSEO.xml
-be315490f478856932d6d7e0dcc69137ae0a39411a18ede9e9b96119cb4b591a,1,1,VCE.com.xml
-0437b4009022008b56e58c10d08f7ace43d83d3ca946e7592c55962e70a8d941,1,1,Vcommerce.xml
-25f9fb9ad931eb2633dbf62a790dbef671003bedf05ce0c67a776b430eff60e3,1,1,VehBidz.xml
-c27f0cfa9d553de3e65fa2f7249aa87b923ea51d078f6604d02e00930928bfcf,1,1,Ve_Interactive.xml
-a8b3a0ea0666e7d56893363da090fc2ad0c3b5ca37698babb2889307a80b1c0d,1,1,Velleman-Group.xml
-1a36f007f5be12089abe81f6a3f5c8963497f8d467f45b9cf126c514fd3c330f,0,1,Velmedia.net.xml
-d7d49d47fe10386c6886db6cb4b3ef8167c923100033c5cafdd8078dc36e1eeb,0,1,Velox-Project.eu.xml
-861008dc67204d83a6834d4044ed097df201351924b424cff5de57bd7575ea8d,0,1,Velvet_Cache.org.xml
-a2678d219a759ab4e9acd04c0325e691f559c7ef55a4f2339d8138274d95d586,1,1,Vendetta-Online.xml
-03142920bcbd18f915c755c8a6feb9026a44156731240b30534a05b95fa051c5,0,1,Venuscafem.com.xml
-2c6ef10eb55db8e24789d312206e9912c7ef86db24585146659860398002b639,0,1,Verbraucher-Sicher-Online.xml
-6dcce26da889c8a152970f62daa73d12b350cdc9940a7df4a7afdf7f73808d3a,0,1,Verdad_Media.xml
-e12b6d5c3eb3e1115119c50070ef4410f6a1e1bc3dbfc9791bb77cb6d82fc52f,1,1,Verio.xml
-4ba3afa6e1e3e9f6e447986b6da4ce1ae8ffcba7c34c6bcf25e7b9ada2396f48,1,1,Verivox.xml
-a321163ecff3304c427ebd7c7e1bf7ea5e0cd763fd1a90ce92f5a09cf236c2ea,1,1,Verizon_Enterprise.xml
-c203bd812b538ac7a93a711f6fc1ee663f78ccb6320db05cbcde811059abd45c,1,1,Verizon_Wireless.xml
-eecd0f86d3976af4bc45b163839875219eae631d4620da357e43ff7e62f9a8bf,0,1,Verkkouutiset.fi.xml
-a67f146e96321ef2c2c1134df0c15776173421d74192c292e81b0c21fbac8a4a,1,1,Versus-Technologies.xml
-0b2034c782d1f7de7c5c6e8416834dd312d437a0aa984e67fb21399667ebdee8,1,1,Vertical_Response.com.xml
-5ab4e8817d97cc42dc1ad1bedaed85bf7143017835e140f10151e222aad74b58,1,1,Vertical-Web-Media.xml
-16e0ed171068f77addf104b14307dcf01fee8cebc1e31e7ede7fda53788d7b12,0,1,Veruta.com.xml
-dca681ef703ae025e986f1bef45575452df62543baa7a0bde381d6bf9a8ae56b,1,1,v.gd.xml
-02f195e0534b84f901ed70ae7a9d857a25a6b97dc1c97dd159131c9caa8298c7,1,0,VG-WORT.xml
-e99551855f8ef5ad0f4f728e46fb5a4503349c443b6a065609328d7c06fd1cbc,0,1,Vianet-Group.xml
-f3815e08088545447609c202403cc423f67885387fa9bc503aff7792e87f1156,0,1,Vidarholen.net.xml
-49337b9ff4af1c53f5837dc436d4f0ae9cae829c0683776836f6d85371376ecc,1,1,Vida_y_Salud.com.xml
-b9a96bb1e88431f6f508e49e1d99303ad56fb2e9beae2b798f019de7ad65239b,1,1,Viddler.com.xml
-eb34c8200f181b33896dc0505a73648eb61692cff8c8b4a6d6db5bb9c4b88e70,0,1,Video_Interchange.xml
-2639ce1da9c9d0ce487df98d01e9e103f32f9adc5d04af04969d5359f3a9aff5,1,1,Vid.ly.xml
-df92a6c088421e80ef1512cc4e07a73d50fb36826406200f4e0a156ea08164bb,0,1,Vidplay.net.xml
-2a88d6ede0612b9738f6c40819e7de2a2513c5f569ddf8f0f5931419868f7e8b,1,1,Vienna_University_of_Technology.xml
-6c277f1037e46a2a059a8225c98a2f813e5230cc48477cc5b2a1d345db77eb27,0,1,Vindico.com.xml
-18f68240c337af3d25a31fdd762e61ce4f5ccbc38e704cbfcd8979340f0c58a9,1,1,Violet_Indigo.xml
-c65c279bfb304e80050f2d823e3c75e5dfcfb8e91f4c6d14ef3ae8c6dfcd6a39,1,1,Vippy.co.xml
-248224aa6eae82843e074512ebf52e4bb7134b14410768fdfff5cfc3c684e52e,0,1,VIPserv.org.xml
-ba2110c8479f41bafaa987c96e313d2a36236847dc7524ae40f8eedaae8aea68,1,1,VirginAustralia.xml
-d31795f6dc7b602c6fa54849c5b2bed28fc4086fba5a737802c43318720ab947,1,1,VirginMobile.xml
-3d01d5a53f3e1e8077b0062f55b9431b2d3639128902e2c355a60e78395cb7d4,1,1,Virool.com.xml
-f684638888b331ae7388ef7261ca4558d1cfa293cb6df9c0dc71b4dcbd3ccb98,1,1,VirtualTourist.xml
-fb197d01a624c439a7398370623d75cc17a09b9d588146e730a9b68eb14fed89,1,1,Visa_Buxx.com.xml
-dbe019114063e2c60b5b435f84d09fec9eaa2780607cf1e0f36a339e7cfbb414,1,1,VisaHQ.xml
-64e823b83cab4914e4e1c9da47f565ad861233091b293f0296a71b8ac7c2d98c,1,1,Visalia_Times-Delta.xml
-bfbf5bb3ba5a0109b83aeaeeb253024d75278ba85e0da3dd1b36c1f0f597e231,1,1,VisibleGains.com.xml
-2bec628efc102efc2825893a3f92ca575a26973904c89a73868defae85303139,1,1,Vision_Art_Forum.com.xml
-001cc8e606c1c655ae640884f9229e7aef96ac5e70c0632f15d55fef59299230,1,1,VisiStat.com.xml
-b79f622abeb5a8754d580adbf3606aa28a8691e24b777bfddef95be0ed06bde7,1,1,Visitestonia.com.xml
-22a722ad1e155e3bee71bdb1b9a3ae90235e9687c48bd387489dfb3ecb58bc8f,0,1,visitsealife.com.xml
-e8b64c820d09e77cb97d2250a529daedf6369536382561b86a348cf771d306c5,1,0,Vistech-Communications.xml
-3e2928ef78292707c878d9f864868e03bcc28d1a69d5c4edebb850c2546e3215,1,1,Visual_Revenue.xml
-a91841a6d81a0937c3bcf3c15585f20a224fb70c17ced32225a35c2033dc90b7,1,1,VisualWebsiteOptimizer.xml
-17f1c78d50c87022ca1f5898c00fb9e43c7c14237916d34135694a41f7906c2a,0,1,Vital_Gamers.com.xml
-75241e3d48e2578f64e46c1f39f4f412ddc4842f0990303c345b99085c18e16d,1,1,VitalMend.com.xml
-e8b46e57d859720a333bde3f21e0e4e36f8cb867c6686a4362c23ea4406ce6eb,1,1,Vitalwerks.xml
-1a4329d51b72f9ccf5f12e8c839f4dc9f744fa6a15dbf4a9fa183b2de95d4410,1,1,Vitamin_Shoppe.xml
-c6920ad0394ef6eb3d8cd9b9d0a5e7cabbb1105a6112acf5f9bae60e97bbe2bb,0,1,Vivaciti.xml
-def6557f41d619f8602d97c4fce68e182ccb0c83481d6fecb7a2a42730640906,1,1,VK.se.xml
-d8652363747589e0cc4a5b880150b22dee3297bb2f869e7b29a63460845fa6ed,0,1,Vliegtickets.nl.xml
-1fbd0ddcea01b9288b9e8463e41972935388ea7e301ff2e33dfe5b229ef3ba2e,1,1,Vogel.de.xml
-e9a5887debbf054a3ef705efba7b795befe0936487d3ddc7ec0f99f53feac955,1,1,VoiceFive.xml
-636420e195fd3296d6a0fbf1aa2af10402c50fd22d6c5070e95b87aa62784f08,1,1,Voices.com.xml
-048d38ae60595630ea75d34041ee63a13d29c206889610516255abcb03fc3d73,0,1,Volatile_Systems.com-problematic.xml
-371824af717de2b303cf2bb11abeb2f875647d007f8c185a6eade9d8b7f129a5,1,1,VolkswagenBank.xml
-60dbeac15d3d6eda2af921da74fad8574b00638eb24d625c3a0102116e59a2ce,1,1,Volotea.com.xml
-26d45e71e55a0f19a90163b240a658d92fd4763f71c0543b938ac9e49610c13f,1,1,Volunteer2.xml
-799b335fc4486d44b5a2aca9e49c56ab08b59d481ad628d2e35031e3aa35c563,0,1,Volunteer_Centers_of_Michigan.xml
-a3272a5c7db777b4e3636ee2b04c43aba5c642ba0b35cc2c00a1855240c9b475,1,1,Volusion.xml
-e8ab747c2c48c350e01e548b2347aa6d96d2c6f4ffad2547a20af7f69075ff8c,0,1,Vonage.xml
-82f403ce2aa0ef95af059c8f8c1fb6356d899cc3d1fb8f945c92a4876b4be4f6,1,1,Voodoo.com.xml
-98c991785d9dafd952609edadb85f69b2e0c5c50bd078d8d363909b6991e26ed,0,1,Voxel.xml
-9fce590c2181d4d42d766e871b4888dd8a9d495dfc4af419c061990f7e973570,1,1,Voxer.xml
-a117ac9f7b8795646b325f5eb086f08c07fc84618a85fe91af96a9527d964301,1,0,Vox_Media.com.xml
-fbb2fcfdc39c784e914f554977d3a26db00fa1e6ff968ba934d080098cee8295,1,1,Vpnbook.com.xml
-5c2cdab9ad0027eae3e6ed5e3a3d7d86a452c9b88943141dc80f2318aef7ce43,1,1,VSCo.co.xml
-3543ad7fed39e1c7d9c1b73cf31abdf033da4b81176b2e6065249b4b1c7f7d19,1,1,Vsexshop.ru.xml
-702dcdfd0555f771183b4881039deb392716e34e15d5bb1eed7f4242d5867ec4,1,1,VTLUUG.org.xml
-6ab17f304050bf833d996cd4dfaca231efc3e2425ded3fa81a2f7d1e0a988593,1,1,Vueling.xml
-43471ca065dd71d70737df3a6ece1cef751fa1e46b1aabae2b6c729e08e06cfd,1,1,Vulture.com.xml
-5e6ee0075ce408d3737133ae80b81cb99ae90f227f711824fcec6178247a60ff,1,1,Vungle.com-falsemixed.xml
-712e9c11fa537727065fc17317b376dbff0841191976892fbf193cb53956d898,1,1,Vungle.xml
-fa9a39660d76b6fd8ba5715b15f43fd9fb1a2ef4be04d03a2fb98d7f7654b0ed,1,1,Waeckerlin.org.xml
-686d52b9e887359a9fb2a3f6eede8bd81fbbba5a1b3d89935e85c4350883fca0,0,1,Wagner.xml
-27404357c723335a40fff088677c65479e073c10b4998506d2e74387d370b113,1,1,Waitrose.com.xml
-ba1593452425105c70c808ddffae73fc41bfc86e0709d962e65157bd81608498,1,1,Waitrose_Direct.com.xml
-683d274e1fa8a18fd73448d94c4477050828c653cbf8c5196bf212046bcb6943,0,1,Walder_Wyss.com.xml
-1e725fb2b88399ecd5321418db119a913147f532bac20834f9c5380fe6b3d230,1,1,Walgreens.xml
-934aea98a94884c94202660e696cd7be14d2e0ee87a4d378c05d87d485c9c0e0,1,1,Walking_Men.xml
-30c1aefedf43c09d94978750bb47fbcd58852e9a878b1e78f4f3a6b30e218f9c,0,1,WaPo_Labs.com.xml
-7c94dfabc1a022237d22c9a38e763f561592b7553acecd8b5aafe7717e3a7669,0,1,WAPY.xml
-490f37f964fb9bd7058bb7e2f52ac06bbd076a10428097654ea263efca37f629,0,1,Warner-Artists.xml
-1e26f33749735e34741aeb8c24b83694092d38f61bd183b7b901cbc4b7aa8385,0,1,Washington-Post-Company-mismatches.xml
-b52e61298887f1a7e837d0cc6e48edd14de0d6ed0983477debb5020ce32c646a,1,1,Water-Challenge.com.xml
-855ec707726db8e3579c25eaede7119ebd757579fe32a139ab7bfd60818a0380,1,1,Water.org.xml
-345b6b2fae63c61a265a9f34a768f81133caa068af17f61b0a82066f02da1777,0,1,Watsi.org.xml
-23f434ff5a7809ed8d594dd950cc7c6c1277c7b8d314949f66e10fb649c5f838,0,1,Watson_Institute.org.xml
-52d9cdba31649b9d41912d38370925a9e4c794f6728f436279628fa9246facf6,0,1,Wazapp.xml
-f1651a48bdaad9f31cc77e80136abe27ffcb9ed903a322fc915815f524c140a4,0,1,WD2go.com.xml
-3666082fafc12b33eaf9ce626f9f90c8a9a240fe12c4e0d04d8b70deaf6abdc5,1,1,WDWS.xml
-0b818b88c798284cf79298c509cb9c22b7bfbbb1a9a2f8168214c272781633f2,1,1,Weather_Decision_Technologies.xml
-87ab309e0c850f1c2e13b04ecaecfafbd1a36a3bed68c65848916a856165906e,0,1,Weather-Underground.xml
-8adf76997622bf023f5962d510eed3723a9fd06e573f76f63de6c7d90759475d,1,1,Weatherzone.xml
-af9750e35db542ad03022e8ae5b73065aef4db2aa1a6282597a86180aa3276d4,1,1,Web4U.xml
-6a724458c5e87ecd10c347e083283ca4e52829c337b4b153587cc9459055d16f,0,1,WebChuck_hosting.com.xml
-9bee3822b846148f1ab13645d332e7d528edba99136159c599f6c91c077caa78,0,1,Web.com-expired.xml
-a49b0578f415ba010c6768174e7afb7d9366d8fcbb7f03aca3f75b66c9bcf3c5,1,1,Web.com.xml
-43ee8656c3c9a8dc1b81d85e29e08c8e63aa584449617f3e4fd44b47c689b988,1,1,Webcontrolcenter.com.xml
-f225dba1046880c1a5c8af9b187020345a85b45515f5f1e7e7bf7be3d01a68fb,1,1,WebD.AM.xml
-f00d35e0cf73278bddebc4394e187439c7d0ea39b15ca69d7d388ac5f9947e48,1,1,WebEx-Communications.xml
-7d614409e9e5c1a7376193e7aeb5950c05b532cfcbe43798148117dd94d4c5d0,0,1,WebFaction.xml
-ae2bd71a4770853110661947b509383266595ac5f97812c8c508b52fd8d25436,1,1,Web_Hosting_Geeks.com.xml
-bc92646bf8aa3728d12304c9eb2881dd885c1d16ba9a282d5062fd72f61162d1,1,1,Web_Hosting_Pad.xml
-8e1b8e2644fbc5ea473acc74abe12256d8d73f48272ea58a092eedbb55c64e21,0,1,WebhostOne.xml
-44fe73be51a061f9dcf30e620cf15781f1877f196f976c601a1127fb9910f942,1,1,WebKite.com.xml
-5476efa330deb653c29a6a507a11c146301f583daad0a8346c880b96673b27af,1,1,Webmagazin.de.xml
-bfe2947fa6ab729061147e9434ba6180a107604fb21bea83859f881216c556c4,1,1,WebMD_Health_Services.xml
-f6ed6586e201c975e17b11fa03740c7c62396674f98f8658941c55f3f50acd1e,1,1,WebMD_Health.xml
-3a027fcaefdfe8d30b38cac405d2ea12596fb81d20d332625986ede4abdc5cfd,1,1,WebMD.xml
-886c705a0f37bd5c15f25de8e488c192ec8dbc40e69a6e0233b324882e338a68,0,1,WebMediaBrands.xml
-f1edbaf6bedf99890c4874b611f74c7c52cc13f881604fbf47512278b22235a6,1,1,Web_of_Knowledge.xml
-b4d326aa97154c16f32e9f4d0153706b2d86e02d1582b93ed46bbfc4b9a6652c,1,1,WebProspector.xml
-2d8f080362c974c4499bea98f697b453570605594629a18c507e4220b0bb3c1d,1,1,Webroot.com.xml
-dbcc578640c655bb0c695ed4716f13a9fe86cc90b044caff1a3ea7ed0dd7dbbf,0,1,Webropolsurveys.com.xml
-6b9beff410e23f4a51edf8752eb83a964188180f19f31aeeb94b6a2ac5e985b7,1,1,Web-servers.com.au.xml
-2a440880c552f3116b2f466d4e831d12c295b8cd8defcb4a42e56324cc839936,1,1,Webshopapp.com.xml
-9555dd551da9c352bd8fecb285654af767f26c8b4af8d374c21b3633a4f25990,1,1,WebShopRevolution.com.xml
-468aeb536e3361358da17effce6b01df3368bb7525a2887d525090baaf76fab6,1,1,Website-start.de.xml
-0f41d0c349d361784937ddd7bf8606350f90f334333ec012d1aa71ffce930c40,1,1,WebSocial.ly.xml
-8099e76e7198496cd1570b4476ea4a7c3a76fc0848410bdc511be3aefa499652,0,1,Webspace4All.xml
-2493d70899767787da29629a688d99fdfbe49ff0256bbc83358728c79a5bb267,1,1,Webspace4Clans.de.xml
-39473a2d6d9c9c2de2c83463787611072e5f3d043021edbf4d60641a6800390d,1,1,WebSpectator.com.xml
-823ec8b7eadf76010137d26fb1947ef171d76fd906ab726890646c2c0f138884,1,1,WebStarts.xml
-cacf30b765ad68c61fa84ffd3e6db0c636f668d9254c900bbcb46de15d6e21ae,1,1,Webstat.com.xml
-e0962fe4bfd0ae833241c4bc9a66106920ceb9e8756cc70167e591707bf39775,1,1,Web-Stat.net.xml
-3d80a69e9d91fc2f37c66f7889675712cb9888dacab9283f99f727033181f32a,1,1,WebtraffIQ.com.xml
-3b00d11eb23e281b78d953139aa17e5cda9e6e581be328d2f477795bbd85582c,0,1,Webtranslateit.xml
-7b39cdcde2f5b3492cb97b2c0f9131fd5f70139f0ce9724681623b7f1f786dae,0,1,WebUrbanist.com.xml
-cbbbdc6fb132f2cce52e3bd5d7010ac0c6c59a5c8e1f002542b76530aa712ba6,0,1,Wego_Health.com-problematic.xml
-1e44ed825125907d6cae44ff8a80367225031b54bd0149694db611e930f54ac3,1,1,Weiss-Research.xml
-8edb6acdbf3d70453a1082ad9cbb2b3301dd7a4a0e8aeb391fe10aaee498545e,1,1,Weizmann-Institute-of-Science.xml
-28a3153777a4465a34523baf6cca4b3b128b2f4b5e41ae3e502f47db6ad8a805,0,1,Welcome_to_MetLife.com.xml
-5521b2ce5f7e898bd3ea0d41fdf92bdc76c7af51509e957e7a588c6b8caafb06,0,1,Welk.sc.xml
-0ed29acd687b02e649ba4e94cdf7aa43f7cb401efc0eda560c4c73f576b48fee,1,1,Wennect.info.xml
-3653a4785c28b361d04ce12c88e0811350bd50b94e6a361494f64761aad5efe6,1,1,WePay.xml
-8ef5a712c94fcf3c7c94ecf7ac46a0865b9cc73306d6f0791f6075a592a5da1f,1,1,Westconsin_Credit_Union.xml
-7ab5d760eb782800a94d7868d79b6f3c7f5621b0aeb88c7e5a8553b7db109471,1,1,WestJet.xml
-4ae3197a0f427caf0222250d811f751f5020e591719b63f3bc5e3e385af14c57,0,1,Westlotto.xml
-7c46e3c1ed2a02cc97133e546feb32b729001242e893e3345ccdefd7db720c57,0,1,West_Orange_History.xml
-ae329e6dccdf72e9be85e53412a7f7a5a53fd44ae853a3e77a20bfeb506b7ea8,1,0,Westoxon.gov.uk.xml
-4db4898402f91818bd0be4b49ceb3f4dc465bde9a2357852c6f47dac0cf178e3,0,1,West_Virginia_University-problematic.xml
-f6818c41df99bdc8cb6885f67c27d91672a516cc1a15610b5c301a9d6ac62bbd,1,1,Wg_cdn.net.xml
-a8ee7b73785bf6447ac322a7af90fba115d2e75bd6a0ef6e7a90e387727b3035,0,1,Whamcat.xml
-6752c99fd0b439b67c13d1ee1063aad8dcf1eeab6e963e406d5a7d6f60af26ab,0,1,Whatbox.ca.xml
-d669b7329d3d77ae1b7ea27a18d05c702e30146dd819f21fd6385c13fe879390,1,1,Where_2_Get_It.xml
-d7537f7e21858dae64562a4f7e64eb14ad7608c4cd25e133a867f51bfd3a0ac9,1,1,Which.xml
-50c7f973e9fcfc2ac8b4f4e7a496a4219b21d97805a22d7fa46f978271a45de5,1,1,WhippleHill.xml
-4e1e48a6d64b79dbafb4bc50032a7e7cd1d71d8782f4c67baa2c1000f2ad0a54,1,1,Whisper-Gifts.xml
-77afcd6e8f15f2b6ade0164b29785cfcd7f94fe60ca8526ad54e24268e01a7b3,1,1,WhiteFence.com.xml
-29211dc5f2d57c9bc61b7b06716d49200976da7aa5bdd47278557c373dce7f6b,1,1,White_Hot_Hair.co.uk.xml
-ec1f9a810ffe14b674903c235952fd9df05dfb0d65b4120bd101b10e33862711,1,1,WHMS-FM.xml
-ed22ad03a82abe2247c198290494e6b90c1b93eefa050d66ed0b5e1759fa27db,0,1,WHO.int.xml
-de49320aa2a935c29d7f90ff0f792ec51a875b448e3cb6828b33c0f37027bf78,1,1,Whole_Earth_Lectronic_Link.xml
-ce809b7bfb8a875feace606a959feb0c461732114e07338c99e258968c591b4a,1,1,Wholesale_Labels.com.xml
-230a483aa987f21dbc5a05091cf8551abc09c10b1c540ca8413061dd68578719,0,1,WhosOn.com.xml
-902704e9faef436127566d05680cb008bee54cbb8d1bbd14382154c336382fb9,1,1,WHYY.org.xml
-5cb01803034a302feddb724d1de7010b34fa9800c902750a827d09992bf86d43,1,1,Wiggle.xml
-4c02cc6ab1440cb13b9205d0962960237508dcaf8ee69df4d12ca1eb6cd4439f,1,1,Wikidot.xml
-c1856a2322d96ad7886aac15a5b3208374cf14605bcde5e575b29a58e3c378dc,1,1,WikiFur.xml
-8a7e65d32bbe8207b80c2f044d4eb72da60b050f414a3af814d9629b61003482,1,1,Wikinvest.xml
-991032b4bf2e8bb26a7ba5c74594c44c83cae224aba49e6eb5633315a687cd09,1,1,Wikispooks.xml
-6b389a045eb70ccb96292b8dccc757b0b6b580dc6f25217f64a96b4e0de100f2,1,1,Wild_Apricot.org.xml
-abacb82abb4afdf07777ea5f54f6ed6bc53e344a39d61dd7c2223eb41a00d636,1,1,Wiley.xml
-823c9bbe863794ade57f6cbf53ccde300deaff8dd3750ccb4d8871c8378f1043,0,1,Willamette_Week.xml
-202a31b211e1fa86534fdfafd80c26659137ecbd6d339ad48afffa62caef66f2,1,1,WIMM.com.xml
-3ce142deff512761b20f1763091c30db82f829e2fed0cf0536788da292634d20,1,1,WiMP_Music.com.xml
-0685ef4a293e73be70fafc4c148235057f90b2c647810ed1dc0edea3d04051b7,1,1,Windows_IT_Pro.xml
-2a13f6f7f6baa4dfa85c46ddb205c5b4dd5c9f20b736d016668dcc4c9caa7414,1,1,Windows_Secrets.com.xml
-c67337bfabda36b7b539abd15c565dd410a20d741dfc2f8eaf379b3038019fa7,1,1,Windstream_Communications.xml
-cbab69014af2a02afb1bbfea64dd5b7ffb8e8759be2095d6e47579ede6041c96,1,1,WineAustraliaCorporation.xml
-32f6f0cc30b35c8976e18ca4ddcce03605753a93b528a5c2a1ca2d30a472d5b3,0,1,Wingolog.org.xml
-4d0fb71c488ef77a627fec50cb67c5cd70738d0c2b044599b6b84891bd76c692,1,1,Winner.com.xml
-b859ff3f78e0cc95b3eaf81ec38153ffd631b75974902b50e181c2b9a73b08f5,1,1,WinSuperSite.com.xml
-5c7c1decb343a51e56b6509b45f8a1cbfd832ba22565e9203fbafd50ffa58aac,1,1,WiredMinds.xml
-0812bcf9185f25ab18b3a7f034f332203cdd4f3de385ab2b5e2737e83e9d969c,1,1,Wishabi.xml
-0c730c529f3cd69f7b467d504ff460ca46301660b1dcdd88ba8300d4ab7f1d6e,1,0,Withknown.com.xml
-83ef353b9aab96e56973c3d8150c1f1e3b6cff4f68cad34cd754f3e2de999108,1,1,WiTopia.net.xml
-107b0e53285b3cd5b876c03108d666cba1dfac53af5a62e0190c990cb08c4cc8,1,1,Wizard-Internet-Services.xml
-e22b3d745136b4a31c7b3f3a8f65c77a8721c1afe5e2729c6cf848fa07ff8687,1,0,Wolrdssl.net.xml
-e237009069a1f7e25b8d4d83fb77aa2f273405abbeafa0f3d9f70110cc08c309,1,1,Womens_Health_Specialists.xml
-f7999de568e74fdd703ef7c2aaa057ce2dc1a418d112ea5cc64aa6d29e57915f,1,1,Wonderlandmovies.xml
-072d4bc8ac964f1db9fc4b3d1113dbe48d854b975c89839f3d5395226fee2b33,1,1,Woobox.com.xml
-69427086023cb8659815526a6188f67b519e979df97998a8ef78e590491da187,1,0,WooConf.com.xml
-ff4541825f047117ea740aace764bdbde39b51a83d23cdb600daeea7bbcd7acc,1,1,Wood_Green.org.uk.xml
-01357c1a2236bf8664e3b8a3ed041831b4058127f0131bb71a33838848aeaf63,1,1,Wood_Green_Shop.org.uk.xml
-d02bc8e6c4c0698add8f02b5c424af3519429f251ccbb2f0c8ec34adf2b08ed4,1,1,Wooga.xml
-9500afb5ea51aa0371714903801089c740a7955bd157c8bd6001ee5a3b2fcd3e,1,1,Worcester-Polytechnic-Institute.xml
-1351c796282373c4a1beba3a91c865b02dd2eaf726604288521e93305137d326,1,1,Word_Pro.xml
-92fd7c961a4c484497a8ed726fdb7fd9a41968ef735746fd08457c37560bcb75,1,0,Workable.com.xml
-a591bae4c365ae63ff66b71537267c743185306bd4a99df5b85e3f014566f332,1,0,WorkplaceGenderEqualityAgency.xml
-078235defd32e86110f2907ad23d7587ac05fc64016db23653018aa86af59233,0,1,World_e-ID_Congress.xml
-dd94cdda2877f852dadfc3a6f2a4d2ef0a464b068a74f6e897a3ab1a15f3865a,1,1,WorldMate.com.xml
-ee8ad00200a94e47b5c9f1552f83a87c7322a0632d7c29ec2c6cdf42edad6475,0,1,WorldOfGames.xml
-229f57810d6333fe8c71989bcc5f5a53950f0fe8234f8b36dbe6a8d71e938292,1,1,WorldRemit.com.xml
-7d767b7fdebe50158bc48e64f5ba12b728876f3ef525c3048ea8ab811b80ba4f,1,1,World_Television.xml
-5065006d5171a62cff4f927cbf17959479e9a88d39bb4604dfc31bc0f0265318,0,1,WOW_Analytics.co.uk.xml
-7ed531500221bdf06b719c9fc59447357de77faeb9082ee7fac65da7df701332,0,1,wpa_supplicant.xml
-b47cc604491e9ea5abf27d66cf994aa808b9d54f3fd47c3ceb552ebe91e60d84,1,1,WP_digital.net.xml
-33bc269186d151c347c4f00a203fe49573bc7cdde3759cccaea2d68e9d78b148,1,1,WP_VulnDB.com.xml
-c50baba02efe0851746b13be4652c164eff3a697417dfbeaf2bc377333074e7e,1,1,Wrapadviser.co.uk.xml
-b4ec6518bb54a6735c38a417b5f75bedeafbcdc73af0a31b33d3b9dbd84f99e0,1,1,Wservices.ch.xml
-839e3b1b48265738219453a6d10596ac6fb455ae2eb1694461875764dbfd67e6,1,1,WSO2.com.xml
-0601000b056c8d7de6c0cb80720f2ea5f7cab0a1011c94bf864532c51a148bd6,1,0,WSWS.xml
-1ed6357a0bb2153b9502ce2da5335e3d0d33a158a40570fc7bd40b6da0e54c5d,1,1,Wtop.com.xml
-b94784e7eb00715fd3fe87ab49dac824b3782b11c5430040d043fbac74a51ac3,1,1,Wuala.xml
-6c1a71abc06b206b2553313564a62d2e4f0bc6a5754a6aabcece7ef4748227e2,1,0,Wufoo.xml
-07be9292aa9ca08d70d90978165e5cb8b2c05989adefb5415f8f42b8a93bf799,1,1,Wush.Net.xml
-35b9f9fea8edf91132dec2e801b084b173a58c519fba894e5968418d6e35fbab,1,1,WyzAnt.xml
-1c84c0dd4bb4e7fa73acb226531ebe3b49147e20552a8806d9a1e4f9b62b61d6,1,1,Xeno_Gamers.org.xml
-26ceb3ed2032542f2075db396734c4cb25ae58347dc7c780364bb100d198c2fd,1,1,Xetum.com.xml
-156219abcab5a2f7d540931ee48a5dfd590aacd92c99cf3170ac9e983f4d8451,1,1,Xg4ken.com.xml
-645bbf60775e6f22ed51012989302f79d66c599b6b17871b883e33861f497a4d,1,1,Xing.xml
-b925930748b05e603d05bbad9b35c9ada0a990bfe8e44c680ef5838f5f56de9b,1,1,Xperia_Studio.xml
-e19344f07aaff2b8ae094fc1a4996f194f1141ba0971c691fe22fa78925e7062,1,1,Xserver.xml
-c3b7364fc8fc89d5336f32aa6707c94f727abe4f7ea809a785263b41e1d5d7a3,0,1,Xtendmedia.com.xml
-e77d44925373ab7fc4744dae5d3f9c240e80b1499b102f134f47bd73cc65ed6c,1,1,Xtenit.xml
-b8313e7119852559552d512337a53de37e7afc059bb67c1ede004c3d91ee39c6,1,0,Xxxbunker.com.xml
-877bfd008b92154e0bf7b5147d1f41fec35b98f8035ccb91b263c2bf12d4b06f,1,1,Yahoo.net.xml
-da2fd160f5803ed73336a0fcd8df659b18857c624b22cd38b286edef13e6c73e,1,1,Yahoo.xml
-0ae6d35db343a943f6c54011416bbe796435a13c894b5a719d1adc0dd29666e4,1,1,Yandex.st.xml
-06806c1c50dd7729426a2faf63f7fde5b63b8cedea2e9006d1bb6cdca2245826,1,1,Yandex.xml
-28a370e112f80d74aa3bfd8e462ad2d09cea7042d7acbcd02b884ce87e236485,0,1,Yard_Digital.com.xml
-4684c5eb2b3e908ba1df47e631a05893af0eede30bc216a2b8dea46d2a78d509,0,1,YellowPages.ca-problematic.xml
-e0aa84f8ba58a339cabda74594b507c6427a9856a57b1ee3232c7f38ab80751a,1,1,Yimg.com.xml
-b79a6f7942d60a42026d304ecc887e0471b7c96b27698c0a815f5892e697316d,1,0,Yimg.jp.xml
-033bde8d86b20991608db24d1854b95a54fcc5d4b072c26a0c3e78877283ac43,1,1,YMCMB_Official_Merch.xml
-e0e4f7684c12fe25d34855d2767e08ed7bda64933f68aaaad8011ad1adb7db31,1,1,Yocto_Project.org.xml
-e30ef33bc99dda8ab603adee29b3d8e5c06a4f03e54ca5945c4756191fea41b2,1,1,Yottaa.net.xml
-f4db2125b4fc951f0971e8aa055a6b211e5099c191befe5855d63ca4a48095aa,1,1,Yottaa.xml
-5cdcff57455137ed99e5dbee098da64da25450e307aec99e1edb70ae75f43c24,1,0,yottos.com.xml
-05499c6ac75a23be8dedec97f6de344fe3f4ae8814d5c9cfa658b52d55eab758,1,1,Younited.com.xml
-cfbde187e30d48e3cba35b483b695821fb55f832be575ab8ac58a5c061fcaefa,1,1,Yourfone.de.xml
-e5702add6d485cbf6b018ea01bbd171656a5cb624d2ac685d7e189a373ab8812,1,1,Yourhosting.xml
-56e89e377a8cc26456aeaf380a689621afd18dd2e445399865874768f48943e1,0,1,Your-Mailing-List-Provider.xml
-ccf17e77a962a90d0134a342bbf02a2c48fceaa22672205030959e5eabbb54d1,1,1,YouVersion.xml
-e00e5d9fc4fe720adbeb30a8beada5e4f8828e8f52f7fdf1d823069c3a7045a8,1,1,YP_bot.net.xml
-da23893ad1085a663c483066192fb377681b2da58672faf6140b5e253641a45c,1,1,Yuku.xml
-95c9dd36a1b9d28f39272c9da9349eed53f7a3b8a1504e8f6729f67a0ab2a03a,0,1,yWorks.com.xml
-888ff125026e53553f9582f1f91112d5582cc1a8d8f6556521e3b9c6c68241a3,1,1,Zacks_Investment_Research.xml
-dafaa75542876c11f864cee777e3c27eca10e0a06a329e87dbc1a245eb195877,0,1,Zagony.ru.xml
-58d2ae044a28eabd58e291233ae948d32e97c42c8cf892aeb2deefe4b4e2a21d,1,1,Zappos.xml
-f2259f9e04795b50d29c0020d8584709289d8be4127d3d160eea3b249e99e245,1,1,Zapunited.xml
-972b3ee4c16a24aab20cca8dfa8399b9353b8a2e5ae04388a24ea4398a10aa9d,1,1,Zendesk.com-clients.xml
-7c12b054111110d274fd3955b238c3c544d8add3805aec8b854d02de700868a2,1,0,Zerista.xml
-1a9195d25a90cc91b40b8849807f44232c624957f6e2f7558f0b2a8bf0732dc5,0,1,ZeroC.com.xml
-54a3a4d4ac3a332b6443f6bbcfb86b516f0cd9e8a489ebf187db3fafdd14f2fa,1,1,Zero_Day_Initiative.com.xml
-d4d130ec1722ad45b9e5a1a8333eb19808d9670167bab5a87363514eeccbfae6,0,1,Ziff-Davis-mismatches.xml
-79057e37af586028932d412ea020851a94189c112d4a48c9a07152fd46dd2cd2,1,1,Zimbra.xml
-f76e810891c9301354123b801ace36ba307fff5ae323fb9bb608d8c2757efb36,1,0,Zissousecure.com.xml
-1bd3ea0ac5d7e83747e15c8f53558ec863a930f53467de80e6fb2c8318ccbf51,0,1,Zlavy.odpadnes.sk.xml
-9cd38fa17f1cd6833d79cf92cd572c624c70f933e6fc881e52c92f486137b270,0,1,Zocalopublicsquare.xml
-647ab116fc936ea3096d11681a6105832fc48cbddddb8e105d2a319eefceb71a,1,0,Zoho_static.com.xml
-618c143055176140e5517088535d1ca18e01aa1132adc3f546cf5f28d4f1f655,1,0,Zoho.xml
-298d6a10c5dd2b45a9b73221ad69566c8110e36acbca3a7ce0404433e7f4a636,1,0,ZONZA.tv.xml
-5e6c30a2931bd2bf241ebcbe957a2b200f6d4526b26321e77bc41c405d90c59a,0,1,Zopa.xml
-0a43f73ea001dcef9e970232e3d8d3123f0a4eb163e1d69b23498bff60a735c9,1,1,Zopim.xml
-6750e29d302751af08e3cbe82647eb8a652fba4be1efbed4bb63473ec6ed40c2,1,1,Zorpia.xml
-54f30ba3843ce2be5355b1259c28f6ffe7b3c9feddcbe0de95025bc506e913cf,1,0,Zulius.com.xml
diff --git a/utils/setversion.py b/utils/setversion.py
index 62239c756ce7..2ade838ac523 100755
--- a/utils/setversion.py
+++ b/utils/setversion.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.6
+#!/usr/bin/env python3
 from datetime import date
 import json
 
diff --git a/utils/sign-bloom/add_timestamp.py b/utils/sign-bloom/add_timestamp.py
new file mode 100755
index 000000000000..1a45eeaab142
--- /dev/null
+++ b/utils/sign-bloom/add_timestamp.py
@@ -0,0 +1,21 @@
+#!/bin/env python3
+import json
+import sys
+
+def usage_and_exit():
+    print("Usage: " + sys.argv[0] + " TIMESTAMP")
+    sys.exit(1)
+
+if len(sys.argv) != 2:
+    usage_and_exit()
+
+try:
+    timestamp = int(sys.argv[1])
+except:
+    usage_and_exit()
+
+
+for line in sys.stdin:
+    json_line = json.loads(line)
+    json_line['timestamp'] = timestamp
+    print(json.dumps(json_line))
diff --git a/utils/sign-bloom/async-airgap.sh b/utils/sign-bloom/async-airgap.sh
new file mode 120000
index 000000000000..70899e99e837
--- /dev/null
+++ b/utils/sign-bloom/async-airgap.sh
@@ -0,0 +1 @@
+../sign-rulesets/async-airgap.sh
\ No newline at end of file
diff --git a/utils/sign-bloom/async-request.sh b/utils/sign-bloom/async-request.sh
new file mode 100755
index 000000000000..201ec13bee15
--- /dev/null
+++ b/utils/sign-bloom/async-request.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+# Used to sign bloom filters created with https://crates.io/crates/create-bloom-filter
+
+set -e
+
+if [ $# -ne 3 ]; then
+  echo "Usage: $0 bloom_file public_key_file output_path"
+  exit
+fi
+
+
+SIGNED_SHA256SUM_BASE64=`mktemp /tmp/bloom-signature.sha256.base64.XXXXXXXX`
+trap 'rm $SIGNED_SHA256SUM_BASE64' EXIT
+
+mkdir -p $3
+TIMESTAMP=`date +%s`
+cp $1 $3/bloom.$TIMESTAMP.bin
+cat $1.json | $(dirname $0)/add_timestamp.py $TIMESTAMP > $3/bloom-metadata.$TIMESTAMP.json
+
+echo 'Hash for signing: '
+sha256sum $3/bloom-metadata.$TIMESTAMP.json | cut -f1 -d' '
+echo metahash for confirmation only $(sha256sum $3/bloom-metadata.$TIMESTAMP.json | cut -f1 -d' ' | tr -d '\n' | sha256sum | cut -c1-6) ...
+
+echo 'Paste in the data from the QR code, then type Ctrl-D:'
+cat | tr -d '\n' > $SIGNED_SHA256SUM_BASE64
+
+base64 -d $SIGNED_SHA256SUM_BASE64 > $3/bloom-signature.$TIMESTAMP.sha256
+openssl dgst -sha256 -sigopt rsa_padding_mode:pss -sigopt rsa_pss_saltlen:32 -verify $2 -signature $3/bloom-signature.$TIMESTAMP.sha256 $3/bloom-metadata.$TIMESTAMP.json
+
+echo $TIMESTAMP > $3/latest-bloom-timestamp
diff --git a/utils/sign-bloom/ddgse b/utils/sign-bloom/ddgse
new file mode 100644
index 000000000000..3b7927ec5c38
Binary files /dev/null and b/utils/sign-bloom/ddgse differ
diff --git a/utils/sign-bloom/ddgse.json b/utils/sign-bloom/ddgse.json
new file mode 100644
index 000000000000..1d490c6e64ee
--- /dev/null
+++ b/utils/sign-bloom/ddgse.json
@@ -0,0 +1 @@
+{"bitmap_bits":11364392,"k_num":24,"sha256sum":"371bfb628062de163947c1226d99a5f3823e6fe1bc0838d24e0deffad1c96ee2","sip_keys":[["4746789603923246281","9835731802354323261"],["11277193235900924841","7296056854142719726"]]}
\ No newline at end of file
diff --git a/utils/sign-bloom/standalone.sh b/utils/sign-bloom/standalone.sh
new file mode 100755
index 000000000000..a4c614071ed2
--- /dev/null
+++ b/utils/sign-bloom/standalone.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+# Used to sign bloom filters created with https://crates.io/crates/create-bloom-filter
+
+set -e
+
+if [ $# -ne 3 ]; then
+  echo "Usage: $0 bloom_file private_key_file output_path"
+  exit
+fi
+
+
+mkdir -p $3
+TIMESTAMP=`date +%s`
+cp $1 $3/bloom.$TIMESTAMP.bin
+cat $1.json | $(dirname $0)/add_timestamp.py $TIMESTAMP > $3/bloom-metadata.$TIMESTAMP.json
+
+openssl dgst -sha256 -sigopt rsa_padding_mode:pss -sigopt rsa_pss_saltlen:32 -sign $2 -out $3/bloom-signature.$TIMESTAMP.sha256 $3/bloom-metadata.$TIMESTAMP.json
+
+echo $TIMESTAMP > $3/latest-bloom-timestamp
diff --git a/utils/sign-rulesets/async-airgap.sh b/utils/sign-rulesets/async-airgap.sh
new file mode 100755
index 000000000000..41ec90876c2e
--- /dev/null
+++ b/utils/sign-rulesets/async-airgap.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -e
+
+if [ $# -ne 2 ]; then
+  echo "Usage: $0 private_key_file sha256_hash"
+  exit
+fi
+
+
+echo metahash for confirmation only $(echo -n $2 | sha256sum | cut -c1-6) ...
+read -p "(press enter to continue)"
+
+SIGNED_SHA256SUM=`mktemp /tmp/signature.sha256.XXXXXXXX`
+trap 'rm $SIGNED_SHA256SUM' EXIT
+SIGNED_SHA256SUM_BASE64_QR=`mktemp /tmp/signature.sha256.base64.XXXXXXXX.png`
+trap 'rm $SIGNED_SHA256SUM_BASE64_QR' EXIT
+
+echo $2 | xxd -r -p | openssl pkeyutl -sign -inkey $1 -pkeyopt digest:sha256 -pkeyopt rsa_padding_mode:pss -pkeyopt rsa_pss_saltlen:32 -out $SIGNED_SHA256SUM
+
+cat $SIGNED_SHA256SUM | base64
+cat $SIGNED_SHA256SUM | base64 | qrencode -o $SIGNED_SHA256SUM_BASE64_QR
+eog $SIGNED_SHA256SUM_BASE64_QR 2>/dev/null
diff --git a/utils/sign-rulesets/async-request.sh b/utils/sign-rulesets/async-request.sh
new file mode 100755
index 000000000000..e63571da3469
--- /dev/null
+++ b/utils/sign-rulesets/async-request.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+set -e
+
+if [ $# -ne 2 ]; then
+  echo "Usage: $0 public_key_file output_path"
+  exit
+fi
+
+
+RULESETS_FILE=rules/default.rulesets
+
+SIGNED_SHA256SUM_BASE64=`mktemp /tmp/ruleset-signature.sha256.base64.XXXXXXXX`
+trap 'rm $SIGNED_SHA256SUM_BASE64' EXIT
+
+mkdir -p $2
+TIMESTAMP=`date +%s`
+REFERENCE=`git rev-parse HEAD`
+echo "{ \"timestamp\": $TIMESTAMP, \"reference\": \"$REFERENCE\", \"rulesets\":" "`cat $RULESETS_FILE`" "}" | tr -d '\n' | gzip -nc > $2/default.rulesets.$TIMESTAMP.gz
+
+echo 'Hash for signing: '
+sha256sum $2/default.rulesets.$TIMESTAMP.gz | cut -f1 -d' '
+echo metahash for confirmation only $(sha256sum $2/default.rulesets.$TIMESTAMP.gz | cut -f1 -d' ' | tr -d '\n' | sha256sum | cut -c1-6) ...
+
+echo 'Paste in the data from the QR code, then type Ctrl-D:'
+cat | tr -d '\n' > $SIGNED_SHA256SUM_BASE64
+
+base64 -d $SIGNED_SHA256SUM_BASE64 > $2/rulesets-signature.$TIMESTAMP.sha256
+openssl dgst -sha256 -sigopt rsa_padding_mode:pss -sigopt rsa_pss_saltlen:32 -verify $1 -signature $2/rulesets-signature.$TIMESTAMP.sha256 $2/default.rulesets.$TIMESTAMP.gz
+
+echo $TIMESTAMP > $2/latest-rulesets-timestamp
diff --git a/utils/sign-rulesets/standalone.sh b/utils/sign-rulesets/standalone.sh
new file mode 100755
index 000000000000..97e835dfb2a4
--- /dev/null
+++ b/utils/sign-rulesets/standalone.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -e
+
+if [ $# -ne 2 ]; then
+  echo "Usage: $0 private_key_file output_path"
+  exit
+fi
+
+
+RULESETS_FILE=rules/default.rulesets
+
+mkdir -p $2
+TIMESTAMP=`date +%s`
+REFERENCE=`git rev-parse HEAD`
+echo "{ \"timestamp\": $TIMESTAMP, \"reference\": \"$REFERENCE\", \"rulesets\":" "`cat $RULESETS_FILE`" "}" | tr -d '\n' | gzip -nc > $2/default.rulesets.$TIMESTAMP.gz
+
+openssl dgst -sha256 -sigopt rsa_padding_mode:pss -sigopt rsa_pss_saltlen:32 -sign $1 -out $2/rulesets-signature.$TIMESTAMP.sha256 $2/default.rulesets.$TIMESTAMP.gz
+
+echo $TIMESTAMP > $2/latest-rulesets-timestamp
diff --git a/utils/standalone-translations.py b/utils/standalone-translations.py
new file mode 100644
index 000000000000..48624c0363c4
--- /dev/null
+++ b/utils/standalone-translations.py
@@ -0,0 +1,56 @@
+#!/usr/bin/env python3
+"""
+Generate a messages.json translations file for HTTPS Everywhere Standalone
+"""
+import re
+import sys
+import os
+import json
+
+source_dir = sys.argv[1]
+dest_dir = sys.argv[2]
+
+message_regex = re.compile("")
+strings_needed = [
+  "about.version",
+  "about.rulesets_version",
+  "menu.globalDisable",
+  "menu.globalEnable",
+  "menu.encryptAllSitesEligibleOn",
+  "menu.encryptAllSitesEligibleOff",
+  "options.enterDisabledSite",
+  "options.addDisabledSite",
+  "options.hostNotFormattedCorrectly",
+  "options.disabledUrlsListed",
+  "menu.httpNoWhereExplainedBlocked",
+  "menu.httpNoWhereExplainedAllowed",
+  "standalone.proxy_server_info_prefix",
+  "standalone.transparent_true",
+  "standalone.transparent_false",
+]
+
+def convert(locale):
+  translation_file = os.path.join(source_dir, locale, "https-everywhere.dtd")
+  if os.path.isfile(translation_file):
+    target_messages = {}
+    with open(translation_file, 'r', encoding='utf-8') as f:
+      for line in f:
+        m = message_regex.search(line)
+        if m:
+          message_name = m.group(1)
+          if message_name in strings_needed:
+            message_value = m.group(2)
+            message_name = re.sub("[.-]", "_", message_name)
+            target_messages[message_name] = message_value
+    return target_messages
+  else:
+    return False
+
+with open(os.path.join(dest_dir, "messages.json"), "w") as out_file:
+  all_target_messages = {}
+  for locale in os.listdir(source_dir):
+    if not "." in locale:
+      target_messages = convert(locale)
+      if target_messages:
+        all_target_messages[locale] = target_messages
+  out_file.write(json.dumps(all_target_messages, sort_keys=True, indent=4))
diff --git a/utils/trivialize-cdn-rules/.gitignore b/utils/trivialize-cdn-rules/.gitignore
new file mode 100644
index 000000000000..ad46b30886fa
--- /dev/null
+++ b/utils/trivialize-cdn-rules/.gitignore
@@ -0,0 +1,61 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+
+# next.js build output
+.next
diff --git a/utils/trivialize-cdn-rules/index.js b/utils/trivialize-cdn-rules/index.js
new file mode 100644
index 000000000000..4f8116dd84be
--- /dev/null
+++ b/utils/trivialize-cdn-rules/index.js
@@ -0,0 +1,161 @@
+'use strict'
+
+const util = require('util')
+const path = require('path')
+
+const fs = require('graceful-fs')
+const xml2js = require('xml2js')
+const request = require('sync-request')
+const chalk = require('chalk')
+
+const readdir = util.promisify(fs.readdir)
+const readFile = util.promisify(fs.readFile)
+const parseXML = util.promisify(xml2js.parseString)
+
+const rulesDir = 'src/chrome/content/rules/'
+
+const log = (level, filename, message) => {
+  switch (level) {
+    case 'WARN':
+      console.warn(chalk.yellow(`[${level}] ${chalk.bold(filename)}: ${message}`))
+      break
+    case 'INFO':
+      console.info(chalk.green(`[${level}] ${chalk.bold(filename)}: ${message}`))
+      break
+    case 'FAIL':
+    default:
+      console.error(chalk.red(`[${level}] ${chalk.bold(filename)}: ${message}`))
+      break
+  }
+}
+
+const supportedCDNsRegexs = [
+  { // Cloudfront.net
+    fromRe: /^\^http(?:s\?)?:\/\/((([\\a-z0-9_-]+)\.)*([\\a-z0-9-]+))\/$/,
+    toRe: /^https:\/\/\w+\.cloudfront\.net\/$/
+  },
+  { // 2o7.net
+    fromRe: /^\^http(?:s\?)?:\/\/((([\\a-z0-9_-]+)\.)*([\\a-z0-9-]+))\/$/,
+    toRe: /^https:\/\/[\w-]+\.1[12]2\.2o7\.net\/$/
+  },
+  { // amazonaws.com
+    fromRe: /^\^http(?:s\?)?:\/\/((([\\a-z0-9_-]+)\.)*([\\a-z0-9-]+))\/$/,
+    toRe: /^https:\/\/s3\.amazonaws\.com\//
+  }
+]
+
+const escapeRegExp = (str) => {
+  return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&') // eslint-disable-line
+}
+
+const isSecureConnectionOkay = (host) => {
+  // FIXME: terrible performance...
+  let response = request('GET', `https://${host}/`, {
+    headers: {
+      'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:10.0) Gecko/20100101 Firefox/10.0'
+    },
+    timeout: 3000,
+    socketTimeout: 3000,
+    maxRedirects: 5
+  })
+  if (response) {
+    return true
+  } else {
+    return false
+  }
+}
+
+const trivializeGenericRewrites = async (fstat, content, rules) => {
+  return new Promise((resolve, reject) => {
+    let rewrittenAtLeastOnce = false
+    let originalContent = content
+
+    for (const rule of rules) {
+      for (const supportedCDNsRegex of supportedCDNsRegexs) {
+        if (supportedCDNsRegex.fromRe.test(rule.from) && supportedCDNsRegex.toRe.test(rule.to)) {
+          let host = rule.from.replace(supportedCDNsRegex.fromRe, '$1').replace(/\\\./g, '.')
+
+          if (host !== null && isSecureConnectionOkay(host)) {
+            // TODO: replace rule here...
+            const ruleRe = `\n([\t ]*)[\t ]*\n`
+            const ruleRegex = new RegExp(ruleRe, 'g')
+
+            if (ruleRegex.test(originalContent)) {
+              content = content.replace(ruleRegex, `\n$1\n`)
+              if (originalContent !== content) {
+                rewrittenAtLeastOnce = true
+              }
+            } else {
+              log('WARN', fstat.filename, `Warning: cannot construct RegExp which match rule ${JSON.stringify(rule)}`)
+            }
+            break
+          }
+        }
+      }
+    }
+
+    if (rewrittenAtLeastOnce) {
+      try {
+        fs.writeFileSync(fstat.fullname, content, { encoding: 'utf8' })
+        resolve(rewrittenAtLeastOnce)
+      } catch (error) {
+        reject(error)
+      }
+    } else {
+      resolve(rewrittenAtLeastOnce)
+    }
+  })
+}
+
+const trivializeCDNRewrites = async (fstat) => {
+  return new Promise((resolve, reject) => {
+    (async () => { // async wrapper for await keyword...
+      let content = await readFile(fstat.fullname, { encoding: 'utf8' }).catch(error => reject(error))
+      let $ = await parseXML(content).catch(error => reject(error))
+      let rules = $.ruleset.rule.map(rule => rule.$)
+      let rewrittenAtLeastOnce = false
+
+      await trivializeGenericRewrites(fstat, content, rules)
+        .then(rewritten => {
+          if (rewritten) {
+            rewrittenAtLeastOnce = true
+          }
+        })
+        .catch(error => {
+          reject(error)
+        })
+
+      // TODO: Add support for more CDNs
+      resolve(rewrittenAtLeastOnce)
+    })()
+  })
+}
+
+(async () => {
+  await readdir(rulesDir)
+    .then(filenames => {
+      return filenames.filter(filename => filename.endsWith('.xml'))
+    })
+    .then(filenames => {
+      return filenames.map(filename => ({
+        fullname: path.join(rulesDir, filename),
+        filename
+      }))
+    })
+    .then(async (fstats) => {
+      return Promise.all(fstats.map(fstat => {
+        return trivializeCDNRewrites(fstat)
+          .then(rewritten => {
+            if (rewritten) {
+              log('INFO', fstat.filename, 'trivialized')
+            }
+          })
+          .catch(error => {
+            log('FAIL', fstat.filename, error)
+          })
+      }))
+    })
+    .catch(error => {
+      log('FAIL', '::Promise.all::', error)
+    })
+})()
diff --git a/utils/trivialize-cdn-rules/package-lock.json b/utils/trivialize-cdn-rules/package-lock.json
new file mode 100644
index 000000000000..423379f97406
--- /dev/null
+++ b/utils/trivialize-cdn-rules/package-lock.json
@@ -0,0 +1,2221 @@
+{
+  "name": "trivialize-cdn-rules",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@types/concat-stream": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@types/concat-stream/-/concat-stream-1.6.0.tgz",
+      "integrity": "sha1-OU2+C7X+5Gs42JZzXoto7yOQ0A0=",
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/form-data": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-0.0.33.tgz",
+      "integrity": "sha1-yayFsqX9GENbjIXZ7LUObWyJP/g=",
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/node": {
+      "version": "10.17.26",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.26.tgz",
+      "integrity": "sha512-myMwkO2Cr82kirHY8uknNRHEVtn0wV3DTQfkrjx17jmkstDRZ24gNUdl8AHXVyVclTYI/bNjgTPTAWvWLqXqkw=="
+    },
+    "@types/qs": {
+      "version": "6.9.3",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.3.tgz",
+      "integrity": "sha512-7s9EQWupR1fTc2pSMtXRQ9w9gLOcrJn+h7HOXw4evxyvVqMi4f+q7d2tnFe3ng3SNHjtK+0EzGMGFUQX4/AQRA=="
+    },
+    "acorn": {
+      "version": "5.7.4",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
+      "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
+      "dev": true
+    },
+    "acorn-jsx": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
+      "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
+      "dev": true,
+      "requires": {
+        "acorn": "^3.0.4"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
+          "dev": true
+        }
+      }
+    },
+    "ajv": {
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+      "dev": true,
+      "requires": {
+        "co": "^4.6.0",
+        "fast-deep-equal": "^1.0.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.3.0"
+      }
+    },
+    "ajv-keywords": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
+      "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=",
+      "dev": true
+    },
+    "ansi-escapes": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
+      "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==",
+      "dev": true
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "array-includes": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz",
+      "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.7.0"
+      }
+    },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "dev": true,
+      "requires": {
+        "array-uniq": "^1.0.1"
+      }
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true
+    },
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "dev": true
+    },
+    "asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
+    },
+    "asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "requires": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
+    },
+    "aws4": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz",
+      "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA=="
+    },
+    "babel-code-frame": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "dev": true,
+      "requires": {
+        "chalk": "^1.1.3",
+        "esutils": "^2.0.2",
+        "js-tokens": "^3.0.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "requires": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
+    },
+    "builtin-modules": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
+      "dev": true
+    },
+    "caller-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
+      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
+      "dev": true,
+      "requires": {
+        "callsites": "^0.2.0"
+      }
+    },
+    "callsites": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
+      "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
+      "dev": true
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+    },
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      }
+    },
+    "chardet": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
+      "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=",
+      "dev": true
+    },
+    "circular-json": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
+      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
+      "dev": true
+    },
+    "cli-cursor": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "dev": true,
+      "requires": {
+        "restore-cursor": "^2.0.0"
+      }
+    },
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
+      "dev": true
+    },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+      "dev": true
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "contains-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
+      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
+      "dev": true
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+    },
+    "cross-spawn": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+      "dev": true,
+      "requires": {
+        "lru-cache": "^4.0.1",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      }
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "debug": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+      "dev": true,
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "debug-log": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/debug-log/-/debug-log-1.0.1.tgz",
+      "integrity": "sha1-IwdjLUwEOCuN+KMvcLiVBG1SdF8=",
+      "dev": true
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "dev": true
+    },
+    "define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "requires": {
+        "object-keys": "^1.0.12"
+      }
+    },
+    "deglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/deglob/-/deglob-2.1.1.tgz",
+      "integrity": "sha512-2kjwuGGonL7gWE1XU4Fv79+vVzpoQCl0V+boMwWtOQJV2AGDabCwez++nB1Nli/8BabAfZQ/UuHPlp6AymKdWw==",
+      "dev": true,
+      "requires": {
+        "find-root": "^1.0.0",
+        "glob": "^7.0.5",
+        "ignore": "^3.0.9",
+        "pkg-config": "^1.1.0",
+        "run-parallel": "^1.1.2",
+        "uniq": "^1.0.1"
+      }
+    },
+    "del": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
+      "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
+      "dev": true,
+      "requires": {
+        "globby": "^5.0.0",
+        "is-path-cwd": "^1.0.0",
+        "is-path-in-cwd": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "rimraf": "^2.2.8"
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
+    "ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "requires": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "es-abstract": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz",
+      "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==",
+      "dev": true,
+      "requires": {
+        "es-to-primitive": "^1.1.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.1",
+        "is-callable": "^1.1.3",
+        "is-regex": "^1.0.4"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
+      "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.1.1",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.1"
+      }
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "eslint": {
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.18.2.tgz",
+      "integrity": "sha512-qy4i3wODqKMYfz9LUI8N2qYDkHkoieTbiHpMrYUI/WbjhXJQr7lI4VngixTgaG+yHX+NBCv7nW4hA0ShbvaNKw==",
+      "dev": true,
+      "requires": {
+        "ajv": "^5.3.0",
+        "babel-code-frame": "^6.22.0",
+        "chalk": "^2.1.0",
+        "concat-stream": "^1.6.0",
+        "cross-spawn": "^5.1.0",
+        "debug": "^3.1.0",
+        "doctrine": "^2.1.0",
+        "eslint-scope": "^3.7.1",
+        "eslint-visitor-keys": "^1.0.0",
+        "espree": "^3.5.2",
+        "esquery": "^1.0.0",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^2.0.0",
+        "functional-red-black-tree": "^1.0.1",
+        "glob": "^7.1.2",
+        "globals": "^11.0.1",
+        "ignore": "^3.3.3",
+        "imurmurhash": "^0.1.4",
+        "inquirer": "^3.0.6",
+        "is-resolvable": "^1.0.0",
+        "js-yaml": "^3.9.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.3.0",
+        "lodash": "^4.17.4",
+        "minimatch": "^3.0.2",
+        "mkdirp": "^0.5.1",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.8.2",
+        "path-is-inside": "^1.0.2",
+        "pluralize": "^7.0.0",
+        "progress": "^2.0.0",
+        "require-uncached": "^1.0.3",
+        "semver": "^5.3.0",
+        "strip-ansi": "^4.0.0",
+        "strip-json-comments": "~2.0.1",
+        "table": "4.0.2",
+        "text-table": "~0.2.0"
+      }
+    },
+    "eslint-config-standard": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-11.0.0.tgz",
+      "integrity": "sha512-oDdENzpViEe5fwuRCWla7AXQd++/oyIp8zP+iP9jiUPG6NBj3SHgdgtl/kTn00AjeN+1HNvavTKmYbMo+xMOlw==",
+      "dev": true
+    },
+    "eslint-config-standard-jsx": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-5.0.0.tgz",
+      "integrity": "sha512-rLToPAEqLMPBfWnYTu6xRhm2OWziS2n40QFqJ8jAM8NSVzeVKTa3nclhsU4DpPJQRY60F34Oo1wi/71PN/eITg==",
+      "dev": true
+    },
+    "eslint-import-resolver-node": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz",
+      "integrity": "sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==",
+      "dev": true,
+      "requires": {
+        "debug": "^2.6.9",
+        "resolve": "^1.5.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "eslint-module-utils": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.2.0.tgz",
+      "integrity": "sha1-snA2LNiLGkitMIl2zn+lTphBF0Y=",
+      "dev": true,
+      "requires": {
+        "debug": "^2.6.8",
+        "pkg-dir": "^1.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "eslint-plugin-import": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.9.0.tgz",
+      "integrity": "sha1-JgAu+/ylmJtyiKwEdQi9JPIXsWk=",
+      "dev": true,
+      "requires": {
+        "builtin-modules": "^1.1.1",
+        "contains-path": "^0.1.0",
+        "debug": "^2.6.8",
+        "doctrine": "1.5.0",
+        "eslint-import-resolver-node": "^0.3.1",
+        "eslint-module-utils": "^2.1.1",
+        "has": "^1.0.1",
+        "lodash": "^4.17.4",
+        "minimatch": "^3.0.3",
+        "read-pkg-up": "^2.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "doctrine": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
+          "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "isarray": "^1.0.0"
+          }
+        }
+      }
+    },
+    "eslint-plugin-node": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-6.0.1.tgz",
+      "integrity": "sha512-Q/Cc2sW1OAISDS+Ji6lZS2KV4b7ueA/WydVWd1BECTQwVvfQy5JAi3glhINoKzoMnfnuRgNP+ZWKrGAbp3QDxw==",
+      "dev": true,
+      "requires": {
+        "ignore": "^3.3.6",
+        "minimatch": "^3.0.4",
+        "resolve": "^1.3.3",
+        "semver": "^5.4.1"
+      }
+    },
+    "eslint-plugin-promise": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-3.7.0.tgz",
+      "integrity": "sha512-2WO+ZFh7vxUKRfR0cOIMrWgYKdR6S1AlOezw6pC52B6oYpd5WFghN+QHxvrRdZMtbo8h3dfUZ2o1rWb0UPbKtg==",
+      "dev": true
+    },
+    "eslint-plugin-react": {
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.7.0.tgz",
+      "integrity": "sha512-KC7Snr4YsWZD5flu6A5c0AcIZidzW3Exbqp7OT67OaD2AppJtlBr/GuPrW/vaQM/yfZotEvKAdrxrO+v8vwYJA==",
+      "dev": true,
+      "requires": {
+        "doctrine": "^2.0.2",
+        "has": "^1.0.1",
+        "jsx-ast-utils": "^2.0.1",
+        "prop-types": "^15.6.0"
+      }
+    },
+    "eslint-plugin-standard": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-3.0.1.tgz",
+      "integrity": "sha1-NNDJFbRe3G8BA5PH7vOCOwhWXPI=",
+      "dev": true
+    },
+    "eslint-scope": {
+      "version": "3.7.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz",
+      "integrity": "sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "eslint-visitor-keys": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
+      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==",
+      "dev": true
+    },
+    "espree": {
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
+      "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
+      "dev": true,
+      "requires": {
+        "acorn": "^5.5.0",
+        "acorn-jsx": "^3.0.0"
+      }
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true
+    },
+    "esquery": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
+      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^4.0.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^4.1.0"
+      }
+    },
+    "estraverse": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+      "dev": true
+    },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+    },
+    "external-editor": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
+      "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
+      "dev": true,
+      "requires": {
+        "chardet": "^0.4.0",
+        "iconv-lite": "^0.4.17",
+        "tmp": "^0.0.33"
+      }
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+    },
+    "fast-deep-equal": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
+      "dev": true
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
+    "figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
+    "file-entry-cache": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
+      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
+      "dev": true,
+      "requires": {
+        "flat-cache": "^1.2.1",
+        "object-assign": "^4.0.1"
+      }
+    },
+    "find-root": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
+      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
+      "dev": true
+    },
+    "find-up": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+      "dev": true,
+      "requires": {
+        "path-exists": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      }
+    },
+    "flat-cache": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
+      "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
+      "dev": true,
+      "requires": {
+        "circular-json": "^0.3.1",
+        "del": "^2.0.2",
+        "graceful-fs": "^4.1.2",
+        "write": "^0.2.1"
+      }
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+    },
+    "form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
+    "get-port": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz",
+      "integrity": "sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw="
+    },
+    "get-stdin": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz",
+      "integrity": "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==",
+      "dev": true
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "glob": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "globals": {
+      "version": "11.7.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.7.0.tgz",
+      "integrity": "sha512-K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==",
+      "dev": true
+    },
+    "globby": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
+      "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
+      "dev": true,
+      "requires": {
+        "array-union": "^1.0.1",
+        "arrify": "^1.0.0",
+        "glob": "^7.0.3",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="
+    },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+    },
+    "har-validator": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+      "requires": {
+        "ajv": "^6.5.5",
+        "har-schema": "^2.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.3",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "fast-deep-equal": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+        }
+      }
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      }
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
+    },
+    "hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true
+    },
+    "http-basic": {
+      "version": "8.1.3",
+      "resolved": "https://registry.npmjs.org/http-basic/-/http-basic-8.1.3.tgz",
+      "integrity": "sha512-/EcDMwJZh3mABI2NhGfHOGOeOZITqfkEO4p/xK+l3NpyncIHUQBoMvCSF/b5GqvKtySC2srL/GGG3+EtlqlmCw==",
+      "requires": {
+        "caseless": "^0.12.0",
+        "concat-stream": "^1.6.2",
+        "http-response-object": "^3.0.1",
+        "parse-cache-control": "^1.0.1"
+      }
+    },
+    "http-response-object": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/http-response-object/-/http-response-object-3.0.2.tgz",
+      "integrity": "sha512-bqX0XTF6fnXSQcEJ2Iuyr75yVakyjIDCqroJQ/aHfSdlM743Cwqoi2nDYMzLGWUcuTWGWy8AAvOKXTfiv6q9RA==",
+      "requires": {
+        "@types/node": "^10.0.3"
+      }
+    },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
+      "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "ignore": {
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
+      "dev": true
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+    },
+    "inquirer": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
+      "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "^3.0.0",
+        "chalk": "^2.0.0",
+        "cli-cursor": "^2.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^2.0.4",
+        "figures": "^2.0.0",
+        "lodash": "^4.3.0",
+        "mute-stream": "0.0.7",
+        "run-async": "^2.2.0",
+        "rx-lite": "^4.0.8",
+        "rx-lite-aggregates": "^4.0.8",
+        "string-width": "^2.1.0",
+        "strip-ansi": "^4.0.0",
+        "through": "^2.3.6"
+      }
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
+    },
+    "is-builtin-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
+      "dev": true,
+      "requires": {
+        "builtin-modules": "^1.0.0"
+      }
+    },
+    "is-callable": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
+      "dev": true
+    },
+    "is-date-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+      "dev": true
+    },
+    "is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true
+    },
+    "is-path-cwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
+      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
+      "dev": true
+    },
+    "is-path-in-cwd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
+      "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
+      "dev": true,
+      "requires": {
+        "is-path-inside": "^1.0.0"
+      }
+    },
+    "is-path-inside": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
+      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
+      "dev": true,
+      "requires": {
+        "path-is-inside": "^1.0.1"
+      }
+    },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+      "dev": true
+    },
+    "is-regex": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.1"
+      }
+    },
+    "is-resolvable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
+      "dev": true
+    },
+    "is-symbol": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
+      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
+      "dev": true
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    },
+    "js-tokens": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "dev": true,
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+    },
+    "json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
+    "json-schema": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
+      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
+    },
+    "json-schema-traverse": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+      "dev": true
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+    },
+    "jsprim": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
+      "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.4.0",
+        "verror": "1.10.0"
+      }
+    },
+    "jsx-ast-utils": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz",
+      "integrity": "sha1-6AGxs5mF4g//yHtA43SAgOLcrH8=",
+      "dev": true,
+      "requires": {
+        "array-includes": "^3.0.3"
+      }
+    },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      }
+    },
+    "load-json-file": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+      "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "dev": true,
+      "requires": {
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "dependencies": {
+        "path-exists": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+          "dev": true
+        }
+      }
+    },
+    "lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dev": true,
+      "requires": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      }
+    },
+    "lru-cache": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
+      "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
+      "dev": true,
+      "requires": {
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
+      }
+    },
+    "mime-db": {
+      "version": "1.44.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="
+    },
+    "mime-types": {
+      "version": "2.1.27",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+      "requires": {
+        "mime-db": "1.44.0"
+      }
+    },
+    "mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+      "dev": true
+    },
+    "mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.5"
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "mute-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+      "dev": true
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
+    "normalize-package-data": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
+      "dev": true,
+      "requires": {
+        "hosted-git-info": "^2.1.4",
+        "is-builtin-module": "^1.0.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true
+    },
+    "object-keys": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
+      "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==",
+      "dev": true
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "onetime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "^1.0.0"
+      }
+    },
+    "optionator": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
+      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+      "dev": true,
+      "requires": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.4",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "wordwrap": "~1.0.0"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true
+    },
+    "p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "dev": true,
+      "requires": {
+        "p-try": "^1.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dev": true,
+      "requires": {
+        "p-limit": "^1.1.0"
+      }
+    },
+    "p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "dev": true
+    },
+    "parse-cache-control": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parse-cache-control/-/parse-cache-control-1.0.1.tgz",
+      "integrity": "sha1-juqz5U+laSD+Fro493+iGqzC104="
+    },
+    "parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "dev": true,
+      "requires": {
+        "error-ex": "^1.2.0"
+      }
+    },
+    "path-exists": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+      "dev": true,
+      "requires": {
+        "pinkie-promise": "^2.0.0"
+      }
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "path-type": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+      "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+      "dev": true,
+      "requires": {
+        "pify": "^2.0.0"
+      }
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+    },
+    "pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "requires": {
+        "pinkie": "^2.0.0"
+      }
+    },
+    "pkg-conf": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-2.1.0.tgz",
+      "integrity": "sha1-ISZRTKbyq/69FoWW3xi6V4Z/AFg=",
+      "dev": true,
+      "requires": {
+        "find-up": "^2.0.0",
+        "load-json-file": "^4.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "load-json-file": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^4.0.0",
+            "pify": "^3.0.0",
+            "strip-bom": "^3.0.0"
+          }
+        },
+        "parse-json": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+          "dev": true,
+          "requires": {
+            "error-ex": "^1.3.1",
+            "json-parse-better-errors": "^1.0.1"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        }
+      }
+    },
+    "pkg-config": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pkg-config/-/pkg-config-1.1.1.tgz",
+      "integrity": "sha1-VX7yLXPaPIg3EHdmxS6tq94pj+Q=",
+      "dev": true,
+      "requires": {
+        "debug-log": "^1.0.0",
+        "find-root": "^1.0.0",
+        "xtend": "^4.0.1"
+      }
+    },
+    "pkg-dir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
+      "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
+      "dev": true,
+      "requires": {
+        "find-up": "^1.0.0"
+      }
+    },
+    "pluralize": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
+      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
+      "dev": true
+    },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true
+    },
+    "process-nextick-args": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
+    },
+    "progress": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
+      "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=",
+      "dev": true
+    },
+    "promise": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz",
+      "integrity": "sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q==",
+      "requires": {
+        "asap": "~2.0.6"
+      }
+    },
+    "prop-types": {
+      "version": "15.6.2",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz",
+      "integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==",
+      "dev": true,
+      "requires": {
+        "loose-envify": "^1.3.1",
+        "object-assign": "^4.1.1"
+      }
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
+      "dev": true
+    },
+    "psl": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+    },
+    "qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+    },
+    "read-pkg": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+      "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+      "dev": true,
+      "requires": {
+        "load-json-file": "^2.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^2.0.0"
+      }
+    },
+    "read-pkg-up": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+      "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+      "dev": true,
+      "requires": {
+        "find-up": "^2.0.0",
+        "read-pkg": "^2.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        }
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "request": {
+      "version": "2.88.2",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+      "requires": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.3",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.5.0",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
+      }
+    },
+    "require-uncached": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
+      "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
+      "dev": true,
+      "requires": {
+        "caller-path": "^0.1.0",
+        "resolve-from": "^1.0.0"
+      }
+    },
+    "resolve": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz",
+      "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==",
+      "dev": true,
+      "requires": {
+        "path-parse": "^1.0.5"
+      }
+    },
+    "resolve-from": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
+      "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
+      "dev": true
+    },
+    "restore-cursor": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "dev": true,
+      "requires": {
+        "onetime": "^2.0.0",
+        "signal-exit": "^3.0.2"
+      }
+    },
+    "rimraf": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.0.5"
+      }
+    },
+    "run-async": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "dev": true,
+      "requires": {
+        "is-promise": "^2.1.0"
+      }
+    },
+    "run-parallel": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
+      "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==",
+      "dev": true
+    },
+    "rx-lite": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
+      "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
+      "dev": true
+    },
+    "rx-lite-aggregates": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
+      "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
+      "dev": true,
+      "requires": {
+        "rx-lite": "*"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+    },
+    "semver": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz",
+      "integrity": "sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==",
+      "dev": true
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "^1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "dev": true
+    },
+    "slice-ansi": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
+      "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+      "dev": true,
+      "requires": {
+        "is-fullwidth-code-point": "^2.0.0"
+      }
+    },
+    "spdx-correct": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz",
+      "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==",
+      "dev": true,
+      "requires": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz",
+      "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==",
+      "dev": true
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "dev": true,
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz",
+      "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==",
+      "dev": true
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "sshpk": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+      "requires": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      }
+    },
+    "standard": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/standard/-/standard-11.0.1.tgz",
+      "integrity": "sha512-nu0jAcHiSc8H+gJCXeiziMVZNDYi8MuqrYJKxTgjP4xKXZMKm311boqQIzDrYI/ktosltxt2CbDjYQs9ANC8IA==",
+      "dev": true,
+      "requires": {
+        "eslint": "~4.18.0",
+        "eslint-config-standard": "11.0.0",
+        "eslint-config-standard-jsx": "5.0.0",
+        "eslint-plugin-import": "~2.9.0",
+        "eslint-plugin-node": "~6.0.0",
+        "eslint-plugin-promise": "~3.7.0",
+        "eslint-plugin-react": "~7.7.0",
+        "eslint-plugin-standard": "~3.0.1",
+        "standard-engine": "~8.0.0"
+      }
+    },
+    "standard-engine": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-8.0.1.tgz",
+      "integrity": "sha512-LA531C3+nljom/XRvdW/hGPXwmilRkaRkENhO3FAGF1Vtq/WtCXzgmnc5S6vUHHsgv534MRy02C1ikMwZXC+tw==",
+      "dev": true,
+      "requires": {
+        "deglob": "^2.1.0",
+        "get-stdin": "^6.0.0",
+        "minimist": "^1.1.0",
+        "pkg-conf": "^2.0.0"
+      }
+    },
+    "string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "dev": true,
+      "requires": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^3.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        }
+      }
+    },
+    "strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+      "dev": true
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "dev": true
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "sync-request": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/sync-request/-/sync-request-6.1.0.tgz",
+      "integrity": "sha512-8fjNkrNlNCrVc/av+Jn+xxqfCjYaBoHqCsDz6mt030UMxJGr+GSfCV1dQt2gRtlL63+VPidwDVLr7V2OcTSdRw==",
+      "requires": {
+        "http-response-object": "^3.0.1",
+        "sync-rpc": "^1.2.1",
+        "then-request": "^6.0.0"
+      }
+    },
+    "sync-rpc": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/sync-rpc/-/sync-rpc-1.3.6.tgz",
+      "integrity": "sha512-J8jTXuZzRlvU7HemDgHi3pGnh/rkoqR/OZSjhTyyZrEkkYQbk7Z33AXp37mkPfPpfdOuj7Ex3H/TJM1z48uPQw==",
+      "requires": {
+        "get-port": "^3.1.0"
+      }
+    },
+    "table": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
+      "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
+      "dev": true,
+      "requires": {
+        "ajv": "^5.2.3",
+        "ajv-keywords": "^2.1.0",
+        "chalk": "^2.1.0",
+        "lodash": "^4.17.4",
+        "slice-ansi": "1.0.0",
+        "string-width": "^2.1.1"
+      }
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "then-request": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/then-request/-/then-request-6.0.2.tgz",
+      "integrity": "sha512-3ZBiG7JvP3wbDzA9iNY5zJQcHL4jn/0BWtXIkagfz7QgOL/LqjCEOBQuJNZfu0XYnv5JhKh+cDxCPM4ILrqruA==",
+      "requires": {
+        "@types/concat-stream": "^1.6.0",
+        "@types/form-data": "0.0.33",
+        "@types/node": "^8.0.0",
+        "@types/qs": "^6.2.31",
+        "caseless": "~0.12.0",
+        "concat-stream": "^1.6.0",
+        "form-data": "^2.2.0",
+        "http-basic": "^8.1.1",
+        "http-response-object": "^3.0.1",
+        "promise": "^8.0.0",
+        "qs": "^6.4.0"
+      },
+      "dependencies": {
+        "@types/node": {
+          "version": "8.10.61",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.61.tgz",
+          "integrity": "sha512-l+zSbvT8TPRaCxL1l9cwHCb0tSqGAGcjPJFItGGYat5oCTiq1uQQKYg5m7AF1mgnEBzFXGLJ2LRmNjtreRX76Q=="
+        }
+      }
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
+      "requires": {
+        "os-tmpdir": "~1.0.2"
+      }
+    },
+    "tough-cookie": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "requires": {
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
+      }
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+    },
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "~1.1.2"
+      }
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+    },
+    "uniq": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
+      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
+      "dev": true
+    },
+    "uri-js": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
+    "uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "requires": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "wordwrap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+      "dev": true
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "write": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
+      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
+      "dev": true,
+      "requires": {
+        "mkdirp": "^0.5.1"
+      }
+    },
+    "xml2js": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+      "requires": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
+      }
+    },
+    "xmlbuilder": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
+    },
+    "xtend": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+      "dev": true
+    },
+    "yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+      "dev": true
+    }
+  }
+}
diff --git a/utils/trivialize-cdn-rules/package.json b/utils/trivialize-cdn-rules/package.json
new file mode 100644
index 000000000000..c21b01694f84
--- /dev/null
+++ b/utils/trivialize-cdn-rules/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "trivialize-cdn-rules",
+  "version": "1.0.0",
+  "main": "index.js",
+  "dependencies": {
+    "graceful-fs": "^4.2.0",
+    "request": "^2.87.0",
+    "sync-request": "^6.1.0",
+    "xml2js": "^0.4.19"
+  },
+  "devDependencies": {
+    "chalk": "^2.4.2",
+    "standard": "^11.0.1"
+  },
+  "scripts": {
+    "start": "node index.js",
+    "lint": "standard --fix index.js"
+  },
+  "keywords": [],
+  "author": "Chan Chak Shing",
+  "description": ""
+}
diff --git a/utils/trivialize-rules/explode-regexp.js b/utils/trivialize-rules/explode-regexp.js
index 0aa3c7477c8d..c034f195a837 100644
--- a/utils/trivialize-rules/explode-regexp.js
+++ b/utils/trivialize-rules/explode-regexp.js
@@ -14,13 +14,12 @@ function explodeRegExp(re, callback) {
     let [first, ...rest] = items;
 
     if (first.repeat) {
-      let repeat = first.repeat;
+      let { repeat, ...firstSub } = first;
       if (repeat.max !== 1) throw new UnsupportedRegExp(first.raw);
-      delete first.repeat;
       if (repeat.min === 0) {
         buildUrls(str, rest);
       }
-      return buildUrls(str, items);
+      return buildUrls(str, [ firstSub, ...rest ]);
     }
 
     switch (first.type) {
diff --git a/utils/trivialize-rules/package-lock.json b/utils/trivialize-rules/package-lock.json
new file mode 100644
index 000000000000..3bccfafbef51
--- /dev/null
+++ b/utils/trivialize-rules/package-lock.json
@@ -0,0 +1,112 @@
+{
+  "name": "trivialize-rules",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
+    },
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      }
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+    },
+    "graceful-fs": {
+      "version": "4.1.15",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
+      "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+    },
+    "highland": {
+      "version": "2.13.4",
+      "resolved": "https://registry.npmjs.org/highland/-/highland-2.13.4.tgz",
+      "integrity": "sha512-r+YlbnBhCTcrcVzBpzPcrvB0llVjeDWKuXSZVuNBe5WgQJtN2xGUUMZC9WzHCntNIx0rskVernxLoFJUCkmb/Q==",
+      "requires": {
+        "util-deprecate": "^1.0.2"
+      }
+    },
+    "regulex": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/regulex/-/regulex-0.0.2.tgz",
+      "integrity": "sha1-e7oj5R8JnIJiE5ZEbYDeQVm9Ksc=",
+      "requires": {
+        "amdefine": "~1.0.0"
+      }
+    },
+    "sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
+    "valid-url": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/valid-url/-/valid-url-1.0.9.tgz",
+      "integrity": "sha1-HBRHm0DxOXp1eC8RXkCGRHQzogA="
+    },
+    "xml2js": {
+      "version": "0.4.19",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
+      "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
+      "requires": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~9.0.1"
+      }
+    },
+    "xmlbuilder": {
+      "version": "9.0.7",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
+      "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
+    }
+  }
+}
diff --git a/utils/trivialize-rules/package.json b/utils/trivialize-rules/package.json
index 651f40ba51df..bae4431180c8 100644
--- a/utils/trivialize-rules/package.json
+++ b/utils/trivialize-rules/package.json
@@ -4,8 +4,11 @@
   "main": "trivialize-rules.js",
   "dependencies": {
     "chalk": "^2.1.0",
+    "escape-string-regexp": "^1.0.5",
+    "graceful-fs": "^4.1.11",
     "highland": "^2.7.1",
     "regulex": "0.0.2",
+    "valid-url": "^1.0.9",
     "xml2js": "^0.4.16"
   },
   "devDependencies": {},
diff --git a/utils/trivialize-rules/trivialize-cookie-rules.js b/utils/trivialize-rules/trivialize-cookie-rules.js
new file mode 100644
index 000000000000..3b8f5f17c68f
--- /dev/null
+++ b/utils/trivialize-rules/trivialize-cookie-rules.js
@@ -0,0 +1,142 @@
+"use strict";
+
+/**
+ * For future contributors, this script was written to trivialize a special
+ * form of securecookie rules which is equal to trivial securecookie rule
+ * under the current HTTPSe implementation. This allows trivialize-rules.js to
+ * simplify rulesets otherwise impossible due to the lack of support of
+ * unbounded wildcard RegExps in explode-regexp.js (by design).
+ *
+ * As stated in trivialize-rules.js, a securecookie rule works if there is an
+ * existing rule covering the exact same domain.
+ *
+ * In particular,  covers all
+ * subdomains in cookie.host given at least one working rule cover
+ * the same subdomains.
+ *
+ * If there is at least one such rule, for e.g. www.example.com, the mentioned
+ * securecookie rules can be reduced to
+ *     
+ * Else, the securecookie rule do not take into effect and thus can be ignored
+ * during the runtime.
+ *
+ * So, regardless of the existence of any rule, for all targets listed in a
+ * ruleset, the securecookie rule can be interpreted as
+ *     
+ *
+ * For simplicity, this implementation require securecookie#host includes a
+ * tailing $
+ */
+
+let util = require("util");
+let path = require("path");
+let xml2js = require("xml2js");
+
+let fs = require("graceful-fs");
+let readdir = util.promisify(fs.readdir);
+let readFile = util.promisify(fs.readFile);
+let parseString = util.promisify(xml2js.parseString);
+
+let rulesDir = "src/chrome/content/rules";
+
+let trivialSecureCookieLiteral = `\n$1\n`;
+let secureCookieRegExp = new RegExp(
+  `\n([\t ]*)[\t ]*\n`
+);
+
+let isTrivial = securecookie => {
+  return securecookie.host === ".+" && securecookie.name === ".+";
+};
+
+(async () => {
+  let filenames = (await readdir(rulesDir)).filter(fn => fn.endsWith(".xml"));
+  let filePromises = filenames.map(async filename => {
+    let content = await readFile(path.join(rulesDir, filename), "utf8");
+    let { ruleset } = await parseString(content);
+
+    let targets = ruleset.target.map(target => target.$.host);
+    let securecookies = ruleset.securecookie
+      ? ruleset.securecookie.map(sc => sc.$)
+      : [];
+
+    // make sure there is at least one non-trivial securecookie
+    if (!securecookies.length || securecookies.some(isTrivial)) {
+      return;
+    }
+
+    for (let securecookie of securecookies) {
+      if (securecookie.name !== ".+") {
+        return;
+      }
+
+      if (
+        !securecookie.host.startsWith("^.+") &&
+        !securecookie.host.startsWith("^.*") &&
+        !securecookie.host.startsWith(".+") &&
+        !securecookie.host.startsWith(".*") &&
+        !securecookie.host.startsWith("(?:.*\\.)?") &&
+        !securecookie.host.startsWith("(?:.+\\.)?") &&
+        !securecookie.host.startsWith("^(?:.*\\.)?") &&
+        !securecookie.host.startsWith("^(?:.+\\.)?")
+      ) {
+        return;
+      }
+    }
+
+    // make sure each domains and its subdomains are covered by at least
+    // one securecookie rule
+    let securedDomains = new Map();
+    for (let target of targets) {
+      // we cannot handle the right-wildcards based on the argument above
+      if (target.includes(".*")) {
+        return;
+      }
+      // replace left-wildcard with www is an implementation detail
+      // see https://github.com/EFForg/https-everywhere/blob/
+      // 260cd8d402fb8069c55cda311e1be7a60db7339d/chromium/background-scripts/background.js#L595
+      if (target.includes("*.")) {
+        target = target.replace("*.", "www.");
+      }
+      securedDomains.set(target, false);
+      securedDomains.set("." + target, false);
+    }
+
+    for (let securecookie of securecookies) {
+      let pattern = new RegExp(securecookie.host);
+      securedDomains.forEach((val, key, map) => {
+        if (pattern.test(key)) {
+          map.set(key, true);
+        }
+      });
+    }
+
+    // If any value of ${securedDomains} is false, return.
+    if (![...securedDomains.values()].every(secured => secured)) {
+      return;
+    }
+
+    // remove the securecookie tag except the last one
+    // replace the last securecookie tag with a trivial one
+    for (let occurrence = securecookies.length; occurrence; --occurrence) {
+      content = content.replace(
+        secureCookieRegExp,
+        occurrence == 1 ? trivialSecureCookieLiteral : ""
+      );
+    }
+
+    return new Promise((resolve, reject) => {
+      fs.writeFile(path.join(rulesDir, filename), content, "utf8", (err) => {
+        if (err) {
+          reject(err);
+        }
+        resolve();
+      });
+    })
+  });
+
+
+  // use for-loop to await too many file opened error
+  for (let fp of filePromises) {
+    await fp.catch(error => console.log(error));
+  }
+})();
diff --git a/utils/trivialize-rules/trivialize-rules.js b/utils/trivialize-rules/trivialize-rules.js
index 1689378c10fc..663ecb60978c 100644
--- a/utils/trivialize-rules/trivialize-rules.js
+++ b/utils/trivialize-rules/trivialize-rules.js
@@ -9,6 +9,7 @@ const readFile = _.wrapCallback(fs.readFile);
 const writeFile = _.wrapCallback(fs.writeFile);
 const parseXML = _.wrapCallback(require('xml2js').parseString);
 const { explodeRegExp, UnsupportedRegExp } = require('./explode-regexp');
+const escapeStringRegexp = require('escape-string-regexp');
 const chalk = require('chalk');
 
 const rulesDir = `${__dirname}/../../src/chrome/content/rules`;
@@ -99,6 +100,7 @@ files.fork().zipAll([ sources.fork(), rules ]).map(([name, source, ruleset]) =>
   const fail = createTag('FAIL', chalk.red, console.error);
 
   let targets = ruleset.target.map(target => target.$.host);
+  let securecookies = ruleset.securecookie ? ruleset.securecookie.map(sc => sc.$) : new Array();
   let rules = ruleset.rule.map(rule => rule.$);
 
   if (rules.length === 1 && isTrivial(rules[0])) {
@@ -181,9 +183,97 @@ files.fork().zipAll([ sources.fork(), rules ]).map(([name, source, ruleset]) =>
 
   domains = Array.from(domains);
 
+  // It is assumed that if all securecookies are static,
+  // they can be safely ignored.
+  //
+  // A securecookie is called to be static either it is a trivial securecookie
+  // or ALL of the following conditions are satisfied:
+  //
+  // 1. securecookie.host match cookie.host from the beginning ^ to the end $.
+  // Otherwise, it might match subdomains/ partial patterns, thus a non-trivial
+  // securecookie.
+  //
+  // 2. securecookie.host will not throw an error when passed to explodeRegExp().
+  // Otherwise, it might match patterns too complicated for our interests.
+  //
+  // 3. Each exploded securecookie.host should be included in ruleset.target/
+  // exploded target. Otherwise, this ruleset is likely problematic itself. It
+  // is dangerous for a rewrite.
+  function isStaticCookie(securecookie) {
+    if (securecookie.host === '.+' && securecookie.name === '.+') {
+      return [true, false];
+    }
+
+    if (!securecookie.host.startsWith('^') || !securecookie.host.endsWith('$')) {
+      return [false, false];
+    }
+
+    let localDomains = new Set();
+    let unsupportedDomains = new Set();
+
+    try {
+      explodeRegExp(securecookie.host, domain => {
+        if (domain.startsWith('.')) {
+          domain = domain.slice(1);
+        }
+        localDomains.add(domain);
+      });
+    } catch (e) {
+      if (!(e instanceof UnsupportedRegExp)) {
+        throw e;
+      }
+      warn`Unsupported regexp part ${e.message} while traversing securecookie : ${JSON.stringify(securecookie)}`;
+      return [false, false];
+    }
+
+    for (const domain of localDomains) {
+      if (domains.indexOf(domain) === -1) {
+        warn`Ruleset does not cover target ${domain} for securecookie : ${JSON.stringify(securecookie)}`;
+        unsupportedDomains.add(domain);
+      }
+    }
+
+    // For cookies to be covered, there must be at least one rule covering the
+    // same domain. This is guaranteed by safeToSecureCookie(cookie) in rules.js
+    //
+    // Since securecookie.host will only match cookie.domain if there there is
+    // a rule covers cookie.domain. Given the target are trivial, cookie.domain
+    // cannot be anything other than domain.example.com and .domain.example.com
+    // (possibly with more leading dots) for a securecookie rule ever to take
+    // place.
+    //
+    // With condition (1) effective, securecookie.host should explode to either
+    // one of the aforementioned patterns. Otherwise, the securecookie rules
+    // will never be applied. Such dangling securecookie rules can be removed
+    // safely.
+    if (unsupportedDomains.size > 0) {
+      if (unsupportedDomains.size === localDomains.size) {
+        return [true, true];
+      }
+      fail`Tag securecookie ${JSON.stringify(securecookie)} matches ${unsupportedDomains} which are not in targets ${targets}`;
+    }
+    return [true, false];
+  }
+
   if (domains.slice().sort().join('\n') !== targets.sort().join('\n')) {
-    if (ruleset.securecookie) {
-      return;
+    // For each securecookie rule, check if it is a static securecookie.
+    // If it is non-static, we do not trivialize the ruleset; Otherwise,
+    // we remove the securecookie if it contain only unsupported hosts.
+    // This removal is better done one by one to avoid side effects.
+    // Else if ALL securecookie rules are static, trivialize the targets.
+    for (const securecookie of securecookies) {
+      let [isStatic, shouldRemove] = isStaticCookie(securecookie);
+
+      if (isStatic) {
+        if (shouldRemove) {
+          let scReSrc = `\n([\t ]*)[\t ]*\n`;
+          let scRe = new RegExp(scReSrc);
+          source = source.replace(scRe, '');
+        }
+      } else {
+        // Skip this ruleset as it contain non-static securecookies
+        return;
+      }
     }
 
     source = replaceXML(source, 'target', domains.map(domain => ``));
@@ -194,7 +284,6 @@ files.fork().zipAll([ sources.fork(), rules ]).map(([name, source, ruleset]) =>
   info`trivialized`;
 
   return writeFile(`${rulesDir}/${name}`, source);
-
 })
   .filter(Boolean)
   .parallel(10)
diff --git a/utils/trivialize-rules/trivialize-targets.js b/utils/trivialize-rules/trivialize-targets.js
new file mode 100644
index 000000000000..474c9a6a43b4
--- /dev/null
+++ b/utils/trivialize-rules/trivialize-targets.js
@@ -0,0 +1,270 @@
+'use strict';
+
+const util = require('util');
+const path = require('path');
+const xml2js = require('xml2js');
+
+const fs = require('graceful-fs');
+const readdir = util.promisify(fs.readdir);
+const readFile = util.promisify(fs.readFile);
+const parseString = util.promisify(xml2js.parseString);
+
+const chalk = require('chalk');
+const validUrl = require('valid-url');
+const escapeStringRegexp = require('escape-string-regexp');
+const { explodeRegExp, UnsupportedRegExp } = require('./explode-regexp');
+
+const rulesDir = `${__dirname}/../../src/chrome/content/rules`;
+
+(async () => {
+  const filenames = (await readdir(rulesDir)).filter(fn => fn.endsWith('.xml'));
+  const filePromises = filenames.map(async filename => {
+    const createTag = (tagName, colour, print) => {
+      return (strings, ...values) => {
+        let result = `[${tagName}] ${chalk.bold(filename)}: ${strings[0]}`;
+        for (let i = 1; i < strings.length; i++) {
+          let value = values[i - 1];
+          if (value instanceof Set) {
+            value = Array.from(value);
+          }
+          value = Array.isArray(value) ? value.join(', ') : value.toString();
+          result += chalk.blue(value) + strings[i];
+        }
+        print(colour(result));
+      };
+    };
+
+    const warn = createTag('WARN', chalk.yellow, console.warn);
+    const info = createTag('INFO', chalk.green, console.info);
+    const fail = createTag('FAIL', chalk.red, console.error);
+
+    let content = await readFile(path.join(rulesDir, filename), 'utf8');
+    const { ruleset } = await parseString(content);
+
+    const rules = ruleset.rule.map(rule => rule.$);
+    const targets = ruleset.target.map(target => target.$.host);
+
+    // make sure ruleset contains at least one left wildcard targets
+    if (!targets.some(target => target.startsWith('*.'))) {
+      return;
+    }
+
+    // but does not contain right widcard targets
+    if (targets.some(target => target.endsWith('.*'))) {
+      return;
+    }
+
+    // should not contain trivial rules
+    if (rules.some(rule => rule.from === '^http:' && rule.to === 'https:')) {
+      return;
+    }
+
+    const ruleToIsSimpleMap = new Map();
+    const ruleToIsSnappingMap = new Map();
+
+    const targetToSupportedExplodedDomainsMap = new Map();
+
+    const explodedDomains = new Set();
+    const unsupportedExplodedDomains = new Set();
+    const unusedTargets = new Set();
+
+    // (1) We check if all rules can be exploded to valid urls
+    //     (a) if true, continue to (2)
+    //     (b) if we cannot trivialize targets for this ruleset, skip
+    const isExplosiveRewrite = rule => {
+      const explodedUrls = [];
+
+      try {
+        explodeRegExp(rule.from, url => explodedUrls.push(url));
+      } catch (e) {
+        // we are getting into runtime error, log and exit
+        if (!(e instanceof UnsupportedRegExp)) {
+          fail(e.message);
+          process.exit(1);
+        }
+        return false;
+      }
+
+      // make sure each exploded URL is valid
+      if (!explodedUrls.every(url => validUrl.isUri(url))) {
+        return false;
+      }
+
+      let isSimpleToAllExplodedUrls = true;
+      let isSnappingToSomeExplodedUrls = false;
+
+      for (const url of explodedUrls) {
+        const { protocol, hostname, pathname } = new URL(url);
+
+        // if a rule do not rewrite all path for any URL, it is not a simple rule
+        // i.e. a rule is simple only if it rewrite all path for all URLs
+        if (!(protocol === 'http:' && pathname === '/*')) {
+          isSimpleToAllExplodedUrls = false;
+        }
+
+        // if a rule is snapping to any URL, it is a snapping rule
+        // where a rule is snapping to a URL if it change the domain
+        // e.g. 
+        if (
+          url.replace(new RegExp(rule.from), rule.to) !==
+          url.replace(/^http:/, 'https:')
+        ) {
+          isSnappingToSomeExplodedUrls = true;
+        }
+
+        // store a collection of exploded domains globally
+        explodedDomains.add(hostname);
+      }
+
+      ruleToIsSimpleMap.set(rule, isSimpleToAllExplodedUrls);
+      ruleToIsSnappingMap.set(rule, isSnappingToSomeExplodedUrls);
+      return true;
+    };
+
+    if (!rules.every(isExplosiveRewrite)) {
+      return;
+    }
+
+    // (2) We check if all the exploded domains are covered by the targets
+    //     (a) if true, continue to (3)
+    //     (b) some exploded domains are not covered by the targets,
+    //         it is not safe to rewrite ruleset to include the
+    //         exploded domains. skipping
+    const isSupported = domain => {
+      if (targets.includes(domain)) {
+        // do not map non-wildcard targets to exploded domains
+        // otherwise, it will introduce unnecessary rewrites
+        targetToSupportedExplodedDomainsMap.delete(domain);
+        return true;
+      }
+
+      // this part follows the implementation in rules.js
+      const segments = domain.split('.');
+      for (let i = 1; i <= segments.length - 2; ++i) {
+        const tmp = '*.' + segments.slice(i, segments.length).join('.');
+        if (targets.includes(tmp)) {
+          targetToSupportedExplodedDomainsMap.get(tmp).push(domain);
+          return true;
+        }
+      }
+      unsupportedExplodedDomains.add(domain);
+      return false;
+    };
+
+    // initially, assume each target doesn't support any exploded domain
+    for (const target of targets) {
+      targetToSupportedExplodedDomainsMap.set(target, []);
+    }
+
+    if (![...explodedDomains].every(domain => isSupported(domain))) {
+      warn`ruleset rewrites domains ${[
+        ...unsupportedExplodedDomains
+      ]} unsupported by ${targets}`;
+      return;
+    }
+
+    // (3) We check to make sure all targets are covered by rewrites
+    //     (a) if true, continue to (4)
+    //     (b) if some targets are not covered by any rewrites, this
+    //         doesn't affect our works trivializing the targets, but
+    //         we should give a warning and then proceed to (4)
+    for (const target of targets) {
+      const supportedExplodedDomains = targetToSupportedExplodedDomainsMap.get(target);
+      if (supportedExplodedDomains && supportedExplodedDomains.length === 0) {
+        // prepare the warning message here
+        unusedTargets.add(target);
+        // make sure we don't remove these targets when performing rewrites
+        targetToSupportedExplodedDomainsMap.delete(target);
+      }
+    }
+
+    if (unusedTargets.size > 0) {
+      warn`ruleset contains targets ${[
+        ...unusedTargets
+      ]} not applied to any rewrites`;
+    }
+
+    // (4) Replace non-trivial targets with exploded domains
+    let indent = null;
+
+    for (const [key, value] of targetToSupportedExplodedDomainsMap) {
+      const escapedKey = escapeStringRegexp(key);
+      const regexSource = `\n([\t ]*)[\t ]*\n`;
+      const regex = new RegExp(regexSource);
+
+      const matches = content.match(regex);
+      if (!matches) {
+        // should be unreachable.
+        warn`unexpected regular expression error`;
+        process.exit(1);
+      }
+
+      [, indent] = matches;
+      const sub =
+        value.map(v => `\n${indent}`).join('') + '\n';
+      content = content.replace(regex, sub);
+    }
+
+    // (5) Check if we can trivialize the rules. Need to satisfy all below conditions:
+    //     i)   there is no unused target, i.e. unusedTargets.size == 0
+    //     ii)  every rule is "simple" as in ruleToIsSimpleMap
+    //     iii) at least one rule is a non-snapping rule
+    //
+    //     (a) if all of the conditions are met, append a trivial rule after all
+    //         existing rules; and remove the non-snapping rules.
+    //     (b) otherwise, do not trivialize the rules
+    const condition1 = unusedTargets.size === 0;
+    const condition2 = [...ruleToIsSimpleMap.entries()].every(([, value]) => value);
+    const condition3 = [...ruleToIsSnappingMap.entries()].some(([, value]) => !value);
+
+    if (condition1 && condition2 && condition3) {
+      // append trivial rule to the end of current ruleset
+      if ((content.match(/\n<\/ruleset>/) || []).length !== 1) {
+        fail`ruleset contains zero or more than one  tag`;
+        return;
+      } else {
+        content = content.replace(
+          /\n<\/ruleset>/,
+          `\n${indent}\n`
+        );
+      }
+
+      // remove all non-snapping rules
+      const nonSnappingRules = [...ruleToIsSnappingMap.entries()]
+        .filter(([, value]) => value === false)
+        .map(([key]) => key);
+
+      for (const rule of nonSnappingRules) {
+        const escapedRuleFrom = escapeStringRegexp(rule.from);
+        const escapedRuleTo = escapeStringRegexp(rule.to);
+
+        const regexSource = `\n([\t ]*)[\t ]*\n`;
+        const regex = new RegExp(regexSource);
+
+        const matches = content.match(regex);
+        if (!matches) {
+          // should be unreachable.
+          warn`unexpected regular expression error`;
+          process.exit(1);
+        }
+
+        [, indent] = matches;
+        content = content.replace(regex, '\n');
+      }
+    }
+
+    return new Promise((resolve, reject) => {
+      fs.writeFile(path.join(rulesDir, filename), content, 'utf8', err => {
+        if (err) {
+          reject(err);
+        }
+        resolve();
+      });
+    });
+  });
+
+  // use for-loop to await too many file opened error
+  for (const fp of filePromises) {
+    await fp.catch(error => console.log(error));
+  }
+})();
diff --git a/utils/zipfile_deterministic.py b/utils/zipfile_deterministic.py
index 89d3fe09124b..5c931f3b6a47 100644
--- a/utils/zipfile_deterministic.py
+++ b/utils/zipfile_deterministic.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.6
+#!/usr/bin/env python3
 """
 A fork of the Python 3.6 zipfile module, modified to remove sources of entropy
 and ensure bit-by-bit determinism for the output file.
@@ -11,10 +11,8 @@
 """
 import io
 import os
-import re
 import importlib.util
 import sys
-import time
 import stat
 import shutil
 import struct
@@ -77,7 +75,7 @@ class LargeZipFile(Exception):
 # we recognize (but not necessarily support) all features up to that version
 MAX_EXTRACT_VERSION = 63
 
-DEFAULT_DATE = (1980,1,1,0,0,0)  # hard-coded timestamp
+DEFAULT_DATE = (2013,12,1,0,0,0)  # hard-coded timestamp
 
 # Below are some formats and associated data for reading/writing headers using
 # the struct module.  The names and structures of headers/records are those used