diff --git a/channels/unsorted.m3u b/channels/unsorted.m3u
index e84746403..4c03edca6 100644
--- a/channels/unsorted.m3u
+++ b/channels/unsorted.m3u
@@ -1,268 +1,28 @@
 #EXTM3U
-#EXTINF:-1,1-2-3.tv
-http://123tv.cdn.ses-ps.com/stream070101/playlist.m3u8
-#EXTINF:-1,Das Erste HD
-https://mcdn.daserste.de/daserste/de/master_3744.m3u8
-#EXTINF:-1,ANIXE HD
-https://ma.anixa.tv/clips/stream/anixehd/index.m3u8
-#EXTINF:-1,ARD-alpha
-https://brlive-lh.akamaihd.net/i/bralpha_germany@119899/index_1_av-p.m3u8
-#EXTINF:-1,a.tv
-https://augsburgtv.iptv-playoutcenter.de/augsburgtv/augsburgtv.stream_1/playlist.m3u8
-#EXTINF:-1,allgäu.tv
-http://tvallgaeu.iptv-playoutcenter.de:1935/tvallgaeu/tvallgaeu.stream_2/playlist.m3u8
 #EXTINF:-1,ABC News
 https://abclive1-lh.akamaihd.net/i/abc_live04@423398/index_4000_av-p.m3u8
 #EXTINF:-1,ALBUK TV
 http://albuk.dyndns.tv:1935/albuk/albuk.stream/playlist.m3u8
-#EXTINF:-1,Baden TV
-http://cdn.icu.de/rtplive/btv.stream/playlist.m3u8
-#EXTINF:-1,BR Fernsehen Nord HD
-https://brlive-lh.akamaihd.net/i/bfsnord_germany@119898/index_1_av-p.m3u8
-#EXTINF:-1,BR Fernsehen Süd HD
-https://brlive-lh.akamaihd.net/i/bfssued_germany@119890/index_1_av-p.m3u8
-#EXTINF:-1,BR Event 1
-http://brevent1hds-lh.akamaihd.net/i/br_event01isma@86390/index_1_av-p.m3u8
-#EXTINF:-1,BR Event 2
-http://brevent1hds-lh.akamaihd.net/i/br_event02isma@111248/index_1_av-p.m3u8
-#EXTINF:-1,BR Event 3
-http://brevent1hds-lh.akamaihd.net/i/br_event03isma@111249/index_1_av-p.m3u8
-#EXTINF:-1,BR Event 4
-http://brevent1hds-lh.akamaihd.net/i/br_event04isma@111250/index_1_av-b.m3u8
-#EXTINF:-1,Bibel TV
-http://bibeltv02.iptv-playoutcenter.de/bibeltv01/bibeltv01.stream_1/playlist.m3u8
 #EXTINF:-1,CBSN
 https://cbsnhls-i.akamaihd.net/hls/live/264710/CBSN_mdialog/prodstream/master_2200.m3u8
 #EXTINF:-1,CBN News
 http://bcliveuniv-lh.akamaihd.net/i/news_1@194050/index_900_av-b.m3u8
 #EXTINF:-1,Create & Craft TV
 https://live-craftuk.simplestreamcdn.com/craftuk/3/prog_index.m3u8
-#EXTINF:-1,Chemnitz Fernsehen
-https://chemnitz.iptv-playoutcenter.de/chemnitz/chemnitzfernsehen.stream_1/playlist.m3u8
-#EXTINF:-1,Donau TV
-http://donautv.iptv-playoutcenter.de:1935/donautv/donautv.stream_1/playlist.m3u8
-#EXTINF:-1,Dresden Fernsehen
-https://dresden.iptv-playoutcenter.de/dresden/dresdenfernsehen.stream_1/playlist.m3u8
-#EXTINF:-1,dorf tv
-https://stream.openplayout.org/hls/dorf_high/index.m3u8
-#EXTINF:-1,Deutsche Welle
-https://dwstream6-lh.akamaihd.net/i/dwstream6_live@123962/index_1_av-p.m3u8
-#EXTINF:-1,Deutsche Welle (EN)
-https://dwstream1-lh.akamaihd.net/i/dwstream1_live@120422/index_1_av-p.m3u8
-#EXTINF:-1,Deutsches Musik Fernsehen
-https://tv.artcom-venture.de/dmf/tv_720.m3u8
-#EXTINF:-1,DJing
-https://www.djing.com/tv/live.m3u8
-#EXTINF:-1,DJing Animation
-https://www.djing.com/tv/animation.m3u8
-#EXTINF:-1,DJing Classics
-https://www.djing.com/tv/hits.m3u8
-#EXTINF:-1,DJing Electro Rock
-https://www.djing.com/tv/session_electro-rock.m3u8
-#EXTINF:-1,DJing French touch
-https://www.djing.com/tv/session_french-touch.m3u8
-#EXTINF:-1,DJing Hedonist
-https://www.djing.com/tv/session_hedonist.m3u8
-#EXTINF:-1,DJing Hot Hot Hot
-https://www.djing.com/tv/h-01-fta.m3u8
-#EXTINF:-1,DJing Ibiza
-https://www.djing.com/tv/dancefloor.m3u8
-#EXTINF:-1,DJing Karaoke
-https://www.djing.com/tv/karaoke.m3u8
-#EXTINF:-1,DJing Summer Vibes
-https://www.djing.com/tv/session_summer-vibes.m3u8
-#EXTINF:-1,DJing Underground
-https://www.djing.com/tv/underground.m3u8
-#EXTINF:-1,DJing Wild EDM
-http://www.djing.com/tv/session_wild-edm.m3u8
-#EXTINF:-1,ERF 1
-http://14000-l.z.core.cdn.streamfarm.net/007erfiphonelive/smil:stream_live.smil/chunklist_w1563145417_b240000.m3u8
-#EXTINF:-1,EWTN katholisches TV
-http://d3j0n5al39mfyd.cloudfront.net/p/GERG_1920x1080_4000k.m3u8
-#EXTINF:-1,Franken Fernsehen
-http://frankentv.iptv-playoutcenter.de:1935/frankentv/frankentv.stream_1/playlist.m3u8
-#EXTINF:-1,France 24
-http://f24hls-i.akamaihd.net/hls/live/221193/F24_EN_LO_HLS/master_900.m3u8
-#EXTINF:-1,Folx TV
-http://46.101.244.86:8081/folx-abr/live-abr/playlist.m3u8
-#EXTINF:-1,hr-fernsehen
-http://hrlive1-lh.akamaihd.net/i/hr_fernsehen@75910/index_3584_av-b.m3u8
-#EXTINF:-1,HR Event 2
-http://hrevent2-lh.akamaihd.net/i/hr_event2@309240/master.m3u8
-#EXTINF:-1,health.tv
-http://62.67.13.53:1935/HealthTV/ghtv_live_master.stream/playlist.m3u8
-#EXTINF:-1,Isar TV
-https://isar-tv.iptv-playoutcenter.de/isar-tv/isar-tv.stream_1/playlist.m3u8
-#EXTINF:-1,K-TV
-http://d1pz8zear993v8.cloudfront.net/hlsme/kathtv.m3u8
-#EXTINF:-1,Kronehit TV
-https://bitcdn-kronehit.bitmovin.com/v2/hls/chunklist_b3128000.m3u8
-#EXTINF:-1,Leipzig Fernsehen
-https://leipzig.iptv-playoutcenter.de/leipzig/leipzigfernsehen.stream_1/playlist.m3u8
-#EXTINF:-1,M4TV
-https://5a32c05065c79.streamlock.net/live/stream/playlist.m3u8
-#EXTINF:-1,münchen.tv
-https://muenchentv.iptv-playoutcenter.de/muenchentv/muenchentv.stream_1/playlist.m3u8
-#EXTINF:-1,m2o Tv
-http://m2otv-lh.akamaihd.net/i/m2oTv_1@186074/index_600_av-p.m3u8
-#EXTINF:-1,noa4 Norderstedt HD
-http://hls1.wtnet.de/noa4/apple/wifi6500.m3u8
-#EXTINF:-1,noa4 Hamburg HD
-http://hls1.wtnet.de/noa4hh/apple/wifi6500.m3u8
-#EXTINF:-1,nrwision
-https://fms.nrwision.de/live/livestreamHD.stream_360p/playlist.m3u8
-#EXTINF:-1,NDR Niedersachsen HD
-https://ndrfs-lh.akamaihd.net/i/ndrfs_nds@430233/index_3776_av-p.m3u8
-#EXTINF:-1,NDR Schleswig-Holstein HD
-https://ndrfs-lh.akamaihd.net/i/ndrfs_sh@430234/index_3776_av-p.m3u8
-#EXTINF:-1,NDR Hamburg HD
-https://ndrfs-lh.akamaihd.net/i/ndrfs_hh@430231/index_3776_av-p.m3u8
 #EXTINF:-1,NHK WORLD TV
 https://nhkwlive-xjp.akamaized.net/hls/live/2003458/nhkwlive-xjp/index_1M.m3u8
-#EXTINF:-1,Oberpfalz TV
-https://oberpfalztv.iptv-playoutcenter.de/oberpfalztv/oberpfalztv.stream_1/playlist.m3u8
-#EXTINF:-1,OK Koblenz
-http://stream-cdn.ok54.de/hls/ok4.m3u8
-#EXTINF:-1,Okto
-https://d38d1dtxhym0zi.cloudfront.net/LiveHTTPOrigin/okto/playlist.m3u8
-#EXTINF:-1,oe24 TV
-http://apasfoe24l.sf.apa.at/ipad/oe24-live1/oe24.sdp/playlist.m3u8
-#EXTINF:-1,Parlamentsfernsehen 1
-https://c13014-l-hls.u.core.cdn.streamfarm.net/1000153copo/hk1.m3u8
-#EXTINF:-1,Parlamentsfernsehen 2
-https://c13014-l-hls.u.core.cdn.streamfarm.net/1000153copo/hk2.m3u8
-#EXTINF:-1,Press TV
-https://5a61de8ed719d.streamlock.net/liveprs/smil:liveprs.smil/playlist.m3u8
-#EXTINF:-1,pearl.tv
-http://enstyle.cdn.ses-ps.com/index.m3u8
-#EXTINF:-1,QVC
-http://d2mn03dhv5o3g8.cloudfront.net/live/qvcde_main_clean/bitrate1.isml/3/prog_index.m3u8
-#EXTINF:-1,QVC PLUS
-http://d2mn03dhv5o3g8.cloudfront.net/live/qvcde_plus_clean/bitrate1.isml/3/prog_index.m3u8
-#EXTINF:-1,QVC Beauty & Style
-http://d2mn03dhv5o3g8.cloudfront.net/live/qvcde_beauty_clean/bitrate1.isml/3/prog_index.m3u8
-#EXTINF:-1,Regio TV Schwaben
-http://regiotv.iptv-playoutcenter.de:1935/regiotv/regiotv.stream_1/playlist.m3u8
-#EXTINF:-1,RFO
-http://rfo.iptv-playoutcenter.de:1935/rfo/rfo.stream_2/playlist.m3u8
-#EXTINF:-1,Rhein Neckar Fernsehen
-http://rnf.iptv-playoutcenter.de:1935/rnf/rnf.stream_1/playlist.m3u8
 #EXTINF:-1,Realitatea TV
 http://livestream.realitatea.net/livestream/liverealitatea.stream/chunklist.m3u8
-#EXTINF:-1,RiC / eoTV
-https://58b42f6c8c9bf.streamlock.net:8080/live/rictv/playlist.m3u8
-#EXTINF:-1,SR Fernsehen HD
-http://fs.live.sr.de/i/sr_universal02@107595/index_1662_av-b.m3u8
-#EXTINF:-1,Sylt1
-http://62.67.13.54:1935/sylt1/sylt1_high.stream/chunklist.m3u8
-#EXTINF:-1,TV Würzburg
-https://tvtouringw.iptv-playoutcenter.de/tvtouringw/tvtouringw.stream_1/playlist.m3u8
-#EXTINF:-1,TVA
-https://tvaktuellr.iptv-playoutcenter.de/tvaktuellr/tvaktuellr.stream_1/playlist.m3u8
-#EXTINF:-1,TVO
-https://tvoberfranken.iptv-playoutcenter.de/tvoberfranken/tvoberfranken.stream_1/playlist.m3u8
-#EXTINF:-1,TeleZüri HD
-https://cdnapisec.kaltura.com/p/1719221/sp/171922100/playManifest/entryId/0_josiatxf/format/applehttp/protocol/https/a.m3u8
-#EXTINF:-1,TeleBärn HD
-http://klive-a.akamaihd.net/dc-1/live/hls/p/1719221/e/1_0mc3z57p/sd/10000/t/XTGwenpKUhx_fbVnsiu9MQ/index-s32.m3u8
-#EXTINF:-1,Tele M1 HD
-http://klive-a.akamaihd.net/dc-1/live/hls/p/1719221/e/1_ljzy3evp/sd/10000/t/nwOKUovT2mwnA8x_KnC4zg/index-s32.m3u8
-#EXTINF:-1,Tirol TV
-http://lb.hd-livestream.de:1935/live/TirolTV/playlist.m3u8
-#EXTINF:-1,TeleBielingue
-http://livevideo.infomaniak.com/streaming/livecast/telebielinguech/playlist.m3u8
 #EXTINF:-1,TVM3
 https://tvm3.vedge.infomaniak.com/livecast/tvm3/playlist.m3u8
 #EXTINF:-1,Telebasel
 http://xapp510394368c1000199.f.l.z.lb.core-cdn.net/10096xtelebase/ios_500/master.m3u8
-#EXTINF:-1,tagesschau24
-https://tagesschau-lh.akamaihd.net/i/tagesschau_1@119231/index_3776_av-p.m3u8
-#EXTINF:-1,TRP1
-http://teleregionalpassau1.iptv-playoutcenter.de:1935/teleregionalpassau1/teleregionalpassau1.stream_1/playlist.m3u8
 #EXTINF:-1,Three
 http://mediaworks-i.akamaihd.net/hls/live/220435/3812193411001/3news_live/master.m3u8
 #EXTINF:-1,VISIT-X.tv
 https://stream.visit-x.tv/vxtv/live/playlist.m3u8
 #EXTINF:-1,Voice of America
 http://voa-lh.akamaihd.net/i/voa_mpls_tvmc6@320298/master.m3u8
-#EXTINF:-1,Westerwald TV
-https://sdn-global-live-http-cache.3qsdn.com/live/_definst_/smil:5715-mbr.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="RTL.de" group-title="Channels",RTL
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/24ffa0d3a2.m3u8
-#EXTINF:-1 tvg-id="RTL2.de" group-title="Channels",RTL 2
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/949cc0db89.m3u8
-#EXTINF:-1 tvg-id="SuperRTL.de" group-title="Channels",SUPER RTL
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/78d140af59.m3u8
-#EXTINF:-1 tvg-id="RTLNitro.de" group-title="Channels",RTL NITRO
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/ddcb586f24.m3u8
-#EXTINF:-1 tvg-id="RTLPassion.de" group-title="Channels",RTL PASSION
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/ab8c8f8912.m3u8
-#EXTINF:-1 tvg-id="RTLCrime.de" group-title="Channels",RTL CRIME
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/b7aae55a06.m3u8
-#EXTINF:-1 tvg-id="SkyCinema.de" tvg-logo="http://195.154.221.171/picons/skycinemahdde.png",SKY CINEMA
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/5cf6d8f21d.m3u8
-#EXTINF:-1 tvg-id="SkyCinema.de" tvg-logo="http://195.154.221.171/picons/skycinemaplus1hdde.png",SKY CINEMA 1
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/4e3082feb7.m3u8
-#EXTINF:-1 tvg-id="SkyCinemaPlus24.de" tvg-logo="http://195.154.221.171/picons/skycinemaplus24hdde.png",SKY CINEMA 24
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/975227d664.m3u8
-#EXTINF:-1 tvg-id="SkyAction.de" tvg-logo="http://195.154.221.171/picons/skycinemaactionhdde.png",SKY ACTION
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/c8a1817526.m3u8
-#EXTINF:-1 tvg-id="ext" tvg-logo="http://195.154.221.171/picons/skyatlantichdde.png",SKY ATLATNIC
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/9a35278d71.m3u8
-#EXTINF:-1 tvg-id="SkyComedy.de" group-title="Channels",SKY COMEDY
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/244f09369e.m3u8
-#EXTINF:-1 tvg-id="ext" group-title="Channels",KIKA TV
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/9f23740066.m3u8
-#EXTINF:-1 tvg-id="Pro7.de" group-title="Channels",PRO 7
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/f263719ab8.m3u8
-#EXTINF:-1 tvg-id="Vox.de" group-title="Channels",VOX DE
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/1d62364d5b.m3u8
-#EXTINF:-1 tvg-id="ext" group-title="Channels",ZDF TV
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/05bcd8c334.m3u8
-#EXTINF:-1 tvg-id="Sat1.de" group-title="Channels",SAT 1
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/b474683965.m3u8
-#EXTINF:-1 tvg-id="ext" group-title="Channels",ARD 1
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/2cbd8fc7fb.m3u8
-#EXTINF:-1 tvg-id="ntv.at" group-title="Channels",NTV
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/cc5b5ca4cc.m3u8
-#EXTINF:-1 tvg-id="n24.de" group-title="Channels",N24
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/929e30dd0c.m3u8
-#EXTINF:-1 tvg-id="DiscoveryChannel.de" group-title="Channels",DISCOVERY DE
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/76633d9420.m3u8
-#EXTINF:-1 tvg-id="History.de" group-title="Channels",HISTORY DE
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/0764a81818.m3u8
-#EXTINF:-1 tvg-id="NatGeoWild.de" group-title="Channels",NAT GEO WILD DE
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/8f160f87ae.m3u8
-#EXTINF:-1 tvg-id="SkyCinemaHits.de" group-title="Channels",SKY HITS
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/6910bdd874.m3u8
-#EXTINF:-1 tvg-id="ext" group-title="Channels",SKY SPORTS 3 DE
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/11e65d81a9.m3u8
-#EXTINF:-1 tvg-id="ext" group-title="Channels",SKY SPORTS 4 DE
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/c46c38bd16.m3u8
-#EXTINF:-1 tvg-id="ext" group-title="Channels",SKY SPORTS 5 DE
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/eaf49c7926.m3u8
-#EXTINF:-1 tvg-id="ext" group-title="Channels",SKY SPORTS AUSTRIA DE
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/b441e56fa3.m3u8
-#EXTINF:-1 tvg-id="ext" tvg-logo="http://195.154.221.171/picons/skysportbundesliga1hdde.png",SKY SPORTS BUNDESLIGA 1
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/f247944fe3.m3u8
-#EXTINF:-1 tvg-id="ext" group-title="Channels",SKY SPORTS BUNDESLIGA 2
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/e5f6ce2f19.m3u8
-#EXTINF:-1 tvg-id="disneychannel.de" group-title="Channels",DISNEY CHANNEL DE
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/d444899d3b.m3u8
-#EXTINF:-1 tvg-id="TNTFilm.de" group-title="Channels",TNT FILM
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/10c80bfd6e.m3u8
-#EXTINF:-1 tvg-id="TNTSeries.cl" group-title="Channels",TNT SERIES
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/1a544eec4f.m3u8
-#EXTINF:-1 tvg-id="prosieben-maxx.de" group-title="Channels",PRO7 MAXX
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/9b61a52482.m3u8
-#EXTINF:-1 tvg-id="AnimalPlanet.de" group-title="Channels",ANIMAL PLANET DE
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/c40a8890e6.m3u8
-#EXTINF:-1 tvg-id="NatGeo.de" group-title="Channels",NAT GEO DE
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/2158ccd2a8.m3u8
-#EXTINF:-1 tvg-id="ext" group-title="Channels",NAT GEO PEOPLE DE
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/ffb59554ab.m3u8
-#EXTINF:-1 tvg-id="ZeeOne.de" group-title="Channels",ZEE ONE
-http://stream-7b694ce7e.nmbs.top/m3u/Germany/a4bd4f8154.m3u8
 #EXTINF:-1 group-title="Кино",Sever TV
 https://hls.goodgame.ru/hls/146065.m3u8
 #EXTINF:-1 group-title="Кино",STR TV