diff --git a/src/chrome/content/rules/Unity.xml b/src/chrome/content/rules/Unity.xml
index cd6a49bb2a5a..c020cc6a9a9f 100644
--- a/src/chrome/content/rules/Unity.xml
+++ b/src/chrome/content/rules/Unity.xml
@@ -1,52 +1,57 @@
 <!--
-	Nonfunctional subdomains:
-		- download.unity3d.com (cert error)
-		- netstorage.unity3d.com (cert error, link used when downloading unity)
-		- blogs.unity3d.com (redirects to http)
-		- forum.unity3d.com (broken in Chrome)
-		- answers.unity3d.com (refused)
-		- info.unity3d.com (cert error)
-		- wiki.unity3d.com (times out)
-		- hwstats.unity3d.com (times out)
-		- japan.unity3d.com (cert error)
-		- beta.unity3d.com (cert error)
-		- response.unity3d.com (cert error)
+	Non-functional hosts
+		SSL peer certificate was not OK:
+		- japan.unity3d.com
+		- response.unity3d.com
+
+		4xx client error:
+		- kharma.unity3d.com
+
+		5xx server error:
+		- assetstore.unity3d.com
+		- www.assetstore.unity3d.com
+
+		Mixed content blocking (MCB) triggered:
+		- answers.unity3d.com
 -->
 <ruleset name="Unity (partial)">
+	<!-- *unity.com -->
+	<target host="unity.com" />
+	<target host="www.unity.com" />
+	<target host="api.unity.com" />
+	<target host="certification.unity.com" />
+	<target host="checkout.unity.com" />
+	<target host="id.unity.com" />
+	<target host="madewith.unity.com" />
+	<target host="unite.unity.com" />
 
+	<!-- *unity3d.com -->
 	<target host="unity3d.com" />
 	<target host="www.unity3d.com" />
+	<target host="accounts.unity3d.com" />
+	<target host="publisher.assetstore.unity3d.com" />
+	<target host="beta.unity3d.com" />
+	<target host="blogs.unity3d.com" />
+	<target host="analytics.cloud.unity3d.com" />
+	<target host="build.cloud.unity3d.com" />
+	<target host="data.cloud.unity3d.com" />
+	<target host="developer.cloud.unity3d.com" />
+	<target host="perf.cloud.unity3d.com" />
 	<target host="docs.unity3d.com" />
+	<target host="download.unity3d.com" />
 	<target host="feedback.unity3d.com" />
+	<target host="forum.unity3d.com" />
+	<target host="hwstats.unity3d.com" />
 	<target host="issuetracker.unity3d.com" />
-	<target host="multiplayer.unity3d.com" />
 	<target host="madewith.unity3d.com" />
-	<target host="unityads.unity3d.com" />
-	<target host="developer.cloud.unity3d.com" />
-	<target host="analytics.cloud.unity3d.com" />
-	<target host="perf.cloud.unity3d.com" />
-	<target host="build.cloud.unity3d.com" />
-	<target host="data.cloud.unity3d.com" />
+	<target host="multiplayer.unity3d.com" />
+	<target host="netstorage.unity3d.com" />
 	<target host="store.unity3d.com" />
-	<target host="www.assetstore.unity3d.com" />
-	<target host="publisher.assetstore.unity3d.com" />
-	<target host="assetstore.unity3d.com" />
-	<target host="accounts.unity3d.com" />
 	<target host="support.unity3d.com" />
-	<target host="kharma.unity3d.com" />
-
-	<target host="id.unity.com" />
-	<target host="api.unity.com" />
-	<target host="checkout.unity.com" />
-	<target host="unite.unity.com" />
-	<target host="certification.unity.com" />
-	<target host="www.unity.com" /><!-- Forwards to madewith.unity.com -->
-	<target host="unity.com" /><!-- Cert error, forwards to madewith.unity.com -->
-	<target host="madewith.unity.com" />
+	<target host="unityads.unity3d.com" />
+	<target host="wiki.unity3d.com" />
 
 	<securecookie host=".+" name=".+" />
 
-	<rule from="^https?://unity\.com/" to="https://www.unity.com/" /><!-- Avoid cert error -->
 	<rule from="^http:" to="https:" />
-
 </ruleset>