diff --git a/lib/app/api/weather.freezed.dart b/lib/app/api/weather.freezed.dart
index e2134f7..01809be 100644
--- a/lib/app/api/weather.freezed.dart
+++ b/lib/app/api/weather.freezed.dart
@@ -12,7 +12,7 @@ part of 'weather.dart';
 T _$identity<T>(T value) => value;
 
 final _privateConstructorUsedError = UnsupportedError(
-    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
 
 WeatherDataApi _$WeatherDataApiFromJson(Map<String, dynamic> json) {
   return _WeatherDataApi.fromJson(json);
diff --git a/lib/app/api/weather.g.dart b/lib/app/api/weather.g.dart
index 4fa386e..0deed85 100644
--- a/lib/app/api/weather.g.dart
+++ b/lib/app/api/weather.g.dart
@@ -24,7 +24,7 @@ Map<String, dynamic> _$$WeatherDataApiImplToJson(
 _$HourlyImpl _$$HourlyImplFromJson(Map<String, dynamic> json) => _$HourlyImpl(
       time: (json['time'] as List<dynamic>?)?.map((e) => e as String).toList(),
       weatherCode: (json['weathercode'] as List<dynamic>?)
-          ?.map((e) => e as int)
+          ?.map((e) => (e as num).toInt())
           .toList(),
       temperature2M: (json['temperature_2m'] as List<dynamic>?)
           ?.map((e) => (e as num).toDouble())
@@ -39,7 +39,7 @@ _$HourlyImpl _$$HourlyImplFromJson(Map<String, dynamic> json) => _$HourlyImpl(
           ?.map((e) => (e as num?)?.toDouble())
           .toList(),
       relativeHumidity2M: (json['relativehumidity_2m'] as List<dynamic>?)
-          ?.map((e) => e as int?)
+          ?.map((e) => (e as num?)?.toInt())
           .toList(),
       surfacePressure: (json['surface_pressure'] as List<dynamic>?)
           ?.map((e) => (e as num?)?.toDouble())
@@ -54,13 +54,13 @@ _$HourlyImpl _$$HourlyImplFromJson(Map<String, dynamic> json) => _$HourlyImpl(
           ?.map((e) => (e as num?)?.toDouble())
           .toList(),
       windDirection10M: (json['winddirection_10m'] as List<dynamic>?)
-          ?.map((e) => e as int?)
+          ?.map((e) => (e as num?)?.toInt())
           .toList(),
       windGusts10M: (json['windgusts_10m'] as List<dynamic>?)
           ?.map((e) => (e as num?)?.toDouble())
           .toList(),
       cloudCover: (json['cloudcover'] as List<dynamic>?)
-          ?.map((e) => e as int?)
+          ?.map((e) => (e as num?)?.toInt())
           .toList(),
       uvIndex: (json['uv_index'] as List<dynamic>?)
           ?.map((e) => (e as num?)?.toDouble())
@@ -70,7 +70,7 @@ _$HourlyImpl _$$HourlyImplFromJson(Map<String, dynamic> json) => _$HourlyImpl(
           .toList(),
       precipitationProbability:
           (json['precipitation_probability'] as List<dynamic>?)
-              ?.map((e) => e as int?)
+              ?.map((e) => (e as num?)?.toInt())
               .toList(),
       shortwaveRadiation: (json['shortwave_radiation'] as List<dynamic>?)
           ?.map((e) => (e as num?)?.toDouble())
@@ -102,7 +102,7 @@ Map<String, dynamic> _$$HourlyImplToJson(_$HourlyImpl instance) =>
 _$DailyImpl _$$DailyImplFromJson(Map<String, dynamic> json) => _$DailyImpl(
       time: _dateTimeFromJson(json['time'] as List?),
       weatherCode: (json['weathercode'] as List<dynamic>?)
-          ?.map((e) => e as int?)
+          ?.map((e) => (e as num?)?.toInt())
           .toList(),
       temperature2MMax: (json['temperature_2m_max'] as List<dynamic>?)
           ?.map((e) => (e as num?)?.toDouble())
@@ -127,7 +127,7 @@ _$DailyImpl _$$DailyImplFromJson(Map<String, dynamic> json) => _$DailyImpl(
           (json['sunset'] as List<dynamic>?)?.map((e) => e as String).toList(),
       precipitationProbabilityMax:
           (json['precipitation_probability_max'] as List<dynamic>?)
-              ?.map((e) => e as int?)
+              ?.map((e) => (e as num?)?.toInt())
               .toList(),
       windSpeed10MMax: (json['windspeed_10m_max'] as List<dynamic>?)
           ?.map((e) => (e as num?)?.toDouble())
@@ -143,7 +143,7 @@ _$DailyImpl _$$DailyImplFromJson(Map<String, dynamic> json) => _$DailyImpl(
           .toList(),
       windDirection10MDominant:
           (json['winddirection_10m_dominant'] as List<dynamic>?)
-              ?.map((e) => e as int?)
+              ?.map((e) => (e as num?)?.toInt())
               .toList(),
     );
 
diff --git a/lib/app/data/weather.g.dart b/lib/app/data/weather.g.dart
index 76c2d16..1103612 100644
--- a/lib/app/data/weather.g.dart
+++ b/lib/app/data/weather.g.dart
@@ -109,7 +109,7 @@ const SettingsSchema = CollectionSchema(
   getId: _settingsGetId,
   getLinks: _settingsGetLinks,
   attach: _settingsAttach,
-  version: '3.1.0+1',
+  version: '3.1.7',
 );
 
 int _settingsEstimateSize(
@@ -2638,7 +2638,7 @@ const MainWeatherCacheSchema = CollectionSchema(
   getId: _mainWeatherCacheGetId,
   getLinks: _mainWeatherCacheGetLinks,
   attach: _mainWeatherCacheAttach,
-  version: '3.1.0+1',
+  version: '3.1.7',
 );
 
 int _mainWeatherCacheEstimateSize(
@@ -10361,7 +10361,7 @@ const LocationCacheSchema = CollectionSchema(
   getId: _locationCacheGetId,
   getLinks: _locationCacheGetLinks,
   attach: _locationCacheAttach,
-  version: '3.1.0+1',
+  version: '3.1.7',
 );
 
 int _locationCacheEstimateSize(
@@ -11460,7 +11460,7 @@ const WeatherCardSchema = CollectionSchema(
   getId: _weatherCardGetId,
   getLinks: _weatherCardGetLinks,
   attach: _weatherCardAttach,
-  version: '3.1.0+1',
+  version: '3.1.7',
 );
 
 int _weatherCardEstimateSize(
diff --git a/lib/app/modules/settings/view/settings.dart b/lib/app/modules/settings/view/settings.dart
index 6adfe35..362edde 100644
--- a/lib/app/modules/settings/view/settings.dart
+++ b/lib/app/modules/settings/view/settings.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 import 'package:flutter/material.dart';
-import 'package:flutter_colorpicker/flutter_colorpicker.dart';
+import 'package:flutter_hsvcolor_picker/flutter_hsvcolor_picker.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:geolocator/geolocator.dart';
 import 'package:get/get.dart';
@@ -612,20 +612,15 @@ class _SettingsPageState extends State<SettingsPage> {
                                                 ),
                                               ),
                                               child: ColorPicker(
-                                                pickerColor: widgetBackgroundColor
+                                                color: widgetBackgroundColor
                                                         .isEmpty
                                                     ? context.theme.primaryColor
                                                     : HexColor.fromHex(
                                                         widgetBackgroundColor),
-                                                onColorChanged: (pickedColor) {
+                                                onChanged: (pickedColor) {
                                                   colorBackground =
                                                       pickedColor.toHex();
                                                 },
-                                                hexInputBar: true,
-                                                labelTypes: const [],
-                                                pickerAreaHeightPercent: 0.7,
-                                                pickerAreaBorderRadius:
-                                                    BorderRadius.circular(20),
                                               ),
                                             ),
                                           ),
@@ -704,20 +699,14 @@ class _SettingsPageState extends State<SettingsPage> {
                                                 ),
                                               ),
                                               child: ColorPicker(
-                                                pickerColor: widgetTextColor
-                                                        .isEmpty
+                                                color: widgetTextColor.isEmpty
                                                     ? context.theme.primaryColor
                                                     : HexColor.fromHex(
                                                         widgetTextColor),
-                                                onColorChanged: (pickedColor) {
+                                                onChanged: (pickedColor) {
                                                   colorText =
                                                       pickedColor.toHex();
                                                 },
-                                                hexInputBar: true,
-                                                labelTypes: const [],
-                                                pickerAreaHeightPercent: 0.7,
-                                                pickerAreaBorderRadius:
-                                                    BorderRadius.circular(20),
                                               ),
                                             ),
                                           ),
diff --git a/lib/theme/theme.dart b/lib/theme/theme.dart
index 61bf1c1..f1a476d 100644
--- a/lib/theme/theme.dart
+++ b/lib/theme/theme.dart
@@ -1,6 +1,6 @@
-import 'package:dynamic_color/dynamic_color.dart';
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
+import 'package:dynamic_color/dynamic_color.dart';
 
 final ThemeData baseLigth = ThemeData.light(useMaterial3: true);
 final ThemeData baseDark = ThemeData.dark(useMaterial3: true);
@@ -24,8 +24,7 @@ ThemeData lightTheme(Color? color, ColorScheme? colorScheme) {
     colorScheme: colorScheme
         ?.copyWith(
           brightness: Brightness.light,
-          background: color,
-          surface: baseLigth.colorScheme.background,
+          surface: baseLigth.colorScheme.surface,
         )
         .harmonized(),
     textTheme: GoogleFonts.ubuntuTextTheme(baseLigth.textTheme),
@@ -41,6 +40,8 @@ ThemeData lightTheme(Color? color, ColorScheme? colorScheme) {
     scaffoldBackgroundColor: color,
     cardTheme: baseLigth.cardTheme.copyWith(
       color: color,
+      surfaceTintColor:
+          color == oledColor ? Colors.transparent : colorScheme?.surfaceTint,
       shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.circular(20),
       ),
@@ -48,16 +49,20 @@ ThemeData lightTheme(Color? color, ColorScheme? colorScheme) {
     ),
     bottomSheetTheme: baseLigth.bottomSheetTheme.copyWith(
       backgroundColor: color,
+      surfaceTintColor:
+          color == oledColor ? Colors.transparent : colorScheme?.surfaceTint,
     ),
     navigationRailTheme: baseLigth.navigationRailTheme.copyWith(
       backgroundColor: color,
     ),
     navigationBarTheme: baseLigth.navigationBarTheme.copyWith(
       backgroundColor: color,
+      surfaceTintColor:
+          color == oledColor ? Colors.transparent : colorScheme?.surfaceTint,
     ),
     inputDecorationTheme: baseLigth.inputDecorationTheme.copyWith(
-      labelStyle: MaterialStateTextStyle.resolveWith(
-        (Set<MaterialState> states) {
+      labelStyle: WidgetStateTextStyle.resolveWith(
+        (Set<WidgetState> states) {
           return const TextStyle(fontSize: 14);
         },
       ),
@@ -75,8 +80,7 @@ ThemeData darkTheme(Color? color, ColorScheme? colorScheme) {
     colorScheme: colorScheme
         ?.copyWith(
           brightness: Brightness.dark,
-          background: color,
-          surface: baseDark.colorScheme.background,
+          surface: baseDark.colorScheme.surface,
         )
         .harmonized(),
     textTheme: GoogleFonts.ubuntuTextTheme(baseDark.textTheme),
@@ -92,6 +96,8 @@ ThemeData darkTheme(Color? color, ColorScheme? colorScheme) {
     scaffoldBackgroundColor: color,
     cardTheme: baseDark.cardTheme.copyWith(
       color: color,
+      surfaceTintColor:
+          color == oledColor ? Colors.transparent : colorScheme?.surfaceTint,
       shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.circular(20),
       ),
@@ -99,16 +105,20 @@ ThemeData darkTheme(Color? color, ColorScheme? colorScheme) {
     ),
     bottomSheetTheme: baseDark.bottomSheetTheme.copyWith(
       backgroundColor: color,
+      surfaceTintColor:
+          color == oledColor ? Colors.transparent : colorScheme?.surfaceTint,
     ),
     navigationRailTheme: baseDark.navigationRailTheme.copyWith(
       backgroundColor: color,
     ),
     navigationBarTheme: baseDark.navigationBarTheme.copyWith(
       backgroundColor: color,
+      surfaceTintColor:
+          color == oledColor ? Colors.transparent : colorScheme?.surfaceTint,
     ),
     inputDecorationTheme: baseDark.inputDecorationTheme.copyWith(
-      labelStyle: MaterialStateTextStyle.resolveWith(
-        (Set<MaterialState> states) {
+      labelStyle: WidgetStateTextStyle.resolveWith(
+        (Set<WidgetState> states) {
           return const TextStyle(fontSize: 14);
         },
       ),
diff --git a/pubspec.lock b/pubspec.lock
index 135116f..f19175d 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,18 +5,18 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a
+      sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7"
       url: "https://pub.dev"
     source: hosted
-    version: "61.0.0"
+    version: "67.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562
+      sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d"
       url: "https://pub.dev"
     source: hosted
-    version: "5.13.0"
+    version: "6.4.1"
   ansicolor:
     dependency: transitive
     description:
@@ -29,18 +29,18 @@ packages:
     dependency: transitive
     description:
       name: archive
-      sha256: "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d"
+      sha256: ecf4273855368121b1caed0d10d4513c7241dfc813f7d3c8933b36622ae9b265
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.10"
+    version: "3.5.1"
   args:
     dependency: transitive
     description:
       name: args
-      sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
+      sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2"
+    version: "2.5.0"
   async:
     dependency: transitive
     description:
@@ -77,10 +77,10 @@ packages:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1"
+      sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.1"
+    version: "4.0.2"
   build_resolvers:
     dependency: transitive
     description:
@@ -93,10 +93,10 @@ packages:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22"
+      sha256: "1414d6d733a85d8ad2f1dfcb3ea7945759e35a123cb99ccfac75d0758f75edfa"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.9"
+    version: "2.4.10"
   build_runner_core:
     dependency: transitive
     description:
@@ -173,10 +173,10 @@ packages:
     dependency: "direct main"
     description:
       name: connectivity_plus
-      sha256: ebe15d94de9dd7c31dc2ac54e42780acdf3384b1497c69290c9f3c5b0279fc57
+      sha256: db7a4e143dc72cc3cb2044ef9b052a7ebfe729513e6a82943bc3526f784365b8
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.2"
+    version: "6.0.3"
   connectivity_plus_platform_interface:
     dependency: transitive
     description:
@@ -213,10 +213,10 @@ packages:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55"
+      sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.3.6"
   dartx:
     dependency: transitive
     description:
@@ -237,10 +237,10 @@ packages:
     dependency: "direct main"
     description:
       name: dio
-      sha256: "0978e9a3e45305a80a7210dbeaf79d6ee8bee33f70c8e542dc654c952070217f"
+      sha256: "11e40df547d418cc0c4900a9318b26304e665da6fa4755399a9ff9efd09034b5"
       url: "https://pub.dev"
     source: hosted
-    version: "5.4.2+1"
+    version: "5.4.3+1"
   dynamic_color:
     dependency: "direct main"
     description:
@@ -286,14 +286,6 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  flutter_colorpicker:
-    dependency: "direct main"
-    description:
-      name: flutter_colorpicker
-      sha256: "458a6ed8ea480eb16ff892aedb4b7092b2804affd7e046591fb03127e8d8ef8b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.3"
   flutter_displaymode:
     dependency: "direct main"
     description:
@@ -305,11 +297,20 @@ packages:
   flutter_glow:
     dependency: "direct main"
     description:
-      name: flutter_glow
-      sha256: "158f041ddbc18f199dcfd9375d40b983a2bf887752598cdf7b41ac6ff36362bf"
+      path: "."
+      ref: HEAD
+      resolved-ref: "7c5e1fd34583db4b40073add9ca329b03bf52a51"
+      url: "https://github.com/payam-zahedi/flutter-glow.git"
+    source: git
+    version: "0.3.1"
+  flutter_hsvcolor_picker:
+    dependency: "direct main"
+    description:
+      name: flutter_hsvcolor_picker
+      sha256: ea5868dbb1c840ef502bbf60168b26e18eab13a3a2b07bfef0c59a64e7fedc2c
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.0"
+    version: "1.5.0"
   flutter_launcher_icons:
     dependency: "direct dev"
     description:
@@ -322,18 +323,18 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1"
+      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "4.0.0"
   flutter_local_notifications:
     dependency: "direct main"
     description:
       name: flutter_local_notifications
-      sha256: f9a05409385b77b06c18f200a41c7c2711ebf7415669350bb0f8474c07bd40d1
+      sha256: "40e6fbd2da7dcc7ed78432c5cdab1559674b4af035fddbfb2f9a8f9c2112fcef"
       url: "https://pub.dev"
     source: hosted
-    version: "17.0.0"
+    version: "17.1.2"
   flutter_local_notifications_linux:
     dependency: transitive
     description:
@@ -346,10 +347,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_local_notifications_platform_interface
-      sha256: "7cf643d6d5022f3baed0be777b0662cce5919c0a7b86e700299f22dc4ae660ef"
+      sha256: "340abf67df238f7f0ef58f4a26d2a83e1ab74c77ab03cd2b2d5018ac64db30b7"
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0+1"
+    version: "7.1.0"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
@@ -385,10 +386,10 @@ packages:
     dependency: "direct dev"
     description:
       name: freezed
-      sha256: "91bce569d4805ea5bad6619a3e8690df8ad062a235165af4c0c5d928dda15eaf"
+      sha256: a434911f643466d78462625df76fd9eb13e57348ff43fe1f77bbe909522c67a1
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.1"
+    version: "2.5.2"
   freezed_annotation:
     dependency: "direct main"
     description:
@@ -417,10 +418,10 @@ packages:
     dependency: transitive
     description:
       name: geocoding_android
-      sha256: "4e1539a136c6ab4c44963cfc631970ee499f706a03654fc1d446b2100caf7221"
+      sha256: "1b13eca79b11c497c434678fed109c2be020b158cec7512c848c102bc7232603"
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.0"
+    version: "3.3.1"
   geocoding_ios:
     dependency: transitive
     description:
@@ -441,18 +442,18 @@ packages:
     dependency: "direct main"
     description:
       name: geolocator
-      sha256: "694ec58afe97787b5b72b8a0ab78c1a9244811c3c10e72c4362ef3c0ceb005cd"
+      sha256: "149876cc5207a0f5daf4fdd3bfcf0a0f27258b3fe95108fa084f527ad0568f1b"
       url: "https://pub.dev"
     source: hosted
-    version: "11.0.0"
+    version: "12.0.0"
   geolocator_android:
     dependency: transitive
     description:
       name: geolocator_android
-      sha256: f15d1536cd01b1399578f1da1eb5d566e7a718db6a3648f2c24d2e2f859f0692
+      sha256: "00c7177a95823dd3ee35ef42fd8666cd27d219ae14cea472ac76a21dff43000b"
       url: "https://pub.dev"
     source: hosted
-    version: "4.5.4"
+    version: "4.6.0"
   geolocator_apple:
     dependency: transitive
     description:
@@ -465,18 +466,18 @@ packages:
     dependency: transitive
     description:
       name: geolocator_platform_interface
-      sha256: "009a21c4bc2761e58dccf07c24f219adaebe0ff707abdfd40b0a763d4003fab9"
+      sha256: c6005787efe9e27cb0f6b50230c217e6f0ef8e1e7a8b854efb4f46489e502603
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.2"
+    version: "4.2.3"
   geolocator_web:
     dependency: transitive
     description:
       name: geolocator_web
-      sha256: "49d8f846ebeb5e2b6641fe477a7e97e5dd73f03cbfef3fd5c42177b7300fb0ed"
+      sha256: "7a22f400d831f924a89d931ba126a10e6b8b437f31e6b9311320435f3e1571bd"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "4.0.0"
   geolocator_windows:
     dependency: transitive
     description:
@@ -521,10 +522,10 @@ packages:
     dependency: "direct main"
     description:
       name: home_widget
-      sha256: "29565bfee4b32eaf9e7e8b998d504618b779a74b2b1ac62dd4dac7468e66f1a3"
+      sha256: "2a0fdd6267ff975bd07bedf74686bd5577200f504f5de36527ac1b56bdbe68e3"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.6.0"
   html:
     dependency: transitive
     description:
@@ -585,10 +586,10 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.1"
+    version: "0.19.0"
   io:
     dependency: transitive
     description:
@@ -601,50 +602,50 @@ packages:
     dependency: "direct main"
     description:
       name: isar
-      sha256: "99165dadb2cf2329d3140198363a7e7bff9bbd441871898a87e26914d25cf1ea"
-      url: "https://pub.dev"
+      sha256: e7135ff16ae4e4624bce608757b2d22aeeeb09225d9f16ec3e3a5c9f3d05e66a
+      url: "https://pub.isar-community.dev"
     source: hosted
-    version: "3.1.0+1"
+    version: "3.1.7"
   isar_flutter_libs:
     dependency: "direct main"
     description:
       name: isar_flutter_libs
-      sha256: bc6768cc4b9c61aabff77152e7f33b4b17d2fc93134f7af1c3dd51500fe8d5e8
-      url: "https://pub.dev"
+      sha256: cb2cc60aac929ca190c0332d10417cab405f666dc96773ab66eb2958866a5e20
+      url: "https://pub.isar-community.dev"
     source: hosted
-    version: "3.1.0+1"
+    version: "3.1.7"
   isar_generator:
     dependency: "direct dev"
     description:
       name: isar_generator
-      sha256: "76c121e1295a30423604f2f819bc255bc79f852f3bc8743a24017df6068ad133"
-      url: "https://pub.dev"
+      sha256: "9409d8c95abc67953165dea302f75d957cd40965fcbcd0134ab2b2e4c5e35042"
+      url: "https://pub.isar-community.dev"
     source: hosted
-    version: "3.1.0+1"
+    version: "3.1.7"
   js:
     dependency: transitive
     description:
       name: js
-      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
+      sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.7"
+    version: "0.7.1"
   json_annotation:
     dependency: "direct main"
     description:
       name: json_annotation
-      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.8.1"
+    version: "4.9.0"
   json_serializable:
     dependency: "direct dev"
     description:
       name: json_serializable
-      sha256: aa1f5a8912615733e0fdc7a02af03308933c93235bdc8d50d0b0c8a8ccb0b969
+      sha256: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b
       url: "https://pub.dev"
     source: hosted
-    version: "6.7.1"
+    version: "6.8.0"
   lat_lng_to_timezone:
     dependency: "direct main"
     description:
@@ -657,34 +658,34 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.0"
+    version: "10.0.4"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.3"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.1"
   lints:
     dependency: transitive
     description:
       name: lints
-      sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
+      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "4.0.0"
   logging:
     dependency: transitive
     description:
@@ -713,10 +714,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.12.0"
   mime:
     dependency: transitive
     description:
@@ -745,10 +746,10 @@ packages:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: "2c582551839386fa7ddbc7770658be7c0f87f388a4bff72066478f597c34d17f"
+      sha256: b93d8b4d624b4ea19b0a5a208b2d6eff06004bc3ce74c06040b120eeadd00ce0
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
+    version: "8.0.0"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -769,26 +770,26 @@ packages:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b
+      sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "51f0d2c554cfbc9d6a312ab35152fc77e2f0b758ce9f1a444a3a1e5b8f3c6b7f"
+      sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.3"
+    version: "2.2.4"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f"
+      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.4.0"
   path_provider_linux:
     dependency: transitive
     description:
@@ -837,14 +838,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.8"
-  pointycastle:
-    dependency: transitive
-    description:
-      name: pointycastle
-      sha256: "70fe966348fe08c34bf929582f1d8247d9d9408130723206472b4687227e4333"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.8.0"
   pool:
     dependency: transitive
     description:
@@ -889,10 +882,10 @@ packages:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1"
+      sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "2.0.0"
   shimmer:
     dependency: "direct main"
     description:
@@ -982,10 +975,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.7.0"
   time:
     dependency: transitive
     description:
@@ -1006,10 +999,10 @@ packages:
     dependency: "direct main"
     description:
       name: timezone
-      sha256: "1cfd8ddc2d1cfd836bc93e67b9be88c3adaeca6f40a00ca999104c30693cdca0"
+      sha256: a6ccda4a69a442098b602c44e61a1e2b4bf6f5516e875bbf0f427d5df14745d5
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.2"
+    version: "0.9.3"
   timing:
     dependency: transitive
     description:
@@ -1038,26 +1031,26 @@ packages:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: "0ecc004c62fd3ed36a2ffcbe0dd9700aee63bd7532d0b642a488b1ec310f492e"
+      sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.5"
+    version: "6.2.6"
   url_launcher_android:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: d4ed0711849dd8e33eb2dd69c25db0d0d3fdc37e0a62e629fe32f57a22db2745
+      sha256: "360a6ed2027f18b73c8d98e159dda67a61b7f2e0f6ec26e86c3ada33b0621775"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.0"
+    version: "6.3.1"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "9149d493b075ed740901f3ee844a38a00b33116c7c5c10d7fb27df8987fb51d5"
+      sha256: "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.5"
+    version: "6.3.0"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -1070,10 +1063,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234
+      sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.2.0"
   url_launcher_platform_interface:
     dependency: transitive
     description:
@@ -1086,10 +1079,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: "3692a459204a33e04bc94f5fb91158faf4f2c8903281ddd82915adecdb1a901d"
+      sha256: "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.0"
+    version: "2.3.1"
   url_launcher_windows:
     dependency: transitive
     description:
@@ -1118,10 +1111,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
       url: "https://pub.dev"
     source: hosted
-    version: "13.0.0"
+    version: "14.2.1"
   watcher:
     dependency: transitive
     description:
@@ -1138,22 +1131,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.5.1"
+  web_socket:
+    dependency: transitive
+    description:
+      name: web_socket
+      sha256: "217f49b5213796cb508d6a942a5dc604ce1cb6a0a6b3d8cb3f0c314f0ecea712"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.4"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
-      sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42"
+      sha256: a2d56211ee4d35d9b344d9d4ce60f362e4f5d1aafb988302906bd732bc731276
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.5"
+    version: "3.0.0"
   win32:
     dependency: transitive
     description:
       name: win32
-      sha256: "0a989dc7ca2bb51eac91e8fd00851297cfffd641aa7538b165c62637ca0eaa4a"
+      sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4
       url: "https://pub.dev"
     source: hosted
-    version: "5.4.0"
+    version: "5.5.1"
   workmanager:
     dependency: "direct main"
     description:
@@ -1195,5 +1196,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.3.3 <4.0.0"
-  flutter: ">=3.19.2"
+  dart: ">=3.4.0 <4.0.0"
+  flutter: ">=3.20.0-1.2.pre"
diff --git a/pubspec.yaml b/pubspec.yaml
index 5f1edf6..5b11c6f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -6,7 +6,7 @@ publish_to: "none"
 version: 1.3.1+34
 
 environment:
-  sdk: ">=3.3.3 <4.0.0"
+  sdk: ">=3.4.0 <4.0.0"
 
 dependencies:
   flutter:
@@ -14,33 +14,39 @@ dependencies:
   flutter_localizations:
     sdk: flutter
   get: ^4.6.6
-  dio: ^5.4.2+1
-  intl: ^0.18.1
-  isar: ^3.1.0+1
+  dio: ^5.4.3+1
+  intl: ^0.19.0
+  isar: 
+    version: ^3.1.7
+    hosted: https://pub.isar-community.dev/
   shimmer: ^3.0.0
   iconsax: ^0.0.8
-  timezone: ^0.9.2
+  timezone: ^0.9.3
   geocoding: ^3.0.0
-  geolocator: ^11.0.0
-  home_widget: ^0.5.0
+  geolocator: ^12.0.0
+  home_widget: ^0.6.0
   workmanager: ^0.5.2
   google_fonts: ^6.2.1
-  flutter_glow: ^0.3.0
-  url_launcher: ^6.2.5
+  flutter_glow:
+    git:
+      url: https://github.com/payam-zahedi/flutter-glow.git
+  url_launcher: ^6.2.6
   time_machine: ^0.9.17
   dynamic_color: ^1.7.0
-  path_provider: ^2.1.2
-  json_annotation: ^4.8.1
+  path_provider: ^2.1.3
+  json_annotation: ^4.9.0
   flutter_timezone: ^1.0.8
-  package_info_plus: ^7.0.0
-  connectivity_plus: ^6.0.2
+  package_info_plus: ^8.0.0
+  connectivity_plus: ^6.0.3
   freezed_annotation: ^2.4.1
-  isar_flutter_libs: ^3.1.0+1
+  isar_flutter_libs:
+    version: ^3.1.7
+    hosted: https://pub.isar-community.dev/
   flutter_displaymode: ^0.6.0
   lat_lng_to_timezone: ^0.2.0
-  flutter_colorpicker: ^1.0.3
+  flutter_hsvcolor_picker: ^1.5.0
   scrollable_positioned_list: ^0.3.8
-  flutter_local_notifications: ^17.0.0
+  flutter_local_notifications: ^17.1.2
   internet_connection_checker_plus: ^2.3.0
 
 # Uncomment this for publishing FLOSS variant
@@ -54,11 +60,13 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  freezed: ^2.5.1
-  build_runner: ^2.4.9
-  flutter_lints: ^3.0.2
-  isar_generator: ^3.1.0+1
-  json_serializable: ^6.7.1
+  freezed: ^2.5.2
+  build_runner: ^2.4.10
+  flutter_lints: ^4.0.0
+  isar_generator: 
+    version: ^3.1.7
+    hosted: https://pub.isar-community.dev/
+  json_serializable: ^6.8.0
   flutter_native_splash: ^2.4.0
   flutter_launcher_icons: ^0.13.1