diff --git a/channels/fr.m3u b/channels/fr.m3u
index f7bc62c49..bd377f436 100644
--- a/channels/fr.m3u
+++ b/channels/fr.m3u
@@ -217,6 +217,10 @@ http://51.210.199.25/hls/stream.m3u8
 https://rmc2hdslive-lh.akamaihd.net/i/DVMR_RMC@167269/master.m3u8
 #EXTINF:-1 tvg-id="RMCDecouverte.fr" tvg-name="RMC Découverte" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/FVrOYXe.jpg" group-title="",RMC Découverte (576p)
 http://cdn.webtv4.cdnfr.orange.fr/hs/HALO3/hls/rmcdecouverte-850466/hls/index.m3u8
+#EXTINF:-1 tvg-id="TF1.fr" tvg-name="TF1" tvg-country="FR" tvg-language="" tvg-logo="https://i.ibb.co/M8GjLmy/TF1.png" group-title="",TF1 (576p)
+http://cdn.webtv4.cdnfr.orange.fr/hs/HALO3/hls/tech_tf1_ott_mobile-155120/hls/index.m3u8
+#EXTINF:-1 tvg-id="TF1.fr" tvg-name="TF1" tvg-country="FR" tvg-language="" tvg-logo="https://i.ibb.co/M8GjLmy/TF1.png" group-title="",TF1 (720p)
+https://tf1-hls-live-ssl.tf1.fr/tf1/1/hls/live_2328.m3u8
 #EXTINF:-1 tvg-id="TF1 Séries Films" tvg-name="TF1 Séries Films" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/qFLq6lE.png" group-title="",TF1 Séries Films (720p)
 https://tsf-hls-live-ssl.tf1.fr/tsf/1/hls/live_2328.m3u8
 #EXTINF:-1 tvg-id="TFX" tvg-name="TFX" tvg-country="FR;AD;BE;LU;MC;CH" tvg-language="French" tvg-logo="https://i.imgur.com/yJ5JRAK.png" group-title="",TFX (720p)
@@ -243,7 +247,3 @@ https://live.creacast.com/mirabelletv/smil:mirabelletv.smil/playlist.m3u8
 https://streamer03.myvideoplace.tv/streamer02/hls/MDS_VIA_PAD_301117_medium/index.m3u8
 #EXTINF:-1 tvg-id="W9.fr" tvg-name="W9" tvg-country="FR;AD;BE;LU;MC;CH" tvg-language="French" tvg-logo="http://static.epg.best/fr/W9.fr.png" group-title="",W9 (576p)
 http://cdn.webtv4.cdnfr.orange.fr/hs/HALO4/hls/w9live-37153/hls/index.m3u8
-#EXTINF:-1 tvg-id="TF1.fr" tvg-name="TF1" tvg-logo="https://i.ibb.co/M8GjLmy/TF1.png" group-title="",TF1 (720p)
-https://tf1-hls-live-ssl.tf1.fr/tf1/1/hls/live_2328.m3u8
-#EXTINF:-1 tvg-id="TF1.fr" tvg-name="TF1" tvg-logo="https://i.ibb.co/M8GjLmy/TF1.png" group-title="",TF1 (576p)
-http://cdn.webtv4.cdnfr.orange.fr/hs/HALO3/hls/tech_tf1_ott_mobile-155120/hls/index.m3u8
diff --git a/channels/hk.m3u b/channels/hk.m3u
index 6bcc47ace..a535c3501 100644
--- a/channels/hk.m3u
+++ b/channels/hk.m3u
@@ -9,6 +9,8 @@ http://61.238.6.49:8001/bysid/82
 rtmp://ivi.bupt.edu.cn:1935/livetv/starsports
 #EXTINF:-1 tvg-id="Thrill.hk" tvg-name="Thrill" tvg-country="SAS" tvg-language="English" tvg-logo="http://console.celestialtiger.com/images/upload/1f6e441382a388940977fd9e165178c42fe0c193.png" group-title="Movies",Thrill (480p)
 http://45.126.83.51/qwr9ew/s/s34/index.m3u8
+#EXTINF:-1 tvg-id="TVBJade.hk" tvg-name="TVB Jade" tvg-country="HK" tvg-language="Chinese" tvg-logo="" group-title="",TVB Jade
+http://ubaio.chaoniu1995.top:6796/ub/cr/crtv.php?id=30
 #EXTINF:-1 tvg-id="ViuTV.hk" tvg-name="ViuTV" tvg-country="HK" tvg-language="Chinese;Yue Chinese" tvg-logo="http://aaaa.com.hk/main/wp-content/uploads/2020/02/ViuTV-logo.png" group-title="",ViuTV
 https://cdn.hkdtmb.com/hls/99/index.m3u8
 #EXTINF:-1 tvg-id="YaLuWeiShi.hk" tvg-name="亞旅衛視" tvg-country="HK" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://i.imgur.com/1wbOhJV.jpg" group-title="Travel",亞旅衛視
@@ -39,5 +41,3 @@ http://221.179.217.70/PLTV/88888888/224/3221225942/1.m3u8
 http://117.169.120.138:8080/live/fhzixun/.m3u8
 #EXTINF:-1 tvg-id="FengHuangWeiShiDianYingTai.hk" tvg-name="鳳凰衛視電影台" tvg-country="HK" tvg-language="Chinese" tvg-logo="https://p1.ifengimg.com/a/2018_43/45a9d426b4ae58c.jpg" group-title="",鳳凰衛視電影台
 rtmp://ivi.bupt.edu.cn:1935/livetv/fhdy
-#EXTINF:-1 tvg-id="TVBJade.hk" tvg-name="TVB Jade" tvg-country="HK" tvg-language="Chinese" tvg-logo="" group-title="",TVB Jade
-http://ubaio.chaoniu1995.top:6796/ub/cr/crtv.php?id=30
diff --git a/channels/ie.m3u b/channels/ie.m3u
index 237e3320a..c2c36a089 100644
--- a/channels/ie.m3u
+++ b/channels/ie.m3u
@@ -1,20 +1,20 @@
 #EXTM3U
+#EXTINF:-1 tvg-id="CommitteeRoom1.ie" tvg-name="Committee Room 1" tvg-country="IE" tvg-language="English" tvg-logo="https://i.imgur.com/JLYqKC0.jpg" group-title="Legislative",Ireland Parliament (Committee Room 1) (720p)
+https://d33zah5htxvoxb.cloudfront.net/el/live/cr1/hls_1280x720.m3u8
+#EXTINF:-1 tvg-id="CommitteeRoom2.ie" tvg-name="Committee Room 2" tvg-country="IE" tvg-language="English" tvg-logo="https://i.imgur.com/2Wxx2jK.jpg" group-title="Legislative",Ireland Parliament (Committee Room 2) (720p)
+https://d33zah5htxvoxb.cloudfront.net/el/live/cr2/hls_1280x720.m3u8
+#EXTINF:-1 tvg-id="CommitteeRoom3.ie" tvg-name="Committee Room 3" tvg-country="IE" tvg-language="English" tvg-logo="https://i.imgur.com/EoAQeg5.jpg" group-title="Legislative",Ireland Parliament (Committee Room 3) (720p)
+https://d33zah5htxvoxb.cloudfront.net/el/live/cr3/hls_1280x720.m3u8
+#EXTINF:-1 tvg-id="CommitteeRoom4.ie" tvg-name="Committee Room 4" tvg-country="IE" tvg-language="English" tvg-logo="https://i.imgur.com/U9U4rgs.jpg" group-title="Legislative",Ireland Parliament (Committee Room 4) (720p)
+https://d33zah5htxvoxb.cloudfront.net/el/live/cr4/hls_1280x720.m3u8
+#EXTINF:-1 tvg-id="DailEireann.ie" tvg-name="Dail Eireann" tvg-country="IE" tvg-language="English" tvg-logo="https://i.imgur.com/mexKiS0.jpg" group-title="Legislative",Ireland Parliament (Dail Eireann) (720p)
+https://d33zah5htxvoxb.cloudfront.net/el/live/dail/hls_1280x720.m3u8
+#EXTINF:-1 tvg-id="SeanadEireann.ie" tvg-name="Seanad Eireann" tvg-country="IE" tvg-language="English" tvg-logo="https://i.imgur.com/c5TI2DT.jpg" group-title="Legislative",Ireland Parliament (Seanad Eireann) (720p)
+https://d33zah5htxvoxb.cloudfront.net/el/live/seanad/hls_1280x720.m3u8
 #EXTINF:-1 tvg-id="OireachtasTV.ie" tvg-name="Oireachtas TV" tvg-country="IE" tvg-language="English" tvg-logo="http://upload.wikimedia.org/wikipedia/commons/7/75/Official_Houses_of_the_Oireachtas_Logo.jpg" group-title="Legislative",Oireachtas TV (480p)
 https://d1h8rkqumz239n.cloudfront.net/oireachtas/ngrp:oireachtas.stream_all/playlist.m3u8
 #EXTINF:-1 tvg-id="OireachtasTV.ie" tvg-name="Oireachtas TV" tvg-country="IE" tvg-language="English" tvg-logo="https://i.imgur.com/lUyNmTY.jpg" group-title="Legislative",Oireachtas TV (720p)
 https://d33zah5htxvoxb.cloudfront.net/el/live/oirtv/hls_1280x720.m3u8
-#EXTINF:-1 tvg-name="Dail Eireann" tvg-country="IE" tvg-language="English" tvg-logo="https://i.imgur.com/mexKiS0.jpg" group-title="Legislative",Ireland Parliament (Dail Eireann) (720p)
-https://d33zah5htxvoxb.cloudfront.net/el/live/dail/hls_1280x720.m3u8
-#EXTINF:-1 tvg-name="Seanad Eireann" tvg-country="IE" tvg-language="English" tvg-logo="https://i.imgur.com/c5TI2DT.jpg" group-title="Legislative",Ireland Parliament (Seanad Eireann) (720p)
-https://d33zah5htxvoxb.cloudfront.net/el/live/seanad/hls_1280x720.m3u8
-#EXTINF:-1 tvg-name="Committee Room 1" tvg-country="IE" tvg-language="English" tvg-logo="https://i.imgur.com/JLYqKC0.jpg" group-title="Legislative",Ireland Parliament (Committee Room 1) (720p)
-https://d33zah5htxvoxb.cloudfront.net/el/live/cr1/hls_1280x720.m3u8
-#EXTINF:-1 tvg-name="Committee Room 2" tvg-country="IE" tvg-language="English" tvg-logo="https://i.imgur.com/2Wxx2jK.jpg" group-title="Legislative",Ireland Parliament (Committee Room 2) (720p)
-https://d33zah5htxvoxb.cloudfront.net/el/live/cr2/hls_1280x720.m3u8
-#EXTINF:-1 tvg-name="Committee Room 3" tvg-country="IE" tvg-language="English" tvg-logo="https://i.imgur.com/EoAQeg5.jpg" group-title="Legislative",Ireland Parliament (Committee Room 3) (720p)
-https://d33zah5htxvoxb.cloudfront.net/el/live/cr3/hls_1280x720.m3u8
-#EXTINF:-1 tvg-name="Committee Room 4" tvg-country="IE" tvg-language="English" tvg-logo="https://i.imgur.com/U9U4rgs.jpg" group-title="Legislative",Ireland Parliament (Committee Room 4) (720p)
-https://d33zah5htxvoxb.cloudfront.net/el/live/cr4/hls_1280x720.m3u8
 #EXTINF:-1 tvg-id="RTENews.ie" tvg-name="RTÉ News" tvg-country="IE" tvg-language="English" tvg-logo="http://static.epg.best/ie/RTENewsNow.ie.png" group-title="News",RTÉ News (1080p)
 https://live.rte.ie/live/a/channel3/news.isml/news.m3u8
 #EXTINF:-1 tvg-id="RugbyMensSevens.ie" tvg-name="Rugby Men's Sevens" tvg-country="IE" tvg-language="English" tvg-logo="https://i.imgur.com/dIzAmT0.png" group-title="Sport",Rugby Men's Sevens (288p)
diff --git a/channels/mt.m3u b/channels/mt.m3u
index 04ded25a7..0f4c24330 100644
--- a/channels/mt.m3u
+++ b/channels/mt.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
-#EXTINF:-1 tvg-name="One" tvg-id="ONE.mt" tvg-logo="https://www.one.com.mt/assets/img/design/logos/menu_one_grey.png" group-title="",One (720p)
-https://2-fss-2.streamhoster.com/pl_124/201830-1293592-1/playlist.m3u8
-#EXTINF:-1 tvg-name="One" tvg-id="ONE.mt" tvg-logo="https://www.one.com.mt/assets/img/design/logos/menu_one_grey.png" group-title="",One (720p)
+#EXTINF:-1 tvg-id="ONE.mt" tvg-name="One" tvg-country="MT" tvg-language="" tvg-logo="https://www.one.com.mt/assets/img/design/logos/menu_one_grey.png" group-title="",One (720p)
 https://2-fss-2.streamhoster.com/pl_124/201830-1293592-1/chunklist.m3u8
-#EXTINF:-1 tvg-name="Smash TV" tvg-id="SmashTV.mt" tvg-logo="https://i.imgur.com/abqTjYB.png" group-title="",Smash TV (720p)
+#EXTINF:-1 tvg-id="ONE.mt" tvg-name="One" tvg-country="MT" tvg-language="" tvg-logo="https://www.one.com.mt/assets/img/design/logos/menu_one_grey.png" group-title="",One (720p)
+https://2-fss-2.streamhoster.com/pl_124/201830-1293592-1/playlist.m3u8
+#EXTINF:-1 tvg-id="SmashTV.mt" tvg-name="Smash TV" tvg-country="MT" tvg-language="" tvg-logo="https://i.imgur.com/abqTjYB.png" group-title="",Smash TV (720p)
 http://s3.smashmalta.com/hls/smash/smash.m3u8
diff --git a/channels/unsorted.m3u b/channels/unsorted.m3u
index ea77752bf..84c24a72b 100644
--- a/channels/unsorted.m3u
+++ b/channels/unsorted.m3u
@@ -2381,8 +2381,6 @@ https://5b38ce71f1f00.streamlock.net/8028/8028/master.m3u8
 https://585b674743bbb.streamlock.net/9006/9006/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/2Cwt1MG.png" group-title="",Onda Valencia
 https://streaming-audio-1.magentalabs.es:19360/ondavalencia/ondavalencia.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="" group-title="",One
-https://2-fss-2.streamhoster.com/pl_124/201830-1293592-1/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/G6e7Hcl.png" group-title="",One America News
 http://n1.klowdtv.net/live1/oan_720p/chunks.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="http://images.pluto.tv/channels/5e4ee1c1f8928000093d0425/colorLogoPNG.png" group-title="",One Day at a Time
@@ -3307,8 +3305,6 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d765a05f
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5e735c6834d7d10007059790/master.m3u8?deviceId=channel&deviceModel=web&deviceVersion=1.0&appVersion=1.0&deviceType=rokuChannel&deviceMake=rokuChannel&deviceDNT=1&advertisingId=channel&embedPartner=rokuChannel&appName=rokuchannel&is_lat=1&bmodel=bm1&content=channel&platform=web&tags=ROKU_CONTENT_TAGS&coppa=false&content_type=livefeed&rdid=channel&genre=ROKU_ADS_CONTENT_GENRE&content_rating=ROKU_ADS_CONTENT_RATING&studio_id=viacom&channel_id=channel
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/UyIkHU3.png" group-title="",Smart Lifestyle TV
 https://t01587-lh.akamaihd.net/i/t01587SmartLifeStyle_1@692079/index_1200_av-p.m3u8?sd=10&set-akamai-hls-revision=5&rebase=on
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="" group-title="",Smash TV
-http://s3.smashmalta.com/hls/smash/smash.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/weNdD7r.png" group-title="",Smithsonian Channel
 https://smithsonianaus-samsungau.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://images.pluto.tv/channels/5f21ea08007a49000762d349/featuredImage.jpg" group-title="",Smithsonian Channel Selects
@@ -3625,8 +3621,6 @@ https://dai.google.com/linear/hls/event/MYhAOCTqQA6QFBdc1xwULQ/master.m3u8
 https://dai.google.com/linear/hls/event/Exp7zxEPSLWuEhMoD2voOg/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/7JgPJxx.png" group-title="",Texas: San Antonio
 https://dai.google.com/linear/hls/event/TIQuLmldSj2SqS8y2ud9Xg/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/Y2C6vP7.png" group-title="",TF1
-https://tf1-hls-live-ssl.tf1.fr/tf1/1/hls/live_2328.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/12Vkj60.png" group-title="",TG Junior
 https://tg-junior.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="" group-title="",TG Norba 24