From 4325f052d77c77490919d47e815a1fead5572449 Mon Sep 17 00:00:00 2001
From: Hugo Gruson <hugo.gruson@protonmail.com>
Date: Thu, 27 Dec 2018 14:14:39 +0100
Subject: [PATCH 1/7] Run hsts-prune

---
 src/chrome/content/rules/Airbnb.xml           | 85 +++----------------
 src/chrome/content/rules/Appinn.xml           | 26 ------
 src/chrome/content/rules/BrowserLeaks.xml     | 10 ---
 src/chrome/content/rules/Despora.de.xml       | 11 ---
 src/chrome/content/rules/ESLint.org.xml       | 10 ---
 src/chrome/content/rules/EVE_Online.com.xml   | 43 ----------
 src/chrome/content/rules/Maxmind.xml          | 20 -----
 .../rules/Mit-dem-rad-zur-arbeit.de.xml       |  5 --
 src/chrome/content/rules/NIFC.gov.xml         | 39 ---------
 .../rules/National_Transport_Safety_Board.xml | 37 --------
 src/chrome/content/rules/Nutrition.gov.xml    | 24 ------
 src/chrome/content/rules/Shopify.xml          | 19 -----
 src/chrome/content/rules/Team-Liquid.xml      |  2 -
 src/chrome/content/rules/Ticket_Driver.xml    | 12 ---
 .../content/rules/ToontownRewritten.xml       | 18 ----
 src/chrome/content/rules/Variomedia.de.xml    | 42 ---------
 src/chrome/content/rules/Whirlpool.xml        | 15 ----
 src/chrome/content/rules/darkwebnews.com.xml  |  8 --
 src/chrome/content/rules/eveonline.com.xml    | 34 --------
 src/chrome/content/rules/smokefree.gov.xml    | 37 --------
 src/chrome/content/rules/wikiHow.com.xml      | 22 -----
 src/chrome/content/rules/yoast.com.xml        | 30 -------
 22 files changed, 12 insertions(+), 537 deletions(-)
 delete mode 100644 src/chrome/content/rules/Appinn.xml
 delete mode 100644 src/chrome/content/rules/BrowserLeaks.xml
 delete mode 100644 src/chrome/content/rules/Despora.de.xml
 delete mode 100644 src/chrome/content/rules/ESLint.org.xml
 delete mode 100644 src/chrome/content/rules/EVE_Online.com.xml
 delete mode 100644 src/chrome/content/rules/Maxmind.xml
 delete mode 100644 src/chrome/content/rules/Mit-dem-rad-zur-arbeit.de.xml
 delete mode 100644 src/chrome/content/rules/NIFC.gov.xml
 delete mode 100644 src/chrome/content/rules/National_Transport_Safety_Board.xml
 delete mode 100644 src/chrome/content/rules/Nutrition.gov.xml
 delete mode 100644 src/chrome/content/rules/Ticket_Driver.xml
 delete mode 100644 src/chrome/content/rules/ToontownRewritten.xml
 delete mode 100644 src/chrome/content/rules/Variomedia.de.xml
 delete mode 100644 src/chrome/content/rules/Whirlpool.xml
 delete mode 100644 src/chrome/content/rules/darkwebnews.com.xml
 delete mode 100644 src/chrome/content/rules/eveonline.com.xml
 delete mode 100644 src/chrome/content/rules/smokefree.gov.xml
 delete mode 100644 src/chrome/content/rules/wikiHow.com.xml
 delete mode 100644 src/chrome/content/rules/yoast.com.xml

diff --git a/src/chrome/content/rules/Airbnb.xml b/src/chrome/content/rules/Airbnb.xml
index 0d2d80e31adb..65bab31ee7a0 100644
--- a/src/chrome/content/rules/Airbnb.xml
+++ b/src/chrome/content/rules/Airbnb.xml
@@ -8,86 +8,25 @@
 -->
 <ruleset name="Airbnb (partial)">
 
-	<target host="airbnb.at" />
-	<target host="www.airbnb.at" />
-	<target host="m.airbnb.at" />
-
-	<target host="airbnb.be" />
-	<target host="fr.airbnb.be" />
-	<target host="www.airbnb.be" />
-	<target host="m.airbnb.be" />
-
-	<target host="airbnb.ca" />
-	<target host="www.airbnb.ca" />
-	<target host="m.airbnb.ca" />
-
-	<target host="airbnb.co.kr" />
-	<target host="www.airbnb.co.kr" />
-	<target host="m.airbnb.co.kr" />
-
-	<target host="airbnb.co.nz" />
-	<target host="www.airbnb.co.nz" />
-	<target host="m.airbnb.co.nz" />
-
-	<target host="airbnb.co.uk" />
-	<target host="www.airbnb.co.uk" />
-	<target host="m.airbnb.co.uk" />
-
-	<target host="airbnb.co.ve" />
-	<target host="www.airbnb.co.ve" />
-	<target host="m.airbnb.co.ve" />
-
-	<target host="airbnb.com.au" />
-	<target host="www.airbnb.com.au" />
-	<target host="m.airbnb.com.au" />
-
-	<target host="airbnb.com.br" />
-	<target host="www.airbnb.com.br" />
-	<target host="m.airbnb.com.br" />
-
-	<target host="airbnb.de" />
-	<target host="www.airbnb.de" />
-	<target host="m.airbnb.de" />
-
-	<target host="airbnb.es" />
-	<target host="www.airbnb.es" />
-	<target host="m.airbnb.es" />
-
-	<target host="airbnb.fi" />
-	<target host="www.airbnb.fi" />
-	<target host="m.airbnb.fi" />
-
-	<target host="airbnb.fr" />
-	<target host="www.airbnb.fr" />
-	<target host="m.airbnb.fr" />
+
+
+
+
+
+
+
+
+
+
+
+
 	
-	<target host="airbnb.it" />
-	<target host="www.airbnb.it" />
-	<target host="m.airbnb.it" />
 
-	<target host="airbnb.jp" />
-	<target host="www.airbnb.jp" />
-	<target host="m.airbnb.jp" />
 
-	<target host="airbnb.lu" />
-	<target host="www.airbnb.lu" />
-	<target host="m.airbnb.lu" />
 
-	<target host="airbnb.mx" />
-	<target host="www.airbnb.mx" />
-	<target host="m.airbnb.mx" />
 
-	<target host="airbnb.no" />
-	<target host="www.airbnb.no" />
-	<target host="m.airbnb.no" />
 
-	<target host="airbnb.ru" />
-	<target host="www.airbnb.ru" />
-	<target host="m.airbnb.ru" />
 
-	<target host="airbnb.se" />
-	<target host="www.airbnb.se" />
-	<target host="m.airbnb.se" />
 
 	<target host="a0.muscache.com" />
 	<target host="a1.muscache.com" />
diff --git a/src/chrome/content/rules/Appinn.xml b/src/chrome/content/rules/Appinn.xml
deleted file mode 100644
index 2bf7e3dec56d..000000000000
--- a/src/chrome/content/rules/Appinn.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-	Invalid certificate:
-		d.cdn.appinn.com
-		edit.appinn.com
-		g.appinn.com
-		g1.appinn.com
-		i.appinn.com
-		img1.appinn.com
-
-	Timeout:
-		m.appinn.com
--->
-<ruleset name="Appinn (partial)">
-	<target host="appinn.com" />
-	<target host="www.appinn.com" />
-	<target host="cn.appinn.com" />
-	<target host="d.appinn.com" />
-	<target host="faxian.appinn.com" />
-	<target host="feed.appinn.com" />
-	<target host="img.appinn.com" />
-	<target host="img3.appinn.com" />
-	<target host="love.appinn.com" />
-	<target host="meta.appinn.com" />
-
-	<rule from="^http:" to="https:" />
-</ruleset>
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 @@
-<ruleset name="BrowserLeaks.com">
-
-	<target host="browserleaks.com" />
-	<target host="www.browserleaks.com" />
-
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/Despora.de.xml b/src/chrome/content/rules/Despora.de.xml
deleted file mode 100644
index 3d14d67d7573..000000000000
--- a/src/chrome/content/rules/Despora.de.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<ruleset name="Despora.de">
-
-	<target host="despora.de" />
-	<target host="www.despora.de" />
-
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>
-
diff --git a/src/chrome/content/rules/ESLint.org.xml b/src/chrome/content/rules/ESLint.org.xml
deleted file mode 100644
index db96c86887fb..000000000000
--- a/src/chrome/content/rules/ESLint.org.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<ruleset name="ESLint.org">
-	<target host="eslint.org" />
-	<target host="www.eslint.org" />
-	<target host="cn.eslint.org" />
-	<target host="jenkins.eslint.org" />
-
-	<securecookie host=".+" name=".+" />
-
-	<rule from="^http:" to="https:" />
-</ruleset>
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 0948a8f8cecf..000000000000
--- a/src/chrome/content/rules/EVE_Online.com.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-	Nonfunctional subdomains:
-
-		- content *
-
-	* 404, valid cert
-
-
-	Mixed content:
-
-		- Ad on community and www from web.ccpgamescdn.com
-
--->
-<ruleset name="EVE Online.com (partial)">
-
-	<target host="eveonline.com" />
-	<target host="community.eveonline.com" />
-	<target host="forums.eveonline.com" />
-	<target host="gate.eveonline.com" />
-	<target host="image.eveonline.com" />
-	<target host="login.eveonline.com" />
-	<target host="secure.eveonline.com" />
-	<target host="www.eveonline.com" />
-		<!--exclusion pattern="^http://content\.eveonline\.com/" /-->
-
-
-	<!--	Secured by server:
-					-->
-	<!--securecookie host="^login\.eveonline\.com$" name="^C$" /-->
-	<!--
-		Not secured by server:
-					-->
-	<!--securecookie host="^\.eveonline\.com$" name="^cultureinfo$" /-->
-	<!--securecookie host="^forums\.eveonline\.com$" name="^ASP.NET_SessionId$" /-->
-	<!--securecookie host="^secure\.eveonline\.com$" name="^(ASP\.NET_SessionId|aid|secure_cultureinfo)$" /-->
-	<!--securecookie host="^wiki\.eveonline\.com$" name="^PHPSESSID$" /-->
-
-	<securecookie host="^(?:forums|secure|wiki)\.eveonline\.com$" name=".+" />
-
-
-	<rule from="^http:" to="https:" />
-
-</ruleset>
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 @@
-<!--
-	Nonfunctional subdomains:
-
-		- status		(hostname mismatch, CN: *.status.io, status.io )
-
--->
-<ruleset name="MaxMind (partial)">
-
-	<target host=        "maxmind.com" />
-	<target host=    "www.maxmind.com" />
-	<target host=    "dev.maxmind.com" />
-	<target host=   "blog.maxmind.com" />
-	<target host="staging.maxmind.com" />
-
-	<securecookie host="^www\.maxmind\.com$" name=".+" />
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>
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 @@
-<ruleset name="Mit-dem-rad-zur-arbeit.de">
-  <target host="www.mit-dem-rad-zur-arbeit.de" />
-
-  <rule from="^http:" to="https:" />
-</ruleset>
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 @@
-<!--
-	National Interagency Fire Center
-
-
-
-	Problematic hosts in *nifc.gov:
-
-		- ^ ᵐ ᶜ
-		- predictiveservices ᶜ
-		- www.predictiveservices ᵐ ᶜ
-		- www ᶜ
-
-	ᶜ Missing certificate chain
-	ᵐ Mismatched
-
-
--->
-<ruleset name="NIFC.gov (partial)" default_off="missing certificate chain">
-
-	<!--	Direct rewrites:
-				-->
-	<target host="predictiveservices.nifc.gov" />
-	<target host="www.nifc.gov" />
-
-	<!--	Complications:
-				-->
-	<target host="nifc.gov" />
-
-
-	<securecookie host="^\w" name=".+" />
-
-
-	<rule from="^http://nifc\.gov/"
-		to="https://www.nifc.gov/" />
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>
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 @@
-<!--
-	National Transport Safety Board
-
-
-
-	Nonfunctional hosts in *ntsb.gov:
-
-		- (www.)? ᵈ
-		- dms ᵈ
-
-	ᵈ Dropped
-
-
-	Problematic hosts in *ntsb.gov:
-
-		- foiarequest ᶜ ᵉ
-
-	ᶜ Server sends no certificate chain, see https://whatsmychaincert.com
-	ᵉ Expired
-
--->
-<ruleset name="NTSB.gov (partial)">
-
-	<target host="app.ntsb.gov" />
-
-
-	<!--	Not secured by server:
-					-->
-	<!--securecookie host="^foiarequest\.ntsb\.gov$" name="^(?:APP_UniqueIdentifier|ASP\.NET_SessionId)$" /-->
-
-	<securecookie host="^\w" name=".+" />
-
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>
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 @@
-<!--
-
-
-	Mixed content:
-
-		- css on www from search.usa.gov *
-		- Images on www from www.nal.usda.gov *
-
-	* Secured by us
-
--->
-<ruleset name="Nutrition.gov">
-
-	<target host="nutrition.gov" />
-	<target host="www.nutrition.gov" />
-
-
-	<securecookie host="^\w" name=".+" />
-
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/Shopify.xml b/src/chrome/content/rules/Shopify.xml
index d65aa40a15d9..23d4bb5f6b17 100644
--- a/src/chrome/content/rules/Shopify.xml
+++ b/src/chrome/content/rules/Shopify.xml
@@ -17,26 +17,9 @@
 		<test url="http://beastmodeco.myshopify.com/" />
 		<test url="http://naiise.myshopify.com/" />
 		<test url="http://littlefreelibrary.myshopify.com/" />
-	<target host="apps.shopify.com" />
-	<target host="canada.shopify.com" />
-	<target host="cdn.shopify.com" />
-	<target host="checkout.shopify.com" />
-	<target host="developers.shopify.com" />
-	<target host="engineering.shopify.com" />
-	<target host="help.shopify.com" />
-	<target host="pay.shopify.com" />
-	<target host="static.shopify.com" />
 		<test url="http://static.shopify.com/s/files/1/0704/4335/files/NBM_AMS4590.pdf" />
-	<target host="themes.shopify.com" />
 
-	<target host="es.shopify.com" />
 	<target host="fr.shopify.ca" />
-	<target host="fr.shopify.com" />
-	<target host="hi.shopify.com" />
-	<target host="it.shopify.com" />
-	<target host="meetups.shopify.com" />
-	<target host="pt.shopify.com" />
-	<target host="ru.shopify.com" />
 	<target host="shopify.ca" />
 	<target host="shopify.co" />
 	<target host="www.shopify.co" />
@@ -48,8 +31,6 @@
 	<target host="www.shopify.co.uk" />
 	<target host="shopify.co.za" />
 	<target host="www.shopify.co.za" />
-	<target host="shopify.com" />
-	<target host="www.shopify.com" />
 	<target host="shopify.com.au" />
 	<target host="www.shopify.com.au" />
 	<target host="shopify.com.co" />
diff --git a/src/chrome/content/rules/Team-Liquid.xml b/src/chrome/content/rules/Team-Liquid.xml
index 1df6538deefc..909a3741351a 100644
--- a/src/chrome/content/rules/Team-Liquid.xml
+++ b/src/chrome/content/rules/Team-Liquid.xml
@@ -8,8 +8,6 @@
 
 <ruleset name="Team Liquid">
 	<!-- liquipedia.net -->
-	<target host="liquipedia.net" />
-	<target host="www.liquipedia.net" />
 
 
 	<!-- teamliquid.net -->
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 @@
-<ruleset name="Ticket Driver">
-
-	<target host="ticketdriver.com" />
-	<target host="www.ticketdriver.com" />
-
-
-	<securecookie host="^(?:w*\.)?ticketdriver\.com$" name=".+" />
-
-
-	<rule from="^http:" to="https:" />
-
-</ruleset>
\ No newline at end of file
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 @@
-<!--
-		Invalid certificate:
-			support.toontownrewritten.com (incomplete certificate chain)
--->
-<ruleset name="Toontown Rewritten">
-	<target host="toontownrewritten.com" />
-	<target host="www.toontownrewritten.com" />
-	<target host="cdn.toontownrewritten.com" />
-	<target host="cp.toontownrewritten.com" />
-	<target host="download.toontownrewritten.com" />
-	<target host="git.toontownrewritten.com" />
-	<target host="synergy.toontownrewritten.com" />
-
-	<securecookie host=".+" name=".+" />
-
-	<rule from="^http:"
-			to="https:" />
-</ruleset>
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 @@
-<!--
-	Other Variomedia rulesets:
-
-		- Vm.ag.xml
-
-
-	Nonfunctional hosts in *variomedia.de:
-
-		- blog *
-
-	* Refused
-
-
-	Insecure cookies are set for these domains:
-
-		- .variomedia.de
-		- .ntlds.variomedia.de
-
--->
-<ruleset name="Variomedia.de">
-
-	<target host="variomedia.de" />
-	<target host="my.variomedia.de" />
-	<target host="my-beta.variomedia.de" />
-	<target host="mysql.variomedia.de" />
-	<target host="ntlds.variomedia.de" />
-	<target host="webmail.variomedia.de" />
-	<target host="www.variomedia.de" />
-
-
-	<!--	Not secured by server:
-					-->
-	<!--securecookie host="^\.variomedia\.de$" name="^sessid$" /-->
-	<!--securecookie host="^\.ntlds\.variomedia\.de$" name="^sid$" /-->
-
-	<securecookie host=".+" name=".+" />
-
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/Whirlpool.xml b/src/chrome/content/rules/Whirlpool.xml
deleted file mode 100644
index 3d740b31d6d2..000000000000
--- a/src/chrome/content/rules/Whirlpool.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<ruleset name="Whirlpool">
-
-	<target host="whirlpool.net.au" />
-	<target host="www.whirlpool.net.au" />
-	<target host="bc.whirlpool.net.au" />
-	<target host="forums.whirlpool.net.au" />
-
-
-	<securecookie host="^\.whirlpool\.net\.au$" name=".+" />
-
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>
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 @@
-<ruleset name="darkwebnews.com">
-	<target host="darkwebnews.com" />
-	<target host="www.darkwebnews.com" />
-
-	<securecookie host=".+" name=".+" />
-
-	<rule from="^http:" to="https:" />
-</ruleset>
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 @@
-<!--
-	eveonline.com
-
-
-	Nonfunctional subdomains:
-		- fanfest		(HTTP Error 404)
-
-
-	Fully covered subdomains:
-
-		- www
-		- forums
-		- community
-		- truestory
-		- wiki
-		- secure
-		- gate
-		- support
-
--->
-<ruleset name="eveonline.com (partial)">
-
-	<target host="eveonline.com" />
-	<target host="*.eveonline.com" />
-
-	<exclusion pattern="^http://(?:fanfest)\.eveonline\.com/" />
-
-	<rule from="^http://(?:www\.)?eveonline\.com/"
-		to="https://www.eveonline.com/" />
-
-	<rule from="^http://(forums|community|truestory|wiki|secure|gate|support)\.eveonline\.com/"
-		to="https://$1.eveonline.com/" />
-
-</ruleset>
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 @@
-<!--
-
-
-	Nonfunctional hosts in *smokefree.gov:
-
-		- teen ᶠ
-		- women ʳ
-
-	ᶠ Handshake fails
-	ʳ Refused
-
-
-	Mixed content:
-
-		- css on ^ from fonts.googleapis.com ˢ
-		- Images on ^ from livehelp.cancer.gov ˢ
-		- Bug on ^ from wcdapps.hhs.gov ˢ
-
-	ˢ Secured by us
-
--->
-<ruleset name="Smokefree.gov (partial)">
-
-	<target host="smokefree.gov" />
-	<target host="espanol.smokefree.gov" />
-	<target host="www.espanol.smokefree.gov" />
-	<target host="www.smokefree.gov" />
-
-
-	<securecookie host="^\w" name=".+" />
-	<securecookie host="^\." name="^_gat?$" />
-
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>
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 @@
-<!--
-	Mismatched:
-		- *.whstatic.com
-
-	wikiHow.com has both a wildcard DNS record and a wildcard SSL certificate.
--->
-
-<ruleset name="wikiHow.com">
-	<target host="wikihow.com" />
-	<target host="*.wikihow.com" />
-
-	<securecookie host=".+" name=".+" />
-
-	<rule from="^http://wikihow\.com/" to="https://wikihow.com/" />
-
-	<!-- Only redirect domains one level deep. -->
-	<rule from="^http://([a-zA-Z0-9-_]+)\.wikihow\.com/" to="https://$1.wikihow.com/" />
-
-	<test url="http://www.wikihow.com/" />
-	<test url="http://de.wikihow.com/" />
-	<test url="http://es.wikihow.com/" />
-</ruleset>
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 @@
-<!--
-	Problematic hosts in *yoast.com:
-
-		- kb ᵐ
-
-	ᵐ Mismatched
-
-
-	Insecure cookies are set for these hosts:
-
-		- www.yoast.com
-
--->
-<ruleset name="Yoast.com (partial)">
-
-	<target host="yoast.com" />
-	<target host="www.yoast.com" />
-
-
-	<!--	Not secured by server:
-					-->
-	<!--securecookie host="^www\.yoast\.com$" name="^X-Mapping-" /-->
-
-	<securecookie host="^\w" name=".+" />
-
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>

From 60b86004df9fa9e6d3bf3dd558e06c2f19e91c8e Mon Sep 17 00:00:00 2001
From: Hugo Gruson <hugo.gruson@protonmail.com>
Date: Thu, 27 Dec 2018 14:19:21 +0100
Subject: [PATCH 2/7] Simplify and rename Airbnb.xml

---
 src/chrome/content/rules/Airbnb.xml       | 45 -----------------------
 src/chrome/content/rules/muscache.com.xml | 11 ++++++
 2 files changed, 11 insertions(+), 45 deletions(-)
 delete mode 100644 src/chrome/content/rules/Airbnb.xml
 create mode 100644 src/chrome/content/rules/muscache.com.xml

diff --git a/src/chrome/content/rules/Airbnb.xml b/src/chrome/content/rules/Airbnb.xml
deleted file mode 100644
index 65bab31ee7a0..000000000000
--- a/src/chrome/content/rules/Airbnb.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-	airbnb.com is preloaded
-
-	Invalid certificate:
-		airbnb.co.ve
-		airbnb.lu
-
--->
-<ruleset name="Airbnb (partial)">
-
-
-
-
-
-
-
-
-
-
-
-
-
-	
-
-
-
-
-
-
-
-	<target host="a0.muscache.com" />
-	<target host="a1.muscache.com" />
-
-	<securecookie host=".+" name=".+" />
-
-	<rule from="^http://airbnb\.co\.ve/"
-		to="https://www.airbnb.co.ve/" />
-
-	<rule from="^http://airbnb\.lu/"
-		to="https://www.airbnb.lu/" />
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/muscache.com.xml b/src/chrome/content/rules/muscache.com.xml
new file mode 100644
index 000000000000..f6cb88bc617b
--- /dev/null
+++ b/src/chrome/content/rules/muscache.com.xml
@@ -0,0 +1,11 @@
+<ruleset name="muscache.com">
+
+	<target host="a0.muscache.com" />
+	<target host="a1.muscache.com" />
+
+	<securecookie host=".+" name=".+" />
+
+	<rule from="^http:"
+		to="https:" />
+
+</ruleset>

From 256cc17fd9fd72b3ac03f8a3ba696d152936619e Mon Sep 17 00:00:00 2001
From: Hugo Gruson <hugo.gruson@protonmail.com>
Date: Thu, 27 Dec 2018 14:23:11 +0100
Subject: [PATCH 3/7] [Shopify] Remove test url and securecookie

---
 src/chrome/content/rules/Shopify.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/chrome/content/rules/Shopify.xml b/src/chrome/content/rules/Shopify.xml
index 23d4bb5f6b17..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,7 +15,6 @@
 		<test url="http://beastmodeco.myshopify.com/" />
 		<test url="http://naiise.myshopify.com/" />
 		<test url="http://littlefreelibrary.myshopify.com/" />
-		<test url="http://static.shopify.com/s/files/1/0704/4335/files/NBM_AMS4590.pdf" />
 
 	<target host="fr.shopify.ca" />
 	<target host="shopify.ca" />
@@ -61,7 +58,6 @@
 	<!--	Cautiously avoiding cross-domain cookies for now.
 								-->
 	<securecookie host="^\w.*\.myshopify\.com$" name=".+" />
-	<securecookie host="^themes\.shopify\.com$" name=".+" />
 
 	<rule from="^http:" to="https:" />
 </ruleset>

From 0962ff53d2c676e26e8fa95c52d548bf32588fb6 Mon Sep 17 00:00:00 2001
From: Hugo Gruson <hugo.gruson@protonmail.com>
Date: Thu, 27 Dec 2018 14:26:05 +0100
Subject: [PATCH 4/7] [TeamLiquid.net] Simplify and rename ruleset

---
 src/chrome/content/rules/Team-Liquid.xml    | 22 ---------------------
 src/chrome/content/rules/TeamLiquid.net.xml |  8 ++++++++
 2 files changed, 8 insertions(+), 22 deletions(-)
 delete mode 100644 src/chrome/content/rules/Team-Liquid.xml
 create mode 100644 src/chrome/content/rules/TeamLiquid.net.xml

diff --git a/src/chrome/content/rules/Team-Liquid.xml b/src/chrome/content/rules/Team-Liquid.xml
deleted file mode 100644
index 909a3741351a..000000000000
--- a/src/chrome/content/rules/Team-Liquid.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-	HTTP-only content:
-		- www.teamliquid.net
-
-	Invalid certificatE:
-		- wiki.teamliquid.net, equivalent to liquipedia.net
--->
-
-<ruleset name="Team Liquid">
-	<!-- liquipedia.net -->
-
-
-	<!-- teamliquid.net -->
-	<target host="teamliquid.net" />
-	<target host="wiki.teamliquid.net" />
-
-	<rule from="^http://wiki\.teamliquid\.net/"
-		to="https://liquipedia.net/" />
-
-
-	<rule from="^http:" to="https:" />
-</ruleset>
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 @@
+<ruleset name="TeamLiquid.net">
+
+	<target host="teamliquid.net" />
+	<target host="www.teamliquid.net" />
+	<target host="wiki.teamliquid.net" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>

From 929ea5cf0f7f204785fc28defb4e02522f0218ca Mon Sep 17 00:00:00 2001
From: Hugo Gruson <hugo.gruson@protonmail.com>
Date: Thu, 27 Dec 2018 14:27:08 +0100
Subject: [PATCH 5/7] [Vm.ag] Remove dangling reference and sort targets

---
 src/chrome/content/rules/Vm.ag.xml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

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 @@
-<!--
-	For other Variomedia coverage, see Variomedia.de.xml.
-
--->
 <ruleset name="Vm.ag">
 
 	<target host="vm.ag" />
-	<target host="piwik.vm.ag" />
 	<target host="www.vm.ag" />
+	<target host="piwik.vm.ag" />
 
-
-	<securecookie host="^\w" name=".+" />
+	<securecookie host=".+" name=".+" />
 
 
 	<rule from="^http:"

From 020f4ccec67d05969aafbafd7a2b95e15765d43d Mon Sep 17 00:00:00 2001
From: Hugo Gruson <hugo.gruson@protonmail.com>
Date: Thu, 3 Jan 2019 20:41:18 +0100
Subject: [PATCH 6/7] Restore Despora.de.xml

---
 src/chrome/content/rules/Despora.de.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 src/chrome/content/rules/Despora.de.xml

diff --git a/src/chrome/content/rules/Despora.de.xml b/src/chrome/content/rules/Despora.de.xml
new file mode 100644
index 000000000000..3d14d67d7573
--- /dev/null
+++ b/src/chrome/content/rules/Despora.de.xml
@@ -0,0 +1,11 @@
+<ruleset name="Despora.de">
+
+	<target host="despora.de" />
+	<target host="www.despora.de" />
+
+
+	<rule from="^http:"
+		to="https:" />
+
+</ruleset>
+

From 054fab43b09dfb3e353b25f9ee905e3562bd959f Mon Sep 17 00:00:00 2001
From: Hugo Gruson <hugo.gruson@protonmail.com>
Date: Thu, 3 Jan 2019 20:42:11 +0100
Subject: [PATCH 7/7] [muscache.com] Add target

---
 src/chrome/content/rules/muscache.com.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/chrome/content/rules/muscache.com.xml b/src/chrome/content/rules/muscache.com.xml
index f6cb88bc617b..6234ff85353b 100644
--- a/src/chrome/content/rules/muscache.com.xml
+++ b/src/chrome/content/rules/muscache.com.xml
@@ -2,6 +2,7 @@
 
 	<target host="a0.muscache.com" />
 	<target host="a1.muscache.com" />
+	<target host="a2.muscache.com" />
 
 	<securecookie host=".+" name=".+" />