diff --git a/web/stations/images-america/paris/KGVL 1400_christmas.png b/web/stations/images-america/paris/KGVL 1400_christmas.png
deleted file mode 100644
index 32bd025d3..000000000
Binary files a/web/stations/images-america/paris/KGVL 1400_christmas.png and /dev/null differ
diff --git a/web/stations/images-america/paris/Mix 107.7.png b/web/stations/images-america/paris/Mix 107.7.png
index 7ba582ff2..aa499cb88 100644
Binary files a/web/stations/images-america/paris/Mix 107.7.png and b/web/stations/images-america/paris/Mix 107.7.png differ
diff --git a/web/stations/images-america/tyler/99.7 KVUT.png b/web/stations/images-america/tyler/99.7 KVUT.png
deleted file mode 100644
index 110c47de1..000000000
Binary files a/web/stations/images-america/tyler/99.7 KVUT.png and /dev/null differ
diff --git a/web/stations/images-europe/germany-rbb/RBB Inforadio.png b/web/stations/images-europe/germany-rbb/RBB Inforadio.png
deleted file mode 100644
index 53325b926..000000000
Binary files a/web/stations/images-europe/germany-rbb/RBB Inforadio.png and /dev/null differ
diff --git a/web/stations/images-europe/germany-rbb/rbb24 Inforadio.png b/web/stations/images-europe/germany-rbb/rbb24 Inforadio.png
new file mode 100644
index 000000000..b9aa72668
Binary files /dev/null and b/web/stations/images-europe/germany-rbb/rbb24 Inforadio.png differ
diff --git a/web/stations/images-europe/iom/Energy FM.png b/web/stations/images-europe/iom/Energy FM.png
new file mode 100644
index 000000000..768edc9b1
Binary files /dev/null and b/web/stations/images-europe/iom/Energy FM.png differ
diff --git a/web/stations/images-europe/ireland/Classic Hits.png b/web/stations/images-europe/ireland/Classic Hits.png
index b1caa8c4d..5379dbe0b 100644
Binary files a/web/stations/images-europe/ireland/Classic Hits.png and b/web/stations/images-europe/ireland/Classic Hits.png differ
diff --git a/web/stations/images-europe/ireland/Newstalk.png b/web/stations/images-europe/ireland/Newstalk.png
index b233eda90..0a76c4c43 100644
Binary files a/web/stations/images-europe/ireland/Newstalk.png and b/web/stations/images-europe/ireland/Newstalk.png differ
diff --git a/web/stations/images-europe/lithuania/LRT Klasika.png b/web/stations/images-europe/lithuania/LRT Klasika.png
index 5ee43bd15..9b86498ca 100644
Binary files a/web/stations/images-europe/lithuania/LRT Klasika.png and b/web/stations/images-europe/lithuania/LRT Klasika.png differ
diff --git a/web/stations/images-europe/lithuania/LRT Opus.png b/web/stations/images-europe/lithuania/LRT Opus.png
index d7880a181..34c0bdf7a 100644
Binary files a/web/stations/images-europe/lithuania/LRT Opus.png and b/web/stations/images-europe/lithuania/LRT Opus.png differ
diff --git a/web/stations/images-europe/lithuania/LRT Radijas.png b/web/stations/images-europe/lithuania/LRT Radijas.png
index 64554ea47..502bcaa75 100644
Binary files a/web/stations/images-europe/lithuania/LRT Radijas.png and b/web/stations/images-europe/lithuania/LRT Radijas.png differ
diff --git a/web/stations/images-europe/mnegro/RTCG.png b/web/stations/images-europe/mnegro/RTCG.png
deleted file mode 100644
index 79e74c607..000000000
Binary files a/web/stations/images-europe/mnegro/RTCG.png and /dev/null differ
diff --git a/web/stations/images-europe/mnegro/Antena M.png b/web/stations/images-europe/montenegro/Antena M.png
similarity index 100%
rename from web/stations/images-europe/mnegro/Antena M.png
rename to web/stations/images-europe/montenegro/Antena M.png
diff --git a/web/stations/images-europe/mnegro/DRS.png b/web/stations/images-europe/montenegro/DRS.png
similarity index 100%
rename from web/stations/images-europe/mnegro/DRS.png
rename to web/stations/images-europe/montenegro/DRS.png
diff --git a/web/stations/images-europe/mnegro/Play radio.png b/web/stations/images-europe/montenegro/Play radio.png
similarity index 100%
rename from web/stations/images-europe/mnegro/Play radio.png
rename to web/stations/images-europe/montenegro/Play radio.png
diff --git a/web/stations/images-europe/montenegro/R98.png b/web/stations/images-europe/montenegro/R98.png
new file mode 100644
index 000000000..a327cd206
Binary files /dev/null and b/web/stations/images-europe/montenegro/R98.png differ
diff --git a/web/stations/images-europe/montenegro/RCG.png b/web/stations/images-europe/montenegro/RCG.png
new file mode 100644
index 000000000..e96e2ff61
Binary files /dev/null and b/web/stations/images-europe/montenegro/RCG.png differ
diff --git a/web/stations/images-europe/mnegro/Radio D Plus.png b/web/stations/images-europe/montenegro/Radio D Plus.png
similarity index 100%
rename from web/stations/images-europe/mnegro/Radio D Plus.png
rename to web/stations/images-europe/montenegro/Radio D Plus.png
diff --git a/web/stations/images-europe/mnegro/Radio D.png b/web/stations/images-europe/montenegro/Radio D.png
similarity index 100%
rename from web/stations/images-europe/mnegro/Radio D.png
rename to web/stations/images-europe/montenegro/Radio D.png
diff --git a/web/stations/images-europe/mnegro/Radio Fatih.png b/web/stations/images-europe/montenegro/Radio Fatih.png
similarity index 100%
rename from web/stations/images-europe/mnegro/Radio Fatih.png
rename to web/stations/images-europe/montenegro/Radio Fatih.png
diff --git a/web/stations/images-europe/mnegro/Radio S1.png b/web/stations/images-europe/montenegro/Radio S1.png
similarity index 100%
rename from web/stations/images-europe/mnegro/Radio S1.png
rename to web/stations/images-europe/montenegro/Radio S1.png
diff --git a/web/stations/images-europe/mnegro/Radio Svetigora.png b/web/stations/images-europe/montenegro/Radio Svetigora.png
similarity index 100%
rename from web/stations/images-europe/mnegro/Radio Svetigora.png
rename to web/stations/images-europe/montenegro/Radio Svetigora.png
diff --git a/web/stations/images-europe/mnegro/Srpski Radio.png b/web/stations/images-europe/montenegro/Srpski Radio.png
similarity index 100%
rename from web/stations/images-europe/mnegro/Srpski Radio.png
rename to web/stations/images-europe/montenegro/Srpski Radio.png
diff --git a/web/stations/images-europe/mnegro/TDI Radio.png b/web/stations/images-europe/montenegro/TDI Radio.png
similarity index 100%
rename from web/stations/images-europe/mnegro/TDI Radio.png
rename to web/stations/images-europe/montenegro/TDI Radio.png
diff --git a/web/stations/images-europe/nireland/BBC Radio Foyle.png b/web/stations/images-europe/nireland/BBC Radio Foyle.png
index 9e243811d..72f2ce205 100644
Binary files a/web/stations/images-europe/nireland/BBC Radio Foyle.png and b/web/stations/images-europe/nireland/BBC Radio Foyle.png differ
diff --git a/web/stations/images-europe/nireland/BBC Radio Ulster.png b/web/stations/images-europe/nireland/BBC Radio Ulster.png
index 19bbc9e9a..0cc9f6e40 100644
Binary files a/web/stations/images-europe/nireland/BBC Radio Ulster.png and b/web/stations/images-europe/nireland/BBC Radio Ulster.png differ
diff --git a/web/stations/images-europe/nireland/Q Radio.png b/web/stations/images-europe/nireland/Q Radio.png
index 97042ca99..c71f5359f 100644
Binary files a/web/stations/images-europe/nireland/Q Radio.png and b/web/stations/images-europe/nireland/Q Radio.png differ
diff --git a/web/stations/images-europe/norway/NRK Alltid Nyheter.png b/web/stations/images-europe/norway/NRK Alltid Nyheter.png
deleted file mode 100644
index 1588aafe5..000000000
Binary files a/web/stations/images-europe/norway/NRK Alltid Nyheter.png and /dev/null differ
diff --git a/web/stations/images-europe/norway/NRK Nyheter.png b/web/stations/images-europe/norway/NRK Nyheter.png
new file mode 100644
index 000000000..25c684570
Binary files /dev/null and b/web/stations/images-europe/norway/NRK Nyheter.png differ
diff --git "a/web/stations/images-europe/norway/NRK S\303\241mi Radio.png" "b/web/stations/images-europe/norway/NRK S\303\241mi Radio.png"
new file mode 100644
index 000000000..6457f0319
Binary files /dev/null and "b/web/stations/images-europe/norway/NRK S\303\241mi Radio.png" differ
diff --git "a/web/stations/images-europe/norway/NRK S\303\241pmi.png" "b/web/stations/images-europe/norway/NRK S\303\241pmi.png"
deleted file mode 100644
index bdbcd42ed..000000000
Binary files "a/web/stations/images-europe/norway/NRK S\303\241pmi.png" and /dev/null differ
diff --git a/web/stations/images-europe/shetland/BBC Radio Shetland.png b/web/stations/images-europe/shetland/BBC Radio Shetland.png
index 1c3d040a9..c0b36afd2 100644
Binary files a/web/stations/images-europe/shetland/BBC Radio Shetland.png and b/web/stations/images-europe/shetland/BBC Radio Shetland.png differ
diff --git a/web/stations/images-europe/turkey/TRT FM.png b/web/stations/images-europe/turkey/TRT FM.png
index 12eb17051..8797c9b3a 100644
Binary files a/web/stations/images-europe/turkey/TRT FM.png and b/web/stations/images-europe/turkey/TRT FM.png differ
diff --git "a/web/stations/images-europe/turkey/TRT Na\304\237me.png" "b/web/stations/images-europe/turkey/TRT Na\304\237me.png"
index 466182599..fe05f7d61 100644
Binary files "a/web/stations/images-europe/turkey/TRT Na\304\237me.png" and "b/web/stations/images-europe/turkey/TRT Na\304\237me.png" differ
diff --git a/web/stations/images-europe/turkey/TRT Radyo 1.png b/web/stations/images-europe/turkey/TRT Radyo 1.png
index 581ed5b8b..d3fcedd5a 100644
Binary files a/web/stations/images-europe/turkey/TRT Radyo 1.png and b/web/stations/images-europe/turkey/TRT Radyo 1.png differ
diff --git a/web/stations/images-europe/turkey/TRT Radyo 3.png b/web/stations/images-europe/turkey/TRT Radyo 3.png
index 61e60bce1..054acb682 100644
Binary files a/web/stations/images-europe/turkey/TRT Radyo 3.png and b/web/stations/images-europe/turkey/TRT Radyo 3.png differ
diff --git a/web/stations/images-europe/turkey/TRT Radyo Haber.png b/web/stations/images-europe/turkey/TRT Radyo Haber.png
index b01efc3e6..1f95afd3e 100644
Binary files a/web/stations/images-europe/turkey/TRT Radyo Haber.png and b/web/stations/images-europe/turkey/TRT Radyo Haber.png differ
diff --git "a/web/stations/images-europe/turkey/TRT T\303\274rk\303\274.png" "b/web/stations/images-europe/turkey/TRT T\303\274rk\303\274.png"
index f0bad8dea..7360fd4eb 100644
Binary files "a/web/stations/images-europe/turkey/TRT T\303\274rk\303\274.png" and "b/web/stations/images-europe/turkey/TRT T\303\274rk\303\274.png" differ
diff --git a/web/stations/stations-america.js b/web/stations/stations-america.js
index ead436651..3d3b36ea7 100644
--- a/web/stations/stations-america.js
+++ b/web/stations/stations-america.js
@@ -23257,11 +23257,6 @@ var stations = {
             logo: "stations/images-america/tyler/Mega 99.3.png",
             url: "http://ice5.securenetsystems.net/KAPW"
         },
-        {
-            name: "99.7 KVUT",
-            logo: "stations/images-america/tyler/99.7 KVUT.png",
-            url: "http://kvut.streamguys1.com/live"
-        },
         {
             name: "KERA 100.1",
             logo: "stations/images-america/0_general_logos/KERA.png",
diff --git a/web/stations/stations-europe.js b/web/stations/stations-europe.js
index 04cd5abb7..89fc3654e 100644
--- a/web/stations/stations-europe.js
+++ b/web/stations/stations-europe.js
@@ -2393,8 +2393,8 @@ var stations = {
             url: "https://dispatcher.rndfnk.com/rbb/rbb888/live/mp3/mid"
         },
         {
-            name: "rbb Inforadio",
-            logo: "stations/images-europe/germany-rbb/RBB Inforadio.png",
+            name: "rbb24 Inforadio",
+            logo: "stations/images-europe/germany-rbb/rbb24 Inforadio.png",
             url: "https://dispatcher.rndfnk.com/rbb/inforadio/live/mp3/mid"
         },
         {
@@ -2861,6 +2861,11 @@ var stations = {
             logo: "stations/images-europe/iom/3FM.png",
             url: "https://stream.rcs.revma.com/0kv9v43t87zuv"
         },
+        {
+            name: "Energy FM",
+            logo: "stations/images-europe/iom/Energy FM.png",
+            url: "https://ukwesta.streaming.broadcast.radio/energyfm"
+        },
         {
             name: "Manx Radio",
             logo: "stations/images-europe/iom/Manx Radio.png",
@@ -3700,62 +3705,62 @@ var stations = {
     "montenegro": [
         {
             name: "RCG",
-            logo: "stations/images-europe/mnegro/RTCG.png",
+            logo: "stations/images-europe/montenegro/RCG.png",
             url: "https://rtcg.ipradio.rs:9008/;"
         },
         {
             name: "R98",
-            logo: "stations/images-europe/mnegro/RTCG.png",
+            logo: "stations/images-europe/montenegro/R98.png",
             url: "https://r98.ipradio.rs:10100/;"
         },
         {
             name: "Antena M",
-            logo: "stations/images-europe/mnegro/Antena M.png",
+            logo: "stations/images-europe/montenegro/Antena M.png",
             url: "http://radioservis.me:8010/antenamlive"
         },
         {
             name: "DRS",
-            logo: "stations/images-europe/mnegro/DRS.png",
+            logo: "stations/images-europe/montenegro/DRS.png",
             url: "https://eu2.fastcast4u.com/proxy/mic0?mp=/stream&1623505984682"
         },
         {
             name: "Play",
-            logo: "stations/images-europe/mnegro/Play radio.png",
+            logo: "stations/images-europe/montenegro/Play radio.png",
             url: "https://stream.playradio.me:8443/play-me.aac"
         },
         {
             name: "Radio D",
-            logo: "stations/images-europe/mnegro/Radio D.png",
+            logo: "stations/images-europe/montenegro/Radio D.png",
             url: "http://tachyon.shoutca.st:8289/xstream"
         },
         {
             name: "Radio D Plus",
-            logo: "stations/images-europe/mnegro/Radio D Plus.png",
+            logo: "stations/images-europe/montenegro/Radio D Plus.png",
             url: "http://tachyon.shoutca.st:8303/xstream"
         },
         {
             name: "Radio Fatih",
-            logo: "stations/images-europe/mnegro/Radio Fatih.png",
+            logo: "stations/images-europe/montenegro/Radio Fatih.png",
             url: "http://radioservis.me:8070/radiofatih"
         },
         {
             name: "Radio S1",
-            logo: "stations/images-europe/mnegro/Radio S1.png",
+            logo: "stations/images-europe/montenegro/Radio S1.png",
             url: "https://53be5ef2d13aa.streamlock.net/asmedia/radios1-cg/playlist.m3u8"
         },
         {
             name: "Radio Svetigora",
-            logo: "stations/images-europe/mnegro/Radio Svetigora.png",
+            logo: "stations/images-europe/montenegro/Radio Svetigora.png",
             url: "https://svetigoralive.com/Radio%20Svetigora;"
         },
         {
             name: "Srpski Radio",
-            logo: "stations/images-europe/mnegro/Srpski Radio.png",
+            logo: "stations/images-europe/montenegro/Srpski Radio.png",
             url: "http://188.166.30.166:8000/stream"
         },
         {
             name: "TDI Radio",
-            logo: "stations/images-europe/mnegro/TDI Radio.png",
+            logo: "stations/images-europe/montenegro/TDI Radio.png",
             url: "https://streaming.tdiradio.com/crnagora.mp3"
         },
     ],
@@ -4132,8 +4137,8 @@ var stations = {
             url: "https://nrk-klassisk.akamaized.net/42/0/hls/nrk_klassisk/playlist.m3u8"
         },
         {
-            name: "NRK Alltid Nyheter",
-            logo: "stations/images-europe/norway/NRK Alltid Nyheter.png",
+            name: "NRK Nyheter",
+            logo: "stations/images-europe/norway/NRK Nyheter.png",
             url: "https://nrklivealltidnyheter-httpcache0-47115-httpcache0.dna.ip-only.net/47115-cachelive2/40/0/hls/nrk_alltid_nyheter/playlist.m3u8"
         },
         {
@@ -4142,8 +4147,8 @@ var stations = {
             url: "https://nrk-radio-live.telenorcdn.net/49/0/hls/nrk_folkemusikk/playlist.m3u8"
         },
         {
-            name: "NRK Sápmi",
-            logo: "stations/images-europe/norway/NRK Sápmi.png",
+            name: "NRK Sámi Radio",
+            logo: "stations/images-europe/norway/NRK Sámi Radio.png",
             url: "https://nrk-sapmi.akamaized.net/43/0/hls/nrk_sami_radio/playlist.m3u8"
         },
         {