diff --git a/sites/freeview.co.uk/freeview.co.uk.channels.xml b/sites/freeview.co.uk/freeview.co.uk.channels.xml
index ab3d4611..b122fcc4 100644
--- a/sites/freeview.co.uk/freeview.co.uk.channels.xml
+++ b/sites/freeview.co.uk/freeview.co.uk.channels.xml
@@ -1,62 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <channels>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#12952">YAAAS!</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#12960">Pop Player</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#13144">MBC</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#14448">TRUE CRIME</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#14456">TRUE CRIME XTRA</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#15016">Sonlife</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#15064">On Demand 365</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#15448">Channelbox</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#15480">UK RADIO PORTAL</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="GREATMystery.uk" site_id="64257#15584">GREAT! mystery</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16164">CNA</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16170">GIGS</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16176">EXTREME CHANNEL</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16188">Trailblazer</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16194">Odyssey TV</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="KetchupTV.us" site_id="64257#16200">Ketchup TV</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16216">Ketchup Too</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16224">Alaraby Network</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16230">wedotv movies</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16240">ROK</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16264">3ABN</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="AlJazeera.qa" site_id="64257#16284">Al Jazeera Arabic</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16298">Real Crime</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16310">Shots!</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16322">NHK WORLD</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16328">Newsmax</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16346">Amazing Facts</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16352">Moochi</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="France24English.fr" site_id="64257#16370">FRANCE 24</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16376">Nosey</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16394">Shop On TV</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16400">Purpose Media</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="TalkTV.uk" site_id="64257#16406">Talk</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="SkyNews.uk" site_id="64257#22080">Sky News</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="talkSPORT.uk" site_id="64257#22592">talkSPORT</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#22624">RNIB Connect</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#22656">Heart</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#22688">Capital</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#22848">Classic FM</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#22880">LBC</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#22912">Trans World Radio</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#23152">That&apos;s TV 2</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#23184">SonLife</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#23904">That&apos;s Dance</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="GemsTV.uk" site_id="64257#24448">Gems TV</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#26368">Smooth Radio</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="PopUp.uk" site_id="64257#27424">POP UP</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#27744">Rewind TV</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#27808">Together TV IP</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#28032">That&apos;s Melody</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#28160">Premier Radio</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#28320">GREAT! movies extra</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#28352">GREAT! player</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#28384">GREAT! romance mix</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#33664">New Media TV</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#34048">Global Arabic +</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#34112">LEGEND XTRA</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#4416">BBC Red Button</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#5632">BBC R5L</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#5696">BBC 5SX</channel>
@@ -74,14 +17,62 @@
   <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#6784">BBC Radio 2</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#6848">BBC Radio 3</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#6912">BBC Radio 4</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="BBCRedButton1.uk" site_id="64257#7168">BBC RB 1</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#8700">That&apos;s TV 3</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#12952">YAAAS!</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#12960">Pop Player</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#13144">MBC</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#14448">TRUE CRIME</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#14456">TRUE CRIME XTRA</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#15016">Sonlife</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#15064">On Demand 365</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#15448">Channelbox</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#15480">UK RADIO PORTAL</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16164">CNA</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16170">GIGS</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16188">Trailblazer</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16194">Odyssey TV</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16216">Ketchup Too</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16224">Alaraby Network</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16230">wedotv movies</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16240">ROK</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16298">Real Crime</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16310">Shots!</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16322">NHK WORLD</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16328">Newsmax</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16346">Amazing Facts</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16352">Moochi</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16360">New Media TV</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16376">Nosey</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16394">Shop On TV</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#16400">Purpose Media</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#22624">RNIB Connect</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#22656">Heart</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#22688">Capital</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#22848">Classic FM</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#22880">LBC</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#22912">Trans World Radio</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#23152">That&apos;s TV 2</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#23184">SonLife</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#23904">That&apos;s Dance</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#26368">Smooth Radio</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#27744">Rewind TV</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#27808">Together TV IP</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#28032">That&apos;s Melody</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#28160">Premier Radio</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#28320">GREAT! movies extra</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#28352">GREAT! player</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#28384">GREAT! romance mix</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#33088">3ABN</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#33792">POP+1</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#34048">Global Arabic +</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="" site_id="64257#34112">LEGEND XTRA</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="4seven.uk" site_id="64257#22528">4seven</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="5Action.uk" site_id="64257#16112">5ACTION</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="5SELECT.uk" site_id="64257#20256">5SELECT</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="5STAR.uk" site_id="64257#12928">5STAR</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="5USA.uk" site_id="64257#12992">5USA</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="Alarabiya.ae" site_id="64257#16304">AL ARABIYA</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="AlJazeera.qa" site_id="64257#16284">Al Jazeera Arabic</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="AlJazeeraEnglish.qa" site_id="64257#16278">Al Jazeera English</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="AsharqNews.sa" site_id="64257#16296">ASHARQ NEWS</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="BBCFour.uk" site_id="64257#4544">BBC FOUR</channel>
@@ -90,6 +81,7 @@
   <channel site="freeview.co.uk" lang="en" xmltv_id="BBCOneLondon.uk" site_id="64257#4164">BBC ONE Lon</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="BBCOneLondonHD.uk" site_id="64257#17536">BBC ONE Lon HD</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="BBCParliament.uk" site_id="64257#4736">BBC Parliament</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="BBCRedButton1.uk" site_id="64257#7168">BBC RB 1</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="BBCThree.uk" site_id="64257#4288">BBC THREE</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="BBCThreeHD.uk" site_id="64257#17920">BBC THREE HD</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="BBCTwo.uk" site_id="64257#4287">BBC TWO</channel>
@@ -104,9 +96,9 @@
   <channel site="freeview.co.uk" lang="en" xmltv_id="Channel4.uk" site_id="64257#8384">Channel 4</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="Channel4HD.uk" site_id="64257#17664">Channel 4 HD</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="Channel4Plus1.uk" site_id="64257#8452">Channel 4+1</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="Channel5.uk" site_id="64257#8500">Channel 5</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="Channel5HD.uk" site_id="64257#17728">Channel 5 HD</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="Channel5Plus1.uk" site_id="64257#13024">Channel 5+1</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="Channel5.uk" site_id="64257#8500">5</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="Channel5HD.uk" site_id="64257#17728">5 HD</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="Channel5Plus1.uk" site_id="64257#13024">5 +1</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="DMAX.uk" site_id="64257#27680">DMAX</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="E4.uk" site_id="64257#8448">E4</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="E4Extra.uk" site_id="64257#22368">E4 Extra</channel>
@@ -114,11 +106,13 @@
   <channel site="freeview.co.uk" lang="en" xmltv_id="Film4.uk" site_id="64257#8385">Film4</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="Film4Plus1.uk" site_id="64257#22464">Film4+1</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="FoodNetwork.uk" site_id="64257#23040">Food Network</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="France24English.fr" site_id="64257#16370">FRANCE 24</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="GBNews.uk" site_id="64257#27360">GB News</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="GINXEsportsTV.uk" site_id="64257#16182">GINX TV</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="GemsTV.uk" site_id="64257#24448">Gems TV</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="GODTV.uk" site_id="64257#16256">God TV</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="GREATaction.uk" site_id="64257#15576">GREAT! action</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="GREATmovies.uk" site_id="64257#27872">GREAT! movies</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="GREATMystery.uk" site_id="64257#15584">GREAT! mystery</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="GREATromance.uk" site_id="64257#27296">GREAT! romance</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="GREATtv.uk" site_id="64257#27168">GREAT! tv</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="HGTV.uk" site_id="64257#28000">HGTV</channel>
@@ -136,21 +130,26 @@
   <channel site="freeview.co.uk" lang="en" xmltv_id="ITVBe.uk" site_id="64257#8340">ITVBe</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="ITVBePlus1.uk" site_id="64257#15864">ITVBe+1</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="JewelleryMaker.uk" site_id="64257#27200">Jewellery Maker</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="KetchupTV.us" site_id="64257#16200">Ketchup TV</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="Legend.uk" site_id="64257#14480">LEGEND</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="LondonLive.uk" site_id="64257#32842">London Live</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="LondonLive.uk" site_id="64257#32842">London TV</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="More4.uk" site_id="64257#8442">More 4</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="PBSAmerica.uk" site_id="64257#27968">PBS America</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="Pop.uk" site_id="64257#33280">POP</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="PopUp.uk" site_id="64257#27424">POP UP</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="Quest.uk" site_id="64257#27328">QUEST</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="QuestPlus1.uk" site_id="64257#23808">QUEST+1</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="QuestRed.uk" site_id="64257#23744">Quest Red</channel>
-  <channel site="freeview.co.uk" lang="en" xmltv_id="QVC.uk" site_id="64257#13120">QVC</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="QVC2.uk" site_id="64257#14416">QVC2</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="QVC.uk" site_id="64257#13120">QVC</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="Really.uk" site_id="64257#23712">Really</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="RevelationTV.uk" site_id="64257#16248">Revelation TV</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="Sky News" site_id="64257#22080">Sky News</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="SkyArts.uk" site_id="64257#22144">Sky Arts</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="SkyMix.uk" site_id="64257#22208">Sky Mix</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="TalkingPicturesTV.uk" site_id="64257#28224">TalkingPictures TV</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="talkSPORT.uk" site_id="64257#22592">talkSPORT</channel>
+  <channel site="freeview.co.uk" lang="en" xmltv_id="TalkTV.uk" site_id="64257#16406">Talk</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="TBNUK.uk" site_id="64257#20160">TBN UK</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="ThatsTV.uk" site_id="64257#27936">That&apos;s TV (UK)</channel>
   <channel site="freeview.co.uk" lang="en" xmltv_id="TinyPop.uk" site_id="64257#33472">Tiny Pop</channel>