Index: master_iconmap.xml
===================================================================
--- master_iconmap.xml	(revision 12245)
+++ master_iconmap.xml	(working copy)
@@ -5,6 +5,18 @@
         <network>CINEMAX</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>ABC</callsign>
+        <network>ABCau</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>ABC2</callsign>
+        <network>ABC2au</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>ACC</callsign>
+        <network>AustralianChristianCh</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>ACMAXP</callsign>
         <network>CINEMAX</network>
     </callsigntonetwork>
@@ -41,10 +53,26 @@
         <network>ANIMALPLANET</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>APTN</callsign>
+        <network>ABORIGINAL</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>ARENA</callsign>
+        <network>ArenaTVau</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>ARENA+2</callsign>
+        <network>ArenaTVau</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>ARTS</callsign>
         <network>AE</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>ARTSC</callsign>
+        <network>ARTSANDENTERTAINMENT</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>ARTSP</callsign>
         <network>AE</network>
     </callsigntonetwork>
@@ -53,6 +81,10 @@
         <network>CINEMAX</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>AURORA</callsign>
+        <network>AuroraCommunityTV</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>AZNNW</callsign>
         <network>AZN</network>
     </callsigntonetwork>
@@ -65,6 +97,10 @@
         <network>BBCA</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>BBCWorld</callsign>
+        <network>BBCWorld</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>BET</callsign>
         <network>BET</network>
     </callsigntonetwork>
@@ -101,10 +137,18 @@
         <network>BRAVO</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>BRAVOC</callsign>
+        <network>BRAVOCA</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>BRAVOP</callsign>
         <network>BRAVO</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>Bloomberg</callsign>
+        <network>BloombergTV</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>C3-02</callsign>
         <network>TLC</network>
     </callsigntonetwork>
@@ -181,10 +225,54 @@
         <network>VH1</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>CBC</callsign>
+        <network>CBC</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>CBLFT</callsign>
+        <network>CBC-CBLFT</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>CBNEW</callsign>
+        <network>CBC-CBNEW</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>CBOT</callsign>
+        <network>CBC</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>CBUT</callsign>
         <network>CBC</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>CFTM</callsign>
+        <network>IND-CFTM</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>CICA</callsign>
+        <network>TVO-CICA</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>CIII</callsign>
+        <network>GLOBALON</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>CITY</callsign>
+        <network>CITY-TORONTO</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>CJOH</callsign>
+        <network>CTV-CJOH</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>CKWS</callsign>
+        <network>CBC</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>CMT</callsign>
+        <network>CMTPURECOUNTRY</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>CMTVP</callsign>
         <network>CMTV</network>
     </callsigntonetwork>
@@ -193,6 +281,10 @@
         <network>CNBC</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>CNBCC</callsign>
+        <network>CNBC</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>CNN</callsign>
         <network>CNN</network>
     </callsigntonetwork>
@@ -201,6 +293,10 @@
         <network>CNNHEADLINENEWS</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>COMEDC</callsign>
+        <network>COMEDYNETWORK</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>COMEDY</callsign>
         <network>COMEDYCENTRAL</network>
     </callsigntonetwork>
@@ -217,6 +313,10 @@
         <network>COURT</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>CPAC</callsign>
+        <network>CPAC</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>CSPAN</callsign>
         <network>CSPAN</network>
     </callsigntonetwork>
@@ -225,6 +325,18 @@
         <network>CSPAN2</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>Cartoon</callsign>
+        <network>CartoonNetworkls</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>Channel[V]</callsign>
+        <network>ChannelVAustralia</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>CountryMusic</callsign>
+        <network>CountryMusicChannel</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>DCHOME</callsign>
         <network>DISCOVERY</network>
     </callsigntonetwork>
@@ -269,6 +381,14 @@
         <network>DISCOVERY</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>Discovery</callsign>
+        <network>DiscoveryChannel</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>Disney</callsign>
+        <network>DisneyChannel</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>EACT</callsign>
         <network>Encore_Action</network>
     </callsigntonetwork>
@@ -337,6 +457,10 @@
         <network>Encore_WAM</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>Expo</callsign>
+        <network>ExpoChannel</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>F4-01</callsign>
         <network>AMC</network>
     </callsigntonetwork>
@@ -393,6 +517,10 @@
         <network>FOOD</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>FOODC</callsign>
+        <network>FOODNETWORKCA</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>FOODP</callsign>
         <network>FOOD</network>
     </callsigntonetwork>
@@ -513,6 +641,34 @@
         <network>FX</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>FashionTV</callsign>
+        <network>FashionTV</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>Fox8</callsign>
+        <network>Fox8</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>Fox8+2</callsign>
+        <network>Fox8</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>FoxClassics</callsign>
+        <network>FoxClassicsau</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>FoxClassics+2</callsign>
+        <network>FoxClassicsau</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>FoxNews</callsign>
+        <network>FoxNewsChannel</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>FoxSportsNews</callsign>
+        <network>FoxSportsNetwork</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>G0-04</callsign>
         <network>STARZ</network>
     </callsigntonetwork>
@@ -749,6 +905,10 @@
         <network>HGTV</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>HGTVC</callsign>
+        <network>HGTVC</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>HGTVP</callsign>
         <network>HGTV</network>
     </callsigntonetwork>
@@ -757,6 +917,10 @@
         <network>HISTORY_INT</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>HISTC</callsign>
+        <network>HISTORYCHANNEL</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>HISTORY</callsign>
         <network>HISTORY</network>
     </callsigntonetwork>
@@ -1353,6 +1517,10 @@
         <network>NBC</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>KGIN</callsign>
+        <network>CBS</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>KGJT</callsign>
         <network>UPN</network>
     </callsigntonetwork>
@@ -1869,6 +2037,10 @@
         <network>FOX</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>KOLN</callsign>
+        <network>CBS</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>KOLO</callsign>
         <network>ABC</network>
     </callsigntonetwork>
@@ -2861,6 +3033,10 @@
         <network>LIFETIME</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>LIFENET</callsign>
+        <network>LIFENETWORK</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>LIFEP</callsign>
         <network>LIFETIME</network>
     </callsigntonetwork>
@@ -2877,6 +3053,14 @@
         <network>Encore_Love</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>Lifestyle</callsign>
+        <network>Lifestyle</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>Lifestyle+2</callsign>
+        <network>Lifestyle</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>MAX</callsign>
         <network>CINEMAX</network>
     </callsigntonetwork>
@@ -2893,6 +3077,10 @@
         <network>CINEMAX</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>MOMUSIC</callsign>
+        <network>MUCH-MORE</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>MPLEX</callsign>
         <network>Encore</network>
     </callsigntonetwork>
@@ -2925,6 +3113,14 @@
         <network>MTV</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>MUCHMUSIC</callsign>
+        <network>MUCH</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>MUSIQUE</callsign>
+        <network>MUSIQUEPLUS</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>MYSTERY</callsign>
         <network>Encore_Mystery</network>
     </callsigntonetwork>
@@ -2933,14 +3129,42 @@
         <network>Encore_Mystery</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>MainEvent</callsign>
+        <network>MainEventPPV</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>MovieExtra</callsign>
+        <network>MovieExtra</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>MovieGreats</callsign>
+        <network>MovieGreats</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>MovieOne</callsign>
+        <network>MovieOne</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>MovieOne+2</callsign>
+        <network>MovieOne</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>NASA</callsign>
         <network>NASA</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>NET1</callsign>
+        <network>PBS-KUON</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>NEWSENG</callsign>
         <network>NEWSENG</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>NEWSNET</callsign>
+        <network>CTV-NEWSNET</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>NEXTP</callsign>
         <network>SHOWTIME</network>
     </callsigntonetwork>
@@ -2977,6 +3201,18 @@
         <network>NWCN</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>NatGeo</callsign>
+        <network>National_Geographic</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>Nickelodeon</callsign>
+        <network>Nickelodeon</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>Nine</callsign>
+        <network>NineNetwork</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>OLN</callsign>
         <network>OLN</network>
     </callsigntonetwork>
@@ -3005,10 +3241,22 @@
         <network>QVC</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>RDI</callsign>
+        <network>RDI</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>RPLEX</callsign>
         <network>RPLEX</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>SBS</callsign>
+        <network>SpecialBroadcastingService</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>SBSNews</callsign>
+        <network>SpecialBroadcastingService</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>SCIENCE</callsign>
         <network>DISCOVERY</network>
     </callsigntonetwork>
@@ -3021,6 +3269,14 @@
         <network>SCIFI</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>SCR</callsign>
+        <network>THESCORE</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>SHCASEC</callsign>
+        <network>SHOWCASECA</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>SHOCSE</callsign>
         <network>SHOWTIME3</network>
     </callsigntonetwork>
@@ -3065,10 +3321,22 @@
         <network>SITV</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>SPACEC</callsign>
+        <network>SPACECHANNEL</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>SPCCAN</callsign>
+        <network>SPEED</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>SPEED</callsign>
         <network>SPEED</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>SPIKEC</callsign>
+        <network>SPIKE</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>SPIKEP</callsign>
         <network>SPIKE</network>
     </callsigntonetwork>
@@ -3081,6 +3349,10 @@
         <network>PBS_Sprout</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>STAR</callsign>
+        <network>STARENTERTAINMENT</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>STARZ</callsign>
         <network>STARZ</network>
     </callsigntonetwork>
@@ -3125,6 +3397,30 @@
         <network>SUNDANCE</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>Seven</callsign>
+        <network>SevenNetwork</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>Showtime</callsign>
+        <network>ShowtimeAustralia</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>Showtime+2</callsign>
+        <network>Showtime2Australia</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>ShowtimeGreats</callsign>
+        <network>ShowtimeGreats</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>SkyNews</callsign>
+        <network>SkyNewsAustralia</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>SkyRacing</callsign>
+        <network>SkyRacing</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>TBS</callsign>
         <network>TBS</network>
     </callsigntonetwork>
@@ -3137,6 +3433,14 @@
         <network>TCM</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>TDCC</callsign>
+        <network>DISC</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>TFO</callsign>
+        <network>IND-TFO</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>THMAXP</callsign>
         <network>CINEMAX</network>
     </callsigntonetwork>
@@ -3181,6 +3485,10 @@
         <network>CARTOONNETWORK</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>TOONC</callsign>
+        <network>TELETOONCA</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>TOOND</callsign>
         <network>DISNEY</network>
     </callsigntonetwork>
@@ -3201,6 +3509,10 @@
         <network>TRAV</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>TREEC</callsign>
+        <network>TREEHOUSE</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>TRUE</callsign>
         <network>Encore</network>
     </callsigntonetwork>
@@ -3209,8 +3521,20 @@
         <network>Encore</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>TSN</callsign>
+        <network>THESPORTSNETWORK</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>TV1</callsign>
+        <network>TV1au</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>TV1+2</callsign>
+        <network>TV1au</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>TV5</callsign>
-        <network>TV5</network>
+        <network>IND-TV5</network>
     </callsigntonetwork>
     <callsigntonetwork>
         <callsign>TVLAND</callsign>
@@ -3225,10 +3549,18 @@
         <network>TVONE</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>TVSN</callsign>
+        <network>TVSNau</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>TWC</callsign>
         <network>WEATHERCHANNEL</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>Ten</callsign>
+        <network>SouthernCrossTen</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>UNIP</callsign>
         <network>UNIVISION</network>
     </callsigntonetwork>
@@ -3269,6 +3601,18 @@
         <network>VH1</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>VISION</callsign>
+        <network>VISIONCA</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>W</callsign>
+        <network>W</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>W+2</callsign>
+        <network>W</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>W1-06</callsign>
         <network>NBC</network>
     </callsigntonetwork>
@@ -5285,6 +5629,10 @@
         <network>FOX</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>WTBS</callsign>
+        <network>TBS</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>WTCI</callsign>
         <network>PBS-WTCI</network>
     </callsigntonetwork>
@@ -5805,6 +6153,14 @@
         <network>WB</network>
     </callsigntonetwork>
     <callsigntonetwork>
+        <callsign>Weather</callsign>
+        <network>WeatherChannelau</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>WorldMovies</callsign>
+        <network>WorldMoviesChannel</network>
+    </callsigntonetwork>
+    <callsigntonetwork>
         <callsign>XETV</callsign>
         <network>FOX</network>
     </callsigntonetwork>
@@ -5812,6 +6168,10 @@
         <callsign>XUPN</callsign>
         <network>UPN</network>
     </callsigntonetwork>
+    <callsigntonetwork>
+        <callsign>YTV</callsign>
+        <network>YOUTHTV</network>
+    </callsigntonetwork>
     <networktourl>
         <network>ABC</network>
         <url>[zap2it]/abc.jpg</url>
@@ -5821,10 +6181,22 @@
         <url>[ls-logo]/ww/wftv.jpg</url>
     </networktourl>
     <networktourl>
+        <network>ABC2au</network>
+        <url>[ls-logo]/aa/abc2_au.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>ABCFAMILY</network>
         <url>[zap2it]/fam.jpg</url>
     </networktourl>
     <networktourl>
+        <network>ABCau</network>
+        <url>[ls-logo]/aa/abcaus.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>ABORIGINAL</network>
+        <url>[ls-logo]/aa/aboriginal_peoples_tvnet.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>AE</network>
         <url>[zap2it]/aetv.jpg</url>
     </networktourl>
@@ -5841,14 +6213,34 @@
         <url>[zap2it]/animal.jpg</url>
     </networktourl>
     <networktourl>
+        <network>ARTSANDENTERTAINMENT</network>
+        <url>[ls-logo]/aa/ae_tv.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>AZN</network>
         <url>[ls-icon]/aa/azn_tv.gif</url>
     </networktourl>
     <networktourl>
+        <network>ArenaTVau</network>
+        <url>[ls-logo]/aa/arenatvaus.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>AuroraCommunityTV</network>
+        <url>[ls-logo]/aa/aurora_community_tv.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>AustralianChristianCh</network>
+        <url>[ls-logo]/aa/aus_christian_chan.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>BBCA</network>
         <url>[zap2it]/bbca.jpg</url>
     </networktourl>
     <networktourl>
+        <network>BBCWorld</network>
+        <url>[ls-logo]/bb/bbc_world.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>BET</network>
         <url>[zap2it]/bet.jpg</url>
     </networktourl>
@@ -5869,6 +6261,14 @@
         <url>[zap2it]/bravo.jpg</url>
     </networktourl>
     <networktourl>
+        <network>BRAVOCA</network>
+        <url>[ls-logo]/bb/bravo_ca.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>BloombergTV</network>
+        <url>[ls-logo]/bb/bloomberg.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>CARTOONNETWORK</network>
         <url>[zap2it]/toon.gif</url>
     </networktourl>
@@ -5877,6 +6277,14 @@
         <url>[zap2it2]/cbc.gif</url>
     </networktourl>
     <networktourl>
+        <network>CBC-CBLFT</network>
+        <url>[zap2it2]/cbc.gif</url>
+    </networktourl>
+    <networktourl>
+        <network>CBC-CBNEW</network>
+        <url>[ls-logo]/cc/cbc_newsworld.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>CBS</network>
         <url>[zap2it]/cbs.jpg</url>
     </networktourl>
@@ -5889,6 +6297,14 @@
         <url>[zap2it]/max.jpg</url>
     </networktourl>
     <networktourl>
+        <network>CITY-TORONTO</network>
+        <url>[ls-logo]/cc/city_city_tv_toronto.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>CMTPURECOUNTRY</network>
+        <url>[ls-logo]/cc/cmt_pure_country.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>CMTV</network>
         <url>[zap2it]/cmtv.gif</url>
     </networktourl>
@@ -5909,10 +6325,18 @@
         <url>[zap2it]/comedy.jpg</url>
     </networktourl>
     <networktourl>
+        <network>COMEDYNETWORK</network>
+        <url>[ls-logo]/cc/comedynetwork.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>COURT</network>
         <url>[zap2it]/court.jpg</url>
     </networktourl>
     <networktourl>
+        <network>CPAC</network>
+        <url>[ls-logo]/cc/cpac.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>CSPAN</network>
         <url>[zap2it]/cspan.jpg</url>
     </networktourl>
@@ -5921,6 +6345,14 @@
         <url>[zap2it]/cspan2.jpg</url>
     </networktourl>
     <networktourl>
+        <network>CTV-CJOH</network>
+        <url>[ls-logo]/cc/cjoh_ottawa.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>CTV-NEWSNET</network>
+        <url>[ls-logo]/cc/ctv_newsnet.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>CW</network>
         <url>[zap2it2]/cw.gif</url>
     </networktourl>
@@ -5945,6 +6377,30 @@
         <url>[ls-logo]/ww/wpix_cw11_new_york.jpg</url>
     </networktourl>
     <networktourl>
+        <network>CartoonNetworkls</network>
+        <url>[ls-logo]/cc/cartoonnet.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>ChannelVAustralia</network>
+        <url>[ls-logo]/cc/channel_v_au.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>CountryMusicChannel</network>
+        <url>[ls-logo]/cc/cmc_country_music.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>DISC</network>
+        <url>[ls-logo]/dd/discovery.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>DISC-CIVIL</network>
+        <url>[ls-logo]/dd/discovery_civilisation.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>DISC-HEALTH</network>
+        <url>[ls-logo]/dd/discovery_health_ca.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>DISCOVERY</network>
         <url>[zap2it]/dsc.jpg</url>
     </networktourl>
@@ -5961,6 +6417,14 @@
         <url>[ls-icon]/dd/diy_net_us.gif</url>
     </networktourl>
     <networktourl>
+        <network>DiscoveryChannel</network>
+        <url>[ls-logo]/dd/discovery.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>DisneyChannel</network>
+        <url>[ls-logo]/dd/disney_channel_interactif.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>ESPN</network>
         <url>[zap2it]/espn.jpg</url>
     </networktourl>
@@ -6021,6 +6485,10 @@
         <url>[ls-logo]/ee/encore_westerns.jpg</url>
     </networktourl>
     <networktourl>
+        <network>ExpoChannel</network>
+        <url>[ls-logo]/ee/expo_channel.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>FITV</network>
         <url>[zap2it]/thn.gif</url>
     </networktourl>
@@ -6037,6 +6505,10 @@
         <url>[zap2it]/food.jpg</url>
     </networktourl>
     <networktourl>
+        <network>FOODNETWORKCA</network>
+        <url>[ls-logo]/ff/foodnetwork_ca.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>FOX</network>
         <url>[zap2it]/fox.jpg</url>
     </networktourl>
@@ -6069,6 +6541,26 @@
         <url>[zap2it]/fx.jpg</url>
     </networktourl>
     <networktourl>
+        <network>FashionTV</network>
+        <url>[ls-logo]/ff/fashion_tv.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>Fox8</network>
+        <url>[ls-logo]/ff/fox8_aus.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>FoxClassicsau</network>
+        <url>[ls-logo]/ff/foxclassics_au.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>FoxNewsChannel</network>
+        <url>[ls-logo]/ff/foxnews.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>FoxSportsNetwork</network>
+        <url>[ls-logo]/ff/fsn.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>G4</network>
         <url>[ls-icon]/gg/g4_video_game_tv.gif</url>
     </networktourl>
@@ -6077,6 +6569,10 @@
         <url>[zap2it]/gameshownetwork.jpg</url>
     </networktourl>
     <networktourl>
+        <network>GLOBALON</network>
+        <url>[ls-logo]/gg/global_ontario.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>GOLF</network>
         <url>[zap2it]/golf.gif</url>
     </networktourl>
@@ -6117,10 +6613,18 @@
         <url>[ls-logo]/hh/hgtv.jpg</url>
     </networktourl>
     <networktourl>
+        <network>HGTVC</network>
+        <url>[ls-logo]/hh/hgtvcanada.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>HISTORY</network>
         <url>[ls-logo]/hh/historychannel.jpg</url>
     </networktourl>
     <networktourl>
+        <network>HISTORYCHANNEL</network>
+        <url>[ls-logo]/hh/historychannel.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>HISTORY_INT</network>
         <url>[ls-logo]/hh/history_int.jpg</url>
     </networktourl>
@@ -6133,6 +6637,18 @@
         <url>[ls-icon]/ii/ifc_us.gif</url>
     </networktourl>
     <networktourl>
+        <network>IND-CFTM</network>
+        <url>[ls-logo]/cc/cftm_montreal.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>IND-TFO</network>
+        <url>[ls-logo]/tt/tfo.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>IND-TV5</network>
+        <url>[ls-logo]/tt/tv5_quebec.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>IND-WACX</network>
         <url>[ls-logo]/ww/wacx_tv55_orlando.jpg</url>
     </networktourl>
@@ -6193,6 +6709,10 @@
         <url>[ls-icon]/kk/kwog_nbc51_seattle.gif</url>
     </networktourl>
     <networktourl>
+        <network>LIFENETWORK</network>
+        <url>[ls-logo]/ll/life_network.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>LIFETIME</network>
         <url>[zap2it]/life.jpg</url>
     </networktourl>
@@ -6201,6 +6721,10 @@
         <url>[ls-icon]/ll/lifetime_movie.gif</url>
     </networktourl>
     <networktourl>
+        <network>Lifestyle</network>
+        <url>[ls-logo]/ll/lifestyle.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>MNTV</network>
         <url>[zap2it]/mynetworktv_affiliate.gif</url>
     </networktourl>
@@ -6217,6 +6741,30 @@
         <url>[zap2it]/mtv2.gif</url>
     </networktourl>
     <networktourl>
+        <network>MUCH</network>
+        <url>[ls-logo]/mm/muchmusic.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>MUCH-LOUD</network>
+        <url>[ls-logo]/mm/much_loud.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>MUCH-MORE</network>
+        <url>[ls-logo]/mm/muchmoremusic.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>MUCH-RETRO</network>
+        <url>[ls-logo]/mm/much_more_retro.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>MUCH-VIBE</network>
+        <url>[ls-logo]/mm/much_vibe.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>MUSIQUEPLUS</network>
+        <url>[ls-logo]/mm/musiqueplus.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>MYTV-WRBW</network>
         <url>[ls-logo]/ww/wrbw_my65_orlando.jpg</url>
     </networktourl>
@@ -6225,10 +6773,30 @@
         <url>[ls-logo]/ww/wwor_my9_secaucus.jpg</url>
     </networktourl>
     <networktourl>
+        <network>MainEventPPV</network>
+        <url>[ls-logo]/mm/mainevent_ppv.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>Max</network>
+        <url>[ls-logo]/mm/max_au.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>Military</network>
         <url>[ls-logo]/mm/military_channel_discovery.jpg</url>
     </networktourl>
     <networktourl>
+        <network>MovieExtra</network>
+        <url>[ls-logo]/mm/movie_extra_aus.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>MovieGreats</network>
+        <url>[ls-logo]/mm/movie_greats_aus.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>MovieOne</network>
+        <url>[ls-logo]/mm/movie_one_aus.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>NASA</network>
         <url>[ls-icon]/nn/nasatv_us.gif</url>
     </networktourl>
@@ -6265,6 +6833,10 @@
         <url>[ls-logo]/nn/nickelodeon.jpg</url>
     </networktourl>
     <networktourl>
+        <network>NineNetwork</network>
+        <url>[ls-logo]/num/9network.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>Noggin</network>
         <url>[ls-logo]/nn/noggin.jpg</url>
     </networktourl>
@@ -6557,6 +7129,10 @@
         <url>[pbs]/KUHT.gif</url>
     </networktourl>
     <networktourl>
+        <network>PBS-KUON</network>
+        <url>[pbs]/KUON.gif</url>
+    </networktourl>
+    <networktourl>
         <network>PBS-KUSD</network>
         <url>[pbs]/KUSD.gif</url>
     </networktourl>
@@ -7037,6 +7613,10 @@
         <url>[zap2it]/qvc.jpg</url>
     </networktourl>
     <networktourl>
+        <network>RDI</network>
+        <url>[ls-logo]/rr/rdi_tv.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>RPLEX</network>
         <url>[ls-icon]/ee/encore_retroplex.gif</url>
     </networktourl>
@@ -7045,6 +7625,10 @@
         <url>[zap2it]/scifi.jpg</url>
     </networktourl>
     <networktourl>
+        <network>SHOWCASECA</network>
+        <url>[ls-logo]/ss/showcase_ca.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>SHOWTIME</network>
         <url>[zap2it]/show.jpg</url>
     </networktourl>
@@ -7065,6 +7649,10 @@
         <url>[zap2it]/sitv.gif</url>
     </networktourl>
     <networktourl>
+        <network>SPACECHANNEL</network>
+        <url>[ls-logo]/ss/space.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>SPEED</network>
         <url>[zap2it]/speed.gif</url>
     </networktourl>
@@ -7073,6 +7661,10 @@
         <url>[ls-icon]/ss/spike_tv.gif</url>
     </networktourl>
     <networktourl>
+        <network>STARENTERTAINMENT</network>
+        <url>[ls-logo]/ss/star_tv_ch.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>STARZ</network>
         <url>[zap2it2]/starz.jpg</url>
     </networktourl>
@@ -7085,6 +7677,38 @@
         <url>[zap2it2]/sundancechannel.jpg</url>
     </networktourl>
     <networktourl>
+        <network>SevenNetwork</network>
+        <url>[ls-logo]/num/7network_aus.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>Showtime2Australia</network>
+        <url>[ls-logo]/ss/showtime2_aus.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>ShowtimeAustralia</network>
+        <url>[ls-logo]/ss/showtime_aus.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>ShowtimeGreats</network>
+        <url>[ls-logo]/ss/showtime_greats.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>SkyNewsAustralia</network>
+        <url>[ls-logo]/ss/sky_news_au.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>SkyRacing</network>
+        <url>[ls-logo]/ss/skyracing.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>SouthernCrossTen</network>
+        <url>[ls-logo]/ss/southern_cross_ten.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>SpecialBroadcastingService</network>
+        <url>[ls-logo]/ss/sbs.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>TBS</network>
         <url>[zap2it]/tbs.jpg</url>
     </networktourl>
@@ -7097,6 +7721,18 @@
         <url>[zap2it2]/telemundo.gif</url>
     </networktourl>
     <networktourl>
+        <network>TELETOONCA</network>
+        <url>[ls-logo]/tt/teletoon_ca.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>THESCORE</network>
+        <url>[ls-logo]/tt/the_score_hd.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>THESPORTSNETWORK</network>
+        <url>[ls-logo]/tt/tsn.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>TLC</network>
         <url>[zap2it]/tlc.jpg</url>
     </networktourl>
@@ -7113,6 +7749,14 @@
         <url>[zap2it]/trav.gif</url>
     </networktourl>
     <networktourl>
+        <network>TREEHOUSE</network>
+        <url>[ls-logo]/tt/treehouse.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>TV1au</network>
+        <url>[ls-logo]/tt/tv1_aus.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>TV5</network>
         <url>[zap2it]/tv5.gif</url>
     </networktourl>
@@ -7121,10 +7765,18 @@
         <url>[zap2it]/tvland.jpg</url>
     </networktourl>
     <networktourl>
+        <network>TVO-CICA</network>
+        <url>[ls-logo]/cc/cica_tv_ontario.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>TVONE</network>
         <url>[ls-logo]/tt/tv_one_us.jpg</url>
     </networktourl>
     <networktourl>
+        <network>TVSNau</network>
+        <url>[ls-logo]/tt/tvsn_au.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>UNIVISION</network>
         <url>[zap2it]/uni.jpg</url>
     </networktourl>
@@ -7149,6 +7801,14 @@
         <url>[ls-logo]/vv/vh1_classic.jpg</url>
     </networktourl>
     <networktourl>
+        <network>VISIONCA</network>
+        <url>[ls-logo]/vv/visiontv.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>W</network>
+        <url>[ls-logo]/ww/w_au.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>WB</network>
         <url>[zap2it]/wb.jpg</url>
     </networktourl>
@@ -7164,6 +7824,18 @@
         <network>WRNN</network>
         <url>[zap2it]/rnn.gif</url>
     </networktourl>
+    <networktourl>
+        <network>WeatherChannelau</network>
+        <url>[ls-logo]/ww/weatherchannel_aus.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>WorldMoviesChannel</network>
+        <url>[ls-logo]/ww/worldmovies.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>YOUTHTV</network>
+        <url>[ls-logo]/yy/youth_tv.jpg</url>
+    </networktourl>
     <baseurl>
         <stub>ls-icon</stub>
         <url>http://lyngsat-logo.com/icon/tv</url>
Index: data/callsigntonetwork.txt
===================================================================
--- data/callsigntonetwork.txt	(revision 12245)
+++ data/callsigntonetwork.txt	(working copy)
@@ -52,6 +52,7 @@
 C4-22       FLIX
 C4-23       VH1
 Cartoon     CartoonNetworkls
+CBC         CBC
 CBUT        CBC
 Channel[V]  ChannelVAustralia
 CMTVP       CMTV
@@ -1501,3 +1502,43 @@
 Waco        WB
 XETV        FOX
 XUPN        UPN
+CJOH        CTV-CJOH
+CBOT        CBC
+CIII        GLOBALON
+CICA        TVO-CICA
+MOMUSIC     MUCH-MORE
+CKWS        CBC
+CBLFT       CBC-CBLFT
+SCR         THESCORE
+MUSIQUE     MUSIQUEPLUS
+ARTSC       ARTSANDENTERTAINMENT
+CMT         CMTPURECOUNTRY
+STAR        STARENTERTAINMENT
+SPIKEC      SPIKE
+MUCHMUSIC   MUCH
+CBNEW       CBC-CBNEW
+VISION      VISIONCA
+YTV         YOUTHTV
+TREEC       TREEHOUSE
+HGTVC       HGTVC
+TDCC        DISC
+BRAVOC      BRAVOCA
+TV5         IND-TV5
+CITY        CITY-TORONTO
+FOODC       FOODNETWORKCA
+SHCASEC     SHOWCASECA
+HISTC       HISTORYCHANNEL
+COMEDC      COMEDYNETWORK
+TOONC       TELETOONCA
+WTBS        TBS
+SPCCAN      SPEED
+SPACEC      SPACECHANNEL
+CNBCC       CNBC
+NEWSNET     CTV-NEWSNET
+CPAC        CPAC
+TSN         THESPORTSNETWORK
+LIFENET     LIFENETWORK
+TFO         IND-TFO
+CFTM        IND-CFTM
+RDI         RDI
+APTN        ABORIGINAL
Index: data/networktourl.txt
===================================================================
--- data/networktourl.txt	(revision 12245)
+++ data/networktourl.txt	(working copy)
@@ -375,3 +375,42 @@
 WeatherChannelau        [ls-logo]/ww/weatherchannel_aus.jpg
 WorldMoviesChannel      [ls-logo]/ww/worldmovies.jpg
 WRNN                    [zap2it]/rnn.gif
+GLOBALON                [ls-logo]/gg/global_ontario.jpg
+CTV-CJOH                [ls-logo]/cc/cjoh_ottawa.jpg
+TVO-CICA                [ls-logo]/cc/cica_tv_ontario.jpg
+MUCH                    [ls-logo]/mm/muchmusic.jpg
+MUCH-RETRO              [ls-logo]/mm/much_more_retro.jpg
+MUCH-MORE               [ls-logo]/mm/muchmoremusic.jpg
+MUCH-LOUD               [ls-logo]/mm/much_loud.jpg
+MUCH-VIBE               [ls-logo]/mm/much_vibe.jpg
+CBC-CBLFT               [zap2it2]/cbc.gif
+THESCORE                [ls-logo]/tt/the_score_hd.jpg
+MUSIQUEPLUS             [ls-logo]/mm/musiqueplus.jpg
+ARTSANDENTERTAINMENT    [ls-logo]/aa/ae_tv.jpg
+STARENTERTAINMENT       [ls-logo]/ss/star_tv_ch.jpg
+CMTPURECOUNTRY          [ls-logo]/cc/cmt_pure_country.jpg
+CBC-CBNEW               [ls-logo]/cc/cbc_newsworld.jpg
+VISIONCA                [ls-logo]/vv/visiontv.jpg
+HGTVC                   [ls-logo]/hh/hgtvcanada.jpg
+DISC                    [ls-logo]/dd/discovery.jpg
+DISC-CIVIL              [ls-logo]/dd/discovery_civilisation.jpg
+DISC-HEALTH             [ls-logo]/dd/discovery_health_ca.jpg
+BRAVOCA                 [ls-logo]/bb/bravo_ca.jpg
+IND-TV5                 [ls-logo]/tt/tv5_quebec.jpg
+CITY-TORONTO            [ls-logo]/cc/city_city_tv_toronto.jpg
+FOODNETWORKCA           [ls-logo]/ff/foodnetwork_ca.jpg
+SHOWCASECA              [ls-logo]/ss/showcase_ca.jpg
+SPACECHANNEL            [ls-logo]/ss/space.jpg
+HISTORYCHANNEL          [ls-logo]/hh/historychannel.jpg
+COMEDYNETWORK           [ls-logo]/cc/comedynetwork.jpg
+TELETOONCA              [ls-logo]/tt/teletoon_ca.jpg
+IND-TFO                 [ls-logo]/tt/tfo.jpg
+CTV-NEWSNET             [ls-logo]/cc/ctv_newsnet.jpg
+CPAC                    [ls-logo]/cc/cpac.jpg
+THESPORTSNETWORK        [ls-logo]/tt/tsn.jpg
+LIFENETWORK             [ls-logo]/ll/life_network.jpg
+IND-CFTM                [ls-logo]/cc/cftm_montreal.jpg
+RDI                     [ls-logo]/rr/rdi_tv.jpg
+ABORIGINAL              [ls-logo]/aa/aboriginal_peoples_tvnet.jpg
+TREEHOUSE               [ls-logo]/tt/treehouse.jpg
+YOUTHTV                 [ls-logo]/yy/youth_tv.jpg