diff --git a/src/chrome/content/rules/Amazon-Associates.xml b/src/chrome/content/rules/Amazon-Associates.xml
deleted file mode 100644
index 0d245e9fcf7f..000000000000
--- a/src/chrome/content/rules/Amazon-Associates.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/chrome/content/rules/Amazon.com.astore.xml b/src/chrome/content/rules/Amazon.com.astore.xml
deleted file mode 100644
index a34b82a25ef3..000000000000
--- a/src/chrome/content/rules/Amazon.com.astore.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/src/chrome/content/rules/Amazon.xml b/src/chrome/content/rules/Amazon.xml
index fefb7939a655..8ed865dca2b2 100644
--- a/src/chrome/content/rules/Amazon.xml
+++ b/src/chrome/content/rules/Amazon.xml
@@ -2,43 +2,48 @@
Other Amazon rulesets:
- 6PM.com.xml
- - AbeBooks.xml
+ - AWS_Trust.com.xml
- AbeBooks.co.uk.xml
+ - AbeBooks.xml
+ - Amazon-Adsystem.com.xml
+ - Amazon.jobs.xml
+ - AmazonAWS.xml
+ - AmazonSupply.com.xml
+ - Amazon_Trust.com.xml
+ - Amazon_blogs.com.xml
+ - Assoc-Amazon.ca.xml
+ - Assoc-Amazon.co.jp.xml
+ - Assoc-Amazon.co.uk.xml
+ - Assoc-Amazon.com.xml
+ - Assoc-Amazon.de.xml
+ - Assoc-Amazon.fr.xml
+ - BeautyBar.com.xml
+ - ComiXology.com.xml
+ - CreateSpace.xml
+ - Images-CreateSpace.com.xml
+ - Junglee.com.xml
+ - MTurk.com.xml
+ - Soap.com.xml
+ - TenMarks.com.xml
- amazon.ca.xml
+ - amazon.cn.xml
+ - amazon.co.jp.xml
- amazon.co.uk.xml
- amazon.com.au.xml
- amazon.com.br.xml
- amazon.com.mx.xml
- - amazon.cn.xml
+ - amazon.de.xml
- amazon.es.xml
- amazon.fr.xml
- amazon.in.xml
- amazon.it.xml
- - Amazon.jobs.xml
- amazon.nl.xml
- - Amazon-Associates.xml
- - AmazonAWS.xml
- - Amazon_EU.xml
- - Amazon_JP.xml
- - Amazon_Trust.com.xml
- - Amazon_blogs.com.xml
- - AmazonSupply.com.xml
- - Assoc-Amazon.com.xml
- - AWS_Trust.com.xml
- - BeautyBar.com.xml
- casa.com.xml
- - ComiXology.com.xml
- - CreateSpace.xml
- diapers.com.xml
- eastdane.com.xml
- - Images-CreateSpace.com.xml
- - Junglee.com.xml
- - MTurk.com.xml
- q-assets.com.xml
- quidsi.com.xml
- shopbop.com.xml
- - Soap.com.xml
- - TenMarks.com.xml
- wag.com.xml
- yoyo.com.xml
@@ -59,18 +64,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ +ve:
+
@@ -79,11 +103,14 @@
+ -->
+
+
@@ -100,7 +127,6 @@
-
diff --git a/src/chrome/content/rules/AmazonAWS.xml b/src/chrome/content/rules/AmazonAWS.xml
index d35d157ca633..d2b3aa3a42b1 100644
--- a/src/chrome/content/rules/AmazonAWS.xml
+++ b/src/chrome/content/rules/AmazonAWS.xml
@@ -17,7 +17,7 @@
- d1ge0kk1l5kms0.cloudfront.net
- ec[5x].images-amazon.com
- - g-ecx.images-amazon.com
+ - g-ecx.images-amazon.com
- d36cz9buwru1tt.cloudfront.net
- s3.amazonaws.com/awsmedia/
@@ -42,7 +42,7 @@
- ec[13].images-amazon.com
- - g-ecx.images-amazon.com.c.footprint.net
+ - g-ecx.images-amazon.com.c.footprint.net
- g-images.amazon.com
@@ -103,11 +103,9 @@
-
-
@@ -140,10 +138,10 @@
-->
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -178,7 +177,7 @@
-
-
diff --git a/src/chrome/content/rules/amazon.cn.xml b/src/chrome/content/rules/amazon.cn.xml
index 559aed0984af..3d26c1e050bc 100644
--- a/src/chrome/content/rules/amazon.cn.xml
+++ b/src/chrome/content/rules/amazon.cn.xml
@@ -13,7 +13,14 @@
+
+
+
+
+
+
+
diff --git a/src/chrome/content/rules/Amazon_JP.xml b/src/chrome/content/rules/amazon.co.jp.xml
similarity index 75%
rename from src/chrome/content/rules/Amazon_JP.xml
rename to src/chrome/content/rules/amazon.co.jp.xml
index 1a6e64e52d93..5645314ff999 100644
--- a/src/chrome/content/rules/Amazon_JP.xml
+++ b/src/chrome/content/rules/amazon.co.jp.xml
@@ -14,9 +14,19 @@
+
+
+
+
+
+
+
+
+
+
@@ -23,17 +23,28 @@
-->
+
+
+
+
+
+
+
+
+
+
+
+
-
+ +ve:
+
@@ -42,11 +53,14 @@
+ -->
+
+
diff --git a/src/chrome/content/rules/amazon.com.au.xml b/src/chrome/content/rules/amazon.com.au.xml
index 212f6f394413..902ecb3579c0 100644
--- a/src/chrome/content/rules/amazon.com.au.xml
+++ b/src/chrome/content/rules/amazon.com.au.xml
@@ -7,11 +7,12 @@
- .amazon.com.au
ᶜ See https://owasp.org/index.php/SecureFlag
-
+
-->
+
-
+
-
+
+
+
+
-
-
diff --git a/src/chrome/content/rules/Amazon_EU.xml b/src/chrome/content/rules/amazon.de.xml
similarity index 74%
rename from src/chrome/content/rules/Amazon_EU.xml
rename to src/chrome/content/rules/amazon.de.xml
index 868467afc71f..3117695c3dbc 100644
--- a/src/chrome/content/rules/Amazon_EU.xml
+++ b/src/chrome/content/rules/amazon.de.xml
@@ -3,9 +3,13 @@
Problematic hosts in *amazon.de:
+ - affiliate-blog.amazon.de *
+ - aws.amazon.de '
+ - kdp.amazon.de ʳ
+ - static.amazon.de *
- - kdp ʳ
-
+ * Mismatch
+ ' Refused
ʳ Refused, preemptable redirect
@@ -14,22 +18,34 @@
- .amazon.de
ᶜ See https://owasp.org/index.php/SecureFlag
-
+
-->
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ +ve:
+
@@ -38,10 +54,13 @@
+ -->
+
+
diff --git a/src/chrome/content/rules/amazon.es.xml b/src/chrome/content/rules/amazon.es.xml
index f9415eb3011d..d766ab99b2bb 100644
--- a/src/chrome/content/rules/amazon.es.xml
+++ b/src/chrome/content/rules/amazon.es.xml
@@ -8,12 +8,19 @@
- .www.amazon.es
ᶜ See https://owasp.org/index.php/SecureFlag
-
+
-->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ +ve:
+
@@ -29,10 +42,13 @@
+ -->
+
+
diff --git a/src/chrome/content/rules/amazon.in.xml b/src/chrome/content/rules/amazon.in.xml
index 72d87f368215..37117b896ce7 100644
--- a/src/chrome/content/rules/amazon.in.xml
+++ b/src/chrome/content/rules/amazon.in.xml
@@ -22,6 +22,7 @@
+
diff --git a/src/chrome/content/rules/amazon.it.xml b/src/chrome/content/rules/amazon.it.xml
index 02abbeb63d0e..b3a6b2722e02 100644
--- a/src/chrome/content/rules/amazon.it.xml
+++ b/src/chrome/content/rules/amazon.it.xml
@@ -8,12 +8,15 @@
- .www.amazon.it
ᶜ See https://owasp.org/index.php/SecureFlag
-
+
-->
+
+
+