diff --git a/stuff/allradio.net.sh b/stuff/allradio.net.sh
index dd4890f7e..4fe2bcf78 100755
--- a/stuff/allradio.net.sh
+++ b/stuff/allradio.net.sh
@@ -11,7 +11,7 @@ for i in "" /{2..50} ; do for j in $(cat languages.txt) ; do curl -s "https://ww
 for i in "" /{2..50} ; do for j in $(cat countries.txt) ; do curl -s "https://www.allradio.net/country/$(echo $j | awk -F '_' '{print $1}')$i" | htmlq -a href a | uniq | grep "radio" | awk -F '/' '{print $3}' | awk NF >> A-$j.txt ; echo -e "$j - $i" ; done ; done
 
 # scarpe the streams from each page
-for i in A-*.txt ; do for j in $(cat $i) ; do curl -s https://www.allradio.net/radio/$j > mep1 ; cat mep1 | htmlq -t h1 | awk '{print "#EXTINF:-1 , "$0}' >> A$i ; cat mep1 | grep -Po '"stream": *\K"[^"]*"' | sed 's/"//g' | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
+for i in A-*.txt ; do for j in $(cat $i) ; do curl -s https://www.allradio.net/radio/$j > mep1 ; cat mep1 | htmlq -t h1 | awk '{print "#EXTINF:-1,"$0}' >> A$i ; cat mep1 | grep -Po '"stream": *\K"[^"]*"' | sed 's/"//g' | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
 
 # convert links to m3u streams
 for i in AA-*.txt ; do sed '1s/^/#EXTM3U\n/' $i > $i.m3u ; done
diff --git a/stuff/get-me_radio.sh b/stuff/get-me_radio.sh
index d462bf035..3ed9287e7 100755
--- a/stuff/get-me_radio.sh
+++ b/stuff/get-me_radio.sh
@@ -9,7 +9,7 @@ for i in $(cat genres.txt) ; do curl -s -L https://www.getmeradio.com/stations/g
 for i in $(cat countries.txt) ; do curl -s -L https://www.getmeradio.com/stations/country/$i | htmlq -a href a | grep "stations" | awk -F '/' '{print $3}' | awk 'NR>2' > A-$i.txt ; done
 
 # scarpe the streams from each page
-for i in A-*.txt ; do for j in $(cat $i) ; do curl -s -L https://www.getmeradio.com/stations/$j/ > mep1 ; cat mep1 | htmlq -t h2 -r .listing-tag | head -n 1 | awk '{print "#EXTINF:-1 , "$0}' >> A$i ; cat mep1 | grep "var audio = new Audio" | awk -F '"' '{print $2}' | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
+for i in A-*.txt ; do for j in $(cat $i) ; do curl -s -L https://www.getmeradio.com/stations/$j/ > mep1 ; cat mep1 | htmlq -t h2 -r .listing-tag | head -n 1 | awk '{print "#EXTINF:-1,"$0}' >> A$i ; cat mep1 | grep "var audio = new Audio" | awk -F '"' '{print $2}' | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
 
 # remove offair and some redirections
 for i in AA-*.txt ; do cat $i | awk '!seen[$0]++' | grep -v "Station Not Available" | grep -B1 "http" | awk 'length>4' | sed 's|https://securestreams7.autopo.st/?uri=||g' > A$i ; echo -e $i ; done
diff --git a/stuff/hit_tuner.net.sh b/stuff/hit_tuner.net.sh
index 7d5c35611..c4b17a41a 100755
--- a/stuff/hit_tuner.net.sh
+++ b/stuff/hit_tuner.net.sh
@@ -24,7 +24,7 @@ for j in $(cat germany.txt) ; do curl -s http://www.hit-tuner.net/en/germany/sta
 
 # scrape links 
 #for i in A-*.txt ; do for j in $(cat $i) ; do curl -s http://www.hit-tuner.net/en/worldwide/radio/$j | grep "\"name\":\"" | awk -F '"' '{print $4}' | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done 
-for i in A-*.txt ; do for j in $(cat $i) ; do curl -s http://www.hit-tuner.net/en/worldwide/radio/$j > mep1 ; cat mep1 | grep "<b title=" | awk -F '"' '{print $4}' | awk '{print "#EXTINF:-1 , "$0}' >> A$i ; cat mep1 | grep "var radio_stream" | awk -F '"' '{print $2}' | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
+for i in A-*.txt ; do for j in $(cat $i) ; do curl -s http://www.hit-tuner.net/en/worldwide/radio/$j > mep1 ; cat mep1 | grep "<b title=" | awk -F '"' '{print $4}' | awk '{print "#EXTINF:-1,"$0}' >> A$i ; cat mep1 | grep "var radio_stream" | awk -F '"' '{print $2}' | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
 
 # scrape germany links since the website strcuture is a bit different
 for i in A-*.txt ; do for j in $(cat $i) ; do curl -s http://www.hit-tuner.net/en/germany/radio/$j > mep1 ; cat mep1 | grep "<b title=" | awk -F '"' '{print $4}' | awk '{print "#EXTINF:-1 , "$0}' >> A$i ; cat mep1 | grep "var radio_stream" | awk -F '"' '{print $2}' | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
diff --git a/stuff/laut.fm.sh b/stuff/laut.fm.sh
index 6c2c5307d..0a5c55a4e 100755
--- a/stuff/laut.fm.sh
+++ b/stuff/laut.fm.sh
@@ -10,7 +10,7 @@ for i in $(cat genres.txt) ; do curl -s https://laut.fm/fm-api/stations/genre/$i
 for i in A-*.txt ; do sed -i 's/\r$//' $i ; done
 
 # convert page titles to streams, no need to put any further load on the website
-for i in A-*.txt ; do for j in $(cat $i) ; do echo "#EXTINF:-1 , $(echo $j | sed -e 's/-/ /g' -e 's/_/ /g')\nhttp://$j.stream.laut.fm/$j" >> A$i ; done ; done
+for i in A-*.txt ; do for j in $(cat $i) ; do echo "#EXTINF:-1,$(echo $j | sed -e 's/-/ /g' -e 's/_/ /g')\nhttp://$j.stream.laut.fm/$j" >> A$i ; done ; done
 
 # convert links to m3u streams
 for i in AA-*.txt ; do sed '1s/^/#EXTM3U\n/' $i > $i.m3u ; done
diff --git a/stuff/live_online_radio.sh b/stuff/live_online_radio.sh
index f1de62896..d49008235 100755
--- a/stuff/live_online_radio.sh
+++ b/stuff/live_online_radio.sh
@@ -16,7 +16,7 @@ for i in *.txt ; do cat $i | awk '!seen[$0]++' > A-$i ; done
 
 # scrape the links from each text file to a m3u output
 #for i in A-*.txt ; do for j in $(cat $i) ; do curl -s $j | htmlq audio | grep -oP 'src="\K[^"]+' | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "\n$i - $j - done\n" ; done ; done
-for i in A-*.txt ; do for j in $(cat $i) ; do curl -s https://liveonlineradio.net/$j > mep1 ; cat mep1 | htmlq --text h1 | sed '/^$/d' | ( echo "#EXTINF:-1 , " && cat) | paste -d "" -s | awk 'length>15' >> A$i ; cat mep1 | htmlq audio | grep -oP 'src="\K[^"]+' | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
+for i in A-*.txt ; do for j in $(cat $i) ; do curl -s https://liveonlineradio.net/$j > mep1 ; cat mep1 | htmlq --text h1 | sed '/^$/d' | ( echo "#EXTINF:-1," && cat) | paste -d "" -s | awk 'length>15' >> A$i ; cat mep1 | htmlq audio | grep -oP 'src="\K[^"]+' | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
 #for i in A-*.txt ; do for j in $(cat $i) ; do curl -s https://liveonlineradio.net/$j > mep1 ; { echo "#EXTINF:-1 , " & cat mep1 | htmlq --text h1 | sed '/^$/d' ; } | paste -d "" -s | awk 'length>15' >> A$i ; cat mep1 | htmlq audio | grep -oP 'src="\K[^"]+' | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
 
 # remove streams that don't have a title
diff --git a/stuff/online_radio_box.sh b/stuff/online_radio_box.sh
index 69ce519d0..569bdc488 100755
--- a/stuff/online_radio_box.sh
+++ b/stuff/online_radio_box.sh
@@ -13,7 +13,7 @@ for i in $(cat genres.txt) ; do curl -s https://onlineradiobox.com/genre/$i/ | h
 for i in $(cat genres.txt) ; do for j in \?p={1..200} ; do curl -s https://onlineradiobox.com/genre/$i/$j | htmlq .stations-list button '.station_play, .b-play' | grep -oP 'radioname="\K[^"]+|stream="\K[^"]+' | sed 's/\;//g' >> A-$i.txt ; echo -e "$i - $j" ; done ; done
 
 # convert temp files to proper format
-for i in A-*.txt ; do cat $i | awk '!seen[$0]++' | awk '{print "#EXTINF:-1 , "$0}' | sed 's/\;//g' | sed 's/#EXTINF:-1 , http/http/g' > A$i ; done
+for i in A-*.txt ; do cat $i | awk '!seen[$0]++' | awk '{print "#EXTINF:-1,"$0}' | sed 's/\;//g' | sed 's/#EXTINF:-1 , http/http/g' > A$i ; done
 
 # convert files to m3u extension
 for i in AA-*.txt ; do sed '1s/^/#EXTM3U\n/' $i > $i.m3u ; done
diff --git a/stuff/openradio.app.sh b/stuff/openradio.app.sh
index 4610f497c..37f5ab29a 100755
--- a/stuff/openradio.app.sh
+++ b/stuff/openradio.app.sh
@@ -11,7 +11,7 @@ for i in "" \?skip={12..1200..12} ; do for j in $(cat languages.txt) ; do curl -
 for i in "" \?skip={12..1200..12} ; do for j in $(cat countries.txt) ; do curl -s https://openradio.app/api/list/by-location/country/$j$i | jq -r '.items[] | {slug, id} | join("-")' | awk NF >> A-loca-$j.txt ; echo -e "$j - $i" ; done ; done
 
 # scarpe the streams from each page
-for i in A-*.txt ; do for j in $(cat $i) ; do curl -s https://openradio.app/station/$j > mep1 ; cat mep1 | htmlq -t h1 | awk '{print "#EXTINF:-1 , "$0}' >> A$i ; cat mep1 | htmlq script | sed 's/\\//g' | grep -Po '"url": *\K"[^"]*"' | sed 's/"//g' | head -n 1 | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
+for i in A-*.txt ; do for j in $(cat $i) ; do curl -s https://openradio.app/station/$j > mep1 ; cat mep1 | htmlq -t h1 | awk '{print "#EXTINF:-1,"$0}' >> A$i ; cat mep1 | htmlq script | sed 's/\\//g' | grep -Po '"url": *\K"[^"]*"' | sed 's/"//g' | head -n 1 | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
 
 # convert links to m3u streams
 for i in AA-*.txt ; do sed '1s/^/#EXTM3U\n/' $i > $i.m3u ; done
diff --git a/stuff/pea.fm.sh b/stuff/pea.fm.sh
index 74ef10a13..06928a3ce 100755
--- a/stuff/pea.fm.sh
+++ b/stuff/pea.fm.sh
@@ -9,7 +9,7 @@ for i in "" page/{2..200}/ ; do for j in $(cat genres.txt) ; do curl -s https://
 for i in "" page/{2..200}/ ; do for j in $(cat country.txt) ; do curl -s https://pea.fm/radio/$j/$i | htmlq -a href a | grep ".html" | uniq | cut -c16- | rev | cut -c6- | rev | sed -e 's/ /%20/g' | awk NF >> A-$j.txt ; echo -e "$j - $i" ; done ; done
 
 # scarpe the streams from each page
-for i in A-*.txt ; do for j in $(cat $i) ; do curl -s https://pea.fm/$j.html > mep1 ; cat mep1 | htmlq -t h1 | cut -c2- | awk '{print "#EXTINF:-1 , "$0}' >> A$i ; cat mep1 | grep "streamurl" | uniq | awk -F '"' '{print $2}' | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
+for i in A-*.txt ; do for j in $(cat $i) ; do curl -s https://pea.fm/$j.html > mep1 ; cat mep1 | htmlq -t h1 | cut -c2- | awk '{print "#EXTINF:-1,"$0}' >> A$i ; cat mep1 | grep "streamurl" | uniq | awk -F '"' '{print $2}' | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
 
 # remove stream titles that don't have a stream after them
 for i in AA-*.txt ; do cat $i | awk '!seen[$0]++' | grep -B1 "http" | awk 'length>4' > A$i ; echo -e $i ; done
diff --git a/stuff/radio-volna.sh b/stuff/radio-volna.sh
index 0676dbfb1..32e9e0012 100755
--- a/stuff/radio-volna.sh
+++ b/stuff/radio-volna.sh
@@ -9,7 +9,7 @@ for i in "" {1..50}/ ; do for j in $(cat genres.txt) ; do curl -s https://radiov
 for i in "" {1..4}/ ; do for j in $(cat countries.txt) ; do curl -s https://radiovolna.net/en/$j/$i | htmlq -a href a | grep ".html" | grep '[[:digit:]]\+' | awk -F '/' '{print $3}' >> A-$j.txt ; echo -e "$j - $i" ; done ; done
 
 # scarpe the streams from each page
-for i in A-*.txt ; do for j in $(cat $i) ; do curl -s https://radiovolna.net/en/$j > mep1 ; cat mep1 | htmlq -t h1 | awk '{print "#EXTINF:-1 , "$0}' >> A$i ; cat mep1 | grep 'data-stream-url' | awk -F '"' '{print $2}' | sed 's/"//g' | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
+for i in A-*.txt ; do for j in $(cat $i) ; do curl -s https://radiovolna.net/en/$j > mep1 ; cat mep1 | htmlq -t h1 | awk '{print "#EXTINF:-1,"$0}' >> A$i ; cat mep1 | grep 'data-stream-url' | awk -F '"' '{print $2}' | sed 's/"//g' | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
 
 # convert links to m3u streams
 for i in AA-*.txt ; do sed '1s/^/#EXTM3U\n/' $i > $i.m3u ; done
diff --git a/stuff/radio.net.sh b/stuff/radio.net.sh
index c40c12d64..db742afa9 100755
--- a/stuff/radio.net.sh
+++ b/stuff/radio.net.sh
@@ -10,7 +10,7 @@ for i in "" \?p={2..25} ; do for j in $(cat genres.txt) ; do curl -s https://www
 for i in A-*.txt ; do cat $i | awk '!seen[$0]++' | tac | sed "1,9d" | tac > A$i ; echo -e $i ; done
 
 # scrape the links from each text file to a m3u output
-for i in AA-*.txt ; do for j in $(cat $i) ; do curl -s https://www.radio.net/s/$j > mep1 ; cat mep1 | htmlq -t h1 | uniq | awk '{print "#EXTINF:-1 , "$0}' >> A$i ; cat mep1 | grep "id=\"__NEXT_DATA__\"" | grep -Po '"url": *\K"[^"]*"' | sed 's/\"//g' | grep "/" | grep -v "radio.net" | head -n 1 | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
+for i in AA-*.txt ; do for j in $(cat $i) ; do curl -s https://www.radio.net/s/$j > mep1 ; cat mep1 | htmlq -t h1 | uniq | awk '{print "#EXTINF:-1,"$0}' >> A$i ; cat mep1 | grep "id=\"__NEXT_DATA__\"" | grep -Po '"url": *\K"[^"]*"' | sed 's/\"//g' | grep "/" | grep -v "radio.net" | head -n 1 | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
 
 # convert links to m3u streams
 for i in AA-*.txt ; do sed '1s/^/#EXTM3U\n/' $i > $i.m3u ; done
diff --git a/stuff/radio_guide.fm.sh b/stuff/radio_guide.fm.sh
index 4f151d0d9..f6b5be515 100755
--- a/stuff/radio_guide.fm.sh
+++ b/stuff/radio_guide.fm.sh
@@ -13,7 +13,7 @@ cat all2.txt | awk -F "/" '{print $1}' | sort | uniq > countries.txt
 for i in $(cat countries.txt) ; do grep $i all2.txt >> A-$i.txt ; done
 
 # scrape the links from each text file to a m3u output
-for i in A-*.txt ; do for j in $(cat $i) ; do curl -s https://www.radioguide.fm/internet-radio-$j > mep1 ; cat mep1 | htmlq -t h1 | awk '{print "#EXTINF:-1 , "$0}' >> A$i ; cat mep1 | grep "var stream" | awk -F "'" '{print $6}' | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
+for i in A-*.txt ; do for j in $(cat $i) ; do curl -s https://www.radioguide.fm/internet-radio-$j > mep1 ; cat mep1 | htmlq -t h1 | awk '{print "#EXTINF:-1,"$0}' >> A$i ; cat mep1 | grep "var stream" | awk -F "'" '{print $6}' | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
 
 # convert links to m3u streams
 for i in AA-*.txt ; do sed '1s/^/#EXTM3U\n/' $i > $i.m3u ; done
diff --git a/stuff/radio_online_live.sh b/stuff/radio_online_live.sh
index bb18484ee..9ee2daa26 100755
--- a/stuff/radio_online_live.sh
+++ b/stuff/radio_online_live.sh
@@ -9,7 +9,7 @@ for i in "" page/{2..200}/ ; do for j in $(cat genres.txt) ; do curl -s https://
 for i in "" page/{2..200}/ ; do for j in $(cat countries.txt) ; do curl -s https://radioonlinelive.com/category/$j/$i | htmlq -r section -a href a | uniq | grep -v "page\|#\|category\|genre" | awk -F '/' '{print $4"/"$5}' | grep -v "/$" >> A-$j.txt ; echo -e "$j - $i" ; done ; done
 
 # scarpe the streams from each page
-for i in A-*.txt ; do for j in $(cat $i) ; do curl -s https://radioonlinelive.com/$j/ > mep1 ; cat mep1 | htmlq -t h1 | awk '{print "#EXTINF:-1 , "$0}' >> A$i ; cat mep1 | htmlq source | awk -F '"' {'print $4'} | sed 's/\;//g' | sed '/^$/d'>> A$i ; echo -e "$i - $j" ; done ; done
+for i in A-*.txt ; do for j in $(cat $i) ; do curl -s https://radioonlinelive.com/$j/ > mep1 ; cat mep1 | htmlq -t h1 | awk '{print "#EXTINF:-1,"$0}' >> A$i ; cat mep1 | htmlq source | awk -F '"' {'print $4'} | sed 's/\;//g' | sed '/^$/d'>> A$i ; echo -e "$i - $j" ; done ; done
 
 # remove stream titles that don't have a stream after them
 for i in AA-*.txt ; do cat $i | awk '!seen[$0]++' | grep -B1 "http" | awk 'length>4' > A$i ; echo -e $i ; done
diff --git a/stuff/radio_station_usa.fm.sh b/stuff/radio_station_usa.fm.sh
index 424209f0f..01536b296 100755
--- a/stuff/radio_station_usa.fm.sh
+++ b/stuff/radio_station_usa.fm.sh
@@ -13,7 +13,7 @@ for i in "" \?page={2..10} ; do for j in $(cat states.txt) ; do curl -s https://
 for i in "" \?page={2..140} ; do for j in $(cat misc.txt) ; do curl -s https://radiostationusa.fm/$j$i | htmlq -a href a | grep "online" | awk -F '/' '{print $2}' | awk NF >> A-$j.txt ; echo -e "$j - $i" ; done ; done
 
 # scarpe the streams from each page
-for i in A-*.txt ; do for j in $(cat $i) ; do curl -s https://radiostationusa.fm/online/$j > mep1 ; cat mep1 | htmlq -t h1 | awk '{print "#EXTINF:-1 , "$0}' >> A$i ; cat mep1 | grep "class=\"play\"" | grep -Po 'url=*\K"[^"]*"' | sed 's/"//g' | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
+for i in A-*.txt ; do for j in $(cat $i) ; do curl -s https://radiostationusa.fm/online/$j > mep1 ; cat mep1 | htmlq -t h1 | awk '{print "#EXTINF:-1,"$0}' >> A$i ; cat mep1 | grep "class=\"play\"" | grep -Po 'url=*\K"[^"]*"' | sed 's/"//g' | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
 
 
 # convert links to m3u streams
diff --git a/stuff/streema.sh b/stuff/streema.sh
index 319485418..ee0ed9106 100755
--- a/stuff/streema.sh
+++ b/stuff/streema.sh
@@ -13,7 +13,7 @@ for i in "" \?page={2..10} ; do for j in $(cat sub-genres.txt) ; do curl -s http
 for i in "" \?page={2..10} ; do for j in $(cat countries.txt) ; do curl -s https://streema.com/radios/country/$j$i | htmlq -a href a | grep "/radios/" | grep -v "/social/\|page=\|country/" | cut -c9- | grep -v "region/" >> A-$j.txt ; echo -e "$j - $i" ; done ; done
 
 # scarpe the streams from each page
-for i in A-*.txt ; do for j in $(cat $i) ; do curl -s http://streema.com/radios/play/$j > mep1 ; cat mep1 | htmlq -t h3 | awk NF | sed -e 's/[ \t]*//' | awk '{print "#EXTINF:-1 , "$0}' >> A$i ; cat mep1 | grep "data-src=" | awk -F "'" '{print $2}' | sed 's/https:\/\/stream.streema.com\/?url=//g' | sed 's/\;//g' | grep -v "<div id" | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
+for i in A-*.txt ; do for j in $(cat $i) ; do curl -s http://streema.com/radios/play/$j > mep1 ; cat mep1 | htmlq -t h3 | awk NF | sed -e 's/[ \t]*//' | awk '{print "#EXTINF:-1,"$0}' >> A$i ; cat mep1 | grep "data-src=" | awk -F "'" '{print $2}' | sed 's/https:\/\/stream.streema.com\/?url=//g' | sed 's/\;//g' | grep -v "<div id" | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
 
 # remove possible duplicates in streams
 for i in AA-*.txt ; do cat $i | awk '!seen[$0]++' | grep -B1 "http" > A$i ; echo -e $i ; done
diff --git a/stuff/vo-radio.sh b/stuff/vo-radio.sh
index 4b4d14df5..0da54466e 100755
--- a/stuff/vo-radio.sh
+++ b/stuff/vo-radio.sh
@@ -9,7 +9,7 @@ for i in "" \?page={2..10} ; do for j in $(cat genres.txt) ; do curl -s https://
 for i in "" \?page={2..5} ; do for j in $(cat states.txt) ; do curl -s https://vo-radio.com/usa/$j$i | htmlq -a href a | uniq | grep -v "page\|privacy" | awk 'length>8' | cut -c2- >> A-$j.txt ; echo -e "$j - $i" ; done ; done
 
 # scarpe the streams from each page
-for i in A-*.txt ; do for j in $(cat $i) ; do curl -s https://vo-radio.com/$j > mep1 ; cat mep1 | htmlq -t h1 | awk '{print "#EXTINF:-1 , "$0}' >> A$i ; cat mep1 | grep "source src=" | awk -F '"' '{print $2}' | sed 's/"//g' | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
+for i in A-*.txt ; do for j in $(cat $i) ; do curl -s https://vo-radio.com/$j > mep1 ; cat mep1 | htmlq -t h1 | awk '{print "#EXTINF:-1,"$0}' >> A$i ; cat mep1 | grep "source src=" | awk -F '"' '{print $2}' | sed 's/"//g' | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
 
 # convert links to m3u streams
 for i in AA-*.txt ; do sed '1s/^/#EXTM3U\n/' $i > $i.m3u ; done
diff --git a/stuff/vtuner.sh b/stuff/vtuner.sh
index 0d41cd0a5..dba592829 100755
--- a/stuff/vtuner.sh
+++ b/stuff/vtuner.sh
@@ -16,7 +16,7 @@ for i in {2..200} ; do for j in $(cat location.txt) ; do curl -s https://vtuner.
 for i in {2..200} ; do for j in $(cat languages.txt) ; do curl -s https://vtuner.com/setupapp/guide/asp/BrowseStations/BrowsePremiumStations.asp\?sCategory\=$j\&sBrowseType\=Language\&sViewBy\=\&sSortby\=\&sWhatList\=ALL\&sNiceLang\=\&iCurrPage\=$i | htmlq -a href a | uniq | grep "dynampls.asp" | awk -F '=' '{print $2"="$3}' >> A-lang-$j.txt ; echo -e "$j - $i" ; done ; done
 
 # scrape the streams
-for i in A-*.txt ; do for j in $(cat $i) ; do curl -s https://vtuner.com/setupapp/guide/asp/BrowseStations/dynampls.asp\?id\=$j > mep1 ; cat mep1 | htmlq \#StatName -t | awk '{print "#EXTINF:-1 , "$0}' >> A$i ; cat mep1 | grep "var rawUrl" | uniq | awk -F '"' '{print $2}' | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
+for i in A-*.txt ; do for j in $(cat $i) ; do curl -s https://vtuner.com/setupapp/guide/asp/BrowseStations/dynampls.asp\?id\=$j > mep1 ; cat mep1 | htmlq \#StatName -t | awk '{print "#EXTINF:-1,"$0}' >> A$i ; cat mep1 | grep "var rawUrl" | uniq | awk -F '"' '{print $2}' | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
 
 # convert links to m3u streams
 for i in AA-*.txt ; do sed '1s/^/#EXTM3U\n/' $i > $i.m3u ; done
diff --git a/stuff/zeno.fm.sh b/stuff/zeno.fm.sh
index d1051b4f6..a359302c0 100755
--- a/stuff/zeno.fm.sh
+++ b/stuff/zeno.fm.sh
@@ -11,7 +11,7 @@ for i in {1..100} ; do for j in $(cat countries.txt) ; do curl -s "https://zeno.
 for i in {1..100} ; do for j in $(cat languages.txt) ; do curl -s "https://zeno.fm/api/stations/?query=&limit=100&genre=&country=&language=$j&page=$i" | jq -r '.[].url' | awk -F '/' '{print $5}' >> A-$j.txt ; echo -e "$j - $i" ; done ; done
 
 # scarpe the streams from each page
-for i in A-*.txt ; do for j in $(cat $i) ; do curl -s https://zeno.fm/radio/$j/ > mep1 ; cat mep1 | htmlq -t h1 | awk '{print "#EXTINF:-1 , "$0}' >> A$i ; cat mep1 | grep -Po '"streamURL": *\K"[^"]*"' | sed 's/"//g' | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
+for i in A-*.txt ; do for j in $(cat $i) ; do curl -s https://zeno.fm/radio/$j/ > mep1 ; cat mep1 | htmlq -t h1 | awk '{print "#EXTINF:-1,"$0}' >> A$i ; cat mep1 | grep -Po '"streamURL": *\K"[^"]*"' | sed 's/"//g' | sed 's/\;//g' | sed '/^$/d' >> A$i ; echo -e "$i - $j" ; done ; done
 
 # convert links to m3u streams
 for i in AA-*.txt ; do sed '1s/^/#EXTM3U\n/' $i > $i.m3u ; done