diff --git a/src/chrome/content/rules/ORF.at.xml b/src/chrome/content/rules/ORF.at.xml
index be09d338452d..376e2f6fb70e 100644
--- a/src/chrome/content/rules/ORF.at.xml
+++ b/src/chrome/content/rules/ORF.at.xml
@@ -26,6 +26,7 @@
 		
 	Cert expired:
 		- oe3verkehr.orf.at
+		- content.orf.at
 
 	Cert mismatch:
 		- burgenlandkalender.orf.at
@@ -58,15 +59,24 @@
 		- api-tvthek
 		- averell
 		- backstage
+		- bernard
+		- bianca
+		- brain
 		- brava
+		- clyde
 		- cook
 		- dalton
+		- dancingstars
 		- der
+		- drei
+		- echtjetzt
 		- extra
 		- files
 		- files2
 		- fm4
 		- go
+		- gutenmorgen
+		- help
 		- insider
 		- iptv
 		- jack
@@ -83,6 +93,7 @@
 		- oe3
 		- oe3dabei
 		- onepager
+		- pinky
 		- publikumsrat
 		- songcontest
 		- sport
@@ -91,9 +102,12 @@
 		- suche
 		- tonga
 		- totoya
+		- tube
+		- tv
 		- tv-thek
 		- tvportal
 		- tvthek
+		- unterwegs
 		- video
 		- webport7
 		- werbung
@@ -118,9 +132,7 @@
 	<target host="appfeeds.orf.at" />
 	<target host="audioapi.orf.at" />
 	<target host="autodiscover.orf.at" />
-	<target host="bernard.orf.at" />
 	<target host="bert.orf.at" />
-	<target host="bianca.orf.at" />
 	<target host="bikini.orf.at" />
 	<target host="bits.orf.at" />
 	<target host="boa.orf.at" />
@@ -128,23 +140,17 @@
 	<target host="book.orf.at" />
 	<target host="booking.orf.at" />
 	<target host="bpo.orf.at" />
-	<target host="brain.orf.at" />
 	<target host="buergerforumdb.orf.at" />
 	<target host="cloud.orf.at" />
-	<target host="clyde.orf.at" />
-	<target host="content.orf.at" />
 	<target host="crm.orf.at" />
 	<target host="crmtest.orf.at" />
 	<target host="crmweb.orf.at" />
 	<target host="ctest.orf.at" />
-	<target host="dancingstars.orf.at" />
 	<target host="debatte.orf.at" />
 	<target host="dev.orf.at" />
 	<target host="developer.orf.at" />
 	<target host="dialin.orf.at" />
 	<target host="digital.orf.at" />
-	<target host="drei.orf.at" />
-	<target host="echtjetzt.orf.at" />
 	<target host="ecommerce.orf.at" />
 	<target host="emm.orf.at" />
 	<target host="enterprise.orf.at" />
@@ -160,9 +166,7 @@
 	<target host="gonzales.orf.at" />
 	<target host="gromit.orf.at" />
 	<target host="guns.orf.at" />
-	<target host="gutenmorgen.orf.at" />
 	<target host="harris.orf.at" />
-	<target host="help.orf.at" />
 	<target host="hermes.orf.at" />
 	<target host="ibiza.orf.at" />
 	<target host="insiderservice.orf.at" />
@@ -190,7 +194,6 @@
 	<target host="oe3pinnwand.orf.at" />
 	<target host="okidoki.orf.at" />
 	<target host="our.orf.at" />
-	<target host="pinky.orf.at" />
 	<target host="pipe.orf.at" />
 	<target host="plovdiv.orf.at" />
 	<target host="preview.orf.at" />
@@ -212,16 +215,14 @@
 	<target host="sms.orf.at" />
 	<target host="speedy.orf.at" />
 	<target host="sts.orf.at" />
+	<target host="teletext.orf.at" />
 	<target host="thredbo.orf.at" />
 	<target host="tickets.orf.at" />
 	<target host="tobago.orf.at" />
 	<target host="trichter.orf.at" />
 	<target host="trinidad.orf.at" />
 	<target host="tts.orf.at" />
-	<target host="tube.orf.at" />
 	<target host="tubestatic.orf.at" />
-	<target host="tv.orf.at" />
-	<target host="unterwegs.orf.at" />
 	<target host="vote.orf.at" />
 	<target host="vpngate.orf.at" />
 	<target host="vpngate1.orf.at" />