diff --git a/.fvmrc b/.fvmrc
index d1af5d5..6886307 100644
--- a/.fvmrc
+++ b/.fvmrc
@@ -1,4 +1,4 @@
 {
-  "flutter": "3.27.1",
+  "flutter": "3.35.5",
   "flavors": {}
 }
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index b18e36a..c980304 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,9 +5,11 @@
 *.swp
 .DS_Store
 .atom/
+.build/
 .buildlog/
 .history
 .svn/
+.swiftpm/
 migrate_working_dir/
 
 # IntelliJ related
@@ -40,16 +42,11 @@ app.*.symbols
 app.*.map.json
 
 # Android Studio will place build artifacts here
+/android/app/.cxx/
 /android/app/debug
 /android/app/profile
 /android/app/release
 
-# App Icons Gen
-extras/app_icon_generator/generated
-
-# iOS related stuff
-Podfile.lock
-
 # Firebase
 .crashlytics
 .firebase/
diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 0000000..1f35cfa
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,137 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Develop - Debug",
+      "request": "launch",
+      "type": "dart",
+      "program": "lib/main_develop.dart",
+      "args": [
+        "--web-browser-flag",
+        "--user-data-dir=./.chrome_data_dir",
+        "--web-port",
+        "5000",
+        "--flavor",
+        "develop"
+      ]
+    },
+    {
+      "name": "Develop - Profile",
+      "request": "launch",
+      "type": "dart",
+      "program": "lib/main_develop.dart",
+      "flutterMode": "profile",
+      "args": [
+        "--web-browser-flag",
+        "--user-data-dir=./.chrome_data_dir",
+        "--web-port",
+        "5000",
+        "--flavor",
+        "develop"
+      ]
+    },
+    {
+      "name": "Develop - Release",
+      "request": "launch",
+      "type": "dart",
+      "program": "lib/main_develop.dart",
+      "flutterMode": "release",
+      "args": [
+        "--web-browser-flag",
+        "--user-data-dir=./.chrome_data_dir",
+        "--web-port",
+        "5000",
+        "--flavor",
+        "develop"
+      ]
+    },
+    {
+      "name": "Staging - Debug",
+      "request": "launch",
+      "type": "dart",
+      "program": "lib/main_staging.dart",
+      "args": [
+        "--web-browser-flag",
+        "--user-data-dir=./.chrome_data_dir",
+        "--web-port",
+        "5000",
+        "--flavor",
+        "staging"
+      ]
+    },
+    {
+      "name": "Staging - Profile",
+      "request": "launch",
+      "type": "dart",
+      "program": "lib/main_staging.dart",
+      "flutterMode": "profile",
+      "args": [
+        "--web-browser-flag",
+        "--user-data-dir=./.chrome_data_dir",
+        "--web-port",
+        "5000",
+        "--flavor",
+        "staging"
+      ]
+    },
+    {
+      "name": "Staging - Release",
+      "request": "launch",
+      "type": "dart",
+      "program": "lib/main_staging.dart",
+      "flutterMode": "release",
+      "args": [
+        "--web-browser-flag",
+        "--user-data-dir=./.chrome_data_dir",
+        "--web-port",
+        "5000",
+        "--flavor",
+        "staging"
+      ]
+    },
+    {
+      "name": "Production - Debug",
+      "request": "launch",
+      "type": "dart",
+      "program": "lib/main_production.dart",
+      "args": [
+        "--web-browser-flag",
+        "--user-data-dir=./.chrome_data_dir",
+        "--web-port",
+        "5000",
+        "--flavor",
+        "production"
+      ]
+    },
+    {
+      "name": "Production - Profile",
+      "request": "launch",
+      "type": "dart",
+      "program": "lib/main_production.dart",
+      "flutterMode": "profile",
+      "args": [
+        "--web-browser-flag",
+        "--user-data-dir=./.chrome_data_dir",
+        "--web-port",
+        "5000",
+        "--flavor",
+        "production"
+      ]
+    },
+    {
+      "name": "Production - Release",
+      "request": "launch",
+      "type": "dart",
+      "program": "lib/main_production.dart",
+      "flutterMode": "release",
+      "args": [
+        "--web-browser-flag",
+        "--user-data-dir=./.chrome_data_dir",
+        "--web-port",
+        "5000",
+        "--flavor",
+        "production"
+      ]
+    }
+  ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
index b01430d..7dd17c0 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,3 @@
 {
-  "dart.flutterSdkPath": ".fvm/versions/3.27.1"
+  "dart.flutterSdkPath": ".fvm/versions/3.35.5"
 }
\ No newline at end of file
diff --git a/README.md b/README.md
index 85dd646..bf2c9ff 100644
--- a/README.md
+++ b/README.md
@@ -53,13 +53,15 @@
 
 - [Authors](#authors)
 
+
 <!-- ################################################## -->
 <!-- #######           Project Notes            ####### -->
 <!-- ################################################## -->
 # Project notes
 
-- Notes that could be benefitial to know during the development. 
+- Notes that could be beneficial to know during the development. 
 - For example list of test accounts, required credentials, steps required to get testing account, etc.
+<!-- ################################################## -->
 
 
 <!-- ################################################## -->
@@ -74,6 +76,7 @@ These are our four core values:
 - **Innovation** - We encourage creativity and innovation within the Flutter team. Support an environment where team members feel comfortable suggesting new ideas, experimenting with different approaches, and finding new solutions to problems.
 <!-- ################################################## -->
 
+
 <!-- ################################################## -->
 <!-- ########           First steps            ######## -->
 <!-- ################################################## -->
@@ -96,6 +99,7 @@ These are our four core values:
 9. - [ ] Go through all the ToDo's inside the project, and react to them.
 <!-- ################################################## -->
 
+
 <!-- ################################################## -->
 <!-- ##########           Project            ########## -->
 <!-- ################################################## -->
@@ -119,7 +123,7 @@ These are our four core values:
       ‣ dbo -> Classes to transfer data over to the database 
       ‣ dto -> Classes to transfer data over the network
       ‣ enum -> Enum classes used across the App
-      ‣ model -> Model classes used across the App
+      ‣ entity -> Entity classes used across the App
     ‣ extensions -> Extension classes/methods over existing data types
     ‣ provider -> Global Services and manager providers, like Notification Service
     ‣ usecase -> Methods used to get/post data. Usually from/to network or local database
@@ -154,7 +158,7 @@ flutter pub run build_runner watch --delete-conflicting-outputs
 
 as an alternative you can just use:
 ```
-make build_runner
+make watch
 ```
 
 ### Linux
@@ -175,12 +179,13 @@ You can read about flavors setup in the following tutorials:
 - 🖥️ [Linux](https://docs.flutter.dev/deployment/linux) - Flavors are not supported yet.
 
 In case of using firebase with multiple flavors, you have to:
-- for iOS add custom build run script phase and copy appropriate `GoogleService-Info.plist` file. It's already prepared, you just need to uncomment it and add appropriate plists to destinations according to the script.
+- For iOS, add the custom Build Run Script phase and copy the appropriate `GoogleService-Info.plist` file. The script is already prepared; simply uncomment it and add the necessary `plist` files to their destinations.
 
 For Google sign in:
 - for iOS, you have to copy value from `REVERSED_CLIENT_ID` from `GoogleService-Info.plist` into `GOOGLE_REVERSED_CLIENT_ID` in build settings.
 <!-- ################################################## -->
 
+
 <!-- ################################################## -->
 <!-- ##########    Build and Distribution    ########## -->
 <!-- ################################################## -->
@@ -189,7 +194,7 @@ For Google sign in:
 - As we are using flavors, we have to specify which flavor to build using `--flavor` argument, and also select a correct main file using `-t` argument.
 - One of the arguments you should use is `--obfuscate`. This makes reverse engineering harder. This has to be used also with `--split-debug-info` which should make the app smaller, and also specify the directory where the mapping file to read obfuscated stack trace is stored.
 - Optional step is to include precompiled Shaders. To do that you have to first [Precompile Shaders](#precompiling-shaders) and add `--bundle-sksl-path` argument.
-- In case we would like to build a Debugable version of the app, we have to add `--debug` argument.
+- To build a debug version of the app, include the `--debug` flag.
 
 Here is an example of assembling an Android app bundle using all the commands:
 ```
@@ -292,7 +297,7 @@ We covered the UI part, now we need to focus more on the app state and business
 The second class is `StateNotifier` class, annotated with `@riverpod` annotation. Rather than splitting the logic completely into small chunks, we believe that it is a good practice to usually have just one `StateNotifier`, providing the `State` for the feature. Naming should follow the same rules as the State class. For example: `UserDetailStateNotifier`. This class must override the `build` method. The State is built inside this method. This is a good place to for example call any necessary API calls, to get data, make some init logic for the feature, etc.. This class can also contain additional methods, to manipulate the State. For example method `updateUser` will update the state with `isUpdatingUser` to `true`, then update the user on the BE side and update the state again with progress set to `false``, and providing new user data. 
 Even through we have just a single huge StateHandler, it is possible to observe just specific fields that are needed for building the UI. This way we can optimize the redrawing of the app when the state changes.
 
-The last part is the solution, on how to communicate one-time events from `StateNotifier` back to the UI. For this, we are using a custom implementation of `EventNotifier` which extends `StateNotifier`. This part is implemented inside `*_event.dart` file. For example: `user_detail_event.dart`. Inside we can find the `Freezed` class defining the events (for example `error` event, `userUpdated` event). There is also a definition of an autodispose StateNotifierProvider, named by the feature. For example: `userDetailEventNotifierProvider`. We should then listen to all these defined events using `ref.listen()` inside our `*_page_content.dart` widget build method. 
+The last part is the solution, on how to communicate one-time events from `StateNotifier` back to the UI. For this, we are using a custom implementation of `EventNotifier` which extends `StateNotifier`. This part is implemented inside `*_event.dart` file. For example: `user_detail_event.dart`. Inside we can find the `Freezed` class defining the events (for example `error` event, `userUpdated` event). There is also a definition of an autodispose StateNotifierProvider, named by the feature. For example: `userDetailEventNotifierProvider`. We should then listen to all these defined events using `ref.listen()` inside our `*_page.dart` widget build method. 
 <!-- ################################################## -->
 
 ## Push Notifications
@@ -302,7 +307,7 @@ On the iOS side, on the other hand, the notification will be always displayed by
 
 ![Push Notifications Payload](docs/push_notifications_payload.jpg)
 
-As for the handling of notifications of different types, we introduced `NotificationPayloadModel`, and `NotificationType`. These both define all the notifications types expected from BE, which the app will be able to handle. All the rest of the logic is handled inside `FirebaseMessagingService` and `NotificationsService` files.
+As for the handling of notifications of different types, we introduced `NotificationPayloadEntity`, and `NotificationType`. These both define all the notifications types expected from BE, which the app will be able to handle. All the rest of the logic is handled inside `FirebaseMessagingService` and `NotificationsService` files.
 
 ![Displaying Push Notifications](docs/displaying_push_notifications.jpg)
 
@@ -339,7 +344,7 @@ This way we are ensuring that at least the Android version is buildable. We are
 ## Theming
 Theming is done inside `lib/core/themes/app_theme.dart`. Currently, we suggest using Material 3. The main setup is done in file `app_theme.dart`.
 
-The main idea right now is to overwrite the whole `colorScheme` with an "undefined" pinkish color and to not use the default theme colorScheme anywhere in the app. Every widget like AppBar, EleveatedButton, TextField, etc. should have a custom implementation starting with the word `Custom` so it is easily recognizable. This Widget then should wrap the appropriate widget, and should utilize colors from `context.colorScheme`, which has an extension method, as is returning our own implementation of `CustomColorScheme`. All colors should be declared there.
+The current approach is to completely override the default `colorScheme` with a custom "undefined" pinkish palette and avoid using the default theme anywhere in the app. Every widget—such as AppBar, ElevatedButton, and TextField—should have a custom implementation prefixed with `Custom` for easy identification. Each `Custom` widget should wrap the corresponding standard widget and use colors from `context.colorScheme` and text styles from `context.textTheme`. These context extensions return our custom implementations: `CustomColorScheme` and `CustomTextTheme`, where all colors and text styles are defined.
 
 The most tricky part of theming is to make sure that the app supports Edge-to-Edge, and that it has correct navigation and StatusBar colors set. To make this possible, we had to implement our own `CustomSystemBarsTheme` class. To use it properly, make sure you are calling `setupSystemBarsTheme` during the App startup. In case of the need of overriding the Brightness for a specific screen, there are two approaches. First, the simple one is to just use `CustomAppBar`, and set brightness to it. Second, wrap the whole Scaffold inside `CustomSystemBarsThemeWidget` and set Brightness to it.
 <!-- ################################################## -->
@@ -356,10 +361,10 @@ To be able to use the firebase provider for Apple login, we need to do some conf
 
 - Create a Service ID - this is the service that would provide sign in with apple. `Developer -> Certificates, Identifiers & Profiles -> Identifiers -> Create new -> Services IDs`
     (note: to get into services there is a filter on Identifiers screen on right top where you can switch from identifiers to services.)
-    - Description will be visible to our users - e.g. WearTechClub
-    - Identifier - can be app/bundle ID `com.wearthech.club.develop` or simply `weartechclub-develop`
+    - Description will be visible to our users - e.g. Template
+    - Identifier - can be app/bundle ID `com.strv.flutter.template.develop` or simply `flutter-template-develop`
     - Enable Sign in with Apple for the service 
-        - Domains is url of your page e.g. `weartechclub.com`
+        - Domains is url of your page e.g. `template.com`
         - Return URL is crucial part - this will be taken from Firebase: Authentication -> Sign-in method -> Apple -> callback URL
 
 - Create a key: `Developer -> Certificates, Identifiers & Profiles -> Keys -> Create new`
@@ -370,9 +375,9 @@ To be able to use the firebase provider for Apple login, we need to do some conf
     - Save -> Continue -> Register -> download the key
 
 - Firebase setup that will be done under `Authentication -> Sign-in method -> Apple`
-    - Services ID - this is the Identifier of a Service ID created in Apple Developer - `weartechclub-develop`
-    - Apple team Id from Developer (e.g. `965Y62DKGTU`)
-    - Key Id - generated when the key was created in previous step  (e.g. `798BRVKFKO`)
+    - Services ID - this is the Identifier of a Service ID created in Apple Developer - `flutter-template-develop`
+    - Apple team Id from Developer (e.g. `965Y6XXXXXX`)
+    - Key Id - generated when the key was created in previous step  (e.g. `798BXXXXXX`)
     - Private key - when you created the key you downloaded the Private key as .p8 file
     - Save it and check the `callback URL` - if it changed from what you have in your `Service ID` as `Return URL`, update it in Apple Developer
 <!-- ################################################## -->
@@ -389,6 +394,7 @@ To be able to use the firebase provider for Apple login, we need to do some conf
     - The app will crash, and you will see the error message `[CustomException] Received error PlatformException(google_sign_in, Your app is missing support for the following URL schemes: com.googleusercontent.apps......` in the debug console if the custom URL schemes setup is incorrect after tapping the Google Auth button.
 <!-- ################################################## -->
 
+
 <!-- ################################################## -->
 <!-- ##########           Testing            ########## -->
 <!-- ################################################## -->
@@ -524,7 +530,7 @@ For the purpose of Fraud prevention, user safety, and compliance the dedicated A
 <!-- ##########           Authors            ########## -->
 <!-- ################################################## -->
 # Authors
-- [Lukáš Hermann](mailto:lukas.hermann@strv.com)
+- [Lukáš Hermann](mailto:hermann@helu.cz)
 - [Robert Oravec](mailto:robert.oravec@strv.com)
 - [Michal Urbánek](mailto:michal.urbanek@strv.com)
 <!-- ################################################## -->
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 607827c..e657abc 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -7,13 +7,21 @@
 
 # The following line activates a set of recommended lints for Flutter apps,
 # packages, and plugins designed to encourage good coding practices.
-include: package:flutter_lints/flutter.yaml
+include: package:netglade_analysis/lints.yaml
 
 analyzer:
-  exclude: 
+  exclude:
     - 'project_setup/**'
     - '**.g.dart'
     - '**.gen.dart'
+    - '**.config.dart'
+    - '**.graphql.dart'
+  errors:
+    todo: info
+
+formatter:
+  page_width: 140
+  trailing_commas: preserve
 
 linter:
   # The lint rules applied to this project can be customized in the
@@ -28,36 +36,10 @@ linter:
   # `// ignore_for_file: name_of_lint` syntax on the line or in the file
   # producing the lint.
   rules:
-    # avoid_redundant_argument_values: true
-    always_declare_return_types: true
-    always_use_package_imports: true
-    avoid_catches_without_on_clauses: true
-    avoid_catching_errors: true
-    avoid_empty_else: true
-    avoid_field_initializers_in_const_classes: true
-    avoid_final_parameters: true
-    avoid_multiple_declarations_per_line: true
-    avoid_types_as_parameter_names: true
-    avoid_types_on_closure_parameters: true
-    avoid_unnecessary_containers: true
-    avoid_void_async: true
-    await_only_futures: true
-    camel_case_extensions: true
-    camel_case_types: true
-    curly_braces_in_flow_control_structures: true
-    empty_statements: true
-    eol_at_end_of_file: true
-    file_names: true
-    leading_newlines_in_multiline_strings: true
-    library_names: true
-    no_duplicate_case_values: true
-    no_logic_in_create_state: true
-    no_self_assignments: true
-    no_wildcard_variable_uses: true
-    prefer_single_quotes: true
-    prefer_void_to_null: true
-    slash_for_doc_comments: true
-    unnecessary_brace_in_string_interps: true
+    sort_pub_dependencies: false
+    require_trailing_commas: false
+    avoid_positional_boolean_parameters: false
+    no_default_cases: false
 
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 39af099..151e131 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -27,8 +27,8 @@ if (flutterVersionName == null) {
 }
 
 def minAndroidSdkVersion = 24
-def compileAndroidSdkVersion = 35
-def targetAndroidSdkVersion = 35
+def compileAndroidSdkVersion = 36
+def targetAndroidSdkVersion = 36
 
 // Initialize a new Properties() object called keystoreProperties.
 def debugKeystoreProperties = new Properties()
@@ -44,14 +44,13 @@ android {
     namespace "com.strv.flutter.template"
 
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
-
-        coreLibraryDesugaringEnabled true
     }
 
     kotlinOptions {
-        jvmTarget = '17'
+        jvmTarget = JavaVersion.VERSION_17
     }
 
     sourceSets {
@@ -118,9 +117,6 @@ android {
             shrinkResources true
 
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-
-            // Comment this when testing dynamic links.
-            applicationIdSuffix = ".debug"
         }
         release {
             signingConfig signingConfigs.release
@@ -130,7 +126,7 @@ android {
 
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
            
-            // TODO: Remove or change to true, once Firebase is set-up correctly
+            // TODO(strv): Remove or change to true, once Firebase is set-up correctly
             firebaseCrashlytics {
                 mappingFileUploadEnabled = false
                 unstrippedNativeLibsDir file("build/app/intermediates/merged_native_libs/productionRelease/out/lib")
@@ -159,10 +155,9 @@ flutter {
 }
 
 dependencies {
-    implementation 'com.google.android.material:material:1.13.0-alpha05'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.0"
-    androidTestUtil "androidx.test:orchestrator:1.4.2"
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
+    implementation 'com.google.android.material:material:1.13.0-alpha12'
+    androidTestUtil "androidx.test:orchestrator:1.5.1"
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
 }
 
 // This section must appear at the bottom of the file
diff --git a/android/app/src/developDebug/ic_launcher-playstore.png b/android/app/src/developDebug/ic_launcher-playstore.png
index 3f1a310..b75ab47 100644
Binary files a/android/app/src/developDebug/ic_launcher-playstore.png and b/android/app/src/developDebug/ic_launcher-playstore.png differ
diff --git a/android/app/src/developDebug/res/mipmap-hdpi/ic_launcher.png b/android/app/src/developDebug/res/mipmap-hdpi/ic_launcher.png
index 7c477c2..3408fae 100644
Binary files a/android/app/src/developDebug/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/developDebug/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/app/src/developDebug/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/developDebug/res/mipmap-hdpi/ic_launcher_foreground.png
index 8fc642f..87394b0 100644
Binary files a/android/app/src/developDebug/res/mipmap-hdpi/ic_launcher_foreground.png and b/android/app/src/developDebug/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/developDebug/res/mipmap-mdpi/ic_launcher.png b/android/app/src/developDebug/res/mipmap-mdpi/ic_launcher.png
index 04a5a92..cc6a1c8 100644
Binary files a/android/app/src/developDebug/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/developDebug/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/app/src/developDebug/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/developDebug/res/mipmap-mdpi/ic_launcher_foreground.png
index fb1309c..a5f0d86 100644
Binary files a/android/app/src/developDebug/res/mipmap-mdpi/ic_launcher_foreground.png and b/android/app/src/developDebug/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/developDebug/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/developDebug/res/mipmap-xhdpi/ic_launcher.png
index f162d23..7bc89b2 100644
Binary files a/android/app/src/developDebug/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/developDebug/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/app/src/developDebug/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/developDebug/res/mipmap-xhdpi/ic_launcher_foreground.png
index 361bbe3..1c1d3ea 100644
Binary files a/android/app/src/developDebug/res/mipmap-xhdpi/ic_launcher_foreground.png and b/android/app/src/developDebug/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/developDebug/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/developDebug/res/mipmap-xxhdpi/ic_launcher.png
index 59ab2bf..b8e668c 100644
Binary files a/android/app/src/developDebug/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/developDebug/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/developDebug/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/developDebug/res/mipmap-xxhdpi/ic_launcher_foreground.png
index 7645a03..ed2f9c7 100644
Binary files a/android/app/src/developDebug/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/android/app/src/developDebug/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/developDebug/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/developDebug/res/mipmap-xxxhdpi/ic_launcher.png
index 8d614d1..431500c 100644
Binary files a/android/app/src/developDebug/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/developDebug/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/app/src/developDebug/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/developDebug/res/mipmap-xxxhdpi/ic_launcher_foreground.png
index 866d4e7..00f20d6 100644
Binary files a/android/app/src/developDebug/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/android/app/src/developDebug/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/developDebug/res/values/colors.xml b/android/app/src/developDebug/res/values/colors.xml
index d81c478..696fb27 100644
--- a/android/app/src/developDebug/res/values/colors.xml
+++ b/android/app/src/developDebug/res/values/colors.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <color name="ic_launcher_background">#FF121618</color>
+  <color name="ic_launcher_background">#FFF2F2F2</color>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/developRelease/ic_launcher-playstore.png b/android/app/src/developRelease/ic_launcher-playstore.png
index a85f2d8..9b0118b 100644
Binary files a/android/app/src/developRelease/ic_launcher-playstore.png and b/android/app/src/developRelease/ic_launcher-playstore.png differ
diff --git a/android/app/src/developRelease/res/mipmap-hdpi/ic_launcher.png b/android/app/src/developRelease/res/mipmap-hdpi/ic_launcher.png
index 8b57140..5461a69 100644
Binary files a/android/app/src/developRelease/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/developRelease/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/app/src/developRelease/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/developRelease/res/mipmap-hdpi/ic_launcher_foreground.png
index b1bf7a8..6f5df14 100644
Binary files a/android/app/src/developRelease/res/mipmap-hdpi/ic_launcher_foreground.png and b/android/app/src/developRelease/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/developRelease/res/mipmap-mdpi/ic_launcher.png b/android/app/src/developRelease/res/mipmap-mdpi/ic_launcher.png
index 6450e3b..b079614 100644
Binary files a/android/app/src/developRelease/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/developRelease/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/app/src/developRelease/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/developRelease/res/mipmap-mdpi/ic_launcher_foreground.png
index e7d7b4d..c7ffa6c 100644
Binary files a/android/app/src/developRelease/res/mipmap-mdpi/ic_launcher_foreground.png and b/android/app/src/developRelease/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/developRelease/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/developRelease/res/mipmap-xhdpi/ic_launcher.png
index dda8a8e..a7cfee5 100644
Binary files a/android/app/src/developRelease/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/developRelease/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/app/src/developRelease/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/developRelease/res/mipmap-xhdpi/ic_launcher_foreground.png
index b515b10..aeb6374 100644
Binary files a/android/app/src/developRelease/res/mipmap-xhdpi/ic_launcher_foreground.png and b/android/app/src/developRelease/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/developRelease/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/developRelease/res/mipmap-xxhdpi/ic_launcher.png
index 42ad601..7dfeec6 100644
Binary files a/android/app/src/developRelease/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/developRelease/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/developRelease/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/developRelease/res/mipmap-xxhdpi/ic_launcher_foreground.png
index 1f47145..a3b6eef 100644
Binary files a/android/app/src/developRelease/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/android/app/src/developRelease/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/developRelease/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/developRelease/res/mipmap-xxxhdpi/ic_launcher.png
index 141d582..4291e39 100644
Binary files a/android/app/src/developRelease/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/developRelease/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/app/src/developRelease/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/developRelease/res/mipmap-xxxhdpi/ic_launcher_foreground.png
index 86656b4..23719e5 100644
Binary files a/android/app/src/developRelease/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/android/app/src/developRelease/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/developRelease/res/values/colors.xml b/android/app/src/developRelease/res/values/colors.xml
index d81c478..696fb27 100644
--- a/android/app/src/developRelease/res/values/colors.xml
+++ b/android/app/src/developRelease/res/values/colors.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <color name="ic_launcher_background">#FF121618</color>
+  <color name="ic_launcher_background">#FFF2F2F2</color>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index f242817..1246ce0 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -3,11 +3,13 @@
     package="com.strv.flutter.template">
 
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove"/>
 
     <application
         android:label="Flutter Template"
         android:name="${applicationName}"
+        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:networkSecurityConfig="@xml/network_security_config">
 
diff --git a/android/app/src/main/res/drawable-hdpi/android12splash.png b/android/app/src/main/res/drawable-hdpi/android12splash.png
index e910ca3..e340151 100644
Binary files a/android/app/src/main/res/drawable-hdpi/android12splash.png and b/android/app/src/main/res/drawable-hdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/splash.png b/android/app/src/main/res/drawable-hdpi/splash.png
index e910ca3..e340151 100644
Binary files a/android/app/src/main/res/drawable-hdpi/splash.png and b/android/app/src/main/res/drawable-hdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/android12splash.png b/android/app/src/main/res/drawable-mdpi/android12splash.png
index e44e119..791e426 100644
Binary files a/android/app/src/main/res/drawable-mdpi/android12splash.png and b/android/app/src/main/res/drawable-mdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/splash.png b/android/app/src/main/res/drawable-mdpi/splash.png
index e44e119..791e426 100644
Binary files a/android/app/src/main/res/drawable-mdpi/splash.png and b/android/app/src/main/res/drawable-mdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-night-hdpi/android12splash.png b/android/app/src/main/res/drawable-night-hdpi/android12splash.png
index e910ca3..e340151 100644
Binary files a/android/app/src/main/res/drawable-night-hdpi/android12splash.png and b/android/app/src/main/res/drawable-night-hdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-night-mdpi/android12splash.png b/android/app/src/main/res/drawable-night-mdpi/android12splash.png
index e44e119..791e426 100644
Binary files a/android/app/src/main/res/drawable-night-mdpi/android12splash.png and b/android/app/src/main/res/drawable-night-mdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-night-v21/background.png b/android/app/src/main/res/drawable-night-v21/background.png
index 4bb5d7a..00a4175 100644
Binary files a/android/app/src/main/res/drawable-night-v21/background.png and b/android/app/src/main/res/drawable-night-v21/background.png differ
diff --git a/android/app/src/main/res/drawable-night-xhdpi/android12splash.png b/android/app/src/main/res/drawable-night-xhdpi/android12splash.png
index 1a318c4..bc1eb02 100644
Binary files a/android/app/src/main/res/drawable-night-xhdpi/android12splash.png and b/android/app/src/main/res/drawable-night-xhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png b/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png
index 757ba67..fdecce3 100644
Binary files a/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png and b/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png b/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png
index 2b2fbca..5194e23 100644
Binary files a/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png and b/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-night/background.png b/android/app/src/main/res/drawable-night/background.png
index 4bb5d7a..00a4175 100644
Binary files a/android/app/src/main/res/drawable-night/background.png and b/android/app/src/main/res/drawable-night/background.png differ
diff --git a/android/app/src/main/res/drawable-v21/background.png b/android/app/src/main/res/drawable-v21/background.png
index 3107d37..8278aeb 100644
Binary files a/android/app/src/main/res/drawable-v21/background.png and b/android/app/src/main/res/drawable-v21/background.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/android12splash.png b/android/app/src/main/res/drawable-xhdpi/android12splash.png
index 1a318c4..bc1eb02 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/android12splash.png and b/android/app/src/main/res/drawable-xhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/splash.png b/android/app/src/main/res/drawable-xhdpi/splash.png
index 1a318c4..bc1eb02 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/splash.png and b/android/app/src/main/res/drawable-xhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/android12splash.png b/android/app/src/main/res/drawable-xxhdpi/android12splash.png
index 757ba67..fdecce3 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/android12splash.png and b/android/app/src/main/res/drawable-xxhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/splash.png b/android/app/src/main/res/drawable-xxhdpi/splash.png
index 757ba67..fdecce3 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/splash.png and b/android/app/src/main/res/drawable-xxhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/android12splash.png b/android/app/src/main/res/drawable-xxxhdpi/android12splash.png
index 2b2fbca..5194e23 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/android12splash.png and b/android/app/src/main/res/drawable-xxxhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/splash.png b/android/app/src/main/res/drawable-xxxhdpi/splash.png
index 2b2fbca..5194e23 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/splash.png and b/android/app/src/main/res/drawable-xxxhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable/background.png b/android/app/src/main/res/drawable/background.png
index 3107d37..8278aeb 100644
Binary files a/android/app/src/main/res/drawable/background.png and b/android/app/src/main/res/drawable/background.png differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index db77bb4..0000000
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 17987b7..0000000
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index 09d4391..0000000
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index d5f1c8d..0000000
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 4d6372e..0000000
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/android/app/src/main/res/values-v31/styles.xml b/android/app/src/main/res/values-v31/styles.xml
index d2dfe4f..c9f50a5 100644
--- a/android/app/src/main/res/values-v31/styles.xml
+++ b/android/app/src/main/res/values-v31/styles.xml
@@ -6,7 +6,7 @@
         <item name="android:windowFullscreen">true</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
-        <item name="android:windowSplashScreenBackground">#FFFFFF</item>
+        <item name="android:windowSplashScreenBackground">#F2F2F2</item>
         <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
diff --git a/android/app/src/productionDebug/ic_launcher-playstore.png b/android/app/src/productionDebug/ic_launcher-playstore.png
index ebd11d4..a1200f4 100644
Binary files a/android/app/src/productionDebug/ic_launcher-playstore.png and b/android/app/src/productionDebug/ic_launcher-playstore.png differ
diff --git a/android/app/src/productionDebug/res/mipmap-hdpi/ic_launcher.png b/android/app/src/productionDebug/res/mipmap-hdpi/ic_launcher.png
index 7ba93f3..74befdd 100644
Binary files a/android/app/src/productionDebug/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/productionDebug/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/app/src/productionDebug/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/productionDebug/res/mipmap-hdpi/ic_launcher_foreground.png
index 364f8df..85c9ec2 100644
Binary files a/android/app/src/productionDebug/res/mipmap-hdpi/ic_launcher_foreground.png and b/android/app/src/productionDebug/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/productionDebug/res/mipmap-mdpi/ic_launcher.png b/android/app/src/productionDebug/res/mipmap-mdpi/ic_launcher.png
index a7bd285..b420e69 100644
Binary files a/android/app/src/productionDebug/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/productionDebug/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/app/src/productionDebug/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/productionDebug/res/mipmap-mdpi/ic_launcher_foreground.png
index 32ebff1..9b730c1 100644
Binary files a/android/app/src/productionDebug/res/mipmap-mdpi/ic_launcher_foreground.png and b/android/app/src/productionDebug/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/productionDebug/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/productionDebug/res/mipmap-xhdpi/ic_launcher.png
index 4124a7c..5062774 100644
Binary files a/android/app/src/productionDebug/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/productionDebug/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/app/src/productionDebug/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/productionDebug/res/mipmap-xhdpi/ic_launcher_foreground.png
index f9e8809..8aa5b60 100644
Binary files a/android/app/src/productionDebug/res/mipmap-xhdpi/ic_launcher_foreground.png and b/android/app/src/productionDebug/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/productionDebug/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/productionDebug/res/mipmap-xxhdpi/ic_launcher.png
index 670319a..47ac32f 100644
Binary files a/android/app/src/productionDebug/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/productionDebug/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/productionDebug/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/productionDebug/res/mipmap-xxhdpi/ic_launcher_foreground.png
index 65bb9b6..83af603 100644
Binary files a/android/app/src/productionDebug/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/android/app/src/productionDebug/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/productionDebug/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/productionDebug/res/mipmap-xxxhdpi/ic_launcher.png
index 1d23a08..4c1c6b2 100644
Binary files a/android/app/src/productionDebug/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/productionDebug/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/app/src/productionDebug/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/productionDebug/res/mipmap-xxxhdpi/ic_launcher_foreground.png
index 3c35468..78f2076 100644
Binary files a/android/app/src/productionDebug/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/android/app/src/productionDebug/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/productionDebug/res/values/colors.xml b/android/app/src/productionDebug/res/values/colors.xml
index d81c478..696fb27 100644
--- a/android/app/src/productionDebug/res/values/colors.xml
+++ b/android/app/src/productionDebug/res/values/colors.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <color name="ic_launcher_background">#FF121618</color>
+  <color name="ic_launcher_background">#FFF2F2F2</color>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/productionRelease/ic_launcher-playstore.png b/android/app/src/productionRelease/ic_launcher-playstore.png
index 3759e7a..a06c430 100644
Binary files a/android/app/src/productionRelease/ic_launcher-playstore.png and b/android/app/src/productionRelease/ic_launcher-playstore.png differ
diff --git a/android/app/src/productionRelease/res/mipmap-hdpi/ic_launcher.png b/android/app/src/productionRelease/res/mipmap-hdpi/ic_launcher.png
index 475d8ad..f1fc9b2 100644
Binary files a/android/app/src/productionRelease/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/productionRelease/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/app/src/productionRelease/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/productionRelease/res/mipmap-hdpi/ic_launcher_foreground.png
index ea220a5..7e269b8 100644
Binary files a/android/app/src/productionRelease/res/mipmap-hdpi/ic_launcher_foreground.png and b/android/app/src/productionRelease/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/productionRelease/res/mipmap-mdpi/ic_launcher.png b/android/app/src/productionRelease/res/mipmap-mdpi/ic_launcher.png
index 88c419f..925dacc 100644
Binary files a/android/app/src/productionRelease/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/productionRelease/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/app/src/productionRelease/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/productionRelease/res/mipmap-mdpi/ic_launcher_foreground.png
index f0e9213..86a3784 100644
Binary files a/android/app/src/productionRelease/res/mipmap-mdpi/ic_launcher_foreground.png and b/android/app/src/productionRelease/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/productionRelease/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/productionRelease/res/mipmap-xhdpi/ic_launcher.png
index c9b353c..9cf4b7c 100644
Binary files a/android/app/src/productionRelease/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/productionRelease/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/app/src/productionRelease/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/productionRelease/res/mipmap-xhdpi/ic_launcher_foreground.png
index b41cbd5..84bcaa7 100644
Binary files a/android/app/src/productionRelease/res/mipmap-xhdpi/ic_launcher_foreground.png and b/android/app/src/productionRelease/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/productionRelease/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/productionRelease/res/mipmap-xxhdpi/ic_launcher.png
index 1f905ad..f17e33e 100644
Binary files a/android/app/src/productionRelease/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/productionRelease/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/productionRelease/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/productionRelease/res/mipmap-xxhdpi/ic_launcher_foreground.png
index bd4330e..44eb082 100644
Binary files a/android/app/src/productionRelease/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/android/app/src/productionRelease/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/productionRelease/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/productionRelease/res/mipmap-xxxhdpi/ic_launcher.png
index 815af8f..42b7747 100644
Binary files a/android/app/src/productionRelease/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/productionRelease/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/app/src/productionRelease/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/productionRelease/res/mipmap-xxxhdpi/ic_launcher_foreground.png
index 6f8178e..df0cbf4 100644
Binary files a/android/app/src/productionRelease/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/android/app/src/productionRelease/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/productionRelease/res/values/colors.xml b/android/app/src/productionRelease/res/values/colors.xml
index d81c478..696fb27 100644
--- a/android/app/src/productionRelease/res/values/colors.xml
+++ b/android/app/src/productionRelease/res/values/colors.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <color name="ic_launcher_background">#FF121618</color>
+  <color name="ic_launcher_background">#FFF2F2F2</color>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/stagingDebug/ic_launcher-playstore.png b/android/app/src/stagingDebug/ic_launcher-playstore.png
index 070cc20..d39896c 100644
Binary files a/android/app/src/stagingDebug/ic_launcher-playstore.png and b/android/app/src/stagingDebug/ic_launcher-playstore.png differ
diff --git a/android/app/src/stagingDebug/res/mipmap-hdpi/ic_launcher.png b/android/app/src/stagingDebug/res/mipmap-hdpi/ic_launcher.png
index c0f313d..ad52079 100644
Binary files a/android/app/src/stagingDebug/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/stagingDebug/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/app/src/stagingDebug/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/stagingDebug/res/mipmap-hdpi/ic_launcher_foreground.png
index c270a66..6cf900d 100644
Binary files a/android/app/src/stagingDebug/res/mipmap-hdpi/ic_launcher_foreground.png and b/android/app/src/stagingDebug/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/stagingDebug/res/mipmap-mdpi/ic_launcher.png b/android/app/src/stagingDebug/res/mipmap-mdpi/ic_launcher.png
index 0f7a43f..a9fb752 100644
Binary files a/android/app/src/stagingDebug/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/stagingDebug/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/app/src/stagingDebug/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/stagingDebug/res/mipmap-mdpi/ic_launcher_foreground.png
index fe1d284..637a26a 100644
Binary files a/android/app/src/stagingDebug/res/mipmap-mdpi/ic_launcher_foreground.png and b/android/app/src/stagingDebug/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/stagingDebug/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/stagingDebug/res/mipmap-xhdpi/ic_launcher.png
index 2e7036b..72f0fee 100644
Binary files a/android/app/src/stagingDebug/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/stagingDebug/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/app/src/stagingDebug/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/stagingDebug/res/mipmap-xhdpi/ic_launcher_foreground.png
index 1dd39ea..228fdaa 100644
Binary files a/android/app/src/stagingDebug/res/mipmap-xhdpi/ic_launcher_foreground.png and b/android/app/src/stagingDebug/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/stagingDebug/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/stagingDebug/res/mipmap-xxhdpi/ic_launcher.png
index 3b70790..6f1922c 100644
Binary files a/android/app/src/stagingDebug/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/stagingDebug/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/stagingDebug/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/stagingDebug/res/mipmap-xxhdpi/ic_launcher_foreground.png
index ca0398a..16a4a62 100644
Binary files a/android/app/src/stagingDebug/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/android/app/src/stagingDebug/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/stagingDebug/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/stagingDebug/res/mipmap-xxxhdpi/ic_launcher.png
index a2d23b2..9c1d0ba 100644
Binary files a/android/app/src/stagingDebug/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/stagingDebug/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/app/src/stagingDebug/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/stagingDebug/res/mipmap-xxxhdpi/ic_launcher_foreground.png
index f257a2c..fe1af34 100644
Binary files a/android/app/src/stagingDebug/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/android/app/src/stagingDebug/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/stagingDebug/res/values/colors.xml b/android/app/src/stagingDebug/res/values/colors.xml
index d81c478..696fb27 100644
--- a/android/app/src/stagingDebug/res/values/colors.xml
+++ b/android/app/src/stagingDebug/res/values/colors.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <color name="ic_launcher_background">#FF121618</color>
+  <color name="ic_launcher_background">#FFF2F2F2</color>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/stagingRelease/ic_launcher-playstore.png b/android/app/src/stagingRelease/ic_launcher-playstore.png
index 2f9517c..b65a4ab 100644
Binary files a/android/app/src/stagingRelease/ic_launcher-playstore.png and b/android/app/src/stagingRelease/ic_launcher-playstore.png differ
diff --git a/android/app/src/stagingRelease/res/mipmap-hdpi/ic_launcher.png b/android/app/src/stagingRelease/res/mipmap-hdpi/ic_launcher.png
index e6c6805..7f7dd44 100644
Binary files a/android/app/src/stagingRelease/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/stagingRelease/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/app/src/stagingRelease/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/stagingRelease/res/mipmap-hdpi/ic_launcher_foreground.png
index 305a04c..13f2f39 100644
Binary files a/android/app/src/stagingRelease/res/mipmap-hdpi/ic_launcher_foreground.png and b/android/app/src/stagingRelease/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/stagingRelease/res/mipmap-mdpi/ic_launcher.png b/android/app/src/stagingRelease/res/mipmap-mdpi/ic_launcher.png
index a9ddf14..7962de9 100644
Binary files a/android/app/src/stagingRelease/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/stagingRelease/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/app/src/stagingRelease/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/stagingRelease/res/mipmap-mdpi/ic_launcher_foreground.png
index 5f99a2e..826ff75 100644
Binary files a/android/app/src/stagingRelease/res/mipmap-mdpi/ic_launcher_foreground.png and b/android/app/src/stagingRelease/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/stagingRelease/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/stagingRelease/res/mipmap-xhdpi/ic_launcher.png
index 5865de5..3e7a9a4 100644
Binary files a/android/app/src/stagingRelease/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/stagingRelease/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/app/src/stagingRelease/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/stagingRelease/res/mipmap-xhdpi/ic_launcher_foreground.png
index bc7293f..fadb979 100644
Binary files a/android/app/src/stagingRelease/res/mipmap-xhdpi/ic_launcher_foreground.png and b/android/app/src/stagingRelease/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/stagingRelease/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/stagingRelease/res/mipmap-xxhdpi/ic_launcher.png
index a329311..70ba8e5 100644
Binary files a/android/app/src/stagingRelease/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/stagingRelease/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/stagingRelease/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/stagingRelease/res/mipmap-xxhdpi/ic_launcher_foreground.png
index b62fd05..b63ec2d 100644
Binary files a/android/app/src/stagingRelease/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/android/app/src/stagingRelease/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/stagingRelease/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/stagingRelease/res/mipmap-xxxhdpi/ic_launcher.png
index 28ead6c..ec2f97a 100644
Binary files a/android/app/src/stagingRelease/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/stagingRelease/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/app/src/stagingRelease/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/stagingRelease/res/mipmap-xxxhdpi/ic_launcher_foreground.png
index acd4744..cb989df 100644
Binary files a/android/app/src/stagingRelease/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/android/app/src/stagingRelease/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/stagingRelease/res/values/colors.xml b/android/app/src/stagingRelease/res/values/colors.xml
index d81c478..696fb27 100644
--- a/android/app/src/stagingRelease/res/values/colors.xml
+++ b/android/app/src/stagingRelease/res/values/colors.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <color name="ic_launcher_background">#FF121618</color>
+  <color name="ic_launcher_background">#FFF2F2F2</color>
 </resources>
\ No newline at end of file
diff --git a/android/gradle.properties b/android/gradle.properties
index 6f5762f..1ac6f5e 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx2048M
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
 android.defaults.buildfeatures.buildconfig=true
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index c619e22..e6045a9 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
diff --git a/android/settings.gradle b/android/settings.gradle
index 38378bc..0ef5b6d 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -5,10 +5,9 @@ pluginManagement {
         def flutterSdkPath = properties.getProperty("flutter.sdk")
         assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
         return flutterSdkPath
-    }
-    settings.ext.flutterSdkPath = flutterSdkPath()
+    }()
 
-    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
     repositories {
         google()
@@ -19,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.1.4" apply false
-    id "org.jetbrains.kotlin.android" version "2.0.0" apply false
+    id "com.android.application" version "8.6.1" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.20" apply false
 
     // START: FlutterFire Configuration
     id "com.google.gms.google-services" version "4.4.2" apply false
diff --git a/assets/localization/app_en.arb b/assets/localization/app_en.arb
index 3e77c75..06af479 100644
--- a/assets/localization/app_en.arb
+++ b/assets/localization/app_en.arb
@@ -1,5 +1,14 @@
 {
-  "@_Custom_Exception": {},
+  "@@x---GENERAL": 0,
+  "appName": "Flutter Template",
+  "generalEmptyStateTitle": "Sorry, nothing is here right now",
+  "generalEmptyStateBody": "Please, try to come back later...",
+  "generalEmptyStateRetryButton": "Retry",
+  "generalErrorStateRetryButton": "Retry",
+  "generalDateToday": "Today",
+  "generalDateTomorrow": "Tomorrow",
+
+  "@@x---CUSTOM_EXCEPTION": 0,
   "customExceptionGeneralMessage": "Sorry! Something went wrong",
   "customExceptionGeneralDetails": "Please, try again later.",
   "customExceptionUnauthenticatedMessage": "You are not authorized to view this page",
@@ -9,30 +18,27 @@
   "customExceptionPageNotFoundMessage": "404 Page not found",
   "customExceptionPageNotFoundDetails": "Please, check if provided url is correct.",
   
-  "@_Validator_Exception": {},
+  "@@x---VALIDATOR_EXCEPTION": 0,
   "validatorExceptionFullNameIsEmpty": "Full name is required",
   "validatorExceptionFullNameTooShort": "Name must have at least 3 characters",
   "validatorExceptionFullNameTooLong": "Max. number of 28 characters reached",
   "validatorExceptionFullNameIsInvalid": "Invalid name",
-  
-  "@_Force_Update": {},
+
+  "@@x---PERMISSIONS_HANDLING": 0,
+  "notificationsPermissionDeniedDialogTitle": "Notification Permission",
+  "notificationsPermissionDeniedDialogText": "Notifications help you stay updated with important information and timely alerts from the app.",
+  "notificationsPermissionDeniedDialogPositiveAction": "Grant Access",
+  "notificationsPermissionDeniedDialogNeutralAction": "Cancel",
+
+  "@@x---FORCE_UPDATE": 0,
   "forceUpdateTitle": "We are better than ever!",
   "forceUpdateDescription": "There is an really important update for you! Please update the app to continue.",
   "forceUpdateButton": "Update",
-
-  "@_General": {},
-  "appName": "Flutter Template",
-  "generalEmptyStateTitle": "Sorry, nothing is here right now",
-  "generalEmptyStateBody": "Please, try to come back later...",
-  "generalEmptyStateRetryButton": "Retry",
-  "generalErrorStateRetryButton": "Retry",
-  "generalDateToday": "Today",
-  "generalDateTomorrow": "Tomorrow",
   
-  "@_Home": {},
+  "@@x---HOME": 0,
   "featureHomepageTitle": "Flutter Template",
   "featureHomepageOpenDebugTools": "Open debug tools",
   
-  "@_Debug_Tools": {},
+  "@@x---DEBUG_TOOLS": 0,
   "featureDebugToolsUserDetailPageTitle": "Detail page"
 }
diff --git a/build.yaml b/build.yaml
index 26cf9f7..763d999 100644
--- a/build.yaml
+++ b/build.yaml
@@ -7,15 +7,12 @@ targets:
         generate_for:
           - lib/common/data/dto/*_dto.dart
           - lib/common/data/dto/**/*_dto.dart
-          - lib/common/data/dto/**/**/*_dto.dart
 
           - lib/common/data/enum/*.dart
           - lib/common/data/enum/**/*.dart
-          - lib/common/data/enum/**/**/*.dart
 
-          - lib/common/data/model/*.dart
-          - lib/common/data/model/**/*.dart
-          - lib/common/data/model/**/**/*.dart
+          - lib/common/data/entity/*.dart
+          - lib/common/data/entity/**/*.dart
 
           - lib/common/validator/*.dart
 
@@ -24,11 +21,9 @@ targets:
           
           - lib/features/*_event.dart
           - lib/features/**/*_event.dart
-          - lib/features/**/**/*_event.dart
           
           - lib/features/*_state.dart
           - lib/features/**/*_state.dart
-          - lib/features/**/**/*_state.dart
 
 
       # Title: Riverpod
@@ -39,11 +34,9 @@ targets:
 
           - lib/common/provider/*.dart
           - lib/common/provider/**/*.dart
-          - lib/common/provider/**/**/*.dart
 
           - lib/common/usecase/*.dart
           - lib/common/usecase/**/*.dart
-          - lib/common/usecase/**/**/*.dart
 
           - lib/core/analytics/analytics_manager.dart
           - lib/core/analytics/analytics_route_observer.dart
@@ -53,7 +46,6 @@ targets:
           
           - lib/features/*_state.dart
           - lib/features/**/*_state.dart
-          - lib/features/**/**/*_state.dart
 
 
       # Title: Json Serializable
@@ -62,15 +54,12 @@ targets:
         generate_for:
           - lib/common/data/dto/*_dto.dart
           - lib/common/data/dto/**/*_dto.dart
-          - lib/common/data/dto/**/**/*_dto.dart
 
           - lib/common/data/enum/*.dart
           - lib/common/data/enum/**/*.dart
-          - lib/common/data/enum/**/**/*.dart
 
-          - lib/common/data/model/*.dart
-          - lib/common/data/model/**/*.dart
-          - lib/common/data/model/**/**/*.dart
+          - lib/common/data/entity/*.dart
+          - lib/common/data/entity/**/*.dart
 
 
       # Title: Auto Route
diff --git a/docs/flutter_template.jpg b/docs/flutter_template.jpg
new file mode 100644
index 0000000..c37d261
Binary files /dev/null and b/docs/flutter_template.jpg differ
diff --git a/flutter.code-workspace b/flutter.code-workspace
index 4f45a36..9d1622e 100644
--- a/flutter.code-workspace
+++ b/flutter.code-workspace
@@ -11,177 +11,22 @@
     {
       "name": "Flutter",
       "path": "./lib"
-    },
+    }
   ],
-  "launch": {
-    "version": "0.2.0",
-    "configurations": [
-      {
-        "name": "Develop - Debug",
-        "request": "launch",
-        "type": "dart",
-        "program": "lib/main_develop.dart",
-        "args": [
-          "--web-browser-flag",
-          "--user-data-dir=./.chrome_data_dir",
-          "--web-port",
-          "5000",
-          "--flavor",
-          "develop",
-        ]
-      },
-      {
-        "name": "Develop - Profile",
-        "request": "launch",
-        "type": "dart",
-        "program": "lib/main_develop.dart",
-        "flutterMode": "profile",
-        "args": [
-          "--web-browser-flag",
-          "--user-data-dir=./.chrome_data_dir",
-          "--web-port",
-          "5000",
-          "--flavor",
-          "develop",
-        ]
-      },
-      {
-        "name": "Develop - Release",
-        "request": "launch",
-        "type": "dart",
-        "program": "lib/main_develop.dart",
-        "flutterMode": "release",
-        "args": [
-          "--web-browser-flag",
-          "--user-data-dir=./.chrome_data_dir",
-          "--web-port",
-          "5000",
-          "--flavor",
-          "develop",
-        ]
-      },
-      {
-        "name": "Staging - Debug",
-        "request": "launch",
-        "type": "dart",
-        "program": "lib/main_staging.dart",
-        "args": [
-          "--web-browser-flag",
-          "--user-data-dir=./.chrome_data_dir",
-          "--web-port",
-          "5000",
-          "--flavor",
-          "staging",
-        ]
-      },
-      {
-        "name": "Staging - Profile",
-        "request": "launch",
-        "type": "dart",
-        "program": "lib/main_staging.dart",
-        "flutterMode": "profile",
-        "args": [
-          "--web-browser-flag",
-          "--user-data-dir=./.chrome_data_dir",
-          "--web-port",
-          "5000",
-          "--flavor",
-          "staging",
-        ]
-      },
-      {
-        "name": "Staging - Release",
-        "request": "launch",
-        "type": "dart",
-        "program": "lib/main_staging.dart",
-        "flutterMode": "release",
-        "args": [
-          "--web-browser-flag",
-          "--user-data-dir=./.chrome_data_dir",
-          "--web-port",
-          "5000",
-          "--flavor",
-          "staging",
-        ]
-      },
-      {
-        "name": "Production - Debug",
-        "request": "launch",
-        "type": "dart",
-        "program": "lib/main_production.dart",
-        "args": [
-          "--web-browser-flag",
-          "--user-data-dir=./.chrome_data_dir",
-          "--web-port",
-          "5000",
-          "--flavor",
-          "production",
-        ]
-      },
-      {
-        "name": "Production - Profile",
-        "request": "launch",
-        "type": "dart",
-        "program": "lib/main_production.dart",
-        "flutterMode": "profile",
-        "args": [
-          "--web-browser-flag",
-          "--user-data-dir=./.chrome_data_dir",
-          "--web-port",
-          "5000",
-          "--flavor",
-          "production",
-        ]
-      },
-      {
-        "name": "Production - Release",
-        "request": "launch",
-        "type": "dart",
-        "program": "lib/main_production.dart",
-        "flutterMode": "release",
-        "args": [
-          "--web-browser-flag",
-          "--user-data-dir=./.chrome_data_dir",
-          "--web-port",
-          "5000",
-          "--flavor",
-          "production",
-        ]
-      },
-    ]
-  },
   "extensions": {
     "recommendations": [
       "Dart-Code.dart-code",
       "Dart-Code.flutter",
       "SimonSiefke.svg-preview",
-      "Nash.awesome-flutter-snippets",
       "wayou.vscode-todo-highlight",
       "hzgood.dart-data-class-generator",
       "pkief.material-icon-theme",
-      "yuanhjty.code-template-tool"
+      "yuanhjty.code-template-tool",
+      "orestesgaolin.go-to-pub-dev"
     ]
   },
   "settings": {
-    "codeTemplateTool.templatesPath": "{workspace}/.templates",
-    // DART formatting settings
-    "[dart]": {
-      "editor.formatOnSave": true,
-      "editor.formatOnType": true,
-      "editor.rulers": [
-        140
-      ],
-      "editor.selectionHighlight": false,
-      "editor.suggest.snippetsPreventQuickSuggestions": false,
-      "editor.suggestSelection": "first",
-      "editor.tabCompletion": "onlySnippets",
-      "editor.wordBasedSuggestions": "off",
-      "editor.codeActionsOnSave": {
-        "source.fixAll": "explicit",
-        "source.organizeImports": "explicit"
-      },
-    },
-    "editor.formatOnSave": true,
+    "editor.formatOnSave": false,
     "editor.wordWrapColumn": 140,
     "explorer.fileNesting.enabled": true,
     "explorer.fileNesting.expand": false,
@@ -190,7 +35,8 @@
       "pubspec.yaml": "analysis_options.yaml, build.yaml, devtools_options.yaml",
       ".gitignore": ".gitattributes",
       "firebase.json": ".firebaserc",
-      "README.md": "LICENSE",
+      "*.graphql": "${capture}.graphql.dart",
+      "README.md": "LICENSE"
     },
     "dart.lineLength": 140,
     "dart.debugSdkLibraries": false,
@@ -199,6 +45,34 @@
     "dart.previewFlutterUiGuidesCustomTracking": true,
     "dart.previewFlutterUiGuides": true,
     "dart.flutterSdkPath": ".fvm/flutter_sdk",
+    // DART formatting
+    "[dart]": {
+      "editor.formatOnSave": true,
+      "editor.formatOnType": true,
+      "editor.rulers": [140],
+      "editor.selectionHighlight": false,
+      "editor.suggest.snippetsPreventQuickSuggestions": false,
+      "editor.suggestSelection": "first",
+      "editor.tabCompletion": "onlySnippets",
+      "editor.wordBasedSuggestions": "off",
+      "editor.codeActionsOnSave": {
+        "source.fixAll": "explicit",
+        "source.organizeImports": "explicit"
+      }
+    },
+    // GRAPHQL formatting
+    "[graphql]": {
+      "editor.insertSpaces": true,
+      "editor.indentSize": 4,
+      "editor.tabSize": 4,
+      "editor.detectIndentation": false,
+      "editor.autoIndent": "advanced",
+      "editor.formatOnSave": true,
+      "editor.formatOnType": true,
+      "editor.defaultFormatter": "esbenp.prettier-vscode",
+      "prettier.useTabs": false,
+      "prettier.tabWidth": 4
+    },
     // Other settings
     "files.exclude": {
       "**/*.lock": true,
@@ -279,7 +153,7 @@
       "android/**/*.keystore": false,
       "android/**/*.jks": true
     },
-    // Material Icons theme
+    // [material-icon-theme] Material Icons theme
     "material-icon-theme.folders.associations": {
       ".templates": "template",
       "integration_test": "test",
@@ -304,52 +178,67 @@
       "section": "components",
       "dbo": "database",
       "dto": "api",
+      "entity": "enum",
       "exception": "error",
       "analytics": "tasks",
       "network": "connection",
       "riverpod": "stack",
-      "debug_tools": "debug",
+      "debug_tools": "debug"
     },
-    // ToDo Highlight color settings
+    // [codeTemplateTool] Settings
+    "codeTemplateTool.templatesPath": "{workspace}/.templates",
+    // [todohighlight] color settings
     "todohighlight.isEnable": true,
     "todohighlight.isCaseSensitive": true,
     "todohighlight.keywords": [
       {
-        "text": " TODO: ",
+        "text": " TODO(",
         "color": "#a8c023",
         "isWholeLine": true,
-        "backgroundColor": "rgba(0,0,0,0)",
+        "backgroundColor": "rgba(0,0,0,0)"
       },
       {
         "text": " FIXME: ",
         "color": "#f06292",
         "isWholeLine": true,
-        "backgroundColor": "rgba(0,0,0,0)",
+        "backgroundColor": "rgba(0,0,0,0)"
       },
       {
         "text": " Note: ",
         "color": "#05AAAE",
         "isWholeLine": true,
-        "backgroundColor": "rgba(0,0,0,0)",
+        "backgroundColor": "rgba(0,0,0,0)"
       },
       {
         "text": " Warning: ",
         "color": "#F27200",
         "isWholeLine": true,
-        "backgroundColor": "rgba(0,0,0,0)",
+        "backgroundColor": "rgba(0,0,0,0)"
       },
       {
         "text": " Title: ",
         "color": "#FF1200",
         "isWholeLine": true,
-        "backgroundColor": "rgba(0,0,0,0)",
+        "backgroundColor": "rgba(0,0,0,0)"
+      },
+      {
+        "text": "@@x---",
+        "color": "#FF1200",
+        "isWholeLine": true,
+        "backgroundColor": "rgba(0,0,0,0)"
       },
       {
         "text": " Subtitle: ",
         "color": "#BE0011",
         "isWholeLine": true,
-        "backgroundColor": "rgba(0,0,0,0)",
+        "backgroundColor": "rgba(0,0,0,0)"
       }
     ],
-  },
-}
\ No newline at end of file
+    "cSpell.words": [
+      "Buildless",
+      "Refreshable",
+      "Riverpod",
+      "usecase"
+    ]
+  }
+}
diff --git a/ios/.gitignore b/ios/.gitignore
index 95a108c..7a7f987 100644
--- a/ios/.gitignore
+++ b/ios/.gitignore
@@ -26,7 +26,6 @@ Flutter/flutter_assets/
 Flutter/flutter_export_environment.sh
 ServiceDefinitions.json
 Runner/GeneratedPluginRegistrant.*
-Podfile.lock
 
 # Exceptions to above rules.
 !default.mode1v3
diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
index 7c56964..0d14080 100644
--- a/ios/Flutter/AppFrameworkInfo.plist
+++ b/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>12.0</string>
+  <string>15.0</string>
 </dict>
 </plist>
diff --git a/ios/Podfile b/ios/Podfile
index 10f3c9b..6b7de04 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '13.0'
+platform :ios, '15.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -37,5 +37,13 @@ end
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     flutter_additional_ios_build_settings(target)
+
+    target.build_configurations.each do |config|
+      config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
+        '$(inherited)',
+
+        'PERMISSION_NOTIFICATIONS=1',
+      ]
+    end
   end
 end
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
new file mode 100644
index 0000000..c79e839
--- /dev/null
+++ b/ios/Podfile.lock
@@ -0,0 +1,401 @@
+PODS:
+  - app_settings (5.1.1):
+    - Flutter
+  - AppAuth (2.0.0):
+    - AppAuth/Core (= 2.0.0)
+    - AppAuth/ExternalUserAgent (= 2.0.0)
+  - AppAuth/Core (2.0.0)
+  - AppAuth/ExternalUserAgent (2.0.0):
+    - AppAuth/Core
+  - AppCheckCore (11.2.0):
+    - GoogleUtilities/Environment (~> 8.0)
+    - GoogleUtilities/UserDefaults (~> 8.0)
+    - PromisesObjC (~> 2.4)
+  - CocoaAsyncSocket (7.6.5)
+  - device_info_plus (0.0.1):
+    - Flutter
+  - Firebase/Auth (12.2.0):
+    - Firebase/CoreOnly
+    - FirebaseAuth (~> 12.2.0)
+  - Firebase/CoreOnly (12.2.0):
+    - FirebaseCore (~> 12.2.0)
+  - Firebase/Crashlytics (12.2.0):
+    - Firebase/CoreOnly
+    - FirebaseCrashlytics (~> 12.2.0)
+  - Firebase/Messaging (12.2.0):
+    - Firebase/CoreOnly
+    - FirebaseMessaging (~> 12.2.0)
+  - Firebase/RemoteConfig (12.2.0):
+    - Firebase/CoreOnly
+    - FirebaseRemoteConfig (~> 12.2.0)
+  - firebase_analytics (12.0.2):
+    - firebase_core
+    - FirebaseAnalytics (= 12.2.0)
+    - Flutter
+  - firebase_auth (6.1.0):
+    - Firebase/Auth (= 12.2.0)
+    - firebase_core
+    - Flutter
+  - firebase_core (4.1.1):
+    - Firebase/CoreOnly (= 12.2.0)
+    - Flutter
+  - firebase_crashlytics (5.0.2):
+    - Firebase/Crashlytics (= 12.2.0)
+    - firebase_core
+    - Flutter
+  - firebase_messaging (16.0.2):
+    - Firebase/Messaging (= 12.2.0)
+    - firebase_core
+    - Flutter
+  - firebase_remote_config (6.0.2):
+    - Firebase/RemoteConfig (= 12.2.0)
+    - firebase_core
+    - Flutter
+  - FirebaseABTesting (12.2.0):
+    - FirebaseCore (~> 12.2.0)
+  - FirebaseAnalytics (12.2.0):
+    - FirebaseAnalytics/Default (= 12.2.0)
+    - FirebaseCore (~> 12.2.0)
+    - FirebaseInstallations (~> 12.2.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+    - GoogleUtilities/MethodSwizzler (~> 8.1)
+    - GoogleUtilities/Network (~> 8.1)
+    - "GoogleUtilities/NSData+zlib (~> 8.1)"
+    - nanopb (~> 3.30910.0)
+  - FirebaseAnalytics/Default (12.2.0):
+    - FirebaseCore (~> 12.2.0)
+    - FirebaseInstallations (~> 12.2.0)
+    - GoogleAppMeasurement/Default (= 12.2.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+    - GoogleUtilities/MethodSwizzler (~> 8.1)
+    - GoogleUtilities/Network (~> 8.1)
+    - "GoogleUtilities/NSData+zlib (~> 8.1)"
+    - nanopb (~> 3.30910.0)
+  - FirebaseAppCheckInterop (12.2.0)
+  - FirebaseAuth (12.2.0):
+    - FirebaseAppCheckInterop (~> 12.2.0)
+    - FirebaseAuthInterop (~> 12.2.0)
+    - FirebaseCore (~> 12.2.0)
+    - FirebaseCoreExtension (~> 12.2.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+    - GoogleUtilities/Environment (~> 8.1)
+    - GTMSessionFetcher/Core (< 6.0, >= 3.4)
+    - RecaptchaInterop (~> 101.0)
+  - FirebaseAuthInterop (12.2.0)
+  - FirebaseCore (12.2.0):
+    - FirebaseCoreInternal (~> 12.2.0)
+    - GoogleUtilities/Environment (~> 8.1)
+    - GoogleUtilities/Logger (~> 8.1)
+  - FirebaseCoreExtension (12.2.0):
+    - FirebaseCore (~> 12.2.0)
+  - FirebaseCoreInternal (12.2.0):
+    - "GoogleUtilities/NSData+zlib (~> 8.1)"
+  - FirebaseCrashlytics (12.2.0):
+    - FirebaseCore (~> 12.2.0)
+    - FirebaseInstallations (~> 12.2.0)
+    - FirebaseRemoteConfigInterop (~> 12.2.0)
+    - FirebaseSessions (~> 12.2.0)
+    - GoogleDataTransport (~> 10.1)
+    - GoogleUtilities/Environment (~> 8.1)
+    - nanopb (~> 3.30910.0)
+    - PromisesObjC (~> 2.4)
+  - FirebaseInstallations (12.2.0):
+    - FirebaseCore (~> 12.2.0)
+    - GoogleUtilities/Environment (~> 8.1)
+    - GoogleUtilities/UserDefaults (~> 8.1)
+    - PromisesObjC (~> 2.4)
+  - FirebaseMessaging (12.2.0):
+    - FirebaseCore (~> 12.2.0)
+    - FirebaseInstallations (~> 12.2.0)
+    - GoogleDataTransport (~> 10.1)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+    - GoogleUtilities/Environment (~> 8.1)
+    - GoogleUtilities/Reachability (~> 8.1)
+    - GoogleUtilities/UserDefaults (~> 8.1)
+    - nanopb (~> 3.30910.0)
+  - FirebaseRemoteConfig (12.2.0):
+    - FirebaseABTesting (~> 12.2.0)
+    - FirebaseCore (~> 12.2.0)
+    - FirebaseInstallations (~> 12.2.0)
+    - FirebaseRemoteConfigInterop (~> 12.2.0)
+    - FirebaseSharedSwift (~> 12.2.0)
+    - GoogleUtilities/Environment (~> 8.1)
+    - "GoogleUtilities/NSData+zlib (~> 8.1)"
+  - FirebaseRemoteConfigInterop (12.2.0)
+  - FirebaseSessions (12.2.0):
+    - FirebaseCore (~> 12.2.0)
+    - FirebaseCoreExtension (~> 12.2.0)
+    - FirebaseInstallations (~> 12.2.0)
+    - GoogleDataTransport (~> 10.1)
+    - GoogleUtilities/Environment (~> 8.1)
+    - GoogleUtilities/UserDefaults (~> 8.1)
+    - nanopb (~> 3.30910.0)
+    - PromisesSwift (~> 2.1)
+  - FirebaseSharedSwift (12.2.0)
+  - Flutter (1.0.0)
+  - flutter_local_notifications (0.0.1):
+    - Flutter
+  - flutter_native_splash (2.4.3):
+    - Flutter
+  - freerasp (1.0.0):
+    - Flutter
+  - google_sign_in_ios (0.0.1):
+    - Flutter
+    - FlutterMacOS
+    - GoogleSignIn (~> 9.0)
+    - GTMSessionFetcher (>= 3.4.0)
+  - GoogleAdsOnDeviceConversion (2.3.0):
+    - GoogleUtilities/Logger (~> 8.1)
+    - GoogleUtilities/Network (~> 8.1)
+    - nanopb (~> 3.30910.0)
+  - GoogleAppMeasurement/Core (12.2.0):
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+    - GoogleUtilities/MethodSwizzler (~> 8.1)
+    - GoogleUtilities/Network (~> 8.1)
+    - "GoogleUtilities/NSData+zlib (~> 8.1)"
+    - nanopb (~> 3.30910.0)
+  - GoogleAppMeasurement/Default (12.2.0):
+    - GoogleAdsOnDeviceConversion (= 2.3.0)
+    - GoogleAppMeasurement/Core (= 12.2.0)
+    - GoogleAppMeasurement/IdentitySupport (= 12.2.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+    - GoogleUtilities/MethodSwizzler (~> 8.1)
+    - GoogleUtilities/Network (~> 8.1)
+    - "GoogleUtilities/NSData+zlib (~> 8.1)"
+    - nanopb (~> 3.30910.0)
+  - GoogleAppMeasurement/IdentitySupport (12.2.0):
+    - GoogleAppMeasurement/Core (= 12.2.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+    - GoogleUtilities/MethodSwizzler (~> 8.1)
+    - GoogleUtilities/Network (~> 8.1)
+    - "GoogleUtilities/NSData+zlib (~> 8.1)"
+    - nanopb (~> 3.30910.0)
+  - GoogleDataTransport (10.1.0):
+    - nanopb (~> 3.30910.0)
+    - PromisesObjC (~> 2.4)
+  - GoogleSignIn (9.0.0):
+    - AppAuth (~> 2.0)
+    - AppCheckCore (~> 11.0)
+    - GTMAppAuth (~> 5.0)
+    - GTMSessionFetcher/Core (~> 3.3)
+  - GoogleUtilities/AppDelegateSwizzler (8.1.0):
+    - GoogleUtilities/Environment
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Network
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Environment (8.1.0):
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Logger (8.1.0):
+    - GoogleUtilities/Environment
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/MethodSwizzler (8.1.0):
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Network (8.1.0):
+    - GoogleUtilities/Logger
+    - "GoogleUtilities/NSData+zlib"
+    - GoogleUtilities/Privacy
+    - GoogleUtilities/Reachability
+  - "GoogleUtilities/NSData+zlib (8.1.0)":
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Privacy (8.1.0)
+  - GoogleUtilities/Reachability (8.1.0):
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/UserDefaults (8.1.0):
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Privacy
+  - GTMAppAuth (5.0.0):
+    - AppAuth/Core (~> 2.0)
+    - GTMSessionFetcher/Core (< 4.0, >= 3.3)
+  - GTMSessionFetcher (3.5.0):
+    - GTMSessionFetcher/Full (= 3.5.0)
+  - GTMSessionFetcher/Core (3.5.0)
+  - GTMSessionFetcher/Full (3.5.0):
+    - GTMSessionFetcher/Core
+  - nanopb (3.30910.0):
+    - nanopb/decode (= 3.30910.0)
+    - nanopb/encode (= 3.30910.0)
+  - nanopb/decode (3.30910.0)
+  - nanopb/encode (3.30910.0)
+  - package_info_plus (0.4.5):
+    - Flutter
+  - path_provider_foundation (0.0.1):
+    - Flutter
+    - FlutterMacOS
+  - patrol (0.0.1):
+    - CocoaAsyncSocket (~> 7.6)
+    - Flutter
+    - FlutterMacOS
+  - permission_handler_apple (9.3.0):
+    - Flutter
+  - PromisesObjC (2.4.0)
+  - PromisesSwift (2.4.0):
+    - PromisesObjC (= 2.4.0)
+  - RecaptchaInterop (101.0.0)
+  - share_plus (0.0.1):
+    - Flutter
+  - shared_preferences_foundation (0.0.1):
+    - Flutter
+    - FlutterMacOS
+  - sign_in_with_apple (0.0.1):
+    - Flutter
+  - url_launcher_ios (0.0.1):
+    - Flutter
+
+DEPENDENCIES:
+  - app_settings (from `.symlinks/plugins/app_settings/ios`)
+  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
+  - firebase_analytics (from `.symlinks/plugins/firebase_analytics/ios`)
+  - firebase_auth (from `.symlinks/plugins/firebase_auth/ios`)
+  - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
+  - firebase_crashlytics (from `.symlinks/plugins/firebase_crashlytics/ios`)
+  - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
+  - firebase_remote_config (from `.symlinks/plugins/firebase_remote_config/ios`)
+  - Flutter (from `Flutter`)
+  - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
+  - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
+  - freerasp (from `.symlinks/plugins/freerasp/ios`)
+  - google_sign_in_ios (from `.symlinks/plugins/google_sign_in_ios/darwin`)
+  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
+  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
+  - patrol (from `.symlinks/plugins/patrol/darwin`)
+  - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
+  - share_plus (from `.symlinks/plugins/share_plus/ios`)
+  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
+  - sign_in_with_apple (from `.symlinks/plugins/sign_in_with_apple/ios`)
+  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
+
+SPEC REPOS:
+  trunk:
+    - AppAuth
+    - AppCheckCore
+    - CocoaAsyncSocket
+    - Firebase
+    - FirebaseABTesting
+    - FirebaseAnalytics
+    - FirebaseAppCheckInterop
+    - FirebaseAuth
+    - FirebaseAuthInterop
+    - FirebaseCore
+    - FirebaseCoreExtension
+    - FirebaseCoreInternal
+    - FirebaseCrashlytics
+    - FirebaseInstallations
+    - FirebaseMessaging
+    - FirebaseRemoteConfig
+    - FirebaseRemoteConfigInterop
+    - FirebaseSessions
+    - FirebaseSharedSwift
+    - GoogleAdsOnDeviceConversion
+    - GoogleAppMeasurement
+    - GoogleDataTransport
+    - GoogleSignIn
+    - GoogleUtilities
+    - GTMAppAuth
+    - GTMSessionFetcher
+    - nanopb
+    - PromisesObjC
+    - PromisesSwift
+    - RecaptchaInterop
+
+EXTERNAL SOURCES:
+  app_settings:
+    :path: ".symlinks/plugins/app_settings/ios"
+  device_info_plus:
+    :path: ".symlinks/plugins/device_info_plus/ios"
+  firebase_analytics:
+    :path: ".symlinks/plugins/firebase_analytics/ios"
+  firebase_auth:
+    :path: ".symlinks/plugins/firebase_auth/ios"
+  firebase_core:
+    :path: ".symlinks/plugins/firebase_core/ios"
+  firebase_crashlytics:
+    :path: ".symlinks/plugins/firebase_crashlytics/ios"
+  firebase_messaging:
+    :path: ".symlinks/plugins/firebase_messaging/ios"
+  firebase_remote_config:
+    :path: ".symlinks/plugins/firebase_remote_config/ios"
+  Flutter:
+    :path: Flutter
+  flutter_local_notifications:
+    :path: ".symlinks/plugins/flutter_local_notifications/ios"
+  flutter_native_splash:
+    :path: ".symlinks/plugins/flutter_native_splash/ios"
+  freerasp:
+    :path: ".symlinks/plugins/freerasp/ios"
+  google_sign_in_ios:
+    :path: ".symlinks/plugins/google_sign_in_ios/darwin"
+  package_info_plus:
+    :path: ".symlinks/plugins/package_info_plus/ios"
+  path_provider_foundation:
+    :path: ".symlinks/plugins/path_provider_foundation/darwin"
+  patrol:
+    :path: ".symlinks/plugins/patrol/darwin"
+  permission_handler_apple:
+    :path: ".symlinks/plugins/permission_handler_apple/ios"
+  share_plus:
+    :path: ".symlinks/plugins/share_plus/ios"
+  shared_preferences_foundation:
+    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
+  sign_in_with_apple:
+    :path: ".symlinks/plugins/sign_in_with_apple/ios"
+  url_launcher_ios:
+    :path: ".symlinks/plugins/url_launcher_ios/ios"
+
+SPEC CHECKSUMS:
+  app_settings: 5127ae0678de1dcc19f2293271c51d37c89428b2
+  AppAuth: 1c1a8afa7e12f2ec3a294d9882dfa5ab7d3cb063
+  AppCheckCore: cc8fd0a3a230ddd401f326489c99990b013f0c4f
+  CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
+  device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
+  Firebase: 26f6f8d460603af3df970ad505b16b15f5e2e9a1
+  firebase_analytics: 8c78ce6224e0623152379d6cc7ef3d9098477b7e
+  firebase_auth: 069b05a861a7c2f7a73112dd616a49a40f35ae52
+  firebase_core: dfc4bd142bee4bc53a5d482397ca322c2dd3165d
+  firebase_crashlytics: e55dcf895eed0dd87c447dd5aff8db7f1bb8bbdb
+  firebase_messaging: 38c66c1184695b0c87abe51d40fc590718abed1a
+  firebase_remote_config: 1e152b6bb31376a4c2fb1b9319ced92bfa1aca57
+  FirebaseABTesting: 32f3fc079d72c9b93e000b60877c4e4f62ef7031
+  FirebaseAnalytics: e04e23bc070e3014aa5cf4980f9df7ce5cd79ec8
+  FirebaseAppCheckInterop: a1b2598c64c5a8c42fd6f6a1c3d0938ae4324678
+  FirebaseAuth: 059c11702bdb759bb49b6c7ec6ff67abf21f39c4
+  FirebaseAuthInterop: 217702acd4cc6baa98ba9d6c054532e0de0b8a16
+  FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd
+  FirebaseCoreExtension: 73af080c22a2f7b44cefa391dc08f7e4ee162cb5
+  FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b
+  FirebaseCrashlytics: f83cbf176d5c637ade108c0aacf1ccbd5ec499bf
+  FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed
+  FirebaseMessaging: 43ec73bbfedd0c385a849bb91593ab4ad4b9e48e
+  FirebaseRemoteConfig: e3ae5500b92e813f3a0b12fa09701a26441dfc95
+  FirebaseRemoteConfigInterop: 0896fd52ab72586a355c8f389ff85aaa9e5375e1
+  FirebaseSessions: f4692789e770bec66ce17d772c0e9561c4f11737
+  FirebaseSharedSwift: 52d868d4c269fcb4e4e1310c548435a9c1f46e25
+  Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
+  flutter_local_notifications: a5a732f069baa862e728d839dd2ebb904737effb
+  flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
+  freerasp: d77275f774facb901f52e9608e5bd34768728363
+  google_sign_in_ios: 205742c688aea0e64db9da03c33121694a365109
+  GoogleAdsOnDeviceConversion: 9090c435cde08903e8dd1ba2c77fbec9e46d9afe
+  GoogleAppMeasurement: 09f341dfa8527d1612a09cbfe809a242c0b737af
+  GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
+  GoogleSignIn: c7f09cfbc85a1abf69187be091997c317cc33b77
+  GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
+  GTMAppAuth: 217a876b249c3c585a54fd6f73e6b58c4f5c4238
+  GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
+  nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
+  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  patrol: 5df5d241d7f95f0df12a6906bbf45acb43a1e537
+  permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
+  PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
+  PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
+  RecaptchaInterop: 11e0b637842dfb48308d242afc3f448062325aba
+  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
+  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+  sign_in_with_apple: c5dcc141574c8c54d5ac99dd2163c0c72ad22418
+  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
+
+PODFILE CHECKSUM: 4b58752610e7b5bbd146b584e63d3c1bd146c7d4
+
+COCOAPODS: 1.16.2
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index b1be846..edd377c 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -172,6 +172,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				BuildIndependentTargetsInParallel = YES;
 				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
@@ -438,6 +439,7 @@
 				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -523,6 +525,7 @@
 				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -606,6 +609,7 @@
 				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -686,6 +690,7 @@
 				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -771,6 +776,7 @@
 				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -854,6 +860,7 @@
 				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -934,6 +941,7 @@
 				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1071,6 +1079,7 @@
 				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1102,6 +1111,7 @@
 				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/develop.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/develop.xcscheme
index 42d5fa8..f1dbece 100644
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/develop.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/develop.xcscheme
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug-develop"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -34,6 +35,7 @@
       buildConfiguration = "Debug-develop"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/production.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/production.xcscheme
index 510487c..8b61820 100644
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/production.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/production.xcscheme
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug-production"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -34,6 +35,7 @@
       buildConfiguration = "Debug-production"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/staging.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/staging.xcscheme
index 1b9a10c..bee9437 100644
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/staging.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/staging.xcscheme
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug-staging"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -34,6 +35,7 @@
       buildConfiguration = "Debug-staging"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png
index 3107d37..8278aeb 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png and b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/darkbackground.png b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/darkbackground.png
index 4bb5d7a..00a4175 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/darkbackground.png and b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/darkbackground.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
index e44e119..791e426 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
index 1a318c4..bc1eb02 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
index 757ba67..fdecce3 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Contents.json
index eabd851..d807305 100644
--- a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Contents.json
+++ b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Contents.json
@@ -2,117 +2,115 @@
   "images": [
     {
       "filename": "Icon-App-20x20@2x.png",
-      "idiom": "iphone",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "20x20"
+      "size": "20x20",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-20x20@3x.png",
-      "idiom": "iphone",
+      "idiom": "universal",
       "scale": "3x",
-      "size": "20x20"
-    },
-    {
-      "filename": "Icon-App-29x29@1x.png",
-      "idiom": "iphone",
-      "scale": "1x",
-      "size": "29x29"
+      "size": "20x20",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-29x29@2x.png",
-      "idiom": "iphone",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "29x29"
+      "size": "29x29",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-29x29@3x.png",
-      "idiom": "iphone",
+      "idiom": "universal",
       "scale": "3x",
-      "size": "29x29"
+      "size": "29x29",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-40x40@2x.png",
-      "idiom": "iphone",
+      "filename": "Icon-App-38x38@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "40x40"
+      "size": "38x38",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-40x40@3x.png",
-      "idiom": "iphone",
+      "filename": "Icon-App-38x38@3x.png",
+      "idiom": "universal",
       "scale": "3x",
-      "size": "40x40"
+      "size": "38x38",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-60x60@2x.png",
-      "idiom": "iphone",
+      "filename": "Icon-App-40x40@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "60x60"
+      "size": "40x40",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-60x60@3x.png",
-      "idiom": "iphone",
+      "filename": "Icon-App-40x40@3x.png",
+      "idiom": "universal",
       "scale": "3x",
-      "size": "60x60"
-    },
-    {
-      "filename": "Icon-App-20x20@1x.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "20x20"
+      "size": "40x40",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-20x20@2x.png",
-      "idiom": "ipad",
+      "filename": "Icon-App-60x60@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "20x20"
+      "size": "60x60",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-29x29@1x.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "29x29"
+      "filename": "Icon-App-60x60@3x.png",
+      "idiom": "universal",
+      "scale": "3x",
+      "size": "60x60",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-29x29@2x.png",
-      "idiom": "ipad",
+      "filename": "Icon-App-64x64@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "29x29"
+      "size": "64x64",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-40x40@1x.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "40x40"
+      "filename": "Icon-App-64x64@3x.png",
+      "idiom": "universal",
+      "scale": "3x",
+      "size": "64x64",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-40x40@2x.png",
-      "idiom": "ipad",
+      "filename": "Icon-App-68x68@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "40x40"
-    },
-    {
-      "filename": "Icon-App-76x76@1x.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "76x76"
+      "size": "68x68",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-76x76@2x.png",
-      "idiom": "ipad",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "76x76"
+      "size": "76x76",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-83.5x83.5@2x.png",
-      "idiom": "ipad",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "83.5x83.5"
+      "size": "83.5x83.5",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-1024x1024@1x.png",
-      "idiom": "ios-marketing",
+      "idiom": "universal",
       "scale": "1x",
-      "size": "1024x1024"
+      "size": "1024x1024",
+      "platform": "ios"
     }
   ],
   "info": {
diff --git a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-1024x1024@1x.png
index d8fe57c..036d801 100644
Binary files a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-1024x1024@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-20x20@1x.png
deleted file mode 100644
index db0a28e..0000000
Binary files a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-20x20@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-20x20@2x.png
index 6b01de1..957563b 100644
Binary files a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-20x20@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-20x20@3x.png
index 7fbf993..ccf0566 100644
Binary files a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-20x20@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-29x29@1x.png
deleted file mode 100644
index 80f4ed1..0000000
Binary files a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-29x29@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-29x29@2x.png
index ae57efd..3c147f3 100644
Binary files a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-29x29@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-29x29@3x.png
index 6a4ff97..8995b88 100644
Binary files a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-38x38@2x.png b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-38x38@2x.png
new file mode 100644
index 0000000..31e39d6
Binary files /dev/null and b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-38x38@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-38x38@3x.png b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-38x38@3x.png
new file mode 100644
index 0000000..ed94f9f
Binary files /dev/null and b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-38x38@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-40x40@1x.png
deleted file mode 100644
index 6b01de1..0000000
Binary files a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-40x40@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-40x40@2x.png
index 49d3229..c458863 100644
Binary files a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-40x40@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-40x40@3x.png
index ca8bb53..84b8c98 100644
Binary files a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-60x60@2x.png
index ca8bb53..84b8c98 100644
Binary files a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-60x60@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-60x60@3x.png
index fd9f846..5c3f642 100644
Binary files a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-60x60@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-64x64@2x.png b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-64x64@2x.png
new file mode 100644
index 0000000..e4bd5e8
Binary files /dev/null and b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-64x64@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-64x64@3x.png b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-64x64@3x.png
new file mode 100644
index 0000000..d05e1fa
Binary files /dev/null and b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-64x64@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-68x68@2x.png b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-68x68@2x.png
new file mode 100644
index 0000000..00ad9db
Binary files /dev/null and b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-68x68@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-76x76@1x.png
deleted file mode 100644
index e0dbe58..0000000
Binary files a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-76x76@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-76x76@2x.png
index dfdf692..89e3f1d 100644
Binary files a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-83.5x83.5@2x.png
index b8f49e0..6054cff 100644
Binary files a/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/developDebugAppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Contents.json
index eabd851..d807305 100644
--- a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Contents.json
+++ b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Contents.json
@@ -2,117 +2,115 @@
   "images": [
     {
       "filename": "Icon-App-20x20@2x.png",
-      "idiom": "iphone",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "20x20"
+      "size": "20x20",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-20x20@3x.png",
-      "idiom": "iphone",
+      "idiom": "universal",
       "scale": "3x",
-      "size": "20x20"
-    },
-    {
-      "filename": "Icon-App-29x29@1x.png",
-      "idiom": "iphone",
-      "scale": "1x",
-      "size": "29x29"
+      "size": "20x20",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-29x29@2x.png",
-      "idiom": "iphone",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "29x29"
+      "size": "29x29",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-29x29@3x.png",
-      "idiom": "iphone",
+      "idiom": "universal",
       "scale": "3x",
-      "size": "29x29"
+      "size": "29x29",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-40x40@2x.png",
-      "idiom": "iphone",
+      "filename": "Icon-App-38x38@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "40x40"
+      "size": "38x38",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-40x40@3x.png",
-      "idiom": "iphone",
+      "filename": "Icon-App-38x38@3x.png",
+      "idiom": "universal",
       "scale": "3x",
-      "size": "40x40"
+      "size": "38x38",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-60x60@2x.png",
-      "idiom": "iphone",
+      "filename": "Icon-App-40x40@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "60x60"
+      "size": "40x40",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-60x60@3x.png",
-      "idiom": "iphone",
+      "filename": "Icon-App-40x40@3x.png",
+      "idiom": "universal",
       "scale": "3x",
-      "size": "60x60"
-    },
-    {
-      "filename": "Icon-App-20x20@1x.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "20x20"
+      "size": "40x40",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-20x20@2x.png",
-      "idiom": "ipad",
+      "filename": "Icon-App-60x60@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "20x20"
+      "size": "60x60",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-29x29@1x.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "29x29"
+      "filename": "Icon-App-60x60@3x.png",
+      "idiom": "universal",
+      "scale": "3x",
+      "size": "60x60",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-29x29@2x.png",
-      "idiom": "ipad",
+      "filename": "Icon-App-64x64@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "29x29"
+      "size": "64x64",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-40x40@1x.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "40x40"
+      "filename": "Icon-App-64x64@3x.png",
+      "idiom": "universal",
+      "scale": "3x",
+      "size": "64x64",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-40x40@2x.png",
-      "idiom": "ipad",
+      "filename": "Icon-App-68x68@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "40x40"
-    },
-    {
-      "filename": "Icon-App-76x76@1x.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "76x76"
+      "size": "68x68",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-76x76@2x.png",
-      "idiom": "ipad",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "76x76"
+      "size": "76x76",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-83.5x83.5@2x.png",
-      "idiom": "ipad",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "83.5x83.5"
+      "size": "83.5x83.5",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-1024x1024@1x.png",
-      "idiom": "ios-marketing",
+      "idiom": "universal",
       "scale": "1x",
-      "size": "1024x1024"
+      "size": "1024x1024",
+      "platform": "ios"
     }
   ],
   "info": {
diff --git a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-1024x1024@1x.png
index a0d981e..0c09abf 100644
Binary files a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-1024x1024@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-20x20@1x.png
deleted file mode 100644
index 6bf0304..0000000
Binary files a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-20x20@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-20x20@2x.png
index 791a211..0103296 100644
Binary files a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-20x20@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-20x20@3x.png
index e694a52..ac6df5d 100644
Binary files a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-20x20@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-29x29@1x.png
deleted file mode 100644
index a7c81d2..0000000
Binary files a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-29x29@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-29x29@2x.png
index 422f106..686210b 100644
Binary files a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-29x29@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-29x29@3x.png
index b959d54..31a362e 100644
Binary files a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-38x38@2x.png b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-38x38@2x.png
new file mode 100644
index 0000000..09af2ce
Binary files /dev/null and b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-38x38@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-38x38@3x.png b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-38x38@3x.png
new file mode 100644
index 0000000..bc69578
Binary files /dev/null and b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-38x38@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-40x40@1x.png
deleted file mode 100644
index 791a211..0000000
Binary files a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-40x40@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-40x40@2x.png
index a4c5927..8b363e4 100644
Binary files a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-40x40@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-40x40@3x.png
index c62d8a6..2659370 100644
Binary files a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-60x60@2x.png
index c62d8a6..2659370 100644
Binary files a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-60x60@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-60x60@3x.png
index 0dea73f..486a55e 100644
Binary files a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-60x60@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-64x64@2x.png b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-64x64@2x.png
new file mode 100644
index 0000000..bae2803
Binary files /dev/null and b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-64x64@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-64x64@3x.png b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-64x64@3x.png
new file mode 100644
index 0000000..1fb4a5f
Binary files /dev/null and b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-64x64@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-68x68@2x.png b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-68x68@2x.png
new file mode 100644
index 0000000..6047c57
Binary files /dev/null and b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-68x68@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-76x76@1x.png
deleted file mode 100644
index 650affc..0000000
Binary files a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-76x76@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-76x76@2x.png
index 6da79be..0e9b159 100644
Binary files a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-83.5x83.5@2x.png
index e574fad..d891a7c 100644
Binary files a/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/developReleaseAppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Contents.json
index eabd851..d807305 100644
--- a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Contents.json
+++ b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Contents.json
@@ -2,117 +2,115 @@
   "images": [
     {
       "filename": "Icon-App-20x20@2x.png",
-      "idiom": "iphone",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "20x20"
+      "size": "20x20",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-20x20@3x.png",
-      "idiom": "iphone",
+      "idiom": "universal",
       "scale": "3x",
-      "size": "20x20"
-    },
-    {
-      "filename": "Icon-App-29x29@1x.png",
-      "idiom": "iphone",
-      "scale": "1x",
-      "size": "29x29"
+      "size": "20x20",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-29x29@2x.png",
-      "idiom": "iphone",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "29x29"
+      "size": "29x29",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-29x29@3x.png",
-      "idiom": "iphone",
+      "idiom": "universal",
       "scale": "3x",
-      "size": "29x29"
+      "size": "29x29",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-40x40@2x.png",
-      "idiom": "iphone",
+      "filename": "Icon-App-38x38@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "40x40"
+      "size": "38x38",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-40x40@3x.png",
-      "idiom": "iphone",
+      "filename": "Icon-App-38x38@3x.png",
+      "idiom": "universal",
       "scale": "3x",
-      "size": "40x40"
+      "size": "38x38",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-60x60@2x.png",
-      "idiom": "iphone",
+      "filename": "Icon-App-40x40@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "60x60"
+      "size": "40x40",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-60x60@3x.png",
-      "idiom": "iphone",
+      "filename": "Icon-App-40x40@3x.png",
+      "idiom": "universal",
       "scale": "3x",
-      "size": "60x60"
-    },
-    {
-      "filename": "Icon-App-20x20@1x.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "20x20"
+      "size": "40x40",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-20x20@2x.png",
-      "idiom": "ipad",
+      "filename": "Icon-App-60x60@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "20x20"
+      "size": "60x60",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-29x29@1x.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "29x29"
+      "filename": "Icon-App-60x60@3x.png",
+      "idiom": "universal",
+      "scale": "3x",
+      "size": "60x60",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-29x29@2x.png",
-      "idiom": "ipad",
+      "filename": "Icon-App-64x64@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "29x29"
+      "size": "64x64",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-40x40@1x.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "40x40"
+      "filename": "Icon-App-64x64@3x.png",
+      "idiom": "universal",
+      "scale": "3x",
+      "size": "64x64",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-40x40@2x.png",
-      "idiom": "ipad",
+      "filename": "Icon-App-68x68@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "40x40"
-    },
-    {
-      "filename": "Icon-App-76x76@1x.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "76x76"
+      "size": "68x68",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-76x76@2x.png",
-      "idiom": "ipad",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "76x76"
+      "size": "76x76",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-83.5x83.5@2x.png",
-      "idiom": "ipad",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "83.5x83.5"
+      "size": "83.5x83.5",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-1024x1024@1x.png",
-      "idiom": "ios-marketing",
+      "idiom": "universal",
       "scale": "1x",
-      "size": "1024x1024"
+      "size": "1024x1024",
+      "platform": "ios"
     }
   ],
   "info": {
diff --git a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-1024x1024@1x.png
index 72bc134..77c07fc 100644
Binary files a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-1024x1024@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-20x20@1x.png
deleted file mode 100644
index b4f683f..0000000
Binary files a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-20x20@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-20x20@2x.png
index ec399d3..2af3628 100644
Binary files a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-20x20@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-20x20@3x.png
index 62d23c5..68d3675 100644
Binary files a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-20x20@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-29x29@1x.png
deleted file mode 100644
index 7daf879..0000000
Binary files a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-29x29@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-29x29@2x.png
index 23cb246..6def1ef 100644
Binary files a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-29x29@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-29x29@3x.png
index 7a289dc..91f0fc5 100644
Binary files a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-38x38@2x.png b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-38x38@2x.png
new file mode 100644
index 0000000..dbd332b
Binary files /dev/null and b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-38x38@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-38x38@3x.png b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-38x38@3x.png
new file mode 100644
index 0000000..799d7dc
Binary files /dev/null and b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-38x38@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-40x40@1x.png
deleted file mode 100644
index ec399d3..0000000
Binary files a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-40x40@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-40x40@2x.png
index 027695c..82f1164 100644
Binary files a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-40x40@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-40x40@3x.png
index db48f84..c0673b9 100644
Binary files a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-60x60@2x.png
index db48f84..c0673b9 100644
Binary files a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-60x60@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-60x60@3x.png
index 5822376..e2c33f6 100644
Binary files a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-60x60@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-64x64@2x.png b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-64x64@2x.png
new file mode 100644
index 0000000..df27e87
Binary files /dev/null and b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-64x64@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-64x64@3x.png b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-64x64@3x.png
new file mode 100644
index 0000000..a438896
Binary files /dev/null and b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-64x64@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-68x68@2x.png b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-68x68@2x.png
new file mode 100644
index 0000000..3d26170
Binary files /dev/null and b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-68x68@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-76x76@1x.png
deleted file mode 100644
index fa78a7c..0000000
Binary files a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-76x76@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-76x76@2x.png
index 7dee896..7963ec4 100644
Binary files a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-83.5x83.5@2x.png
index 31af7ac..48a1508 100644
Binary files a/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/productionDebugAppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Contents.json
index eabd851..d807305 100644
--- a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Contents.json
+++ b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Contents.json
@@ -2,117 +2,115 @@
   "images": [
     {
       "filename": "Icon-App-20x20@2x.png",
-      "idiom": "iphone",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "20x20"
+      "size": "20x20",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-20x20@3x.png",
-      "idiom": "iphone",
+      "idiom": "universal",
       "scale": "3x",
-      "size": "20x20"
-    },
-    {
-      "filename": "Icon-App-29x29@1x.png",
-      "idiom": "iphone",
-      "scale": "1x",
-      "size": "29x29"
+      "size": "20x20",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-29x29@2x.png",
-      "idiom": "iphone",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "29x29"
+      "size": "29x29",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-29x29@3x.png",
-      "idiom": "iphone",
+      "idiom": "universal",
       "scale": "3x",
-      "size": "29x29"
+      "size": "29x29",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-40x40@2x.png",
-      "idiom": "iphone",
+      "filename": "Icon-App-38x38@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "40x40"
+      "size": "38x38",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-40x40@3x.png",
-      "idiom": "iphone",
+      "filename": "Icon-App-38x38@3x.png",
+      "idiom": "universal",
       "scale": "3x",
-      "size": "40x40"
+      "size": "38x38",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-60x60@2x.png",
-      "idiom": "iphone",
+      "filename": "Icon-App-40x40@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "60x60"
+      "size": "40x40",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-60x60@3x.png",
-      "idiom": "iphone",
+      "filename": "Icon-App-40x40@3x.png",
+      "idiom": "universal",
       "scale": "3x",
-      "size": "60x60"
-    },
-    {
-      "filename": "Icon-App-20x20@1x.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "20x20"
+      "size": "40x40",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-20x20@2x.png",
-      "idiom": "ipad",
+      "filename": "Icon-App-60x60@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "20x20"
+      "size": "60x60",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-29x29@1x.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "29x29"
+      "filename": "Icon-App-60x60@3x.png",
+      "idiom": "universal",
+      "scale": "3x",
+      "size": "60x60",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-29x29@2x.png",
-      "idiom": "ipad",
+      "filename": "Icon-App-64x64@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "29x29"
+      "size": "64x64",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-40x40@1x.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "40x40"
+      "filename": "Icon-App-64x64@3x.png",
+      "idiom": "universal",
+      "scale": "3x",
+      "size": "64x64",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-40x40@2x.png",
-      "idiom": "ipad",
+      "filename": "Icon-App-68x68@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "40x40"
-    },
-    {
-      "filename": "Icon-App-76x76@1x.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "76x76"
+      "size": "68x68",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-76x76@2x.png",
-      "idiom": "ipad",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "76x76"
+      "size": "76x76",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-83.5x83.5@2x.png",
-      "idiom": "ipad",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "83.5x83.5"
+      "size": "83.5x83.5",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-1024x1024@1x.png",
-      "idiom": "ios-marketing",
+      "idiom": "universal",
       "scale": "1x",
-      "size": "1024x1024"
+      "size": "1024x1024",
+      "platform": "ios"
     }
   ],
   "info": {
diff --git a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-1024x1024@1x.png
index 8d1489d..e4514df 100644
Binary files a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-1024x1024@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-20x20@1x.png
deleted file mode 100644
index b1dd713..0000000
Binary files a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-20x20@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-20x20@2x.png
index 6d860b2..5ae3b38 100644
Binary files a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-20x20@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-20x20@3x.png
index e3a94c0..595e798 100644
Binary files a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-20x20@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-29x29@1x.png
deleted file mode 100644
index 80ba0b5..0000000
Binary files a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-29x29@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-29x29@2x.png
index 7355d26..d871826 100644
Binary files a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-29x29@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-29x29@3x.png
index 3b61204..9644842 100644
Binary files a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-38x38@2x.png b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-38x38@2x.png
new file mode 100644
index 0000000..047d9f8
Binary files /dev/null and b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-38x38@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-38x38@3x.png b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-38x38@3x.png
new file mode 100644
index 0000000..caa2ebd
Binary files /dev/null and b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-38x38@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-40x40@1x.png
deleted file mode 100644
index 6d860b2..0000000
Binary files a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-40x40@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-40x40@2x.png
index de6a60b..9aca130 100644
Binary files a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-40x40@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-40x40@3x.png
index 5fe5970..7c6b2bb 100644
Binary files a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-60x60@2x.png
index 5fe5970..7c6b2bb 100644
Binary files a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-60x60@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-60x60@3x.png
index d6c69da..2c5cf14 100644
Binary files a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-60x60@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-64x64@2x.png b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-64x64@2x.png
new file mode 100644
index 0000000..15afd2b
Binary files /dev/null and b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-64x64@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-64x64@3x.png b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-64x64@3x.png
new file mode 100644
index 0000000..5ae60db
Binary files /dev/null and b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-64x64@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-68x68@2x.png b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-68x68@2x.png
new file mode 100644
index 0000000..bc48d80
Binary files /dev/null and b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-68x68@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-76x76@1x.png
deleted file mode 100644
index 8ee0b17..0000000
Binary files a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-76x76@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-76x76@2x.png
index 185b2eb..4160851 100644
Binary files a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-83.5x83.5@2x.png
index 1eae0a6..0697087 100644
Binary files a/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/productionReleaseAppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Contents.json
index eabd851..d807305 100644
--- a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Contents.json
+++ b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Contents.json
@@ -2,117 +2,115 @@
   "images": [
     {
       "filename": "Icon-App-20x20@2x.png",
-      "idiom": "iphone",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "20x20"
+      "size": "20x20",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-20x20@3x.png",
-      "idiom": "iphone",
+      "idiom": "universal",
       "scale": "3x",
-      "size": "20x20"
-    },
-    {
-      "filename": "Icon-App-29x29@1x.png",
-      "idiom": "iphone",
-      "scale": "1x",
-      "size": "29x29"
+      "size": "20x20",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-29x29@2x.png",
-      "idiom": "iphone",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "29x29"
+      "size": "29x29",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-29x29@3x.png",
-      "idiom": "iphone",
+      "idiom": "universal",
       "scale": "3x",
-      "size": "29x29"
+      "size": "29x29",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-40x40@2x.png",
-      "idiom": "iphone",
+      "filename": "Icon-App-38x38@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "40x40"
+      "size": "38x38",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-40x40@3x.png",
-      "idiom": "iphone",
+      "filename": "Icon-App-38x38@3x.png",
+      "idiom": "universal",
       "scale": "3x",
-      "size": "40x40"
+      "size": "38x38",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-60x60@2x.png",
-      "idiom": "iphone",
+      "filename": "Icon-App-40x40@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "60x60"
+      "size": "40x40",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-60x60@3x.png",
-      "idiom": "iphone",
+      "filename": "Icon-App-40x40@3x.png",
+      "idiom": "universal",
       "scale": "3x",
-      "size": "60x60"
-    },
-    {
-      "filename": "Icon-App-20x20@1x.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "20x20"
+      "size": "40x40",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-20x20@2x.png",
-      "idiom": "ipad",
+      "filename": "Icon-App-60x60@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "20x20"
+      "size": "60x60",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-29x29@1x.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "29x29"
+      "filename": "Icon-App-60x60@3x.png",
+      "idiom": "universal",
+      "scale": "3x",
+      "size": "60x60",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-29x29@2x.png",
-      "idiom": "ipad",
+      "filename": "Icon-App-64x64@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "29x29"
+      "size": "64x64",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-40x40@1x.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "40x40"
+      "filename": "Icon-App-64x64@3x.png",
+      "idiom": "universal",
+      "scale": "3x",
+      "size": "64x64",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-40x40@2x.png",
-      "idiom": "ipad",
+      "filename": "Icon-App-68x68@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "40x40"
-    },
-    {
-      "filename": "Icon-App-76x76@1x.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "76x76"
+      "size": "68x68",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-76x76@2x.png",
-      "idiom": "ipad",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "76x76"
+      "size": "76x76",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-83.5x83.5@2x.png",
-      "idiom": "ipad",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "83.5x83.5"
+      "size": "83.5x83.5",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-1024x1024@1x.png",
-      "idiom": "ios-marketing",
+      "idiom": "universal",
       "scale": "1x",
-      "size": "1024x1024"
+      "size": "1024x1024",
+      "platform": "ios"
     }
   ],
   "info": {
diff --git a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-1024x1024@1x.png
index bb49a0e..57cea4a 100644
Binary files a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-1024x1024@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-20x20@1x.png
deleted file mode 100644
index 3408104..0000000
Binary files a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-20x20@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-20x20@2x.png
index e407303..938b95c 100644
Binary files a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-20x20@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-20x20@3x.png
index e7a34aa..bba11b6 100644
Binary files a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-20x20@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-29x29@1x.png
deleted file mode 100644
index e2580fb..0000000
Binary files a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-29x29@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-29x29@2x.png
index d6b29dd..669f8e3 100644
Binary files a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-29x29@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-29x29@3x.png
index a15fe50..8a739c3 100644
Binary files a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-38x38@2x.png b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-38x38@2x.png
new file mode 100644
index 0000000..8252b35
Binary files /dev/null and b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-38x38@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-38x38@3x.png b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-38x38@3x.png
new file mode 100644
index 0000000..e62e398
Binary files /dev/null and b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-38x38@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-40x40@1x.png
deleted file mode 100644
index e407303..0000000
Binary files a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-40x40@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-40x40@2x.png
index f105513..cde4999 100644
Binary files a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-40x40@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-40x40@3x.png
index 374a64e..44d4d74 100644
Binary files a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-60x60@2x.png
index 374a64e..44d4d74 100644
Binary files a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-60x60@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-60x60@3x.png
index 10635ca..aa7d317 100644
Binary files a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-60x60@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-64x64@2x.png b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-64x64@2x.png
new file mode 100644
index 0000000..b401cf8
Binary files /dev/null and b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-64x64@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-64x64@3x.png b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-64x64@3x.png
new file mode 100644
index 0000000..9551f1b
Binary files /dev/null and b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-64x64@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-68x68@2x.png b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-68x68@2x.png
new file mode 100644
index 0000000..ad1d7f4
Binary files /dev/null and b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-68x68@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-76x76@1x.png
deleted file mode 100644
index 90163b9..0000000
Binary files a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-76x76@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-76x76@2x.png
index 8e8e8b3..6459f22 100644
Binary files a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-83.5x83.5@2x.png
index d9129b5..7eef908 100644
Binary files a/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/stagingDebugAppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Contents.json
index eabd851..d807305 100644
--- a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Contents.json
+++ b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Contents.json
@@ -2,117 +2,115 @@
   "images": [
     {
       "filename": "Icon-App-20x20@2x.png",
-      "idiom": "iphone",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "20x20"
+      "size": "20x20",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-20x20@3x.png",
-      "idiom": "iphone",
+      "idiom": "universal",
       "scale": "3x",
-      "size": "20x20"
-    },
-    {
-      "filename": "Icon-App-29x29@1x.png",
-      "idiom": "iphone",
-      "scale": "1x",
-      "size": "29x29"
+      "size": "20x20",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-29x29@2x.png",
-      "idiom": "iphone",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "29x29"
+      "size": "29x29",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-29x29@3x.png",
-      "idiom": "iphone",
+      "idiom": "universal",
       "scale": "3x",
-      "size": "29x29"
+      "size": "29x29",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-40x40@2x.png",
-      "idiom": "iphone",
+      "filename": "Icon-App-38x38@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "40x40"
+      "size": "38x38",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-40x40@3x.png",
-      "idiom": "iphone",
+      "filename": "Icon-App-38x38@3x.png",
+      "idiom": "universal",
       "scale": "3x",
-      "size": "40x40"
+      "size": "38x38",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-60x60@2x.png",
-      "idiom": "iphone",
+      "filename": "Icon-App-40x40@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "60x60"
+      "size": "40x40",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-60x60@3x.png",
-      "idiom": "iphone",
+      "filename": "Icon-App-40x40@3x.png",
+      "idiom": "universal",
       "scale": "3x",
-      "size": "60x60"
-    },
-    {
-      "filename": "Icon-App-20x20@1x.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "20x20"
+      "size": "40x40",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-20x20@2x.png",
-      "idiom": "ipad",
+      "filename": "Icon-App-60x60@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "20x20"
+      "size": "60x60",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-29x29@1x.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "29x29"
+      "filename": "Icon-App-60x60@3x.png",
+      "idiom": "universal",
+      "scale": "3x",
+      "size": "60x60",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-29x29@2x.png",
-      "idiom": "ipad",
+      "filename": "Icon-App-64x64@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "29x29"
+      "size": "64x64",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-40x40@1x.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "40x40"
+      "filename": "Icon-App-64x64@3x.png",
+      "idiom": "universal",
+      "scale": "3x",
+      "size": "64x64",
+      "platform": "ios"
     },
     {
-      "filename": "Icon-App-40x40@2x.png",
-      "idiom": "ipad",
+      "filename": "Icon-App-68x68@2x.png",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "40x40"
-    },
-    {
-      "filename": "Icon-App-76x76@1x.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "76x76"
+      "size": "68x68",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-76x76@2x.png",
-      "idiom": "ipad",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "76x76"
+      "size": "76x76",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-83.5x83.5@2x.png",
-      "idiom": "ipad",
+      "idiom": "universal",
       "scale": "2x",
-      "size": "83.5x83.5"
+      "size": "83.5x83.5",
+      "platform": "ios"
     },
     {
       "filename": "Icon-App-1024x1024@1x.png",
-      "idiom": "ios-marketing",
+      "idiom": "universal",
       "scale": "1x",
-      "size": "1024x1024"
+      "size": "1024x1024",
+      "platform": "ios"
     }
   ],
   "info": {
diff --git a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-1024x1024@1x.png
index b491457..aaae7e8 100644
Binary files a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-1024x1024@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-20x20@1x.png
deleted file mode 100644
index 187cfb1..0000000
Binary files a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-20x20@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-20x20@2x.png
index 45258dc..78aa24d 100644
Binary files a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-20x20@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-20x20@3x.png
index e3ee1cf..a3b03a7 100644
Binary files a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-20x20@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-29x29@1x.png
deleted file mode 100644
index 6db0e2b..0000000
Binary files a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-29x29@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-29x29@2x.png
index 9902e3e..8636784 100644
Binary files a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-29x29@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-29x29@3x.png
index f6515b6..f74b51d 100644
Binary files a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-38x38@2x.png b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-38x38@2x.png
new file mode 100644
index 0000000..3e76804
Binary files /dev/null and b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-38x38@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-38x38@3x.png b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-38x38@3x.png
new file mode 100644
index 0000000..537a32b
Binary files /dev/null and b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-38x38@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-40x40@1x.png
deleted file mode 100644
index 45258dc..0000000
Binary files a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-40x40@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-40x40@2x.png
index 8d9d480..55583c7 100644
Binary files a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-40x40@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-40x40@3x.png
index cd251ac..5422334 100644
Binary files a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-60x60@2x.png
index cd251ac..5422334 100644
Binary files a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-60x60@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-60x60@3x.png
index a593bd8..bcc08e9 100644
Binary files a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-60x60@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-64x64@2x.png b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-64x64@2x.png
new file mode 100644
index 0000000..bd7e9ae
Binary files /dev/null and b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-64x64@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-64x64@3x.png b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-64x64@3x.png
new file mode 100644
index 0000000..987e66a
Binary files /dev/null and b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-64x64@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-68x68@2x.png b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-68x68@2x.png
new file mode 100644
index 0000000..88fc256
Binary files /dev/null and b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-68x68@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-76x76@1x.png
deleted file mode 100644
index 48e63b8..0000000
Binary files a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-76x76@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-76x76@2x.png
index c3ba6b5..9eeb5d3 100644
Binary files a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-83.5x83.5@2x.png
index 6b3bb01..0c54ee2 100644
Binary files a/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/stagingReleaseAppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index c8afd67..c087e13 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -1,70 +1,74 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>Flutter Template</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Flutter Template</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-			<key>CFBundleURLName</key>
-			<string>REVERSED_CLIENT_ID</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>com.googleusercontent.apps.907121519909-ac5hdm2av7utn2i85dj1v8v2pcttufb3</string>
-				<string>com.googleusercontent.apps.907121519909-5it712s6au9p09d0oo5t2pmp12fs1f8b</string>
-				<string>com.googleusercontent.apps.907121519909-antq2s70r5iu8hp24i6nckcfbd3f4v0b</string>
-			</array>
-		</dict>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
-	<key>ITSAppUsesNonExemptEncryption</key>
-	<false/>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UIStatusBarHidden</key>
-	<true/>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
-</dict>
+	<dict>
+		<key>CADisableMinimumFrameDurationOnPhone</key>
+		<true/>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>$(DEVELOPMENT_LANGUAGE)</string>
+		<key>CFBundleDisplayName</key>
+		<string>Flutter Template</string>
+		<key>CFBundleExecutable</key>
+		<string>$(EXECUTABLE_NAME)</string>
+		<key>CFBundleIdentifier</key>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundleName</key>
+		<string>Flutter Template</string>
+		<key>CFBundlePackageType</key>
+		<string>APPL</string>
+		<key>CFBundleShortVersionString</key>
+		<string>$(FLUTTER_BUILD_NAME)</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleURLTypes</key>
+		<array>
+			<dict>
+				<key>CFBundleTypeRole</key>
+				<string>Editor</string>
+				<key>CFBundleURLName</key>
+				<string>REVERSED_CLIENT_ID</string>
+				<key>CFBundleURLSchemes</key>
+				<array>
+					<string>com.googleusercontent.apps.907121519909-ac5hdm2av7utn2i85dj1v8v2pcttufb3</string>
+					<string>com.googleusercontent.apps.907121519909-5it712s6au9p09d0oo5t2pmp12fs1f8b</string>
+					<string>com.googleusercontent.apps.907121519909-antq2s70r5iu8hp24i6nckcfbd3f4v0b</string>
+				</array>
+			</dict>
+		</array>
+		<key>CFBundleVersion</key>
+		<string>$(FLUTTER_BUILD_NUMBER)</string>
+		<key>ITSAppUsesNonExemptEncryption</key>
+		<false/>
+		<key>LSRequiresIPhoneOS</key>
+		<true/>
+		<key>UIApplicationSupportsIndirectInputEvents</key>
+		<true/>
+		<key>UIBackgroundModes</key>
+		<array>
+		<string>remote-notification</string>
+		</array>
+		<key>UILaunchStoryboardName</key>
+		<string>LaunchScreen</string>
+		<key>UIMainStoryboardFile</key>
+		<string>Main</string>
+		<key>UIStatusBarHidden</key>
+		<true/>
+		<key>UISupportedInterfaceOrientations</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+		<key>UISupportedInterfaceOrientations~ipad</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationPortraitUpsideDown</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+		<key>UIViewControllerBasedStatusBarAppearance</key>
+		<false/>
+	</dict>
 </plist>
diff --git a/lib/app/app.dart b/lib/app/app.dart
index 01e10fd..a08c9ea 100644
--- a/lib/app/app.dart
+++ b/lib/app/app.dart
@@ -40,7 +40,7 @@ class App extends ConsumerWidget {
                 message: Configuration.instance.flavor == Flavor.develop ? 'DEV' : 'STG',
                 location: BannerLocation.topStart,
                 color: Configuration.instance.flavor == Flavor.develop ? const Color(0xFF37B73B) : const Color(0xFF3C45D9),
-              )
+              ),
             ],
           ),
         );
@@ -51,7 +51,7 @@ class App extends ConsumerWidget {
 
   Widget _createAppWidget(WidgetRef ref) {
     final appRouter = ref.watch(appRouterProvider);
-    final themeProvider = ref.watch(themeModeNotifierProvider);
+    final themeProvider = ref.watch(themeModeProvider);
 
     return MaterialApp.router(
       title: 'Flutter Template',
@@ -65,11 +65,13 @@ class App extends ConsumerWidget {
       ),
       builder: (context, child) {
         if (AppPlatform.isWeb) {
-          return Overlay(initialEntries: [
-            OverlayEntry(
-              builder: (context) => SelectionArea(child: child ?? const SizedBox()),
-            ),
-          ]);
+          return Overlay(
+            initialEntries: [
+              OverlayEntry(
+                builder: (context) => SelectionArea(child: child ?? const SizedBox()),
+              ),
+            ],
+          );
         } else {
           return child ?? const SizedBox();
         }
diff --git a/lib/app/configuration/configuration.dart b/lib/app/configuration/configuration.dart
index 2625bdd..be1b042 100644
--- a/lib/app/configuration/configuration.dart
+++ b/lib/app/configuration/configuration.dart
@@ -31,39 +31,39 @@ class Configuration {
   final IosDeviceInfo? iosDeviceInfo;
 
   String get apiHostUrl => switch (flavor) {
-        Flavor.develop => ConfigDevelop.apiHostUrl,
-        Flavor.staging => ConfigStaging.apiHostUrl,
-        Flavor.production => ConfigProduction.apiHostUrl,
-      };
+    Flavor.develop => ConfigDevelop.apiHostUrl,
+    Flavor.staging => ConfigStaging.apiHostUrl,
+    Flavor.production => ConfigProduction.apiHostUrl,
+  };
 
   // Used for Web notifications
   String get vapidKey => switch (flavor) {
-        Flavor.develop => ConfigDevelop.vapidKey,
-        Flavor.staging => ConfigStaging.vapidKey,
-        Flavor.production => ConfigProduction.vapidKey,
-      };
+    Flavor.develop => ConfigDevelop.vapidKey,
+    Flavor.staging => ConfigStaging.vapidKey,
+    Flavor.production => ConfigProduction.vapidKey,
+  };
 
   // Used for example for Google SignIn init
   String? get firebaseClientID => switch (flavor) {
-        Flavor.develop => switch (currentPlatform) {
-            AppPlatform.android => ConfigDevelop.androidClientId,
-            AppPlatform.iOS => ConfigDevelop.iosClientId,
-            AppPlatform.web => ConfigDevelop.webClientId,
-            _ => null,
-          },
-        Flavor.staging => switch (currentPlatform) {
-            AppPlatform.android => ConfigStaging.androidClientId,
-            AppPlatform.iOS => ConfigStaging.iosClientId,
-            AppPlatform.web => ConfigStaging.webClientId,
-            _ => null,
-          },
-        Flavor.production => switch (currentPlatform) {
-            AppPlatform.android => ConfigProduction.androidClientId,
-            AppPlatform.iOS => ConfigProduction.iosClientId,
-            AppPlatform.web => ConfigProduction.webClientId,
-            _ => null,
-          },
-      };
+    Flavor.develop => switch (currentPlatform) {
+      AppPlatform.android => ConfigDevelop.androidClientId,
+      AppPlatform.iOS => ConfigDevelop.iosClientId,
+      AppPlatform.web => ConfigDevelop.webClientId,
+      _ => null,
+    },
+    Flavor.staging => switch (currentPlatform) {
+      AppPlatform.android => ConfigStaging.androidClientId,
+      AppPlatform.iOS => ConfigStaging.iosClientId,
+      AppPlatform.web => ConfigStaging.webClientId,
+      _ => null,
+    },
+    Flavor.production => switch (currentPlatform) {
+      AppPlatform.android => ConfigProduction.androidClientId,
+      AppPlatform.iOS => ConfigProduction.iosClientId,
+      AppPlatform.web => ConfigProduction.webClientId,
+      _ => null,
+    },
+  };
 
   // Function which setups base configuration.
   static Future<void> setup({required Flavor flavor}) async {
diff --git a/lib/app/configuration/develop/config_develop.dart b/lib/app/configuration/develop/config_develop.dart
index e983039..7dc7564 100644
--- a/lib/app/configuration/develop/config_develop.dart
+++ b/lib/app/configuration/develop/config_develop.dart
@@ -1,4 +1,4 @@
-// TODO: Fill correct values
+// TODO(strv): Fill correct values
 class ConfigDevelop {
   static const apiHostUrl = 'https://strv.com';
 
diff --git a/lib/app/configuration/production/config_production.dart b/lib/app/configuration/production/config_production.dart
index 7dff0f2..35134d1 100644
--- a/lib/app/configuration/production/config_production.dart
+++ b/lib/app/configuration/production/config_production.dart
@@ -1,4 +1,4 @@
-// TODO: Fill correct values
+// TODO(strv): Fill correct values
 class ConfigProduction {
   static const apiHostUrl = 'https://strv.com';
 
diff --git a/lib/app/configuration/staging/config_staging.dart b/lib/app/configuration/staging/config_staging.dart
index 5d06630..07bd00d 100644
--- a/lib/app/configuration/staging/config_staging.dart
+++ b/lib/app/configuration/staging/config_staging.dart
@@ -1,4 +1,4 @@
-// TODO: Fill correct values
+// TODO(strv): Fill correct values
 class ConfigStaging {
   static const apiHostUrl = 'https://strv.com';
 
diff --git a/lib/app/navigation/app_router.dart b/lib/app/navigation/app_router.dart
index fc71dc0..bbf9f15 100644
--- a/lib/app/navigation/app_router.dart
+++ b/lib/app/navigation/app_router.dart
@@ -7,7 +7,6 @@ import 'package:flutter_app/features/home/home_page.dart';
 import 'package:flutter_app/features/landing/landing_page.dart';
 import 'package:flutter_app/features/profile/profile_page.dart';
 import 'package:flutter_app/features/root/root_page.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'app_router.g.dart';
@@ -23,27 +22,30 @@ class AppRouter extends RootStackRouter {
 
   @override
   List<AutoRoute> get routes => [
-        // Subtitle: Landing Route
-        CustomRoute(
-          page: LandingRoute.page,
-          initial: true,
-          // We don't really need to animate landing page, because
-          // it doesn't have UI, it's covered by splash screen.
-          durationInMilliseconds: 0,
-        ),
+    // Subtitle: Landing Route
+    CustomRoute<void>(
+      page: LandingRoute.page,
+      initial: true,
+      // We don't really need to animate landing page, because
+      // it doesn't have UI, it's covered by splash screen.
+      duration: Duration.zero,
+    ),
 
-        // Subtitle: Authentication Route
-        AutoRoute(page: AuthenticationRoute.page),
+    // Subtitle: Authentication Route
+    AutoRoute(page: AuthenticationRoute.page),
 
-        // Subtitle: Main Routes
-        AutoRoute(page: RootRoute.page, children: [
-          AutoRoute(page: HomeRoute.page),
-          AutoRoute(page: EventsRoute.page),
-          AutoRoute(page: ProfileRoute.page),
-        ]),
-        AutoRoute(page: EventDetailRoute.page),
+    // Subtitle: Main Routes
+    AutoRoute(
+      page: RootRoute.page,
+      children: [
+        AutoRoute(page: HomeRoute.page),
+        AutoRoute(page: EventsRoute.page),
+        AutoRoute(page: ProfileRoute.page),
+      ],
+    ),
+    AutoRoute(page: EventDetailRoute.page),
 
-        // Subtitle: Debug Tools Routes
-        AutoRoute(page: DebugToolsRoute.page),
-      ];
+    // Subtitle: Debug Tools Routes
+    AutoRoute(page: DebugToolsRoute.page),
+  ];
 }
diff --git a/lib/app/setup/setup_app.dart b/lib/app/setup/setup_app.dart
index ed9d5dd..01bd9b5 100644
--- a/lib/app/setup/setup_app.dart
+++ b/lib/app/setup/setup_app.dart
@@ -16,20 +16,22 @@ import 'package:flutter_app/common/provider/firebase_remote_config_service.dart'
 import 'package:flutter_app/common/provider/notifications_service.dart';
 import 'package:flutter_app/common/provider/theme_mode_provider.dart';
 import 'package:flutter_app/core/analytics/crashlytics_manager.dart';
+import 'package:flutter_app/core/flogger.dart';
 import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:flutter_web_plugins/url_strategy.dart';
 import 'package:freerasp/freerasp.dart';
+import 'package:google_sign_in/google_sign_in.dart';
 import 'package:window_manager/window_manager.dart';
 
 Future<void> setupApp({required Flavor flavor}) async {
-  WidgetsBinding widgetsBinding = WidgetsFlutterBinding.ensureInitialized();
+  final widgetsBinding = WidgetsFlutterBinding.ensureInitialized();
   if (!kIsWeb) {
     FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding);
   }
 
   // Force app orientation to portrait and landscape.
   // This must be also forced in info.plist file for iOS, under [UISupportedInterfaceOrientations].
-  SystemChrome.setPreferredOrientations([
+  await SystemChrome.setPreferredOrientations([
     DeviceOrientation.portraitUp,
     DeviceOrientation.portraitDown,
     DeviceOrientation.landscapeLeft,
@@ -46,6 +48,9 @@ Future<void> setupApp({required Flavor flavor}) async {
   await _setupFirebaseMessaging();
   await _setupLocalNotificationsService();
 
+  // Setup Google Sign In
+  await GoogleSignIn.instance.initialize();
+
   // Setup FreeRASP Security
   await _setupRASP(flavor: flavor);
 
@@ -60,20 +65,20 @@ Future<void> setupApp({required Flavor flavor}) async {
   PaintingBinding.instance.imageCache.maximumSizeBytes = 200 << 20; // Equals to 250MB of cache
 
   // Load Theme Mode from DB before starting app
-  await providerContainer.read(themeModeNotifierProvider.future);
+  await providerContainer.read(themeModeProvider.future);
 
-  // Setup reactive Edge-to-Edge support accross all platforms
+  // Setup reactive Edge-to-Edge support across all platforms
   await CustomSystemBarsTheme.setupSystemBarsTheme(providerContainer: providerContainer);
 }
 
-// TODO: Support it or remove it!
+// TODO(strv): Support it or remove it!
 Future<void> _setupFirebase({required Flavor flavor}) async {
   if (AppPlatform.isMobile || AppPlatform.isMacOS) {
     await Firebase.initializeApp();
   } else if (AppPlatform.isWeb) {
     await Firebase.initializeApp(
       // For WebApp we need to specify the FirebaseOptions here!
-      // TODO: Replace with actual values. Can be found inside Firebase -> Project Settings, under Web App
+      // TODO(strv): Replace with actual values. Can be found inside Firebase -> Project Settings, under Web App
       options: const FirebaseOptions(
         apiKey: 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
         authDomain: 'strv-flutter-template.firebaseapp.com',
@@ -87,7 +92,7 @@ Future<void> _setupFirebase({required Flavor flavor}) async {
   }
 }
 
-/// TODO: Support it or remove it!
+// TODO(strv): Support it or remove it!
 /// Setup Firebase crashlytics according [docs](https://firebase.google.com/docs/crashlytics/customize-crash-reports?platform=flutter).
 Future<void> _setupFirebaseCrashlytics() async {
   if (!AppPlatform.isMobile) return;
@@ -107,37 +112,43 @@ Future<void> _setupFirebaseCrashlytics() async {
   };
 
   // Handles errors that happen outside of the Flutter context
-  Isolate.current.addErrorListener(RawReceivePort((pair) async {
-    final List<dynamic> errorAndStacktrace = pair;
-    await CrashlyticsManager.logCritical(
-      errorAndStacktrace.first,
-      stack: errorAndStacktrace.last,
-    );
-  }).sendPort);
+  Isolate.current.addErrorListener(
+    RawReceivePort((dynamic pair) async {
+      if (pair is List && pair.length == 2 && pair[1] is StackTrace) {
+        final dynamic error = pair[0];
+        final stack = pair[1] as StackTrace;
+
+        await CrashlyticsManager.logCritical(error, stack: stack);
+      } else {
+        // Optionally log or handle unexpected message format
+        Flogger.e('Unexpected error message format from isolate: $pair');
+      }
+    }).sendPort,
+  );
 }
 
-/// TODO: Support it or remove it!
+// TODO(strv): Support it or remove it!
 Future<void> _setupFirebaseRemoteConfig() async {
   if (!AppPlatform.isMobile) return;
 
   await providerContainer.read(firebaseRemoteConfigServiceProvider.future);
 }
 
-/// TODO: Support it or remove it!
+// TODO(strv): Support it or remove it!
 Future<void> _setupFirebaseMessaging() async {
   if (!AppPlatform.isLinux && !AppPlatform.isWindows) {
     await providerContainer.read(firebaseMessagingServiceProvider.future);
   }
 }
 
-/// TODO: Support it or remove it!
+// TODO(strv): Support it or remove it!
 Future<void> _setupLocalNotificationsService() async {
   if (!AppPlatform.isLinux && !AppPlatform.isWindows) {
     await providerContainer.read(notificationsServiceProvider.future);
   }
 }
 
-// TODO: [FreeRASP] Configure correct package names and other values
+// TODO(strv): [FreeRASP] Configure correct package names and other values
 Future<void> _setupRASP({required Flavor flavor}) async {
   // Only Mobile platforms are supported!
   if (!AppPlatform.isMobile) return;
@@ -198,7 +209,7 @@ Future<void> _setupWebPlatform({required Flavor flavor}) async {
 Future<void> _setupDesktopPlatform() async {
   if (AppPlatform.isDesktop) {
     await windowManager.ensureInitialized();
-    windowManager.setMinimumSize(const Size(400, 400));
-    windowManager.setSize(const Size(500, 950));
+    await windowManager.setMinimumSize(const Size(400, 400));
+    await windowManager.setSize(const Size(500, 950));
   }
 }
diff --git a/lib/app/setup/web_setup.dart b/lib/app/setup/web_setup.dart
index 572df5b..667f454 100644
--- a/lib/app/setup/web_setup.dart
+++ b/lib/app/setup/web_setup.dart
@@ -10,13 +10,10 @@ class WebSetup {
     switch (flavor) {
       case Flavor.develop:
         script.id = 'develop';
-        break;
       case Flavor.staging:
         script.id = 'staging';
-        break;
       case Flavor.production:
         script.id = 'production';
-        break;
     }
 
     document.head?.append(script);
diff --git a/lib/app/theme/app_theme.dart b/lib/app/theme/app_theme.dart
index 6d83b92..b90d1c7 100644
--- a/lib/app/theme/app_theme.dart
+++ b/lib/app/theme/app_theme.dart
@@ -16,12 +16,21 @@ class AppTheme {
     final colorScheme = CustomColorScheme(brightness: brightness);
     final textTheme = CustomTextTheme(colorScheme: colorScheme);
 
+    // Create a native color scheme based on the custom color scheme.
+    var nativeColorScheme = kDebugMode
+        ? _getUndefinedColorScheme(brightness)
+        : ColorScheme.fromSeed(seedColor: colorScheme.primary, brightness: brightness);
+
+    // Override colors that make sense to override, and that we can match.
+    nativeColorScheme = nativeColorScheme.copyWith(
+      surface: colorScheme.surface,
+    );
+
     return ThemeData(
       brightness: brightness,
-      colorScheme: (kDebugMode)
-          ? _getUndefinedColorScheme(brightness)
-          : ColorScheme.fromSeed(seedColor: colorScheme.primary, brightness: brightness),
-      textTheme: (kDebugMode) ? _getUndefinedTextTheme() : null,
+      colorScheme: nativeColorScheme,
+      visualDensity: VisualDensity.standard, // Needed for consistent web and app sizing
+      textTheme: kDebugMode ? _getUndefinedTextTheme() : null,
       scaffoldBackgroundColor: colorScheme.surface,
       // Warning: IconButtonTheme needs to be set till this is fixed: https://github.com/flutter/flutter/issues/130485
       iconButtonTheme: const IconButtonThemeData(style: ButtonStyle()),
@@ -100,20 +109,18 @@ class AppTheme {
 BottomSheetThemeData _getBottomSheetThemeData({
   required CustomColorScheme colorScheme,
   required CustomTextTheme textTheme,
-}) =>
-    BottomSheetThemeData(
-      backgroundColor: colorScheme.surface,
-      surfaceTintColor: colorScheme.surface,
-      shape: const RoundedRectangleBorder(
-        borderRadius: BorderRadius.only(topLeft: Radius.circular(12), topRight: Radius.circular(12)),
-      ),
-    );
+}) => BottomSheetThemeData(
+  backgroundColor: colorScheme.surface,
+  surfaceTintColor: colorScheme.surface,
+  shape: const RoundedRectangleBorder(
+    borderRadius: BorderRadius.only(topLeft: Radius.circular(12), topRight: Radius.circular(12)),
+  ),
+);
 
 TextSelectionThemeData _getTextSelectionThemeData({
   required CustomColorScheme colorScheme,
-}) =>
-    TextSelectionThemeData(
-      cursorColor: colorScheme.secondary,
-      selectionColor: colorScheme.secondary.withValues(alpha: 0.3),
-      selectionHandleColor: colorScheme.secondary,
-    );
+}) => TextSelectionThemeData(
+  cursorColor: colorScheme.secondary,
+  selectionColor: colorScheme.secondary.withValues(alpha: 0.3),
+  selectionHandleColor: colorScheme.secondary,
+);
diff --git a/lib/app/theme/custom_color_scheme.dart b/lib/app/theme/custom_color_scheme.dart
index 65e71c1..76a3900 100644
--- a/lib/app/theme/custom_color_scheme.dart
+++ b/lib/app/theme/custom_color_scheme.dart
@@ -6,40 +6,40 @@ class CustomColorScheme {
       (brightness.isLightMode) ? CustomColorScheme._light() : CustomColorScheme._dark();
 
   CustomColorScheme._light()
-      : brightness = Brightness.light,
-        primary = const Color(0xFF0A59F8),
-        onPrimary = const Color(0xFFFFFFFF),
-        secondary = const Color(0xFF000000),
-        onSecondary = const Color(0xFFFFFFFF),
-        surface = const Color(0xFFFFFFFF),
-        surfaceVariant = const Color(0xFFF7F7F7),
-        onSurface = const Color(0xFF000000),
-        snackbarBackground = const Color(0xFF041028),
-        snackbarText = const Color(0xFFFFFFFF),
-        success = const Color(0xFF10B452),
-        error = const Color(0xFFE51934),
-        shadow = const Color(0x66000000),
-        divider = const Color(0xFFEBEBEB),
-        shimmerBackground = const Color(0xFFF0F0F0),
-        shimmerForeground = const Color(0xFFF7F7F7);
+    : brightness = Brightness.light,
+      primary = const Color(0xFF0A59F8),
+      onPrimary = const Color(0xFFFFFFFF),
+      secondary = const Color(0xFF000000),
+      onSecondary = const Color(0xFFFFFFFF),
+      surface = const Color(0xFFFFFFFF),
+      surfaceVariant = const Color(0xFFF7F7F7),
+      onSurface = const Color(0xFF000000),
+      snackbarBackground = const Color(0xFF041028),
+      snackbarText = const Color(0xFFFFFFFF),
+      success = const Color(0xFF10B452),
+      error = const Color(0xFFE51934),
+      shadow = const Color(0x66000000),
+      divider = const Color(0xFFEBEBEB),
+      shimmerBackground = const Color(0xFFF0F0F0),
+      shimmerForeground = const Color(0xFFF7F7F7);
 
   CustomColorScheme._dark()
-      : brightness = Brightness.dark,
-        primary = const Color(0xFF0A59F8),
-        onPrimary = const Color(0xFFFFFFFF),
-        secondary = const Color(0xFFFFFFFF),
-        onSecondary = const Color(0xFF000000),
-        surface = const Color(0xFF000000),
-        surfaceVariant = const Color(0x1AFFFFFF),
-        onSurface = const Color(0xFFFFFFFF),
-        snackbarBackground = const Color(0xFF041028),
-        snackbarText = const Color(0xFFFFFFFF),
-        success = const Color(0xFF10B452),
-        error = const Color(0xFFE51934),
-        shadow = const Color(0x66000000),
-        divider = const Color(0xFFEBEBEB),
-        shimmerBackground = const Color(0xFF1F1F1F),
-        shimmerForeground = const Color(0x1AFFFFFF);
+    : brightness = Brightness.dark,
+      primary = const Color(0xFF0A59F8),
+      onPrimary = const Color(0xFFFFFFFF),
+      secondary = const Color(0xFFFFFFFF),
+      onSecondary = const Color(0xFF000000),
+      surface = const Color(0xFF000000),
+      surfaceVariant = const Color(0x1AFFFFFF),
+      onSurface = const Color(0xFFFFFFFF),
+      snackbarBackground = const Color(0xFF041028),
+      snackbarText = const Color(0xFFFFFFFF),
+      success = const Color(0xFF10B452),
+      error = const Color(0xFFE51934),
+      shadow = const Color(0x66000000),
+      divider = const Color(0xFFEBEBEB),
+      shimmerBackground = const Color(0xFF1F1F1F),
+      shimmerForeground = const Color(0x1AFFFFFF);
 
   // Title: Theme specific colors
   final Brightness brightness;
diff --git a/lib/app/theme/custom_system_bars_theme.dart b/lib/app/theme/custom_system_bars_theme.dart
index e2a4f01..0f2c5a4 100644
--- a/lib/app/theme/custom_system_bars_theme.dart
+++ b/lib/app/theme/custom_system_bars_theme.dart
@@ -1,9 +1,9 @@
-import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_app/app/configuration/configuration.dart';
 import 'package:flutter_app/app/setup/app_platform.dart';
+import 'package:flutter_app/common/component/custom_app_bar.dart' show CustomAppBar;
 import 'package:flutter_app/common/extension/brightness.dart';
 import 'package:flutter_app/common/provider/theme_mode_provider.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -25,15 +25,10 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 ///
 class CustomSystemBarsTheme {
   static Future<void> setupSystemBarsTheme({required ProviderContainer providerContainer}) async {
-    final brightness = providerContainer.read(themeModeNotifierProvider.notifier).brightness;
-    SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
-    await _setupSystemBarsUpdateCallback(providerContainer: providerContainer);
-    await setSystemBarsTheme(brightness: brightness);
-  }
+    final brightness = providerContainer.read(themeModeProvider.notifier).brightness;
 
-  static Future<void> setSystemBarsTheme({required Brightness brightness}) async {
-    final brightness = PlatformDispatcher.instance.platformBrightness;
-    SystemChrome.setSystemUIOverlayStyle((getSystemBarsTheme(brightness: brightness)));
+    await _setupSystemBarsUpdateCallback(providerContainer: providerContainer);
+    _setSystemBarsTheme(brightness: brightness);
   }
 
   static SystemUiOverlayStyle getSystemBarsTheme({required Brightness brightness}) {
@@ -42,19 +37,23 @@ class CustomSystemBarsTheme {
     } else if (AppPlatform.isIOS) {
       return _getIosSystemBarsTheme(brightness: brightness);
     } else {
-      return (((brightness).isLightMode) ? SystemUiOverlayStyle.light : SystemUiOverlayStyle.dark);
+      return ((brightness.isLightMode) ? SystemUiOverlayStyle.light : SystemUiOverlayStyle.dark);
     }
   }
 
+  static void _setSystemBarsTheme({required Brightness brightness}) {
+    SystemChrome.setSystemUIOverlayStyle(getSystemBarsTheme(brightness: brightness));
+  }
+
   static SystemUiOverlayStyle _getAndroidSystemBarsTheme({required Brightness brightness}) {
-    final AndroidDeviceInfo androidInfo = Configuration.instance.androidDeviceInfo!;
-    final bool canUseTransparentNavigation = androidInfo.version.sdkInt >= 29; // Enabled by default for iOS
+    final androidInfo = Configuration.instance.androidDeviceInfo!;
+    final canUseTransparentNavigation = androidInfo.version.sdkInt >= 29; // Enabled by default for iOS
 
     return SystemUiOverlayStyle(
       // StatusBar
       systemStatusBarContrastEnforced: false,
       statusBarColor: Colors.transparent,
-      statusBarIconBrightness: brightness.inverse, // For Android
+      statusBarIconBrightness: brightness.inverse,
 
       // NavigationBar
       systemNavigationBarContrastEnforced: false,
@@ -63,8 +62,8 @@ class CustomSystemBarsTheme {
       systemNavigationBarColor: canUseTransparentNavigation
           ? Colors.transparent
           : brightness.isLightMode
-              ? Colors.white
-              : Colors.black,
+          ? Colors.white
+          : Colors.black,
     );
   }
 
@@ -72,14 +71,9 @@ class CustomSystemBarsTheme {
     return SystemUiOverlayStyle(
       // StatusBar
       systemStatusBarContrastEnforced: false,
-      statusBarColor: Colors.transparent,
       statusBarBrightness: brightness, // For iOS
-
       // NavigationBar
       systemNavigationBarContrastEnforced: false,
-      systemNavigationBarColor: Colors.transparent,
-      systemNavigationBarDividerColor: Colors.transparent,
-      systemNavigationBarIconBrightness: brightness,
     );
   }
 
@@ -87,21 +81,21 @@ class CustomSystemBarsTheme {
     final originalCallback = PlatformDispatcher.instance.onPlatformBrightnessChanged;
     PlatformDispatcher.instance.onPlatformBrightnessChanged = () async {
       originalCallback?.call();
-      final themeMode = await providerContainer.read(themeModeNotifierProvider.future);
+      final themeMode = await providerContainer.read(themeModeProvider.future);
       if (themeMode == ThemeMode.system) {
-        setSystemBarsTheme(brightness: PlatformDispatcher.instance.platformBrightness);
+        _setSystemBarsTheme(brightness: PlatformDispatcher.instance.platformBrightness);
       }
     };
 
     // HotFix for API 28, that need SystemBarsTheme applied on each app resume!
     if (AppPlatform.isAndroid) {
-      final AndroidDeviceInfo androidInfo = await DeviceInfoPlugin().androidInfo;
+      final androidInfo = Configuration.instance.androidDeviceInfo!;
       if (androidInfo.version.sdkInt == 28) {
         SystemChannels.lifecycle.setMessageHandler((msg) async {
           if (msg == AppLifecycleState.resumed.toString()) {
-            final themeMode = await providerContainer.read(themeModeNotifierProvider.future);
+            final themeMode = await providerContainer.read(themeModeProvider.future);
             if (themeMode == ThemeMode.system) {
-              setSystemBarsTheme(brightness: PlatformDispatcher.instance.platformBrightness);
+              _setSystemBarsTheme(brightness: PlatformDispatcher.instance.platformBrightness);
             }
           }
           return Future.value(msg);
@@ -113,9 +107,9 @@ class CustomSystemBarsTheme {
 
 class CustomSystemBarsThemeWidget extends StatelessWidget {
   const CustomSystemBarsThemeWidget({
-    super.key,
     required this.brightness,
     required this.child,
+    super.key,
   });
 
   final Brightness brightness;
diff --git a/lib/app/theme/custom_text_theme.dart b/lib/app/theme/custom_text_theme.dart
index 0b8c82a..3bb7bcf 100644
--- a/lib/app/theme/custom_text_theme.dart
+++ b/lib/app/theme/custom_text_theme.dart
@@ -18,110 +18,110 @@ import 'package:flutter_app/assets/fonts.gen.dart';
 ///
 class CustomTextTheme {
   CustomTextTheme({required CustomColorScheme colorScheme})
-      : // Subtitle: Display
-        displayLarge = TextStyle(
-          fontSize: 57,
-          fontFamily: FontFamily.clashDisplay,
-          fontWeight: FontWeight.w400,
-          color: colorScheme.onSurface,
-          decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
-        ),
-        displayMedium = TextStyle(
-          fontSize: 45,
-          fontFamily: FontFamily.clashDisplay,
-          fontWeight: FontWeight.w400,
-          color: colorScheme.onSurface,
-          decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
-        ),
-        displaySmall = TextStyle(
-          fontSize: 36,
-          fontFamily: FontFamily.clashDisplay,
-          fontWeight: FontWeight.w400,
-          color: colorScheme.onSurface,
-          decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
-        ),
-        // Subtitle: Headline
-        headlineLarge = TextStyle(
-          fontSize: 32,
-          fontFamily: FontFamily.clashDisplay,
-          fontWeight: FontWeight.w400,
-          color: colorScheme.onSurface,
-          decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
-        ),
-        headlineMedium = TextStyle(
-          fontSize: 28,
-          fontFamily: FontFamily.clashDisplay,
-          fontWeight: FontWeight.w400,
-          color: colorScheme.onSurface,
-          decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
-        ),
-        headlineSmall = TextStyle(
-          fontSize: 24,
-          fontFamily: FontFamily.clashDisplay,
-          fontWeight: FontWeight.w400,
-          color: colorScheme.onSurface,
-          decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
-        ),
-        // Subtitle: Title
-        titleLarge = TextStyle(
-          fontSize: 22,
-          fontFamily: FontFamily.clashDisplay,
-          fontWeight: FontWeight.w400,
-          color: colorScheme.onSurface,
-          decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
-        ),
-        titleMedium = TextStyle(
-          fontSize: 16,
-          fontFamily: FontFamily.clashDisplay,
-          fontWeight: FontWeight.w500,
-          color: colorScheme.onSurface,
-          decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
-        ),
-        titleSmall = TextStyle(
-          fontSize: 14,
-          fontFamily: FontFamily.clashDisplay,
-          fontWeight: FontWeight.w500,
-          color: colorScheme.onSurface,
-          decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
-        ),
-        // Subtitle: Label
-        labelLarge = TextStyle(
-          fontSize: 14,
-          fontWeight: FontWeight.w500,
-          color: colorScheme.onSurface,
-          decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
-        ),
-        labelMedium = TextStyle(
-          fontSize: 12,
-          fontWeight: FontWeight.w500,
-          color: colorScheme.onSurface,
-          decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
-        ),
-        labelSmall = TextStyle(
-          fontSize: 11,
-          fontWeight: FontWeight.w500,
-          color: colorScheme.onSurface,
-          decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
-        ),
-        // Subtitle: Body
-        bodyLarge = TextStyle(
-          fontSize: 16,
-          fontWeight: FontWeight.w400,
-          color: colorScheme.onSurface,
-          decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
-        ),
-        bodyMedium = TextStyle(
-          fontSize: 14,
-          fontWeight: FontWeight.w400,
-          color: colorScheme.onSurface,
-          decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
-        ),
-        bodySmall = TextStyle(
-          fontSize: 12,
-          fontWeight: FontWeight.w400,
-          color: colorScheme.onSurface,
-          decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
-        );
+    : // Subtitle: Display
+      displayLarge = TextStyle(
+        fontSize: 57,
+        fontFamily: FontFamily.clashDisplay,
+        fontWeight: FontWeight.w400,
+        color: colorScheme.onSurface,
+        decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
+      ),
+      displayMedium = TextStyle(
+        fontSize: 45,
+        fontFamily: FontFamily.clashDisplay,
+        fontWeight: FontWeight.w400,
+        color: colorScheme.onSurface,
+        decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
+      ),
+      displaySmall = TextStyle(
+        fontSize: 36,
+        fontFamily: FontFamily.clashDisplay,
+        fontWeight: FontWeight.w400,
+        color: colorScheme.onSurface,
+        decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
+      ),
+      // Subtitle: Headline
+      headlineLarge = TextStyle(
+        fontSize: 32,
+        fontFamily: FontFamily.clashDisplay,
+        fontWeight: FontWeight.w400,
+        color: colorScheme.onSurface,
+        decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
+      ),
+      headlineMedium = TextStyle(
+        fontSize: 28,
+        fontFamily: FontFamily.clashDisplay,
+        fontWeight: FontWeight.w400,
+        color: colorScheme.onSurface,
+        decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
+      ),
+      headlineSmall = TextStyle(
+        fontSize: 24,
+        fontFamily: FontFamily.clashDisplay,
+        fontWeight: FontWeight.w400,
+        color: colorScheme.onSurface,
+        decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
+      ),
+      // Subtitle: Title
+      titleLarge = TextStyle(
+        fontSize: 22,
+        fontFamily: FontFamily.clashDisplay,
+        fontWeight: FontWeight.w400,
+        color: colorScheme.onSurface,
+        decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
+      ),
+      titleMedium = TextStyle(
+        fontSize: 16,
+        fontFamily: FontFamily.clashDisplay,
+        fontWeight: FontWeight.w500,
+        color: colorScheme.onSurface,
+        decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
+      ),
+      titleSmall = TextStyle(
+        fontSize: 14,
+        fontFamily: FontFamily.clashDisplay,
+        fontWeight: FontWeight.w500,
+        color: colorScheme.onSurface,
+        decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
+      ),
+      // Subtitle: Label
+      labelLarge = TextStyle(
+        fontSize: 14,
+        fontWeight: FontWeight.w500,
+        color: colorScheme.onSurface,
+        decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
+      ),
+      labelMedium = TextStyle(
+        fontSize: 12,
+        fontWeight: FontWeight.w500,
+        color: colorScheme.onSurface,
+        decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
+      ),
+      labelSmall = TextStyle(
+        fontSize: 11,
+        fontWeight: FontWeight.w500,
+        color: colorScheme.onSurface,
+        decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
+      ),
+      // Subtitle: Body
+      bodyLarge = TextStyle(
+        fontSize: 16,
+        fontWeight: FontWeight.w400,
+        color: colorScheme.onSurface,
+        decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
+      ),
+      bodyMedium = TextStyle(
+        fontSize: 14,
+        fontWeight: FontWeight.w400,
+        color: colorScheme.onSurface,
+        decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
+      ),
+      bodySmall = TextStyle(
+        fontSize: 12,
+        fontWeight: FontWeight.w400,
+        color: colorScheme.onSurface,
+        decorationColor: colorScheme.onSurface, // Used for autofill, suggestion underline, etc.
+      );
 
   // Title: Theme specific TextStyles
 
diff --git a/lib/common/animation/custom_fade_slide_animation.dart b/lib/common/animation/custom_fade_slide_animation.dart
index 1459fb0..76b9141 100644
--- a/lib/common/animation/custom_fade_slide_animation.dart
+++ b/lib/common/animation/custom_fade_slide_animation.dart
@@ -13,15 +13,15 @@ import 'package:flutter/material.dart';
 /// [textDirection] : direction of the text for slide animation (default: [TextDirection.ltr])
 class CustomFadeSlideAnimation extends StatefulWidget {
   const CustomFadeSlideAnimation({
-    super.key,
     required this.child,
+    super.key,
     this.beginOffset = const Offset(0, 0.5),
-    this.endOffset = const Offset(0, 0),
+    this.endOffset = Offset.zero,
     this.fadeDuration = const Duration(milliseconds: 1000),
     this.slideDuration = const Duration(milliseconds: 500),
     this.fadeCurve = Curves.decelerate,
     this.slideCurve = Curves.decelerate,
-    this.delay = const Duration(milliseconds: 0),
+    this.delay = Duration.zero,
     this.textDirection = TextDirection.ltr,
   });
 
@@ -46,7 +46,7 @@ class CustomFadeSlideAnimationState extends State<CustomFadeSlideAnimation> with
   late AnimationController? _fadeController;
   late AnimationController? _slideController;
 
-  /// Controllers are initialised in [initState] with the values defined or received as parameters in the widget
+  /// Controllers are initialized in [initState] with the values defined or received as parameters in the widget
   @override
   void initState() {
     super.initState();
@@ -61,7 +61,7 @@ class CustomFadeSlideAnimationState extends State<CustomFadeSlideAnimation> with
     );
 
     // Start animation after the specified delay
-    Future.delayed(widget.delay).then((value) => {_fadeController?.forward(), _slideController?.forward()});
+    Future<void>.delayed(widget.delay).then((value) => {_fadeController?.forward(), _slideController?.forward()});
   }
 
   /// Both the animation controllers are being disposed for safety
diff --git a/lib/common/component/custom_app_bar.dart b/lib/common/component/custom_app_bar.dart
index aac520f..6ab8289 100644
--- a/lib/common/component/custom_app_bar.dart
+++ b/lib/common/component/custom_app_bar.dart
@@ -31,7 +31,7 @@ class CustomAppBar extends ConsumerWidget implements PreferredSizeWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final themeModeBrightness = brightness ?? ref.read(themeModeNotifierProvider.notifier).brightness;
+    final themeModeBrightness = brightness ?? ref.read(themeModeProvider.notifier).brightness;
     return AppBar(
       toolbarHeight: toolbarHeight ?? kToolbarHeight,
       automaticallyImplyLeading: automaticallyImplyLeading,
@@ -44,7 +44,7 @@ class CustomAppBar extends ConsumerWidget implements PreferredSizeWidget {
       titleTextStyle: context.textTheme.titleLarge,
       shadowColor: context.colorScheme.shadow,
       scrolledUnderElevation: 4,
-      elevation: (forceElevated == true) ? 4 : 0,
+      elevation: (forceElevated ?? false) ? 4 : 0,
       actions: actions,
       bottom: bottom,
     );
diff --git a/lib/common/component/custom_bottom_app_bar.dart b/lib/common/component/custom_bottom_app_bar.dart
index 4ccef6e..f991325 100644
--- a/lib/common/component/custom_bottom_app_bar.dart
+++ b/lib/common/component/custom_bottom_app_bar.dart
@@ -5,9 +5,9 @@ import 'package:flutter_app/common/extension/build_context.dart';
 
 class CustomBottomAppBar extends StatelessWidget {
   const CustomBottomAppBar({
-    super.key,
     required this.selectedIndex,
     required this.items,
+    super.key,
   });
 
   final int selectedIndex;
@@ -21,9 +21,8 @@ class CustomBottomAppBar extends StatelessWidget {
       elevation: 8,
       height: 64,
       shadowColor: Colors.black,
-      padding: const EdgeInsets.all(0),
+      padding: EdgeInsets.zero,
       child: Row(
-        mainAxisSize: MainAxisSize.max,
         children: items.mapIndexed((index, item) => _BottomAppBarButton(item: item, isSelected: index == selectedIndex)).toList(),
       ),
     );
@@ -32,7 +31,6 @@ class CustomBottomAppBar extends StatelessWidget {
 
 class CustomBottomAppBarItem {
   CustomBottomAppBarItem({
-    Key? key,
     required this.label,
     required this.icon,
     required this.onSelectListener,
diff --git a/lib/common/component/custom_button/custom_button_primary.dart b/lib/common/component/custom_button/custom_button_primary.dart
index 7a96f4a..cb56aa7 100644
--- a/lib/common/component/custom_button/custom_button_primary.dart
+++ b/lib/common/component/custom_button/custom_button_primary.dart
@@ -6,9 +6,9 @@ import 'package:flutter_app/common/extension/build_context.dart';
 
 class CustomButtonPrimary extends StatelessWidget {
   const CustomButtonPrimary({
-    super.key,
     required this.text,
     required this.onPressed,
+    super.key,
     this.isLoading = false,
     this.isEnabled = true,
   });
@@ -29,7 +29,7 @@ class CustomButtonPrimary extends StatelessWidget {
               onPressed();
             },
       style: _getButtonStyle(context),
-      child: (isLoading)
+      child: isLoading
           ? SizedBox(
               width: 24,
               height: 24,
diff --git a/lib/common/component/custom_floating_action_button.dart b/lib/common/component/custom_floating_action_button.dart
index e556409..c5c6f4a 100644
--- a/lib/common/component/custom_floating_action_button.dart
+++ b/lib/common/component/custom_floating_action_button.dart
@@ -3,9 +3,9 @@ import 'package:flutter_app/common/extension/build_context.dart';
 
 class CustomFloatingActionButton extends StatelessWidget {
   const CustomFloatingActionButton({
-    super.key,
     required this.child,
     required this.onPressed,
+    super.key,
   });
 
   final Icon child;
diff --git a/lib/common/component/custom_icon_button.dart b/lib/common/component/custom_icon_button.dart
index db249bf..1db6d65 100644
--- a/lib/common/component/custom_icon_button.dart
+++ b/lib/common/component/custom_icon_button.dart
@@ -3,9 +3,9 @@ import 'package:flutter_app/common/component/custom_progress_indicator.dart';
 
 class CustomIconButton extends StatelessWidget {
   const CustomIconButton({
-    super.key,
     required this.icon,
     required this.onPressed,
+    super.key,
     this.isLoading = false,
     this.buttonSize = 44,
     this.iconSize = 24,
diff --git a/lib/common/component/custom_ink_well/custom_ink_well_circular.dart b/lib/common/component/custom_ink_well/custom_ink_well_circular.dart
index 709972e..658e4ad 100644
--- a/lib/common/component/custom_ink_well/custom_ink_well_circular.dart
+++ b/lib/common/component/custom_ink_well/custom_ink_well_circular.dart
@@ -2,15 +2,15 @@ import 'package:flutter/material.dart';
 
 class CustomInkWellCircular extends StatelessWidget {
   const CustomInkWellCircular({
-    super.key,
     required this.onClick,
+    required this.child,
+    super.key,
     this.onLongClick,
     this.padding,
-    required this.child,
   });
 
-  final Function()? onClick;
-  final Function()? onLongClick;
+  final VoidCallback? onClick;
+  final VoidCallback? onLongClick;
   final EdgeInsets? padding;
   final Widget child;
 
@@ -20,7 +20,7 @@ class CustomInkWellCircular extends StatelessWidget {
       alignment: Alignment.center,
       children: [
         Padding(
-          padding: padding ?? const EdgeInsets.all(0),
+          padding: padding ?? EdgeInsets.zero,
           child: child,
         ),
         Positioned.fill(
diff --git a/lib/common/component/custom_ink_well/custom_ink_well_rounded_rectangle.dart b/lib/common/component/custom_ink_well/custom_ink_well_rounded_rectangle.dart
index 815fce0..4d25c5f 100644
--- a/lib/common/component/custom_ink_well/custom_ink_well_rounded_rectangle.dart
+++ b/lib/common/component/custom_ink_well/custom_ink_well_rounded_rectangle.dart
@@ -2,16 +2,16 @@ import 'package:flutter/material.dart';
 
 class CustomInkWellRoundedRectangle extends StatelessWidget {
   const CustomInkWellRoundedRectangle({
-    super.key,
     required this.onClick,
-    this.onLongClick,
     required this.cornerRadius,
-    this.padding,
     required this.child,
+    super.key,
+    this.onLongClick,
+    this.padding,
   });
 
-  final Function()? onClick;
-  final Function()? onLongClick;
+  final VoidCallback? onClick;
+  final VoidCallback? onLongClick;
   final double cornerRadius;
   final EdgeInsets? padding;
   final Widget child;
@@ -21,7 +21,7 @@ class CustomInkWellRoundedRectangle extends StatelessWidget {
     return Stack(
       children: [
         Padding(
-          padding: padding ?? const EdgeInsets.all(0),
+          padding: padding ?? EdgeInsets.zero,
           child: child,
         ),
         Positioned.fill(
diff --git a/lib/common/component/custom_network_image.dart b/lib/common/component/custom_network_image.dart
index d51e708..5c7265f 100644
--- a/lib/common/component/custom_network_image.dart
+++ b/lib/common/component/custom_network_image.dart
@@ -5,10 +5,10 @@ import 'package:flutter_app/common/component/custom_progress_indicator.dart';
 
 class CustomNetworkImage extends StatelessWidget {
   const CustomNetworkImage({
-    super.key,
     required this.url,
     required this.width,
     required this.height,
+    super.key,
     this.fit,
     this.shape,
     this.border,
@@ -16,15 +16,15 @@ class CustomNetworkImage extends StatelessWidget {
   });
 
   const CustomNetworkImage.square({
-    super.key,
     required this.url,
     required double? size,
+    super.key,
     this.fit,
     this.shape,
     this.border,
     this.borderRadius,
-  })  : width = size,
-        height = size;
+  }) : width = size,
+       height = size;
 
   final String url;
   final double? width;
@@ -41,7 +41,6 @@ class CustomNetworkImage extends StatelessWidget {
       width: width,
       height: height,
       fit: fit ?? BoxFit.cover,
-      cache: true,
       shape: shape,
       border: border,
       borderRadius: borderRadius,
diff --git a/lib/common/component/custom_profile_avatar.dart b/lib/common/component/custom_profile_avatar.dart
index b48da3c..1adafed 100644
--- a/lib/common/component/custom_profile_avatar.dart
+++ b/lib/common/component/custom_profile_avatar.dart
@@ -6,10 +6,10 @@ import 'package:flutter_app/common/component/custom_progress_indicator.dart';
 
 class CustomClickableProfileAvatar extends StatelessWidget {
   const CustomClickableProfileAvatar({
-    super.key,
     required this.imageUrl,
     required this.size,
     required this.onClick,
+    super.key,
     this.onLongClick,
   });
 
@@ -37,9 +37,9 @@ class CustomClickableProfileAvatar extends StatelessWidget {
 
 class CustomProfileAvatar extends StatelessWidget {
   const CustomProfileAvatar({
-    super.key,
     required this.imageUrl,
     required this.size,
+    super.key,
   });
 
   final String imageUrl;
@@ -55,7 +55,6 @@ class CustomProfileAvatar extends StatelessWidget {
           width: size,
           height: size,
           fit: BoxFit.cover,
-          cache: true,
           loadStateChanged: (state) {
             switch (state.extendedImageLoadState) {
               case LoadState.loading:
diff --git a/lib/common/component/custom_progress_indicator.dart b/lib/common/component/custom_progress_indicator.dart
index 2456ca5..3b823be 100644
--- a/lib/common/component/custom_progress_indicator.dart
+++ b/lib/common/component/custom_progress_indicator.dart
@@ -24,50 +24,52 @@ class CustomProgressIndicator extends StatelessWidget {
   Widget build(BuildContext context) {
     final color = this.color ?? context.colorScheme.onSurface;
 
-    return LayoutBuilder(builder: (context, constraints) {
-      double realSize = size;
-      if (constraints.maxHeight < realSize && constraints.maxHeight > 0) realSize = constraints.maxHeight;
-      if (constraints.maxWidth < realSize && constraints.maxWidth > 0) realSize = constraints.maxWidth;
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        var realSize = size;
+        if (constraints.maxHeight < realSize && constraints.maxHeight > 0) realSize = constraints.maxHeight;
+        if (constraints.maxWidth < realSize && constraints.maxWidth > 0) realSize = constraints.maxWidth;
 
-      if (AppPlatform.isApple) {
-        /// For the iOS, the issue is that the indicator does not scale at all. We can handle that using Transform.
-        return CupertinoActivityIndicator(
-          radius: realSize / 2 / iosIndicatorScalingFactor,
-          color: color,
-        );
-      } else {
-        /// For Material indicator, the issue is that it is overlapping it parent by the half size of it stroke width.
-        /// Sadly to size it properly, we need to double wrap it in SizedBox.
-        /// Another issue is the scaling of the widget when we won't set the size. Because of that we need to wrap it inside LayoutBuilder.
+        if (AppPlatform.isApple) {
+          /// For the iOS, the issue is that the indicator does not scale at all. We can handle that using Transform.
+          return CupertinoActivityIndicator(
+            radius: realSize / 2 / iosIndicatorScalingFactor,
+            color: color,
+          );
+        } else {
+          /// For Material indicator, the issue is that it is overlapping it parent by the half size of it stroke width.
+          /// Sadly to size it properly, we need to double wrap it in SizedBox.
+          /// Another issue is the scaling of the widget when we won't set the size. Because of that we need to wrap it inside LayoutBuilder.
 
-        double? strokeWidth = materialStrokeWidth;
-        if (strokeWidth == null) {
-          if (realSize < 16) {
-            strokeWidth = 1;
-          } else if (realSize < 24) {
-            strokeWidth = 2;
-          } else if (realSize < 36) {
-            strokeWidth = 3;
-          } else {
-            strokeWidth = 4;
+          var strokeWidth = materialStrokeWidth;
+          if (strokeWidth == null) {
+            if (realSize < 16) {
+              strokeWidth = 1;
+            } else if (realSize < 24) {
+              strokeWidth = 2;
+            } else if (realSize < 36) {
+              strokeWidth = 3;
+            } else {
+              strokeWidth = 4;
+            }
           }
-        }
 
-        return SizedBox(
-          width: realSize,
-          height: realSize,
-          child: Center(
-            child: SizedBox(
-              width: realSize - strokeWidth,
-              height: realSize - strokeWidth,
-              child: CircularProgressIndicator(
-                strokeWidth: strokeWidth,
-                valueColor: AlwaysStoppedAnimation(color),
+          return SizedBox(
+            width: realSize,
+            height: realSize,
+            child: Center(
+              child: SizedBox(
+                width: realSize - strokeWidth,
+                height: realSize - strokeWidth,
+                child: CircularProgressIndicator(
+                  strokeWidth: strokeWidth,
+                  valueColor: AlwaysStoppedAnimation(color),
+                ),
               ),
             ),
-          ),
-        );
-      }
-    });
+          );
+        }
+      },
+    );
   }
 }
diff --git a/lib/common/component/custom_radio_button_group.dart b/lib/common/component/custom_radio_button_group.dart
index db3d3bb..4839aab 100644
--- a/lib/common/component/custom_radio_button_group.dart
+++ b/lib/common/component/custom_radio_button_group.dart
@@ -5,48 +5,48 @@ import 'package:flutter_app/common/extension/build_context.dart';
 
 class CustomRadioButtonGroup<T> extends StatelessWidget {
   const CustomRadioButtonGroup({
-    super.key,
     required this.options,
     required this.selectedOption,
     required this.onOptionSelected,
+    super.key,
   });
 
   final Map<T, String> options;
   final T? selectedOption;
-  final Function(T) onOptionSelected;
+  final ValueChanged<T> onOptionSelected;
 
   @override
   Widget build(BuildContext context) {
-    return Column(
-      children: options.entries.map(
-        (entry) {
-          void onOptionClick() {
-            onOptionSelected(entry.key);
-          }
-
-          return CustomInkWellRoundedRectangle(
-            cornerRadius: 4,
-            onClick: onOptionClick,
-            child: Padding(
-              padding: const EdgeInsets.symmetric(vertical: 4, horizontal: 8),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.start,
-                crossAxisAlignment: CrossAxisAlignment.center,
-                children: [
-                  Radio(
-                    value: entry.key,
-                    groupValue: selectedOption,
-                    fillColor: WidgetStateProperty.all(context.colorScheme.primary),
-                    onChanged: (_) => onOptionClick,
-                  ),
-                  const SizedBox(width: 12),
-                  CustomText(text: entry.value, style: context.textTheme.labelLarge),
-                ],
+    return RadioGroup<T>(
+      groupValue: selectedOption,
+      onChanged: (value) {
+        if (value != null) {
+          onOptionSelected(value);
+        }
+      },
+      child: Column(
+        children: options.entries.map(
+          (entry) {
+            return CustomInkWellRoundedRectangle(
+              cornerRadius: 4,
+              onClick: () => onOptionSelected(entry.key),
+              child: Padding(
+                padding: const EdgeInsets.symmetric(vertical: 4, horizontal: 8),
+                child: Row(
+                  children: [
+                    Radio(
+                      value: entry.key,
+                      fillColor: WidgetStateProperty.all(context.colorScheme.primary),
+                    ),
+                    const SizedBox(width: 12),
+                    CustomText(text: entry.value, style: context.textTheme.labelLarge),
+                  ],
+                ),
               ),
-            ),
-          );
-        },
-      ).toList(),
+            );
+          },
+        ).toList(),
+      ),
     );
   }
 }
diff --git a/lib/common/component/custom_snackbar/custom_snackbar_error.dart b/lib/common/component/custom_snackbar/custom_snackbar_error.dart
index f5d43ff..b5b42a1 100644
--- a/lib/common/component/custom_snackbar/custom_snackbar_error.dart
+++ b/lib/common/component/custom_snackbar/custom_snackbar_error.dart
@@ -20,7 +20,7 @@ class CustomSnackbarError {
 
   Future<void> show() async {
     if (_shownMessages.contains(message)) {
-      Flogger.i('[CustomSnackBar] Not going to show message $message, because it\'s already in `_shownMessages`.');
+      Flogger.i("[CustomSnackBar] Not going to show message $message, because it's already in `_shownMessages`.");
       return;
     }
 
@@ -36,7 +36,7 @@ class CustomSnackbarError {
     final isSmallScreen = ResponsiveWidget.isSmallScreen(context);
 
     return SnackBar(
-      width: isSmallScreen ? null : ResponsiveWidget.mediumSizeTreshold,
+      width: isSmallScreen ? null : ResponsiveWidget.mediumSizeThreshold,
       margin: isSmallScreen ? EdgeInsets.only(left: 20, right: 20, top: 20, bottom: 20 + optionalBottomSpacing) : null,
       shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(12))),
       backgroundColor: context.colorScheme.snackbarBackground.withValues(alpha: 0.94),
diff --git a/lib/common/component/custom_snackbar/custom_snackbar_message.dart b/lib/common/component/custom_snackbar/custom_snackbar_message.dart
index 450146b..5335b99 100644
--- a/lib/common/component/custom_snackbar/custom_snackbar_message.dart
+++ b/lib/common/component/custom_snackbar/custom_snackbar_message.dart
@@ -19,7 +19,7 @@ class CustomSnackbarMessage {
 
   Future<void> show() async {
     if (_shownMessages.contains(message)) {
-      Flogger.i('[CustomSnackBar] Not going to show message $message, because it\'s already in `_shownMessages`.');
+      Flogger.i("[CustomSnackBar] Not going to show message $message, because it's already in `_shownMessages`.");
       return;
     }
 
@@ -35,7 +35,7 @@ class CustomSnackbarMessage {
     final isSmallScreen = ResponsiveWidget.isSmallScreen(context);
 
     return SnackBar(
-      width: isSmallScreen ? null : ResponsiveWidget.mediumSizeTreshold,
+      width: isSmallScreen ? null : ResponsiveWidget.mediumSizeThreshold,
       margin: isSmallScreen ? EdgeInsets.only(left: 20, right: 20, top: 20, bottom: 20 + optionalBottomSpacing) : null,
       shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(12))),
       backgroundColor: context.colorScheme.snackbarBackground.withValues(alpha: 0.94),
diff --git a/lib/common/component/custom_snackbar/custom_snackbar_success.dart b/lib/common/component/custom_snackbar/custom_snackbar_success.dart
index b05aef0..296d59d 100644
--- a/lib/common/component/custom_snackbar/custom_snackbar_success.dart
+++ b/lib/common/component/custom_snackbar/custom_snackbar_success.dart
@@ -20,7 +20,7 @@ class CustomSnackbarSuccess {
 
   Future<void> show() async {
     if (_shownMessages.contains(message)) {
-      Flogger.i('[CustomSnackBar] Not going to show message $message, because it\'s already in `_shownMessages`.');
+      Flogger.i("[CustomSnackBar] Not going to show message $message, because it's already in `_shownMessages`.");
       return;
     }
 
@@ -36,7 +36,7 @@ class CustomSnackbarSuccess {
     final isSmallScreen = ResponsiveWidget.isSmallScreen(context);
 
     return SnackBar(
-      width: isSmallScreen ? null : ResponsiveWidget.mediumSizeTreshold,
+      width: isSmallScreen ? null : ResponsiveWidget.mediumSizeThreshold,
       margin: isSmallScreen ? EdgeInsets.only(left: 20, right: 20, top: 20, bottom: 20 + optionalBottomSpacing) : null,
       shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(12))),
       backgroundColor: context.colorScheme.snackbarBackground.withValues(alpha: 0.94),
diff --git a/lib/common/component/custom_switch.dart b/lib/common/component/custom_switch.dart
index 76c0537..be3bd25 100644
--- a/lib/common/component/custom_switch.dart
+++ b/lib/common/component/custom_switch.dart
@@ -4,17 +4,17 @@ import 'package:flutter_app/common/extension/build_context.dart';
 
 class CustomSwitch extends StatelessWidget {
   const CustomSwitch({
-    super.key,
     required this.title,
     required this.value,
     required this.onChanged,
+    super.key,
     this.subtitle,
     this.dense = false,
   });
 
   final String title;
   final bool value;
-  final Function(bool value) onChanged;
+  final ValueChanged<bool> onChanged;
   final String? subtitle;
   final bool dense;
 
@@ -34,7 +34,7 @@ class CustomSwitch extends StatelessWidget {
       dense: dense,
       shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
       contentPadding: EdgeInsets.zero,
-      activeColor: context.colorScheme.primary,
+      activeThumbColor: context.colorScheme.primary,
       inactiveThumbColor: Colors.grey.shade600,
       inactiveTrackColor: Colors.grey.shade400,
       trackOutlineColor: WidgetStateProperty.all(Colors.transparent),
diff --git a/lib/common/component/custom_tab_bar.dart b/lib/common/component/custom_tab_bar.dart
index 4da50ac..ebcae0b 100644
--- a/lib/common/component/custom_tab_bar.dart
+++ b/lib/common/component/custom_tab_bar.dart
@@ -3,15 +3,15 @@ import 'package:flutter_app/common/extension/build_context.dart';
 
 class CustomTabBar extends StatelessWidget {
   const CustomTabBar({
+    required this.tabs,
     super.key,
     this.tabController,
-    required this.tabs,
     this.onTap,
   });
 
   final TabController? tabController;
   final List<Tab> tabs;
-  final void Function(int)? onTap;
+  final ValueChanged<int>? onTap;
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/common/component/custom_text/custom_text.dart b/lib/common/component/custom_text/custom_text.dart
index 68559ec..ac39e5c 100644
--- a/lib/common/component/custom_text/custom_text.dart
+++ b/lib/common/component/custom_text/custom_text.dart
@@ -4,9 +4,9 @@ import 'package:flutter_app/common/extension/build_context.dart';
 
 class CustomText extends StatelessWidget {
   const CustomText({
-    super.key,
     required this.text,
     required this.style,
+    super.key,
     this.color,
     this.padding = EdgeInsets.zero,
     this.textAlign = TextAlign.start,
diff --git a/lib/common/component/custom_text_field.dart b/lib/common/component/custom_text_field.dart
index c0fc508..6b081cc 100644
--- a/lib/common/component/custom_text_field.dart
+++ b/lib/common/component/custom_text_field.dart
@@ -25,8 +25,8 @@ class CustomTextField extends StatefulWidget {
     this.withCounterText = false,
     this.note,
     this.prefix,
-  })  : assert(!(controller != null && validatorController != null), 'You can only provide controller or validationController!'),
-        assert(!(withCounterText == true && maxLength == null), 'maxLength must be set when the withCounterText is used!');
+  }) : assert(!(controller != null && validatorController != null), 'You can only provide controller or validationController!'),
+       assert(!(withCounterText && maxLength == null), 'maxLength must be set when the withCounterText is used!');
 
   final String? label;
   final TextEditingController? controller;
@@ -51,7 +51,7 @@ class CustomTextField extends StatefulWidget {
 }
 
 class _CustomTextFieldState extends State<CustomTextField> {
-  var textLength = 0;
+  int textLength = 0;
   final _focusNode = FocusNode();
   bool hasFocus = false;
   String lastErrorMessage = '';
@@ -61,8 +61,8 @@ class _CustomTextFieldState extends State<CustomTextField> {
   @override
   void initState() {
     super.initState();
-    widget.validatorController?.addListener(() => _onValidatorChange());
-    _focusNode.addListener(() => _onFocusChange());
+    widget.validatorController?.addListener(_onValidatorChange);
+    _focusNode.addListener(_onFocusChange);
 
     textLength = widget.validatorController?.text.length ?? widget.controller?.text.length ?? 0;
   }
@@ -75,14 +75,14 @@ class _CustomTextFieldState extends State<CustomTextField> {
 
   @override
   Widget build(BuildContext context) {
-    final double contentTopPadding = (widget.label == null) ? 17 : 9;
-    final double contentBottomPadding = (widget.label == null) ? 20 : 12;
+    final contentTopPadding = (widget.label == null) ? 17.0 : 9.0;
+    final contentBottomPadding = (widget.label == null) ? 20.0 : 12.0;
 
     // Subtitle: Enabled State colors
-    Color inputBgColor = context.colorScheme.surfaceVariant;
-    Color inputTextColor = context.colorScheme.onSurface;
-    Color labelTextColor = context.colorScheme.onSurface;
-    Color floatingLabelTextColor = context.colorScheme.onSurface;
+    var inputBgColor = context.colorScheme.surfaceVariant;
+    var inputTextColor = context.colorScheme.onSurface;
+    var labelTextColor = context.colorScheme.onSurface;
+    var floatingLabelTextColor = context.colorScheme.onSurface;
     final errorTextColor = context.colorScheme.error;
     final counterTextColor = context.colorScheme.onSurface;
     final noteTextColor = context.colorScheme.onSurface;
@@ -93,7 +93,7 @@ class _CustomTextFieldState extends State<CustomTextField> {
       inputTextColor = context.colorScheme.onSurface;
       labelTextColor = context.colorScheme.onSurface;
       floatingLabelTextColor = context.colorScheme.onSurface;
-    } else if (widget.enabled == false) {
+    } else if (!widget.enabled) {
       // Subtitle: Disabled State colors
       inputBgColor = context.colorScheme.surfaceVariant;
       inputTextColor = context.colorScheme.onSurface.withValues(alpha: 0.5);
@@ -191,7 +191,7 @@ class _CustomTextFieldState extends State<CustomTextField> {
                 errorTextColor: errorTextColor,
               ),
             ),
-            crossFadeState: widget.validatorController?.state.hasError == true ? CrossFadeState.showFirst : CrossFadeState.showSecond,
+            crossFadeState: (widget.validatorController?.state.hasError ?? false) ? CrossFadeState.showFirst : CrossFadeState.showSecond,
           ),
 
           // Title: Bottom note text
diff --git a/lib/common/component/custom_text_field_button.dart b/lib/common/component/custom_text_field_button.dart
index ea36101..7c73c87 100644
--- a/lib/common/component/custom_text_field_button.dart
+++ b/lib/common/component/custom_text_field_button.dart
@@ -5,8 +5,8 @@ import 'package:flutter_app/common/validator/text_validator_controller.dart';
 
 class CustomTextFieldButton extends StatelessWidget {
   const CustomTextFieldButton({
-    super.key,
     required this.onClick,
+    super.key,
     this.label,
     this.controller,
     this.validatorController,
diff --git a/lib/common/composition/bottom_sheet/bottom_sheet_container_widget.dart b/lib/common/composition/bottom_sheet/bottom_sheet_container_widget.dart
index f4a8e6c..f2fdf78 100644
--- a/lib/common/composition/bottom_sheet/bottom_sheet_container_widget.dart
+++ b/lib/common/composition/bottom_sheet/bottom_sheet_container_widget.dart
@@ -4,8 +4,8 @@ import 'package:modal_bottom_sheet/modal_bottom_sheet.dart';
 
 class BottomSheetContainerWidget extends StatelessWidget {
   const BottomSheetContainerWidget({
-    super.key,
     required this.child,
+    super.key,
   });
 
   final Widget child;
diff --git a/lib/common/composition/dialog/custom_alert_dialog.dart b/lib/common/composition/dialog/custom_alert_dialog.dart
deleted file mode 100644
index 7acceef..0000000
--- a/lib/common/composition/dialog/custom_alert_dialog.dart
+++ /dev/null
@@ -1,43 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_app/common/composition/dialog/custom_dialog_wrapper.dart';
-
-class CustomAlertDialog {
-  CustomAlertDialog({
-    required this.context,
-    required this.title,
-    this.message,
-    this.positiveActionTitle,
-    this.positiveAction,
-    this.neutralActionTitle,
-    this.neutralAction,
-    this.negativeActionTitle,
-    this.negativeAction,
-  });
-
-  final BuildContext context;
-  final String title;
-  final String? message;
-  final String? positiveActionTitle;
-  final VoidCallback? positiveAction;
-  final String? neutralActionTitle;
-  final VoidCallback? neutralAction;
-  final String? negativeActionTitle;
-  final VoidCallback? negativeAction;
-
-  Future<bool?> show() async {
-    return await showDialog<bool>(
-      context: context,
-      builder: (builderContext) => CustomDialogWrapper.alert(
-        context: builderContext,
-        title: title,
-        message: message,
-        positiveActionTitle: positiveActionTitle,
-        positiveAction: positiveAction,
-        neutralActionTitle: neutralActionTitle,
-        neutralAction: neutralAction,
-        negativeActionTitle: negativeActionTitle,
-        negativeAction: negativeAction,
-      ),
-    );
-  }
-}
diff --git a/lib/common/composition/dialog/custom_dialog_wrapper.dart b/lib/common/composition/dialog/custom_dialog.dart
similarity index 91%
rename from lib/common/composition/dialog/custom_dialog_wrapper.dart
rename to lib/common/composition/dialog/custom_dialog.dart
index eab993a..6d533e8 100644
--- a/lib/common/composition/dialog/custom_dialog_wrapper.dart
+++ b/lib/common/composition/dialog/custom_dialog.dart
@@ -4,12 +4,12 @@ import 'package:flutter_app/app/setup/app_platform.dart';
 import 'package:flutter_app/common/component/custom_text/custom_text.dart';
 import 'package:flutter_app/common/extension/build_context.dart';
 
-class CustomDialogWrapper extends StatelessWidget {
-  const CustomDialogWrapper.alert({
-    super.key,
+class CustomDialog extends StatelessWidget {
+  const CustomDialog.alert({
     required this.context,
     required this.title,
-    this.message,
+    required this.message,
+    super.key,
     this.positiveActionTitle,
     this.positiveAction,
     this.neutralActionTitle,
@@ -20,10 +20,10 @@ class CustomDialogWrapper extends StatelessWidget {
     this.forceMaterial = false,
   }) : content = null;
 
-  const CustomDialogWrapper.custom({
-    super.key,
+  const CustomDialog.custom({
     required this.context,
     required this.title,
+    super.key,
     this.content,
     this.positiveActionTitle,
     this.positiveAction,
@@ -80,12 +80,11 @@ class CustomDialogWrapper extends StatelessWidget {
     } else {
       return AlertDialog(
         title: CustomText(text: title, style: context.textTheme.titleLarge),
-        content: content ??
-            (message != null
-                ? SingleChildScrollView(
-                    child: CustomText(text: message!, style: context.textTheme.bodyMedium),
-                  )
-                : null),
+        content:
+            content ??
+            SingleChildScrollView(
+              child: CustomText(text: message!, style: context.textTheme.bodyMedium),
+            ),
         backgroundColor: context.colorScheme.surface,
         surfaceTintColor: context.colorScheme.surface, // Needs to be the same as backgroundColor
         shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(12))),
@@ -122,6 +121,13 @@ class CustomDialogWrapper extends StatelessWidget {
     }
   }
 
+  Future<bool?> show() {
+    return showDialog<bool>(
+      context: context,
+      builder: (builderContext) => this,
+    );
+  }
+
   void _positiveButtonAction(BuildContext context) {
     positiveAction?.call();
     if (automaticallyCloseOnAction) {
diff --git a/lib/common/composition/dialog/custom_notification_permission_denied_dialog.dart b/lib/common/composition/dialog/custom_notification_permission_denied_dialog.dart
new file mode 100644
index 0000000..20ad908
--- /dev/null
+++ b/lib/common/composition/dialog/custom_notification_permission_denied_dialog.dart
@@ -0,0 +1,23 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_app/common/composition/dialog/custom_dialog.dart';
+import 'package:flutter_app/common/extension/build_context.dart';
+import 'package:permission_handler/permission_handler.dart';
+
+/// Dialog for notifying users when notification permissions are denied.
+/// Provides options to open app settings or cancel the request.
+///
+/// Returns `true` if the user selected the positive action (Grant Access),
+/// `false` if the user selected the neutral action (Cancel) or dismissed the dialog.
+class CustomNotificationPermissionDeniedDialog {
+  static Future<bool> show(BuildContext context) async =>
+      await CustomDialog.alert(
+        context: context,
+        title: context.locale.notificationsPermissionDeniedDialogTitle,
+        message: context.locale.notificationsPermissionDeniedDialogText,
+        positiveActionTitle: context.locale.notificationsPermissionDeniedDialogPositiveAction,
+        positiveAction: openAppSettings,
+        neutralActionTitle: context.locale.notificationsPermissionDeniedDialogNeutralAction,
+      ).show() ??
+      false;
+}
diff --git a/lib/common/composition/expandable_single_child_scroll_view.dart b/lib/common/composition/expandable_single_child_scroll_view.dart
index 1c873cd..660bed6 100644
--- a/lib/common/composition/expandable_single_child_scroll_view.dart
+++ b/lib/common/composition/expandable_single_child_scroll_view.dart
@@ -4,10 +4,10 @@ import 'package:flutter/material.dart';
 /// but when child doesn't fit, it will automatically become scrollable widget.
 class ExpandableSingleChildScrollView extends StatelessWidget {
   const ExpandableSingleChildScrollView({
-    super.key,
     required this.child,
     this.padding = EdgeInsets.zero,
     this.alwaysScrollablePhysics = false,
+    super.key,
   });
 
   final Widget child;
@@ -19,7 +19,7 @@ class ExpandableSingleChildScrollView extends StatelessWidget {
     return LayoutBuilder(
       builder: (context, constraint) {
         return SingleChildScrollView(
-          physics: (alwaysScrollablePhysics) ? const AlwaysScrollableScrollPhysics() : null,
+          physics: alwaysScrollablePhysics ? const AlwaysScrollableScrollPhysics() : null,
           child: ConstrainedBox(
             constraints: BoxConstraints(minHeight: constraint.maxHeight),
             child: Padding(
diff --git a/lib/common/composition/placeholder/empty_placeholder_widget.dart b/lib/common/composition/placeholder/empty_placeholder_widget.dart
index effc7cf..5deaa54 100644
--- a/lib/common/composition/placeholder/empty_placeholder_widget.dart
+++ b/lib/common/composition/placeholder/empty_placeholder_widget.dart
@@ -7,8 +7,8 @@ import 'package:flutter_app/common/extension/build_context.dart';
 
 class EmptyPlaceholderWidget extends StatelessWidget {
   const EmptyPlaceholderWidget({
-    super.key,
     required this.onRetry,
+    super.key,
   });
 
   final VoidCallback onRetry;
@@ -18,12 +18,10 @@ class EmptyPlaceholderWidget extends StatelessWidget {
     return ExpandableSingleChildScrollView(
       padding: const EdgeInsets.all(20),
       child: Align(
-        alignment: Alignment.center,
         child: ConstrainedBox(
-          constraints: const BoxConstraints(maxWidth: ResponsiveWidget.mediumSizeTreshold),
+          constraints: const BoxConstraints(maxWidth: ResponsiveWidget.mediumSizeThreshold),
           child: Column(
             mainAxisAlignment: MainAxisAlignment.center,
-            crossAxisAlignment: CrossAxisAlignment.center,
             children: [
               CustomText(text: context.locale.generalEmptyStateTitle, style: context.textTheme.titleMedium),
               const SizedBox(height: 8),
diff --git a/lib/common/composition/placeholder/error_placeholder_widget.dart b/lib/common/composition/placeholder/error_placeholder_widget.dart
index 8e99c6f..10dfac4 100644
--- a/lib/common/composition/placeholder/error_placeholder_widget.dart
+++ b/lib/common/composition/placeholder/error_placeholder_widget.dart
@@ -3,13 +3,13 @@ import 'package:flutter_app/common/component/custom_button/custom_button_primary
 import 'package:flutter_app/common/component/custom_text/custom_text.dart';
 import 'package:flutter_app/common/composition/expandable_single_child_scroll_view.dart';
 import 'package:flutter_app/common/composition/responsive_widget.dart';
-import 'package:flutter_app/common/data/model/exception/custom_exception.dart';
+import 'package:flutter_app/common/data/entity/exception/custom_exception.dart';
 import 'package:flutter_app/common/extension/build_context.dart';
 
 class ErrorPlaceholderWidget extends StatelessWidget {
   const ErrorPlaceholderWidget({
-    super.key,
     required this.onRetry,
+    super.key,
     this.exception = const CustomException.general(),
   });
 
@@ -21,18 +21,27 @@ class ErrorPlaceholderWidget extends StatelessWidget {
     return ExpandableSingleChildScrollView(
       padding: const EdgeInsets.all(20),
       child: Align(
-        alignment: Alignment.center,
         child: ConstrainedBox(
-          constraints: const BoxConstraints(maxWidth: ResponsiveWidget.mediumSizeTreshold),
+          constraints: const BoxConstraints(maxWidth: ResponsiveWidget.mediumSizeThreshold),
           child: Column(
             mainAxisAlignment: MainAxisAlignment.center,
-            crossAxisAlignment: CrossAxisAlignment.center,
             children: [
-              CustomText(text: exception.getMessage(context: context), style: context.textTheme.titleMedium),
+              CustomText(
+                text: exception.getMessage(context: context),
+                style: context.textTheme.titleMedium,
+              ),
               const SizedBox(height: 8),
-              CustomText(text: exception.getDetails(context: context), style: context.textTheme.bodyMedium),
+
+              CustomText(
+                text: exception.getDetails(context: context),
+                style: context.textTheme.bodyMedium,
+              ),
               const SizedBox(height: 32),
-              CustomButtonPrimary(onPressed: onRetry, text: context.locale.generalErrorStateRetryButton),
+
+              CustomButtonPrimary(
+                onPressed: onRetry,
+                text: context.locale.generalErrorStateRetryButton,
+              ),
             ],
           ),
         ),
diff --git a/lib/common/composition/responsive_widget.dart b/lib/common/composition/responsive_widget.dart
index 3821d8e..5ecac2c 100644
--- a/lib/common/composition/responsive_widget.dart
+++ b/lib/common/composition/responsive_widget.dart
@@ -1,15 +1,17 @@
 import 'package:flutter/material.dart';
 
+/// This widget is a helper to build responsive UIs.
+/// Feel free to polish this Widget by app needs. Some projects may require just small and large sizes.
 class ResponsiveWidget extends StatelessWidget {
   const ResponsiveWidget({
-    super.key,
     required this.small,
+    super.key,
     this.medium,
     this.large,
   });
 
-  static const double mediumSizeTreshold = 800;
-  static const double largeSizeTreshold = 1600;
+  static const double mediumSizeThreshold = 800;
+  static const double largeSizeThreshold = 1600;
 
   final Widget Function() small;
   final Widget Function()? medium;
@@ -32,11 +34,25 @@ class ResponsiveWidget extends StatelessWidget {
     T Function()? large,
   }) {
     final maxWidth = MediaQuery.sizeOf(context).width;
-    if (maxWidth >= largeSizeTreshold && large != null) {
-      return large();
-    } else if (maxWidth >= mediumSizeTreshold && medium != null) {
-      return medium();
-    } else {
+    return resolveValueByWidth(maxWidth, small: small, medium: medium, large: large);
+  }
+
+  static T resolveValueByWidth<T>(
+    double maxWidth, {
+    required T Function() small,
+    T Function()? medium,
+    T Function()? large,
+  }) {
+    try {
+      if (maxWidth >= largeSizeThreshold && large != null) {
+        return large();
+      } else if (maxWidth >= mediumSizeThreshold && medium != null) {
+        return medium();
+      } else {
+        return small();
+      }
+      // ignore: avoid_catching_errors
+    } on FlutterError catch (_) {
       return small();
     }
   }
@@ -46,21 +62,21 @@ class ResponsiveWidget extends StatelessWidget {
       maxWidth: ResponsiveWidget.resolveValue(
         context,
         small: () => double.infinity,
-        medium: () => ResponsiveWidget.mediumSizeTreshold,
-        large: () => ResponsiveWidget.largeSizeTreshold,
+        medium: () => ResponsiveWidget.mediumSizeThreshold,
+        large: () => ResponsiveWidget.largeSizeThreshold,
       ),
     );
   }
 
   static bool isSmallScreen(BuildContext context) {
-    return MediaQuery.sizeOf(context).width < mediumSizeTreshold;
+    return MediaQuery.sizeOf(context).width < mediumSizeThreshold;
   }
 
   static bool isMediumScreen(BuildContext context) {
-    return MediaQuery.sizeOf(context).width >= mediumSizeTreshold && MediaQuery.sizeOf(context).width < largeSizeTreshold;
+    return MediaQuery.sizeOf(context).width >= mediumSizeThreshold && MediaQuery.sizeOf(context).width < largeSizeThreshold;
   }
 
   static bool isLargeScreen(BuildContext context) {
-    return MediaQuery.sizeOf(context).width >= largeSizeTreshold;
+    return MediaQuery.sizeOf(context).width >= largeSizeThreshold;
   }
 }
diff --git a/lib/common/data/dto/create_device_token_request_dto.dart b/lib/common/data/dto/create_device_token_request_dto.dart
index b337bf8..fb8c5ea 100644
--- a/lib/common/data/dto/create_device_token_request_dto.dart
+++ b/lib/common/data/dto/create_device_token_request_dto.dart
@@ -4,7 +4,7 @@ part 'create_device_token_request_dto.freezed.dart';
 part 'create_device_token_request_dto.g.dart';
 
 @Freezed(toJson: true)
-class CreateDeviceTokenRequestDTO with _$CreateDeviceTokenRequestDTO {
+abstract class CreateDeviceTokenRequestDTO with _$CreateDeviceTokenRequestDTO {
   const factory CreateDeviceTokenRequestDTO({
     required String? token,
   }) = _CreateDeviceTokenRequestDTO;
diff --git a/lib/common/data/dto/user_response_dto.dart b/lib/common/data/dto/user_response_dto.dart
index 2321826..4b6ce38 100644
--- a/lib/common/data/dto/user_response_dto.dart
+++ b/lib/common/data/dto/user_response_dto.dart
@@ -1,3 +1,4 @@
+import 'package:flutter_app/common/data/entity/user_entity.dart';
 import 'package:flutter_app/common/data/enum/user_role.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
@@ -5,7 +6,7 @@ part 'user_response_dto.freezed.dart';
 part 'user_response_dto.g.dart';
 
 @freezed
-class UserResponseDTO with _$UserResponseDTO {
+abstract class UserResponseDTO with _$UserResponseDTO {
   const factory UserResponseDTO({
     required String id,
     required UserRole role,
@@ -16,3 +17,14 @@ class UserResponseDTO with _$UserResponseDTO {
 
   factory UserResponseDTO.fromJson(Map<String, dynamic> json) => _$UserResponseDTOFromJson(json);
 }
+
+extension UserResponseDTOExtension on UserResponseDTO {
+  UserEntity toEntity() => UserEntity(
+    id: id,
+    role: role,
+    email: email,
+    displayName: displayName,
+    imageUrl: null,
+    referredId: referredId,
+  );
+}
diff --git a/lib/common/data/entity/exception/custom_exception.dart b/lib/common/data/entity/exception/custom_exception.dart
new file mode 100644
index 0000000..ffc1d56
--- /dev/null
+++ b/lib/common/data/entity/exception/custom_exception.dart
@@ -0,0 +1,107 @@
+import 'package:dio/dio.dart';
+import 'package:firebase_auth/firebase_auth.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_app/common/component/custom_snackbar/custom_snackbar_error.dart';
+import 'package:flutter_app/common/extension/build_context.dart';
+import 'package:flutter_app/core/analytics/crashlytics_manager.dart';
+import 'package:flutter_app/core/flogger.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:google_sign_in/google_sign_in.dart';
+import 'package:sign_in_with_apple/sign_in_with_apple.dart';
+
+part 'custom_exception.freezed.dart';
+
+@freezed
+sealed class CustomException with _$CustomException implements Exception {
+  const CustomException._();
+
+  const factory CustomException.general() = CustomExceptionGeneral;
+  const factory CustomException.withMessage({String? message}) = CustomExceptionWithMessage;
+  const factory CustomException.unauthenticated() = CustomExceptionUnauthenticated;
+  const factory CustomException.notConnectedToTheInternet() = CustomExceptionNotConnectedToTheInternet;
+  const factory CustomException.decodingFailed() = CustomExceptionDecodingFailed;
+
+  // Note: Mapped Firebase exception with error code `credential-already-in-use`.
+  const factory CustomException.signInCancelled() = CustomExceptionSignInCancelled;
+  const factory CustomException.credentialAlreadyInUse({required AuthCredential? credential}) = CustomExceptionCredentialAlreadyInUse;
+
+  factory CustomException.fromErrorObject({required Object? error}) {
+    Flogger.e('[CustomException] Received error $error, ');
+
+    CrashlyticsManager.logNonCritical(error, stack: StackTrace.current);
+
+    if (error is CustomException) {
+      return error;
+    } else if (error is DioException) {
+      switch (error.type) {
+        case DioExceptionType.connectionError:
+          return const CustomException.notConnectedToTheInternet();
+        default:
+          final data = error.response?.data;
+          final statusCode = error.response?.statusCode;
+          if (data is Map) {
+            Flogger.e("[CustomException] error.response: ${data["errorCode"]}");
+          }
+
+          // Note: This is the place to handle your own error codes, response, or states, and map them to you own CustomException.
+
+          if (statusCode == 401) {
+            return const CustomException.unauthenticated();
+          }
+
+          return CustomException.withMessage(message: error.message);
+      }
+    } else if (error is GoogleSignInException) {
+      switch (error.code) {
+        case GoogleSignInExceptionCode.canceled:
+          return const CustomException.signInCancelled();
+        default:
+          return CustomException.withMessage(message: error.description);
+      }
+    } else if (error is SignInWithAppleAuthorizationException) {
+      switch (error.code) {
+        case AuthorizationErrorCode.canceled:
+          return const CustomException.signInCancelled();
+        default:
+          return CustomException.withMessage(message: error.message);
+      }
+    } else if (error is FirebaseAuthException) {
+      switch (error.code) {
+        case 'credential-already-in-use':
+          return CustomException.credentialAlreadyInUse(credential: error.credential);
+        default:
+          return CustomException.withMessage(message: error.message);
+      }
+    } else {
+      return const CustomException.general();
+    }
+  }
+
+  String getMessage({required BuildContext context}) {
+    return switch (this) {
+      CustomExceptionWithMessage(message: final message) => message ?? context.locale.customExceptionGeneralMessage,
+      CustomExceptionUnauthenticated() => context.locale.customExceptionUnauthenticatedMessage,
+      CustomExceptionNotConnectedToTheInternet() => context.locale.customExceptionInternetConnectionMessage,
+      _ => context.locale.customExceptionGeneralMessage,
+    };
+  }
+
+  String getDetails({required BuildContext context}) {
+    return switch (this) {
+      CustomExceptionNotConnectedToTheInternet() => context.locale.customExceptionInternetConnectionDetails,
+      _ => context.locale.customExceptionGeneralDetails,
+    };
+  }
+
+  Future<void> showErrorSnackbar({
+    required BuildContext context,
+    double optionalBottomSpacing = 0,
+  }) async {
+    await CustomSnackbarError(
+      context: context,
+      message: getMessage(context: context),
+      optionalBottomSpacing: optionalBottomSpacing,
+    ).show();
+  }
+}
diff --git a/lib/common/data/entity/exception/validator_exception.dart b/lib/common/data/entity/exception/validator_exception.dart
new file mode 100644
index 0000000..a33e1d7
--- /dev/null
+++ b/lib/common/data/entity/exception/validator_exception.dart
@@ -0,0 +1,23 @@
+import 'package:flutter/material.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'validator_exception.freezed.dart';
+
+@freezed
+sealed class ValidatorException with _$ValidatorException implements Exception {
+  const ValidatorException._();
+
+  const factory ValidatorException.generalIsEmpty(String Function(BuildContext) getText) = ValidatorExceptionGeneralIsEmpty;
+  const factory ValidatorException.generalIsTooShort(String Function(BuildContext) getText) = ValidatorExceptionGeneralIsTooShort;
+  const factory ValidatorException.generalIsTooLong(String Function(BuildContext) getText) = ValidatorExceptionGeneralIsTooLong;
+  const factory ValidatorException.generalIsInvalid(String Function(BuildContext) getText) = ValidatorExceptionGeneralIsInvalid;
+
+  String getMessage({required BuildContext context}) {
+    return switch (this) {
+      ValidatorExceptionGeneralIsEmpty(getText: final getText) => getText(context),
+      ValidatorExceptionGeneralIsTooShort(getText: final getText) => getText(context),
+      ValidatorExceptionGeneralIsTooLong(getText: final getText) => getText(context),
+      ValidatorExceptionGeneralIsInvalid(getText: final getText) => getText(context),
+    };
+  }
+}
diff --git a/lib/common/data/model/notification_payload_model.dart b/lib/common/data/entity/notification_payload_entity.dart
similarity index 55%
rename from lib/common/data/model/notification_payload_model.dart
rename to lib/common/data/entity/notification_payload_entity.dart
index 9704b94..5d4843f 100644
--- a/lib/common/data/model/notification_payload_model.dart
+++ b/lib/common/data/entity/notification_payload_entity.dart
@@ -1,8 +1,8 @@
 import 'package:collection/collection.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
-part 'notification_payload_model.freezed.dart';
-part 'notification_payload_model.g.dart';
+part 'notification_payload_entity.freezed.dart';
+part 'notification_payload_entity.g.dart';
 
 @JsonEnum(valueField: 'value', alwaysCreate: true)
 enum NotificationType {
@@ -17,32 +17,32 @@ enum NotificationType {
 }
 
 @Freezed(fromJson: true, toJson: true)
-sealed class NotificationPayloadModel with _$NotificationPayloadModel {
-  const NotificationPayloadModel._();
+sealed class NotificationPayloadEntity with _$NotificationPayloadEntity {
+  const NotificationPayloadEntity._();
 
   // Title: Sample
-  const factory NotificationPayloadModel.sample({
+  const factory NotificationPayloadEntity.sample({
     required int id,
     required String title,
     required String body,
     @Default(NotificationType.sample) NotificationType type,
-  }) = NotificationPayloadModelSample;
+  }) = NotificationPayloadEntitySample;
 
   // Subtitle: unknown
-  const factory NotificationPayloadModel.unknown({
+  const factory NotificationPayloadEntity.unknown({
     @Default(-1) int id,
     @Default('') String title,
     @Default('') String body,
     @Default(NotificationType.unknown) NotificationType type,
-  }) = NotificationPayloadModelUnknown;
+  }) = NotificationPayloadEntityUnknown;
 
-  factory NotificationPayloadModel.fromJson(Map<String, dynamic> json) {
-    switch (NotificationType.fromString(json['type'])) {
+  factory NotificationPayloadEntity.fromJson(Map<String, dynamic> json) {
+    switch (NotificationType.fromString(json['type'] as String?)) {
       case NotificationType.sample:
-        return NotificationPayloadModelSample.fromJson(json);
+        return NotificationPayloadEntitySample.fromJson(json);
 
-      default:
-        return const NotificationPayloadModelUnknown();
+      case NotificationType.unknown:
+        return const NotificationPayloadEntityUnknown();
     }
   }
 }
diff --git a/lib/common/data/entity/user_entity.dart b/lib/common/data/entity/user_entity.dart
new file mode 100644
index 0000000..109265c
--- /dev/null
+++ b/lib/common/data/entity/user_entity.dart
@@ -0,0 +1,19 @@
+import 'package:flutter_app/common/data/enum/user_role.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'user_entity.freezed.dart';
+part 'user_entity.g.dart';
+
+@freezed
+abstract class UserEntity with _$UserEntity {
+  const factory UserEntity({
+    required String id,
+    required UserRole role,
+    required String? email,
+    required String? displayName,
+    required String? imageUrl,
+    required String? referredId,
+  }) = _UserEntity;
+
+  factory UserEntity.fromJson(Map<String, dynamic> json) => _$UserEntityFromJson(json);
+}
diff --git a/lib/common/data/model/exception/custom_exception.dart b/lib/common/data/model/exception/custom_exception.dart
deleted file mode 100644
index b19af8e..0000000
--- a/lib/common/data/model/exception/custom_exception.dart
+++ /dev/null
@@ -1,89 +0,0 @@
-import 'package:dio/dio.dart';
-import 'package:firebase_auth/firebase_auth.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_app/common/component/custom_snackbar/custom_snackbar_error.dart';
-import 'package:flutter_app/common/extension/build_context.dart';
-import 'package:flutter_app/core/analytics/crashlytics_manager.dart';
-import 'package:flutter_app/core/flogger.dart';
-import 'package:freezed_annotation/freezed_annotation.dart';
-
-part 'custom_exception.freezed.dart';
-
-@freezed
-class CustomException with _$CustomException implements Exception {
-  const CustomException._();
-
-  const factory CustomException.general() = _General;
-  const factory CustomException.withMessage({String? message}) = _CustomExceptionWithMessage;
-  const factory CustomException.unauthenticated() = _Unauthenticated;
-  const factory CustomException.notConnectedToTheInternet() = _NotConnectedToTheInternet;
-  const factory CustomException.decodingFailed() = _DecodingFailed;
-
-  // Title: Mapped Firebase exception with error code `credential-already-in-use`.
-  const factory CustomException.signInCancelled() = _SignInCancelled;
-  const factory CustomException.credentialAlreadyInUse({required AuthCredential? credential}) = _CredentialAlreadyInUse;
-
-  factory CustomException.fromErrorObject({required Object? error}) {
-    Flogger.e('[CustomException] Received error $error, ');
-
-    CrashlyticsManager.logNonCritical(error, stack: StackTrace.current);
-
-    if (error is CustomException) {
-      return error;
-    } else if (error is DioException) {
-      switch (error.type) {
-        case DioExceptionType.connectionError:
-          return const CustomException.notConnectedToTheInternet();
-        default:
-          if (error.response?.data is Map) {
-            Flogger.e("[CustomException] error.response: ${error.response?.data["errorCode"]}");
-          }
-
-          // Title: This is the place to handle your own error codes, response, or states, and map them to you own CustomException.
-
-          if (error.response?.statusCode == 401) {
-            return const CustomException.unauthenticated();
-          }
-
-          return CustomException.withMessage(message: error.message);
-      }
-    } else if (error is FirebaseAuthException) {
-      switch (error.code) {
-        case 'credential-already-in-use':
-          return CustomException.credentialAlreadyInUse(credential: error.credential);
-        default:
-          return const CustomException.general();
-      }
-    } else {
-      return const CustomException.general();
-    }
-  }
-
-  String getMessage({required BuildContext context}) {
-    return mapOrNull(
-          withMessage: (exception) => exception.message,
-          unauthenticated: (_) => context.locale.customExceptionUnauthenticatedMessage,
-          notConnectedToTheInternet: (_) => context.locale.customExceptionInternetConnectionMessage,
-        ) ??
-        context.locale.customExceptionGeneralMessage;
-  }
-
-  String getDetails({required BuildContext context}) {
-    return mapOrNull(
-          notConnectedToTheInternet: (_) => context.locale.customExceptionInternetConnectionDetails,
-        ) ??
-        context.locale.customExceptionGeneralDetails;
-  }
-
-  Future<void> showErrorSnackbar({
-    required BuildContext context,
-    double optionalBottomSpacing = 0,
-  }) async {
-    await CustomSnackbarError(
-      context: context,
-      message: getMessage(context: context),
-      optionalBottomSpacing: optionalBottomSpacing,
-    ).show();
-  }
-}
diff --git a/lib/common/data/model/exception/validator_exception.dart b/lib/common/data/model/exception/validator_exception.dart
deleted file mode 100644
index 64c409a..0000000
--- a/lib/common/data/model/exception/validator_exception.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:freezed_annotation/freezed_annotation.dart';
-
-part 'validator_exception.freezed.dart';
-
-@freezed
-class ValidatorException with _$ValidatorException implements Exception {
-  const ValidatorException._();
-
-  const factory ValidatorException.generalIsEmpty(String Function(BuildContext) getText) = _GeneralIsEmpty;
-  const factory ValidatorException.generalIsTooShort(String Function(BuildContext) getText) = _GeneralIsTooShort;
-  const factory ValidatorException.generalIsTooLong(String Function(BuildContext) getText) = _GeneralIsTooLong;
-  const factory ValidatorException.generalIsInvalid(String Function(BuildContext) getText) = _GeneralIsInvalid;
-
-  String getMessage({required BuildContext context}) {
-    return map(
-      generalIsEmpty: (value) => value.getText(context),
-      generalIsTooShort: (value) => value.getText(context),
-      generalIsTooLong: (value) => value.getText(context),
-      generalIsInvalid: (value) => value.getText(context),
-    );
-  }
-}
diff --git a/lib/common/data/model/user_model.dart b/lib/common/data/model/user_model.dart
deleted file mode 100644
index f5b30f2..0000000
--- a/lib/common/data/model/user_model.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-import 'package:flutter_app/common/data/dto/user_response_dto.dart';
-import 'package:flutter_app/common/data/enum/user_role.dart';
-import 'package:freezed_annotation/freezed_annotation.dart';
-
-part 'user_model.freezed.dart';
-part 'user_model.g.dart';
-
-@freezed
-class UserModel with _$UserModel {
-  const UserModel._();
-
-  const factory UserModel({
-    required String id,
-    required UserRole role,
-    required String? email,
-    required String? displayName,
-    required String? imageUrl,
-    required String? referredId,
-  }) = _UserModel;
-
-  factory UserModel.fromJson(Map<String, dynamic> json) => _$UserModelFromJson(json);
-
-  factory UserModel.fromAPI({required UserResponseDTO user}) {
-    return UserModel(
-      id: user.id,
-      role: user.role,
-      email: user.email,
-      displayName: user.displayName,
-      imageUrl: null,
-      referredId: user.referredId,
-    );
-  }
-}
diff --git a/lib/common/extension/async_value.dart b/lib/common/extension/async_value.dart
index 8785c8c..23dfe7e 100644
--- a/lib/common/extension/async_value.dart
+++ b/lib/common/extension/async_value.dart
@@ -3,18 +3,19 @@ import 'package:flutter_app/common/component/custom_app_bar.dart';
 import 'package:flutter_app/common/component/custom_progress_indicator.dart';
 import 'package:flutter_app/common/composition/placeholder/empty_placeholder_widget.dart';
 import 'package:flutter_app/common/composition/placeholder/error_placeholder_widget.dart';
-import 'package:flutter_app/common/data/model/exception/custom_exception.dart';
+import 'package:flutter_app/common/data/entity/exception/custom_exception.dart';
 import 'package:flutter_app/common/extension/dynamic.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_riverpod/misc.dart';
 
 extension AsyncValueExtension<T> on AsyncValue<T> {
-  Widget mapState<R>({
-    required Refreshable provider,
+  Widget mapState({
+    required ProviderBase<Object> provider,
+    required Widget Function(T data) data,
     bool Function(T data)? isEmpty,
     Widget Function(T? error)? error,
     Widget Function(T? loading)? loading,
     Widget Function(T data)? empty,
-    required Widget Function(T data) data,
   }) {
     return map(
       // Title: Loading State
@@ -43,24 +44,24 @@ extension AsyncValueExtension<T> on AsyncValue<T> {
       data: (dataParam) => (isEmpty?.let((it) => it(dataParam.value)) ?? false)
           // Title: Empty State
           ? (empty?.call(dataParam.value) ??
-              Scaffold(
-                appBar: const CustomAppBar(),
-                body: SafeArea(
-                  child: _EmptyPlacholderWidget(provider),
-                ),
-              ))
+                Scaffold(
+                  appBar: const CustomAppBar(),
+                  body: SafeArea(
+                    child: _EmptyPlaceholderWidget(provider),
+                  ),
+                ))
           // Title: Data State
           : data(dataParam.value),
     );
   }
 
-  Widget mapContentState<R>({
-    required Refreshable provider,
+  Widget mapContentState({
+    required ProviderBase<Object> provider,
+    required Widget Function(T data) data,
     bool Function(T data)? isEmpty,
     Widget Function(T? error)? error,
     Widget Function(T? loading)? loading,
     Widget Function(T data)? empty,
-    required Widget Function(T data) data,
   }) {
     return map(
       // Title: Loading State
@@ -73,7 +74,7 @@ extension AsyncValueExtension<T> on AsyncValue<T> {
 
       data: (dataParam) => (isEmpty?.let((it) => it(dataParam.value)) ?? false)
           // Title: Empty State
-          ? (empty?.call(dataParam.value) ?? _EmptyPlacholderWidget(provider))
+          ? (empty?.call(dataParam.value) ?? _EmptyPlaceholderWidget(provider))
           // Title: Data State
           : data(dataParam.value),
     );
@@ -91,12 +92,12 @@ class _ProgressIndicatorWidget extends StatelessWidget {
   }
 }
 
-class _EmptyPlacholderWidget extends StatelessWidget {
-  const _EmptyPlacholderWidget(
+class _EmptyPlaceholderWidget extends StatelessWidget {
+  const _EmptyPlaceholderWidget(
     this.provider,
   );
 
-  final Refreshable provider;
+  final ProviderBase<Object> provider;
 
   @override
   Widget build(BuildContext context) {
@@ -114,7 +115,7 @@ class _ErrorPlaceholderWidget extends StatelessWidget {
     this.error,
   );
 
-  final Refreshable provider;
+  final ProviderBase<Object> provider;
   final Object error;
 
   @override
diff --git a/lib/common/extension/list.dart b/lib/common/extension/list.dart
index c75a3cd..8dc0bce 100644
--- a/lib/common/extension/list.dart
+++ b/lib/common/extension/list.dart
@@ -1,10 +1,11 @@
 extension ListExtension<T> on List<T> {
-  List<T> replace(oldEntity, newEntity) {
+  List<T> replace(T oldEntity, T newEntity) {
     final newList = <T>[...this];
     final index = indexOf(oldEntity);
     if (index != -1) {
-      newList.remove(oldEntity);
-      newList.insert(index, newEntity);
+      newList
+        ..remove(oldEntity)
+        ..insert(index, newEntity);
     }
     return newList;
   }
diff --git a/lib/common/extension/response.dart b/lib/common/extension/response.dart
index d4382d2..9c83193 100644
--- a/lib/common/extension/response.dart
+++ b/lib/common/extension/response.dart
@@ -1,12 +1,12 @@
 import 'package:dio/dio.dart';
-import 'package:flutter_app/common/data/model/exception/custom_exception.dart';
+import 'package:flutter_app/common/data/entity/exception/custom_exception.dart';
 
-extension ResponseExtension on Response {
-  /// Tries to downcast `data` as `List<dynamic>`. If decoding failes,
+extension ResponseExtension on Response<Map<String, dynamic>> {
+  /// Tries to downcast `data` as `List<dynamic>`. If decoding fails,
   /// `CustomException.decodingFailed()` is thrown.
   List<dynamic> get listData {
     if (data is List) {
-      return data as List;
+      return data! as List;
     } else {
       throw const CustomException.decodingFailed();
     }
diff --git a/lib/common/extension/string.dart b/lib/common/extension/string.dart
index 13d729a..b9f57f7 100644
--- a/lib/common/extension/string.dart
+++ b/lib/common/extension/string.dart
@@ -1,5 +1,5 @@
 extension StringExtension on String? {
   bool get isNullOrEmpty {
-    return this == null || this?.isEmpty == true;
+    return this == null || this!.isEmpty;
   }
 }
diff --git a/lib/common/provider/current_user_model_state.dart b/lib/common/provider/current_user_state.dart
similarity index 59%
rename from lib/common/provider/current_user_model_state.dart
rename to lib/common/provider/current_user_state.dart
index 0101ca0..0934e20 100644
--- a/lib/common/provider/current_user_model_state.dart
+++ b/lib/common/provider/current_user_state.dart
@@ -1,28 +1,28 @@
-import 'package:flutter_app/common/data/model/user_model.dart';
+import 'package:flutter_app/common/data/entity/user_entity.dart';
 import 'package:flutter_app/common/usecase/user/get_database_user_use_case.dart';
 import 'package:flutter_app/common/usecase/user/set_database_user_use_case.dart';
 import 'package:flutter_app/core/flogger.dart';
 import 'package:flutter_app/core/riverpod/state_handler.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
-part 'current_user_model_state.g.dart';
+part 'current_user_state.g.dart';
 
 @Riverpod(keepAlive: true)
-class CurrentUserModelState extends _$CurrentUserModelState with NullableStateHandler {
+class CurrentUserState extends _$CurrentUserState with NullableStateHandler {
   @override
-  FutureOr<UserModel?> build() async {
+  FutureOr<UserEntity?> build() async {
     return await _getUserFromDatabase();
   }
 
-  Future<void> updateCurrentUser(UserModel? user) async {
-    Flogger.d('[CurrentUserModelState] Going to set user $user');
+  Future<void> updateCurrentUser(UserEntity? user) async {
+    Flogger.d('[CurrentUserEntityState] Going to set user $user');
 
     await ref.read(setDatabaseUserUseCaseProvider(user: user).future);
 
     setStateData(user);
   }
 
-  Future<UserModel?> _getUserFromDatabase() async {
+  Future<UserEntity?> _getUserFromDatabase() async {
     return await ref.read(getDatabaseUserUseCaseProvider.future);
   }
 }
diff --git a/lib/common/provider/firebase_messaging_service.dart b/lib/common/provider/firebase_messaging_service.dart
index a30a0bb..983f3ea 100644
--- a/lib/common/provider/firebase_messaging_service.dart
+++ b/lib/common/provider/firebase_messaging_service.dart
@@ -1,13 +1,11 @@
-import 'package:app_settings/app_settings.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter_app/app/configuration/configuration.dart';
 import 'package:flutter_app/app/setup/app_platform.dart';
-import 'package:flutter_app/common/data/model/notification_payload_model.dart';
-import 'package:flutter_app/common/provider/current_user_model_state.dart';
+import 'package:flutter_app/common/data/entity/notification_payload_entity.dart';
+import 'package:flutter_app/common/provider/current_user_state.dart';
 import 'package:flutter_app/common/provider/notifications_service.dart';
 import 'package:flutter_app/common/usecase/create_device_token_use_case.dart';
 import 'package:flutter_app/core/analytics/crashlytics_manager.dart';
-import 'package:flutter_app/core/database/shared_preferences.dart';
 import 'package:flutter_app/core/flogger.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
@@ -15,18 +13,16 @@ part 'firebase_messaging_service.g.dart';
 
 @Riverpod(keepAlive: true)
 class FirebaseMessagingService extends _$FirebaseMessagingService {
-  final _firebaseMessaging = FirebaseMessaging.instance;
-
   @pragma('vm:entry-point')
   static Future<void> firebaseNotificationDisplayBgHandler(RemoteMessage message) async {
     Flogger.d('[Firebase Messaging] Display notification with payload: ${message.data}');
-    NotificationsService.showNotification(NotificationPayloadModel.fromJson(message.data));
+    await NotificationsService.showNotification(NotificationPayloadEntity.fromJson(message.data));
   }
 
   @pragma('vm:entry-point')
   static Future<void> firebaseNotificationOpenBgHandler(RemoteMessage message) async {
     Flogger.d('[Firebase Messaging] Open notification with payload: ${message.data}');
-    NotificationsService.tryOpeningNotificationFromRemoteMessage(message);
+    await NotificationsService.tryOpeningNotificationFromRemoteMessage(message);
   }
 
   @override
@@ -36,39 +32,6 @@ class FirebaseMessagingService extends _$FirebaseMessagingService {
     return this;
   }
 
-  /// Check whether user has at least any Notification permission allowed
-  Future<bool> isPermissionsGranted() async {
-    NotificationSettings settings = await _firebaseMessaging.getNotificationSettings();
-    return settings.authorizationStatus == AuthorizationStatus.authorized ||
-        settings.authorizationStatus == AuthorizationStatus.provisional;
-  }
-
-  /// Sadly it is little bit tricky to realize if we already checked for Permission. We cannot use [AuthorizationStatus.notDetermined],
-  /// As it is always denied on Android, even through we can display the system dialog.
-  /// Another issue is that the count for displaying the native dialog is different on Android and iOS.
-  /// The best approach here is to manually check and track the count of how many times we displayed the dialog.
-  Future<bool> requestPermissions() async {
-    final preferences = await ref.read(sharedPreferencesProvider.future);
-    final dialogRequestCount = preferences.getInt(PreferencesKeys.notificationsPermissionRequestCount.value) ?? 0;
-
-    NotificationSettings? settings;
-    if (dialogRequestCount == 0 || (dialogRequestCount == 1 && AppPlatform.isAndroid)) {
-      await preferences.setInt(PreferencesKeys.notificationsPermissionRequestCount.value, dialogRequestCount + 1);
-      settings = await _firebaseMessaging.requestPermission(alert: true, badge: true, sound: true);
-    } else {
-      await AppSettings.openAppSettings();
-      settings = await _firebaseMessaging.getNotificationSettings();
-    }
-
-    if (settings.authorizationStatus == AuthorizationStatus.authorized || settings.authorizationStatus == AuthorizationStatus.provisional) {
-      Flogger.d('[Firebase Messaging] User granted permission');
-      return true;
-    } else {
-      Flogger.d('[Firebase Messaging] User declined or has not accepted permission');
-      return false;
-    }
-  }
-
   /// Do not forget to call this after user sign in!
   /// getToken throws an error when the notification permission was not granted
   Future<void> registerFCMToken({String? fcmToken}) async {
@@ -82,7 +45,7 @@ class FirebaseMessagingService extends _$FirebaseMessagingService {
     }
 
     try {
-      if (await ref.read(currentUserModelStateProvider.future) != null) {
+      if (await ref.read(currentUserStateProvider.future) != null) {
         await ref.read(createDeviceTokenUseCaseProvider(deviceToken: fcmToken.toString()).future);
       }
     } on Exception catch (e, st) {
@@ -95,16 +58,16 @@ class FirebaseMessagingService extends _$FirebaseMessagingService {
     /// We need to try to get APNS Token before.
     /// https://stackoverflow.com/questions/77089496/flutter-apns-token-has-not-been-set-yet-please-ensure-the-apns-token-is-avail
     if (AppPlatform.isIOS) {
-      int iosGetApnsTriesRemaining = 10;
+      var iosGetApnsTriesRemaining = 10;
 
       while ((await FirebaseMessaging.instance.getAPNSToken()) == null && iosGetApnsTriesRemaining != 0) {
         Flogger.d('[Firebase Messaging] Waiting for APNS token for 5ms!');
         iosGetApnsTriesRemaining--;
-        await Future.delayed(const Duration(milliseconds: 5));
+        await Future<void>.delayed(const Duration(milliseconds: 5));
       }
 
       if (iosGetApnsTriesRemaining == 0) {
-        CrashlyticsManager.logNonCritical('APNS Token could not be obtained even after 50ms of waiting!');
+        await CrashlyticsManager.logNonCritical('APNS Token could not be obtained even after 50ms of waiting!');
         return;
       }
     }
@@ -113,12 +76,14 @@ class FirebaseMessagingService extends _$FirebaseMessagingService {
     await registerFCMToken();
 
     // Set listener to register new FCM token
-    FirebaseMessaging.instance.onTokenRefresh.listen((fcmToken) async {
-      Flogger.d("[Firebase Messaging] User's FCM token refreshed: $fcmToken");
-      await registerFCMToken(fcmToken: fcmToken);
-    }).onError((err) {
-      Flogger.e('[Firebase Messaging] Error while refreshed FCM token: $err');
-    });
+    FirebaseMessaging.instance.onTokenRefresh
+        .listen((fcmToken) async {
+          Flogger.d("[Firebase Messaging] User's FCM token refreshed: $fcmToken");
+          await registerFCMToken(fcmToken: fcmToken);
+        })
+        .onError((Object err) {
+          Flogger.e('[Firebase Messaging] Error while refreshed FCM token: $err');
+        });
   }
 
   /// On Android - foreground, background and killed notifications are handled from the `data` payload and are manually displayed.
diff --git a/lib/common/provider/notifications_service.dart b/lib/common/provider/notifications_service.dart
index 1f543b9..489b486 100644
--- a/lib/common/provider/notifications_service.dart
+++ b/lib/common/provider/notifications_service.dart
@@ -1,9 +1,10 @@
 import 'dart:convert';
 
 import 'package:firebase_messaging/firebase_messaging.dart';
-import 'package:flutter_app/common/data/model/notification_payload_model.dart';
+import 'package:flutter_app/common/data/entity/notification_payload_entity.dart';
 import 'package:flutter_app/core/flogger.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
+import 'package:permission_handler/permission_handler.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'notifications_service.g.dart';
@@ -12,6 +13,38 @@ part 'notifications_service.g.dart';
 class NotificationsService extends _$NotificationsService {
   static final _flutterLocalNotifications = FlutterLocalNotificationsPlugin();
 
+  /// Check whether user has at least any Notification permission allowed
+  static Future<bool> isPermissionGranted() async {
+    final permissionStatus = await Permission.notification.status;
+    return !permissionStatus.isDenied && !permissionStatus.isPermanentlyDenied;
+  }
+
+  /// Check whether user has at least any Notification permission denied
+  static Future<bool> isPermissionPermanentlyDenied() async => Permission.notification.isPermanentlyDenied;
+
+  /// Request Notification permission from the user
+  /// Returns true if the permission was granted, false if it was denied or permanently denied.
+  /// Warning: If the permission is permanently denied, this method will automatically
+  /// open the app settings. Consider showing a dialog to the user first.
+  static Future<bool> requestPermission() async {
+    var permissionStatus = await Permission.notification.status;
+
+    // If the status is denied, we request it.
+    // This means that the request has not been displayed yet, or displayed only once on Android.
+    if (permissionStatus == PermissionStatus.denied) {
+      permissionStatus = await Permission.notification.request();
+      return !permissionStatus.isDenied && !permissionStatus.isPermanentlyDenied;
+    }
+    // If the status is permanentlyDenied, we cannot request it again. We can only open the appSettings.
+    else if (permissionStatus == PermissionStatus.permanentlyDenied) {
+      await openAppSettings();
+      return false;
+    }
+
+    // Otherwise, we handle the status as granted.
+    return true;
+  }
+
   /// The backgroundHandler needs to be either a static function or a top level function to be accessible as a Flutter entry point
   @pragma('vm:entry-point')
   static void localNotificationOpenBgHandler(NotificationResponse notificationResponse) {
@@ -19,14 +52,13 @@ class NotificationsService extends _$NotificationsService {
     _tryOpeningNotificationFromPayload(notificationResponse.payload);
   }
 
-  static void handleNotificationOpen(NotificationPayloadModel notificationModel) {
-    switch (notificationModel) {
-      case NotificationPayloadModelSample():
+  static void handleNotificationOpen(NotificationPayloadEntity notification) {
+    switch (notification) {
+      case NotificationPayloadEntitySample():
         Flogger.d('[Notifications] Handle open of Sample notification');
-        // TODO: [Notifications] Handle Notification open action here
-        break;
+      // TODO(strv): [Notifications] Handle Notification open action here
 
-      case NotificationPayloadModelUnknown():
+      case NotificationPayloadEntityUnknown():
       // Do nothing
     }
   }
@@ -38,11 +70,11 @@ class NotificationsService extends _$NotificationsService {
 
     // Title: 2. Check FlutterLocalNotifications for initial Message
     final notificationAppLaunchDetails = await _flutterLocalNotifications.getNotificationAppLaunchDetails();
-    _tryOpeningNotificationFromPayload(notificationAppLaunchDetails?.notificationResponse?.payload);
+    await _tryOpeningNotificationFromPayload(notificationAppLaunchDetails?.notificationResponse?.payload);
   }
 
-  static Future<void> showNotification(NotificationPayloadModel notification) async {
-    if (notification is NotificationPayloadModelUnknown) return;
+  static Future<void> showNotification(NotificationPayloadEntity notification) async {
+    if (notification is NotificationPayloadEntityUnknown) return;
 
     Flogger.i('[Notifications] New local notification to display: $notification');
     await _flutterLocalNotifications.cancelAll();
@@ -61,7 +93,7 @@ class NotificationsService extends _$NotificationsService {
     }
 
     try {
-      handleNotificationOpen(NotificationPayloadModel.fromJson(jsonDecode(payload)));
+      handleNotificationOpen(NotificationPayloadEntity.fromJson(jsonDecode(payload) as Map<String, dynamic>));
       return Future.value(true);
     } on Exception catch (e) {
       Flogger.e('[Notifications] Could not parse payload from notification: $payload with error $e');
@@ -75,7 +107,7 @@ class NotificationsService extends _$NotificationsService {
     }
 
     try {
-      handleNotificationOpen(NotificationPayloadModel.fromJson(message.data));
+      handleNotificationOpen(NotificationPayloadEntity.fromJson(message.data));
       return Future.value(true);
     } on Exception catch (e) {
       Flogger.e('[Notifications] Could not parse payload from notification: ${message.data} with error $e');
@@ -90,7 +122,7 @@ class NotificationsService extends _$NotificationsService {
   }
 
   Future<void> _setupLocalNotifications() async {
-    InitializationSettings initializationSettings = const InitializationSettings(
+    const initializationSettings = InitializationSettings(
       // This icon must be inside Android native resources
       android: AndroidInitializationSettings('notification_icon'),
       // This makes sure that we can manually request permission later
diff --git a/lib/common/usecase/authentication/get_authorization_token_use_case.dart b/lib/common/usecase/authentication/get_authorization_token_use_case.dart
index aadbefd..b99ed58 100644
--- a/lib/common/usecase/authentication/get_authorization_token_use_case.dart
+++ b/lib/common/usecase/authentication/get_authorization_token_use_case.dart
@@ -1,6 +1,5 @@
-import 'package:flutter_app/common/usecase/authentication/get_firebase_user_use_case.dart';
+import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter_app/core/flogger.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'get_authorization_token_use_case.g.dart';
@@ -8,9 +7,9 @@ part 'get_authorization_token_use_case.g.dart';
 @riverpod
 Future<String?> getAuthorizationTokenUseCase(
   Ref ref, {
-  forceRefresh = false,
+  bool forceRefresh = false,
 }) async {
-  final firebaseUser = await ref.read(getFirebaseUserUseCaseProvider.future);
+  final firebaseUser = FirebaseAuth.instance.currentUser;
   final token = await firebaseUser?.getIdToken(forceRefresh);
 
   Flogger.d('[Authorization] GET - Current Firebase Authorization Token: $token');
diff --git a/lib/common/usecase/authentication/get_firebase_user_use_case.dart b/lib/common/usecase/authentication/get_firebase_user_use_case.dart
deleted file mode 100644
index 34c4d5a..0000000
--- a/lib/common/usecase/authentication/get_firebase_user_use_case.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-import 'package:firebase_auth/firebase_auth.dart';
-import 'package:flutter_app/core/flogger.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:riverpod_annotation/riverpod_annotation.dart';
-
-part 'get_firebase_user_use_case.g.dart';
-
-@riverpod
-Future<User?> getFirebaseUserUseCase(Ref ref) async {
-  final user = FirebaseAuth.instance.currentUser;
-
-  Flogger.d('[Authentication] GET - Current Firebase user: $user');
-
-  return user;
-}
diff --git a/lib/common/usecase/authentication/sign_in_anonymously_use_case.dart b/lib/common/usecase/authentication/sign_in_anonymously_use_case.dart
index e3bf828..2f2ef75 100644
--- a/lib/common/usecase/authentication/sign_in_anonymously_use_case.dart
+++ b/lib/common/usecase/authentication/sign_in_anonymously_use_case.dart
@@ -1,14 +1,10 @@
 import 'package:firebase_auth/firebase_auth.dart';
-import 'package:flutter_app/common/data/model/user_model.dart';
+import 'package:flutter_app/common/data/entity/user_entity.dart';
 import 'package:flutter_app/common/usecase/authentication/sign_in_completion_use_case.dart';
 import 'package:flutter_app/core/flogger.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:riverpod_annotation/riverpod_annotation.dart';
 
-part 'sign_in_anonymously_use_case.g.dart';
-
-@riverpod
-Future<UserModel> signInAnonymouslyUseCase(Ref ref) async {
+final signInAnonymouslyUseCase = FutureProvider<UserEntity>((ref) async {
   Flogger.d('[Authentication] Going to sign in user anonymously');
 
   await FirebaseAuth.instance.signInAnonymously();
@@ -16,4 +12,4 @@ Future<UserModel> signInAnonymouslyUseCase(Ref ref) async {
   final user = await ref.read(signInCompletionUseCaseProvider.future);
 
   return user;
-}
+});
diff --git a/lib/common/usecase/authentication/sign_in_completion_use_case.dart b/lib/common/usecase/authentication/sign_in_completion_use_case.dart
index 1bdbdc8..4d454c6 100644
--- a/lib/common/usecase/authentication/sign_in_completion_use_case.dart
+++ b/lib/common/usecase/authentication/sign_in_completion_use_case.dart
@@ -1,24 +1,23 @@
+import 'package:flutter_app/common/data/entity/user_entity.dart';
 import 'package:flutter_app/common/data/enum/user_role.dart';
-import 'package:flutter_app/common/data/model/user_model.dart';
-import 'package:flutter_app/common/provider/current_user_model_state.dart';
+import 'package:flutter_app/common/provider/current_user_state.dart';
 import 'package:flutter_app/core/flogger.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'sign_in_completion_use_case.g.dart';
 
 @riverpod
-Future<UserModel> signInCompletionUseCase(Ref ref) async {
+Future<UserEntity> signInCompletionUseCase(Ref ref) async {
   Flogger.d('[Authentication] Going to sign in user on BE');
 
   /*
   final dio = ref.read(dioProvider);
   final response = await dio.post('v1/sign-in');
   final userResponse = UserResponseDTO.fromJson(response.data);
-  final user = UserModel.fromAPI(user: userResponse);
+  final user = UserEntity.fromAPI(user: userResponse);
   */
-  // TODO: Remove this line and uncomment the above lines
-  const user = UserModel(
+  // TODO(strv): Remove this line and uncomment the above lines
+  const user = UserEntity(
     id: '1',
     email: 'john.doe@example.com',
     displayName: 'John Doe',
@@ -29,7 +28,7 @@ Future<UserModel> signInCompletionUseCase(Ref ref) async {
 
   Flogger.d('[Authentication] Received new user from BE $user');
 
-  await ref.read(currentUserModelStateProvider.notifier).updateCurrentUser(user);
+  await ref.read(currentUserStateProvider.notifier).updateCurrentUser(user);
 
   Flogger.d('[Authentication] Current user updated');
 
diff --git a/lib/common/usecase/authentication/sign_in_with_apple_use_case.dart b/lib/common/usecase/authentication/sign_in_with_apple_use_case.dart
index 41336f0..90a51b2 100644
--- a/lib/common/usecase/authentication/sign_in_with_apple_use_case.dart
+++ b/lib/common/usecase/authentication/sign_in_with_apple_use_case.dart
@@ -2,44 +2,36 @@ import 'dart:convert';
 
 import 'package:crypto/crypto.dart';
 import 'package:firebase_auth/firebase_auth.dart';
-import 'package:flutter_app/common/data/model/user_model.dart';
-import 'package:flutter_app/common/usecase/authentication/sign_in_with_oauth_credential_use_case.dart';
+import 'package:flutter_app/common/data/entity/user_entity.dart';
+import 'package:flutter_app/common/usecase/authentication/sign_in_with_auth_credential_use_case.dart';
 import 'package:flutter_app/core/flogger.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:sign_in_with_apple/sign_in_with_apple.dart';
 
-part 'sign_in_with_apple_use_case.g.dart';
-
-// TODO: Enable for Android and web after the domain is registered.
-@riverpod
-Future<UserModel> signInWithAppleUseCase(Ref ref) async {
+final signInWithAppleUseCase = FutureProvider<UserEntity>((ref) async {
   Flogger.d('[Authentication] Sign in with Apple started');
 
+  // To prevent replay attacks with the credential returned from Apple, we include a nonce in the credential request.
+  // When signing in with Firebase, the nonce in the id token returned by Apple, is expected to match the sha256 hash of `rawNonce`.
   final rawNonce = generateNonce();
-  final bytes = utf8.encode(rawNonce);
-  final digest = sha256.convert(bytes);
-  final nonce = digest.toString();
+  final sha256Nonce = sha256.convert(utf8.encode(rawNonce)).toString();
 
+  // webAuthenticationOptions is required on Android and on the Web.
+  // TODO(strv): Configure for Android and web after the domain is registered.
   final appleCredential = await SignInWithApple.getAppleIDCredential(
-    scopes: [
-      AppleIDAuthorizationScopes.email,
-      AppleIDAuthorizationScopes.fullName,
-    ],
-    nonce: nonce,
+    nonce: sha256Nonce,
+    webAuthenticationOptions: WebAuthenticationOptions(
+      clientId: 'com.example.app',
+      redirectUri: Uri.parse('https://example.com/auth/callback'),
+    ),
+    scopes: [AppleIDAuthorizationScopes.email, AppleIDAuthorizationScopes.fullName],
   );
 
-  final oauthCredential = OAuthProvider('apple.com').credential(
-    idToken: appleCredential.identityToken,
-    rawNonce: rawNonce,
-    accessToken: appleCredential.authorizationCode,
-  );
+  final oauthCredential = OAuthProvider(
+    'apple.com',
+  ).credential(rawNonce: rawNonce, idToken: appleCredential.identityToken, accessToken: appleCredential.authorizationCode);
 
   Flogger.d('[Authentication] Received credential from Apple: $oauthCredential');
 
-  return await ref.read(
-    signInWithOauthCredentialUseCaseProvider(
-      credential: oauthCredential,
-    ).future,
-  );
-}
+  return await ref.read(signInWithAuthCredentialUseCaseProvider(credential: oauthCredential).future);
+});
diff --git a/lib/common/usecase/authentication/sign_in_with_oauth_credential_use_case.dart b/lib/common/usecase/authentication/sign_in_with_auth_credential_use_case.dart
similarity index 61%
rename from lib/common/usecase/authentication/sign_in_with_oauth_credential_use_case.dart
rename to lib/common/usecase/authentication/sign_in_with_auth_credential_use_case.dart
index ec43d5b..e32b97c 100644
--- a/lib/common/usecase/authentication/sign_in_with_oauth_credential_use_case.dart
+++ b/lib/common/usecase/authentication/sign_in_with_auth_credential_use_case.dart
@@ -1,20 +1,18 @@
 import 'package:firebase_auth/firebase_auth.dart';
-import 'package:flutter_app/common/data/model/exception/custom_exception.dart';
-import 'package:flutter_app/common/data/model/user_model.dart';
-import 'package:flutter_app/common/usecase/authentication/get_firebase_user_use_case.dart';
+import 'package:flutter_app/common/data/entity/exception/custom_exception.dart';
+import 'package:flutter_app/common/data/entity/user_entity.dart';
 import 'package:flutter_app/common/usecase/authentication/sign_in_completion_use_case.dart';
 import 'package:flutter_app/core/flogger.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
-part 'sign_in_with_oauth_credential_use_case.g.dart';
+part 'sign_in_with_auth_credential_use_case.g.dart';
 
 @riverpod
-FutureOr<UserModel> signInWithOauthCredentialUseCase(
+FutureOr<UserEntity> signInWithAuthCredentialUseCase(
   Ref ref, {
-  required OAuthCredential credential,
+  required AuthCredential credential,
 }) async {
-  final firebaseUser = await ref.read(getFirebaseUserUseCaseProvider.future);
+  final firebaseUser = FirebaseAuth.instance.currentUser;
 
   Flogger.d('[Authentication] Firebase user $firebaseUser');
 
@@ -28,7 +26,10 @@ FutureOr<UserModel> signInWithOauthCredentialUseCase(
       Flogger.d('[Authentication] Anonymous user was linked with google credential');
     } on Exception catch (error) {
       final customException = CustomException.fromErrorObject(error: error);
-      final credentialIsAlreadyInUse = customException.mapOrNull(credentialAlreadyInUse: (value) => value.credential);
+      final credentialIsAlreadyInUse = switch (customException) {
+        CustomExceptionCredentialAlreadyInUse(credential: final credential) => credential,
+        _ => null,
+      };
 
       if (credentialIsAlreadyInUse != null) {
         await FirebaseAuth.instance.signInWithCredential(credentialIsAlreadyInUse);
@@ -37,8 +38,8 @@ FutureOr<UserModel> signInWithOauthCredentialUseCase(
       }
     }
   } else {
-    // Title: Sign in with credential
-    Flogger.d('[Authentication] Going to sign in user with received credential ${credential.asMap().toString()}');
+    // Title: Sign in with credentials
+    Flogger.d('[Authentication] Going to sign in user with received credential ${credential.asMap()}');
 
     await FirebaseAuth.instance.signInWithCredential(credential);
   }
diff --git a/lib/common/usecase/authentication/sign_in_with_google_use_case.dart b/lib/common/usecase/authentication/sign_in_with_google_use_case.dart
index c261461..3baaf4d 100644
--- a/lib/common/usecase/authentication/sign_in_with_google_use_case.dart
+++ b/lib/common/usecase/authentication/sign_in_with_google_use_case.dart
@@ -1,41 +1,40 @@
 import 'package:firebase_auth/firebase_auth.dart';
-import 'package:flutter_app/common/data/model/exception/custom_exception.dart';
-import 'package:flutter_app/common/data/model/user_model.dart';
-import 'package:flutter_app/common/usecase/authentication/sign_in_with_oauth_credential_use_case.dart';
+import 'package:flutter_app/common/data/entity/user_entity.dart';
+import 'package:flutter_app/common/usecase/authentication/sign_in_with_auth_credential_use_case.dart';
 import 'package:flutter_app/core/flogger.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:google_sign_in/google_sign_in.dart';
-import 'package:riverpod_annotation/riverpod_annotation.dart';
 
-part 'sign_in_with_google_use_case.g.dart';
+const List<String> _scopes = <String>[
+  'email',
+];
 
-@riverpod
-Future<UserModel> signInWithGoogleUseCase(Ref ref) async {
+final signInWithGoogleUseCase = FutureProvider<UserEntity>((ref) async {
   Flogger.d('[Authentication] Sign in with Google started');
 
-  final GoogleSignIn googleSignIn = GoogleSignIn();
+  final googleSignIn = GoogleSignIn.instance;
 
-  // Step 1: Logout from Current Google account if any
-  if (await googleSignIn.isSignedIn()) {
-    await googleSignIn.disconnect();
-  }
+  // Subtitle: Step 1 - Logout from Current Google account if any
+  await googleSignIn.disconnect();
 
-  // Step 2: Sign in with Google
-  final googleSignInAccount = await googleSignIn.signIn();
+  // Subtitle: Step 2 - Authenticate user with Google
+  final account = await googleSignIn.authenticate();
 
-  if (googleSignInAccount == null) throw const CustomException.signInCancelled();
+  // Subtitle: Step 3 - Authorize scopes
+  var authorization = await account.authorizationClient.authorizationForScopes(_scopes);
+  authorization ??= await account.authorizationClient.authorizeScopes(_scopes);
 
-  final googleSignInAuthentication = await googleSignInAccount.authentication;
+  // Subtitle: Step 4 - Create OAuth credential for Firebase
   final oauthCredential = GoogleAuthProvider.credential(
-    accessToken: googleSignInAuthentication.accessToken,
-    idToken: googleSignInAuthentication.idToken,
+    accessToken: authorization.accessToken,
+    idToken: account.authentication.idToken,
   );
 
-  Flogger.d('[Authentication] Received credential from Google: $oauthCredential');
+  Flogger.d('[Authentication] Received credential: $oauthCredential');
 
   return await ref.read(
-    signInWithOauthCredentialUseCaseProvider(
+    signInWithAuthCredentialUseCaseProvider(
       credential: oauthCredential,
     ).future,
   );
-}
+});
diff --git a/lib/common/usecase/authentication/sign_out_use_case.dart b/lib/common/usecase/authentication/sign_out_use_case.dart
index 93d0382..383c4df 100644
--- a/lib/common/usecase/authentication/sign_out_use_case.dart
+++ b/lib/common/usecase/authentication/sign_out_use_case.dart
@@ -1,8 +1,7 @@
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_app/common/provider/current_user_model_state.dart';
+import 'package:flutter_app/common/provider/current_user_state.dart';
 import 'package:flutter_app/core/flogger.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:google_sign_in/google_sign_in.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
@@ -12,9 +11,12 @@ part 'sign_out_use_case.g.dart';
 Future<void> signOutUseCase(Ref ref) async {
   Flogger.d('[Authentication] Going to sign out current user');
 
+  // Title: Clear current user state
+  await ref.read(currentUserStateProvider.notifier).updateCurrentUser(null);
+
   // Title: Try to sign out from Google - if any
   try {
-    await GoogleSignIn().disconnect();
+    await GoogleSignIn.instance.disconnect();
   } on MissingPluginException catch (error) {
     Flogger.d('[Authentication] MissingPluginException $error');
   } on PlatformException catch (error) {
@@ -24,8 +26,5 @@ Future<void> signOutUseCase(Ref ref) async {
   // Title: Sign out from Firebase
   await FirebaseAuth.instance.signOut();
 
-  // Title: Clear current user state
-  await ref.read(currentUserModelStateProvider.notifier).updateCurrentUser(null);
-
   Flogger.d('[Authentication] Sign out complete');
 }
diff --git a/lib/common/usecase/create_device_token_use_case.dart b/lib/common/usecase/create_device_token_use_case.dart
index 16ca7c0..3d805ed 100644
--- a/lib/common/usecase/create_device_token_use_case.dart
+++ b/lib/common/usecase/create_device_token_use_case.dart
@@ -1,6 +1,5 @@
 import 'package:flutter_app/common/data/dto/create_device_token_request_dto.dart';
 import 'package:flutter_app/core/network/dio_provider.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'create_device_token_use_case.g.dart';
@@ -12,8 +11,8 @@ Future<void> createDeviceTokenUseCase(
 }) async {
   final dio = ref.read(dioProvider);
 
-  // TODO: Register FCM token on API
-  await dio.post(
+  // TODO(strv): Register FCM token on API
+  await dio.post<Map<String, dynamic>>(
     '/v1/device-tokens',
     data: CreateDeviceTokenRequestDTO(token: deviceToken).toJson(),
   );
diff --git a/lib/common/usecase/external_url_open_use_case.dart b/lib/common/usecase/external_url_open_use_case.dart
index 0bee14f..a88febd 100644
--- a/lib/common/usecase/external_url_open_use_case.dart
+++ b/lib/common/usecase/external_url_open_use_case.dart
@@ -1,4 +1,3 @@
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:url_launcher/url_launcher.dart';
 
diff --git a/lib/common/usecase/format/format_long_date_use_case.dart b/lib/common/usecase/format/format_long_date_use_case.dart
index 503b1cc..558ba07 100644
--- a/lib/common/usecase/format/format_long_date_use_case.dart
+++ b/lib/common/usecase/format/format_long_date_use_case.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:intl/intl.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
diff --git a/lib/common/usecase/get_random_image_url_use_case.dart b/lib/common/usecase/get_random_image_url_use_case.dart
index 06bb505..17802d1 100644
--- a/lib/common/usecase/get_random_image_url_use_case.dart
+++ b/lib/common/usecase/get_random_image_url_use_case.dart
@@ -1,6 +1,5 @@
 import 'dart:math';
 
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'get_random_image_url_use_case.g.dart';
diff --git a/lib/common/usecase/native_store_open_use_case.dart b/lib/common/usecase/native_store_open_use_case.dart
index cabd05f..a8475d8 100644
--- a/lib/common/usecase/native_store_open_use_case.dart
+++ b/lib/common/usecase/native_store_open_use_case.dart
@@ -1,6 +1,5 @@
 import 'package:flutter_app/app/setup/app_platform.dart';
 import 'package:flutter_app/core/flogger.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:url_launcher/url_launcher.dart';
 
@@ -15,7 +14,9 @@ final _platformNotSupportedException = Exception('Platform not supported');
 
 /// This exception was thrown when page in store can't be launchd
 class CantLaunchPageException implements Exception {
-  CantLaunchPageException(String cause) : super();
+  CantLaunchPageException(this.message) : super();
+
+  final String message;
 }
 
 @riverpod
@@ -64,38 +65,36 @@ Future<void> _open(String? appStoreId, String? appStoreIdMacOS, String? androidA
   throw _platformNotSupportedException;
 }
 
-Future _openAndroid(String? androidAppBundleId) async {
+Future<void> _openAndroid(String? androidAppBundleId) async {
   if (androidAppBundleId != null) {
     await _openUrl('$_playMarketUrl$androidAppBundleId');
-    return;
+  } else {
+    throw CantLaunchPageException('androidAppBundleId is not passed');
   }
-  throw CantLaunchPageException('androidAppBundleId is not passed');
 }
 
-Future _openIOS(String? appStoreId) async {
+Future<void> _openIOS(String? appStoreId) async {
   if (appStoreId != null) {
     await _openUrl('$_appStoreUrlIOS$appStoreId');
-    return;
+  } else {
+    throw CantLaunchPageException('appStoreId is not passed');
   }
-  throw CantLaunchPageException('appStoreId is not passed');
 }
 
-Future _openMacOS(String? appStoreId, String? appStoreIdMacOS) async {
+Future<void> _openMacOS(String? appStoreId, String? appStoreIdMacOS) async {
   if (appStoreId != null || appStoreIdMacOS != null) {
     await _openUrl('$_appStoreUrlMacOS${appStoreIdMacOS ?? appStoreId}');
-    return;
+  } else {
+    throw CantLaunchPageException('appStoreId and appStoreIdMacOS is not passed');
   }
-  throw CantLaunchPageException(
-    'appStoreId and appStoreIdMacOS is not passed',
-  );
 }
 
-Future _openWindows(String? windowsProductId) async {
+Future<void> _openWindows(String? windowsProductId) async {
   if (windowsProductId != null) {
     await _openUrl('$_microsoftStoreUrl$windowsProductId');
-    return;
+  } else {
+    throw CantLaunchPageException('windowsProductId is not passed');
   }
-  throw CantLaunchPageException('windowsProductId is not passed');
 }
 
 Future<void> _openUrl(String url) async {
@@ -105,7 +104,7 @@ Future<void> _openUrl(String url) async {
       uri,
       mode: LaunchMode.externalApplication,
     );
-    return;
+  } else {
+    throw CantLaunchPageException('Could not launch $url');
   }
-  throw CantLaunchPageException('Could not launch $url');
 }
diff --git a/lib/common/usecase/user/get_current_user_use_case.dart b/lib/common/usecase/user/get_current_user_use_case.dart
index e3239fe..f323dc3 100644
--- a/lib/common/usecase/user/get_current_user_use_case.dart
+++ b/lib/common/usecase/user/get_current_user_use_case.dart
@@ -1,15 +1,14 @@
 import 'package:flutter_app/common/data/dto/user_response_dto.dart';
-import 'package:flutter_app/common/data/model/user_model.dart';
+import 'package:flutter_app/common/data/entity/user_entity.dart';
 import 'package:flutter_app/core/network/dio_provider.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'get_current_user_use_case.g.dart';
 
 @riverpod
-Future<UserModel> getCurrentUserUseCase(Ref ref) async {
+Future<UserEntity> getCurrentUserUseCase(Ref ref) async {
   final dio = ref.read(dioProvider);
-  final response = await dio.get('/v1/users/me');
+  final response = await dio.get<Map<String, dynamic>>('/v1/users/me');
 
-  return UserModel.fromAPI(user: UserResponseDTO.fromJson(response.data));
+  return UserResponseDTO.fromJson(response.data!).toEntity();
 }
diff --git a/lib/common/usecase/user/get_database_user_use_case.dart b/lib/common/usecase/user/get_database_user_use_case.dart
index d5f18ce..6e0f087 100644
--- a/lib/common/usecase/user/get_database_user_use_case.dart
+++ b/lib/common/usecase/user/get_database_user_use_case.dart
@@ -1,24 +1,23 @@
 import 'dart:convert';
 
-import 'package:flutter_app/common/data/model/user_model.dart';
+import 'package:flutter_app/common/data/entity/user_entity.dart';
 import 'package:flutter_app/core/database/shared_preferences.dart';
 import 'package:flutter_app/core/flogger.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'get_database_user_use_case.g.dart';
 
 @riverpod
-Future<UserModel?> getDatabaseUserUseCase(Ref ref) async {
+Future<UserEntity?> getDatabaseUserUseCase(Ref ref) async {
   final preferences = await ref.read(sharedPreferencesProvider.future);
   final currentUserData = preferences.getString(PreferencesKeys.currentUserData.value);
 
   if (currentUserData != null) {
     try {
-      return UserModel.fromJson(jsonDecode(currentUserData));
+      return UserEntity.fromJson(jsonDecode(currentUserData) as Map<String, dynamic>);
       // ignore: avoid_catches_without_on_clauses
     } catch (e) {
-      Flogger.e('[CurrentUserModelState] Error while parsing user data: $e');
+      Flogger.e('[CurrentUserEntityState] Error while parsing user data: $e');
       return null;
     }
   } else {
diff --git a/lib/common/usecase/user/set_database_user_use_case.dart b/lib/common/usecase/user/set_database_user_use_case.dart
index eca26e2..8d476e2 100644
--- a/lib/common/usecase/user/set_database_user_use_case.dart
+++ b/lib/common/usecase/user/set_database_user_use_case.dart
@@ -1,8 +1,7 @@
 import 'dart:convert';
 
-import 'package:flutter_app/common/data/model/user_model.dart';
+import 'package:flutter_app/common/data/entity/user_entity.dart';
 import 'package:flutter_app/core/database/shared_preferences.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'set_database_user_use_case.g.dart';
@@ -10,7 +9,7 @@ part 'set_database_user_use_case.g.dart';
 @riverpod
 Future<void> setDatabaseUserUseCase(
   Ref ref, {
-  required UserModel? user,
+  required UserEntity? user,
 }) async {
   final preferences = await ref.read(sharedPreferencesProvider.future);
 
diff --git a/lib/common/validator/controller/text_validator_controller_full_name.dart b/lib/common/validator/controller/text_validator_controller_full_name.dart
index fba9589..a69aeaa 100644
--- a/lib/common/validator/controller/text_validator_controller_full_name.dart
+++ b/lib/common/validator/controller/text_validator_controller_full_name.dart
@@ -3,13 +3,13 @@ import 'package:flutter_app/common/validator/controller/text_validator_controlle
 
 class TextValidatorControllerFullName extends TextValidatorControllerGeneral {
   TextValidatorControllerFullName()
-      : super(
-          emptyText: (context) => context.locale.validatorExceptionFullNameIsEmpty,
-          minLength: 3,
-          tooShortText: (context) => context.locale.validatorExceptionFullNameTooShort,
-          maxLength: 48,
-          tooLongText: (context) => context.locale.validatorExceptionFullNameTooLong,
-          regex: RegExp(r"^[\w'\-,.][^0-9_!¡?÷?¿/\\+=@#$%ˆ&*(){}|~<>;:[\]]{2,}$", caseSensitive: false),
-          regexText: (context) => context.locale.validatorExceptionFullNameIsInvalid,
-        );
+    : super(
+        emptyText: (context) => context.locale.validatorExceptionFullNameIsEmpty,
+        minLength: 3,
+        tooShortText: (context) => context.locale.validatorExceptionFullNameTooShort,
+        maxLength: 48,
+        tooLongText: (context) => context.locale.validatorExceptionFullNameTooLong,
+        regex: RegExp(r"^[\w'\-,.][^0-9_!¡?÷?¿/\\+=@#$%ˆ&*(){}|~<>;:[\]]{2,}$", caseSensitive: false),
+        regexText: (context) => context.locale.validatorExceptionFullNameIsInvalid,
+      );
 }
diff --git a/lib/common/validator/controller/text_validator_controller_general.dart b/lib/common/validator/controller/text_validator_controller_general.dart
index 66ba3a8..b864f29 100644
--- a/lib/common/validator/controller/text_validator_controller_general.dart
+++ b/lib/common/validator/controller/text_validator_controller_general.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/widgets.dart';
-import 'package:flutter_app/common/data/model/exception/validator_exception.dart';
+import 'package:flutter_app/common/data/entity/exception/validator_exception.dart';
 import 'package:flutter_app/common/validator/text_field_validator_state.dart';
 import 'package:flutter_app/common/validator/text_validator_controller.dart';
 
@@ -15,17 +15,15 @@ class TextValidatorControllerGeneral extends TextValidatorController {
     this.condition,
     this.conditionText,
   }) {
-    if (tooShortText != null && minLength == null) throw Exception('minLength must be also set when tooShortText is set.');
-    if (minLength != null && tooShortText == null) throw Exception('tooShortText must be also set when minLength is set.');
-
-    if (tooLongText != null && maxLength == null) throw Exception('maxLength must be also set when tooLongText is set.');
-    if (maxLength != null && tooLongText == null) throw Exception('tooLongText must be also set when maxLength is set.');
-
-    if (regexText != null && regex == null) throw Exception('regex must be also set when regexText is set.');
-    if (regex != null && regexText == null) throw Exception('regexText must be also set when regex is set.');
-
-    if (conditionText != null && condition == null) throw Exception('condition must be also set when conditionText is set.');
-    if (condition != null && conditionText == null) throw Exception('conditionText must be also set when condition is set.');
+    if ((tooShortText != null && minLength == null) || (minLength != null && tooShortText == null)) {
+      throw Exception('minLength and tooShortText must be set together.');
+    } else if ((tooLongText != null && maxLength == null) || (maxLength != null && tooLongText == null)) {
+      throw Exception('maxLength and tooLongText must be set together.');
+    } else if ((regexText != null && regex == null) || (regex != null && regexText == null)) {
+      throw Exception('regex and regexText must be set together.');
+    } else if ((conditionText != null && condition == null) || (condition != null && conditionText == null)) {
+      throw Exception('condition and conditionText must be set together.');
+    }
   }
 
   final String Function(BuildContext context)? emptyText;
@@ -35,7 +33,7 @@ class TextValidatorControllerGeneral extends TextValidatorController {
   final String Function(BuildContext context)? tooLongText;
   final RegExp? regex;
   final String Function(BuildContext context)? regexText;
-  final bool Function(String text)? condition;
+  final Future<bool> Function(String text)? condition;
   final String Function(BuildContext context)? conditionText;
 
   TextFieldValidatorState _state = const TextFieldValidatorState.initial();
@@ -44,7 +42,7 @@ class TextValidatorControllerGeneral extends TextValidatorController {
   TextFieldValidatorState get state => _state;
 
   @override
-  void validate() {
+  Future<void> validate() async {
     if (!canValidate) return;
 
     final text = controller.text;
@@ -57,7 +55,7 @@ class TextValidatorControllerGeneral extends TextValidatorController {
       _state = TextFieldValidatorState.invalid(exception: ValidatorException.generalIsTooLong(tooLongText!));
     } else if (regex != null && !regex!.hasMatch(text)) {
       _state = TextFieldValidatorState.invalid(exception: ValidatorException.generalIsInvalid(regexText!));
-    } else if (condition?.call(text) ?? false) {
+    } else if (condition != null && await condition!(text)) {
       _state = TextFieldValidatorState.invalid(exception: ValidatorException.generalIsInvalid(conditionText!));
     } else {
       _state = const TextFieldValidatorState.valid();
@@ -65,4 +63,8 @@ class TextValidatorControllerGeneral extends TextValidatorController {
 
     notifyListeners();
   }
+
+  bool get isValid => _state is TextFieldValidatorStateValid;
+
+  bool get isInvalid => _state is TextFieldValidatorStateInvalid;
 }
diff --git a/lib/common/validator/text_field_validator_state.dart b/lib/common/validator/text_field_validator_state.dart
index 0653b9a..fa2da15 100644
--- a/lib/common/validator/text_field_validator_state.dart
+++ b/lib/common/validator/text_field_validator_state.dart
@@ -1,26 +1,35 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_app/common/data/model/exception/validator_exception.dart';
+import 'package:flutter_app/common/data/entity/exception/validator_exception.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
 part 'text_field_validator_state.freezed.dart';
 
 @freezed
-class TextFieldValidatorState with _$TextFieldValidatorState {
+sealed class TextFieldValidatorState with _$TextFieldValidatorState {
   const TextFieldValidatorState._();
 
-  const factory TextFieldValidatorState.initial() = _Initial;
-  const factory TextFieldValidatorState.valid() = _Valid;
-  const factory TextFieldValidatorState.invalid({required ValidatorException exception}) = _Invalid;
+  const factory TextFieldValidatorState.initial() = TextFieldValidatorStateInitial;
+  const factory TextFieldValidatorState.valid() = TextFieldValidatorStateValid;
+  const factory TextFieldValidatorState.invalid({required ValidatorException exception}) = TextFieldValidatorStateInvalid;
 
   bool get isValid {
-    return mapOrNull(valid: (_) => true) ?? false;
+    return switch (this) {
+      TextFieldValidatorStateValid() => true,
+      _ => false,
+    };
   }
 
   bool get hasError {
-    return mapOrNull(invalid: (_) => true) ?? false;
+    return switch (this) {
+      TextFieldValidatorStateInvalid() => true,
+      _ => false,
+    };
   }
 
   String? getErrorMessage(BuildContext context) {
-    return mapOrNull(invalid: (value) => value.exception.getMessage(context: context));
+    return switch (this) {
+      TextFieldValidatorStateInvalid(exception: final exception) => exception.getMessage(context: context),
+      _ => null,
+    };
   }
 }
diff --git a/lib/common/validator/text_validator_controller.dart b/lib/common/validator/text_validator_controller.dart
index 8c0074a..0de58c0 100644
--- a/lib/common/validator/text_validator_controller.dart
+++ b/lib/common/validator/text_validator_controller.dart
@@ -18,16 +18,19 @@ abstract class TextValidatorController extends ChangeNotifier {
     });
   }
 
-  /// Indicates, if form is validated immediatelly. It's due to postponing validation until some action button is selected.
-  bool canValidate;
+  /// Text field controller.
   final controller = TextEditingController();
+
+  /// Indicates, if form is validated immediately. It's due to postponing validation until some action button is selected.
+  bool canValidate;
+
+  /// State of the validator.
   TextFieldValidatorState get state;
-  Timer? _debounceTimer;
 
-  String get text {
-    return controller.text;
-  }
+  /// Debounce timer to postpone validation.
+  Timer? _debounceTimer;
 
+  String get text => controller.text;
   set text(String text) {
     controller.text = text;
   }
@@ -49,10 +52,10 @@ abstract class TextValidatorController extends ChangeNotifier {
   }
 
   /// Sets `canValidate` to `true` and calls `validate()` function.
-  void forceValidate() {
+  Future<void> forceValidate() async {
     canValidate = true;
-    validate();
+    await validate();
   }
 
-  void validate();
+  Future<void> validate();
 }
diff --git a/lib/core/analytics/analytics_event.dart b/lib/core/analytics/analytics_event.dart
index c704b8a..0d8f032 100644
--- a/lib/core/analytics/analytics_event.dart
+++ b/lib/core/analytics/analytics_event.dart
@@ -3,15 +3,15 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 part 'analytics_event.freezed.dart';
 
 @freezed
-class AnalyticsEvent with _$AnalyticsEvent {
-  factory AnalyticsEvent._({
+sealed class AnalyticsEvent with _$AnalyticsEvent {
+  factory AnalyticsEvent({
     required String firebaseEventId,
     Map<String, String>? firebaseEventParams,
   }) = _AnalyticsEvent;
 
-  factory AnalyticsEvent.onSampleEvent() => AnalyticsEvent._(firebaseEventId: 'on_sample_event');
-  factory AnalyticsEvent.onAnotherSampleEvent({required String sampleParamValue}) => AnalyticsEvent._(
-        firebaseEventId: 'on_another_sample_event',
-        firebaseEventParams: {'sample_parameter_id': sampleParamValue},
-      );
+  factory AnalyticsEvent.onSampleEvent() => AnalyticsEvent(firebaseEventId: 'on_sample_event');
+  factory AnalyticsEvent.onAnotherSampleEvent({required String sampleParamValue}) => AnalyticsEvent(
+    firebaseEventId: 'on_another_sample_event',
+    firebaseEventParams: {'sample_parameter_id': sampleParamValue},
+  );
 }
diff --git a/lib/core/analytics/analytics_manager.dart b/lib/core/analytics/analytics_manager.dart
index 9cda0f4..dbfa547 100644
--- a/lib/core/analytics/analytics_manager.dart
+++ b/lib/core/analytics/analytics_manager.dart
@@ -1,17 +1,15 @@
 import 'package:firebase_analytics/firebase_analytics.dart';
 import 'package:firebase_core/firebase_core.dart';
-import 'package:flutter_app/common/data/model/user_model.dart';
+import 'package:flutter_app/common/data/entity/user_entity.dart';
 import 'package:flutter_app/core/analytics/analytics_event.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'analytics_manager.g.dart';
 
 @riverpod
-Future<void> analyticsManagerUpdateUserInfo(Ref ref, {required UserModel? user}) async {
-  FirebaseAnalytics.instance
-    ..setUserId(id: user?.id)
-    ..setUserProperty(name: 'display_name', value: user?.displayName);
+Future<void> analyticsManagerUpdateUserInfo(Ref ref, {required UserEntity? user}) async {
+  await FirebaseAnalytics.instance.setUserId(id: user?.id);
+  await FirebaseAnalytics.instance.setUserProperty(name: 'display_name', value: user?.displayName);
 }
 
 @riverpod
diff --git a/lib/core/analytics/analytics_route_observer.dart b/lib/core/analytics/analytics_route_observer.dart
index 887655f..c7f492d 100644
--- a/lib/core/analytics/analytics_route_observer.dart
+++ b/lib/core/analytics/analytics_route_observer.dart
@@ -2,7 +2,6 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_app/core/analytics/analytics_manager.dart';
 import 'package:flutter_app/core/flogger.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'analytics_route_observer.g.dart';
@@ -16,7 +15,7 @@ class AnalyticsRouteObserver extends AutoRouterObserver {
   final Ref ref;
 
   @override
-  void didPush(Route route, Route? previousRoute) {
+  void didPush(Route<dynamic> route, Route<dynamic>? previousRoute) {
     if (route.settings.name == null) return;
 
     Flogger.d('[AnalyticsRouteObserver] New route pushed: ${route.settings.name}');
@@ -37,7 +36,9 @@ class AnalyticsRouteObserver extends AutoRouterObserver {
 
   void _logScreenName(String screenName) {
     try {
-      ref.read(analyticsManagerLogScreenViewProvider(screenName).future);
+      if (ref.mounted) {
+        ref.read(analyticsManagerLogScreenViewProvider(screenName).future);
+      }
     } on Exception catch (error) {
       Flogger.e('[AnalyticsRouteObserver] Error while sending event $error');
     }
diff --git a/lib/core/analytics/analytics_screen_view.dart b/lib/core/analytics/analytics_screen_view.dart
index 89de524..2c5567d 100644
--- a/lib/core/analytics/analytics_screen_view.dart
+++ b/lib/core/analytics/analytics_screen_view.dart
@@ -3,13 +3,13 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 part 'analytics_screen_view.freezed.dart';
 
 @freezed
-class AnalyticsScreenView with _$AnalyticsScreenView {
-  factory AnalyticsScreenView._({
+sealed class AnalyticsScreenView with _$AnalyticsScreenView {
+  factory AnalyticsScreenView({
     required String firebaseScreenName,
   }) = _AnalyticsScreenView;
 
-  factory AnalyticsScreenView.homePage() => AnalyticsScreenView._(firebaseScreenName: 'home_page_screen');
-  factory AnalyticsScreenView.eventsPage() => AnalyticsScreenView._(firebaseScreenName: 'events_page_screen');
-  factory AnalyticsScreenView.favoritesPage() => AnalyticsScreenView._(firebaseScreenName: 'favorites_page_screen');
-  factory AnalyticsScreenView.eventDetailPage() => AnalyticsScreenView._(firebaseScreenName: 'event_detail_page_screen');
+  factory AnalyticsScreenView.homePage() => AnalyticsScreenView(firebaseScreenName: 'home_page_screen');
+  factory AnalyticsScreenView.eventsPage() => AnalyticsScreenView(firebaseScreenName: 'events_page_screen');
+  factory AnalyticsScreenView.favoritesPage() => AnalyticsScreenView(firebaseScreenName: 'favorites_page_screen');
+  factory AnalyticsScreenView.eventDetailPage() => AnalyticsScreenView(firebaseScreenName: 'event_detail_page_screen');
 }
diff --git a/lib/core/analytics/crashlytics_manager.dart b/lib/core/analytics/crashlytics_manager.dart
index e872a83..214b0d9 100644
--- a/lib/core/analytics/crashlytics_manager.dart
+++ b/lib/core/analytics/crashlytics_manager.dart
@@ -6,13 +6,13 @@ import 'package:flutter_app/app/setup/app_platform.dart';
 class CrashlyticsManager {
   static Future<void> logMessage(dynamic message) async {
     if (Firebase.apps.isNotEmpty && AppPlatform.isMobile && !kDebugMode) {
-      await FirebaseCrashlytics.instance.log(message);
+      await FirebaseCrashlytics.instance.log(message.toString());
     }
   }
 
   static Future<void> logNonCritical(dynamic exception, {StackTrace? stack, String? message}) async {
     if (Firebase.apps.isNotEmpty && AppPlatform.isMobile && !kDebugMode) {
-      await FirebaseCrashlytics.instance.recordError(exception, stack, reason: message, fatal: false);
+      await FirebaseCrashlytics.instance.recordError(exception, stack, reason: message);
     }
   }
 
diff --git a/lib/core/database/shared_preferences.dart b/lib/core/database/shared_preferences.dart
index 204b592..519821d 100644
--- a/lib/core/database/shared_preferences.dart
+++ b/lib/core/database/shared_preferences.dart
@@ -1,11 +1,9 @@
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 part 'shared_preferences.g.dart';
 
 enum PreferencesKeys {
-  notificationsPermissionRequestCount('notifications_permission_request_count'),
   currentUserData('current_user_data'),
   themeMode('theme_mode');
 
diff --git a/lib/core/flogger.dart b/lib/core/flogger.dart
index dc2a736..73b7341 100644
--- a/lib/core/flogger.dart
+++ b/lib/core/flogger.dart
@@ -6,7 +6,7 @@ import 'package:talker_flutter/talker_flutter.dart';
 
 /// Wrapper over the Talker package.
 class Flogger {
-  static final bool _providerLogsEnabled = false;
+  static const bool _providerLogsEnabled = false;
 
   static final talker = TalkerFlutter.init(
     logger: TalkerLogger(formatter: _LoggerFormatter()),
@@ -30,85 +30,103 @@ class Flogger {
 
   static void v(dynamic message, {Object? exception, StackTrace? stackTrace, DateTime? time}) {
     CrashlyticsManager.logMessage(message);
-    talker.logCustom(_CustomLog(
-      message.toString(),
-      exception: exception,
-      stackTrace: stackTrace,
-      pen: colors['verbose'],
-      key: TalkerLogType.verbose.key,
-    ));
+    talker.logCustom(
+      _CustomLog(
+        message.toString(),
+        exception: exception,
+        stackTrace: stackTrace,
+        pen: colors['verbose'],
+        key: 'verbose',
+      ),
+    );
   }
 
   static void d(dynamic message, {Object? exception, StackTrace? stackTrace, DateTime? time}) {
     CrashlyticsManager.logMessage(message);
-    talker.logCustom(_CustomLog(
-      message.toString(),
-      exception: exception,
-      stackTrace: stackTrace,
-      pen: colors['debug'],
-      key: TalkerLogType.debug.key,
-    ));
+    talker.logCustom(
+      _CustomLog(
+        message.toString(),
+        exception: exception,
+        stackTrace: stackTrace,
+        pen: colors['debug'],
+        key: 'debug',
+      ),
+    );
   }
 
   static void i(dynamic message, {Object? exception, StackTrace? stackTrace, DateTime? time}) {
     CrashlyticsManager.logMessage(message);
-    talker.logCustom(_CustomLog(
-      message.toString(),
-      exception: exception,
-      stackTrace: stackTrace,
-      pen: colors['info'],
-      key: TalkerLogType.info.key,
-    ));
+    talker.logCustom(
+      _CustomLog(
+        message.toString(),
+        exception: exception,
+        stackTrace: stackTrace,
+        pen: colors['info'],
+        key: 'info',
+      ),
+    );
   }
 
   static void w(dynamic message, {Object? exception, StackTrace? stackTrace, DateTime? time}) {
-    CrashlyticsManager.logNonCritical(exception, stack: stackTrace, message: message);
-    talker.logCustom(_CustomLog(
-      message.toString(),
-      exception: exception,
-      stackTrace: stackTrace,
-      pen: colors['warning'],
-      key: TalkerLogType.warning.key,
-    ));
+    CrashlyticsManager.logNonCritical(exception, stack: stackTrace, message: message.toString());
+    talker.logCustom(
+      _CustomLog(
+        message.toString(),
+        exception: exception,
+        stackTrace: stackTrace,
+        pen: colors['warning'],
+        key: 'warning',
+      ),
+    );
   }
 
   static void e(dynamic message, {Object? exception, StackTrace? stackTrace, DateTime? time}) {
-    CrashlyticsManager.logNonCritical(exception, stack: stackTrace, message: message);
-    talker.logCustom(_CustomLog(
-      message.toString(),
-      exception: exception,
-      stackTrace: stackTrace,
-      pen: colors['error'],
-      key: TalkerLogType.error.key,
-    ));
+    CrashlyticsManager.logNonCritical(exception, stack: stackTrace, message: message.toString());
+    talker.logCustom(
+      _CustomLog(
+        message.toString(),
+        exception: exception,
+        stackTrace: stackTrace,
+        pen: colors['error'],
+        key: 'error',
+      ),
+    );
   }
 
-  static void navigation(dynamic message) => talker.logCustom(_CustomLog(
-        message.toString(),
-        pen: colors['navigation'],
-        key: TalkerLogType.route.key,
-      ));
-
-  static void providerAdded(dynamic message) => (_providerLogsEnabled)
-      ? talker.logCustom(_CustomLog(
-          message.toString(),
-          pen: colors['providerAdded'],
-          key: TalkerLogType.riverpodAdd.key,
-        ))
+  static void navigation(dynamic message) => talker.logCustom(
+    _CustomLog(
+      message.toString(),
+      pen: colors['navigation'],
+      key: 'navigation',
+    ),
+  );
+
+  static void providerAdded(dynamic message) => _providerLogsEnabled
+      ? talker.logCustom(
+          _CustomLog(
+            message.toString(),
+            pen: colors['providerAdded'],
+            key: 'providerAdded',
+          ),
+        )
       : null;
-  static void providerUpdated(dynamic message) => (_providerLogsEnabled)
-      ? talker.logCustom(_CustomLog(
-          message.toString(),
-          pen: colors['providerUpdated'],
-          key: TalkerLogType.riverpodUpdate.key,
-        ))
+  static void providerUpdated(dynamic message) => _providerLogsEnabled
+      ? talker.logCustom(
+          _CustomLog(
+            message.toString(),
+            pen: colors['providerUpdated'],
+            key: 'providerUpdated',
+          ),
+        )
       : null;
-  static void providerRemoved(dynamic message) => (_providerLogsEnabled)
-      ? talker.logCustom(_CustomLog(
-          message.toString(),
-          pen: colors['providerRemoved'],
-          key: TalkerLogType.riverpodDispose.key,
-        ))
+  static void providerRemoved(dynamic message) => _providerLogsEnabled
+      ? talker.logCustom(
+          _CustomLog(
+            message.toString(),
+            pen: colors['providerRemoved'],
+            key: 'providerRemoved',
+          ),
+        )
       : null;
 }
 
@@ -147,7 +165,7 @@ class _LoggerFormatter implements LoggerFormatter {
     final msg = details.message?.toString() ?? '';
     final msgBorderedLines = _splitLongLines(msg, _maxOutputThreshold).split('\n').map((e) => '│ $e');
     if (!settings.enableColors) {
-      return (showBorder) ? '$topline\n${msgBorderedLines.join('\n')}\n$underline' : msgBorderedLines.join('\n');
+      return showBorder ? '$topline\n${msgBorderedLines.join('\n')}\n$underline' : msgBorderedLines.join('\n');
     }
     var lines = [if (showBorder) topline, ...msgBorderedLines, if (showBorder) underline];
     lines = lines.map((e) => details.pen.write(e)).toList();
@@ -156,14 +174,14 @@ class _LoggerFormatter implements LoggerFormatter {
   }
 
   static String _splitLongLines(String input, int maxLineLength) {
-    List<String> lines = input.split('\n');
-    List<String> outputLines = [];
+    final lines = input.split('\n');
+    final outputLines = <String>[];
 
-    for (String line in lines) {
+    for (final line in lines) {
       if (line.length > maxLineLength) {
         // Split the line into chunks of maxLineLength
-        for (int i = 0; i < line.length; i += maxLineLength) {
-          int end = (i + maxLineLength < line.length) ? i + maxLineLength : line.length;
+        for (var i = 0; i < line.length; i += maxLineLength) {
+          final end = (i + maxLineLength < line.length) ? i + maxLineLength : line.length;
           outputLines.add(line.substring(i, end));
         }
       } else {
diff --git a/lib/core/network/dio_authorization_token_interceptor.dart b/lib/core/network/dio_authorization_token_interceptor.dart
index 9609904..105a89d 100644
--- a/lib/core/network/dio_authorization_token_interceptor.dart
+++ b/lib/core/network/dio_authorization_token_interceptor.dart
@@ -21,7 +21,7 @@ class DioAuthorizationTokenInterceptor extends Interceptor {
       return handler.next(options);
     }
 
-    final token = await ref.read(getAuthorizationTokenUseCaseProvider(forceRefresh: false).future);
+    final token = await ref.read(getAuthorizationTokenUseCaseProvider().future);
 
     options.headers['Authorization'] = 'Bearer $token';
 
diff --git a/lib/core/network/dio_provider.dart b/lib/core/network/dio_provider.dart
index 81a9958..1b93133 100644
--- a/lib/core/network/dio_provider.dart
+++ b/lib/core/network/dio_provider.dart
@@ -2,7 +2,6 @@ import 'package:dio/dio.dart';
 import 'package:flutter_app/app/configuration/configuration.dart';
 import 'package:flutter_app/core/flogger.dart';
 import 'package:flutter_app/core/network/dio_authorization_token_interceptor.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:talker_dio_logger/talker_dio_logger.dart';
 
@@ -19,9 +18,6 @@ Dio dio(Ref ref) {
     TalkerDioLogger(
       talker: Flogger.talker,
       settings: TalkerDioLoggerSettings(
-        printRequestHeaders: false,
-        printResponseHeaders: false,
-        printResponseMessage: true,
         requestPen: Flogger.colors['httpRequest'],
         responsePen: Flogger.colors['httpResponse'],
         errorPen: Flogger.colors['httpError'],
diff --git a/lib/core/riverpod/event_notifier.dart b/lib/core/riverpod/event_notifier.dart
index 27042be..86daa6d 100644
--- a/lib/core/riverpod/event_notifier.dart
+++ b/lib/core/riverpod/event_notifier.dart
@@ -1,15 +1,18 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 /// Notifier which is used only to listen.
-class EventNotifier<T> extends StateNotifier<T> {
-  EventNotifier(super.state);
-
-  @override
-  bool updateShouldNotify(T old, T current) {
-    return true;
-  }
+class EventNotifier<T> extends Notifier<T?> {
+  /// Creates an [EventNotifier] with the given [state].
+  EventNotifier() : super();
 
+  /// Updates the state with the provided event.
+  // ignore: use_setters_to_change_properties
   void send(T event) {
     state = event;
   }
+
+  @override
+  T? build() {
+    return state;
+  }
 }
diff --git a/lib/core/riverpod/provider_logger.dart b/lib/core/riverpod/provider_logger.dart
index 87139ae..a6b5326 100644
--- a/lib/core/riverpod/provider_logger.dart
+++ b/lib/core/riverpod/provider_logger.dart
@@ -1,32 +1,27 @@
 import 'package:flutter_app/core/flogger.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-class ProvidersLogger extends ProviderObserver {
+base class ProvidersLogger extends ProviderObserver {
   @override
-  void didAddProvider(
-    ProviderBase provider,
-    Object? value,
-    ProviderContainer container,
-  ) {
-    super.didAddProvider(provider, value, container);
+  void didAddProvider(ProviderObserverContext context, Object? value) {
+    super.didAddProvider(context, value);
 
     Flogger.v(
-      '[PROVIDER] Provider added: ${provider.name ?? provider.runtimeType},'
+      '[PROVIDER] Provider added: ${context.provider.name ?? context.provider.runtimeType},'
       '\n[PROVIDER] Value: $value',
     );
   }
 
   @override
   void didUpdateProvider(
-    ProviderBase provider,
+    ProviderObserverContext context,
     Object? previousValue,
     Object? newValue,
-    ProviderContainer container,
   ) {
-    super.didUpdateProvider(provider, previousValue, newValue, container);
+    super.didUpdateProvider(context, previousValue, newValue);
 
     Flogger.v(
-      '[PROVIDER] Provider updated: ${provider.name ?? provider.runtimeType},'
+      '[PROVIDER] Provider updated: ${context.provider.name ?? context.provider.runtimeType},'
       '\n[PROVIDER] Old value: $previousValue,'
       '\n[PROVIDER] New value: $newValue',
     );
@@ -34,11 +29,10 @@ class ProvidersLogger extends ProviderObserver {
 
   @override
   void didDisposeProvider(
-    ProviderBase provider,
-    ProviderContainer container,
+    ProviderObserverContext context,
   ) {
-    super.didDisposeProvider(provider, container);
+    super.didDisposeProvider(context);
 
-    Flogger.v('[PROVIDER] Provider disposed: ${provider.name ?? provider.runtimeType}');
+    Flogger.v('[PROVIDER] Provider disposed: ${context.provider.name ?? context.provider.runtimeType}');
   }
 }
diff --git a/lib/core/riverpod/state_handler.dart b/lib/core/riverpod/state_handler.dart
index edfc8ce..7f2635c 100644
--- a/lib/core/riverpod/state_handler.dart
+++ b/lib/core/riverpod/state_handler.dart
@@ -1,48 +1,44 @@
 import 'package:flutter_app/core/flogger.dart';
-import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 /// setInitialState() - This method can be used to manually set the initial state of the notifier.
 ///     It will set Loading state on first initialization of the [AsyncNotifier]. If the currentData is not null,
 ///     it will set the currentData as the initial state. This can happen for example when the notifier is invalidated,
 ///     or when there is ref.watch used in the build method.
 
-// ignore: invalid_use_of_internal_member
-mixin AutoDisposeStateHandler<T> on BuildlessAutoDisposeAsyncNotifier<T> {
-  T? get currentData => state.valueOrNull;
+mixin AutoDisposeStateHandler<T> on AnyNotifier<AsyncValue<T>, T> {
+  T? get currentData => state.value;
 
   void setInitialState() => state = currentData == null ? const AsyncLoading() : AsyncData(currentData as T);
   void setStateLoading() => _setStateLoading(() => state = AsyncValue<T>.loading());
   void setStateData(T? data) => _setStateData(data, (data) => state = AsyncData(data));
 }
 
-// ignore: invalid_use_of_internal_member
-mixin NullableAutoDisposeStateHandler<T> on BuildlessAutoDisposeAsyncNotifier<T?> {
-  T? get currentData => state.valueOrNull;
+mixin NullableAutoDisposeStateHandler<T> on AnyNotifier<AsyncValue<T?>, T?> {
+  T? get currentData => state.value;
 
   void setInitialState() => state = currentData == null ? const AsyncLoading() : AsyncData(currentData as T);
   void setStateLoading() => _setStateLoading(() => state = AsyncValue<T>.loading());
   void setStateData(T? data) => _setStateDataNullable(data, (data) => state = AsyncData(data));
 }
 
-// ignore: invalid_use_of_internal_member
-mixin StateHandler<T> on BuildlessAsyncNotifier<T> {
-  T? get currentData => state.valueOrNull;
+mixin StateHandler<T> on AnyNotifier<AsyncValue<T>, T> {
+  T? get currentData => state.value;
 
   void setInitialState() => state = currentData == null ? const AsyncLoading() : AsyncData(currentData as T);
   void setStateLoading() => _setStateLoading(() => state = AsyncValue<T>.loading());
   void setStateData(T? data) => _setStateData(data, (data) => state = AsyncData(data));
 }
 
-// ignore: invalid_use_of_internal_member
-mixin NullableStateHandler<T> on BuildlessAsyncNotifier<T?> {
-  T? get currentData => state.valueOrNull;
+mixin NullableStateHandler<T> on AnyNotifier<AsyncValue<T?>, T?> {
+  T? get currentData => state.value;
 
   void setInitialState() => state = currentData == null ? const AsyncLoading() : AsyncData(currentData as T);
   void setStateLoading() => _setStateLoading(() => state = AsyncValue<T>.loading());
   void setStateData(T? data) => _setStateDataNullable(data, (data) => state = AsyncData(data));
 }
 
-void _setStateLoading(Function() onStateChange) {
+void _setStateLoading(void Function() onStateChange) {
   try {
     onStateChange();
     // ignore: avoid_catching_errors
@@ -51,7 +47,7 @@ void _setStateLoading(Function() onStateChange) {
   }
 }
 
-void _setStateData<T>(T? data, Function(T data) onStateChange) {
+void _setStateData<T>(T? data, void Function(T data) onStateChange) {
   try {
     if (data != null) {
       onStateChange(data);
@@ -64,7 +60,7 @@ void _setStateData<T>(T? data, Function(T data) onStateChange) {
   }
 }
 
-void _setStateDataNullable<T>(T? data, Function(T? data) onStateChange) {
+void _setStateDataNullable<T>(T? data, void Function(T? data) onStateChange) {
   try {
     onStateChange(data);
     // ignore: avoid_catching_errors
diff --git a/lib/features/authentication/authentication_event.dart b/lib/features/authentication/authentication_event.dart
index 1539b4b..fb68e81 100644
--- a/lib/features/authentication/authentication_event.dart
+++ b/lib/features/authentication/authentication_event.dart
@@ -5,9 +5,10 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 part 'authentication_event.freezed.dart';
 
 @freezed
-class AuthenticationEvent with _$AuthenticationEvent {
-  const factory AuthenticationEvent.signedIn() = _SignedIn;
+sealed class AuthenticationEvent with _$AuthenticationEvent {
+  const factory AuthenticationEvent.signedIn() = AuthenticationEventSignedIn;
 }
 
-final authenticationEventNotifierProvider =
-    StateNotifierProvider.autoDispose<EventNotifier<AuthenticationEvent?>, AuthenticationEvent?>((ref) => EventNotifier(null));
+final authenticationEventNotifierProvider = NotifierProvider.autoDispose<EventNotifier<AuthenticationEvent?>, AuthenticationEvent?>(
+  EventNotifier.new,
+);
diff --git a/lib/features/authentication/authentication_page.dart b/lib/features/authentication/authentication_page.dart
index fa5b002..db88266 100644
--- a/lib/features/authentication/authentication_page.dart
+++ b/lib/features/authentication/authentication_page.dart
@@ -1,6 +1,8 @@
-import 'package:auto_route/annotations.dart';
+import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_app/app/navigation/app_router.dart';
 import 'package:flutter_app/common/component/custom_app_bar.dart';
+import 'package:flutter_app/features/authentication/authentication_event.dart';
 import 'package:flutter_app/features/authentication/authentication_page_content.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
@@ -10,6 +12,14 @@ class AuthenticationPage extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    ref.listen(
+      authenticationEventNotifierProvider,
+      (_, next) => switch (next) {
+        AuthenticationEventSignedIn() => context.router.replaceAll([const LandingRoute()]),
+        _ => () {},
+      },
+    );
+
     return const Scaffold(
       appBar: CustomAppBar(
         title: 'Authentication',
diff --git a/lib/features/authentication/authentication_page_content.dart b/lib/features/authentication/authentication_page_content.dart
index 571bd18..7d1badf 100644
--- a/lib/features/authentication/authentication_page_content.dart
+++ b/lib/features/authentication/authentication_page_content.dart
@@ -4,7 +4,6 @@ import 'package:flutter_app/app/navigation/app_router.dart';
 import 'package:flutter_app/common/component/custom_button/custom_button_primary.dart';
 import 'package:flutter_app/common/extension/async_value.dart';
 import 'package:flutter_app/common/usecase/authentication/sign_in_completion_use_case.dart';
-import 'package:flutter_app/features/authentication/authentication_event.dart';
 import 'package:flutter_app/features/authentication/authentication_state.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
@@ -13,19 +12,10 @@ class AuthenticationPageContent extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final state = ref.watch(authenticationStateNotifierProvider);
-
-    ref.listen(
-      authenticationEventNotifierProvider,
-      (_, next) {
-        next?.whenOrNull(
-          signedIn: () => context.router.replaceAll([const LandingRoute()]),
-        );
-      },
-    );
+    final state = ref.watch(authenticationStateProvider);
 
     return state.mapContentState(
-      provider: authenticationStateNotifierProvider,
+      provider: authenticationStateProvider,
       data: (data) => _DataStateWidget(data: data),
     );
   }
@@ -45,29 +35,30 @@ class _DataStateWidget extends ConsumerWidget {
           children: [
             const Spacer(),
             CustomButtonPrimary(
-                text: 'Mock Sign In',
-                isLoading: data.isSigningIn,
-                onPressed: () async {
-                  await ref.read(signInCompletionUseCaseProvider.future);
-                  if (context.mounted) context.router.replaceAll([const LandingRoute()]);
-                }),
+              text: 'Mock Sign In',
+              isLoading: data.isSigningIn,
+              onPressed: () async {
+                await ref.read(signInCompletionUseCaseProvider.future);
+                if (context.mounted) await context.router.replaceAll([const LandingRoute()]);
+              },
+            ),
             const SizedBox(height: 48),
             CustomButtonPrimary(
               text: 'Sign in Anonymously',
               isLoading: data.isSigningIn,
-              onPressed: () => ref.read(authenticationStateNotifierProvider.notifier).signInAnonymously(),
+              onPressed: () => ref.read(authenticationStateProvider.notifier).signInAnonymously(),
             ),
             const SizedBox(height: 24),
             CustomButtonPrimary(
               text: 'Sign in with Google',
               isLoading: data.isSigningIn,
-              onPressed: () => ref.read(authenticationStateNotifierProvider.notifier).signInWithGoogle(),
+              onPressed: () => ref.read(authenticationStateProvider.notifier).signInWithGoogle(),
             ),
             const SizedBox(height: 8),
             CustomButtonPrimary(
               text: 'Sign in with Apple',
               isLoading: data.isSigningIn,
-              onPressed: () => ref.read(authenticationStateNotifierProvider.notifier).signInWithApple(),
+              onPressed: () => ref.read(authenticationStateProvider.notifier).signInWithApple(),
             ),
           ],
         ),
diff --git a/lib/features/authentication/authentication_state.dart b/lib/features/authentication/authentication_state.dart
index 1404db6..1e529ce 100644
--- a/lib/features/authentication/authentication_state.dart
+++ b/lib/features/authentication/authentication_state.dart
@@ -1,11 +1,12 @@
-import 'package:flutter_app/common/data/model/exception/custom_exception.dart';
-import 'package:flutter_app/common/data/model/user_model.dart';
+import 'package:flutter_app/common/data/entity/exception/custom_exception.dart';
+import 'package:flutter_app/common/data/entity/user_entity.dart';
 import 'package:flutter_app/common/usecase/authentication/sign_in_anonymously_use_case.dart';
 import 'package:flutter_app/common/usecase/authentication/sign_in_with_apple_use_case.dart';
 import 'package:flutter_app/common/usecase/authentication/sign_in_with_google_use_case.dart';
 import 'package:flutter_app/core/flogger.dart';
 import 'package:flutter_app/core/riverpod/state_handler.dart';
 import 'package:flutter_app/features/authentication/authentication_event.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
@@ -13,7 +14,7 @@ part 'authentication_state.freezed.dart';
 part 'authentication_state.g.dart';
 
 @freezed
-class AuthenticationState with _$AuthenticationState {
+abstract class AuthenticationState with _$AuthenticationState {
   const factory AuthenticationState({
     required bool isSigningIn,
   }) = _AuthenticationState;
@@ -29,18 +30,18 @@ class AuthenticationStateNotifier extends _$AuthenticationStateNotifier with Aut
   }
 
   Future<void> signInAnonymously() async {
-    _signInWithProvider(signInAnonymouslyUseCaseProvider);
+    await _signInWithProvider(signInAnonymouslyUseCase);
   }
 
   Future<void> signInWithGoogle() async {
-    _signInWithProvider(signInWithGoogleUseCaseProvider);
+    await _signInWithProvider(signInWithGoogleUseCase);
   }
 
   Future<void> signInWithApple() async {
-    _signInWithProvider(signInWithAppleUseCaseProvider);
+    await _signInWithProvider(signInWithAppleUseCase);
   }
 
-  Future<void> _signInWithProvider(AutoDisposeFutureProvider<UserModel> provider) async {
+  Future<void> _signInWithProvider(FutureProvider<UserEntity> provider) async {
     setStateData(currentData?.copyWith(isSigningIn: true));
 
     try {
@@ -50,14 +51,11 @@ class AuthenticationStateNotifier extends _$AuthenticationStateNotifier with Aut
       ref.read(authenticationEventNotifierProvider.notifier).send(const AuthenticationEvent.signedIn());
     } on Exception catch (error) {
       final customException = CustomException.fromErrorObject(error: error);
-      customException.maybeWhen(
-        signInCancelled: () {
-          Flogger.d('User cancelled the sign in process');
-        },
-        orElse: () {
-          Flogger.e('Error while signing in: $customException');
-        },
-      );
+      if (customException case CustomExceptionSignInCancelled()) {
+        Flogger.d('User cancelled the sign in process');
+      } else {
+        Flogger.e('Error while signing in: $customException');
+      }
     }
 
     setStateData(currentData?.copyWith(isSigningIn: false));
diff --git a/lib/features/debug_tools/debug_tools_page.dart b/lib/features/debug_tools/debug_tools_page.dart
index 8c98ecc..75df47f 100644
--- a/lib/features/debug_tools/debug_tools_page.dart
+++ b/lib/features/debug_tools/debug_tools_page.dart
@@ -24,10 +24,10 @@ class DebugToolsPage extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final stateProvider = ref.watch(debugToolsPageStateNotifierProvider);
+    final stateProvider = ref.watch(debugToolsPageStateProvider);
 
     return stateProvider.mapState(
-      provider: debugToolsPageStateNotifierProvider,
+      provider: debugToolsPageStateProvider,
       data: (data) => Scaffold(
         appBar: const CustomAppBar(
           title: 'Debug tools',
@@ -36,7 +36,7 @@ class DebugToolsPage extends ConsumerWidget {
           canPop: data.selectedAction == null || !ResponsiveWidget.isSmallScreen(context),
           onPopInvokedWithResult: (didPop, result) {
             if (!didPop) {
-              ref.read(debugToolsPageStateNotifierProvider.notifier).setAction(null);
+              ref.read(debugToolsPageStateProvider.notifier).setAction(null);
             }
           },
           child: SafeArea(
diff --git a/lib/features/debug_tools/debug_tools_page_state.dart b/lib/features/debug_tools/debug_tools_page_state.dart
index 1580f18..3895ef7 100644
--- a/lib/features/debug_tools/debug_tools_page_state.dart
+++ b/lib/features/debug_tools/debug_tools_page_state.dart
@@ -9,11 +9,11 @@ enum DebugToolsSampleType {
   widgets,
   popups,
   colors,
-  textStyles;
+  textStyles,
 }
 
 @freezed
-class DebugToolsPageState with _$DebugToolsPageState {
+abstract class DebugToolsPageState with _$DebugToolsPageState {
   const factory DebugToolsPageState({
     @Default(null) DebugToolsSampleType? selectedAction,
   }) = _DebugToolsPageState;
diff --git a/lib/features/debug_tools/page/actions/debug_tools_actions_page_content.dart b/lib/features/debug_tools/page/actions/debug_tools_actions_page_content.dart
index 49086ec..900ed5d 100644
--- a/lib/features/debug_tools/page/actions/debug_tools_actions_page_content.dart
+++ b/lib/features/debug_tools/page/actions/debug_tools_actions_page_content.dart
@@ -2,9 +2,12 @@ import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter_app/common/component/custom_button/custom_button_primary.dart';
+import 'package:flutter_app/common/component/custom_snackbar/custom_snackbar_success.dart';
 import 'package:flutter_app/common/component/custom_switch.dart';
 import 'package:flutter_app/common/component/custom_text/custom_text.dart';
+import 'package:flutter_app/common/composition/dialog/custom_notification_permission_denied_dialog.dart';
 import 'package:flutter_app/common/extension/build_context.dart';
+import 'package:flutter_app/common/provider/notifications_service.dart';
 import 'package:flutter_app/core/flogger.dart';
 import 'package:flutter_app/features/debug_tools/debug_tools_page_state.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -25,16 +28,17 @@ class _DebugToolsActionsPageContentState extends ConsumerState<DebugToolsActions
       children: [
         CustomText(text: 'Actions', style: context.textTheme.headlineLarge),
         const SizedBox(height: 20),
+        // Title: Debug logs
         CustomButtonPrimary(
           onPressed: () {
             Navigator.of(context).push(
-              MaterialPageRoute(
+              MaterialPageRoute<void>(
                 builder: (context) => Theme(
-                  data: ThemeData(colorScheme: ColorScheme.fromSwatch(primarySwatch: Colors.purple)),
+                  data: ThemeData(colorScheme: ColorScheme.fromSwatch(primarySwatch: Colors.grey)),
                   child: TalkerScreen(
                     talker: Flogger.talker,
-                    theme: TalkerScreenTheme(
-                      logColors: {TalkerLogType.debug: Colors.green},
+                    theme: const TalkerScreenTheme(
+                      logColors: {'debug': Colors.green},
                     ),
                   ),
                 ),
@@ -44,6 +48,21 @@ class _DebugToolsActionsPageContentState extends ConsumerState<DebugToolsActions
           text: 'Console Logs',
         ),
         const SizedBox(height: 20),
+        // Title: Notifications sample
+        CustomButtonPrimary(
+          onPressed: () async {
+            final isPermanentlyDenied = await NotificationsService.isPermissionPermanentlyDenied();
+            final isDenied = isPermanentlyDenied || !(await NotificationsService.requestPermission());
+            if (isDenied && context.mounted) {
+              await CustomNotificationPermissionDeniedDialog.show(context);
+              return;
+            } else if (context.mounted) {
+              await CustomSnackbarSuccess(context: context, message: 'Permission granted').show();
+            }
+          },
+          text: 'Request Notification Permission',
+        ),
+        const SizedBox(height: 20),
         ...getToolsSectionList(context, ref),
         const SizedBox(height: 20),
         ...getSamplesSectionList(context, ref),
@@ -74,7 +93,7 @@ class _DebugToolsActionsPageContentState extends ConsumerState<DebugToolsActions
         onChanged: (value) => setState(() => debugRepaintRainbowEnabled = !debugRepaintRainbowEnabled),
       ),
       CustomSwitch(
-        title: 'Time Dilataion',
+        title: 'Time Dilation',
         value: timeDilation != 1,
         dense: true,
         onChanged: (value) => setState(() => timeDilation = (timeDilation == 6) ? 1 : 6),
@@ -88,22 +107,22 @@ class _DebugToolsActionsPageContentState extends ConsumerState<DebugToolsActions
       const SizedBox(height: 20),
       CustomButtonPrimary(
         text: 'Widgets sample',
-        onPressed: () => ref.read(debugToolsPageStateNotifierProvider.notifier).setAction(DebugToolsSampleType.widgets),
+        onPressed: () => ref.read(debugToolsPageStateProvider.notifier).setAction(DebugToolsSampleType.widgets),
       ),
       const SizedBox(height: 16),
       CustomButtonPrimary(
         text: 'Popups sample',
-        onPressed: () => ref.read(debugToolsPageStateNotifierProvider.notifier).setAction(DebugToolsSampleType.popups),
+        onPressed: () => ref.read(debugToolsPageStateProvider.notifier).setAction(DebugToolsSampleType.popups),
       ),
       const SizedBox(height: 16),
       CustomButtonPrimary(
         text: 'Colors sample',
-        onPressed: () => ref.read(debugToolsPageStateNotifierProvider.notifier).setAction(DebugToolsSampleType.colors),
+        onPressed: () => ref.read(debugToolsPageStateProvider.notifier).setAction(DebugToolsSampleType.colors),
       ),
       const SizedBox(height: 16),
       CustomButtonPrimary(
         text: 'Text Styles sample',
-        onPressed: () => ref.read(debugToolsPageStateNotifierProvider.notifier).setAction(DebugToolsSampleType.textStyles),
+        onPressed: () => ref.read(debugToolsPageStateProvider.notifier).setAction(DebugToolsSampleType.textStyles),
       ),
     ];
   }
diff --git a/lib/features/debug_tools/page/colors/debug_tools_colors_page_content.dart b/lib/features/debug_tools/page/colors/debug_tools_colors_page_content.dart
index 5ba4052..dcb11a4 100644
--- a/lib/features/debug_tools/page/colors/debug_tools_colors_page_content.dart
+++ b/lib/features/debug_tools/page/colors/debug_tools_colors_page_content.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_app/common/component/custom_text/custom_text.dart';
 import 'package:flutter_app/common/extension/build_context.dart';
-import 'package:flutter_app/features/debug_tools/page/colors/model/debug_tools_color.dart';
+import 'package:flutter_app/features/debug_tools/page/colors/entity/debug_tools_color.dart';
 
 class DebugToolsColorsPageContent extends StatelessWidget {
   const DebugToolsColorsPageContent({super.key});
diff --git a/lib/features/debug_tools/page/colors/model/debug_tools_color.dart b/lib/features/debug_tools/page/colors/entity/debug_tools_color.dart
similarity index 100%
rename from lib/features/debug_tools/page/colors/model/debug_tools_color.dart
rename to lib/features/debug_tools/page/colors/entity/debug_tools_color.dart
diff --git a/lib/features/debug_tools/page/popups/debug_tools_list_dialog.dart b/lib/features/debug_tools/page/popups/debug_tools_list_dialog.dart
index b49464f..ac30f75 100644
--- a/lib/features/debug_tools/page/popups/debug_tools_list_dialog.dart
+++ b/lib/features/debug_tools/page/popups/debug_tools_list_dialog.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_app/common/component/custom_ink_well/custom_ink_well_rounded_rectangle.dart';
 import 'package:flutter_app/common/component/custom_text/custom_text.dart';
-import 'package:flutter_app/common/composition/dialog/custom_dialog_wrapper.dart';
+import 'package:flutter_app/common/composition/dialog/custom_dialog.dart';
 import 'package:flutter_app/common/composition/responsive_widget.dart';
 import 'package:flutter_app/common/extension/build_context.dart';
 
@@ -16,38 +16,35 @@ class DebugToolsListDialog {
   final BuildContext context;
   final String title;
   final List<String> list;
-  final void Function(String listItem) onItemSelect;
+  final ValueChanged<String> onItemSelect;
 
   Future<bool?> show() async {
-    return await showDialog<bool>(
+    return CustomDialog.custom(
       context: context,
-      builder: (builderContext) => CustomDialogWrapper.custom(
-        context: builderContext,
-        title: title,
-        content: SizedBox(
-          width: ResponsiveWidget.mediumSizeTreshold,
-          child: ListView.separated(
-            shrinkWrap: true,
-            itemCount: list.length,
-            separatorBuilder: (context, index) => Padding(
-              padding: const EdgeInsets.all(8.0),
-              child: Container(height: 1, color: context.colorScheme.divider),
-            ),
-            itemBuilder: (context, index) {
-              final item = list[index];
-              return CustomInkWellRoundedRectangle(
-                padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 12),
-                cornerRadius: 8,
-                onClick: () {
-                  onItemSelect(item);
-                  Navigator.of(builderContext).pop(true);
-                },
-                child: CustomText(text: item, style: context.textTheme.bodyMedium),
-              );
-            },
+      title: title,
+      content: SizedBox(
+        width: ResponsiveWidget.mediumSizeThreshold,
+        child: ListView.separated(
+          shrinkWrap: true,
+          itemCount: list.length,
+          separatorBuilder: (context, index) => Padding(
+            padding: const EdgeInsets.all(8),
+            child: Container(height: 1, color: context.colorScheme.divider),
           ),
+          itemBuilder: (context, index) {
+            final item = list[index];
+            return CustomInkWellRoundedRectangle(
+              padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 12),
+              cornerRadius: 8,
+              onClick: () {
+                onItemSelect(item);
+                Navigator.of(context).pop(true);
+              },
+              child: CustomText(text: item, style: context.textTheme.bodyMedium),
+            );
+          },
         ),
       ),
-    );
+    ).show();
   }
 }
diff --git a/lib/features/debug_tools/page/popups/debug_tools_popups_page_content.dart b/lib/features/debug_tools/page/popups/debug_tools_popups_page_content.dart
index d2dbf76..b380c56 100644
--- a/lib/features/debug_tools/page/popups/debug_tools_popups_page_content.dart
+++ b/lib/features/debug_tools/page/popups/debug_tools_popups_page_content.dart
@@ -7,7 +7,7 @@ import 'package:flutter_app/common/component/custom_snackbar/custom_snackbar_suc
 import 'package:flutter_app/common/component/custom_text/custom_text.dart';
 import 'package:flutter_app/common/component/custom_time_picker.dart';
 import 'package:flutter_app/common/composition/bottom_sheet/bottom_sheet_container_widget.dart';
-import 'package:flutter_app/common/composition/dialog/custom_alert_dialog.dart';
+import 'package:flutter_app/common/composition/dialog/custom_dialog.dart';
 import 'package:flutter_app/common/extension/build_context.dart';
 import 'package:flutter_app/core/flogger.dart';
 import 'package:flutter_app/features/debug_tools/page/popups/debug_tools_list_dialog.dart';
@@ -25,7 +25,7 @@ class DebugToolsPopupsPageContent extends ConsumerWidget {
         CustomText(text: 'Dialogs', style: context.textTheme.headlineLarge),
         const SizedBox(height: 20),
         CustomButtonPrimary(
-          onPressed: () => CustomAlertDialog(
+          onPressed: () => CustomDialog.alert(
             context: context,
             title: 'Delete event',
             message: "Are you sure you want to delete this event? This action will delete all data and can't be recovered.",
@@ -47,7 +47,7 @@ class DebugToolsPopupsPageContent extends ConsumerWidget {
         ),
         const SizedBox(height: 16),
         CustomButtonPrimary(
-          onPressed: () => showCustomModalBottomSheet(
+          onPressed: () => showCustomModalBottomSheet<void>(
             context: context,
             containerWidget: (context, animation, child) => BottomSheetContainerWidget(child: child),
             builder: (context) => Padding(
diff --git a/lib/features/debug_tools/page/text_styles/debug_tools_text_styles_page_content.dart b/lib/features/debug_tools/page/text_styles/debug_tools_text_styles_page_content.dart
index 16b151c..15a3551 100644
--- a/lib/features/debug_tools/page/text_styles/debug_tools_text_styles_page_content.dart
+++ b/lib/features/debug_tools/page/text_styles/debug_tools_text_styles_page_content.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_app/common/extension/build_context.dart';
-import 'package:flutter_app/features/debug_tools/page/text_styles/model/debug_tools_text_style.dart';
+import 'package:flutter_app/features/debug_tools/page/text_styles/entity/debug_tools_text_style.dart';
 
 class DebugToolsTextStylesPageContent extends StatelessWidget {
   const DebugToolsTextStylesPageContent({super.key});
diff --git a/lib/features/debug_tools/page/text_styles/model/debug_tools_text_style.dart b/lib/features/debug_tools/page/text_styles/entity/debug_tools_text_style.dart
similarity index 100%
rename from lib/features/debug_tools/page/text_styles/model/debug_tools_text_style.dart
rename to lib/features/debug_tools/page/text_styles/entity/debug_tools_text_style.dart
diff --git a/lib/features/debug_tools/page/widgets/debug_tools_widgets_page_content.dart b/lib/features/debug_tools/page/widgets/debug_tools_widgets_page_content.dart
index 2d41869..983dbbb 100644
--- a/lib/features/debug_tools/page/widgets/debug_tools_widgets_page_content.dart
+++ b/lib/features/debug_tools/page/widgets/debug_tools_widgets_page_content.dart
@@ -17,22 +17,21 @@ class DebugToolsWidgetsPageContent extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final state = ref.watch(debugToolsWidgetsPageStateNotifierProvider);
+    final state = ref.watch(debugToolsWidgetsPageStateProvider);
 
     ref.listen(
       debugToolsWidgetsPageEventNotifierProvider,
-      (_, next) {
-        next?.whenOrNull(
-          fieldValidated: (message) => CustomSnackbarMessage(
-            context: context,
-            message: message,
-          ).show(),
-        );
+      (_, next) => switch (next) {
+        DebugToolsWidgetsPageEventFieldValidated(message: final message) => CustomSnackbarMessage(
+          context: context,
+          message: message,
+        ).show(),
+        _ => () {},
       },
     );
 
     return state.mapContentState(
-      provider: debugToolsWidgetsPageStateNotifierProvider,
+      provider: debugToolsWidgetsPageStateProvider,
       data: (data) => ListView(
         padding: const EdgeInsets.all(20),
         children: [
@@ -44,12 +43,12 @@ class DebugToolsWidgetsPageContent extends ConsumerWidget {
           const SizedBox(height: 20),
           CustomTextField(
             label: 'Example of custom text field',
-            validatorController: ref.read(debugToolsWidgetsPageStateNotifierProvider.notifier).exampleTextController,
+            validatorController: ref.read(debugToolsWidgetsPageStateProvider.notifier).exampleTextController,
             textCapitalization: TextCapitalization.words,
           ),
           const SizedBox(height: 20),
           CustomButtonPrimary(
-            onPressed: () => ref.read(debugToolsWidgetsPageStateNotifierProvider.notifier).validateSampleTextField(),
+            onPressed: () => ref.read(debugToolsWidgetsPageStateProvider.notifier).validateSampleTextField(),
             text: 'Validate text field',
           ),
           const SizedBox(height: 16),
@@ -57,8 +56,7 @@ class DebugToolsWidgetsPageContent extends ConsumerWidget {
           const SizedBox(height: 20),
           CustomTextFieldButton(
             label: 'Example of custom text field button',
-            validatorController: ref.read(debugToolsWidgetsPageStateNotifierProvider.notifier).exampleTextController,
-            enabled: true,
+            validatorController: ref.read(debugToolsWidgetsPageStateProvider.notifier).exampleTextController,
             onClick: () => Flogger.d('Clicked text field button'),
           ),
           const SizedBox(height: 64),
@@ -67,7 +65,7 @@ class DebugToolsWidgetsPageContent extends ConsumerWidget {
           CustomRadioButtonGroup(
             options: const {'First': 'First', 'Second': 'Second', 'Third': 'Third'},
             selectedOption: data.selectedOption,
-            onOptionSelected: (newOption) => ref.read(debugToolsWidgetsPageStateNotifierProvider.notifier).onOptionChanged(newOption),
+            onOptionSelected: (newOption) => ref.read(debugToolsWidgetsPageStateProvider.notifier).onOptionChanged(newOption),
           ),
           const SizedBox(height: 20),
         ],
diff --git a/lib/features/debug_tools/page/widgets/debug_tools_widgets_page_event.dart b/lib/features/debug_tools/page/widgets/debug_tools_widgets_page_event.dart
index 089a6ab..a02f0dc 100644
--- a/lib/features/debug_tools/page/widgets/debug_tools_widgets_page_event.dart
+++ b/lib/features/debug_tools/page/widgets/debug_tools_widgets_page_event.dart
@@ -5,10 +5,11 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 part 'debug_tools_widgets_page_event.freezed.dart';
 
 @freezed
-class DebugToolsWidgetsPageEvent with _$DebugToolsWidgetsPageEvent {
-  const factory DebugToolsWidgetsPageEvent.fieldValidated({required String message}) = _DebugToolsSomeEvent;
+sealed class DebugToolsWidgetsPageEvent with _$DebugToolsWidgetsPageEvent {
+  const factory DebugToolsWidgetsPageEvent.fieldValidated({required String message}) = DebugToolsWidgetsPageEventFieldValidated;
 }
 
 final debugToolsWidgetsPageEventNotifierProvider =
-    StateNotifierProvider.autoDispose<EventNotifier<DebugToolsWidgetsPageEvent?>, DebugToolsWidgetsPageEvent?>(
-        (ref) => EventNotifier(null));
+    NotifierProvider.autoDispose<EventNotifier<DebugToolsWidgetsPageEvent?>, DebugToolsWidgetsPageEvent?>(
+      EventNotifier.new,
+    );
diff --git a/lib/features/debug_tools/page/widgets/debug_tools_widgets_page_state.dart b/lib/features/debug_tools/page/widgets/debug_tools_widgets_page_state.dart
index 48898e8..fa5117a 100644
--- a/lib/features/debug_tools/page/widgets/debug_tools_widgets_page_state.dart
+++ b/lib/features/debug_tools/page/widgets/debug_tools_widgets_page_state.dart
@@ -8,13 +8,12 @@ part 'debug_tools_widgets_page_state.freezed.dart';
 part 'debug_tools_widgets_page_state.g.dart';
 
 @freezed
-class DebugToolsWidgetsPageState with _$DebugToolsWidgetsPageState {
-  const DebugToolsWidgetsPageState._();
-
+abstract class DebugToolsWidgetsPageState with _$DebugToolsWidgetsPageState {
   const factory DebugToolsWidgetsPageState({
     required String sampleFieldValidMessage,
     required String selectedOption,
   }) = _DebugToolsWidgetsPageState;
+  const DebugToolsWidgetsPageState._();
 }
 
 @riverpod
diff --git a/lib/features/home/home_page_content.dart b/lib/features/home/home_page_content.dart
index 3069efe..e2ca31d 100644
--- a/lib/features/home/home_page_content.dart
+++ b/lib/features/home/home_page_content.dart
@@ -13,11 +13,10 @@ class HomePageContent extends StatelessWidget {
   Widget build(BuildContext context) {
     return Center(
       child: Padding(
-        padding: const EdgeInsets.all(16.0),
+        padding: const EdgeInsets.all(16),
         child: Center(
           child: Column(
             mainAxisAlignment: MainAxisAlignment.center,
-            crossAxisAlignment: CrossAxisAlignment.center,
             children: [
               CustomFadeSlideAnimation(
                 delay: const Duration(milliseconds: 300),
diff --git a/lib/features/landing/force_update_page_content.dart b/lib/features/landing/force_update_page_content.dart
index 72a34f6..f7fee6a 100644
--- a/lib/features/landing/force_update_page_content.dart
+++ b/lib/features/landing/force_update_page_content.dart
@@ -18,15 +18,10 @@ class ForceUpdatePageContent extends ConsumerWidget {
           padding: const EdgeInsets.all(20),
           child: Column(
             mainAxisAlignment: MainAxisAlignment.center,
-            crossAxisAlignment: CrossAxisAlignment.center,
             children: [
               Assets.svg.imgRocket.svg(width: 200),
               const SizedBox(height: 48),
-              CustomText(
-                text: context.locale.forceUpdateTitle,
-                style: context.textTheme.titleMedium,
-                textAlign: TextAlign.center,
-              ),
+              CustomText(text: context.locale.forceUpdateTitle, style: context.textTheme.titleMedium, textAlign: TextAlign.center),
               const SizedBox(height: 8),
               CustomText(
                 text: context.locale.forceUpdateDescription,
@@ -38,11 +33,8 @@ class ForceUpdatePageContent extends ConsumerWidget {
               if (AppPlatform.isMobile)
                 CustomButtonPrimary(
                   onPressed: () {
-                    // TODO: Fill correct Android and iOS app IDs
-                    ref.read(nativeStoreOpenUseCaseProvider(
-                      androidAppBundleId: 'com.template.app',
-                      appStoreId: '123123123',
-                    ));
+                    // TODO(strv): Fill correct Android and iOS app IDs
+                    ref.read(nativeStoreOpenUseCaseProvider(androidAppBundleId: 'com.strv.template.app', appStoreId: '123123123'));
                   },
                   text: context.locale.forceUpdateButton,
                 ),
diff --git a/lib/features/landing/landing_page.dart b/lib/features/landing/landing_page.dart
index 4437d90..ba42a24 100644
--- a/lib/features/landing/landing_page.dart
+++ b/lib/features/landing/landing_page.dart
@@ -5,7 +5,7 @@ import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_app/app/navigation/app_router.dart';
 import 'package:flutter_app/app/setup/app_platform.dart';
-import 'package:flutter_app/common/provider/current_user_model_state.dart';
+import 'package:flutter_app/common/provider/current_user_state.dart';
 import 'package:flutter_app/common/provider/firebase_remote_config_service.dart';
 import 'package:flutter_app/core/flogger.dart';
 import 'package:flutter_app/features/landing/force_update_page_content.dart';
@@ -41,7 +41,7 @@ class _LandingPageState extends ConsumerState<LandingPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      body: (_forceUpdate == true) ? const ForceUpdatePageContent() : const SizedBox(),
+      body: _forceUpdate ? const ForceUpdatePageContent() : const SizedBox(),
     );
   }
 
@@ -49,17 +49,17 @@ class _LandingPageState extends ConsumerState<LandingPage> {
     final forceUpdateRequired = await _handleForceUpdate();
     if (forceUpdateRequired) return;
 
-    final currentUser = await ref.read(currentUserModelStateProvider.future);
+    final currentUser = await ref.read(currentUserStateProvider.future);
 
     if (mounted) {
       FlutterNativeSplash.remove();
 
       if (currentUser == null) {
         Flogger.d('[LandingPage] Redirecting to Authentication page');
-        context.replaceRoute(const AuthenticationRoute());
+        await context.replaceRoute(const AuthenticationRoute());
       } else {
         Flogger.d('[LandingPage] Redirecting to Home page');
-        context.replaceRoute(const RootRoute());
+        await context.replaceRoute(const RootRoute());
       }
     }
   }
diff --git a/lib/features/profile/profile_event.dart b/lib/features/profile/profile_event.dart
index 3cc7f51..84d9672 100644
--- a/lib/features/profile/profile_event.dart
+++ b/lib/features/profile/profile_event.dart
@@ -5,9 +5,10 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 part 'profile_event.freezed.dart';
 
 @freezed
-class ProfileEvent with _$ProfileEvent {
-  const factory ProfileEvent.signedOut() = _SignedOut;
+sealed class ProfileEvent with _$ProfileEvent {
+  const factory ProfileEvent.signedOut() = ProfileEventSignedOut;
 }
 
-final profileEventNotifierProvider =
-    StateNotifierProvider.autoDispose<EventNotifier<ProfileEvent?>, ProfileEvent?>((ref) => EventNotifier(null));
+final profileEventNotifierProvider = NotifierProvider.autoDispose<EventNotifier<ProfileEvent?>, ProfileEvent?>(
+  EventNotifier.new,
+);
diff --git a/lib/features/profile/profile_page.dart b/lib/features/profile/profile_page.dart
index 88281e8..9432c28 100644
--- a/lib/features/profile/profile_page.dart
+++ b/lib/features/profile/profile_page.dart
@@ -1,6 +1,8 @@
-import 'package:auto_route/annotations.dart';
+import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_app/app/navigation/app_router.dart';
 import 'package:flutter_app/common/component/custom_app_bar.dart';
+import 'package:flutter_app/features/profile/profile_event.dart';
 import 'package:flutter_app/features/profile/profile_page_content.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
@@ -10,6 +12,14 @@ class ProfilePage extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    ref.listen(
+      profileEventNotifierProvider,
+      (_, next) => switch (next) {
+        ProfileEventSignedOut() => context.router.replaceAll([const LandingRoute()]),
+        _ => () {},
+      },
+    );
+
     return const Scaffold(
       appBar: CustomAppBar(
         title: 'Profile',
diff --git a/lib/features/profile/profile_page_content.dart b/lib/features/profile/profile_page_content.dart
index 81c80b0..04ba5de 100644
--- a/lib/features/profile/profile_page_content.dart
+++ b/lib/features/profile/profile_page_content.dart
@@ -1,13 +1,10 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_app/app/navigation/app_router.dart';
 import 'package:flutter_app/common/animation/shimmer_loading_animation.dart';
 import 'package:flutter_app/common/component/custom_button/custom_button_primary.dart';
 import 'package:flutter_app/common/component/custom_profile_avatar.dart';
 import 'package:flutter_app/common/component/custom_text/custom_text.dart';
 import 'package:flutter_app/common/extension/async_value.dart';
 import 'package:flutter_app/common/extension/build_context.dart';
-import 'package:flutter_app/features/profile/profile_event.dart';
 import 'package:flutter_app/features/profile/profile_state.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
@@ -16,19 +13,10 @@ class ProfilePageContent extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final state = ref.watch(profileStateNotifierProvider);
-
-    ref.listen(
-      profileEventNotifierProvider,
-      (_, next) {
-        next?.whenOrNull(
-          signedOut: () => context.router.replaceAll([const LandingRoute()]),
-        );
-      },
-    );
+    final state = ref.watch(profileStateProvider);
 
     return state.mapContentState(
-      provider: profileStateNotifierProvider,
+      provider: profileStateProvider,
       loading: (loading) => const _LoadingStateWidget(),
       data: (data) => _DataStateWidget(data: data),
     );
@@ -58,7 +46,6 @@ class _LoadingStateWidget extends ConsumerWidget {
           const Spacer(),
           CustomButtonPrimary(
             text: 'Sign out',
-            isLoading: false,
             onPressed: () {},
           ),
         ],
@@ -86,7 +73,7 @@ class _DataStateWidget extends ConsumerWidget {
           CustomButtonPrimary(
             text: 'Sign out',
             isLoading: data.isSigningOut,
-            onPressed: () => ref.read(profileStateNotifierProvider.notifier).signOut(),
+            onPressed: () => ref.read(profileStateProvider.notifier).signOut(),
           ),
         ],
       ),
diff --git a/lib/features/profile/profile_state.dart b/lib/features/profile/profile_state.dart
index 48837bf..b62c1b8 100644
--- a/lib/features/profile/profile_state.dart
+++ b/lib/features/profile/profile_state.dart
@@ -1,5 +1,5 @@
-import 'package:flutter_app/common/data/model/exception/custom_exception.dart';
-import 'package:flutter_app/common/provider/current_user_model_state.dart';
+import 'package:flutter_app/common/data/entity/exception/custom_exception.dart';
+import 'package:flutter_app/common/provider/current_user_state.dart';
 import 'package:flutter_app/common/usecase/authentication/sign_out_use_case.dart';
 import 'package:flutter_app/common/usecase/get_random_image_url_use_case.dart';
 import 'package:flutter_app/core/flogger.dart';
@@ -12,7 +12,7 @@ part 'profile_state.freezed.dart';
 part 'profile_state.g.dart';
 
 @freezed
-class ProfileState with _$ProfileState {
+abstract class ProfileState with _$ProfileState {
   const factory ProfileState({
     required String displayName,
     required String imageUrl,
@@ -24,10 +24,10 @@ class ProfileState with _$ProfileState {
 class ProfileStateNotifier extends _$ProfileStateNotifier with AutoDisposeStateHandler {
   @override
   FutureOr<ProfileState> build() async {
-    final currentUser = await ref.read(currentUserModelStateProvider.future);
+    final currentUser = await ref.read(currentUserStateProvider.future);
     final imageUrl = ref.read(getRandomImageUrlUseCaseProvider(width: 120, height: 120));
 
-    await Future.delayed(const Duration(seconds: 2));
+    await Future<void>.delayed(const Duration(seconds: 2));
 
     return ProfileState(
       displayName: currentUser?.displayName ?? '',
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
index 217d1d1..bae23f1 100644
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -5,6 +5,7 @@
 import FlutterMacOS
 import Foundation
 
+import app_settings
 import device_info_plus
 import firebase_analytics
 import firebase_auth
@@ -25,13 +26,14 @@ import url_launcher_macos
 import window_manager
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+  AppSettingsPlugin.register(with: registry.registrar(forPlugin: "AppSettingsPlugin"))
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
-  FLTFirebaseAnalyticsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseAnalyticsPlugin"))
+  FirebaseAnalyticsPlugin.register(with: registry.registrar(forPlugin: "FirebaseAnalyticsPlugin"))
   FLTFirebaseAuthPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseAuthPlugin"))
   FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
   FLTFirebaseCrashlyticsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCrashlyticsPlugin"))
   FLTFirebaseMessagingPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseMessagingPlugin"))
-  FLTFirebaseRemoteConfigPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseRemoteConfigPlugin"))
+  FirebaseRemoteConfigPlugin.register(with: registry.registrar(forPlugin: "FirebaseRemoteConfigPlugin"))
   FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
   FLTGoogleSignInPlugin.register(with: registry.registrar(forPlugin: "FLTGoogleSignInPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj
index b8539f5..8874b9e 100644
--- a/macos/Runner.xcodeproj/project.pbxproj
+++ b/macos/Runner.xcodeproj/project.pbxproj
@@ -182,7 +182,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					33CC10EC2044A3C60003C045 = {
diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index 58a36ce..b4bb6f4 100644
--- a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -48,6 +48,7 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
diff --git a/macos/Runner/AppDelegate.swift b/macos/Runner/AppDelegate.swift
index 8e02df2..b3c1761 100644
--- a/macos/Runner/AppDelegate.swift
+++ b/macos/Runner/AppDelegate.swift
@@ -6,4 +6,8 @@ class AppDelegate: FlutterAppDelegate {
   override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
     return true
   }
+
+  override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
+    return true
+  }
 }
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
index a1eb6a4..13d7386 100644
Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png
index c559dde..7982458 100644
Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png
index ac633e1..683e31f 100644
Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png
index 724182d..afc9fbf 100644
Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png
index 4fd6f59..60050a2 100644
Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png
index 0ad3ac1..770e2f7 100644
Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png
index fa8df0f..f5399c2 100644
Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ
diff --git a/makefile b/makefile
index 0f649ea..f99e932 100644
--- a/makefile
+++ b/makefile
@@ -1,23 +1,22 @@
 # https://medium.com/flutter-community/automating-flutter-workflows-with-the-makefile-423b8e023c9a
-.PHONY: setup build_runner clean gen gen_locale install integration_test test generateAndroidProductionAppBundle generateIosStagingIpa generateIosProductionIpa generateWebProduction deployWeb
+.PHONY: setup watch clean gen locale install integration_test test generateAndroidProductionAppBundle generateIosStagingIpa generateIosProductionIpa generateWebProduction deployWeb runner_gen
 
 setup: # Setup the project
 	@fvm dart ./project_setup/lib/main.dart
 
-build_runner: # Run build_runner
+watch: # Run build_runner
 	@fvm dart run build_runner watch --delete-conflicting-outputs
 
 clean: # Clean everything in the project, download dependencies, generate code
-	@rm ios/Podfile.lock || true
 	@fvm flutter clean
 	@fvm flutter pub get
 	@make gen
 
 gen: # Generates localization and freezed files in project
-	@make gen_locale
+	@make locale
 	@fvm dart run build_runner build --delete-conflicting-outputs
 
-gen_locale: # Generates localization and freezed files in project
+locale: # Generates localization and freezed files in project
 	@fvm flutter gen-l10n --arb-dir "assets/localization" --template-arb-file "app_en.arb" --output-localization-file "app_localizations.gen.dart" --output-dir "lib/assets" --no-synthetic-package
 
 install: # Install any required packages
@@ -50,6 +49,19 @@ generateWebProduction: # Clean everything and build Web
 	@make clean
 	@fvm flutter build web -t lib/main_production.dart --web-renderer canvaskit
 
+# This requires to have firebase-tools installed globally on the system.
+# npm install -g firebase-tools
+#
+# It also requires to be logged in to firebase with the correct account.
+# firebase login
+#
+# To get the project ID, run the following command:
+# firebase projects:list
 # TODO: Update project name or remove in case there is no web or when web is not hosted on Firebase.
-deployWeb: # Deploy already builded Web
-	@firebase deploy --project strv-flutter-template
+deployWeb:
+	@firebase deploy --project XXX
+
+runner_gen: # For github actions
+	@flutter pub get
+	@flutter gen-l10n --arb-dir "assets/localization" --template-arb-file "app_en.arb" --output-localization-file "app_localizations.gen.dart" --output-dir "lib/assets" --no-synthetic-package
+	@dart run build_runner build --delete-conflicting-outputs
\ No newline at end of file
diff --git a/project_setup/README.md b/project_setup/README.md
index db06c76..0538ea7 100644
--- a/project_setup/README.md
+++ b/project_setup/README.md
@@ -28,7 +28,7 @@ All you need to do now is to set correct configuration in `/project_setup/lib/co
 ### Step 3
 run `make setup` in root folder of the project, and select generation of new splash screen.
 
-## Aplication Rebranding
+## Application Rebranding
 
 ### Step 1
 All you need to do is to set correct application name and package name configuration in `/project_setup/lib/configuration.dart`.
diff --git a/project_setup/analysis_options.yaml b/project_setup/analysis_options.yaml
new file mode 100644
index 0000000..e657abc
--- /dev/null
+++ b/project_setup/analysis_options.yaml
@@ -0,0 +1,45 @@
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
+
+# The following line activates a set of recommended lints for Flutter apps,
+# packages, and plugins designed to encourage good coding practices.
+include: package:netglade_analysis/lints.yaml
+
+analyzer:
+  exclude:
+    - 'project_setup/**'
+    - '**.g.dart'
+    - '**.gen.dart'
+    - '**.config.dart'
+    - '**.graphql.dart'
+  errors:
+    todo: info
+
+formatter:
+  page_width: 140
+  trailing_commas: preserve
+
+linter:
+  # The lint rules applied to this project can be customized in the
+  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
+  # included above or to enable additional rules. A list of all available lints
+  # and their documentation is published at
+  # https://dart-lang.github.io/linter/lints/index.html.
+  #
+  # Instead of disabling a lint rule for the entire project in the
+  # section below, it can also be suppressed for a single line of code
+  # or a specific dart file by using the `// ignore: name_of_lint` and
+  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+  # producing the lint.
+  rules:
+    sort_pub_dependencies: false
+    require_trailing_commas: false
+    avoid_positional_boolean_parameters: false
+    no_default_cases: false
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options
diff --git a/project_setup/lib/configuration.dart b/project_setup/lib/configuration.dart
index d3a4f03..c049a9d 100644
--- a/project_setup/lib/configuration.dart
+++ b/project_setup/lib/configuration.dart
@@ -1,9 +1,9 @@
-import 'package:project_setup/core/model/app_icon_variant_model.dart';
-import 'package:project_setup/core/model/setup_platform.dart';
+import 'package:project_setup/core/entity/app_icon_variant_model.dart';
+import 'package:project_setup/core/entity/setup_platform.dart';
 
 class Configuration {
   // Title: App Icon
-  static final appIconBackgroundColor = '#121618';
+  static final appIconBackgroundColor = '#F2F2F2';
   static final appIconVariants = [
     AppIconVariantModel(name: 'developDebug', labelColorHex: '#37B73B', labelText: 'DEV', debugIndicator: true),
     AppIconVariantModel(name: 'developRelease', labelColorHex: '#37B73B', labelText: 'DEV'),
@@ -14,7 +14,7 @@ class Configuration {
   ];
 
   // Title: Splash Screen
-  static final splashScreenBackgroundColor = '#FFFFFF';
+  static final splashScreenBackgroundColor = '#F2F2F2';
   static final splashScreenDarkModeBackgroundColor = '#121618';
   static final splashScreenPlatforms = [SetupPlatform.android, SetupPlatform.ios, SetupPlatform.web];
 
diff --git a/project_setup/lib/core/app_icon_generator.dart b/project_setup/lib/core/app_icon_generator.dart
index 2afd588..54052e1 100644
--- a/project_setup/lib/core/app_icon_generator.dart
+++ b/project_setup/lib/core/app_icon_generator.dart
@@ -4,8 +4,8 @@ import 'dart:typed_data';
 import 'package:image/image.dart';
 import 'package:interact/interact.dart';
 import 'package:project_setup/configuration.dart';
-import 'package:project_setup/core/model/app_icon_variant_model.dart';
-import 'package:project_setup/core/model/setup_platform.dart';
+import 'package:project_setup/core/entity/app_icon_variant_model.dart';
+import 'package:project_setup/core/entity/setup_platform.dart';
 import 'package:project_setup/core/util/print.dart';
 import 'package:project_setup/core/util/util.dart';
 
@@ -100,8 +100,8 @@ icons_launcher:
 ///   - tmp_app_icon_android.png
 ///   - tmp_app_icon_android_foreground.png
 ///
-/// Input Icon should be 750x750 which will be generated into 1500x1500 icon for Andorid usage
-/// Generated Cropped icon shoud be 1024x1024 which is used for iOS
+/// Input Icon should be 900x900 which will be generated into 1500x1500 icon for Android usage
+/// Generated Cropped icon should be 1024x1024 which is used for iOS
 Future<List<File>> _generateIcons({
   required String? labelColorHex,
   required String? labelText,
@@ -143,7 +143,8 @@ Future<List<File>> _generateIcons({
   }
 
   void _drawOverlayImage() {
-    final offset = 1500 ~/ 2 - 750 ~/ 2;
+    final widthOffset = 1500 ~/ 2 - inputImage.width ~/ 2;
+    final heightOffset = 1500 ~/ 2 - inputImage.height ~/ 2;
     // Manually overlay the overlayImage onto the baseImage
     for (int y = 0; y < inputImage.height; y++) {
       for (int x = 0; x < inputImage.width; x++) {
@@ -153,7 +154,7 @@ Future<List<File>> _generateIcons({
 
         // If the pixel is fully transparent, fill it with the specified color
         if (alpha != 0) {
-          outputImage.setPixel(x + offset, y + offset, pixel);
+          outputImage.setPixel(x + widthOffset, y + heightOffset, pixel);
         }
       }
     }
@@ -165,7 +166,7 @@ Future<List<File>> _generateIcons({
     return outputImageFile;
   }
 
-  // Title: Step 1 - Generate Android Foregorund image (1500x1500 - transparent background)
+  // Title: Step 1 - Generate Android Foreground image (1500x1500 - transparent background)
   if (!iconShouldOverlayLabel) _drawOverlayImage();
   if (labelColorHex != null && labelText != null) _drawLabel();
   if (iconShouldOverlayLabel) _drawOverlayImage();
diff --git a/project_setup/lib/core/model/app_icon_variant_model.dart b/project_setup/lib/core/model/app_icon_variant_model.dart
index d927562..2804c60 100644
--- a/project_setup/lib/core/model/app_icon_variant_model.dart
+++ b/project_setup/lib/core/model/app_icon_variant_model.dart
@@ -1,4 +1,4 @@
-import 'package:project_setup/core/model/setup_platform.dart';
+import 'package:project_setup/core/entity/setup_platform.dart';
 
 class AppIconVariantModel {
   const AppIconVariantModel({
diff --git a/project_setup/lib/core/splash_screen_generator.dart b/project_setup/lib/core/splash_screen_generator.dart
index 0120534..7f32dca 100644
--- a/project_setup/lib/core/splash_screen_generator.dart
+++ b/project_setup/lib/core/splash_screen_generator.dart
@@ -4,7 +4,7 @@ import 'dart:typed_data';
 import 'package:image/image.dart';
 import 'package:interact/interact.dart';
 import 'package:project_setup/configuration.dart';
-import 'package:project_setup/core/model/setup_platform.dart';
+import 'package:project_setup/core/entity/setup_platform.dart';
 import 'package:project_setup/core/util/print.dart';
 import 'package:project_setup/core/util/util.dart';
 
diff --git a/project_setup/lib/core/util/files.dart b/project_setup/lib/core/util/files.dart
index 873ab30..b87fb60 100644
--- a/project_setup/lib/core/util/files.dart
+++ b/project_setup/lib/core/util/files.dart
@@ -24,7 +24,7 @@ Future<void> findAndReplaceTextInDirectory({
     // Check if the entity is a file and if it's in the excludedFiles list
     if (entity is File) {
       if (includedFiles != null && includedFiles.contains(entity.path.split(Platform.pathSeparator).last)) {
-        await findAndRemplaceTextInFile(
+        await findAndReplaceTextInFile(
           file: entity,
           searchString: searchString,
           replaceString: replaceString,
@@ -35,7 +35,7 @@ Future<void> findAndReplaceTextInDirectory({
   }
 }
 
-Future<void> findAndRemplaceTextInFile({
+Future<void> findAndReplaceTextInFile({
   required File file,
   required String searchString,
   required String replaceString,
diff --git a/project_setup/pubspec.lock b/project_setup/pubspec.lock
index c343794..7ef026e 100644
--- a/project_setup/pubspec.lock
+++ b/project_setup/pubspec.lock
@@ -5,42 +5,42 @@ packages:
     dependency: transitive
     description:
       name: archive
-      sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
+      sha256: "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd"
       url: "https://pub.dev"
     source: hosted
-    version: "3.6.1"
+    version: "4.0.7"
   characters:
     dependency: transitive
     description:
       name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.4.0"
   clock:
     dependency: transitive
     description:
       name: clock
-      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   collection:
     dependency: transitive
     description:
       name: collection
-      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
+      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
       url: "https://pub.dev"
     source: hosted
-    version: "1.19.0"
+    version: "1.19.1"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
+      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.6"
   dart_console:
     dependency: transitive
     description:
@@ -53,18 +53,18 @@ packages:
     dependency: transitive
     description:
       name: ffi
-      sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21"
+      sha256: "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
   image:
     dependency: "direct main"
     description:
       name: image
-      sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8"
+      sha256: "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928"
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.0"
+    version: "4.5.4"
   interact:
     dependency: "direct main"
     description:
@@ -85,23 +85,39 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
+      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
       url: "https://pub.dev"
     source: hosted
-    version: "1.15.0"
+    version: "1.16.0"
+  netglade_analysis:
+    dependency: "direct dev"
+    description:
+      name: netglade_analysis
+      sha256: "67778583fbddc666daddb53a9ab948bf5a37cbfb949c5d7fdf51b87b0cd1746a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "16.1.0"
   path:
     dependency: transitive
     description:
       name: path
-      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
+      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.0"
+    version: "1.9.1"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27
+      sha256: "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.1.0"
+  posix:
+    dependency: transitive
+    description:
+      name: posix
+      sha256: f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62
       url: "https://pub.dev"
     source: hosted
     version: "6.0.2"
@@ -117,18 +133,18 @@ packages:
     dependency: transitive
     description:
       name: typed_data
-      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
+      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.4.0"
   win32:
     dependency: transitive
     description:
       name: win32
-      sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4
+      sha256: "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba"
       url: "https://pub.dev"
     source: hosted
-    version: "5.5.1"
+    version: "5.13.0"
   xml:
     dependency: transitive
     description:
@@ -138,4 +154,4 @@ packages:
     source: hosted
     version: "6.5.0"
 sdks:
-  dart: ">=3.4.0 <4.0.0"
+  dart: ">=3.8.0 <4.0.0"
diff --git a/project_setup/pubspec.yaml b/project_setup/pubspec.yaml
index 6c81c69..3ab661d 100644
--- a/project_setup/pubspec.yaml
+++ b/project_setup/pubspec.yaml
@@ -4,9 +4,13 @@ version: 1.0.0
 
 
 environment:
-  sdk: '>=3.2.0 <4.0.0'
+  sdk: '>=3.8.0 <4.0.0'
 
 
 dependencies:
-  image: 4.2.0                                # https://pub.dev/packages/image
-  interact: 2.2.0                             # https://pub.dev/packages/interact
+  image: 4.5.4
+  interact: 2.2.0
+
+
+dev_dependencies:
+  netglade_analysis: 16.1.0
diff --git a/project_setup/resources/icon.png b/project_setup/resources/icon.png
index 0418673..1ae5a94 100644
Binary files a/project_setup/resources/icon.png and b/project_setup/resources/icon.png differ
diff --git a/project_setup/resources/splash.png b/project_setup/resources/splash.png
index c5ec0a9..6ed3a4e 100644
Binary files a/project_setup/resources/splash.png and b/project_setup/resources/splash.png differ
diff --git a/pubspec.lock b/pubspec.lock
index 3dd446f..4f239bc 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,39 +5,42 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
+      sha256: da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f
       url: "https://pub.dev"
     source: hosted
-    version: "76.0.0"
+    version: "85.0.0"
   _flutterfire_internals:
     dependency: transitive
     description:
       name: _flutterfire_internals
-      sha256: "27899c95f9e7ec06c8310e6e0eac967707714b9f1450c4a58fa00ca011a4a8ae"
+      sha256: "23d16f00a2da8ffa997c782453c73867b0609bd90435195671a54de38a3566df"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.49"
-  _macros:
-    dependency: transitive
-    description: dart
-    source: sdk
-    version: "0.3.3"
+    version: "1.3.62"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
+      sha256: f4ad0fea5f102201015c9aae9d93bc02f75dd9491529a8c21f88d17a8523d44c
       url: "https://pub.dev"
     source: hosted
-    version: "6.11.0"
+    version: "7.6.0"
+  analyzer_buffer:
+    dependency: transitive
+    description:
+      name: analyzer_buffer
+      sha256: f7833bee67c03c37241c67f8741b17cc501b69d9758df7a5a4a13ed6c947be43
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.10"
   analyzer_plugin:
     dependency: transitive
     description:
       name: analyzer_plugin
-      sha256: "9661b30b13a685efaee9f02e5d01ed9f2b423bd889d28a304d02d704aee69161"
+      sha256: a5ab7590c27b779f3d4de67f31c4109dbe13dd7339f86461a6f2a8ab2594d8ce
       url: "https://pub.dev"
     source: hosted
-    version: "0.11.3"
+    version: "0.13.4"
   ansicolor:
     dependency: transitive
     description:
@@ -50,106 +53,106 @@ packages:
     dependency: "direct main"
     description:
       name: app_settings
-      sha256: "09bc7fe0313a507087bec1a3baf555f0576e816a760cbb31813a88890a09d9e5"
+      sha256: "3e46c561441e5820d3a25339bf8b51b9e45a5f686873851a20c257a530917795"
       url: "https://pub.dev"
     source: hosted
-    version: "5.1.1"
+    version: "6.1.1"
   archive:
     dependency: transitive
     description:
       name: archive
-      sha256: "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a"
+      sha256: "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "4.0.7"
   args:
     dependency: transitive
     description:
       name: args
-      sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
+      sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.0"
+    version: "2.7.0"
   async:
     dependency: transitive
     description:
       name: async
-      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
       url: "https://pub.dev"
     source: hosted
-    version: "2.11.0"
+    version: "2.13.0"
   auto_route:
     dependency: "direct main"
     description:
       name: auto_route
-      sha256: "1d1bd908a1fec327719326d5d0791edd37f16caff6493c01003689fb03315ad7"
+      sha256: c820e918863a03544aac68eaf61e17c8a6126b663d7cad24a8fd3657a1e6be61
       url: "https://pub.dev"
     source: hosted
-    version: "9.3.0+1"
+    version: "10.1.2"
   auto_route_generator:
     dependency: "direct dev"
     description:
       name: auto_route_generator
-      sha256: c9086eb07271e51b44071ad5cff34e889f3156710b964a308c2ab590769e79e6
+      sha256: ed4b65e85b4b2b00b06ef1e44c8623985c52c32d05d72147e3201257aa70a115
       url: "https://pub.dev"
     source: hosted
-    version: "9.0.0"
+    version: "10.2.4"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   build:
     dependency: transitive
     description:
       name: build
-      sha256: cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0
+      sha256: ce76b1d48875e3233fde17717c23d1f60a91cc631597e49a400c89b475395b1d
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2"
+    version: "3.1.0"
   build_config:
     dependency: transitive
     description:
       name: build_config
-      sha256: "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33"
+      sha256: "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.2.0"
   build_daemon:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "294a2edaf4814a378725bfe6358210196f5ea37af89ecd81bfa32960113d4948"
+      sha256: "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.3"
+    version: "4.0.4"
   build_resolvers:
     dependency: transitive
     description:
       name: build_resolvers
-      sha256: "99d3980049739a985cf9b21f30881f46db3ebc62c5b8d5e60e27440876b1ba1e"
+      sha256: d1d57f7807debd7349b4726a19fd32ec8bc177c71ad0febf91a20f84cd2d4b46
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.3"
+    version: "3.0.3"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "74691599a5bc750dc96a6b4bfd48f7d9d66453eab04c7f4063134800d6a5c573"
+      sha256: b24597fceb695969d47025c958f3837f9f0122e237c6a22cb082a5ac66c3ca30
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.14"
+    version: "2.7.1"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021"
+      sha256: "066dda7f73d8eb48ba630a55acb50c4a84a2e6b453b1cb4567f581729e794f7b"
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.0"
+    version: "9.3.1"
   built_collection:
     dependency: transitive
     description:
@@ -162,18 +165,18 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2"
+      sha256: a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d
       url: "https://pub.dev"
     source: hosted
-    version: "8.9.3"
+    version: "8.12.0"
   characters:
     dependency: transitive
     description:
       name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.4.0"
   charcode:
     dependency: transitive
     description:
@@ -186,10 +189,10 @@ packages:
     dependency: transitive
     description:
       name: checked_yaml
-      sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
+      sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.4"
   ci:
     dependency: transitive
     description:
@@ -198,6 +201,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.1.0"
+  cli_config:
+    dependency: transitive
+    description:
+      name: cli_config
+      sha256: ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
   cli_util:
     dependency: transitive
     description:
@@ -210,26 +221,26 @@ packages:
     dependency: transitive
     description:
       name: clock
-      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   code_builder:
     dependency: transitive
     description:
       name: code_builder
-      sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e"
+      sha256: "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243"
       url: "https://pub.dev"
     source: hosted
-    version: "4.10.1"
+    version: "4.11.0"
   collection:
     dependency: "direct main"
     description:
       name: collection
-      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
+      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
       url: "https://pub.dev"
     source: hosted
-    version: "1.19.0"
+    version: "1.19.1"
   color:
     dependency: transitive
     description:
@@ -246,6 +257,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.2"
+  coverage:
+    dependency: transitive
+    description:
+      name: coverage
+      sha256: "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.15.0"
   cross_file:
     dependency: transitive
     description:
@@ -274,42 +293,42 @@ packages:
     dependency: "direct dev"
     description:
       name: custom_lint
-      sha256: "3486c470bb93313a9417f926c7dd694a2e349220992d7b9d14534dc49c15bba9"
+      sha256: "78085fbe842de7c5bef92de811ca81536968dbcbbcdac5c316711add2d15e796"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.0"
+    version: "0.8.0"
   custom_lint_builder:
     dependency: transitive
     description:
       name: custom_lint_builder
-      sha256: "42cdc41994eeeddab0d7a722c7093ec52bd0761921eeb2cbdbf33d192a234759"
+      sha256: cc5532d5733d4eccfccaaec6070a1926e9f21e613d93ad0927fad020b95c9e52
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.0"
+    version: "0.8.0"
   custom_lint_core:
     dependency: transitive
     description:
       name: custom_lint_core
-      sha256: "02450c3e45e2a6e8b26c4d16687596ab3c4644dd5792e3313aa9ceba5a49b7f5"
+      sha256: cc4684d22ca05bf0a4a51127e19a8aea576b42079ed2bc9e956f11aaebe35dd1
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.0"
+    version: "0.8.0"
   custom_lint_visitor:
     dependency: transitive
     description:
       name: custom_lint_visitor
-      sha256: bfe9b7a09c4775a587b58d10ebb871d4fe618237639b1e84d5ec62d7dfef25f9
+      sha256: "4a86a0d8415a91fbb8298d6ef03e9034dc8e323a599ddc4120a0e36c433983a2"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0+6.11.0"
+    version: "1.0.0+7.7.0"
   dart_style:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab"
+      sha256: "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.7"
+    version: "3.1.1"
   dartx:
     dependency: transitive
     description:
@@ -322,42 +341,42 @@ packages:
     dependency: transitive
     description:
       name: dbus
-      sha256: "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac"
+      sha256: "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.10"
+    version: "0.7.11"
   device_info_plus:
     dependency: "direct main"
     description:
       name: device_info_plus
-      sha256: "4fa68e53e26ab17b70ca39f072c285562cfc1589df5bb1e9295db90f6645f431"
+      sha256: "49413c8ca514dea7633e8def233b25efdf83ec8522955cc2c0e3ad802927e7c6"
       url: "https://pub.dev"
     source: hosted
-    version: "11.2.0"
+    version: "12.1.0"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
       name: device_info_plus_platform_interface
-      sha256: "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2"
+      sha256: e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.2"
+    version: "7.0.3"
   dio:
     dependency: "direct main"
     description:
       name: dio
-      sha256: "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260"
+      sha256: d90ee57923d1828ac14e492ca49440f65477f4bb1263575900be731a3dac66a9
       url: "https://pub.dev"
     source: hosted
-    version: "5.7.0"
+    version: "5.9.0"
   dio_web_adapter:
     dependency: transitive
     description:
       name: dio_web_adapter
-      sha256: "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8"
+      sha256: "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.1"
   dispose_scope:
     dependency: transitive
     description:
@@ -378,34 +397,34 @@ packages:
     dependency: "direct main"
     description:
       name: extended_image
-      sha256: "85199f9233e03abc2ce2e68cbb2991648666af4a527ae4e6250935be8edfddae"
+      sha256: f6cbb1d798f51262ed1a3d93b4f1f2aa0d76128df39af18ecb77fa740f88b2e0
       url: "https://pub.dev"
     source: hosted
-    version: "9.1.0"
+    version: "10.0.1"
   extended_image_library:
     dependency: transitive
     description:
       name: extended_image_library
-      sha256: "9a94ec9314aa206cfa35f16145c3cd6e2c924badcc670eaaca8a3a8063a68cd7"
+      sha256: "1f9a24d3a00c2633891c6a7b5cab2807999eb2d5b597e5133b63f49d113811fe"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.5"
+    version: "5.0.1"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.3"
   ffi:
     dependency: transitive
     description:
       name: ffi
-      sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6"
+      sha256: "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
   file:
     dependency: transitive
     description:
@@ -418,154 +437,138 @@ packages:
     dependency: "direct main"
     description:
       name: firebase_analytics
-      sha256: "498c6cb8468e348a556709c745d92a52173ab3a9b906aa0593393f0787f201ea"
+      sha256: fce78440ab7b95563054039aac5e342088efed9dc009ac6f81d5cac07155d509
       url: "https://pub.dev"
     source: hosted
-    version: "11.4.0"
+    version: "12.0.2"
   firebase_analytics_platform_interface:
     dependency: transitive
     description:
       name: firebase_analytics_platform_interface
-      sha256: ccbb350554e98afdb4b59852689292d194d31232a2647b5012a66622b3711df9
+      sha256: "75bdcd2d2635c4cdcd7ec13727527751ddf2f9933e5bf1264a2387920246f3c5"
       url: "https://pub.dev"
     source: hosted
-    version: "4.3.0"
+    version: "5.0.2"
   firebase_analytics_web:
     dependency: transitive
     description:
       name: firebase_analytics_web
-      sha256: "68e1f18fc16482c211c658e739c25f015b202a260d9ad8249c6d3d7963b8105f"
+      sha256: ed5767695b131cdd425ee6d49934dca80689d9df40609c0d0aa8907ee6f0f785
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.10+6"
+    version: "0.6.0+2"
   firebase_auth:
     dependency: "direct main"
     description:
       name: firebase_auth
-      sha256: "1c2e81c4d4b56f63cb6cefea0560aa5a504457c7a5a601018e6c6d7c07795640"
+      sha256: "735f857c9363376eeb585e7ba57e67e5f495202cd3f609902b8769795fd823bc"
       url: "https://pub.dev"
     source: hosted
-    version: "5.4.0"
+    version: "6.1.0"
   firebase_auth_platform_interface:
     dependency: transitive
     description:
       name: firebase_auth_platform_interface
-      sha256: "973899f5be76d37312a07e366033b7f3f262dc51ec70ceae2a3592993289717a"
+      sha256: "5badda0ea5048ffbb1726169cf5530539490de8055c3bd43f4f9cd5fcef8e556"
       url: "https://pub.dev"
     source: hosted
-    version: "7.5.0"
+    version: "8.1.2"
   firebase_auth_web:
     dependency: transitive
     description:
       name: firebase_auth_web
-      sha256: "960f7cc50ecb977a721165166aae90e86302f1370549457f78cbcea5be7f2cb2"
+      sha256: "07c889d2c56e648ed30225e819801d7e45542747a658d9c385520de35d312dec"
       url: "https://pub.dev"
     source: hosted
-    version: "5.13.6"
+    version: "6.0.3"
   firebase_core:
     dependency: "direct main"
     description:
       name: firebase_core
-      sha256: "0307c1fde82e2b8b97e0be2dab93612aff9a72f31ebe9bfac66ed8b37ef7c568"
+      sha256: "4dd96f05015c0dcceaa47711394c32971aee70169625d5e2477e7676c01ce0ee"
       url: "https://pub.dev"
     source: hosted
-    version: "3.10.0"
+    version: "4.1.1"
   firebase_core_platform_interface:
     dependency: transitive
     description:
       name: firebase_core_platform_interface
-      sha256: d7253d255ff10f85cfd2adaba9ac17bae878fa3ba577462451163bd9f1d1f0bf
+      sha256: "5873a370f0d232918e23a5a6137dbe4c2c47cf017301f4ea02d9d636e52f60f0"
       url: "https://pub.dev"
     source: hosted
-    version: "5.4.0"
+    version: "6.0.1"
   firebase_core_web:
     dependency: transitive
     description:
       name: firebase_core_web
-      sha256: fbc008cf390d909b823763064b63afefe9f02d8afdb13eb3f485b871afee956b
+      sha256: "61a51037312dac781f713308903bb7a1762a7f92f7bc286a3a0947fb2a713b82"
       url: "https://pub.dev"
     source: hosted
-    version: "2.19.0"
+    version: "3.1.1"
   firebase_crashlytics:
     dependency: "direct main"
     description:
       name: firebase_crashlytics
-      sha256: f6adb65fa3d6391a79f0e60833bb4cdc468ce0c318831c90057ee11e0909cd29
+      sha256: a636096df0d2a4bc72397bfc669a4fffc8896016a58de1a6f45a49d9ba064f94
       url: "https://pub.dev"
     source: hosted
-    version: "4.3.0"
+    version: "5.0.2"
   firebase_crashlytics_platform_interface:
     dependency: transitive
     description:
       name: firebase_crashlytics_platform_interface
-      sha256: "6635166c22c6f75f634b8e77b70fcc43b24af4cfee28f975249dbdbd9769a702"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.8.0"
-  firebase_dynamic_links:
-    dependency: "direct main"
-    description:
-      name: firebase_dynamic_links
-      sha256: e4984adcdeaa69f22fb60909c5ff211b9ef14d0d0f9362e4209eeef3e552b5e2
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.1.0"
-  firebase_dynamic_links_platform_interface:
-    dependency: transitive
-    description:
-      name: firebase_dynamic_links_platform_interface
-      sha256: f41a911267727d241e6d3453718a4b0a95ac33ee0a6e086923f9cab4acd31806
+      sha256: "1ccad077a6fc7bace97d8eace263f42e66dc23a23a839de864a4f10ac4a7c264"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.7"
+    version: "3.8.13"
   firebase_messaging:
     dependency: "direct main"
     description:
       name: firebase_messaging
-      sha256: "48a8a59197c1c5174060ba9aa1e0036e9b5a0d28a0cc22d19c1fcabc67fafe3c"
+      sha256: ba12ad0b600e0c939fbb9391e1cd3320a5b5dad5284276b9182fc21eb1e72c2b
       url: "https://pub.dev"
     source: hosted
-    version: "15.2.0"
+    version: "16.0.2"
   firebase_messaging_platform_interface:
     dependency: transitive
     description:
       name: firebase_messaging_platform_interface
-      sha256: "9770a8e91f54296829dcaa61ce9b7c2f9ae9abbf99976dd3103a60470d5264dd"
+      sha256: b4bade67bfc09fcc56eb012b3fc72b59ca9e2259a34cdfb81b368169770ff536
       url: "https://pub.dev"
     source: hosted
-    version: "4.6.0"
+    version: "4.7.2"
   firebase_messaging_web:
     dependency: transitive
     description:
       name: firebase_messaging_web
-      sha256: "329ca4ef45ec616abe6f1d5e58feed0934a50840a65aa327052354ad3c64ed77"
+      sha256: "8ae4a00d178993feb79603cad324b53696375cbb78805e8eb603fe331866629d"
       url: "https://pub.dev"
     source: hosted
-    version: "3.10.0"
+    version: "4.0.2"
   firebase_remote_config:
     dependency: "direct main"
     description:
       name: firebase_remote_config
-      sha256: "1ddeee5055a6fd2295429b8cc3019d5f422c60c77fd22156a789aa6446645595"
+      sha256: "6406d65d88d41891d201095d1a6bff8ecabe91f3097090db00900d53826f2f9f"
       url: "https://pub.dev"
     source: hosted
-    version: "5.3.0"
+    version: "6.0.2"
   firebase_remote_config_platform_interface:
     dependency: transitive
     description:
       name: firebase_remote_config_platform_interface
-      sha256: a17a43aa27f860a4e13c2cea11f66d71584976c5b9aa59b0e1720b8435d14764
+      sha256: "60ec31cc11bcf2f416e86dd77521784b7dc4be1b82118ca10a1ce9a29fa85e09"
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.48"
+    version: "2.0.3"
   firebase_remote_config_web:
     dependency: transitive
     description:
       name: firebase_remote_config_web
-      sha256: a85a95d6cc0692b82663acf3b0c312f219c55fbdf8ce997922ab862e64945415
+      sha256: "864791054997d63987e0fbb2d7b175ab04e41060a9315b7eeddba2974603247c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.7.6"
+    version: "1.8.12"
   fixnum:
     dependency: transitive
     description:
@@ -591,50 +594,58 @@ packages:
     dependency: transitive
     description:
       name: flutter_gen_core
-      sha256: "46ecf0e317413dd065547887c43f93f55e9653e83eb98dc13dd07d40dd225325"
+      sha256: b6bafbbd981da2f964eb45bcb8b8a7676a281084f8922c0c75de4cfbaa849311
       url: "https://pub.dev"
     source: hosted
-    version: "5.8.0"
+    version: "5.12.0"
   flutter_gen_runner:
     dependency: "direct dev"
     description:
       name: flutter_gen_runner
-      sha256: "77f0a02fc30d9fcf2549fe874eb3fde091435724904bcbb1af60aa40cbfab1f4"
+      sha256: c99b10af9d404e3f46fd1927e7d90099779e935e86022674c4c2a9e6c2a93b29
       url: "https://pub.dev"
     source: hosted
-    version: "5.8.0"
+    version: "5.12.0"
   flutter_lints:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
+      sha256: "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.0"
+    version: "6.0.0"
   flutter_local_notifications:
     dependency: "direct main"
     description:
       name: flutter_local_notifications
-      sha256: ef41ae901e7529e52934feba19ed82827b11baa67336829564aeab3129460610
+      sha256: "7ed76be64e8a7d01dfdf250b8434618e2a028c9dfa2a3c41dc9b531d4b3fc8a5"
       url: "https://pub.dev"
     source: hosted
-    version: "18.0.1"
+    version: "19.4.2"
   flutter_local_notifications_linux:
     dependency: transitive
     description:
       name: flutter_local_notifications_linux
-      sha256: "8f685642876742c941b29c32030f6f4f6dacd0e4eaecb3efbb187d6a3812ca01"
+      sha256: e3c277b2daab8e36ac5a6820536668d07e83851aeeb79c446e525a70710770a5
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.0"
+    version: "6.0.0"
   flutter_local_notifications_platform_interface:
     dependency: transitive
     description:
       name: flutter_local_notifications_platform_interface
-      sha256: "6c5b83c86bf819cdb177a9247a3722067dd8cc6313827ce7c77a4b238a26fd52"
+      sha256: "277d25d960c15674ce78ca97f57d0bae2ee401c844b6ac80fcd972a9c99d09fe"
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.0"
+    version: "9.1.0"
+  flutter_local_notifications_windows:
+    dependency: transitive
+    description:
+      name: flutter_local_notifications_windows
+      sha256: "8d658f0d367c48bd420e7cf2d26655e2d1130147bca1eea917e576ca76668aaf"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.3"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
@@ -644,26 +655,26 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_native_splash
-      sha256: "7062602e0dbd29141fb8eb19220b5871ca650be5197ab9c1f193a28b17537bc7"
+      sha256: "8321a6d11a8d13977fa780c89de8d257cce3d841eecfb7a4cadffcc4f12d82dc"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.4"
+    version: "2.4.6"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e"
+      sha256: b0694b7fb1689b0e6cc193b3f1fcac6423c4f93c74fb20b806c6b6f196db0c31
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.24"
+    version: "2.0.30"
   flutter_riverpod:
     dependency: "direct main"
     description:
       name: flutter_riverpod
-      sha256: "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1"
+      sha256: "71a420767ae786f9402e4efb74e1119fa95b53e6a3781ab8ab21c121ac1349c6"
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.1"
+    version: "3.0.1"
   flutter_shaders:
     dependency: transitive
     description:
@@ -676,10 +687,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_svg
-      sha256: c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b
+      sha256: b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.17"
+    version: "2.2.1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -694,26 +705,26 @@ packages:
     dependency: "direct main"
     description:
       name: freerasp
-      sha256: e057e1ecf8cf14dfc2e7aabba94dcc5356f1c9856a81c2c2a011916c04cb2aaf
+      sha256: a6c3f534499959152f0b9a24779f45dcac21f1c7e139c1cce26c0a80f68ca7a4
       url: "https://pub.dev"
     source: hosted
-    version: "6.11.0"
+    version: "7.2.1"
   freezed:
     dependency: "direct dev"
     description:
       name: freezed
-      sha256: "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e"
+      sha256: "13065f10e135263a4f5a4391b79a8efc5fb8106f8dd555a9e49b750b45393d77"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.7"
+    version: "3.2.3"
   freezed_annotation:
     dependency: "direct main"
     description:
       name: freezed_annotation
-      sha256: c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2
+      sha256: "7294967ff0a6d98638e7acb774aac3af2550777accd8149c90af5b014e6d44d8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.4"
+    version: "3.1.0"
   frontend_server_client:
     dependency: transitive
     description:
@@ -726,58 +737,58 @@ packages:
     dependency: transitive
     description:
       name: glob
-      sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
+      sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
   google_identity_services_web:
     dependency: transitive
     description:
       name: google_identity_services_web
-      sha256: "55580f436822d64c8ff9a77e37d61f5fb1e6c7ec9d632a43ee324e2a05c3c6c9"
+      sha256: "5d187c46dc59e02646e10fe82665fc3884a9b71bc1c90c2b8b749316d33ee454"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.3"
+    version: "0.3.3+1"
   google_sign_in:
     dependency: "direct main"
     description:
       name: google_sign_in
-      sha256: fad6ddc80c427b0bba705f2116204ce1173e09cf299f85e053d57a55e5b2dd56
+      sha256: "521031b65853b4409b8213c0387d57edaad7e2a949ce6dea0d8b2afc9cb29763"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.2"
+    version: "7.2.0"
   google_sign_in_android:
     dependency: transitive
     description:
       name: google_sign_in_android
-      sha256: "3b96f9b6cf61915f73cbe1218a192623e296a9b8b31965702503649477761e36"
+      sha256: "7abdfa0088dc8f7d08eb3dbb1665a72bcb5b37afa256c9ec5d21e1e2d7503e5c"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.34"
+    version: "7.2.0"
   google_sign_in_ios:
     dependency: transitive
     description:
       name: google_sign_in_ios
-      sha256: "83f015169102df1ab2905cf8abd8934e28f87db9ace7a5fa676998842fed228a"
+      sha256: d9d80f953a244a099a40df1ff6aadc10ee375e6a098bbd5d55be332ce26db18c
       url: "https://pub.dev"
     source: hosted
-    version: "5.7.8"
+    version: "6.2.1"
   google_sign_in_platform_interface:
     dependency: transitive
     description:
       name: google_sign_in_platform_interface
-      sha256: "1f6e5787d7a120cc0359ddf315c92309069171306242e181c09472d1b00a2971"
+      sha256: "7f59208c42b415a3cca203571128d6f84f885fead2d5b53eb65a9e27f2965bb5"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.5"
+    version: "3.1.0"
   google_sign_in_web:
     dependency: transitive
     description:
       name: google_sign_in_web
-      sha256: ada595df6c30cead48e66b1f3a050edf0c5cf2ba60c185d69690e08adcc6281b
+      sha256: "2fc1f941e6443b2d6984f4056a727a3eaeab15d8ee99ba7125d79029be75a1da"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.4+3"
+    version: "1.1.0"
   graphs:
     dependency: transitive
     description:
@@ -806,26 +817,26 @@ packages:
     dependency: transitive
     description:
       name: hotreloader
-      sha256: ed56fdc1f3a8ac924e717257621d09e9ec20e308ab6352a73a50a1d7a4d9158e
+      sha256: bc167a1163807b03bada490bfe2df25b0d744df359227880220a5cbd04e5734b
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.0"
+    version: "4.3.0"
   html:
     dependency: transitive
     description:
       name: html
-      sha256: "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec"
+      sha256: "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602"
       url: "https://pub.dev"
     source: hosted
-    version: "0.15.5"
+    version: "0.15.6"
   http:
     dependency: transitive
     description:
       name: http
-      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
+      sha256: bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.2"
+    version: "1.5.0"
   http_client_helper:
     dependency: transitive
     description:
@@ -854,26 +865,26 @@ packages:
     dependency: transitive
     description:
       name: image
-      sha256: "8346ad4b5173924b5ddddab782fc7d8a6300178c8b1dc427775405a01701c4a6"
+      sha256: "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928"
       url: "https://pub.dev"
     source: hosted
-    version: "4.5.2"
+    version: "4.5.4"
   image_size_getter:
     dependency: transitive
     description:
       name: image_size_getter
-      sha256: c3900f04e31468a81aa23b09b1c7d09c3c952122bbe9ecdae336977b7be24c05
+      sha256: "7c26937e0ae341ca558b7556591fd0cc456fcc454583b7cb665d2f03e93e590f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.0+1"
+    version: "2.4.1"
   intl:
     dependency: "direct main"
     description:
       name: intl
-      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
+      sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
       url: "https://pub.dev"
     source: hosted
-    version: "0.19.0"
+    version: "0.20.2"
   io:
     dependency: transitive
     description:
@@ -886,10 +897,10 @@ packages:
     dependency: transitive
     description:
       name: js
-      sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf
+      sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.1"
+    version: "0.7.2"
   json_annotation:
     dependency: "direct main"
     description:
@@ -902,42 +913,50 @@ packages:
     dependency: "direct dev"
     description:
       name: json_serializable
-      sha256: c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c
+      sha256: "33a040668b31b320aafa4822b7b1e177e163fc3c1e835c6750319d4ab23aa6fe"
       url: "https://pub.dev"
     source: hosted
-    version: "6.9.0"
+    version: "6.11.1"
   leak_tracker:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
+      sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.7"
+    version: "11.0.2"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
+      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.8"
+    version: "3.0.10"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
+  lean_builder:
+    dependency: transitive
+    description:
+      name: lean_builder
+      sha256: ef5cd5f907157eb7aa87d1704504b5a6386d2cbff88a3c2b3344477bab323ee9
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.2"
   lints:
     dependency: transitive
     description:
       name: lints
-      sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7
+      sha256: a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0
       url: "https://pub.dev"
     source: hosted
-    version: "5.1.1"
+    version: "6.0.0"
   logging:
     dependency: transitive
     description:
@@ -946,22 +965,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.0"
-  macros:
-    dependency: transitive
-    description:
-      name: macros
-      sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.3-main.0"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
+      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16+1"
+    version: "0.12.17"
   material_color_utilities:
     dependency: transitive
     description:
@@ -974,10 +985,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
+      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
       url: "https://pub.dev"
     source: hosted
-    version: "1.15.0"
+    version: "1.17.0"
   mime:
     dependency: transitive
     description:
@@ -986,6 +997,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
+  mockito:
+    dependency: transitive
+    description:
+      name: mockito
+      sha256: "2314cbe9165bcd16106513df9cf3c3224713087f09723b128928dc11a4379f99"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.5.0"
   modal_bottom_sheet:
     dependency: "direct main"
     description:
@@ -994,38 +1013,54 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.0"
+  netglade_analysis:
+    dependency: "direct dev"
+    description:
+      name: netglade_analysis
+      sha256: "5f3b6824ad4b341d7c75eb854c42045468cd9cd6ff1b62638459ba06918c0cb0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "18.0.0"
+  node_preamble:
+    dependency: transitive
+    description:
+      name: node_preamble
+      sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
   package_config:
     dependency: transitive
     description:
       name: package_config
-      sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67"
+      sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.2.0"
   package_info_plus:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: "70c421fe9d9cc1a9a7f3b05ae56befd469fe4f8daa3b484823141a55442d858d"
+      sha256: f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.2"
+    version: "9.0.0"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
       name: package_info_plus_platform_interface
-      sha256: a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b
+      sha256: "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.2.1"
   path:
     dependency: transitive
     description:
       name: path
-      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
+      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.0"
+    version: "1.9.1"
   path_parsing:
     dependency: transitive
     description:
@@ -1046,18 +1081,18 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2"
+      sha256: "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.15"
+    version: "2.2.18"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942"
+      sha256: "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1"
+    version: "2.4.2"
   path_provider_linux:
     dependency: transitive
     description:
@@ -1086,34 +1121,82 @@ packages:
     dependency: "direct dev"
     description:
       name: patrol
-      sha256: f2b423122e63b1251fc31165ba1f7d85d60e22b4d20076ef39dcb47f83e35467
+      sha256: "782988d05af24427296e48417c36c520598656e00ba73c401a19ecd65262ee0b"
       url: "https://pub.dev"
     source: hosted
-    version: "3.13.2"
+    version: "3.19.0"
   patrol_finders:
     dependency: transitive
     description:
       name: patrol_finders
-      sha256: "5a1e2b4c6636e89645fc596d68224cfe6cca28e11c855b98dd0df9bed0d80405"
+      sha256: "4a658d7d560de523f92deb3fa3326c78747ca0bf7e7f4b8788c012463138b628"
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.0"
+    version: "2.9.0"
   patrol_log:
     dependency: transitive
     description:
       name: patrol_log
-      sha256: ad5d7b759d16071ca16aa9b27eb4f106ce23079792d4312941874dbc33e795cb
+      sha256: "9fed4143980df1e3bbcfa00d0b443c7d68f04f9132317b7698bbc37f8a5a58c5"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.2"
+    version: "0.5.0"
+  permission_handler:
+    dependency: "direct main"
+    description:
+      name: permission_handler
+      sha256: bc917da36261b00137bbc8896bf1482169cd76f866282368948f032c8c1caae1
+      url: "https://pub.dev"
+    source: hosted
+    version: "12.0.1"
+  permission_handler_android:
+    dependency: transitive
+    description:
+      name: permission_handler_android
+      sha256: "1e3bc410ca1bf84662104b100eb126e066cb55791b7451307f9708d4007350e6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "13.0.1"
+  permission_handler_apple:
+    dependency: transitive
+    description:
+      name: permission_handler_apple
+      sha256: f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.4.7"
+  permission_handler_html:
+    dependency: transitive
+    description:
+      name: permission_handler_html
+      sha256: "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.3+5"
+  permission_handler_platform_interface:
+    dependency: transitive
+    description:
+      name: permission_handler_platform_interface
+      sha256: eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.3.0"
+  permission_handler_windows:
+    dependency: transitive
+    description:
+      name: permission_handler_windows
+      sha256: "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.1"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27
+      sha256: "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.2"
+    version: "7.0.1"
   platform:
     dependency: transitive
     description:
@@ -1134,18 +1217,18 @@ packages:
     dependency: transitive
     description:
       name: pool
-      sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
+      sha256: "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d"
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.1"
+    version: "1.5.2"
   posix:
     dependency: transitive
     description:
       name: posix
-      sha256: a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a
+      sha256: "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.1"
+    version: "6.0.3"
   pretty_dio_logger:
     dependency: "direct main"
     description:
@@ -1158,10 +1241,10 @@ packages:
     dependency: transitive
     description:
       name: pub_semver
-      sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd"
+      sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.5"
+    version: "2.2.0"
   pubspec_parse:
     dependency: transitive
     description:
@@ -1174,42 +1257,42 @@ packages:
     dependency: transitive
     description:
       name: riverpod
-      sha256: "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959"
+      sha256: b21446f04474040479b19004c5b729605cde221bbd14cf16ad0db8804dce4810
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.1"
+    version: "3.0.1"
   riverpod_analyzer_utils:
     dependency: transitive
     description:
       name: riverpod_analyzer_utils
-      sha256: c6b8222b2b483cb87ae77ad147d6408f400c64f060df7a225b127f4afef4f8c8
+      sha256: a0f68adb078b790faa3c655110a017f9a7b7b079a57bbd40f540e80dce5fcd29
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.8"
+    version: "1.0.0-dev.7"
   riverpod_annotation:
     dependency: "direct main"
     description:
       name: riverpod_annotation
-      sha256: e14b0bf45b71326654e2705d462f21b958f987087be850afd60578fcd502d1b8
+      sha256: d8154e04008b98015ee3e0514a5d929e3d15605790d28bcd74e63e2d415632a1
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.1"
+    version: "3.0.1"
   riverpod_generator:
     dependency: "direct dev"
     description:
       name: riverpod_generator
-      sha256: "63546d70952015f0981361636bf8f356d9cfd9d7f6f0815e3c07789a41233188"
+      sha256: af92fa4051568071f7e12bd44b8b4f3adc7470e3676bd5ac953582a9cce4a1c0
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.3"
+    version: "3.0.1"
   riverpod_lint:
     dependency: "direct dev"
     description:
       name: riverpod_lint
-      sha256: "83e4caa337a9840469b7b9bd8c2351ce85abad80f570d84146911b32086fbd99"
+      sha256: "8ac5927dca2444d62f7f1d652ffe4aeeb95ad17f6ebd2c287471f2ed2e79fea8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.3"
+    version: "3.0.1"
   rxdart:
     dependency: transitive
     description:
@@ -1262,34 +1345,34 @@ packages:
     dependency: transitive
     description:
       name: share_plus
-      sha256: "6327c3f233729374d0abaafd61f6846115b2a481b4feddd8534211dc10659400"
+      sha256: "3424e9d5c22fd7f7590254ba09465febd6f8827c8b19a44350de4ac31d92d3a6"
       url: "https://pub.dev"
     source: hosted
-    version: "10.1.3"
+    version: "12.0.0"
   share_plus_platform_interface:
     dependency: transitive
     description:
       name: share_plus_platform_interface
-      sha256: cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b
+      sha256: "88023e53a13429bd65d8e85e11a9b484f49d4c190abbd96c7932b74d6927cc9a"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.2"
+    version: "6.1.0"
   shared_preferences:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: a752ce92ea7540fc35a0d19722816e04d0e72828a4200e83a98cf1a1eb524c9a
+      sha256: "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.5"
+    version: "2.5.3"
   shared_preferences_android:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: bf808be89fe9dc467475e982c1db6c2faf3d2acf54d526cd5ec37d86c99dbd84
+      sha256: bd14436108211b0d4ee5038689a56d4ae3620fd72fd6036e113bf1345bc74d9e
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1"
+    version: "2.4.13"
   shared_preferences_foundation:
     dependency: transitive
     description:
@@ -1318,10 +1401,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_web
-      sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e
+      sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2"
+    version: "2.4.3"
   shared_preferences_windows:
     dependency: transitive
     description:
@@ -1338,38 +1421,54 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.2"
+  shelf_packages_handler:
+    dependency: transitive
+    description:
+      name: shelf_packages_handler
+      sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.2"
+  shelf_static:
+    dependency: transitive
+    description:
+      name: shelf_static
+      sha256: c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.3"
   shelf_web_socket:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67
+      sha256: "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.0"
   sign_in_with_apple:
     dependency: "direct main"
     description:
       name: sign_in_with_apple
-      sha256: e84a62e17b7e463abf0a64ce826c2cd1f0b72dff07b7b275e32d5302d76fb4c5
+      sha256: "8bd875c8e8748272749eb6d25b896f768e7e9d60988446d543fe85a37a2392b8"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.4"
+    version: "7.0.1"
   sign_in_with_apple_platform_interface:
     dependency: transitive
     description:
       name: sign_in_with_apple_platform_interface
-      sha256: c2ef2ce6273fce0c61acd7e9ff5be7181e33d7aa2b66508b39418b786cca2119
+      sha256: "981bca52cf3bb9c3ad7ef44aace2d543e5c468bb713fd8dda4275ff76dfa6659"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "2.0.0"
   sign_in_with_apple_web:
     dependency: transitive
     description:
       name: sign_in_with_apple_web
-      sha256: "2f7c38368f49e3f2043bca4b46a4a61aaae568c140a79aa0675dc59ad0ca49bc"
+      sha256: f316400827f52cafcf50d00e1a2e8a0abc534ca1264e856a81c5f06bd5b10fed
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "3.0.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -1379,26 +1478,42 @@ packages:
     dependency: transitive
     description:
       name: source_gen
-      sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832"
+      sha256: "7b19d6ba131c6eb98bfcbf8d56c1a7002eba438af2e7ae6f8398b2b0f4f381e3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.0"
+    version: "3.1.0"
   source_helper:
     dependency: transitive
     description:
       name: source_helper
-      sha256: "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c"
+      sha256: "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.5"
+    version: "1.3.8"
+  source_map_stack_trace:
+    dependency: transitive
+    description:
+      name: source_map_stack_trace
+      sha256: c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
+  source_maps:
+    dependency: transitive
+    description:
+      name: source_maps
+      sha256: "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.10.13"
   source_span:
     dependency: transitive
     description:
       name: source_span
-      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
+      sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.10.1"
   sprintf:
     dependency: transitive
     description:
@@ -1411,10 +1526,10 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
+      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
       url: "https://pub.dev"
     source: hosted
-    version: "1.12.0"
+    version: "1.12.1"
   state_notifier:
     dependency: transitive
     description:
@@ -1427,10 +1542,10 @@ packages:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
   stream_transform:
     dependency: transitive
     description:
@@ -1443,58 +1558,74 @@ packages:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
+      sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.4.1"
   talker:
     dependency: "direct main"
     description:
       name: talker
-      sha256: "9d1c777f12ac49db3bf7b3e3977a09041a23da0fc65b7c12f0530c2045128104"
+      sha256: f86b1de9e2442228c9340b418703b4ee10d0f831bf3571696ba1d835293ad22a
       url: "https://pub.dev"
     source: hosted
-    version: "4.4.7"
+    version: "5.0.1"
   talker_dio_logger:
     dependency: "direct main"
     description:
       name: talker_dio_logger
-      sha256: "9f63452dac8f7ab544b19f7b1f58bf5a5a94ed2e159e3fdb7a010e9db35339f6"
+      sha256: "35699be0353164916db4e6cfdeae390da53b5b1e364ee78fc0ef4c1c46cd3f46"
       url: "https://pub.dev"
     source: hosted
-    version: "4.4.7"
+    version: "5.0.1"
   talker_flutter:
     dependency: "direct main"
     description:
       name: talker_flutter
-      sha256: "7557c3088dbf341d1f9b6aac12ed1a15663e5e6a0165a29787070320c7edaa4e"
+      sha256: "4e5614548cd4f2a979ec6a63d455dc12e254e49989d67e95b89003d1893cc21c"
       url: "https://pub.dev"
     source: hosted
-    version: "4.4.7"
+    version: "5.0.1"
   talker_logger:
     dependency: transitive
     description:
       name: talker_logger
-      sha256: "6a38786d0755538a397d374c57f381f26c15c45095a2e9677b09ac2a00f464e4"
+      sha256: "8c63990d33e779a24368e0c191e6c9a54639088b6fe3a5b763a6f37fe00ff20b"
       url: "https://pub.dev"
     source: hosted
-    version: "4.6.2"
+    version: "5.0.1"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
+  test:
+    dependency: transitive
+    description:
+      name: test
+      sha256: "75906bf273541b676716d1ca7627a17e4c4070a3a16272b7a3dc7da3b9f3f6b7"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.26.3"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
+      sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.3"
+    version: "0.7.7"
+  test_core:
+    dependency: transitive
+    description:
+      name: test_core
+      sha256: "0cc24b5ff94b38d2ae73e1eb43cc302b77964fbf67abad1e296025b78deb53d0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.12"
   time:
     dependency: transitive
     description:
@@ -1507,10 +1638,10 @@ packages:
     dependency: transitive
     description:
       name: timezone
-      sha256: ffc9d5f4d1193534ef051f9254063fa53d588609418c84299956c3db9383587d
+      sha256: dd14a3b83cfd7cb19e7888f1cbc20f258b8d71b54c06f79ac585f14093a287d1
       url: "https://pub.dev"
     source: hosted
-    version: "0.10.0"
+    version: "0.10.1"
   timing:
     dependency: transitive
     description:
@@ -1547,26 +1678,26 @@ packages:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603"
+      sha256: f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.1"
+    version: "6.3.2"
   url_launcher_android:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193"
+      sha256: "199bc33e746088546a39cc5f36bac5a278c5e53b40cb3196f99e7345fdcfae6b"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.14"
+    version: "6.3.22"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626"
+      sha256: d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.2"
+    version: "6.3.4"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -1579,10 +1710,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2"
+      sha256: c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.2"
+    version: "3.2.3"
   url_launcher_platform_interface:
     dependency: transitive
     description:
@@ -1595,10 +1726,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9"
+      sha256: "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
   url_launcher_windows:
     dependency: transitive
     description:
@@ -1619,10 +1750,10 @@ packages:
     dependency: transitive
     description:
       name: vector_graphics
-      sha256: "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7"
+      sha256: a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.15"
+    version: "1.1.19"
   vector_graphics_codec:
     dependency: transitive
     description:
@@ -1635,82 +1766,90 @@ packages:
     dependency: transitive
     description:
       name: vector_graphics_compiler
-      sha256: "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad"
+      sha256: d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.16"
+    version: "1.1.19"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.2.0"
   vm_service:
     dependency: transitive
     description:
       name: vm_service
-      sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
+      sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60"
       url: "https://pub.dev"
     source: hosted
-    version: "14.3.0"
+    version: "15.0.2"
   watcher:
     dependency: transitive
     description:
       name: watcher
-      sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104"
+      sha256: "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.3"
   web:
     dependency: transitive
     description:
       name: web
-      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
+      sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   web_socket:
     dependency: transitive
     description:
       name: web_socket
-      sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83"
+      sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.6"
+    version: "1.0.1"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
-      sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f"
+      sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.3"
+  webkit_inspection_protocol:
+    dependency: transitive
+    description:
+      name: webkit_inspection_protocol
+      sha256: "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.1"
   win32:
     dependency: transitive
     description:
       name: win32
-      sha256: "154360849a56b7b67331c21f09a386562d88903f90a1099c5987afc1912e1f29"
+      sha256: "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03"
       url: "https://pub.dev"
     source: hosted
-    version: "5.10.0"
+    version: "5.14.0"
   win32_registry:
     dependency: transitive
     description:
       name: win32_registry
-      sha256: "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852"
+      sha256: "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.5"
+    version: "2.1.0"
   window_manager:
     dependency: "direct main"
     description:
       name: window_manager
-      sha256: "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059"
+      sha256: "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd"
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.3"
+    version: "0.5.1"
   xdg_directories:
     dependency: transitive
     description:
@@ -1723,10 +1862,18 @@ packages:
     dependency: transitive
     description:
       name: xml
-      sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226
+      sha256: "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.6.1"
+  xxh3:
+    dependency: transitive
+    description:
+      name: xxh3
+      sha256: "399a0438f5d426785723c99da6b16e136f4953fb1e9db0bf270bd41dd4619916"
       url: "https://pub.dev"
     source: hosted
-    version: "6.5.0"
+    version: "1.2.0"
   yaml:
     dependency: transitive
     description:
@@ -1736,5 +1883,5 @@ packages:
     source: hosted
     version: "3.1.3"
 sdks:
-  dart: ">=3.6.0 <4.0.0"
-  flutter: ">=3.27.0"
+  dart: ">=3.9.0 <4.0.0"
+  flutter: ">=3.35.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 962ebe2..ac97c6f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,11 +1,12 @@
 name: flutter_app
-description: Template project for flutter apps.
-publish_to: 'none' # Remove this line if you wish to publish to pub.dev
+description: Template project for Flutter apps.
+publish_to: "none" # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+10000000 #1 00 00 000
 
 
 environment:
-  sdk: '>=3.5.0 <4.0.0'
+  sdk: ">=3.8.0 <4.0.0"
+  flutter: 3.32.0
 
 
 dependencies:
@@ -17,94 +18,97 @@ dependencies:
     sdk: flutter
 
   # State management
-  flutter_riverpod: 2.6.1                     # https://pub.dev/packages/flutter_riverpod
-  riverpod_annotation: 2.6.1                  # https://pub.dev/packages/riverpod_annotation
+  flutter_riverpod: ^3.0.1
+  riverpod_annotation: ^3.0.1
+
+  # Navigation
+  auto_route: ^10.1.2
+
+  # Data Structures
+  freezed_annotation: 3.1.0
+  json_annotation: 4.9.0
 
   # Network
-  dio: 5.7.0                                  # https://pub.dev/packages/dio
-  pretty_dio_logger: 1.4.0                    # https://pub.dev/packages/pretty_dio_logger
+  dio: 5.9.0
+
+  # Storage
+  shared_preferences: 2.5.3
 
   # Firebase
-  firebase_analytics: 11.4.0                  # https://pub.dev/packages/firebase_analytics
-  firebase_auth: 5.4.0                        # https://pub.dev/packages/firebase_auth
-  firebase_core: 3.10.0                       # https://pub.dev/packages/firebase_core
-  firebase_crashlytics: 4.3.0                 # https://pub.dev/packages/firebase_crashlytics
-  firebase_dynamic_links : 6.1.0              # https://pub.dev/packages/firebase_dynamic_links
-  firebase_messaging: 15.2.0                  # https://pub.dev/packages/firebase_messaging
-  firebase_remote_config: 5.3.0               # https://pub.dev/packages/firebase_remote_config
+  firebase_analytics: ^12.0.2
+  firebase_auth: ^6.1.0
+  firebase_core: ^4.1.1
+  firebase_crashlytics: ^5.0.2
+  firebase_messaging: ^16.0.2
+  firebase_remote_config: ^6.0.2
 
   # Authentication
-  google_sign_in: 6.2.2                       # https://pub.dev/packages/google_sign_in
-  sign_in_with_apple: 6.1.4                   # https://pub.dev/packages/sign_in_with_apple
+  google_sign_in: ^7.2.0
+  sign_in_with_apple: 7.0.1
 
-  # Storage
-  shared_preferences: 2.3.5                   # https://pub.dev/packages/shared_preferences
+  # Device
+  device_info_plus: ^12.1.0
+  package_info_plus: ^9.0.0
+  path_provider: 2.1.5
+  window_manager: 0.5.1
 
-  # Data Structures
-  freezed_annotation: 2.4.4                   # https://pub.dev/packages/freezed_annotation
-  json_annotation: 4.9.0                      # https://pub.dev/packages/json_annotation
+  # Security
+  freerasp: 7.2.1
 
   # Logging
-  talker: 4.4.7                               # https://pub.dev/packages/talker
-  talker_flutter: 4.4.7                       # https://pub.dev/packages/talker_flutter
-  talker_dio_logger: 4.4.7                    # https://pub.dev/packages/talker_dio_logger
-  
-  # Device
-  device_info_plus: 11.2.0                    # https://pub.dev/packages/device_info_plus
-  package_info_plus: 8.1.2                    # https://pub.dev/packages/package_info_plus
-  path_provider: 2.1.5                        # https://pub.dev/packages/path_provider
-  window_manager: 0.4.3                       # https://pub.dev/packages/window_manager
-  
-  # Navigation
-  auto_route: 9.3.0+1                         # https://pub.dev/packages/auto_route
-  url_launcher: 6.3.1                         # https://pub.dev/packages/url_launcher
-  
+  pretty_dio_logger: 1.4.0
+  talker: ^5.0.1
+  talker_flutter: ^5.0.1
+  talker_dio_logger: ^5.0.1
+
   # Resources
-  extended_image: 9.1.0                       # https://pub.dev/packages/extended_image
-  flutter_native_splash: 2.4.4                # https://pub.dev/packages/flutter_native_splash
-  flutter_svg: 2.0.17                         # https://pub.dev/packages/flutter_svg
-  intl: 0.19.0                                # https://pub.dev/packages/intl https://docs.flutter.dev/development/accessibility-and-localization/internationalization
-  
-  # Security
-  freerasp: 6.11.0                            # https://pub.dev/packages/freerasp
+  extended_image: 10.0.1
+  flutter_native_splash: 2.4.6
+  flutter_svg: ^2.2.1
+  intl: 0.20.2
 
   # UI
-  flutter_animate: 4.5.2                      # https://pub.dev/packages/flutter_animate
-  flutter_local_notifications: 18.0.1         # https://pub.dev/packages/flutter_local_notifications
-  modal_bottom_sheet: 3.0.0                   # https://pub.dev/packages/modal_bottom_sheet
-  universal_html: 2.2.4                       # https://pub.dev/packages/universal_html
+  flutter_animate: 4.5.2
+  flutter_local_notifications: ^19.4.2
+  modal_bottom_sheet: 3.0.0
+  universal_html: 2.2.4
 
   # Utility
-  app_settings: 5.1.1                         # https://pub.dev/packages/app_settings
-  collection: 1.19.0                          # https://pub.dev/packages/collection
-  crypto: 3.0.6                               # https://pub.dev/packages/crypto
+  app_settings: 6.1.1
+  collection: 1.19.1
+  crypto: 3.0.6
+  permission_handler: 12.0.1
+  url_launcher: 6.3.2
 
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
 
-  # UI Tests
-  patrol: 3.13.2                              # https://pub.dev/packages/patrol
+  # Build Runner
+  build_runner: ^2.7.1
 
   # State management
-  riverpod_generator: 2.6.3                   # https://pub.dev/packages/riverpod_generator
+  riverpod_generator: ^3.0.1
+
+  # Navigation
+  auto_route_generator: ^10.2.4
 
   # Data Structures
-  freezed: 2.5.7                              # https://pub.dev/packages/freezed
-  json_serializable: 6.9.0                    # https://pub.dev/packages/json_serializable
+  freezed: ^3.2.3
+  json_serializable: ^6.11.1
 
   # Resources
-  flutter_gen_runner: 5.8.0                   # https://pub.dev/packages/flutter_gen_runner
+  flutter_gen_runner: ^5.12.0
 
   # Lint
-  custom_lint: 0.7.0                          # https://pub.dev/packages/custom_lint
-  flutter_lints: 5.0.0                        # https://pub.dev/packages/flutter_lints
-  riverpod_lint: 2.6.3                        # https://pub.dev/packages/riverpod_lint
+  custom_lint: ^0.8.0
+  flutter_lints: 6.0.0
+  netglade_analysis: 18.0.0
+  riverpod_lint: ^3.0.1
 
-  # Utils
-  auto_route_generator: 9.0.0                 # https://pub.dev/packages/auto_route_generator
-  build_runner: 2.4.14                        # https://pub.dev/packages/build_runner
+  # UI Tests
+  patrol: 3.19.0
 
 
 patrol:
@@ -124,6 +128,7 @@ flutter_gen:
 
 flutter:
   uses-material-design: true
+  generate: true
 
   assets:
     - assets/png/
diff --git a/snap/gui/app_icon.png b/snap/gui/app_icon.png
index 724182d..afc9fbf 100644
Binary files a/snap/gui/app_icon.png and b/snap/gui/app_icon.png differ
diff --git a/web/favicon.png b/web/favicon.png
index ac633e1..60050a2 100644
Binary files a/web/favicon.png and b/web/favicon.png differ
diff --git a/web/firebase-messaging-sw.js b/web/firebase-messaging-sw.js
index 388d825..e2bfb78 100644
--- a/web/firebase-messaging-sw.js
+++ b/web/firebase-messaging-sw.js
@@ -1,5 +1,5 @@
-importScripts("https://www.gstatic.com/firebasejs/8.10.0/firebase-app.js");
-importScripts("https://www.gstatic.com/firebasejs/8.10.0/firebase-messaging.js");
+importScripts("https://www.gstatic.com/firebasejs/11.7.0/firebase-app.js");
+importScripts("https://www.gstatic.com/firebasejs/11.7.0/firebase-messaging.js");
 
 firebase.initializeApp({
     apiKey: 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
diff --git a/web/icons/Icon-192.png b/web/icons/Icon-192.png
index 311342b..0b322ca 100644
Binary files a/web/icons/Icon-192.png and b/web/icons/Icon-192.png differ
diff --git a/web/icons/Icon-512.png b/web/icons/Icon-512.png
index 0ad3ac1..770e2f7 100644
Binary files a/web/icons/Icon-512.png and b/web/icons/Icon-512.png differ
diff --git a/web/icons/Icon-maskable-192.png b/web/icons/Icon-maskable-192.png
index 311342b..0b322ca 100644
Binary files a/web/icons/Icon-maskable-192.png and b/web/icons/Icon-maskable-192.png differ
diff --git a/web/icons/Icon-maskable-512.png b/web/icons/Icon-maskable-512.png
index 0ad3ac1..770e2f7 100644
Binary files a/web/icons/Icon-maskable-512.png and b/web/icons/Icon-maskable-512.png differ
diff --git a/web/index.html b/web/index.html
index cd940ea..ff0d715 100644
--- a/web/index.html
+++ b/web/index.html
@@ -1,114 +1,132 @@
 <!DOCTYPE html>
 <html>
+  <head>
+    <base href="$FLUTTER_BASE_HREF" />
+    <meta charset="UTF-8" />
+    <meta content="IE=Edge" http-equiv="X-UA-Compatible" />
+    <meta name="description" content="A new Flutter project." />
+
+    <!-- iOS meta tags & icons -->
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+    <meta name="apple-mobile-web-app-title" content="template" />
+    <link rel="apple-touch-icon" href="icons/Icon-192.png" />
+
+    <!-- Favicon -->
+    <link rel="icon" type="image/png" href="favicon.png" />
+
+    <title>Flutter Template</title>
+    <link rel="manifest" href="manifest.json" />
+
+    <!-- Native Splash Screen -->
+    <meta
+      content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"
+      name="viewport"
+    />
+    <style id="splash-screen-style">
+      html {
+        height: 100%;
+      }
 
-<head>
-  <base href="$FLUTTER_BASE_HREF">
-  <meta charset="UTF-8">
-  <meta content="IE=Edge" http-equiv="X-UA-Compatible">
-  <meta name="description" content="A new Flutter project.">
-
-  <!-- iOS meta tags & icons -->
-  <meta name="apple-mobile-web-app-capable" content="yes">
-  <meta name="apple-mobile-web-app-status-bar-style" content="black">
-  <meta name="apple-mobile-web-app-title" content="template">
-  <link rel="apple-touch-icon" href="icons/Icon-192.png">
-
-  <!-- Favicon -->
-  <link rel="icon" type="image/png" href="favicon.png">
-
-  <title>Flutter Template</title>
-  <link rel="manifest" href="manifest.json">
-
-  <!-- Native Splash Screen -->
-  <style id="splash-screen-style">
-    html {
-      height: 100%
-    }
-
-    body {
-      margin: 0;
-      min-height: 100%;
-      background-color: #FFFFFF;
-      background-size: 100% 100%;
-    }
-
-    .center {
-      margin: 0;
-      position: absolute;
-      top: 50%;
-      left: 50%;
-      -ms-transform: translate(-50%, -50%);
-      transform: translate(-50%, -50%);
-    }
-
-    .contain {
-      display: block;
-      width: 100%;
-      height: 100%;
-      object-fit: contain;
-    }
-
-    .stretch {
-      display: block;
-      width: 100%;
-      height: 100%;
-    }
+      body {
+        margin: 0;
+        min-height: 100%;
+        background-color: #f2f2f2;
+        background-size: 100% 100%;
+      }
 
-    .cover {
-      display: block;
-      width: 100%;
-      height: 100%;
-      object-fit: cover;
-    }
+      .center {
+        margin: 0;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        -ms-transform: translate(-50%, -50%);
+        transform: translate(-50%, -50%);
+      }
 
-    .bottom {
-      position: absolute;
-      bottom: 0;
-      left: 50%;
-      -ms-transform: translate(-50%, 0);
-      transform: translate(-50%, 0);
-    }
+      .contain {
+        display: block;
+        width: 100%;
+        height: 100%;
+        object-fit: contain;
+      }
 
-    .bottomLeft {
-      position: absolute;
-      bottom: 0;
-      left: 0;
-    }
+      .stretch {
+        display: block;
+        width: 100%;
+        height: 100%;
+      }
 
-    .bottomRight {
-      position: absolute;
-      bottom: 0;
-      right: 0;
-    }
+      .cover {
+        display: block;
+        width: 100%;
+        height: 100%;
+        object-fit: cover;
+      }
 
-    @media (prefers-color-scheme: dark) {
-      body {
-        background-color: #121618;
+      .bottom {
+        position: absolute;
+        bottom: 0;
+        left: 50%;
+        -ms-transform: translate(-50%, 0);
+        transform: translate(-50%, 0);
       }
-    }
-  </style>
-  <script id="splash-screen-script">
-    function removeSplashFromWeb() {
-      document.getElementById("splash")?.remove();
-      document.getElementById("splash-branding")?.remove();
-      document.body.style.background = "transparent";
-    }
-  </script>
-  <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport">
-</head>
 
-<body>
-  <picture id="splash">
-    <source
-      srcset="splash/img/light-1x.png 1x, splash/img/light-2x.png 2x, splash/img/light-3x.png 3x, splash/img/light-4x.png 4x"
-      media="(prefers-color-scheme: light)">
-    <source
-      srcset="splash/img/dark-1x.png 1x, splash/img/dark-2x.png 2x, splash/img/dark-3x.png 3x, splash/img/dark-4x.png 4x"
-      media="(prefers-color-scheme: dark)">
-    <img class="center" aria-hidden="true" src="splash/img/light-1x.png" alt="">
-  </picture>
+      .bottomLeft {
+        position: absolute;
+        bottom: 0;
+        left: 0;
+      }
 
-  <script src="flutter_bootstrap.js" async></script>
-</body>
+      .bottomRight {
+        position: absolute;
+        bottom: 0;
+        right: 0;
+      }
 
-</html>
\ No newline at end of file
+      @media (prefers-color-scheme: dark) {
+        body {
+          background-color: #121618;
+        }
+      }
+    </style>
+    <script id="splash-screen-script">
+      function removeSplashFromWeb() {
+        document.getElementById("splash")?.remove();
+        document.getElementById("splash-branding")?.remove();
+        document.body.style.background = "transparent";
+      }
+    </script>
+  </head>
+
+  <body>
+    <picture id="splash">
+      <source
+        srcset="
+          splash/img/light-1x.png 1x,
+          splash/img/light-2x.png 2x,
+          splash/img/light-3x.png 3x,
+          splash/img/light-4x.png 4x
+        "
+        media="(prefers-color-scheme: light)"
+      />
+      <source
+        srcset="
+          splash/img/dark-1x.png 1x,
+          splash/img/dark-2x.png 2x,
+          splash/img/dark-3x.png 3x,
+          splash/img/dark-4x.png 4x
+        "
+        media="(prefers-color-scheme: dark)"
+      />
+      <img
+        class="center"
+        aria-hidden="true"
+        src="splash/img/light-1x.png"
+        alt=""
+      />
+    </picture>
+
+    <script src="flutter_bootstrap.js" async=""></script>
+  </body>
+</html>
diff --git a/web/splash/img/dark-1x.png b/web/splash/img/dark-1x.png
index e44e119..791e426 100644
Binary files a/web/splash/img/dark-1x.png and b/web/splash/img/dark-1x.png differ
diff --git a/web/splash/img/dark-2x.png b/web/splash/img/dark-2x.png
index 1a318c4..bc1eb02 100644
Binary files a/web/splash/img/dark-2x.png and b/web/splash/img/dark-2x.png differ
diff --git a/web/splash/img/dark-3x.png b/web/splash/img/dark-3x.png
index 757ba67..fdecce3 100644
Binary files a/web/splash/img/dark-3x.png and b/web/splash/img/dark-3x.png differ
diff --git a/web/splash/img/dark-4x.png b/web/splash/img/dark-4x.png
index 2b2fbca..5194e23 100644
Binary files a/web/splash/img/dark-4x.png and b/web/splash/img/dark-4x.png differ
diff --git a/web/splash/img/light-1x.png b/web/splash/img/light-1x.png
index e44e119..791e426 100644
Binary files a/web/splash/img/light-1x.png and b/web/splash/img/light-1x.png differ
diff --git a/web/splash/img/light-2x.png b/web/splash/img/light-2x.png
index 1a318c4..bc1eb02 100644
Binary files a/web/splash/img/light-2x.png and b/web/splash/img/light-2x.png differ
diff --git a/web/splash/img/light-3x.png b/web/splash/img/light-3x.png
index 757ba67..fdecce3 100644
Binary files a/web/splash/img/light-3x.png and b/web/splash/img/light-3x.png differ
diff --git a/web/splash/img/light-4x.png b/web/splash/img/light-4x.png
index 2b2fbca..5194e23 100644
Binary files a/web/splash/img/light-4x.png and b/web/splash/img/light-4x.png differ
diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
index 4cf7fc5..ec7d4e3 100644
--- a/windows/flutter/generated_plugin_registrant.cc
+++ b/windows/flutter/generated_plugin_registrant.cc
@@ -8,6 +8,7 @@
 
 #include <firebase_auth/firebase_auth_plugin_c_api.h>
 #include <firebase_core/firebase_core_plugin_c_api.h>
+#include <permission_handler_windows/permission_handler_windows_plugin.h>
 #include <screen_retriever_windows/screen_retriever_windows_plugin_c_api.h>
 #include <share_plus/share_plus_windows_plugin_c_api.h>
 #include <url_launcher_windows/url_launcher_windows.h>
@@ -18,6 +19,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("FirebaseAuthPluginCApi"));
   FirebaseCorePluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("FirebaseCorePluginCApi"));
+  PermissionHandlerWindowsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin"));
   ScreenRetrieverWindowsPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("ScreenRetrieverWindowsPluginCApi"));
   SharePlusWindowsPluginCApiRegisterWithRegistrar(
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
index 35b84a1..e478ce5 100644
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@@ -5,6 +5,7 @@
 list(APPEND FLUTTER_PLUGIN_LIST
   firebase_auth
   firebase_core
+  permission_handler_windows
   screen_retriever_windows
   share_plus
   url_launcher_windows
@@ -12,6 +13,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST
+  flutter_local_notifications_windows
 )
 
 set(PLUGIN_BUNDLED_LIBRARIES)
diff --git a/windows/runner/resources/app_icon.ico b/windows/runner/resources/app_icon.ico
index 5ac4c69..2a33f37 100644
Binary files a/windows/runner/resources/app_icon.ico and b/windows/runner/resources/app_icon.ico differ