diff --git a/lists/north_macedonia.md b/lists/north_macedonia.md
index 172c9aa..ed5b745 100644
--- a/lists/north_macedonia.md
+++ b/lists/north_macedonia.md
@@ -4,13 +4,13 @@
 
 | #   | Channel        | Link  | Logo | EPG id |
 |:---:|:--------------:|:-----:|:----:|:------:|
-| 1   | MRT1 Ⓖ | [>](https://vipottbpkstream.vip.hr/Content/onevip-hls/Live/Channel(MRT_1)/index.m3u8) | <img height="20" src="https://i.imgur.com/EkkyAE0.png"/> | MRT.com.mk |
+| 1   | MRT1 Ⓖ | [>](https://vipottbpkstream.vip.hr/Content/onevip-hls/Live/Channel(MRT_1)/index.m3u8) | <img height="20" src="https://i.imgur.com/EkkyAE0.png"/> | MRT1.mk |
 | 2   | MRT2 Ⓖ | [>](https://vipottbpkstream.vip.hr/Content/onevip-hls/Live/Channel(MRT_2)/index.m3u8) | <img height="20" src="https://i.imgur.com/YvOrUnN.png"/> | MRT2 |
 | 3   | MRT Sobraniski kanal Ⓖ | [>](https://vipottbpkstream.vip.hr/Content/onevip-hls/Live/Channel(Sobraniski_Kanal)/index.m3u8) | <img height="20" src="https://upload.wikimedia.org/wikipedia/commons/thumb/1/18/Logo_of_MRT_Assembly_Channel_%282012-%29.svg/634px-Logo_of_MRT_Assembly_Channel_%282012-%29.svg.png"/> | MRTSobraniskikanal |
 | 3   | MRT3 Ⓖ | [>](https://www.tvkaista.net/stream-forwarder/get.php?x=MRT3) | <img height="20" src="https://upload.wikimedia.org/wikipedia/commons/thumb/2/2c/Logo_of_MRT_3_%282020-%29.svg/640px-Logo_of_MRT_3_%282020-%29.svg.png"/> | MRT3 |
 | 4   | MRT4 Ⓖ | [>](https://www.tvkaista.net/stream-forwarder/get.php?x=MRT4) | <img height="20" src="https://upload.wikimedia.org/wikipedia/commons/thumb/6/68/Logo_of_MRT_4_%282020-%29.svg/640px-Logo_of_MRT_4_%282020-%29.svg.png"/> | MRT4 |
 | 4   | MRT5 Ⓖ | [>](https://www.tvkaista.net/stream-forwarder/get.php?x=MRT5) | <img height="20" src="https://upload.wikimedia.org/wikipedia/commons/thumb/2/22/Logo_of_MRT_5_%282020-%29.svg/640px-Logo_of_MRT_5_%282020-%29.svg.png"/> | MRT5 |
-| 5   | Kanal 5 Ⓢ Ⓖ | [>](https://vipottbpkstream.vip.hr/Content/onevip-hls/Live/Channel(Kanal_5)/index.m3u8) | <img height="20" src="https://i.imgur.com/Qw7N3S2.png"/> | Kanal5.mk |
+| 5   | Kanal 5 Ⓢ Ⓖ | [>](https://vipottbpkstream.vip.hr/Content/onevip-hls/Live/Channel(Kanal_5)/index.m3u8) | <img height="20" src="https://i.imgur.com/Qw7N3S2.png"/> | Channel5NorthMacedonia.mk |
 | 28  | Alfa TV Ⓢ Ⓖ | [>](https://vipottbpkstream.vip.hr/Content/onevip-hls/Live/Channel(Alfa)/index.m3u8) | <img height="20" src="https://i.imgur.com/5BSyXfr.png"/> | Alfa.mk |
 | 100 | Alsat M Ⓢ Ⓖ | [>](https://vipottbpkstream.vip.hr/Content/onevip-hls/Live/Channel(Alsat_M)/index.m3u8) | <img height="20" src="https://upload.wikimedia.org/wikipedia/commons/thumb/7/72/Logo_of_Alsat_TV_%282020-%29.svg/640px-Logo_of_Alsat_TV_%282020-%29.svg.png"/> | Alsat.mk |
 | 101 | Sitel Ⓢ Ⓖ | [>](https://vipottbpkstream.vip.hr/Content/onevip-hls/Live/Channel(Sitel)/index.m3u8) | <img height="20" src="https://i.imgur.com/pdobwKt.png"/> | Sitel.com.mk |
@@ -21,7 +21,7 @@
 | #   | Channel        | Link  | Logo | EPG id |
 |:---:|:--------------:|:-----:|:----:|:------:|
 | 1   | MRT Sat   | [>](https://www.tvkaista.net/stream-forwarder/get.php?x=MRT1Sat) | <img height="20" src="https://upload.wikimedia.org/wikipedia/commons/thumb/6/61/Logo_of_MRT_SAT_%282012-%29.svg/640px-Logo_of_MRT_SAT_%282012-%29.svg.png"/> | MRT1Sat |
-| 2   | MRT 2 Sat | [>](https://www.tvkaista.net/stream-forwarder/get.php?x=MRT2Sat) | <img height="20" src="https://upload.wikimedia.org/wikipedia/commons/thumb/3/3f/Logo_of_MRT_2_SAT_%282012-%29.svg/640px-Logo_of_MRT_2_SAT_%282012-%29.svg.png"/> | MRT2Sat |
+| 2   | MRT 2 Sat | [>](https://www.tvkaista.net/stream-forwarder/get.php?x=MRT2Sat) | <img height="20" src="https://upload.wikimedia.org/wikipedia/commons/thumb/3/3f/Logo_of_MRT_2_SAT_%282012-%29.svg/640px-Logo_of_MRT_2_SAT_%282012-%29.svg.png"/> | MRT2Sat.mk |
 | 3   | TV 21 Ⓢ Ⓖ | [>](https://vipottbpkstream.vip.hr/Content/onevip-hls/Live/Channel(TV21)/index.m3u8) | <img height="20" src="https://upload.wikimedia.org/wikipedia/commons/thumb/1/1e/Logo_of_TV21_Macedonia.svg/640px-Logo_of_TV21_Macedonia.svg.png"/> | TV21.mk |
 
 <h2>DVB-C</h2>
@@ -47,11 +47,11 @@
 | #   | Channel        | Link  | Logo | EPG id |
 |:---:|:--------------:|:-----:|:----:|:------:|
 | 1   | Наша ТВ | [>](https://stream.nasatv.com.mk/hls/nasatv_live.m3u8) | <img height="20" src="https://i.imgur.com/EOLrXvB.png"/> | NasaTV.mk |
-| 2   | Cool TV | [>](https://stream.nasatv.com.mk/cooltv/hls/cooltv_live.m3u8) | <img height="20" src="https://i.imgur.com/rtjCP5a.png"/> | nasatv.com.mk/cool-tv |
-| 3   | Folk TV | [>](https://stream.nasatv.com.mk/folktv/hls/folktv_live.m3u8) | <img height="20" src="https://i.imgur.com/4b9aZ9P.png"/> | nasatv.com.mk/folk-tv |
-| 4   | Jazz TV | [>](https://stream.nasatv.com.mk/jazztv/hls/jazztv_live.m3u8) | <img height="20" src="https://i.imgur.com/4b9aZ9P.png"/> | nasatv.com.mk/jazz-tv |
-| 5   | Love TV | [>](https://stream.nasatv.com.mk/lovetv/hls/lovetv_live.m3u8) | <img height="20" src="https://i.imgur.com/B8iaejQ.png"/> | nasatv.com.mk/love-tv |
-| 6   | Rock TV | [>](https://stream.nasatv.com.mk/rocktv/hls/rocktv_live.m3u8) | <img height="20" src="https://i.imgur.com/Y9miDQo.png"/> | nasatv.com.mk/love-tv |
+| 2   | Cool TV | [>](https://stream.nasatv.com.mk/cooltv/hls/cooltv_live.m3u8) | <img height="20" src="https://i.imgur.com/rtjCP5a.png"/> | cool-tv |
+| 3   | Folk TV | [>](https://stream.nasatv.com.mk/folktv/hls/folktv_live.m3u8) | <img height="20" src="https://i.imgur.com/4b9aZ9P.png"/> | folk-tv |
+| 4   | Jazz TV | [>](https://stream.nasatv.com.mk/jazztv/hls/jazztv_live.m3u8) | <img height="20" src="https://i.imgur.com/4b9aZ9P.png"/> | jazz-tv |
+| 5   | Love TV | [>](https://stream.nasatv.com.mk/lovetv/hls/lovetv_live.m3u8) | <img height="20" src="https://i.imgur.com/B8iaejQ.png"/> | love-tv |
+| 6   | Rock TV | [>](https://stream.nasatv.com.mk/rocktv/hls/rocktv_live.m3u8) | <img height="20" src="https://i.imgur.com/Y9miDQo.png"/> | love-tv |
 | 7 | Стар Фолк | [>](https://live.muzickatv.mk/live/StarMusic.m3u8) | <img height="20" src="https://i.imgur.com/7RstQYI.png"/> | starfolk.net |
 | 8 | Sky Folk | [>](https://skyfolk.mk/live.m3u8) | <img height="20" src="https://i.imgur.com/xRw4Hmu.png"/> | skyfolk.mk |
 | 9 | Хуго 2 | [>](http://fta.hugo.mk:1935/live/tvhugo/stream/2.m3u8) | <img height="20" src="https://i.imgur.com/yb3xjOZ.png"/> | hugo-2 |