diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ebaa1a50..eed539ac 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,8 +22,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:versionCode="55921"
-    android:versionName="55921-elys">
+    android:versionCode="55922"
+    android:versionName="55922-elys">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
diff --git a/app/src/main/java/joshuatee/wx/fragments/MiscFragment.kt b/app/src/main/java/joshuatee/wx/fragments/MiscFragment.kt
index aa91013a..4735928f 100644
--- a/app/src/main/java/joshuatee/wx/fragments/MiscFragment.kt
+++ b/app/src/main/java/joshuatee/wx/fragments/MiscFragment.kt
@@ -37,7 +37,7 @@ import joshuatee.wx.misc.WebView
 import joshuatee.wx.misc.WebViewTwitter
 import joshuatee.wx.models.ModelsGenericActivity
 import joshuatee.wx.nhc.NhcActivity
-import joshuatee.wx.radar.RadarMosaicNwsActivity
+import joshuatee.wx.radar.RadarMosaicActivity
 import joshuatee.wx.settings.Location
 import joshuatee.wx.vis.GoesActivity
 import joshuatee.wx.radar.WXGLRadarActivity
@@ -51,7 +51,11 @@ class MiscFragment : Fragment() {
 
     private val hm = mutableMapOf<String, TileObject>()
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         val view = inflater.inflate(R.layout.fragment_recyclerview, container, false)
         TabScreen(requireActivity(), view, "FRAGMENT_MISC_ORDER", tileObjects)
         return view
@@ -60,68 +64,71 @@ class MiscFragment : Fragment() {
     private val tileObjects: MutableList<TileObject>
         get() {
             hm["model_ncep"] = TileObject(
-                    R.drawable.ncep,
-                    ModelsGenericActivity::class.java,
-                    ModelsGenericActivity.INFO,
-                    arrayOf("1", "NCEP", "NCEP"),
-                    "model_ncep", "NCEP"
+                R.drawable.ncep,
+                ModelsGenericActivity::class.java,
+                ModelsGenericActivity.INFO,
+                arrayOf("1", "NCEP", "NCEP"),
+                "model_ncep", "NCEP"
             )
             hm["model_hrrr"] = TileObject(
-                    R.drawable.hrrrviewer,
-                    ModelsGenericActivity::class.java,
-                    ModelsGenericActivity.INFO,
-                    arrayOf("1", "ESRL", "ESRL"),
-                    "model_hrrr", "HRRR"
+                R.drawable.hrrrviewer,
+                ModelsGenericActivity::class.java,
+                ModelsGenericActivity.INFO,
+                arrayOf("1", "ESRL", "ESRL"),
+                "model_hrrr", "HRRR"
             )
 
             hm["uswarn"] = TileObject(
-                    R.drawable.uswarn,
-                    USAlertsActivity::class.java,
-                    USAlertsActivity.URL,
-                    arrayOf(".*?Tornado Warning.*?|.*?Severe Thunderstorm Warning.*?|.*?Flash Flood Warning.*?", "us"),
-                    "uswarn", "US Warnings"
+                R.drawable.uswarn,
+                USAlertsActivity::class.java,
+                USAlertsActivity.URL,
+                arrayOf(
+                    ".*?Tornado Warning.*?|.*?Severe Thunderstorm Warning.*?|.*?Flash Flood Warning.*?",
+                    "us"
+                ),
+                "uswarn", "US Warnings"
             )
             hm["wpctext"] = TileObject(
-                    R.drawable.srfd,
-                    NationalTextActivity::class.java,
-                    NationalTextActivity.URL,
-                    arrayOf("pmdspd", "Short Range Forecast Discussion"),
-                    "wpctext", "National text products"
+                R.drawable.srfd,
+                NationalTextActivity::class.java,
+                NationalTextActivity.URL,
+                arrayOf("pmdspd", "Short Range Forecast Discussion"),
+                "wpctext", "National text products"
             )
             hm["nhc"] = TileObject(
-                    R.drawable.nhc,
-                    NhcActivity::class.java,
-                    "",
-                    arrayOf(),
-                    "nhc", "NHC"
+                R.drawable.nhc,
+                NhcActivity::class.java,
+                "",
+                arrayOf(),
+                "nhc", "NHC"
             )
             hm["nwsmosaic"] = TileObject(
-                    R.drawable.nws_sector,
-                    RadarMosaicNwsActivity::class.java,
-                    RadarMosaicNwsActivity.URL,
-                    arrayOf("sector"),
-                    "nwsmosaic", "NWS Radar Mosaics"
+                R.drawable.nws_sector,
+                RadarMosaicActivity::class.java,
+                RadarMosaicActivity.URL,
+                arrayOf("sector"),
+                "nwsmosaic", "NWS Radar Mosaics"
             )
             hm["goes"] = TileObject(
-                    R.drawable.goes,
-                    GoesActivity::class.java,
-                    GoesActivity.RID,
-                    arrayOf("CONUS", "9"),
-                    "goes", "GOES"
+                R.drawable.goes,
+                GoesActivity::class.java,
+                GoesActivity.RID,
+                arrayOf("CONUS", "9"),
+                "goes", "GOES"
             )
             hm["lightning"] = TileObject(
-                    R.drawable.lightning,
-                    GoesActivity::class.java,
-                    GoesActivity.RID,
-                    arrayOf("CONUS", "23"),
-                    "lightning", "lightning"
+                R.drawable.lightning,
+                GoesActivity::class.java,
+                GoesActivity.RID,
+                arrayOf("CONUS", "23"),
+                "lightning", "lightning"
             )
             hm["wpcimages"] = TileObject(
-                    R.drawable.fmap,
-                    NationalImagesActivity::class.java,
-                    "",
-                    arrayOf(),
-                    "wpcimages", "National Images"
+                R.drawable.fmap,
+                NationalImagesActivity::class.java,
+                "",
+                arrayOf(),
+                "wpcimages", "National Images"
             )
 	    //elys mod - keeping twitter
             hm["twitter_state"] = TileObject(
@@ -137,78 +144,78 @@ class MiscFragment : Fragment() {
                      "twitter_tornado", "Twitter tornado"
             )
             hm["opc"] = TileObject(
-                    R.drawable.opc,
-                    ImageCollectionActivity::class.java,
-                    ImageCollectionActivity.TYPE,
-                    arrayOf("OPC"),
-                    "opc", "OPC"
+                R.drawable.opc,
+                ImageCollectionActivity::class.java,
+                ImageCollectionActivity.TYPE,
+                arrayOf("OPC"),
+                "opc", "OPC"
             )
             hm["goesfulldisk"] = TileObject(
-                    R.drawable.goesfulldisk,
-                    ImageCollectionActivity::class.java,
-                    ImageCollectionActivity.TYPE,
-                    arrayOf("GOESFD"),
-                    "goesfulldisk", "GOES Full Disk"
+                R.drawable.goesfulldisk,
+                ImageCollectionActivity::class.java,
+                ImageCollectionActivity.TYPE,
+                arrayOf("GOESFD"),
+                "goesfulldisk", "GOES Full Disk"
             )
             hm["nwsobs"] = TileObject(
-                    R.drawable.nwsobssites,
-                    NwsObsSitesActivity::class.java,
-                    "",
-                    arrayOf(),
-                    "nwsobs", "Observation sites"
+                R.drawable.nwsobssites,
+                NwsObsSitesActivity::class.java,
+                "",
+                arrayOf(),
+                "nwsobs", "Observation sites"
             )
             if (!UIPreferences.dualpaneRadarIcon) {
                 hm["wxogl"] = TileObject(
-                        R.drawable.wxogldualpane,
-                        WXGLRadarActivityMultiPane::class.java,
-                        WXGLRadarActivityMultiPane.RID,
-                        arrayOf(Location.rid, "", "2"),
-                        "wxogl", "Dual pane nexrad radar"
+                    R.drawable.wxogldualpane,
+                    WXGLRadarActivityMultiPane::class.java,
+                    WXGLRadarActivityMultiPane.RID,
+                    arrayOf(Location.rid, "", "2"),
+                    "wxogl", "Dual pane nexrad radar"
                 )
             } else {
                 hm["wxogl"] = TileObject(
-                        R.drawable.wxoglsinglepane,
-                        WXGLRadarActivity::class.java,
-                        WXGLRadarActivity.RID,
-                        arrayOf(Location.rid, ""),
-                        "wxogl", "Single pane nexrad radar"
+                    R.drawable.wxoglsinglepane,
+                    WXGLRadarActivity::class.java,
+                    WXGLRadarActivity.RID,
+                    arrayOf(Location.rid, ""),
+                    "wxogl", "Single pane nexrad radar"
                 )
             }
             Location.checkCurrentLocationValidity()
             hm["wxoglquad"] = TileObject(
-                    R.drawable.wxoglquadpane,
-                    WXGLRadarActivityMultiPane::class.java,
-                    WXGLRadarActivityMultiPane.RID,
-                    arrayOf(Location.rid, "", "4"),
-                    "wxoglquad", "Dual pane nexrad radar"
+                R.drawable.wxoglquadpane,
+                WXGLRadarActivityMultiPane::class.java,
+                WXGLRadarActivityMultiPane.RID,
+                arrayOf(Location.rid, "", "4"),
+                "wxoglquad", "Dual pane nexrad radar"
             )
             hm["model_nssl_wrf"] = TileObject(
-                    R.drawable.nsslwrf,
-                    ModelsGenericActivity::class.java,
-                    ModelsGenericActivity.INFO,
-                    arrayOf("1", "NSSL", "NSSL"),
-                    "model_nssl_wrf", "WRF"
+                R.drawable.nsslwrf,
+                ModelsGenericActivity::class.java,
+                ModelsGenericActivity.INFO,
+                arrayOf("1", "NSSL", "NSSL"),
+                "model_nssl_wrf", "WRF"
             )
             hm["goes16"] = TileObject(
-                    R.drawable.goes16,
-                    GoesActivity::class.java,
-                    GoesActivity.RID,
-                    arrayOf(""),
-                    "goes16", "GOES"
+                R.drawable.goes16,
+                GoesActivity::class.java,
+                GoesActivity.RID,
+                arrayOf(""),
+                "goes16", "GOES"
             )
             hm["wpcgefs"] = TileObject(
-                    R.drawable.wpcgefs,
-                    ModelsGenericActivity::class.java,
-                    ModelsGenericActivity.INFO,
-                    arrayOf("1", "WPCGEFS", "WPC"),
-                    "wpcgefs", "WPC GEFS"
+                R.drawable.wpcgefs,
+                ModelsGenericActivity::class.java,
+                ModelsGenericActivity.INFO,
+                arrayOf("1", "WPCGEFS", "WPC"),
+                "wpcgefs", "WPC GEFS"
             )
             hm["wpc_rainfall"] = TileObject(
-                    R.drawable.wpc_rainfall,
-                    RainfallOutlookSummaryActivity::class.java,
-                    "",
-                    arrayOf(),
-                    "wpc_rainfall", "WPC RAINFALL"
+                R.drawable.wpc_rainfall,
+                RainfallOutlookSummaryActivity::class.java,
+                "",
+                arrayOf(),
+                "wpc_rainfall", "WPC RAINFALL"
             )
 	    //elys mod
             hm["aurora"] = TileObject(
diff --git a/app/src/main/java/joshuatee/wx/objects/Route.kt b/app/src/main/java/joshuatee/wx/objects/Route.kt
index 27df76d1..84cbbba1 100644
--- a/app/src/main/java/joshuatee/wx/objects/Route.kt
+++ b/app/src/main/java/joshuatee/wx/objects/Route.kt
@@ -33,7 +33,7 @@ import joshuatee.wx.models.ModelsSpcHrefActivity
 import joshuatee.wx.nhc.NhcActivity
 import joshuatee.wx.nhc.NhcStormActivity
 import joshuatee.wx.nhc.NhcStormDetails
-import joshuatee.wx.radar.RadarMosaicNwsActivity
+import joshuatee.wx.radar.RadarMosaicActivity
 import joshuatee.wx.radar.WXGLRadarActivity
 import joshuatee.wx.radar.WXGLRadarActivityMultiPane
 import joshuatee.wx.settings.FavAddActivity
@@ -303,8 +303,8 @@ class Route() {
         fun radarMosaic(context: Context) {
             Route(
                 context,
-                RadarMosaicNwsActivity::class.java,
-                RadarMosaicNwsActivity.URL,
+                RadarMosaicActivity::class.java,
+                RadarMosaicActivity.URL,
                 arrayOf("")
             )
         }
diff --git a/app/src/main/java/joshuatee/wx/radar/RadarMosaicNwsActivity.kt b/app/src/main/java/joshuatee/wx/radar/RadarMosaicActivity.kt
similarity index 86%
rename from app/src/main/java/joshuatee/wx/radar/RadarMosaicNwsActivity.kt
rename to app/src/main/java/joshuatee/wx/radar/RadarMosaicActivity.kt
index 1daecad5..9117e0d4 100644
--- a/app/src/main/java/joshuatee/wx/radar/RadarMosaicNwsActivity.kt
+++ b/app/src/main/java/joshuatee/wx/radar/RadarMosaicActivity.kt
@@ -38,7 +38,7 @@ import joshuatee.wx.ui.TouchImage
 import joshuatee.wx.util.Utility
 import joshuatee.wx.util.UtilityShare
 
-class RadarMosaicNwsActivity : VideoRecordActivity() {
+class RadarMosaicActivity : VideoRecordActivity() {
 
     //
     // Provides native interface to NWS radar mosaics along with animations
@@ -57,7 +57,7 @@ class RadarMosaicNwsActivity : VideoRecordActivity() {
     private lateinit var navDrawer: NavDrawer
     private val prefImagePosition = "RADARMOSAICNWS"
     private val prefTokenSector = "REMEMBER_NWSMOSAIC_SECTOR"
-    private var sector = UtilityNwsRadarMosaic.getNearest(Location.latLon)
+    private var sector = UtilityRadarMosaic.getNearest(Location.latLon)
     private var saveLocation = false
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -72,19 +72,25 @@ class RadarMosaicNwsActivity : VideoRecordActivity() {
 
     @SuppressLint("MissingSuperCall")
     override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState, R.layout.activity_image_show_navdrawer, R.menu.radarnwsmosaic, bottomToolbar = false)
+        super.onCreate(
+            savedInstanceState,
+            R.layout.activity_image_show_navdrawer,
+            R.menu.radarnwsmosaic,
+            bottomToolbar = false
+        )
         val arguments = intent.getStringArrayExtra(URL)!!
         setupUI()
         if (arguments.isNotEmpty() && arguments[0] != "") {
             sector = Utility.readPref(this, prefTokenSector, sector)
             saveLocation = true
         }
-        navDrawer.index = UtilityNwsRadarMosaic.sectors.indexOf(sector)
+        navDrawer.index = UtilityRadarMosaic.sectors.indexOf(sector)
         getContent()
     }
 
     private fun setupUI() {
-        navDrawer = NavDrawer(this, UtilityNwsRadarMosaic.labels, UtilityNwsRadarMosaic.sectors) { getContent() }
+        navDrawer =
+            NavDrawer(this, UtilityRadarMosaic.labels, UtilityRadarMosaic.sectors) { getContent() }
         touchImage = TouchImage(this, toolbar, R.id.iv, navDrawer, "")
         objectAnimate = ObjectAnimate(this, touchImage)
         objectToolbar.connectClick { navDrawer.open() }
@@ -100,7 +106,7 @@ class RadarMosaicNwsActivity : VideoRecordActivity() {
     private fun getContent() {
         objectAnimate.stop()
         title = navDrawer.url
-        FutureBytes(UtilityNwsRadarMosaic.get(navDrawer.url), ::showImage)
+        FutureBytes(UtilityRadarMosaic.get(navDrawer.url), ::showImage)
     }
 
     private fun showImage(bitmap: Bitmap) {
@@ -126,7 +132,12 @@ class RadarMosaicNwsActivity : VideoRecordActivity() {
             return true
         }
         when (item.itemId) {
-            R.id.action_animate -> objectAnimate.animateClicked(::getContent) { UtilityNwsRadarMosaic.getAnimation(navDrawer.url) }
+            R.id.action_animate -> objectAnimate.animateClicked(::getContent) {
+                UtilityRadarMosaic.getAnimation(
+                    navDrawer.url
+                )
+            }
+
             R.id.action_stop -> objectAnimate.stop()
             R.id.action_pause -> objectAnimate.pause()
             R.id.action_share -> if (UIPreferences.recordScreenShare && Build.VERSION.SDK_INT < 33) {
diff --git a/app/src/main/java/joshuatee/wx/radar/UtilityNwsRadarMosaic.kt b/app/src/main/java/joshuatee/wx/radar/UtilityRadarMosaic.kt
similarity index 51%
rename from app/src/main/java/joshuatee/wx/radar/UtilityNwsRadarMosaic.kt
rename to app/src/main/java/joshuatee/wx/radar/UtilityRadarMosaic.kt
index 033154d9..af52595c 100644
--- a/app/src/main/java/joshuatee/wx/radar/UtilityNwsRadarMosaic.kt
+++ b/app/src/main/java/joshuatee/wx/radar/UtilityRadarMosaic.kt
@@ -26,7 +26,7 @@ import joshuatee.wx.settings.UtilityLocation
 import joshuatee.wx.util.To
 
 @Suppress("SpellCheckingInspection")
-object UtilityNwsRadarMosaic {
+object UtilityRadarMosaic {
 
     private const val BASE_URL = "https://radar.weather.gov/ridge/standard/"
 
@@ -50,55 +50,55 @@ object UtilityNwsRadarMosaic {
     }
 
     val sectors = listOf(
-            "CONUS",
-            "ALASKA",
-            "CARIB",
-            "CENTGRLAKES",
-            "GUAM",
-            "HAWAII",
-            "NORTHEAST",
-            "NORTHROCKIES",
-            "PACNORTHWEST",
-            "PACSOUTHWEST",
-            "SOUTHEAST",
-            "SOUTHMISSVLY",
-            "SOUTHPLAINS",
-            "SOUTHROCKIES",
-            "UPPERMISSVLY",
+        "CONUS",
+        "ALASKA",
+        "CARIB",
+        "CENTGRLAKES",
+        "GUAM",
+        "HAWAII",
+        "NORTHEAST",
+        "NORTHROCKIES",
+        "PACNORTHWEST",
+        "PACSOUTHWEST",
+        "SOUTHEAST",
+        "SOUTHMISSVLY",
+        "SOUTHPLAINS",
+        "SOUTHROCKIES",
+        "UPPERMISSVLY",
     )
 
     val labels = listOf(
-            "CONUS",
-            "ALASKA",
-            "CARIB",
-            "CENTGRLAKES",
-            "GUAM",
-            "HAWAII",
-            "NORTHEAST",
-            "NORTHROCKIES",
-            "PACNORTHWEST",
-            "PACSOUTHWEST",
-            "SOUTHEAST",
-            "SOUTHMISSVLY",
-            "SOUTHPLAINS",
-            "SOUTHROCKIES",
-            "UPPERMISSVLY",
+        "CONUS",
+        "ALASKA",
+        "CARIB",
+        "CENTGRLAKES",
+        "GUAM",
+        "HAWAII",
+        "NORTHEAST",
+        "NORTHROCKIES",
+        "PACNORTHWEST",
+        "PACSOUTHWEST",
+        "SOUTHEAST",
+        "SOUTHMISSVLY",
+        "SOUTHPLAINS",
+        "SOUTHROCKIES",
+        "UPPERMISSVLY",
     )
 
     private val cityToLatLon = mapOf(
-            "ALASKA" to LatLon(63.8683, -149.3669),
-            "CARIB" to LatLon(18.356, -69.592),
-            "CENTGRLAKES" to LatLon(42.4396, -84.7305),
-            "GUAM" to LatLon(13.4208, 144.7540),
-            "HAWAII" to LatLon(19.5910, -155.4343),
-            "NORTHEAST" to LatLon(42.7544, -73.4800),
-            "NORTHROCKIES" to LatLon(44.0813, -108.1309),
-            "PACNORTHWEST" to LatLon(43.1995, -118.9174),
-            "PACSOUTHWEST" to LatLon(35.8313, -119.2245),
-            "SOUTHEAST" to LatLon(30.2196, -82.1522),
-            "SOUTHMISSVLY" to LatLon(33.2541, -89.8034),
-            "SOUTHPLAINS" to LatLon(32.4484, -99.7781),
-            "SOUTHROCKIES" to LatLon(33.2210, -110.3162),
-            "UPPERMISSVLY" to LatLon(42.9304, -95.7488)
+        "ALASKA" to LatLon(63.8683, -149.3669),
+        "CARIB" to LatLon(18.356, -69.592),
+        "CENTGRLAKES" to LatLon(42.4396, -84.7305),
+        "GUAM" to LatLon(13.4208, 144.7540),
+        "HAWAII" to LatLon(19.5910, -155.4343),
+        "NORTHEAST" to LatLon(42.7544, -73.4800),
+        "NORTHROCKIES" to LatLon(44.0813, -108.1309),
+        "PACNORTHWEST" to LatLon(43.1995, -118.9174),
+        "PACSOUTHWEST" to LatLon(35.8313, -119.2245),
+        "SOUTHEAST" to LatLon(30.2196, -82.1522),
+        "SOUTHMISSVLY" to LatLon(33.2541, -89.8034),
+        "SOUTHPLAINS" to LatLon(32.4484, -99.7781),
+        "SOUTHROCKIES" to LatLon(33.2210, -110.3162),
+        "UPPERMISSVLY" to LatLon(42.9304, -95.7488)
     )
 }
diff --git a/app/src/main/java/joshuatee/wx/settings/UtilityHomeScreen.kt b/app/src/main/java/joshuatee/wx/settings/UtilityHomeScreen.kt
index b47f2f9d..63cee9a2 100644
--- a/app/src/main/java/joshuatee/wx/settings/UtilityHomeScreen.kt
+++ b/app/src/main/java/joshuatee/wx/settings/UtilityHomeScreen.kt
@@ -29,7 +29,7 @@ import joshuatee.wx.misc.USAlertsActivity
 import joshuatee.wx.models.ModelsGenericActivity
 import joshuatee.wx.nhc.NhcActivity
 import joshuatee.wx.objects.Route
-import joshuatee.wx.radar.RadarMosaicNwsActivity
+import joshuatee.wx.radar.RadarMosaicActivity
 import joshuatee.wx.radar.WXGLRadarActivityMultiPane
 import joshuatee.wx.spc.SpcSwoActivity
 import joshuatee.wx.spc.SpcStormReportsActivity
@@ -183,9 +183,9 @@ internal object UtilityHomeScreen {
         classArgs["RTMA_WIND"] = arrayOf("10m_wnd")
         classId["RTMA_WIND"] = RtmaActivity.RID
 
-        classes["RAD_2KM"] = RadarMosaicNwsActivity::class.java
+        classes["RAD_2KM"] = RadarMosaicActivity::class.java
         classArgs["RAD_2KM"] = arrayOf("")
-        classId["RAD_2KM"] = RadarMosaicNwsActivity.URL
+        classId["RAD_2KM"] = RadarMosaicActivity.URL
 
         listOf(
             "FMAP",
diff --git a/app/src/main/java/joshuatee/wx/util/DownloadImage.kt b/app/src/main/java/joshuatee/wx/util/DownloadImage.kt
index fcb7b4bf..91565f9a 100644
--- a/app/src/main/java/joshuatee/wx/util/DownloadImage.kt
+++ b/app/src/main/java/joshuatee/wx/util/DownloadImage.kt
@@ -30,7 +30,7 @@ import joshuatee.wx.misc.UtilityRtma
 import joshuatee.wx.getImage
 import joshuatee.wx.objects.FavoriteType
 import joshuatee.wx.settings.UIPreferences
-import joshuatee.wx.radar.UtilityNwsRadarMosaic
+import joshuatee.wx.radar.UtilityRadarMosaic
 import joshuatee.wx.spc.UtilitySpc
 import joshuatee.wx.spc.UtilitySpcMeso
 import joshuatee.wx.spc.UtilitySpcMesoInputOutput
@@ -46,9 +46,9 @@ object DownloadImage {
         val sector = Utility.readPref(
             context,
             prefTokenSector,
-            UtilityNwsRadarMosaic.getNearest(Location.latLon)
+            UtilityRadarMosaic.getNearest(Location.latLon)
         )
-        UtilityNwsRadarMosaic.get(sector).getImage()
+        UtilityRadarMosaic.get(sector).getImage()
     } catch (e: Exception) {
         UtilityLog.handleException(e)
         UtilityImg.getBlankBitmap()
diff --git a/app/src/main/java/joshuatee/wx/util/UtilityShortcut.kt b/app/src/main/java/joshuatee/wx/util/UtilityShortcut.kt
index 75cc17e6..ad94df0d 100644
--- a/app/src/main/java/joshuatee/wx/util/UtilityShortcut.kt
+++ b/app/src/main/java/joshuatee/wx/util/UtilityShortcut.kt
@@ -33,7 +33,7 @@ import joshuatee.wx.misc.WfoTextActivity
 import joshuatee.wx.misc.SevereDashboardActivity
 import joshuatee.wx.objects.ObjectIntentShortcut
 import joshuatee.wx.objects.ShortcutType
-import joshuatee.wx.radar.RadarMosaicNwsActivity
+import joshuatee.wx.radar.RadarMosaicActivity
 import joshuatee.wx.settings.Location
 import joshuatee.wx.spc.SpcSwoSummaryActivity
 import joshuatee.wx.vis.GoesActivity
@@ -91,7 +91,7 @@ object UtilityShortcut {
             }
 
             ShortcutType.RADAR_MOSAIC -> {
-                intent = ObjectIntentShortcut(context, RadarMosaicNwsActivity::class.java).intent
+                intent = ObjectIntentShortcut(context, RadarMosaicActivity::class.java).intent
                 imageId = R.drawable.widget_radar_mosaic
             }
 
diff --git a/app/src/main/java/joshuatee/wx/widgets/ObjectWidgetMosaicRadar.kt b/app/src/main/java/joshuatee/wx/widgets/ObjectWidgetMosaicRadar.kt
index a8c3ae7a..a9285ec9 100644
--- a/app/src/main/java/joshuatee/wx/widgets/ObjectWidgetMosaicRadar.kt
+++ b/app/src/main/java/joshuatee/wx/widgets/ObjectWidgetMosaicRadar.kt
@@ -25,7 +25,7 @@ import android.content.Context
 import android.widget.RemoteViews
 import joshuatee.wx.R
 import joshuatee.wx.settings.UIPreferences
-import joshuatee.wx.radar.RadarMosaicNwsActivity
+import joshuatee.wx.radar.RadarMosaicActivity
 
 class ObjectWidgetMosaicRadar(context: Context) {
 
@@ -34,7 +34,15 @@ class ObjectWidgetMosaicRadar(context: Context) {
     init {
         UtilityWidget.setImage(context, remoteViews, WidgetFile.MOSAIC_RADAR.fileName)
         if (!UIPreferences.widgetPreventTap) {
-            UtilityWidget.setupIntent(context, remoteViews, RadarMosaicNwsActivity::class.java, R.id.iv, RadarMosaicNwsActivity.URL, arrayOf(""), WidgetFile.MOSAIC_RADAR.action)
+            UtilityWidget.setupIntent(
+                context,
+                remoteViews,
+                RadarMosaicActivity::class.java,
+                R.id.iv,
+                RadarMosaicActivity.URL,
+                arrayOf(""),
+                WidgetFile.MOSAIC_RADAR.action
+            )
         }
     }
 
diff --git a/doc/ChangeLog.md b/doc/ChangeLog.md
index 338db2ce..0958a2a8 100644
--- a/doc/ChangeLog.md
+++ b/doc/ChangeLog.md
@@ -2,9 +2,19 @@
 
 # Developer ChangeLog
 
-## 55921 2024_11_07
+## 55922 2024_11_17
+
+* [ADD]
+
+## 55921 2024_11_17
 
 * [REF] evacuate radar lists from GlobalArrays and use functions in RadarSites
+* [REF] radar mosaic cleanup
+
+```
+	renamed:    app/src/main/java/joshuatee/wx/radar/RadarMosaicNwsActivity.kt -> app/src/main/java/joshuatee/wx/radar/RadarMosaicActivity.kt
+	renamed:    app/src/main/java/joshuatee/wx/radar/UtilityNwsRadarMosaic.kt -> app/src/main/java/joshuatee/wx/radar/UtilityRadarMosaic.kt
+```
 
 ## 55920 2024_11_07