Merge branch 'master' of https://github.com/nickleby/epg

2022-08-26 13:13:19 -04:00
parent f8c34ba32a 59980ed779
commit c39735afd4
206 changed files with 1180 additions and 856 deletions
--- a/sites/allente.se/allente.se.config.js
+++ b/sites/allente.se/allente.se.config.js
@@ -20,6 +20,8 @@ module.exports = {
        category: item.details.categories,
        description: item.details.description,
        icon: item.details.image,
+        season: parseSeason(item),
+        episode: parseEpisode(item),
        start,
        stop
      })
@@ -51,3 +53,10 @@ function parseItems(content, channel) {

  return channelData && Array.isArray(channelData.events) ? channelData.events : []
 }
+
+function parseSeason(item) {
+    return item.details.season || null
+}
+function parseEpisode(item) {
+    return item.details.episode || null
+}
--- a/sites/allente.se/allente.se.test.js
+++ b/sites/allente.se/allente.se.test.js
@@ -2,7 +2,7 @@
 // node ./scripts/channels.js --config=./sites/allente.se/allente.se.config.js --output=./sites/allente.se/allente.se_fi.channels.xml --set=country:fi --set=lang:fi
 // node ./scripts/channels.js --config=./sites/allente.se/allente.se.config.js --output=./sites/allente.se/allente.se_no.channels.xml --set=country:no --set=lang:no
 // node ./scripts/channels.js --config=./sites/allente.se/allente.se.config.js --output=./sites/allente.se/allente.se_dk.channels.xml --set=country:dk --set=lang:da
-// npx epg-grabber --config=sites/allente.se/allente.se.config.js --channels=sites/allente.se/allente.se_se.channels.xml --output=.gh-pages/guides/se/allente.se.epg.xml --days=2
+// npx epg-grabber --config=sites/allente.se/allente.se.config.js --channels=sites/allente.se/allente.se_se.channels.xml --output=guide.xml --days=2

 const { parser, url } = require('./allente.se.config.js')
 const dayjs = require('dayjs')
@@ -29,7 +29,7 @@ it('can generate valid url for different country', () => {
 })

 it('can parse response', () => {
-  const content = `{"channels":[{"id":"0148","icon":"//images.ctfassets.net/989y85n5kcxs/5uT9g9pdQWRZeDPQXVI9g6/e02f550a32e259b9be8081e83dc64948/svt_1_logotyp_rgb_0.png","name":"SVT1 HD (T)","events":[{"id":"0086202111170415","live":false,"time":"2021-11-17T04:15:00Z","title":"Go'kväll","details":{"title":"Go'kväll","image":"https://viasatps.api.comspace.se/PS/channeldate/image/viasat.ps/21/2021-11-16/se.cs.svt1.event.A_40938191100.jpg?size=2560x1440","description":"Svenskt magasin från 2021. Dockspelare och hundar. Intervju med dockspelarna Björn Carlberg och Petter Lennstrand, personerna bakom tv-favoriter som Allram Eest och Klotty. Nu är de aktuella med turné och en ny dockföreställning. Sofia Åhman ger nya inspirerande träningstips och hundinstruktören Helena Tilly svarar på tittarnas frågor om hundar. Reportageserien \\"Sju sorters kakor\\" fortsätter.","season":2021,"episode":121,"categories":["other"],"duration":"45"}}]}]}`
+  const content = `{"channels":[{"id":"0148","icon":"//images.ctfassets.net/989y85n5kcxs/5uT9g9pdQWRZeDPQXVI9g6/9cc44da567f591822ed645c99ecdcb64/SVT_1_black_new__2_.png","name":"SVT1 HD (T)","events":[{"id":"0086202208220710","live":false,"time":"2022-08-22T07:10:00Z","title":"Hemmagympa med Sofia","details":{"title":"Hemmagympa med Sofia","image":"https://viasatps.api.comspace.se/PS/channeldate/image/viasat.ps/21/2022-08-22/se.cs.svt1.event.A_41214031600.jpg?size=2560x1440","description":"Svenskt träningsprogram från 2021. Styrka. Sofia Åhman leder SVT:s hemmagympapass. Denna gång fokuserar vi på styrka.","season":4,"episode":1,"categories":["other"],"duration":"20"}}]}]}`
  const result = parser({ content, channel }).map(p => {
    p.start = p.start.toJSON()
    p.stop = p.stop.toJSON()
@@ -38,12 +38,14 @@ it('can parse response', () => {

  expect(result).toMatchObject([
    {
-      start: '2021-11-17T04:15:00.000Z',
-      stop: '2021-11-17T05:00:00.000Z',
-      title: `Go'kväll`,
+      start: '2022-08-22T07:10:00.000Z',
+      stop: '2022-08-22T07:30:00.000Z',
+      title: `Hemmagympa med Sofia`,
      category: ['other'],
-      description: `Svenskt magasin från 2021. Dockspelare och hundar. Intervju med dockspelarna Björn Carlberg och Petter Lennstrand, personerna bakom tv-favoriter som Allram Eest och Klotty. Nu är de aktuella med turné och en ny dockföreställning. Sofia Åhman ger nya inspirerande träningstips och hundinstruktören Helena Tilly svarar på tittarnas frågor om hundar. Reportageserien \"Sju sorters kakor\" fortsätter.`,
-      icon: 'https://viasatps.api.comspace.se/PS/channeldate/image/viasat.ps/21/2021-11-16/se.cs.svt1.event.A_40938191100.jpg?size=2560x1440'
+      description: `Svenskt träningsprogram från 2021. Styrka. Sofia Åhman leder SVT:s hemmagympapass. Denna gång fokuserar vi på styrka.`,
+      icon: 'https://viasatps.api.comspace.se/PS/channeldate/image/viasat.ps/21/2022-08-22/se.cs.svt1.event.A_41214031600.jpg?size=2560x1440',
+      season: 4,
+      episode: 1
    }
  ])
 })
--- a/sites/allente.se/allente.se_se.channels.xml
+++ b/sites/allente.se/allente.se_se.channels.xml
@@ -68,6 +68,8 @@
    <channel lang="sv" xmltv_id="NRK2.no" site_id="se#0288">NRK2</channel>
    <channel lang="sv" xmltv_id="NRK3.no" site_id="se#0289">NRK3</channel>
    <channel lang="sv" xmltv_id="ParamountNetworkSweden.se" site_id="se#0034">Paramount Network</channel>
+    <channel lang="sv" xmltv_id="ParamountPlusMovies.se" site_id="se#1001">Paramount+ Movies</channel>
+    <channel lang="sv" xmltv_id="ParamountPlusSeries.se" site_id="se#1002">Paramount+ Series</channel>
    <channel lang="sv" xmltv_id="SFkanalen.se" site_id="se#972">SF-kanalen</channel>
    <channel lang="sv" xmltv_id="Sjuan.se" site_id="se#0232">Sjuan</channel>
    <channel lang="sv" xmltv_id="SkyNewsInternational.uk" site_id="se#596">Sky News International</channel>
--- a/sites/andorradifusio.ad/andorradifusio.ad.test.js
+++ b/sites/andorradifusio.ad/andorradifusio.ad.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/andorradifusio.ad/andorradifusio.ad.config.js --channels=sites/andorradifusio.ad/andorradifusio.ad_ad.channels.xml --output=.gh-pages/guides/ad/andorradifusio.ad.epg.xml --days=2
+// npx epg-grabber --config=sites/andorradifusio.ad/andorradifusio.ad.config.js --channels=sites/andorradifusio.ad/andorradifusio.ad_ad.channels.xml --output=guide.xml --days=2

 const { parser, url } = require('./andorradifusio.ad.config.js')
 const dayjs = require('dayjs')
--- a/sites/beinsports.com/beinsports.com_qa-en.channels.xml
+++ b/sites/beinsports.com/beinsports.com_qa-en.channels.xml
@@ -11,13 +11,14 @@
    <channel lang="en" xmltv_id="beINSports7.qa" site_id="#8">BeIn Sports 7</channel>
    <channel lang="en" xmltv_id="beINSportsPremium3.qa" site_id="#9">BeIn Sports Premium 3</channel>
    <channel lang="en" xmltv_id="beINSportsXtra1.qa" site_id="#10">BeIn Sports Xtra 1</channel>
-    <channel lang="en" xmltv_id="beIN4K.qa" site_id="#11">BeIn 4K</channel>
-    <channel lang="en" xmltv_id="beINSportsNBA.qa" site_id="#12">BeIn NBA</channel>
-    <channel lang="en" xmltv_id="beINSportsEnglish1.qa" site_id="#13">BeIn Sports English 1</channel>
-    <channel lang="en" xmltv_id="beINSportsEnglish2.qa" site_id="#14">BeIn Sports English 2</channel>
-    <channel lang="en" xmltv_id="beINSportsEnglish3.qa" site_id="#15">BeIn Sports English 3</channel>
-    <channel lang="en" xmltv_id="beINSportsFrench1.qa" site_id="#16">BeIn Sports French 1</channel>
-    <channel lang="en" xmltv_id="beINSportsFrench2.qa" site_id="#17">BeIn Sports French 2</channel>
-    <channel lang="en" xmltv_id="beINSportsFrench3.qa" site_id="#18">BeIn Sports French 3</channel>
+    <channel lang="en" xmltv_id="beINSportsXtra2.qa" site_id="#11">BeIn Sports Xtra 2</channel>
+    <channel lang="en" xmltv_id="beIN4K.qa" site_id="#12">BeIn 4K</channel>
+    <channel lang="en" xmltv_id="beINSportsNBA.qa" site_id="#13">BeIn NBA</channel>
+    <channel lang="en" xmltv_id="beINSportsEnglish1.qa" site_id="#14">BeIn Sports English 1</channel>
+    <channel lang="en" xmltv_id="beINSportsEnglish2.qa" site_id="#15">BeIn Sports English 2</channel>
+    <channel lang="en" xmltv_id="beINSportsEnglish3.qa" site_id="#16">BeIn Sports English 3</channel>
+    <channel lang="en" xmltv_id="beINSportsFrench1.qa" site_id="#17">BeIn Sports French 1</channel>
+    <channel lang="en" xmltv_id="beINSportsFrench2.qa" site_id="#18">BeIn Sports French 2</channel>
+    <channel lang="en" xmltv_id="beINSportsFrench3.qa" site_id="#19">BeIn Sports French 3</channel>
  </channels>
-</site>
+</site>
--- a/sites/canalplus-caraibes.com/canalplus-caraibes.com.test.js
+++ b/sites/canalplus-caraibes.com/canalplus-caraibes.com.test.js
@@ -1,5 +1,5 @@
 // [Geo-blocked] node ./scripts/channels.js --config=./sites/canalplus-caraibes.com/canalplus-caraibes.com.config.js --output=./sites/canalplus-caraibes.com/canalplus-caraibes.com_bl.channels.xml --set=country:bl
-// npx epg-grabber --config=sites/canalplus-caraibes.com/canalplus-caraibes.com.config.js --channels=sites/canalplus-caraibes.com/canalplus-caraibes.com_bl.channels.xml --output=.gh-pages/guides/bl/canalplus-caraibes.com.epg.xml --days=2
+// npx epg-grabber --config=sites/canalplus-caraibes.com/canalplus-caraibes.com.config.js --channels=sites/canalplus-caraibes.com/canalplus-caraibes.com_bl.channels.xml --output=guide.xml --days=2

 const { parser, url } = require('./canalplus-caraibes.com.config.js')
 const axios = require('axios')
@@ -30,13 +30,12 @@ it('can generate valid url for tomorrow', () => {
  )
 })

-
 it('can parse response', done => {
-    const content = `{"timeSlices":[{"contents":[{"title":"Rugby - Leinster / La Rochelle","subtitle":"Rugby","thirdTitle":"BEIN SPORTS 1 HD","startTime":1660815000,"endTime":1660816800,"onClick":{"displayTemplate":"miniDetail","displayName":"Rugby - Leinster / La Rochelle","URLPage":"https://service.canal-overseas.com/ott-frontend/vector/53001/event/140377765","URLVitrine":"https://service.canal-overseas.com/ott-frontend/vector/53001/program/224515801/recommendations"},"programID":224515801,"diffusionID":"140377765","URLImageDefault":"https://service.canal-overseas.com/image-api/v1/image/75fca4586fdc3458930dd1ab6fc2e643","URLImage":"https://service.canal-overseas.com/image-api/v1/image/7854e20fb6efecd398598653c57cc771"}],"timeSlice":"4"}]}`
-    axios.get.mockImplementation(url => {
-        if (url === 'https://service.canal-overseas.com/ott-frontend/vector/53001/event/140377765') {
-            return Promise.resolve({
-                data: JSON.parse(`{
+  const content = `{"timeSlices":[{"contents":[{"title":"Rugby - Leinster / La Rochelle","subtitle":"Rugby","thirdTitle":"BEIN SPORTS 1 HD","startTime":1660815000,"endTime":1660816800,"onClick":{"displayTemplate":"miniDetail","displayName":"Rugby - Leinster / La Rochelle","URLPage":"https://service.canal-overseas.com/ott-frontend/vector/53001/event/140377765","URLVitrine":"https://service.canal-overseas.com/ott-frontend/vector/53001/program/224515801/recommendations"},"programID":224515801,"diffusionID":"140377765","URLImageDefault":"https://service.canal-overseas.com/image-api/v1/image/75fca4586fdc3458930dd1ab6fc2e643","URLImage":"https://service.canal-overseas.com/image-api/v1/image/7854e20fb6efecd398598653c57cc771"}],"timeSlice":"4"}]}`
+  axios.get.mockImplementation(url => {
+    if (url === 'https://service.canal-overseas.com/ott-frontend/vector/53001/event/140377765') {
+      return Promise.resolve({
+        data: JSON.parse(`{
                    "currentPage": {
                    "displayName": "Rugby - Leinster / La Rochelle",
                    "displayTemplate": "detailPage",
@@ -94,42 +93,43 @@ it('can parse response', done => {
                    ]
                    }
                    }`)
-            })
-        } else {
-            return Promise.resolve({ data: '' })
+      })
+    } else {
+      return Promise.resolve({ data: '' })
+    }
+  })
+
+  parser({ content })
+    .then(result => {
+      result = result.map(p => {
+        p.start = p.start.toJSON()
+        p.stop = p.stop.toJSON()
+        return p
+      })
+
+      expect(result).toMatchObject([
+        {
+          start: '2022-08-18T09:30:00.000Z',
+          stop: '2022-08-18T10:00:00.000Z',
+          title: 'Rugby - Leinster / La Rochelle',
+          icon: 'https://service.canal-overseas.com/image-api/v1/image/7854e20fb6efecd398598653c57cc771',
+          category: 'Rugby',
+          description:
+            "Retransmission d'un match de Champions Cup de rugby à XV. L'European Rugby Champions Cup est une compétition annuelle interclubs de rugby à XV disputée par les meilleures équipes en Europe. Jusqu'en 2014, cette compétition s'appelait Heineken Cup, ou H Cup, et était sous l'égide de l'ERC, et depuis cette date l'EPRC lui a succédé. La première édition s'est déroulée en 1995."
        }
+      ])
+      done()
    })
-
-    parser({ content })
-        .then(result => {
-            result = result.map(p => {
-                p.start = p.start.toJSON()
-                p.stop = p.stop.toJSON()
-                return p
-            })
-
-            expect(result).toMatchObject([
-                {
-                    start: '2022-08-18T09:30:00.000Z',
-                    stop: '2022-08-18T10:00:00.000Z',
-                    title: 'Rugby - Leinster / La Rochelle',
-                    icon: 'https://service.canal-overseas.com/image-api/v1/image/7854e20fb6efecd398598653c57cc771',
-                    category: 'Rugby',
-                    description: 'Retransmission d\'un match de Champions Cup de rugby à XV. L\'European Rugby Champions Cup est une compétition annuelle interclubs de rugby à XV disputée par les meilleures équipes en Europe. Jusqu\'en 2014, cette compétition s\'appelait Heineken Cup, ou H Cup, et était sous l\'égide de l\'ERC, et depuis cette date l\'EPRC lui a succédé. La première édition s\'est déroulée en 1995.'
-                }
-            ])
-            done()
-        })
-        .catch(done)
+    .catch(done)
 })

 it('can handle empty guide', done => {
-    parser({
-        content: `{"currentPage":{"displayTemplate":"error","BOName":"Page introuvable"},"title":"Page introuvable","text":"La page que vous demandez est introuvable. Si le problème persiste, vous pouvez contacter l'assistance de CANAL+/CANALSAT.","code":404}`
+  parser({
+    content: `{"currentPage":{"displayTemplate":"error","BOName":"Page introuvable"},"title":"Page introuvable","text":"La page que vous demandez est introuvable. Si le problème persiste, vous pouvez contacter l'assistance de CANAL+/CANALSAT.","code":404}`
+  })
+    .then(result => {
+      expect(result).toMatchObject([])
+      done()
    })
-        .then(result => {
-            expect(result).toMatchObject([])
-            done()
-        })
-        .catch(done)
+    .catch(done)
 })
--- a/sites/canalplus-haiti.com/canalplus-haiti.com.test.js
+++ b/sites/canalplus-haiti.com/canalplus-haiti.com.test.js
@@ -1,5 +1,5 @@
 // [Geo-blocked] node ./scripts/channels.js --config=./sites/canalplus-haiti.com/canalplus-haiti.com.config.js --output=./sites/canalplus-haiti.com/canalplus-haiti.com_ht.channels.xml
-// npx epg-grabber --config=sites/canalplus-haiti.com/canalplus-haiti.com.config.js --channels=sites/canalplus-haiti.com/canalplus-haiti.com_ht.channels.xml --output=.gh-pages/guides/ht/canalplus-haiti.com.epg.xml --days=2
+// npx epg-grabber --config=sites/canalplus-haiti.com/canalplus-haiti.com.config.js --channels=sites/canalplus-haiti.com/canalplus-haiti.com_ht.channels.xml --output=guide.xml --days=2

 const { parser, url } = require('./canalplus-haiti.com.config.js')
 const axios = require('axios')
@@ -31,7 +31,7 @@ it('can generate valid url for tomorrow', () => {
 })

 it('can parse response', done => {
-    const content = `{
+  const content = `{
        "timeSlices": [
            {
                "contents": [
@@ -57,10 +57,10 @@ it('can parse response', done => {
            }
        ]
    }`
-    axios.get.mockImplementation(url => {
-        if (url === 'https://service.canal-overseas.com/ott-frontend/vector/53101/event/140952809') {
-            return Promise.resolve({
-                data: JSON.parse(`{
+  axios.get.mockImplementation(url => {
+    if (url === 'https://service.canal-overseas.com/ott-frontend/vector/53101/event/140952809') {
+      return Promise.resolve({
+        data: JSON.parse(`{
                    "currentPage": {
                    "displayName": "New Amsterdam - S3 - Ep7",
                    "displayTemplate": "detailPage",
@@ -133,42 +133,43 @@ it('can parse response', done => {
                    ]
                    }
                    }`)
-            })
-        } else {
-            return Promise.resolve({ data: '' })
+      })
+    } else {
+      return Promise.resolve({ data: '' })
+    }
+  })
+
+  parser({ content })
+    .then(result => {
+      result = result.map(p => {
+        p.start = p.start.toJSON()
+        p.stop = p.stop.toJSON()
+        return p
+      })
+
+      expect(result).toMatchObject([
+        {
+          start: '2022-08-17T23:55:00.000Z',
+          stop: '2022-08-18T00:40:00.000Z',
+          title: 'New Amsterdam - S3 - Ep7',
+          icon: 'https://service.canal-overseas.com/image-api/v1/image/52a18a209e28380b199201961c27097e',
+          category: 'Série Hôpital',
+          description:
+            "C'est la journée nationale de dépistage du VIH et Max offre des soins gratuits à tous les malades séropositifs qui se présentent à New Amsterdam."
        }
+      ])
+      done()
    })
-
-    parser({ content })
-        .then(result => {
-            result = result.map(p => {
-                p.start = p.start.toJSON()
-                p.stop = p.stop.toJSON()
-                return p
-            })
-
-            expect(result).toMatchObject([
-                {
-                    start: '2022-08-17T23:55:00.000Z',
-                    stop: '2022-08-18T00:40:00.000Z',
-                    title: 'New Amsterdam - S3 - Ep7',
-                    icon: 'https://service.canal-overseas.com/image-api/v1/image/52a18a209e28380b199201961c27097e',
-                    category: 'Série Hôpital',
-                    description: 'C\'est la journée nationale de dépistage du VIH et Max offre des soins gratuits à tous les malades séropositifs qui se présentent à New Amsterdam.'
-                }
-            ])
-            done()
-        })
-        .catch(done)
+    .catch(done)
 })

 it('can handle empty guide', done => {
-    parser({
-        content: `{"currentPage":{"displayTemplate":"error","BOName":"Page introuvable"},"title":"Page introuvable","text":"La page que vous demandez est introuvable. Si le problème persiste, vous pouvez contacter l'assistance de CANAL+/CANALSAT.","code":404}`
+  parser({
+    content: `{"currentPage":{"displayTemplate":"error","BOName":"Page introuvable"},"title":"Page introuvable","text":"La page que vous demandez est introuvable. Si le problème persiste, vous pouvez contacter l'assistance de CANAL+/CANALSAT.","code":404}`
+  })
+    .then(result => {
+      expect(result).toMatchObject([])
+      done()
    })
-        .then(result => {
-            expect(result).toMatchObject([])
-            done()
-        })
-        .catch(done)
+    .catch(done)
 })
--- a/sites/canalplus-reunion.com/canalplus-reunion.com.test.js
+++ b/sites/canalplus-reunion.com/canalplus-reunion.com.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/canalplus-reunion.com/canalplus-reunion.com.config.js --channels=sites/canalplus-reunion.com/canalplus-reunion.com_km.channels.xml --output=.gh-pages/guides/km/canalplus-reunion.com.epg.xml --days=2
+// npx epg-grabber --config=sites/canalplus-reunion.com/canalplus-reunion.com.config.js --channels=sites/canalplus-reunion.com/canalplus-reunion.com_km.channels.xml --output=guide.xml --days=2

 const { parser, url } = require('./canalplus-reunion.com.config.js')
 const axios = require('axios')
@@ -30,7 +30,7 @@ it('can generate valid url for tomorrow', () => {
 })

 it('can parse response', done => {
-    const content = `{
+  const content = `{
        "timeSlices": [
            {
                "contents": [
@@ -56,10 +56,10 @@ it('can parse response', done => {
            }
        ]
    }`
-    axios.get.mockImplementation(url => {
-        if (url === 'https://service.canal-overseas.com/ott-frontend/vector/63001/event/140382363') {
-            return Promise.resolve({
-                data: JSON.parse(`{
+  axios.get.mockImplementation(url => {
+    if (url === 'https://service.canal-overseas.com/ott-frontend/vector/63001/event/140382363') {
+      return Promise.resolve({
+        data: JSON.parse(`{
                    "currentPage": {
                    "displayName": "Almeria / Real Madrid",
                    "displayTemplate": "detailPage",
@@ -117,42 +117,43 @@ it('can parse response', done => {
                    ]
                    }
                    }`)
-            })
-        } else {
-            return Promise.resolve({ data: '' })
+      })
+    } else {
+      return Promise.resolve({ data: '' })
+    }
+  })
+
+  parser({ content })
+    .then(result => {
+      result = result.map(p => {
+        p.start = p.start.toJSON()
+        p.stop = p.stop.toJSON()
+        return p
+      })
+
+      expect(result).toMatchObject([
+        {
+          start: '2022-08-18T00:00:00.000Z',
+          stop: '2022-08-18T02:00:00.000Z',
+          title: 'Almeria / Real Madrid',
+          icon: 'https://service.canal-overseas.com/image-api/v1/image/47000149dabce60d1769589c766aad20',
+          category: 'Football',
+          description:
+            "Diffusion d'un match de LaLiga Santander, championnat d'Espagne de football, la plus haute compétition de football d'Espagne. Cette compétition professionnelle, placée sous la supervision de la Fédération espagnole de football, a été fondée en 1928 et s'appelle Primera Division jusqu'en 2008. Elle se nomme ensuite Liga BBVA jusqu'en 2016 puis LaLiga Santander depuis cette date."
        }
+      ])
+      done()
    })
-
-    parser({ content })
-        .then(result => {
-            result = result.map(p => {
-                p.start = p.start.toJSON()
-                p.stop = p.stop.toJSON()
-                return p
-            })
-
-            expect(result).toMatchObject([
-                {
-                    start: '2022-08-18T00:00:00.000Z',
-                    stop: '2022-08-18T02:00:00.000Z',
-                    title: 'Almeria / Real Madrid',
-                    icon: 'https://service.canal-overseas.com/image-api/v1/image/47000149dabce60d1769589c766aad20',
-                    category: 'Football',
-                    description: 'Diffusion d\'un match de LaLiga Santander, championnat d\'Espagne de football, la plus haute compétition de football d\'Espagne. Cette compétition professionnelle, placée sous la supervision de la Fédération espagnole de football, a été fondée en 1928 et s\'appelle Primera Division jusqu\'en 2008. Elle se nomme ensuite Liga BBVA jusqu\'en 2016 puis LaLiga Santander depuis cette date.'
-                }
-            ])
-            done()
-        })
-        .catch(done)
+    .catch(done)
 })

 it('can handle empty guide', done => {
-    parser({
-        content: `{"currentPage":{"displayTemplate":"error","BOName":"Page introuvable"},"title":"Page introuvable","text":"La page que vous demandez est introuvable. Si le problème persiste, vous pouvez contacter l'assistance de CANAL+/CANALSAT.","code":404}`
+  parser({
+    content: `{"currentPage":{"displayTemplate":"error","BOName":"Page introuvable"},"title":"Page introuvable","text":"La page que vous demandez est introuvable. Si le problème persiste, vous pouvez contacter l'assistance de CANAL+/CANALSAT.","code":404}`
+  })
+    .then(result => {
+      expect(result).toMatchObject([])
+      done()
    })
-        .then(result => {
-            expect(result).toMatchObject([])
-            done()
-        })
-        .catch(done)
+    .catch(done)
 })
--- a/sites/chaines-tv.orange.fr/chaines-tv.orange.fr.test.js
+++ b/sites/chaines-tv.orange.fr/chaines-tv.orange.fr.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/chaines-tv.orange.fr/chaines-tv.orange.fr.config.js --channels=sites/chaines-tv.orange.fr/chaines-tv.orange.fr_fr.channels.xml --output=.gh-pages/guides/fr/chaines-tv.orange.fr.epg.xml --days=2
+// npx epg-grabber --config=sites/chaines-tv.orange.fr/chaines-tv.orange.fr.config.js --channels=sites/chaines-tv.orange.fr/chaines-tv.orange.fr_fr.channels.xml --output=guide.xml --days=2

 const { parser, url, request } = require('./chaines-tv.orange.fr.config.js')
 const dayjs = require('dayjs')
--- a/sites/digiturk.com.tr/digiturk.com.tr.test.js
+++ b/sites/digiturk.com.tr/digiturk.com.tr.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/digiturk.com.tr/digiturk.com.tr.config.js --channels=sites/digiturk.com.tr/digiturk.com.tr_tr.channels.xml --output=.gh-pages/guides/tr/digiturk.com.tr.epg.xml --days=2
+// npx epg-grabber --config=sites/digiturk.com.tr/digiturk.com.tr.config.js --channels=sites/digiturk.com.tr/digiturk.com.tr_tr.channels.xml --output=guide.xml --days=2

 const { parser, url } = require('./digiturk.com.tr.config.js')
 const dayjs = require('dayjs')
--- a/sites/dishtv.in/dishtv.in.test.js
+++ b/sites/dishtv.in/dishtv.in.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/dishtv.in/dishtv.in.config.js --channels=sites/dishtv.in/dishtv.in_in.channels.xml --output=.gh-pages/guides/in/dishtv.in.epg.xml --days=2
+// npx epg-grabber --config=sites/dishtv.in/dishtv.in.config.js --channels=sites/dishtv.in/dishtv.in_in.channels.xml --output=guide.xml --days=2

 const { parser, url, request } = require('./dishtv.in.config.js')
 const dayjs = require('dayjs')
--- a/sites/elcinema.com/elcinema.com.test.js
+++ b/sites/elcinema.com/elcinema.com.test.js
@@ -1,5 +1,5 @@
-// npx epg-grabber --config=sites/elcinema.com/elcinema.com.config.js --channels=sites/elcinema.com/elcinema.com_eg-en.channels.xml --output=.gh-pages/guides/eg-en/elcinema.com.epg.xml --days=2
-// npx epg-grabber --config=sites/elcinema.com/elcinema.com.config.js --channels=sites/elcinema.com/elcinema.com_eg-ar.channels.xml --output=.gh-pages/guides/eg-ar/elcinema.com.epg.xml --days=2
+// npx epg-grabber --config=sites/elcinema.com/elcinema.com.config.js --channels=sites/elcinema.com/elcinema.com_eg-en.channels.xml --output=guide.xml --days=2
+// npx epg-grabber --config=sites/elcinema.com/elcinema.com.config.js --channels=sites/elcinema.com/elcinema.com_eg-ar.channels.xml --output=guide.xml --days=2

 const { parser, url, request } = require('./elcinema.com.config.js')
 const dayjs = require('dayjs')
--- a/sites/elcinema.com/elcinema.com_eg-ar.channels.xml
+++ b/sites/elcinema.com/elcinema.com_eg-ar.channels.xml
@@ -5,6 +5,7 @@
    <channel lang="ar" xmltv_id="AbuDhabiDrama.ae" site_id="1178">Abu Dhabi Drama</channel>
    <channel lang="ar" xmltv_id="AbuDhabiTV.ae" site_id="1136">Abu Dhabi TV</channel>
    <channel lang="ar" xmltv_id="AlAoulaMiddleEast.ma" site_id="1101">Al Aoula Middle East</channel>
+    <channel lang="ar" xmltv_id="Alaraby2TV.uk" site_id="1382">Al Araby 2 TV</channel>
    <channel lang="ar" xmltv_id="AlDafrahTV.ae" site_id="1264">Al Dafrah TV</channel>
    <channel lang="ar" xmltv_id="AlHayatTV.us" site_id="1137">Al Hayat</channel>
    <channel lang="ar" xmltv_id="AlJadeed.lb" site_id="1216">Al Jadeed</channel>
@@ -32,6 +33,7 @@
    <channel lang="ar" xmltv_id="beINMovies1HD.qa" site_id="1322">BeIn Movies Premiere</channel>
    <channel lang="ar" xmltv_id="beINSeries1.qa" site_id="1327">BeIn Series 1</channel>
    <channel lang="ar" xmltv_id="beINSeries2.qa" site_id="1328">BeIn Series 2</channel>
+    <channel lang="ar" xmltv_id="CartoonNetworkArabic.ae" site_id="1242">Cartoon Network Arabic</channel>
    <channel lang="ar" xmltv_id="CBC.eg" site_id="1198">CBC</channel>
    <channel lang="ar" xmltv_id="CBCDrama.eg" site_id="1199">CBC Drama</channel>
    <channel lang="ar" xmltv_id="CBCSofra.eg" site_id="1260">CBC Sofra</channel>
@@ -55,6 +57,7 @@
    <channel lang="ar" xmltv_id="KTVKhallikBilbait.kw" site_id="1370">KTV Khallik Bilbait</channel>
    <channel lang="ar" xmltv_id="KuwaitTV.kw" site_id="1310">Kuwait TV</channel>
    <channel lang="ar" xmltv_id="LanaTV.lb" site_id="1313">Lana TV</channel>
+    <channel lang="ar" xmltv_id="LBC.sa" site_id="1341">LBC</channel>
    <channel lang="ar" xmltv_id="LBCInternational.lb" site_id="1168">LBC International</channel>
    <channel lang="ar" xmltv_id="MasperoZaman.eg" site_id="1336">Maspero Zaman</channel>
    <channel lang="ar" xmltv_id="MBC1.ae" site_id="1127">MBC</channel>
@@ -67,12 +70,14 @@
    <channel lang="ar" xmltv_id="MBCDrama.ae" site_id="1194">MBC Drama</channel>
    <channel lang="ar" xmltv_id="MBCPlusDrama.ae" site_id="1131">MBC Drama +</channel>
    <channel lang="ar" xmltv_id="MBCMasr.eg" site_id="1239">MBC Maser</channel>
+    <channel lang="ar" xmltv_id="MBCMasr2.eg" site_id="1278">MBC Maser 2</channel>
    <channel lang="ar" xmltv_id="MBCMax.ae" site_id="1132">MBC Max</channel>
    <channel lang="ar" xmltv_id="MixBelAraby.eg" site_id="1371">Mix Bel Araby</channel>
    <channel lang="ar" xmltv_id="MixHollywood.eg" site_id="1355">Mix Hollywood</channel>
    <channel lang="ar" xmltv_id="MTVLebanon.lb" site_id="1296">MTV Alloubnaniya</channel>
    <channel lang="ar" xmltv_id="Musawa.ps" site_id="1343">Musawa</channel>
-    <channel lang="ar" xmltv_id="NationalGeographicMiddleEast.uk" site_id="1266">National Geographic Middle East</channel>
+    <channel lang="ar" xmltv_id="NationalGeographicAbuDhabi.ae" site_id="1266">National Geographic Abu Dhabi</channel>
+    <channel lang="ar" xmltv_id="NationalGeographicMiddleEast.uk" site_id="1275">National Geographic Middle East</channel>
    <channel lang="ar" xmltv_id="Nessma.tn" site_id="1304">Nessma</channel>
    <channel lang="ar" xmltv_id="NileComedy.eg" site_id="1158">Nile Comedy</channel>
    <channel lang="ar" xmltv_id="NileDrama.eg" site_id="1156">Nile Drama</channel>
@@ -91,7 +96,10 @@
    <channel lang="ar" xmltv_id="OSNYaHala.ae" site_id="1205">OSN Ya Hala</channel>
    <channel lang="ar" xmltv_id="OSNYaHalaAlOula.ae" site_id="1250">OSN Ya Hala Al Oula</channel>
    <channel lang="ar" xmltv_id="OSNYaHalaCinema.ae" site_id="1285">OSN Ya Hala Cinema</channel>
+    <channel lang="ar" xmltv_id="RotanaComedy.sa" site_id="1358">Rotana Comedy</channel>
+    <channel lang="ar" xmltv_id="RotanaCinemaEgypt.eg" site_id="1148">Rotana Cinema Egypt</channel>
    <channel lang="ar" xmltv_id="RotanaCinemaKSA.sa" site_id="1289">Rotana Cinema KSA</channel>
+    <channel lang="ar" xmltv_id="RotanaClassic.sa" site_id="1217">Rotana Classic</channel>
    <channel lang="ar" xmltv_id="RotanaDrama.sa" site_id="1147">Rotana Drama</channel>
    <channel lang="ar" xmltv_id="SadaElbalad.eg" site_id="1226">Sada Elbalad</channel>
    <channel lang="ar" xmltv_id="SadaElbalad2.eg" site_id="1279">Sada Elbalad 2</channel>
@@ -108,5 +116,9 @@
    <channel lang="ar" xmltv_id="TeN.eg" site_id="1280">Ten</channel>
    <channel lang="ar" xmltv_id="ThikrayatTV.sa" site_id="1366">Thikrayat TV</channel>
    <channel lang="ar" xmltv_id="UTV.iq" site_id="1367">UTV</channel>
+    <channel lang="ar" xmltv_id="Watania1.tn" site_id="1308">Watania 1</channel>
+    <channel lang="ar" xmltv_id="Watania2.tn" site_id="1334">Watania 2</channel>    
+    <channel lang="ar" xmltv_id="ZeeAflam.in" site_id="1262">Zee Aflam</channel>
+    <channel lang="ar" xmltv_id="ZeeAlwan.in" site_id="1261">Zee Alwan</channel>    
  </channels>
-</site>
+</site>
--- a/sites/elcinema.com/elcinema.com_eg-en.channels.xml
+++ b/sites/elcinema.com/elcinema.com_eg-en.channels.xml
@@ -5,6 +5,7 @@
    <channel lang="en" xmltv_id="AbuDhabiDrama.ae" site_id="1178">Abu Dhabi Drama</channel>
    <channel lang="en" xmltv_id="AbuDhabiTV.ae" site_id="1136">Abu Dhabi TV</channel>
    <channel lang="en" xmltv_id="AlAoulaMiddleEast.ma" site_id="1101">Al Aoula Middle East</channel>
+    <channel lang="en" xmltv_id="Alaraby2TV.uk" site_id="1382">Al Araby 2 TV</channel>
    <channel lang="en" xmltv_id="AlDafrahTV.ae" site_id="1264">Al Dafrah TV</channel>
    <channel lang="en" xmltv_id="AlHayatTV.us" site_id="1137">Al Hayat</channel>
    <channel lang="en" xmltv_id="AlJadeed.lb" site_id="1216">Al Jadeed</channel>
@@ -32,6 +33,7 @@
    <channel lang="en" xmltv_id="beINMovies1HD.qa" site_id="1322">BeIn Movies Premiere</channel>
    <channel lang="en" xmltv_id="beINSeries1.qa" site_id="1327">BeIn Series 1</channel>
    <channel lang="en" xmltv_id="beINSeries2.qa" site_id="1328">BeIn Series 2</channel>
+    <channel lang="en" xmltv_id="CartoonNetworkArabic.ae" site_id="1242">Cartoon Network Arabic</channel>
    <channel lang="en" xmltv_id="CBC.eg" site_id="1198">CBC</channel>
    <channel lang="en" xmltv_id="CBCDrama.eg" site_id="1199">CBC Drama</channel>
    <channel lang="en" xmltv_id="CBCSofra.eg" site_id="1260">CBC Sofra</channel>
@@ -55,6 +57,7 @@
    <channel lang="en" xmltv_id="KTVKhallikBilbait.kw" site_id="1370">KTV Khallik Bilbait</channel>
    <channel lang="en" xmltv_id="KuwaitTV.kw" site_id="1310">Kuwait TV</channel>
    <channel lang="en" xmltv_id="LanaTV.lb" site_id="1313">Lana TV</channel>
+    <channel lang="en" xmltv_id="LBC.sa" site_id="1341">LBC</channel>
    <channel lang="en" xmltv_id="LBCInternational.lb" site_id="1168">LBC International</channel>
    <channel lang="en" xmltv_id="MasperoZaman.eg" site_id="1336">Maspero Zaman</channel>
    <channel lang="en" xmltv_id="MBC1.ae" site_id="1127">MBC</channel>
@@ -67,12 +70,14 @@
    <channel lang="en" xmltv_id="MBCDrama.ae" site_id="1194">MBC Drama</channel>
    <channel lang="en" xmltv_id="MBCPlusDrama.ae" site_id="1131">MBC Drama +</channel>
    <channel lang="en" xmltv_id="MBCMasr.eg" site_id="1239">MBC Maser</channel>
+    <channel lang="en" xmltv_id="MBCMasr2.eg" site_id="1278">MBC Maser 2</channel>
    <channel lang="en" xmltv_id="MBCMax.ae" site_id="1132">MBC Max</channel>
    <channel lang="en" xmltv_id="MixBelAraby.eg" site_id="1371">Mix Bel Araby</channel>
    <channel lang="en" xmltv_id="MixHollywood.eg" site_id="1355">Mix Hollywood</channel>
    <channel lang="en" xmltv_id="MTVLebanon.lb" site_id="1296">MTV Alloubnaniya</channel>
    <channel lang="en" xmltv_id="Musawa.ps" site_id="1343">Musawa</channel>
-    <channel lang="en" xmltv_id="NationalGeographicMiddleEast.uk" site_id="1266">National Geographic Middle East</channel>
+    <channel lang="en" xmltv_id="NationalGeographicAbuDhabi.ae" site_id="1266">National Geographic Abu Dhabi</channel>
+    <channel lang="en" xmltv_id="NationalGeographicMiddleEast.uk" site_id="1275">National Geographic Middle East</channel>
    <channel lang="en" xmltv_id="Nessma.tn" site_id="1304">Nessma</channel>
    <channel lang="en" xmltv_id="NileComedy.eg" site_id="1158">Nile Comedy</channel>
    <channel lang="en" xmltv_id="NileDrama.eg" site_id="1156">Nile Drama</channel>
@@ -91,7 +96,10 @@
    <channel lang="en" xmltv_id="OSNYaHala.ae" site_id="1205">OSN Ya Hala</channel>
    <channel lang="en" xmltv_id="OSNYaHalaAlOula.ae" site_id="1250">OSN Ya Hala Al Oula</channel>
    <channel lang="en" xmltv_id="OSNYaHalaCinema.ae" site_id="1285">OSN Ya Hala Cinema</channel>
+    <channel lang="en" xmltv_id="RotanaComedy.sa" site_id="1358">Rotana Comedy</channel>
+    <channel lang="en" xmltv_id="RotanaCinemaEgypt.eg" site_id="1148">Rotana Cinema Egypt</channel>
    <channel lang="en" xmltv_id="RotanaCinemaKSA.sa" site_id="1289">Rotana Cinema KSA</channel>
+    <channel lang="en" xmltv_id="RotanaClassic.sa" site_id="1217">Rotana Classic</channel>
    <channel lang="en" xmltv_id="RotanaDrama.sa" site_id="1147">Rotana Drama</channel>
    <channel lang="en" xmltv_id="SadaElbalad.eg" site_id="1226">Sada Elbalad</channel>
    <channel lang="en" xmltv_id="SadaElbalad2.eg" site_id="1279">Sada Elbalad 2</channel>
@@ -108,5 +116,9 @@
    <channel lang="en" xmltv_id="TeN.eg" site_id="1280">Ten</channel>
    <channel lang="en" xmltv_id="ThikrayatTV.sa" site_id="1366">Thikrayat TV</channel>
    <channel lang="en" xmltv_id="UTV.iq" site_id="1367">UTV</channel>
+    <channel lang="en" xmltv_id="Watania1.tn" site_id="1308">Watania 1</channel>
+    <channel lang="en" xmltv_id="Watania2.tn" site_id="1334">Watania 2</channel>    
+    <channel lang="en" xmltv_id="ZeeAflam.in" site_id="1262">Zee Aflam</channel>
+    <channel lang="en" xmltv_id="ZeeAlwan.in" site_id="1261">Zee Alwan</channel>    
  </channels>
 </site>
--- a/sites/gatotv.com/gatotv.com.test.js
+++ b/sites/gatotv.com/gatotv.com.test.js
@@ -1,5 +1,5 @@
 // node ./scripts/channels.js --config=./sites/gatotv.com/gatotv.com.config.js --output=./sites/gatotv.com/gatotv.com_cr.channels.xml --set=country:costa_rica
-// npx epg-grabber --config=sites/gatotv.com/gatotv.com.config.js --channels=sites/gatotv.com/gatotv.com_ar.channels.xml --output=.gh-pages/guides/ar/gatotv.com.epg.xml --days=2
+// npx epg-grabber --config=sites/gatotv.com/gatotv.com.config.js --channels=sites/gatotv.com/gatotv.com_ar.channels.xml --output=guide.xml --days=2

 const { parser, url, request } = require('./gatotv.com.config.js')
 const dayjs = require('dayjs')
--- a/sites/hd-plus.de/hd-plus.de.test.js
+++ b/sites/hd-plus.de/hd-plus.de.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/hd-plus.de/hd-plus.de.config.js --channels=sites/hd-plus.de/hd-plus.de_de.channels.xml --output=.gh-pages/guides/de/hd-plus.de.epg.xml --days=2
+// npx epg-grabber --config=sites/hd-plus.de/hd-plus.de.config.js --channels=sites/hd-plus.de/hd-plus.de_de.channels.xml --output=guide.xml --days=2

 const { parser, url } = require('./hd-plus.de.config.js')
 const dayjs = require('dayjs')
--- a/sites/ipko.com/ipko.com.test.js
+++ b/sites/ipko.com/ipko.com.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/ipko.com/ipko.com.config.js --channels=sites/ipko.com/ipko.com_al.channels.xml --days=2 --output=.gh-pages/guides/al/ipko.com.epg.xml
+// npx epg-grabber --config=sites/ipko.com/ipko.com.config.js --channels=sites/ipko.com/ipko.com_al.channels.xml --days=2 --output=guide.xml

 const { parser, url } = require('./ipko.com.config.js')
 const dayjs = require('dayjs')
--- a/sites/knr.gl/knr.gl.test.js
+++ b/sites/knr.gl/knr.gl.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/knr.gl/knr.gl.config.js --channels=sites/knr.gl/knr.gl_gl.channels.xml --output=.gh-pages/guides/gl/knr.gl.epg.xml --days=2
+// npx epg-grabber --config=sites/knr.gl/knr.gl.config.js --channels=sites/knr.gl/knr.gl_gl.channels.xml --output=guide.xml --days=2

 const { parser, url } = require('./knr.gl.config.js')
 const dayjs = require('dayjs')
--- a/sites/magticom.ge/magticom.ge.test.js
+++ b/sites/magticom.ge/magticom.ge.test.js
@@ -1,5 +1,5 @@
 // node ./scripts/channels.js --config=./sites/magticom.ge/magticom.ge.config.js --output=./sites/magticom.ge/magticom.ge_ge.channels.xml
-// npx epg-grabber --config=sites/magticom.ge/magticom.ge.config.js --channels=sites/magticom.ge/magticom.ge_ge.channels.xml --output=.gh-pages/guides/ge/magticom.ge.epg.xml --days=2
+// npx epg-grabber --config=sites/magticom.ge/magticom.ge.config.js --channels=sites/magticom.ge/magticom.ge_ge.channels.xml --output=guide.xml --days=2

 const { parser, url, request } = require('./magticom.ge.config.js')
 const dayjs = require('dayjs')
--- a/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr.test.js
+++ b/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr.config.js --channels=sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr_hr.channels.xml --output=.gh-pages/guides/hr/maxtv.hrvatskitelekom.hr.epg.xml --days=2
+// npx epg-grabber --config=sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr.config.js --channels=sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr_hr.channels.xml --output=guide.xml --days=2

 const { parser, url, request } = require('./maxtv.hrvatskitelekom.hr.config.js')
 const dayjs = require('dayjs')
--- a/sites/maxtvgo.mk/maxtvgo.mk.test.js
+++ b/sites/maxtvgo.mk/maxtvgo.mk.test.js
@@ -1,5 +1,5 @@
 // node ./scripts/channels.js --config=./sites/maxtvgo.mk/maxtvgo.mk.config.js --output=./sites/maxtvgo.mk/maxtvgo.mk_mk.channels.xml
-// npx epg-grabber --config=sites/maxtvgo.mk/maxtvgo.mk.config.js --channels=sites/maxtvgo.mk/maxtvgo.mk_mk.channels.xml --output=.gh-pages/guides/mk/maxtvgo.mk.epg.xml --days=2
+// npx epg-grabber --config=sites/maxtvgo.mk/maxtvgo.mk.config.js --channels=sites/maxtvgo.mk/maxtvgo.mk_mk.channels.xml --output=guide.xml --days=2

 const { parser, url } = require('./maxtvgo.mk.config.js')
 const dayjs = require('dayjs')
--- a/sites/mi.tv/mi.tv.test.js
+++ b/sites/mi.tv/mi.tv.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/mi.tv/mi.tv.config.js --channels=sites/mi.tv/mi.tv_ar.channels.xml --output=.gh-pages/guides/ar/mi.tv.epg.xml --days=2
+// npx epg-grabber --config=sites/mi.tv/mi.tv.config.js --channels=sites/mi.tv/mi.tv_ar.channels.xml --output=guide.xml --days=2

 const { parser, url } = require('./mi.tv.config.js')
 const dayjs = require('dayjs')
--- a/sites/mtel.ba/mtel.ba.test.js
+++ b/sites/mtel.ba/mtel.ba.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/mtel.ba/mtel.ba.config.js --channels=sites/mtel.ba/mtel.ba_ba.channels.xml --output=.gh-pages/guides/ba/mtel.ba.epg.xml --days=2
+// npx epg-grabber --config=sites/mtel.ba/mtel.ba.config.js --channels=sites/mtel.ba/mtel.ba_ba.channels.xml --output=guide.xml --days=2

 const { parser, url, request } = require('./mtel.ba.config.js')
 const dayjs = require('dayjs')
--- a/sites/mts.rs/mts.rs.test.js
+++ b/sites/mts.rs/mts.rs.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/mts.rs/mts.rs.config.js --channels=sites/mts.rs/mts.rs_rs.channels.xml --output=.gh-pages/guides/rs/mts.rs.epg.xml --days=2
+// npx epg-grabber --config=sites/mts.rs/mts.rs.config.js --channels=sites/mts.rs/mts.rs_rs.channels.xml --output=guide.xml --days=2

 const { parser, url, request } = require('./mts.rs.config.js')
 const dayjs = require('dayjs')
--- a/sites/novacyprus.com/novacyprus.com.test.js
+++ b/sites/novacyprus.com/novacyprus.com.test.js
@@ -1,5 +1,5 @@
 // node ./scripts/channels.js --config=./sites/novacyprus.com/novacyprus.com.config.js --output=./sites/novacyprus.com/novacyprus.com_cy.channels.xml
-// npx epg-grabber --config=sites/novacyprus.com/novacyprus.com.config.js --channels=sites/novacyprus.com/novacyprus.com_cy.channels.xml --output=.gh-pages/guides/cy/novacyprus.com.epg.xml --days=2
+// npx epg-grabber --config=sites/novacyprus.com/novacyprus.com.config.js --channels=sites/novacyprus.com/novacyprus.com_cy.channels.xml --output=guide.xml --days=2

 const { parser, url } = require('./novacyprus.com.config.js')
 const dayjs = require('dayjs')
--- a/sites/programetv.ro/programetv.ro.test.js
+++ b/sites/programetv.ro/programetv.ro.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/programetv.ro/programetv.ro.config.js --channels=sites/programetv.ro/programetv.ro_ro.channels.xml --output=.gh-pages/guides/ro/programetv.ro.epg.xml --days=2
+// npx epg-grabber --config=sites/programetv.ro/programetv.ro.config.js --channels=sites/programetv.ro/programetv.ro_ro.channels.xml --output=guide.xml --days=2

 const { parser, url } = require('./programetv.ro.config.js')
 const dayjs = require('dayjs')
--- a/sites/programme-tv.vini.pf/programme-tv.vini.pf.test.js
+++ b/sites/programme-tv.vini.pf/programme-tv.vini.pf.test.js
@@ -1,5 +1,5 @@
 // node ./scripts/channels.js --config=./sites/programme-tv.vini.pf/programme-tv.vini.pf.config.js --output=./sites/programme-tv.vini.pf/programme-tv.vini.pf_pf.channels.xml
-// npx epg-grabber --config=sites/programme-tv.vini.pf/programme-tv.vini.pf.config.js --channels=sites/programme-tv.vini.pf/programme-tv.vini.pf_pf.channels.xml --output=.gh-pages/guides/pf/programme-tv.vini.pf.epg.xml --days=2
+// npx epg-grabber --config=sites/programme-tv.vini.pf/programme-tv.vini.pf.config.js --channels=sites/programme-tv.vini.pf/programme-tv.vini.pf_pf.channels.xml --output=guide.xml --days=2

 const { parser, url, request } = require('./programme-tv.vini.pf.config.js')
 const axios = require('axios')
--- a/sites/rev.bs/rev.bs.test.js
+++ b/sites/rev.bs/rev.bs.test.js
@@ -1,5 +1,5 @@
 // node ./scripts/channels.js --config=./sites/rev.bs/rev.bs.config.js --output=./sites/rev.bs/rev.bs_bs.channels.xml
-// npx epg-grabber --config=sites/rev.bs/rev.bs.config.js --channels=sites/rev.bs/rev.bs_bs.channels.xml --output=.gh-pages/guides/bs/rev.bs.epg.xml --days=2
+// npx epg-grabber --config=sites/rev.bs/rev.bs.config.js --channels=sites/rev.bs/rev.bs_bs.channels.xml --output=guide.xml --days=2

 const { parser, url } = require('./rev.bs.config.js')
 const axios = require('axios')
--- a/sites/rtb.gov.bn/rtb.gov.bn.test.js
+++ b/sites/rtb.gov.bn/rtb.gov.bn.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/rtb.gov.bn/rtb.gov.bn.config.js --channels=sites/rtb.gov.bn/rtb.gov.bn_bn.channels.xml --output=.gh-pages/guides/bn/rtb.gov.bn.epg.xml --days=2
+// npx epg-grabber --config=sites/rtb.gov.bn/rtb.gov.bn.config.js --channels=sites/rtb.gov.bn/rtb.gov.bn_bn.channels.xml --output=guide.xml --days=2

 const { parser, url } = require('./rtb.gov.bn.config.js')
 const path = require('path')
--- a/sites/ruv.is/ruv.is.test.js
+++ b/sites/ruv.is/ruv.is.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/ruv.is/ruv.is.config.js --channels=sites/ruv.is/ruv.is_is.channels.xml --output=.gh-pages/guides/is/ruv.is.epg.xml --days=2
+// npx epg-grabber --config=sites/ruv.is/ruv.is.config.js --channels=sites/ruv.is/ruv.is_is.channels.xml --output=guide.xml --days=2

 const { parser, url } = require('./ruv.is.config.js')
 const dayjs = require('dayjs')
--- a/sites/siba.com.co/siba.com.co.test.js
+++ b/sites/siba.com.co/siba.com.co.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/siba.com.co/siba.com.co.config.js --channels=sites/siba.com.co/siba.com.co_co.channels.xml --output=.gh-pages/guides/co/siba.com.co.epg.xml --days=2
+// npx epg-grabber --config=sites/siba.com.co/siba.com.co.config.js --channels=sites/siba.com.co/siba.com.co_co.channels.xml --output=guide.xml --days=2

 const { parser, url, request } = require('./siba.com.co.config.js')
 const dayjs = require('dayjs')
--- a/sites/sky.com/sky.com.test.js
+++ b/sites/sky.com/sky.com.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/sky.com/sky.com.config.js --channels=sites/sky.com/sky.com_uk.channels.xml --output=.gh-pages/guides/au/sky.com.epg.xml --days=2
+// npx epg-grabber --config=sites/sky.com/sky.com.config.js --channels=sites/sky.com/sky.com_uk.channels.xml --output=guide.xml --days=2

 const { parser, url } = require('./sky.com.config.js')
 const dayjs = require('dayjs')
--- a/sites/teliatv.ee/teliatv.ee.test.js
+++ b/sites/teliatv.ee/teliatv.ee.test.js
@@ -1,7 +1,7 @@
 // node ./scripts/channels.js --config=./sites/teliatv.ee/teliatv.ee.config.js --output=./sites/teliatv.ee/teliatv.ee_ee-et.channels.xml --set=lang:et
 // node ./scripts/channels.js --config=./sites/teliatv.ee/teliatv.ee.config.js --output=./sites/teliatv.ee/teliatv.ee_ee-ru.channels.xml --set=lang:ru
 // node ./scripts/channels.js --config=./sites/teliatv.ee/teliatv.ee.config.js --output=./sites/teliatv.ee/teliatv.ee_ee-en.channels.xml --set=lang:en
-// npx epg-grabber --config=sites/teliatv.ee/teliatv.ee.config.js --channels=sites/teliatv.ee/teliatv.ee_ee-et.channels.xml --output=.gh-pages/guides/ee-et/teliatv.ee.epg.xml --days=2
+// npx epg-grabber --config=sites/teliatv.ee/teliatv.ee.config.js --channels=sites/teliatv.ee/teliatv.ee_ee-et.channels.xml --output=guide.xml --days=2

 const { parser, url } = require('./teliatv.ee.config.js')
 const dayjs = require('dayjs')
--- a/sites/teliatv.ee/teliatv.ee_ee-en.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee_ee-en.channels.xml
@@ -74,6 +74,8 @@
    <channel lang="en" xmltv_id="MTVLive.uk" site_id="1302">MTV Live HD</channel>
    <channel lang="en" xmltv_id="MyHits.ee" site_id="76">MyHits</channel>
    <channel lang="en" xmltv_id="MyZenTV.fr" site_id="1306">MyZen TV</channel>
+    <channel lang="en" xmltv_id="NationalGeographicRussia.ru" site_id="19">National Geographic</channel>
+    <channel lang="en" xmltv_id="NationalGeographicWildRussia.ru" site_id="79">National Geographic Wild</channel>
    <channel lang="en" xmltv_id="NickelodeonCIS.ru" site_id="58">Nickelodeon</channel>
    <channel lang="en" xmltv_id="NickJrScandinavia.nl" site_id="1300">Nick Jr</channel>
    <channel lang="en" xmltv_id="NicktoonsScandinavia.nl" site_id="1301">Nicktoons</channel>
@@ -132,4 +134,4 @@
    <channel lang="en" xmltv_id="YleTV1.fi" site_id="12">YLE TV 1</channel>
    <channel lang="en" xmltv_id="YleTV2.fi" site_id="13">YLE TV 2</channel>
  </channels>
-</site>
+</site>
--- a/sites/turksatkablo.com.tr/turksatkablo.com.tr.test.js
+++ b/sites/turksatkablo.com.tr/turksatkablo.com.tr.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/turksatkablo.com.tr/turksatkablo.com.tr.config.js --channels=sites/turksatkablo.com.tr/turksatkablo.com.tr_tr.channels.xml --output=.gh-pages/guides/tr/turksatkablo.com.tr.epg.xml --days=2
+// npx epg-grabber --config=sites/turksatkablo.com.tr/turksatkablo.com.tr.config.js --channels=sites/turksatkablo.com.tr/turksatkablo.com.tr_tr.channels.xml --output=guide.xml --days=2

 const { parser, url } = require('./turksatkablo.com.tr.config.js')
 const dayjs = require('dayjs')
--- a/sites/tv.mail.ru/tv.mail.ru.test.js
+++ b/sites/tv.mail.ru/tv.mail.ru.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/tv.mail.ru/tv.mail.ru.config.js --channels=sites/tv.mail.ru/tv.mail.ru_am.channels.xml --output=.gh-pages/guides/am/tv.mail.ru.epg.xml --days=2
+// npx epg-grabber --config=sites/tv.mail.ru/tv.mail.ru.config.js --channels=sites/tv.mail.ru/tv.mail.ru_am.channels.xml --output=guide.xml --days=2

 const { parser, url } = require('./tv.mail.ru.config.js')
 const dayjs = require('dayjs')
--- a/sites/tv.nu/tv.nu_se.channels.xml
+++ b/sites/tv.nu/tv.nu_se.channels.xml
@@ -104,6 +104,8 @@
    <channel lang="sv" xmltv_id="OutdoorChannelInternational.us" site_id="outdoor-channel-hd">Outdoor Channel HD</channel>
    <channel lang="sv" xmltv_id="OutTV.ca" site_id="outtv">OUTtv</channel>
    <channel lang="sv" xmltv_id="ParamountNetworkSweden.se" site_id="paramount-network-30228">Paramount Network</channel>
+    <channel lang="sv" xmltv_id="ParamountPlusMovies.se" site_id="paramount-movies">Paramount+ Movies</channel>
+    <channel lang="sv" xmltv_id="ParamountPlusSeries.se" site_id="paramount-series">Paramount+ Series</channel>
    <channel lang="sv" xmltv_id="PinkPlus.rs" site_id="pink-plus">Pink Plus</channel>
    <channel lang="sv" xmltv_id="PlayboyTVEurope.us" site_id="playboy-tv-europe">Playboy TV Europe</channel>
    <channel lang="sv" xmltv_id="ProSiebenGermany.de" site_id="prosieben">ProSieben</channel>
--- a/sites/tv.yandex.ru/tv.yandex.ru.test.js
+++ b/sites/tv.yandex.ru/tv.yandex.ru.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/tv.yandex.ru/tv.yandex.ru.config.js --channels=sites/tv.yandex.ru/tv.yandex.ru_kz.channels.xml --output=.gh-pages/guides/kz/tv.yandex.ru.epg.xml --days=2
+// npx epg-grabber --config=sites/tv.yandex.ru/tv.yandex.ru.config.js --channels=sites/tv.yandex.ru/tv.yandex.ru_kz.channels.xml --output=guide.xml --days=2

 const { parser, url, request } = require('./tv.yandex.ru.config.js')
 const dayjs = require('dayjs')
--- a/sites/tv2go.t-2.net/tv2go.t-2.net.test.js
+++ b/sites/tv2go.t-2.net/tv2go.t-2.net.test.js
@@ -1,5 +1,5 @@
 // node ./scripts/channels.js --config=./sites/tv2go.t-2.net/tv2go.t-2.net.config.js --output=./sites/tv2go.t-2.net/tv2go.t-2.net_si.channels.xml
-// npx epg-grabber --config=sites/tv2go.t-2.net/tv2go.t-2.net.config.js --channels=sites/tv2go.t-2.net/tv2go.t-2.net_si.channels.xml --output=.gh-pages/guides/si/tv2go.t-2.net.epg.xml --days=2
+// npx epg-grabber --config=sites/tv2go.t-2.net/tv2go.t-2.net.config.js --channels=sites/tv2go.t-2.net/tv2go.t-2.net_si.channels.xml --output=guide.xml --days=2

 const { parser, url, request } = require('./tv2go.t-2.net.config.js')
 const dayjs = require('dayjs')
--- a/sites/tva.tv/tva.tv.test.js
+++ b/sites/tva.tv/tva.tv.test.js
@@ -1,5 +1,5 @@
 // node ./scripts/channels.js --config=./sites/tva.tv/tva.tv.config.js --output=./sites/tva.tv/tva.tv_ir.channels.xml
-// npx epg-grabber --config=sites/tva.tv/tva.tv.config.js --channels=sites/tva.tv/tva.tv_ir.channels.xml --output=.gh-pages/guides/ir/tva.tv.epg.xml --timeout=30000 --days=2
+// npx epg-grabber --config=sites/tva.tv/tva.tv.config.js --channels=sites/tva.tv/tva.tv_ir.channels.xml --output=guide.xml --timeout=30000 --days=2

 const { parser, url } = require('./tva.tv.config.js')
 const dayjs = require('dayjs')
--- a/sites/tvarenasport.com/tvarenasport.com.test.js
+++ b/sites/tvarenasport.com/tvarenasport.com.test.js
@@ -1,5 +1,5 @@
 // node ./scripts/channels.js --config=./sites/tvarenasport.com/tvarenasport.com.config.js --output=./sites/tvarenasport.com/tvarenasport.com_rs.channels.xml --set=country:rs
-// npx epg-grabber --config=sites/tvarenasport.com/tvarenasport.com.config.js --channels=sites/tvarenasport.com/tvarenasport.com_rs.channels.xml --output=.gh-pages/guides/rs/tvarenasport.com.epg.xml --days=2
+// npx epg-grabber --config=sites/tvarenasport.com/tvarenasport.com.config.js --channels=sites/tvarenasport.com/tvarenasport.com_rs.channels.xml --output=guide.xml --days=2

 const { parser, url } = require('./tvarenasport.com.config.js')
 const dayjs = require('dayjs')
--- a/sites/tvarenasport.hr/tvarenasport.hr.test.js
+++ b/sites/tvarenasport.hr/tvarenasport.hr.test.js
@@ -1,5 +1,5 @@
 // node ./scripts/channels.js --config=./sites/tvarenasport.hr/tvarenasport.hr.config.js --output=./sites/tvarenasport.hr/tvarenasport.hr_hr.channels.xml
-// npx epg-grabber --config=sites/tvarenasport.hr/tvarenasport.hr.config.js --channels=sites/tvarenasport.hr/tvarenasport.hr_hr.channels.xml --output=.gh-pages/guides/hr/tvarenasport.hr.epg.xml --days=2
+// npx epg-grabber --config=sites/tvarenasport.hr/tvarenasport.hr.config.js --channels=sites/tvarenasport.hr/tvarenasport.hr_hr.channels.xml --output=guide.xml --days=2

 const { parser, url } = require('./tvarenasport.hr.config.js')
 const dayjs = require('dayjs')
--- a/sites/tvcubana.icrt.cu/tvcubana.icrt.cu.test.js
+++ b/sites/tvcubana.icrt.cu/tvcubana.icrt.cu.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/tvcubana.icrt.cu/tvcubana.icrt.cu.config.js --channels=sites/tvcubana.icrt.cu/tvcubana.icrt.cu_cu.channels.xml --output=.gh-pages/guides/cu/tvcubana.icrt.cu.epg.xml --days=2
+// npx epg-grabber --config=sites/tvcubana.icrt.cu/tvcubana.icrt.cu.config.js --channels=sites/tvcubana.icrt.cu/tvcubana.icrt.cu_cu.channels.xml --output=guide.xml --days=2

 const { parser, url, request } = require('./tvcubana.icrt.cu.config.js')
 const dayjs = require('dayjs')
--- a/sites/tvgid.ua/tvgid.ua.test.js
+++ b/sites/tvgid.ua/tvgid.ua.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/tvgid.ua/tvgid.ua.config.js --channels=sites/tvgid.ua/tvgid.ua_ua.channels.xml --output=.gh-pages/guides/ua/tvgid.ua.epg.xml --days=2
+// npx epg-grabber --config=sites/tvgid.ua/tvgid.ua.config.js --channels=sites/tvgid.ua/tvgid.ua_ua.channels.xml --output=guide.xml --days=2

 const { parser, url } = require('./tvgid.ua.config.js')
 const iconv = require('iconv-lite')
--- a/sites/tvheute.at/tvheute.at.test.js
+++ b/sites/tvheute.at/tvheute.at.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/tvheute.at/tvheute.at.config.js --channels=sites/tvheute.at/tvheute.at_at.channels.xml --output=.gh-pages/guides/at/tvheute.at.epg.xml --days=2
+// npx epg-grabber --config=sites/tvheute.at/tvheute.at.config.js --channels=sites/tvheute.at/tvheute.at_at.channels.xml --output=guide.xml --days=2

 const { parser, url, request } = require('./tvheute.at.config.js')
 const dayjs = require('dayjs')
--- a/sites/tvim.tv/tvim.tv.test.js
+++ b/sites/tvim.tv/tvim.tv.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/tvim.tv/tvim.tv.config.js --channels=sites/tvim.tv/tvim.tv_xk.channels.xml --days=2 --output=.gh-pages/guides/xk/tvim.tv.epg.xml
+// npx epg-grabber --config=sites/tvim.tv/tvim.tv.config.js --channels=sites/tvim.tv/tvim.tv_xk.channels.xml --days=2 --output=guide.xml

 const { parser, url } = require('./tvim.tv.config.js')
 const dayjs = require('dayjs')
--- a/sites/tvmusor.hu/tvmusor.hu.test.js
+++ b/sites/tvmusor.hu/tvmusor.hu.test.js
@@ -1,5 +1,5 @@
 // node ./scripts/channels.js --config=./sites/tvmusor.hu/tvmusor.hu.config.js --output=./sites/tvmusor.hu/tvmusor.hu_hu.channels.xml
-// npx epg-grabber --config=sites/tvmusor.hu/tvmusor.hu.config.js --channels=sites/tvmusor.hu/tvmusor.hu_hu.channels.xml --output=.gh-pages/guides/hu/tvmusor.hu.epg.xml --days=2
+// npx epg-grabber --config=sites/tvmusor.hu/tvmusor.hu.config.js --channels=sites/tvmusor.hu/tvmusor.hu_hu.channels.xml --output=guide.xml --days=2

 const { parser, url, request } = require('./tvmusor.hu.config.js')
 const dayjs = require('dayjs')
--- a/sites/tvplus.com.tr/tvplus.com.tr.test.js
+++ b/sites/tvplus.com.tr/tvplus.com.tr.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/tvplus.com.tr/tvplus.com.tr.config.js --channels=sites/tvplus.com.tr/tvplus.com.tr_tr.channels.xml --output=.gh-pages/guides/tr/tvplus.com.tr.epg.xml --days=2
+// npx epg-grabber --config=sites/tvplus.com.tr/tvplus.com.tr.config.js --channels=sites/tvplus.com.tr/tvplus.com.tr_tr.channels.xml --output=guide.xml --days=2

 const { parser, url, request } = require('./tvplus.com.tr.config.js')
 const dayjs = require('dayjs')
--- a/sites/tvtv.us/tvtv.us.config.js
+++ b/sites/tvtv.us/tvtv.us.config.js
@@ -23,6 +23,9 @@ module.exports = {
        category: parseCategory(item),
        season: parseSeason(item),
        episode: parseEpisode(item),
+        directors: parseDirectors(item),
+        actors: parseActors(item),
+        date: parseDate(item),
        start: parseStart(item),
        stop: parseStop(item),
        icon: parseIcon(item)
@@ -122,6 +125,18 @@ function parseEpisode(item) {
  return item.program.episodeNum || null
 }

+function parseDirectors(item) {
+  return item.program.directors || []
+}
+
+function parseDate(item) {
+  return item.program.releaseDate
+}
+
+function parseActors(item) {
+  return item.program.topCast || []
+}
+
 function parseIcon(item) {
  return item.program.preferredImage && item.program.preferredImage.uri
    ? `https://tvtv.us/gn/i/${item.program.preferredImage.uri}`
--- a/sites/tvtv.us/tvtv.us.test.js
+++ b/sites/tvtv.us/tvtv.us.test.js
@@ -40,6 +40,7 @@ it('can parse response', () => {
      category: ['Health'],
      season: 1,
      episode: 6,
+      date: '2019-04-20',
      icon: 'https://tvtv.us/gn/i/assets/p16640522_b_v9_aa.jpg?w=240&h=360'
    },
    {
@@ -49,6 +50,8 @@ it('can parse response', () => {
      sub_title: 'Sizzled & Seared',
      description: `Everything is sizzled and seared as chef Corbin Tomaszeski joins Christine and Carl in the kitchen.`,
      category: ['House/garden'],
+      actors: ['Carl Heinrich','Christine Ha'],
+      date: '2016-01-14',
      icon: 'https://tvtv.us/gn/i/assets/p10464580_b_v7_aa.jpg?w=240&h=360'
    }
  ])
--- a/sites/tvtv.us/tvtv.us_ca.channels.xml
+++ b/sites/tvtv.us/tvtv.us_ca.channels.xml
@@ -11,30 +11,27 @@
    <channel lang="en" xmltv_id="ATNPunjabiPlus.ca" site_id="17043">ATN Punjabi Plus</channel>
    <channel lang="en" xmltv_id="ATNZoom.ca" site_id="10246">ATN Zoom</channel>
    <channel lang="en" xmltv_id="CartoonNetworkCanada.ca" site_id="10613">Cartoon Network Canada</channel>
-    <channel lang="en" xmltv_id="CBXTDT.ca" site_id="71733">CBC Edmonton</channel>
-    <channel lang="en" xmltv_id="CBRTDT.ca" site_id="15939">CBC Calgary</channel>
-    <channel lang="en" xmltv_id="CBHTDT.ca" site_id="72723">CBC Halifax</channel>
-    <channel lang="en" xmltv_id="CBMTDT.ca" site_id="53502">CBC Montreal</channel>
    <channel lang="en" xmltv_id="CBCNewsNetwork.ca" site_id="63287">CBC News Network</channel>
-    <channel lang="en" xmltv_id="CBOTDT.ca" site_id="10097">CBC Ottawa</channel>
-    <channel lang="en" xmltv_id="CBLTDT.ca" site_id="10091">CBC Toronto</channel>
    <channel lang="en" xmltv_id="CBETDT.ca" site_id="72772">CBC Windsor</channel>
-    <channel lang="en" xmltv_id="CBWTDT.ca" site_id="72940">CBC Winnipeg</channel>
-    <channel lang="fr" xmltv_id="CBFTDT.ca" site_id="45867">Ici Radio-Canada Télé</channel>
+    <channel lang="en" xmltv_id="CBHTDT.ca" site_id="72723">CBC Halifax</channel>
+    <channel lang="en" xmltv_id="CBLTDT.ca" site_id="10091">CBC Toronto</channel>
+    <channel lang="en" xmltv_id="CBMTDT.ca" site_id="53502">CBC Montreal</channel>
+    <channel lang="en" xmltv_id="CBOTDT.ca" site_id="10097">CBC Ottawa</channel>
+    <channel lang="en" xmltv_id="CBRTDT.ca" site_id="15939">CBC Calgary</channel>
    <channel lang="en" xmltv_id="CBSSportsNetworkCanada.ca" site_id="10708">CBS Sports Network Canada</channel>
+    <channel lang="en" xmltv_id="CBWTDT.ca" site_id="72940">CBC Winnipeg</channel>
+    <channel lang="en" xmltv_id="CBXTDT.ca" site_id="71733">CBC Edmonton</channel>
    <channel lang="en" xmltv_id="CFHDDT.ca" site_id="26780">ICI (CFHD-DT) Montréal, QC</channel>
-    <channel lang="fr" xmltv_id="CFTMDT.ca" site_id="72755">TVA</channel>
+    <channel lang="en" xmltv_id="CFPLDT.ca" site_id="72720">CTV2 (CFPL-DT) London ON</channel>
+    <channel lang="en" xmltv_id="CFTODT.ca" site_id="44784">CTV (CFTO-DT) Toronto ON</channel>
    <channel lang="en" xmltv_id="CHBCDT2.ca" site_id="13834">Global (CHBC-DT-2) Vernon, BC</channel>
    <channel lang="en" xmltv_id="CHKMDT.ca" site_id="11597">Global (CHKM) Kamloops, BC</channel>
-    <channel lang="en" xmltv_id="CICADT.ca" site_id="70583">TVOntario (CICA-DT) Toronto</channel>
-    <channel lang="fr" xmltv_id="CIVMDT.ca" site_id="63040">Télé-Québec</channel>
-    <channel lang="en" xmltv_id="CPACEnglish.ca" site_id="17608">CPAC</channel>
-    <channel lang="en" xmltv_id="CKVRDT.ca" site_id="72705">CTV2 (CKVR-DT) Barrie ON</channel>
-    <channel lang="en" xmltv_id="CFPLDT.ca" site_id="72720">CTV2 (CFPL-DT) London ON</channel>
    <channel lang="en" xmltv_id="CHWIDT.ca" site_id="72956">CTV2 (CHWI-DT) Wheatley ON</channel>
+    <channel lang="en" xmltv_id="CICADT.ca" site_id="70583">TVOntario (CICA-DT) Toronto</channel>
    <channel lang="en" xmltv_id="CKCODT.ca" site_id="72614">CTV (CKCO-DT) Kitchener ON</channel>
+    <channel lang="en" xmltv_id="CKVRDT.ca" site_id="72705">CTV2 (CKVR-DT) Barrie ON</channel>
+    <channel lang="en" xmltv_id="CPACEnglish.ca" site_id="17608">CPAC</channel>
    <channel lang="en" xmltv_id="CTVSciFiChannel.ca" site_id="72484">CTV Sci-Fi Channel</channel>
-    <channel lang="en" xmltv_id="CFTODT.ca" site_id="44784">CTV (CFTO-DT) Toronto ON</channel>
    <channel lang="en" xmltv_id="DejaView.ca" site_id="100638">Deja View</channel>
    <channel lang="en" xmltv_id="DisneyChannelCanadaWest.ca" site_id="16831">Disney Channel Canada West</channel>
    <channel lang="en" xmltv_id="FairchildTV2.ca" site_id="11397">Fairchild TV 2</channel>
@@ -42,20 +39,16 @@
    <channel lang="en" xmltv_id="FrissonsTV.ca" site_id="32125">Frissons TV</channel>
    <channel lang="en" xmltv_id="GlobalNewsBC1.ca" site_id="10980">Global News: BC1</channel>
    <channel lang="en" xmltv_id="History2Canada.ca" site_id="26772">History2 Canada</channel>
-    <channel lang="en" xmltv_id="History2HDCanada.ca" site_id="81208">History2 HD Canada</channel>	
+    <channel lang="en" xmltv_id="History2HDCanada.ca" site_id="81208">History2 HD Canada</channel>  
    <channel lang="en" xmltv_id="HollywoodSuite00sMovies.ca" site_id="73578">Hollywood Suite 00s Movies</channel>
    <channel lang="en" xmltv_id="HollywoodSuite70sMovies.ca" site_id="73572">Hollywood Suite 70s Movies</channel>
    <channel lang="en" xmltv_id="HollywoodSuite80sMovies.ca" site_id="73574">Hollywood Suite 80s Movies</channel>
    <channel lang="en" xmltv_id="HollywoodSuite90sMovies.ca" site_id="73571">Hollywood Suite 90s Movies</channel>
-    <channel lang="fr" xmltv_id="IciRDI.ca" site_id="60327">ICI RDI</channel>
    <channel lang="en" xmltv_id="Investigation.ca" site_id="11344">Investigation</channel>
-    <channel lang="fr" xmltv_id="LCN.ca" site_id="67231">LCN</channel>
    <channel lang="en" xmltv_id="LeafsNationNetwork.ca" site_id="60020">Leafs Nation Network</channel>
    <channel lang="en" xmltv_id="LoveNature.ca" site_id="52745">Love Nature</channel>
    <channel lang="en" xmltv_id="Makeful.ca" site_id="46217">Makeful</channel>
-    <channel lang="fr" xmltv_id="Noovo.ca" site_id="58688">Noovo</channel>
    <channel lang="en" xmltv_id="PrimeAsiaTV.ca" site_id="32677">Prime Asia TV</channel>
-    <channel lang="en" xmltv_id="StingrayQello.ca" site_id="113296">Qello Concerts by Stingray</channel>
    <channel lang="en" xmltv_id="SaisonsCanada.ca" site_id="20046">Saisons Canada</channel>
    <channel lang="en" xmltv_id="SportsmanChannelCanada.ca" site_id="32992">Sportsman Channel Canada</channel>
    <channel lang="en" xmltv_id="SportsnetEast.ca" site_id="70394">SportsNet East</channel>
@@ -72,23 +65,24 @@
    <channel lang="en" xmltv_id="StingrayClassicRB.ca" site_id="19047">Stingray Classic R&amp;B</channel>
    <channel lang="en" xmltv_id="StingrayClassicRock.ca" site_id="67567">Stingray Classic Rock</channel>
    <channel lang="en" xmltv_id="StingrayCountry.ca" site_id="35064">Stingray Country</channel>
-    <channel lang="en" xmltv_id="StingrayTodaysLatinPop.ca" site_id="68639">Stingray Exitos del Momento</channel>
+    <channel lang="en" xmltv_id="StingrayEverything80s.ca" site_id="67566">Stingray Remember the 80's</channel>
    <channel lang="en" xmltv_id="StingrayFestival4K.ca" site_id="34379">Stingray Festival 4K</channel>
    <channel lang="en" xmltv_id="StingrayFlashback70s.ca" site_id="67565">Stingray Flashback 70s</channel>
    <channel lang="en" xmltv_id="StingrayFrancoFetes.ca" site_id="17046">Stingray Franco Fêtes</channel>
    <channel lang="en" xmltv_id="StingrayGospel.ca" site_id="18845">Stingray Gospel</channel>
    <channel lang="en" xmltv_id="StingrayGreatestHits.ca" site_id="110433">Stingray Greatest Hits</channel>
-    <channel lang="en" xmltv_id="StingrayUrbanBeat.ca" site_id="67564">Stingray Hip-Hop/R&amp;B</channel>
    <channel lang="en" xmltv_id="StingrayHitList.ca" site_id="67555">Stingray Hit List</channel>
    <channel lang="en" xmltv_id="StingrayHotCountry.ca" site_id="67557">Stingray Hot Country</channel>
    <channel lang="en" xmltv_id="StingrayKaraoke.ca" site_id="110657">Stingray Karaoke</channel>
    <channel lang="en" xmltv_id="StingrayNaturescape.ca" site_id="90613">Stingray Naturescape</channel>
    <channel lang="en" xmltv_id="StingrayNoFences.ca" site_id="18841">Stingray No Fences</channel>
    <channel lang="en" xmltv_id="StingrayPopAdult.ca" site_id="67558">Stingray Pop Adult</channel>
-    <channel lang="en" xmltv_id="StingrayEverything80s.ca" site_id="67566">Stingray Remember the 80's</channel>
+    <channel lang="en" xmltv_id="StingrayQello.ca" site_id="113296">Qello Concerts by Stingray</channel>
    <channel lang="en" xmltv_id="StingrayRockAlternative.ca" site_id="67568">Stingray Rock Alternative</channel>
    <channel lang="en" xmltv_id="StingrayRomanceLatino.ca" site_id="19049">Stingray Romance Latino</channel>
    <channel lang="en" xmltv_id="StingraySoulStorm.ca" site_id="67563">Stingray Soul Storm</channel>
+    <channel lang="en" xmltv_id="StingrayTodaysLatinPop.ca" site_id="68639">Stingray Exitos del Momento</channel>
+    <channel lang="en" xmltv_id="StingrayUrbanBeat.ca" site_id="67564">Stingray Hip-Hop/R&amp;B</channel>
    <channel lang="en" xmltv_id="Telebimbi.ca" site_id="19655">Telebimbi</channel>
    <channel lang="en" xmltv_id="TheRuralChannel.ca" site_id="11109">The Rural Channel</channel>
    <channel lang="en" xmltv_id="TSN1.ca" site_id="11182">TSN1</channel>
@@ -101,5 +95,37 @@
    <channel lang="en" xmltv_id="WaterTelevisionNetwork.ca" site_id="35844">Water Television Network</channel>
    <channel lang="en" xmltv_id="WWENetworkCanada.ca" site_id="90143">WWE Network</channel>
    <channel lang="en" xmltv_id="YourTVMilton.ca" site_id="35589">YourTV Milton</channel>
+    <channel lang="fr" xmltv_id="CBFTDT.ca" site_id="45867">Ici Radio-Canada Télé</channel>
+    <channel lang="fr" xmltv_id="CFTMDT.ca" site_id="72755">TVA</channel>
+    <channel lang="fr" xmltv_id="CIVMDT.ca" site_id="63040">Télé-Québec</channel>
+    <channel lang="fr" xmltv_id="IciRDI.ca" site_id="60327">ICI RDI</channel>
+    <channel lang="fr" xmltv_id="LCN.ca" site_id="67231">LCN</channel>
+    <channel lang="fr" xmltv_id="Noovo.ca" site_id="58688">Noovo</channel>
+    <channel lang="en" xmltv_id="ShawPayPerView1.ca" site_id="22016">Pay Per View 1</channel>
+    <channel lang="en" xmltv_id="ShawPayPerView2.ca" site_id="22017">Pay Per View 2</channel>
+    <channel lang="en" xmltv_id="ShawPayPerView3.ca" site_id="22018">Pay Per View 3</channel>
+    <channel lang="en" xmltv_id="ShawPayPerView4.ca" site_id="22019">Pay Per View 4</channel>
+    <channel lang="en" xmltv_id="ShawPayPerView5.ca" site_id="22020">Pay Per View 5</channel>
+    <channel lang="en" xmltv_id="ShawPayPerView6.ca" site_id="22021">Pay Per View 6</channel>
+    <channel lang="en" xmltv_id="ShawPayPerView7.ca" site_id="22022">Pay Per View 7</channel>
+    <channel lang="en" xmltv_id="ShawPayPerView8.ca" site_id="22023">Pay Per View 8</channel>
+    <channel lang="en" xmltv_id="StingrayClassica.ca" site_id="67641">Stingray Classica</channel>
+    <channel lang="en" xmltv_id="StingrayClassicRock.ca" site_id="67567">Stingray Classic Rock</channel>
+    <channel lang="en" xmltv_id="StingrayEasyListening.ca" site_id="67573">Stingray Easy Listening</channel>
+    <channel lang="en" xmltv_id="StingrayEverything80s.ca" site_id="67566">Stingray Remember the 80's</channel>
+    <channel lang="en" xmltv_id="StingrayFlashback70s.ca" site_id="67565">Stingray Flashback 70s</channel>
+    <channel lang="en" xmltv_id="StingrayGreatestHits.ca" site_id="110433">Stingray Greatest Hits</channel>
+    <channel lang="en" xmltv_id="StingrayHitList.ca" site_id="67555">Stingray Hit List</channel>
+    <channel lang="en" xmltv_id="StingrayHotCountry.ca" site_id="67557">Stingray Hot Country</channel>
+    <channel lang="en" xmltv_id="StingrayKaraoke.ca" site_id="110657">Stingray Karaoke</channel>
+    <channel lang="en" xmltv_id="StingrayNothinBut90s.ca" site_id="68620">Stingray Nothin' But 90's</channel>
+    <channel lang="en" xmltv_id="StingrayPopAdult.ca" site_id="67558">Stingray Pop Adult</channel>
+    <channel lang="en" xmltv_id="StingrayQello.ca" site_id="113296">Qello Concerts by Stingray</channel>
+    <channel lang="en" xmltv_id="StingrayRockAlternative.ca" site_id="67568">Stingray Rock Alternative</channel>
+    <channel lang="en" xmltv_id="StingraySmoothJazz.ca" site_id="67571">Stingray Smooth Jazz</channel>
+    <channel lang="en" xmltv_id="StingraySoulStorm.ca" site_id="67563">Stingray Soul Storm</channel>
+    <channel lang="en" xmltv_id="StingrayTodaysLatinPop.ca" site_id="68639">Stingray Exitos del Momento</channel>
+    <channel lang="en" xmltv_id="StingrayUrbanBeat.ca" site_id="67564">Stingray Hip-Hop/R&amp;B</channel>
+    <channel lang="en" xmltv_id="WildBrainTV.ca" site_id="10176">Family CHRGD</channel>
  </channels>
 </site>
--- a/sites/tvtv.us/tvtv.us_us-local.channels.xml
+++ b/sites/tvtv.us/tvtv.us_us-local.channels.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site site="tvtv.us">
  <channels>
-    <channel lang="en" xmltv_id="WTNZDT1.us" site_id="11602">FOX (WTNZ) KNOXVILLE</channel>
-    <channel lang="en" xmltv_id="WBIRDT1.us" site_id="11305">NBC (WBIR) KNOXVILLE</channel>
-    <channel lang="en" xmltv_id="WVLTDT1.us" site_id="11627">CBS (WVLT) KNOXVILLE</channel>
-    <channel lang="en" xmltv_id="WATEDT1.us" site_id="11286">ABC (WATE) KNOXVILLE</channel>
    <channel lang="en" xmltv_id="K05FWD3.us" site_id="12531">360 North (K05FW-D3) Girdwood, AK</channel>
    <channel lang="en" xmltv_id="K08MMD1.us" site_id="103348">Three Angels (K08MM) Bakersfield, CA</channel>
    <channel lang="en" xmltv_id="K11LCD2.us" site_id="34499">Comet TV (K11LC-D2) Prescott, AZ</channel>
@@ -408,7 +404,7 @@
    <channel lang="en" xmltv_id="KITVDT1.us" site_id="19590">ABC (KITV) Honolulu, HI</channel>
    <channel lang="en" xmltv_id="KITVDT2.us" site_id="55988">MeTV (KITV-DT2) Honolulu, HI</channel>
    <channel lang="en" xmltv_id="KITVDT3.us" site_id="109140">Hawaii TV (KITV-DT3) Honolulu, HI</channel>
-    <channel lang="en" xmltv_id="KIVIDT1.us" site_id="28023">ABC (KIVI-DT1) Boise, ID</channel>	
+    <channel lang="en" xmltv_id="KIVIDT1.us" site_id="28023">ABC (KIVI-DT1) Boise, ID</channel> 
    <channel lang="en" xmltv_id="KIXEDT1.us" site_id="42680">PBS (KIXE) Redding, CA</channel>
    <channel lang="en" xmltv_id="KIXEDT2.us" site_id="46790">Create (KIXE-TV2) Redding, CA</channel>
    <channel lang="en" xmltv_id="KIXEDT3.us" site_id="55603">PBS World (KIXE-DT3) Redding, CA</channel>
@@ -445,7 +441,7 @@
    <channel lang="en" xmltv_id="KLCSDT2.us" site_id="43779">PBS Kids (KLCS-DT2) Los Angeles, CA</channel>
    <channel lang="en" xmltv_id="KLFBLD1.us" site_id="78681">Three Angels (KLFB-LD) Salinas, CA</channel>
    <channel lang="en" xmltv_id="KLFBLD2.us" site_id="78682">3ABN Latino (KLFB-LD2) Salinas, CA</channel>
-    <channel lang="en" xmltv_id="KLFBLD3.us" site_id="78683">3ABN Proclaim (KLFB-LD3) Salinas, CA</channel>	
+    <channel lang="en" xmltv_id="KLFBLD3.us" site_id="78683">3ABN Proclaim (KLFB-LD3) Salinas, CA</channel> 
    <channel lang="en" xmltv_id="KLKNDT1.us" site_id="31652">ABC (KLKN-DT1) Lincoln, NE</channel>
    <channel lang="en" xmltv_id="KLPDLD2.us" site_id="15462">Decades (KLPD-LD2) Denver, CO</channel>
    <channel lang="en" xmltv_id="KLRACD4.us" site_id="36259">Retro TV (KLRA-CD4) Little Rock, AR</channel>
@@ -683,7 +679,7 @@
    <channel lang="en" xmltv_id="KSEEDT3.us" site_id="57694">LATV (KSEE-DT3) Fresno, CA</channel>
    <channel lang="en" xmltv_id="KSFVCD2.us" site_id="87005">Mana (KSFV-CD2) Los Angeles, CA</channel>
    <channel lang="en" xmltv_id="KSFVCD3.us" site_id="83157">Corner Store (KSFV-CD3) Los Angeles, CA</channel>
-    <channel lang="en" xmltv_id="KSFYDT1.us" site_id="20375">ABC (KSFY-DT1) Sioux Falls, SD</channel>	
+    <channel lang="en" xmltv_id="KSFYDT1.us" site_id="20375">ABC (KSFY-DT1) Sioux Falls, SD</channel> 
    <channel lang="en" xmltv_id="KSKJCD1.us" site_id="97134">beIN Sports Xtra (KSKJ-CD) Los Angeles, CA</channel>
    <channel lang="en" xmltv_id="KSKJCD2.us" site_id="97135">SSTN (KSKJ-DT2) Los Angeles, CA</channel>
    <channel lang="en" xmltv_id="KSKJCD3.us" site_id="97173">Infomercials (KSKJ-CD3) Los Angeles, CA</channel>
@@ -779,7 +775,8 @@
    <channel lang="en" xmltv_id="KTVIDT1.us" site_id="21300">FOX (KTVI-DT1) St Louis, MO</channel>
    <channel lang="en" xmltv_id="KTVIDT2.us" site_id="70954">Antenna TV (KTVI-DT2) St Louis, MO</channel>
    <channel lang="en" xmltv_id="KTVIDT3.us" site_id="98169">Ion Mystery (KTVI-DT3) St Louis, MO</channel>
-    <channel lang="en" xmltv_id="KTVIDT4.us" site_id="112482">Dabl (KTVI-DT4) St Louis, MO</channel>	
+    <channel lang="en" xmltv_id="KTVIDT4.us" site_id="112482">Dabl (KTVI-DT4) St Louis, MO</channel>  
+    <channel lang="en" xmltv_id="KTVMDT1.us" site_id="30608">NBC (KTVM-DT1) Butte, MT</channel>
    <channel lang="en" xmltv_id="KTVODT1.us" site_id="34831">ABC (KTVO-DT1) Kirskville, MO</channel>
    <channel lang="en" xmltv_id="KTVPLD3.us" site_id="16718">Shop LC (KTVP-LD3) Phoenix, AZ</channel>
    <channel lang="en" xmltv_id="KTVTDT1.us" site_id="20204">CBS (WFAA-DT1) Dallas, TX</channel>
@@ -790,7 +787,6 @@
    <channel lang="en" xmltv_id="KTVUDT2.us" site_id="50439">LATV (KTVU-DT2) San Francisco, CA</channel>
    <channel lang="en" xmltv_id="KTVUDT3.us" site_id="92206">Movies! (KTVU-DT3) San Francisco, CA</channel>
    <channel lang="en" xmltv_id="KTVUDT4.us" site_id="94801">Buzzr TV (KTVU4) Oakland, CA</channel>
-    <channel lang="en" xmltv_id="KTVMDT1.us" site_id="30608">NBC (KTVM-DT1) Butte, MT</channel>
    <channel lang="en" xmltv_id="KTVWDT5.us" site_id="36592">Digi TV (KTVW-DT5) Phoenix, AZ</channel>
    <channel lang="en" xmltv_id="KTXHDT1.us" site_id="30977">MyNetwork (KTXH-DT1) Houston TX</channel>
    <channel lang="en" xmltv_id="KTXHDT2.us" site_id="81449">Movies! (KTXH-DT2) Houston TX</channel>
@@ -873,7 +869,7 @@
    <channel lang="en" xmltv_id="KVPTDT3.us" site_id="55439">Create (KVPT3) Fresno, CA</channel>
    <channel lang="en" xmltv_id="KVPTDT4.us" site_id="97775">PBS World (KVPT-DT4) Fresno, CA</channel>
    <channel lang="en" xmltv_id="KVSNDT2.us" site_id="18339">UniMás (KVSN-DT2) Colorado Springs, CO</channel>
-    <channel lang="en" xmltv_id="KVUEDT1.us" site_id="33585">ABC (KVUE-DT1) Austin, TX</channel>	
+    <channel lang="en" xmltv_id="KVUEDT1.us" site_id="33585">ABC (KVUE-DT1) Austin, TX</channel>  
    <channel lang="en" xmltv_id="KVVGLD1.us" site_id="84439">Azteca (KVVG-LD) Porterville, CA</channel>
    <channel lang="en" xmltv_id="KWGNDT1.us" site_id="20370">CW (KWGN-DT1) Denver, CO</channel>
    <channel lang="en" xmltv_id="KWHYDT1.us" site_id="24023">Canal 22 (KWHY-TV) Los Angeles, CA</channel>
@@ -882,7 +878,7 @@
    <channel lang="en" xmltv_id="KWHYDT5.us" site_id="97810">Majestadtv (KWHY-DT5) Los Angeles, CA</channel>
    <channel lang="en" xmltv_id="KWMOLD2.us" site_id="36260">Infomercials (KWMO-LD2) Hot Springs, AR</channel>
    <channel lang="en" xmltv_id="KWYBDT1.us" site_id="62998">ABC (KWYB-DT1) Butte, MT</channel>   
-    <channel lang="en" xmltv_id="KXANDT1.us" site_id="25147">NBC (KXAN-DT1) Austin, TX</channel>		
+    <channel lang="en" xmltv_id="KXANDT1.us" site_id="25147">NBC (KXAN-DT1) Austin, TX</channel>    
    <channel lang="en" xmltv_id="KXASDT1.us" site_id="19627">NBC (KXAS-DT1) Dallas TX</channel>
    <channel lang="en" xmltv_id="KXASDT2.us" site_id="45803">Cozi TV (KXAS-DT2) Dallas TX</channel>
    <channel lang="en" xmltv_id="KXASDT3.us" site_id="61401">NBCLX (KXAS-DT3) Dallas TX</channel>
@@ -955,6 +951,8 @@
    <channel lang="en" xmltv_id="WALELD4.us" site_id="31252">Jewelry TV (WALE-LD4) Montgomery, AL</channel>
    <channel lang="en" xmltv_id="WAPADT1.us" site_id="44322">WAPA America</channel>
    <channel lang="en" xmltv_id="WAPADT2.us" site_id="63739">WAPA Deportes</channel>
+    <channel lang="en" xmltv_id="WASALD1.us" site_id="75011">EstrellaTV (WASA-LD1) Port Jervis, NY</channel>
+    <channel lang="en" xmltv_id="WATEDT1.us" site_id="11286">ABC (WATE) KNOXVILLE</channel>
    <channel lang="en" xmltv_id="WATLDT1.us" site_id="31621">My Network TV (WATL-DT1) Atlanta, GA</channel>
    <channel lang="en" xmltv_id="WATLDT2.us" site_id="70568">This TV (WATL-DT2) Atlanta, GA</channel>
    <channel lang="en" xmltv_id="WATLDT3.us" site_id="91912">Antenna TV (WATL-DT3) Atlanta, GA</channel>
@@ -962,7 +960,6 @@
    <channel lang="en" xmltv_id="WATMDT2.us" site_id="58804">FOX (WATM2) Altoona, PA</channel>
    <channel lang="en" xmltv_id="WATMDT3.us" site_id="58806">Cozi TV (WATM3) Altoona, PA</channel>
    <channel lang="en" xmltv_id="WATMDT4.us" site_id="91912">This TV (WATM4) Altoona, PA</channel>
-    <channel lang="en" xmltv_id="WASALD1.us" site_id="75011">EstrellaTV (WASA-LD1) Port Jervis, NY</channel>
    <channel lang="en" xmltv_id="WAXNDT1.us" site_id="30908">TV 64 (WAXN-DT1) Kannapolis, NC</channel>
    <channel lang="en" xmltv_id="WBALDT1.us" site_id="21231">NBC (WBAL-DT1) Baltimore, MD</channel>
    <channel lang="en" xmltv_id="WBALDT2.us" site_id="48570">MeTV (WBAL-DT2) Baltimore, MD</channel>
@@ -971,13 +968,18 @@
    <channel lang="en" xmltv_id="WBBMDT2.us" site_id="91649">Start TV (WFMZ-DT2) Chicago, IL</channel>
    <channel lang="en" xmltv_id="WBBMDT3.us" site_id="112504">Dabl (WFMZ-DT3) Chicago, IL</channel>
    <channel lang="en" xmltv_id="WBBZDT1.us" site_id="63992">MeTV (WBBZ-TV) Springville, NY</channel>
+    <channel lang="en" xmltv_id="WBCFLD2.us" site_id="31473">YouToo America (WBCF-LD2) Florence, AL</channel>
    <channel lang="en" xmltv_id="WBFFDT1.us" site_id="21233">FOX (WBFF-DT1) Baltimore, MD</channel>
    <channel lang="en" xmltv_id="WBFFDT2.us" site_id="50339">My TV (WBFF-DT2) Baltimore, MD</channel>
-    <channel lang="en" xmltv_id="WBCFLD2.us" site_id="31473">YouToo America (WBCF-LD2) Florence, AL</channel>
    <channel lang="en" xmltv_id="WBGTCD5.us" site_id="33298">Decades (WBGT-CD5) Rochester, NY</channel>
    <channel lang="en" xmltv_id="WBGTCD7.us" site_id="33299">Movies! (WBGT-CD7) Rochester, NY</channel>
    <channel lang="en" xmltv_id="WBGUDT1.us" site_id="35058">PBS (WBGU-TV) Toledo, OH</channel>
+    <channel lang="en" xmltv_id="WBIRDT1.us" site_id="11305">NBC (WBIR) KNOXVILLE</channel>
    <channel lang="en" xmltv_id="WBNXDT1.us" site_id="55926">WBNX-TV 55 (WBNX-DT1) Akron, OH</channel>
+    <channel lang="en" xmltv_id="WBONLD1.us" site_id="77242">AMG TV (WBON-LD) Richmond, KY</channel>
+    <channel lang="en" xmltv_id="WBONLD2.us" site_id="84234">Buzzr TV (WBON-LD2) Richmond, KY</channel>
+    <channel lang="en" xmltv_id="WBONLD3.us" site_id="84235">Heartland (WBON-LD3) Richmond, KY</channel>
+    <channel lang="en" xmltv_id="WBONLD4.us" site_id="115204">Retro TV (WBON-LD4) Richmond, KY</channel>
    <channel lang="en" xmltv_id="WBRZDT1.us" site_id="30436">ABC (WBRZ-DT1) Baton Rouge, LA</channel>
    <channel lang="en" xmltv_id="WBSFDT1.us" site_id="63898">CW (WBSF) Bay City, MI</channel>
    <channel lang="en" xmltv_id="WBTSCD1.us" site_id="91446">NBC (WBTS-CD1) Boston, MA</channel>
@@ -1012,7 +1014,7 @@
    <channel lang="en" xmltv_id="WCIUDT5.us" site_id="70376">MeTV Plus (WCIU-DT5) Chicago, IL</channel>
    <channel lang="en" xmltv_id="WCIUDT6.us" site_id="59674">Decades (WCIU-DT6) Chicago, IL</channel>
    <channel lang="en" xmltv_id="WCMUDT1.us" site_id="66291">PBS (WCMU-TV) Mount Pleasant, MI</channel>
-    <channel lang="en" xmltv_id="WCTIDT1.us" site_id="31042">ABC (WCTI-DT1) New Bern, NC</channel>	
+    <channel lang="en" xmltv_id="WCTIDT1.us" site_id="31042">ABC (WCTI-DT1) New Bern, NC</channel>  
    <channel lang="en" xmltv_id="WCTVDT1.us" site_id="44739">CBS (WCTV1) Tallahassee, FL</channel>
    <channel lang="en" xmltv_id="WCTVDT2.us" site_id="46285">MeTV (WCTV2) Tallahassee, FL</channel>
    <channel lang="en" xmltv_id="WCTVDT3.us" site_id="109194">Circle (WCTV3) Tallahassee, FL</channel>
@@ -1022,6 +1024,10 @@
    <channel lang="en" xmltv_id="WCTXDT2.us" site_id="59401">Comet (WCTX-DT2) Hartford, CT </channel>
    <channel lang="en" xmltv_id="WCVBDT1.us" site_id="19596">ABC (WCVB-DT1) Boston, MA</channel>
    <channel lang="en" xmltv_id="WCVBDT2.us" site_id="35356">MeTV (WCVB-DT2) Boston, MA</channel>
+    <channel lang="en" xmltv_id="WCVEDT1.us" site_id="43782">PBS (WCVE-DT) Richmond, VA</channel>
+    <channel lang="en" xmltv_id="WCVEDT2.us" site_id="58837">Create (WCVE-DT2) Richmond, VA</channel>
+    <channel lang="en" xmltv_id="WCVEDT3.us" site_id="58918">PBS World (WCVE-DT3) Richmond, VA</channel>
+    <channel lang="en" xmltv_id="WCVEDT4.us" site_id="108690">PBS Kids (WCVE-DT4) Richmond, VA</channel>
    <channel lang="en" xmltv_id="WCWNDT1.us" site_id="34986">CW (WCWN-DT1) Albany, NY</channel>
    <channel lang="en" xmltv_id="WDCADT1.us" site_id="34427">My Network TV (WDCA-DT1) Washington D.C.</channel>
    <channel lang="en" xmltv_id="WDCADT2.us" site_id="77760">Movies! (WDCA-DT2) Washington D.C.</channel>
@@ -1151,9 +1157,9 @@
    <channel lang="en" xmltv_id="WJACDT2.us" site_id="49028">MeTV (WJAC2) Altoona, PA</channel>
    <channel lang="en" xmltv_id="WJACDT3.us" site_id="91485">Comet (WJAC3) Altoona, PA</channel>
    <channel lang="en" xmltv_id="WJACDT4.us" site_id="98160">CW (WJAC4) Altoona, PA</channel>
-    <channel lang="en" xmltv_id="WJBKDT1.us" site_id="19600">FOX (WJBK-DT1) Detroit, MI</channel>
    <channel lang="en" xmltv_id="WJBFDT1.us" site_id="35066">ABC (WJBF-DT1) Augusta, GA</channel>
-    <channel lang="en" xmltv_id="WJLADT1.us" site_id="19579">ABC (WJLA-DT1) Washington, DC</channel>	
+    <channel lang="en" xmltv_id="WJBKDT1.us" site_id="19600">FOX (WJBK-DT1) Detroit, MI</channel>
+    <channel lang="en" xmltv_id="WJLADT1.us" site_id="19579">ABC (WJLA-DT1) Washington, DC</channel>  
    <channel lang="en" xmltv_id="WJLPDT1.us" site_id="75523">MeTV (WJLP-DT1) New York, NY</channel>
    <channel lang="en" xmltv_id="WJLPDT2.us" site_id="92098">Laff (WJLP-DT2) New York, NY</channel>
    <channel lang="en" xmltv_id="WJLPDT3.us" site_id="99162">Grit (WJLP-DT3) New York, NY</channel>
@@ -1168,9 +1174,9 @@
    <channel lang="en" xmltv_id="WJWDT3.us" site_id="106509">Comet (WJW-DT3) Cleveland, OH</channel>
    <channel lang="en" xmltv_id="WJWDT4.us" site_id="106510">Charge (WJW-DT4) Cleveland, OH</channel>
    <channel lang="en" xmltv_id="WJZDT1.us" site_id="21232">CBS (WJZ-DT1) Baltimore, MD</channel>
-    <channel lang="en" xmltv_id="WKARDT1.us" site_id="42529">PBS (WKAR-TV) East Lansing, MI</channel>
    <channel lang="en" xmltv_id="WKAQDT1.us" site_id="12569">Telemundo (WKAQ-DT) San Juan, PR</channel>
    <channel lang="en" xmltv_id="WKAQDT2.us" site_id="69285">Punto 2 (WKAQ-DT) San Juan, PR</channel>
+    <channel lang="en" xmltv_id="WKARDT1.us" site_id="42529">PBS (WKAR-TV) East Lansing, MI</channel>
    <channel lang="en" xmltv_id="WKBDDT1.us" site_id="25126">CW (WKBD-TV) Detroit, MI</channel>
    <channel lang="en" xmltv_id="WKBWDT1.us" site_id="24052">ABC (WKBW1) Buffalo, NY</channel>
    <channel lang="en" xmltv_id="WKBWDT2.us" site_id="56328">Bounce (WKBW2) Buffalo, NY</channel>
@@ -1185,6 +1191,11 @@
    <channel lang="en" xmltv_id="WKOBLD6.us" site_id="81777">EstrellaTV (WKOB-LD6) New York, NY</channel>
    <channel lang="en" xmltv_id="WKOBLD7.us" site_id="113863">Shop LC (WKOB-LD7) New York, NY</channel>
    <channel lang="en" xmltv_id="WKOBLD8.us" site_id="113864">Novelisima (WKOB-LD8) New York, NY</channel>
+    <channel lang="en" xmltv_id="WKOIDT1.us" site_id="34609">ION (WKOI-DT) Richmond, IN</channel>
+    <channel lang="en" xmltv_id="WKOIDT2.us" site_id="50100">Hillsong (WKOI-DT2) Richmond, IN</channel>
+    <channel lang="en" xmltv_id="WKOIDT3.us" site_id="50102">PosiTiV (WKOI-DT3) Richmond, IN</channel>
+    <channel lang="en" xmltv_id="WKOIDT4.us" site_id="50104">Enlace (WKOI-DT4) Richmond, IN</channel>
+    <channel lang="en" xmltv_id="WKOIDT5.us" site_id="50106">Smile (WKOI-DT5) Richmond, IN</channel>
    <channel lang="en" xmltv_id="WKRNDT1.us" site_id="20465">ABC (WKRN-DT1) Nashville, TN</channel>
    <channel lang="en" xmltv_id="WKYCDT1.us" site_id="20492">NBC (WKYC-DT1) Cleveland, OH</channel>
    <channel lang="en" xmltv_id="WKYCDT2.us" site_id="42697">True Crime Network (WKYC-DT2) Cleveland, OH</channel>
@@ -1220,10 +1231,10 @@
    <channel lang="en" xmltv_id="WMARDT3.us" site_id="43981">Bounce (WMAR-DT3) Washington D.C.</channel>
    <channel lang="en" xmltv_id="WMARDT4.us" site_id="106560">Court TV Mystery (WMAR-DT4) Washington D.C.</channel>
    <channel lang="en" xmltv_id="WMARDT5.us" site_id="111220">Court TV (WMAR-DT5) Washington D.C.</channel>
-    <channel lang="en" xmltv_id="WMBBDT1.us" site_id="30594">ABC (WMBB-DT1) Panama City, FL</channel>		
-    <channel lang="en" xmltv_id="WMBCDT1.us" site_id="35911">WMBC (WMBC-DT1) Newton, NJ</channel>	
-    <channel lang="en" xmltv_id="WMBCDT2.us" site_id="55810">Quest (WMBC-DT2) Newton, NJ</channel>		
-    <channel lang="en" xmltv_id="WMBCDT3.us" site_id="55772">TBD (WMBC-DT3) Newton, NJ</channel>		
+    <channel lang="en" xmltv_id="WMBBDT1.us" site_id="30594">ABC (WMBB-DT1) Panama City, FL</channel>   
+    <channel lang="en" xmltv_id="WMBCDT1.us" site_id="35911">WMBC (WMBC-DT1) Newton, NJ</channel> 
+    <channel lang="en" xmltv_id="WMBCDT2.us" site_id="55810">Quest (WMBC-DT2) Newton, NJ</channel>    
+    <channel lang="en" xmltv_id="WMBCDT3.us" site_id="55772">TBD (WMBC-DT3) Newton, NJ</channel>    
    <channel lang="en" xmltv_id="WMBCDT4.us" site_id="55773">SinoVision (WMBC-DT4) Newton, NJ</channel>
    <channel lang="en" xmltv_id="WMBCDT5.us" site_id="62811">New Tang Dynasty (WMBC-DT5) Newton, NJ</channel>
    <channel lang="en" xmltv_id="WMBCDT7.us" site_id="78580">Aliento Vision (WMBC-DT7) Newton, NJ</channel>
@@ -1344,6 +1355,14 @@
    <channel lang="en" xmltv_id="WRCDT4.us" site_id="106502">Telemundp (WRC-DT4) Washington D.C.</channel>
    <channel lang="en" xmltv_id="WRCFCD1.us" site_id="83296">UniMás 29 (WRCF-CD1) Orlando, FL</channel>
    <channel lang="en" xmltv_id="WRDQDT1.us" site_id="31505">TV27 (WRDQ-DT1) Orlando, FL</channel>
+    <channel lang="en" xmltv_id="WRICDT1.us" site_id="20458">ABC (WRIC-DT) Richmond, VA</channel>
+    <channel lang="en" xmltv_id="WRICDT2.us" site_id="71490">ION (WRIC-DT2) Richmond, VA</channel>
+    <channel lang="en" xmltv_id="WRICDT3.us" site_id="98442">Cozi TV (WRIC-DT3) Richmond, VA</channel>
+    <channel lang="en" xmltv_id="WRLHDT1.us" site_id="34674">FOX (WRLH-DT) Richmond, KY</channel>
+    <channel lang="en" xmltv_id="WRLHDT2.us" site_id="52724">MyNetworkTV (WRLH-DT2) Richmond, KY</channel>
+    <channel lang="en" xmltv_id="WRLHDT3.us" site_id="69969">Comet TV (WRLH-DT3) Richmond, KY</channel>
+    <channel lang="en" xmltv_id="WRLHDT4.us" site_id="102233">CHARGE! (WRLH-DT4) Richmond, KY</channel>
+    <channel lang="en" xmltv_id="WRLHDT5.us" site_id="112986">Dabl (WRLH-DT5) Richmond, KY</channel>
    <channel lang="en" xmltv_id="WRNNDT1.us" site_id="101453">WRNN/ShopHQ (WRNN-DT1) New Rochelle, NY</channel>
    <channel lang="en" xmltv_id="WRNNDT2.us" site_id="55565">Circle (WRNN-DT2) Kingston, NY</channel>
    <channel lang="en" xmltv_id="WRNNDT3.us" site_id="55567">Canal de La Fe (WRNN-DT3) New York, NY</channel>
@@ -1376,7 +1395,6 @@
    <channel lang="en" xmltv_id="WSNSDT1.us" site_id="24521">Telemundo (WSNS-DT1) Chicago, IL</channel>
    <channel lang="en" xmltv_id="WSNSDT2.us" site_id="67535">TeleXitos (WSNS-DT2) Chicago, IL</channel>
    <channel lang="en" xmltv_id="WSOCDT1.us" site_id="20494">ABC (WSOC-DT1) Charlotte, NC</channel>
-    <channel lang="es" xmltv_id="WSOCDT2.us" site_id="45250">Telemundo (WSOC-DT2) Charlotte, NC</channel>
    <channel lang="en" xmltv_id="WSSFLD2.us" site_id="15616">The Cowboy Channel (WSSF-LD2) Fayette, AL</channel>
    <channel lang="en" xmltv_id="WSSFLD3.us" site_id="15614">Smile (WSSF-LD3) Fayette, AL</channel>
    <channel lang="en" xmltv_id="WSSFLD6.us" site_id="15618">TBN (WSSF-LD6) Fayette, AL</channel>
@@ -1405,7 +1423,8 @@
    <channel lang="en" xmltv_id="WTMOCD1.us" site_id="78613">Telemundo 31 (WTMO-CD1) Orlando, FL</channel>
    <channel lang="en" xmltv_id="WTNHDT1.us" site_id="67497">ABC (WTNH-DT1) Hartford, CT </channel>
    <channel lang="en" xmltv_id="WTNHDT2.us" site_id="67497">Rewind TV (WTNH-DT2) Hartford, CT </channel>
-    <channel lang="en" xmltv_id="WTOKDT1.us" site_id="43182">ABC (WTOK-DT1) Meridian, MS</channel>	
+    <channel lang="en" xmltv_id="WTNZDT1.us" site_id="11602">FOX (WTNZ) KNOXVILLE</channel>
+    <channel lang="en" xmltv_id="WTOKDT1.us" site_id="43182">ABC (WTOK-DT1) Meridian, MS</channel>  
    <channel lang="en" xmltv_id="WTOLDT1.us" site_id="30754">CBS (WTOL) Toledo, OH</channel>
    <channel lang="en" xmltv_id="WTTGDT1.us" site_id="20367">FOX (WTTG-DT1) Washington D.C.</channel>
    <channel lang="en" xmltv_id="WTTGDT2.us" site_id="94963">Burzzr (WTTG-DT2) Washington D.C.</channel>
@@ -1417,6 +1436,8 @@
    <channel lang="en" xmltv_id="WTTWDT2.us" site_id="36111">WTTW Prime (WTTW-DT2) Chicago, IL</channel>
    <channel lang="en" xmltv_id="WTTWDT3.us" site_id="49346">Create and World (WTTW-DT3) Chicago, IL</channel>
    <channel lang="en" xmltv_id="WTVDDT1.us" site_id="21103">ABC (WTVD-DT1) Durham, NC</channel>
+    <channel lang="en" xmltv_id="WTVEDT1.us" site_id="34796">TVE51/Infomercials (WTVE-DT1) Reading, PA</channel>
+    <channel lang="en" xmltv_id="WTVEDT2.us" site_id="78908">Timeless/Infomercials (WTVE-DT2) Reading, PA</channel>
    <channel lang="en" xmltv_id="WTVFDT1.us" site_id="28659">CBS (WTVF-DT1) Nashville, TN</channel>
    <channel lang="en" xmltv_id="WTVFDT2.us" site_id="31244">Newschannel 5+ (WTVF-DT2) Nashville, TN</channel>
    <channel lang="en" xmltv_id="WTVGDT1.us" site_id="31709">ABC (WTVG) Toledo, OH</channel>
@@ -1424,13 +1445,14 @@
    <channel lang="en" xmltv_id="WTVJDT1.us" site_id="21219">NBC (WTVJ-DT1) Miami, FL</channel>
    <channel lang="en" xmltv_id="WTVJDT2.us" site_id="45543">Cozi TV (WTVJ-DT2) Miami, FL</channel>
    <channel lang="en" xmltv_id="WTVJDT3.us" site_id="63644">NBCLX (WTVJ-DT3) Miami, FL</channel>
+    <channel lang="en" xmltv_id="WTVRDT1.us" site_id="36075">CBS (WTVR-DT) Richmond, KY</channel>
+    <channel lang="en" xmltv_id="WTVRDT2.us" site_id="46787">Antenna TV (WTVR-DT2) Richmond, KY</channel>
+    <channel lang="en" xmltv_id="WTVRDT4.us" site_id="47679">Court TV (WTVR-DT4) Richmond, KY</channel>
    <channel lang="en" xmltv_id="WTVSDT1.us" site_id="25512">PBS (WTVS-DT1) Detroit, MI</channel>
    <channel lang="en" xmltv_id="WTVSDT5.us" site_id="117254">Michigan Learning Channel (WTVS-DT5) Detroit, MI</channel>
    <channel lang="en" xmltv_id="WTVUCD3.us" site_id="35645">H&amp;I (WTVU-CD3) Syracuse, NY</channel>
    <channel lang="en" xmltv_id="WTVUCD5.us" site_id="35647">Decades (WTVU-CD5) Syracuse, NY</channel>
    <channel lang="en" xmltv_id="WTVUCD6.us" site_id="35648">Movies! (WTVU-CD6) Syracuse, NY</channel>
-    <channel lang="en" xmltv_id="WTVEDT1.us" site_id="34796">TVE51/Infomercials (WTVE-DT1) Reading, PA</channel>
-    <channel lang="en" xmltv_id="WTVEDT2.us" site_id="78908">Timeless/Infomercials (WTVE-DT2) Reading, PA</channel>
    <channel lang="en" xmltv_id="WTWCDT1.us" site_id="36063">NBC (WCTV1) Tallahassee, FL</channel>
    <channel lang="en" xmltv_id="WTWCDT2.us" site_id="50901">FOX (WCTV2) Tallahassee, FL</channel>
    <channel lang="en" xmltv_id="WTWCDT3.us" site_id="43722">Charge! (WCTV3) Tallahassee, FL</channel>
@@ -1478,8 +1500,14 @@
    <channel lang="en" xmltv_id="WVIZDT3.us" site_id="57737">PBS World (WVIZ-DT3) Cleveland, OH</channel>
    <channel lang="en" xmltv_id="WVIZDT4.us" site_id="57703">PBS Create (WVIZ-DT4) Cleveland, OH</channel>
    <channel lang="en" xmltv_id="WVIZDT5.us" site_id="102096">PBS Kids (WVIZ-DT5) Cleveland, OH</channel>
+    <channel lang="en" xmltv_id="WVLTDT1.us" site_id="11627">CBS (WVLT) KNOXVILLE</channel>
    <channel lang="en" xmltv_id="WVTTCD4.us" site_id="36323">Infomercials (WVTT-CD4) Olean, NY</channel>
    <channel lang="en" xmltv_id="WVVCLD2.us" site_id="17385">Cornerstone (WVVC-LD2) Utica, NY</channel>
+    <channel lang="en" xmltv_id="WWBTDT1.us" site_id="30305">NBC (WWBT-DT) Richmond, KY</channel>
+    <channel lang="en" xmltv_id="WWBTDT2.us" site_id="30674">MeTV (WWBT-DT2) Richmond, KY</channel>
+    <channel lang="en" xmltv_id="WWBTDT3.us" site_id="30675">Circle (WWBT-DT3) Richmond, KY</channel>
+    <channel lang="en" xmltv_id="WWBTDT4.us" site_id="113527">Ion Mystery (WWBT-DT4) Richmond, KY</channel>
+    <channel lang="en" xmltv_id="WWBTDT5.us" site_id="114161">True Crime Network (WWBT-DT5) Richmond, KY</channel>
    <channel lang="en" xmltv_id="WWJDT1.us" site_id="20376">CBS (WWJ-DT1) Detroit, MI</channel>
    <channel lang="en" xmltv_id="WWJDT2.us" site_id="42610">Start TV (WWJ-DT2) Detroit, MI</channel>
    <channel lang="en" xmltv_id="WWJDT3.us" site_id="42611">Dabl (WWJ-DT3) Detroit, MI</channel>
@@ -1495,6 +1523,10 @@
    <channel lang="en" xmltv_id="WXIADT1.us" site_id="19587">NBC (WXIA-DT1) Atanta, GA</channel>
    <channel lang="en" xmltv_id="WXIADT3.us" site_id="63920">True Crime Network (WXIA-DT3) Atanta, GA</channel>
    <channel lang="en" xmltv_id="WXIADT4.us" site_id="107026">Quest (WXIA-DT4) Atanta, GA</channel>
+    <channel lang="en" xmltv_id="WXMIDT1.us" site_id="31707">FOX (WXMI-DT1) Grand Rapids, MI</channel>
+    <channel lang="en" xmltv_id="WXMIDT2.us" site_id="50772">Antenna TV (WXMI-DT2) Grand Rapids, MI</channel>
+    <channel lang="en" xmltv_id="WXMIDT3.us" site_id="70381">Bounce (WXMI-DT3) Grand Rapids, MI</channel>
+    <channel lang="en" xmltv_id="WXMIDT4.us" site_id="107639">Ion Mystery (WXMI-DT4) Grand Rapids, MI</channel>
    <channel lang="en" xmltv_id="WXNYLD2.us" site_id="16443">CCTV 4 America (WXNY-LD2) New York, NY</channel>
    <channel lang="en" xmltv_id="WXNYLD3.us" site_id="16444">CGTN Español (WXNY-LD3) New York, NY</channel>
    <channel lang="en" xmltv_id="WXNYLD4.us" site_id="16446">Retro TV (WXNY-LD4) New York, NY</channel>
@@ -1505,10 +1537,6 @@
    <channel lang="en" xmltv_id="WXTVDT3.us" site_id="91913">Twist (WXTV-DT3) NY</channel>
    <channel lang="en" xmltv_id="WXTVDT4.us" site_id="90175">Grit (WXTV-DT4) NY</channel>
    <channel lang="en" xmltv_id="WXXADT4.us" site_id="34871">WXXA-TV4</channel>
-    <channel lang="en" xmltv_id="WXMIDT1.us" site_id="31707">FOX (WXMI-DT1) Grand Rapids, MI</channel>
-    <channel lang="en" xmltv_id="WXMIDT2.us" site_id="50772">Antenna TV (WXMI-DT2) Grand Rapids, MI</channel>
-    <channel lang="en" xmltv_id="WXMIDT3.us" site_id="70381">Bounce (WXMI-DT3) Grand Rapids, MI</channel>
-    <channel lang="en" xmltv_id="WXMIDT4.us" site_id="107639">Ion Mystery (WXMI-DT4) Grand Rapids, MI</channel>
    <channel lang="en" xmltv_id="WXYZDT1.us" site_id="19601">ABC (WXYZ-DT1) Detroit, MI</channel>
    <channel lang="en" xmltv_id="WXYZDT2.us" site_id="35140">Bounce (WXYZ-DT2) Detroit, MI</channel>
    <channel lang="en" xmltv_id="WXYZDT3.us" site_id="35425">Laff (WXYZ-DT3) Detroit, MI</channel>
@@ -1521,37 +1549,9 @@
    <channel lang="en" xmltv_id="WZDCCD1.us" site_id="76363">Telemundo (WZDC-CD1) Washington, DC</channel>
    <channel lang="en" xmltv_id="WZMEDT1.us" site_id="64008">Story Television (WZME-DT1) New York, NY</channel>
    <channel lang="en" xmltv_id="WZMEDT2.us" site_id="74322">MeTV Plus (WZME-DT2) New York, NY</channel>
-    <channel lang="en" xmltv_id="WZZMDT1.us" site_id="31482">ABC (WZZM-DT1) Grand Rapids, MI</channel>
-    <channel lang="en" xmltv_id="WBONLD1.us" site_id="77242">AMG TV (WBON-LD) Richmond, KY</channel>
-    <channel lang="en" xmltv_id="WBONLD2.us" site_id="84234">Buzzr TV (WBON-LD2) Richmond, KY</channel>
-    <channel lang="en" xmltv_id="WBONLD3.us" site_id="84235">Heartland (WBON-LD3) Richmond, KY</channel>
-    <channel lang="en" xmltv_id="WBONLD4.us" site_id="115204">Retro TV (WBON-LD4) Richmond, KY</channel>
-    <channel lang="en" xmltv_id="WCVEDT1.us" site_id="43782">PBS (WCVE-DT) Richmond, VA</channel>
-    <channel lang="en" xmltv_id="WCVEDT2.us" site_id="58837">Create (WCVE-DT2) Richmond, VA</channel>
-    <channel lang="en" xmltv_id="WCVEDT3.us" site_id="58918">PBS World (WCVE-DT3) Richmond, VA</channel>
-    <channel lang="en" xmltv_id="WCVEDT4.us" site_id="108690">PBS Kids (WCVE-DT4) Richmond, VA</channel>
-    <channel lang="en" xmltv_id="WKOIDT1.us" site_id="34609">ION (WKOI-DT) Richmond, IN</channel>
-    <channel lang="en" xmltv_id="WKOIDT2.us" site_id="50100">Hillsong (WKOI-DT2) Richmond, IN</channel>
-    <channel lang="en" xmltv_id="WKOIDT3.us" site_id="50102">PosiTiV (WKOI-DT3) Richmond, IN</channel>
-    <channel lang="en" xmltv_id="WKOIDT4.us" site_id="50104">Enlace (WKOI-DT4) Richmond, IN</channel>
-    <channel lang="en" xmltv_id="WKOIDT5.us" site_id="50106">Smile (WKOI-DT5) Richmond, IN</channel>
-    <channel lang="en" xmltv_id="WRICDT1.us" site_id="20458">ABC (WRIC-DT) Richmond, VA</channel>
-    <channel lang="en" xmltv_id="WRICDT2.us" site_id="71490">ION (WRIC-DT2) Richmond, VA</channel>
-    <channel lang="en" xmltv_id="WRICDT3.us" site_id="98442">Cozi TV (WRIC-DT3) Richmond, VA</channel>
-    <channel lang="en" xmltv_id="WRLHDT1.us" site_id="34674">FOX (WRLH-DT) Richmond, KY</channel>
-    <channel lang="en" xmltv_id="WRLHDT2.us" site_id="52724">MyNetworkTV (WRLH-DT2) Richmond, KY</channel>
-    <channel lang="en" xmltv_id="WRLHDT3.us" site_id="69969">Comet TV (WRLH-DT3) Richmond, KY</channel>
-    <channel lang="en" xmltv_id="WRLHDT4.us" site_id="102233">CHARGE! (WRLH-DT4) Richmond, KY</channel>
-    <channel lang="en" xmltv_id="WRLHDT5.us" site_id="112986">Dabl (WRLH-DT5) Richmond, KY</channel>
-    <channel lang="en" xmltv_id="WTVRDT1.us" site_id="36075">CBS (WTVR-DT) Richmond, KY</channel>
-    <channel lang="en" xmltv_id="WTVRDT2.us" site_id="46787">Antenna TV (WTVR-DT2) Richmond, KY</channel>
-    <channel lang="en" xmltv_id="WTVRDT4.us" site_id="47679">Court TV (WTVR-DT4) Richmond, KY</channel>
-    <channel lang="en" xmltv_id="WWBTDT1.us" site_id="30305">NBC (WWBT-DT) Richmond, KY</channel>
-    <channel lang="en" xmltv_id="WWBTDT2.us" site_id="30674">MeTV (WWBT-DT2) Richmond, KY</channel>
-    <channel lang="en" xmltv_id="WWBTDT3.us" site_id="30675">Circle (WWBT-DT3) Richmond, KY</channel>
-    <channel lang="en" xmltv_id="WWBTDT4.us" site_id="113527">Ion Mystery (WWBT-DT4) Richmond, KY</channel>
-    <channel lang="en" xmltv_id="WWBTDT5.us" site_id="114161">True Crime Network (WWBT-DT5) Richmond, KY</channel>
    <channel lang="en" xmltv_id="WZTDLD1.us" site_id="78805">Telemundo (WZTD-LD) Richmond, KY</channel>
+    <channel lang="en" xmltv_id="WZZMDT1.us" site_id="31482">ABC (WZZM-DT1) Grand Rapids, MI</channel>
    <channel lang="en" xmltv_id="XHASDT2.us" site_id="74026">LATV (XHAS-DT2) San Diego, CA</channel>
+    <channel lang="es" xmltv_id="WSOCDT2.us" site_id="45250">Telemundo (WSOC-DT2) Charlotte, NC</channel>
  </channels>
 </site>
--- a/sites/tvtv.us/tvtv.us_us.channels.xml
+++ b/sites/tvtv.us/tvtv.us_us.channels.xml
@@ -13,14 +13,12 @@
    <channel lang="en" xmltv_id="AccuWeather.us" site_id="56193">AccuWeather</channel>
    <channel lang="en" xmltv_id="ActionMaxEast.us" site_id="18433">ActionMax East</channel>
    <channel lang="en" xmltv_id="ActionMaxWest.us" site_id="18434">ActionMax West</channel>
-    <channel lang="en" xmltv_id="AdrenalinaSportsNetwork.us" site_id="110135">Adrenalina Sports Network</channel>
+    <channel lang="en" xmltv_id="AdrenalinaSportsNetwork.us" site_id="83162">Adrenalina Sports Network</channel>
    <channel lang="en" xmltv_id="AdultSwimEast.us" site_id="83166">[adult swim]East</channel>
    <channel lang="en" xmltv_id="AdultSwimWest.us" site_id="110135">[adult swim]West</channel>
    <channel lang="en" xmltv_id="AFNSpectrum.us" site_id="106653">AFN Spectrum</channel>
    <channel lang="en" xmltv_id="AFNSports.us" site_id="45901">AFN Sports</channel>
    <channel lang="en" xmltv_id="AFNSports2.us" site_id="46634">AFN Sports 2</channel>
-    <channel lang="en" xmltv_id="AEEast.us" site_id="51529">A&amp;E East</channel>
-    <channel lang="en" xmltv_id="AEWest.us" site_id="21760">A&amp;E West</channel>
    <channel lang="en" xmltv_id="AlresalahTV.sa" site_id="31969">Al Resalah</channel>
    <channel lang="en" xmltv_id="AltitudeSports.us" site_id="44263">Altitude Sports</channel>
    <channel lang="en" xmltv_id="AMCEast.us" site_id="10021">AMC East</channel>
@@ -145,6 +143,7 @@
    <channel lang="en" xmltv_id="ComedyCentralWest.us" site_id="10150">Comedy Central West</channel>
    <channel lang="en" xmltv_id="ComedyTV.us" site_id="80740">Comedy.TV</channel>
    <channel lang="en" xmltv_id="Comet.us" site_id="97051">Comet</channel>
+    <channel lang="en" xmltv_id="CONtv.us" site_id="110483">CONtv</channel>
    <channel lang="en" xmltv_id="CookingChannel.us" site_id="30156">Cooking Channel</channel>
    <channel lang="en" xmltv_id="CourtTVMystery.us" site_id="15773">Court TV Mystery</channel>
    <channel lang="en" xmltv_id="CoziTV.us" site_id="78851">Cozi TV</channel>
@@ -158,8 +157,8 @@
    <channel lang="en" xmltv_id="Dabl.us" site_id="112157">Dabl</channel>
    <channel lang="en" xmltv_id="DaystarTV.us" site_id="19026">Daystar TV</channel>
    <channel lang="en" xmltv_id="Decades.us" site_id="91415">Decades</channel>
-    <channel lang="en" xmltv_id="DePeliculaUS.us" site_id="35401">De Pelicula</channel>
    <channel lang="en" xmltv_id="DePeliculaClasico.mx" site_id="33628">De Pelicula Clasico</channel>
+    <channel lang="en" xmltv_id="DePeliculaUS.us" site_id="35401">De Pelicula</channel>
    <channel lang="en" xmltv_id="DestinationAmerica.us" site_id="16617">Destination America</channel>
    <channel lang="en" xmltv_id="DiscoveryChannelEast.us" site_id="56905">Discovery Channel East</channel>
    <channel lang="en" xmltv_id="DiscoveryChannelWest.us" site_id="12500">Discovery Channel West</channel>
@@ -175,6 +174,7 @@
    <channel lang="en" xmltv_id="DisneyXDWest.us" site_id="18793">Disney XD West</channel>
    <channel lang="en" xmltv_id="DoctorWho.us" site_id="120086">Classic Doctor Who</channel>
    <channel lang="en" xmltv_id="DocuBoxHD.us" site_id="78765">DocuBox HD</channel>
+    <channel lang="en" xmltv_id="Docurama.us" site_id="110479">Docurama</channel>
    <channel lang="en" xmltv_id="DogTV.us" site_id="82446">Dog TV</channel>
    <channel lang="en" xmltv_id="Dream2.eg" site_id="60324">Dream 2</channel>
    <channel lang="en" xmltv_id="Dust.au" site_id="112881">Dust</channel>
@@ -202,6 +202,7 @@
    <channel lang="en" xmltv_id="ESPNDeportes.us" site_id="25595">ESPN Deportes</channel>
    <channel lang="en" xmltv_id="ESPNews.us" site_id="59976">ESPNEWS</channel>
    <channel lang="en" xmltv_id="ESPNU.us" site_id="45654">ESPNU</channel>
+    <channel lang="en" xmltv_id="ESportsTV.us" site_id="120205">ESTV</channel>
    <channel lang="en" xmltv_id="EstrellaTVEast.us" site_id="65064">Estrella TV</channel>
    <channel lang="en" xmltv_id="EsTV.us" site_id="14987">ES.TV</channel>
    <channel lang="en" xmltv_id="ETLive.us" site_id="110291">Entertainment Tonight Live</channel>
@@ -214,7 +215,6 @@
    <channel lang="en" xmltv_id="EuronewsFrench.fr" site_id="3900">Euronews Français</channel>
    <channel lang="en" xmltv_id="EWest.us" site_id="91579">E! West</channel>
    <channel lang="en" xmltv_id="EWTNUS.us" site_id="10183">EWTN</channel>
-    <channel lang="en" xmltv_id="WildBrainTV.ca" site_id="10176">Family CHRGD</channel>
    <channel lang="en" xmltv_id="FETV.us" site_id="73413">FETV</channel>
    <channel lang="en" xmltv_id="FlixEast.us" site_id="10201">Flix East</channel>
    <channel lang="en" xmltv_id="FlixWest.us" site_id="16575">Flix West</channel>
@@ -225,7 +225,6 @@
    <channel lang="en" xmltv_id="FoxDeportes.us" site_id="15377">Fox Deportes</channel>
    <channel lang="en" xmltv_id="FoxEast.us" site_id="10212">Fox East</channel>
    <channel lang="en" xmltv_id="FoxNewsChannel.us" site_id="60179">FOX News</channel>
-    <channel lang="en" xmltv_id="LiveNOWfromFOX.us" site_id="119219">LiveNow From FOX</channel>
    <channel lang="en" xmltv_id="FoxSoccerPlus.us" site_id="66879">Fox Soccer Plus</channel>
    <channel lang="en" xmltv_id="FoxSports1.us" site_id="82547">Fox Sports 1</channel>
    <channel lang="en" xmltv_id="FoxSports2.us" site_id="59305">Fox Sports 2</channel>
@@ -313,6 +312,7 @@
    <channel lang="en" xmltv_id="JBS.us" site_id="74978">JBS</channel>
    <channel lang="en" xmltv_id="JewelryTV.us" site_id="16604">Jewelry TV</channel>
    <channel lang="en" xmltv_id="JewishLifeTelevision.us" site_id="60165">Jewish Life Television</channel>
+    <channel lang="en" xmltv_id="JohnnyCarsonTV.us" site_id="115370">Johnny Carson</channel>
    <channel lang="en" xmltv_id="KanalDRomania.ro" site_id="73590">Kanal D</channel>
    <channel lang="en" xmltv_id="Laff.us" site_id="92091">Laff</channel>
    <channel lang="en" xmltv_id="LawCrime.us" site_id="109553">Law &amp; Crime</channel>
@@ -322,6 +322,7 @@
    <channel lang="en" xmltv_id="LifetimeRealWomen.us" site_id="29612">Lifetime Real Women East</channel>
    <channel lang="en" xmltv_id="LifetimeWest.us" site_id="10919">Lifetime West</channel>
    <channel lang="en" xmltv_id="LinkTV.us" site_id="21450">Link TV</channel>
+    <channel lang="en" xmltv_id="LiveNOWfromFOX.us" site_id="119219">LiveNow From FOX</channel>
    <channel lang="en" xmltv_id="LivingFaithTV.us" site_id="58595">Living Faith TV</channel>
    <channel lang="en" xmltv_id="LogoEast.us" site_id="46762">Logo East</channel>
    <channel lang="en" xmltv_id="LogoWest.us" site_id="46947">Logo West</channel>
@@ -338,7 +339,7 @@
    <channel lang="en" xmltv_id="MelodyAflam.eg" site_id="90639">Melody Aflam</channel>
    <channel lang="en" xmltv_id="MelodyDrama.eg" site_id="10465">Melody Drama</channel>
    <channel lang="en" xmltv_id="MelodyHits.eg" site_id="10471">Melody Hits</channel>
-    <channel lang="en" xmltv_id="MeTV.us" site_id="70436">MeTV</channel>
+    <channel lang="en" xmltv_id="METV.us" site_id="70436">MeTV</channel>
    <channel lang="en" xmltv_id="MezzoLiveHD.fr" site_id="115902">Mezzo Live HD</channel>
    <channel lang="en" xmltv_id="MGMHDUSA.us" site_id="58530">MGM HD</channel>
    <channel lang="en" xmltv_id="MilitaryHistory.us" site_id="48999">Military History Channel</channel>
@@ -373,8 +374,8 @@
    <channel lang="en" xmltv_id="MTVClassicEast.us" site_id="22561">MTV Classic East</channel>
    <channel lang="en" xmltv_id="MTVClassicWest.us" site_id="59054">MTV Classic West</channel>
    <channel lang="en" xmltv_id="MTVEast.us" site_id="10986">MTV East</channel>
-    <channel lang="en" xmltv_id="MTVLiveUS.us" site_id="49141">MTV Live</channel>
    <channel lang="en" xmltv_id="MTVLive.uk" site_id="66419">MTV Live (International)</channel>
+    <channel lang="en" xmltv_id="MTVLiveUS.us" site_id="49141">MTV Live</channel>
    <channel lang="en" xmltv_id="MTVTr3sEast.us" site_id="18715">MTV Tr3s East</channel>
    <channel lang="en" xmltv_id="MTVTr3sWest.us" site_id="55928">MTV Tr3s West</channel>
    <channel lang="en" xmltv_id="MTVU.us" site_id="44228">MTV U</channel>
@@ -413,6 +414,7 @@
    <channel lang="en" xmltv_id="MusicChoiceTropicales.us" site_id="19335">Music Choice Tropicales</channel>
    <channel lang="en" xmltv_id="MusicChoiceY2K.us" site_id="26228">Music Choice Y2K</channel>
    <channel lang="en" xmltv_id="MyDestinationTV.us" site_id="71303">MyDestination.TV</channel>
+    <channel lang="en" xmltv_id="MysteryScienceTheater3000.us" site_id="113781">Mystery Science Theater 3000</channel>
    <channel lang="en" xmltv_id="NASATV.us" site_id="12553">NASA TV</channel>
    <channel lang="en" xmltv_id="NASATVUHD.us" site_id="34466">NASA TV UHD</channel>
    <channel lang="en" xmltv_id="NatGeoMundo.us" site_id="117788">Nat Geo Mundo</channel>
@@ -506,17 +508,9 @@
    <channel lang="en" xmltv_id="Pac12Washington.us" site_id="76373">Pac-12 Washington</channel>
    <channel lang="en" xmltv_id="ParamountNetworkEast.us" site_id="11163">Paramount Network East</channel>
    <channel lang="en" xmltv_id="PasionesUS.us" site_id="61776">Pasiones US</channel>
-    <channel lang="en" xmltv_id="ShawPayPerView1.ca" site_id="22016">Pay Per View 1</channel>
-    <channel lang="en" xmltv_id="ShawPayPerView2.ca" site_id="22017">Pay Per View 2</channel>
-    <channel lang="en" xmltv_id="ShawPayPerView3.ca" site_id="22018">Pay Per View 3</channel>
-    <channel lang="en" xmltv_id="ShawPayPerView4.ca" site_id="22019">Pay Per View 4</channel>
-    <channel lang="en" xmltv_id="ShawPayPerView5.ca" site_id="22020">Pay Per View 5</channel>
-    <channel lang="en" xmltv_id="ShawPayPerView6.ca" site_id="22021">Pay Per View 6</channel>
-    <channel lang="en" xmltv_id="ShawPayPerView7.ca" site_id="22022">Pay Per View 7</channel>
-    <channel lang="en" xmltv_id="ShawPayPerView8.ca" site_id="22023">Pay Per View 8</channel>
    <channel lang="en" xmltv_id="PBSEast.us" site_id="33453">PBS East (National Feed)</channel>
-    <channel lang="en" xmltv_id="PBSWest.us" site_id="62271">PBS West (National Feed)</channel>
    <channel lang="en" xmltv_id="PBSKidsEasternCentral.us" site_id="101364">PBS Kids East (National Feed)</channel>
+    <channel lang="en" xmltv_id="PBSWest.us" site_id="62271">PBS West (National Feed)</channel>
    <channel lang="en" xmltv_id="PeopleTV.us" site_id="107584">People TV</channel>
    <channel lang="en" xmltv_id="PeruMagico.pe" site_id="18869">Perú Mágico</channel>
    <channel lang="en" xmltv_id="PetsTV.us" site_id="71297">Pets.TV</channel>
@@ -526,7 +520,7 @@
    <channel lang="en" xmltv_id="PopWest.us" site_id="43377">Pop West</channel>
    <channel lang="en" xmltv_id="PositivTV.us" site_id="34169">Positiv TV</channel>
    <channel lang="en" xmltv_id="PursuitChannel.us" site_id="60111">Pursuit Channel</channel>
-    <channel lang="en" xmltv_id="StingrayQello.ca" site_id="113296">Qello Concerts by Stingray</channel>
+    <channel lang="en" xmltv_id="PursuitUp.us" site_id="112487">Pursuit Up</channel>
    <channel lang="en" xmltv_id="Quest.us" site_id="106838">Quest</channel>
    <channel lang="en" xmltv_id="QVC.us" site_id="11069">QVC</channel>
    <channel lang="en" xmltv_id="QVC2.us" site_id="82682">QVC2</channel>
@@ -560,6 +554,7 @@
    <channel lang="en" xmltv_id="ShopHQ.us" site_id="14948">ShopHQ</channel>
    <channel lang="en" xmltv_id="ShopLC.us" site_id="56032">Shop LC</channel>
    <channel lang="en" xmltv_id="ShopTV.ph" site_id="11017">Shop TV</channel>
+    <channel lang="en" xmltv_id="ShoutFactoryTV.us" site_id="111132">Shout Factory TV</channel>
    <channel lang="en" xmltv_id="Showtime2East.us" site_id="11116">Showtime 2 East</channel>
    <channel lang="en" xmltv_id="Showtime2West.us" site_id="16444">Showtime 2 West</channel>
    <channel lang="en" xmltv_id="ShowtimeEast.us" site_id="11115">Showtime East</channel>
@@ -623,23 +618,7 @@
    <channel lang="en" xmltv_id="StarzKidsFamilyEast.us" site_id="50671">Starz Kids &amp; Family East</channel>
    <channel lang="en" xmltv_id="StarzKidsFamilyWest.us" site_id="57583">Starz Kids &amp; Family West</channel>
    <channel lang="en" xmltv_id="StarzWest.us" site_id="12741">Starz West</channel>
-    <channel lang="en" xmltv_id="StingrayClassica.ca" site_id="67641">Stingray Classica</channel>
-    <channel lang="en" xmltv_id="StingrayClassicRock.ca" site_id="67567">Stingray Classic Rock</channel>
-    <channel lang="en" xmltv_id="StingrayEasyListening.ca" site_id="67573">Stingray Easy Listening</channel>
-    <channel lang="en" xmltv_id="StingrayTodaysLatinPop.ca" site_id="68639">Stingray Exitos del Momento</channel>
-    <channel lang="en" xmltv_id="StingrayFlashback70s.ca" site_id="67565">Stingray Flashback 70s</channel>
-    <channel lang="en" xmltv_id="StingrayGreatestHits.ca" site_id="110433">Stingray Greatest Hits</channel>
-    <channel lang="en" xmltv_id="StingrayUrbanBeat.ca" site_id="67564">Stingray Hip-Hop/R&amp;B</channel>
-    <channel lang="en" xmltv_id="StingrayHitList.ca" site_id="67555">Stingray Hit List</channel>
-    <channel lang="en" xmltv_id="StingrayHotCountry.ca" site_id="67557">Stingray Hot Country</channel>
-    <channel lang="en" xmltv_id="StingrayKaraoke.ca" site_id="110657">Stingray Karaoke</channel>
    <channel lang="en" xmltv_id="StingrayNaturescape.us" site_id="90613">Stingray Naturescape</channel>
-    <channel lang="en" xmltv_id="StingrayNothinBut90s.ca" site_id="68620">Stingray Nothin' But 90's</channel>
-    <channel lang="en" xmltv_id="StingrayPopAdult.ca" site_id="67558">Stingray Pop Adult</channel>
-    <channel lang="en" xmltv_id="StingrayEverything80s.ca" site_id="67566">Stingray Remember the 80's</channel>
-    <channel lang="en" xmltv_id="StingrayRockAlternative.ca" site_id="67568">Stingray Rock Alternative</channel>
-    <channel lang="en" xmltv_id="StingraySmoothJazz.ca" site_id="67571">Stingray Smooth Jazz</channel>
-    <channel lang="en" xmltv_id="StingraySoulStorm.ca" site_id="67563">Stingray Soul Storm</channel>
    <channel lang="en" xmltv_id="Studiocanal.fr" site_id="35751">StudioCanal</channel>
    <channel lang="en" xmltv_id="SundanceTVEast.us" site_id="71280">SundanceTV East</channel>
    <channel lang="en" xmltv_id="SundanceTVWest.us" site_id="78806">SundanceTV West</channel>
@@ -660,9 +639,11 @@
    <channel lang="en" xmltv_id="TeleXitos.us" site_id="74299">TeleXitos</channel>
    <channel lang="en" xmltv_id="TennisChannel.us" site_id="33395">Tennis Channel</channel>
    <channel lang="en" xmltv_id="TheAfricaChannel.us" site_id="47472">The Africa Channel</channel>
+    <channel lang="en" xmltv_id="TheCarolBurnettShow.us" site_id="122609">The Carol Burnett Show</channel>
    <channel lang="en" xmltv_id="TheCountryNetwork.us" site_id="69639">The Country Network</channel>
    <channel lang="en" xmltv_id="TheCowboyChannel.us" site_id="80597">The Cowboy Channel</channel>
    <channel lang="en" xmltv_id="TheFamilyChannelEast.us" site_id="11156">The Family Channel</channel>
+    <channel lang="en" xmltv_id="TheFirstTV.us" site_id="114934">The First</channel>
    <channel lang="en" xmltv_id="TheIsraeliNetwork.il" site_id="27549">The Israeli Network</channel>
    <channel lang="en" xmltv_id="TheMovieChannelEast.us" site_id="11160">The Movie Channel East</channel>
    <channel lang="en" xmltv_id="TheMovieChannelWest.us" site_id="12509">The Movie Channel West</channel>
@@ -696,6 +677,7 @@
    <channel lang="en" xmltv_id="TVPPolonia.pl" site_id="19134">TVP Polonia</channel>
    <channel lang="en" xmltv_id="TVW.us" site_id="40766">TVW</channel>
    <channel lang="en" xmltv_id="TyCSports.ar" site_id="16275">TyC Sports</channel>
+    <channel lang="en" xmltv_id="TYTNetwork.us" site_id="107478">TYT Network</channel>
    <channel lang="en" xmltv_id="UltraFamilia.us" site_id="80149">Ultra Familia</channel>
    <channel lang="en" xmltv_id="UniMasCentral.us" site_id="11523">UniMás Central</channel>
    <channel lang="en" xmltv_id="UniMasEast.us" site_id="29058">UniMás Este</channel>
@@ -730,15 +712,5 @@
    <channel lang="en" xmltv_id="ZeeTamil.in" site_id="90286">Zee Tamil</channel>
    <channel lang="en" xmltv_id="ZeeTVUSA.us" site_id="33377">Zee TV USA</channel>
    <channel lang="en" xmltv_id="ZeeZest.in" site_id="32345">Zee Zest</channel>
-    <channel lang="en" xmltv_id="TheFirstTV.us" site_id="114934">The First</channel>
-    <channel lang="en" xmltv_id="ShoutFactoryTV.us" site_id="111132">Shout Factory TV</channel>
-    <channel lang="en" xmltv_id="MysteryScienceTheater3000.us" site_id="113781">Mystery Science Theater 3000</channel>
-    <channel lang="en" xmltv_id="JohnnyCarsonTV.us" site_id="115370">Johnny Carson</channel>
-    <channel lang="en" xmltv_id="TheCarolBurnettShow.us" site_id="122609">The Carol Burnett Show</channel>
-    <channel lang="en" xmltv_id="CONtv.us" site_id="110483">CONtv</channel>
-    <channel lang="en" xmltv_id="Docurama.us" site_id="110479">Docurama</channel>
-    <channel lang="en" xmltv_id="ESportsTV.us" site_id="120205">ESTV</channel>
-    <channel lang="en" xmltv_id="PursuitUp.us" site_id="112487">Pursuit Up</channel>
-    <channel lang="en" xmltv_id="TYTNetwork.us" site_id="107478">TYT Network</channel>
  </channels>
 </site>
--- a/sites/useetv.com/useetv.com.config.js
+++ b/sites/useetv.com/useetv.com.config.js
@@ -0,0 +1,67 @@
+const cheerio = require('cheerio')
+const dayjs = require('dayjs')
+const utc = require('dayjs/plugin/utc')
+const timezone = require('dayjs/plugin/timezone')
+const customParseFormat = require('dayjs/plugin/customParseFormat')
+
+dayjs.extend(utc)
+dayjs.extend(timezone)
+dayjs.extend(customParseFormat)
+
+module.exports = {
+  site: 'useetv.com',
+  url({ channel }) {
+    return `https://www.useetv.com/tvod/${channel.site_id}`
+  },
+  parser({ content, date }) {
+    const programs = []
+    const items = parseItems(content, date)
+    items.forEach(item => {
+      const prev = programs[programs.length - 1]
+      const $item = cheerio.load(item)
+      let start = parseStart($item, date)
+      if (prev && start.isBefore(prev.start)) {
+        start = start.add(1, 'd')
+        date = date.add(1, 'd')
+      }
+      let stop = parseStop($item, date)
+      if (stop.isBefore(start)) {
+        stop = stop.add(1, 'd')
+        date = date.add(1, 'd')
+      }
+      programs.push({
+        title: parseTitle($item),
+        start,
+        stop
+      })
+    })
+
+    return programs
+  }
+}
+
+function parseStart($item, date) {
+  const timeString = $item('p').text()
+  const [_, start] = timeString.match(/(\d{2}:\d{2}) -/) || [null, null]
+  const dateString = `${date.format('YYYY-MM-DD')} ${start}`
+
+  return dayjs.tz(dateString, 'YYYY-MM-DD HH:mm', 'Asia/Jakarta')
+}
+
+function parseStop($item, date) {
+  const timeString = $item('p').text()
+  const [_, stop] = timeString.match(/- (\d{2}:\d{2})/) || [null, null]
+  const dateString = `${date.format('YYYY-MM-DD')} ${stop}`
+
+  return dayjs.tz(dateString, 'YYYY-MM-DD HH:mm', 'Asia/Jakarta')
+}
+
+function parseTitle($item) {
+  return $item('b').text()
+}
+
+function parseItems(content, date) {
+  const $ = cheerio.load(content)
+
+  return $(`#pills-${date.format('YYYY-MM-DD')} .schedule-item`).toArray()
+}
--- a/sites/useetv.com/useetv.com.test.js
+++ b/sites/useetv.com/useetv.com.test.js
@@ -0,0 +1,57 @@
+// npx epg-grabber --config=sites/useetv.com/useetv.com.config.js --channels=sites/useetv.com/useetv.com_id.channels.xml --output=guide.xml --timeout=30000 --days=2
+
+const { parser, url, request } = require('./useetv.com.config.js')
+const dayjs = require('dayjs')
+const utc = require('dayjs/plugin/utc')
+dayjs.extend(utc)
+
+const date = dayjs.utc('2022-08-08', 'YYYY-MM-DD').startOf('d')
+const channel = {
+  site_id: 'metrotv',
+  xmltv_id: 'MetroTV.id'
+}
+const content = `<!DOCTYPE html><html><head></head><body><section class="live-tv-channels" id="top"><div><div class="schedule-list"><div id="pills-2022-08-08"><div class="row"><div><a class="schedule-item"><span class="replay"></span><p>07:00 - 07:05</p><b>Headline News</b></a></div><div><a class="schedule-item"><span class="replay"></span><p>07:05 - 07:30</p><b>Editorial Media Indonesia</b></a></div><div><a class="schedule-item"><span class="replay"></span><p>07:30 - 07:45</p><b>Editorial Media Indonesia</b></a></div><div><a class="schedule-item"><span class="replay"></span><p>07:45 - 08:00</p><b>Editorial Media Indonesia</b></a></div></div></div></div></div></section></body>`
+
+it('can generate valid url', () => {
+  expect(url({ channel })).toBe('https://www.useetv.com/tvod/metrotv')
+})
+
+it('can parse response', () => {
+  const result = parser({ content, channel, date }).map(p => {
+    p.start = p.start.toJSON()
+    p.stop = p.stop.toJSON()
+    return p
+  })
+
+  expect(result).toMatchObject([
+    {
+      title: 'Headline News',
+      start: '2022-08-08T00:00:00.000Z',
+      stop: '2022-08-08T00:05:00.000Z'
+    },
+    {
+      title: 'Editorial Media Indonesia',
+      start: '2022-08-08T00:05:00.000Z',
+      stop: '2022-08-08T00:30:00.000Z'
+    },
+    {
+      title: 'Editorial Media Indonesia',
+      start: '2022-08-08T00:30:00.000Z',
+      stop: '2022-08-08T00:45:00.000Z'
+    },
+    {
+      title: 'Editorial Media Indonesia',
+      start: '2022-08-08T00:45:00.000Z',
+      stop: '2022-08-08T01:00:00.000Z'
+    }
+  ])
+})
+
+it('can handle empty guide', () => {
+  const result = parser({
+    date,
+    channel,
+    content: `<!DOCTYPE html><html><head></head><body></body></html>`
+  })
+  expect(result).toMatchObject([])
+})
--- a/sites/useetv.com/useetv.com_id.channels.xml
+++ b/sites/useetv.com/useetv.com_id.channels.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site site="useetv.com">
+  <channels>
+    <channel lang="id" xmltv_id="UseePrime.id" site_id="useeprime">UseePrime</channel>
+    <channel lang="id" xmltv_id="UseePhoto.id" site_id="useephoto">Usee Photo</channel>
+    <!-- <channel lang="id" xmltv_id="IndiKids.id" site_id="indikids">IndiKids</channel> -->
+    <channel lang="id" xmltv_id="RuangTrampil.id" site_id="useeinfo">Ruang Trampil</channel>
+    <channel lang="id" xmltv_id="SEAToday.id" site_id="seatoday">SEA Today</channel>
+    <channel lang="id" xmltv_id="Trans7.id" site_id="trans7">Trans7</channel>
+    <channel lang="id" xmltv_id="TransTV.id" site_id="transtv">TransTV</channel>
+    <channel lang="id" xmltv_id="ANTV.id" site_id="antv">ANTV</channel>
+    <channel lang="id" xmltv_id="tvOne.id" site_id="tvone">TV One</channel>
+    <channel lang="id" xmltv_id="MetroTV.id" site_id="metrotv">Metro TV</channel>
+    <channel lang="id" xmltv_id="KompasTV.id" site_id="kompastv">Kompas TV</channel>
+    <channel lang="id" xmltv_id="INews.id" site_id="inews">iNews</channel>
+    <channel lang="id" xmltv_id="TVRINasional.id" site_id="tvri">TVRI</channel>
+    <channel lang="id" xmltv_id="RajawaliTV.id" site_id="rtv">Rajawali TV</channel>
+    <channel lang="id" xmltv_id="RodjaTV.id" site_id="rodjatv">Rodja TV</channel>
+    <channel lang="id" xmltv_id="JTV.id" site_id="jtv">JTV</channel>
+    <channel lang="id" xmltv_id="MNCNews.id" site_id="mncnews">MNC News</channel>
+    <channel lang="id" xmltv_id="BeritaSatu.id" site_id="beritasatu">Berita Satu</channel>
+    <channel lang="id" xmltv_id="RRINet.id" site_id="rrinet">RRI NET</channel>
+    <channel lang="id" xmltv_id="BaliTV.id" site_id="balitv">Bali TV</channel>
+    <channel lang="id" xmltv_id="MQTV.id" site_id="mqtv">MQTV</channel>
+    <channel lang="id" xmltv_id="MTATV.id" site_id="mtatv">MTATV</channel>
+    <!-- <channel lang="id" xmltv_id="AlQuranKareem.id" site_id="alquran">AlQuran Kareem</channel> -->
+    <channel lang="id" xmltv_id="JakTV.id" site_id="jaktv">JakTV</channel>
+    <channel lang="id" xmltv_id="NusantaraTV.id" site_id="nusantaratv">Nusantara TV</channel>
+    <!-- <channel lang="id" xmltv_id="Antara.id" site_id="antara">Antara</channel> -->
+    <!-- <channel lang="id" xmltv_id="MuhammadiyahTV.id" site_id="muhammadiyahtv">Muhammadiyah TV</channel> -->
+    <!-- <channel lang="id" xmltv_id="Prambors.id" site_id="pramborstv">Prambors</channel> -->
+    <channel lang="id" xmltv_id="TVEdukasi.id" site_id="tvedukasi">TV Edukasi</channel>
+    <channel lang="id" xmltv_id="ArirangTV.kr" site_id="arirang">Arirang</channel>
+    <channel lang="id" xmltv_id="TVMUI.id" site_id="muitv">MUI TV</channel>
+    <channel lang="id" xmltv_id="TawafTV.id" site_id="tawaftv">Tawaf TV</channel>
+    <channel lang="id" xmltv_id="TV9Nusantara.id" site_id="tv9">TV9 NU</channel>
+    <!-- <channel lang="id" xmltv_id="IndonesianaTV.id" site_id="indonesiana">Indonesiana TV</channel> -->
+    <!-- <channel lang="id" xmltv_id="UtamiTV.id" site_id="utamitv">Utami TV</channel> -->
+    <channel lang="id" xmltv_id="CCTV4Asia.cn" site_id="cctv4">CCTV4</channel>
+    <channel lang="id" xmltv_id="DWEnglish.de" site_id="dwtv">DW (English)</channel>
+    <channel lang="id" xmltv_id="ABCAustraliaAsia.au" site_id="abcaustralia">ABC Australia</channel>
+    <!-- <channel lang="id" xmltv_id="ChineseDrama.id" site_id="chinesedrama">Chinese Drama</channel> -->
+    <channel lang="id" xmltv_id="EuronewsEnglish.fr" site_id="euronews">Euronews</channel>
+    <channel lang="id" xmltv_id="TRTWorld.tr" site_id="trtworld">TRT World</channel>
+    <channel lang="id" xmltv_id="France24English.fr" site_id="france24">France 24</channel>
+    <channel lang="id" xmltv_id="CGTNDocumentary.cn" site_id="cgtndocumentary">CGTN Documentary</channel>
+    <channel lang="id" xmltv_id="SCTV.id" site_id="sctv">SCTV</channel>
+    <channel lang="id" xmltv_id="Indosiar.id" site_id="indosiar">Indosiar</channel>
+    <!-- <channel lang="id" xmltv_id="UseeSports.id" site_id="useesport">UseeSports</channel> -->
+    <!-- <channel lang="id" xmltv_id="UseeSports2.id" site_id="useesports2">UseeSports2</channel> -->
+    <channel lang="id" xmltv_id="beINSports1Indonesia.id" site_id="bein1">beIN Sports 1</channel>
+    <channel lang="id" xmltv_id="beINSports3Indonesia.id" site_id="bein2">beIN Sports 3</channel>
+    <channel lang="id" xmltv_id="SPOTV.kr" site_id="spotv">SPOTV</channel>
+    <channel lang="id" xmltv_id="SPOTV2.kr" site_id="spotv2">SPOTV2</channel>
+    <channel lang="id" xmltv_id="NBATV.us" site_id="nba">NBA</channel>
+    <channel lang="id" xmltv_id="NBATVHD.us" site_id="nba">NBA</channel>
+    <channel lang="id" xmltv_id="eGGNetwork.my" site_id="egg">egg network</channel>
+    <channel lang="id" xmltv_id="FightSports.us" site_id="fightsport">Fight Sport</channel>
+    <channel lang="id" xmltv_id="TVNMovies.hk" site_id="tvnmovies">TVN Movies</channel>
+    <channel lang="id" xmltv_id="IMC.id" site_id="imc">IMC</channel>
+    <channel lang="id" xmltv_id="GalaxyPremium.id" site_id="galaxypremium">Galaxy Premium</channel>
+    <channel lang="id" xmltv_id="Galaxy.id" site_id="galaxy">Galaxy</channel>
+    <!-- <channel lang="id" xmltv_id="Hits.id" site_id="hits">Hits</channel> -->
+    <!-- <channel lang="id" xmltv_id="Flik.id" site_id="flik">Flik</channel> -->
+    <channel lang="id" xmltv_id="BioskopIndonesia.id" site_id="bioskopindonesia">Bioskop Indonesia</channel>
+    <channel lang="id" xmltv_id="CelestialMoviesIndonesia.id" site_id="celestialmovie">Celestial Movie</channel>
+    <channel lang="id" xmltv_id="ZeeBioskop.id" site_id="zbioskop">ZBioskop</channel>
+    <channel lang="id" xmltv_id="ParamountNetworkIndonesia.id" site_id="paramount">Paramount</channel>
+    <channel lang="id" xmltv_id="Thrill.hk" site_id="thrill">Thrill</channel>
+    <channel lang="id" xmltv_id="MyCinemaAsia.id" site_id="mycinemaasia">My Cinema Asia</channel>
+    <channel lang="id" xmltv_id="MyFamily.id" site_id="myfamily">My Family</channel>
+    <channel lang="id" xmltv_id="MyCinema.id" site_id="mycinema">My Cinema</channel>
+    <channel lang="id" xmltv_id="CinemaWorld.my" site_id="cinemaworld">Cinema World</channel>
+    <channel lang="id" xmltv_id="CNNIndonesia.id" site_id="cnnindonesia">CNN Indonesia</channel>
+    <channel lang="id" xmltv_id="CNBCIndonesia.id" site_id="cnbcindonesia">CNBC Indonesia</channel>
+    <channel lang="id" xmltv_id="BloombergTVAsiaPacific.hk" site_id="bloomberg">Bloomberg</channel>
+    <channel lang="id" xmltv_id="CNA.sg" site_id="newsasia">News Asia</channel>
+    <channel lang="id" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="cnninternational">CNN International</channel>
+    <channel lang="id" xmltv_id="AlJazeeraChannel.qa" site_id="aljazeera">Aljazeera</channel>
+    <channel lang="id" xmltv_id="CNBCAsia.sg" site_id="cnbcasia">CNBC Asia</channel>
+    <channel lang="id" xmltv_id="TVBSNews.tw" site_id="tvbs">TVBS News</channel>
+    <channel lang="id" xmltv_id="TVNAsia.hk" site_id="tvn">TVN</channel>
+    <channel lang="id" xmltv_id="AXNHDIndonesia.id" site_id="axn">AXN</channel>
+    <channel lang="id" xmltv_id="AXNIndonesia.id" site_id="axn">AXN</channel>
+    <channel lang="id" xmltv_id="KPlus.sg" site_id="kplus">Kplus</channel>
+    <channel lang="id" xmltv_id="KBSWorld.kr" site_id="kbsworld">KBS World</channel>
+    <channel lang="id" xmltv_id="CitraDrama.id" site_id="cdrama">Citra Drama </channel>
+    <channel lang="id" xmltv_id="WarnerTVSoutheastAsia.us" site_id="warner">Warner</channel>
+    <channel lang="id" xmltv_id="RockExtreme.sg" site_id="blueantextreme">Rock Extreme</channel>
+    <channel lang="id" xmltv_id="TLCSoutheastAsia.us" site_id="tlc">TLC</channel>
+    <channel lang="id" xmltv_id="HistoryAsia.us" site_id="history">History</channel>
+    <channel lang="id" xmltv_id="DuniaLain.id" site_id="dunialain">Dunia Lain</channel>
+    <channel lang="id" xmltv_id="RockEntertainment.sg" site_id="blueant">Rock Entertainment</channel>
+    <channel lang="id" xmltv_id="AniplusAsia.sg" site_id="aniplus">ANIPlus</channel>
+    <channel lang="id" xmltv_id="AnimaxAsia.sg" site_id="animax">Animax</channel>
+    <channel lang="id" xmltv_id="OneTVAsia.sg" site_id="sone">SONE</channel>
+    <channel lang="id" xmltv_id="Kix.hk" site_id="kix">Kix</channel>
+    <channel lang="id" xmltv_id="LifetimeAsia.us" site_id="lifetime">Lifetime</channel>
+    <channel lang="id" xmltv_id="TV5MondeAsia.fr" site_id="tv5monde">TV5Monde</channel>
+    <channel lang="id" xmltv_id="NHKWorldPremium.jp" site_id="nhkpremium">NHK World Premium</channel>
+    <!-- <channel lang="id" xmltv_id="Formosa.id" site_id="formosa">Formosa</channel> -->
+    <!-- <channel lang="id" xmltv_id="SGEM.id" site_id="sgem">SGEM</channel> -->
+    <!-- UNSURE- GUESS --><channel lang="id" xmltv_id="ZhejiangSatelliteTVInternational.cn" site_id="zhejiang">Zhejiang</channel>
+    <!-- <channel lang="id" xmltv_id="Shenzen.id" site_id="shenzen">Shenzen</channel> -->
+    <!-- <channel lang="id" xmltv_id="EBCAsia.id" site_id="ettvasia">EBC Asia</channel> -->
+    <channel lang="id" xmltv_id="CTiAsia.tw" site_id="ctiasia">CTI Asia</channel>
+    <channel lang="id" xmltv_id="CartoonNetworkAsia.sg" site_id="cartoonnetwork">Cartoon Network</channel>
+    <channel lang="id" xmltv_id="Horee.id" site_id="horee">Horee</channel>
+    <channel lang="id" xmltv_id="NickJrAsia.sg" site_id="nickjr">Nick Junior</channel>
+    <channel lang="id" xmltv_id="NickelodeonAsia.sg" site_id="nickelodeon">Nickelodeon</channel>
+    <channel lang="id" xmltv_id="DuniaAnak.id" site_id="duniaanak">Dunia anak</channel>
+    <channel lang="id" xmltv_id="BoomerangAsia.sg" site_id="boomerang">Boomerang</channel>
+    <channel lang="id" xmltv_id="MyKidz.id" site_id="mykids">MyKidz</channel>
+    <channel lang="id" xmltv_id="MentariTV.id" site_id="mentaritv">Mentari TV</channel>
+    <!-- <channel lang="id" xmltv_id="DaVinciLearning.id" site_id="davinci">Da Vinci Learning</channel> -->
+    <channel lang="id" xmltv_id="NationalGeographicHDIndonesia.id" site_id="natgeo">Nat Geo</channel>
+    <channel lang="id" xmltv_id="NationalGeographicIndonesia.id" site_id="natgeo">Nat Geo</channel>
+    <channel lang="id" xmltv_id="DiscoveryChannelHDIndonesia.id" site_id="disco">Discovery Channel</channel>
+    <channel lang="id" xmltv_id="DiscoveryChannelIndonesia.id" site_id="disco">Discovery Channel</channel>
+    <channel lang="id" xmltv_id="NationalGeographicWildHDIndonesia.id" site_id="natgeowild">Nat Geo Wild</channel>
+    <channel lang="id" xmltv_id="NationalGeographicWildIndonesia.id" site_id="natgeowild">Nat Geo Wild</channel>
+    <channel lang="id" xmltv_id="TechStorm.sg" site_id="techstorm">Tech Storm</channel>
+    <channel lang="id" xmltv_id="CrimePlusInvestigationAsia.us" site_id="crimeinvestigation">Crime Investigation</channel>
+    <channel lang="id" xmltv_id="LinguaChannel.id" site_id="lingua">Lingua</channel>
+    <!-- <channel lang="id" xmltv_id="PandaTV.id" site_id="pandatv">Panda TV</channel> -->
+    <channel lang="id" xmltv_id="AsianFoodNetwork.sg" site_id="afc">Asian Food Network</channel>
+    <channel lang="id" xmltv_id="HGTVAsia.us" site_id="hgtv">HGTV</channel>
+    <channel lang="id" xmltv_id="EatNGo.id" site_id="eatgo">Eat N Go</channel>
+    <channel lang="id" xmltv_id="FashionTVAsia.fr" site_id="fashiontv">FashionTV</channel>
+    <channel lang="id" xmltv_id="MTVLive.uk" site_id="mtvlive">MTV Live</channel>
+    <channel lang="id" xmltv_id="CitraDangdut.id" site_id="citradangdut">Citra Dangdut</channel>
+    <!-- <channel lang="id" xmltv_id="I-Konser.id" site_id="ikonser">I-Konser</channel> -->
+    <channel lang="id" xmltv_id="OChannel.id" site_id="ochannel">O Channel</channel>
+    <channel lang="id" xmltv_id="nsert.id" site_id="insert">Insert</channel>
+    <!-- <channel lang="id" xmltv_id="KCON2022.id" site_id="kcon1">KCON 2022</channel> -->
+    <!-- <channel lang="id" xmltv_id="SPOTV-MotoGP.id" site_id="motogp">SPOTV - MotoGP</channel> -->
+    <channel lang="id" xmltv_id="NET.id" site_id="net">Net.</channel>
+    <channel lang="id" xmltv_id="DAAITV.id" site_id="daaitv">Daai TV</channel>
+    <channel lang="id" xmltv_id="IDXChannel.id" site_id="idx">IDX</channel>
+    <!-- <channel lang="id" xmltv_id="MusikIndonesia.id" site_id="musikindo">Musik Indonesia</channel> -->
+    <!-- <channel lang="id" xmltv_id="MMITV.id" site_id="mmi">MMI TV</channel> -->
+    <channel lang="id" xmltv_id="MShopSignature.id" site_id="mncshop">M Shop</channel>
+    <channel lang="id" xmltv_id="SeruChannel.id" site_id="seru">Seru!</channel>
+    <channel lang="id" xmltv_id="UChannel.id" site_id="uchannel">UChannel</channel>
+    <!-- <channel lang="id" xmltv_id="ElJohnTV.id" site_id="eljohn">El John TV</channel> -->
+    <channel lang="id" xmltv_id="NHKWorldJapan.jp" site_id="nhkworld">NHK World Japan</channel>
+    <channel lang="id" xmltv_id="ATV.id" site_id="atv">ATV</channel>
+    <channel lang="id" xmltv_id="OutdoorChannelInternational.us" site_id="outdoor">Outdoor Channel</channel>
+    <channel lang="id" xmltv_id="HorizonSports.us" site_id="horizonsport">Horizon Sports</channel>
+    <!-- <channel lang="id" xmltv_id="HItsMovie.id" site_id="hitsmovie">HIts Movie</channel> -->
+    <channel lang="id" xmltv_id="StarChineseMoviesSouthEastAsia.hk" site_id="starchinesemovies">Star Chinese Movies</channel>
+    <channel lang="id" xmltv_id="StarChineseChannelInternational.hk" site_id="starchinesechannel">Star Chinese Channel</channel>
+    <!-- <channel lang="id" xmltv_id="KungfuTV.id" site_id="kungfutv">Kungfu TV</channel> -->
+    <channel lang="id" xmltv_id="BabyFirst.us" site_id="babyfirst">Baby First</channel>
+    <channel lang="id" xmltv_id="DreamWorksChannelAsia.us" site_id="dreamworks">Dreamworks</channel>
+  </channels>
+</site>
+
+<!-- 
+  Get all channels from https://www.useetv.com/tv/live:
+  [...document.querySelectorAll('.channel-item')].map(el => `<channel lang="id" xmltv_id="${el.dataset.name.replaceAll(' ', '')}.id" site_id="${el.href.replace('https://www.useetv.com/livetv/', '')}">${el.dataset.name}</channel>`).join('\n')
+ -->
--- a/sites/vidio.com/vidio.com.test.js
+++ b/sites/vidio.com/vidio.com.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/vidio.com/vidio.com.config.js --channels=sites/vidio.com/vidio.com_id.channels.xml --output=.gh-pages/guides/id/vidio.com.epg.xml --days=2
+// npx epg-grabber --config=sites/vidio.com/vidio.com.config.js --channels=sites/vidio.com/vidio.com_id.channels.xml --output=guide.xml --days=2

 const { parser, url } = require('./vidio.com.config.js')
 const dayjs = require('dayjs')
--- a/sites/vivacom.bg/vivacom.bg.test.js
+++ b/sites/vivacom.bg/vivacom.bg.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/vivacom.bg/vivacom.bg.config.js --channels=sites/vivacom.bg/vivacom.bg_bg.channels.xml --output=.gh-pages/guides/bg/vivacom.bg.epg.xml --days=2
+// npx epg-grabber --config=sites/vivacom.bg/vivacom.bg.config.js --channels=sites/vivacom.bg/vivacom.bg_bg.channels.xml --output=guide.xml --days=2

 const { parser, url, request } = require('./vivacom.bg.config.js')
 const dayjs = require('dayjs')
--- a/sites/vtm.be/vtm.be.test.js
+++ b/sites/vtm.be/vtm.be.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/vtm.be/vtm.be.config.js --channels=sites/vtm.be/vtm.be_be.channels.xml --output=.gh-pages/guides/be/vtm.be.epg.xml --days=2
+// npx epg-grabber --config=sites/vtm.be/vtm.be.config.js --channels=sites/vtm.be/vtm.be_be.channels.xml --output=guide.xml --days=2

 const { parser, url } = require('./vtm.be.config.js')
 const dayjs = require('dayjs')
--- a/sites/walesi.com.fj/walesi.com.fj.test.js
+++ b/sites/walesi.com.fj/walesi.com.fj.test.js
@@ -45,13 +45,13 @@ it('can parse response', () => {

  expect(result).toMatchObject([
    {
-      start: '2021-11-20T11:00:00.000Z',
-      stop: '2021-11-20T17:00:00.000Z',
+      start: '2021-11-20T12:00:00.000Z',
+      stop: '2021-11-20T18:00:00.000Z',
      title: `Aljazeera`
    },
    {
-      start: '2021-11-20T17:00:00.000Z',
-      stop: '2021-11-20T17:30:00.000Z',
+      start: '2021-11-20T18:00:00.000Z',
+      stop: '2021-11-20T18:30:00.000Z',
      title: `Move Fiji`
    }
  ])
--- a/sites/zap.co.ao/zap.co.ao.test.js
+++ b/sites/zap.co.ao/zap.co.ao.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/zap.co.ao/zap.co.ao.config.js --channels=sites/zap.co.ao/zap.co.ao_ao.channels.xml --output=.gh-pages/guides/ao/zap.co.ao.epg.xml --days=2
+// npx epg-grabber --config=sites/zap.co.ao/zap.co.ao.config.js --channels=sites/zap.co.ao/zap.co.ao_ao.channels.xml --output=guide.xml --days=2

 const { parser, url } = require('./zap.co.ao.config.js')
 const dayjs = require('dayjs')
--- a/sites/znbc.co.zm/znbc.co.zm.test.js
+++ b/sites/znbc.co.zm/znbc.co.zm.test.js
@@ -1,4 +1,4 @@
-// npx epg-grabber --config=sites/znbc.co.zm/znbc.co.zm.config.js --channels=sites/znbc.co.zm/znbc.co.zm_zm.channels.xml --output=.gh-pages/guides/zm/znbc.co.zm.epg.xml --days=2
+// npx epg-grabber --config=sites/znbc.co.zm/znbc.co.zm.config.js --channels=sites/znbc.co.zm/znbc.co.zm_zm.channels.xml --output=guide.xml --days=2

 const { parser, url } = require('./znbc.co.zm.config.js')
 const dayjs = require('dayjs')