Ticket #2365: master_iconmap.8.patch

data/callsigntonetwork.txt

@@ -1 +1 @@
 5MAX        CINEMAX
+ABC2        ABC2au
 ABC         ABCau
-ABC2        ABC2au
 ACC         AustralianChristianCh
 ACCNET      ACCESS-CJAL
 ACMAXP      CINEMAX
@@ -16 +16 @@
 ANIMALP     ANIMALPLANET
 ANIPL       ANIMALPLANET
 APTN        APTN
+ARENA+2     ArenaTVau
 ARENA       ArenaTVau
-ARENA+2     ArenaTVau
 ART         ART_LATINO
 ARTS        AE
 ARTSC       AE
 ARTSP       AE
+AS          AmericasStore
 ATMAX       CINEMAX
 AURORA      AuroraCommunityTV
 AXN         AXN
@@ -33 +34 @@
 BBCWorld    BBCWorld
 BET         BET
 BETJAZZ     BET
+BETJ        BETJAZZ
 BETP        BET
 BIO         BIO
 BLKFAM      BLKFAM
+BLKSTZP     STARZ
 BLKSTZ      STARZ
-BLKSTZP     STARZ
+Bloomberg   BLOOM
 BLOOM       BLOOM
 BNEWS       BROADCASTNEWS
 BOOME       BOOMERANG
@@ -45 +48 @@
 BRAVOC      BRAVO-CA
 BRAVOP      BRAVO
 BYUTV       BYUTV
-Bloomberg   BLOOM
-C-SPAN      CSPAN
 C3-02       TLC
 C3-07       CSPAN
 C3-12       HISTORY
@@ -69 +70 @@
 CANBR       CANAL_BRASIL-BR
 CANRU       CANAL_RURAL-BR
 CARNE       CARTOONNETWORK
+Cartoon     CartoonNetworkls
 CBC         CBC
 CBLFT       CBC
 CBNEW       CBC-NewsWorld
@@ -76 +78 @@
 CBUT        CBC
 CBXFT       CBC-CBXFT
 CBXT        CBC-CBXT
+CCTV9       CHINATV
 CFRN        CTV-CFRN
 CFTM        IND-CFTM
+Channel[V]  ChannelVAustralia
 CHCA        GLOBAL-CHCA
 CICA        TVO-CICA
 CIII        GLOBALON
@@ -90 +94 @@
 CMT         CMT
 CMTV        CMT
 CMTVP       CMT
+CNBCC       CNBC
 CNBC        CNBC
-CNBCC       CNBC
+CNBCWLD     CNBCWLD
 CNN         CNN
 CNNH        CNNHEADLINENEWS
 CNNIN       CNN_INTERNATIONAL
@@ -99 +104 @@
 COMEDCP     COMEDYCENTRAL
 COMEDY      COMEDYCENTRAL
 COMEDYP     COMEDYCENTRAL
+CountryMusic CountryMusicChannel
 COURT       COURT
 COURTP      COURT
 CPAC        CPAC
 CSNCH       CSNCH
+CSPAN2      CSPAN2
+CSPAN3      CSPAN3
+C-SPAN      CSPAN
 CSPAN       CSPAN
-CSPAN2      CSPAN2
 CULTU       CULTURA-BR
 CWEA        WEATHERCHANNEL
-Cartoon     CartoonNetworkls
-Channel[V]  ChannelVAustralia
-CountryMusic CountryMusicChannel
-DCHOME      DISCOVERY
-DCKIDS      DISCOVERY
+DCHOME      DISCOVERY-HOME
+DCKIDS      DISCOVERY_KIDS
 DCWINGS     DISCOVERY
 DEUWE       DEUTSCHE_WELLE-DE
-DHC         DISCOVERY
+DHC         DISCOVERY-HEALTH-US
 DHD         DISCOVERYHD
 DISCH       DISCOVERY
+Discovery   DISCOVERY
 DISHO       DISCOVERY_HOME_HEALTH
 DISKI       DISCOVERY_KIDS
 DISN        DISNEY
+DISNEY      DISNEY
 DISNP       DISNEY
 DIY         DIY
 DSC         DISCOVERY
 DSCP        DISCOVERY
-DTIMES      DISCOVERY
+DTIMES      DISCOVERY-TIMES
 DTVFX       FX
-Discovery   DISCOVERY
-DISNEY      DISNEY
 EA2         Encore_Avenue
 EACT        Encore_Action
 EDRA        Encore_Drama
@@ -137 +142 @@
 ENCOREP     Encore
 ESPBR       ESPN_BRASIL-BR
 ESPIN       ESPN_INTERNATIONAL
-ESPN        ESPN
 ESPN2       ESPN2
 ESPN2HD     ESPN2
 ESPNCL      ESPNCL
 ESPND       ESPND
+ESPN        ESPN
 ESPNEWS     ESPNEWS
 ESPNHD      ESPN
 ETV         ETV
@@ -152 +157 @@
 Expo        ExpoChannel
 F4-01       AMC
 FAM         ABCFAMILY
+FAMNET      FAMNET
 FAMP        ABCFAMILY
 FAMZP       SHOWTIME
+FAMZ        SHOWFAMILY
+FashionTV   FashionTV
 FCSA        FOXSPORTS
 FCSC        FOXSPORTS
 FCSP        FOXSPORTS
@@ -163 +171 @@
 FLIXP       FLIX
 FMC         FOXMOVIE
 FNC         FOXNEWS
+FOODC       FOOD-CA
 FOOD        FOOD
-FOODC       FOOD-CA
 FOODP       FOOD
+Fox8+2      Fox8
+Fox8        Fox8
+FoxClassics+2 FoxClassicsau
+FoxClassics FoxClassicsau
 FOX         FOX
+FOXHDSO     FSNHD
+FoxNews     FOXNEWS
+FoxSportsNews FoxSportsNetwork
 FOXW2       FOXSPORTS
 FSAZ        FOXSPORTS
 FSBA        FOXSPORTS
+FSC         FoxSportsNetwork
+FSCH2       FOXSPORTS
 FSCH        FOXSPORTS
-FSCH2       FOXSPORTS
 FSD         FOXSPORTS
 FSE         FSE
 FSFL        FOXSPORTS
 FSM3        FOXSPORTS
-FSN         FOXSPORTS
 FSN1        FOXSPORTS
+FSNE1       FOXSPORTS
 FSNE        FOXSPORTS
-FSNE1       FOXSPORTS
+FSN         FOXSPORTS
 FSNY        FOXSPORTS
 FSO         FOXSPORTS
-FSOH        FOXSPORTS
 FSOH1       FOXSPORTS
 FSOH2       FOXSPORTS
+FSOH        FOXSPORTS
 FSP         FOXSPORTS
-FSR         FOXSPORTS
 FSR1        FOXSPORTS
 FSR2        FOXSPORTS
 FSR3        FOXSPORTS
+FSR         FOXSPORTS
+FSS1        FOXSPORTS
+FSS2        FoxSportsNetwork
 FSS         FOXSPORTS
-FSS1        FOXSPORTS
 FSW         FOXSPORTS
 FSWLD       FOXSPORTS
 FUSE        FUSE
 FUTUR       FUTURA-BR
 FX          FX
 FXP         FX
-FashionTV   FashionTV
-Fox8        Fox8
-Fox8+2      Fox8
-FoxClassics FoxClassicsau
-FoxClassics+2 FoxClassicsau
-FoxNews     FOXNEWS
-FoxSportsNews FoxSportsNetwork
 G0-04       STARZ
 G0-08       STARZ
 G0-12       STARZ
@@ -244 +254 @@
 G5-24       SHOWTIME
 G7-06       GAMESHOWNETWORK
 G7-07       GOLF
+GAC         GAC
 GALA        GALAVISION
-GAC         GAC
 GLOBO       GLOBO-BR
 GLONE       GLOBO_NEWS-BR
 GNT         GNT-BR
@@ -255 +265 @@
 HALMRKP     HALMRK
 HB2P        HBOPLUS
 HB2W        HBOPLUS
-HBO         HBO
 HBO2        HBOPLUS
 HBOC        HBOCOMEDY
 HBOCP       HBOCOMEDY
 HBOF        HBOFAMILY
 HBOFP       HBOFAMILY
-HBOHD       HBO
+HBO         HBO
+HBOHD       HBO_HD
 HBOHDP      HBO_HD
 HBOP        HBO
 HBOPL       HBOPLUS
@@ -269 +279 @@
 HBOSIGP     HBOSIGNATURE
 HBOZ        HBOZONE
 HBOZP       HBOZONE
+HDNET       HDNET
+HGTVC       HGTV-CA
 HGTV        HGTV
-HGTVC       HGTV-CA
 HGTVP       HGTV
 HISI        HISTORY_INT
 HISTC       HISTORY
@@ -279 +290 @@
 HISTP       HISTORY
 HSN         HOMESHOPPINGNETWORK
 IFC         IFC
+INHD2       INHD
 INHD        INHD
-INHD2       INHD
+INSP        INSPNET
 IPLEX       IPLEX
 JETIX       JETIX
 KAAL        ABC
@@ -349 +361 @@
 KCOS        PBS-KCOS
 KCPL        UPN
 KCPM        UPN
+KCPQDT      FOX
 KCPQ        FOX
-KCPQDT      FOX
 KCPT        PBS-KCPT
 KCRA        NBC
 KCRG        ABC
 KCSM        PBS-KCSM
 KCTF        PBS-KCTF
-KCTS        PBS-KCTS
 KCTSCAB     PBS-KCTS
-KCTSDT      PBS-KCTS
 KCTSDT2     PBS-KCTS
 KCTSDT3     PBS-KCTS
 KCTSDT5     PBS-KCTS
+KCTSDT      PBS-KCTS
+KCTS        PBS-KCTS
 KCTV        CBS-KCTV
 KCVU        FOX
 KCWC        PBS-KCWC
@@ -376 +388 @@
 KDFX        FOX
 KDIN        PBS-KDIN
 KDK         NBC
+KDLT        NBC
 KDL         UPN
-KDLT        NBC
 KDNL        ABC
 KDRV        ABC
 KDSM        FOX
@@ -434 +446 @@
 KGTF        PBS-KGTF
 KGTV        ABC
 KGUN        ABC
+KGWB        WB
 KGW         NBC
-KGWB        WB
 KHAS        NBC
 KHBB        UPN
 KHBS        ABC
 KHCV        KHCV
+KHCW        CW-KHCW
+KHCWDT      CW-KHCW
 KHET        PBS-KHET
 KHGI        ABC
 KHMT        UPN
 KHNL        NBC
 KHOG        ABC
 KHON        FOX
+KHOU        CBS-KHOU
+KHOUDT2     CBS-KHOU
+KHOUDT      CBS-KHOU
+KHQA        UPN
 KHQ         NBC
-KHQA        UPN
 KHWB        WB
 KIDK        UPN
 KIDY        FOX
@@ -459 +476 @@
 KIMA        UPN
 KIMO        ABC
 KIMT        UPN
+KINGDT      KING
 KING        KING
-KINGDT      KING
 KION        CBS
+KIRODT      KIRO
 KIRO        KIRO
-KIRODT      KIRO
 KITV        ABC
 KIVI        ABC
 KIXE        PBS-KIXE
@@ -493 +510 @@
 KLRU        PBS-KLRU
 KLSB        NBC
 KLSR        FOX
+KLTJ        DAYSTAR
 KLTV        ABC
 KLVX        PBS-KLVX
 KLWB        WB
@@ -524 +542 @@
 KMTX        NBC
 KMTZ        NBC
 KMVU        FOX
+KMWB2       WB
 KMWB        WB
-KMWB2       WB
+KMYQDT      MNTV
 KMYQ        MNTV
-KMYQDT      MNTV
 KNAZ        NBC
 KNBC        NBC
 KNBN        NBC
@@ -543 +561 @@
 KNTV        NBC
 KNVA        WB
 KNVN        NBC
+KNWS        IND-KNWS
 KNXV        ABC
 KOAA        NBC
 KOAT        ABC
-KOB         NBC
 KOBF        NBC
 KOBI        NBC
+KOB         NBC
 KOBR        NBC
 KOCB        WB
 KOCE        PBS-KOCE
@@ -559 +578 @@
 KOKI        FOX
 KOLN        CBS
 KOLO        ABC
+KOMODT      KOMO
 KOMO        KOMO
-KOMODT      KOMO
 KOMU        NBC
+KONGDT      KONG
 KONG        KONG
-KONGDT      KONG
 KOOD        PBS-KOOD
 KOPB        PBS-KOPB
 KOTA        ABC
@@ -581 +600 @@
 KPNX        NBC
 KPNZ        UPN
 KPOM        NBC
-KPRC        NBC
+KPRCDT2     NBC-KPRC
+KPRCDT3     NBC-KPRC
+KPRC        NBC-KPRC
 KPSE        UPN
 KPTH        FOX
 KPTM        FOX
@@ -589 +610 @@
 KPTV        FOX
 KPVI        NBC
 KPWB        WB
+KPXB        ITV-KPXB
 KPXC        ITV
 KPXD        ITV
 KPXE        ITV
@@ -610 +632 @@
 KREM        CBS-KREM
 KRGV        ABC
 KRIS        NBC
-KRIV        FOX
+KRIVDT      FOX-KRIV
+KRIV        FOX-KRIV
 KRMA        PBS-KRMA
 KRMJ        PBS-KRMJ
 KRNV        NBC
@@ -646 +669 @@
 KSTP        ABC
 KSTS        TELEMUNDO
 KSTU        FOX
+KSTWDT      KSTW
 KSTW        KSTW
-KSTWDT      KSTW
 KSVI        ABC
 KSWB        WB
 KSWO        ABC
@@ -656 +679 @@
 KTAL        NBC
 KTBC        FOX
 KTBS        ABC
+KTBU        IND-KTBU
 KTBY        FOX
 KTCA        PBS-KTCA
 KTCI        PBS-KTCI
@@ -678 +702 @@
 KTOO        PBS-KTOO
 KTOV        UPN
 KTRE        ABC
-KTRK        ABC
+KTRK        ABC-KTRK
+KTRKDT2     ABC-KTRK
+KTRKDT3     ABC-KTRK
 KTRV        FOX
 KTSC        PBS-KTSC
 KTTC        NBC
 KTTU        UPN
 KTTV        FOX
 KTTW        FOX
+KTUDCA      UPN
 KTUD        UPN
-KTUDCA      UPN
 KTUL        ABC
 KTUU        NBC
 KTVB        NBC
@@ -708 +734 @@
 KTWT        UPN
 KTWU        PBS-KTWU
 KTXA        UPN
-KTXH        UPN
+KTXH        MYTV-KTXH
 KTXL        FOX
 KTXS        ABC
 KTXT        PBS-KTXT
@@ -717 +743 @@
 KUAT        PBS-KUAT
 KUCW        WUCW
 KUED        PBS-KUED
+KUHTDT2     PBS-KUHT
+KUHTDT      PBS-KUHT
 KUHT        PBS-KUHT
 KUIL        UPN
 KULR        NBC
@@ -814 +842 @@
 LIFE        LIFETIME
 LIFENET     LIFENETWORK
 LIFEP       LIFETIME
+Lifestyle+2 Lifestyle
+Lifestyle   Lifestyle
 LMN         LIFETIMEMOVIE
 LOVE        Encore_Love
 LOVEP       Encore_Love
-Lifestyle   Lifestyle
-Lifestyle+2 Lifestyle
+LRW         LIFEWOMEN
+MainEvent   MainEventPPV
 MAX         CINEMAX
 MAXP        CINEMAX
 MILI        Military
 MOMAXP      CINEMAX
 MOMUSIC     MUCH-MORE
+MovieExtra  MovieExtra
+MovieGreats MovieGreats
+MovieOne+2  MovieOne
+MovieOne    MovieOne
 MPLEX       Encore
 MSNBC       MSNBC
-MTV         MTV
 MTV2        MTV2
 MTV2P       MTV2
 MTVCAN      MTV-CA
 MTVL        MTV
+MTV         MTV
 MTVP        MTV
 MTVS        MTV
 MUCHMUSIC   MUCHMUSIC
@@ -838 +872 @@
 MUSIQUE     MUSIQUEPLUS
 MYSTERY     Encore_Mystery
 MYSTERYP    Encore_Mystery
-MainEvent   MainEventPPV
-MovieExtra  MovieExtra
-MovieGreats MovieGreats
-MovieOne    MovieOne
-MovieOne+2  MovieOne
 NASA        NASA
 NATGE       National_Geographic
+NatGeo      National_Geographic
+NBATV       NBATV
+NECN        NEWSENG
 NESN        NESN
 NET1        PBS-KUON
 NEWSENG     NEWSENG
-NECN        NEWSENG
 NEWSNET     CTV-NEWSNET
 NEXTP       SHOWTIME
+NEXT        SHOWNEXT
+NFLHD       NFL
 NFL         NFL
-NFLHD       NFL
 NGC         National_Geographic
+Nickelodeon Nickelodeon
 NICKE       Nickelodeon
 NIK         Nickelodeon
 NIKP        Nickelodeon
 NIKTON      Nick_Toons
+Nine        NineNetwork
 NOGN        Noggin
 NWCN        NWCN
-NatGeo      National_Geographic
-Nickelodeon Nickelodeon
-Nine        NineNetwork
 OLCC        OLN
 OLN         OLN
 OMAX        CINEMAX
@@ -881 +912 @@
 ROBTV       ROBTV
 RPLEX       RPLEX
 RSW         RSN-RSW
+SBSNews     SpecialBroadcastingService
 SBS         SpecialBroadcastingService
-SBSNews     SpecialBroadcastingService
 SBT         SBT-BR
-SCIENCE     DISCOVERY
+SCIENCE     DISCOVERY-SCIENCE
+SCIFIP      SCIFI
 SCIFI       SCIFI
-SCIFIP      SCIFI
 SCR         THESCORE
+Seven       SevenNetwork
 SHCASEC     SHOWCASE-CA
 SHCASEP     SHOWCASE-CA
+SHOCSEP     SHOWCASE
 SHOCSE      SHOWCASE
-SHOCSEP     SHOWCASE
+SHOTOOP     SHOWTIMETOO
 SHOTOO      SHOWTIMETOO
-SHOTOOP     SHOWTIMETOO
-SHOW        SHOWTIME
+SHOWBP      SHOWTIME
 SHOWB       SHOWTIME
-SHOWBP      SHOWTIME
+SHOWHDP     SHOWHDP
+SHOWHD      SHOWHD
 SHOWP       SHOWTIME
+SHOW        SHOWTIME
+Showtime+2  Showtime2Australia
+ShowtimeGreats ShowtimeGreats
+Showtime    ShowtimeAustralia
+SHOWXP      SHOWTIMEEXTREME
 SHOWX       SHOWTIMEEXTREME
-SHOWXP      SHOWTIMEEXTREME
 SITV        SITV
+SkyNews     SkyNewsAustralia
+SkyRacing   SkyRacing
+SOAP        SOAP
 SONY        SONY
-SOAP        SOAP
 SPACEC      SPACE
 SPCCAN      SPACE
 SPEED       SPEED
@@ -912 +951 @@
 SPORT       SPORTV-BR
 SPROUT      PBS_Sprout
 STAR        STAR
-STARZ       STARZ
+STARZCP     STARZ
 STARZC      STARZ
-STARZCP     STARZ
+STARZFP     STARZ
 STARZF      STARZ
-STARZFP     STARZ
 STARZP      STARZ
+STARZ       STARZ
+STRZTHP     STARZ
 STRZTH      STARZ
-STRZTHP     STARZ
 STYLE       STYLE
+SUNDAEP     SUNDANCE
 SUNDAE      SUNDANCE
-SUNDAEP     SUNDANCE
-Seven       SevenNetwork
-Showtime    ShowtimeAustralia
-Showtime+2  Showtime2Australia
-ShowtimeGreats ShowtimeGreats
-SkyNews     SkyNewsAustralia
-SkyRacing   SkyRacing
+TBN         TBN
+TBSP        TBS
 TBS         TBS
-TBSP        TBS
+TCMC        TCM
 TCM         TCM
-TCMC        TCM
 TDCC        DISCOVERY
 TELAC       TELECINE_ACTION-BR
 TELCU       TELECINE_CULT-BR
 TELEM       TELECINE_EMOTION-BR
 TELPI       TELECINE_PIPOCA-BR
 TELPR       TELECINE_PREMIUM-BR
+TENNIS      TENNIS
+Ten         SouthernCrossTen
 TFCP        TFC-West
 TFO         IND-TFO
 THMAXP      CINEMAX
+TLCP        TLC
 TLC         TLC
-TLCP        TLC
 TLN          TeleLatino
+TMCP        TMC
 TMC         TMC
-TMCP        TMC
+TMCXP       TMC
 TMCX        TMC
-TMCXP       TMC
-TNT         TNT
 TNTHD       TNT
 TNTP        TNT
+TNT         TNT
 TOON        CARTOONNETWORK
+TOONCP      TELETOON-CA
 TOONC       TELETOON-CA
-TOONCP      TELETOON-CA
-TOOND       DISNEY
 TOONDP      DISNEY
+TOOND       TOON_DISNEY
 TOONP       CARTOONNETWORK
+TRAVP       TRAV
 TRAV        TRAV
-TRAVP       TRAV
 TREEC       TREEHOUSE
 TROPP       TVTROPOLIS
 TRUE        Encore
 TRUEP       Encore
 TSC         THESHOPPINGCHANNEL
 TSN         TSN
+TV1+2       TV1au
 TV1         TV1au
-TV1+2       TV1au
 TV5         TV5
 TVAW        IND-CFTM
 TVGC        TVGUIDE
+TVLANDP     TVLAND
 TVLAND      TVLAND
-TVLANDP     TVLAND
 TVONE       TVONE
 TVSEN       TV_SENADO-BR
 TVSN        TVSNau
 TWC         WEATHERCHANNEL
-Ten         SouthernCrossTen
+TXCN        TEXAS_CABLE_NEWS
 UHD         UNIVERSALHD
 UNICH       UNIVERSAL_CHANNEL
 UNIP        UNIVISION
 UNIVERSALHD UNIVERSALHD
+USAP        USA
 USA         USA
-USAP        USA
 UW2TV       UWTV
 UWTV        UWTV
 VERSUS      VERSUS
-VH1         VH1
 VH1CL       VH1_Classic
 VH1CNTRY    VH1
 VH1P        VH1
 VH1SOUL     VH1
+VH1         VH1
 VISION      VISIONTV
 VOICE       VOICETV
-W           W
-W+2         W
 W1-06       NBC
 W1-10       ABC
 W1-22       CBS
+W+2         W
 W3-03       UPN
 W3-09       WB
 W3-14       TCM
@@ -1017 +1052 @@
 WABG        ABC
 WABM        UPN
 WACH        FOX
+Waco        WB
 WACX        IND-WACX
 WACY        UPN
 WAFF        NBC
@@ -1097 +1133 @@
 WBXX        WB
 WBZ         CBS
 WBZL        WB
+WCAU-DT     NBC-WCAU
 WCAU        NBC-WCAU
-WCAU-DT     NBC-WCAU
 WCAU-WX     NBC-WCAU-WEATHERPLUS
 WCBB        PBS-WCBB
 WCBD        NBC
@@ -1155 +1191 @@
 WDSU        NBC
 WDTN        NBC
 WDWB        WB
-WE          WE
 WEAO        PBS-WEAO
 WEAR        ABC
+Weather     WeatherChannelau
 WEAU        NBC
 WECT        NBC
 WEDH        PBS-WEDH
@@ -1177 +1213 @@
 WEUX        FOX
 WEVU        UPN
 WEWB        WB
+WE          WE
 WEWS        ABC
 WEYI        NBC
 WFAA        ABC
@@ -1229 +1266 @@
 WGN         CW-WGN
 WGNM        UPN
 WGNO        ABC
-WGNSAT      WB
+WGNSAT      SUPERSTATION_WGN
 WGNT        UPN
 WGRZ        NBC
 WGSA        UPN
 WGTE        PBS-WGTE
 WGTU        ABC
 WGTV        PBS-WGTV
-WGTW        TBN-WGTW
 WGTW-D1     TBN-WGTW
 WGTW-D2     CHURCHCHANNEL
 WGTW-D3     JCTV
 WGTW-D4     ENLACEUS
 WGTW-D5     SMILEOFACHILD
+WGTW        TBN-WGTW
 WGVU        PBS-WGVU
 WGWB        WB
 WGXA        FOX
@@ -1255 +1292 @@
 WHEC        NBC
 WHIZ        NBC
 WHNS        FOX
+WHOI        ABC
 WHO         NBC
-WHOI        ABC
 WHRO        PBS-WHRO
 WHSV        ABC
 WHTJ        PBS-WHTJ
 WHTM        ABC
 WHTV        UPN
 WHUT        PBS-WHUT
+WHYY-1      PBS-WHYY
 WHYY        PBS-WHYY
-WHYY-1      PBS-WHYY
 WIBW        CBS-WIBW
 WICD        NBC
 WICS        NBC
@@ -1274 +1311 @@
 WILX        NBC
 WIPB        PBS-WIPB
 WIPR        PBS-WIPR
+WISN        ABC
 WIS         NBC
-WISN        ABC
 WITF        PBS-WITF
 WITI        FOX
 WITN        NBC
@@ -1298 +1335 @@
 WJRT        ABC
 WJSU        ABC
 WJTC        UPN
+WJWB        WB
 WJW         FOX
-WJWB        WB
 WJXX        ABC
 WJYS         IND-WJYS
 WJZY        UPN
@@ -1355 +1392 @@
 WMAR        ABC
 WMBB        ABC
 WMC         NBC
+WMCN-DT     SHOPNBC-WMCN
 WMCN        SHOPNBC-WMCN
-WMCN-DT     SHOPNBC-WMCN
 WMDN        UPN
 WMDT        ABC
 WMEC        PBS-WMEC
@@ -1423 +1460 @@
 WOLO        ABC
 WOMAX       CINEMAX
 WOMENP      SHOWTIME
+WOMEN       SHOWWOMEN
 WOOD        NBC
 WOPX        ITV
+WorldMovies WorldMoviesChannel
 WOSU        PBS-WOSU
 WOTV        ABC
 WOUB        PBS-WOUB
 WOWT        NBC
-WP          WNETWORK
 WPBA        PBS-WPBA
 WPBF        ABC
 WPBN        NBC
@@ -1440 +1478 @@
 WPGA        ABC
 WPGH        FOX
 WPGX        FOX
-WPHL        MYTV-WPHL
 WPHL-D1     MYTV-WPHL
 WPHL-D2     TUBE
+WPHL        MYTV-WPHL
 WPIX        CW-WPIX
 WPLG        ABC
 WPME        UPN
@@ -1462 +1500 @@
 WPTZ        NBC
 WPVI        ABC-WPVI
 WPVI-HD     ABC-WPVI
+WP          WNETWORK
 WPWR        MYTV-WPWR
 WPXD        ITV
 WPXI        NBC
@@ -1478 +1517 @@
 WRAZ        FOX
 WRBU        UPN
 WRBW        MYTV-WRBW
+WRCB        NBC
 WRC         NBC
-WRCB        NBC
 WRDC        UPN
 WRDQ        IND-WRDQ
 WREX        NBC
@@ -1577 +1616 @@
 WTWB        WB
 WTWC        NBC
 WTWO        NBC
+WTXFDT      FOX-WTXF
 WTXF        FOX-WTXF
-WTXFDT      FOX-WTXF
 WTXL        ABC
 WTXX        WB
 WUAB        UPN
@@ -1597 +1636 @@
 WUTF        TELEFUTURA
 WUTR        ABC
 WUTV        FOX
+WUVP-DT     UNIVISION
 WUVP        UNIVISION
-WUVP-DT     UNIVISION
 WUXP        UPN
 WVAG        UPN
 WVAH        FOX
@@ -1623 +1662 @@
 WVUT        PBS-WVUT
 WVVA        NBC
 WVWB        WB
+W           W
 WWAY        ABC
 WWBT        WB
 WWCP        FOX
@@ -1650 +1690 @@
 WXXI        PBS-WXXI
 WXXV        FOX
 WXYZ        ABC
+WYBE-DT     IND-WYBE
 WYBE        IND-WYBE
-WYBE-DT     IND-WYBE
 WYCC        PBS-WYCC
 WYDC        FOX
 WYES        PBS-WYES
@@ -1666 +1706 @@
 WZTV        FOX
 WZVN        ABC
 WZZM        ABC
-Waco        WB
-Weather     WeatherChannelau
-WorldMovies WorldMoviesChannel
 XETV        FOX
 XUPN        UPN
 YTV         IND-YTVP

data/networktourl.txt

@@ -1 @@
-ABC                     [ls-logo]/tv/aa/abc.jpg
+ABC2au                  [ls-logo]/tv/aa/abc2_au.jpg
+ABCau                   [ls-logo]/tv/aa/abcaus.jpg
+ABCFAMILY               [ls-logo]/tv/aa/abc_family.jpg
 ABC-KMBC                [ls-logo]/tv/kk/kmbc_kansascity.jpg
 ABC-KTKA                [ls-logo]/tv/kk/ktka_abc49_topeka.jpg
+ABC-KTRK                [ls-logo]/tv/kk/ktrk_abc13_houston.jpg
+ABC                     [ls-logo]/tv/aa/abc.jpg
 ABC-WFTV                [ls-logo]/tv/ww/wftv.jpg
 ABC-WLS                 [ls-logo]/tv/ww/wls_chicago_ch7.jpg
 ABC-WPVI                [ls-logo]/tv/ww/wpvi_abc6_philadelphia.jpg
-ABC2au                  [ls-logo]/tv/aa/abc2_au.jpg
-ABCFAMILY               [ls-logo]/tv/aa/abc_family.jpg
-ABCau                   [ls-logo]/tv/aa/abcaus.jpg
 ACCESS-CJAL             [ls-logo]/tv/cc/cjal_access9_edmonton.jpg
 AE                      [ls-logo]/tv/aa/ae_tv.jpg
 AMC                     [ls-logo]/tv/aa/amc.jpg
+AmericasStore           [ls-logo]/tv/aa/americas_store.jpg
 ANGEL1                  [ls-logo]/tv/aa/angel_one.jpg
 ANIMALPLANET            [ls-logo]/tv/aa/animalplanet.jpg
 APTN                    [ls-logo]/tv/aa/aboriginal_peoples_tvnet.jpg
+ArenaTVau               [ls-logo]/tv/aa/arena_tv_au.jpg
 ART_LATINO              [ls-logo]/tv/aa/art_latino.jpg
+AuroraCommunityTV       [ls-logo]/tv/aa/aurora_community_tv.jpg
+AustralianChristianCh   [ls-logo]/tv/aa/aus_christian_chan.jpg
 AXN                     [ls-logo]/tv/aa/axn.jpg
 AZN                     [ls-logo]/tv/aa/azn_tv.jpg
-ArenaTVau               [ls-logo]/tv/aa/arena_tv_au.jpg
-AuroraCommunityTV       [ls-logo]/tv/aa/aurora_community_tv.jpg
-AustralianChristianCh   [ls-logo]/tv/aa/aus_christian_chan.jpg
 BANDEIRANTES-BR         [ls-logo]/tv/rr/rede_bandeirantes.jpg
 BBCA                    [ls-logo]/tv/bb/bbc_america.jpg
 BBCWorld                [ls-logo]/tv/bb/bbc_world.jpg
+BETJAZZ                 [ls-logo]/tv/bb/bet_jazz.jpg
 BET                     [ls-logo]/tv/bb/bet.jpg
 BIO                     [ls-logo]/tv/bb/biography.jpg
 BLKFAM                  [ls-logo]/tv/bb/black_family_channel.jpg
 BLOOM                   [ls-logo]/tv/bb/bloomberg.jpg
 BOOMERANG               [ls-logo]/tv/bb/boomerang.jpg
+BRAVO-CA                [ls-logo]/tv/bb/bravo_ca.jpg
 BRAVO                   [ls-logo]/tv/bb/bravo_us.jpg
-BRAVO-CA                [ls-logo]/tv/bb/bravo_ca.jpg
 BROADCASTNEWS           [ls-logo]/tv/bb/broadcast_news.jpg
 BYUTV                   [ls-logo]/tv/bb/byu_tv.jpg
 CANAL_BRASIL-BR         [ls-logo]/tv/cc/canalbrasil.jpg
 CANAL_RURAL-BR          [ls-logo]/tv/cc/canal_rural_brasil.jpg
 CARTOONNETWORK          [ls-logo]/tv/cc/cartoon_network.jpg
-CBC                     [ls-logo]/tv/cc/cbc_tv.jpg
+CartoonNetworkls        [ls-logo]/tv/cc/cartoonnet.jpg
 CBC-CBLFT               [ls-logo]/tv/cc/cblt_toronto.jpg
 CBC-CBXFT               [ls-logo]/tv/cc/cbc_src.jpg
 CBC-CBXT                [ls-logo]/tv/cc/cbc_edmonton.jpg
+CBC                     [ls-logo]/tv/cc/cbc_tv.jpg
 CBC-NewsWorld           [ls-logo]/tv/cc/cbc_newsworld.jpg
-CBS                     [ls-logo]/tv/cc/cbs.jpg
 CBS-KCTV                [ls-logo]/tv/kk/kctv_tv5_kansas_city.jpg
+CBS-KHOU                [ls-logo]/tv/kk/khou_cbs11_houston.jpg
 CBS-KREM                [ls-logo]/tv/kk/krem_cbs2_spokane.jpg
 CBS-KYW                 [ls-logo]/tv/kk/kyw_cbs3_philadelphia.jpg
+CBS                     [ls-logo]/tv/cc/cbs.jpg
 CBS-WBBM                [ls-logo]/tv/ww/wbbm_cbs2_chicago.jpg
 CBS-WIBW                [ls-logo]/tv/ww/wibw_cbs13_topeka.jpg
 CBS-WKMG                [ls-logo]/tv/ww/wkmg_orlando.jpg
+ChannelVAustralia       [ls-logo]/tv/cc/channel_v_au.jpg
+CHINATV                 [ls-logo]/tv/cc/china_tv.jpg
 CHURCHCHANNEL           [ls-logo]/tv/cc/church_channel.jpg
 CINEMAX                 [ls-logo]/tv/cc/cinemax.jpg
 CITY-TORONTO            [ls-logo]/tv/cc/city_city_tv_toronto.jpg
@@ -53 +60 @@
 CLT                     [ls-logo]/tv/cc/clt.jpg
 CMT                     [ls-logo]/tv/cc/cmt.jpg
 CNBC                    [ls-logo]/tv/cc/cnbc.jpg
-CNN                     [ls-logo]/tv/cc/cnn.jpg
+CNBCWLD                 [ls-logo]/tv/cc/cnbc_world.jpg
 CNNHEADLINENEWS         [ls-logo]/tv/cc/cnn_headline_news.jpg
 CNN_INTERNATIONAL       [ls-logo]/tv/cc/cnn_international.jpg
+CNN                     [ls-logo]/tv/cc/cnn.jpg
 COMEDYCENTRAL           [ls-logo]/tv/cc/comedy_central_us.jpg
 COMEDYNETWORK           [ls-logo]/tv/cc/comedynetwork.jpg
+CountryMusicChannel     [ls-logo]/tv/cc/cmc_country_music.jpg
 COURT                   [ls-logo]/tv/cc/court_tv_us.jpg
 CPAC                    [ls-logo]/tv/cc/cpac.jpg
 CSNCH                   [ls-logo]/tv/cc/comcast_sportsnet_baltimore.jpg
+CSPAN2                  [ls-logo]/tv/cc/cspan2.jpg
+CSPAN3                  [ls-logo]/tv/cc/cspan3.jpg
 CSPAN                   [ls-logo]/tv/cc/cspan.jpg
-CSPAN2                  [ls-logo]/tv/cc/cspan2.jpg
 CTV-CFRN                [ls-logo]/tv/cc/cfrn_edmonton.jpg
 CTV-CJOH                [ls-logo]/tv/cc/cjoh_ottawa.jpg
 CTV-NEWSNET             [ls-logo]/tv/cc/ctv_newsnet.jpg
 CULTURA-BR              [ls-logo]/tv/cc/cultura.jpg
-CW                      [ls-logo]/corp/tt/the_cw_network.jpg
+CW-KHCW                 [ls-logo]/tv/kk/khcw_cw39_houston.jpg
 CW-KTLA                 [ls-logo]/tv/kk/ktla_cw5_los_angeles.jpg
 CW-KWGN                 [ls-logo]/tv/kk/kwgn_cw2_denver.jpg
+CW                      [ls-logo]/corp/tt/the_cw_network.jpg
 CW-WGN                  [ls-logo]/tv/ww/wgn_cw9_chicago.jpg
 CW-WKCF                 [ls-logo]/tv/ww/wkcf_cw18_clermont.jpg
 CW-WPIX                 [ls-logo]/tv/ww/wpix_cw11_new_york.jpg
 CW-WPSG                 [ls-logo]/tv/ww/wpsg_cw57_philadelphia.jpg
-CartoonNetworkls        [ls-logo]/tv/cc/cartoonnet.jpg
-ChannelVAustralia       [ls-logo]/tv/cc/channel_v_au.jpg
-CountryMusicChannel     [ls-logo]/tv/cc/cmc_country_music.jpg
+DAYSTAR                 [ls-logo]/tv/dd/daystar.jpg
 DEUTSCHE_WELLE-DE       [ls-logo]/tv/dd/dw_tv.jpg
-DISC-CIVIL              [ls-logo]/tv/dd/discovery_civilisation.jpg
-DISC-HEALTH             [ls-logo]/tv/dd/discovery_health_ca.jpg
-DISCOVERY               [ls-logo]/tv/dd/discovery.jpg
+DISCOVERY-CIVIL         [ls-logo]/tv/dd/discovery_civilisation.jpg
 DISCOVERYHD             [ls-logo]/tv/dd/discovery_hd.jpg
+DISCOVERY-HEALTH-CA     [ls-logo]/tv/dd/discovery_health_ca.jpg
+DISCOVERY-HEALTH-US     [ls-logo]/tv/dd/discovery_health.jpg
 DISCOVERY_HOME_HEALTH   [ls-logo]/tv/dd/discovery_home_health.jpg
+DISCOVERY-HOME          [ls-logo]/tv/dd/discovery_home.jpg
 DISCOVERY_KIDS          [ls-logo]/tv/dd/discovery_kids.jpg
+DISCOVERY               [ls-logo]/tv/dd/discovery.jpg
+DISCOVERY-SCIENCE       [ls-logo]/tv/ss/science_channel.jpg
+DISCOVERY-TIMES         [ls-logo]/tv/dd/discovery_times.jpg
 DISNEY                  [ls-logo]/tv/dd/disney_channel.jpg
 DIY                     [ls-logo]/tv/dd/diy_net_us.jpg
-ENLACEUS                [ls-logo]/tv/tt/tbn_enlace_us.jpg
-ESPN                    [ls-logo]/tv/ee/espn.jpg
-ESPN2                   [ls-logo]/tv/ee/espn2.jpg
-ESPNCL                  [ls-logo]/tv/ee/espn_classic.jpg
-ESPND                   [ls-logo]/tv/ee/espn_deportes.jpg
-ESPNEWS                 [ls-logo]/tv/ee/espnews.jpg
-ESPN_BRASIL-BR          [ls-logo]/tv/ee/espn_brasil.jpg
-ESPN_INTERNATIONAL      [ls-logo]/tv/ee/espn_int.jpg
-ETV                     [ls-logo]/tv/ee/e_entertainment_tv.jpg
-Encore                  [ls-logo]/tv/ee/encore_us.jpg
 Encore_Action           [ls-logo]/tv/ee/encore_action.jpg
 Encore_Avenue           [ls-logo]/tv/ee/encore_avenue.jpg
 Encore_Drama            [ls-logo]/tv/ee/encore_drama.jpg
 Encore_HDTV             [ls-logo]/tv/ee/encore_hd.jpg
 Encore_Love             [ls-logo]/tv/ee/encore_love.jpg
+Encore                  [ls-logo]/tv/ee/encore_us.jpg
 Encore_Mystery          [ls-logo]/tv/ee/encore_mystery.jpg
 Encore_WAM              [ls-logo]/tv/ee/encore_wam.jpg
 Encore_Westerns         [ls-logo]/tv/ee/encore_westerns.jpg
+ENLACEUS                [ls-logo]/tv/tt/tbn_enlace_us.jpg
+ESPN2                   [ls-logo]/tv/ee/espn2.jpg
+ESPN_BRASIL-BR          [ls-logo]/tv/ee/espn_brasil.jpg
+ESPNCL                  [ls-logo]/tv/ee/espn_classic.jpg
+ESPND                   [ls-logo]/tv/ee/espn_deportes.jpg
+ESPNEWS                 [ls-logo]/tv/ee/espnews.jpg
+ESPN_INTERNATIONAL      [ls-logo]/tv/ee/espn_int.jpg
+ESPN                    [ls-logo]/tv/ee/espn.jpg
+ETV                     [ls-logo]/tv/ee/e_entertainment_tv.jpg
 EWTN                    [ls-logo]/tv/ee/ewtn.jpg
 ExpoChannel             [ls-logo]/tv/ee/expo_channel.jpg
+FAMNET                  [ls-logo]/tv/ff/familynet.jpg
+FashionTV               [ls-logo]/tv/ff/fashion_tv.jpg
 FITV                    [ls-logo]/tv/ff/fittv_usa.jpg
 FLIVING                 [ls-logo]/tv/ff/fineliving.jpg
 FLIX                    [ls-logo]/tv/ff/flix.jpg
+FOOD-CA                 [ls-logo]/tv/ff/foodnetwork_ca.jpg
 FOOD                    [ls-logo]/tv/ff/foodnetwork.jpg
-FOOD-CA                 [ls-logo]/tv/ff/foodnetwork_ca.jpg
+Fox8                    [ls-logo]/tv/ff/fox8_aus.jpg
+FoxClassicsau           [ls-logo]/tv/ff/foxclassics_au.jpg
+FOX-KRIV                [ls-logo]/tv/kk/kriv_fox26_houston.jpg
+FOX-KTMJ                [ls-logo]/tv/kk/ktmj_fox43_topeka.jpg
 FOX                     [ls-logo]/tv/ff/fox.jpg
-FOX-KTMJ                [ls-logo]/tv/kk/ktmj_fox43_topeka.jpg
+FOXMOVIE                [ls-logo]/tv/ff/fox_moviechannel.jpg
+FOXNEWS                 [ls-logo]/tv/ff/foxnews.jpg
+FOXSPORTS               [ls-logo]/tv/ff/fox_sports.jpg
+FoxSportsNetwork        [ls-logo]/tv/ff/fsn.jpg
 FOX-WDAF                [ls-logo]/tv/ww/wdaf_kansascity.jpg
 FOX-WFLD                [ls-logo]/tv/ww/wfld_fox32_chicago.jpg
 FOX-WOFL                [ls-logo]/tv/ww/wofl_fox35_orlando.jpg
 FOX-WTXF                [ls-logo]/tv/ww/wtxf_fox29_philadelphia.jpg
-FOXMOVIE                [ls-logo]/tv/ff/fox_moviechannel.jpg
-FOXNEWS                 [ls-logo]/tv/ff/foxnews.jpg
-FOXSPORTS               [ls-logo]/tv/ff/fox_sports.jpg
 FSE                     [ls-logo]/tv/ff/fox_sports_espanol.jpg
+FSNHD                   [ls-logo]/tv/ff/fsn_hd.jpg
 FUSE                    [ls-logo]/tv/ff/fuse.jpg
 FUTURA-BR               [ls-logo]/tv/cc/canalfutura.jpg
 FX                      [ls-logo]/tv/ff/fx_us.jpg
-FashionTV               [ls-logo]/tv/ff/fashion_tv.jpg
-Fox8                    [ls-logo]/tv/ff/fox8_aus.jpg
-FoxClassicsau           [ls-logo]/tv/ff/foxclassics_au.jpg
-FoxSportsNetwork        [ls-logo]/tv/ff/fsn.jpg
 G4                      [ls-logo]/tv/gg/g4_video_game_tv.jpg
 GAC                     [ls-logo]/tv/gg/great_american_country.jpg
 GALAVISION              [ls-logo]/tv/gg/galavision_us.jpg
@@ -140 +156 @@
 GNT-BR                  [ls-logo]/tv/gg/gnt_brasil.jpg
 GOLF                    [ls-logo]/tv/gg/golf_channel.jpg
 HALMRK                  [ls-logo]/tv/hh/hallmark_channel.jpg
-HBO                     [ls-logo]/tv/hh/hbo.jpg
 HBOCOMEDY               [ls-logo]/tv/hh/hbo_comedy.jpg
 HBOFAMILY               [ls-logo]/tv/hh/hbo_family.jpg
+HBO_HD                  [ls-logo]/tv/hh/hbo_hdtv.jpg
+HBO                     [ls-logo]/tv/hh/hbo.jpg
 HBOPLUS                 [ls-logo]/tv/hh/hbo_plus.jpg
 HBOSIGNATURE            [ls-logo]/tv/hh/hbo_signature.jpg
 HBOZONE                 [ls-logo]/tv/hh/hbo_zone.jpg
-HBO_HD                  [ls-logo]/tv/hh/hbo_hdtv.jpg
+HDNET                   [ls-logo]/tv/hh/hdnet.jpg
+HGTV-CA                 [ls-logo]/tv/hh/hgtvcanada.jpg
 HGTV                    [ls-logo]/tv/hh/hgtv.jpg
-HGTV-CA                 [ls-logo]/tv/hh/hgtvcanada.jpg
+HISTORY_INT             [ls-logo]/tv/hh/history_int.jpg
 HISTORY                 [ls-logo]/tv/hh/historychannel.jpg
-HISTORY_INT             [ls-logo]/tv/hh/history_int.jpg
 HOMESHOPPINGNETWORK     [ls-logo]/tv/hh/hsn.jpg
 IFC                     [ls-logo]/tv/ii/ifc_us.jpg
 IND-CFTM                [ls-logo]/tv/cc/cftm_montreal.jpg
+IND-KNWS                [ls-logo]/tv/kk/knws_51_houston.jpg
+IND-KTBU                [ls-logo]/tv/kk/ktbu_america_one55_houston.jpg
 IND-TFO                 [ls-logo]/tv/tt/tfo.jpg
 IND-WACX                [ls-logo]/tv/ww/wacx_tv55_orlando.jpg
 IND-WCIU                [ls-logo]/tv/ww/wciu_cbs26_chicago.jpg
@@ -166 +185 @@
 IND-WZMY                [ls-logo]/tv/ww/wzmy_my50_derry.jpg
 IND-YTVP                [ls-logo]/tv/yy/youth_tv.jpg
 INHD                    [ls-logo]/tv/ii/inhd.jpg
+INSPNET                 [ls-logo]/tv/ii/inspiration_net_int.jpg
 IPLEX                   [ls-logo]/tv/ee/encore_indieplex.jpg
+ITV-KPXB                [ls-logo]/tv/kk/kpxb_i49_houston.jpg
+ITV-KWPX                [ls-logo]/tv/kk/kwpx_i33_seattle.jpg
 ITV                     [ls-logo]/tv/kk/kwpx_i33_seattle.jpg
-ITV-KWPX                [ls-logo]/tv/kk/kwpx_i33_seattle.jpg
 ITV-WCPX                [ls-logo]/tv/ww/wcpx_i38_chicago.jpg
 JCTV                    [ls-logo]/tv/jj/jc_tv.jpg
 JETIX                   [ls-logo]/tv/jj/jetix.jpg
@@ -183 +204 @@
 KUPX                    [ls-logo]/tv/kk/kupx_i16_salt_lake_city.jpg
 KWOG                    [ls-logo]/tv/kk/kwog_nbc51_seattle.jpg
 LIFENETWORK             [ls-logo]/tv/ll/life_network.jpg
+Lifestyle               [ls-logo]/tv/ll/lifestyle.jpg
 LIFETIME                [ls-logo]/tv/ll/lifetime.jpg
 LIFETIMEMOVIE           [ls-logo]/tv/ll/lifetime_movie.jpg
-Lifestyle               [ls-logo]/tv/ll/lifestyle.jpg
+LIFEWOMEN               [ls-logo]/tv/ll/lifetime_real_woman.jpg
+MainEventPPV            [ls-logo]/tv/mm/mainevent_ppv.jpg
+Max                     [ls-logo]/tv/mm/max_au.jpg
+Military                [ls-logo]/tv/mm/military_channel_discovery.jpg
 MNTV                    [ls-logo]/corp/ln/my_network_tv.jpg
+MovieExtra              [ls-logo]/tv/mm/movie_extra_aus.jpg
+MovieGreats             [ls-logo]/tv/mm/movie_greats_aus.jpg
+MovieOne                [ls-logo]/tv/mm/movie_one_aus.jpg
 MSNBC                   [ls-logo]/tv/mm/msnbc.jpg
+MTV2                    [ls-logo]/tv/mm/mtv2_us.jpg
+MTV-CA                  [ls-logo]/tv/mm/mtv_ca.jpg
 MTV                     [ls-logo]/tv/mm/mtv.jpg
-MTV-CA                  [ls-logo]/tv/mm/mtv_ca.jpg
-MTV2                    [ls-logo]/tv/mm/mtv2_us.jpg
 MUCH-LOUD               [ls-logo]/tv/mm/much_loud.jpg
 MUCH-MORE               [ls-logo]/tv/mm/muchmoremusic.jpg
+MUCHMUSIC               [ls-logo]/tv/mm/muchmusic.jpg
 MUCH-RETRO              [ls-logo]/tv/mm/much_more_retro.jpg
 MUCH-VIBE               [ls-logo]/tv/mm/much_vibe.jpg
-MUCHMUSIC               [ls-logo]/tv/mm/muchmusic.jpg
 MULTISHOW-BR            [ls-logo]/tv/mm/multishow.jpg
 MUSIQUEPLUS             [ls-logo]/tv/mm/musiqueplus.jpg
+MYTV-KTXH               [ls-logo]/tv/kk/ktxh_my20_houston.jpg
 MYTV-WPHL               [ls-logo]/tv/ww/wphl_my17_philadelphia.jpg
 MYTV-WPWR               [ls-logo]/tv/ww/wpwr_my50_chicago.jpg
 MYTV-WRBW               [ls-logo]/tv/ww/wrbw_my65_orlando.jpg
 MYTV-WWOR               [ls-logo]/tv/ww/wwor_my9_secaucus.jpg
-MainEventPPV            [ls-logo]/tv/mm/mainevent_ppv.jpg
-Max                     [ls-logo]/tv/mm/max_au.jpg
-Military                [ls-logo]/tv/mm/military_channel_discovery.jpg
-MovieExtra              [ls-logo]/tv/mm/movie_extra_aus.jpg
-MovieGreats             [ls-logo]/tv/mm/movie_greats_aus.jpg
-MovieOne                [ls-logo]/tv/mm/movie_one_aus.jpg
 NASA                    [ls-logo]/tv/nn/nasatv_us.jpg
-NBC                     [ls-logo]/tv/nn/nbc.jpg
+National_Geographic     [ls-logo]/tv/nn/natgeochannel.jpg
+NBATV                   [ls-logo]/tv/nn/nba_tv.jpg
 NBC-KMCI                [ls-logo]/tv/kk/kmci38_kansascity.jpg
+NBC-KPRC                [ls-logo]/tv/kk/kprc_nbc2_houston.jpg
 NBC-KSHB                [ls-logo]/tv/kk/kshb41_kansas.jpg
 NBC-KSNT                [ls-logo]/tv/kk/ksnt_nbc27_topeka.jpg
+NBC                     [ls-logo]/tv/nn/nbc.jpg
 NBC-WCAU                [ls-logo]/tv/ww/wcau_nbc10_philadelphia.jpg
 NBC-WCAU-WEATHERPLUS    [ls-logo]/tv/ww/wcau_weather_plus.jpg
 NBC-WESH                [ls-logo]/tv/ww/wesh_nbc2_daytona_beach.jpg
@@ -220 +246 @@
 NESN                    [ls-logo]/tv/nn/nesn_us.jpg
 NEWSENG                 [ls-logo]/tv/nn/new_england_cable_news.jpg
 NFL                     [ls-logo]/tv/nn/nfl.jpg
-NWCN                    [ls-logo]/tv/nn/nw_cablenews_can.jpg
-National_Geographic     [ls-logo]/tv/nn/natgeochannel.jpg
+Nickelodeon             [ls-logo]/tv/nn/nickelodeon.jpg
 Nick_Toons              [ls-logo]/tv/nn/nicktoons_us.jpg
-Nickelodeon             [ls-logo]/tv/nn/nickelodeon.jpg
 NineNetwork             [ls-logo]/tv/num/9network.jpg
 Noggin                  [ls-logo]/tv/nn/noggin.jpg
+NWCN                    [ls-logo]/tv/nn/nw_cablenews_can.jpg
 OLN                     [ls-logo]/tv/oo/outdoor_life_network.jpg
 OXYGEN                  [ls-logo]/tv/oo/oxygen.jpg
-PBS                     [ls-logo]/tv/pp/pbs.jpg
 PBS-KAET                [pbs]/KAET.gif
 PBS-KAID                [pbs]/KAID.gif
 PBS-KAKM                [pbs]/KAKM.gif
@@ -305 +329 @@
 PBS-KWBU                [pbs]/KWBU.gif
 PBS-KWCM                [pbs]/KWCM.gif
 PBS-KWSU                [pbs]/KWSU.gif
+PBS                     [ls-logo]/tv/pp/pbs.jpg
+PBS_Sprout              [ls-logo]/tv/pp/pbs_kids_sprout.jpg
 PBS-WBCC                [pbs]/WBCC.gif
 PBS-WBGU                [pbs]/WBGU.gif
 PBS-WBIQ                [pbs]/WBIQ.gif
@@ -414 +440 @@
 PBS-WYCC                [pbs]/WYCC.gif
 PBS-WYES                [pbs]/WYES.gif
 PBS-WYIN                [pbs]/WYIN.gif
-PBS_Sprout              [ls-logo]/tv/pp/pbs_kids_sprout.jpg
 PEOPLE_ARTS             [ls-logo]/tv/pp/people_arts.jpg
 PLAYBOY                 [ls-logo]/tv/pp/playboy.jpg
 QVC                     [ls-logo]/tv/qq/qvc.jpg
@@ -429 +454 @@
 RSN-RSW                 [ls-logo]/tv/rr/rogers_sportsnet_west.jpg
 SBT-BR                  [ls-logo]/tv/ss/sbt.jpg
 SCIFI                   [ls-logo]/tv/ss/scifi.jpg
+SevenNetwork            [ls-logo]/tv/num/7network_aus.jpg
 SHOPNBC                 [ls-logo]/tv/ss/shopnbc.jpg
 SHOPNBC-WMCN            [ls-logo]/tv/ww/wmcn_53_atlantic_city.jpg
+SHOWCASE-CA             [ls-logo]/tv/ss/showcase_ca.jpg
 SHOWCASE                [ls-logo]/tv/ss/showcase.jpg
-SHOWCASE-CA             [ls-logo]/tv/ss/showcase_ca.jpg
+SHOWFAMILY              [ls-logo]/tv/ss/showtime_family_zone.jpg
+SHOWHD                  [ls-logo]/tv/ss/showtime_hdtv_us.jpg
+SHOWHDP                 [ls-logo]/tv/ss/showtime_hdtv_us.jpg
+SHOWNEXT                [ls-logo]/tv/ss/showtime_next.jpg
+Showtime2Australia      [ls-logo]/tv/ss/showtime2_aus.jpg
+ShowtimeAustralia       [ls-logo]/tv/ss/showtime_aus.jpg
+SHOWTIMEEXTREME         [ls-logo]/tv/ss/showtimextreme.jpg
+ShowtimeGreats          [ls-logo]/tv/ss/showtime_greats.jpg
 SHOWTIME                [ls-logo]/tv/ss/showtime.jpg
-SHOWTIMEEXTREME         [ls-logo]/tv/ss/showtimextreme.jpg
 SHOWTIMETOO             [ls-logo]/tv/ss/showtime_too.jpg
+SHOWWOMEN               [ls-logo]/tv/ss/showtime_women.jpg
 SITV                    [ls-logo]/tv/ss/sitv_los_angeles.jpg
+SkyNewsAustralia        [ls-logo]/tv/ss/sky_news_au.jpg
+SkyRacing               [ls-logo]/tv/ss/skyracing.jpg
 SMILEOFACHILD           [ls-logo]/tv/ss/smile_of_a_child.jpg
+SOAP                    [ls-logo]/tv/ss/soapnet_us.jpg
 SONY                    [ls-logo]/tv/ss/sonytv.jpg
-SOAP                    [ls-logo]/tv/ss/soapnet_us.jpg
+SouthernCrossTen        [ls-logo]/tv/ss/southern_cross_ten.jpg
 SPACE                   [ls-logo]/tv/ss/space_arg.jpg
+SpecialBroadcastingService [ls-logo]/tv/ss/sbs.jpg
 SPEED                   [ls-logo]/tv/ss/speed_channel_us.jpg
 SPIKE                   [ls-logo]/tv/ss/spike_tv.jpg
 SPORTV-BR               [ls-logo]/tv/ss/sportv.jpg
@@ -448 +486 @@
 STARZ                   [ls-logo]/tv/ss/starz.jpg
 STYLE                   [ls-logo]/tv/ss/style_network_us.jpg
 SUNDANCE                [ls-logo]/tv/ss/sundance_channel.jpg
-SevenNetwork            [ls-logo]/tv/num/7network_aus.jpg
-Showtime2Australia      [ls-logo]/tv/ss/showtime2_aus.jpg
-ShowtimeAustralia       [ls-logo]/tv/ss/showtime_aus.jpg
-ShowtimeGreats          [ls-logo]/tv/ss/showtime_greats.jpg
-SkyNewsAustralia        [ls-logo]/tv/ss/sky_news_au.jpg
-SkyRacing               [ls-logo]/tv/ss/skyracing.jpg
-SouthernCrossTen        [ls-logo]/tv/ss/southern_cross_ten.jpg
-SpecialBroadcastingService [ls-logo]/tv/ss/sbs.jpg
+SUPERSTATION_WGN        [ls-logo]/tv/ww/wgn_superstation_chicago.jpg
+TBN                     [ls-logo]/tv/tt/tbn.jpg
 TBN-WGTW                [ls-logo]/tv/ww/wgtw_48_philadelphia.jpg
 TBS                     [ls-logo]/tv/tt/tbs_atlanta.jpg
 TBS-WTBS                [ls-logo]/tv/ww/wtbs_17_atlanta.jpg
@@ -470 +502 @@
 TELEMUNDO               [ls-logo]/tv/ww/wkaq_telemundo.jpg
 TELEMUNDO-WSNS          [ls-logo]/tv/ww/wsns_telemundo44_chicago.jpg
 TELETOON-CA             [ls-logo]/tv/tt/teletoon_ca.jpg
+TENNIS                  [ls-logo]/tv/tt/tennis_channel.jpg
+TEXAS_CABLE_NEWS        [ls-logo]/tv/tt/texascablenews.jpg
 TFC-West                [ls-logo]/tv/ff/family.jpg
 THESCORE                [ls-logo]/tv/tt/the_score.jpg
 THESHOPPINGCHANNEL      [ls-logo]/tv/tt/tsc.jpg
 TLC                     [ls-logo]/tv/tt/the_learning_channel.jpg
 TMC                     [ls-logo]/tv/tt/the_movie_channel.jpg
 TNT                     [ls-logo]/tv/tt/tnt.jpg
+TOON_DISNEY             [ls-logo]/tv/dd/disney_toon_us.jpg
 TRAV                    [ls-logo]/tv/tt/travelchannel_us.jpg
 TREEHOUSE               [ls-logo]/tv/tt/treehouse.jpg
 TSN                     [ls-logo]/tv/tt/tsn.jpg
@@ -486 +521 @@
 TVLAND                  [ls-logo]/tv/tt/tvland_us.jpg
 TVO-CICA                [ls-logo]/tv/cc/cica_tv_ontario.jpg
 TVONE                   [ls-logo]/tv/tt/tv_one_us.jpg
+TV_SENADO-BR            [ls-logo]/tv/tt/tv_senado_br.jpg
 TVSNau                  [ls-logo]/tv/tt/tvsn_au.jpg
 TVTROPOLIS              [ls-logo]/tv/tt/tv_tropolis.jpg
-TV_SENADO-BR            [ls-logo]/tv/tt/tv_senado_br.jpg
+UNIVERSAL_CHANNEL       [ls-logo]/tv/uu/universal_channel.jpg
 UNIVERSALHD             [ls-logo]/tv/uu/universal_hd.jpg
-UNIVERSAL_CHANNEL       [ls-logo]/tv/uu/universal_channel.jpg
 UNIVISION               [ls-logo]/tv/uu/univision.jpg
+UPN-KCWE                [ls-logo]/tv/kk/kcwe_cw29_kansas_city.jpg
 UPN                     [ls-logo]/corp/tt/the_cw_network.jpg
-UPN-KCWE                [ls-logo]/tv/kk/kcwe_cw29_kansas_city.jpg
 USA                     [ls-logo]/tv/uu/usa_network.jpg
 UWTV                    [ls-logo]/tv/uu/uwtv_washington.jpg
 VERSUS                  [ls-logo]/tv/vv/versus.jpg
+VH1_Classic             [ls-logo]/tv/vv/vh1_classic.jpg
 VH1                     [ls-logo]/tv/vv/vh1.jpg
-VH1_Classic             [ls-logo]/tv/vv/vh1_classic.jpg
 VISIONTV                [ls-logo]/tv/vv/visiontv.jpg
 VOICETV                 [ls-logo]/tv/vv/voice_tv.jpg
-W                       [ls-logo]/tv/ww/w_au.jpg
+WB-KSMO                 [ls-logo]/tv/kk/ksmo_my62_kansas_city.jpg
 WB                      [ls-logo]/tv/ww/wbtv_net_us.jpg
-WB-KSMO                 [ls-logo]/tv/kk/ksmo_my62_kansas_city.jpg
 WB-WBKS                 [ls-logo]/tv/ww/wbks_wb5_topeka.jpg
+WeatherChannelau        [ls-logo]/tv/ww/weatherchannel_aus.jpg
+WEATHERCHANNEL          [ls-logo]/tv/tt/the_weather_channel_us.jpg
 WE                      [ls-logo]/tv/ww/we.jpg
-WEATHERCHANNEL          [ls-logo]/tv/tt/the_weather_channel_us.jpg
+W                       [ls-logo]/tv/ww/w_au.jpg
 WNETWORK                [ls-logo]/tv/ww/w_network.jpg
+WorldMoviesChannel      [ls-logo]/tv/ww/worldmovies.jpg
 WRNN                    [ls-logo]/tv/ww/wrnn_tv48_kingston.jpg
 WUCW                    [ls-logo]/tv/ww/wucw_cw23_minneapolis.jpg
-WeatherChannelau        [ls-logo]/tv/ww/weatherchannel_aus.jpg
-WorldMoviesChannel      [ls-logo]/tv/ww/worldmovies.jpg