Using uncapturing patterns

osamak · osamak · commit b14fcf514e6e · 2011-09-27T22:08:28.000+03:00
diff --git a/src/chrome/content/rules/123-Reg.xml b/src/chrome/content/rules/123-Reg.xml
@@ -2,5 +2,5 @@
   <target host="www.123-reg.co.uk" />
   <target host="123-reg.co.uk" />
 
-  <rule from="^http://(www\.)?123-reg\.co\.uk/" to="https://www.123-reg.co.uk/"/>
+  <rule from="^http://(?:www\.)?123-reg\.co\.uk/" to="https://www.123-reg.co.uk/"/>
 </ruleset>
diff --git a/src/chrome/content/rules/1nightstandstory.xml b/src/chrome/content/rules/1nightstandstory.xml
@@ -2,5 +2,5 @@
   <target host="1nightstandstory.com" />
   <target host="www.1nightstandstory.com" />
 
-  <rule from="^http://(www\.)?1nightstandstory\.com/" to="https://www.1nightstandstory.com/"/>
+  <rule from="^http://(?:www\.)?1nightstandstory\.com/" to="https://www.1nightstandstory.com/"/>
 </ruleset>
diff --git a/src/chrome/content/rules/33Bits.xml b/src/chrome/content/rules/33Bits.xml
@@ -2,5 +2,5 @@
   <target host="www.33bits.org" />
   <target host="33bits.org" />
 
-  <rule from="^http://(www\.)?33bits\.org/" to="https://www.33bits.org/"/>
+  <rule from="^http://(?:www\.)?33bits\.org/" to="https://www.33bits.org/"/>
 </ruleset>
diff --git a/src/chrome/content/rules/37Signals.xml b/src/chrome/content/rules/37Signals.xml
@@ -7,7 +7,7 @@
 
 	<securecookie host="^((www|gettingreal|launchpad|smiley)\.)?37signals\.com$" name=".*" />
 
-	<rule from="^http://(www\.)?37signals\.com/" to="https://37signals.com/"/>
+	<rule from="^http://(?:www\.)?37signals\.com/" to="https://37signals.com/"/>
 	<rule from="^http://(gettingreal|launchpad|smiley)\.37signals\.com/" to="https://$1.37signals.com/"/>
 </ruleset>
 
diff --git a/src/chrome/content/rules/38.de.xml b/src/chrome/content/rules/38.de.xml
@@ -2,5 +2,5 @@
   <target host="www.38.de" />
   <target host="38.de" />
 
-  <rule from="^http://(www\.)?38\.de/" to="https://www.38.de/"/>
+  <rule from="^http://(?:www\.)?38\.de/" to="https://www.38.de/"/>
 </ruleset>
diff --git a/src/chrome/content/rules/3min.xml b/src/chrome/content/rules/3min.xml
@@ -5,5 +5,5 @@
 
   <securecookie host="^(.*\.)?3min\.de$" name=".*" />
 
-  <rule from="^http://(www\.)?3min\.de/" to="https://www.3min.de/"/>
+  <rule from="^http://(?:www\.)?3min\.de/" to="https://www.3min.de/"/>
 </ruleset>
diff --git a/src/chrome/content/rules/4sevens.xml b/src/chrome/content/rules/4sevens.xml
@@ -2,5 +2,5 @@
   <target host="www.4sevens.com" />
   <target host="4sevens.com" />
 
-  <rule from="^http://(www\.)?4sevens\.com/" to="https://www.4sevens.com/"/>
+  <rule from="^http://(?:www\.)?4sevens\.com/" to="https://www.4sevens.com/"/>
 </ruleset>
diff --git a/src/chrome/content/rules/7chan.xml b/src/chrome/content/rules/7chan.xml
@@ -2,5 +2,5 @@
   <target host="7chan.org" />
   <target host="www.7chan.org" />
 
-  <rule from="^http://(www\.)?7chan\.org/" to="https://7chan.org/"/>
+  <rule from="^http://(?:www\.)?7chan\.org/" to="https://7chan.org/"/>
 </ruleset>
diff --git a/src/chrome/content/rules/ACLU-of-North-Carolina.xml b/src/chrome/content/rules/ACLU-of-North-Carolina.xml
@@ -4,5 +4,5 @@
 	<target host="acluofnc.org" />
 	<target host="www.acluofnc.org" />
 
-	<rule from="^http://(www\.)?aclu(ofnc|ofnorthcarolina)\.org/" to="https://www.acluofnorthcarolina.org/" />
+	<rule from="^http://(?:www\.)?aclu(ofnc|ofnorthcarolina)\.org/" to="https://www.acluofnorthcarolina.org/" />
 </ruleset>
diff --git a/src/chrome/content/rules/ACLU-of-Southern-California.xml b/src/chrome/content/rules/ACLU-of-Southern-California.xml
@@ -2,5 +2,5 @@
 	<target host="aclu-sc.org" />
 	<target host="www.aclu-sc.org" />
 
-	<rule from="^http://(www\.)?aclu-sc\.org/" to="https://www.aclu-sc.org/" />
+	<rule from="^http://(?:www\.)?aclu-sc\.org/" to="https://www.aclu-sc.org/" />
 </ruleset>
diff --git a/src/chrome/content/rules/AboutMe.xml b/src/chrome/content/rules/AboutMe.xml
@@ -4,5 +4,5 @@
 
   <securecookie host="^(.*\.)?about.me$" name=".*" />
 
-  <rule from="^http://(www\.)?about\.me/" to="https://www.about.me/"/>
+  <rule from="^http://(?:www\.)?about\.me/" to="https://www.about.me/"/>
 </ruleset>
diff --git a/src/chrome/content/rules/AccessNow.xml b/src/chrome/content/rules/AccessNow.xml
@@ -2,5 +2,5 @@
   <target host="accessnow.org" />
   <target host="www.accessnow.org" />
 
-  <rule from="^http://(www\.)?accessnow\.org/" to="https://www.accessnow.org/" />
+  <rule from="^http://(?:www\.)?accessnow\.org/" to="https://www.accessnow.org/" />
 </ruleset>
diff --git a/src/chrome/content/rules/AccessibilityNL.xml b/src/chrome/content/rules/AccessibilityNL.xml
@@ -4,5 +4,5 @@
   <target host="www.accessibility.nl" />
   <target host="accessibility.nl" />
 
-  <rule from="^http://(www\.)?accessibility\.nl/" to="https://www.accessibility.nl/"/>
+  <rule from="^http://(?:www\.)?accessibility\.nl/" to="https://www.accessibility.nl/"/>
 </ruleset>
diff --git a/src/chrome/content/rules/Adafruit.xml b/src/chrome/content/rules/Adafruit.xml
@@ -2,5 +2,5 @@
   <target host="www.adafruit.com" />
   <target host="adafruit.com" />
 
-  <rule from="^http://(www\.)?adafruit\.com/" to="https://www.adafruit.com/"/>
+  <rule from="^http://(?:www\.)?adafruit\.com/" to="https://www.adafruit.com/"/>
 </ruleset>
diff --git a/src/chrome/content/rules/Adversary.org.xml b/src/chrome/content/rules/Adversary.org.xml
@@ -2,5 +2,5 @@
   <target host="www.adversary.org" />
   <target host="adversary.org" />
 
-  <rule from="^http://(www\.)?adversary\.org/" to="https://www.adversary.org/" />
+  <rule from="^http://(?:www\.)?adversary\.org/" to="https://www.adversary.org/" />
 </ruleset>
diff --git a/src/chrome/content/rules/Aftenposten.xml b/src/chrome/content/rules/Aftenposten.xml
@@ -2,7 +2,7 @@
         <target host="www.aftenposten.no" />
         <target host="aftenposten.no" />
 
-	<rule from="^http://(www\.)?aftenposten\.no/" to="https://www.aftenposten.no/"/>
+	<rule from="^http://(?:www\.)?aftenposten\.no/" to="https://www.aftenposten.no/"/>
 
 	<!-- The following rules will generate SSL warnings by default because
 	the cert is only valid for www.aftenposten.no -->
diff --git a/src/chrome/content/rules/Dropbox.xml b/src/chrome/content/rules/Dropbox.xml
@@ -8,7 +8,7 @@
   <securecookie host="^(.*\.)?dropbox\.com$" name=".*" />
 
   <rule from="^http://(dl|dl-web|files)\.dropbox\.com/" to="https://$1.dropbox.com/"/>
-  <rule from="^http://(www\.)?dropbox\.com/" to="https://www.dropbox.com/"/>
+  <rule from="^http://(?:www\.)?dropbox\.com/" to="https://www.dropbox.com/"/>
   
   <!-- this fixes https://trac.torproject.org/projects/tor/ticket/3673 -->
   <exclusion pattern="http://(www\.)?dropbox.com/frameresize.htm" />
diff --git a/src/chrome/content/rules/Geek.com.xml b/src/chrome/content/rules/Geek.com.xml
@@ -4,6 +4,6 @@
 
 	<securecookie host="^(.*\.)?geek\.com$" name=".*" />
 
-	<rule from="^http://(www\.)?geek\.com/" to="https://www.geek.com/"/>
+	<rule from="^http://(?:www\.)?geek\.com/" to="https://www.geek.com/"/>
 </ruleset>
 
diff --git a/src/chrome/content/rules/Github.xml b/src/chrome/content/rules/Github.xml
@@ -4,6 +4,6 @@
 
   <securecookie host="^(.*\.)?github\.com$" name=".*" />
 
-  <rule from="^http://(www\.)?github\.com/" to="https://github.com/"/>
+  <rule from="^http://(?:www\.)?github\.com/" to="https://github.com/"/>
   <rule from="^http://(assets\d+|gist)\.github\.com/" to="https://$1.github.com/"/>
 </ruleset>
diff --git a/src/chrome/content/rules/Gitorious.xml b/src/chrome/content/rules/Gitorious.xml
@@ -6,6 +6,6 @@
 
   <rule from="^http://gitorious\.org/"
 	  to="https://gitorious.org/"/>
-  <rule from="^http://([^/:@]+)\.gitorious\.org/"
+  <rule from="^http://([^/:@\.]+)\.gitorious\.org/"
 	  to="https://$1.gitorious.org/"/>
 </ruleset>
diff --git a/src/chrome/content/rules/Google.xml b/src/chrome/content/rules/Google.xml
@@ -56,40 +56,40 @@
 
   <!-- There are two distinct cases for these firefox searches -->
 
-  <rule from="^http://(www\.)?google(\.com?)?\.[a-z][a-z]/firefox/?$"
+  <rule from="^http://(?:www\.)?google(?:\.com?)?\.[a-z][a-z]/firefox/?$"
           to="https://encrypted.google.com/"/>
 
-  <rule from="^http://(www\.)?google(\.com?)?\.[a-z][a-z]/firefox"
+  <rule from="^http://(?:www\.)?google(?:\.com?)?\.[a-z][a-z]/firefox"
           to="https://encrypted.google.com/search"/>
 
-  <rule from="^http://(www\.)?google\.com/webhp"
+  <rule from="^http://(?:www\.)?google\.com/webhp"
           to="https://encrypted.google.com/webhp"/>
 
-  <rule from="^http://(www\.)?google\.com/squared"
+  <rule from="^http://(?:www\.)?google\.com/squared"
           to="https://www.google.com/squared"/>
 
   <rule from="^http://codesearch\.google\.com/"
           to="https://codesearch.google.com/"/>
 
-  <rule from="^http://(www\.)?google\.com/codesearch"
+  <rule from="^http://(?:www\.)?google\.com/codesearch"
           to="https://www.google.com/codesearch"/>
 
-  <rule from="^http://(www\.)?google\.com/#"
+  <rule from="^http://(?:www\.)?google\.com/#"
           to="https://encrypted.google.com/#"/>
 
-  <rule from="^http://(www\.)?google\.com/$"
+  <rule from="^http://(?:www\.)?google\.com/$"
           to="https://encrypted.google.com/"/>
 
   <!-- most google international sites look like "google.fr" -->
 
   <rule
-    from="^http://(www\.)?google\.[^/@:][^/@:]/(search\?|#)"
+    from="^http://(?:www\.)?google\.[^/@:][^/@:]/(?:search\?|#)"
       to="https://encrypted.google.com/search?" />
 
   <!-- some look like "google.co.jp" -->
   <!-- and some crazy ones like "google.com.au" -->
   <rule
-    from="^http://(www\.)?google\.com?\.[^/@:][^/@:]/(search\?|#)"
+    from="^http://(?:www\.)?google\.com?\.[^/@:][^/@:]/(?:search\?|#)"
       to="https://encrypted.google.com/search?" />
   <!-- Completion urls look like this:
 
@@ -119,45 +119,45 @@ http://clients2.google.co.jp/complete/search?hl=ja&client=hp&expIds=17259,24660,
        -->
 
   <rule
-   from="^http://(www\.)?google\.(com?\.)?(au|ca|gh|ie|in|jm|ke|lk|my|na|ng|nz|pk|rw|sl|sg|ug|uk|za|zw)/?$"
+   from="^http://(?:www\.)?google\.(?:com?\.)?(?:au|ca|gh|ie|in|jm|ke|lk|my|na|ng|nz|pk|rw|sl|sg|ug|uk|za|zw)/?$"
      to="https://encrypted.google.com/" />
 
   <rule
-   from="^http://(www\.)?google\.(com?\.)?(ar|bo|cl|co|cu|cr|ec|es|gt|mx|pa|pe|py|sv|uy|ve)/?$"
+   from="^http://(?:www\.)?google\.(?:com?\.)?(?:ar|bo|cl|co|cu|cr|ec|es|gt|mx|pa|pe|py|sv|uy|ve)/?$"
     to="https://encrypted.google.com/webhp?hl=es" />
 
   <rule
-   from="^http://(www\.)?google\.(com\.)?(ae|bh|eg|jo|kw|lb|ly|om|qa|sa)/?$"
+   from="^http://(?:www\.)?google\.(?:com\.)?(?:ae|bh|eg|jo|kw|lb|ly|om|qa|sa)/?$"
      to="https://encrypted.google.com/webhp?hl=ar" />
 
-  <rule from="^http://(www\.)?google\.(at|ch|de)/?$"
+  <rule from="^http://(?:www\.)?google\.(?:at|ch|de)/?$"
           to="https://encrypted.google.com/webhp?hl=de" />
 
-  <rule from="^http://(www\.)?google\.(fr|nl|it|pl|ru|bg|pt|ro|hr|fi|no)/?$"
-          to="https://encrypted.google.com/webhp?hl=$2" />
+  <rule from="^http://(?:www\.)?google\.(fr|nl|it|pl|ru|bg|pt|ro|hr|fi|no)/?$"
+          to="https://encrypted.google.com/webhp?hl=$1" />
 
-  <rule from="^http://(www\.)?google\.com?\.(id|th|tr)/?$"
-          to="https://encrypted.google.com/webhp?hl=$2" />
+  <rule from="^http://(?:www\.)?google\.com?\.(id|th|tr)/?$"
+          to="https://encrypted.google.com/webhp?hl=$1" />
 
-  <rule from="^http://(www\.)?google\.com\.il/?$"
+  <rule from="^http://(?:www\.)?google\.com\.il/?$"
           to="https://encrypted.google.com/webhp?hl=he" />
 
-  <rule from="^http://(www\.)?google\.com\.kr/?$"
+  <rule from="^http://(?:www\.)?google\.com\.kr/?$"
           to="https://encrypted.google.com/webhp?hl=ko" />
 
-  <rule from="^http://(www\.)?google\.com\.kz/?$"
+  <rule from="^http://(?:www\.)?google\.com\.kz/?$"
           to="https://encrypted.google.com/webhp?hl=kk" />
 
-  <rule from="^http://(www\.)?google\.com\.jp/?$"
+  <rule from="^http://(?:www\.)?google\.com\.jp/?$"
           to="https://encrypted.google.com/webhp?hl=ja" />
 
-  <rule from="^http://(www\.)?google\.com\.vn/?$"
+  <rule from="^http://(?:www\.)?google\.com\.vn/?$"
           to="https://encrypted.google.com/webhp?hl=vi" />
 
-  <rule from="^http://(www\.)?google\.com\.br/?$"
+  <rule from="^http://(?:www\.)?google\.com\.br/?$"
           to="https://encrypted.google.com/webhp?hl=pt-BR" />
 
-  <rule from="^http://(www\.)?google\.se/?$"
+  <rule from="^http://(?:www\.)?google\.se/?$"
           to="https://encrypted.google.com/webhp?hl=sv" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Oomphme.xml b/src/chrome/content/rules/Oomphme.xml
@@ -2,5 +2,5 @@
   <target host="www.oomphme.com" />
   <target host="oomphme.com" />
 
-  <rule from="^http://(www\.)?oomphme\.com/" to="https://www.oomphme.com/"/>
+  <rule from="^http://(?:www\.)?oomphme\.com/" to="https://www.oomphme.com/"/>
 </ruleset>
diff --git a/src/chrome/content/rules/OpenDNS.xml b/src/chrome/content/rules/OpenDNS.xml
@@ -10,6 +10,6 @@
   <exclusion pattern="^http://guide\.opendns\.com/" /> 
 	 
 
-  <rule from="^http://(www\.)?opendns\.com/" to="https://www.opendns.com/"/>
+  <rule from="^http://(?:www\.)?opendns\.com/" to="https://www.opendns.com/"/>
   <rule from="^http://([^/:@\.]+)\.opendns\.com/" to="https://$1.opendns.com/"/>
 </ruleset>
diff --git a/src/chrome/content/rules/OpenID.xml b/src/chrome/content/rules/OpenID.xml
@@ -2,5 +2,5 @@
   <target host="openid.net" />
   <target host="www.openid.net" />
 
-  <rule from="^http://(www\.)?openid\.net/" to="https://openid.net/"/>
+  <rule from="^http://(?:www\.)?openid\.net/" to="https://openid.net/"/>
 </ruleset>
diff --git a/src/chrome/content/rules/OpenSSL.xml b/src/chrome/content/rules/OpenSSL.xml
@@ -2,6 +2,6 @@
   <target host="openssl.org" />
   <target host="www.openssl.org" />
 
-  <rule from="^http://(www\.)?openssl\.org/" to="https://www.openssl.org/"/>
+  <rule from="^http://(?:www\.)?openssl\.org/" to="https://www.openssl.org/"/>
 </ruleset>
 
diff --git a/src/chrome/content/rules/PGP.xml b/src/chrome/content/rules/PGP.xml
@@ -6,5 +6,5 @@
 
   <rule from="^http://(www\.)?pgp\.com/" to="https://www.pgp.com/"/>
   <rule from="^http://(sstats)\.pgp\.com/" to="https://$1.pgp.com/"/>
-  <rule from="^http://([^/:@]+)\.store\.pgp\.com/" to="https://$1.store.pgp.com/"/>
+  <rule from="^http://([^/:@\.]+)\.store\.pgp\.com/" to="https://$1.store.pgp.com/"/>
 </ruleset>
diff --git a/src/chrome/content/rules/Panic.xml b/src/chrome/content/rules/Panic.xml
@@ -4,6 +4,6 @@
 
   <securecookie host="^(.+\.)?panic\.com$" name=".*"/>
 
-  <rule from="^http://panic\.com/" to="https://panic.com/"/>
-  <rule from="^http://(www)\.panic\.com/" to="https://$1.panic.com/"/>
+  <rule from="^http://(www\.)?panic\.com/"
+	  to="https://$1panic.com/"/>
 </ruleset>
diff --git a/src/chrome/content/rules/Reddit.xml b/src/chrome/content/rules/Reddit.xml
@@ -5,7 +5,8 @@ server-side CDN issues, so it's off for the time being -->
   <target host="reddit.com" />
   <target host="*.reddit.com" />
   <target host="redd.it" />
-  <rule from="^http://(www\.|pay\.)?reddit\.com/"
+
+  <rule from="^http://(?:www\.|pay\.)?reddit\.com/"
 	  to="https://pay.reddit.com/"/>
   <rule from="^http://(sp|static|thumbs)\.reddit\.com/"
 	  to="https://s3.amazonaws.com/$1.reddit.com/"/>
diff --git a/src/chrome/content/rules/Statcounter.xml b/src/chrome/content/rules/Statcounter.xml
@@ -5,6 +5,6 @@
 <!--  <target host="www.statcounter.com" /> -->
 
   <rule from="^http://(www\.)?statcounter\.com/" to="https://statcounter.com/"/>
-  <rule from="^http://([^/:@]+)\.statcounter\.com/" to="https://$1.statcounter.com/"/>
+  <rule from="^http://([^/:@\.]+)\.statcounter\.com/" to="https://$1.statcounter.com/"/>
 </ruleset>
 
diff --git a/src/chrome/content/rules/Stayfriends.xml b/src/chrome/content/rules/Stayfriends.xml
@@ -6,7 +6,6 @@
   <target host="stayfriends.ch" />
   <target host="www.stayfriends.ch" />  
   
-  <rule from="^http://(www\.)?stayfriends\.de/" to="https://www.stayfriends.de/"/>
-  <rule from="^http://(www\.)?stayfriends\.at/" to="https://www.stayfriends.at/"/>
-  <rule from="^http://(www\.)?stayfriends\.ch/" to="https://www.stayfriends.ch/"/>
+  <rule from="^http://(?:www\.)?stayfriends\.(at|ch|de)/"
+	to="https://www.stayfriends.$1/"/>
 </ruleset>
diff --git a/src/chrome/content/rules/User-agents.org.xml b/src/chrome/content/rules/User-agents.org.xml
@@ -2,5 +2,6 @@
   <target host="user-agents.org" />
   <target host="www.user-agents.org" />
 
-  <rule from="^http://(www\.)?user-agents\.org/" to="https://www.user-agents.org/" />
+  <rule from="^http://(?:www\.)?user-agents\.org/"
+	  to="https://www.user-agents.org/" />
 </ruleset>
diff --git a/src/chrome/content/rules/Wikipedia.xml b/src/chrome/content/rules/Wikipedia.xml
@@ -56,21 +56,21 @@
           to="https://secure.wikimedia.org/wikipedia/$1/wiki/"/>
   
 
-  <rule from="^http://(www\.)?mediawiki\.org/$" 
+  <rule from="^http://(?:www\.)?mediawiki\.org/$" 
           to="https://secure.wikimedia.org/wikipedia/mediawiki/wiki/" />
-  <rule from="^http://(www\.)?mediawiki\.org/(w|wiki)/" 
-          to="https://secure.wikimedia.org/wikipedia/mediawiki/$2/" />
-  <rule from="^http://(www\.)?wikimediafoundation\.org/$" 
+  <rule from="^http://(?:www\.)?mediawiki\.org/(w|wiki)/" 
+          to="https://secure.wikimedia.org/wikipedia/mediawiki/$1/" />
+  <rule from="^http://(?:www\.)?wikimediafoundation\.org/$" 
           to="https://secure.wikimedia.org/wikipedia/foundation/wiki/" />
-  <rule from="^http://(www\.)?wikimediafoundation\.org/(w|wiki)/" 
-          to="https://secure.wikimedia.org/wikipedia/foundation/$2/" />
+  <rule from="^http://(?:www\.)?wikimediafoundation\.org/(w|wiki)/" 
+          to="https://secure.wikimedia.org/wikipedia/foundation/$1/" />
 
 <!-- portal containing links to the English versions of all projects -->
-  <rule from="^http://(www\.)wikimedia\.org/$"
+  <rule from="^http://(?:www\.)wikimedia\.org/$"
           to="https://secure.wikimedia.org/" />
 	
-  <rule from="^http://(www\.)?(bits|upload)\.wikimedia\.org/"
-   	  to="https://$2.wikimedia.org/"/>
+  <rule from="^http://(?:www\.)?(bits|upload)\.wikimedia\.org/"
+   	  to="https://$1.wikimedia.org/"/>
   <rule from="^http://geoiplookup\.wikimedia\.org/"
 	  to="https://geoiplookup.wikimedia.org/"/>
   <rule from="^http://survey\.wikimedia\.org/"
diff --git a/src/chrome/content/rules/WordPress.xml b/src/chrome/content/rules/WordPress.xml
@@ -20,11 +20,11 @@
 	  to="https://s-ssl.wordpress.$1/"/>
   <rule from="^http://s[0-9]\.wordpress\.(com|org)/"
 	  to="https://secure.wordpress.$1/"/>
-  <rule from="^http://([^/:@]+)\.wordpress\.(com|org)/"
+  <rule from="^http://([^/:@\.]+)\.wordpress\.(com|org)/"
 	  to="https://$1.wordpress.$2/"/>
-  <rule from="^http://([^/:@]+)\.(trac|svn)\.wordpress\.org/"
+  <rule from="^http://([^/:@\.]+)\.(trac|svn)\.wordpress\.org/"
 	  to="https://$1.$2.wordpress.org/"/>
-  <rule from="^http://([^/:@]+)\.files\.wordpress\.com/"
+  <rule from="^http://([^/:@\.]+)\.files\.wordpress\.com/"
 	  to="https://$1.files.wordpress.com/"/>
   <rule from="^http://s\d*\.wp\.com/(\?custom-css|i/|wp-content/|wp-includes/)"
 	  to="https://s-ssl.wordpress.com/$1" />
diff --git a/src/chrome/content/rules/XFCE.org.xml b/src/chrome/content/rules/XFCE.org.xml
diff --git a/src/chrome/content/rules/Xing.xml b/src/chrome/content/rules/Xing.xml
diff --git a/src/chrome/content/rules/Xiph.org.xml b/src/chrome/content/rules/Xiph.org.xml
diff --git a/src/chrome/content/rules/YouTube_testing.xml b/src/chrome/content/rules/YouTube_testing.xml
