diff --git a/android/app/build.gradle b/android/app/build.gradle
index 2a68ac2c7..5eb571114 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -49,8 +49,8 @@ android {
     ndkVersion '26.1.10909125'
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
 
     lint {
@@ -156,12 +156,12 @@ android {
 }
 
 tasks.withType(KotlinCompile).configureEach {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
 
 flutter {
@@ -189,11 +189,11 @@ dependencies {
 
     implementation "androidx.appcompat:appcompat:1.7.0"
     implementation 'androidx.core:core-ktx:1.13.1'
-    implementation 'androidx.lifecycle:lifecycle-process:2.8.4'
+    implementation 'androidx.lifecycle:lifecycle-process:2.8.5'
     implementation 'androidx.media:media:1.7.0'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.security:security-crypto:1.1.0-alpha06'
-    implementation 'androidx.work:work-runtime-ktx:2.9.0'
+    implementation 'androidx.work:work-runtime-ktx:2.9.1'
 
     implementation 'com.caverock:androidsvg-aar:1.4'
     implementation 'com.commonsware.cwac:document:0.5.0'
diff --git a/android/app/src/main/res/drawable-v21/ic_notification.xml b/android/app/src/main/res/drawable/ic_notification.xml
similarity index 100%
rename from android/app/src/main/res/drawable-v21/ic_notification.xml
rename to android/app/src/main/res/drawable/ic_notification.xml
diff --git a/android/app/src/main/res/drawable-v21/ic_shortcut_collection.xml b/android/app/src/main/res/drawable/ic_shortcut_collection.xml
similarity index 100%
rename from android/app/src/main/res/drawable-v21/ic_shortcut_collection.xml
rename to android/app/src/main/res/drawable/ic_shortcut_collection.xml
diff --git a/android/app/src/main/res/drawable-v21/ic_shortcut_movie.xml b/android/app/src/main/res/drawable/ic_shortcut_movie.xml
similarity index 100%
rename from android/app/src/main/res/drawable-v21/ic_shortcut_movie.xml
rename to android/app/src/main/res/drawable/ic_shortcut_movie.xml
diff --git a/android/app/src/main/res/drawable-v21/ic_shortcut_safe_mode.xml b/android/app/src/main/res/drawable/ic_shortcut_safe_mode.xml
similarity index 100%
rename from android/app/src/main/res/drawable-v21/ic_shortcut_safe_mode.xml
rename to android/app/src/main/res/drawable/ic_shortcut_safe_mode.xml
diff --git a/android/app/src/main/res/drawable-v21/ic_shortcut_search.xml b/android/app/src/main/res/drawable/ic_shortcut_search.xml
similarity index 100%
rename from android/app/src/main/res/drawable-v21/ic_shortcut_search.xml
rename to android/app/src/main/res/drawable/ic_shortcut_search.xml
diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
index edd8ddab8..807a30b31 100644
--- a/android/app/src/main/res/values-night/styles.xml
+++ b/android/app/src/main/res/values-night/styles.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
     <style name="NormalTheme" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:windowBackground">?android:colorBackground</item>
+        <item name="android:windowBackground">@color/window_background_night</item>
+        <item name="android:windowSplashScreenBackground" tools:targetApi="s">@color/window_background_night</item>
+        <item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">@mipmap/ic_launcher</item>
 
         <!-- API28+, draws next to the notch in fullscreen -->
         <item name="android:windowLayoutInDisplayCutoutMode" tools:targetApi="28">shortEdges</item>
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index a77f5f66a..8c34775a3 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -4,4 +4,6 @@
     <color name="ic_shortcut_background">#FFFFFF</color>
     <color name="ic_shortcut_foreground">#455A64</color>
     <color name="ic_launcher_flavour">#1cc8eb</color>
+    <color name="window_background_day">#FFFFFF</color>
+    <color name="window_background_night">#262626</color>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index ef426481b..eca13a958 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
     <style name="NormalTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="android:windowBackground">?android:colorBackground</item>
+        <item name="android:windowBackground">@color/window_background_day</item>
+        <item name="android:windowSplashScreenBackground" tools:targetApi="s">@color/window_background_day</item>
+        <item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">@mipmap/ic_launcher</item>
 
         <!-- API28+, draws next to the notch in fullscreen -->
         <item name="android:windowLayoutInDisplayCutoutMode" tools:targetApi="28">shortEdges</item>
diff --git a/android/exifinterface/build.gradle b/android/exifinterface/build.gradle
index 88a67339e..d2e62e0d5 100644
--- a/android/exifinterface/build.gradle
+++ b/android/exifinterface/build.gradle
@@ -4,10 +4,10 @@ plugins {
 
 android {
     namespace 'androidx.exifinterface.media'
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
-        minSdk 19
+        minSdk 21
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -20,11 +20,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
 }
 
 dependencies {
-    implementation 'androidx.annotation:annotation:1.8.0'
+    implementation 'androidx.annotation:annotation:1.8.2'
 }
\ No newline at end of file
diff --git a/android/settings.gradle b/android/settings.gradle
index 3480028f5..b62954086 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -10,7 +10,7 @@ pluginManagement {
 
     settings.ext.kotlin_version = '1.9.24'
     settings.ext.ksp_version = "$kotlin_version-1.0.20"
-    settings.ext.agp_version = '8.5.1'
+    settings.ext.agp_version = '8.6.0'
 
     includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
 
diff --git a/plugins/aves_platform_meta/android/build.gradle b/plugins/aves_platform_meta/android/build.gradle
index 0c38b3d1e..3a4eafe4d 100644
--- a/plugins/aves_platform_meta/android/build.gradle
+++ b/plugins/aves_platform_meta/android/build.gradle
@@ -33,8 +33,8 @@ android {
     compileSdk 34
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
 
     lintOptions {
diff --git a/plugins/aves_screen_state/android/build.gradle b/plugins/aves_screen_state/android/build.gradle
index 79767327b..5a8da97e1 100644
--- a/plugins/aves_screen_state/android/build.gradle
+++ b/plugins/aves_screen_state/android/build.gradle
@@ -4,7 +4,7 @@ version '1.0-SNAPSHOT'
 buildscript {
     ext {
         kotlin_version = '1.9.24'
-        agp_version = '8.5.1'
+        agp_version = '8.6.0'
     }
 
     repositories {
@@ -30,11 +30,11 @@ apply plugin: 'kotlin-android'
 
 android {
     namespace 'deckers.thibault.aves.aves_screen_state'
-    compileSdk 34
+    compileSdk 35
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
 
     lintOptions {