diff --git a/sites/tvpassport.com/tvpassport.com.channels.xml b/sites/tvpassport.com/tvpassport.com.channels.xml
index ed45cc0a..07682b4c 100644
--- a/sites/tvpassport.com/tvpassport.com.channels.xml
+++ b/sites/tvpassport.com/tvpassport.com.channels.xml
@@ -33,6 +33,7 @@
     <channel lang="en" xmltv_id="BravoWest.us" site_id="bravo-usa-pacific-feed/1320">Bravo West</channel>
     <channel lang="en" xmltv_id="CarsTV.us" site_id="carstv-hd/18803">Cars.TV</channel>
     <channel lang="en" xmltv_id="CBATDT.ca" site_id="cbc-cbat-fredericton-nb-hd/3942">CBC (CBAT) Fredericton, NB HD</channel>
+    <channel lang="en" xmltv_id="CBETDT.ca" site_id="cbc-cbet-windsor-on/132">CBC (CBET) Windsor, ON</channel>
     <channel lang="en" xmltv_id="CBHTDT.ca" site_id="cbc-cbht-halifax-ns/121">CBC (CBHT) Halifax, NS</channel>
     <channel lang="en" xmltv_id="CBLTDT.ca" site_id="cbc-cblt-toronto-on/34">CBC (CBLT) Toronto, ON</channel>
     <channel lang="en" xmltv_id="CBMTDT.ca" site_id="cbc-cbmt-montreal-qc/107">CBC (CBMT) Montreal, QC</channel>
@@ -61,8 +62,6 @@
     <channel lang="en" xmltv_id="FreeformWest.us" site_id="freeform-pacific-feed/1197">Freeform West</channel>
     <channel lang="en" xmltv_id="FXWest.us" site_id="fx-networks-west-coast/1449">FX West</channel>
     <channel lang="en" xmltv_id="FXXWest.us" site_id="fxx-usa-pacific/19080">FXX West</channel>
-    <channel lang="en" xmltv_id="KFJXDT1.us" site_id="fox-kfjx-pittsburg-ks/2426">FOX (KFJX) Pittsburg, KS</channel>
-    <channel lang="en" xmltv_id="KFNBDT1.us" site_id="fox-kfnb-casper-wy/9916">FOX (KFNB) Casper, WY</channel>
     <channel lang="en" xmltv_id="HBOCanada1.ca" site_id="hbo1/84">HBO Canada 1</channel>
     <channel lang="en" xmltv_id="HBOCanada2.ca" site_id="hbo-2-eastern-feed-hd/6313">HBO Canada 2</channel>
     <channel lang="en" xmltv_id="HBOComedyWest.us" site_id="hbo-comedy-pacific/2593">HBO Comedy West</channel>
@@ -80,12 +79,21 @@
     <channel lang="en" xmltv_id="KCOPDT1.us" site_id="mnt-kcop-los-angeles-ca/1811">KCOP (KCOP) Los Angeles, CA</channel>
     <channel lang="en" xmltv_id="KDVRDT1.us" site_id="fox-kdvr-denver-co/1572">FOX (KDVR) Denver, CO</channel>
     <channel lang="en" xmltv_id="KDLTDT2.us" site_id="fox-kdlt2-odlt-sioux-falls-sd/1063">FOX (KDLT-DT2) Sioux Falls, SD</channel>
-	<channel lang="en" xmltv_id="KECIDT1.us" site_id="nbc-keci-missoula-mt/5053">NBC (KECI-TV) Missoula, MT</channel>
-	<channel lang="en" xmltv_id="KGANDT2.us" site_id="fox-kgan2-cedar-rapids-ia/18542">FOX (KGAN-DT2) Cedar Rapids, IA</channel>
-	<channel lang="en" xmltv_id="KHONDT2.us" site_id="cw-khondt2-honolulu-hi/5892">CW (KHON-DT2) Honolulu, HI</channel>
+    <channel lang="en" xmltv_id="KECIDT1.us" site_id="nbc-keci-missoula-mt/5053">NBC (KECI-TV) Missoula, MT</channel>
+    <channel lang="en" xmltv_id="KFJXDT1.us" site_id="fox-kfjx-pittsburg-ks/2426">FOX (KFJX) Pittsburg, KS</channel>
+    <channel lang="en" xmltv_id="KFNBDT1.us" site_id="fox-kfnb-casper-wy/9916">FOX (KFNB) Casper, WY</channel>
+    <channel lang="en" xmltv_id="KGANDT2.us" site_id="fox-kgan2-cedar-rapids-ia/18542">FOX (KGAN-DT2) Cedar Rapids, IA</channel>
+    <channel lang="en" xmltv_id="KGODT1.us" site_id="abc-kgo-san-francisco-ca/2148">ABC (KGO) San Francisco, CA</channel>
+    <channel lang="en" xmltv_id="KHONDT2.us" site_id="cw-khondt2-honolulu-hi/5892">CW (KHON-DT2) Honolulu, HI</channel>
     <channel lang="en" xmltv_id="KNBCDT1.us" site_id="nbc-knbc-los-angeles-ca/2588">NBC (KNBC) Los Angeles, CA</channel>
+    <channel lang="en" xmltv_id="KNTVDT1.us" site_id="nbc-kntv-san-francisco-ca/3262">NBC (KNTV) San Francisco, CA</channel>
+    <channel lang="en" xmltv_id="KNXVDT1.us" site_id="abc-knxv-phoenix-az/1178">ABC (KNXV) Phoenix, AZ</channel>
     <channel lang="en" xmltv_id="KPAXDT1.us" site_id="cbs-kpax-missoula-mt/4976">CBS (KPAX-TV) Missoula, MT</channel>
     <channel lang="en" xmltv_id="KPAXDT2.us" site_id="cw-kpaxtv2-missoula-mt/8949">CW (KPAX-DT2) Missoula, MT</channel>
+    <channel lang="en" xmltv_id="KPHODT1.us" site_id="cbs-kpho-phoenix-az/1179">CBS (KPHO) Phoenix, AZ</channel>
+    <channel lang="en" xmltv_id="KPIXDT1.us" site_id="cbs-kpix-san-francisco-ca/2203">CBS (KPIX) San Francisco, CA</channel>
+    <channel lang="en" xmltv_id="KPNXDT1.us" site_id="nbc-kpnx-phoenix-az/1186">NBC (KPNX) Phoenix, AZ</channel>
+    <channel lang="en" xmltv_id="KSAZDT1.us" site_id="fox-ksaz-phoenix-az/1185">FOX (KSAZ) Phoenix, AZ</channel>
     <channel lang="en" xmltv_id="KTLADT1.us" site_id="ktla-los-angeles-ca/90">KTLA 5 (KTLA) Los Angeles, CA</channel>
     <channel lang="en" xmltv_id="KTMFDT1.us" site_id="abc-ktmf-missoula-mt/4940">ABC (KTMF) Missoula, MT</channel>
     <channel lang="en" xmltv_id="KTMFDT2.us" site_id="fox-ktmf2-missoula-mt/8933">FOX (KTMF-DT2) Missoula, MT</channel>
@@ -93,6 +101,7 @@
     <channel lang="en" xmltv_id="KTTVDT1.us" site_id="fox-kttv-los-angeles-ca/1949">FOX (KTTV) Los Angeles, CA</channel>
     <channel lang="en" xmltv_id="KTVDDT1.us" site_id="mnt-ktvd-denver-co/1565">MNT (KTVD) Denver, CO</channel>
     <channel lang="en" xmltv_id="KTVQDT2.us" site_id="cw-ktvq2-billings-mt/8943">CW (KTVQ-DT2) Billings, MT</channel>
+    <channel lang="en" xmltv_id="KTVUDT1.us" site_id="fox-ktvu-san-francisco-ca/2145">FOX (KTVU) San Francisco, CA</channel>
     <channel lang="en" xmltv_id="KUFMDT1.us" site_id="pbs-kufm-missoula-mt/13228">PBS (KUFM-TV) Missoula, MT</channel>
     <channel lang="en" xmltv_id="KXDFCD1.us" site_id="cbs-k13xd-fairbanks-ak/4960">CBS (KXDF-CD) Fairbanks, AK</channel>
     <channel lang="en" xmltv_id="KYAZDT2.us" site_id="metv-plus-kyazdt2-houston-tx/15499">MeTV Plus (KYAZ-DT2) Houston TX</channel>
@@ -104,8 +113,8 @@
     <channel lang="en" xmltv_id="MSG.us" site_id="msg-madison-square-gardens-hd/4695">MSG</channel>
     <channel lang="en" xmltv_id="News12Conneticut.us" site_id="news-12-connecticut/20178">News12 Conneticut</channel>
     <channel lang="en" xmltv_id="News12LongIsland.us" site_id="news-12-long-island/20180">News12 Long Island</channel>
-	<channel lang="en" xmltv_id="NHLNetwork.us" site_id="nhl-network-usa/14156">NHL Network</channel>
-	<channel lang="en" xmltv_id="OuterMaxEast.us" site_id="outermax-eastern/2270">OuterMax Eastern</channel>
+    <channel lang="en" xmltv_id="NHLNetwork.us" site_id="nhl-network-usa/14156">NHL Network</channel>
+    <channel lang="en" xmltv_id="OuterMaxEast.us" site_id="outermax-eastern/2270">OuterMax Eastern</channel>
     <channel lang="en" xmltv_id="RetroPlexEast.us" site_id="retroplex-eastern/2342">RetroPlex East</channel>
     <channel lang="en" xmltv_id="RetroPlexWest.us" site_id="retroplex-pacific/2343">RetroPlex West</channel>
     <channel lang="en" xmltv_id="ScreenPix.us" site_id="screenpix/34659">ScreenPix</channel>
@@ -152,6 +161,7 @@
     <channel lang="en" xmltv_id="WABCDT2.us" site_id="localish-wabcdt2-new-york-ny/10497">Localish (WABC-DT2) New York, NY</channel>
     <channel lang="en" xmltv_id="WABCDT3.us" site_id="this-wabctv3-new-york-ny/11049">THIS (WABC-TV3) New York, NY</channel>
     <channel lang="en" xmltv_id="WABCDT4.us" site_id="hsn-wabctv4-new-york-ny/36168">HSN (WABC-TV4) New York, NY</channel>
+    <channel lang="en" xmltv_id="WADLDT1.us" site_id="wadl-tv-detroit-mi/10217">MNT (WADL) Mount Clemens, MI</channel>
     <channel lang="en" xmltv_id="WBBZDT1.us" site_id="metv-wbbz-buffalo-ny/9936">Independent (WBBZ-TV) Springville, NY</channel>
     <channel lang="en" xmltv_id="WBGUDT1.us" site_id="pbs-wbgu-bowling-green-oh/3025">PBS (WBGU-TV) Bowling Green, OH</channel>
     <channel lang="en" xmltv_id="WBKPDT1.us" site_id="cw-wbkp-calumet-mi/4943">CW (WBKP) Calumet, MI</channel>
@@ -161,16 +171,16 @@
     <channel lang="en" xmltv_id="WCBSDT1.us" site_id="cbs-wcbs-new-york-ny/1766">CBS (WCBS) New York, NY</channel>
     <channel lang="en" xmltv_id="WCBSDT2.us" site_id="start-tv-wcbstv2-new-york-ny/11045">Start TV (WCBS-TV2) New York, NY</channel>
     <channel lang="en" xmltv_id="WCBSDT3.us" site_id="dabl-wcbstv3-new-york-ny/34131">DABL (WCBS-TV3) New York, NY</channel>
-	<channel lang="en" xmltv_id="WCSCDT1.us" site_id="cbs-wcsc-charleston-sc/1092">CBS (WCSC) Charleston, SC</channel>
-	<channel lang="en" xmltv_id="WCIUDT5.us" site_id="story-wciutv5-chicago-il/11342">Story (WCIU-DT5) Chicago, IL</channel>
+    <channel lang="en" xmltv_id="WCSCDT1.us" site_id="cbs-wcsc-charleston-sc/1092">CBS (WCSC) Charleston, SC</channel>
+    <channel lang="en" xmltv_id="WCIUDT5.us" site_id="story-wciutv5-chicago-il/11342">Story (WCIU-DT5) Chicago, IL</channel>
     <channel lang="en" xmltv_id="WCMUDT1.us" site_id="pbs-wcmu-mt-pleasant-mi/9304">PBS (WCMU-TV) Mount Pleasant, MI</channel>
     <channel lang="en" xmltv_id="WDCQDT1.us" site_id="pbs-wdcq-flint-mi/9042">PBS (WDCQ-TV) Bad Axe, MI</channel>
     <channel lang="en" xmltv_id="WDVBCD1.us" site_id="the-country-network-wdvb-edison-nj/11067">The Country Network (WDVB) Edison, NJ</channel>
     <channel lang="en" xmltv_id="WDVBCD2.us" site_id="sstn-wdvbcd2-edison-nj/11068">SSTN (WDVB-CD2) Edison, NJ</channel>
     <channel lang="en" xmltv_id="WEDWDT1.us" site_id="connecticut-public-television-wedw-bridgeport/2065">Connecticut Public Television (WEDW) Bridgeport</channel>
     <channel lang="en" xmltv_id="WEDWDT3.us" site_id="cptv-spirit-wedwdt3-bridgeport-ct/11910">CPTV Spirit (WEDW-DT3) Bridgeport, CT</channel>
-	<channel lang="en" xmltv_id="WEVVDT2.us" site_id="fox-wevv2-evansville-in-hd/9720">FOX (WEVV) Evansville, IN</channel>
-	<channel lang="en" xmltv_id="WEYIDT1.us" site_id="nbc-weyi-flint-mi/5136">NBC (WEYI-TV) Saginaw, MI</channel>
+    <channel lang="en" xmltv_id="WEVVDT2.us" site_id="fox-wevv2-evansville-in-hd/9720">FOX (WEVV) Evansville, IN</channel>
+    <channel lang="en" xmltv_id="WEYIDT1.us" site_id="nbc-weyi-flint-mi/5136">NBC (WEYI-TV) Saginaw, MI</channel>
     <channel lang="en" xmltv_id="WFQXDT1.us" site_id="fox-wfqx-traverse-citycadillac-mi/483">FOX (WFQX-TV) Cadillac, MI</channel>
     <channel lang="en" xmltv_id="WFQXDT2.us" site_id="cw-wfqxtv2-traverse-citycadillac-mi/31612">CW (WFQX-DT2) Cadillac, MI</channel>
     <channel lang="en" xmltv_id="WFTYDT1.us" site_id="unimas-wfty-smithtown-ny/1961">UniMás (WFTY) Smithtown, NY</channel>
@@ -180,6 +190,8 @@
     <channel lang="en" xmltv_id="WFUTDT4.us" site_id="ion-mystery-wfutdt4-newark-nj/16471">ION Mystery (WFUT-DT4) Newark, NJ</channel>
     <channel lang="en" xmltv_id="WGTUDT1.us" site_id="abc-wgtu-traverse-city-mi/1260">ABC (WGTU) Traverse City, MI</channel>
     <channel lang="en" xmltv_id="WGVUDT1.us" site_id="pbs-wgvu-grand-rapids-mi/1919">PBS (WGVU-TV) Grand Rapids, MI</channel>
+    <channel lang="en" xmltv_id="WHNELD9.us" site_id="newsnet-whneld9-flint-mi/35849">NewsNet (WHNE-LD9) Detroit, MI</channel>
+    <channel lang="en" xmltv_id="WJACDT4.us" site_id="cw-wjactv4-johnstown-pa/15113">CW+ (WJAC-TV4) Johnstown, PA</channel>
     <channel lang="en" xmltv_id="WJLPDT2.us" site_id="laff-wjlp2-new-jersey/15178">Laff (WJLP2) New Jersey</channel>
     <channel lang="en" xmltv_id="WJLPDT3.us" site_id="grit-tv-wjlp3-new-jerseynew-york/20040">Grit TV (WJLP3) New Jersey/New York</channel>
     <channel lang="en" xmltv_id="WJLPDT4.us" site_id="ion-mystery-wjlp4-new-jerseynew-york/20041">ION Mystery (WJLP4) New Jersey/New York</channel>
@@ -210,6 +222,7 @@
     <channel lang="en" xmltv_id="WMBQCD1.us" site_id="biztv-wmbqcd-new-york-ny/16459">Biz-TV (WMBQ-CD) New York, NY</channel>
     <channel lang="en" xmltv_id="WMBQCD2.us" site_id="hope-channel-wmbqcd2-new-york-ny/16460">Hope Channel (WMBQ-CD2) New York, NY</channel>
     <channel lang="en" xmltv_id="WMEUCD1.us" site_id="the-u-wmeucd-chicago-il/12512">The U (WMEU-CD) Chicago, IL</channel>
+    <channel lang="en" xmltv_id="WMYDDT1.us" site_id="mnt-wmyd-detroit-mi/269">Independent (WMYD) Detroit, MI</channel>
     <channel lang="en" xmltv_id="WNBCDT1.us" site_id="nbc-wnbc-new-york-ny/1767">NBC (WNBC) New York, NY</channel>
     <channel lang="en" xmltv_id="WNBCDT2.us" site_id="cozi-wnbcdt2-new-york-ny/10919">Cozi (WNBC-DT2) New York, NY</channel>
     <channel lang="en" xmltv_id="WNDTCD1.us" site_id="fnx-wndtcd-manhattan-ny/34515">FNX (WNDT-CD) Manhattan, NY</channel>
@@ -263,8 +276,8 @@
     <channel lang="en" xmltv_id="WRNNDT3.us" site_id="canal-de-la-fe-wrnndt3-new-york-ny/11091">Canal de La Fe (WRNN-DT3) New York, NY</channel>
     <channel lang="en" xmltv_id="WRNNDT4.us" site_id="qvc2-wrnntv4-new-york-ny/11092">QVC2 (WRNN-TV4) New York, NY</channel>
     <channel lang="en" xmltv_id="WSMHDT1.us" site_id="fox-wsmh-flint-mi/5047">FOX (WSMH) Flint, MI</channel>
-	<channel lang="en" xmltv_id="WTATDT1.us" site_id="fox-wtat-charleston-sc/1097">FOX (WTAT) Charleston, SC</channel>
-	<channel lang="en" xmltv_id="WTBYDT1.us" site_id="tbn-wtby-new-york-ny/2575">TBN (WTBY) New York, NY</channel>
+    <channel lang="en" xmltv_id="WTATDT1.us" site_id="fox-wtat-charleston-sc/1097">FOX (WTAT) Charleston, SC</channel>
+    <channel lang="en" xmltv_id="WTBYDT1.us" site_id="tbn-wtby-new-york-ny/2575">TBN (WTBY) New York, NY</channel>
     <channel lang="en" xmltv_id="WTBYDT2.us" site_id="smile-wtbytv2-new-york-ny/11093">Smile (WTBY-TV2) New York, NY</channel>
     <channel lang="en" xmltv_id="WTBYDT4.us" site_id="positiv-wtbytv4-new-york-ny/11095">PosiTiV (WTBY-TV4) New York, NY</channel>
     <channel lang="en" xmltv_id="WTNHDT1.us" site_id="abc-wtnh-sd-new-haven-ct/17476">ABC (WTNH) SD New Haven, CT</channel>
@@ -305,14 +318,5 @@
     <channel lang="es" xmltv_id="WTBYDT3.us" site_id="enlace-wtbytv3-new-york-ny/11094">Enlace (WTBY-TV3) New York, NY</channel>
     <channel lang="es" xmltv_id="WXNYLD3.us" site_id="cgtn-spanish-wxnyld3-new-york-ny/16444">CGTN Spanish (WXNY-LD3) New York, NY</channel>
     <channel lang="es" xmltv_id="WXTVDT1.us" site_id="uni-wxtv-teaneck-nj/1771">UNI (WXTV) Teaneck, NJ</channel>
-    <channel lang="en" xmltv_id="WJACDT4.us" site_id="cw-wjactv4-johnstown-pa/15113">CW+ (WJAC-TV4) Johnstown, PA</channel>
-    <channel lang="en" xmltv_id="KTVUDT1.us" site_id="fox-ktvu-san-francisco-ca/2145">FOX (KTVU) San Francisco, CA</channel>
-    <channel lang="en" xmltv_id="KPIXDT1.us" site_id="cbs-kpix-san-francisco-ca/2203">CBS (KPIX) San Francisco, CA</channel>
-    <channel lang="en" xmltv_id="KGODT1.us" site_id="abc-kgo-san-francisco-ca/2148">ABC (KGO) San Francisco, CA</channel>
-    <channel lang="en" xmltv_id="KNTVDT1.us" site_id="nbc-kntv-san-francisco-ca/3262">NBC (KNTV) San Francisco, CA</channel>
-    <channel lang="en" xmltv_id="KSAZDT1.us" site_id="fox-ksaz-phoenix-az/1185">FOX (KSAZ) Phoenix, AZ</channel>
-    <channel lang="en" xmltv_id="KPHODT1.us" site_id="cbs-kpho-phoenix-az/1179">CBS (KPHO) Phoenix, AZ</channel>
-    <channel lang="en" xmltv_id="KNXVDT1.us" site_id="abc-knxv-phoenix-az/1178">ABC (KNXV) Phoenix, AZ</channel>
-    <channel lang="en" xmltv_id="KPNXDT1.us" site_id="nbc-kpnx-phoenix-az/1186">NBC (KPNX) Phoenix, AZ</channel>
   </channels>
 </site>