diff --git a/README.md b/README.md
index 73c225e7..d6164aac 100644
--- a/README.md
+++ b/README.md
@@ -100,7 +100,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="2">🇫🇮&nbsp;Finland</td><td align="right">36</td><td nowrap><code>https://iptv-org.github.io/epg/guides/fi/allente.se.epg.xml.gz</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/allente.se.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/allente.se.yml/badge.svg" alt="allente.se" style="max-width: 100%;"></a></td></tr>
     <tr><td align="right">36</td><td nowrap><code>https://iptv-org.github.io/epg/guides/fi/telkussa.fi.epg.xml.gz</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/telkussa.fi.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/telkussa.fi.yml/badge.svg" alt="telkussa.fi" style="max-width: 100%;"></a></td></tr>
     <tr><td valign="top" rowspan="5">🇫🇷&nbsp;France</td><td align="right">280</td><td nowrap><code>https://iptv-org.github.io/epg/guides/fr/telecablesat.fr.epg.xml.gz</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/telecablesat.fr.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/telecablesat.fr.yml/badge.svg" alt="telecablesat.fr" style="max-width: 100%;"></a></td></tr>
-    <tr><td align="right">225</td><td nowrap><code>https://iptv-org.github.io/epg/guides/fr/canalplus.com.epg.xml.gz</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/canalplus.com.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/canalplus.com.yml/badge.svg" alt="canalplus.com" style="max-width: 100%;"></a></td></tr>
+    <tr><td align="right">226</td><td nowrap><code>https://iptv-org.github.io/epg/guides/fr/canalplus.com.epg.xml.gz</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/canalplus.com.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/canalplus.com.yml/badge.svg" alt="canalplus.com" style="max-width: 100%;"></a></td></tr>
     <tr><td align="right">211</td><td nowrap><code>https://iptv-org.github.io/epg/guides/fr/programme-tv.net.epg.xml.gz</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/programme-tv.net.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/programme-tv.net.yml/badge.svg" alt="programme-tv.net" style="max-width: 100%;"></a></td></tr>
     <tr><td align="right">194</td><td nowrap><code>https://iptv-org.github.io/epg/guides/fr/chaines-tv.orange.fr.epg.xml.gz</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/chaines-tv.orange.fr.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/chaines-tv.orange.fr.yml/badge.svg" alt="chaines-tv.orange.fr" style="max-width: 100%;"></a></td></tr>
     <tr><td align="right">10</td><td nowrap><code>https://iptv-org.github.io/epg/guides/fr/beinsports.com.epg.xml.gz</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/beinsports.com.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/beinsports.com.yml/badge.svg" alt="beinsports.com" style="max-width: 100%;"></a></td></tr>
@@ -155,7 +155,7 @@ To load a program guide, all you need to do is copy the link to one or more of t
     <tr><td align="right">3</td><td nowrap><code>https://iptv-org.github.io/epg/guides/il/kan.org.il.epg.xml.gz</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/kan.org.il.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/kan.org.il.yml/badge.svg" alt="kan.org.il" style="max-width: 100%;"></a></td></tr>
     <tr><td align="right">1</td><td nowrap><code>https://iptv-org.github.io/epg/guides/il/9tv.co.il.epg.xml.gz</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/9tv.co.il.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/9tv.co.il.yml/badge.svg" alt="9tv.co.il" style="max-width: 100%;"></a></td></tr>
     <tr><td align="right">1</td><td nowrap><code>https://iptv-org.github.io/epg/guides/il/mako.co.il.epg.xml.gz</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/mako.co.il.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/mako.co.il.yml/badge.svg" alt="mako.co.il" style="max-width: 100%;"></a></td></tr>
-    <tr><td valign="top" rowspan="3">🇮🇹&nbsp;Italy</td><td align="right">152</td><td nowrap><code>https://iptv-org.github.io/epg/guides/it/guidatv.sky.it.epg.xml.gz</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/guidatv.sky.it.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/guidatv.sky.it.yml/badge.svg" alt="guidatv.sky.it" style="max-width: 100%;"></a></td></tr>
+    <tr><td valign="top" rowspan="3">🇮🇹&nbsp;Italy</td><td align="right">164</td><td nowrap><code>https://iptv-org.github.io/epg/guides/it/guidatv.sky.it.epg.xml.gz</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/guidatv.sky.it.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/guidatv.sky.it.yml/badge.svg" alt="guidatv.sky.it" style="max-width: 100%;"></a></td></tr>
     <tr><td align="right">15</td><td nowrap><code>https://iptv-org.github.io/epg/guides/it/mediaset.it.epg.xml.gz</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/mediaset.it.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/mediaset.it.yml/badge.svg" alt="mediaset.it" style="max-width: 100%;"></a></td></tr>
     <tr><td align="right">14</td><td nowrap><code>https://iptv-org.github.io/epg/guides/it/raiplay.it.epg.xml.gz</code></td><td><a href="https://github.com/iptv-org/epg/actions/workflows/raiplay.it.yml"><img src="https://github.com/iptv-org/epg/actions/workflows/raiplay.it.yml/badge.svg" alt="raiplay.it" style="max-width: 100%;"></a></td></tr>
     <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.gz</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>
diff --git a/sites/canalplus.com/canalplus.com_fr.channels.xml b/sites/canalplus.com/canalplus.com_fr.channels.xml
index 5403d40f..84d808a4 100644
--- a/sites/canalplus.com/canalplus.com_fr.channels.xml
+++ b/sites/canalplus.com/canalplus.com_fr.channels.xml
@@ -34,8 +34,8 @@
     <channel lang="fr" xmltv_id="CanalAlphaNE.ch" site_id="772">CANAL ALPHA NE</channel>
     <channel lang="fr" xmltv_id="CanalJ.fr" site_id="525">CANAL J</channel>
     <channel lang="fr" xmltv_id="CanalPlusCinemaFrance.fr" site_id="198">CANAL+CINEMA</channel>
-    <channel lang="fr" xmltv_id="CanalPlusDecale.fr" site_id="257">CANAL+DECALE</channel>
     <channel lang="fr" xmltv_id="CanalPlusDocs.fr" site_id="899">CANAL+DOCS</channel>
+    <channel lang="fr" xmltv_id="CanalPlusFoot.fr" site_id="19">CANAL+FOOT</channel>
     <channel lang="fr" xmltv_id="CanalPlusFormula1.fr" site_id="824">CANAL+FORMULA1</channel>
     <channel lang="fr" xmltv_id="CanalPlusFrance.fr" site_id="301">CANAL+</channel>
     <channel lang="fr" xmltv_id="CanalPlusGrandEcran.fr" site_id="900">CANAL+GRAND ECRAN</channel>
@@ -44,6 +44,7 @@
     <channel lang="fr" xmltv_id="CanalPlusPremierLeague.fr" site_id="815">CANAL+PREMIER LEAGUE</channel>
     <channel lang="fr" xmltv_id="CanalPlusSeriesFrance.fr" site_id="481">CANAL+SERIES</channel>
     <channel lang="fr" xmltv_id="CanalPlusSport2.fr" site_id="861">CANAL+ SPORT 2 (CH)</channel>
+    <channel lang="fr" xmltv_id="CanalPlusSport360.fr" site_id="83">CANAL+SPORT360</channel>
     <channel lang="fr" xmltv_id="CanalPlusSportFrance.fr" site_id="177">CANAL+SPORT</channel>
     <channel lang="fr" xmltv_id="CanalPlusTop14.fr" site_id="816">CANAL+TOP14</channel>
     <channel lang="fr" xmltv_id="CartoonNetworkFrance.fr" site_id="502">CARTOON NETWORK</channel>
diff --git a/sites/guidatv.sky.it/guidatv.sky.it_it.channels.xml b/sites/guidatv.sky.it/guidatv.sky.it_it.channels.xml
index 46495079..9d3d09bb 100644
--- a/sites/guidatv.sky.it/guidatv.sky.it_it.channels.xml
+++ b/sites/guidatv.sky.it/guidatv.sky.it_it.channels.xml
@@ -41,7 +41,7 @@
     <channel lang="it" xmltv_id="EuronewsItalian.fr" site_id="DTH#801">EuroNews Italiano</channel>
     <channel lang="it" xmltv_id="Eurosport1Italy.it" site_id="DTH#9057">Eurosport 1 Italia</channel>
     <channel lang="it" xmltv_id="Eurosport2Italy.it" site_id="DTH#9060">Eurosport 2 Italia</channel>
-    <channel lang="it" xmltv_id="ExplorerChannel.it" site_id="DTH#11262">Explorer HD Channel</channel>
+    <channel lang="it" xmltv_id="ExplorerHDChannel.it" site_id="DTH#11262">Explorer HD Channel</channel>
     <channel lang="it" xmltv_id="FashionTVEurope.fr" site_id="DTH#810">Fashion TV</channel>
     <channel lang="it" xmltv_id="FoodNetworkItaly.it" site_id="DTH#10534">Food Network Italia</channel>
     <channel lang="it" xmltv_id="FoxBusiness.us" site_id="DTH#6741">Fox Business</channel>
@@ -70,7 +70,6 @@
     <channel lang="it" xmltv_id="MotorTrend.it" site_id="DTH#8130">Motor Trend</channel>
     <channel lang="it" xmltv_id="MTVItaly.it" site_id="DTH#9195">MTV HD</channel>
     <channel lang="it" xmltv_id="MTVMusicItaly.it" site_id="DTH#528">MTV Music</channel>
-    <channel lang="it" xmltv_id="MTVMusicItaly.it" site_id="DTH#11054">MTV Music Italia</channel>
     <channel lang="it" xmltv_id="NationalGeographicWildItalyPlus1.it" site_id="DTH#8813">National Geographic Wild Italia +1</channel>
     <channel lang="it" xmltv_id="NationalGeographicItaly.it" site_id="DTH#9098">National Geographic Italia</channel>
     <channel lang="it" xmltv_id="NationalGeographicItalyPlus1.it" site_id="DTH#125">National Geographic Italia +1</channel>
@@ -122,12 +121,12 @@
     <channel lang="it" xmltv_id="SkyDocumentariesPlus1.it" site_id="DTH#11240">Sky Documentaries +1 HD</channel>
     <channel lang="it" xmltv_id="SkyDocumentariesHD.it" site_id="DTH#11239">Sky Documentaries HD</channel>
     <channel lang="it" xmltv_id="SkyInvestigationPlus1.it" site_id="DTH#11238">Sky Investigation +1 HD</channel>
-    <channel lang="it" xmltv_id="SkyInvestigation.it" site_id="DTH#11246">Sky Investigation HD</channel>
+    <channel lang="it" xmltv_id="SkyInvestigationHD.it" site_id="DTH#11246">Sky Investigation HD</channel>
     <channel lang="it" xmltv_id="SkyMeteo24.it" site_id="DTH#321">Sky Meteo 24</channel>
     <channel lang="it" xmltv_id="SkyNatureHD.it" site_id="DTH#11242">Sky Nature HD</channel>
     <channel lang="it" xmltv_id="SkyNewsInternational.uk" site_id="DTH#445">Sky News International</channel>
-    <channel lang="it" xmltv_id="SkySerieAnime.it" site_id="DTH#11247">Sky Serie Anime HD</channel>
-    <channel lang="it" xmltv_id="SkySerie.it" site_id="DTH#11244">Sky Serie HD</channel>
+    <channel lang="it" xmltv_id="SkySerieAnimeHD.it" site_id="DTH#11247">Sky Serie Anime HD</channel>
+    <channel lang="it" xmltv_id="SkySerieHD.it" site_id="DTH#11244">Sky Serie HD</channel>
     <channel lang="it" xmltv_id="SkySport10.it" site_id="DTH#8613">Sky Sport 10</channel>
     <channel lang="it" xmltv_id="SkySport11.it" site_id="DTH#615">Sky Sport 11</channel>
     <channel lang="it" xmltv_id="SkySport2.it" site_id="DTH#9045">Sky Sport 2</channel>
diff --git a/sites/tv.trueid.net/tv.trueid.net_th.channels.xml b/sites/tv.trueid.net/tv.trueid.net_th.channels.xml
index d6f15394..0e76ae03 100644
--- a/sites/tv.trueid.net/tv.trueid.net_th.channels.xml
+++ b/sites/tv.trueid.net/tv.trueid.net_th.channels.xml
@@ -2,10 +2,10 @@
 <site site="tv.trueid.net">
   <channels>
     <channel lang="th" xmltv_id="Amarin34HD.th" site_id="amarintv-hd">Amarin 34 HD</channel>
-    <channel lang="th" xmltv_id="AnimalPlanetHDThailand.th" site_id="hybrid-animalplanet-hd">Animal Planet HD</channel>
+    <channel lang="th" xmltv_id="AnimalPlanetHDThailand.th" site_id="animalplanet-hd">Animal Planet HD</channel>
     <channel lang="th" xmltv_id="AsianFoodNetwork.sg" site_id="asian-food-channel">Asian Food Network</channel>
-    <channel lang="th" xmltv_id="AXNHDThailand.th" site_id="hybrid-axn-hd">AXN HD</channel>
-    <channel lang="th" xmltv_id="BBCEarthAsia.uk" site_id="hybrid-bbc-earth-hd">BBC Earth HD</channel>
+    <channel lang="th" xmltv_id="AXNHDThailand.th" site_id="axn-hd">AXN HD</channel>
+    <channel lang="th" xmltv_id="BBCEarthAsia.uk" site_id="bbc-earth-hd">BBC Earth HD</channel>
     <channel lang="th" xmltv_id="BBCLifestyleAsia.uk" site_id="bbc-life-style">BBC Lifestyle</channel>
     <channel lang="th" xmltv_id="BBCWorldNewsAsiaPacific.uk" site_id="bbc-world-news-hd">BBC World News HD</channel>
     <channel lang="th" xmltv_id="BBTVChannel7.th" site_id="ch7-hd">BBTV Channel 7</channel>
@@ -17,42 +17,42 @@
     <channel lang="th" xmltv_id="Channel8.th" site_id="ch8">Thai Channel 8</channel>
     <channel lang="th" xmltv_id="CNBCAsia.sg" site_id="cnbc">CNBC</channel>
     <channel lang="th" xmltv_id="CNNInternationalAsiaPacific.hk" site_id="cnn-hd">CNN HD</channel>
-    <channel lang="th" xmltv_id="DiscoveryAsiaThailand.th" site_id="hybrid-discoveryasia">Discovery Asia</channel>
+    <channel lang="th" xmltv_id="DiscoveryAsiaThailand.th" site_id="discoveryasia">Discovery Asia</channel>
     <channel lang="th" xmltv_id="DiscoveryChannelThailand.th" site_id="discoverychannel">Discovery Channel</channel>
-    <channel lang="th" xmltv_id="DreamWorksChannelAsia.us" site_id="hybrid-dreamworks-hd">DreamWorks TV HD</channel>
-    <channel lang="th" xmltv_id="FashionTVAsia.fr" site_id="hybrid-fashion-tv">FashionTV</channel>
-    <channel lang="th" xmltv_id="FoodNetworkAsia.sg" site_id="hybrid-food-network-hd">Food Network HD</channel>
+    <channel lang="th" xmltv_id="DreamWorksChannelAsia.us" site_id="dreamworks-hd">DreamWorks TV HD</channel>
+    <channel lang="th" xmltv_id="FashionTVAsia.fr" site_id="fashion-tv">FashionTV</channel>
+    <channel lang="th" xmltv_id="FoodNetworkAsia.sg" site_id="food-network-hd">Food Network HD</channel>
     <channel lang="th" xmltv_id="GEM.sg" site_id="gem">Gem</channel>
     <channel lang="th" xmltv_id="GMM25.th" site_id="gmm25">GMM 25</channel>
     <channel lang="th" xmltv_id="History2Asia.us" site_id="hybrid-h2">History 2</channel>
-    <channel lang="th" xmltv_id="HistoryAsia.us" site_id="hybrid-history-channel-hd">History HD</channel>
+    <channel lang="th" xmltv_id="HistoryAsia.us" site_id="history-channel-hd">History HD</channel>
     <channel lang="th" xmltv_id="JKN18.th" site_id="jkn18">JKN 18</channel>
     <channel lang="th" xmltv_id="KBSWorld.kr" site_id="kbs-world-hd">KBS World</channel>
     <channel lang="th" xmltv_id="KMTV.kr" site_id="hybrid-kmtv-hd">KMTV HD</channel>
-    <channel lang="th" xmltv_id="LifetimeAsia.us" site_id="hybrid-life-time">Lifetime</channel>
+    <channel lang="th" xmltv_id="LifetimeAsia.us" site_id="life-time">Lifetime</channel>
     <channel lang="th" xmltv_id="LoveNature.ca" site_id="lovenature">Love Nature</channel>
     <channel lang="th" xmltv_id="MCOTHD.th" site_id="9mcot-hd">MCOT HD</channel>
     <channel lang="th" xmltv_id="Mono29.th" site_id="mono29">Mono 29</channel>
-    <channel lang="th" xmltv_id="MotorvisionTV.de" site_id="hybrid-motor-vision">Motorvision TV</channel>
+    <channel lang="th" xmltv_id="MotorvisionTV.de" site_id="motor-vision">Motorvision TV</channel>
     <channel lang="th" xmltv_id="NationTV.th" site_id="nationtv">Nation TV</channel>
-    <channel lang="th" xmltv_id="NBATV.us" site_id="nba-tv">NBA TV</channel>
+    <channel lang="th" xmltv_id="NBATV.us" site_id="hybrid-nba-tv">NBA TV</channel>
     <channel lang="th" xmltv_id="NBT2HD.th" site_id="nbt">NBT 2</channel>
     <channel lang="th" xmltv_id="NHKWorldPremium.jp" site_id="nhk-world-tv">NHK World</channel>
     <channel lang="th" xmltv_id="NickelodeonAsia.sg" site_id="nickelodeon">Nickelodeon</channel>
-    <channel lang="th" xmltv_id="NickJrAsia.sg" site_id="hybrid-nickjr-hd">Nick Jr HD</channel>
+    <channel lang="th" xmltv_id="NickJrAsia.sg" site_id="nickjr-hd">Nick Jr HD</channel>
     <channel lang="th" xmltv_id="One31.th" site_id="one-hd">One 31</channel>
-    <channel lang="th" xmltv_id="OutdoorChannelInternational.us" site_id="hybrid-outdoor-channel">Outdoor Channel</channel>
+    <channel lang="th" xmltv_id="OutdoorChannelInternational.us" site_id="outdoor-channel">Outdoor Channel</channel>
     <channel lang="th" xmltv_id="ParamountNetworkHDThailand.th" site_id="hybrid-paramount-hd">Paramount Network HD</channel>
     <channel lang="th" xmltv_id="PhoenixInfoNewsChannel.hk" site_id="phoenix-infonews">Phoenix InfoNews Channel</channel>
     <channel lang="th" xmltv_id="PPTVHD36.th" site_id="pptv-hd">PPTV HD 36</channel>
     <channel lang="th" xmltv_id="RamaChannel.th" site_id="hybrid-rama-channel">Rama Channel</channel>
-    <channel lang="th" xmltv_id="RockEntertainment.sg" site_id="hybrid-rtl-entertainment">Rock Entertainment</channel>
-    <channel lang="th" xmltv_id="RockExtreme.sg" site_id="hybrid-rtl-extreme">Rock Extreme</channel>
+    <channel lang="th" xmltv_id="RockEntertainment.sg" site_id="rtl-entertainment">Rock Entertainment</channel>
+    <channel lang="th" xmltv_id="RockExtreme.sg" site_id="rtl-extreme">Rock Extreme</channel>
     <channel lang="th" xmltv_id="SPOTV2.kr" site_id="spotv2-hd">SpoTV 2</channel>
     <channel lang="th" xmltv_id="ThaiPBS3.th" site_id="thaipbs">Thai PBS 3</channel>
     <channel lang="th" xmltv_id="ThairathTV32.th" site_id="thairathtv-hd">Thairath TV 32</channel>
     <channel lang="th" xmltv_id="ThaiTV5HD1.th" site_id="ch5">Thai TV 5 HD1</channel>
-    <channel lang="th" xmltv_id="TLCSoutheastAsia.us" site_id="hybrid-tcl-hd">TLC HD</channel>
+    <channel lang="th" xmltv_id="TLCSoutheastAsia.us" site_id="tcl-hd">TLC HD</channel>
     <channel lang="th" xmltv_id="TNN16.th" site_id="hybrid-3-tnn16">TNN 16</channel>
     <channel lang="th" xmltv_id="TNN2.th" site_id="tnn-2">TNN 2</channel>
     <channel lang="th" xmltv_id="True4U.th" site_id="true4u">True 4U</channel>