diff --git a/README.md b/README.md
index 27889ffc..883a1c68 100644
--- a/README.md
+++ b/README.md
@@ -66,13 +66,13 @@ To load a program guide, all you need to do is copy the link to one or more of t
     <tr><td valign="top">🇨🇳&nbsp;China</td><td align="right">94</td><td nowrap><code>https://iptv-org.github.io/epg/guides/cn/tv.cctv.com.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/tv.cctv.com.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/tv.cctv.com.yml/badge.svg" alt="tv.cctv.com" style="max-width: 100%;"></a></td></tr>
     <tr><td valign="top" rowspan="3">🇨🇴&nbsp;Colombia</td><td align="right">98</td><td nowrap><code>https://iptv-org.github.io/epg/guides/co/siba.com.co.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/siba.com.co.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/siba.com.co.yml/badge.svg" alt="siba.com.co" style="max-width: 100%;"></a></td></tr>
     <tr><td align="right">52</td><td nowrap><code>https://iptv-org.github.io/epg/guides/co/gatotv.com.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/gatotv.com.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/gatotv.com.yml/badge.svg" alt="gatotv.com" style="max-width: 100%;"></a></td></tr>
-    <tr><td align="right">42</td><td nowrap><code>https://iptv-org.github.io/epg/guides/co/mi.tv.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/mi.tv.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/mi.tv.yml/badge.svg" alt="mi.tv" style="max-width: 100%;"></a></td></tr>
+    <tr><td align="right">41</td><td nowrap><code>https://iptv-org.github.io/epg/guides/co/mi.tv.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/mi.tv.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/mi.tv.yml/badge.svg" alt="mi.tv" style="max-width: 100%;"></a></td></tr>
     <tr><td valign="top">🇰🇲&nbsp;Comoros</td><td align="right">118</td><td nowrap><code>https://iptv-org.github.io/epg/guides/km/canalplus-reunion.com.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/canalplus-reunion.com.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/canalplus-reunion.com.yml/badge.svg" alt="canalplus-reunion.com" style="max-width: 100%;"></a></td></tr>
     <tr><td valign="top">🇨🇷&nbsp;Costa Rica</td><td align="right">45</td><td nowrap><code>https://iptv-org.github.io/epg/guides/cr/gatotv.com.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/gatotv.com.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/gatotv.com.yml/badge.svg" alt="gatotv.com" style="max-width: 100%;"></a></td></tr>
-    <tr><td valign="top">🇭🇷&nbsp;Croatia</td><td align="right">167</td><td nowrap><code>https://iptv-org.github.io/epg/guides/hr/maxtv.hrvatskitelekom.hr.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/maxtv.hrvatskitelekom.hr.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/maxtv.hrvatskitelekom.hr.yml/badge.svg" alt="maxtv.hrvatskitelekom.hr" style="max-width: 100%;"></a></td></tr>
+    <tr><td valign="top">🇭🇷&nbsp;Croatia</td><td align="right">166</td><td nowrap><code>https://iptv-org.github.io/epg/guides/hr/maxtv.hrvatskitelekom.hr.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/maxtv.hrvatskitelekom.hr.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/maxtv.hrvatskitelekom.hr.yml/badge.svg" alt="maxtv.hrvatskitelekom.hr" style="max-width: 100%;"></a></td></tr>
     <tr><td valign="top">🇨🇺&nbsp;Cuba</td><td align="right">10</td><td nowrap><code>https://iptv-org.github.io/epg/guides/cu/tvcubana.icrt.cu.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/tvcubana.icrt.cu.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/tvcubana.icrt.cu.yml/badge.svg" alt="tvcubana.icrt.cu" style="max-width: 100%;"></a></td></tr>
     <tr><td valign="top">🇨🇾&nbsp;Cyprus</td><td align="right">30</td><td nowrap><code>https://iptv-org.github.io/epg/guides/cy/novacyprus.com.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/novacyprus.com.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/novacyprus.com.yml/badge.svg" alt="novacyprus.com" style="max-width: 100%;"></a></td></tr>
-    <tr><td valign="top">🇨🇿&nbsp;Czech Republic</td><td align="right">528</td><td nowrap><code>https://iptv-org.github.io/epg/guides/cz/m.tv.sms.cz.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/m.tv.sms.cz.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/m.tv.sms.cz.yml/badge.svg" alt="m.tv.sms.cz" style="max-width: 100%;"></a></td></tr>
+    <tr><td valign="top">🇨🇿&nbsp;Czech Republic</td><td align="right">527</td><td nowrap><code>https://iptv-org.github.io/epg/guides/cz/m.tv.sms.cz.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/m.tv.sms.cz.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/m.tv.sms.cz.yml/badge.svg" alt="m.tv.sms.cz" style="max-width: 100%;"></a></td></tr>
     <tr><td valign="top" rowspan="3">🇨🇩&nbsp;Democratic Republic of the Congo</td><td align="right">242</td><td nowrap><code>https://iptv-org.github.io/epg/guides/cd/canalplus-afrique.com.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/canalplus-afrique.com.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/canalplus-afrique.com.yml/badge.svg" alt="canalplus-afrique.com" style="max-width: 100%;"></a></td></tr>
     <tr><td align="right">172</td><td nowrap><code>https://iptv-org.github.io/epg/guides/cd/startimestv.com.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/startimestv.com.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/startimestv.com.yml/badge.svg" alt="startimestv.com" style="max-width: 100%;"></a></td></tr>
     <tr><td align="right">126</td><td nowrap><code>https://iptv-org.github.io/epg/guides/cd/guide.dstv.com.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/guide.dstv.com.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/guide.dstv.com.yml/badge.svg" alt="guide.dstv.com" style="max-width: 100%;"></a></td></tr>
@@ -157,7 +157,7 @@ To load a program guide, all you need to do is copy the link to one or more of t
     <tr><td valign="top" rowspan="3">🇨🇮&nbsp;Ivory Coast</td><td align="right">242</td><td nowrap><code>https://iptv-org.github.io/epg/guides/ci/canalplus-afrique.com.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/canalplus-afrique.com.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/canalplus-afrique.com.yml/badge.svg" alt="canalplus-afrique.com" style="max-width: 100%;"></a></td></tr>
     <tr><td align="right">172</td><td nowrap><code>https://iptv-org.github.io/epg/guides/ci/startimestv.com.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/startimestv.com.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/startimestv.com.yml/badge.svg" alt="startimestv.com" style="max-width: 100%;"></a></td></tr>
     <tr><td align="right">128</td><td nowrap><code>https://iptv-org.github.io/epg/guides/ci/guide.dstv.com.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/guide.dstv.com.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/guide.dstv.com.yml/badge.svg" alt="guide.dstv.com" style="max-width: 100%;"></a></td></tr>
-    <tr><td valign="top">🇯🇵&nbsp;Japan</td><td align="right">135</td><td nowrap><code>https://iptv-org.github.io/epg/guides/jp/tvguide.myjcom.jp.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/tvguide.myjcom.jp.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/tvguide.myjcom.jp.yml/badge.svg" alt="tvguide.myjcom.jp" style="max-width: 100%;"></a></td></tr>
+    <tr><td valign="top">🇯🇵&nbsp;Japan</td><td align="right">136</td><td nowrap><code>https://iptv-org.github.io/epg/guides/jp/tvguide.myjcom.jp.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/tvguide.myjcom.jp.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/tvguide.myjcom.jp.yml/badge.svg" alt="tvguide.myjcom.jp" style="max-width: 100%;"></a></td></tr>
     <tr><td valign="top" rowspan="2">🇯🇴&nbsp;Jordan</td><td align="right">98</td><td nowrap><code>https://iptv-org.github.io/epg/guides/jo-ar/osn.com.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/osn.com.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/osn.com.yml/badge.svg" alt="osn.com" style="max-width: 100%;"></a></td></tr>
     <tr><td align="right">98</td><td nowrap><code>https://iptv-org.github.io/epg/guides/jo-en/osn.com.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/osn.com.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/osn.com.yml/badge.svg" alt="osn.com" style="max-width: 100%;"></a></td></tr>
     <tr><td valign="top">🇰🇿&nbsp;Kazakhstan</td><td align="right">8</td><td nowrap><code>https://iptv-org.github.io/epg/guides/kz/tv.yandex.ru.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/tv.yandex.ru.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/tv.yandex.ru.yml/badge.svg" alt="tv.yandex.ru" style="max-width: 100%;"></a></td></tr>
@@ -230,7 +230,7 @@ To load a program guide, all you need to do is copy the link to one or more of t
     <tr><td valign="top" rowspan="3">🇨🇬&nbsp;Republic of the Congo</td><td align="right">242</td><td nowrap><code>https://iptv-org.github.io/epg/guides/cg/canalplus-afrique.com.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/canalplus-afrique.com.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/canalplus-afrique.com.yml/badge.svg" alt="canalplus-afrique.com" style="max-width: 100%;"></a></td></tr>
     <tr><td align="right">149</td><td nowrap><code>https://iptv-org.github.io/epg/guides/cg/startimestv.com.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/startimestv.com.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/startimestv.com.yml/badge.svg" alt="startimestv.com" style="max-width: 100%;"></a></td></tr>
     <tr><td align="right">125</td><td nowrap><code>https://iptv-org.github.io/epg/guides/cg/guide.dstv.com.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/guide.dstv.com.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/guide.dstv.com.yml/badge.svg" alt="guide.dstv.com" style="max-width: 100%;"></a></td></tr>
-    <tr><td valign="top">🇷🇴&nbsp;Romania</td><td align="right">223</td><td nowrap><code>https://iptv-org.github.io/epg/guides/ro/programetv.ro.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/programetv.ro.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/programetv.ro.yml/badge.svg" alt="programetv.ro" style="max-width: 100%;"></a></td></tr>
+    <tr><td valign="top">🇷🇴&nbsp;Romania</td><td align="right">230</td><td nowrap><code>https://iptv-org.github.io/epg/guides/ro/programetv.ro.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/programetv.ro.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/programetv.ro.yml/badge.svg" alt="programetv.ro" style="max-width: 100%;"></a></td></tr>
     <tr><td valign="top">🇷🇺&nbsp;Russia</td><td align="right">283</td><td nowrap><code>https://iptv-org.github.io/epg/guides/ru/tv.yandex.ru.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/tv.yandex.ru.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/tv.yandex.ru.yml/badge.svg" alt="tv.yandex.ru" style="max-width: 100%;"></a></td></tr>
     <tr><td valign="top" rowspan="3">🇷🇼&nbsp;Rwanda</td><td align="right">242</td><td nowrap><code>https://iptv-org.github.io/epg/guides/rw/canalplus-afrique.com.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/canalplus-afrique.com.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/canalplus-afrique.com.yml/badge.svg" alt="canalplus-afrique.com" style="max-width: 100%;"></a></td></tr>
     <tr><td align="right">142</td><td nowrap><code>https://iptv-org.github.io/epg/guides/rw/startimestv.com.epg.xml</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/startimestv.com.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/startimestv.com.yml/badge.svg" alt="startimestv.com" style="max-width: 100%;"></a></td></tr>
diff --git a/sites/cosmote.gr/cosmote.gr_gr.channels.xml b/sites/cosmote.gr/cosmote.gr_gr.channels.xml
index 852b1092..ce1cecdc 100644
--- a/sites/cosmote.gr/cosmote.gr_gr.channels.xml
+++ b/sites/cosmote.gr/cosmote.gr_gr.channels.xml
@@ -17,21 +17,21 @@
     <channel lang="el" xmltv_id="CBSRealityEurope.us" site_id="cbs-reality">CBS Reality Europe</channel>
     <channel lang="el" xmltv_id="CNBCEurope.uk" site_id="cnbc">CNBC Europe</channel>
     <channel lang="el" xmltv_id="CNNInternationalEurope.us" site_id="cnn">CNN International Europe</channel>
-    <channel lang="el" xmltv_id="CosmoteCinema1.gr" site_id="ote-cinema-1">Cosmote Cinema 1</channel>
-    <channel lang="el" xmltv_id="CosmoteCinema2.gr" site_id="ote-cinema-2-hd">Cosmote Cinema 2</channel>
+    <channel lang="el" xmltv_id="CosmoteCinema1HD.gr" site_id="ote-cinema-1">Cosmote Cinema 1</channel>
+    <channel lang="el" xmltv_id="CosmoteCinema2HD.gr" site_id="ote-cinema-2-hd">Cosmote Cinema 2</channel>
     <channel lang="el" xmltv_id="CosmoteCinema3.gr" site_id="ote-cinema-3">Cosmote Cinema 3</channel>
-    <channel lang="el" xmltv_id="CosmoteHistory.gr" site_id="ote-history">Cosmote History</channel>
-    <channel lang="el" xmltv_id="CosmoteSeriesMarathon.gr" site_id="cosmote-series-marath-1">Cosmote Series Marathon</channel>
-    <channel lang="el" xmltv_id="CosmoteSport1.gr" site_id="ote-sport-1-hd">Cosmote Sport 1</channel>
-    <channel lang="el" xmltv_id="CosmoteSport2.gr" site_id="ote-sport-2-hd">Cosmote Sport 2</channel>
-    <channel lang="el" xmltv_id="CosmoteSport3.gr" site_id="ote-sport-3-hd">Cosmote Sport 3</channel>
-    <channel lang="el" xmltv_id="CosmoteSport4.gr" site_id="ote-sport-4-hd">Cosmote Sport 4</channel>
-    <channel lang="el" xmltv_id="CosmoteSport5.gr" site_id="ote-sport-5-hd">Cosmote Sport 5</channel>
-    <channel lang="el" xmltv_id="CosmoteSport6.gr" site_id="ote-sport-6-hd">Cosmote Sport 6</channel>
-    <channel lang="el" xmltv_id="CosmoteSport7.gr" site_id="ote-sport-7-hd">Cosmote Sport 7</channel>
-    <channel lang="el" xmltv_id="CosmoteSport8.gr" site_id="ote-sport-8-hd">Cosmote Sport 8</channel>
-    <channel lang="el" xmltv_id="CosmoteSport9.gr" site_id="cosmotesport9hd">Cosmote Sport 9</channel>
-    <channel lang="el" xmltv_id="CosmoteSportHighlights.gr" site_id="ote-sport-highlights-hd">Cosmote Sport Highlights</channel>
+    <channel lang="el" xmltv_id="CosmoteHistoryHD.gr" site_id="ote-history">Cosmote History</channel>
+    <channel lang="el" xmltv_id="CosmoteSeriesMarathonHD.gr" site_id="cosmote-series-marath-1">Cosmote Series Marathon</channel>
+    <channel lang="el" xmltv_id="CosmoteSport1HD.gr" site_id="ote-sport-1-hd">Cosmote Sport 1</channel>
+    <channel lang="el" xmltv_id="CosmoteSport2HD.gr" site_id="ote-sport-2-hd">Cosmote Sport 2</channel>
+    <channel lang="el" xmltv_id="CosmoteSport3HD.gr" site_id="ote-sport-3-hd">Cosmote Sport 3</channel>
+    <channel lang="el" xmltv_id="CosmoteSport4HD.gr" site_id="ote-sport-4-hd">Cosmote Sport 4</channel>
+    <channel lang="el" xmltv_id="CosmoteSport5HD.gr" site_id="ote-sport-5-hd">Cosmote Sport 5</channel>
+    <channel lang="el" xmltv_id="CosmoteSport6HD.gr" site_id="ote-sport-6-hd">Cosmote Sport 6</channel>
+    <channel lang="el" xmltv_id="CosmoteSport7HD.gr" site_id="ote-sport-7-hd">Cosmote Sport 7</channel>
+    <channel lang="el" xmltv_id="CosmoteSport8HD.gr" site_id="ote-sport-8-hd">Cosmote Sport 8</channel>
+    <channel lang="el" xmltv_id="CosmoteSport9HD.gr" site_id="cosmotesport9hd">Cosmote Sport 9</channel>
+    <channel lang="el" xmltv_id="CosmoteSportHighlightsHD.gr" site_id="ote-sport-highlights-hd">Cosmote Sport Highlights</channel>
     <channel lang="el" xmltv_id="CrimePlusInvestigationUK.uk" site_id="crime-and-investigation">Crime + Investigation UK</channel>
     <channel lang="el" xmltv_id="DisneyChannelMENA.uk" site_id="disney-channel">Disney Channel Middle East</channel>
     <channel lang="el" xmltv_id="DWEnglish.de" site_id="deutsche-welle">DW English</channel>
@@ -57,7 +57,7 @@
     <channel lang="el" xmltv_id="MadTV.gr" site_id="mad">Mad TV</channel>
     <channel lang="el" xmltv_id="MadViral.gr" site_id="mad-hits">Mad Viral</channel>
     <channel lang="el" xmltv_id="MakedoniaTV.gr" site_id="makedonia-tv">Makedonia TV</channel>
-    <channel lang="el" xmltv_id="MegaTV.gr" site_id="mega-hd">Mega TV</channel>
+    <channel lang="el" xmltv_id="MEGATVHD.gr" site_id="mega-hd">Mega TV</channel>
     <channel lang="el" xmltv_id="MezzoLiveHD.fr" site_id="mezzo">Mezzo Live HD</channel>
     <channel lang="el" xmltv_id="MotorvisionTV.de" site_id="motorvision-channel-hd">Motorvision TV</channel>
     <channel lang="el" xmltv_id="MTVGlobal.cz" site_id="mtv-europe">MTV Global</channel>
diff --git a/sites/dsmart.com.tr/dsmart.com.tr_tr.channels.xml b/sites/dsmart.com.tr/dsmart.com.tr_tr.channels.xml
index 6e1590fd..694f8e3e 100644
--- a/sites/dsmart.com.tr/dsmart.com.tr_tr.channels.xml
+++ b/sites/dsmart.com.tr/dsmart.com.tr_tr.channels.xml
@@ -18,7 +18,7 @@
     <channel lang="tr" xmltv_id="CartoonNetworkTurkey.tr" site_id="58d29bb0eefad3db9c6062c8">Cartoon Network Türkiye</channel>
     <channel lang="tr" xmltv_id="CNNInternationalEurope.us" site_id="58d29bb0eefad3db9c6062b8">CNN International Europe</channel>
     <channel lang="tr" xmltv_id="CNNTurk.tr" site_id="59dca1f3cfef0b4d80a47a5f">CNN Türk</channel>
-    <channel lang="tr" xmltv_id="CocukSmart.tr" site_id="58d29bb0eefad3db9c6062b5">Çocuk Smart</channel>
+    <channel lang="tr" xmltv_id="CocukSmartHD.tr" site_id="58d29bb0eefad3db9c6062b5">Çocuk Smart</channel>
     <channel lang="tr" xmltv_id="DaVinci.de" site_id="58d29bb0eefad3db9c6062b6">Da Vinci</channel>
     <channel lang="tr" xmltv_id="DiscoveryChannelTurkey.us" site_id="58d29bb0eefad3db9c606248">Discovery Channel Türkiye</channel>
     <channel lang="tr" xmltv_id="DiscoveryScienceTurkey.us" site_id="58d29bb0eefad3db9c60628e">Discovery Science Türkiye</channel>
diff --git a/sites/gatotv.com/gatotv.com_es.channels.xml b/sites/gatotv.com/gatotv.com_es.channels.xml
index 47700f2d..217d0b59 100644
--- a/sites/gatotv.com/gatotv.com_es.channels.xml
+++ b/sites/gatotv.com/gatotv.com_es.channels.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site site="gatotv.com">
   <channels>
-    <channel lang="es" xmltv_id="0porMPlus.es" site_id="_0">#0</channel>
+    <channel lang="es" xmltv_id="0porMovistarPlus.es" site_id="_0">#0</channel>
     <channel lang="es" xmltv_id="AMCSpain.us" site_id="amc_espana">AMC España</channel>
     <channel lang="es" xmltv_id="Antena3.es" site_id="antena_3_espana">Antena 3</channel>
     <channel lang="es" xmltv_id="Atreseries.es" site_id="atreseries_espana">Atreseries</channel>
diff --git a/sites/m.tv.sms.cz/m.tv.sms.cz_cz.channels.xml b/sites/m.tv.sms.cz/m.tv.sms.cz_cz.channels.xml
index f8c6a595..e7397868 100644
--- a/sites/m.tv.sms.cz/m.tv.sms.cz_cz.channels.xml
+++ b/sites/m.tv.sms.cz/m.tv.sms.cz_cz.channels.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site site="m.tv.sms.cz">
   <channels>
-    <channel lang="cz" xmltv_id="0porMPlus.es" site_id="Cero">#0</channel>
+    <channel lang="cz" xmltv_id="0porMovistarPlus.es" site_id="Cero">#0</channel>
     <channel lang="cz" xmltv_id="360TuneBox.us" site_id="360TuneBox">360 Tune Box</channel>
     <channel lang="cz" xmltv_id="3sat.de" site_id="3SAT">3sat</channel>
     <channel lang="cz" xmltv_id="4FunDance.pl" site_id="4Fun+Dance">4 Fun Dance</channel>
@@ -480,7 +480,7 @@
     <channel lang="cz" xmltv_id="TVNOE.cz" site_id="Noe">TV Noe</channel>
     <channel lang="cz" xmltv_id="TVNova.cz" site_id="Nova">TV Nova</channel>
     <channel lang="cz" xmltv_id="TVNTurbo.pl" site_id="TVN+Turbo">TVN Turbo</channel>
-    <channel lang="cz" xmltv_id="TVOsem.sk" site_id="TV8">TV Osem</channel>
+    <channel lang="cz" xmltv_id="TVOSEM.sk" site_id="TV8">TV Osem</channel>
     <channel lang="cz" xmltv_id="TVP1.pl" site_id="TVP1">TVP 1</channel>
     <channel lang="cz" xmltv_id="TVP2.pl" site_id="TVP2">TVP 2</channel>
     <channel lang="cz" xmltv_id="TVPABC.pl" site_id="TVP+ABC">TVP ABC</channel>
@@ -518,7 +518,7 @@
     <channel lang="cz" xmltv_id="VTV3.vn" site_id="VTV3">VTV 3</channel>
     <channel lang="cz" xmltv_id="VTV4.vn" site_id="VTV4">VTV 4</channel>
     <channel lang="cz" xmltv_id="WaterPlanet.pl" site_id="Water+Planet">Water Planet</channel>
-    <channel lang="cz" xmltv_id="WauTV.sk" site_id="WAU">Wau TV</channel>
+    <channel lang="cz" xmltv_id="TVWAU.sk" site_id="WAU">Wau TV</channel>
     <channel lang="cz" xmltv_id="Welt.de" site_id="Welt">Welt</channel>
     <channel lang="cz" xmltv_id="WildTV.ca" site_id="Wild+TV">Wild TV</channel>
     <channel lang="cz" xmltv_id="WPolscePL.pl" site_id="wPolsce.pl">W Polsce PL</channel>
diff --git a/sites/movistarplus.es/movistarplus.es_es.channels.xml b/sites/movistarplus.es/movistarplus.es_es.channels.xml
index e3f3a957..92985a01 100644
--- a/sites/movistarplus.es/movistarplus.es_es.channels.xml
+++ b/sites/movistarplus.es/movistarplus.es_es.channels.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site site="movistarplus.es">
   <channels>
-    <channel lang="es" xmltv_id="0porMPlus.es" site_id="MV3">#0</channel>
+    <channel lang="es" xmltv_id="0porMovistarPlus.es" site_id="MV3">#0</channel>
     <channel lang="es" xmltv_id="324.es" site_id="3_24">3/24</channel>
     <channel lang="es" xmltv_id="7TelevisionRegiondeMurcia.es" site_id="7TVMUR">7 Televisión Región de Murcia</channel>
     <channel lang="es" xmltv_id="8TVCadiz.es" site_id="8TV">8 TV Cádiz</channel>
@@ -125,9 +125,9 @@
     <channel lang="es" xmltv_id="MovistarLaLigaUHD.es" site_id="MLIGUH">Movistar LaLiga UHD</channel>
     <channel lang="es" xmltv_id="MovistarLigadeCampeones.es" site_id="CHAPIO">Movistar Liga de Campeones</channel>
     <channel lang="es" xmltv_id="MovistarLigadeCampeones1.es" site_id="CHAP1">Movistar Liga de Campeones 1</channel>
-    <channel lang="es" xmltv_id="MovistarLigadeCampeones10.es" site_id="CHAP10">Movistar Liga de Campeones 10</channel>
-    <channel lang="es" xmltv_id="MovistarLigadeCampeones11.es" site_id="CHAP11">Movistar Liga de Campeones 11</channel>
-    <channel lang="es" xmltv_id="MovistarLigadeCampeones12.es" site_id="CHAP12">Movistar Liga de Campeones 12</channel>
+    <channel lang="es" xmltv_id="LigadeCampeones10porMovistarPlus.es" site_id="CHAP10">Movistar Liga de Campeones 10</channel>
+    <channel lang="es" xmltv_id="LigadeCampeones11porMovistarPlus.es" site_id="CHAP11">Movistar Liga de Campeones 11</channel>
+    <channel lang="es" xmltv_id="LigadeCampeones12porMovistarPlus.es" site_id="CHAP12">Movistar Liga de Campeones 12</channel>
     <channel lang="es" xmltv_id="MovistarLigadeCampeones2.es" site_id="CHAP2">Movistar Liga de Campeones 2</channel>
     <channel lang="es" xmltv_id="MovistarLigadeCampeones3.es" site_id="CHAP3">Movistar Liga de Campeones 3</channel>
     <channel lang="es" xmltv_id="MovistarLigadeCampeones4.es" site_id="CHAP4">Movistar Liga de Campeones 4</channel>
@@ -135,9 +135,9 @@
     <channel lang="es" xmltv_id="MovistarLigadeCampeones6.es" site_id="CHAP6">Movistar Liga de Campeones 6</channel>
     <channel lang="es" xmltv_id="MovistarLigadeCampeones7.es" site_id="CHAP7">Movistar Liga de Campeones 7</channel>
     <channel lang="es" xmltv_id="MovistarLigadeCampeones8.es" site_id="CHAP8">Movistar Liga de Campeones 8</channel>
-    <channel lang="es" xmltv_id="MovistarLigadeCampeones9.es" site_id="CHAP9">Movistar Liga de Campeones 9</channel>
+    <channel lang="es" xmltv_id="LigadeCampeones9porMovistarPlus.es" site_id="CHAP9">Movistar Liga de Campeones 9</channel>
     <channel lang="es" xmltv_id="MovistarLigadeCampeonesUHD.es" site_id="CHAUHD">Movistar Liga de Campeones UHD</channel>
-    <channel lang="es" xmltv_id="MovistarLosOscar.es" site_id="MOSCAR">Movistar Los Oscar</channel>
+    <channel lang="es" xmltv_id="OscarsporMovistarPlus.es" site_id="MOSCAR">Movistar Los Oscar</channel>
     <channel lang="es" xmltv_id="MovistarSeries.es" site_id="MV2">Movistar Series</channel>
     <channel lang="es" xmltv_id="MovistarSeries2.es" site_id="CPSER">Movistar  Series 2</channel>
     <channel lang="es" xmltv_id="MTV00s.uk" site_id="VH1">MTV 00s</channel>
@@ -182,7 +182,7 @@
     <channel lang="es" xmltv_id="tvG2.es" site_id="TVG2">tvG2</channel>
     <channel lang="es" xmltv_id="TVGEuropa.es" site_id="TVG">TVG Europa</channel>
     <channel lang="es" xmltv_id="UBeat.mx" site_id="UBEAT">U-Beat</channel>
-    <channel lang="es" xmltv_id="VamosporMPlus.es" site_id="VAMOSD">#Vamos</channel>
-    <channel lang="es" xmltv_id="Xtrm.es" site_id="XTRM">Xtrm</channel>
+    <channel lang="es" xmltv_id="VamosporMovistarPlus.es" site_id="VAMOSD">#Vamos</channel>
+    <channel lang="es" xmltv_id="XTRM.es" site_id="XTRM">Xtrm</channel>
   </channels>
 </site>
\ No newline at end of file
diff --git a/sites/programacion-tv.elpais.com/programacion-tv.elpais.com_es.channels.xml b/sites/programacion-tv.elpais.com/programacion-tv.elpais.com_es.channels.xml
index ba90cdd0..1c21e038 100644
--- a/sites/programacion-tv.elpais.com/programacion-tv.elpais.com_es.channels.xml
+++ b/sites/programacion-tv.elpais.com/programacion-tv.elpais.com_es.channels.xml
@@ -109,6 +109,6 @@
     <channel lang="es" xmltv_id="VePlusPanregional.ve" site_id="653">Ve Plus Panregional</channel>
     <channel lang="es" xmltv_id="VH1Europe.uk" site_id="165">VH1 Europe</channel>
     <channel lang="es" xmltv_id="Viajar.es" site_id="188">Viajar</channel>
-    <channel lang="es" xmltv_id="Xtrm.es" site_id="68">Xtrm</channel>
+    <channel lang="es" xmltv_id="XTRM.es" site_id="68">Xtrm</channel>
   </channels>
 </site>
\ No newline at end of file
diff --git a/sites/programetv.ro/programetv.ro_ro.channels.xml b/sites/programetv.ro/programetv.ro_ro.channels.xml
index 0e5dc1c1..6dfc1fbf 100644
--- a/sites/programetv.ro/programetv.ro_ro.channels.xml
+++ b/sites/programetv.ro/programetv.ro_ro.channels.xml
@@ -108,10 +108,6 @@
     <channel lang="ro" xmltv_id="KanalDRomania.ro" site_id="kanal-d">Kanal D Romania</channel>
     <channel lang="ro" xmltv_id="KIKA.de" site_id="kika">KIKA</channel>
     <channel lang="ro" xmltv_id="KissTV.ro" site_id="kiss-tv">Kiss TV</channel>
-    <channel lang="ro" xmltv_id="LookSport.ro" site_id="look-sport">LookSport</channel>
-    <channel lang="ro" xmltv_id="LookSport2.ro" site_id="look-sport-2">LookSport 2</channel>
-    <channel lang="ro" xmltv_id="LookSport3.ro" site_id="look-sport-3">LookSport 3</channel>
-    <channel lang="ro" xmltv_id="LookSportPlus.ro" site_id="look-sport-plus">LookSport +</channel>
     <channel lang="ro" xmltv_id="LoveNature.ca" site_id="love-nature">Love Nature</channel>
     <channel lang="ro" xmltv_id="LuxeTV.lu" site_id="luxe-tv">Luxe TV</channel>
     <channel lang="ro" xmltv_id="M1.hu" site_id="m1">M1</channel>
@@ -146,9 +142,24 @@
     <channel lang="ro" xmltv_id="NicktoonsRomania.ro" site_id="nicktoons">Nicktoons România</channel>
     <channel lang="ro" xmltv_id="NitroGermany.de" site_id="rtl-nitro">Nitro Deutschland</channel>
     <channel lang="ro" xmltv_id="ntv.de" site_id="n-tv">N-TV</channel>
+    <channel lang="ro" xmltv_id="OrangeSport1.ro" site_id="orange-sport-1">Orange Sport 1</channel>
+    <channel lang="ro" xmltv_id="OrangeSport1HD.ro" site_id="orange-sport-1-hd">Orange Sport 1 HD</channel>
+    <channel lang="ro" xmltv_id="OrangeSport2.ro" site_id="orange-sport-2">Orange Sport 2</channel>
+    <channel lang="ro" xmltv_id="OrangeSport3.ro" site_id="orange-sport-3">Orange Sport 3</channel>
+    <channel lang="ro" xmltv_id="OrangeSport4.ro" site_id="orange-sport-4">Orange Sport 4</channel>
     <channel lang="ro" xmltv_id="Phoenix.de" site_id="phoenix">Phoenix</channel>
     <channel lang="ro" xmltv_id="PlayboyTVEurope.us" site_id="playboy-tv">Playboy TV Europe</channel>
+    <channel lang="ro" xmltv_id="Prima4K.ro" site_id="prima-4k">Prima 4K</channel>
+    <channel lang="ro" xmltv_id="PrimaSport1.ro" site_id="prima-sport-1">Prima Sport 1</channel>
+    <channel lang="ro" xmltv_id="PrimaSport1HD.ro" site_id="prima-sport-1-hd">Prima Sport 1 HD</channel>
+    <channel lang="ro" xmltv_id="PrimaSport2.ro" site_id="prima-sport-2">Prima Sport 2</channel>
+    <channel lang="ro" xmltv_id="PrimaSport2HD.ro" site_id="prima-sport-2-hd">Prima Sport 2 HD</channel>
+    <channel lang="ro" xmltv_id="PrimaSport3.ro" site_id="prima-sport-3">Prima Sport 3</channel>
+    <channel lang="ro" xmltv_id="PrimaSport3HD.ro" site_id="prima-sport-3-hd">Prima Sport 3 HD</channel>
+    <channel lang="ro" xmltv_id="PrimaSport4.ro" site_id="prima-sport-4">Prima Sport 4</channel>
+    <channel lang="ro" xmltv_id="PrimaSport4HD.ro" site_id="prima-sport-4-hd">Prima Sport 4 HD</channel>
     <channel lang="ro" xmltv_id="PrimaTV.ro" site_id="prima-tv">Prima TV</channel>
+    <channel lang="ro" xmltv_id="PrimaTVHD.ro" site_id="prima-tv-hd">Prima TV HD</channel>
     <channel lang="ro" xmltv_id="PrivateTV.nl" site_id="private-tv">Private TV</channel>
     <channel lang="ro" xmltv_id="Pro2.ro" site_id="pro-2">Pro 2</channel>
     <channel lang="ro" xmltv_id="ProCinema.ro" site_id="pro-cinema-hd">Pro Cinema</channel>
@@ -185,10 +196,6 @@
     <channel lang="ro" xmltv_id="SuperRTLGermany.de" site_id="super-rtl">Super RTL Deutschland</channel>
     <channel lang="ro" xmltv_id="TarafTV.ro" site_id="taraf-tv">Taraf TV</channel>
     <channel lang="ro" xmltv_id="TeenNickRomania.ro" site_id="teennick">TeenNick România</channel>
-    <channel lang="ro" xmltv_id="TelekomSport1.ro" site_id="telekom-sport-1">Telekom Sport 1</channel>
-    <channel lang="ro" xmltv_id="TelekomSport2.ro" site_id="telekom-sport-2">Telekom Sport 2</channel>
-    <channel lang="ro" xmltv_id="TelekomSport3.ro" site_id="telekom-sport-3">Telekom Sport 3</channel>
-    <channel lang="ro" xmltv_id="TelekomSport4.ro" site_id="telekom-sport-4">Telekom Sport 4</channel>
     <channel lang="ro" xmltv_id="TheFishingHuntingChannel.hu" site_id="the-fishing-and-hunting-channel">The Fishing &amp; Hunting Channel</channel>
     <channel lang="ro" xmltv_id="TLCRomania.ro" site_id="tlc">TLC Rômania</channel>
     <channel lang="ro" xmltv_id="TraceCaribbean.fr" site_id="trace-caribbean">Trace Caribbean</channel>
diff --git a/sites/transvision.co.id/transvision.co.id_id.channels.xml b/sites/transvision.co.id/transvision.co.id_id.channels.xml
index 04d80465..32a522c1 100644
--- a/sites/transvision.co.id/transvision.co.id_id.channels.xml
+++ b/sites/transvision.co.id/transvision.co.id_id.channels.xml
@@ -29,7 +29,7 @@
     <channel lang="id" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="CNN">CNN International HD</channel>
     <channel lang="id" xmltv_id="CrimePlusInvestigationAsia.us" site_id="CI">Crime &amp; Investigation HD</channel>
     <channel lang="id" xmltv_id="DaVinciAsia.de" site_id="DVL">Da Vinci</channel>
-    <channel lang="id" xmltv_id="DaAiTVIndonesia.id" site_id="DAAI">DAAI TV</channel>
+    <channel lang="id" xmltv_id="DAAITV.id" site_id="DAAI">DAAI TV</channel>
     <channel lang="id" xmltv_id="DuckTV.sk" site_id="DUCK">Duck TV</channel>
     <channel lang="id" xmltv_id="DuniaAnak.id" site_id="AND">Dunia Anak</channel>
     <channel lang="id" xmltv_id="DuniaLain.id" site_id="TRDU">Dunia Lain</channel>
diff --git a/sites/tv.yandex.ru/tv.yandex.ru_ru.channels.xml b/sites/tv.yandex.ru/tv.yandex.ru_ru.channels.xml
index 31586bd1..e3028306 100644
--- a/sites/tv.yandex.ru/tv.yandex.ru_ru.channels.xml
+++ b/sites/tv.yandex.ru/tv.yandex.ru_ru.channels.xml
@@ -26,7 +26,7 @@
     <channel lang="ru" xmltv_id="Bober.ru" site_id="213#bober-1171">Bober</channel>
     <channel lang="ru" xmltv_id="BoksTV.ru" site_id="213#boks-tv-1095">Boks TV</channel>
     <channel lang="ru" xmltv_id="BollywoodHDRussia.ru" site_id="213#bollywood-hd-1105">Bollywood HD</channel>
-    <channel lang="ru" xmltv_id="BolshayaAziya.ru" site_id="213#bolshaya-aziya-116">Bolshaya Aziya</channel>
+    <channel lang="ru" xmltv_id="BigAsia.ru" site_id="213#bolshaya-aziya-116">Bolshaya Aziya</channel>
     <channel lang="ru" xmltv_id="BoomerangCentralEasternEurope.us" site_id="213#boomerang-741">Boomerang Central &amp; Eastern Europe</channel>
     <channel lang="ru" xmltv_id="BridgeTV.ru" site_id="213#bridge-tv-102">Bridge TV</channel>
     <channel lang="ru" xmltv_id="BridgeTVRusskiyHit.ru" site_id="213#bridge-tv-russkiy-hit-608">Bridge TV Russkiy Hit</channel>
diff --git a/sites/tvguide.myjcom.jp/tvguide.myjcom.jp_jp.channels.xml b/sites/tvguide.myjcom.jp/tvguide.myjcom.jp_jp.channels.xml
index 6ba96e73..10fca385 100644
--- a/sites/tvguide.myjcom.jp/tvguide.myjcom.jp_jp.channels.xml
+++ b/sites/tvguide.myjcom.jp/tvguide.myjcom.jp_jp.channels.xml
@@ -136,5 +136,6 @@
     <channel lang="jp" xmltv_id="JOAYDTV.jp" site_id="2_2072_32723">ABCテレビ/Asahi Broadcasting Kansai</channel>
     <channel lang="jp" xmltv_id="BSShochikuTokyu.jp" site_id="120_103_65406">BS松竹東急/BS Shochiku Tokyu</channel>
     <channel lang="jp" xmltv_id="BSYoshimoto.jp" site_id="120_179_65406">BSよしもと/BS Yoshimoto</channel>
+    <channel lang="jp" xmltv_id="JOOYDTV.jp" site_id="2_2064_32722">MBS毎日放送/Mainichi Broadcasting Osaka</channel>
   </channels>
 </site>
diff --git a/sites/tvtv.us/tvtv.us_us-local.channels.xml b/sites/tvtv.us/tvtv.us_us-local.channels.xml
index 2848477d..7c8fd24f 100644
--- a/sites/tvtv.us/tvtv.us_us-local.channels.xml
+++ b/sites/tvtv.us/tvtv.us_us-local.channels.xml
@@ -97,8 +97,8 @@
     <channel lang="en" xmltv_id="KAZADT2.us" site_id="66282">Decades (KAZA2) Avalon, CA</channel>
     <channel lang="en" xmltv_id="KAZADT3.us" site_id="66847">MeTV Plus (KAZA-DT3) Avalon, CA</channel>
     <channel lang="en" xmltv_id="KAZADT4.us" site_id="72303">Biz-TV (KAZA4) Avalon, CA</channel>
-    <channel lang="en" xmltv_id="KAZTCD2.us" site_id="31303">MeTV (KAZT-CD2) Phoenix, AZ</channel>
-    <channel lang="en" xmltv_id="KAZTCD3.us" site_id="31227">HSN (KAZT-CD3) Phoenix, AZ</channel>
+    <channel lang="en" xmltv_id="KAZTDT2.us" site_id="31303">MeTV (KAZT-CD2) Phoenix, AZ</channel>
+    <channel lang="en" xmltv_id="KAZTDT3.us" site_id="31227">HSN (KAZT-CD3) Phoenix, AZ</channel>
     <channel lang="en" xmltv_id="KBABLD1.us" site_id="67104">PBS (KBAB-LD) Santa Barbara, CA</channel>
     <channel lang="en" xmltv_id="KBABLD2.us" site_id="20364">PBS Plus (KBAB-LD2) Santa Barbara, CA</channel>
     <channel lang="en" xmltv_id="KBABLD3.us" site_id="111306">Daystar (KBAB-LD3) Santa Barbara, CA</channel>
diff --git a/sites/vidio.com/vidio.com_id.channels.xml b/sites/vidio.com/vidio.com_id.channels.xml
index 42542b51..6f31ceac 100644
--- a/sites/vidio.com/vidio.com_id.channels.xml
+++ b/sites/vidio.com/vidio.com_id.channels.xml
@@ -19,7 +19,7 @@
     <channel lang="id" xmltv_id="CitraEntertainment.id" site_id="6402">Citra Entertainment</channel>
     <channel lang="id" xmltv_id="CitraMuslim.id" site_id="6678">Citra Muslim</channel>
     <channel lang="id" xmltv_id="CNA.sg" site_id="6411">CNA</channel>
-    <channel lang="id" xmltv_id="DaAiTVIndonesia.id" site_id="6482">Da Ai TV</channel>
+    <channel lang="id" xmltv_id="DAAITV.id" site_id="6482">Da Ai TV</channel>
     <channel lang="id" xmltv_id="DaVinciAsia.de" site_id="6549">Da Vinci Asia</channel>
     <channel lang="id" xmltv_id="DWEnglish.de" site_id="5075">DW English</channel>
     <channel lang="id" xmltv_id="EuronewsEnglish.fr" site_id="6412">EuroNews English</channel>