diff --git a/web/cities/cities-ats.js b/web/cities/cities-ats.js
index 0d38be956..96f590d55 100644
--- a/web/cities/cities-ats.js
+++ b/web/cities/cities-ats.js
@@ -195,7 +195,7 @@ var country_properties = {
         name: "Burlington",
         name_english: "Burlington",
         code: "us-co",
-        relative_radius: 0.6
+        relative_radius: 0.8
     },
     "burns": {
         name: "Burns",
@@ -303,7 +303,7 @@ var country_properties = {
         name: "Colby",
         name_english: "Colby",
         code: "us-ks",
-        relative_radius: 0.7
+        relative_radius: 0.8
     },
     "college_station": {
         name: "College Station",
@@ -837,7 +837,7 @@ var country_properties = {
         name: "Lawrence",
         name_english: "Lawrence",
         code: "us-ks",
-        relative_radius: 1.2
+        relative_radius: 1.0
     },
     "lawton": {
         name: "Lawton",
@@ -1559,6 +1559,12 @@ var country_properties = {
         code: "us-tx",
         relative_radius: 0.7
     },
+    "wakeeney": {
+        name: "WaKeeney",
+        name_english: "WaKeeney",
+        code: "us-ks",
+        relative_radius: 0.6
+    },
     "wallace": {
         name: "Wallace",
         name_english: "Wallace",
@@ -1733,7 +1739,7 @@ var city_properties = {
         relative_whitenoise: 0.95
     },
     "burlington": {
-        relative_whitenoise: 0.80
+        relative_whitenoise: 0.95
     },
     "burns": {
         relative_whitenoise: 0.85
@@ -2495,6 +2501,10 @@ var city_properties = {
     "waco": {
         relative_whitenoise: 0.95
     },
+    "wakeeney": {
+		relative_radius: 0.5,
+        relative_whitenoise: 0.95
+    },
     "wallace": {
         relative_radius: 0.5,
         relative_whitenoise: 0.85
@@ -2817,7 +2827,7 @@ var cities = [
         "gameName": "burlington",
         "realName": "Burlington",
         "country": "burlington",
-        "x": "-27255.2",
+        "x": "-28855.2",
         "y": "145.367",
         "z": "-2904.98"
     },
@@ -2993,7 +3003,7 @@ var cities = [
         "gameName": "colby",
         "realName": "Colby",
         "country": "colby",
-        "x": "-22443.8",
+        "x": "-23043.8",
         "y": "105",
         "z": "-1644.82"
     },
@@ -4933,6 +4943,14 @@ var cities = [
         "y": "113.414",
         "z": "42150.9"
     },
+    {
+        "gameName": "wakeeney",
+        "realName": "WaKeeney",
+        "country": "hays",
+        "x": "-17524.2",
+        "y": "70.8681",
+        "z": "-567.434"
+    },
     {
         "gameName": "wallace",
         "realName": "Wallace",
@@ -7533,7 +7551,7 @@ var country_properties_c2c = {
         name: "kansas",
         name_english: "kansas",
         code: "us-ks",
-        relative_radius: 0.9
+        relative_radius: 1.0
     },
     "greatbend_ks": {
         name: "Great Bend",
@@ -8001,7 +8019,7 @@ var country_properties_c2c = {
         name: "Lincoln",
         name_english: "Lincoln",
         code: "us-ne",
-        relative_radius: 0.7
+        relative_radius: 0.6
     },
     "mccook_ne": {
         name: "McCook",
@@ -8970,7 +8988,7 @@ var city_properties_c2c = {
         relative_whitenoise: 0.95
     },
     "lincoln": {
-        relative_whitenoise: 0.85
+        relative_whitenoise: 0.95
     },
     "mccook_ne": {
         relative_whitenoise: 0.85
@@ -10363,9 +10381,9 @@ var cities_c2c = [
         "gameName": "lincoln",
         "realName": "Lincoln",
         "country": "lincoln",
-        "x": "-2976.41",
+        "x": "-4076.41",
         "y": "153.148",
-        "z": "-7568.5"
+        "z": "-9068.5"
     },
     {
         "gameName": "mccook_ne",
diff --git a/web/stations/images-america/colby/KXXX 790.png b/web/stations/images-america/colby/790 KXXX.png
similarity index 100%
rename from web/stations/images-america/colby/KXXX 790.png
rename to web/stations/images-america/colby/790 KXXX.png
diff --git a/web/stations/images-america/dallas_fort_worth/102.5 El Pez.png b/web/stations/images-america/dallas_fort_worth/102.5 El Pez.png
deleted file mode 100644
index d8fa4e4b2..000000000
Binary files a/web/stations/images-america/dallas_fort_worth/102.5 El Pez.png and /dev/null differ
diff --git a/web/stations/images-america/dallas_fort_worth/620 AM Radio Luz.png b/web/stations/images-america/dallas_fort_worth/620 AM Radio Luz.png
deleted file mode 100644
index fcd2bfbfb..000000000
Binary files a/web/stations/images-america/dallas_fort_worth/620 AM Radio Luz.png and /dev/null differ
diff --git a/web/stations/images-america/dallas_fort_worth/Radio Luz.png b/web/stations/images-america/dallas_fort_worth/Radio Luz.png
new file mode 100644
index 000000000..fe5b65fbc
Binary files /dev/null and b/web/stations/images-america/dallas_fort_worth/Radio Luz.png differ
diff --git a/web/stations/images-america/show_low/103.5 The Vibe.png b/web/stations/images-america/show_low/103.5 The Vibe.png
deleted file mode 100644
index 548cb10a1..000000000
Binary files a/web/stations/images-america/show_low/103.5 The Vibe.png and /dev/null differ
diff --git a/web/stations/images-america/show_low/Vibe 103.5.png b/web/stations/images-america/show_low/Vibe 103.5.png
new file mode 100644
index 000000000..22456bd30
Binary files /dev/null and b/web/stations/images-america/show_low/Vibe 103.5.png differ
diff --git a/web/stations/stations-america.js b/web/stations/stations-america.js
index 97f544285..d1e234db4 100644
--- a/web/stations/stations-america.js
+++ b/web/stations/stations-america.js
@@ -2694,21 +2694,6 @@ var stations = {
             logo: "stations/images-america/0_general_logos/HPPR.png",
             url: "https://playerservices.streamtheworld.com/api/livestream-redirect/KANZFM_HPPR2_SC"
         },
-        {
-            name: "FlyOver Country 97.9",
-            logo: "stations/images-america/colby/FlyOver Country 97.9.png",
-            url: "https://ice23.securenetsystems.net/KWGB"
-        },
-        {
-            name: "URock 102.5",
-            logo: "stations/images-america/colby/URock 102.5.png",
-            url: "https://ice42.securenetsystems.net/KKCI"
-        },
-        {
-            name: "Tri-State Praise 107.7",
-            logo: "stations/images-america/colby/Tri-State Praise 107.7.png",
-            url: "https://ice10.securenetsystems.net/KGCR"
-        },
         {
             name: "630 KHOW",
             logo: "stations/images-america/denver/630 KHOW.png",
@@ -2739,11 +2724,6 @@ var stations = {
             logo: "stations/images-america/c2c/mccook_ne/KRVN 880.png",
             url: "https://ais-sa1.streamon.fm/7323_48k.aac"
         },
-        {
-            name: "KXXX 790",
-            logo: "stations/images-america/colby/KXXX 790.png",
-            url: "https://ice42.securenetsystems.net/KXXX"
-        },
         {
             name: "AM920 The Country Giant",
             logo: "stations/images-america/lamar/AM920 The Country Giant.png",
@@ -3653,8 +3633,8 @@ var stations = {
             url: "https://ice42.securenetsystems.net/KLOE"
         },
         {
-            name: "KXXX 790",
-            logo: "stations/images-america/colby/KXXX 790.png",
+            name: "790 KXXX",
+            logo: "stations/images-america/colby/790 KXXX.png",
             url: "https://ice42.securenetsystems.net/KXXX"
         },
         {
@@ -4706,9 +4686,9 @@ var stations = {
             url: "https://stream.revma.ihrhls.com/zc2815/hls.m3u8"
         },
         {
-            name: "102.5 El Pez",
-            logo: "stations/images-america/dallas_fort_worth/102.5 El Pez.png",
-            url: "http://216.246.103.221/index.php?u=https://playerservices.streamtheworld.com/api/livestream-redirect/KLTYHD2AAC_SC"
+            name: "102.5 Radio Luz",
+            logo: "stations/images-america/dallas_fort_worth/Radio Luz.png",
+            url: "http://216.246.103.221/index.php?u=https://playerservices.streamtheworld.com/api/livestream-redirect/KTNOAMAAC.aac"
         },
         {
             name: "MIX 102.9",
@@ -4797,7 +4777,7 @@ var stations = {
         },
         {
             name: "620 AM Radio Luz",
-            logo: "stations/images-america/dallas_fort_worth/620 AM Radio Luz.png",
+            logo: "stations/images-america/dallas_fort_worth/Radio Luz.png",
             url: "http://216.246.103.221/index.php?u=https://playerservices.streamtheworld.com/api/livestream-redirect/KTNOAMAAC_SC"
         },
         {
@@ -5720,7 +5700,7 @@ var stations = {
         },
         {
             name: "620 AM Radio Luz",
-            logo: "stations/images-america/dallas_fort_worth/620 AM Radio Luz.png",
+            logo: "stations/images-america/dallas_fort_worth/Radio Luz.png",
             url: "http://216.246.103.221/index.php?u=https://playerservices.streamtheworld.com/api/livestream-redirect/KTNOAMAAC_SC"
         },
         {
@@ -7059,7 +7039,7 @@ var stations = {
         {
             name: "90.5 KCSU",
             logo: "stations/images-america/fort_collins/90.5 KCSU.png",
-            url: "https://listen.creek.org/kcsu"
+            url: "https://listen.creek.org/test-kcsu-1"
         },
         {
             name: "90.9 K215FM",
@@ -13634,11 +13614,6 @@ var stations = {
             logo: "stations/images-america/sacramento/Sactown Sports 1140.png",
             url: "https://bonneville.cdnstream1.com/2616_48.aac"
         },
-        {
-            name: "Punjabi Radio 1170",
-            logo: "stations/images-america/0_general_logos/Punjabi Radio.png",
-            url: "http://s5.voscast.com:9281/stream"
-        },
         {
             name: "Relevant Radio 1230",
             logo: "stations/images-america/0_general_logos/Relevant Radio.png",
@@ -19209,8 +19184,8 @@ var stations = {
             url: "http://216.246.103.221/index.php?u=https://ice42.securenetsystems.net/KQAZ"
         },*/
         {
-            name: "103.5 The Vibe",
-            logo: "stations/images-america/show_low/103.5 The Vibe.png",
+            name: "Vibe 103.5",
+            logo: "stations/images-america/show_low/Vibe 103.5.png",
             url: "https://s5.radioforge.com:6874/vibe23"
         },
         {
@@ -21949,7 +21924,7 @@ var stations = {
         },
         {
             name: "620 AM Radio Luz",
-            logo: "stations/images-america/dallas_fort_worth/620 AM Radio Luz.png",
+            logo: "stations/images-america/dallas_fort_worth/Radio Luz.png",
             url: "http://216.246.103.221/index.php?u=https://playerservices.streamtheworld.com/api/livestream-redirect/KTNOAMAAC_SC"
         },
         {
@@ -37629,8 +37604,8 @@ var stations_c2c = {
             url: "http://216.246.103.221/index.php?u=https://ice41.securenetsystems.net/KIOD"
         },
         {
-            name: "KXXX 790",
-            logo: "stations/images-america/colby/KXXX 790.png",
+            name: "790 KXXX",
+            logo: "stations/images-america/colby/790 KXXX.png",
             url: "https://ice42.securenetsystems.net/KXXX"
         },
         {
@@ -42021,7 +41996,7 @@ var stations_c2c = {
         },
         {
             name: "620 AM Radio Luz",
-            logo: "stations/images-america/dallas_fort_worth/620 AM Radio Luz.png",
+            logo: "stations/images-america/dallas_fort_worth/Radio Luz.png",
             url: "http://216.246.103.221/index.php?u=https://playerservices.streamtheworld.com/api/livestream-redirect/KTNOAMAAC_SC"
         },
         {