diff --git a/src/chrome/content/rules/Steam.xml b/src/chrome/content/rules/Steam.xml
index f4b30357f641..4277bf3c92ad 100644
--- a/src/chrome/content/rules/Steam.xml
+++ b/src/chrome/content/rules/Steam.xml
@@ -1,149 +1,53 @@
-<!--
-	For other Valve coverage, see Valve.xml.
+<ruleset name="Steam">
+	<!-- "steam-api.com" has a cert but it doesn't resolve -->
+	<!--target host="steam-api.com" /-->
+	<target host="*.steam-api.com" />
+		<test url="http://community.steam-api.com/" />
+		<test url="http://community.steam-api.com/ISteamWebAPIUtil/GetSupportedAPIList/v1/" />
+		<test url="http://partner.steam-api.com/" />
+
+	<target host="steamcommunity.com" />
+		<test url="http://steamcommunity.com/" />
+		<test url="http://steamcommunity.com/broadcast/getbroadcastmpd/?steamid=76561197966726415" />
+	<target host="*.steamcommunity.com" />
+		<test url="http://www.steamcommunity.com/" />
+		<test url="http://api.steamcommunity.com/" />
+		<test url="http://cdn.steamcommunity.com/public/css/skin_1/header.css" />
+
+	<target host="partner.steamgames.com" />
 
-
-	CDN buckets:
-
-		- steamcdn-a.akamaihd.net
-		- steamstore-a.akamaihd.net
-
-		- akacdn.valve.com.edgesuite.net
-
-			- cdn4
-			- cloud-3
-			- repo
-
-		- content2.steampowered.com.c.footprint.net
-
-			- cloud-4
-
-		- cds.w2n5c2t7.hwcdn.net
-
-			- cloud-2.steampowered.com
-
-		- valve.vo.llnwd.net/...
-
-			- .hs. doesn't exist
-			- cdn.steampowered.com
-			- cloud.streampowered.com
-			- media.steampowered.com
-
-
-	Nonfunctional domains:
-
-		- ^ *
-		- cafe ¹
-		- cafesupport ²
-		- cdn ³
-		- cloud ³
-		- cloud-2 ⁴
-		- cloud-3 ⁵
-		- cloud-4 ¹
-		- forums ⁶
-		- media ³
-		- repo ⁷
-		- www ⁶
-
-	* 403
-	¹ Dropped
-	² 403; mismatched, CN: store.steampowered.com
-	³ 400; mismatched, CN: *.hs.llnwd.net
-	⁴ Refused
-	⁵ 404, akamai
-	⁶ 503, valid cert
-	⁷ 504, akamai
-
-
-	Problematic subdomains:
-
-		- cdn4 ²
-
-	² Works, akamai
-
-
-	Fully covered subdomains:
-
-		- api
-		- kgs
-		- partner
-		- partnerupload0
-		- partnerupload1
-		- store
-		- support
-
--->
-<ruleset name="Steam Powered.com (partial)" default_off="Breaks some games">
-
-	<!--	Direct rewrites:
-					-->
 	<target host="api.steampowered.com" />
+		<test url="http://api.steampowered.com/ISteamWebAPIUtil/GetSupportedAPIList/v1/" />
 	<target host="kgs.steampowered.com" />
 	<target host="partner.steampowered.com" />
-	<target host="partnerupload0.steampowered.com" />
-	<target host="partnerupload1.steampowered.com" />
+	<target host="storefront.steampowered.com" />
+		<test url="http://storefront.steampowered.com/app/440/" />
 	<target host="store.steampowered.com" />
+		<test url="http://store.steampowered.com/app/440/" />
 	<target host="support.steampowered.com" />
-	<!--target host="www.steampowered.com" /-->
-
-	<!--	Special cases:
-				-->
-	<!--target host="steampowered.com" /-->
-	<!--target host="cdn.steampowered.com" /-->
-	<!--target host="cdn.store.steampowered.com" /-->
-
-		<!--	Redirects to $:
-					-->
-		<!--exclusion pattern="^http://www\.steampowered\.com/steamworks/(gettingstarted\.php|images/bg_vtile\.gif|index\.php)" /-->
-		<!--
-			503:
-				-->
-		<!--exclusion pattern="^http://www\.steampowered\.com/($|steamworks(?:$|[?/]))" /-->
-		<!--exclusion pattern="^http://(?:www\.)?steampowered\.com/(?:$|status/survey\.html|steamworks(?:$|[?/]))" /-->
-		<!--
-			Redirect to http:
-						-->
-		<!--exclusion pattern="^http://store\.steampowered\.com/(about|app/\d+|freestuff/demos|news|recommended|stats)/" /-->
-		<!--
-			Exceptions:
-					-->
-		<exclusion pattern="^http://store\.steampowered\.com/+(?!favicon\.ico|(?:join|login|psn/beginsetup|search|software)(?:$|[?/])|public/images/)" />
-
-			<!--	+ve:
-					-->
-			<test url="http://store.steampowered.com/about/" />
-			<test url="http://store.steampowered.com/app/4000/" />
-			<test url="http://store.steampowered.com/app/266410/" />
-			<test url="http://store.steampowered.com/app/311560/" />
-			<test url="http://store.steampowered.com/forum/222621" />
-			<test url="http://store.steampowered.com/freestuff/demos/" />
-			<test url="http://store.steampowered.com/genre/Indie/" />
-			<test url="http://store.steampowered.com/genre/RPG/" />
-			<test url="http://store.steampowered.com/news/" />
-			<test url="http://store.steampowered.com/updated/all/" />
-
-			<!--	-ve:
-					-->
-			<test url="http://store.steampowered.com/login/" />
-			<test url="http://store.steampowered.com/favicon.ico" />
-			<test url="http://store.steampowered.com/search/?filter=popularnew" />
-
-
-	<!--	Not secured by server:
-					-->
-	<!--securecookie host="^partner\.steampowered\.com$" name="(dateEnd|dateStart|steamstatsAuth|steamworksSteamid|steamworksToken)$" /-->
-
+	<target host="help.steampowered.com" />
+	<target host="cdn.steampowered.com" />
+		<test url="http://cdn.steampowered.com/public/images/gift/steamcards_promo_02.png" />
+	<target host="cdn.store.steampowered.com" />
+		<test url="http://cdn.store.steampowered.com/public/images/gift/steamcards_promo_02.png" />
+	<target host="www.steampowered.com" />
+
+	<securecookie host="^steamcommunity\.com$" name=".+" />
+	<securecookie host="^partner\.steamgames\.com$" name=".+" />
 	<securecookie host="^partner\.steampowered\.com$" name=".+" />
 
+	<rule from="^https?://cdn\.steamcommunity\.com/"
+			to="https://steamcommunity-a.akamaihd.net/" />
 
-	<!--rule from="^http://steampowered\.com/"
-		to="https://www.steampowered.com/" /-->
+	<rule from="^https?://storefront\.steampowered\.com/"
+			to="https://store.steampowered.com/" />
 
-	<!--	Disabled per https://github.com/EFForg/https-everywhere/issues/1453
-								-->
-	<!--rule from="^http://cdn\.store\.steampowered\.com/"
-		to="https://store.steampowered.com/" /-->
+	<rule from="^https?://((cdn|cdn\.store|www)\.)?steampowered\.com/"
+			to="https://store.steampowered.com/" />
 
-	<rule from="^http:"
-		to="https:" />
+	<rule from="^https?://www\.steamcommunity\.com/"
+			to="https://steamcommunity.com/" />
 
+	<rule from="^http:"
+			to="https:" />
 </ruleset>
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 @@
-<!--
-	For other Valve coverage, see Valve.xml.
-
-
-	Problematic subdomains:
-
-		- cdn *
-		- www *
-
-	* Mismatched
-
-
-	Insecure cookies are set for these domains and hosts:
-
-		- steamcommunity.com
-		- .steamcommunity.com
-
-
-	Mixed content:
-
-		- Image, on ^ from:
-
-			- steamcommunity-a.akamaihd.net *
-			- cdn.akamai.steamstatic.com *
-			- cloud-[24].steampowered.com ²
-
-	* Secured by us
-	² Unsecurable <= refused
-
--->
-<ruleset name="Steam Community.com (partial)">
-
-	<target host="steamcommunity.com" />
-	<target host="cdn.steamcommunity.com" />
-	<target host="www.steamcommunity.com" />
-
-
-	<!--	Not secured by server:
-					-->
-	<!--securecookie host="^steamcommunity\.com$" name="^(rgTopicView_General_\d+_\d+|recentlyVisitedAppHubs|sessionid|steamCC_(\d+_){3}\d+|timezoneOffset)$" /-->
-	<!--securecookie host="^\.steamcommunity\.com$" name="^__utm\w$" /-->
-
-	<securecookie host="^steamcommunity\.com$" name=".+" />
-	<securecookie host="^\.steamcommunity\.com$" name="^__utm\w$" />
-	
-	<!-- Fix #2326 -->
-	<exclusion pattern="^http://steamcommunity\.com/broadcast/" />
-	
-	<test url="http://steamcommunity.com/broadcast/getbroadcastmpd/?steamid=76561197966726415" />
-
-	<!--	www: cert only matches ^streamcommunity.com.
-								-->
-	<rule from="^http://(?:cdn\.|www\.)?steamcommunity\.com/"
-		to="https://steamcommunity.com/" />
-
-</ruleset>
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 @@
-<!--
-	For other Valve coverage, see Valve.xml.
-
-
-	(www.)?: 403
-
-
-	Insecure cookies are set for these hosts:
-
-		- partner.steamgames.com
-
--->
-<ruleset name="Steamgames.com (partial)" default_off="breaks some games">
-
-	<target host="partner.steamgames.com" />
-
-
-	<!--	Not secured by server:
-					-->
-	<!--securecookie host="^partner\.steamgames\.com$" name="^sessionid$" /-->
-
-	<securecookie host="^partner\.steamgames\.com$" name=".+" />
-
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>
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 @@
-<ruleset name="Valve (expired)" default_off="expired">
-
-	<target host="storefront.steampowered.com" />
-
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/ValveSoftware.com.xml b/src/chrome/content/rules/ValveSoftware.com.xml
index 093d5114f339..b332bc27e6e5 100644
--- a/src/chrome/content/rules/ValveSoftware.com.xml
+++ b/src/chrome/content/rules/ValveSoftware.com.xml
@@ -2,9 +2,7 @@
 	Other Valve rulesets:
 		+ Dota_2.com.xml
 		+ Steam.xml
-		+ Steam_Community.com.xml
 		+ Steam_static.com.xml
-		+ Steamgames.com.xml
 
 	Redirect to HTTP:
 		- ^