diff --git a/web/stations/images-america/0_general_logos/Central Florida Public Media.png b/web/stations/images-america/0_general_logos/Central Florida Public Media.png
new file mode 100644
index 000000000..a2f55217b
Binary files /dev/null and b/web/stations/images-america/0_general_logos/Central Florida Public Media.png differ
diff --git a/web/stations/images-america/c2c/gainesville_fl/89.5 WMFV.png b/web/stations/images-america/c2c/gainesville_fl/89.5 WMFV.png
deleted file mode 100644
index d0c204826..000000000
Binary files a/web/stations/images-america/c2c/gainesville_fl/89.5 WMFV.png and /dev/null differ
diff --git a/web/stations/images-america/c2c/orlando_fl/90.7 WMFE.png b/web/stations/images-america/c2c/orlando_fl/90.7 WMFE.png
deleted file mode 100644
index 139bf1fe7..000000000
Binary files a/web/stations/images-america/c2c/orlando_fl/90.7 WMFE.png and /dev/null differ
diff --git a/web/stations/images-america/denver/FLO 107.1.png b/web/stations/images-america/denver/FLO 107.1.png
deleted file mode 100644
index 3abd80eb0..000000000
Binary files a/web/stations/images-america/denver/FLO 107.1.png and /dev/null differ
diff --git "a/web/stations/images-america/denver/JAMMIN\342\200\231 101.5.png" "b/web/stations/images-america/denver/JAMMIN\342\200\231 101.5.png"
deleted file mode 100644
index f5d0772c8..000000000
Binary files "a/web/stations/images-america/denver/JAMMIN\342\200\231 101.5.png" and /dev/null differ
diff --git a/web/stations/images-america/denver/Kingdom 107.1.png b/web/stations/images-america/denver/Kingdom 107.1.png
new file mode 100644
index 000000000..56efa292f
Binary files /dev/null and b/web/stations/images-america/denver/Kingdom 107.1.png differ
diff --git a/web/stations/images-america/denver/Star 101.5.png b/web/stations/images-america/denver/Star 101.5.png
new file mode 100644
index 000000000..b3c0ef561
Binary files /dev/null and b/web/stations/images-america/denver/Star 101.5.png differ
diff --git a/web/stations/images-europe/norway/P11 Dance.png b/web/stations/images-europe/norway/P11 Dance.png
new file mode 100644
index 000000000..74ce8939a
Binary files /dev/null and b/web/stations/images-europe/norway/P11 Dance.png differ
diff --git a/web/stations/images-europe/norway/P12 Bandit.png b/web/stations/images-europe/norway/P12 Bandit.png
new file mode 100644
index 000000000..b94bb9c2d
Binary files /dev/null and b/web/stations/images-europe/norway/P12 Bandit.png differ
diff --git a/web/stations/stations-america.js b/web/stations/stations-america.js
index 872a05e88..ea747719c 100644
--- a/web/stations/stations-america.js
+++ b/web/stations/stations-america.js
@@ -5440,9 +5440,9 @@ var stations = {
             url: "https://lds.msvdn.net/icecastRelay/101155/40TKLCJ/icecast"
         },
         {
-            name: "JAMMIN’ 101.5",
-            logo: "stations/images-america/denver/JAMMIN’ 101.5.png",
-            url: "https://live.amperwave.net/manifest/maxmedia-kjhmfmaac-ibc1"
+            name: "Star 101.5",
+            logo: "stations/images-america/denver/Star 101.5.png",
+            url: "https://pillar.streamguys1.com/KSRC"
         },
         {
             name: "101.9 Way FM",
@@ -5495,9 +5495,9 @@ var stations = {
             url: "https://stream.revma.ihrhls.com/zc7784/hls.m3u8"
         },
         {
-            name: "FLO 107.1",
-            logo: "stations/images-america/denver/FLO 107.1.png",
-            url: "https://live.amperwave.net/manifest/maxmedia-kfcofmaac-ibc1"
+            name: "Kingdom 107.1",
+            logo: "stations/images-america/denver/Kingdom 107.1.png",
+            url: "https://pillar.streamguys1.com/KNDM"
         },
         {
             name: "KS 107.5",
@@ -19975,9 +19975,9 @@ var stations = {
             url: "https://maestro.emfcdn.com/stream_for/k-love/web/aac"
         },
         {
-            name: "JAMMIN’ 101.5",
-            logo: "stations/images-america/denver/JAMMIN’ 101.5.png",
-            url: "https://live.amperwave.net/manifest/maxmedia-kjhmfmaac-ibc1"
+            name: "Star 101.5",
+            logo: "stations/images-america/denver/Star 101.5.png",
+            url: "https://pillar.streamguys1.com/KSRC"
         },
         {
             name: "102.5 K273DC",
@@ -19995,9 +19995,9 @@ var stations = {
             url: "http://newerastreaming.com:9006/stream"
         },
         {
-            name: "FLO 107.1",
-            logo: "stations/images-america/denver/FLO 107.1.png",
-            url: "https://live.amperwave.net/manifest/maxmedia-kfcofmaac-ibc1"
+            name: "Kingdom 107.1",
+            logo: "stations/images-america/denver/Kingdom 107.1.png",
+            url: "https://pillar.streamguys1.com/KNDM"
         },
         {
             name: "GraceFM 107.7",
@@ -27269,8 +27269,8 @@ var stations_c2c = {
             url: "https://ais-sa1.streamon.fm/7648_48k.aac"
         },
         {
-            name: "89.5 WMFV",
-            logo: "stations/images-america/c2c/gainesville_fl/89.5 WMFV.png",
+            name: "89.5 Central Florida Public Media",
+            logo: "stations/images-america/0_general_logos/Central Florida Public Media.png",
             url: "https://wmfe-iad.streamguys1.com/wmfv"
         },
         {
@@ -28428,13 +28428,13 @@ var stations_c2c = {
             url: "https://peridot.streamguys1.com:7835/WUCF-HD2"
         },
         {
-            name: "90.7 WMFE",
-            logo: "stations/images-america/c2c/orlando_fl/90.7 WMFE.png",
+            name: "90.7 Central Florida Public Media",
+            logo: "stations/images-america/0_general_logos/Central Florida Public Media.png",
             url: "https://wmfe-iad.streamguys1.com/wmfe"
         },
         {
             name: "Classical 90.7-HD2",
-            logo: "stations/images-america/c2c/orlando_fl/90.7 WMFE.png",
+            logo: "stations/images-america/0_general_logos/Central Florida Public Media.png",
             url: "https://wmfe-iad.streamguys1.com/wmfe2"
         },
         {
diff --git a/web/stations/stations-europe.js b/web/stations/stations-europe.js
index cb9af5dee..43960a332 100644
--- a/web/stations/stations-europe.js
+++ b/web/stations/stations-europe.js
@@ -4181,6 +4181,16 @@ var stations = {
             logo: "stations/images-europe/norway/P10 Country.png",
             url: "https://p10.p4groupaudio.com/P10_MM"
         },
+        {
+            name: "P11 Dance",
+            logo: "stations/images-europe/norway/P11 Dance.png",
+            url: "https://p11.p4groupaudio.com/P11_MM"
+        },
+        {
+            name: "P12 Bandit",
+            logo: "stations/images-europe/norway/P11 Dance.png",
+            url: "https://p12.p4groupaudio.com/BAN_AM"
+        },
         {
             name: "NRJ Norge",
             logo: "stations/images-europe/norway/Energy.png",