Index: contrib/master_iconmap/data/callsigntonetwork.txt
===================================================================
--- contrib/master_iconmap/data/callsigntonetwork.txt	(revision 11136)
+++ contrib/master_iconmap/data/callsigntonetwork.txt	(working copy)
@@ -567,7 +567,7 @@
 KTGM            ABC
 KTIV            UPN
 KTKA            ABC
-KTLA            WB
+KTLA            CW-KTLA
 KTMF            ABC
 KTMJ            FOX
 KTNE            PBS-KTNE
@@ -663,7 +663,7 @@
 KWCV            WB
 KWES            NBC
 KWFT            WB
-KWGN            WB
+KWGN            CW-KWGN
 KWIB            WB
 KWKB            WB
 KWKT            FOX
@@ -820,6 +820,7 @@
 WABG            ABC
 WABM            UPN
 WACH            FOX
+WACX            IND-WACX
 WACY            UPN
 WAFF            NBC
 WAGA            FOX
@@ -965,7 +966,7 @@
 WEMT            FOX
 WENH            PBS-WENH
 WENY            ABC
-WESH            NBC
+WESH            NBC-WESH
 WESTERN         ENCORE
 WESTERNP        ENCORE
 WETA            PBS-WETA
@@ -991,7 +992,7 @@
 WFTC            UPN
 WFTE            UPN
 WFTS            ABC
-WFTV            ABC
+WFTV            ABC-WFTV
 WFTX            FOX
 WFUM            PBS-WFUM
 WFWA            PBS-WFWA
@@ -1020,7 +1021,7 @@
 WGGB            ABC
 WGHP            FOX
 WGMB            FOX
-WGN             WB
+WGN             CW-WGN
 WGNM            UPN
 WGNO            ABC
 WGNSAT          WB
@@ -1090,11 +1091,12 @@
 WKAR            PBS-WKAR
 WKBD            UPN
 WKBW            ABC
-WKCF            WB
+WKCF            CW-WKCF
 WKDH            ABC
 WKEF            ABC
 WKGB            PBS-WKGB
 WKJG            NBC
+WKMG            CBS-WKMG
 WKNO            PBS-WKNO
 WKOP            PBS-WKOP
 WKOW            ABC
@@ -1109,6 +1111,7 @@
 WLAX            FOX
 WLBT            NBC
 WLBZ            NBC
+WLCB            IND-WLCB
 WLCW            UPN
 WLEX            NBC
 WLFL            WB
@@ -1191,7 +1194,7 @@
 WOAI            NBC
 WOAY            ABC
 WOCO            ABC
-WOFL            FOX
+WOFL            FOX-WOFL
 WOGX            FOX
 WOHB            UPN
 WOHL            FOX
@@ -1203,6 +1206,7 @@
 WOMAX           CINEMAX
 WOMENP          SHOWTIME
 WOOD            NBC
+WOPX            PAX-WOPX
 WOSU            PBS-WOSU
 WOTV            ABC
 WOUB            PBS-WOUB
@@ -1218,7 +1222,7 @@
 WPGH            FOX
 WPGX            FOX
 WPHL            WB
-WPIX            WB
+WPIX            CW-WPIX
 WPLG            ABC
 WPME            UPN
 WPMI            NBC
@@ -1249,10 +1253,11 @@
 WQWQ            UPN
 WRAZ            FOX
 WRBU            UPN
-WRBW            UPN
+WRBW            MYTV-WRBW
 WRC             NBC
 WRCB            NBC
 WRDC            UPN
+WRDQ            IND-WRDQ
 WREX            NBC
 WRGT            FOX
 WRIC            ABC
@@ -1267,7 +1272,7 @@
 WSAZ            NBC
 WSB             ABC
 WSBE            PBS-WSBE
-WSBK            UPN
+WSBK            IND-WSBK
 WSEC            PBS-WSEC
 WSEE            CBS
 WSET            ABC
@@ -1394,7 +1399,7 @@
 WWJ             CBS
 WWLP            NBC
 WWMB            UPN
-WWOR            UPN
+WWOR            MYTV-WWOR
 WWSB            ABC
 WWTI            ABC
 WWWB            WB
Index: contrib/master_iconmap/data/baseurl.txt
===================================================================
--- contrib/master_iconmap/data/baseurl.txt	(revision 11136)
+++ contrib/master_iconmap/data/baseurl.txt	(working copy)
@@ -1,5 +1,5 @@
-lyngsat         http://lyngsat-logo.com/icon/tv/
-lyngsat-logo    http://lyngsat-logo.com/logo/tv/
+lyngsat         http://lyngsat-logo.com/icon/tv
+lyngsat-logo    http://lyngsat-logo.com/logo/tv
 pbs             http://www.pbs.org/images/stations/standard
 zap2it          http://images.zap2it.com/station_logo
-zap2it2         http://tvlistings2.zap2it.com/tms_network_logos/
+zap2it2         http://tvlistings2.zap2it.com/tms_network_logos
Index: contrib/master_iconmap/data/networktourl.txt
===================================================================
--- contrib/master_iconmap/data/networktourl.txt	(revision 11136)
+++ contrib/master_iconmap/data/networktourl.txt	(working copy)
@@ -1,4 +1,5 @@
 ABC                 [zap2it]/abc.jpg
+ABC-WFTV            [lyngsat-logo]/ww/wftv.jpg
 ABCFAMILY           [zap2it]/fam.jpg
 AE                  [zap2it]/aetv.jpg
 AMC                 [zap2it]/amc.gif
@@ -14,6 +15,7 @@
 CARTOONNETWORK      [zap2it]/toon.gif
 CBC                 [zap2it2]/cbc.gif
 CBS                 [zap2it]/cbs.jpg
+CBS-WKMG            [lyngsat-logo]/ww/wkmg_orlando.jpg
 CINEMAX             [zap2it]/max.jpg
 CMTV                [zap2it]/cmtv.gif
 CNBC                [zap2it]/cnbc.jpg
@@ -23,6 +25,11 @@
 COURT               [zap2it]/court.jpg
 CSPAN               [zap2it]/cspan.jpg
 CSPAN2              [zap2it]/cspan2.jpg
+CW-KTLA             [lyngsat-logo]/kk/ktla.jpg
+CW-KWGN             [lyngsat-logo]/kk/kwgn_cw2_denver.jpg
+CW-WGN              [lyngsat-logo]/ww/wgn_cw9_chicago.jpg
+CW-WKCF             [lyngsat-logo]/ww/wkcf_cw18_clermont.jpg
+CW-WPIX             [lyngsat-logo]/ww/wpix_cw11_new_york.jpg
 DISCOVERY           [zap2it]/dsc.jpg
 DISCOVERYHD         [lyngsat]/dd/discovery_hd.gif
 DISNEY              [zap2it]/disn.jpg
@@ -39,6 +46,7 @@
 FLIX                [zap2it2]/flix.jpg
 FOOD                [zap2it]/food.jpg
 FOX                 [zap2it]/fox.jpg
+FOX-WOFL            [lyngsat-logo]/ww/wofl_fox35_orlando.jpg
 FOXMOVIE            [lyngsat]/ff/fox_moviechannel.gif
 FOXNEWS             [zap2it]/fnc.gif
 FOXSPORTS           [zap2it]/foxsports.jpg
@@ -60,6 +68,11 @@
 HOMESHOPPINGNETWORK [zap2it]/hsn.jpg
 IFC                 [lyngsat]/ii/ifc_us.gif
 INHD                [lyngsat]/ii/inhd.gif
+IND-WSBK            [lyngsat-logo]/ww/wsbk_tv38_boston.jpg
+IND-WACX            [lyngsat-logo]/ww/wacx_tv55_orlando.jpg
+IND-WLCB            [lyngsat-logo]/ww/wlcb_45_leesburg.jpg
+IND-WRDQ            [lyngsat-logo]/ww/wrdq_action27_orlando.jpg
+IND-WTGL            [lyngsat-logo]/ww/wtgl_52_cocoa.jpg
 IPLEX               [lyngsat]/ee/encore_indieplex.gif
 KMEX                [zap2it]/uni.gif
 KONG                [lyngsat]/kk/kong6_16_seattle.gif
@@ -69,8 +82,11 @@
 MSNBC               [zap2it]/msnbc.jpg
 MTV                 [zap2it]/mtv.jpg
 MTV2                [zap2it]/mtv2.gif
+MYTV-WRBW           [lyngsat-logo]/ww/wrbw_my65_orlando.jpg
+MYTV-WWOR           [lyngsat-logo]/ww/wwor_my9_secaucus.jpg
 NASA                [lyngsat]/nn/nasatv_us.gif
 NBC                 [zap2it]/nbc.jpg
+NBC-WESH            [lyngsat-logo]/ww/wesh_nbc2_daytona_beach.jpg
 NEWSENG             [zap2it]/necn.gif
 NFL                 [lyngsat]/nn/nfl.gif
 NICKELODEON         [zap2it]/nik.jpg
@@ -78,6 +94,7 @@
 OLN                 [zap2it]/oln.gif
 OXYGEN              [lyngsat]/oo/oxygen.gif
 PAX                 [zap2it]/pax.jpg
+PAX-WOPX            [lyngsat-logo]/ww/wopx_pax56_orlando.jpg
 PAXSAT              [zap2it]/pax.jpg
 PBS                 [zap2it]/pbs.jpg
 PBS-KAET            [pbs]/KAET.gif