diff --git a/.metadata b/.metadata
index d5fce604..2d1be89a 100644
--- a/.metadata
+++ b/.metadata
@@ -4,7 +4,42 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: 4cceeaa075d412ae0b56cbf0b7032c2754129c8c
-  channel: master
+  revision: "2663184aa79047d0a33a14a3b607954f8fdd8730"
+  channel: "stable"
 
 project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+      base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+    - platform: android
+      create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+      base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+    - platform: ios
+      create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+      base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+    - platform: linux
+      create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+      base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+    - platform: macos
+      create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+      base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+    - platform: web
+      create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+      base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+    - platform: windows
+      create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+      base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'
diff --git a/android/.gitignore b/android/.gitignore
old mode 100755
new mode 100644
index 6f568019..55afd919
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -7,7 +7,7 @@ gradle-wrapper.jar
 GeneratedPluginRegistrant.java
 
 # Remember to never publicly share your keystore.
-# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+# See https://flutter.dev/to/reference-keystore
 key.properties
 **/*.keystore
 **/*.jks
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 8537d176..00a13266 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -1,32 +1,11 @@
 plugins {
     id "com.android.application"
+    // START: FlutterFire Configuration
+   id 'com.google.gms.google-services'
+    // END: FlutterFire Configuration
     id "kotlin-android"
     // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
     id "dev.flutter.flutter-gradle-plugin"
-    id "com.google.firebase.crashlytics"
-}
-
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        localProperties.load(reader)
-    }
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
-}
-
-def flutterMinSdkVersion = localProperties.getProperty('flutter.minSdkVersion')
-if (flutterMinSdkVersion == null) {
-    flutterMinSdkVersion = 30
 }
 
 def keystoreProperties = new Properties()
@@ -35,62 +14,67 @@ if (keystorePropertiesFile.exists()) {
     keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 }
 
-
-apply plugin: 'com.google.gms.google-services'
-
 android {
-    namespace "com.caelitechnologies.rotary_nl_rye"
-    compileSdkVersion flutter.compileSdkVersion
-    ndkVersion flutter.ndkVersion
+    namespace = "com.caelitechnologies.rotary_nl_rye"
+    compileSdk = flutter.compileSdkVersion
+    // ndkVersion = flutter.ndkVersion
+    ndkVersion = "26.1.10909125"
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+            // Enable core library desugaring
+        coreLibraryDesugaringEnabled true
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8
     }
 
     defaultConfig {
-        applicationId "com.caelitechnologies.rotary_nl_rye"
-        minSdkVersion flutterMinSdkVersion
-        targetSdkVersion flutter.targetSdkVersion
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
+        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+        applicationId = "com.caelitechnologies.rotary_nl_rye"
+        // You can update the following values to match your application needs.
+        // For more information, see: https://flutter.dev/to/review-gradle-config.
+        minSdk = 26
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
+        multiDexEnabled true
     }
 
     signingConfigs {
-       release {
-           keyAlias keystoreProperties['keyAlias']
-           keyPassword keystoreProperties['keyPassword']
-           storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
-           storePassword keystoreProperties['storePassword']
-       }
-   }
+        release {
+            keyAlias = keystoreProperties['keyAlias']
+            keyPassword = keystoreProperties['keyPassword']
+            storeFile = keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+            storePassword = keystoreProperties['storePassword']
+        }
+    }
 
     buildTypes {
-        debug{ 
-            signingConfig signingConfigs.debug
+        release {
+            minifyEnabled false
+            shrinkResources false
+            signingConfig signingConfigs.release
+            ndk {
+                debugSymbolLevel 'FULL' // Include full debug symbols
+            }
         }
-        profile {
+       debug {
             signingConfig signingConfigs.debug
         }
-       release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-           signingConfig signingConfigs.release
-           // signingConfig signingConfigs.debug
-           minifyEnabled false
-           shrinkResources false
-            firebaseCrashlytics {
-                mappingFileUploadEnabled false
-            }
-    }
     }
 }
 
 flutter {
-    source '../..'
+    source = "../.."
 }
 
 dependencies {
-    implementation "androidx.multidex:multidex:2.0.1"
-    implementation 'com.google.android.play:integrity:1.4.0'
+    // Your other dependencies...
+
+    implementation(platform("com.google.firebase:firebase-bom:33.3.0"))
+    // Add core library desugaring dependency
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.2'
 }
\ No newline at end of file
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index 92dc5d97..399f6981 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -1,6 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.caelitechnologies.rotary_nl_rye">
-    <!-- Flutter needs it to communicate with the running application
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 44e059a0..7e915089 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,111 +1,61 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.caelitechnologies.rotary_nl_rye">
-    <uses-permission
-        android:name="android.permission.INTERNET"/>
-           <uses-permission android:name="android.permission.WAKE_LOCK" />
-   <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+
     <queries>
         <!-- If your app opens https URLs -->
         <intent>
-            <action
-                android:name="android.intent.action.VIEW"/>
-            <data
-                android:scheme="https"/>
+            <action android:name="android.intent.action.VIEW"/>
+            <data android:scheme="https"/>
         </intent>
         <!-- If your app makes calls -->
         <intent>
-            <action
-                android:name="android.intent.action.DIAL"/>
-            <data
-                android:scheme="tel"/>
+            <action android:name="android.intent.action.DIAL"/>
+            <data android:scheme="tel"/>
         </intent>
         <!-- If your app emails -->
         <intent>
-            <action
-                android:name="android.intent.action.SEND"/>
-            <data
-                android:mimeType="*/*"/>
+            <action android:name="android.intent.action.SEND"/>
+            <data android:mimeType="*/*"/>
         </intent>
         <!-- If your app checks for SMS support -->
         <intent>
-            <action
-                android:name="android.intent.action.VIEW"/>
-            <data
-                android:scheme="sms"/>
+            <action android:name="android.intent.action.VIEW"/>
+            <data android:scheme="sms"/>
         </intent>
         <!-- If your app checks for call support -->
         <intent>
-            <action
-                android:name="android.intent.action.VIEW"/>
-            <data
-                android:scheme="tel"/>
+            <action android:name="android.intent.action.VIEW"/>
+            <data android:scheme="tel"/>
         </intent>
     </queries>
-    <application
-        android:label="Rotary Youth Exchange NL"
-        android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
-        <!-- Add custom icon to the notifications -->
-        <meta-data
-            android:name="com.google.firebase.messaging.default_notification_icon"
-            android:resource="@drawable/ic_stat_rotary_logo_icon"/>
-        <!-- Change the color of the icon -->
-        <meta-data
-            android:name="com.google.firebase.messaging.default_notification_color"
-            android:resource="@color/colorPrimary"/>
-        <activity
-            android:name=".MainActivity"
-            android:exported="true"
-            android:launchMode="singleTop"
-            android:theme="@style/LaunchTheme"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize">
+
+    <application android:label="Rotary Youth Exchange NL" android:name="${applicationName}" android:icon="@mipmap/ic_launcher">
+        <activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:taskAffinity="" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
                  to determine the Window background behind the Flutter UI. -->
-            <meta-data
-                android:name="io.flutter.embedding.android.NormalTheme"
-                android:resource="@style/NormalTheme"/>
-            <!-- Displays an Android View that continues showing the launch screen
-                 Drawable until Flutter paints its first frame, then this splash
-                 screen fades out. A splash screen is useful to avoid any visual
-                 gap between the end of Android's launch screen and the painting of
-                 Flutter's first frame. -->
-            <meta-data
-                android:name="io.flutter.embedding.android.SplashScreenDrawable"
-                android:resource="@drawable/launch_background"/>
+            <meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
-            <intent-filter>
-                <action
-                    android:name="FLUTTER_NOTIFICATION_CLICK"/>
-                <category
-                    android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
-            <intent-filter>
-                <action
-                    android:name="android.intent.action.VIEW"/>
-                <category
-                    android:name="android.intent.category.DEFAULT"/>
-                <category
-                    android:name="android.intent.category.BROWSABLE"/>
-                <!-- Accepts URIs that begin with YOUR_SCHEME://YOUR_HOST -->
-                <data
-                    android:scheme="https"
-                    android:host="rotarynl.page.link"/>
-            </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
-        <meta-data
-            android:name="flutterEmbedding"
-            android:value="2"/>
-        <meta-data
-            android:name="com.google.firebase.messaging.default_notification_channel_id"
-            android:value="high_importance_channel"/>
+        <meta-data android:name="flutterEmbedding" android:value="2" />
     </application>
-</manifest>
\ No newline at end of file
+    <!-- Required to query activities that can process text, see:
+         https://developer.android.com/training/package-visibility and
+         https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
+
+         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.PROCESS_TEXT"/>
+            <data android:mimeType="text/plain"/>
+        </intent>
+    </queries>
+</manifest>
diff --git a/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java b/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java
deleted file mode 100644
index 752fc185..00000000
--- a/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java
+++ /dev/null
@@ -1,25 +0,0 @@
-// Generated file.
-//
-// If you wish to remove Flutter's multidex support, delete this entire file.
-//
-// Modifications to this file should be done in a copy under a different name
-// as this file may be regenerated.
-
-package io.flutter.app;
-
-import android.app.Application;
-import android.content.Context;
-import androidx.annotation.CallSuper;
-import androidx.multidex.MultiDex;
-
-/**
- * Extension of {@link android.app.Application}, adding multidex support.
- */
-public class FlutterMultiDexApplication extends Application {
-  @Override
-  @CallSuper
-  protected void attachBaseContext(Context base) {
-    super.attachBaseContext(base);
-    MultiDex.install(this);
-  }
-}
diff --git a/android/app/src/main/kotlin/com/example/rotary_nl_rye/MainActivity.kt b/android/app/src/main/kotlin/com/caelitechnologies/rotary_nl_rye/MainActivity.kt
similarity index 70%
rename from android/app/src/main/kotlin/com/example/rotary_nl_rye/MainActivity.kt
rename to android/app/src/main/kotlin/com/caelitechnologies/rotary_nl_rye/MainActivity.kt
index c18e43b5..c82a8fe0 100644
--- a/android/app/src/main/kotlin/com/example/rotary_nl_rye/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/caelitechnologies/rotary_nl_rye/MainActivity.kt
@@ -2,5 +2,4 @@ package com.caelitechnologies.rotary_nl_rye
 
 import io.flutter.embedding.android.FlutterActivity
 
-class MainActivity: FlutterActivity() {
-}
+class MainActivity: FlutterActivity()
diff --git a/android/app/src/main/kotlin/com/example/rotary_nl_rye/Application.kt b/android/app/src/main/kotlin/com/example/rotary_nl_rye/Application.kt
deleted file mode 100644
index 4dda7a70..00000000
--- a/android/app/src/main/kotlin/com/example/rotary_nl_rye/Application.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.caelitechnologies.rotary_nl_rye
-import io.flutter.app.FlutterApplication
-import io.flutter.plugin.common.PluginRegistry
-import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback
-import io.flutter.view.FlutterMain
-// import io.flutter.plugins.firebase.messaging.FlutterFirebaseMessagingBackgroundService;
-
-class Application : FlutterApplication() {
-
-    override fun onCreate() {
-        super.onCreate()
-       // FlutterFirebaseMessagingBackgroundService.setPluginRegistrant(this);
-        FlutterMain.startInitialization(this)
-    }
-}
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable-anydpi/home.xml b/android/app/src/main/res/drawable-anydpi/home.xml
deleted file mode 100644
index cd6cfd6a..00000000
--- a/android/app/src/main/res/drawable-anydpi/home.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#333333"
-    android:alpha="0.6">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
-</vector>
diff --git a/android/app/src/main/res/drawable-hdpi/android12splash.png b/android/app/src/main/res/drawable-hdpi/android12splash.png
new file mode 100644
index 00000000..3456862f
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/home.png b/android/app/src/main/res/drawable-hdpi/home.png
deleted file mode 100644
index c6da75fe..00000000
Binary files a/android/app/src/main/res/drawable-hdpi/home.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-hdpi/ic_stat_rotary_logo_icon.png b/android/app/src/main/res/drawable-hdpi/ic_stat_rotary_logo_icon.png
deleted file mode 100644
index fbd222ef..00000000
Binary files a/android/app/src/main/res/drawable-hdpi/ic_stat_rotary_logo_icon.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-hdpi/splash.png b/android/app/src/main/res/drawable-hdpi/splash.png
index bfade777..42123ee1 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
new file mode 100644
index 00000000..a65f45b5
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/home.png b/android/app/src/main/res/drawable-mdpi/home.png
deleted file mode 100644
index cb1f92f1..00000000
Binary files a/android/app/src/main/res/drawable-mdpi/home.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-mdpi/ic_stat_rotary_logo_icon.png b/android/app/src/main/res/drawable-mdpi/ic_stat_rotary_logo_icon.png
deleted file mode 100644
index be076f04..00000000
Binary files a/android/app/src/main/res/drawable-mdpi/ic_stat_rotary_logo_icon.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-mdpi/splash.png b/android/app/src/main/res/drawable-mdpi/splash.png
index d2b56242..02c785a6 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
new file mode 100644
index 00000000..3456862f
Binary files /dev/null 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
new file mode 100644
index 00000000..a65f45b5
Binary files /dev/null and b/android/app/src/main/res/drawable-night-mdpi/android12splash.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
new file mode 100644
index 00000000..84a0af34
Binary files /dev/null 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
new file mode 100644
index 00000000..177c46c0
Binary files /dev/null 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
new file mode 100644
index 00000000..d4c0956a
Binary files /dev/null and b/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml
old mode 100755
new mode 100644
diff --git a/android/app/src/main/res/drawable-xhdpi/android12splash.png b/android/app/src/main/res/drawable-xhdpi/android12splash.png
new file mode 100644
index 00000000..84a0af34
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/home.png b/android/app/src/main/res/drawable-xhdpi/home.png
deleted file mode 100644
index f6c17d5f..00000000
Binary files a/android/app/src/main/res/drawable-xhdpi/home.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-xhdpi/ic_stat_rotary_logo_icon.png b/android/app/src/main/res/drawable-xhdpi/ic_stat_rotary_logo_icon.png
deleted file mode 100644
index 33b42205..00000000
Binary files a/android/app/src/main/res/drawable-xhdpi/ic_stat_rotary_logo_icon.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-xhdpi/splash.png b/android/app/src/main/res/drawable-xhdpi/splash.png
index 63234f5f..acde70d1 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
new file mode 100644
index 00000000..177c46c0
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/home.png b/android/app/src/main/res/drawable-xxhdpi/home.png
deleted file mode 100644
index 40d14fb8..00000000
Binary files a/android/app/src/main/res/drawable-xxhdpi/home.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_stat_rotary_logo_icon.png b/android/app/src/main/res/drawable-xxhdpi/ic_stat_rotary_logo_icon.png
deleted file mode 100644
index 1fd462c2..00000000
Binary files a/android/app/src/main/res/drawable-xxhdpi/ic_stat_rotary_logo_icon.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/splash.png b/android/app/src/main/res/drawable-xxhdpi/splash.png
index 95ad1fa8..a0df5237 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
new file mode 100644
index 00000000..d4c0956a
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_stat_rotary_logo_icon.png b/android/app/src/main/res/drawable-xxxhdpi/ic_stat_rotary_logo_icon.png
deleted file mode 100644
index e55c2afe..00000000
Binary files a/android/app/src/main/res/drawable-xxxhdpi/ic_stat_rotary_logo_icon.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml
old mode 100755
new mode 100644
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
old mode 100755
new mode 100644
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
old mode 100755
new mode 100644
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
old mode 100755
new mode 100644
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
old mode 100755
new mode 100644
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
old mode 100755
new mode 100644
diff --git a/android/app/src/main/res/values-night-v31/styles.xml b/android/app/src/main/res/values-night-v31/styles.xml
index a3653cb1..4a30431c 100644
--- a/android/app/src/main/res/values-night-v31/styles.xml
+++ b/android/app/src/main/res/values-night-v31/styles.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
         <item name="android:windowDrawsSystemBarBackgrounds">false</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:windowSplashScreenBackground">#042a49</item>
+        <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
+        <item name="android:windowSplashScreenIconBackgroundColor">#042a49</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
old mode 100755
new mode 100644
index 7b20e158..dbc9ea9f
--- a/android/app/src/main/res/values-night/styles.xml
+++ b/android/app/src/main/res/values-night/styles.xml
@@ -3,7 +3,7 @@
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
+             the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
         <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
@@ -14,7 +14,7 @@
          This theme determines the color of the Android Window while your
          Flutter UI initializes, as well as behind your Flutter UI while its
          running.
-         
+
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
diff --git a/android/app/src/main/res/values-v31/styles.xml b/android/app/src/main/res/values-v31/styles.xml
index d0a68e92..7a86a34b 100644
--- a/android/app/src/main/res/values-v31/styles.xml
+++ b/android/app/src/main/res/values-v31/styles.xml
@@ -6,6 +6,9 @@
         <item name="android:windowFullscreen">false</item>
         <item name="android:windowDrawsSystemBarBackgrounds">false</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:windowSplashScreenBackground">#42a5f5</item>
+        <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
+        <item name="android:windowSplashScreenIconBackgroundColor">#42a5f5</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
old mode 100755
new mode 100644
index 85351167..0d1fa8fc
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#f7a81b</color>
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
+             the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
         <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
@@ -15,7 +14,7 @@
          This theme determines the color of the Android Window while your
          Flutter UI initializes, as well as behind your Flutter UI while its
          running.
-         
+
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
index 92dc5d97..399f6981 100644
--- a/android/app/src/profile/AndroidManifest.xml
+++ b/android/app/src/profile/AndroidManifest.xml
@@ -1,6 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.caelitechnologies.rotary_nl_rye">
-    <!-- Flutter needs it to communicate with the running application
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>
diff --git a/android/build.gradle b/android/build.gradle
old mode 100755
new mode 100644
diff --git a/android/gradle.properties b/android/gradle.properties
index 3b5b324f..f9d349c7 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,3 +1,5 @@
-org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index a48a0b30..3c85cfe0 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sun Jun 23 15:39:52 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
old mode 100755
new mode 100644
index 8190b0f0..b63654eb
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -18,9 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.1.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
-    id "com.google.firebase.crashlytics" version "3.0.2" apply false
+    id "com.android.application" version '8.6.1' apply false
+    id "org.jetbrains.kotlin.android" version "1.9.0" apply false
     id "com.google.gms.google-services" version "4.4.2" apply false
 }
 
diff --git a/icon/icon.png b/assets/icons/icon.png
similarity index 100%
rename from icon/icon.png
rename to assets/icons/icon.png
diff --git a/assets/image/Class_of_2024-2025_outbunds.jpg b/assets/image/Class_of_2024-2025_outbunds.jpg
new file mode 100644
index 00000000..ca41f6c0
Binary files /dev/null and b/assets/image/Class_of_2024-2025_outbunds.jpg differ
diff --git a/assets/image/RPFYA.png b/assets/image/RPFYA.png
new file mode 100644
index 00000000..661dd384
Binary files /dev/null and b/assets/image/RPFYA.png differ
diff --git a/assets/image/b70db74b-aebe-470d-8c47-306640be9a00.jpg b/assets/image/b70db74b-aebe-470d-8c47-306640be9a00.jpg
deleted file mode 100644
index 3811d3ec..00000000
Binary files a/assets/image/b70db74b-aebe-470d-8c47-306640be9a00.jpg and /dev/null differ
diff --git a/assets/image/classOff22.jpeg b/assets/image/classOff22.jpeg
deleted file mode 100644
index 93844b10..00000000
Binary files a/assets/image/classOff22.jpeg and /dev/null differ
diff --git a/assets/image/homepage/Aankomst_inbounds_aug24.png b/assets/image/homepage/Aankomst_inbounds_aug24.png
new file mode 100644
index 00000000..bf3dfa2a
Binary files /dev/null and b/assets/image/homepage/Aankomst_inbounds_aug24.png differ
diff --git a/assets/image/homepage/Farewell_Inbounds_2023-2024_mei_2024.jpg b/assets/image/homepage/Farewell_Inbounds_2023-2024_mei_2024.jpg
deleted file mode 100644
index 34a06c69..00000000
Binary files a/assets/image/homepage/Farewell_Inbounds_2023-2024_mei_2024.jpg and /dev/null differ
diff --git a/assets/image/homepage/Inbounds_Bezoek_Beurs_van_Berlage.jpg b/assets/image/homepage/Inbounds_Bezoek_Beurs_van_Berlage.jpg
deleted file mode 100644
index 5d7ac822..00000000
Binary files a/assets/image/homepage/Inbounds_Bezoek_Beurs_van_Berlage.jpg and /dev/null differ
diff --git a/assets/image/homepage/Inboundweekend_sept24.png b/assets/image/homepage/Inboundweekend_sept24.png
new file mode 100644
index 00000000..f267a7ce
Binary files /dev/null and b/assets/image/homepage/Inboundweekend_sept24.png differ
diff --git a/assets/image/homepage/Informatiedag_14_september_2024.jpg b/assets/image/homepage/Informatiedag_14_september_2024.jpg
deleted file mode 100644
index cfd44385..00000000
Binary files a/assets/image/homepage/Informatiedag_14_september_2024.jpg and /dev/null differ
diff --git a/assets/image/homepage/Nederland_herdenkt-inbounds_4_mei_2024.png b/assets/image/homepage/Nederland_herdenkt-inbounds_4_mei_2024.png
deleted file mode 100644
index a229f862..00000000
Binary files a/assets/image/homepage/Nederland_herdenkt-inbounds_4_mei_2024.png and /dev/null differ
diff --git a/assets/image/homepage/Rebounddag_2024_Laren.png b/assets/image/homepage/Rebounddag_2024_Laren.png
new file mode 100644
index 00000000..f64a1170
Binary files /dev/null and b/assets/image/homepage/Rebounddag_2024_Laren.png differ
diff --git a/assets/image/homepage/Koningsdag_Emmen_27_april_2024.png b/assets/image/homepage/Rotex24-25.png
similarity index 51%
rename from assets/image/homepage/Koningsdag_Emmen_27_april_2024.png
rename to assets/image/homepage/Rotex24-25.png
index 7124ff93..7a05f668 100644
Binary files a/assets/image/homepage/Koningsdag_Emmen_27_april_2024.png and b/assets/image/homepage/Rotex24-25.png differ
diff --git a/assets/image/homepage/Testimonial_Schouwen-Duiveland.png b/assets/image/homepage/Testimonial_Schouwen-Duiveland.png
deleted file mode 100644
index 6d1ec390..00000000
Binary files a/assets/image/homepage/Testimonial_Schouwen-Duiveland.png and /dev/null differ
diff --git a/assets/website files/news.json b/assets/website files/news.json
index cad6dcff..e9712f7d 100644
--- a/assets/website files/news.json	
+++ b/assets/website files/news.json	
@@ -1,5 +1,29 @@
 {
     "news": [
+        {
+            "id": 12,
+            "images": "https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/news/nieuwsbrief-voorjaar-2024-def.png",
+            "pdf": "https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/news/koningsdag-emmen-apr24.pdf",
+            "title": "Koningsdag Emmen",
+            "description": "",
+            "isPdf": "yes"
+        },
+        {
+            "id": 11,
+            "images": "https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/news/nieuwsbrief-voorjaar-2024-def.png",
+            "pdf": "https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/news/testimonial-rc-schouwen-duiveland-maart-2024.pdf",
+            "title": "Testimonial RC Schouwen-Duiveland",
+            "description": "",
+            "isPdf": "yes"
+        },
+        {
+            "id": 10,
+            "images": "https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/news/nieuwsbrief-voorjaar-2024-def.png",
+            "pdf": "https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/news/nieuwsbrief-voorjaar-2024-def.pdf",
+            "title": "Nieuwsbrief Voorjaar 2024",
+            "description": "",
+            "isPdf": "yes"
+        },
         {
             "id": 9,
             "images": "https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/news/nieuwsbrief-najaar-2023.png",
diff --git a/flutter_launcher_icons.yaml b/flutter_launcher_icons.yaml
new file mode 100644
index 00000000..5461c026
--- /dev/null
+++ b/flutter_launcher_icons.yaml
@@ -0,0 +1,32 @@
+# flutter pub run flutter_launcher_icons
+flutter_launcher_icons:
+  image_path: assets/icons/icon.png
+
+  android: "ic_launcher"
+  image_path_android: "assets/icons/icon.png"
+  min_sdk_android: 21 # android min sdk min:16, default 21
+  # adaptive_icon_background: "assets/icon/background.png"
+  # adaptive_icon_foreground: "assets/icon/foreground.png"
+  # adaptive_icon_monochrome: "assets/icon/monochrome.png"
+
+  ios: true
+  # image_path_ios: "assets/icon/icon.png"
+  remove_alpha_channel_ios: true
+  # image_path_ios_dark_transparent: "assets/icon/icon_dark.png"
+  # image_path_ios_tinted_grayscale: "assets/icon/icon_tinted.png"
+  # desaturate_tinted_to_grayscale_ios: true
+
+  web:
+    generate: false
+    image_path: assets/icons/icon.png
+    background_color: "#42a5f5"
+    theme_color: "#42a5f5"
+
+  windows:
+    generate: false
+    image_path: assets/icons/icon.png
+    icon_size: 48 # min:48, max:256, default: 48
+
+  macos:
+    generate: false
+    image_path: assets/icons/icon.png
diff --git a/flutter_native_splash.yaml b/flutter_native_splash.yaml
index 128d5ae3..42e57f21 100644
--- a/flutter_native_splash.yaml
+++ b/flutter_native_splash.yaml
@@ -50,13 +50,13 @@ flutter_native_splash:
     # 640 pixels in diameter.
     # App icon without an icon background: This should be 1152×1152 pixels, and fit within a circle
     # 768 pixels in diameter.
-    #image: assets/android12splash.png
+    image: assets/icons/icon.png
 
     # Splash screen background color.
     #color: "#42a5f5"
 
     # App icon background color.
-    #icon_background_color: "#111111"
+    icon_background_color: "#42a5f5"
 
     # The branding property allows you to specify an image used as branding in the splash screen.
     #branding: assets/dart.png
@@ -66,12 +66,11 @@ flutter_native_splash:
     # parameters from above.
     #image_dark: assets/android12splash-invert.png
     #color_dark: "#042a49"
-    #icon_background_color_dark: "#eeeeee"
+    icon_background_color_dark: "#042a49"
 
   # The android, ios and web parameters can be used to disable generating a splash screen on a given
   # platform.
   android: true
-  ios: true
   web: false
 
   # Platform specific images can be specified with the following parameters, which will override
@@ -100,7 +99,7 @@ flutter_native_splash:
   # https://developer.android.com/reference/android/view/Gravity): bottom, center,
   # center_horizontal, center_vertical, clip_horizontal, clip_vertical, end, fill, fill_horizontal,
   # fill_vertical, left, right, start, or top.
-  android_gravity: center
+  # android_gravity: center
   #
   # ios_content_mode can be one of the following iOS UIView.ContentMode (see
   # https://developer.apple.com/documentation/uikit/uiview/contentmode): scaleToFill,
diff --git a/ios/.gitignore b/ios/.gitignore
old mode 100755
new mode 100644
index c7a9213b..7a7f9873
--- a/ios/.gitignore
+++ b/ios/.gitignore
@@ -1,3 +1,4 @@
+**/dgph
 *.mode1v3
 *.mode2v3
 *.moved-aside
@@ -14,7 +15,6 @@ Icon?
 profile
 xcuserdata
 **/.generated/
-/build/
 Flutter/App.framework
 Flutter/Flutter.framework
 Flutter/Flutter.podspec
diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
old mode 100755
new mode 100644
diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig
old mode 100755
new mode 100644
diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig
old mode 100755
new mode 100644
diff --git a/ios/Podfile b/ios/Podfile
index 2d122814..e51a31d9 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, '13.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -29,37 +29,16 @@ flutter_ios_podfile_setup
 
 target 'Runner' do
   use_frameworks!
-  # pod 'Firebase/Analytics'
-  # pod 'Firebase/Firestore'
-  # pod 'Firebase/Auth'
-  # pod 'Firebase/Messaging'
-  # pod 'Firebase/Crashlytics'
-  # pod 'Firebase/DynamicLinks'
-  # pod 'Firebase/RemoteConfig'
-
   use_modular_headers!
 
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
+  target 'RunnerTests' do
+    inherit! :search_paths
+  end
 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['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
-    end
   end
 end
-
-
-# post_install do |installer|
-#   installer.pods_project.targets.each do |target|
-#       target.build_configurations.each do |config|
-#       xcconfig_path = config.base_configuration_reference.real_path
-#       xcconfig = File.read(xcconfig_path)
-#       xcconfig_mod = xcconfig.gsub(/DT_TOOLCHAIN_DIR/, "TOOLCHAIN_DIR")
-#       File.open(xcconfig_path, "w") { |file| file << xcconfig_mod }
-#       end
-#   end
-# end
\ No newline at end of file
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index c09eba7e..4f55e8c4 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1,1277 +1,116 @@
 PODS:
-  - abseil/algorithm (1.20240116.2):
-    - abseil/algorithm/algorithm (= 1.20240116.2)
-    - abseil/algorithm/container (= 1.20240116.2)
-  - abseil/algorithm/algorithm (1.20240116.2):
-    - abseil/base/config
-    - abseil/xcprivacy
-  - abseil/algorithm/container (1.20240116.2):
-    - abseil/algorithm/algorithm
-    - abseil/base/core_headers
-    - abseil/base/nullability
-    - abseil/meta/type_traits
-    - abseil/xcprivacy
-  - abseil/base (1.20240116.2):
-    - abseil/base/atomic_hook (= 1.20240116.2)
-    - abseil/base/base (= 1.20240116.2)
-    - abseil/base/base_internal (= 1.20240116.2)
-    - abseil/base/config (= 1.20240116.2)
-    - abseil/base/core_headers (= 1.20240116.2)
-    - abseil/base/cycleclock_internal (= 1.20240116.2)
-    - abseil/base/dynamic_annotations (= 1.20240116.2)
-    - abseil/base/endian (= 1.20240116.2)
-    - abseil/base/errno_saver (= 1.20240116.2)
-    - abseil/base/fast_type_id (= 1.20240116.2)
-    - abseil/base/log_severity (= 1.20240116.2)
-    - abseil/base/malloc_internal (= 1.20240116.2)
-    - abseil/base/no_destructor (= 1.20240116.2)
-    - abseil/base/nullability (= 1.20240116.2)
-    - abseil/base/prefetch (= 1.20240116.2)
-    - abseil/base/pretty_function (= 1.20240116.2)
-    - abseil/base/raw_logging_internal (= 1.20240116.2)
-    - abseil/base/spinlock_wait (= 1.20240116.2)
-    - abseil/base/strerror (= 1.20240116.2)
-    - abseil/base/throw_delegate (= 1.20240116.2)
-  - abseil/base/atomic_hook (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/xcprivacy
-  - abseil/base/base (1.20240116.2):
-    - abseil/base/atomic_hook
-    - abseil/base/base_internal
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/cycleclock_internal
-    - abseil/base/dynamic_annotations
-    - abseil/base/log_severity
-    - abseil/base/nullability
-    - abseil/base/raw_logging_internal
-    - abseil/base/spinlock_wait
-    - abseil/meta/type_traits
-    - abseil/xcprivacy
-  - abseil/base/base_internal (1.20240116.2):
-    - abseil/base/config
-    - abseil/meta/type_traits
-    - abseil/xcprivacy
-  - abseil/base/config (1.20240116.2):
-    - abseil/xcprivacy
-  - abseil/base/core_headers (1.20240116.2):
-    - abseil/base/config
-    - abseil/xcprivacy
-  - abseil/base/cycleclock_internal (1.20240116.2):
-    - abseil/base/base_internal
-    - abseil/base/config
-    - abseil/xcprivacy
-  - abseil/base/dynamic_annotations (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/xcprivacy
-  - abseil/base/endian (1.20240116.2):
-    - abseil/base/base
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/nullability
-    - abseil/xcprivacy
-  - abseil/base/errno_saver (1.20240116.2):
-    - abseil/base/config
-    - abseil/xcprivacy
-  - abseil/base/fast_type_id (1.20240116.2):
-    - abseil/base/config
-    - abseil/xcprivacy
-  - abseil/base/log_severity (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/xcprivacy
-  - abseil/base/malloc_internal (1.20240116.2):
-    - abseil/base/base
-    - abseil/base/base_internal
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/dynamic_annotations
-    - abseil/base/raw_logging_internal
-    - abseil/xcprivacy
-  - abseil/base/no_destructor (1.20240116.2):
-    - abseil/base/config
-    - abseil/xcprivacy
-  - abseil/base/nullability (1.20240116.2):
-    - abseil/base/core_headers
-    - abseil/meta/type_traits
-    - abseil/xcprivacy
-  - abseil/base/prefetch (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/xcprivacy
-  - abseil/base/pretty_function (1.20240116.2):
-    - abseil/xcprivacy
-  - abseil/base/raw_logging_internal (1.20240116.2):
-    - abseil/base/atomic_hook
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/errno_saver
-    - abseil/base/log_severity
-    - abseil/xcprivacy
-  - abseil/base/spinlock_wait (1.20240116.2):
-    - abseil/base/base_internal
-    - abseil/base/core_headers
-    - abseil/base/errno_saver
-    - abseil/xcprivacy
-  - abseil/base/strerror (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/errno_saver
-    - abseil/xcprivacy
-  - abseil/base/throw_delegate (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/raw_logging_internal
-    - abseil/xcprivacy
-  - abseil/cleanup/cleanup (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/cleanup/cleanup_internal
-    - abseil/xcprivacy
-  - abseil/cleanup/cleanup_internal (1.20240116.2):
-    - abseil/base/base_internal
-    - abseil/base/core_headers
-    - abseil/utility/utility
-    - abseil/xcprivacy
-  - abseil/container/common (1.20240116.2):
-    - abseil/meta/type_traits
-    - abseil/types/optional
-    - abseil/xcprivacy
-  - abseil/container/common_policy_traits (1.20240116.2):
-    - abseil/meta/type_traits
-    - abseil/xcprivacy
-  - abseil/container/compressed_tuple (1.20240116.2):
-    - abseil/utility/utility
-    - abseil/xcprivacy
-  - abseil/container/container_memory (1.20240116.2):
-    - abseil/base/config
-    - abseil/memory/memory
-    - abseil/meta/type_traits
-    - abseil/utility/utility
-    - abseil/xcprivacy
-  - abseil/container/fixed_array (1.20240116.2):
-    - abseil/algorithm/algorithm
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/dynamic_annotations
-    - abseil/base/throw_delegate
-    - abseil/container/compressed_tuple
-    - abseil/memory/memory
-    - abseil/xcprivacy
-  - abseil/container/flat_hash_map (1.20240116.2):
-    - abseil/algorithm/container
-    - abseil/base/core_headers
-    - abseil/container/container_memory
-    - abseil/container/hash_function_defaults
-    - abseil/container/raw_hash_map
-    - abseil/memory/memory
-    - abseil/xcprivacy
-  - abseil/container/flat_hash_set (1.20240116.2):
-    - abseil/algorithm/container
-    - abseil/base/core_headers
-    - abseil/container/container_memory
-    - abseil/container/hash_function_defaults
-    - abseil/container/raw_hash_set
-    - abseil/memory/memory
-    - abseil/xcprivacy
-  - abseil/container/hash_function_defaults (1.20240116.2):
-    - abseil/base/config
-    - abseil/hash/hash
-    - abseil/strings/cord
-    - abseil/strings/strings
-    - abseil/xcprivacy
-  - abseil/container/hash_policy_traits (1.20240116.2):
-    - abseil/container/common_policy_traits
-    - abseil/meta/type_traits
-    - abseil/xcprivacy
-  - abseil/container/hashtable_debug_hooks (1.20240116.2):
-    - abseil/base/config
-    - abseil/xcprivacy
-  - abseil/container/hashtablez_sampler (1.20240116.2):
-    - abseil/base/base
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/raw_logging_internal
-    - abseil/debugging/stacktrace
-    - abseil/memory/memory
-    - abseil/profiling/exponential_biased
-    - abseil/profiling/sample_recorder
-    - abseil/synchronization/synchronization
-    - abseil/time/time
-    - abseil/utility/utility
-    - abseil/xcprivacy
-  - abseil/container/inlined_vector (1.20240116.2):
-    - abseil/algorithm/algorithm
-    - abseil/base/core_headers
-    - abseil/base/throw_delegate
-    - abseil/container/inlined_vector_internal
-    - abseil/memory/memory
-    - abseil/meta/type_traits
-    - abseil/xcprivacy
-  - abseil/container/inlined_vector_internal (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/container/compressed_tuple
-    - abseil/memory/memory
-    - abseil/meta/type_traits
-    - abseil/types/span
-    - abseil/xcprivacy
-  - abseil/container/layout (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/debugging/demangle_internal
-    - abseil/meta/type_traits
-    - abseil/strings/strings
-    - abseil/types/span
-    - abseil/utility/utility
-    - abseil/xcprivacy
-  - abseil/container/raw_hash_map (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/throw_delegate
-    - abseil/container/container_memory
-    - abseil/container/raw_hash_set
-    - abseil/xcprivacy
-  - abseil/container/raw_hash_set (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/dynamic_annotations
-    - abseil/base/endian
-    - abseil/base/prefetch
-    - abseil/base/raw_logging_internal
-    - abseil/container/common
-    - abseil/container/compressed_tuple
-    - abseil/container/container_memory
-    - abseil/container/hash_policy_traits
-    - abseil/container/hashtable_debug_hooks
-    - abseil/container/hashtablez_sampler
-    - abseil/hash/hash
-    - abseil/memory/memory
-    - abseil/meta/type_traits
-    - abseil/numeric/bits
-    - abseil/utility/utility
-    - abseil/xcprivacy
-  - abseil/crc/cpu_detect (1.20240116.2):
-    - abseil/base/base
-    - abseil/base/config
-    - abseil/xcprivacy
-  - abseil/crc/crc32c (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/endian
-    - abseil/base/prefetch
-    - abseil/crc/cpu_detect
-    - abseil/crc/crc_internal
-    - abseil/crc/non_temporal_memcpy
-    - abseil/strings/str_format
-    - abseil/strings/strings
-    - abseil/xcprivacy
-  - abseil/crc/crc_cord_state (1.20240116.2):
-    - abseil/base/config
-    - abseil/crc/crc32c
-    - abseil/numeric/bits
-    - abseil/strings/strings
-    - abseil/xcprivacy
-  - abseil/crc/crc_internal (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/endian
-    - abseil/base/prefetch
-    - abseil/base/raw_logging_internal
-    - abseil/crc/cpu_detect
-    - abseil/memory/memory
-    - abseil/numeric/bits
-    - abseil/xcprivacy
-  - abseil/crc/non_temporal_arm_intrinsics (1.20240116.2):
-    - abseil/base/config
-    - abseil/xcprivacy
-  - abseil/crc/non_temporal_memcpy (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/crc/non_temporal_arm_intrinsics
-    - abseil/xcprivacy
-  - abseil/debugging/debugging_internal (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/dynamic_annotations
-    - abseil/base/errno_saver
-    - abseil/base/raw_logging_internal
-    - abseil/xcprivacy
-  - abseil/debugging/demangle_internal (1.20240116.2):
-    - abseil/base/base
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/xcprivacy
-  - abseil/debugging/stacktrace (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/dynamic_annotations
-    - abseil/base/raw_logging_internal
-    - abseil/debugging/debugging_internal
-    - abseil/xcprivacy
-  - abseil/debugging/symbolize (1.20240116.2):
-    - abseil/base/base
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/dynamic_annotations
-    - abseil/base/malloc_internal
-    - abseil/base/raw_logging_internal
-    - abseil/debugging/debugging_internal
-    - abseil/debugging/demangle_internal
-    - abseil/strings/strings
-    - abseil/xcprivacy
-  - abseil/flags/commandlineflag (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/fast_type_id
-    - abseil/flags/commandlineflag_internal
-    - abseil/strings/strings
-    - abseil/types/optional
-    - abseil/xcprivacy
-  - abseil/flags/commandlineflag_internal (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/fast_type_id
-    - abseil/xcprivacy
-  - abseil/flags/config (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/flags/path_util
-    - abseil/flags/program_name
-    - abseil/strings/strings
-    - abseil/synchronization/synchronization
-    - abseil/xcprivacy
-  - abseil/flags/flag (1.20240116.2):
-    - abseil/base/base
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/flags/config
-    - abseil/flags/flag_internal
-    - abseil/flags/reflection
-    - abseil/strings/strings
-    - abseil/xcprivacy
-  - abseil/flags/flag_internal (1.20240116.2):
-    - abseil/base/base
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/dynamic_annotations
-    - abseil/flags/commandlineflag
-    - abseil/flags/commandlineflag_internal
-    - abseil/flags/config
-    - abseil/flags/marshalling
-    - abseil/flags/reflection
-    - abseil/memory/memory
-    - abseil/meta/type_traits
-    - abseil/strings/strings
-    - abseil/synchronization/synchronization
-    - abseil/utility/utility
-    - abseil/xcprivacy
-  - abseil/flags/marshalling (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/log_severity
-    - abseil/numeric/int128
-    - abseil/strings/str_format
-    - abseil/strings/strings
-    - abseil/types/optional
-    - abseil/xcprivacy
-  - abseil/flags/path_util (1.20240116.2):
-    - abseil/base/config
-    - abseil/strings/strings
-    - abseil/xcprivacy
-  - abseil/flags/private_handle_accessor (1.20240116.2):
-    - abseil/base/config
-    - abseil/flags/commandlineflag
-    - abseil/flags/commandlineflag_internal
-    - abseil/strings/strings
-    - abseil/xcprivacy
-  - abseil/flags/program_name (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/flags/path_util
-    - abseil/strings/strings
-    - abseil/synchronization/synchronization
-    - abseil/xcprivacy
-  - abseil/flags/reflection (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/no_destructor
-    - abseil/container/flat_hash_map
-    - abseil/flags/commandlineflag
-    - abseil/flags/commandlineflag_internal
-    - abseil/flags/config
-    - abseil/flags/private_handle_accessor
-    - abseil/strings/strings
-    - abseil/synchronization/synchronization
-    - abseil/xcprivacy
-  - abseil/functional/any_invocable (1.20240116.2):
-    - abseil/base/base_internal
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/meta/type_traits
-    - abseil/utility/utility
-    - abseil/xcprivacy
-  - abseil/functional/bind_front (1.20240116.2):
-    - abseil/base/base_internal
-    - abseil/container/compressed_tuple
-    - abseil/meta/type_traits
-    - abseil/utility/utility
-    - abseil/xcprivacy
-  - abseil/functional/function_ref (1.20240116.2):
-    - abseil/base/base_internal
-    - abseil/base/core_headers
-    - abseil/functional/any_invocable
-    - abseil/meta/type_traits
-    - abseil/xcprivacy
-  - abseil/hash/city (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/endian
-    - abseil/xcprivacy
-  - abseil/hash/hash (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/endian
-    - abseil/container/fixed_array
-    - abseil/functional/function_ref
-    - abseil/hash/city
-    - abseil/hash/low_level_hash
-    - abseil/meta/type_traits
-    - abseil/numeric/bits
-    - abseil/numeric/int128
-    - abseil/strings/strings
-    - abseil/types/optional
-    - abseil/types/variant
-    - abseil/utility/utility
-    - abseil/xcprivacy
-  - abseil/hash/low_level_hash (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/endian
-    - abseil/base/prefetch
-    - abseil/numeric/int128
-    - abseil/xcprivacy
-  - abseil/memory (1.20240116.2):
-    - abseil/memory/memory (= 1.20240116.2)
-  - abseil/memory/memory (1.20240116.2):
-    - abseil/base/core_headers
-    - abseil/meta/type_traits
-    - abseil/xcprivacy
-  - abseil/meta (1.20240116.2):
-    - abseil/meta/type_traits (= 1.20240116.2)
-  - abseil/meta/type_traits (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/xcprivacy
-  - abseil/numeric/bits (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/xcprivacy
-  - abseil/numeric/int128 (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/numeric/bits
-    - abseil/xcprivacy
-  - abseil/numeric/representation (1.20240116.2):
-    - abseil/base/config
-    - abseil/xcprivacy
-  - abseil/profiling/exponential_biased (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/xcprivacy
-  - abseil/profiling/sample_recorder (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/synchronization/synchronization
-    - abseil/time/time
-    - abseil/xcprivacy
-  - abseil/random/bit_gen_ref (1.20240116.2):
-    - abseil/base/core_headers
-    - abseil/base/fast_type_id
-    - abseil/meta/type_traits
-    - abseil/random/internal/distribution_caller
-    - abseil/random/internal/fast_uniform_bits
-    - abseil/random/random
-    - abseil/xcprivacy
-  - abseil/random/distributions (1.20240116.2):
-    - abseil/base/base_internal
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/meta/type_traits
-    - abseil/numeric/bits
-    - abseil/random/internal/distribution_caller
-    - abseil/random/internal/fast_uniform_bits
-    - abseil/random/internal/fastmath
-    - abseil/random/internal/generate_real
-    - abseil/random/internal/iostream_state_saver
-    - abseil/random/internal/traits
-    - abseil/random/internal/uniform_helper
-    - abseil/random/internal/wide_multiply
-    - abseil/strings/strings
-    - abseil/xcprivacy
-  - abseil/random/internal/distribution_caller (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/fast_type_id
-    - abseil/utility/utility
-    - abseil/xcprivacy
-  - abseil/random/internal/fast_uniform_bits (1.20240116.2):
-    - abseil/base/config
-    - abseil/meta/type_traits
-    - abseil/random/internal/traits
-    - abseil/xcprivacy
-  - abseil/random/internal/fastmath (1.20240116.2):
-    - abseil/numeric/bits
-    - abseil/xcprivacy
-  - abseil/random/internal/generate_real (1.20240116.2):
-    - abseil/meta/type_traits
-    - abseil/numeric/bits
-    - abseil/random/internal/fastmath
-    - abseil/random/internal/traits
-    - abseil/xcprivacy
-  - abseil/random/internal/iostream_state_saver (1.20240116.2):
-    - abseil/meta/type_traits
-    - abseil/numeric/int128
-    - abseil/xcprivacy
-  - abseil/random/internal/nonsecure_base (1.20240116.2):
-    - abseil/base/core_headers
-    - abseil/container/inlined_vector
-    - abseil/meta/type_traits
-    - abseil/random/internal/pool_urbg
-    - abseil/random/internal/salted_seed_seq
-    - abseil/random/internal/seed_material
-    - abseil/types/span
-    - abseil/xcprivacy
-  - abseil/random/internal/pcg_engine (1.20240116.2):
-    - abseil/base/config
-    - abseil/meta/type_traits
-    - abseil/numeric/bits
-    - abseil/numeric/int128
-    - abseil/random/internal/fastmath
-    - abseil/random/internal/iostream_state_saver
-    - abseil/xcprivacy
-  - abseil/random/internal/platform (1.20240116.2):
-    - abseil/base/config
-    - abseil/xcprivacy
-  - abseil/random/internal/pool_urbg (1.20240116.2):
-    - abseil/base/base
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/endian
-    - abseil/base/raw_logging_internal
-    - abseil/random/internal/randen
-    - abseil/random/internal/seed_material
-    - abseil/random/internal/traits
-    - abseil/random/seed_gen_exception
-    - abseil/types/span
-    - abseil/xcprivacy
-  - abseil/random/internal/randen (1.20240116.2):
-    - abseil/base/raw_logging_internal
-    - abseil/random/internal/platform
-    - abseil/random/internal/randen_hwaes
-    - abseil/random/internal/randen_slow
-    - abseil/xcprivacy
-  - abseil/random/internal/randen_engine (1.20240116.2):
-    - abseil/base/endian
-    - abseil/meta/type_traits
-    - abseil/random/internal/iostream_state_saver
-    - abseil/random/internal/randen
-    - abseil/xcprivacy
-  - abseil/random/internal/randen_hwaes (1.20240116.2):
-    - abseil/base/config
-    - abseil/random/internal/platform
-    - abseil/random/internal/randen_hwaes_impl
-    - abseil/xcprivacy
-  - abseil/random/internal/randen_hwaes_impl (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/numeric/int128
-    - abseil/random/internal/platform
-    - abseil/xcprivacy
-  - abseil/random/internal/randen_slow (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/endian
-    - abseil/numeric/int128
-    - abseil/random/internal/platform
-    - abseil/xcprivacy
-  - abseil/random/internal/salted_seed_seq (1.20240116.2):
-    - abseil/container/inlined_vector
-    - abseil/meta/type_traits
-    - abseil/random/internal/seed_material
-    - abseil/types/optional
-    - abseil/types/span
-    - abseil/xcprivacy
-  - abseil/random/internal/seed_material (1.20240116.2):
-    - abseil/base/core_headers
-    - abseil/base/dynamic_annotations
-    - abseil/base/raw_logging_internal
-    - abseil/random/internal/fast_uniform_bits
-    - abseil/strings/strings
-    - abseil/types/optional
-    - abseil/types/span
-    - abseil/xcprivacy
-  - abseil/random/internal/traits (1.20240116.2):
-    - abseil/base/config
-    - abseil/numeric/bits
-    - abseil/numeric/int128
-    - abseil/xcprivacy
-  - abseil/random/internal/uniform_helper (1.20240116.2):
-    - abseil/base/config
-    - abseil/meta/type_traits
-    - abseil/numeric/int128
-    - abseil/random/internal/traits
-    - abseil/xcprivacy
-  - abseil/random/internal/wide_multiply (1.20240116.2):
-    - abseil/base/config
-    - abseil/numeric/bits
-    - abseil/numeric/int128
-    - abseil/random/internal/traits
-    - abseil/xcprivacy
-  - abseil/random/random (1.20240116.2):
-    - abseil/random/distributions
-    - abseil/random/internal/nonsecure_base
-    - abseil/random/internal/pcg_engine
-    - abseil/random/internal/pool_urbg
-    - abseil/random/internal/randen_engine
-    - abseil/random/seed_sequences
-    - abseil/xcprivacy
-  - abseil/random/seed_gen_exception (1.20240116.2):
-    - abseil/base/config
-    - abseil/xcprivacy
-  - abseil/random/seed_sequences (1.20240116.2):
-    - abseil/base/config
-    - abseil/random/internal/pool_urbg
-    - abseil/random/internal/salted_seed_seq
-    - abseil/random/internal/seed_material
-    - abseil/random/seed_gen_exception
-    - abseil/types/span
-    - abseil/xcprivacy
-  - abseil/status/status (1.20240116.2):
-    - abseil/base/atomic_hook
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/no_destructor
-    - abseil/base/nullability
-    - abseil/base/raw_logging_internal
-    - abseil/base/strerror
-    - abseil/container/inlined_vector
-    - abseil/debugging/stacktrace
-    - abseil/debugging/symbolize
-    - abseil/functional/function_ref
-    - abseil/memory/memory
-    - abseil/strings/cord
-    - abseil/strings/str_format
-    - abseil/strings/strings
-    - abseil/types/optional
-    - abseil/types/span
-    - abseil/xcprivacy
-  - abseil/status/statusor (1.20240116.2):
-    - abseil/base/base
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/nullability
-    - abseil/base/raw_logging_internal
-    - abseil/meta/type_traits
-    - abseil/status/status
-    - abseil/strings/has_ostream_operator
-    - abseil/strings/str_format
-    - abseil/strings/strings
-    - abseil/types/variant
-    - abseil/utility/utility
-    - abseil/xcprivacy
-  - abseil/strings/charset (1.20240116.2):
-    - abseil/base/core_headers
-    - abseil/strings/string_view
-    - abseil/xcprivacy
-  - abseil/strings/cord (1.20240116.2):
-    - abseil/base/base
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/endian
-    - abseil/base/nullability
-    - abseil/base/raw_logging_internal
-    - abseil/container/inlined_vector
-    - abseil/crc/crc32c
-    - abseil/crc/crc_cord_state
-    - abseil/functional/function_ref
-    - abseil/meta/type_traits
-    - abseil/numeric/bits
-    - abseil/strings/cord_internal
-    - abseil/strings/cordz_functions
-    - abseil/strings/cordz_info
-    - abseil/strings/cordz_statistics
-    - abseil/strings/cordz_update_scope
-    - abseil/strings/cordz_update_tracker
-    - abseil/strings/internal
-    - abseil/strings/strings
-    - abseil/types/optional
-    - abseil/types/span
-    - abseil/xcprivacy
-  - abseil/strings/cord_internal (1.20240116.2):
-    - abseil/base/base_internal
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/endian
-    - abseil/base/raw_logging_internal
-    - abseil/base/throw_delegate
-    - abseil/container/compressed_tuple
-    - abseil/container/container_memory
-    - abseil/container/inlined_vector
-    - abseil/container/layout
-    - abseil/crc/crc_cord_state
-    - abseil/functional/function_ref
-    - abseil/meta/type_traits
-    - abseil/strings/strings
-    - abseil/types/span
-    - abseil/xcprivacy
-  - abseil/strings/cordz_functions (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/raw_logging_internal
-    - abseil/profiling/exponential_biased
-    - abseil/xcprivacy
-  - abseil/strings/cordz_handle (1.20240116.2):
-    - abseil/base/base
-    - abseil/base/config
-    - abseil/base/raw_logging_internal
-    - abseil/synchronization/synchronization
-    - abseil/xcprivacy
-  - abseil/strings/cordz_info (1.20240116.2):
-    - abseil/base/base
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/raw_logging_internal
-    - abseil/container/inlined_vector
-    - abseil/debugging/stacktrace
-    - abseil/strings/cord_internal
-    - abseil/strings/cordz_functions
-    - abseil/strings/cordz_handle
-    - abseil/strings/cordz_statistics
-    - abseil/strings/cordz_update_tracker
-    - abseil/synchronization/synchronization
-    - abseil/time/time
-    - abseil/types/span
-    - abseil/xcprivacy
-  - abseil/strings/cordz_statistics (1.20240116.2):
-    - abseil/base/config
-    - abseil/strings/cordz_update_tracker
-    - abseil/xcprivacy
-  - abseil/strings/cordz_update_scope (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/strings/cord_internal
-    - abseil/strings/cordz_info
-    - abseil/strings/cordz_update_tracker
-    - abseil/xcprivacy
-  - abseil/strings/cordz_update_tracker (1.20240116.2):
-    - abseil/base/config
-    - abseil/xcprivacy
-  - abseil/strings/has_ostream_operator (1.20240116.2):
-    - abseil/base/config
-    - abseil/xcprivacy
-  - abseil/strings/internal (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/endian
-    - abseil/base/raw_logging_internal
-    - abseil/meta/type_traits
-    - abseil/xcprivacy
-  - abseil/strings/str_format (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/nullability
-    - abseil/strings/str_format_internal
-    - abseil/strings/string_view
-    - abseil/types/span
-    - abseil/xcprivacy
-  - abseil/strings/str_format_internal (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/container/fixed_array
-    - abseil/container/inlined_vector
-    - abseil/functional/function_ref
-    - abseil/meta/type_traits
-    - abseil/numeric/bits
-    - abseil/numeric/int128
-    - abseil/numeric/representation
-    - abseil/strings/strings
-    - abseil/types/optional
-    - abseil/types/span
-    - abseil/utility/utility
-    - abseil/xcprivacy
-  - abseil/strings/string_view (1.20240116.2):
-    - abseil/base/base
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/nullability
-    - abseil/base/throw_delegate
-    - abseil/xcprivacy
-  - abseil/strings/strings (1.20240116.2):
-    - abseil/base/base
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/endian
-    - abseil/base/nullability
-    - abseil/base/raw_logging_internal
-    - abseil/base/throw_delegate
-    - abseil/memory/memory
-    - abseil/meta/type_traits
-    - abseil/numeric/bits
-    - abseil/numeric/int128
-    - abseil/strings/charset
-    - abseil/strings/internal
-    - abseil/strings/string_view
-    - abseil/xcprivacy
-  - abseil/synchronization/graphcycles_internal (1.20240116.2):
-    - abseil/base/base
-    - abseil/base/base_internal
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/malloc_internal
-    - abseil/base/raw_logging_internal
-    - abseil/xcprivacy
-  - abseil/synchronization/kernel_timeout_internal (1.20240116.2):
-    - abseil/base/base
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/raw_logging_internal
-    - abseil/time/time
-    - abseil/xcprivacy
-  - abseil/synchronization/synchronization (1.20240116.2):
-    - abseil/base/atomic_hook
-    - abseil/base/base
-    - abseil/base/base_internal
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/dynamic_annotations
-    - abseil/base/malloc_internal
-    - abseil/base/raw_logging_internal
-    - abseil/debugging/stacktrace
-    - abseil/debugging/symbolize
-    - abseil/synchronization/graphcycles_internal
-    - abseil/synchronization/kernel_timeout_internal
-    - abseil/time/time
-    - abseil/xcprivacy
-  - abseil/time (1.20240116.2):
-    - abseil/time/internal (= 1.20240116.2)
-    - abseil/time/time (= 1.20240116.2)
-  - abseil/time/internal (1.20240116.2):
-    - abseil/time/internal/cctz (= 1.20240116.2)
-  - abseil/time/internal/cctz (1.20240116.2):
-    - abseil/time/internal/cctz/civil_time (= 1.20240116.2)
-    - abseil/time/internal/cctz/time_zone (= 1.20240116.2)
-  - abseil/time/internal/cctz/civil_time (1.20240116.2):
-    - abseil/base/config
-    - abseil/xcprivacy
-  - abseil/time/internal/cctz/time_zone (1.20240116.2):
-    - abseil/base/config
-    - abseil/time/internal/cctz/civil_time
-    - abseil/xcprivacy
-  - abseil/time/time (1.20240116.2):
-    - abseil/base/base
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/raw_logging_internal
-    - abseil/numeric/int128
-    - abseil/strings/strings
-    - abseil/time/internal/cctz/civil_time
-    - abseil/time/internal/cctz/time_zone
-    - abseil/types/optional
-    - abseil/xcprivacy
-  - abseil/types (1.20240116.2):
-    - abseil/types/any (= 1.20240116.2)
-    - abseil/types/bad_any_cast (= 1.20240116.2)
-    - abseil/types/bad_any_cast_impl (= 1.20240116.2)
-    - abseil/types/bad_optional_access (= 1.20240116.2)
-    - abseil/types/bad_variant_access (= 1.20240116.2)
-    - abseil/types/compare (= 1.20240116.2)
-    - abseil/types/optional (= 1.20240116.2)
-    - abseil/types/span (= 1.20240116.2)
-    - abseil/types/variant (= 1.20240116.2)
-  - abseil/types/any (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/fast_type_id
-    - abseil/meta/type_traits
-    - abseil/types/bad_any_cast
-    - abseil/utility/utility
-    - abseil/xcprivacy
-  - abseil/types/bad_any_cast (1.20240116.2):
-    - abseil/base/config
-    - abseil/types/bad_any_cast_impl
-    - abseil/xcprivacy
-  - abseil/types/bad_any_cast_impl (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/raw_logging_internal
-    - abseil/xcprivacy
-  - abseil/types/bad_optional_access (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/raw_logging_internal
-    - abseil/xcprivacy
-  - abseil/types/bad_variant_access (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/raw_logging_internal
-    - abseil/xcprivacy
-  - abseil/types/compare (1.20240116.2):
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/meta/type_traits
-    - abseil/xcprivacy
-  - abseil/types/optional (1.20240116.2):
-    - abseil/base/base_internal
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/base/nullability
-    - abseil/memory/memory
-    - abseil/meta/type_traits
-    - abseil/types/bad_optional_access
-    - abseil/utility/utility
-    - abseil/xcprivacy
-  - abseil/types/span (1.20240116.2):
-    - abseil/algorithm/algorithm
-    - abseil/base/core_headers
-    - abseil/base/nullability
-    - abseil/base/throw_delegate
-    - abseil/meta/type_traits
-    - abseil/xcprivacy
-  - abseil/types/variant (1.20240116.2):
-    - abseil/base/base_internal
-    - abseil/base/config
-    - abseil/base/core_headers
-    - abseil/meta/type_traits
-    - abseil/types/bad_variant_access
-    - abseil/utility/utility
-    - abseil/xcprivacy
-  - abseil/utility/utility (1.20240116.2):
-    - abseil/base/base_internal
-    - abseil/base/config
-    - abseil/meta/type_traits
-    - abseil/xcprivacy
-  - abseil/xcprivacy (1.20240116.2)
   - audioplayers_darwin (0.0.1):
     - Flutter
-  - BoringSSL-GRPC (0.0.32):
-    - BoringSSL-GRPC/Implementation (= 0.0.32)
-    - BoringSSL-GRPC/Interface (= 0.0.32)
-  - BoringSSL-GRPC/Implementation (0.0.32):
-    - BoringSSL-GRPC/Interface (= 0.0.32)
-  - BoringSSL-GRPC/Interface (0.0.32)
-  - cloud_firestore (5.2.1):
-    - Firebase/Firestore (= 10.29.0)
-    - firebase_core
-    - Flutter
-  - connectivity_plus (0.0.1):
-    - Flutter
-    - FlutterMacOS
-  - Firebase/Analytics (10.29.0):
+  - Firebase/Analytics (11.2.0):
     - Firebase/Core
-  - Firebase/Auth (10.29.0):
-    - Firebase/CoreOnly
-    - FirebaseAuth (~> 10.29.0)
-  - Firebase/Core (10.29.0):
-    - Firebase/CoreOnly
-    - FirebaseAnalytics (~> 10.29.0)
-  - Firebase/CoreOnly (10.29.0):
-    - FirebaseCore (= 10.29.0)
-  - Firebase/Crashlytics (10.29.0):
+  - Firebase/Core (11.2.0):
     - Firebase/CoreOnly
-    - FirebaseCrashlytics (~> 10.29.0)
-  - Firebase/DynamicLinks (10.29.0):
-    - Firebase/CoreOnly
-    - FirebaseDynamicLinks (~> 10.29.0)
-  - Firebase/Firestore (10.29.0):
-    - Firebase/CoreOnly
-    - FirebaseFirestore (~> 10.29.0)
-  - Firebase/Messaging (10.29.0):
-    - Firebase/CoreOnly
-    - FirebaseMessaging (~> 10.29.0)
-  - Firebase/RemoteConfig (10.29.0):
-    - Firebase/CoreOnly
-    - FirebaseRemoteConfig (~> 10.29.0)
-  - firebase_analytics (11.2.1):
-    - Firebase/Analytics (= 10.29.0)
-    - firebase_core
-    - Flutter
-  - firebase_auth (5.1.4):
-    - Firebase/Auth (= 10.29.0)
+    - FirebaseAnalytics (~> 11.2.0)
+  - Firebase/CoreOnly (11.2.0):
+    - FirebaseCore (= 11.2.0)
+  - firebase_analytics (11.3.3):
+    - Firebase/Analytics (= 11.2.0)
     - firebase_core
     - Flutter
-  - firebase_core (3.3.0):
-    - Firebase/CoreOnly (= 10.29.0)
-    - Flutter
-  - firebase_crashlytics (4.0.4):
-    - Firebase/Crashlytics (= 10.29.0)
-    - firebase_core
-    - Flutter
-  - firebase_dynamic_links (6.0.4):
-    - Firebase/DynamicLinks (= 10.29.0)
-    - firebase_core
-    - Flutter
-  - firebase_messaging (15.0.4):
-    - Firebase/Messaging (= 10.29.0)
-    - firebase_core
-    - Flutter
-  - firebase_remote_config (5.0.4):
-    - Firebase/RemoteConfig (= 10.29.0)
-    - firebase_core
-    - Flutter
-  - FirebaseABTesting (10.29.0):
-    - FirebaseCore (~> 10.0)
-  - FirebaseAnalytics (10.29.0):
-    - FirebaseAnalytics/AdIdSupport (= 10.29.0)
-    - FirebaseCore (~> 10.0)
-    - FirebaseInstallations (~> 10.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.11)
-    - GoogleUtilities/MethodSwizzler (~> 7.11)
-    - GoogleUtilities/Network (~> 7.11)
-    - "GoogleUtilities/NSData+zlib (~> 7.11)"
-    - nanopb (< 2.30911.0, >= 2.30908.0)
-  - FirebaseAnalytics/AdIdSupport (10.29.0):
-    - FirebaseCore (~> 10.0)
-    - FirebaseInstallations (~> 10.0)
-    - GoogleAppMeasurement (= 10.29.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.11)
-    - GoogleUtilities/MethodSwizzler (~> 7.11)
-    - GoogleUtilities/Network (~> 7.11)
-    - "GoogleUtilities/NSData+zlib (~> 7.11)"
-    - nanopb (< 2.30911.0, >= 2.30908.0)
-  - FirebaseAppCheckInterop (10.29.0)
-  - FirebaseAuth (10.29.0):
-    - FirebaseAppCheckInterop (~> 10.17)
-    - FirebaseCore (~> 10.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.8)
-    - GoogleUtilities/Environment (~> 7.8)
-    - GTMSessionFetcher/Core (< 4.0, >= 2.1)
-    - RecaptchaInterop (~> 100.0)
-  - FirebaseCore (10.29.0):
-    - FirebaseCoreInternal (~> 10.0)
-    - GoogleUtilities/Environment (~> 7.12)
-    - GoogleUtilities/Logger (~> 7.12)
-  - FirebaseCoreExtension (10.29.0):
-    - FirebaseCore (~> 10.0)
-  - FirebaseCoreInternal (10.29.0):
-    - "GoogleUtilities/NSData+zlib (~> 7.8)"
-  - FirebaseCrashlytics (10.29.0):
-    - FirebaseCore (~> 10.5)
-    - FirebaseInstallations (~> 10.0)
-    - FirebaseRemoteConfigInterop (~> 10.23)
-    - FirebaseSessions (~> 10.5)
-    - GoogleDataTransport (~> 9.2)
-    - GoogleUtilities/Environment (~> 7.8)
-    - nanopb (< 2.30911.0, >= 2.30908.0)
-    - PromisesObjC (~> 2.1)
-  - FirebaseDynamicLinks (10.29.0):
-    - FirebaseCore (~> 10.0)
-  - FirebaseFirestore (10.29.0):
-    - FirebaseCore (~> 10.0)
-    - FirebaseCoreExtension (~> 10.0)
-    - FirebaseFirestoreInternal (= 10.29.0)
-    - FirebaseSharedSwift (~> 10.0)
-  - FirebaseFirestoreInternal (10.29.0):
-    - abseil/algorithm (~> 1.20240116.1)
-    - abseil/base (~> 1.20240116.1)
-    - abseil/container/flat_hash_map (~> 1.20240116.1)
-    - abseil/memory (~> 1.20240116.1)
-    - abseil/meta (~> 1.20240116.1)
-    - abseil/strings/strings (~> 1.20240116.1)
-    - abseil/time (~> 1.20240116.1)
-    - abseil/types (~> 1.20240116.1)
-    - FirebaseAppCheckInterop (~> 10.17)
-    - FirebaseCore (~> 10.0)
-    - "gRPC-C++ (~> 1.62.0)"
-    - gRPC-Core (~> 1.62.0)
-    - leveldb-library (~> 1.22)
-    - nanopb (< 2.30911.0, >= 2.30908.0)
-  - FirebaseInstallations (10.29.0):
-    - FirebaseCore (~> 10.0)
-    - GoogleUtilities/Environment (~> 7.8)
-    - GoogleUtilities/UserDefaults (~> 7.8)
-    - PromisesObjC (~> 2.1)
-  - FirebaseMessaging (10.29.0):
-    - FirebaseCore (~> 10.0)
-    - FirebaseInstallations (~> 10.0)
-    - GoogleDataTransport (~> 9.3)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.8)
-    - GoogleUtilities/Environment (~> 7.8)
-    - GoogleUtilities/Reachability (~> 7.8)
-    - GoogleUtilities/UserDefaults (~> 7.8)
-    - nanopb (< 2.30911.0, >= 2.30908.0)
-  - FirebaseRemoteConfig (10.29.0):
-    - FirebaseABTesting (~> 10.0)
-    - FirebaseCore (~> 10.0)
-    - FirebaseInstallations (~> 10.0)
-    - FirebaseRemoteConfigInterop (~> 10.23)
-    - FirebaseSharedSwift (~> 10.0)
-    - GoogleUtilities/Environment (~> 7.8)
-    - "GoogleUtilities/NSData+zlib (~> 7.8)"
-  - FirebaseRemoteConfigInterop (10.29.0)
-  - FirebaseSessions (10.29.0):
-    - FirebaseCore (~> 10.5)
-    - FirebaseCoreExtension (~> 10.0)
-    - FirebaseInstallations (~> 10.0)
-    - GoogleDataTransport (~> 9.2)
-    - GoogleUtilities/Environment (~> 7.13)
-    - GoogleUtilities/UserDefaults (~> 7.13)
-    - nanopb (< 2.30911.0, >= 2.30908.0)
-    - PromisesSwift (~> 2.1)
-  - FirebaseSharedSwift (10.29.0)
+  - firebase_core (3.6.0):
+    - Firebase/CoreOnly (= 11.2.0)
+    - Flutter
+  - FirebaseAnalytics (11.2.0):
+    - FirebaseAnalytics/AdIdSupport (= 11.2.0)
+    - FirebaseCore (~> 11.0)
+    - FirebaseInstallations (~> 11.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/MethodSwizzler (~> 8.0)
+    - GoogleUtilities/Network (~> 8.0)
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+    - nanopb (~> 3.30910.0)
+  - FirebaseAnalytics/AdIdSupport (11.2.0):
+    - FirebaseCore (~> 11.0)
+    - FirebaseInstallations (~> 11.0)
+    - GoogleAppMeasurement (= 11.2.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/MethodSwizzler (~> 8.0)
+    - GoogleUtilities/Network (~> 8.0)
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+    - nanopb (~> 3.30910.0)
+  - FirebaseCore (11.2.0):
+    - FirebaseCoreInternal (~> 11.0)
+    - GoogleUtilities/Environment (~> 8.0)
+    - GoogleUtilities/Logger (~> 8.0)
+  - FirebaseCoreInternal (11.2.0):
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+  - FirebaseInstallations (11.2.0):
+    - FirebaseCore (~> 11.0)
+    - GoogleUtilities/Environment (~> 8.0)
+    - GoogleUtilities/UserDefaults (~> 8.0)
+    - PromisesObjC (~> 2.4)
   - Flutter (1.0.0)
-  - flutter_app_badger (1.3.0):
-    - Flutter
-  - flutter_local_notifications (0.0.1):
-    - Flutter
   - flutter_native_splash (0.0.1):
     - Flutter
   - flutter_pdfview (1.0.2):
     - Flutter
   - geocoding_ios (1.0.5):
     - Flutter
-  - GoogleAppMeasurement (10.29.0):
-    - GoogleAppMeasurement/AdIdSupport (= 10.29.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.11)
-    - GoogleUtilities/MethodSwizzler (~> 7.11)
-    - GoogleUtilities/Network (~> 7.11)
-    - "GoogleUtilities/NSData+zlib (~> 7.11)"
-    - nanopb (< 2.30911.0, >= 2.30908.0)
-  - GoogleAppMeasurement/AdIdSupport (10.29.0):
-    - GoogleAppMeasurement/WithoutAdIdSupport (= 10.29.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.11)
-    - GoogleUtilities/MethodSwizzler (~> 7.11)
-    - GoogleUtilities/Network (~> 7.11)
-    - "GoogleUtilities/NSData+zlib (~> 7.11)"
-    - nanopb (< 2.30911.0, >= 2.30908.0)
-  - GoogleAppMeasurement/WithoutAdIdSupport (10.29.0):
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.11)
-    - GoogleUtilities/MethodSwizzler (~> 7.11)
-    - GoogleUtilities/Network (~> 7.11)
-    - "GoogleUtilities/NSData+zlib (~> 7.11)"
-    - nanopb (< 2.30911.0, >= 2.30908.0)
-  - GoogleDataTransport (9.4.1):
-    - GoogleUtilities/Environment (~> 7.7)
-    - nanopb (< 2.30911.0, >= 2.30908.0)
-    - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/AppDelegateSwizzler (7.13.3):
+  - GoogleAppMeasurement (11.2.0):
+    - GoogleAppMeasurement/AdIdSupport (= 11.2.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/MethodSwizzler (~> 8.0)
+    - GoogleUtilities/Network (~> 8.0)
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+    - nanopb (~> 3.30910.0)
+  - GoogleAppMeasurement/AdIdSupport (11.2.0):
+    - GoogleAppMeasurement/WithoutAdIdSupport (= 11.2.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/MethodSwizzler (~> 8.0)
+    - GoogleUtilities/Network (~> 8.0)
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+    - nanopb (~> 3.30910.0)
+  - GoogleAppMeasurement/WithoutAdIdSupport (11.2.0):
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/MethodSwizzler (~> 8.0)
+    - GoogleUtilities/Network (~> 8.0)
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+    - nanopb (~> 3.30910.0)
+  - GoogleUtilities/AppDelegateSwizzler (8.0.2):
     - GoogleUtilities/Environment
     - GoogleUtilities/Logger
     - GoogleUtilities/Network
     - GoogleUtilities/Privacy
-  - GoogleUtilities/Environment (7.13.3):
+  - GoogleUtilities/Environment (8.0.2):
     - GoogleUtilities/Privacy
-    - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/Logger (7.13.3):
+  - GoogleUtilities/Logger (8.0.2):
     - GoogleUtilities/Environment
     - GoogleUtilities/Privacy
-  - GoogleUtilities/MethodSwizzler (7.13.3):
+  - GoogleUtilities/MethodSwizzler (8.0.2):
     - GoogleUtilities/Logger
     - GoogleUtilities/Privacy
-  - GoogleUtilities/Network (7.13.3):
+  - GoogleUtilities/Network (8.0.2):
     - GoogleUtilities/Logger
     - "GoogleUtilities/NSData+zlib"
     - GoogleUtilities/Privacy
     - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (7.13.3)":
+  - "GoogleUtilities/NSData+zlib (8.0.2)":
     - GoogleUtilities/Privacy
-  - GoogleUtilities/Privacy (7.13.3)
-  - GoogleUtilities/Reachability (7.13.3):
+  - GoogleUtilities/Privacy (8.0.2)
+  - GoogleUtilities/Reachability (8.0.2):
     - GoogleUtilities/Logger
     - GoogleUtilities/Privacy
-  - GoogleUtilities/UserDefaults (7.13.3):
+  - GoogleUtilities/UserDefaults (8.0.2):
     - GoogleUtilities/Logger
     - GoogleUtilities/Privacy
-  - "gRPC-C++ (1.62.5)":
-    - "gRPC-C++/Implementation (= 1.62.5)"
-    - "gRPC-C++/Interface (= 1.62.5)"
-  - "gRPC-C++/Implementation (1.62.5)":
-    - abseil/algorithm/container (~> 1.20240116.2)
-    - abseil/base/base (~> 1.20240116.2)
-    - abseil/base/config (~> 1.20240116.2)
-    - abseil/base/core_headers (~> 1.20240116.2)
-    - abseil/cleanup/cleanup (~> 1.20240116.2)
-    - abseil/container/flat_hash_map (~> 1.20240116.2)
-    - abseil/container/flat_hash_set (~> 1.20240116.2)
-    - abseil/container/inlined_vector (~> 1.20240116.2)
-    - abseil/flags/flag (~> 1.20240116.2)
-    - abseil/flags/marshalling (~> 1.20240116.2)
-    - abseil/functional/any_invocable (~> 1.20240116.2)
-    - abseil/functional/bind_front (~> 1.20240116.2)
-    - abseil/functional/function_ref (~> 1.20240116.2)
-    - abseil/hash/hash (~> 1.20240116.2)
-    - abseil/memory/memory (~> 1.20240116.2)
-    - abseil/meta/type_traits (~> 1.20240116.2)
-    - abseil/random/bit_gen_ref (~> 1.20240116.2)
-    - abseil/random/distributions (~> 1.20240116.2)
-    - abseil/random/random (~> 1.20240116.2)
-    - abseil/status/status (~> 1.20240116.2)
-    - abseil/status/statusor (~> 1.20240116.2)
-    - abseil/strings/cord (~> 1.20240116.2)
-    - abseil/strings/str_format (~> 1.20240116.2)
-    - abseil/strings/strings (~> 1.20240116.2)
-    - abseil/synchronization/synchronization (~> 1.20240116.2)
-    - abseil/time/time (~> 1.20240116.2)
-    - abseil/types/optional (~> 1.20240116.2)
-    - abseil/types/span (~> 1.20240116.2)
-    - abseil/types/variant (~> 1.20240116.2)
-    - abseil/utility/utility (~> 1.20240116.2)
-    - "gRPC-C++/Interface (= 1.62.5)"
-    - "gRPC-C++/Privacy (= 1.62.5)"
-    - gRPC-Core (= 1.62.5)
-  - "gRPC-C++/Interface (1.62.5)"
-  - "gRPC-C++/Privacy (1.62.5)"
-  - gRPC-Core (1.62.5):
-    - gRPC-Core/Implementation (= 1.62.5)
-    - gRPC-Core/Interface (= 1.62.5)
-  - gRPC-Core/Implementation (1.62.5):
-    - abseil/algorithm/container (~> 1.20240116.2)
-    - abseil/base/base (~> 1.20240116.2)
-    - abseil/base/config (~> 1.20240116.2)
-    - abseil/base/core_headers (~> 1.20240116.2)
-    - abseil/cleanup/cleanup (~> 1.20240116.2)
-    - abseil/container/flat_hash_map (~> 1.20240116.2)
-    - abseil/container/flat_hash_set (~> 1.20240116.2)
-    - abseil/container/inlined_vector (~> 1.20240116.2)
-    - abseil/flags/flag (~> 1.20240116.2)
-    - abseil/flags/marshalling (~> 1.20240116.2)
-    - abseil/functional/any_invocable (~> 1.20240116.2)
-    - abseil/functional/bind_front (~> 1.20240116.2)
-    - abseil/functional/function_ref (~> 1.20240116.2)
-    - abseil/hash/hash (~> 1.20240116.2)
-    - abseil/memory/memory (~> 1.20240116.2)
-    - abseil/meta/type_traits (~> 1.20240116.2)
-    - abseil/random/bit_gen_ref (~> 1.20240116.2)
-    - abseil/random/distributions (~> 1.20240116.2)
-    - abseil/random/random (~> 1.20240116.2)
-    - abseil/status/status (~> 1.20240116.2)
-    - abseil/status/statusor (~> 1.20240116.2)
-    - abseil/strings/cord (~> 1.20240116.2)
-    - abseil/strings/str_format (~> 1.20240116.2)
-    - abseil/strings/strings (~> 1.20240116.2)
-    - abseil/synchronization/synchronization (~> 1.20240116.2)
-    - abseil/time/time (~> 1.20240116.2)
-    - abseil/types/optional (~> 1.20240116.2)
-    - abseil/types/span (~> 1.20240116.2)
-    - abseil/types/variant (~> 1.20240116.2)
-    - abseil/utility/utility (~> 1.20240116.2)
-    - BoringSSL-GRPC (= 0.0.32)
-    - gRPC-Core/Interface (= 1.62.5)
-    - gRPC-Core/Privacy (= 1.62.5)
-  - gRPC-Core/Interface (1.62.5)
-  - gRPC-Core/Privacy (1.62.5)
-  - GTMSessionFetcher/Core (3.5.0)
-  - leveldb-library (1.22.5)
   - map_launcher (0.0.1):
     - Flutter
-  - nanopb (2.30910.0):
-    - nanopb/decode (= 2.30910.0)
-    - nanopb/encode (= 2.30910.0)
-  - nanopb/decode (2.30910.0)
-  - nanopb/encode (2.30910.0)
+  - 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
   - PromisesObjC (2.4.0)
-  - PromisesSwift (2.4.0):
-    - PromisesObjC (= 2.4.0)
-  - RecaptchaInterop (100.0.0)
   - share_plus (0.0.1):
     - Flutter
   - shared_preferences_foundation (0.0.1):
@@ -1290,18 +129,9 @@ PODS:
 
 DEPENDENCIES:
   - audioplayers_darwin (from `.symlinks/plugins/audioplayers_darwin/ios`)
-  - cloud_firestore (from `.symlinks/plugins/cloud_firestore/ios`)
-  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/darwin`)
   - 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_dynamic_links (from `.symlinks/plugins/firebase_dynamic_links/ios`)
-  - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
-  - firebase_remote_config (from `.symlinks/plugins/firebase_remote_config/ios`)
   - Flutter (from `Flutter`)
-  - flutter_app_badger (from `.symlinks/plugins/flutter_app_badger/ios`)
-  - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
   - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
   - flutter_pdfview (from `.symlinks/plugins/flutter_pdfview/ios`)
   - geocoding_ios (from `.symlinks/plugins/geocoding_ios/ios`)
@@ -1317,65 +147,25 @@ DEPENDENCIES:
 
 SPEC REPOS:
   trunk:
-    - abseil
-    - BoringSSL-GRPC
     - Firebase
-    - FirebaseABTesting
     - FirebaseAnalytics
-    - FirebaseAppCheckInterop
-    - FirebaseAuth
     - FirebaseCore
-    - FirebaseCoreExtension
     - FirebaseCoreInternal
-    - FirebaseCrashlytics
-    - FirebaseDynamicLinks
-    - FirebaseFirestore
-    - FirebaseFirestoreInternal
     - FirebaseInstallations
-    - FirebaseMessaging
-    - FirebaseRemoteConfig
-    - FirebaseRemoteConfigInterop
-    - FirebaseSessions
-    - FirebaseSharedSwift
     - GoogleAppMeasurement
-    - GoogleDataTransport
     - GoogleUtilities
-    - "gRPC-C++"
-    - gRPC-Core
-    - GTMSessionFetcher
-    - leveldb-library
     - nanopb
     - PromisesObjC
-    - PromisesSwift
-    - RecaptchaInterop
 
 EXTERNAL SOURCES:
   audioplayers_darwin:
     :path: ".symlinks/plugins/audioplayers_darwin/ios"
-  cloud_firestore:
-    :path: ".symlinks/plugins/cloud_firestore/ios"
-  connectivity_plus:
-    :path: ".symlinks/plugins/connectivity_plus/darwin"
   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_dynamic_links:
-    :path: ".symlinks/plugins/firebase_dynamic_links/ios"
-  firebase_messaging:
-    :path: ".symlinks/plugins/firebase_messaging/ios"
-  firebase_remote_config:
-    :path: ".symlinks/plugins/firebase_remote_config/ios"
   Flutter:
     :path: Flutter
-  flutter_app_badger:
-    :path: ".symlinks/plugins/flutter_app_badger/ios"
-  flutter_local_notifications:
-    :path: ".symlinks/plugins/flutter_local_notifications/ios"
   flutter_native_splash:
     :path: ".symlinks/plugins/flutter_native_splash/ios"
   flutter_pdfview:
@@ -1402,56 +192,25 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/wakelock_plus/ios"
 
 SPEC CHECKSUMS:
-  abseil: d121da9ef7e2ff4cab7666e76c5a3e0915ae08c3
   audioplayers_darwin: 877d9a4d06331c5c374595e46e16453ac7eafa40
-  BoringSSL-GRPC: 1e2348957acdbcad360b80a264a90799984b2ba6
-  cloud_firestore: 8a2ff2bb050f87d0ca996866625cefbe2395a83b
-  connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db
-  Firebase: cec914dab6fd7b1bd8ab56ea07ce4e03dd251c2d
-  firebase_analytics: 04491d1ee74c8e7c2330c96afc54188a969b06ee
-  firebase_auth: 8dbfcdd635cc4fb2ea213aeee8c9a979b3d3373b
-  firebase_core: 57aeb91680e5d5e6df6b888064be7c785f146efb
-  firebase_crashlytics: e3d3e0c99bad5aaab5908385133dea8ec344693f
-  firebase_dynamic_links: 550e8cefbdee7b6e74adfebb3cc4d340fa72f6c8
-  firebase_messaging: c862b3d2b973ecc769194dc8de09bd22c77ae757
-  firebase_remote_config: 622c7e72a9349b7db48658ea902d9f2f1f2d7aaa
-  FirebaseABTesting: d87f56707159bae64e269757a6e963d490f2eebe
-  FirebaseAnalytics: 23717de130b779aa506e757edb9713d24b6ffeda
-  FirebaseAppCheckInterop: 6a1757cfd4067d8e00fccd14fcc1b8fd78cfac07
-  FirebaseAuth: e2ebfaf9fb4638a1c9a3b0efd17d1b90943987cd
-  FirebaseCore: 30e9c1cbe3d38f5f5e75f48bfcea87d7c358ec16
-  FirebaseCoreExtension: 705ca5b14bf71d2564a0ddc677df1fc86ffa600f
-  FirebaseCoreInternal: df84dd300b561c27d5571684f389bf60b0a5c934
-  FirebaseCrashlytics: 34647b41e18de773717fdd348a22206f2f9bc774
-  FirebaseDynamicLinks: 83c278fcae48ac2cf8c3fb10f64f3d469dadcf9b
-  FirebaseFirestore: f258936f52d712337233182b90042a76ff48dce0
-  FirebaseFirestoreInternal: f43d25cc04835ec3aa1885f4fc946a1a4f9e1c56
-  FirebaseInstallations: 913cf60d0400ebd5d6b63a28b290372ab44590dd
-  FirebaseMessaging: 7b5d8033e183ab59eb5b852a53201559e976d366
-  FirebaseRemoteConfig: 48ef3f243742a8d72422ccfc9f986e19d7de53fd
-  FirebaseRemoteConfigInterop: 6efda51fb5e2f15b16585197e26eaa09574e8a4d
-  FirebaseSessions: dbd14adac65ce996228652c1fc3a3f576bdf3ecc
-  FirebaseSharedSwift: 20530f495084b8d840f78a100d8c5ee613375f6e
+  Firebase: 98e6bf5278170668a7983e12971a66b2cd57fc8c
+  firebase_analytics: fbc57838bdb94eef1e0ff504f127d974ff2981ad
+  firebase_core: 2bedc3136ec7c7b8561c6123ed0239387b53f2af
+  FirebaseAnalytics: c36efd5710c60c17558650fa58c2066eca7e9265
+  FirebaseCore: a282032ae9295c795714ded2ec9c522fc237f8da
+  FirebaseCoreInternal: 0c569513412da9f3b31bd0b340013bbee8f295c5
+  FirebaseInstallations: 771177d89d6c451dc6e50085ec82e2fc77ed0a4a
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_app_badger: 824f956e8d58c7d9153ba0bf519423be4204e0ae
-  flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086
   flutter_native_splash: edf599c81f74d093a4daf8e17bd7a018854bc778
   flutter_pdfview: 25f53dd6097661e6395b17de506e6060585946bd
   geocoding_ios: d7460f56e80e118d57678efe5c2cdc888739ff18
-  GoogleAppMeasurement: f9de05ee17401e3355f68e8fc8b5064d429f5918
-  GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
-  GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
-  "gRPC-C++": e725ef63c4475d7cdb7e2cf16eb0fde84bd9ee51
-  gRPC-Core: eee4be35df218649fe66d721a05a7f27a28f069b
-  GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
-  leveldb-library: e8eadf9008a61f9e1dde3978c086d2b6d9b9dc28
+  GoogleAppMeasurement: 76d4f8b36b03bd8381fa9a7fe2cc7f99c0a2e93a
+  GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
   map_launcher: 5fde49ac9a52672bf99da746599f507b4490d7b5
-  nanopb: 438bc412db1928dac798aa6fd75726007be04262
+  nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
   package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
-  PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
-  RecaptchaInterop: 7d1a4a01a6b2cb1610a47ef3f85f0c411434cb21
   share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
   sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
@@ -1459,6 +218,6 @@ SPEC CHECKSUMS:
   video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
   wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1
 
-PODFILE CHECKSUM: 7270adf6e8b663f57e97181ab4e46625bc1c6899
+PODFILE CHECKSUM: 4f1c12611da7338d21589c0b2ecd6bd20b109694
 
 COCOAPODS: 1.14.2
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 6eb906ee..1da98fb3 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -7,17 +7,28 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		0F2A45092CA421C8008243CF /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 0F2A45082CA421C8008243CF /* GoogleService-Info.plist */; };
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
-		1D54AD3626303320004791D0 /* (null) in Embed Frameworks */ = {isa = PBXBuildFile; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		1DEF30512642D98F00267989 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1DEF30502642D98A00267989 /* GoogleService-Info.plist */; };
-		25A5E47AB749A7DCC42E4B18 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8552AD080B6D5AA1DC069725 /* Pods_Runner.framework */; };
+		2878AF8E10B62FA5EC5138F4 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 830B595E296FC459497D8F22 /* Pods_Runner.framework */; };
+		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+		B516FECD96F6B5B41B147155 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0919CC1E98DCCF8C2386834F /* Pods_RunnerTests.framework */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXContainerItemProxy section */
+		331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 97C146E61CF9000F007C117D /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 97C146ED1CF9000F007C117D;
+			remoteInfo = Runner;
+		};
+/* End PBXContainerItemProxy section */
+
 /* Begin PBXCopyFilesBuildPhase section */
 		9705A1C41CF9048500538489 /* Embed Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
@@ -25,7 +36,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				1D54AD3626303320004791D0 /* (null) in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -33,15 +43,20 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		0919CC1E98DCCF8C2386834F /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		0F2A45082CA421C8008243CF /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
-		159A66D8BCB1DBF8A458A2B5 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
-		1DEF30502642D98A00267989 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
+		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
+		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		3477D6B5105E3EF5B099CA99 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
+		4D77A6F06ED7C04F9A34F311 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		7A96AD0864F3F41894570A6E /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
-		8552AD080B6D5AA1DC069725 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		830B595E296FC459497D8F22 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -49,8 +64,9 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		B02175D7ABD4481566D19EAF /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
-		B44BF9A7499F456CD9AE1FAE /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		9A35D813CF6D29E1A571FAD2 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
+		B75BB09B164B1C58017B2DF0 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		CC14A5073855620E40AD7AC2 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -58,23 +74,51 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				25A5E47AB749A7DCC42E4B18 /* Pods_Runner.framework in Frameworks */,
+				2878AF8E10B62FA5EC5138F4 /* Pods_Runner.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		F2E06228E67125781CA22189 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				B516FECD96F6B5B41B147155 /* Pods_RunnerTests.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		4F1E13CFF248171DA77A38EC /* Pods */ = {
+		331C8082294A63A400263BE5 /* RunnerTests */ = {
 			isa = PBXGroup;
 			children = (
-				B02175D7ABD4481566D19EAF /* Pods-Runner.debug.xcconfig */,
-				B44BF9A7499F456CD9AE1FAE /* Pods-Runner.release.xcconfig */,
-				159A66D8BCB1DBF8A458A2B5 /* Pods-Runner.profile.xcconfig */,
+				331C807B294A618700263BE5 /* RunnerTests.swift */,
+			);
+			path = RunnerTests;
+			sourceTree = "<group>";
+		};
+		5754E6CCED3B504926462AAC /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				3477D6B5105E3EF5B099CA99 /* Pods-Runner.debug.xcconfig */,
+				B75BB09B164B1C58017B2DF0 /* Pods-Runner.release.xcconfig */,
+				CC14A5073855620E40AD7AC2 /* Pods-Runner.profile.xcconfig */,
+				9A35D813CF6D29E1A571FAD2 /* Pods-RunnerTests.debug.xcconfig */,
+				4D77A6F06ED7C04F9A34F311 /* Pods-RunnerTests.release.xcconfig */,
+				7A96AD0864F3F41894570A6E /* Pods-RunnerTests.profile.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
 		};
+		72FB365AB6E32021380C23A0 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				830B595E296FC459497D8F22 /* Pods_Runner.framework */,
+				0919CC1E98DCCF8C2386834F /* Pods_RunnerTests.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
@@ -92,8 +136,9 @@
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
-				4F1E13CFF248171DA77A38EC /* Pods */,
-				E0443B1739BFE88D83ED495D /* Frameworks */,
+				331C8082294A63A400263BE5 /* RunnerTests */,
+				5754E6CCED3B504926462AAC /* Pods */,
+				72FB365AB6E32021380C23A0 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -101,6 +146,7 @@
 			isa = PBXGroup;
 			children = (
 				97C146EE1CF9000F007C117D /* Runner.app */,
+				331C8081294A63A400263BE5 /* RunnerTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -108,11 +154,11 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
-				1DEF30502642D98A00267989 /* GoogleService-Info.plist */,
 				97C146FA1CF9000F007C117D /* Main.storyboard */,
 				97C146FD1CF9000F007C117D /* Assets.xcassets */,
 				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
 				97C147021CF9000F007C117D /* Info.plist */,
+				0F2A45082CA421C8008243CF /* GoogleService-Info.plist */,
 				1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
 				1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
 				74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
@@ -121,32 +167,40 @@
 			path = Runner;
 			sourceTree = "<group>";
 		};
-		E0443B1739BFE88D83ED495D /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				8552AD080B6D5AA1DC069725 /* Pods_Runner.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
+		331C8080294A63A400263BE5 /* RunnerTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
+			buildPhases = (
+				C00846AC87991264F718F979 /* [CP] Check Pods Manifest.lock */,
+				331C807D294A63A400263BE5 /* Sources */,
+				331C807F294A63A400263BE5 /* Resources */,
+				F2E06228E67125781CA22189 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				331C8086294A63A400263BE5 /* PBXTargetDependency */,
+			);
+			name = RunnerTests;
+			productName = RunnerTests;
+			productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
 		97C146ED1CF9000F007C117D /* Runner */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				A8A85203FBB941218E2F8D84 /* [CP] Check Pods Manifest.lock */,
+				DAD0FD65371EA294E653BA12 /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				799C36E39E610E1373C1F82C /* [CP] Embed Pods Frameworks */,
-				1D813BBD2663768100FB3CCB /* ShellScript */,
-				1D813BBE266376D800FB3CCB /* ShellScript */,
-				D0AAF1C9F5956B33A2B50244 /* [CP] Copy Pods Resources */,
+				34ED139FE355461A943CC3C4 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -167,6 +221,10 @@
 				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
+					331C8080294A63A400263BE5 = {
+						CreatedOnToolsVersion = 14.0;
+						TestTargetID = 97C146ED1CF9000F007C117D;
+					};
 					97C146ED1CF9000F007C117D = {
 						CreatedOnToolsVersion = 7.3.1;
 						LastSwiftMigration = 1100;
@@ -187,18 +245,26 @@
 			projectRoot = "";
 			targets = (
 				97C146ED1CF9000F007C117D /* Runner */,
+				331C8080294A63A400263BE5 /* RunnerTests */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXResourcesBuildPhase section */
+		331C807F294A63A400263BE5 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		97C146EC1CF9000F007C117D /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
-				1DEF30512642D98F00267989 /* GoogleService-Info.plist in Resources */,
+				0F2A45092CA421C8008243CF /* GoogleService-Info.plist in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
 			);
@@ -207,39 +273,22 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		1D813BBD2663768100FB3CCB /* ShellScript */ = {
+		34ED139FE355461A943CC3C4 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/FirebaseCrashlytics/run\"\n";
-		};
-		1D813BBE266376D800FB3CCB /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
+			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
-			);
-			outputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/FirebaseCrashlytics/upload-symbols\" -gsp \"${PROJECT_DIR}/Runner/GoogleService-Info.plist\" -p ios \"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
 		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -255,28 +304,12 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n";
-		};
-		799C36E39E610E1373C1F82C /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 12;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
@@ -286,9 +319,9 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "xattr -cr .\n/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
 		};
-		A8A85203FBB941218E2F8D84 /* [CP] Check Pods Manifest.lock */ = {
+		C00846AC87991264F718F979 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -303,33 +336,46 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+				"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D0AAF1C9F5956B33A2B50244 /* [CP] Copy Pods Resources */ = {
+		DAD0FD65371EA294E653BA12 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "[CP] Copy Pods Resources";
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
+		331C807D294A63A400263BE5 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		97C146EA1CF9000F007C117D /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -341,6 +387,14 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXTargetDependency section */
+		331C8086294A63A400263BE5 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 97C146ED1CF9000F007C117D /* Runner */;
+			targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
 /* Begin PBXVariantGroup section */
 		97C146FA1CF9000F007C117D /* Main.storyboard */ = {
 			isa = PBXVariantGroup;
@@ -366,7 +420,6 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -392,12 +445,12 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: rubentalstra@icloud.com (3952Q9R8FB)";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -406,10 +459,10 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
-				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
+				SUPPORTED_PLATFORMS = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -421,16 +474,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = A8S2486A44;
 				ENABLE_BITCODE = NO;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.education";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -438,8 +485,10 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.caelitechnologies.rotary-nl-rye";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -447,12 +496,64 @@
 			};
 			name = Profile;
 		};
+		331C8088294A63A400263BE5 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 9A35D813CF6D29E1A571FAD2 /* Pods-RunnerTests.debug.xcconfig */;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.caelitechnologies.rotaryNlRye.RunnerTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
+			};
+			name = Debug;
+		};
+		331C8089294A63A400263BE5 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 4D77A6F06ED7C04F9A34F311 /* Pods-RunnerTests.release.xcconfig */;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.caelitechnologies.rotaryNlRye.RunnerTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
+			};
+			name = Release;
+		};
+		331C808A294A63A400263BE5 /* Profile */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7A96AD0864F3F41894570A6E /* Pods-RunnerTests.profile.xcconfig */;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.caelitechnologies.rotaryNlRye.RunnerTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
+			};
+			name = Profile;
+		};
 		97C147031CF9000F007C117D /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -478,12 +579,12 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: rubentalstra@icloud.com (3952Q9R8FB)";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -498,7 +599,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -510,8 +611,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -537,12 +637,12 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: rubentalstra@icloud.com (3952Q9R8FB)";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -551,10 +651,10 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
-				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
+				SUPPORTED_PLATFORMS = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -568,16 +668,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_ENTITLEMENTS = Runner/RunnerDebug.entitlements;
-				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = A8S2486A44;
 				ENABLE_BITCODE = NO;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.education";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -585,8 +679,10 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.caelitechnologies.rotary-nl-rye";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -601,16 +697,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_ENTITLEMENTS = Runner/RunnerRelease.entitlements;
-				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = A8S2486A44;
 				ENABLE_BITCODE = NO;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.education";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -618,8 +708,10 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.caelitechnologies.rotary-nl-rye";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -630,6 +722,16 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
+		331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				331C8088294A63A400263BE5 /* Debug */,
+				331C8089294A63A400263BE5 /* Release */,
+				331C808A294A63A400263BE5 /* Profile */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
diff --git a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
old mode 100755
new mode 100644
diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
old mode 100755
new mode 100644
diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
old mode 100755
new mode 100644
diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
old mode 100755
new mode 100644
index 68923119..8e3ca5df
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -37,12 +37,23 @@
          </BuildableReference>
       </MacroExpansion>
       <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "331C8080294A63A400263BE5"
+               BuildableName = "RunnerTests.xctest"
+               BlueprintName = "RunnerTests"
+               ReferencedContainer = "container:Runner.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = ""
-      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
new file mode 100644
index 00000000..f9b0d7c5
--- /dev/null
+++ b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,8 @@
+<?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>PreviewsEnabled</key>
+	<false/>
+</dict>
+</plist>
diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift
old mode 100755
new mode 100644
index 5d4cffc5..3e42701c
--- a/ios/Runner/AppDelegate.swift
+++ b/ios/Runner/AppDelegate.swift
@@ -1,6 +1,6 @@
-import UIKit
 import Flutter
-import Firebase
+import UIKit
+import Firebase  // Add this import
 
 @main
 @objc class AppDelegate: FlutterAppDelegate {
@@ -8,12 +8,11 @@ import Firebase
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
-      FirebaseApp.configure()
-    if #available(iOS 10.0, *) {
-      UNUserNotificationCenter.current().delegate = self as UNUserNotificationCenterDelegate
-    }
-
+    FirebaseApp.configure()  // Initialize Firebase
+      if #available(iOS 10.0, *) {
+        UNUserNotificationCenter.current().delegate = self as UNUserNotificationCenterDelegate
+      }
     GeneratedPluginRegistrant.register(with: self)
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }
-}
+}
\ No newline at end of file
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
old mode 100755
new mode 100644
index d36b1fab..d0d98aa1
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,122 +1 @@
-{
-  "images" : [
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
+{"images":[{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@3x.png","scale":"3x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@1x.png","scale":"1x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@1x.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@1x.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@1x.png","scale":"1x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@2x.png","scale":"2x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@1x.png","scale":"1x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@1x.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"Icon-App-83.5x83.5@2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"Icon-App-1024x1024@1x.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}}
\ No newline at end of file
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
old mode 100755
new mode 100644
index b40b38c1..4f6ddc12
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
old mode 100755
new mode 100644
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
old mode 100755
new mode 100644
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
old mode 100755
new mode 100644
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
old mode 100755
new mode 100644
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
old mode 100755
new mode 100644
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
old mode 100755
new mode 100644
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
old mode 100755
new mode 100644
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png
new file mode 100644
index 00000000..c38f61f9
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png
new file mode 100644
index 00000000..a6472cc2
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png
new file mode 100644
index 00000000..2a5c134e
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png
new file mode 100644
index 00000000..315e652f
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
old mode 100755
new mode 100644
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
old mode 100755
new mode 100644
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png
new file mode 100644
index 00000000..98dc0484
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png
new file mode 100644
index 00000000..7a1eb263
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
old mode 100755
new mode 100644
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
old mode 100755
new mode 100644
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
old mode 100755
new mode 100644
diff --git a/ios/Runner/Assets.xcassets/Contents.json b/ios/Runner/Assets.xcassets/Contents.json
deleted file mode 100644
index 73c00596..00000000
--- a/ios/Runner/Assets.xcassets/Contents.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
old mode 100755
new mode 100644
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
old mode 100755
new mode 100644
index d2b56242..02c785a6
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
old mode 100755
new mode 100644
index 63234f5f..acde70d1
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
old mode 100755
new mode 100644
index 95ad1fa8..a0df5237
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/LaunchImage.imageset/README.md b/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
old mode 100755
new mode 100644
diff --git a/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard
old mode 100755
new mode 100644
diff --git a/ios/Runner/Base.lproj/Main.storyboard b/ios/Runner/Base.lproj/Main.storyboard
old mode 100755
new mode 100644
index 4db6861c..41b7ba9d
--- a/ios/Runner/Base.lproj/Main.storyboard
+++ b/ios/Runner/Base.lproj/Main.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19115.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
-    <device id="retina6_7" orientation="portrait" appearance="light"/>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19107.4"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -16,14 +16,14 @@
                         <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-16" y="-6"/>
+            <point key="canvasLocation" x="-16" y="-40"/>
         </scene>
     </scenes>
 </document>
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 3f2e8135..77ff076e 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -2,6 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 	<dict>
+		<!-- Core Information -->
 		<key>CFBundleDevelopmentRegion</key>
 		<string>$(DEVELOPMENT_LANGUAGE)</string>
 		<key>CFBundleDisplayName</key>
@@ -28,11 +29,11 @@
 		<string>$(FLUTTER_BUILD_NAME)</string>
 		<key>CFBundleSignature</key>
 		<string>????</string>
-		<key>LSApplicationQueriesSchemes</key>
-		<array>
-			<string>sms</string>
-			<string>tel</string>
-		</array>
+		<key>CFBundleVersion</key>
+		<string>$(FLUTTER_BUILD_NUMBER)</string>
+		<key>LSRequiresIPhoneOS</key>
+		<true/>
+		<!-- URL Schemes and App-Specific URLs -->
 		<key>CFBundleURLTypes</key>
 		<array>
 			<dict>
@@ -46,26 +47,34 @@
 				</array>
 			</dict>
 		</array>
-		<key>CFBundleVersion</key>
-		<string>$(FLUTTER_BUILD_NUMBER)</string>
+		<!-- Supported URL Schemes -->
 		<key>LSApplicationQueriesSchemes</key>
 		<array>
 			<string>https</string>
 			<string>http</string>
+			<string>sms</string>
+			<string>tel</string>
+			<string>comgooglemaps</string>
+			<string>baidumap</string>
+			<string>iosamap</string>
+			<string>waze</string>
+			<string>yandexmaps</string>
+			<string>yandexnavi</string>
+			<string>citymapper</string>
+			<string>mapswithme</string>
+			<string>osmandmaps</string>
+			<string>dgis</string>
+			<string>qqmap</string>
+			<string>here-location</string>
+			<string>tomtomgo</string>
+			<string>copilot</string>
+			<string>com.sygic.aura</string>
+			<string>nmap</string>
+			<string>kakaomap</string>
+			<string>tmap</string>
+			<string>szn-mapy</string>
 		</array>
-		<key>FirebaseDynamicLinksCustomDomains</key>
-		<array>
-			<string>https://rotarytestnl.page.link</string>
-			<string>https://rotarynl.page.link</string>
-			<!-- <string>https://rotary.nl/yep</string> -->
-		</array>
-		<key>LSRequiresIPhoneOS</key>
-		<true/>
-		<key>UIBackgroundModes</key>
-		<array>
-			<string>fetch</string>
-			<string>remote-notification</string>
-		</array>
+		<!-- Launch Screen and Interface -->
 		<key>UILaunchStoryboardName</key>
 		<string>LaunchScreen</string>
 		<key>UIMainStoryboardFile</key>
@@ -89,31 +98,21 @@
 		</array>
 		<key>UIViewControllerBasedStatusBarAppearance</key>
 		<false/>
-		<key>CADisableMinimumFrameDurationOnPhone</key>
-		<true/>
+		<!-- Access to Device Features -->
+		<key>NSCameraUsageDescription</key>
+		<string>This app requires access to the camera to take pictures.</string>
+		<key>NSPhotoLibraryUsageDescription</key>
+		<string>This app requires access to the photo library to upload images.</string>
+		<key>NSLocationWhenInUseUsageDescription</key>
+		<string>This app needs access to your location to provide map-based services.</string>
+		<key>NSLocationAlwaysUsageDescription</key>
+		<string>This app needs to track your location even when not in use to provide background services.</string>
+		<key>NSMicrophoneUsageDescription</key>
+		<string>This app needs access to the microphone for audio recording features.</string>
+		<!-- Other Required Permissions -->
 		<key>UIApplicationSupportsIndirectInputEvents</key>
 		<true/>
-		<key>LSApplicationQueriesSchemes</key>
-<array>
-    <string>comgooglemaps</string>
-    <string>baidumap</string>
-    <string>iosamap</string>
-    <string>waze</string>
-    <string>yandexmaps</string>
-    <string>yandexnavi</string>
-    <string>citymapper</string>
-    <string>mapswithme</string>
-    <string>osmandmaps</string>
-    <string>dgis</string>
-    <string>qqmap</string>
-    <string>here-location</string>
-    <string>tomtomgo</string>
-    <string>copilot</string>
-    <string>com.sygic.aura</string>
-    <string>nmap</string>
-    <string>kakaomap</string>
-    <string>tmap</string>
-    <string>szn-mapy</string>
-</array>
+		<key>CADisableMinimumFrameDurationOnPhone</key>
+		<true/>
 	</dict>
 </plist>
diff --git a/ios/Runner/Runner-Bridging-Header.h b/ios/Runner/Runner-Bridging-Header.h
old mode 100755
new mode 100644
diff --git a/ios/Runner/Runner.entitlements b/ios/Runner/Runner.entitlements
deleted file mode 100644
index 5f4b28cb..00000000
--- a/ios/Runner/Runner.entitlements
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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>aps-environment</key>
-	<string>development</string>
-	<key>com.apple.developer.associated-domains</key>
-	<array>
-		<string>applinks:rotarytestnl.page.link</string>
-		<string>applinks:rotary.nl/yep</string>
-		<string>applinks:rotarynl.page.link</string>
-	</array>
-</dict>
-</plist>
diff --git a/ios/Runner/RunnerDebug.entitlements b/ios/Runner/RunnerDebug.entitlements
deleted file mode 100644
index 5f4b28cb..00000000
--- a/ios/Runner/RunnerDebug.entitlements
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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>aps-environment</key>
-	<string>development</string>
-	<key>com.apple.developer.associated-domains</key>
-	<array>
-		<string>applinks:rotarytestnl.page.link</string>
-		<string>applinks:rotary.nl/yep</string>
-		<string>applinks:rotarynl.page.link</string>
-	</array>
-</dict>
-</plist>
diff --git a/ios/Runner/RunnerRelease.entitlements b/ios/Runner/RunnerRelease.entitlements
deleted file mode 100644
index 3a45cab9..00000000
--- a/ios/Runner/RunnerRelease.entitlements
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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>aps-environment</key>
-	<string>production</string>
-	<key>com.apple.developer.associated-domains</key>
-	<array>
-		<string>applinks:rotarytestnl.page.link</string>
-		<string>applinks:rotary.nl/yep</string>
-		<string>applinks:rotarynl.page.link</string>
-	</array>
-</dict>
-</plist>
diff --git a/ios/RunnerTests/RunnerTests.swift b/ios/RunnerTests/RunnerTests.swift
new file mode 100644
index 00000000..86a7c3b1
--- /dev/null
+++ b/ios/RunnerTests/RunnerTests.swift
@@ -0,0 +1,12 @@
+import Flutter
+import UIKit
+import XCTest
+
+class RunnerTests: XCTestCase {
+
+  func testExample() {
+    // If you add code to the Runner application, consider adding tests here.
+    // See https://developer.apple.com/documentation/xctest for more information about using XCTest.
+  }
+
+}
diff --git a/lib/core/custom_routes.dart b/lib/core/custom_routes.dart
deleted file mode 100644
index 92cd5105..00000000
--- a/lib/core/custom_routes.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-// 🐦 Flutter imports:
-import 'package:flutter/material.dart';
-
-// 🌎 Project imports:
-import 'firebase/firebase_dynamic_links.dart';
-
-var customRoutes = <String, WidgetBuilder>{
-  '/error': (context) => ErrorPage(),
-};
diff --git a/lib/core/data/datasources/firestore.dart b/lib/core/data/datasources/firestore.dart
deleted file mode 100644
index e93d691d..00000000
--- a/lib/core/data/datasources/firestore.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-// 📦 Package imports:
-import 'package:cloud_firestore/cloud_firestore.dart';
-import 'package:firebase_auth/firebase_auth.dart';
-
-// 🌎 Project imports:
-import 'package:rotary_nl_rye/core/data/datasources/config.dart';
-
-class FireStoreUrls {
-  static Future<String> getUrl(String key) async {
-    FirebaseAuth.instance.signInAnonymously();
-    try {
-      final urls = await FirebaseFirestore.instance
-          .collection(Config.fbDataCollectionKey)
-          .doc(Config.fbDataDocumentKey)
-          .get();
-      return urls.data()![key];
-    } catch (e) {
-      throw 'unable to fetch and parse FirestoreUrl $e';
-    }
-  }
-}
diff --git a/lib/core/data/datasources/http.dart b/lib/core/data/datasources/http.dart
index 5bcb425f..1fcf2f87 100644
--- a/lib/core/data/datasources/http.dart
+++ b/lib/core/data/datasources/http.dart
@@ -1,24 +1,31 @@
 // 📦 Package imports:
-import 'package:http/http.dart' as http;
+import 'package:dio/dio.dart';
 
 class ApiResponse {
+  final Dio _dio = Dio();
+
   Future<String> getBody(String url) async {
-    http.Response? response;
+    Response<String>? response;
+
     try {
-      response = await http.get(
-        Uri.parse(url),
-        headers: {
-          'Content-Type': 'application/json',
-        },
+      // Send GET request using Dio
+      response = await _dio.get(
+        url,
+        options: Options(
+          headers: {
+            'Content-Type': 'application/json',
+          },
+        ),
       );
     } catch (e) {
-      throw Exception('unable to fetch from url $e');
+      // Handle Dio-specific exceptions
+      throw Exception('Unable to fetch from url: $e');
     }
 
     if (response.statusCode != 200) {
-      throw 'response ${response.statusCode}';
+      throw Exception('Error: Response status code ${response.statusCode}');
     }
 
-    return response.body;
+    return response.data ?? '';
   }
 }
diff --git a/lib/core/data/initData.dart b/lib/core/data/initData.dart
deleted file mode 100644
index 1c5b25e4..00000000
--- a/lib/core/data/initData.dart
+++ /dev/null
@@ -1,49 +0,0 @@
-// 🌎 Project imports:
-import 'package:rotary_nl_rye/core/data/datasources/cache.dart';
-import 'package:rotary_nl_rye/core/data/datasources/config.dart';
-import 'package:rotary_nl_rye/core/data/datasources/http.dart';
-import 'package:rotary_nl_rye/core/data/repository/header_image_repository_impl.dart';
-import 'package:rotary_nl_rye/core/data/repository/news_repository_impl.dart';
-import 'package:rotary_nl_rye/core/data/repository/stories_repository_impl.dart';
-
-class Repo {
-  final ApiResponse apiResponse = new ApiResponse();
-  final Cache cache = new Cache();
-
-  Future<void> initData(String studentExchangeYear, String studentName) async {
-    print('initData');
-    if (studentExchangeYear != '' && studentName != '') {
-      await StoriesRepositoryImpl()
-          .cacheStories(studentExchangeYear, studentName);
-    }
-    if (!(await isDataPresent()) || await isTooOld()) {
-      await cacheData();
-    }
-  }
-
-  Future<void> cacheData() async {
-    await cache.clear();
-    await HeaderImageRepositoryImpl().cacheImageHeader();
-    await NewsRepositoryImpl().cacheNews();
-    // await ExchangeStudentsRepositoryImpl().cacheExchangeStudents();
-    await cache.store(
-        Config.spLastUpdateKey, DateTime.now().millisecondsSinceEpoch);
-  }
-
-  Future<bool> isDataPresent() async {
-    final Set<String> keys = await cache.getKeys();
-    return keys.contains(Config.spLastUpdateKey);
-  }
-
-  Future<bool> isTooOld() async {
-    DateTime dateTime = await getLastUpdate();
-    final age = dateTime.difference(DateTime.now());
-    return age > Config.maxAge;
-  }
-
-  Future<DateTime> getLastUpdate() async {
-    final int lastUpdate = await cache.getByKey(Config.spLastUpdateKey) as int;
-    final DateTime dateTime = DateTime.fromMillisecondsSinceEpoch(lastUpdate);
-    return dateTime;
-  }
-}
diff --git a/lib/core/data/repository/exchange_students.dart b/lib/core/data/repository/exchange_students.dart
deleted file mode 100644
index 7b465b16..00000000
--- a/lib/core/data/repository/exchange_students.dart
+++ /dev/null
@@ -1,70 +0,0 @@
-// 🎯 Dart imports:
-import 'dart:async';
-import 'dart:convert';
-
-// 🌎 Project imports:
-import 'package:rotary_nl_rye/core/data/datasources/cache.dart';
-import 'package:rotary_nl_rye/core/data/datasources/config.dart';
-import 'package:rotary_nl_rye/core/data/datasources/firestore.dart';
-import 'package:rotary_nl_rye/core/data/datasources/http.dart';
-import 'package:rotary_nl_rye/core/domain/entities/exchange_student.dart';
-import 'package:rotary_nl_rye/core/domain/repository/exchange_student_repository.dart';
-import '../initData.dart';
-
-class ExchangeStudentsRepositoryImpl implements ExchangeStudentRepository {
-  final _controller = StreamController<List<ExchangeStudent>>.broadcast();
-  final Cache cache = new Cache();
-
-  @override
-  get exchangeStudents => _controller.stream;
-
-  @override
-  Future<void> dispose() async {
-    await _controller.close();
-  }
-
-  Future<List<ExchangeStudent>> get() async {
-    await Repo().initData('', '');
-
-    List<ExchangeStudent> exchangeStudents = await getExchangeStudentsNews();
-    _controller.sink.add(exchangeStudents);
-
-    return exchangeStudents;
-  }
-
-  Future<List<ExchangeStudent>> getExchangeStudentsNews() async {
-    final List temp =
-        json.decode(await cache.getByKey(Config.spExchangeStudentsKey));
-    final List<ExchangeStudent> exchangeStudents = [];
-    temp.forEach((json) {
-      exchangeStudents.add(ExchangeStudent.fromJson(json));
-    });
-    return exchangeStudents;
-  }
-
-  Future<void> cacheExchangeStudents() async {
-    String data = await getExchangeStudentsData();
-
-    List<ExchangeStudent> exchangeStudents = encodeExchangeStudents(data);
-
-    await cache.store(
-        Config.spExchangeStudentsKey, json.encode(exchangeStudents));
-  }
-
-  Future<String> getExchangeStudentsData() async {
-    final ApiResponse apiResponse = new ApiResponse();
-    final String url = await FireStoreUrls.getUrl(Config.fbExchangeStudentsKey);
-    final String data = await apiResponse.getBody(url);
-    return data;
-  }
-
-  List<ExchangeStudent> encodeExchangeStudents(String data) {
-    final List decoded =
-        json.decode(data)[Config.apiExchangeStudentsKey] as List;
-    final List<ExchangeStudent> exchangeStudents = [];
-    for (Map<String, dynamic> item in decoded) {
-      exchangeStudents.add(ExchangeStudent.fromJson(item));
-    }
-    return exchangeStudents;
-  }
-}
diff --git a/lib/core/data/repository/header_image_repository_impl.dart b/lib/core/data/repository/header_image_repository_impl.dart
deleted file mode 100644
index ce3b0ce8..00000000
--- a/lib/core/data/repository/header_image_repository_impl.dart
+++ /dev/null
@@ -1,44 +0,0 @@
-// 🎯 Dart imports:
-import 'dart:async';
-import 'dart:convert';
-
-// 🌎 Project imports:
-import 'package:rotary_nl_rye/core/data/datasources/cache.dart';
-import 'package:rotary_nl_rye/core/data/datasources/config.dart';
-import 'package:rotary_nl_rye/core/data/datasources/firestore.dart';
-import 'package:rotary_nl_rye/core/domain/entities/image.dart';
-import 'package:rotary_nl_rye/core/domain/repository/header_image_repository.dart';
-import '../initData.dart';
-
-class HeaderImageRepositoryImpl implements HeaderImageRepository{
-  final _controller = StreamController<HeaderImage>.broadcast();
-  final Cache cache = new Cache();
-
-  @override
-  get headerImage => _controller.stream;
-
-  @override
-  Future<void> dispose() async {
-    await _controller.close();
-  }
-
-  Future<HeaderImage> getHeaderImageData() async {
-    await Repo().initData('', '');
-
-    HeaderImage headerImage = await getCachedHeaderImage();
-    _controller.sink.add(headerImage);
-
-    return headerImage;
-  }
-
-  Future<HeaderImage> getCachedHeaderImage() async {
-    final HeaderImage headerImage = json.decode(await cache.getByKey(Config.spImageHeaderKey));
-    return headerImage;
-  }
-
-  Future<void> cacheImageHeader() async {
-    final String url = await FireStoreUrls.getUrl(Config.fbImageHeaderKey);
-
-    await cache.store(Config.spImageHeaderKey, url);
-  }
-}
diff --git a/lib/core/data/repository/news_repository_impl.dart b/lib/core/data/repository/news_repository_impl.dart
deleted file mode 100644
index 75ea290f..00000000
--- a/lib/core/data/repository/news_repository_impl.dart
+++ /dev/null
@@ -1,65 +0,0 @@
-// 🎯 Dart imports:
-import 'dart:async';
-import 'dart:convert';
-
-// 🌎 Project imports:
-import 'package:rotary_nl_rye/core/data/datasources/cache.dart';
-import 'package:rotary_nl_rye/core/data/datasources/config.dart';
-import 'package:rotary_nl_rye/core/data/datasources/firestore.dart';
-import 'package:rotary_nl_rye/core/data/datasources/http.dart';
-import 'package:rotary_nl_rye/core/domain/entities/news.dart';
-import 'package:rotary_nl_rye/core/domain/repository/news_repository.dart';
-import '../initData.dart';
-
-class NewsRepositoryImpl implements NewsRepository {
-  final _controller = StreamController<List<News>>.broadcast();
-  final Cache cache = new Cache();
-
-  @override
-  get news => _controller.stream;
-
-  @override
-  Future<void> dispose() async {
-    await _controller.close();
-  }
-
-  Future<List<News>> get() async {
-    await Repo().initData('', '');
-
-    List<News> news = await getCachedNews();
-    _controller.sink.add(news);
-
-    return news;
-  }
-
-  Future<List<News>> getCachedNews() async {
-    final List temp = json.decode(await cache.getByKey(Config.spNewsKey));
-    final List<News> news = [];
-    temp.forEach((json) {news.add(News.fromJson(json));});
-    return news;
-  }
-
-  Future<void> cacheNews() async {
-    String data = await getNewsData();
-
-    List<News> news = encodeNews(data);
-
-    await cache.store(Config.spNewsKey, json.encode(news));
-  }
-
-  Future<String> getNewsData() async {
-    final ApiResponse apiResponse = new ApiResponse();
-    final String url = await FireStoreUrls.getUrl(Config.fbNewsKey);
-    final String data = await apiResponse.getBody(url);
-    return data;
-  }
-
-  List<News> encodeNews(String data) {
-    final List decoded = json.decode(data)[Config.apiNewsKey] as List;
-    final List<News> news = [];
-    for (Map<String, dynamic> item in decoded) {
-      news.add(News.fromJson(item));
-    }
-    return news;
-  }
-}
diff --git a/lib/core/data/repository/stories_repository_impl.dart b/lib/core/data/repository/stories_repository_impl.dart
deleted file mode 100644
index 8686ef74..00000000
--- a/lib/core/data/repository/stories_repository_impl.dart
+++ /dev/null
@@ -1,66 +0,0 @@
-// 🎯 Dart imports:
-import 'dart:async';
-import 'dart:convert';
-
-// 🌎 Project imports:
-import 'package:rotary_nl_rye/core/data/datasources/cache.dart';
-import 'package:rotary_nl_rye/core/data/datasources/http.dart';
-import 'package:rotary_nl_rye/core/domain/entities/exchange_student.dart';
-import 'package:rotary_nl_rye/core/domain/entities/story.dart';
-import 'package:rotary_nl_rye/core/domain/repository/stories_repository.dart';
-import '../initData.dart';
-
-class StoriesRepositoryImpl implements StoriesRepository {
-  final _controller = StreamController<List<Story>>.broadcast();
-  final Cache cache = new Cache();
-
-  @override
-  getStoriesOf(ExchangeStudent exchangeStudent) => _controller.stream;
-
-  @override
-  Future<void> dispose() async {
-    await _controller.close();
-  }
-
-  Future<List<Story>> get(String studentExchangeYear, String studentName) async {
-    await Repo().initData(studentExchangeYear, studentName);
-
-    List<Story> stories = await getCachedStories(studentExchangeYear, studentName);
-    _controller.sink.add(stories);
-
-    return stories;
-  }
-
-  Future<void> cacheStories(String studentExchangeYear, String studentName) async {
-    String data = await getStoriesData(studentExchangeYear, studentName);
-
-    List<Story> stories = encodeStories(data);
-
-    await cache.store(studentExchangeYear + studentName, json.encode(stories));
-  }
-
-  Future<List<Story>> getCachedStories(String studentExchangeYear, String studentName) async {
-    final List temp = json.decode(await cache.getByKey(studentExchangeYear + studentName));
-    final List<Story> stories = [];
-    temp.forEach((json) {
-      stories.add(Story.fromJson(json));
-    });
-    return stories;
-  }
-
-  Future<String> getStoriesData(String studentExchangeYear, String studentName) async {
-    final ApiResponse apiResponse = new ApiResponse();
-    final String url = "https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/rebounds/students/$studentExchangeYear/${studentName.replaceAll(" ","_").toLowerCase()}.json";
-    final String data = await apiResponse.getBody(url);
-    return data;
-  }
-
-  List<Story> encodeStories(String data) {
-    final List decoded = json.decode(data)['stories'] as List;
-    final List<Story> stories = [];
-    for (Map<String, dynamic> item in decoded) {
-      stories.add(Story.fromJson(item));
-    }
-    return stories;
-  }
-}
diff --git a/lib/core/domain/StudentsBloc.dart b/lib/core/domain/StudentsBloc.dart
index 0977567b..1846ced4 100644
--- a/lib/core/domain/StudentsBloc.dart
+++ b/lib/core/domain/StudentsBloc.dart
@@ -1,6 +1,11 @@
+// 🎯 Dart imports:
 import 'dart:async';
 import 'dart:convert';
+
+// 🐦 Flutter imports:
 import 'package:flutter/services.dart';
+
+// 🌎 Project imports:
 import 'entities/exchange_student.dart';
 
 class StudentsBloc {
diff --git a/lib/core/domain/news.dart b/lib/core/domain/news.dart
index 7d64cd3b..a7ab4e00 100644
--- a/lib/core/domain/news.dart
+++ b/lib/core/domain/news.dart
@@ -1,37 +1,52 @@
 // 🎯 Dart imports:
 import 'dart:async';
-import 'dart:convert';
+
+// 📦 Package imports:
+import 'package:dio/dio.dart';
 
 // 🌎 Project imports:
-import 'package:rotary_nl_rye/core/data/datasources/cache.dart';
-import 'package:rotary_nl_rye/core/data/datasources/config.dart';
-import 'package:rotary_nl_rye/core/data/initData.dart';
 import 'entities/news.dart';
 
 class NewsBloc {
-  final _headerController = StreamController<String>.broadcast();
   final _newsController = StreamController<List<News>>.broadcast();
+  final Dio _dio = Dio(); // Create an instance of Dio
 
-  final Cache cache = new Cache();
-
-  get header => _headerController.stream;
   get news => _newsController.stream;
 
-  Future<List<News>> getNewsData() async {
-    await Repo().initData('', '');
-    final String imageHeader = await cache.getByKey(Config.spImageHeaderKey);
-    _headerController.sink.add(imageHeader);
+  final String url =
+      'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/news/news.json';
 
-    final List temp = json.decode(await cache.getByKey(Config.spNewsKey));
-    final List<News> news = [];
-    temp.forEach((json) {news.add(News.fromJson(json));});
-    _newsController.sink.add(news);
-
-    return news;
+  Future<List<News>> getNewsData() async {
+    try {
+      // Fetch the news data from the URL using Dio
+      final response = await _dio.get(url);
+
+      if (response.statusCode == 200) {
+        // Decode the response as a Map
+        final Map<String, dynamic> jsonResponse = response.data;
+
+        // Access the 'news' field which contains the list of news items
+        final List<dynamic> newsList = jsonResponse['news'];
+
+        // Convert the list to List<News> using the News model
+        final List<News> news =
+            newsList.map((json) => News.fromJson(json)).toList();
+
+        _newsController.sink.add(news);
+
+        return news;
+      } else {
+        throw Exception('Failed to load news data');
+      }
+    } catch (e) {
+      // Handle errors and optionally add logging here
+      print('Error fetching news data: $e');
+      _newsController.sink.addError(e);
+      return [];
+    }
   }
 
   Future<void> dispose() async {
     await _newsController.close();
-    await _headerController.close();
   }
 }
diff --git a/lib/core/domain/repository/exchange_student_repository.dart b/lib/core/domain/repository/exchange_student_repository.dart
deleted file mode 100644
index 113cb3d6..00000000
--- a/lib/core/domain/repository/exchange_student_repository.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// 🎯 Dart imports:
-import 'dart:async';
-
-// 🌎 Project imports:
-import 'package:rotary_nl_rye/core/domain/entities/exchange_student.dart';
-
-abstract class ExchangeStudentRepository {
-  Stream<List<ExchangeStudent>> get exchangeStudents;
-
-  Future<void> dispose();
-}
diff --git a/lib/core/domain/repository/header_image_repository.dart b/lib/core/domain/repository/header_image_repository.dart
deleted file mode 100644
index 03e9b763..00000000
--- a/lib/core/domain/repository/header_image_repository.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// 🎯 Dart imports:
-import 'dart:async';
-
-// 🌎 Project imports:
-import 'package:rotary_nl_rye/core/domain/entities/image.dart';
-
-abstract class HeaderImageRepository {
-  Stream<HeaderImage> get headerImage;
-
-  Future<void> dispose();
-}
diff --git a/lib/core/domain/repository/news_repository.dart b/lib/core/domain/repository/news_repository.dart
deleted file mode 100644
index efd3942b..00000000
--- a/lib/core/domain/repository/news_repository.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// 🎯 Dart imports:
-import 'dart:async';
-
-// 🌎 Project imports:
-import 'package:rotary_nl_rye/core/domain/entities/news.dart';
-
-abstract class NewsRepository {
-  Stream<List<News>> get news;
-
-  Future<void> dispose();
-}
diff --git a/lib/core/domain/repository/stories_repository.dart b/lib/core/domain/repository/stories_repository.dart
deleted file mode 100644
index 6f589f8d..00000000
--- a/lib/core/domain/repository/stories_repository.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// 🎯 Dart imports:
-import 'dart:async';
-
-// 🌎 Project imports:
-import 'package:rotary_nl_rye/core/domain/entities/exchange_student.dart';
-import 'package:rotary_nl_rye/core/domain/entities/story.dart';
-
-abstract class StoriesRepository {
-  Stream<List<Story>> getStoriesOf(ExchangeStudent exchangeStudent);
-
-  Future<void> dispose();
-}
diff --git a/lib/core/error/exceptions.dart b/lib/core/error/exceptions.dart
deleted file mode 100644
index 33802710..00000000
--- a/lib/core/error/exceptions.dart
+++ /dev/null
@@ -1,4 +0,0 @@
-// TODO messages
-class ServerException implements Exception {}
-
-class CacheException implements Exception {}
\ No newline at end of file
diff --git a/lib/core/error/failures.dart b/lib/core/error/failures.dart
deleted file mode 100644
index d752bcd0..00000000
--- a/lib/core/error/failures.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// 📦 Package imports:
-import 'package:equatable/equatable.dart';
-
-abstract class Failure extends Equatable {
-  final List properties = const [];
-  Failure([properties]);
-
-
-  @override
-  List<Object> get props => [properties];
-}
-
-// General failures
-class ServerFailure extends Failure {}
-
-class CacheFailure extends Failure {}
diff --git a/lib/core/firebase/check_update.dart b/lib/core/firebase/check_update.dart
deleted file mode 100644
index 5e36e0f4..00000000
--- a/lib/core/firebase/check_update.dart
+++ /dev/null
@@ -1,113 +0,0 @@
-// 🎯 Dart imports:
-import 'dart:io';
-
-// 🐦 Flutter imports:
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-
-// 📦 Package imports:
-import 'package:firebase_remote_config/firebase_remote_config.dart';
-import 'package:package_info_plus/package_info_plus.dart';
-import 'package:url_launcher/url_launcher_string.dart';
-
-const APP_STORE_URL =
-    'https://phobos.apple.com/WebObjects/MZStore.woa/wa/viewSoftwareUpdate?id=1567096118&mt=8';
-const PLAY_STORE_URL =
-    'https://play.google.com/store/apps/details?id=com.caelitechnologies.rotary_nl_rye';
-
-versionCheck(context) async {
-  //Get Current installed version of app
-  final PackageInfo info = await PackageInfo.fromPlatform();
-  double currentVersion = double.parse(info.version.trim().replaceAll('.', '') +
-      info.buildNumber.trim().replaceAll('.', ''));
-
-  //Get Latest version info from firebase config
-  final FirebaseRemoteConfig remoteConfig = FirebaseRemoteConfig.instance;
-
-  try {
-    // Using default duration to force fetching from remote server.
-    await remoteConfig.fetchAndActivate();
-    await remoteConfig.setConfigSettings(RemoteConfigSettings(
-      fetchTimeout: Duration(seconds: 0),
-      minimumFetchInterval: Duration(hours: 1), // caches fetch for 1 hour
-    ));
-    // Version + build
-    String forceUpdateCurrentVersion =
-        remoteConfig.getString('force_update_current_version');
-    // print("forceUpdateCurrentVersion: $forceUpdateCurrentVersion");
-    String forceUpdateCurrentBuild =
-        remoteConfig.getString('force_update_current_build');
-    // print("forceUpdateCurrentBuild: $forceUpdateCurrentBuild");
-
-    double newVersion = double.parse(
-        forceUpdateCurrentVersion.trim().replaceAll('.', '') +
-            forceUpdateCurrentBuild.trim().replaceAll('.', ''));
-
-    print('Firebase Version: $newVersion - currentVersion: $currentVersion');
-
-    // print("newVersion: $newVersion");
-    if (newVersion > currentVersion) {
-      _showVersionDialog(context);
-    }
-  } on PlatformException catch (exception) {
-    // Fetch throttled.
-    print(exception);
-  } catch (exception) {
-    print('EXCEPTION: $exception');
-    print('Unable to fetch remote config. Cached or default values will be '
-        'used');
-  }
-}
-
-//Show Dialog to force user to update
-_showVersionDialog(context) async {
-  await showDialog<String>(
-    context: context,
-    barrierDismissible: false,
-    builder: (BuildContext context) {
-      String title = 'New Update Available';
-      String message =
-          'There is a newer version of app available please update it now.';
-      String btnLabel = 'Update Now';
-      String btnLabelCancel = 'Later';
-      return Platform.isIOS
-          ? new CupertinoAlertDialog(
-              title: Text(title),
-              content: Text(message),
-              actions: <Widget>[
-                TextButton(
-                  child: Text(btnLabel),
-                  onPressed: () => _launchURL(APP_STORE_URL),
-                ),
-                TextButton(
-                  child: Text(btnLabelCancel),
-                  onPressed: () => Navigator.pop(context),
-                ),
-              ],
-            )
-          : new AlertDialog(
-              title: Text(title),
-              content: Text(message),
-              actions: <Widget>[
-                TextButton(
-                  child: Text(btnLabel),
-                  onPressed: () => _launchURL(PLAY_STORE_URL),
-                ),
-                TextButton(
-                  child: Text(btnLabelCancel),
-                  onPressed: () => Navigator.pop(context),
-                ),
-              ],
-            );
-    },
-  );
-}
-
-_launchURL(String url) async {
-  if (await canLaunchUrlString(url)) {
-    await canLaunchUrlString(url);
-  } else {
-    throw 'Could not launch $url';
-  }
-}
diff --git a/lib/core/firebase/firebase_cloud_messaging.dart b/lib/core/firebase/firebase_cloud_messaging.dart
deleted file mode 100644
index fe129a99..00000000
--- a/lib/core/firebase/firebase_cloud_messaging.dart
+++ /dev/null
@@ -1,142 +0,0 @@
-// 🐦 Flutter imports:
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-
-// 📦 Package imports:
-import 'package:firebase_messaging/firebase_messaging.dart';
-import 'package:flutter_app_badger/flutter_app_badger.dart';
-import 'package:flutter_local_notifications/flutter_local_notifications.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-
-// 🌎 Project imports:
-import 'package:rotary_nl_rye/core/domain/entities/news.dart';
-import 'package:rotary_nl_rye/core/domain/news.dart';
-import 'package:rotary_nl_rye/features/news/presentation/pages/non_pdf_news.dart';
-import 'package:rotary_nl_rye/features/news/presentation/widgets/pdf_viewer.dart';
-import 'package:rotary_nl_rye/main.dart';
-
-Future<void> getToken() async {
-  FirebaseMessaging.instance.getToken().then((token) {
-    print(token); // Print the Token in Console
-  });
-}
-
-Future<void> getInitialMessages(BuildContext context) async {
-  NewsBloc _repo = NewsBloc();
-
-  FirebaseMessaging.instance
-      .getInitialMessage()
-      .then((RemoteMessage? message) async {
-    if (message?.data['navigation'] == '/news') {
-      // test
-      final prefs = await SharedPreferences.getInstance();
-      prefs.setInt('newsBadge', 1);
-      // end test
-      _removeBadge();
-      String id = message?.data['id'];
-      print('news id $id');
-      List<News> _newsList = await _repo.getNewsData();
-      print('news fetched ${_newsList[int.parse(id)].toString()}');
-      _newsList[int.parse(id)].isPdf
-          ? Navigator.push(
-              context,
-              MaterialPageRoute(
-                  builder: (context) => PDFPage(
-                      pdfUrl: _newsList[int.parse(id)].pdf!,
-                      data: _newsList[int.parse(id)])),
-            )
-          : Navigator.push(
-              context,
-              MaterialPageRoute(
-                  builder: (context) =>
-                      NonPDFPage(data: _newsList[int.parse(id)])));
-    }
-  });
-}
-
-Future<void> onMessage(BuildContext context) async {
-  FirebaseMessaging.onMessage.listen((RemoteMessage message) async {
-    // test
-    final prefs = await SharedPreferences.getInstance();
-    prefs.setInt('newsBadge', 1);
-// end test
-    RemoteNotification? notification = message.notification;
-    AndroidNotification? android = message.notification?.android;
-    if (notification != null && android != null && !kIsWeb) {
-      flutterLocalNotificationsPlugin.show(
-          notification.hashCode,
-          notification.title,
-          notification.body,
-          NotificationDetails(
-            android: AndroidNotificationDetails(
-              channel.id,
-              channel.name,
-
-              channelDescription: channel.description,
-
-              // TODO add a proper drawable resource to android, for now using
-              //      one that already exists in example app.
-              icon: 'ic_stat_rotary_logo_icon',
-              color: Color(
-                  0xFFf7a81b), // TODO still need to change to a better one
-            ),
-          ));
-    }
-    // print('A new onMessage event was published!');
-    // if (message.data["navigation"] == "/news") {
-    //   String id = message.data["id"];
-    //   print('news id $id');
-    //   List<News> _newsList = await _repo.fetchNews();
-    //   print('news fetched ${_newsList[int.parse(id)].toString()}');
-    //   _newsList[int.parse(id)].isPdf
-    //       ? Navigator.push(
-    //           context,
-    //           MaterialPageRoute(
-    //               builder: (context) => PDFPage(
-    //                   pdfId: _newsList[int.parse(id)],
-    //                   pdfUrl: _newsList[int.parse(id)].pdf!)),
-    //         )
-    //       : Navigator.push(
-    //           context,
-    //           MaterialPageRoute(
-    //               builder: (context) =>
-    //                   NonPDFPage(data: _newsList[int.parse(id)])));
-    // }
-  });
-}
-
-Future<void> onMessageOpenedApp(BuildContext context) async {
-  NewsBloc _repo = NewsBloc();
-
-  FirebaseMessaging.onMessageOpenedApp.listen((RemoteMessage message) async {
-    print('A new onMessageOpenedApp event was published!');
-    if (message.data['navigation'] == '/news') {
-      // test
-      final prefs = await SharedPreferences.getInstance();
-      prefs.setInt('newsBadge', 1);
-// end test
-      String id = message.data['id'];
-      print('news id $id');
-      List<News> _newsList = await _repo.getNewsData();
-      print('news fetched ${_newsList[int.parse(id)].toString()}');
-      _newsList[int.parse(id)].isPdf
-          ? Navigator.push(
-              context,
-              MaterialPageRoute(
-                  builder: (context) => PDFPage(
-                      pdfUrl: _newsList[int.parse(id)].pdf!,
-                      data: _newsList[int.parse(id)])),
-            )
-          : Navigator.push(
-              context,
-              MaterialPageRoute(
-                  builder: (context) =>
-                      NonPDFPage(data: _newsList[int.parse(id)])));
-    }
-    print('onMessage: ${message.data}');
-  });
-}
-
-void _removeBadge() {
-  FlutterAppBadger.removeBadge();
-}
diff --git a/lib/core/firebase/firebase_dynamic_links.dart b/lib/core/firebase/firebase_dynamic_links.dart
deleted file mode 100644
index 50c10f14..00000000
--- a/lib/core/firebase/firebase_dynamic_links.dart
+++ /dev/null
@@ -1,306 +0,0 @@
-// 🎯 Dart imports:
-import 'dart:async';
-
-// 🐦 Flutter imports:
-import 'package:flutter/material.dart';
-
-// 📦 Package imports:
-import 'package:firebase_dynamic_links/firebase_dynamic_links.dart';
-
-// 🌎 Project imports:
-import 'package:rotary_nl_rye/core/domain/entities/news.dart';
-import 'package:rotary_nl_rye/core/domain/news.dart';
-import 'package:rotary_nl_rye/core/presentation/pages/pdf_viewer_share.dart';
-import 'package:rotary_nl_rye/features/news/presentation/pages/non_pdf_news.dart';
-import 'package:rotary_nl_rye/features/news/presentation/widgets/pdf_viewer.dart';
-import 'package:rotary_nl_rye/features/settings/presentation/pages/SocialPage.dart';
-
-Future<void> initDynamicLinks(BuildContext context) async {
-  NewsBloc _repo = NewsBloc();
-  FirebaseDynamicLinks dynamicLinks = FirebaseDynamicLinks.instance;
-
-  //  "onLink" is when the app is open and on the homescreen.
-
-  dynamicLinks.onLink.listen((dynamicLinkData) async {
-    // Navigator.pushNamed(context, dynamicLinkData.link.path);
-
-    final Uri deepLink = dynamicLinkData.link;
-
-    // if (deepLink != null) {
-    final uri = deepLink.path;
-    print('deepLink.path: $uri ');
-    if (deepLink.path == '/helloworld') {
-      // final id = deepLink.queryParameters["id"];
-      // final name = deepLink.queryParameters["name"];
-      Navigator.of(context)
-          .push(MaterialPageRoute(builder: (context) => SocialPage()));
-    }
-    if (deepLink.path == '/stories') {
-      // final id = deepLink.queryParameters["id"];
-      // final name = deepLink.queryParameters["name"];
-      Navigator.of(context)
-          .push(MaterialPageRoute(builder: (context) => SocialPage()));
-    }
-    if (deepLink.path == '/pdfUrl') {
-      String? pdfUrl = deepLink.queryParameters['url'];
-      Navigator.push(
-        context,
-        MaterialPageRoute(
-            builder: (context) => PDFPageWithShare(
-                  pdfUrl: pdfUrl!,
-                )),
-      );
-    }
-
-    if (deepLink.path == '/news') {
-      String? id = deepLink.queryParameters['id'];
-      print('news id $id');
-      List<News> _newsList = await _repo.getNewsData();
-      print('news fetched ${_newsList[int.parse(id!)].toString()}');
-      _newsList[int.parse(id)].isPdf
-          ? Navigator.push(
-              context,
-              MaterialPageRoute(
-                  builder: (context) => PDFPage(
-                        pdfUrl: _newsList[int.parse(id)].pdf!,
-                        data: _newsList[int.parse(id)],
-                      )),
-            )
-          : Navigator.push(
-              context,
-              MaterialPageRoute(
-                  builder: (context) =>
-                      NonPDFPage(data: _newsList[int.parse(id)])));
-    }
-    // still need some work
-    Navigator.pushNamed(context, '${deepLink.path}');
-    // }
-  }).onError((error) {
-    print('onLink error');
-    Navigator.pushNamed(context, '/error');
-  });
-
-//  "getInitialLink" is when the app is closed.
-  final PendingDynamicLinkData? data =
-      await FirebaseDynamicLinks.instance.getInitialLink();
-  final Uri? deepLink = data?.link;
-
-  final uri = deepLink?.path;
-
-  print('deepLink.path: $uri ');
-  if (deepLink?.path == '/helloworld') {
-    // final id = deepLink?.queryParameters["id"];
-    // final name = deepLink?.queryParameters["name"];
-    Navigator.of(context)
-        .push(MaterialPageRoute(builder: (context) => SocialPage()));
-  }
-  if (deepLink?.path == '/stories') {
-    // final id = deepLink?.queryParameters["id"];
-    // final name = deepLink?.queryParameters["name"];
-    Navigator.of(context)
-        .push(MaterialPageRoute(builder: (context) => SocialPage()));
-  }
-  if (deepLink?.path == '/pdfUrl') {
-    String? pdfUrl = deepLink?.queryParameters['url'];
-    Navigator.push(
-      context,
-      MaterialPageRoute(
-          builder: (context) => PDFPageWithShare(
-                pdfUrl: pdfUrl!,
-              )),
-    );
-  }
-  if (deepLink?.path == '/news') {
-    String? id = deepLink?.queryParameters['id'];
-    List<News> _newsList = await _repo.getNewsData();
-
-    _newsList[int.parse(id!)].isPdf
-        ? Navigator.push(
-            context,
-            MaterialPageRoute(
-                builder: (context) => PDFPage(
-                    pdfUrl: _newsList[int.parse(id)].pdf!,
-                    data: _newsList[int.parse(id)])),
-          )
-        : Navigator.push(
-            context,
-            MaterialPageRoute(
-                builder: (context) =>
-                    NonPDFPage(data: _newsList[int.parse(id)])));
-  }
-  // still need some work
-  // Navigator.pushNamed(context, '${deepLink?.path}');
-}
-
-class ErrorPage extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: const Text('Hello World DeepLink error'),
-      ),
-      body: const Center(
-        child: const Text('Error Page'),
-      ),
-    );
-  }
-}
-
-/// Don't delete this under here. some usefull code <3
-
-// class DynamicLinks extends StatefulWidget {
-//   @override
-//   _DynamicLinksState createState() => _DynamicLinksState();
-// }
-
-// class _DynamicLinksState extends State<DynamicLinks>
-//     with WidgetsBindingObserver {
-//   String? _linkMessage;
-//   bool _isCreatingLink = false;
-//   late String pathName, id, name;
-
-//   @override
-//   void initState() {
-//     super.initState();
-//     // this._initDynamicLinks();
-//     // this._createDynamicLink(id, name);
-//   }
-
-// //   Future<void> _initDynamicLinks() async {
-// //     FirebaseDynamicLinks.instance.onLink(
-// //         onSuccess: (PendingDynamicLinkData? dynamicLink) async {
-// //       final Uri? deepLink = dynamicLink?.link;
-
-// //       if (deepLink != null) {
-// //         Navigator.pushNamed(context, deepLink.path);
-// // // ignore: unnecessary_statements
-
-// //         if (deepLink.queryParameters.containsKey('id')) {
-// //           String? id = deepLink.queryParameters['id'];
-// //           String? name = deepLink.queryParameters['name'];
-// //           Navigator.of(context).push(MaterialPageRoute(
-// //               builder: (context) => SocialPage(id: id, name: name)));
-
-// //           // Navigator.pushNamed(BuildContext context) => SocialPage(id: id, name: name);
-// //         }
-// //       }
-// //     }, onError: (OnLinkErrorException e) async {
-// //       Navigator.pushNamed(context, '/error');
-// //     });
-
-// //     final PendingDynamicLinkData? data =
-// //         await FirebaseDynamicLinks.instance.getInitialLink();
-// //     final Uri? deepLink = data?.link;
-
-// //     if (deepLink != null) {
-// //       if (deepLink.queryParameters.containsKey('name')) {
-// //         String? id = deepLink.queryParameters['id'];
-// //         String? name = deepLink.queryParameters['name'];
-// //         Navigator.of(context).push(MaterialPageRoute(
-// //             builder: (context) => SocialPage(id: id, name: name)));
-
-// //         // Navigator.pushNamed(BuildContext context) => SocialPage(id: id, name: name);
-// //       }
-// //     }
-// //   }
-
-//   Future<void> _createDynamicLink(
-//       String pathName, String id, String name) async {
-//     final DynamicLinkParameters parameters = DynamicLinkParameters(
-//       uriPrefix: 'https://rotarynl.page.link',
-//       link: Uri.parse(
-//           'https://rotarytestnl.page.link/$pathName?id=$id&name=$name'), //change this to the url in the main.dart
-//       androidParameters: AndroidParameters(
-//         packageName: 'com.caelitechnologies.rotary_nl_rye',
-//         minimumVersion: 1,
-//       ),
-//       iosParameters: IosParameters(
-//         bundleId: 'com.caelitechnologies.rotary-nl-rye',
-//         minimumVersion: '1',
-//         appStoreId: '1567096118',
-//       ),
-//       socialMetaTagParameters: SocialMetaTagParameters(
-//         title: 'Example of a Dynamic Link',
-//         description: 'This link works whether app is installed or not!',
-//         imageUrl: Uri.parse(
-//             'https://is4-ssl.mzstatic.com/image/thumb/Purple114/v4/6e/21/e4/6e21e45b-49cb-fa52-83c2-bb56ab288b49/AppIcon-0-0-1x_U007emarketing-0-0-0-4-0-0-sRGB-0-0-0-GLES2_U002c0-512MB-85-220-0-0.jpeg/1200x630wa.png'),
-//       ),
-//     );
-
-//     Uri url;
-//     final ShortDynamicLink shortLink = await parameters.buildShortLink();
-//     url = shortLink.shortUrl;
-
-//     setState(() {
-//       _linkMessage = url.toString();
-//     });
-//   }
-
-//   @override
-//   void dispose() {
-//     // ignore: unnecessary_statements
-//     _linkMessage;
-//     super.dispose();
-//   }
-
-//   @override
-//   Widget build(BuildContext context) {
-//     return Scaffold(
-//       appBar: AppBar(
-//         title: const Text('Dynamic Links test page'),
-//         actions: <Widget>[
-//           IconButton(
-//             icon: Icon(
-//               CupertinoIcons.share,
-//               color: Palette.indigo,
-//             ),
-//             onPressed: _createShareURL,
-//           )
-//         ],
-//       ),
-//       body: SizedBox(
-//         width: double.infinity,
-//         child: Column(
-//           crossAxisAlignment: CrossAxisAlignment.center,
-//           mainAxisAlignment: MainAxisAlignment.center,
-//           children: [
-//             InkWell(
-//               // onTap: () async {
-//               //   if (_linkMessage != null) {
-//               //     await launch(_linkMessage!);
-//               //   }
-//               // },
-//               onLongPress: () {
-//                 Clipboard.setData(ClipboardData(text: _linkMessage));
-//                 ScaffoldMessenger.of(context).showSnackBar(
-//                   const SnackBar(content: Text('Copied Link!')),
-//                 );
-//               },
-//               child: Text(
-//                 _linkMessage ?? '',
-//                 style: const TextStyle(color: Colors.blue),
-//               ),
-//             ),
-//             Text(_linkMessage == null ? '' : '')
-//             ////
-//           ],
-//         ),
-//       ),
-//     );
-//   }
-
-//   _createShareURL() async {
-//     _createDynamicLink(
-//         pathName = 'error', id = 'id_test_1', name = 'name_test_2');
-
-//     if (await canLaunch(_linkMessage!)) {
-//       await Share.share(
-//           Platform.isIOS
-//               ? 'Hier mot nog een leuk stukje komen. + de link naar de juiste pagina $_linkMessage' // iOS
-//               : 'Hier mot nog een leuk stukje komen. + de link naar de juiste pagina $_linkMessage', //android
-//           subject: 'look at this nice app :)');
-//     } else {
-//       throw 'Could not launch $_linkMessage';
-//     }
-//   }
-// }
diff --git a/lib/core/presentation/pages/organization_contact_details_page.dart b/lib/core/presentation/pages/organization_contact_details_page.dart
index 59e6793a..af870882 100644
--- a/lib/core/presentation/pages/organization_contact_details_page.dart
+++ b/lib/core/presentation/pages/organization_contact_details_page.dart
@@ -1,6 +1,7 @@
-// 🐦 Flutter imports:
+// 🎯 Dart imports:
 import 'dart:io';
 
+// 🐦 Flutter imports:
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
diff --git a/lib/core/presentation/pages/pdf_viewer_share.dart b/lib/core/presentation/pages/pdf_viewer_share.dart
index 1aba4846..20f62478 100644
--- a/lib/core/presentation/pages/pdf_viewer_share.dart
+++ b/lib/core/presentation/pages/pdf_viewer_share.dart
@@ -3,13 +3,11 @@ import 'dart:async';
 import 'dart:io';
 
 // 🐦 Flutter imports:
-import 'package:dio/dio.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
 // 📦 Package imports:
-import 'package:firebase_dynamic_links/firebase_dynamic_links.dart';
+import 'package:dio/dio.dart';
 import 'package:flutter_cached_pdfview/flutter_cached_pdfview.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:path_provider/path_provider.dart';
@@ -40,14 +38,13 @@ class _PDFPageWithShareState extends State<PDFPageWithShare> {
       Completer<PDFViewController>();
   final StreamController<String> _pageCountController =
       StreamController<String>();
-  final FirebaseDynamicLinks dynamicLinks = FirebaseDynamicLinks.instance;
 
   String? _linkMessage;
 
   @override
   void initState() {
     super.initState();
-    _createDynamicLink(pdfUrl);
+    // _createDynamicLink(pdfUrl);
     SystemChrome.setPreferredOrientations([
       DeviceOrientation.landscapeRight,
       DeviceOrientation.landscapeLeft,
@@ -78,17 +75,17 @@ class _PDFPageWithShareState extends State<PDFPageWithShare> {
           Container(
             child: PopupMenuButton<int>(
               itemBuilder: (context) => [
-                PopupMenuItem<int>(
-                  value: 0,
-                  child: Row(
-                    children: [
-                      Icon(CupertinoIcons.share, color: Palette.lightIndigo),
-                      const SizedBox(width: 7),
-                      Text('Share in-app Link'),
-                    ],
-                  ),
-                ),
-                PopupMenuDivider(),
+                // PopupMenuItem<int>(
+                //   value: 0,
+                //   child: Row(
+                //     children: [
+                //       Icon(CupertinoIcons.share, color: Palette.lightIndigo),
+                //       const SizedBox(width: 7),
+                //       Text('Share in-app Link'),
+                //     ],
+                //   ),
+                // ),
+                // PopupMenuDivider(),
                 PopupMenuItem<int>(
                   value: 1,
                   child: Row(
@@ -186,47 +183,47 @@ class _PDFPageWithShareState extends State<PDFPageWithShare> {
     );
   }
 
-  Future<void> _createDynamicLink(String pdfUrl) async {
-    setState(() {});
-
-    final DynamicLinkParameters parameters = DynamicLinkParameters(
-      uriPrefix: 'https://rotarynl.page.link',
-      link: Uri.parse('https://rotarynl.page.link/pdfUrl?url=$pdfUrl'),
-      androidParameters: AndroidParameters(
-        packageName: 'com.caelitechnologies.rotary_nl_rye',
-        minimumVersion: 1,
-      ),
-      iosParameters: IOSParameters(
-        bundleId: 'com.caelitechnologies.rotary-nl-rye',
-        minimumVersion: '1',
-        appStoreId: '1567096118',
-      ),
-    );
-
-    final ShortDynamicLink shortLink =
-        await dynamicLinks.buildShortLink(parameters);
-    final Uri url = shortLink.shortUrl;
-
-    if (mounted) {
-      setState(() {
-        _linkMessage = url.toString();
-      });
-    }
-  }
+  // Future<void> _createDynamicLink(String pdfUrl) async {
+  //   setState(() {});
+
+  //   final DynamicLinkParameters parameters = DynamicLinkParameters(
+  //     uriPrefix: 'https://rotarynl.page.link',
+  //     link: Uri.parse('https://rotarynl.page.link/pdfUrl?url=$pdfUrl'),
+  //     androidParameters: AndroidParameters(
+  //       packageName: 'com.caelitechnologies.rotary_nl_rye',
+  //       minimumVersion: 1,
+  //     ),
+  //     iosParameters: IOSParameters(
+  //       bundleId: 'com.caelitechnologies.rotary-nl-rye',
+  //       minimumVersion: '1',
+  //       appStoreId: '1567096118',
+  //     ),
+  //   );
+
+  //   final ShortDynamicLink shortLink =
+  //       await dynamicLinks.buildShortLink(parameters);
+  //   final Uri url = shortLink.shortUrl;
+
+  //   if (mounted) {
+  //     setState(() {
+  //       _linkMessage = url.toString();
+  //     });
+  //   }
+  // }
 
   Future<void> _selectedItem(BuildContext context, int item) async {
-    _createDynamicLink(pdfUrl);
+    // _createDynamicLink(pdfUrl);
 
     switch (item) {
       case 0:
-        if (_linkMessage != null && await canLaunchUrlString(_linkMessage!)) {
-          await Share.share(
-            'Hierbij verstuur ik een linkje van een Document: $_linkMessage',
-            subject: 'Look at this nice app :)',
-          );
-        } else {
-          throw 'Could not launch $_linkMessage';
-        }
+        // if (_linkMessage != null && await canLaunchUrlString(_linkMessage!)) {
+        //   await Share.share(
+        //     'Hierbij verstuur ik een linkje van een Document: $_linkMessage',
+        //     subject: 'Look at this nice app :)',
+        //   );
+        // } else {
+        //   throw 'Could not launch $_linkMessage';
+        // }
         break;
       case 1:
         Directory tempDir = await getTemporaryDirectory();
diff --git a/lib/core/presentation/widgets/page_navigator.dart b/lib/core/presentation/widgets/page_navigator.dart
index ccbe6412..db772966 100644
--- a/lib/core/presentation/widgets/page_navigator.dart
+++ b/lib/core/presentation/widgets/page_navigator.dart
@@ -1,15 +1,10 @@
 // 🐦 Flutter imports:
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 
 // 📦 Package imports:
-import 'package:flutter_app_badger/flutter_app_badger.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
 // 🌎 Project imports:
-import 'package:rotary_nl_rye/core/firebase/check_update.dart';
-import 'package:rotary_nl_rye/core/firebase/firebase_cloud_messaging.dart';
-import 'package:rotary_nl_rye/core/firebase/firebase_dynamic_links.dart';
 import 'package:rotary_nl_rye/core/prop.dart';
 import 'package:rotary_nl_rye/features/about/presentation/pages/about_page.dart';
 import 'package:rotary_nl_rye/features/contact/presentation/pages/contact_page.dart';
@@ -17,67 +12,26 @@ import 'package:rotary_nl_rye/features/emergency/presentation/pages/emergency_pa
 import 'package:rotary_nl_rye/features/home/presentation/pages/home_page.dart';
 import 'package:rotary_nl_rye/features/settings/presentation/pages/SettingsPage.dart';
 
+import 'dart:io' show Platform; // For platform detection
+
+import 'package:flutter/cupertino.dart'; // For iOS Cupertino components
+
+
 class PageNavigator extends StatefulWidget {
   @override
   _PageNavigatorState createState() => _PageNavigatorState();
 }
 
 class _PageNavigatorState extends State<PageNavigator> {
-  String _appBadgeSupported = 'Unknown';
   int _selectedIndex = 0;
 
-  @override
-  void initState() {
-    super.initState();
-    _initializeApp();
-  }
-
-  Future<void> _initializeApp() async {
-    await initDynamicLinks(context);
-    await _checkAppBadgeSupport();
-    await _initializeFCM();
-    _removeBadge();
-    _checkVersion();
-  }
-
-  Future<void> _initializeFCM() async {
-    await getToken();
-    await getInitialMessages(context);
-    onMessage(context);
-    onMessageOpenedApp(context);
-  }
-
-  Future<void> _checkVersion() async {
-    try {
-      await versionCheck(context);
-    } catch (e) {
-      print(e);
-    }
-  }
-
-  Future<void> _checkAppBadgeSupport() async {
-    try {
-      bool isSupported = await FlutterAppBadger.isAppBadgeSupported();
-      setState(() {
-        _appBadgeSupported = isSupported ? 'Supported' : 'Not supported';
-      });
-      print('Badge supported: $_appBadgeSupported\n');
-    } on PlatformException {
-      setState(() {
-        _appBadgeSupported = 'Failed to get badge support.';
-      });
-    }
-  }
-
-  void _removeBadge() {
-    FlutterAppBadger.removeBadge();
-  }
-
-  void _onItemTapped(int index) {
-    setState(() {
-      _selectedIndex = index;
-    });
-  }
+  final List<Widget> _pages = [
+    HomePage(),
+    AboutPage(),
+    EmergencyPage(),
+    ContactPage(),
+    SettingsPage(),
+  ];
 
   @override
   Widget build(BuildContext context) {
@@ -86,47 +40,109 @@ class _PageNavigatorState extends State<PageNavigator> {
     Palette.initialize(
         MediaQuery.of(context).platformBrightness == Brightness.dark);
 
-    return DefaultTabController(
-      length: 5,
-      child: Scaffold(
-        bottomNavigationBar: _buildBottomNavigationBar(),
-        body: TabBarView(
-          children: [
-            HomePage(),
-            AboutPage(),
-            EmergencyPage(),
-            ContactPage(),
-            SettingsPage(),
-          ],
-        ),
+    // Platform-specific design
+    if (Platform.isIOS) {
+      return _buildIOSNavigator(); // Use only CupertinoTabBar for iOS
+    } else {
+      return _buildAndroidNavigator(); // Standard BottomNavigationBar for Android
+    }
+  }
+
+  // iOS-specific navigation using CupertinoTabScaffold (no AppBar)
+  Widget _buildIOSNavigator() {
+    return CupertinoTabScaffold(
+      tabBar: CupertinoTabBar(
+        currentIndex: _selectedIndex,
+        onTap: _onItemTapped,
+        backgroundColor: Colors.white,
+        activeColor: Palette.indigo,
+        inactiveColor: Palette.lightIndigo,
+        items: [
+          _buildCupertinoTabItem(FontAwesomeIcons.house, 'Home'),
+          _buildCupertinoTabItem(FontAwesomeIcons.userGroup, 'About'),
+          _buildCupertinoTabItem(
+              FontAwesomeIcons.triangleExclamation, 'Emergency',
+              activeColor: Colors.red, inactiveColor: Colors.red[200]),
+          _buildCupertinoTabItem(FontAwesomeIcons.addressBook, 'Contact'),
+          _buildCupertinoTabItem(FontAwesomeIcons.gear, 'Settings'),
+        ],
       ),
+      tabBuilder: (BuildContext context, int index) {
+        return _pages[index]; // Just display the page, no AppBar
+      },
     );
   }
 
-  Widget _buildBottomNavigationBar() {
+  // Android-specific navigation using BottomNavigationBar
+  Widget _buildAndroidNavigator() {
+    return Scaffold(
+      body: _pages[_selectedIndex], // Display the selected page
+      bottomNavigationBar: _buildAndroidBottomNavigationBar(),
+    );
+  }
+
+  // Android-specific bottom navigation bar (fancy floating design)
+  Widget _buildAndroidBottomNavigationBar() {
     return Container(
-      padding: const EdgeInsets.only(top: 10, bottom: 20),
-      color: Palette.themeShadeColor,
-      child: TabBar(
-        tabs: [
-          _buildTabIcon(FontAwesomeIcons.house, 0),
-          _buildTabIcon(FontAwesomeIcons.userGroup, 1),
-          _buildTabIcon(FontAwesomeIcons.triangleExclamation, 2,
-              activeColor: Colors.red, inactiveColor: Colors.red[200]),
-          _buildTabIcon(FontAwesomeIcons.addressBook, 3),
-          _buildTabIcon(FontAwesomeIcons.gear, 4),
+      decoration: BoxDecoration(
+        color: Palette.themeShadeColor,
+        borderRadius: BorderRadius.circular(20),
+        boxShadow: [
+          BoxShadow(
+            color: Colors.black12,
+            blurRadius: 10,
+            offset: Offset(0, 5),
+          ),
         ],
-        indicatorColor: Colors.transparent,
-        onTap: _onItemTapped,
       ),
+      child: ClipRRect(
+        borderRadius: BorderRadius.circular(20),
+        child: BottomNavigationBar(
+          type: BottomNavigationBarType.fixed,
+          currentIndex: _selectedIndex,
+          onTap: _onItemTapped,
+          backgroundColor: Palette.themeShadeColor,
+          selectedItemColor: Palette.indigo,
+          unselectedItemColor: Palette.lightIndigo,
+          selectedFontSize: 14,
+          unselectedFontSize: 12,
+          items: [
+            _buildBottomNavigationBarItem(FontAwesomeIcons.house, 'Home'),
+            _buildBottomNavigationBarItem(FontAwesomeIcons.userGroup, 'About'),
+            _buildBottomNavigationBarItem(
+                FontAwesomeIcons.triangleExclamation, 'Emergency',
+                activeColor: Colors.red, inactiveColor: Colors.red[200]),
+            _buildBottomNavigationBarItem(
+                FontAwesomeIcons.addressBook, 'Contact'),
+            _buildBottomNavigationBarItem(FontAwesomeIcons.gear, 'Settings'),
+          ],
+        ),
+      ),
+    );
+  }
+
+  // Cupertino-style tab item builder
+  BottomNavigationBarItem _buildCupertinoTabItem(IconData icon, String label,
+      {Color? activeColor, Color? inactiveColor}) {
+    return BottomNavigationBarItem(
+      icon: Icon(icon),
+      label: label,
     );
   }
 
-  Widget _buildTabIcon(IconData icon, int index,
+  // Android-specific bottom navigation bar item builder
+  BottomNavigationBarItem _buildBottomNavigationBarItem(
+      IconData icon, String label,
       {Color? activeColor, Color? inactiveColor}) {
-    final Color color = _selectedIndex == index
-        ? (activeColor ?? Palette.indigo)
-        : (inactiveColor ?? Palette.lightIndigo);
-    return Tab(icon: Icon(icon, size: 30, color: color));
+    return BottomNavigationBarItem(
+      icon: Icon(icon),
+      label: label,
+    );
+  }
+
+  void _onItemTapped(int index) {
+    setState(() {
+      _selectedIndex = index;
+    });
   }
 }
diff --git a/lib/core/presentation/widgets/photo_gallery/gallery_view.dart b/lib/core/presentation/widgets/photo_gallery/gallery_view.dart
index c8015075..a1123300 100644
--- a/lib/core/presentation/widgets/photo_gallery/gallery_view.dart
+++ b/lib/core/presentation/widgets/photo_gallery/gallery_view.dart
@@ -1,13 +1,10 @@
-// 🎯 Dart imports:
-import 'dart:convert';
-
 // 🐦 Flutter imports:
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
 // 📦 Package imports:
+import 'package:dio/dio.dart';
 import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
-import 'package:http/http.dart' as http;
 import 'package:transparent_image/transparent_image.dart';
 
 // 🌎 Project imports:
@@ -15,16 +12,14 @@ import 'package:rotary_nl_rye/core/presentation/widgets/photo_gallery/view_photo
 import 'package:rotary_nl_rye/core/prop.dart';
 import 'package:rotary_nl_rye/features/uniform_widgets/back_button.dart';
 
-//TODO still need to add this somewhere
-
 class GalleryViewPage extends StatefulWidget {
   @override
   _GalleryViewPageState createState() => _GalleryViewPageState();
 }
 
 class _GalleryViewPageState extends State<GalleryViewPage> {
-  late List data;
   late List<String> imageList = [];
+  final Dio _dio = Dio();
 
   @override
   void initState() {
@@ -32,91 +27,83 @@ class _GalleryViewPageState extends State<GalleryViewPage> {
     fetchDataFromApi();
   }
 
-  Future<String> fetchDataFromApi() async {
-    var jsonData = await http.get(Uri.parse(
-        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/archive/archive-images.json'));
-    var fetchData = jsonDecode(jsonData.body);
-
-    setState(() {
-      data = fetchData;
-      data.forEach((element) {
-        imageList.add(element);
-      });
-    });
-    // print(imageList);
-    return 'Success';
+  Future<void> fetchDataFromApi() async {
+    try {
+      final response = await _dio.get(
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/archive/archive-images.json',
+      );
+      if (response.statusCode == 200) {
+        setState(() {
+          imageList = List<String>.from(response.data);
+        });
+      } else {
+        throw Exception('Failed to load data');
+      }
+    } catch (e) {
+      print('Error fetching data: $e');
+    }
   }
 
-  // List<String> imageList = [
-  //   'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/saying_goodby.jpg',
-  //   // 'https://cdn.pixabay.com/photo/2020/12/15/16/25/clock-5834193__340.jpg',
-  //   // 'https://cdn.pixabay.com/photo/2020/09/18/19/31/laptop-5582775_960_720.jpg',
-  //   // 'https://media.istockphoto.com/photos/woman-kayaking-in-fjord-in-norway-picture-id1059380230?b=1&amp;k=6&amp;m=1059380230&amp;s=170667a&amp;w=0&amp;h=kA_A_XrhZJjw2bo5jIJ7089-VktFK0h0I4OWDqaac0c=',
-  //   // 'https://cdn.pixabay.com/photo/2019/11/05/00/53/cellular-4602489_960_720.jpg',
-  //   // 'https://cdn.pixabay.com/photo/2017/02/12/10/29/christmas-2059698_960_720.jpg',
-  //   // 'https://cdn.pixabay.com/photo/2020/01/29/17/09/snowboard-4803050_960_720.jpg',
-  //   // 'https://cdn.pixabay.com/photo/2020/02/06/20/01/university-library-4825366_960_720.jpg',
-  //   // 'https://cdn.pixabay.com/photo/2020/11/22/17/28/cat-5767334_960_720.jpg',
-  //   // 'https://cdn.pixabay.com/photo/2020/12/13/16/22/snow-5828736_960_720.jpg',
-  //   // 'https://cdn.pixabay.com/photo/2020/12/09/09/27/women-5816861_960_720.jpg',
-  // ];
-
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-        appBar: AppBar(
-          systemOverlayStyle: SystemUiOverlayStyle(
-            statusBarBrightness: MediaQuery.of(context).platformBrightness,
+      appBar: AppBar(
+        systemOverlayStyle: SystemUiOverlayStyle(
+          statusBarBrightness: MediaQuery.of(context).platformBrightness,
+        ),
+        backgroundColor: Colors.transparent,
+        elevation: 0.0,
+        leading: UniformBackButton(),
+        title: Text(
+          'Gallery View',
+          textScaler: TextScaler.linear(1.2),
+          style: TextStyle(color: Palette.indigo, fontWeight: FontWeight.bold),
+        ),
+      ),
+      body: Container(
+        margin: const EdgeInsets.all(12),
+        child: MasonryGridView.count(
+          crossAxisCount: 2,
+          crossAxisSpacing: 10,
+          mainAxisSpacing: 12,
+          itemCount: imageList.length,
+          itemBuilder: (context, index) => buildImageCard(context, index),
+        ),
+      ),
+    );
+  }
+
+  Widget buildImageCard(BuildContext context, int index) {
+    return InkWell(
+      onTap: () {
+        Navigator.push(
+          context,
+          MaterialPageRoute(
+            builder: (_) {
+              return ViewPhotos(
+                imageIndex: index,
+                imageList: imageList,
+                heroTitle: 'image$index',
+              );
+            },
+            fullscreenDialog: true,
           ),
-          backgroundColor: Colors.transparent,
-          elevation: 0.0,
-          leading: UniformBackButton(),
-          title: Text(
-            'Gallery View',
-            textScaler: TextScaler.linear(1.2),
-            style:
-                TextStyle(color: Palette.indigo, fontWeight: FontWeight.bold),
+        );
+      },
+      child: Container(
+        decoration: BoxDecoration(
+          color: Colors.transparent,
+          borderRadius: BorderRadius.all(Radius.circular(15)),
+        ),
+        child: ClipRRect(
+          borderRadius: BorderRadius.all(Radius.circular(15)),
+          child: FadeInImage.memoryNetwork(
+            placeholder: kTransparentImage,
+            image: imageList[index],
+            fit: BoxFit.cover,
           ),
         ),
-        body: Container(
-            margin: EdgeInsets.all(12),
-            child: MasonryGridView.count(
-              crossAxisCount: 2,
-              crossAxisSpacing: 10,
-              mainAxisSpacing: 12,
-              itemCount: imageList.length,
-              itemBuilder: (BuildContext context, int index) {
-                return InkWell(
-                    onTap: () {
-                      Navigator.push(
-                          context,
-                          MaterialPageRoute(
-                              builder: (_) {
-                                return ViewPhotos(
-                                  imageIndex: index,
-                                  imageList: imageList,
-                                  heroTitle: 'image$index',
-                                );
-                              },
-                              fullscreenDialog: true));
-                    },
-                    child: Container(
-                      decoration: BoxDecoration(
-                          color: Colors.transparent,
-                          borderRadius: BorderRadius.all(Radius.circular(15))),
-                      child: ClipRRect(
-                        borderRadius: BorderRadius.all(Radius.circular(15)),
-                        child: FadeInImage.memoryNetwork(
-                          placeholder: kTransparentImage,
-                          image: imageList[index],
-                          fit: BoxFit.cover,
-                        ),
-                      ),
-                    ));
-              },
-              // staggeredTileBuilder: (index) {
-              //   return StaggeredTile.count(1, index.isEven ? 1.2 : 1.8);
-              // }),
-            )));
+      ),
+    );
   }
 }
diff --git a/lib/core/translation/translate.dart b/lib/core/translation/translate.dart
index 698194e4..6934bd4c 100644
--- a/lib/core/translation/translate.dart
+++ b/lib/core/translation/translate.dart
@@ -6,7 +6,7 @@ import 'dart:io';
 import 'package:flutter/services.dart';
 
 // 📦 Package imports:
-import 'package:http/http.dart' as http;
+import 'package:dio/dio.dart';
 import 'package:internet_connection_checker/internet_connection_checker.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
@@ -14,93 +14,99 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:rotary_nl_rye/core/translation/deeplSupportedLang.dart';
 
 class Translate {
-  static Future<Map<String, dynamic>> text(
-      {required String inputText, String inputLang = 'NL'}) async {
+  static final Dio _dio = Dio(); // Initialize Dio
+
+  static Future<Map<String, dynamic>> text({
+    required String inputText,
+    String inputLang = 'NL',
+  }) async {
     Map<String, dynamic> result = {
-      'translation': '',
+      'translation': inputText, // Fallback to the input text
       'success': false,
-      'message': ''
+      'message': '',
     };
 
-    var lang = fetchLang();
+    String lang = fetchLang();
 
-    // check if input lang is different from the text
+    // Check if the input language matches the translation language
     if (lang == inputLang) {
-      result['translation'] = inputLang;
-      result['message'] = 'Text lang = to Translate lang';
-
+      result['message'] = 'Text language is the same as the target language';
+      result['success'] = true;
       return result;
     }
 
-    print('Translating');
+    print('Translating...');
 
-    // check cache
+    // Check cache for the translation
     SharedPreferences cache = await SharedPreferences.getInstance();
-    final key = lang + '+' + inputText;
+    final key = '$lang+$inputText';
+
     if (cache.containsKey(key)) {
-      print('Retrieving from cache');
-      result['translation'] = Future.value(cache.getString(key));
+      print('Retrieving translation from cache');
+      result['translation'] = cache.getString(key)!;
       result['success'] = true;
-
       return result;
     }
 
-    // check network connection
-    if (!(await new InternetConnectionChecker().hasConnection)) {
-      result['translation'] = inputLang;
-      result['message'] = 'No connection';
-      result['success'] = false;
-
+    // Check internet connection
+    if (!(await InternetConnectionChecker().hasConnection)) {
+      result['message'] = 'No internet connection';
       return result;
     }
 
-    // fallback to english
-    if (!(deeplSupportedLangs.containsValue(lang))) {
-      print('Language not supported. Fallback to english');
+    // Fallback to English if the language is not supported by DeepL
+    if (!deeplSupportedLangs.containsValue(lang)) {
+      print('Language not supported, falling back to English');
       lang = 'EN-US';
     }
 
-    print('Retrieving from deepl api');
+    // Fetch translation from DeepL API using Dio
+    print('Fetching translation from DeepL API...');
     final response = await getTranslation(lang, inputText);
-    final status = response.statusCode;
-
-    // check if api call was succes
-    if (status != 200) {
-      result['translation'] = inputText;
-      result['message'] = 'Api call failed with status: $status';
 
+    if (response.statusCode != 200) {
+      result['message'] = 'API call failed with status: ${response.statusCode}';
       return result;
     }
 
-    final body = jsonDecode(response.body);
-    result['translation'] = body['translations'][0]['text'];
-    result['success'] = true;
+    try {
+      final body = jsonDecode(response.data);
+      final translation = body['translations'][0]['text'];
+      result['translation'] = translation;
+      result['success'] = true;
 
-    print('Cache data');
-    cache.setString(key, result['translation']);
+      // Cache the translation
+      print('Caching translation...');
+      cache.setString(key, translation);
+    } catch (e) {
+      print('Error parsing translation response: $e');
+      result['message'] = 'Error parsing translation response';
+    }
 
     return result;
   }
 
-  static Future<http.Response> getTranslation(String lang, String input) async {
+  static Future<Response> getTranslation(String lang, String input) async {
     String data = await rootBundle.loadString('assets/keys/deepl.json');
     String key = json.decode(data)['key'];
-    return http.post(
-        Uri.parse('https://api-free.deepl.com/v2/translate?auth_key=$key'),
-        headers: <String, String>{
-          'Host': 'api-free.deepl.com',
-        },
-        body: <String, String>{
-          'text': input,
-          'target_lang': lang
-        });
+
+    return _dio.post(
+      'https://api-free.deepl.com/v2/translate',
+      options: Options(
+        headers: {'Host': 'api-free.deepl.com'},
+      ),
+      data: {
+        'text': input,
+        'target_lang': lang,
+        'auth_key': key,
+      },
+    );
   }
 
   static String fetchLang() {
-    if (Platform.localeName.split('_')[0] == 'zh') {
-      return 'ZH';
-    } else {
-      return Platform.localeName.split('_').join('-').toUpperCase();
-    }
+    String locale = Platform.localeName.split('_')[0];
+    return locale == 'zh'
+        ? 'ZH'
+        : Platform.localeName.split('_').join('-').toUpperCase();
   }
 }
diff --git a/lib/core/usecases/usecase.dart b/lib/core/usecases/usecase.dart
deleted file mode 100644
index e826ae3b..00000000
--- a/lib/core/usecases/usecase.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-// 📦 Package imports:
-import 'package:dartz/dartz.dart';
-import 'package:equatable/equatable.dart';
-
-// 🌎 Project imports:
-import '../error/failures.dart';
-
-abstract class UseCase<Type, Params> {
-  Future<Either<Failure, Type>> call(Params params);
-}
-
-class NoParams extends Equatable {
-  @override
-  List<Object> get props => [];
-}
diff --git a/lib/features/calendar/data/EventUtils.dart b/lib/features/calendar/data/EventUtils.dart
index 755660d4..afcf9de2 100644
--- a/lib/features/calendar/data/EventUtils.dart
+++ b/lib/features/calendar/data/EventUtils.dart
@@ -6,9 +6,11 @@ import 'dart:convert';
 
 // 📦 Package imports:
 import 'package:http/http.dart' as http;
-import 'package:rotary_nl_rye/features/calendar/models/EventModel.dart';
 import 'package:table_calendar/table_calendar.dart';
 
+// 🌎 Project imports:
+import 'package:rotary_nl_rye/features/calendar/models/EventModel.dart';
+
 late Map<String, dynamic> data;
 late List<Events> events;
 late LinkedHashMap<DateTime, List<Events>> eventsData;
@@ -33,22 +35,30 @@ Future<LinkedHashMap<DateTime, List<Events>>> getData() async {
   events = EventResult.fromJson(data).events;
 
   eventsHashMap.clear();
+
   for (var event in events) {
     DateTime eventStart = event.start.dateTime;
     DateTime eventEnd = event.end.dateTime;
 
-    if (eventStart.isBefore(eventEnd)) {
+    // Single-day event: Add the event if the start and end date are the same
+    if (isSameDay(eventStart, eventEnd)) {
+      if (!eventsHashMap.containsKey(eventStart)) {
+        eventsHashMap[eventStart] = [];
+      }
+      eventsHashMap[eventStart]!.add(event);
+    } else {
+      // Multi-day event: Add the event to each day between start and end
       eventEnd =
           eventEnd.subtract(Duration(days: 1)); // Ensure end date is exclusive
-    }
 
-    for (DateTime date = eventStart;
-        date.isBefore(eventEnd) || isSameDay(date, eventEnd);
-        date = date.add(Duration(days: 1))) {
-      if (!eventsHashMap.containsKey(date)) {
-        eventsHashMap[date] = [];
+      for (DateTime date = eventStart;
+          date.isBefore(eventEnd) || isSameDay(date, eventEnd);
+          date = date.add(Duration(days: 1))) {
+        if (!eventsHashMap.containsKey(date)) {
+          eventsHashMap[date] = [];
+        }
+        eventsHashMap[date]!.add(event);
       }
-      eventsHashMap[date]!.add(event);
     }
   }
 
diff --git a/lib/features/calendar/presentation/pages/events_page.dart b/lib/features/calendar/presentation/pages/events_page.dart
index 18d99621..decf18e7 100644
--- a/lib/features/calendar/presentation/pages/events_page.dart
+++ b/lib/features/calendar/presentation/pages/events_page.dart
@@ -12,16 +12,16 @@ import 'package:flutter/services.dart';
 // 📦 Package imports:
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:geocoding/geocoding.dart';
 import 'package:intl/intl.dart';
 import 'package:map_launcher/map_launcher.dart';
-import 'package:geocoding/geocoding.dart';
-import 'package:rotary_nl_rye/features/calendar/data/EventUtils.dart';
-import 'package:rotary_nl_rye/features/calendar/models/EventModel.dart';
 import 'package:table_calendar/table_calendar.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 
 // 🌎 Project imports:
 import 'package:rotary_nl_rye/core/prop.dart';
+import 'package:rotary_nl_rye/features/calendar/data/EventUtils.dart';
+import 'package:rotary_nl_rye/features/calendar/models/EventModel.dart';
 import 'package:rotary_nl_rye/features/uniform_widgets/back_button.dart';
 
 class CalendarPage extends StatefulWidget {
diff --git a/lib/features/forRotaryClubs/presentation/pages/InfoCounselor/InfoCounselor.dart b/lib/features/forRotaryClubs/presentation/pages/InfoCounselor/InfoCounselor.dart
index 8ada79ae..f49519bc 100644
--- a/lib/features/forRotaryClubs/presentation/pages/InfoCounselor/InfoCounselor.dart
+++ b/lib/features/forRotaryClubs/presentation/pages/InfoCounselor/InfoCounselor.dart
@@ -1,6 +1,8 @@
 // 🐦 Flutter imports:
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+
+// 📦 Package imports:
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
 // 🌎 Project imports:
diff --git a/lib/features/forRotaryClubs/presentation/pages/InfoGastgezin/InfoGastgezin.dart b/lib/features/forRotaryClubs/presentation/pages/InfoGastgezin/InfoGastgezin.dart
index 79c72349..a364e9c1 100644
--- a/lib/features/forRotaryClubs/presentation/pages/InfoGastgezin/InfoGastgezin.dart
+++ b/lib/features/forRotaryClubs/presentation/pages/InfoGastgezin/InfoGastgezin.dart
@@ -1,13 +1,15 @@
 // 🐦 Flutter imports:
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+
+// 📦 Package imports:
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
 // 🌎 Project imports:
 import 'package:rotary_nl_rye/core/presentation/pages/pdf_viewer_share.dart';
 import 'package:rotary_nl_rye/core/prop.dart';
-import 'package:rotary_nl_rye/features/uniform_widgets/info_list_tile.dart';
 import 'package:rotary_nl_rye/features/uniform_widgets/back_button.dart';
+import 'package:rotary_nl_rye/features/uniform_widgets/info_list_tile.dart';
 
 class InfoGastgezinPage extends StatefulWidget {
   @override
diff --git a/lib/features/forRotaryClubs/presentation/pages/Jeugdcommissaris/jeugd_commissaris.dart b/lib/features/forRotaryClubs/presentation/pages/Jeugdcommissaris/jeugd_commissaris.dart
index a053c3cf..e223c44e 100644
--- a/lib/features/forRotaryClubs/presentation/pages/Jeugdcommissaris/jeugd_commissaris.dart
+++ b/lib/features/forRotaryClubs/presentation/pages/Jeugdcommissaris/jeugd_commissaris.dart
@@ -1,13 +1,15 @@
 // 🐦 Flutter imports:
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+
+// 📦 Package imports:
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
 // 🌎 Project imports:
 import 'package:rotary_nl_rye/core/presentation/pages/pdf_viewer_share.dart';
 import 'package:rotary_nl_rye/core/prop.dart';
-import 'package:rotary_nl_rye/features/uniform_widgets/info_list_tile.dart';
 import 'package:rotary_nl_rye/features/uniform_widgets/back_button.dart';
+import 'package:rotary_nl_rye/features/uniform_widgets/info_list_tile.dart';
 
 class InfoForJeugdcommissarisPage extends StatefulWidget {
   @override
@@ -44,7 +46,7 @@ class _InfoForJeugdcommissarisPageState
       'icon': FontAwesomeIcons.handsHoldingChild,
       'page': PDFPageWithShare(
           pdfUrl:
-              'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/rotary-club-info/verklaring-jeugd-vrijwilliger-met-addendum-okt22-def.pdf'),
+              'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/rotary-club-info/24-25/verklaring-jeugd-vrijwilliger-gedragscode-mdjc-jan23-definitieve-versie.pdf'),
     },
     {
       'title': 'Presentielijst DJC training',
@@ -65,7 +67,7 @@ class _InfoForJeugdcommissarisPageState
       'icon': FontAwesomeIcons.clipboardList,
       'page': PDFPageWithShare(
           pdfUrl:
-              'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/rotary-club-info/2023/actielijst-rotary-clubs-2023-2024-voorbereiding-ontvangst-inbound-student-def-1.pdf'),
+              'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/rotary-club-info/24-25/actielijst-rotary-clubs-2025-2026-voorbereiding-ontvangst-inbound-student-def.pdf'),
     },
     {
       'title': 'Rules and Information Inbounds',
diff --git a/lib/features/forRotaryClubs/presentation/pages/rotary_club_info_page.dart b/lib/features/forRotaryClubs/presentation/pages/rotary_club_info_page.dart
index 95873290..08968c41 100644
--- a/lib/features/forRotaryClubs/presentation/pages/rotary_club_info_page.dart
+++ b/lib/features/forRotaryClubs/presentation/pages/rotary_club_info_page.dart
@@ -7,13 +7,13 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
 // 🌎 Project imports:
 import 'package:rotary_nl_rye/core/prop.dart';
+import 'package:rotary_nl_rye/features/forRotaryClubs/presentation/pages/AlgemeneInformatie/algemeneInfo.dart';
 import 'package:rotary_nl_rye/features/forRotaryClubs/presentation/pages/InfoCounselor/InfoCounselor.dart';
 import 'package:rotary_nl_rye/features/forRotaryClubs/presentation/pages/InfoGastgezin/InfoGastgezin.dart';
-import 'package:rotary_nl_rye/features/forRotaryClubs/presentation/pages/AlgemeneInformatie/algemeneInfo.dart';
 import 'package:rotary_nl_rye/features/forRotaryClubs/presentation/pages/Jeugdcommissaris/jeugd_commissaris.dart';
 import 'package:rotary_nl_rye/features/forRotaryClubs/presentation/pages/belangrijkeDocumenten/important_documents.dart';
-import 'package:rotary_nl_rye/features/uniform_widgets/back_button.dart';
 import 'package:rotary_nl_rye/features/forRotaryClubs/presentation/widgets/option_row_data.dart';
+import 'package:rotary_nl_rye/features/uniform_widgets/back_button.dart';
 
 class ForRotaryClubsPage extends StatefulWidget {
   @override
diff --git a/lib/features/forRotaryClubs/presentation/widgets/option_row_data.dart b/lib/features/forRotaryClubs/presentation/widgets/option_row_data.dart
index 19ec2f29..af45bbdd 100644
--- a/lib/features/forRotaryClubs/presentation/widgets/option_row_data.dart
+++ b/lib/features/forRotaryClubs/presentation/widgets/option_row_data.dart
@@ -1,4 +1,4 @@
-// 📦 Package imports:
+// 🐦 Flutter imports:
 import 'package:flutter/material.dart';
 
 class OptionRowData {
diff --git a/lib/features/home/presentation/pages/home_page.dart b/lib/features/home/presentation/pages/home_page.dart
index 58d4b7c2..91fd2fc4 100644
--- a/lib/features/home/presentation/pages/home_page.dart
+++ b/lib/features/home/presentation/pages/home_page.dart
@@ -8,7 +8,6 @@ import 'package:shared_preferences/shared_preferences.dart';
 
 // 🌎 Project imports:
 import 'package:rotary_nl_rye/core/domain/entities/exchange_student.dart';
-import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:rotary_nl_rye/features/calendar/presentation/pages/events_page.dart';
 import 'package:rotary_nl_rye/features/forRotaryClubs/presentation/pages/rotary_club_info_page.dart';
 import 'package:rotary_nl_rye/features/home/presentation/widgets/carousel_display.dart';
@@ -31,20 +30,10 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
   bool _isLoading = false;
   List<ExchangeStudent> exchangeStudents = [];
   SharedPreferences? sharedPreferences;
-  int _currentNewsIndex = 0;
 
   @override
   void initState() {
     super.initState();
-    _loadBadge();
-    FlutterNativeSplash.remove();
-  }
-
-  void _loadBadge() async {
-    final prefs = await SharedPreferences.getInstance();
-    setState(() {
-      _currentNewsIndex = (prefs.getInt('newsBadge') ?? 0);
-    });
   }
 
   @override
@@ -84,19 +73,16 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
               icon: FontAwesomeIcons.list,
               title: 'Programs',
               pushTo: ProgramPage(),
-              currentNewsIndex: 0,
             ),
             HomeCardItem(
               icon: FontAwesomeIcons.newspaper,
               title: 'News',
               pushTo: NewsPage(),
-              currentNewsIndex: _currentNewsIndex,
             ),
             HomeCardItem(
               icon: FontAwesomeIcons.calendarDays,
               title: 'Calendar',
               pushTo: CalendarPage(),
-              currentNewsIndex: 0,
             ),
           ],
         ),
@@ -107,19 +93,16 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
               icon: FontAwesomeIcons.planeDeparture,
               title: 'Op Exchange',
               pushTo: OutboundPage(),
-              currentNewsIndex: 0,
             ),
             HomeCardItemToNL(
               icon: FontAwesomeIcons.planeArrival,
               title: 'To',
               pushTo: InboundPage(),
-              currentNewsIndex: 0,
             ),
             HomeCardItem(
               icon: FontAwesomeIcons.rotateRight,
               title: 'Rebound',
               pushTo: CountriesPage(),
-              currentNewsIndex: 0,
             ),
           ],
         ),
@@ -130,12 +113,10 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
               icon: FontAwesomeIcons.campground,
               title: 'Camps & Tours List',
               pushTo: LoadCsv(),
-              currentNewsIndex: 0,
             ),
             HomeCardItemSingleRotary(
               title: 'voor Rotary Clubs',
               pushTo: ForRotaryClubsPage(),
-              currentNewsIndex: 0,
             ),
           ],
         ),
diff --git a/lib/features/home/presentation/widgets/carousel_display.dart b/lib/features/home/presentation/widgets/carousel_display.dart
index f581fbfa..d2e1aba8 100644
--- a/lib/features/home/presentation/widgets/carousel_display.dart
+++ b/lib/features/home/presentation/widgets/carousel_display.dart
@@ -1,14 +1,11 @@
-// 🎯 Dart imports:
-import 'dart:ui';
-
 // 🐦 Flutter imports:
 import 'package:flutter/material.dart';
 
 // 📦 Package imports:
-import 'package:flutter_swiper_null_safety/flutter_swiper_null_safety.dart';
+import 'package:carousel_slider/carousel_slider.dart';
 
 // 🌎 Project imports:
-import '../../../../core/prop.dart';
+import 'package:rotary_nl_rye/core/prop.dart';
 
 class Carousel extends StatefulWidget {
   @override
@@ -18,132 +15,73 @@ class Carousel extends StatefulWidget {
 class _CarouselState extends State<Carousel> {
   int _current = 0;
 
-  List<CarouselModel> carousels = [
-    CarouselModel(
-        image: 'assets/image/homepage/Informatiedag_14_september_2024.jpg',
-        text: null),
-    CarouselModel(
-        image: 'assets/image/homepage/Koningsdag_Emmen_27_april_2024.png',
-        text: null),
-    CarouselModel(
-        image:
-            'assets/image/homepage/Nederland_herdenkt-inbounds_4_mei_2024.png',
-        text: null),
-    CarouselModel(
-        image: 'assets/image/homepage/Inbounds_Bezoek_Beurs_van_Berlage.jpg',
-        text: null),
-    CarouselModel(
-        image: 'assets/image/homepage/Farewell_Inbounds_2023-2024_mei_2024.jpg',
-        text: null),
-    CarouselModel(
-        image: 'assets/image/homepage/Testimonial_Schouwen-Duiveland.png',
-        text: null),
+  final List<CarouselModel> carousels = [
+    CarouselModel(image: 'assets/image/homepage/Rebounddag_2024_Laren.png'),
+    CarouselModel(image: 'assets/image/homepage/Inboundweekend_sept24.png'),
+    CarouselModel(image: 'assets/image/homepage/Rotex24-25.png'),
+    CarouselModel(image: 'assets/image/homepage/Aankomst_inbounds_aug24.png'),
   ];
 
-  List<T> map<T>(List list, Function handler) {
-    List<T> result = [];
-    for (var i = 0; i < list.length; i++) {
-      result.add(handler(i, list[i]));
-    }
-    return result;
-  }
-
   @override
   Widget build(BuildContext context) {
-    return Container(
-      alignment: Alignment.centerLeft,
-      width: MediaQuery.of(context).size.width,
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        mainAxisAlignment: MainAxisAlignment.start,
-        children: <Widget>[
-          Container(
-            width: MediaQuery.of(context).size.width,
-            height: 220,
-            child: Swiper(
-              onIndexChanged: (index) {
-                setState(() {
-                  _current = index;
-                });
-              },
-              autoplay: true,
-              layout: SwiperLayout.DEFAULT,
-              scale: 1,
-              itemCount: carousels.length,
-              itemBuilder: (BuildContext context, int index) {
-                return Stack(
-                  alignment: Alignment.bottomLeft,
-                  children: <Widget>[
-                    Container(
-                      margin: EdgeInsets.symmetric(horizontal: 16),
-                      decoration: BoxDecoration(
-                        borderRadius: BorderRadius.circular(kBorderRadius),
-                        image: DecorationImage(
-                          image: AssetImage(carousels[index].image),
-                          fit: BoxFit.cover,
-                        ),
-                      ),
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: <Widget>[
+        CarouselSlider.builder(
+          itemCount: carousels.length,
+          itemBuilder: (BuildContext context, int index, int realIndex) {
+            return Stack(
+              alignment: Alignment.bottomLeft,
+              children: <Widget>[
+                Container(
+                  decoration: BoxDecoration(
+                    borderRadius: BorderRadius.circular(kBorderRadius),
+                    image: DecorationImage(
+                      image: AssetImage(carousels[index].image),
+                      fit: BoxFit.cover,
                     ),
-                    if (carousels[index].text != null &&
-                        carousels[index].text!.isNotEmpty)
-                      Padding(
-                        padding:
-                            EdgeInsets.symmetric(horizontal: 28, vertical: 12),
-                        child: ClipRRect(
-                          borderRadius: BorderRadius.circular(kBorderRadius),
-                          child: BackdropFilter(
-                            filter: ImageFilter.blur(sigmaX: 10, sigmaY: 10),
-                            child: Container(
-                              decoration: BoxDecoration(
-                                borderRadius:
-                                    BorderRadius.circular(kBorderRadius),
-                                color: Colors.black38,
-                              ),
-                              child: Padding(
-                                padding: const EdgeInsets.symmetric(
-                                    horizontal: 20, vertical: 10),
-                                child: Text(
-                                  carousels[index].text!,
-                                  style: TextStyle(color: Colors.white),
-                                ),
-                              ),
-                            ),
-                          ),
-                        ),
-                      ),
-                  ],
-                );
-              },
-            ),
-          ),
-          SizedBox(
-            height: 12,
+                  ),
+                ),
+              ],
+            );
+          },
+          options: CarouselOptions(
+            height: 220,
+            autoPlay: true,
+            enlargeCenterPage: true, // Makes the center image slightly larger
+            viewportFraction:
+                1, // Controls the width of each image (less than 1.0 to create gaps)
+            aspectRatio: 16 / 9,
+            onPageChanged: (index, reason) {
+              setState(() {
+                _current = index;
+              });
+            },
           ),
-          Row(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: <Widget>[
-              Row(
-                children: map<Widget>(
-                  carousels,
-                  (index, image) {
-                    return Container(
-                      alignment: Alignment.centerLeft,
-                      height: 6,
-                      width: 6,
-                      margin: EdgeInsets.only(right: 8),
-                      decoration: BoxDecoration(
-                          shape: BoxShape.circle,
-                          color: _current == index
-                              ? Palette.indigo
-                              : Palette.lightIndigo),
-                    );
-                  },
+        ),
+        const SizedBox(height: 12),
+        Row(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: carousels.asMap().entries.map((entry) {
+            return GestureDetector(
+              onTap: () => setState(() {
+                _current = entry.key;
+              }),
+              child: Container(
+                width: 8,
+                height: 8,
+                margin: const EdgeInsets.symmetric(vertical: 8, horizontal: 4),
+                decoration: BoxDecoration(
+                  shape: BoxShape.circle,
+                  color: _current == entry.key
+                      ? Palette.indigo
+                      : Palette.lightIndigo,
                 ),
               ),
-            ],
-          ),
-        ],
-      ),
+            );
+          }).toList(),
+        ),
+      ],
     );
   }
 }
diff --git a/lib/features/home/presentation/widgets/home_card_item.dart b/lib/features/home/presentation/widgets/home_card_item.dart
index 30af3fee..08773dbf 100644
--- a/lib/features/home/presentation/widgets/home_card_item.dart
+++ b/lib/features/home/presentation/widgets/home_card_item.dart
@@ -2,7 +2,6 @@
 import 'package:flutter/material.dart';
 
 // 📦 Package imports:
-import 'package:badges/badges.dart' as badges;
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
@@ -12,14 +11,13 @@ import 'package:rotary_nl_rye/core/prop.dart';
 class HomeCardItem extends StatelessWidget {
   final String title;
   final IconData icon;
-  final int currentNewsIndex;
-  final pushTo;
+  final Widget pushTo;
 
-  HomeCardItem(
-      {required this.title,
-      required this.icon,
-      this.pushTo,
-      required this.currentNewsIndex});
+  HomeCardItem({
+    required this.title,
+    required this.icon,
+    required this.pushTo,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -33,12 +31,10 @@ class HomeCardItem extends StatelessWidget {
         ),
         child: MaterialButton(
           onPressed: () {
-            if (pushTo != null) {
-              Navigator.push(
-                context,
-                MaterialPageRoute(builder: (context) => pushTo),
-              );
-            }
+            Navigator.push(
+              context,
+              MaterialPageRoute(builder: (context) => pushTo),
+            );
           },
           color: Palette.themeCardShadeColor,
           height: 120,
@@ -53,30 +49,14 @@ class HomeCardItem extends StatelessWidget {
                 crossAxisAlignment: CrossAxisAlignment.center,
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: <Widget>[
-                  icon == FontAwesomeIcons.newspaper && currentNewsIndex > 0
-                      ? Container(
-                          margin: EdgeInsets.only(bottom: 16),
-                          child: badges.Badge(
-                            position:
-                                badges.BadgePosition.topEnd(top: -15, end: -15),
-                            badgeContent: Text(currentNewsIndex.toString(),
-                                style: TextStyle(
-                                    fontSize: 20, color: Colors.white)),
-                            child: FaIcon(
-                              icon,
-                              color: Palette.lightIndigo,
-                              size: 35,
-                            ),
-                          ))
-                      : Container(
-                          margin: EdgeInsets.only(bottom: 16),
-                          child: FaIcon(
-                            icon,
-                            color: Palette.lightIndigo,
-                            size: 35,
-                          ),
-                        ),
-
+                  Container(
+                    margin: EdgeInsets.only(bottom: 16),
+                    child: FaIcon(
+                      icon,
+                      color: Palette.lightIndigo,
+                      size: 35,
+                    ),
+                  ),
                   SizedBox(
                       width: 80,
                       child: Text(
@@ -90,13 +70,6 @@ class HomeCardItem extends StatelessWidget {
                         textAlign: TextAlign.center,
                         overflow: TextOverflow.ellipsis,
                       )),
-
-                  // Text(
-                  //   title,
-                  //   style: TextStyle(fontSize: 14, color: Palette.indigo),
-                  //   maxLines: 2,
-                  //   overflow: TextOverflow.ellipsis,
-                  // )
                 ],
               )
             ],
@@ -110,14 +83,13 @@ class HomeCardItem extends StatelessWidget {
 class HomeCardItemToNL extends StatelessWidget {
   final String title;
   final IconData icon;
-  final int currentNewsIndex;
-  final pushTo;
+  final Widget pushTo;
 
-  HomeCardItemToNL(
-      {required this.title,
-      required this.icon,
-      this.pushTo,
-      required this.currentNewsIndex});
+  HomeCardItemToNL({
+    required this.title,
+    required this.icon,
+    required this.pushTo,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -131,12 +103,10 @@ class HomeCardItemToNL extends StatelessWidget {
         ),
         child: MaterialButton(
           onPressed: () {
-            if (pushTo != null) {
-              Navigator.push(
-                context,
-                MaterialPageRoute(builder: (context) => pushTo),
-              );
-            }
+            Navigator.push(
+              context,
+              MaterialPageRoute(builder: (context) => pushTo),
+            );
           },
           color: Palette.themeCardShadeColor,
           height: 120,
@@ -151,29 +121,14 @@ class HomeCardItemToNL extends StatelessWidget {
                 crossAxisAlignment: CrossAxisAlignment.center,
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: <Widget>[
-                  icon == FontAwesomeIcons.newspaper && currentNewsIndex > 0
-                      ? Container(
-                          margin: EdgeInsets.only(bottom: 16),
-                          child: badges.Badge(
-                            position:
-                                badges.BadgePosition.topEnd(top: -15, end: -15),
-                            badgeContent: Text(currentNewsIndex.toString(),
-                                style: TextStyle(
-                                    fontSize: 20, color: Colors.white)),
-                            child: FaIcon(
-                              icon,
-                              color: Palette.lightIndigo,
-                              size: 35,
-                            ),
-                          ))
-                      : Container(
-                          margin: EdgeInsets.only(bottom: 16),
-                          child: FaIcon(
-                            icon,
-                            color: Palette.lightIndigo,
-                            size: 35,
-                          ),
-                        ),
+                  Container(
+                    margin: EdgeInsets.only(bottom: 16),
+                    child: FaIcon(
+                      icon,
+                      color: Palette.lightIndigo,
+                      size: 35,
+                    ),
+                  ),
                   Row(
                     children: [
                       Text(
diff --git a/lib/features/home/presentation/widgets/home_card_item_rotary.dart b/lib/features/home/presentation/widgets/home_card_item_rotary.dart
index 01b3c194..ef6af536 100644
--- a/lib/features/home/presentation/widgets/home_card_item_rotary.dart
+++ b/lib/features/home/presentation/widgets/home_card_item_rotary.dart
@@ -9,11 +9,12 @@ import 'package:rotary_nl_rye/core/prop.dart';
 
 class HomeCardItemSingleRotary extends StatelessWidget {
   final String title;
-  final int currentNewsIndex;
-  final pushTo;
+  final Widget pushTo;
 
-  HomeCardItemSingleRotary(
-      {required this.title, this.pushTo, required this.currentNewsIndex});
+  HomeCardItemSingleRotary({
+    required this.title,
+    required this.pushTo,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -29,12 +30,10 @@ class HomeCardItemSingleRotary extends StatelessWidget {
           elevation: 0,
           highlightElevation: 0,
           onPressed: () {
-            if (pushTo != null) {
-              Navigator.push(
-                context,
-                MaterialPageRoute(builder: (context) => pushTo),
-              );
-            }
+            Navigator.push(
+              context,
+              MaterialPageRoute(builder: (context) => pushTo),
+            );
           },
           color: Palette.themeCardShadeColor,
           height: 80,
diff --git a/lib/features/home/presentation/widgets/home_card_item_single.dart b/lib/features/home/presentation/widgets/home_card_item_single.dart
index c3a23225..504d176f 100644
--- a/lib/features/home/presentation/widgets/home_card_item_single.dart
+++ b/lib/features/home/presentation/widgets/home_card_item_single.dart
@@ -2,7 +2,6 @@
 import 'package:flutter/material.dart';
 
 // 📦 Package imports:
-import 'package:badges/badges.dart' as badges;
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
 // 🌎 Project imports:
@@ -11,14 +10,13 @@ import 'package:rotary_nl_rye/core/prop.dart';
 class HomeCardItemSingle extends StatelessWidget {
   final String title;
   final IconData icon;
-  final int currentNewsIndex;
-  final pushTo;
+  final Widget pushTo;
 
-  HomeCardItemSingle(
-      {required this.title,
-      required this.icon,
-      this.pushTo,
-      required this.currentNewsIndex});
+  HomeCardItemSingle({
+    required this.title,
+    required this.icon,
+    required this.pushTo,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -34,12 +32,10 @@ class HomeCardItemSingle extends StatelessWidget {
           elevation: 0,
           highlightElevation: 0,
           onPressed: () {
-            if (pushTo != null) {
-              Navigator.push(
-                context,
-                MaterialPageRoute(builder: (context) => pushTo),
-              );
-            }
+            Navigator.push(
+              context,
+              MaterialPageRoute(builder: (context) => pushTo),
+            );
           },
           color: Palette.themeCardShadeColor,
           height: 80,
@@ -52,29 +48,14 @@ class HomeCardItemSingle extends StatelessWidget {
                 crossAxisAlignment: CrossAxisAlignment.center,
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: <Widget>[
-                  icon == FontAwesomeIcons.newspaper && currentNewsIndex > 0
-                      ? Container(
-                          margin: EdgeInsets.only(bottom: 16),
-                          child: badges.Badge(
-                            position:
-                                badges.BadgePosition.topEnd(top: -15, end: -15),
-                            badgeContent: Text(currentNewsIndex.toString(),
-                                style: TextStyle(
-                                    fontSize: 20, color: Colors.white)),
-                            child: FaIcon(
-                              icon,
-                              color: Palette.lightIndigo,
-                              size: 35,
-                            ),
-                          ))
-                      : Container(
-                          margin: EdgeInsets.only(bottom: 10),
-                          child: FaIcon(
-                            icon,
-                            color: Palette.lightIndigo,
-                            size: 35,
-                          ),
-                        ),
+                  Container(
+                    margin: EdgeInsets.only(bottom: 10),
+                    child: FaIcon(
+                      icon,
+                      color: Palette.lightIndigo,
+                      size: 35,
+                    ),
+                  ),
                   Text(
                     title,
                     style: TextStyle(fontSize: 14, color: Palette.indigo),
diff --git a/lib/features/inbound/data/inbound_list.dart b/lib/features/inbound/data/inbound_list.dart
index 4d484734..14e63250 100644
--- a/lib/features/inbound/data/inbound_list.dart
+++ b/lib/features/inbound/data/inbound_list.dart
@@ -2,51 +2,108 @@
 import 'package:rotary_nl_rye/features/inbound/presentation/models/ClassOf.dart';
 
 List<Inbounds> inboundList = [
-  // João Vitor Alberti Rech
+  // Aiden Almaraz
   Inbounds(
-    name: 'João Vitor',
+    name: 'Aiden Almaraz',
     bio:
-        'Hallo! Hoe gaat het?\n\n Mijn naam is João Vitor, ik ben 17 jaar en ik kom uit Brazilië.\n\n I live in Bauru, a city in the state of São Paulo. My Rotary club in Brazil is Rotary Club Bauru Vitória Régia and my district is 4510.\n\n In the Netherlands, I’m living in Maarssen, a city next to Utrecht. I’m being hosted by the Rotary Club Maarssen, in district 1570.\n\n In Brazil, my house has 6nmembers: my mother, who participates in the Rotary Club Bauru Vitória Régia; my father, who works very hard; my sister, who is in the university studying to be a dentist; me, who participated in the Interact Club Bauru Aeroporto, and my two pets: a cat and a dog.\n\n I love reading and listening to music. My favorite book is “Enquanto eu não te encontro”, a Brazilian book by Pedro Rhuas, and my favorite singer is Lana Del Rey.\n\n I always wanted to do an exchange program, visit another country, learn a new language. I know about the Rotary and the RYE since I was a kid because some of my cousins already did the program.\n\n I hope I can meet a lot of people, make a lot of friends and learn Dutch. \n\n I’m so happy of finally making my dream come true in an amazing country!',
+        'Hello, my name is Aiden Almaraz and I am from Roger, Arkansas which is North East of Texas. Most people ask me, why leave the U.S and come here? Well the reason is because I’ve wanted to experience the world since I was young due to my grandma. She has traveled all over the world and has experienced so many things I won’t even experience. She would tell me bed time stories of her edventures. When I got older I heard of this opportunity and I grabbed it and didn’t let go. I’m currently staying in Eemnes with my wonderful host family. Out of this year I want to learn a third language and become well embedded with the culture here. ',
     imageUrl:
-        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/joao-vitor-alberti-rech.jpeg',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/24-25/aiden-almaraz.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
     facebookUrl: null,
     instagramUrl: null,
     websiteUrl: null,
-    from: 'Brazilië',
-    fromFlag: 'br',
+    from: 'USA',
+    fromFlag: 'us',
+    to: 'Nederland',
+    toFlag: 'nl',
+  ),
+
+  // Annabel Austin
+  Inbounds(
+    name: 'Annabel Austin',
+    bio:
+        'My name is Annabel Austin and I’m fifteen years old. I come from Switzerland (near Lucerne), and I have always wanted to do an exchange year. In my exchange, I want to visit many new places, make friends for life, experience the Dutch culture and learn Dutch. I want to get out of my comfort zone and grow to be more open. Now I’m living in Harderwijk, while I really like the city and my host family, I sometimes still miss my family at home. I\'m looking forward to having a once in a lifetime opportunity!',
+    imageUrl:
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/24-25/annabel-austin.jpg',
+    email: null,
+    phoneNumber: null,
+    snapchatUrl: null,
+    facebookUrl: null,
+    instagramUrl: null,
+    websiteUrl: null,
+    from: 'Switzerland ',
+    fromFlag: 'ch',
     to: 'Nederland',
     toFlag: 'nl',
   ),
 
-  // Mili Alfonso Bermudez
+  // Martina Barra Ponce
   Inbounds(
-    name: 'Milagros Alfonso',
+    name: 'Martina Barra Ponce',
     bio:
-        'Hallo! Ik ben Milagros Alfonso, from La Falda a small city in Cordoba, Argentina. I am 16 years and I love reading, listening to music, playing piano, visiting museums and having new experiences! \n I am very excited for the exchange year in the Netherlands, I’ll be in Medemblik on the district 1580.\n I am sure that this will be a year full of learning and great experiences🫶',
+        'I’m Martina Barra Ponce and I’m from Catamarca, Argentina. Currently I’m living in the city of Lelystad in the Netherlands and since I’m a kid I have always dreamed of making an exchange because I love traveling and get to know new cultures. So this programe (Rotary Youth Exchange) gave the opportunity to do that. This year I’m really looking forward to learn Dutch and also be able to get used to this totally new culture.',
     imageUrl:
-        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/milagros-alfonso.jpg',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/24-25/martina-barra-ponce.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
     facebookUrl: null,
     instagramUrl: null,
     websiteUrl: null,
-    from: 'Argentinië',
+    from: 'Argentina ',
     fromFlag: 'ar',
     to: 'Nederland',
     toFlag: 'nl',
   ),
 
-  // Luke Christopherson
+  // Paola Bellu
+  Inbounds(
+    name: 'Paola Bellu',
+    bio:
+        'Hi I’m Paola, I’m from Italy and I’m 17 years old. I’m staying in Delft for my exchange and I’m loving it. I chose to do the Rotary Youth Exchange because I really love to travel and see new places and get to know new people and I really want and hope to achieve my goal to make new friends and see more cities as possible as well to learn a new, hard, language.',
+    imageUrl:
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/24-25/paola-bellu.png',
+    email: null,
+    phoneNumber: null,
+    snapchatUrl: null,
+    facebookUrl: null,
+    instagramUrl: null,
+    websiteUrl: null,
+    from: 'Italy',
+    fromFlag: 'it',
+    to: 'Nederland',
+    toFlag: 'nl',
+  ),
+
+  // Carlotta Beraudi
   Inbounds(
-    name: 'Luke Christopherson',
+    name: 'Carlotta Beraudi',
     bio:
-        'I am from Chelan, a small town in eastern Washington State, USA. I am very passionate about sports, art, history and geography. I have been wanted to go on an exchange year for a long time, and am very grateful that I have the opportunity now! I am currently living in Arnhem, Gelderland(District 1560). I am very excited for the adventure I am taking on!',
+        'hi everyone, i’m carlotta and i’m from Italy, now i’m an exchange student in the netherlands more  specifically in Franeker. I’m a very chaotic and outgoing girl ( It\'s another way of saying that I talk a lot and make friends with everyone😂) the thing that i hate the most is not doing nothing. I love staying with other people and interact with everyone, i love to hang out and know new things. this is also one of the reasons of my exchange:get involved. i’ve thought a lot about my qualities and i’ve realised that this is one of the best ways to raise myself, i’ve understood that the thing that i needed was a personal grown. the others reason aremy desire to discover new cultures and languages. I hope that at end of this exchange i’ll be a different person, more mature and more open to all the experiences that my life deserves for me!!',
     imageUrl:
-        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/luke-christopherson.jpg',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/24-25/carlotta-beraudi.jpg',
+    email: null,
+    phoneNumber: null,
+    snapchatUrl: null,
+    facebookUrl: null,
+    instagramUrl: null,
+    websiteUrl: null,
+    from: 'Italy',
+    fromFlag: 'it',
+    to: 'Nederland',
+    toFlag: 'nl',
+  ),
+
+  // Kimball Coffey
+  Inbounds(
+    name: 'Kimball Coffey',
+    bio:
+        'Hi! My name is Kimball Coffey and I am from Syracuse, New York in the United States. I am 17 years old and have 4 siblings back home. I am a sporty person and I enjoy cycling, baseball, and athletics. I also have quite the talent for languages and can speak English, Spanish, as well as a bit of French and Arabic. This year, I will live in Franeker in Friesland. I wanted to go on an exchange because I think it could be an eye opening opportunity to go and live amongst people of another culture. This year, I want to learn to speak Dutch as well as Frisian if possible, meet new people, and get to know everything that there is about the Netherlands.',
+    imageUrl:
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/24-25/kimball-coffey.png',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -59,51 +116,70 @@ List<Inbounds> inboundList = [
     toFlag: 'nl',
   ),
 
-  // Ella Day
+  // Renzo Curra
   Inbounds(
-    name: 'Ella Day',
+    name: 'Renzo Curra',
     bio:
-        'Hoi! My name is Ella Day. I am 17 years old and grew up in Okotoks Alberta, Canada. I\'m from District 5360.  I\'ll be spending my exchange year in Emmen. \n I love to read (40+ books so far this year), camp, bike, and play softball. \n I feel so lucky to have been selected for this wonderful opportunity and can\'t wait to see where it leads me, how I can grow my understanding of the Dutch language and culture, and most importantly how it will help me to grow as a person. ',
+        'Hoi! I am Renzo Curra, from Olavarria and small city in Buenos Aires, Argentina, i live with my mum (mariana) and my dad (Gustavo) and my sister (Renata) she lives in another city because she is studing at university, i am 16 years old,i am a good person, i am so funny, i laugh all the time, i am so extrovert, i  like to meet new people. I am living in Oegstgeest with Jonneke (my host mum) and Frank (my host dad) i lived a few days with my host sister (Thil) but now she is in Italy. I am doing the Rotary Youth Exchange because i think is a good experience because is it only once in a lifetime at this age, i think is good apportunity because it opens your mind and helps you to think differently. In this year i want to meet people, try new food, learn another lenguage, see another culture, make friends from another country.',
     imageUrl:
-        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/ella-day.png',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/24-25/renzo-curra.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
     facebookUrl: null,
     instagramUrl: null,
     websiteUrl: null,
-    from: 'Canada',
-    fromFlag: 'ca',
+    from: 'Argentina ',
+    fromFlag: 'ar',
     to: 'Nederland',
     toFlag: 'nl',
   ),
 
-  // Angelica Galdini
+  // Mélusine Garnier
   Inbounds(
-    name: 'Angelica Galdini',
+    name: 'Mélusine Garnier',
     bio:
-        'Hello, I am Angelica Galdini, I’m 17 years old and I am from Como in Italy. \n\n In the Nederland I will spend the whole year in Maarssen.\n\n I like listening to music, going out with my friends and spending time with my family. \n\n I have always loved to travel, to know new cultures, visit new places and I’m really happy to be here. \n\n I hope this experience will make me grow and know new people from all the world!',
+        '''Hoii! My name is Mélusine. I’m from France. When you think of France, you probably think of Paris and the Eiffel Tower but France it’s not only Paris. I was born in Paris, and now I live in Clermont Ferrand, since my second birthday. It would be a lie if I said my city is the prettiest in the world, but the landscapes make it beautiful. Now I live in Venlo, in Limburg. That means a lot of traditions and different dialects every 5 km. Limbourg is, for me, the family oriented part of The Netherlands. I wanted to go on RYE because since I was a child my dream was going abroad, visiting the world, meet new people, making connections… I’m in the youngest part of rotary (interact) so for me it’s was the perfect thing to do. Continue in my Rotary way and in the same realize my dream. I want to become fluent in Dutch, make friends for like, and "live the country" like a real Dutchie. This year will be the best of my life.''',
     imageUrl:
-        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/angelica-galdini.jpg',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/24-25/melusine-garnier.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
     facebookUrl: null,
     instagramUrl: null,
     websiteUrl: null,
-    from: 'Italië',
-    fromFlag: 'it',
+    from: 'France',
+    fromFlag: 'fr',
+    to: 'Nederland',
+    toFlag: 'nl',
+  ),
+
+  // Javiera Gurdet Agurto
+  Inbounds(
+    name: 'Javiera Gurdet Agurto',
+    bio:
+        'Hi, my name is Javiera Gurdet, I am from Vallenar, Chile. I am 15 years old and I currently live in Den hout, Achterstraat 3, with Petra and her family. I wanted to go on an exchange because I want to try new things, cultures, languages, different ways of seeing life. Since I was very young I have liked adventures and new challenges, that is why one of my dreams was to go on an exchange, I never lost faith in being able to achieve it and now I am here! This year I want to learn the language, culture, get to know the gastronomy, I really want to learn urban legends about this country, meet new people, get to know a different reality than what I was used to, but the most important thing is that I want to grow as a person, I want to be the best version of myself, I want to give my best so that more people can fulfill their dreams just like I did, I want to achieve every goal that I set for myself, I want to help others in everything I can, I want to bring innovative things to Chile, things that can really contribute to us; But more than just wanting this, I know that I will achieve everything I set out to do.',
+    imageUrl:
+        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+    email: null,
+    phoneNumber: null,
+    snapchatUrl: null,
+    facebookUrl: null,
+    instagramUrl: null,
+    websiteUrl: null,
+    from: 'Chile',
+    fromFlag: 'cl',
     to: 'Nederland',
     toFlag: 'nl',
   ),
 
-  // Elena Guererro Hutt
+  // Mónica Gomez Gonzalez
   Inbounds(
-    name: 'Elena Guererro Hutt',
+    name: 'Mónica Gomez Gonzalez',
     bio:
-        'Hello! My name is Elena, I come from Mexico City. I am 16 years old, I love to cook and play basketball, I like to try new things and create new memories. I will currently be living in Epe and I’m in Rotary District 1560. \n\n "I\'m delighted to meet new people and share my new experiences!"',
+        'Hi, my name is Mony Gómez and I’m Mexican,  I am 16 years old and now I’m living probably one of the biggest adventures of my life, I’m doing an exchange year in the Netherlands, specifically in a small but beautiful village, believe me when I say small (700 inhabitants), Vierhouten, and it’s situated in the middle of the Netherlands. I decided to go abroad just for knowing and living something different, as I said, I believe that  this will be a great adventure, I hope to know the language, food, culture, traditions, make friends and relationships that last for years, also I’ll love to leave a bit of myself and Mexico in the Dutch hearts. I just expect to have fun experiencing the typical Dutch life.',
     imageUrl:
-        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/elena-guererro-hutt.jpeg',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/24-25/monica-gomez-gonzalez.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -116,32 +192,51 @@ List<Inbounds> inboundList = [
     toFlag: 'nl',
   ),
 
-  // Alaina Jackson
+  // Kali Harkness
   Inbounds(
-    name: 'Alaina Jackson',
+    name: 'Kali Harkness',
     bio:
-        'Hello, My name is Alaina Jackson and I am from Rotterdam New York. I am 16 years old and I have one brother named Caelum who is 18. I have traveled to many countries before such as Japan and Mexico, but this is my first time in Europe! Some things I enjoy are classical ballet dancing and art. I have been dancing since I was 3 years old and currently perform shows such as the Nutcracker with a company in upstate New York. Other than the arts, I enjoy going to school and learning subjects such as math and history. \n\n Currently I am living in Gouda, and I am loving my time here so far! I am very excited to continue exploring the culture and learn more about the Netherlands!',
+        'My name is Kali Harkness and I\'m a Canadian from BC. My current host family is in Hezze but later in the year I\'ll be moving to Valkenswaard where my host club is located. The idea of gaining a better understanding of the world and also learning a new language really appealed to me and is the base for why I wanted to go on this exchange. In my year here I really just want to work on putting myself out there, trying new things and being involved as well learning the language and working on personal interests such as improving my art skills. Things will change and new opportunities will arise, I want to achieve the most I am capable of, my idea of what that is right now is vague.',
     imageUrl:
-        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/alaina-jackson.jpg',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/24-25/kali-harkness.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
     facebookUrl: null,
     instagramUrl: null,
     websiteUrl: null,
-    from: 'USA',
-    fromFlag: 'us',
+    from: 'Canada',
+    fromFlag: 'ca',
+    to: 'Nederland',
+    toFlag: 'nl',
+  ),
+
+  // Rafael Macias Gonzalez
+  Inbounds(
+    name: 'Rafael Macias Gonzalez',
+    bio:
+        'Hallo!, I ‘am Rafael Macias from Teodelina a small city in Santa fe ,Argentina.  My district in Argentina is 4945. I’m 17 years old  I am living in Enkhuizen ,Noord of holland  I’m part of the district 1580 I decided to enter the Exchange program because it is a way to get know different cultures, open your mind, connect with the world and make new contacts. I\'m living a dream because I wanted to do this a few years ago, it is a unique opportunity so I hope to do it in the best way possible and make the most beautiful memories. A bit about me:  I like to play football and dive. I am a curious boy, I like to learn from others, spend time with friends and enjoy life. This year in Netherlands I hope to learn a little of the language, get to know its culture and visit places and it would be a dream to meet the queen of Netherlands who is from Argentina. If you want to contact me this is my instagram Rafamacias10 and my email Rafa10macias@gmail.com',
+    imageUrl:
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/24-25/rafael-macias-gonzalez.jpg',
+    email: 'Rafa10macias@gmail.com',
+    phoneNumber: null,
+    snapchatUrl: null,
+    facebookUrl: null,
+    instagramUrl: 'https://www.instagram.com/Rafamacias10/',
+    websiteUrl: null,
+    from: 'Argentina ',
+    fromFlag: 'ar',
     to: 'Nederland',
     toFlag: 'nl',
   ),
 
-  // Lexis Jones
+  // Maggie Reissig
   Inbounds(
-    name: 'Lexis Jones',
+    name: 'Maggie Reissig',
     bio:
-        'Hello! My name is Lexis. I am from a very small town called Scranton in Kansas which only has a population of 700. I’m 16, but soon to be 17 this coming October. I live with my two brothers, mom, dog and cat, who is called Bee! For my exchange I will be going to Bussum, which is district 1570.\n\n I have a few hobbies! I’ve been drawing since I was 10 and still do. It one of my favorite creative outlets, and you can usually find my doodling in all sorts of papers! The past few years I’ve also crocheted, although I’m still quite slow at it and it’s usually a on and off hobby. I have plants in my room I also take care of. My favorite ones are my vibes which I cut and propagated myself. Lastly, I really enjoy going on walks/hikes!\n\n I’ve wanted to be an exchange student since I was 13, and I’m so thankful I was given this opportunity to be able to travel to a new country and learn all the new customs. Along with any history that comes with the Netherlands! <3',
+        'Hi! My name is Maggie Reissig, and I’m from the United States. When I applied last September, I had no idea what I had in store for me. I had never imagined myself being able to stay in a small city called Baarlo, 4,000 miles from home. All my life, I have wanted to travel and explore the world, and there was no better way to push myself than to get on a plane and go a year experiencing everything I can. I want more than anything to gain perspective, and be able to speak and understand more than one language. My goals for this year are to see as much as possible, and learn as much language as possible.',
     imageUrl:
-        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/lexis-jones.jpeg',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/24-25/maggie-reissig.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -154,211 +249,226 @@ List<Inbounds> inboundList = [
     toFlag: 'nl',
   ),
 
-  // Juliana Novo Rojas
+  // Stella Riccio
   Inbounds(
-    name: 'Juliana Novo Rojas',
+    name: 'Stella Riccio',
     bio:
-        'Hii, my name is Juliana but people call me Juli, I’m 15 years old. I come from Alicant, a city in Spain. My family is from Colombia, but me and my brother were born in Spain where we live with our parents. This year I will stay in Bennekom, Gelderland.\n\n I’m keen on doing windsurf, surf and everything that has to be with the sea. Also I love traveling, knowing new people, listening to music and playing the ukelele.\n\n I wish this will be a great year, and I’m looking forward to meet all the exchange students that are here in the Nederlands.',
+        'I’m Stella, I’m 17 and I’m from Cagliari.\n\n My mother and my father are Anna and Roberto and my sister and my brother are Grazia and Mario. I have a dog named Emma. I like reading and shopping. I’m living here in Netherland (my first choice) in a place called Venlo with Gunda and Willem, my first host family. I like them, they are so nice with me and we visited some nice places.\n\n At the beginning I was disoriented, but now I’m fine and I really like staying here.\n\n I heard about the possibility of staying here from my family, because my father is an ex-rotarian. I hope this year I will be able to live in another place so far from Italy and to learn the dutch.',
     imageUrl:
-        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/juliana-novo-rojas.jpg',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/24-25/stella-riccio.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
     facebookUrl: null,
     instagramUrl: null,
     websiteUrl: null,
-    from: 'Spanje',
-    fromFlag: 'es',
+    from: 'Italy',
+    fromFlag: 'it',
     to: 'Nederland',
     toFlag: 'nl',
   ),
 
-  // Keona Olney
+  // Ximena Reyes Flores
   Inbounds(
-    name: 'Keona Olney',
+    name: 'Ximena Reyes Flores',
     bio:
-        'Hallo! My name is keona. I come from a small town on north Vancouver island, Bc Canada, called port hardy. I am currently 17, and turning 18 beginning of June. I live with my mom and dad, two cats, and as well two dogs. I also have a sister who is in university. For my exchange year I will be in Sneek, district 1590.\n\n I have been playing ice hockey since I was little, growing up in the arena on skates. I as well have been working for for a few years now, which has become another big hobby of mine. \n\n I have always loved traveling which brought me to rotary exchange. I am beyond thankful I was given this opportunity to explore, learn, and challenge myself.',
+        'I´m Ximena Reyes, I come from the northwest of Mexico and I\'m currently living in Enschede for my exchange year. I decided to live the experience of an exchange year because I love traveling and new experiences as much as I love knowing new people. I love having a lot of fun and learning how different cultures are all around the world. I really want to achieve a very good level in Dutch and make friendships for life. ',
     imageUrl:
-        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/keona-olney.jpg',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/24-25/ximena-reyes-flores.png',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
     facebookUrl: null,
     instagramUrl: null,
     websiteUrl: null,
-    from: 'Canada',
-    fromFlag: 'ca',
+    from: 'Mexico',
+    fromFlag: 'mx',
     to: 'Nederland',
     toFlag: 'nl',
   ),
 
-  // Sabrina Pinterich Almeida
+  // Kaleena Sahim
   Inbounds(
-    name: 'Sabrina Pinterich Almeida',
+    name: 'Kaleena Sahim',
     bio:
-        'Hallo! Mijn naam is Sabrina, ik ben zestien jaar en ik kom uit Curitiba in Brazilië.\n\n I was born and have lived my whole life in Curitiba, the capital of the state of Paraná in the south of Brazil. \n I’ve danced ballet since I was 3 years old and swim since I was 2. I’m also the public relations of my Interact Club in Curitiba. \n\n I love reading, traveling, listening to music and spending time with family and friends. \n\n My district in Brazil is 4730 and in Nederland is 1560. I’ll be living in a city called Winterswijk in Gelderland. \n\n I’m so excited to learn a new language, meet new people and a new culture. I’ve always dreamed of an exchange year so I’m so grateful for this opportunity and I’m going to make the most out of it!',
+        'I’m Kaleena Sahim and i’m from the United States, specifically Washington state. this year I am staying in Schiedam. I wanted to go on a a youth exchange because I didn’t feel that I was being pushed to grow at school both academically and socially while in the States. This year I hope to grow as a person, learn new things as well as find myself as a person.',
     imageUrl:
-        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/sabrina-pinterich-almeida.jpeg',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/24-25/kaleena-sahim.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
     facebookUrl: null,
     instagramUrl: null,
     websiteUrl: null,
-    from: 'Brazilië',
-    fromFlag: 'br',
+    from: 'USA',
+    fromFlag: 'us',
     to: 'Nederland',
     toFlag: 'nl',
   ),
 
-  // Julia Piovesan
+  // Nínive Santos de Siquiera
   Inbounds(
-    name: 'Julia Piovesan',
+    name: 'Nínive Santos de Siquiera',
     bio:
-        'Hallo , Ik heet Julia Piovesan, I ben zeventien jaar en Ik kom uit Brazilië!\n\n I live São Paulo, in the southwest region of Brazil, one of the biggest city in the world!\n My birthday is 10 of July, My sign is Cancer ♋️ and I love this kind of things, also love reading books, listening to music, watching series, go to the gym, travel and go to the beach (I am a fan of this one).\n\n So the dream of doing an exchange program came from many years ago, when I was little I already had it in my mind that I really wanted to do an exchange program, my aunt did it and other people in my family also did it so that made me want to do it and dream about it! \n\n I hope to have the best year of my life here in the Netherlands and see and know a lot from here, from the culture, the incredible places and views, and of course learn the language!',
+        'Hello, my name is Nínive. Im from Brazil, Im staying at Waalwijk in the Nederlands. I wanted to do the Rotary youth exchange because since I was a little girl, I wanted to do an exchange program and learn a new culture/language! My main goal this year is to learn dutch!',
     imageUrl:
-        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/julia-piovesan.jpeg',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/24-25/ninive-santos-de-siquiera.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
     facebookUrl: null,
     instagramUrl: null,
     websiteUrl: null,
-    from: 'Brazilië',
+    from: 'Brazil',
     fromFlag: 'br',
     to: 'Nederland',
     toFlag: 'nl',
   ),
 
-  // Kaylavondra Radinka
+  // Sebastián Silva Ramos
   Inbounds(
-    name: 'Kaylavondra Radinka',
+    name: 'Sebastián Silva Ramos',
     bio:
-        '“You know, there’s a difference between like and love. I like my Skechers, but I love my Prada backpack.” Here is a quote from one of my favorite movies, 10 Things I Hate About You. I like to chill and read books at home, but I love exploring. So, here I am in another country to do my hobby, traveling and learning. \n\n Im Radinka Kaylavondra, people usually call me Kayla. I come from Surabaya, Indonesia, and I will be living in Lochem for a year. I have always wanted to study abroad since I was very little, so going on this exchange is the first step I take to achieve my dream. I really hope that through this exchange, I will be able to speak a new language, make a lot of new friends with people from all over the world, and ultimately to gain new experiences. \n\n Ik hou van Nederland! ',
+        'Hello! My name is Sebastian Silva, and I’m 17 years old from Quito, Ecuador. This year, I’m embarking on an exciting adventure, living in Roosendaal in the southern Netherlands. I’m passionate about football and look forward to diving into this new chapter of my life. I chose to make this move because I believe it will be one of the most rewarding experiences, offering me the chance to learn the language, meet new people, and immerse myself in the culture of this amazing country.',
     imageUrl:
-        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/kaylavondra-radinka.jpeg',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/24-25/sebastian-silva-ramos.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
     facebookUrl: null,
     instagramUrl: null,
     websiteUrl: null,
-    from: 'Indonesië',
-    fromFlag: 'in',
+    from: 'Ecuador',
+    fromFlag: 'ec',
     to: 'Nederland',
     toFlag: 'nl',
   ),
 
-  // Jackson Rose
+  // Alberto Silvestri
   Inbounds(
-    name: 'Jackson Rose',
+    name: 'Alberto Silvestri',
     bio:
-        'Hello, my name is Jackson, I am 15 (soon to be 16) years old. I am from Canada and I live in a small town in B.C named Cranbrook, and I am going to Zwolle for my exchange year.\n\n I like to cook, bike, and do anything that has to do with sports. I consider myself fairly outgoing and enjoy meeting new people. I am very excited for the upcoming year!',
+        'My name is Alberto, I’m from Italy and I was born in Siena. Here in the Netherlands, I’m staying in Roosendaal. I wanted to do the Rotary Youth Exchange because I liked the idea behind it: changing host families three times during the year to push us out of our comfort zone. This year, I especially want to grow by experiencing and getting used to different situations, trying to adapt to new challenges, and learning new things, like the language.',
     imageUrl:
-        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/Jackson-Rose.jpg',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/24-25/alberto-silvestri.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
     facebookUrl: null,
     instagramUrl: null,
     websiteUrl: null,
-    from: 'Canada',
-    fromFlag: 'ca',
+    from: 'Italy',
+    fromFlag: 'it',
     to: 'Nederland',
     toFlag: 'nl',
   ),
 
-  // Arthur Rougier
+  // Wheel Srisopon
   Inbounds(
-    name: 'Arthur Rougier',
+    name: 'Wheel Srisopon',
     bio:
-        'Hoi, ik ben Arthur, ik kom uit Frankrijk, Vichy ligt in de Auvergne, midden Frankrijk. En ik ben 15 jaar oud (16 in Oktober). In Nederland, ik woon in Etten Leur, district 1610. Ik hou van piano spelen, film kijken, sportschool, pretpark en skiën.',
+        'Hallo! I’m Wheel, Rotary Youth Exchange from Thailand, district 3350. In the Netherlands, I live in Scherpenzeel with the Rotary club of Scherpenzeel-Woenberg, district 1570. Being an exchange student has always been my dream since I was young, and with the Rotary, I have got a very amazing opportunity to be here in the Netherlands. My biggest goal from this exchange year is to have a wonderful experience in the Netherlands and to be able to speak in Dutch. I really enjoyed living here so far. The people, the host-family and of course the Rotary are very nice and kind. I’m looking forward to more amazing experiences in the Netherlands!',
     imageUrl:
-        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/arthur-rougier.jpg',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/24-25/wheel-srisopon.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
     facebookUrl: null,
     instagramUrl: null,
     websiteUrl: null,
-    from: 'Frankrijk',
-    fromFlag: 'fr',
+    from: 'Thailand',
+    fromFlag: 'th',
     to: 'Nederland',
     toFlag: 'nl',
   ),
 
-  //Owen Scruggs
+  // Renan Thomé
   Inbounds(
-    name: 'Owen Scruggs',
+    name: 'Renan Thomé',
     bio:
-        ' Hoi! Mijn naam is Owen en ik kom uit Jacksonville, Florida in de Verenigde Staten van Amerika. Ik ben zeventien jaar en woon in Wierden voor mijn uitwisseling. Ik kom uit district 6970 van noord Florida. Ik ben zo blij dat ik hier in Nederland ben, het is een prachtig land en de mensen hier zijn zo aardig! Ik kon me geen betere plek wensen dan hier. Bedankt allemaal om deze kans mogelijk te maken!',
+        'Hello, my name is Renan Russo, I am 17 years old and I come from Brazil. In my country, I really like playing football, skateboarding and going to the beach. here, I am living in Den Hout, a small village in the province.I wanted to join RYEP because I believe it is an opportunity to acquire a lot of knowledge and open your mind to other cultures and I chose the Netherlands because it is a very unique country! It is a very eco-friendly country, with solar panels, windmills and bicycles (I love cycling). I also want to learn Dutch, as we have Dutch-speaking neighbors (Suriname). During my stay here, I plan to explore more and more Dutch culture, learn the language, make friends and visit the most famous places in the country.',
     imageUrl:
-        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/owen-scruggs.jpg',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/24-25/renan-thome.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
     facebookUrl: null,
     instagramUrl: null,
     websiteUrl: null,
-    from: 'USA',
-    fromFlag: 'us',
+    from: 'Brazil',
+    fromFlag: 'br',
     to: 'Nederland',
     toFlag: 'nl',
   ),
 
-  // Senja Ulvinen
+  // Maria Eduarda Zanelato
   Inbounds(
-    name: 'Senja Ulvinen',
+    name: 'Maria Eduarda Zanelato',
     bio:
-        'Hoi, my name is Senja Ulvinen and I’m 17 years old. I come from small town called Lapua. Lapua is located in the west of Finland (D1385). My family includes my dad and my mom and three little brothers. We also have a dog.\n\n I enjoy reading books and watching movies or series. I like to spend time with my friends and family but I also like to be by myself. I’m joyful and cheery. I like to make people happy and laugh. I’m tolerant of other people. I like to see and experience new things. So the exchange year is perfect for me.\n\n Here in The Netherlands I live in Dronten (D1590), I think it’s a nice village. People here are friendly and I’m having good time here. \n\n I look forward to what the future holds. I hope to make unforgettable memories and many new friends.',
+        'Hi, I\'m Duda, from Brazil, and I\'m staying in the city of Haaksbergen, NL. I have wanted to do an exchange since I was twelve years old, I have always been curious to know a new language, culture and customs, Rotary is providing this for me. During this year of exchange I hope to get to know the country and its customs, in addition to growing as a person, with more responsibilities and deciding which way to follow in the future 😀',
     imageUrl:
-        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/senja-ulvinen.jpeg',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/24-25/maria-eduarda-zanelato.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
     facebookUrl: null,
     instagramUrl: null,
     websiteUrl: null,
-    from: 'Finland',
-    fromFlag: 'fi',
+    from: 'Brazil',
+    fromFlag: 'br',
     to: 'Nederland',
     toFlag: 'nl',
   ),
 
-  // Valentina Velazco Garay
+  // Venla Laine
   Inbounds(
-    name: 'Valentina Velazco Garay',
-    bio:
-        'I’m Valentina from Mexico and I love to learn new lenguages and traditions',
+    name: 'Venla Laine',
+    bio: '',
     imageUrl:
-        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/valentina-velazco-garay.jpeg',
+        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
     facebookUrl: null,
     instagramUrl: null,
     websiteUrl: null,
-    from: 'Mexico',
-    fromFlag: 'mx',
+    from: '?',
+    fromFlag: 'eu',
+    to: 'Nederland',
+    toFlag: 'nl',
+  ),
+  // Luke Reid
+  Inbounds(
+    name: 'Luke Reid',
+    bio: '',
+    imageUrl:
+        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+    email: null,
+    phoneNumber: null,
+    snapchatUrl: null,
+    facebookUrl: null,
+    instagramUrl: null,
+    websiteUrl: null,
+    from: '?',
+    fromFlag: 'eu',
+    to: 'Nederland',
+    toFlag: 'nl',
+  ),
+  // Alexina Taylor
+  Inbounds(
+    name: 'Alexina Taylor',
+    bio: '',
+    imageUrl:
+        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+    email: null,
+    phoneNumber: null,
+    snapchatUrl: null,
+    facebookUrl: null,
+    instagramUrl: null,
+    websiteUrl: null,
+    from: '?',
+    fromFlag: 'eu',
     to: 'Nederland',
     toFlag: 'nl',
   ),
-
-  // name
-  // Inbounds(
-  //   name: 'name',
-  //   bio: 'test',
-  //   imageUrl:
-  //       'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
-  //   email: null,
-  //   phoneNumber: null,
-  //   snapchatUrl: 'https://www.snapchat.com/add/juliaaltieri20/',
-  //   facebookUrl: null,
-  //   instagramUrl: 'https://www.instagram.com/juli.altieri/',
-  //   websiteUrl: null,
-  //   from: 'Canada',
-  //   fromFlag: 'ca',
-  //   to: 'Nederland',
-  //   toFlag: 'nl',
-  // ),
 ];
diff --git a/lib/features/inbound/data/inbound_list_23_24.dart b/lib/features/inbound/data/inbound_list_23_24.dart
new file mode 100644
index 00000000..4d484734
--- /dev/null
+++ b/lib/features/inbound/data/inbound_list_23_24.dart
@@ -0,0 +1,364 @@
+// 🌎 Project imports:
+import 'package:rotary_nl_rye/features/inbound/presentation/models/ClassOf.dart';
+
+List<Inbounds> inboundList = [
+  // João Vitor Alberti Rech
+  Inbounds(
+    name: 'João Vitor',
+    bio:
+        'Hallo! Hoe gaat het?\n\n Mijn naam is João Vitor, ik ben 17 jaar en ik kom uit Brazilië.\n\n I live in Bauru, a city in the state of São Paulo. My Rotary club in Brazil is Rotary Club Bauru Vitória Régia and my district is 4510.\n\n In the Netherlands, I’m living in Maarssen, a city next to Utrecht. I’m being hosted by the Rotary Club Maarssen, in district 1570.\n\n In Brazil, my house has 6nmembers: my mother, who participates in the Rotary Club Bauru Vitória Régia; my father, who works very hard; my sister, who is in the university studying to be a dentist; me, who participated in the Interact Club Bauru Aeroporto, and my two pets: a cat and a dog.\n\n I love reading and listening to music. My favorite book is “Enquanto eu não te encontro”, a Brazilian book by Pedro Rhuas, and my favorite singer is Lana Del Rey.\n\n I always wanted to do an exchange program, visit another country, learn a new language. I know about the Rotary and the RYE since I was a kid because some of my cousins already did the program.\n\n I hope I can meet a lot of people, make a lot of friends and learn Dutch. \n\n I’m so happy of finally making my dream come true in an amazing country!',
+    imageUrl:
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/joao-vitor-alberti-rech.jpeg',
+    email: null,
+    phoneNumber: null,
+    snapchatUrl: null,
+    facebookUrl: null,
+    instagramUrl: null,
+    websiteUrl: null,
+    from: 'Brazilië',
+    fromFlag: 'br',
+    to: 'Nederland',
+    toFlag: 'nl',
+  ),
+
+  // Mili Alfonso Bermudez
+  Inbounds(
+    name: 'Milagros Alfonso',
+    bio:
+        'Hallo! Ik ben Milagros Alfonso, from La Falda a small city in Cordoba, Argentina. I am 16 years and I love reading, listening to music, playing piano, visiting museums and having new experiences! \n I am very excited for the exchange year in the Netherlands, I’ll be in Medemblik on the district 1580.\n I am sure that this will be a year full of learning and great experiences🫶',
+    imageUrl:
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/milagros-alfonso.jpg',
+    email: null,
+    phoneNumber: null,
+    snapchatUrl: null,
+    facebookUrl: null,
+    instagramUrl: null,
+    websiteUrl: null,
+    from: 'Argentinië',
+    fromFlag: 'ar',
+    to: 'Nederland',
+    toFlag: 'nl',
+  ),
+
+  // Luke Christopherson
+  Inbounds(
+    name: 'Luke Christopherson',
+    bio:
+        'I am from Chelan, a small town in eastern Washington State, USA. I am very passionate about sports, art, history and geography. I have been wanted to go on an exchange year for a long time, and am very grateful that I have the opportunity now! I am currently living in Arnhem, Gelderland(District 1560). I am very excited for the adventure I am taking on!',
+    imageUrl:
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/luke-christopherson.jpg',
+    email: null,
+    phoneNumber: null,
+    snapchatUrl: null,
+    facebookUrl: null,
+    instagramUrl: null,
+    websiteUrl: null,
+    from: 'USA',
+    fromFlag: 'us',
+    to: 'Nederland',
+    toFlag: 'nl',
+  ),
+
+  // Ella Day
+  Inbounds(
+    name: 'Ella Day',
+    bio:
+        'Hoi! My name is Ella Day. I am 17 years old and grew up in Okotoks Alberta, Canada. I\'m from District 5360.  I\'ll be spending my exchange year in Emmen. \n I love to read (40+ books so far this year), camp, bike, and play softball. \n I feel so lucky to have been selected for this wonderful opportunity and can\'t wait to see where it leads me, how I can grow my understanding of the Dutch language and culture, and most importantly how it will help me to grow as a person. ',
+    imageUrl:
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/ella-day.png',
+    email: null,
+    phoneNumber: null,
+    snapchatUrl: null,
+    facebookUrl: null,
+    instagramUrl: null,
+    websiteUrl: null,
+    from: 'Canada',
+    fromFlag: 'ca',
+    to: 'Nederland',
+    toFlag: 'nl',
+  ),
+
+  // Angelica Galdini
+  Inbounds(
+    name: 'Angelica Galdini',
+    bio:
+        'Hello, I am Angelica Galdini, I’m 17 years old and I am from Como in Italy. \n\n In the Nederland I will spend the whole year in Maarssen.\n\n I like listening to music, going out with my friends and spending time with my family. \n\n I have always loved to travel, to know new cultures, visit new places and I’m really happy to be here. \n\n I hope this experience will make me grow and know new people from all the world!',
+    imageUrl:
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/angelica-galdini.jpg',
+    email: null,
+    phoneNumber: null,
+    snapchatUrl: null,
+    facebookUrl: null,
+    instagramUrl: null,
+    websiteUrl: null,
+    from: 'Italië',
+    fromFlag: 'it',
+    to: 'Nederland',
+    toFlag: 'nl',
+  ),
+
+  // Elena Guererro Hutt
+  Inbounds(
+    name: 'Elena Guererro Hutt',
+    bio:
+        'Hello! My name is Elena, I come from Mexico City. I am 16 years old, I love to cook and play basketball, I like to try new things and create new memories. I will currently be living in Epe and I’m in Rotary District 1560. \n\n "I\'m delighted to meet new people and share my new experiences!"',
+    imageUrl:
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/elena-guererro-hutt.jpeg',
+    email: null,
+    phoneNumber: null,
+    snapchatUrl: null,
+    facebookUrl: null,
+    instagramUrl: null,
+    websiteUrl: null,
+    from: 'Mexico',
+    fromFlag: 'mx',
+    to: 'Nederland',
+    toFlag: 'nl',
+  ),
+
+  // Alaina Jackson
+  Inbounds(
+    name: 'Alaina Jackson',
+    bio:
+        'Hello, My name is Alaina Jackson and I am from Rotterdam New York. I am 16 years old and I have one brother named Caelum who is 18. I have traveled to many countries before such as Japan and Mexico, but this is my first time in Europe! Some things I enjoy are classical ballet dancing and art. I have been dancing since I was 3 years old and currently perform shows such as the Nutcracker with a company in upstate New York. Other than the arts, I enjoy going to school and learning subjects such as math and history. \n\n Currently I am living in Gouda, and I am loving my time here so far! I am very excited to continue exploring the culture and learn more about the Netherlands!',
+    imageUrl:
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/alaina-jackson.jpg',
+    email: null,
+    phoneNumber: null,
+    snapchatUrl: null,
+    facebookUrl: null,
+    instagramUrl: null,
+    websiteUrl: null,
+    from: 'USA',
+    fromFlag: 'us',
+    to: 'Nederland',
+    toFlag: 'nl',
+  ),
+
+  // Lexis Jones
+  Inbounds(
+    name: 'Lexis Jones',
+    bio:
+        'Hello! My name is Lexis. I am from a very small town called Scranton in Kansas which only has a population of 700. I’m 16, but soon to be 17 this coming October. I live with my two brothers, mom, dog and cat, who is called Bee! For my exchange I will be going to Bussum, which is district 1570.\n\n I have a few hobbies! I’ve been drawing since I was 10 and still do. It one of my favorite creative outlets, and you can usually find my doodling in all sorts of papers! The past few years I’ve also crocheted, although I’m still quite slow at it and it’s usually a on and off hobby. I have plants in my room I also take care of. My favorite ones are my vibes which I cut and propagated myself. Lastly, I really enjoy going on walks/hikes!\n\n I’ve wanted to be an exchange student since I was 13, and I’m so thankful I was given this opportunity to be able to travel to a new country and learn all the new customs. Along with any history that comes with the Netherlands! <3',
+    imageUrl:
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/lexis-jones.jpeg',
+    email: null,
+    phoneNumber: null,
+    snapchatUrl: null,
+    facebookUrl: null,
+    instagramUrl: null,
+    websiteUrl: null,
+    from: 'USA',
+    fromFlag: 'us',
+    to: 'Nederland',
+    toFlag: 'nl',
+  ),
+
+  // Juliana Novo Rojas
+  Inbounds(
+    name: 'Juliana Novo Rojas',
+    bio:
+        'Hii, my name is Juliana but people call me Juli, I’m 15 years old. I come from Alicant, a city in Spain. My family is from Colombia, but me and my brother were born in Spain where we live with our parents. This year I will stay in Bennekom, Gelderland.\n\n I’m keen on doing windsurf, surf and everything that has to be with the sea. Also I love traveling, knowing new people, listening to music and playing the ukelele.\n\n I wish this will be a great year, and I’m looking forward to meet all the exchange students that are here in the Nederlands.',
+    imageUrl:
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/juliana-novo-rojas.jpg',
+    email: null,
+    phoneNumber: null,
+    snapchatUrl: null,
+    facebookUrl: null,
+    instagramUrl: null,
+    websiteUrl: null,
+    from: 'Spanje',
+    fromFlag: 'es',
+    to: 'Nederland',
+    toFlag: 'nl',
+  ),
+
+  // Keona Olney
+  Inbounds(
+    name: 'Keona Olney',
+    bio:
+        'Hallo! My name is keona. I come from a small town on north Vancouver island, Bc Canada, called port hardy. I am currently 17, and turning 18 beginning of June. I live with my mom and dad, two cats, and as well two dogs. I also have a sister who is in university. For my exchange year I will be in Sneek, district 1590.\n\n I have been playing ice hockey since I was little, growing up in the arena on skates. I as well have been working for for a few years now, which has become another big hobby of mine. \n\n I have always loved traveling which brought me to rotary exchange. I am beyond thankful I was given this opportunity to explore, learn, and challenge myself.',
+    imageUrl:
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/keona-olney.jpg',
+    email: null,
+    phoneNumber: null,
+    snapchatUrl: null,
+    facebookUrl: null,
+    instagramUrl: null,
+    websiteUrl: null,
+    from: 'Canada',
+    fromFlag: 'ca',
+    to: 'Nederland',
+    toFlag: 'nl',
+  ),
+
+  // Sabrina Pinterich Almeida
+  Inbounds(
+    name: 'Sabrina Pinterich Almeida',
+    bio:
+        'Hallo! Mijn naam is Sabrina, ik ben zestien jaar en ik kom uit Curitiba in Brazilië.\n\n I was born and have lived my whole life in Curitiba, the capital of the state of Paraná in the south of Brazil. \n I’ve danced ballet since I was 3 years old and swim since I was 2. I’m also the public relations of my Interact Club in Curitiba. \n\n I love reading, traveling, listening to music and spending time with family and friends. \n\n My district in Brazil is 4730 and in Nederland is 1560. I’ll be living in a city called Winterswijk in Gelderland. \n\n I’m so excited to learn a new language, meet new people and a new culture. I’ve always dreamed of an exchange year so I’m so grateful for this opportunity and I’m going to make the most out of it!',
+    imageUrl:
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/sabrina-pinterich-almeida.jpeg',
+    email: null,
+    phoneNumber: null,
+    snapchatUrl: null,
+    facebookUrl: null,
+    instagramUrl: null,
+    websiteUrl: null,
+    from: 'Brazilië',
+    fromFlag: 'br',
+    to: 'Nederland',
+    toFlag: 'nl',
+  ),
+
+  // Julia Piovesan
+  Inbounds(
+    name: 'Julia Piovesan',
+    bio:
+        'Hallo , Ik heet Julia Piovesan, I ben zeventien jaar en Ik kom uit Brazilië!\n\n I live São Paulo, in the southwest region of Brazil, one of the biggest city in the world!\n My birthday is 10 of July, My sign is Cancer ♋️ and I love this kind of things, also love reading books, listening to music, watching series, go to the gym, travel and go to the beach (I am a fan of this one).\n\n So the dream of doing an exchange program came from many years ago, when I was little I already had it in my mind that I really wanted to do an exchange program, my aunt did it and other people in my family also did it so that made me want to do it and dream about it! \n\n I hope to have the best year of my life here in the Netherlands and see and know a lot from here, from the culture, the incredible places and views, and of course learn the language!',
+    imageUrl:
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/julia-piovesan.jpeg',
+    email: null,
+    phoneNumber: null,
+    snapchatUrl: null,
+    facebookUrl: null,
+    instagramUrl: null,
+    websiteUrl: null,
+    from: 'Brazilië',
+    fromFlag: 'br',
+    to: 'Nederland',
+    toFlag: 'nl',
+  ),
+
+  // Kaylavondra Radinka
+  Inbounds(
+    name: 'Kaylavondra Radinka',
+    bio:
+        '“You know, there’s a difference between like and love. I like my Skechers, but I love my Prada backpack.” Here is a quote from one of my favorite movies, 10 Things I Hate About You. I like to chill and read books at home, but I love exploring. So, here I am in another country to do my hobby, traveling and learning. \n\n Im Radinka Kaylavondra, people usually call me Kayla. I come from Surabaya, Indonesia, and I will be living in Lochem for a year. I have always wanted to study abroad since I was very little, so going on this exchange is the first step I take to achieve my dream. I really hope that through this exchange, I will be able to speak a new language, make a lot of new friends with people from all over the world, and ultimately to gain new experiences. \n\n Ik hou van Nederland! ',
+    imageUrl:
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/kaylavondra-radinka.jpeg',
+    email: null,
+    phoneNumber: null,
+    snapchatUrl: null,
+    facebookUrl: null,
+    instagramUrl: null,
+    websiteUrl: null,
+    from: 'Indonesië',
+    fromFlag: 'in',
+    to: 'Nederland',
+    toFlag: 'nl',
+  ),
+
+  // Jackson Rose
+  Inbounds(
+    name: 'Jackson Rose',
+    bio:
+        'Hello, my name is Jackson, I am 15 (soon to be 16) years old. I am from Canada and I live in a small town in B.C named Cranbrook, and I am going to Zwolle for my exchange year.\n\n I like to cook, bike, and do anything that has to do with sports. I consider myself fairly outgoing and enjoy meeting new people. I am very excited for the upcoming year!',
+    imageUrl:
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/Jackson-Rose.jpg',
+    email: null,
+    phoneNumber: null,
+    snapchatUrl: null,
+    facebookUrl: null,
+    instagramUrl: null,
+    websiteUrl: null,
+    from: 'Canada',
+    fromFlag: 'ca',
+    to: 'Nederland',
+    toFlag: 'nl',
+  ),
+
+  // Arthur Rougier
+  Inbounds(
+    name: 'Arthur Rougier',
+    bio:
+        'Hoi, ik ben Arthur, ik kom uit Frankrijk, Vichy ligt in de Auvergne, midden Frankrijk. En ik ben 15 jaar oud (16 in Oktober). In Nederland, ik woon in Etten Leur, district 1610. Ik hou van piano spelen, film kijken, sportschool, pretpark en skiën.',
+    imageUrl:
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/arthur-rougier.jpg',
+    email: null,
+    phoneNumber: null,
+    snapchatUrl: null,
+    facebookUrl: null,
+    instagramUrl: null,
+    websiteUrl: null,
+    from: 'Frankrijk',
+    fromFlag: 'fr',
+    to: 'Nederland',
+    toFlag: 'nl',
+  ),
+
+  //Owen Scruggs
+  Inbounds(
+    name: 'Owen Scruggs',
+    bio:
+        ' Hoi! Mijn naam is Owen en ik kom uit Jacksonville, Florida in de Verenigde Staten van Amerika. Ik ben zeventien jaar en woon in Wierden voor mijn uitwisseling. Ik kom uit district 6970 van noord Florida. Ik ben zo blij dat ik hier in Nederland ben, het is een prachtig land en de mensen hier zijn zo aardig! Ik kon me geen betere plek wensen dan hier. Bedankt allemaal om deze kans mogelijk te maken!',
+    imageUrl:
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/owen-scruggs.jpg',
+    email: null,
+    phoneNumber: null,
+    snapchatUrl: null,
+    facebookUrl: null,
+    instagramUrl: null,
+    websiteUrl: null,
+    from: 'USA',
+    fromFlag: 'us',
+    to: 'Nederland',
+    toFlag: 'nl',
+  ),
+
+  // Senja Ulvinen
+  Inbounds(
+    name: 'Senja Ulvinen',
+    bio:
+        'Hoi, my name is Senja Ulvinen and I’m 17 years old. I come from small town called Lapua. Lapua is located in the west of Finland (D1385). My family includes my dad and my mom and three little brothers. We also have a dog.\n\n I enjoy reading books and watching movies or series. I like to spend time with my friends and family but I also like to be by myself. I’m joyful and cheery. I like to make people happy and laugh. I’m tolerant of other people. I like to see and experience new things. So the exchange year is perfect for me.\n\n Here in The Netherlands I live in Dronten (D1590), I think it’s a nice village. People here are friendly and I’m having good time here. \n\n I look forward to what the future holds. I hope to make unforgettable memories and many new friends.',
+    imageUrl:
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/senja-ulvinen.jpeg',
+    email: null,
+    phoneNumber: null,
+    snapchatUrl: null,
+    facebookUrl: null,
+    instagramUrl: null,
+    websiteUrl: null,
+    from: 'Finland',
+    fromFlag: 'fi',
+    to: 'Nederland',
+    toFlag: 'nl',
+  ),
+
+  // Valentina Velazco Garay
+  Inbounds(
+    name: 'Valentina Velazco Garay',
+    bio:
+        'I’m Valentina from Mexico and I love to learn new lenguages and traditions',
+    imageUrl:
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/long-term/23-24/valentina-velazco-garay.jpeg',
+    email: null,
+    phoneNumber: null,
+    snapchatUrl: null,
+    facebookUrl: null,
+    instagramUrl: null,
+    websiteUrl: null,
+    from: 'Mexico',
+    fromFlag: 'mx',
+    to: 'Nederland',
+    toFlag: 'nl',
+  ),
+
+  // name
+  // Inbounds(
+  //   name: 'name',
+  //   bio: 'test',
+  //   imageUrl:
+  //       'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+  //   email: null,
+  //   phoneNumber: null,
+  //   snapchatUrl: 'https://www.snapchat.com/add/juliaaltieri20/',
+  //   facebookUrl: null,
+  //   instagramUrl: 'https://www.instagram.com/juli.altieri/',
+  //   websiteUrl: null,
+  //   from: 'Canada',
+  //   fromFlag: 'ca',
+  //   to: 'Nederland',
+  //   toFlag: 'nl',
+  // ),
+];
diff --git a/lib/features/inbound/data/ngse_students_data.dart b/lib/features/inbound/data/ngse_students_data.dart
new file mode 100644
index 00000000..d36fe84c
--- /dev/null
+++ b/lib/features/inbound/data/ngse_students_data.dart
@@ -0,0 +1,20 @@
+import 'package:rotary_nl_rye/features/inbound/presentation/models/ngse_student_model.dart';
+
+List<NGSEStudent> students = [
+  NGSEStudent(
+    name: 'Federico',
+    country: 'Italy',
+    combinedText: '''
+Begin september\'24 is Federico uit Italië in Nederland. Hij loopt een aantal maanden stage via NGSE (New Generation Service Exchange) in Rotterdam voor zijn universitaire studie Economy & Administration.
+
+Zijn grote passie is voetbal waar hij al jaren als scheidsrechter wedstrijden fluit in Italië op het hoogste niveau. Een stage bij VOC Rotterdam Football and Cricket Teams is dan ook zijn droomstage. Dank aan district D1600 (Zuid-Nederland) die dit voor hem mogelijk maakte.
+
+Heel veel succes Federico!
+
+NB. Ook interesse in mogelijkheden voor een buitenlandstage voor studie of werk? Mail interesse@rotaryyep.nl
+    ''',
+    imageUrl:
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/inbound/short-term/ngse/federico.jpg',
+  ),
+  // Add more students here...
+];
diff --git a/lib/features/inbound/presentation/models/ngse_student_model.dart b/lib/features/inbound/presentation/models/ngse_student_model.dart
new file mode 100644
index 00000000..ee9925d2
--- /dev/null
+++ b/lib/features/inbound/presentation/models/ngse_student_model.dart
@@ -0,0 +1,13 @@
+class NGSEStudent {
+  final String name;
+  final String country;
+  final String combinedText;
+  final String imageUrl;
+
+  NGSEStudent({
+    required this.name,
+    required this.country,
+    required this.combinedText,
+    required this.imageUrl,
+  });
+}
diff --git a/lib/features/inbound/presentation/pages/inbound_page.dart b/lib/features/inbound/presentation/pages/inbound_page.dart
index 53d1a0ab..973a0110 100644
--- a/lib/features/inbound/presentation/pages/inbound_page.dart
+++ b/lib/features/inbound/presentation/pages/inbound_page.dart
@@ -6,6 +6,7 @@ import 'package:flutter/services.dart';
 // 📦 Package imports:
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:rotary_nl_rye/features/inbound/presentation/pages/short_term/ngse/ngse_inbound_page.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 
 // 🌎 Project imports:
@@ -92,7 +93,7 @@ class _InboundPageState extends State<InboundPage> {
                 'NGSE',
                 'New Generations Service Exchange',
                 FontAwesomeIcons.hashtag,
-                null,
+                NGSEInboundStudentsPage(),
               ),
               buildInboundOptionRow(
                 context,
diff --git a/lib/features/inbound/presentation/pages/long_term/class_of/class_of.dart b/lib/features/inbound/presentation/pages/long_term/class_of/class_of.dart
index c815c2a8..54a1214a 100644
--- a/lib/features/inbound/presentation/pages/long_term/class_of/class_of.dart
+++ b/lib/features/inbound/presentation/pages/long_term/class_of/class_of.dart
@@ -36,7 +36,7 @@ class _ClassOfPageInboundsState extends State<ClassOfPageInbounds> {
           // centerTitle: false,
           leading: UniformBackButton(),
           title: Text(
-            'Class Of 2023-24',
+            'Class Of 2024-25',
             textScaler: TextScaler.linear(1.2),
             style:
                 TextStyle(color: Palette.indigo, fontWeight: FontWeight.bold),
diff --git a/lib/features/inbound/presentation/pages/long_term/long_term_inbound_page.dart b/lib/features/inbound/presentation/pages/long_term/long_term_inbound_page.dart
index 69373f56..f7fbc458 100644
--- a/lib/features/inbound/presentation/pages/long_term/long_term_inbound_page.dart
+++ b/lib/features/inbound/presentation/pages/long_term/long_term_inbound_page.dart
@@ -47,7 +47,7 @@ class _LongTermExchangeInboundPageState
             height: 15,
             thickness: 2,
           ),
-          buildInboundOptionRow(context, 'Class of 2023-2024',
+          buildInboundOptionRow(context, 'Class of 2024-2025',
               FontAwesomeIcons.peopleGroup, ClassOfPageInbounds()),
           Divider(
             height: 15,
diff --git a/lib/features/inbound/presentation/pages/short_term/ngse/ngse_inbound_page.dart b/lib/features/inbound/presentation/pages/short_term/ngse/ngse_inbound_page.dart
index 95a8d3f8..fcd91311 100644
--- a/lib/features/inbound/presentation/pages/short_term/ngse/ngse_inbound_page.dart
+++ b/lib/features/inbound/presentation/pages/short_term/ngse/ngse_inbound_page.dart
@@ -1,148 +1,100 @@
 // 🐦 Flutter imports:
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
+import 'package:rotary_nl_rye/features/inbound/data/ngse_students_data.dart';
+import 'package:rotary_nl_rye/features/inbound/presentation/models/ngse_student_model.dart';
+import 'package:rotary_nl_rye/features/inbound/presentation/pages/short_term/ngse/ngse_student_details_page.dart';
 
-// 📦 Package imports:
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-
-// 🌎 Project imports:
-import 'package:rotary_nl_rye/core/prop.dart';
-import 'package:rotary_nl_rye/features/uniform_widgets/back_button.dart';
-
-class NGSEInboundPage extends StatefulWidget {
+class NGSEInboundStudentsPage extends StatefulWidget {
   @override
-  _NGSEInboundPageState createState() => _NGSEInboundPageState();
+  _NGSEInboundStudentsPageState createState() =>
+      _NGSEInboundStudentsPageState();
 }
 
-class _NGSEInboundPageState extends State<NGSEInboundPage> {
+class _NGSEInboundStudentsPageState extends State<NGSEInboundStudentsPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        systemOverlayStyle:
-            MediaQuery.of(context).platformBrightness == Brightness.light
-                ? SystemUiOverlayStyle.dark
-                : SystemUiOverlayStyle.light,
         backgroundColor: Colors.transparent,
         elevation: 0.0,
-        leading: UniformBackButton(),
+        leading: BackButton(),
         title: Text(
-          'NGSE Inbound',
-          textScaler: TextScaler.linear(1.2),
-          style: TextStyle(color: Palette.indigo, fontWeight: FontWeight.bold),
+          'NGSE Inbound Students',
+          style: TextStyle(color: Colors.indigo, fontWeight: FontWeight.bold),
         ),
       ),
-      body: ListView(
-        shrinkWrap: true,
-        scrollDirection: Axis.vertical,
-        children: <Widget>[
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: <Widget>[
-              // Padding(
-              //   padding:
-              //       const EdgeInsets.only(left: 20.0, right: 20.0, top: 20.0),
-              //   child: Text(
-              //     "Kandidaten \n\nWat leuk dat je geïnteresseerd in de mogelijkheden van Rotary voor jaaruitwisseling. Wereldwijd gaan er jaarlijks zo’n 8.000 studenten via Rotary op jaaruitwisseling, een hele organisatie. Wie weet ben jij komend schooljaar een van die studenten.",
-              //     style: TextStyle(fontSize: 16.0),
-              //   ),
-              // ),
-              // Divider(
-              //   height: 15,
-              //   thickness: 2,
-              // ),
-              // buildInboundOptionRow(context, "Welcome to the Netherlands!",
-              //     FontAwesomeIcons.doorOpen, WelcomeInTheNetherlandsPage()),
-              // Divider(
-              //   height: 15,
-              //   thickness: 2,
-              // ),
-              // buildInboundOptionRow(context, "Flight and Arrival",
-              //     FontAwesomeIcons.plane, FlightAndArrivalPage()),
-              // Divider(
-              //   height: 15,
-              //   thickness: 2,
-              // ),
-              // buildInboundOptionRow(context, "Language",
-              //     FontAwesomeIcons.language, LanguagePage()),
-              // Divider(
-              //   height: 15,
-              //   thickness: 2,
-              // ),
-
-              // buildInboundOptionRow(context, "Insurance",
-              //     FontAwesomeIcons.umbrella, InsurancePage()),
-              // Divider(
-              //   height: 15,
-              //   thickness: 2,
-              // ),
-              // buildInboundOptionRow(
-              //     context, "Travel", FontAwesomeIcons.passport, TravelPage()),
-              // Divider(
-              //   height: 15,
-              //   thickness: 2,
-              // ),
-              // // the end
-              // SizedBox(
-              //   height: 20,
-              // ),
-            ],
-          )
-        ],
+      body: ListView.builder(
+        itemCount: students.length,
+        itemBuilder: (context, index) {
+          final student = students[index];
+          return buildStudentCard(
+            context,
+            student,
+          );
+        },
       ),
     );
   }
 
-  GestureDetector buildInboundOptionRow(
-    BuildContext context,
-    String title,
-    IconData icon,
-    pushTo,
-  ) {
-    return GestureDetector(
-        child: Padding(
-      padding: EdgeInsets.only(top: 8.0, bottom: 8.0, left: 8.0),
-      child: ListTile(
-        leading: Padding(
-          padding: EdgeInsets.zero,
-          child: Container(
-            child: FaIcon(
-              icon,
-              color: Palette.lightIndigo,
-              size: 27,
-            ),
-          ),
+  Widget buildStudentCard(BuildContext context, NGSEStudent student) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 5.0),
+      child: Card(
+        elevation: 2.0,
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(8),
         ),
-        title: Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: <Widget>[
-            SizedBox(
-              width: Device.width - 120,
-              child: Text(title,
-                  maxLines: 2,
-                  overflow: TextOverflow.ellipsis,
-                  softWrap: false,
+        child: InkWell(
+          onTap: () {
+            Navigator.push(
+              context,
+              MaterialPageRoute(
+                builder: (context) => StudentDetailPage(
+                  name: student.name,
+                  country: student.country,
+                  combinedText: student.combinedText, // Pass combinedText
+                  imagePath: student.imageUrl,
+                ),
+              ),
+            );
+          },
+          child: Padding(
+            padding: const EdgeInsets.all(10.0),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: <Widget>[
+                Text(
+                  student.name,
                   style: TextStyle(
-                    fontSize: 15,
-                    color: Palette.grey,
+                    fontSize: 18,
+                    fontWeight: FontWeight.bold,
+                    color: Colors.indigo,
+                  ),
+                ),
+                SizedBox(height: 4),
+                Text(
+                  'Country: ${student.country}',
+                  style: TextStyle(
+                    fontSize: 14,
                     fontWeight: FontWeight.w500,
-                  )),
-            ),
-            Icon(
-              Icons.arrow_forward_ios,
-              color: Palette.grey,
+                    color: Colors.grey,
+                  ),
+                ),
+                SizedBox(height: 4),
+                Text(
+                  student.combinedText,
+                  style: TextStyle(
+                    fontSize: 12,
+                    color: Colors.grey,
+                  ),
+                  maxLines: 2,
+                  overflow: TextOverflow.ellipsis,
+                ),
+              ],
             ),
-          ],
+          ),
         ),
-        onTap: () {
-          if (pushTo != null) {
-            Navigator.push(
-              context,
-              MaterialPageRoute(builder: (context) => pushTo),
-            );
-          }
-        },
       ),
-    ));
+    );
   }
 }
diff --git a/lib/features/inbound/presentation/pages/short_term/ngse/ngse_student_details_page.dart b/lib/features/inbound/presentation/pages/short_term/ngse/ngse_student_details_page.dart
new file mode 100644
index 00000000..adddc02e
--- /dev/null
+++ b/lib/features/inbound/presentation/pages/short_term/ngse/ngse_student_details_page.dart
@@ -0,0 +1,160 @@
+// 🐦 Flutter imports:
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:rotary_nl_rye/core/presentation/widgets/full_screen_image.dart';
+import 'package:url_launcher/url_launcher_string.dart';
+
+class StudentDetailPage extends StatelessWidget {
+  final String name;
+  final String country;
+  final String combinedText;
+  final String imagePath;
+
+  StudentDetailPage({
+    required this.name,
+    required this.country,
+    required this.combinedText,
+    required this.imagePath,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        backgroundColor: Colors.transparent,
+        elevation: 0.0,
+        leading: BackButton(),
+        title: Text(
+          name,
+          style: TextStyle(color: Colors.indigo, fontWeight: FontWeight.bold),
+        ),
+      ),
+      body: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: SingleChildScrollView(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: <Widget>[
+              Text(
+                name,
+                style: TextStyle(
+                  fontSize: 24,
+                  fontWeight: FontWeight.bold,
+                  color: Colors.indigo,
+                ),
+              ),
+              SizedBox(height: 10),
+              Text(
+                'Country: $country',
+                style: TextStyle(
+                  fontSize: 18,
+                  fontWeight: FontWeight.w500,
+                  color: Colors.grey,
+                ),
+              ),
+              SizedBox(height: 20),
+              buildRichTextWithLinks(combinedText), // Combined bio + details
+              SizedBox(height: 20),
+              buildProfileImage(
+                  context), // Use your buildProfileImage method here
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget buildProfileImage(BuildContext context) {
+    return InkWell(
+      onTap: () {
+        Navigator.of(context).push(PageRouteBuilder(
+            opaque: false,
+            pageBuilder: (BuildContext context, _, __) =>
+                FullScreenImage(url: imagePath)));
+      },
+      child: CachedNetworkImage(
+        imageUrl: imagePath,
+        imageBuilder: (context, imageProvider) => Container(
+          decoration: BoxDecoration(
+            image: DecorationImage(
+              image: imageProvider,
+              fit: BoxFit
+                  .contain, // Ensures the entire image is visible without cropping
+            ),
+          ),
+          constraints: BoxConstraints(
+            maxHeight: 200, // Define max height for the image
+            maxWidth:
+                MediaQuery.of(context).size.width, // Use the full screen width
+          ),
+        ),
+        placeholder: (context, url) =>
+            Center(child: CircularProgressIndicator()),
+        errorWidget: (context, url, error) => Icon(Icons.error),
+      ),
+    );
+  }
+
+  Widget buildRichTextWithLinks(String text) {
+    final RegExp emailRegex = RegExp(
+        r'([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})'); // Regex for email
+    final RegExp urlRegex =
+        RegExp(r'(https?:\/\/[^\s]+)'); // Regex for URLs (HTTP/HTTPS)
+
+    List<TextSpan> spans = [];
+    int start = 0;
+
+    // Find all matches for both email and URL
+    final matches = [
+      ...emailRegex.allMatches(text),
+      ...urlRegex.allMatches(text),
+    ]..sort(
+        (a, b) => a.start.compareTo(b.start)); // Sort matches by start index
+
+    for (final match in matches) {
+      if (match.start > start) {
+        spans.add(TextSpan(
+          text: text.substring(start, match.start), // Text before the link
+          style: TextStyle(color: Colors.black),
+        ));
+      }
+
+      final matchedText = match.group(0);
+      if (matchedText != null) {
+        if (emailRegex.hasMatch(matchedText)) {
+          spans.add(TextSpan(
+            text: matchedText,
+            style: TextStyle(
+                color: Colors.blue, decoration: TextDecoration.underline),
+            recognizer: TapGestureRecognizer()
+              ..onTap = () => launchUrlString('mailto:$matchedText'),
+          ));
+        } else if (urlRegex.hasMatch(matchedText)) {
+          spans.add(TextSpan(
+            text: matchedText,
+            style: TextStyle(
+                color: Colors.blue, decoration: TextDecoration.underline),
+            recognizer: TapGestureRecognizer()
+              ..onTap = () => launchUrlString(matchedText),
+          ));
+        }
+      }
+      start = match.end;
+    }
+
+    if (start < text.length) {
+      spans.add(TextSpan(
+        text: text.substring(start), // Remaining text after last link
+        style: TextStyle(color: Colors.black),
+      ));
+    }
+
+    return RichText(
+      text: TextSpan(
+        children: spans,
+        style: TextStyle(fontSize: 16),
+      ),
+    );
+  }
+}
diff --git a/lib/features/news/data/utils.dart b/lib/features/news/data/utils.dart
deleted file mode 100644
index 8b137891..00000000
--- a/lib/features/news/data/utils.dart
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/lib/features/news/models/firestore_url.dart b/lib/features/news/models/firestore_url.dart
deleted file mode 100644
index db65c791..00000000
--- a/lib/features/news/models/firestore_url.dart
+++ /dev/null
@@ -1,34 +0,0 @@
-// 📦 Package imports:
-import 'package:cloud_firestore/cloud_firestore.dart';
-
-class FireStoreUrl {
-  final String? id;
-  final String? headerUrl;
-  final String? jsonUrl;
-  final String? students;
-  final DocumentReference? reference;
-
-  FireStoreUrl({this.jsonUrl, this.headerUrl, this.students})
-      : id = null,
-        reference = null;
-
-  FireStoreUrl.fromSnapshot(DocumentSnapshot<Map<String, dynamic>> snapshot)
-      : id = snapshot.id,
-        students = snapshot.data()!['students'],
-        reference = snapshot.reference,
-        headerUrl = snapshot.data()!['header'],
-        jsonUrl = snapshot.data()!['json'];
-
-  factory FireStoreUrl.fromJson(Map<String, dynamic> json) => FireStoreUrl(
-      headerUrl: json['headerUrl'],
-      jsonUrl: json['jsonUrl'],
-      students: json['students']);
-
-  Map<String, dynamic> toJson() {
-    return {
-      'students': students,
-      'headerUrl': headerUrl,
-      'jsonUrl': jsonUrl,
-    };
-  }
-}
diff --git a/lib/features/news/presentation/pages/news_page.dart b/lib/features/news/presentation/pages/news_page.dart
index 6eeaca39..1419498e 100644
--- a/lib/features/news/presentation/pages/news_page.dart
+++ b/lib/features/news/presentation/pages/news_page.dart
@@ -2,10 +2,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
-// 📦 Package imports:
-import 'package:cached_network_image/cached_network_image.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-
 // 🌎 Project imports:
 import 'package:rotary_nl_rye/core/domain/news.dart';
 import 'package:rotary_nl_rye/features/news/presentation/pages/non_pdf_news.dart';
@@ -27,12 +23,6 @@ class _NewsPageState extends State<NewsPage> {
   void initState() {
     super.initState();
     _newsBloc.getNewsData();
-    _removeBadge();
-  }
-
-  Future<void> _removeBadge() async {
-    final prefs = await SharedPreferences.getInstance();
-    await prefs.setInt('newsBadge', 0);
   }
 
   @override
@@ -62,7 +52,7 @@ class _NewsPageState extends State<NewsPage> {
         padding: const EdgeInsets.symmetric(horizontal: 15),
         child: Column(
           children: [
-            _buildHeaderStreamBuilder(),
+            _buildLocalHeader(),
             const SizedBox(height: 10),
             const Divider(thickness: 2),
             _buildNewsStreamBuilder(),
@@ -72,30 +62,19 @@ class _NewsPageState extends State<NewsPage> {
     );
   }
 
-  Widget _buildHeaderStreamBuilder() {
-    return StreamBuilder<String>(
-      stream: _newsBloc.header,
-      builder: (context, snapshot) {
-        if (snapshot.hasData) {
-          return CachedNetworkImage(
-            height: 170,
-            width: double.infinity,
-            imageUrl: snapshot.data!,
-            imageBuilder: (context, imageProvider) => Container(
-              decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(8),
-                image: DecorationImage(image: imageProvider, fit: BoxFit.cover),
-              ),
-            ),
-            placeholder: (context, url) =>
-                const Center(child: CircularProgressIndicator()),
-            errorWidget: (context, url, error) => const Icon(Icons.error),
-          );
-        } else if (snapshot.hasError) {
-          return Center(child: Text(snapshot.error.toString()));
-        }
-        return const Center(child: CircularProgressIndicator());
-      },
+  // Updated method for loading the header as a local asset
+  Widget _buildLocalHeader() {
+    return Container(
+      height: 170,
+      width: double.infinity,
+      decoration: BoxDecoration(
+        borderRadius: BorderRadius.circular(8),
+        image: DecorationImage(
+          image: AssetImage(
+              'assets/image/homepage/Rebounddag_2024_Laren.png'), // Local asset path
+          fit: BoxFit.cover,
+        ),
+      ),
     );
   }
 
diff --git a/lib/features/news/presentation/pages/non_pdf_news.dart b/lib/features/news/presentation/pages/non_pdf_news.dart
index 5d83514e..c9dd0ead 100644
--- a/lib/features/news/presentation/pages/non_pdf_news.dart
+++ b/lib/features/news/presentation/pages/non_pdf_news.dart
@@ -1,7 +1,7 @@
-// 🐦 Flutter imports:
+// 🎯 Dart imports:
 import 'dart:io';
 
-import 'package:firebase_dynamic_links/firebase_dynamic_links.dart';
+// 🐦 Flutter imports:
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -9,9 +9,7 @@ import 'package:flutter/services.dart';
 // 📦 Package imports:
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:percent_indicator/circular_percent_indicator.dart';
-import 'package:share_plus/share_plus.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:url_launcher/url_launcher_string.dart';
 
 // 🌎 Project imports:
 import 'package:rotary_nl_rye/core/domain/entities/news.dart';
@@ -21,6 +19,10 @@ import 'package:rotary_nl_rye/core/translation/translate.dart';
 import 'package:rotary_nl_rye/features/news/presentation/widgets/pdf_viewer.dart';
 import 'package:rotary_nl_rye/features/uniform_widgets/back_button.dart';
 
+// import 'package:share_plus/share_plus.dart';
+// import 'package:url_launcher/url_launcher_string.dart';
+
+
 class NonPDFPage extends StatefulWidget {
   final News data;
 
@@ -42,11 +44,9 @@ class _NonPDFPageState extends State<NonPDFPage> {
   bool translationSuccess = true;
   String errorMessage = '';
 
-  String? _linkMessage;
+  // String? _linkMessage;
   String? id;
 
-  FirebaseDynamicLinks dynamicLinks = FirebaseDynamicLinks.instance;
-
   @override
   void dispose() {
     super.dispose();
@@ -54,13 +54,13 @@ class _NonPDFPageState extends State<NonPDFPage> {
     translate.clear();
     index = 0;
     translationIndex = 0;
-    _linkMessage = null;
+    // _linkMessage = null;
   }
 
   @override
   void initState() {
     super.initState();
-    _createDynamicLink(id = widget.data.id.toString());
+    // _createDynamicLink(id = widget.data.id.toString());
     _removeBadge();
   }
 
@@ -90,19 +90,19 @@ class _NonPDFPageState extends State<NonPDFPage> {
             ),
             child: PopupMenuButton<int>(
               itemBuilder: (context) => [
-                PopupMenuItem<int>(
-                    value: 0,
-                    child: Row(
-                      children: [
-                        Icon(
-                          CupertinoIcons.share,
-                          color: Palette.lightIndigo,
-                        ),
-                        const SizedBox(width: 7),
-                        Text('Share')
-                      ],
-                    )),
-                if (Platform.localeName != 'NL') PopupMenuDivider(),
+                // PopupMenuItem<int>(
+                //     value: 0,
+                //     child: Row(
+                //       children: [
+                //         Icon(
+                //           CupertinoIcons.share,
+                //           color: Palette.lightIndigo,
+                //         ),
+                //         const SizedBox(width: 7),
+                //         Text('Share')
+                //       ],
+                //     )),
+                // if (Platform.localeName != 'NL') PopupMenuDivider(),
                 if (Platform.localeName != 'NL')
                   PopupMenuItem<int>(
                       value: 1,
@@ -347,17 +347,17 @@ class _NonPDFPageState extends State<NonPDFPage> {
   Future<void> selectedItem(BuildContext context, item) async {
     switch (item) {
       case 0:
-        _createDynamicLink(id = widget.data.id.toString());
-
-        if (await canLaunchUrlString(_linkMessage!)) {
-          await Share.share(
-              Platform.isIOS
-                  ? 'Hier moet nog een leuk stukje komen. + de link naar de juiste pagina $_linkMessage'
-                  : 'Hier moet nog een leuk stukje komen. + de link naar de juiste pagina $_linkMessage',
-              subject: 'look at this nice app :)');
-        } else {
-          throw 'Could not launch $_linkMessage';
-        }
+        // _createDynamicLink(id = widget.data.id.toString());
+
+        // if (await canLaunchUrlString(_linkMessage!)) {
+        //   await Share.share(
+        //       Platform.isIOS
+        //           ? 'Hier moet nog een leuk stukje komen. + de link naar de juiste pagina $_linkMessage'
+        //           : 'Hier moet nog een leuk stukje komen. + de link naar de juiste pagina $_linkMessage',
+        //       subject: 'look at this nice app :)');
+        // } else {
+        //   throw 'Could not launch $_linkMessage';
+        // }
 
         break;
       case 1:
@@ -393,27 +393,27 @@ class _NonPDFPageState extends State<NonPDFPage> {
     }
   }
 
-  Future<void> _createDynamicLink(String id) async {
-    final DynamicLinkParameters parameters = DynamicLinkParameters(
-      uriPrefix: 'https://rotarynl.page.link',
-      link: Uri.parse('https://rotarynl.page.link/news?id=$id'),
-      androidParameters: AndroidParameters(
-        packageName: 'com.caelitechnologies.rotary_nl_rye',
-        minimumVersion: 1,
-      ),
-      iosParameters: IOSParameters(
-        bundleId: 'com.caelitechnologies.rotary-nl-rye',
-        minimumVersion: '1.0.0',
-        appStoreId: '1567096118',
-      ),
-    );
+  // Future<void> _createDynamicLink(String id) async {
+  //   final DynamicLinkParameters parameters = DynamicLinkParameters(
+  //     uriPrefix: 'https://rotarynl.page.link',
+  //     link: Uri.parse('https://rotarynl.page.link/news?id=$id'),
+  //     androidParameters: AndroidParameters(
+  //       packageName: 'com.caelitechnologies.rotary_nl_rye',
+  //       minimumVersion: 1,
+  //     ),
+  //     iosParameters: IOSParameters(
+  //       bundleId: 'com.caelitechnologies.rotary-nl-rye',
+  //       minimumVersion: '1.0.0',
+  //       appStoreId: '1567096118',
+  //     ),
+  //   );
 
-    final ShortDynamicLink shortLink =
-        await dynamicLinks.buildShortLink(parameters);
-    final Uri url = shortLink.shortUrl;
+  //   final ShortDynamicLink shortLink =
+  //       await dynamicLinks.buildShortLink(parameters);
+  //   final Uri url = shortLink.shortUrl;
 
-    setState(() {
-      _linkMessage = url.toString();
-    });
-  }
+  //   setState(() {
+  //     _linkMessage = url.toString();
+  //   });
+  // }
 }
diff --git a/lib/features/news/presentation/widgets/pdf_viewer.dart b/lib/features/news/presentation/widgets/pdf_viewer.dart
index 8d58f756..9a0c0280 100644
--- a/lib/features/news/presentation/widgets/pdf_viewer.dart
+++ b/lib/features/news/presentation/widgets/pdf_viewer.dart
@@ -1,22 +1,17 @@
-// 🐦 Flutter imports:
+// 🎯 Dart imports:
 import 'dart:async';
-import 'dart:io';
 
-import 'package:flutter/cupertino.dart';
+// 🐦 Flutter imports:
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
 // 📦 Package imports:
-import 'package:firebase_dynamic_links/firebase_dynamic_links.dart';
 import 'package:flutter_cached_pdfview/flutter_cached_pdfview.dart';
 import 'package:percent_indicator/circular_percent_indicator.dart';
-import 'package:share_plus/share_plus.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:url_launcher/url_launcher_string.dart';
 
 // 🌎 Project imports:
 import 'package:rotary_nl_rye/core/domain/entities/news.dart';
-import 'package:rotary_nl_rye/core/prop.dart';
 import 'package:rotary_nl_rye/features/uniform_widgets/back_button.dart';
 
 class PDFPage extends StatefulWidget {
@@ -35,7 +30,7 @@ class _PDFPageState extends State<PDFPage> {
 
   _PDFPageState({required this.pdfUrl, required this.data});
 
-  String? _linkMessage;
+  // String? _linkMessage;
   String? id;
 
   final Completer<PDFViewController> _pdfViewController =
@@ -43,12 +38,10 @@ class _PDFPageState extends State<PDFPage> {
   final StreamController<String> _pageCountController =
       StreamController<String>();
 
-  FirebaseDynamicLinks dynamicLinks = FirebaseDynamicLinks.instance;
-
   @override
   void initState() {
     super.initState();
-    _createDynamicLink(id = widget.data.id.toString());
+    // _createDynamicLink(id = widget.data.id.toString());
     _removeBadge();
     SystemChrome.setPreferredOrientations([
       DeviceOrientation.landscapeRight,
@@ -80,15 +73,15 @@ class _PDFPageState extends State<PDFPage> {
           backgroundColor: Colors.transparent,
           elevation: 0.0,
           leading: UniformBackButton(),
-          actions: <Widget>[
-            IconButton(
-              icon: Icon(
-                CupertinoIcons.share,
-                color: Palette.indigo,
-              ),
-              onPressed: _createShareURL,
-            )
-          ],
+          // actions: <Widget>[
+          //   IconButton(
+          //     icon: Icon(
+          //       CupertinoIcons.share,
+          //       color: Palette.indigo,
+          //     ),
+          //     onPressed: _createShareURL,
+          //   )
+          // ],
         ),
         body: Stack(
           children: <Widget>[
@@ -167,41 +160,41 @@ class _PDFPageState extends State<PDFPage> {
         ));
   }
 
-  Future<void> _createDynamicLink(String id) async {
-    final DynamicLinkParameters parameters = DynamicLinkParameters(
-      uriPrefix: 'https://rotarynl.page.link',
-      link: Uri.parse('https://rotarynl.page.link/news?id=$id'),
-      androidParameters: AndroidParameters(
-        packageName: 'com.caelitechnologies.rotary_nl_rye',
-        minimumVersion: 1,
-      ),
-      iosParameters: IOSParameters(
-        bundleId: 'com.caelitechnologies.rotary-nl-rye',
-        minimumVersion: '1',
-        appStoreId: '1567096118',
-      ),
-    );
-
-    final ShortDynamicLink shortLink =
-        await dynamicLinks.buildShortLink(parameters);
-    final Uri url = shortLink.shortUrl;
-
-    setState(() {
-      _linkMessage = url.toString();
-    });
-  }
-
-  _createShareURL() async {
-    _createDynamicLink(id = widget.data.id.toString());
-
-    if (await canLaunchUrlString(_linkMessage!)) {
-      await Share.share(
-          Platform.isIOS
-              ? 'Hier mot nog een leuk stukje komen. + de link naar de juiste pagina $_linkMessage'
-              : 'Hier mot nog een leuk stukje komen. + de link naar de juiste pagina $_linkMessage',
-          subject: 'look at this nice app :)');
-    } else {
-      throw 'Could not launch $_linkMessage';
-    }
-  }
+  // Future<void> _createDynamicLink(String id) async {
+  //   final DynamicLinkParameters parameters = DynamicLinkParameters(
+  //     uriPrefix: 'https://rotarynl.page.link',
+  //     link: Uri.parse('https://rotarynl.page.link/news?id=$id'),
+  //     androidParameters: AndroidParameters(
+  //       packageName: 'com.caelitechnologies.rotary_nl_rye',
+  //       minimumVersion: 1,
+  //     ),
+  //     iosParameters: IOSParameters(
+  //       bundleId: 'com.caelitechnologies.rotary-nl-rye',
+  //       minimumVersion: '1',
+  //       appStoreId: '1567096118',
+  //     ),
+  //   );
+
+  //   final ShortDynamicLink shortLink =
+  //       await dynamicLinks.buildShortLink(parameters);
+  //   final Uri url = shortLink.shortUrl;
+
+  //   setState(() {
+  //     _linkMessage = url.toString();
+  //   });
+  // }
+
+  // _createShareURL() async {
+  //   _createDynamicLink(id = widget.data.id.toString());
+
+  //   if (await canLaunchUrlString(_linkMessage!)) {
+  //     await Share.share(
+  //         Platform.isIOS
+  //             ? 'Hier mot nog een leuk stukje komen. + de link naar de juiste pagina $_linkMessage'
+  //             : 'Hier mot nog een leuk stukje komen. + de link naar de juiste pagina $_linkMessage',
+  //         subject: 'look at this nice app :)');
+  //   } else {
+  //     throw 'Could not launch $_linkMessage';
+  //   }
+  // }
 }
diff --git a/lib/features/outbound/data/outbound_list.dart b/lib/features/outbound/data/outbound_list.dart
index 472b6c8e..64fac249 100644
--- a/lib/features/outbound/data/outbound_list.dart
+++ b/lib/features/outbound/data/outbound_list.dart
@@ -8,7 +8,7 @@ List<Outbounds> outboundList = [
     bio:
         'Hiii, \nIk ben Fien uit Franeker in Friesland en ik ga dit jaar op uitwisseling met Rotary. Ik ben nu 17 jaar en word in de zomer 18, waarna ik een jaar naar de prachtige stad Rome ga in Italië. \nIk zal vanaf september in jaar 4 zitten in Rome. Volgens mijn gastbroer kom ik gelukkig in een klas met leerlingen van ongeveer dezelfde leeftijd. Ik heb in Italië een vakkenpakket dat aardig aansluit op het vakkenpakket dat ik nu ook heb, wat voornamelijk beta vakken zijn. \nAangezien er weinig mensen goed Engels spreken in Italië, zullen de eerste paar maanden vast wat pittiger worden, maar toch kijk ik er heel erg naar uit om de cultuur te leren kennen, de taal te leren en vooral om heel veel Italiaanse gerechten te eten!!',
     imageUrl:
-        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/outbound/long-term/24-25/fien-ten-hoeve.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -28,7 +28,7 @@ List<Outbounds> outboundList = [
     bio:
         'Hey! \nIk ben Fien Theewen, ik ben 16 jaar oud en ik woon in Venlo. Voor mijn exchange year ga ik naar Jacksonville Florida, in het stadje Fernandina beach! \nMijn ouders kwamen vorig jaar bij mij met het idee om een exchange year te gaan doen. Het sprak mij meteen aan, en ben meteen gaan kijken naar de eerste meeting met rotary voor zo’n exhange year. \nIk kijk heel erg naar dit jaar uit. Ik hoop veel vrienden te maken, veel dingen te leren en het beste uit mezelf te halen, en een echte Amerikaanse high school ervaring mee te maken. En natuurlijk genieten van alle avonturen!',
     imageUrl:
-        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/outbound/long-term/24-25/fien-theewen.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -48,7 +48,7 @@ List<Outbounds> outboundList = [
     bio:
         'Hoi! \nIk ben Jasper Verhofstad, 17 jaar oud en woon in Baarlo. \nIk ga op exchange naar Finland! Ik hoop dat ik een goede band opbouw met mijn gastgezinnen en vrienden die ik daar maak. \nOok hoop ik de Finse cultuur en taal te leren. \nIk kan niet wachten om het grootste avontuur van mijn leven aan te gaan en in augustus het vliegtuig op te stappen!',
     imageUrl:
-        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/outbound/long-term/24-25/jasper-verhofstad.png',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -68,7 +68,7 @@ List<Outbounds> outboundList = [
     bio:
         'Hoi, \nIk ben Vincent en ik ben nu nog 15 jaar oud maar 16 jaar als ik op exchange ga. Ik heb geen broertjes of zusjes. Ik woon in Venlo, Limburg. Ik ga op exchange naar Centraal Amerika, district 6110. \nIk heb nog geen contact met mijn gastouders daar. Ik hoop dat ik een geweldige exchange ervaring zal hebben en een hoop leuke dingen ga meemaken. \nIk spreek al vloeiend Engels maar maak nog veel fouten en heb nog een flink Nederlands accent als ik Engels spreek. Ik kijk enorm uit om naar high school te gaan. Ik speel basketbal en ik hoop dat ik daar in het basketbal team kom. \nIk heb er enorm veel zin in!',
     imageUrl:
-        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/outbound/long-term/24-25/vincent-kemper.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -88,7 +88,7 @@ List<Outbounds> outboundList = [
     bio:
         'Hoi, \nIk ben Carleen, ik ben momenteel 18 jaar oud. Ik ga over twee maanden naar Mexico! Ik heb al contact gehad met mijn gastgezin, ze waren heel aardig. Ze leken super enthousiast om mij als gastkind te hebben en ze hebben veel katten, dus mijn enthousiasme is enorm! Ik verblijf in een vrij kleine stad tussen Toluca en Mexico-Stad. Mijn stad ligt ook bovenop een berg, wat betekent dat ik altijd minstens 2800 meter hoog zal zijn. Ik heb dit programma gekozen om mijn horizon echt te verbreden en een totaal nieuwe cultuur te leren kennen en er hopelijk deel van uit te maken. Ik wilde ook een nieuwe taal leren en Spaans leek me de beste optie vanwege de veelzijdigheid ervan. Ik kijk er vooral naar uit om nieuwe mensen te ontmoeten en de natuur, culturele gebruiken, nieuwe gerechten enz. te ontdekken. Op dit moment ben ik nog steeds bezig met het verkrijgen van mijn visum en hopelijk land ik over ongeveer twee maanden in Mexico!',
     imageUrl:
-        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/outbound/long-term/24-25/carleen-bruining.png',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -108,7 +108,7 @@ List<Outbounds> outboundList = [
     bio:
         'Hallo!! \nIk ben Tim Hilderink, ik ben 17 jaar en ik ga naar Brazilië op Exchange in het jaar 2024-2025 naar het dorpje Canela in de buurt van Porto Alegre. \nIk woon in Haaksbergen een dorpje in de buurt van Enschede met mijn ouders, broer en mijn hond Sepp. Ik heb dit jaar 5 havo gedaan en ik ben hopelijk geslaagd, wat ik hier na wil doen weet ik nog niet zo goed maar daar heb ik nu genoeg tijd voor gekregen om even goed over na te denken. In mijn vrije tijd speel ik hockey en padel. \nIk kijk met heel veel plezier uit naar het aankomende jaar en al helemaal na alle leuke activiteiten die ik met de Rotary en Rotex heb gedaan. Het lijkt me ook heel leuk om het Portugees onder de knie te hebben maar het is wel een hele lastige taal ook heb ik zin om alle nieuwe mensen van de school daar te ontmoeten. Ik ben echt super blij dat ik dit ga doen en ik ben heel dankbaar voor de kans die mij geboden is.',
     imageUrl:
-        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/outbound/long-term/24-25/tim-hilderink.png',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -128,7 +128,7 @@ List<Outbounds> outboundList = [
     bio:
         'Hoi, \nIk ben Izak van Os. \nIk ben 16 jaar oud en ik ga op exchange naar Brazilië. Daar verblijf ik in Assis, een stadje in het zuidwesten van de staat Sao Paulo. \nOm eerlijk te zijn weet ik nog helemaal niet wat ik moet verwachten. Van verschillende leden van de Rotex moet ik geloven dat het als een blonde en lange buitenlander niet moeilijk is om vrienden te maken. Dus daar verheug ik wel op. \nMijn gastmoeder had al vroeg contact opgezocht met mijn ouders via Whatsapp. Ik daarentegen heb alleen contact met het nichtje van mijn hostouders die in hetzelfde huis woont. Veel mensen uit Assis zijn me al gaan volgen op Insta, dus ik verwacht een warm welkom.',
     imageUrl:
-        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/outbound/long-term/24-25/izak-van-os.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -148,7 +148,7 @@ List<Outbounds> outboundList = [
     bio:
         'Hiii, \nIk ben Myrthe de Jong, \nik ben nu 17 jaar. Nu woon ik nog in Alphen a/d Rijn maar over een paar maandjes ga ik naar Poulsbo North kitsap in de USA!! \nIk heb een hele leuke sponsor club, deze club is in Neede , dat is praktisch gezien aan de andere kant van het land. Ik ben daar wel al op een hele leuke kennismaking geweest en ben dankbaar dat ze mijn sponsorclub willen zijn. \nIk ben heel erg benieuwd hoe het in de USA zal gaan en hoe verschillend het van Nederland is. Ik heb heel veel zin om daar achter te komen en vindt het stiekem toch wel spannend nu het steeds dichterbij komt. \n“Lifetime in a year” \nI am looking forward to it!',
     imageUrl:
-        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/outbound/long-term/24-25/myrthe-de-jong.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -168,7 +168,7 @@ List<Outbounds> outboundList = [
     bio:
         'Heyhoi! \nIk ben Lysanne Smits en ben op dit moment 17 jaar. Ik kom uit het kleine stadje Franeker in Friesland. Sporten is mijn grootste hobby! Ook speel ik de klarinet. \nIn 2024-2025 ga ik op uitwisseling naar Italië! Ik kom terecht in de stad Cremona. De stad van Stradivarius. Als muziekliefhebber vind ik dit enorm leuk! \nIk ga naar een scientifico school met voornamelijk beta-vakken. Dit gaat pittig worden in het italiaans maar het komt goed overeen met mijn vakkenpakket in Nederland dus dat is handig :) \nIk kijk enorm uit naar dit jaar. Het zal zeker niet makkelijk worden maar heb zin om de uitdaging uit te gaan! Het zal een leuk avontuur worden.',
     imageUrl:
-        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/outbound/long-term/24-25/lysanne-smits.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -188,7 +188,7 @@ List<Outbounds> outboundList = [
     bio:
         'Hoi, \nIk ben Emily Odink 16 jaar oud en ik woon in Lelystad. Dit jaar ga ik naar Rossland een klein stadje in British Colombia, Canada. Het ligt tussen de bergen, dus in de zomer wordt er gemountainbiked en in de winter geskied hier kijk ik erg naar uit. \nDit jaar hoop ik veel nieuwe mensen te leren kennen en levenslange vriendschappen te sluiten. Ook ben ik benieuwd naar het Canadese school leven. Ik kan niet wachten tot het zover is :)',
     imageUrl:
-        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/outbound/long-term/24-25/emily-odink.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -208,7 +208,7 @@ List<Outbounds> outboundList = [
     bio:
         'Ciao! \nIk ben Rinske Baarda en ik ben 17 jaar oud. Ik ga komend schooljaar naar Lecco in Italië. Dat is een stad boven Milaan in district 2042. \nIk heb er heel veel zin in! Mij lijkt het heel interessant om over de cultuur te leren en het leven daar te ervaren. Ook hoop ik de taal goed te leren. Daar ben ik als voorbereiding al een beetje mee bezig. Ik heb al contact met mijn eerste gastgezin en ik kan niet wachten om ze te ontmoeten en een geweldige tijd met de gastgezinnen te beleven. \nIk heb tot nu toe veel plezier beleefd tijdens de selectie- en trainingsdagen en ik vond het heel leuk om de andere prebounds beter te leren kennen. Nu zijn we een hele leuke, hechte groep. Dit hoop ik ook te krijgen met mijn nieuwe vrienden en de andere exchangestudenten in Italië. \nIk heb heel veel zin in mijn avontuur :) \nArrivederci!',
     imageUrl:
-        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/outbound/long-term/24-25/rinske-baarda.png',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -228,7 +228,7 @@ List<Outbounds> outboundList = [
     bio:
         'Hi! \nIk ben Marcella, ik ben 17 jaar en ik ga voor mijn exchange year 24/25 naar Amerika, New York state. En ik heb hier natuurlijk super veel zin in! Het lijkt me sinds ik een jaar of 12 ben al echt super leuk om naar een Amerikaanse High School te gaan, dus het is echt een droom voor mij die uitkomt. En dit is ook echt iets wat je maar 1 keer in je leven kan doen, dus ik vind het heel leuk dat ik dit mag meemaken aankomend schooljaar. \nHet district waar ik heenga is district 7120, en ik kom in een van de plaatsjes Palymra of Macedon terecht dichtbij Rochester, ook ligt het dichtbij Canada en bij de waterval Niagara Falls. De school waar ik heenga heet Pal-Mac high school en ik heb hier natuurlijk al van alles opgezocht op internet en het ziet er uit als een hele leuke school. De school waar ik naartoe ga weet ik dus al wel, maar mijn gastfamilie heb ik nog niet dus dat is nog even afwachten wie dat zullen gaan worden. \nIk heb er in ieder geval heel veel zin in en ik hoop dat ik een heel leuk jaar ga hebben in Amerika. En ook hoop ik dat ik veel nieuwe dingen zal leren en ontdekken over de Amerikaanse cultuur. \nAls je mijn tijd daar wilt volgen kun je mijn Instagram volgen: @Marcellaa.jv',
     imageUrl:
-        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/outbound/long-term/24-25/marcella-jorge-vaz.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -248,7 +248,7 @@ List<Outbounds> outboundList = [
     bio:
         'Heyy \nIk ben Mathilde en ik ben 17 jaar. Ik kom uit Leiden en ik hou van shoppen met vrienden, leuke dingen doen en lekker eten! \nIk ga dit jaar naar District 2032 in Italië! Dat ligt vlak bij Genua. Ik hoop dat ik mijn bucketlist kan voltooien, zoals een Italiaanse bruiloft bijwonen, Italiaans leren koken en natuurlijk de cultuur ontdekken als een echte Italiaanse! \nIk ben vooral benieuwd wat dit jaar mij gaat brengen hoe mijn gastouders gaan zijn en of ik daadwerkelijk ga veranderen zoals mensen zeggen. \nIk hoop dat dit het jaar van mijn leven wordt! \nSaluti -groetjes-',
     imageUrl:
-        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/outbound/long-term/24-25/mathilde-van-den-berg.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -268,7 +268,7 @@ List<Outbounds> outboundList = [
     bio:
         'Hoi! \nIk ben Xavier Peters, ik ben 17 jaar oud en ik woon in Roosendaal. \nIk ga komend jaar met mijn exchange naar Argentinië in het district 4945. Dit is een multi district bestaande uit Uruguay en Argentinië. Hier zal ik verblijven in het prachtige Santa Fe! \nIk heb enorm veel zin in komend jaar om nieuwe mensen te leren kennen, een nieuwe taal te leren en om met name zelfvoorzienend te worden!',
     imageUrl:
-        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/outbound/long-term/24-25/xavier-peters.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -288,7 +288,7 @@ List<Outbounds> outboundList = [
     bio:
         'Hoi hoi, \nIk ben Cathelijne van der Pluijm, 17 jaar oud en ik kom uit Waalwijk, Brabant. \nIk ga een jaar lang naar de Verenigde Staten. Ik zit in de buurt van Syracuse in de staat New York. Ik heb hier natuurlijk heel veel zin in en kan niet wachten om vele mooie herinningen te maken! \nIn de winter van 2019 had mijn gezin Colton, een jongen uit Amerika in huis via de Rotary Youth Exchange. Dit was zo’n gave ervaring dat ook ik nu bijna 5 jaar later op Exchange naar Amerika mag gaan via Rotary. \nVeel mensen vragen of ik het niet spannend vind om een jaar weg te gaan,  maar ik kan zeggen dat ik op dit moment er vooral veel zin in heb om op dit grote avontuur te gaan!',
     imageUrl:
-        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/outbound/long-term/24-25/cathelijne-van-der-pluijm.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -308,7 +308,7 @@ List<Outbounds> outboundList = [
     bio:
         'Hoii \nIk ben Jasmijn Peterse, ik ben 16 jaar oud en ik kom uit Den Hout in Noord Brabant. \nIk ga volgend jaar naar Brazilië. Ik verblijf dan in de stad Curitiba. Ik heb er voor gekozen om een jaar naar het buitenland te gaan omdat ik meer van de wereld wilde zien en niet op een toeristische manier. Ik wilde de cultuur van een ander land leren kennen. \nIk heb niet echt verwachtingen voor dit jaar zodat alles een verrassing wordt. Ik heb heel veel zin om allemaal nieuwe mensen en culturen te leren kennen. \nIk heb nu al een tijdje contact met mijn gastouders. Ze zijn super aardig en hebben me al een paar handige tips gegeven voor volgend jaar.',
     imageUrl:
-        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/outbound/long-term/24-25/jasmijn-peterse.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -328,7 +328,7 @@ List<Outbounds> outboundList = [
     bio:
         'Hi, \nIk ben Bo, 15 jaar en ik ga 24/25 naar Frankrijk op Exchange. Ik zit nu in Vwo 4 en woon in Delft, zodra ik terug ben maar ik mijn Vwo af. \nIk ga naar Bellerive-sur-Allier, dit ligt dichtbij Vichy en ergens in het midden van Frankrijk. Ik kijk er erg naar uit om een nieuwe taal te leren, nieuwe ervaringen op te doen, nieuwe vrienden maken en veel te leren.',
     imageUrl:
-        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/outbound/long-term/24-25/bo-heijns.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -348,7 +348,7 @@ List<Outbounds> outboundList = [
     bio:
         'Hoi! \nMijn naam is Britt, ik woon in Nunspeet en ik ben 18 jaar oud. Ik ga komend schooljaar op Exchange naar Canada in de provincie New Brunswick. \nIk kijk al een lange tijd uit naar dit Exchange avontuur en ik heb enorm veel zin om deze zomer aan het jaar van mijn leven te beginnen. Ik hoop op een enorm leuk jaar waarin ik nieuwe vrienden voor het leven maak en veel nieuwe ervaringen op zal doen. \nIn Canada mag ik naar een echte high school en het lijkt mij heel leuk om de Engelse taal straks vloeiend te kunnen spreken. Daarnaast kijk ik uit naar de reis die ik met mede Exchange student kan maken in Noord-Amerika en natuurlijk alle andere ervaringen die mij te wachten staan! \nAl met al ben erg benieuwd hoe het is om een jaar lang weg van huis te zijn, maar ik kijk vooral heel erg uit naar het jaar wat mij te wachten staat in Canada!',
     imageUrl:
-        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/outbound/long-term/24-25/britt-groeneboer.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -368,7 +368,7 @@ List<Outbounds> outboundList = [
     bio:
         'Hoi! \nMijn naam is Madyke de Groot, ik ben 17 jaar oud en woon samen met mijn ouders in Nunspeet. \nKomend jaar ga ik op uitwisseling naar de Verenigde Staten. Ik ga wonen in Arlington, een dorpje in de staat Washington. \nArlington ligt tussen Seattle en Vancouver en is omgeven door mooie natuurgebieden. \nHet wonen bij gastgezinnen is voor mij een hele nieuwe ervaring en dat zal vast even wennen zijn. \nKomend schooljaar volg ik het junior jaar op de highschool van Arlington. In de ochtend lessen volgen en ‘s middag tijd voor sport en cultuur. \nHet wordt vast een spannende tijd waarin ik hoop veel mensen te leren kennen en door alle ervaringen als persoon te groeien. \nIk heb er ontzettend veel zin in!',
     imageUrl:
-        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/outbound/long-term/24-25/madyke-de-groot.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -388,7 +388,7 @@ List<Outbounds> outboundList = [
     bio:
         'Grüezi Mitenand! \nMijn naam is Tom Pellicaan, ik ben 15 jaar, zit in 4 VWO en woon in Brabant. Ik heb ontzettend veel zin in mijn exchange jaar in Fribourg, Zwitserland, maar ik voel ook grote spanning. \nIn mijn vrije tijd ben ik behulpzaam bij jongerenorganisaties, hierdoor weet ik hoe krachtig het is als jongeren samenkomen, samenwerken en samen iets creëren en ondernemen. En dat doe je ook als uitwisselingsstudent! \nUitwisseling is voor mij een kans om mijzelf verder te ontwikkelen, tegelijk doe je zooo veel meer. Je bouwt internationale kenniskringen op en leert nieuwe culturen. Ik weet zeker dat dit gaat gebeuren en hoop verder Frans en Duits te leren (Fribourg is tweetalig) en een prachtjaar te hebben met prachtige mensen. \nMisschien kan ik als ik terugkom ook nog eens jodelen! \np.s. een tussenjaar op de middelbare kan gewoon! Als dit jou is: DOEN! Het gaat om de ontdekking en ervaring en dat is het zeker weten waar, maakt niet uit waar. \nÀ bientôt!',
     imageUrl:
-        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/outbound/long-term/24-25/tom-pellicaan.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -408,7 +408,7 @@ List<Outbounds> outboundList = [
     bio:
         'Hai! \nMijn naam is Zora Linde de Valck, ik ben 16 jaar en ik kom uit Roosendaal. \nIk ga op uitwisseling naar Thailand! Ik ga naar de stad Nakhon Sawan, in district 3350. Dit ligt op zo’n 3 uur rijden naar het noorden vanaf Bangkok. Ik heb al een tijd contact met mijn gastgezin, ze zijn super vriendelijk en verwelkomend en ik kijk er naar uit om ze in het echt te kunnen ontmoeten. \nTijdens mijn exchange hoop ik veel nieuwe mensen te ontmoeten, veel nieuwe dingen te proberen en beleven en veel plekken te mogen bezoeken. Ik ben erg benieuwd naar het leven daar. Ik vind het spannend maar heb er ook heel erg veel zin in.',
     imageUrl:
-        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/outbound/long-term/24-25/zora-linde-de-valck.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -426,9 +426,9 @@ List<Outbounds> outboundList = [
   Outbounds(
     name: 'Jens Hoppzak',
     bio:
-        'Hallo allemaal, \nIk ben Jens Hoppzak, ik ben 16 jaar oud en ik woon in Sevenum. \nMijn hobby’s zijn: chillen met vrienden en sportief bezig zijn. Ik heb mijn gastouders al ontmoet en het is ook een sportief en gezellig gezin. \nIk ga op exchange naar Argentinië in het plaatsje Santa Lucia. Ik heb er veel zin in en kijk er naar uit om nieuwe mensen te leren kennen, cultuur te ontdekken en vloeiend Spaans te kunnen leren. Ik heb gekozen voor een jaar exchange omdat ik altijd al veel van de wereld wou zien en culturen ontdekken en omdat ik nog niet wist wat ik na de middelbare wou doen dit een perfecte keuze vond. \nIk kan niet wachten tot ik op het vliegtuig stap en het avontuur mag gaan beginnen.',
+        'Hallo allemaal, \nIk ben Jens Hoppzak, ik ben 16 jaar oud en ik woon in Sevenum. \nMijn hobby\'s zijn: chillen met vrienden en sportief bezig zijn. Ik heb mijn gastouders al ontmoet en het is ook een sportief en gezellig gezin. \nIk ga op exchange naar Argentinië in het plaatsje Santa Lucia. Ik heb er veel zin in en kijk er naar uit om nieuwe mensen te leren kennen, cultuur te ontdekken en vloeiend Spaans te kunnen leren. Ik heb gekozen voor een jaar exchange omdat ik altijd al veel van de wereld wou zien en culturen ontdekken en omdat ik nog niet wist wat ik na de middelbare wou doen dit een perfecte keuze vond. \nIk kan niet wachten tot ik op het vliegtuig stap en het avontuur mag gaan beginnen.',
     imageUrl:
-        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/outbound/long-term/24-25/jens-hoppzak.png',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -448,7 +448,7 @@ List<Outbounds> outboundList = [
     bio:
         'Hola! \nIk ben Charlotte van Witteloostuijn en ik ben 17 jaar oud. Ik woon in Breda en ik ga volgend schooljaar naar Mexico toe! \nIk ben geplaatst in de stad Ensenada, Baja Calafornia in district 4100. Dit ligt helemaal aan de Westkust van Mexico en onder California. Het staat bekend om de mooie surfstranden en het lekkere eten. Zoals je wel begrijpt heb ik er suuuper veel zin in dus! \nIk hoop vooral veel nieuwe ervaringen op te doen, nieuwe sporten te leren, Spaans te leren, veel van de Mexicaanse cultuur te leren en natuurlijk een fantastisch jaar te hebben! \nGroetjes Charlotte',
     imageUrl:
-        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/outbound/long-term/24-25/charlotte-van-witteloostuijn.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -468,7 +468,7 @@ List<Outbounds> outboundList = [
     bio:
         'Holaa!! \nIk ben Ella Klumpenhouwer. Ik ben 17 jaar oud en ik zit op VWO 5. Ik ga voor mijn exchange naar Chile🇨🇱, en daar kom ik terecht in district 4320. \nIk heb voor Chile gekozen, omdat het me heel leuk leek om naar Zuid-Amerika te gaan en daar de cultuur te ontdekken. Ik wist al een paar jaar dat ik dit wou gaan doen, omdat me vader het op mijn 12de al aan mij vroeg of dit mij leuk leek. Eerst was ik van plan om naar Japan te gaan, omdat dat mij een heel ander en bijzonder land leek. Maar na de informatiedag, had ik veel goede verhalen over Zuid-Amerika gehoord, en wist ik gelijk al dat ik naar Chile wou. Ook ben ik nog nooit in Zuid-Amerika geweest, dus ik heb zin om heen heel nieuw land/continent te ontdekken. \nIk wil in dit jaar de Chileense cultuur ontdekken en meemaken. Ook wil ik veel mensen ontmoeten en veel nieuwe vrienden maken. Ik wil ook veel nieuwe plekken zien en heel het land gaan ontdekken en ik wil Spaans gaan leren. \nIk heb contact met mijn eerste gastgezin en hierdoor heb ik nog meer zin om op uitwisseling te gaan. Ik heb er super veel zin in en ik hoop op een heel leuk jaar!❤',
     imageUrl:
-        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/outbound/long-term/24-25/ella-klumpenhouwer.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -488,7 +488,7 @@ List<Outbounds> outboundList = [
     bio:
         'Hi! \nIk ben Robin, ik ben 16 jaar oud en woon in Heeze. Ik zit in havo 5 en ben niet klaar met mijn examens. \nDit jaar ga ik naar São Bernardo do Campo in Brazilië. Het is een stad ongeveer een half uurtje van São Paulo vandaan. Ik heb super veel zin om naar Brazilië te gaan en nieuwe culturen te ontdekken en mensen te ontmoeten. Zoals mijn eerste gast gezin waar ik al contact mee heb en die ook heel blij zijn dat ik kom. Ik hoop dat ik het Portugees snel onder de knie krijg en een heel leuk jaar ga hebben. \nIk heb mijn vlucht al geboekt en heb er heel veel zin in! \nGroetjes, \nRobin',
     imageUrl:
-        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/outbound/long-term/24-25/robin-van-gorp.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -508,7 +508,7 @@ List<Outbounds> outboundList = [
     bio:
         'Ik ben Jesper en ik ben 17 jaar oud. \nIk woon in Harlingen, een havenstad in Friesland. Ik ben bijna klaar met mijn vijfde jaar op het Stedelijk Gymnasium Leeuwarden en zal na mijn exchange beginnen aan het examenjaar in de zesde. \nIk ga deze zomer naar Leavenworth in de staat Washington in de Verenigde Staten. Deze staat ligt helemaal in het Noord-Westen van de VS en is daarom omringd door bergen. Leavenworth is een klein stadje in het midden van Washington. Het heeft ongeveer 2.500 inwoners en is voornamelijk op tourisme gefocust. De hele stad is namelijk in een Bavarisch thema gebouwd. Het ligt tussen de bergen in en geeft daarom een groot aanbod in natuursporten. Ik heb zelf nog nooit iets van wintersport gedaan, maar ik hoop er hier kennis mee te maken. \nIn Nederland hockey ik, maar dat is in Leavenworth geen optie, daarom kijk ik er zeer naar uit om andere sporten te proberen. Omdat ik al contact heb met mensen van mijn toekomstige school heb ik mij al kunnen inschrijven voor het voetbalteam. En kijk ik er naar uit om met het team door Washington te reizen.',
     imageUrl:
-        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/outbound/long-term/24-25/jesper-koornstra.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
@@ -528,7 +528,7 @@ List<Outbounds> outboundList = [
     bio:
         'Hoi, \nIk ben Marit, ik ben 18 jaar en ik woon in Eemnes, Utrecht. Ik verhuis komend jaar naar district 4921 in Argentinië, naar het stadje San Antonio Oeste in de provincie Río Negro!! \nOp uitwisseling gaan is al heel lang een droom van mij. Ik ben al mijn hele leven geïnteresseerd geweest in het leren over andere talen en culturen. \nIk wil ontzettend graag Spaans leren en deze uitwisseling is echt een geweldige kans om dat te doen. Ik kan niet wachten tot mijn uitwisseling van start gaat en ik hoop mooie ervaringen op te doen en vrienden voor het leven te maken!',
     imageUrl:
-        'https://upload.wikimedia.org/wikipedia/commons/7/7c/Profile_avatar_placeholder_large.png',
+        'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/outbound/long-term/24-25/marit-tusveld.jpg',
     email: null,
     phoneNumber: null,
     snapchatUrl: null,
diff --git a/lib/features/outbound/presentation/pages/long_term/long_term_outbound_page.dart b/lib/features/outbound/presentation/pages/long_term/long_term_outbound_page.dart
index 69d13628..05aa6dd8 100644
--- a/lib/features/outbound/presentation/pages/long_term/long_term_outbound_page.dart
+++ b/lib/features/outbound/presentation/pages/long_term/long_term_outbound_page.dart
@@ -52,7 +52,7 @@ class _LongTermExchangeOutboundPageState
           ClipRRect(
             borderRadius: BorderRadius.circular(15),
             child: Image.asset(
-              'assets/image/classOff22.jpeg',
+              'assets/image/Class_of_2024-2025_outbunds.jpg',
               fit: BoxFit.cover,
             ),
           ),
diff --git a/lib/features/outbound/presentation/pages/short_term/camps_and_tours/widgets/loadCsv.dart b/lib/features/outbound/presentation/pages/short_term/camps_and_tours/widgets/loadCsv.dart
index f66d0f0b..26e3f766 100644
--- a/lib/features/outbound/presentation/pages/short_term/camps_and_tours/widgets/loadCsv.dart
+++ b/lib/features/outbound/presentation/pages/short_term/camps_and_tours/widgets/loadCsv.dart
@@ -4,9 +4,9 @@ import 'package:flutter/services.dart' show SystemUiOverlayStyle;
 
 // 📦 Package imports:
 import 'package:csv/csv.dart';
+import 'package:dio/dio.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:http/http.dart' as http;
 
 // 🌎 Project imports:
 import 'package:rotary_nl_rye/core/prop.dart';
@@ -19,6 +19,7 @@ class LoadCsv extends StatefulWidget {
 
 class _LoadCsvState extends State<LoadCsv> {
   late Future<List<List<dynamic>>> _futureData;
+  final Dio _dio = Dio();
 
   @override
   void initState() {
@@ -27,17 +28,22 @@ class _LoadCsvState extends State<LoadCsv> {
   }
 
   Future<List<List<dynamic>>> getData() async {
-    final response = await http.get(
-      Uri.parse(
+    try {
+      final response = await _dio.get(
         'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/outbounds/camps-and-tours/zomerkampen.csv',
-      ),
-      headers: {'Content-Type': 'application/json', 'Charset': 'utf-8'},
-    );
-    if (response.statusCode == 200) {
-      return CsvToListConverter(eol: '\r\n', fieldDelimiter: ';')
-          .convert(response.body);
-    } else {
-      throw Exception('Failed to load CSV data');
+        options: Options(
+          headers: {'Content-Type': 'application/json', 'Charset': 'utf-8'},
+        ),
+      );
+
+      if (response.statusCode == 200) {
+        return CsvToListConverter(eol: '\r\n', fieldDelimiter: ';')
+            .convert(response.data);
+      } else {
+        throw Exception('Failed to load CSV data');
+      }
+    } catch (e) {
+      throw Exception('Error fetching data: $e');
     }
   }
 
diff --git a/lib/features/outbound/presentation/pages/short_term/camps_and_tours/widgets/pdf_viewer.dart b/lib/features/outbound/presentation/pages/short_term/camps_and_tours/widgets/pdf_viewer.dart
index 2fbdfd63..39f69d2e 100644
--- a/lib/features/outbound/presentation/pages/short_term/camps_and_tours/widgets/pdf_viewer.dart
+++ b/lib/features/outbound/presentation/pages/short_term/camps_and_tours/widgets/pdf_viewer.dart
@@ -2,11 +2,11 @@
 import 'dart:async';
 
 // 🐦 Flutter imports:
-import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
 // 📦 Package imports:
+import 'package:dio/dio.dart';
 import 'package:flutter_cached_pdfview/flutter_cached_pdfview.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:path_provider/path_provider.dart';
diff --git a/lib/features/programs/presentation/pages/information/camps_tours.dart b/lib/features/programs/presentation/pages/information/camps_tours.dart
index b05551ba..ae2057f9 100644
--- a/lib/features/programs/presentation/pages/information/camps_tours.dart
+++ b/lib/features/programs/presentation/pages/information/camps_tours.dart
@@ -6,11 +6,11 @@ import 'package:flutter/services.dart';
 // 📦 Package imports:
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:carousel_slider/carousel_slider.dart';
-import 'package:rotary_nl_rye/features/outbound/presentation/pages/short_term/camps_and_tours/widgets/loadCsv.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 
 // 🌎 Project imports:
 import 'package:rotary_nl_rye/core/prop.dart';
+import 'package:rotary_nl_rye/features/outbound/presentation/pages/short_term/camps_and_tours/widgets/loadCsv.dart';
 import 'package:rotary_nl_rye/features/uniform_widgets/back_button.dart';
 
 class CampsAndToursProgramPage extends StatefulWidget {
diff --git a/lib/features/programs/presentation/pages/information/ngse.dart b/lib/features/programs/presentation/pages/information/ngse.dart
index 4606d8bb..363c9dae 100644
--- a/lib/features/programs/presentation/pages/information/ngse.dart
+++ b/lib/features/programs/presentation/pages/information/ngse.dart
@@ -1,6 +1,8 @@
 // 🐦 Flutter imports:
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:url_launcher/url_launcher.dart'; // Add this import
 
 // 🌎 Project imports:
 import 'package:rotary_nl_rye/core/prop.dart';
@@ -32,23 +34,32 @@ class _NGSEProgramPageState extends State<NGSEProgramPage> {
       body: ListView(
         padding: EdgeInsets.symmetric(horizontal: 16, vertical: 15),
         children: <Widget>[
-          buildSectionTitle('NGSE: deelnemen'),
-          buildSectionTitle('NGSE: deelnemen', fontSize: 17.0),
+          buildSectionTitle('NGSE: Op zoek naar een stage of werkervaring?'),
           buildParagraph(
-              'NGSE behoort tot de vijfde service avenue van Rotary International, net als de Internationale Jeugduitwisselingen, Interact, Rotaract en RYLA.'),
+              'Op zoek naar een (internationale) stage of werkervaring? Rotary NGSE kan je helpen!'),
           buildParagraph(
-              'NGSE (New Generations Service Exchange) is een relatief nieuw Rotary uitwisselingsprogramma voor jonge volwassenen tussen de 18 en 30 jaar. Het is bedoeld voor jongeren die graag ervaring willen opdoen in het buitenland. Dit kan zijn als onderdeel van hun studie of als (meekijk) stage. Maar ook kan het worden ingezet om werkervaring op te doen buiten Nederland. De nadruk bij NGSE ligt op vocational en service-activiteiten. Deze kunnen ook via de clubactiviteiten van de Rotary Club ter plaatse (hostclub) worden uitgeoefend. Dankzij de NGSE leert de uitgezonden jongere over het leven in een ander land, over andere onderwijssystemen en andere arbeidsculturen. Voor jonge volwassenen vergroot dit hun wereld en hun netwerk. Door ideeën uit te wisselen en geïnspireerd te raken ontwikkelen zij ook hun kijk op de wereld (en op hun eigen zelfbeeld.) Zelfstandigheid, zelfvertrouwen en leiderschap kunnen hierdoor groeien.'),
-          buildSectionTitle(
-              'AANMELDEN - UITZENDEN EN ONTVANGEN DOOR NGSE & ROTARY CLUBS'),
+              'Het vinden van een passende (internationale) stage binnen je studie valt vaak niet mee. Contacten via je opleiding zijn er weinig of passen niet in het beeld van een stage die jij voor je ziet. Ook leads via familie of vrienden kosten veel tijd maar leveren niet altijd op wat jij hoopt.'),
           buildParagraph(
-              'Voor deze vorm van uitwisseling is geen wederkerigheid vereist. Een kandidaat kan zich bij een Rotary Club (sponsorclub) in zijn buurt aanmelden of rechtstreeks bij de NGSE-coördinator. De uitzendende Rotary Club mag financieel bijdragen, maar hoeft dat niet te doen. De NGSEcoördinator gaat op zoek naar een passende gastclub (hostclub) in het buitenland. Die hostclub en de kandidaat gaan samen op zoek naar een passend gastgezin of passende woonruimte en indien van toepassing, ook een passende onderwijsinstelling of werkgever. Als tegenprestatie houdt de uitgezonden jongere contact met de hostclub en helpt die club bij serviceprojecten, vocational projecten of andere humanitaire acties. Zo ontstaan soms wel levenslange contacten en vriendschappen. De hostclub kan natuurlijk ook zelf een jongvolwassene uitsturen naar Nederland en rekenen op de gastvrijheid van de sponsorclub van de uitgezonden Nederlandse NGSE-jongere. Maar dit is geen vanzelfsprekende zaak.'),
+              'Het wereldwijde netwerk van Rotary kan jou helpen – sinds een aantal jaren heeft Rotary de New Generations Service Exchange (NGSE) opgericht. Een programma gericht op jou als student of als werkzoekende die wel wat aanvulling op zijn/haar cv kan gebruiken. Ben je tussen de 18 en 30 jaar dan kun je je hiervoor aanmelden. De duur van een stage of werkervaring kan variëren - bij internationale stages buiten Europa geldt een duur van drie maanden voor een stage dit i.v.m. het visum. Bij andere stages kan dit variëren afhankelijk van jouw ideeën en die van de Rotary hostclub (ontvangende club).'),
+          SizedBox(height: 20),
+          buildImage('assets/image/RPFYA.png'),
+          buildSectionTitle('AANMELDEN - UITZENDEN EN ONTVANGEN'),
+          buildParagraphWithLink(
+              'Op de site van Rotary International kun je nog meer info over NGSE vinden: ',
+              'https://www.rotary.org/en/our-programs/new-generations-service-exchange'),
+          buildSectionTitle('KOSTEN'),
           buildParagraph(
-              'Iedere Rotary Club kan zichzelf ook aanmelden om als \'host\' of gastclub te fungeren, ook al is er nog geen aanmelding vanuit het buitenland.'),
-          buildSectionTitle('DUUR VAN UITWISSELING & KOSTEN'),
+              'Enerzijds verwachten we van jou dat je jouw hostclub helpt met hun (service) projecten tijdens jouw stage bij hen. Zo leer jij hen en zij jou kennen. Hier kunnen mooie verdere contacten uit ontstaan.'),
           buildParagraph(
-              'De duur van deze NGSE uitwisseling is variabel, maar bij werkervaringsstages geldt een maximum van drie maanden. Een visumaanvraag is veelal niet nodig of eenvoudig. Langere periodes (tot maximaal 6 maanden) zijn bespreekbaar afhankelijk van het gastland. De studie of stageplek voor de kandidaat moet geregeld zijn vóór de aankomst van de kandidaat in het gastland. Alle kosten zijn voor de kandidaat: reis, visum, inentingen, studie en verzekeringen.'),
-          buildParagraph(
-              'Bij inschrijving betaalt de kandidaat aan NGSE €150,00 ex BTW (€181,50 incl. BTW) inschrijfkosten.'),
+              'Deelname aan het NGSE programma kost in totaal €150,- ex BTW. De kosten voor reis, visum, inentingen, studie en verzekeringen zijn voor eigen rekening.'),
+          buildParagraphWithLink(
+              'Wil je meer weten of heb je vragen wat NGSE voor jou kan doen? Stuur een mailtje naar ',
+              'interesse@rotaryyep.nl'),
+          buildSectionTitle('Testimonies'),
+          buildTestimony(
+              'Tara Higgins: “When we travel, this amazing thing happens. We let down our guard. You’re constantly exposed to new experiences and new people. I’m so grateful for Rotary for allowing me to experience that.” Tara spent eight weeks in Ireland visiting a number of classrooms to improve her skills as a teacher.'),
+          buildTestimony(
+              'James Kolasinski: “The experience was beyond what I could have ever hoped for: Not only was the breadth of work experience completely unexpected, the hospitality I experienced was second to none.” James spent a month in Texas, USA, as a medical student in order to better understand international health care systems.'),
           buildEndSection(),
         ],
       ),
@@ -75,6 +86,54 @@ class _NGSEProgramPageState extends State<NGSEProgramPage> {
     );
   }
 
+  Widget buildParagraphWithLink(String text, String link) {
+    return Padding(
+      padding: const EdgeInsets.only(top: 10.0),
+      child: RichText(
+        text: TextSpan(
+          children: [
+            TextSpan(
+              text: text,
+              style: TextStyle(fontSize: 14.0, color: Colors.black),
+            ),
+            TextSpan(
+              text: link,
+              style: TextStyle(
+                  fontSize: 14.0,
+                  color: Colors.blue,
+                  decoration: TextDecoration.underline),
+              recognizer: TapGestureRecognizer()
+                ..onTap = () => launchUrl(Uri.parse(link)),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget buildTestimony(String text) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 15.0),
+      child: Text(
+        text,
+        style: TextStyle(
+            fontStyle: FontStyle.italic,
+            fontSize: 14.0,
+            color: Colors.grey[700]),
+      ),
+    );
+  }
+
+  Widget buildImage(String path) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 20.0),
+      child: Image.asset(
+        path,
+        height: 200.0,
+      ),
+    );
+  }
+
   Widget buildEndSection() {
     return Column(
       children: <Widget>[
@@ -91,7 +150,7 @@ class _NGSEProgramPageState extends State<NGSEProgramPage> {
           padding: const EdgeInsets.only(top: 15.0),
           child: Center(
             child: Text(
-              'Update: 20 oktober 2020',
+              'Update: 29 september 2024',
               style: TextStyle(color: Color(0xFF777777)),
             ),
           ),
diff --git a/lib/features/programs/presentation/pages/promo/podcast_page.dart b/lib/features/programs/presentation/pages/promo/podcast_page.dart
index c5d81b27..c79b5f8c 100644
--- a/lib/features/programs/presentation/pages/promo/podcast_page.dart
+++ b/lib/features/programs/presentation/pages/promo/podcast_page.dart
@@ -1,6 +1,8 @@
 // 🐦 Flutter imports:
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+
+// 📦 Package imports:
 import 'package:audioplayers/audioplayers.dart';
 
 // 🌎 Project imports:
diff --git a/lib/features/rebounds/models/country.dart b/lib/features/rebounds/models/country.dart
index cbb0b6aa..627b55bb 100644
--- a/lib/features/rebounds/models/country.dart
+++ b/lib/features/rebounds/models/country.dart
@@ -1,3 +1,4 @@
+// 🌎 Project imports:
 import 'package:rotary_nl_rye/core/presentation/models/image_list_tile_item.dart';
 
 class Country extends ImageListTileItem {
diff --git a/lib/features/rebounds/presentation/pages/CountriesPage.dart b/lib/features/rebounds/presentation/pages/CountriesPage.dart
index 0eb08565..14a49f19 100644
--- a/lib/features/rebounds/presentation/pages/CountriesPage.dart
+++ b/lib/features/rebounds/presentation/pages/CountriesPage.dart
@@ -1,5 +1,8 @@
+// 🐦 Flutter imports:
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+
+// 🌎 Project imports:
 import 'package:rotary_nl_rye/core/domain/StudentsBloc.dart';
 import 'package:rotary_nl_rye/core/domain/entities/exchange_student.dart';
 import 'package:rotary_nl_rye/core/prop.dart';
diff --git a/lib/features/rebounds/presentation/pages/ExchangeStudentsDetails.dart b/lib/features/rebounds/presentation/pages/ExchangeStudentsDetails.dart
index bb163256..fd7659a0 100644
--- a/lib/features/rebounds/presentation/pages/ExchangeStudentsDetails.dart
+++ b/lib/features/rebounds/presentation/pages/ExchangeStudentsDetails.dart
@@ -1,6 +1,8 @@
 // 🐦 Flutter imports:
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+
+// 📦 Package imports:
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
diff --git a/lib/features/rebounds/presentation/pages/ExchangeStudentsList.dart b/lib/features/rebounds/presentation/pages/ExchangeStudentsList.dart
index 23e84c20..10a03ee4 100644
--- a/lib/features/rebounds/presentation/pages/ExchangeStudentsList.dart
+++ b/lib/features/rebounds/presentation/pages/ExchangeStudentsList.dart
@@ -1,6 +1,11 @@
+// 🐦 Flutter imports:
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+
+// 📦 Package imports:
 import 'package:flutter_svg/flutter_svg.dart';
+
+// 🌎 Project imports:
 import 'package:rotary_nl_rye/core/domain/entities/exchange_student.dart';
 import 'package:rotary_nl_rye/core/prop.dart';
 import 'package:rotary_nl_rye/features/rebounds/models/country.dart';
diff --git a/lib/features/settings/presentation/pages/SettingsPage.dart b/lib/features/settings/presentation/pages/SettingsPage.dart
index 9ee6a9eb..e02a6442 100644
--- a/lib/features/settings/presentation/pages/SettingsPage.dart
+++ b/lib/features/settings/presentation/pages/SettingsPage.dart
@@ -1,6 +1,7 @@
-// 🐦 Flutter imports:
+// 🎯 Dart imports:
 import 'dart:io';
 
+// 🐦 Flutter imports:
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
@@ -17,8 +18,8 @@ import 'package:url_launcher/url_launcher_string.dart';
 import 'package:rotary_nl_rye/core/lang/languages.dart';
 import 'package:rotary_nl_rye/core/presentation/widgets/photo_gallery/gallery_view.dart';
 import 'package:rotary_nl_rye/core/prop.dart';
-import 'package:rotary_nl_rye/features/settings/presentation/pages/contributors_page.dart';
 import 'package:rotary_nl_rye/features/settings/presentation/pages/SocialPage.dart';
+import 'package:rotary_nl_rye/features/settings/presentation/pages/contributors_page.dart';
 
 class SettingsPage extends StatefulWidget {
   @override
diff --git a/lib/features/settings/presentation/pages/contributors_page.dart b/lib/features/settings/presentation/pages/contributors_page.dart
index 2441439b..89e6a4bf 100644
--- a/lib/features/settings/presentation/pages/contributors_page.dart
+++ b/lib/features/settings/presentation/pages/contributors_page.dart
@@ -5,8 +5,8 @@ import 'package:flutter/services.dart';
 // 🌎 Project imports:
 import 'package:rotary_nl_rye/core/presentation/pages/contributors_details_page.dart';
 import 'package:rotary_nl_rye/core/prop.dart';
-import 'package:rotary_nl_rye/features/uniform_widgets/back_button.dart';
 import 'package:rotary_nl_rye/features/settings/presentation/pages/models/contributor.dart';
+import 'package:rotary_nl_rye/features/uniform_widgets/back_button.dart';
 import 'package:rotary_nl_rye/features/widgets/list_tiles.dart';
 
 class ContributorsPage extends StatefulWidget {
diff --git a/lib/features/widgets/contact_list_tile.dart b/lib/features/widgets/contact_list_tile.dart
index 57e6fd4b..90481fe6 100644
--- a/lib/features/widgets/contact_list_tile.dart
+++ b/lib/features/widgets/contact_list_tile.dart
@@ -3,8 +3,8 @@ import 'package:flutter/material.dart';
 
 // 🌎 Project imports:
 import 'package:rotary_nl_rye/core/prop.dart';
-import 'package:rotary_nl_rye/features/uniform_widgets/uniform_circle_avatar.dart';
 import 'package:rotary_nl_rye/features/contact/presentation/models/organization.dart';
+import 'package:rotary_nl_rye/features/uniform_widgets/uniform_circle_avatar.dart';
 
 class ContactListTile extends StatelessWidget {
   final Widget contactDetailsPage;
diff --git a/lib/features/widgets/counselor_list_tile.dart b/lib/features/widgets/counselor_list_tile.dart
index e16892e9..be23d32e 100644
--- a/lib/features/widgets/counselor_list_tile.dart
+++ b/lib/features/widgets/counselor_list_tile.dart
@@ -1,5 +1,7 @@
 // 🐦 Flutter imports:
 import 'package:flutter/material.dart';
+
+// 📦 Package imports:
 import 'package:cached_network_image/cached_network_image.dart';
 
 // 🌎 Project imports:
diff --git a/lib/features/widgets/country_list_tile.dart b/lib/features/widgets/country_list_tile.dart
index 8962082f..6135353b 100644
--- a/lib/features/widgets/country_list_tile.dart
+++ b/lib/features/widgets/country_list_tile.dart
@@ -1,5 +1,7 @@
 // 🐦 Flutter imports:
 import 'package:flutter/material.dart';
+
+// 📦 Package imports:
 import 'package:flutter_svg/flutter_svg.dart';
 
 // 🌎 Project imports:
diff --git a/lib/features/widgets/inbound_student_list_tile.dart b/lib/features/widgets/inbound_student_list_tile.dart
index e0797614..a7c873ba 100644
--- a/lib/features/widgets/inbound_student_list_tile.dart
+++ b/lib/features/widgets/inbound_student_list_tile.dart
@@ -1,5 +1,7 @@
 // 🐦 Flutter imports:
 import 'package:flutter/material.dart';
+
+// 📦 Package imports:
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
diff --git a/lib/features/widgets/inbounds_students_list_tile.dart b/lib/features/widgets/inbounds_students_list_tile.dart
index 5897c9c6..74b04814 100644
--- a/lib/features/widgets/inbounds_students_list_tile.dart
+++ b/lib/features/widgets/inbounds_students_list_tile.dart
@@ -1,5 +1,7 @@
 // 🐦 Flutter imports:
 import 'package:flutter/material.dart';
+
+// 📦 Package imports:
 import 'package:cached_network_image/cached_network_image.dart';
 
 // 🌎 Project imports:
diff --git a/lib/features/widgets/outbound_student_list_tile.dart b/lib/features/widgets/outbound_student_list_tile.dart
index 16959504..d8a8f1de 100644
--- a/lib/features/widgets/outbound_student_list_tile.dart
+++ b/lib/features/widgets/outbound_student_list_tile.dart
@@ -1,5 +1,7 @@
 // 🐦 Flutter imports:
 import 'package:flutter/material.dart';
+
+// 📦 Package imports:
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
diff --git a/lib/features/widgets/rebounds_students_list_tile.dart b/lib/features/widgets/rebounds_students_list_tile.dart
index 9a75df9e..ff93507a 100644
--- a/lib/features/widgets/rebounds_students_list_tile.dart
+++ b/lib/features/widgets/rebounds_students_list_tile.dart
@@ -1,10 +1,12 @@
 // 🐦 Flutter imports:
 import 'package:flutter/material.dart';
+
+// 📦 Package imports:
 import 'package:cached_network_image/cached_network_image.dart';
 
 // 🌎 Project imports:
-import 'package:rotary_nl_rye/core/prop.dart';
 import 'package:rotary_nl_rye/core/domain/entities/exchange_student.dart';
+import 'package:rotary_nl_rye/core/prop.dart';
 
 class ReboundsStudentsListTile extends StatelessWidget {
   final Widget reboundsStudentsListPage;
diff --git a/lib/features/widgets/rotex_contact_list_tile.dart b/lib/features/widgets/rotex_contact_list_tile.dart
index 4bd0272b..0b1218b4 100644
--- a/lib/features/widgets/rotex_contact_list_tile.dart
+++ b/lib/features/widgets/rotex_contact_list_tile.dart
@@ -1,4 +1,7 @@
+// 🐦 Flutter imports:
 import 'package:flutter/material.dart';
+
+// 🌎 Project imports:
 import 'package:rotary_nl_rye/core/prop.dart';
 import 'package:rotary_nl_rye/features/contact/presentation/models/rotex.dart';
 import 'package:rotary_nl_rye/features/uniform_widgets/uniform_circle_avatar.dart';
diff --git a/lib/features/widgets/svg_list_tile.dart b/lib/features/widgets/svg_list_tile.dart
index 5a055716..525ebdb1 100644
--- a/lib/features/widgets/svg_list_tile.dart
+++ b/lib/features/widgets/svg_list_tile.dart
@@ -1,5 +1,7 @@
 // 🐦 Flutter imports:
 import 'package:flutter/material.dart';
+
+// 📦 Package imports:
 import 'package:flutter_svg/flutter_svg.dart';
 
 // 🌎 Project imports:
diff --git a/lib/injection_container.dart b/lib/injection_container.dart
index b823c480..f0b84606 100644
--- a/lib/injection_container.dart
+++ b/lib/injection_container.dart
@@ -11,49 +11,10 @@ import 'package:rotary_nl_rye/core/network/network_info.dart';
 final sl = GetIt.instance;
 
 Future<void> init() async {
-  /// Features - Stories
-  // Bloc
-  // sl.registerFactory(() => StoriesBloc(getStories: sl()));
-
-  // Use cases
-  // sl.registerLazySingleton(() => GetStories(sl()));
-
   // temp solluction
   final Cache cache = new Cache();
 
   await cache.clear();
-  // final today = DateTime(now.year, now.month, now.day);
-  // final toDaysAgo = DateTime(now.year, now.month, now.day - 2);
-
-  // Repository
-  // sl.registerLazySingleton<StoriesRepository>(() => StoriesRepositoryImpl(
-  //     storiesRemoteDataSource: sl(),
-  //     storiesLocalDataSource: sl(),
-  //     updateLocalDataSource: sl(),
-  //     networkInfo: sl()));
-
-  // Data Sources
-  // sl.registerLazySingleton<StoriesRemoteDataSource>(
-  //     () => StoriesRemoteDataSourceImpl(firebaseDatabase: sl()));
-  // sl.registerLazySingleton<StoriesLocalDataSource>(
-  //     () => StoriesLocalDataSourceImpl(sharedPreferences: sl()));
-  // sl.registerLazySingleton<UpdateLocalDataSource>(
-  //     () => UpdateLocalDataSourceImpl(sharedPreferences: sl()));
-
-  /// Features - Stories/Countries
-  // Bloc
-  // sl.registerFactory(() => CountriesBloc(getCountries: sl()));
-
-  // Use cases
-  // sl.registerLazySingleton(() => GetCountries(sl()));
-
-  // Repository
-  // sl.registerLazySingleton<CountriesRepository>(() => CountriesRepositoryImpl(
-  //     countriesRemoteDataSource: sl()));
-
-  // Data Sources
-  // sl.registerLazySingleton<CountriesRemoteDataSource>(
-  //         () => CountriesRemoteDataSourceImpl());
 
   /// Core
   sl.registerLazySingleton<NetworkInfo>(() => NetworkInfoImpl(sl()));
@@ -62,7 +23,4 @@ Future<void> init() async {
   final sharedPreferences = await SharedPreferences.getInstance();
   sl.registerLazySingleton(() => sharedPreferences);
   sl.registerLazySingleton(() => InternetConnectionChecker());
-
-  // final FirebaseDatabase firebaseDatabase = FirebaseDatabase();
-  // sl.registerLazySingleton(() => firebaseDatabase);
 }
diff --git a/lib/main.dart b/lib/main.dart
index c0f57cdb..0e791cd7 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,91 +1,44 @@
-// 🎯 Dart imports:
-import 'dart:async';
-import 'dart:io';
-
 // 🐦 Flutter imports:
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
 // 📦 Package imports:
+import 'package:firebase_analytics/firebase_analytics.dart';
 import 'package:firebase_core/firebase_core.dart';
-import 'package:firebase_crashlytics/firebase_crashlytics.dart';
-import 'package:firebase_messaging/firebase_messaging.dart';
-import 'package:flutter_local_notifications/flutter_local_notifications.dart';
-import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
-import 'package:shared_preferences/shared_preferences.dart';
+import 'package:flutter_native_splash/flutter_native_splash.dart';
 
 // 🌎 Project imports:
-import 'core/custom_routes.dart';
-import 'core/data/initData.dart';
 import 'core/lang/languages.dart';
 import 'core/presentation/widgets/page_navigator.dart';
 import 'injection_container.dart' as di;
 
-Future<void> _firebaseMessagingBackgroundHandler(RemoteMessage message) async {
-  await Firebase.initializeApp();
-  print('Handling a background message: ${message.messageId}');
-
-  final prefs = await SharedPreferences.getInstance();
-  prefs.setInt('newsBadge', 1);
-}
-
-late AndroidNotificationChannel channel;
-late FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin;
-
 void main() async {
   WidgetsBinding widgetsBinding = WidgetsFlutterBinding.ensureInitialized();
 
   await Firebase.initializeApp();
-  FlutterError.onError = FirebaseCrashlytics.instance.recordFlutterFatalError;
   FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding);
 
-  if (Platform.isAndroid) {
-    FirebaseMessaging.onBackgroundMessage(_firebaseMessagingBackgroundHandler);
-  }
-
-  if (!kIsWeb) {
-    _initializeNotifications();
-  }
-
-  if (kDebugMode) {
-    await FirebaseCrashlytics.instance.setCrashlyticsCollectionEnabled(false);
-  }
-
   await di.init();
   SystemChrome.setPreferredOrientations(
       [DeviceOrientation.portraitDown, DeviceOrientation.portraitUp]);
 
   runApp(MyApp());
 
-  final _repo = Repo();
-  _repo.initData('', '');
+  FlutterNativeSplash.remove();
 }
 
-Future<void> _initializeNotifications() async {
-  channel = const AndroidNotificationChannel(
-    'high_importance_channel',
-    'High Importance Notifications',
-    description: 'This channel is used for important notifications.',
-    importance: Importance.high,
-  );
-
-  flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
-
-  await flutterLocalNotificationsPlugin
-      .resolvePlatformSpecificImplementation<
-          AndroidFlutterLocalNotificationsPlugin>()
-      ?.createNotificationChannel(channel);
-
-  await FirebaseMessaging.instance.setForegroundNotificationPresentationOptions(
-    alert: true,
-    badge: true,
-    sound: true,
-  );
+class MyApp extends StatefulWidget {
+  @override
+  _MyAppState createState() => _MyAppState();
 }
 
-class MyApp extends StatelessWidget {
+class _MyAppState extends State<MyApp> {
+  // Create an instance of FirebaseAnalytics
+  static FirebaseAnalytics analytics = FirebaseAnalytics.instance;
+  static FirebaseAnalyticsObserver observer =
+      FirebaseAnalyticsObserver(analytics: analytics);
+
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
@@ -124,8 +77,8 @@ class MyApp extends StatelessWidget {
       themeMode: ThemeMode.system,
       title: 'Rotary Youth Exchange',
       debugShowCheckedModeBanner: false,
+      navigatorObservers: <NavigatorObserver>[observer], // Add observer here
       home: PageNavigator(),
-      routes: customRoutes,
     );
   }
 }
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
index 48e20c2a..0af27574 100644
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -6,16 +6,8 @@ import FlutterMacOS
 import Foundation
 
 import audioplayers_darwin
-import cloud_firestore
-import connectivity_plus
 import firebase_analytics
-import firebase_auth
 import firebase_core
-import firebase_crashlytics
-import firebase_messaging
-import firebase_remote_config
-import flutter_app_badger
-import flutter_local_notifications
 import package_info_plus
 import path_provider_foundation
 import share_plus
@@ -27,16 +19,8 @@ import wakelock_plus
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   AudioplayersDarwinPlugin.register(with: registry.registrar(forPlugin: "AudioplayersDarwinPlugin"))
-  FLTFirebaseFirestorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseFirestorePlugin"))
-  ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
   FLTFirebaseAnalyticsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseAnalyticsPlugin"))
-  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"))
-  FlutterAppBadgerPlugin.register(with: registry.registrar(forPlugin: "FlutterAppBadgerPlugin"))
-  FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
diff --git a/pubspec.yaml b/pubspec.yaml
index 844d02b1..9810a12c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -15,51 +15,35 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 8.0.2+95
+version: 9.0.0+98
 
 # authors:
 #   - Ruben Talstra <info@caeli-tech.com>
 #   - Jannik Norden <dev.janniknorden@gmail.com>
 environment:
-  sdk: ">=3.3.0 <4.0.0"
+  sdk: ^3.5.1
 
 dependencies:
-  badges: ^3.1.2
-  dio: ^5.6.0
+  dio: ^5.7.0
   cached_network_image: ^3.4.1
   carousel_slider: ^5.0.0
-  chewie: ^1.8.3
-  cloud_firestore: ^5.2.1
+  chewie: ^1.8.5
   csv: ^6.0.0
   cupertino_icons: ^1.0.8
-  dartz: ^0.10.1
-  equatable: ^2.0.5
-  firebase_analytics: ^11.2.1
-  firebase_auth: ^5.1.4
-  firebase_core: ^3.3.0
-  firebase_crashlytics: ^4.0.4
-  firebase_dynamic_links: ^6.0.4
-  firebase_messaging: ^15.0.4
-  firebase_remote_config: ^5.0.4
+  firebase_analytics: ^11.3.3
+  firebase_core: ^3.6.0
   flutter:
     sdk: flutter
-  flutter_app_badger:
-    git:
-      url: https://github.com/g123k/flutter_app_badger.git
   flutter_cached_pdfview: ^0.4.2
-  flutter_local_notifications: ^17.2.2
   flutter_localizations:
     sdk: flutter
   flutter_staggered_grid_view: ^0.7.0
   flutter_svg: ^2.0.10
-  flutter_swiper_null_safety: ^1.0.2
   font_awesome_flutter: ^10.7.0
-  get_it: ^7.7.0
-  internet_connection_checker: ^2.0.0
-  # maps_launcher: ^2.2.1
-  map_launcher: ^3.4.0
+  get_it: ^8.0.0
+  internet_connection_checker: ^1.0.0
+  map_launcher: ^3.5.0
   geocoding: ^3.0.0
-  mockito: ^5.4.4
   package_info_plus: ^8.0.2
   path_provider: ^2.1.4
   photo_view: ^0.15.0
@@ -72,28 +56,21 @@ dependencies:
   url_launcher: ^6.3.0
   video_player: ^2.9.1
   percent_indicator: ^4.2.3
-  audioplayers: ^6.0.0
+  audioplayers: ^6.1.0
 
   http: ^1.2.2
   flutter_cache_manager: ^3.4.1
   flutter_native_splash: ^2.4.1
   
-dependency_overrides:
-  web: ^1.0.0
 
 dev_dependencies:
-  dependency_validator: ^4.1.0
-  flutter_launcher_icons: ^0.13.1
-  flutter_lints: ^4.0.0
+  dependency_validator: ^4.1.1
+  flutter_launcher_icons: ^0.14.1
+  flutter_lints: ^5.0.0
   import_sorter: ^4.6.0
   flutter_test:
     sdk: flutter
 
-flutter_icons:
-  image_path: "icon/icon.jpg"
-  android: true
-  ios: true
-
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 # The following section is specific to Flutter.
@@ -111,6 +88,7 @@ flutter:
     - assets/image/homepage/
     - assets/icons/flags/
     - assets/icons/custom/
+    - assets/icons/icon.png
     - assets/lang/
     - assets/keys/deepl.json
     - assets/students/list.json
diff --git a/test/widget_test.dart b/test/widget_test.dart
new file mode 100644
index 00000000..329e0662
--- /dev/null
+++ b/test/widget_test.dart
@@ -0,0 +1,34 @@
+// This is a basic Flutter widget test.
+//
+// To perform an interaction with a widget in your test, use the WidgetTester
+// utility in the flutter_test package. For example, you can send tap and scroll
+// gestures. You can also use WidgetTester to find child widgets in the widget
+// tree, read text, and verify that the values of widget properties are correct.
+
+// 🐦 Flutter imports:
+import 'package:flutter/material.dart';
+
+// 📦 Package imports:
+import 'package:flutter_test/flutter_test.dart';
+
+// 🌎 Project imports:
+import 'package:rotary_nl_rye/main.dart';
+
+void main() {
+  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
+    // Build our app and trigger a frame.
+    await tester.pumpWidget(MyApp());
+
+    // Verify that our counter starts at 0.
+    expect(find.text('0'), findsOneWidget);
+    expect(find.text('1'), findsNothing);
+
+    // Tap the '+' icon and trigger a frame.
+    await tester.tap(find.byIcon(Icons.add));
+    await tester.pump();
+
+    // Verify that our counter has incremented.
+    expect(find.text('0'), findsNothing);
+    expect(find.text('1'), findsOneWidget);
+  });
+}
diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
index 04c78a73..50ee8300 100644
--- a/windows/flutter/generated_plugin_registrant.cc
+++ b/windows/flutter/generated_plugin_registrant.cc
@@ -7,9 +7,6 @@
 #include "generated_plugin_registrant.h"
 
 #include <audioplayers_windows/audioplayers_windows_plugin.h>
-#include <cloud_firestore/cloud_firestore_plugin_c_api.h>
-#include <connectivity_plus/connectivity_plus_windows_plugin.h>
-#include <firebase_auth/firebase_auth_plugin_c_api.h>
 #include <firebase_core/firebase_core_plugin_c_api.h>
 #include <share_plus/share_plus_windows_plugin_c_api.h>
 #include <url_launcher_windows/url_launcher_windows.h>
@@ -17,12 +14,6 @@
 void RegisterPlugins(flutter::PluginRegistry* registry) {
   AudioplayersWindowsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("AudioplayersWindowsPlugin"));
-  CloudFirestorePluginCApiRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("CloudFirestorePluginCApi"));
-  ConnectivityPlusWindowsPluginRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin"));
-  FirebaseAuthPluginCApiRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("FirebaseAuthPluginCApi"));
   FirebaseCorePluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("FirebaseCorePluginCApi"));
   SharePlusWindowsPluginCApiRegisterWithRegistrar(
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
index ddf39b14..5add389a 100644
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@@ -4,9 +4,6 @@
 
 list(APPEND FLUTTER_PLUGIN_LIST
   audioplayers_windows
-  cloud_firestore
-  connectivity_plus
-  firebase_auth
   firebase_core
   share_plus
   url_launcher_windows