diff --git a/app/src/main/java/com/pranshulgg/weather_master_app/data/local/mapper/weather/WeatherDomainMapper.kt b/app/src/main/java/com/pranshulgg/weather_master_app/data/local/mapper/weather/WeatherDomainMapper.kt
index d53ca55b5..7f07bf212 100644
--- a/app/src/main/java/com/pranshulgg/weather_master_app/data/local/mapper/weather/WeatherDomainMapper.kt
+++ b/app/src/main/java/com/pranshulgg/weather_master_app/data/local/mapper/weather/WeatherDomainMapper.kt
@@ -1,5 +1,6 @@
 package com.pranshulgg.weather_master_app.data.local.mapper.weather
 
+import com.pranshulgg.weather_master_app.core.model.domain.location.Location
 import com.pranshulgg.weather_master_app.core.model.domain.weather.WeatherCurrent
 import com.pranshulgg.weather_master_app.core.model.domain.weather.WeatherDaily
 import com.pranshulgg.weather_master_app.core.model.domain.weather.WeatherHourly
@@ -36,11 +37,11 @@ fun WeatherCurrent.toCurrentWeatherEntity(
 
 @OptIn(ExperimentalUuidApi::class)
 fun List<WeatherHourly>.toHourlyWeatherEntity(
-    locationId: String
+    location: Location
 ): List<HourlyWeatherEntity> =
     map { item ->
         HourlyWeatherEntity(
-            locationId = locationId,
+            locationId = location.id,
             temperature = item.temperature,
             windSpeed = item.windSpeed,
             windDirection = item.windDirection,
@@ -53,7 +54,8 @@ fun List<WeatherHourly>.toHourlyWeatherEntity(
             visibility = item.visibility,
             pressureMsl = item.pressureMsl,
             humidity = item.humidity,
-            dewPoint = item.dewPoint
+            dewPoint = item.dewPoint,
+            cachedSource = location.source
         )
     }
 
diff --git a/app/src/main/java/com/pranshulgg/weather_master_app/feature/settings/appearance/components/SelectableThemeColors.kt b/app/src/main/java/com/pranshulgg/weather_master_app/feature/settings/appearance/components/SelectableThemeColors.kt
index e101a01b5..0e4391b71 100644
--- a/app/src/main/java/com/pranshulgg/weather_master_app/feature/settings/appearance/components/SelectableThemeColors.kt
+++ b/app/src/main/java/com/pranshulgg/weather_master_app/feature/settings/appearance/components/SelectableThemeColors.kt
@@ -168,7 +168,6 @@ fun SelectableThemeColors(onThemeColorChanged: (String) -> Unit) {
                         selected = variant
                     },
                     modifier = Modifier.semantics { role = Role.RadioButton },
-                    shapes = ToggleButtonDefaults.shapes(),
                     colors = ToggleButtonDefaults.toggleButtonColors(
                         checkedContainerColor = MaterialTheme.colorScheme.tertiary,
                         checkedContentColor = MaterialTheme.colorScheme.onTertiary,
diff --git a/app/src/main/java/com/pranshulgg/weather_master_app/widgets/uvindex/ui/UvIndexWidgetConfig.kt b/app/src/main/java/com/pranshulgg/weather_master_app/widgets/uvindex/ui/UvIndexWidgetConfig.kt
index c74649dcc..825ee6f9f 100644
--- a/app/src/main/java/com/pranshulgg/weather_master_app/widgets/uvindex/ui/UvIndexWidgetConfig.kt
+++ b/app/src/main/java/com/pranshulgg/weather_master_app/widgets/uvindex/ui/UvIndexWidgetConfig.kt
@@ -107,7 +107,6 @@ fun UvIndexWidgetConfig(onDone: (WidgetConfig) -> Unit = {}) {
                             selectedVariant = item
                         },
                         modifier = Modifier.semantics { role = Role.RadioButton },
-                        shapes = ToggleButtonDefaults.shapes(),
                         colors = ToggleButtonDefaults.toggleButtonColors(
                             checkedContainerColor = MaterialTheme.colorScheme.tertiary,
                             checkedContentColor = MaterialTheme.colorScheme.onTertiary,
diff --git a/app/src/main/java/com/pranshulgg/weather_master_app/widgets/weather/ui/WeatherWidgetConfig.kt b/app/src/main/java/com/pranshulgg/weather_master_app/widgets/weather/ui/WeatherWidgetConfig.kt
index a6437d4ce..9f0759615 100644
--- a/app/src/main/java/com/pranshulgg/weather_master_app/widgets/weather/ui/WeatherWidgetConfig.kt
+++ b/app/src/main/java/com/pranshulgg/weather_master_app/widgets/weather/ui/WeatherWidgetConfig.kt
@@ -135,7 +135,6 @@ fun WeatherWidgetConfig(onDone: (WidgetConfig) -> Unit = {}) {
                             selectedVariant = item
                         },
                         modifier = Modifier.semantics { role = Role.RadioButton },
-                        shapes = ToggleButtonDefaults.shapes(),
                         colors = ToggleButtonDefaults.toggleButtonColors(
                             checkedContainerColor = MaterialTheme.colorScheme.tertiary,
                             checkedContentColor = MaterialTheme.colorScheme.onTertiary,
diff --git a/app/src/main/java/com/pranshulgg/weather_master_app/widgets/weather4/ui/Weather4Config.kt b/app/src/main/java/com/pranshulgg/weather_master_app/widgets/weather4/ui/Weather4Config.kt
index 30fcab68c..697fd2581 100644
--- a/app/src/main/java/com/pranshulgg/weather_master_app/widgets/weather4/ui/Weather4Config.kt
+++ b/app/src/main/java/com/pranshulgg/weather_master_app/widgets/weather4/ui/Weather4Config.kt
@@ -129,7 +129,6 @@ fun Weather4Config(onDone: (WidgetConfig) -> Unit = {}) {
                             selectedVariant = item
                         },
                         modifier = Modifier.semantics { role = Role.RadioButton },
-                        shapes = ToggleButtonDefaults.shapes(),
                         colors = ToggleButtonDefaults.toggleButtonColors(
                             checkedContainerColor = MaterialTheme.colorScheme.tertiary,
                             checkedContentColor = MaterialTheme.colorScheme.onTertiary,
diff --git a/app/src/main/java/com/pranshulgg/weather_master_app/widgets/weatherhorizontal/ui/WeatherHorizontalConfig.kt b/app/src/main/java/com/pranshulgg/weather_master_app/widgets/weatherhorizontal/ui/WeatherHorizontalConfig.kt
index d19d23ba9..7cf9b91ae 100644
--- a/app/src/main/java/com/pranshulgg/weather_master_app/widgets/weatherhorizontal/ui/WeatherHorizontalConfig.kt
+++ b/app/src/main/java/com/pranshulgg/weather_master_app/widgets/weatherhorizontal/ui/WeatherHorizontalConfig.kt
@@ -126,7 +126,6 @@ fun WeatherHorizontalConfig(onDone: (WidgetConfig) -> Unit = {}) {
                             selectedVariant = item
                         },
                         modifier = Modifier.semantics { role = Role.RadioButton },
-                        shapes = ToggleButtonDefaults.shapes(),
                         colors = ToggleButtonDefaults.toggleButtonColors(
                             checkedContainerColor = MaterialTheme.colorScheme.tertiary,
                             checkedContentColor = MaterialTheme.colorScheme.onTertiary,