diff --git a/app/Android.bp b/app/Android.bp
index ad4a179..5ab6a55 100644
--- a/app/Android.bp
+++ b/app/Android.bp
@@ -35,12 +35,16 @@ android_app {
 
     static_libs: [
         // DO NOT EDIT THIS SECTION MANUALLY
-        "androidx.core_core-ktx",
+        "androidx.activity_activity",
         "androidx.appcompat_appcompat",
         "androidx-constraintlayout_constraintlayout",
-        "androidx.preference_preference",
-        "com.google.android.material_material",
+        "androidx.core_core-ktx",
         "androidx.exifinterface_exifinterface",
+        "androidx.fragment_fragment-ktx",
+        "androidx.lifecycle_lifecycle-runtime",
+        "androidx.lifecycle_lifecycle-runtime-ktx",
+        "androidx.lifecycle_lifecycle-service",
+        "Glimpse_androidx.media3_media3-common-ktx",
         "Glimpse_androidx.media3_media3-exoplayer",
         "Glimpse_androidx.media3_media3-exoplayer-dash",
         "Glimpse_androidx.media3_media3-exoplayer-hls",
@@ -49,12 +53,22 @@ android_app {
         "Glimpse_androidx.media3_media3-ui",
         "androidx.navigation_navigation-fragment-ktx",
         "androidx.navigation_navigation-ui-ktx",
+        "androidx.preference_preference",
         "androidx.recyclerview_recyclerview",
         "androidx.recyclerview_recyclerview-selection",
-        "Glimpse_io.coil-kt_coil",
-        "Glimpse_io.coil-kt_coil-gif",
-        "Glimpse_io.coil-kt_coil-video",
+        "androidx.viewpager2_viewpager2",
+        "com.google.android.material_material",
+        "Glimpse_com.squareup.okhttp3_okhttp",
+        "Glimpse_io.coil-kt.coil3_coil",
+        "Glimpse_io.coil-kt.coil3_coil-android",
+        "Glimpse_io.coil-kt.coil3_coil-core-android",
+        "Glimpse_io.coil-kt.coil3_coil-gif",
+        "Glimpse_io.coil-kt.coil3_coil-network-core-android",
+        "Glimpse_io.coil-kt.coil3_coil-network-okhttp",
+        "Glimpse_io.coil-kt.coil3_coil-video",
+        "Glimpse_io.github.panpf.zoomimage_zoomimage-core-android",
         "Glimpse_io.github.panpf.zoomimage_zoomimage-view-coil",
+        "kotlin-stdlib",
     ],
 
     optimize: {
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 80edee9..8f8fbd5 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -8,8 +8,8 @@ import org.lineageos.generatebp.GenerateBpPluginExtension
 import org.lineageos.generatebp.models.Module
 
 plugins {
-    id("com.android.application")
-    id("kotlin-android")
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
 }
 
 apply {
@@ -18,7 +18,7 @@ apply {
 
 buildscript {
     repositories {
-        maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/v1.9/.m2")
+        maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/v1.15/.m2")
     }
 
     dependencies {
@@ -27,8 +27,8 @@ buildscript {
 }
 
 android {
-    compileSdk = 35
     namespace = "org.lineageos.glimpse"
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "org.lineageos.glimpse"
@@ -39,34 +39,32 @@ android {
     }
 
     buildTypes {
-        getByName("release") {
+        release {
             // Enables code shrinking, obfuscation, and optimization.
             isMinifyEnabled = true
 
             // Enables resource shrinking.
             isShrinkResources = true
 
-            // Includes the default ProGuard rules files.
-            setProguardFiles(
-                listOf(
-                    getDefaultProguardFile("proguard-android-optimize.txt"),
-                    "proguard-rules.pro"
-                )
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
             )
         }
-        getByName("debug") {
+
+        debug {
             // Append .dev to package name so we won't conflict with AOSP build.
             applicationIdSuffix = ".dev"
         }
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
 
     lint {
@@ -75,41 +73,33 @@ android {
 }
 
 dependencies {
-    // Align versions of all Kotlin components
-    implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.10"))
-
-    implementation("androidx.core:core-ktx:1.12.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    implementation("androidx.preference:preference:1.2.1")
-    implementation("com.google.android.material:material:1.9.0")
-
-    // EXIF
-    implementation("androidx.exifinterface:exifinterface:1.3.7")
-
-    // Media3
-    implementation("androidx.media3:media3-exoplayer:1.2.1")
-    implementation("androidx.media3:media3-exoplayer-dash:1.2.1")
-    implementation("androidx.media3:media3-exoplayer-hls:1.2.1")
-    implementation("androidx.media3:media3-exoplayer-rtsp:1.2.1")
-    implementation("androidx.media3:media3-exoplayer-smoothstreaming:1.2.1")
-    implementation("androidx.media3:media3-ui:1.2.1")
-
-    // Navigation
-    implementation("androidx.navigation:navigation-fragment-ktx:2.7.6")
-    implementation("androidx.navigation:navigation-ui-ktx:2.7.6")
-
-    // Recyclerview
-    implementation("androidx.recyclerview:recyclerview:1.3.2")
-    implementation("androidx.recyclerview:recyclerview-selection:1.1.0")
-
-    // Coil
-    implementation("io.coil-kt:coil:2.5.0")
-    implementation("io.coil-kt:coil-gif:2.5.0")
-    implementation("io.coil-kt:coil-video:2.5.0")
-
-    // ZoomImage
-    implementation("io.github.panpf.zoomimage:zoomimage-view-coil:1.0.2")
+    implementation(libs.androidx.activity)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.constraintlayout)
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.exifinterface)
+    implementation(libs.androidx.fragment.ktx)
+    implementation(libs.androidx.lifecycle.service)
+    implementation(libs.androidx.media3.common.ktx)
+    implementation(libs.androidx.media3.exoplayer)
+    implementation(libs.androidx.media3.exoplayer.dash)
+    implementation(libs.androidx.media3.exoplayer.hls)
+    implementation(libs.androidx.media3.exoplayer.rtsp)
+    implementation(libs.androidx.media3.exoplayer.smoothstreaming)
+    implementation(libs.androidx.media3.ui)
+    implementation(libs.androidx.navigation.fragment.ktx)
+    implementation(libs.androidx.navigation.ui.ktx)
+    implementation(libs.androidx.preference)
+    implementation(libs.androidx.recyclerview)
+    implementation(libs.androidx.recyclerview.selection)
+    implementation(libs.androidx.viewpager2)
+    implementation(libs.coil)
+    implementation(libs.coil.gif)
+    implementation(libs.coil.network.okhttp)
+    implementation(libs.coil.video)
+    implementation(libs.material)
+    implementation(libs.okhttp)
+    implementation(libs.zoomimage.view.coil)
 }
 
 configure<GenerateBpPluginExtension> {
diff --git a/app/libs/Android.bp b/app/libs/Android.bp
index a61228e..54e12ee 100644
--- a/app/libs/Android.bp
+++ b/app/libs/Android.bp
@@ -1,5 +1,5 @@
 //
-// SPDX-FileCopyrightText: 2023-2024 The LineageOS Project
+// SPDX-FileCopyrightText: The LineageOS Project
 // SPDX-License-Identifier: Apache-2.0
 //
 
@@ -7,7 +7,7 @@
 
 android_library_import {
     name: "Glimpse_androidx.media3_media3-common-nodeps",
-    aars: ["androidx/media3/media3-common/1.2.1/media3-common-1.2.1.aar"],
+    aars: ["androidx/media3/media3-common/1.5.0/media3-common-1.5.0.aar"],
     sdk_version: "35",
     min_sdk_version: "14",
     apex_available: [
@@ -29,7 +29,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/media3/media3-common/1.2.1/AndroidManifest.xml",
+    manifest: "androidx/media3/media3-common/1.5.0/AndroidManifest.xml",
     static_libs: [
         "Glimpse_androidx.media3_media3-common-nodeps",
         "androidx.annotation_annotation",
@@ -39,9 +39,47 @@ android_library {
     java_version: "1.7",
 }
 
+android_library_import {
+    name: "Glimpse_androidx.media3_media3-common-ktx-nodeps",
+    aars: ["androidx/media3/media3-common-ktx/1.5.0/media3-common-ktx-1.5.0.aar"],
+    sdk_version: "35",
+    min_sdk_version: "14",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    static_libs: [
+        "Glimpse_androidx.media3_media3-common",
+        "Glimpse_androidx.media3_media3-exoplayer",
+        "androidx.core_core",
+        "kotlinx-coroutines-android",
+        "kotlinx-coroutines-core",
+    ],
+}
+
+android_library {
+    name: "Glimpse_androidx.media3_media3-common-ktx",
+    sdk_version: "35",
+    min_sdk_version: "14",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    manifest: "androidx/media3/media3-common-ktx/1.5.0/AndroidManifest.xml",
+    static_libs: [
+        "Glimpse_androidx.media3_media3-common-ktx-nodeps",
+        "Glimpse_androidx.media3_media3-common",
+        "Glimpse_androidx.media3_media3-exoplayer",
+        "androidx.core_core",
+        "kotlinx-coroutines-android",
+        "kotlinx-coroutines-core",
+    ],
+    java_version: "1.7",
+}
+
 android_library_import {
     name: "Glimpse_androidx.media3_media3-container-nodeps",
-    aars: ["androidx/media3/media3-container/1.2.1/media3-container-1.2.1.aar"],
+    aars: ["androidx/media3/media3-container/1.5.0/media3-container-1.5.0.aar"],
     sdk_version: "35",
     min_sdk_version: "14",
     apex_available: [
@@ -62,7 +100,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/media3/media3-container/1.2.1/AndroidManifest.xml",
+    manifest: "androidx/media3/media3-container/1.5.0/AndroidManifest.xml",
     static_libs: [
         "Glimpse_androidx.media3_media3-container-nodeps",
         "Glimpse_androidx.media3_media3-common",
@@ -73,7 +111,7 @@ android_library {
 
 android_library_import {
     name: "Glimpse_androidx.media3_media3-database-nodeps",
-    aars: ["androidx/media3/media3-database/1.2.1/media3-database-1.2.1.aar"],
+    aars: ["androidx/media3/media3-database/1.5.0/media3-database-1.5.0.aar"],
     sdk_version: "35",
     min_sdk_version: "14",
     apex_available: [
@@ -94,7 +132,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/media3/media3-database/1.2.1/AndroidManifest.xml",
+    manifest: "androidx/media3/media3-database/1.5.0/AndroidManifest.xml",
     static_libs: [
         "Glimpse_androidx.media3_media3-database-nodeps",
         "Glimpse_androidx.media3_media3-common",
@@ -105,7 +143,7 @@ android_library {
 
 android_library_import {
     name: "Glimpse_androidx.media3_media3-datasource-nodeps",
-    aars: ["androidx/media3/media3-datasource/1.2.1/media3-datasource-1.2.1.aar"],
+    aars: ["androidx/media3/media3-datasource/1.5.0/media3-datasource-1.5.0.aar"],
     sdk_version: "35",
     min_sdk_version: "14",
     apex_available: [
@@ -128,7 +166,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/media3/media3-datasource/1.2.1/AndroidManifest.xml",
+    manifest: "androidx/media3/media3-datasource/1.5.0/AndroidManifest.xml",
     static_libs: [
         "Glimpse_androidx.media3_media3-datasource-nodeps",
         "Glimpse_androidx.media3_media3-common",
@@ -141,7 +179,7 @@ android_library {
 
 android_library_import {
     name: "Glimpse_androidx.media3_media3-decoder-nodeps",
-    aars: ["androidx/media3/media3-decoder/1.2.1/media3-decoder-1.2.1.aar"],
+    aars: ["androidx/media3/media3-decoder/1.5.0/media3-decoder-1.5.0.aar"],
     sdk_version: "35",
     min_sdk_version: "14",
     apex_available: [
@@ -162,7 +200,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/media3/media3-decoder/1.2.1/AndroidManifest.xml",
+    manifest: "androidx/media3/media3-decoder/1.5.0/AndroidManifest.xml",
     static_libs: [
         "Glimpse_androidx.media3_media3-decoder-nodeps",
         "Glimpse_androidx.media3_media3-common",
@@ -173,7 +211,7 @@ android_library {
 
 android_library_import {
     name: "Glimpse_androidx.media3_media3-exoplayer-nodeps",
-    aars: ["androidx/media3/media3-exoplayer/1.2.1/media3-exoplayer-1.2.1.aar"],
+    aars: ["androidx/media3/media3-exoplayer/1.5.0/media3-exoplayer-1.5.0.aar"],
     sdk_version: "35",
     min_sdk_version: "14",
     apex_available: [
@@ -202,7 +240,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/media3/media3-exoplayer/1.2.1/AndroidManifest.xml",
+    manifest: "androidx/media3/media3-exoplayer/1.5.0/AndroidManifest.xml",
     static_libs: [
         "Glimpse_androidx.media3_media3-exoplayer-nodeps",
         "Glimpse_androidx.media3_media3-common",
@@ -221,7 +259,7 @@ android_library {
 
 android_library_import {
     name: "Glimpse_androidx.media3_media3-exoplayer-dash-nodeps",
-    aars: ["androidx/media3/media3-exoplayer-dash/1.2.1/media3-exoplayer-dash-1.2.1.aar"],
+    aars: ["androidx/media3/media3-exoplayer-dash/1.5.0/media3-exoplayer-dash-1.5.0.aar"],
     sdk_version: "35",
     min_sdk_version: "14",
     apex_available: [
@@ -242,7 +280,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/media3/media3-exoplayer-dash/1.2.1/AndroidManifest.xml",
+    manifest: "androidx/media3/media3-exoplayer-dash/1.5.0/AndroidManifest.xml",
     static_libs: [
         "Glimpse_androidx.media3_media3-exoplayer-dash-nodeps",
         "Glimpse_androidx.media3_media3-exoplayer",
@@ -253,7 +291,7 @@ android_library {
 
 android_library_import {
     name: "Glimpse_androidx.media3_media3-exoplayer-hls-nodeps",
-    aars: ["androidx/media3/media3-exoplayer-hls/1.2.1/media3-exoplayer-hls-1.2.1.aar"],
+    aars: ["androidx/media3/media3-exoplayer-hls/1.5.0/media3-exoplayer-hls-1.5.0.aar"],
     sdk_version: "35",
     min_sdk_version: "14",
     apex_available: [
@@ -274,7 +312,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/media3/media3-exoplayer-hls/1.2.1/AndroidManifest.xml",
+    manifest: "androidx/media3/media3-exoplayer-hls/1.5.0/AndroidManifest.xml",
     static_libs: [
         "Glimpse_androidx.media3_media3-exoplayer-hls-nodeps",
         "Glimpse_androidx.media3_media3-exoplayer",
@@ -285,7 +323,7 @@ android_library {
 
 android_library_import {
     name: "Glimpse_androidx.media3_media3-exoplayer-rtsp-nodeps",
-    aars: ["androidx/media3/media3-exoplayer-rtsp/1.2.1/media3-exoplayer-rtsp-1.2.1.aar"],
+    aars: ["androidx/media3/media3-exoplayer-rtsp/1.5.0/media3-exoplayer-rtsp-1.5.0.aar"],
     sdk_version: "35",
     min_sdk_version: "14",
     apex_available: [
@@ -306,7 +344,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/media3/media3-exoplayer-rtsp/1.2.1/AndroidManifest.xml",
+    manifest: "androidx/media3/media3-exoplayer-rtsp/1.5.0/AndroidManifest.xml",
     static_libs: [
         "Glimpse_androidx.media3_media3-exoplayer-rtsp-nodeps",
         "Glimpse_androidx.media3_media3-exoplayer",
@@ -317,7 +355,7 @@ android_library {
 
 android_library_import {
     name: "Glimpse_androidx.media3_media3-exoplayer-smoothstreaming-nodeps",
-    aars: ["androidx/media3/media3-exoplayer-smoothstreaming/1.2.1/media3-exoplayer-smoothstreaming-1.2.1.aar"],
+    aars: ["androidx/media3/media3-exoplayer-smoothstreaming/1.5.0/media3-exoplayer-smoothstreaming-1.5.0.aar"],
     sdk_version: "35",
     min_sdk_version: "14",
     apex_available: [
@@ -338,7 +376,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/media3/media3-exoplayer-smoothstreaming/1.2.1/AndroidManifest.xml",
+    manifest: "androidx/media3/media3-exoplayer-smoothstreaming/1.5.0/AndroidManifest.xml",
     static_libs: [
         "Glimpse_androidx.media3_media3-exoplayer-smoothstreaming-nodeps",
         "Glimpse_androidx.media3_media3-exoplayer",
@@ -349,7 +387,7 @@ android_library {
 
 android_library_import {
     name: "Glimpse_androidx.media3_media3-extractor-nodeps",
-    aars: ["androidx/media3/media3-extractor/1.2.1/media3-extractor-1.2.1.aar"],
+    aars: ["androidx/media3/media3-extractor/1.5.0/media3-extractor-1.5.0.aar"],
     sdk_version: "35",
     min_sdk_version: "14",
     apex_available: [
@@ -372,7 +410,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/media3/media3-extractor/1.2.1/AndroidManifest.xml",
+    manifest: "androidx/media3/media3-extractor/1.5.0/AndroidManifest.xml",
     static_libs: [
         "Glimpse_androidx.media3_media3-extractor-nodeps",
         "Glimpse_androidx.media3_media3-common",
@@ -385,7 +423,7 @@ android_library {
 
 android_library_import {
     name: "Glimpse_androidx.media3_media3-ui-nodeps",
-    aars: ["androidx/media3/media3-ui/1.2.1/media3-ui-1.2.1.aar"],
+    aars: ["androidx/media3/media3-ui/1.5.0/media3-ui-1.5.0.aar"],
     sdk_version: "35",
     min_sdk_version: "14",
     apex_available: [
@@ -408,7 +446,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/media3/media3-ui/1.2.1/AndroidManifest.xml",
+    manifest: "androidx/media3/media3-ui/1.5.0/AndroidManifest.xml",
     static_libs: [
         "Glimpse_androidx.media3_media3-ui-nodeps",
         "Glimpse_androidx.media3_media3-common",
@@ -487,7 +525,7 @@ java_library_static {
 
 java_import {
     name: "Glimpse_com.squareup.okio_okio-jvm-nodeps",
-    jars: ["com/squareup/okio/okio-jvm/3.6.0/okio-jvm-3.6.0.jar"],
+    jars: ["com/squareup/okio/okio-jvm/3.9.1/okio-jvm-3.9.1.jar"],
     sdk_version: "35",
     min_sdk_version: "14",
     apex_available: [
@@ -506,14 +544,14 @@ java_library_static {
     ],
     static_libs: [
         "Glimpse_com.squareup.okio_okio-jvm-nodeps",
-        "kotlin-stdlib-jdk8",
+        "kotlin-stdlib",
     ],
     java_version: "1.7",
 }
 
 android_library_import {
     name: "Glimpse_io.coil-kt_coil-nodeps",
-    aars: ["io/coil-kt/coil/2.5.0/coil-2.5.0.aar"],
+    aars: ["io/coil-kt/coil/2.4.0/coil-2.4.0.aar"],
     sdk_version: "35",
     min_sdk_version: "14",
     apex_available: [
@@ -534,7 +572,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "io/coil-kt/coil/2.5.0/AndroidManifest.xml",
+    manifest: "io/coil-kt/coil/2.4.0/AndroidManifest.xml",
     static_libs: [
         "Glimpse_io.coil-kt_coil-nodeps",
         "Glimpse_io.coil-kt_coil-base",
@@ -545,7 +583,7 @@ android_library {
 
 android_library_import {
     name: "Glimpse_io.coil-kt_coil-base-nodeps",
-    aars: ["io/coil-kt/coil-base/2.5.0/coil-base-2.5.0.aar"],
+    aars: ["io/coil-kt/coil-base/2.4.0/coil-base-2.4.0.aar"],
     sdk_version: "35",
     min_sdk_version: "14",
     apex_available: [
@@ -575,7 +613,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "io/coil-kt/coil-base/2.5.0/AndroidManifest.xml",
+    manifest: "io/coil-kt/coil-base/2.4.0/AndroidManifest.xml",
     static_libs: [
         "Glimpse_io.coil-kt_coil-base-nodeps",
         "Glimpse_com.squareup.okhttp3_okhttp",
@@ -593,9 +631,23 @@ android_library {
     java_version: "1.7",
 }
 
+java_library_static {
+    name: "Glimpse_io.coil-kt.coil3_coil",
+    sdk_version: "35",
+    min_sdk_version: "14",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    static_libs: [
+        "Glimpse_io.coil-kt.coil3_coil-android",
+    ],
+    java_version: "1.7",
+}
+
 android_library_import {
-    name: "Glimpse_io.coil-kt_coil-gif-nodeps",
-    aars: ["io/coil-kt/coil-gif/2.5.0/coil-gif-2.5.0.aar"],
+    name: "Glimpse_io.coil-kt.coil3_coil-android-nodeps",
+    aars: ["io/coil-kt/coil3/coil-android/3.0.4/coil-release.aar"],
     sdk_version: "35",
     min_sdk_version: "14",
     apex_available: [
@@ -603,35 +655,143 @@ android_library_import {
         "//apex_available:anyapex",
     ],
     static_libs: [
-        "Glimpse_io.coil-kt_coil-base",
+        "Glimpse_io.coil-kt.coil3_coil-core",
+        "kotlin-stdlib",
+    ],
+}
+
+android_library {
+    name: "Glimpse_io.coil-kt.coil3_coil-android",
+    sdk_version: "35",
+    min_sdk_version: "14",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    manifest: "io/coil-kt/coil3/coil-android/3.0.4/AndroidManifest.xml",
+    static_libs: [
+        "Glimpse_io.coil-kt.coil3_coil-android-nodeps",
+        "Glimpse_io.coil-kt.coil3_coil-core",
+        "kotlin-stdlib",
+    ],
+    java_version: "1.7",
+}
+
+java_library_static {
+    name: "Glimpse_io.coil-kt.coil3_coil-core",
+    sdk_version: "35",
+    min_sdk_version: "14",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    static_libs: [
+        "Glimpse_io.coil-kt.coil3_coil-core-android",
+    ],
+    java_version: "1.7",
+}
+
+android_library_import {
+    name: "Glimpse_io.coil-kt.coil3_coil-core-android-nodeps",
+    aars: ["io/coil-kt/coil3/coil-core-android/3.0.4/coil-core-release.aar"],
+    sdk_version: "35",
+    min_sdk_version: "14",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    static_libs: [
+        "Glimpse_com.squareup.okio_okio",
+        "androidx.annotation_annotation",
+        "androidx.appcompat_appcompat-resources",
+        "androidx.core_core-ktx",
+        "androidx.exifinterface_exifinterface",
+        "androidx.lifecycle_lifecycle-runtime",
+        "androidx.profileinstaller_profileinstaller",
+        "kotlin-stdlib",
+        "kotlinx-coroutines-android",
+        "kotlinx-coroutines-core",
+    ],
+}
+
+android_library {
+    name: "Glimpse_io.coil-kt.coil3_coil-core-android",
+    sdk_version: "35",
+    min_sdk_version: "14",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    manifest: "io/coil-kt/coil3/coil-core-android/3.0.4/AndroidManifest.xml",
+    static_libs: [
+        "Glimpse_io.coil-kt.coil3_coil-core-android-nodeps",
+        "Glimpse_com.squareup.okio_okio",
+        "androidx.annotation_annotation",
+        "androidx.appcompat_appcompat-resources",
+        "androidx.core_core-ktx",
+        "androidx.exifinterface_exifinterface",
+        "androidx.lifecycle_lifecycle-runtime",
+        "androidx.profileinstaller_profileinstaller",
+        "kotlin-stdlib",
+        "kotlinx-coroutines-android",
+        "kotlinx-coroutines-core",
+    ],
+    java_version: "1.7",
+}
+
+android_library_import {
+    name: "Glimpse_io.coil-kt.coil3_coil-gif-nodeps",
+    aars: ["io/coil-kt/coil3/coil-gif/3.0.4/coil-gif-3.0.4.aar"],
+    sdk_version: "35",
+    min_sdk_version: "14",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    static_libs: [
+        "Glimpse_io.coil-kt.coil3_coil-core",
         "androidx.core_core-ktx",
         "androidx.vectordrawable_vectordrawable-animated",
-        "kotlin-stdlib-jdk8",
+        "kotlin-stdlib",
     ],
 }
 
 android_library {
-    name: "Glimpse_io.coil-kt_coil-gif",
+    name: "Glimpse_io.coil-kt.coil3_coil-gif",
     sdk_version: "35",
     min_sdk_version: "14",
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "io/coil-kt/coil-gif/2.5.0/AndroidManifest.xml",
+    manifest: "io/coil-kt/coil3/coil-gif/3.0.4/AndroidManifest.xml",
     static_libs: [
-        "Glimpse_io.coil-kt_coil-gif-nodeps",
-        "Glimpse_io.coil-kt_coil-base",
+        "Glimpse_io.coil-kt.coil3_coil-gif-nodeps",
+        "Glimpse_io.coil-kt.coil3_coil-core",
         "androidx.core_core-ktx",
         "androidx.vectordrawable_vectordrawable-animated",
-        "kotlin-stdlib-jdk8",
+        "kotlin-stdlib",
+    ],
+    java_version: "1.7",
+}
+
+java_library_static {
+    name: "Glimpse_io.coil-kt.coil3_coil-network-core",
+    sdk_version: "35",
+    min_sdk_version: "14",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    static_libs: [
+        "Glimpse_io.coil-kt.coil3_coil-network-core-android",
     ],
     java_version: "1.7",
 }
 
 android_library_import {
-    name: "Glimpse_io.coil-kt_coil-video-nodeps",
-    aars: ["io/coil-kt/coil-video/2.5.0/coil-video-2.5.0.aar"],
+    name: "Glimpse_io.coil-kt.coil3_coil-network-core-android-nodeps",
+    aars: ["io/coil-kt/coil3/coil-network-core-android/3.0.4/coil-network-core-release.aar"],
     sdk_version: "35",
     min_sdk_version: "14",
     apex_available: [
@@ -639,26 +799,103 @@ android_library_import {
         "//apex_available:anyapex",
     ],
     static_libs: [
-        "Glimpse_io.coil-kt_coil-base",
+        "Glimpse_io.coil-kt.coil3_coil-core",
         "androidx.core_core-ktx",
-        "kotlin-stdlib-jdk8",
+        "kotlin-stdlib",
     ],
 }
 
 android_library {
-    name: "Glimpse_io.coil-kt_coil-video",
+    name: "Glimpse_io.coil-kt.coil3_coil-network-core-android",
     sdk_version: "35",
     min_sdk_version: "14",
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "io/coil-kt/coil-video/2.5.0/AndroidManifest.xml",
+    manifest: "io/coil-kt/coil3/coil-network-core-android/3.0.4/AndroidManifest.xml",
     static_libs: [
-        "Glimpse_io.coil-kt_coil-video-nodeps",
-        "Glimpse_io.coil-kt_coil-base",
+        "Glimpse_io.coil-kt.coil3_coil-network-core-android-nodeps",
+        "Glimpse_io.coil-kt.coil3_coil-core",
         "androidx.core_core-ktx",
-        "kotlin-stdlib-jdk8",
+        "kotlin-stdlib",
+    ],
+    java_version: "1.7",
+}
+
+java_library_static {
+    name: "Glimpse_io.coil-kt.coil3_coil-network-okhttp",
+    sdk_version: "35",
+    min_sdk_version: "14",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    static_libs: [
+        "Glimpse_io.coil-kt.coil3_coil-network-okhttp-jvm",
+    ],
+    java_version: "1.7",
+}
+
+java_import {
+    name: "Glimpse_io.coil-kt.coil3_coil-network-okhttp-jvm-nodeps",
+    jars: ["io/coil-kt/coil3/coil-network-okhttp-jvm/3.0.4/coil-network-okhttp-jvm-3.0.4.jar"],
+    sdk_version: "35",
+    min_sdk_version: "14",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+}
+
+java_library_static {
+    name: "Glimpse_io.coil-kt.coil3_coil-network-okhttp-jvm",
+    sdk_version: "35",
+    min_sdk_version: "14",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    static_libs: [
+        "Glimpse_io.coil-kt.coil3_coil-network-okhttp-jvm-nodeps",
+        "Glimpse_com.squareup.okhttp3_okhttp",
+        "Glimpse_io.coil-kt.coil3_coil-core",
+        "Glimpse_io.coil-kt.coil3_coil-network-core",
+        "kotlin-stdlib",
+    ],
+    java_version: "1.7",
+}
+
+android_library_import {
+    name: "Glimpse_io.coil-kt.coil3_coil-video-nodeps",
+    aars: ["io/coil-kt/coil3/coil-video/3.0.4/coil-video-3.0.4.aar"],
+    sdk_version: "35",
+    min_sdk_version: "14",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    static_libs: [
+        "Glimpse_io.coil-kt.coil3_coil-core",
+        "androidx.core_core-ktx",
+        "kotlin-stdlib",
+    ],
+}
+
+android_library {
+    name: "Glimpse_io.coil-kt.coil3_coil-video",
+    sdk_version: "35",
+    min_sdk_version: "14",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    manifest: "io/coil-kt/coil3/coil-video/3.0.4/AndroidManifest.xml",
+    static_libs: [
+        "Glimpse_io.coil-kt.coil3_coil-video-nodeps",
+        "Glimpse_io.coil-kt.coil3_coil-core",
+        "androidx.core_core-ktx",
+        "kotlin-stdlib",
     ],
     java_version: "1.7",
 }
diff --git a/app/libs/androidx/media3/media3-common-ktx/1.5.0/AndroidManifest.xml b/app/libs/androidx/media3/media3-common-ktx/1.5.0/AndroidManifest.xml
new file mode 100644
index 0000000..96c184b
--- /dev/null
+++ b/app/libs/androidx/media3/media3-common-ktx/1.5.0/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          https://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.media3.common.ktx" >
+
+    <uses-sdk android:minSdkVersion="21" />
+
+</manifest>
\ No newline at end of file
diff --git a/app/libs/androidx/media3/media3-common/1.2.1/AndroidManifest.xml.license b/app/libs/androidx/media3/media3-common-ktx/1.5.0/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/media3/media3-common/1.2.1/AndroidManifest.xml.license
rename to app/libs/androidx/media3/media3-common-ktx/1.5.0/AndroidManifest.xml.license
diff --git a/app/libs/androidx/media3/media3-common-ktx/1.5.0/media3-common-ktx-1.5.0.aar b/app/libs/androidx/media3/media3-common-ktx/1.5.0/media3-common-ktx-1.5.0.aar
new file mode 100644
index 0000000..e32d3e5
Binary files /dev/null and b/app/libs/androidx/media3/media3-common-ktx/1.5.0/media3-common-ktx-1.5.0.aar differ
diff --git a/app/libs/androidx/media3/media3-common/1.2.1/media3-common-1.2.1.aar.license b/app/libs/androidx/media3/media3-common-ktx/1.5.0/media3-common-ktx-1.5.0.aar.license
similarity index 100%
rename from app/libs/androidx/media3/media3-common/1.2.1/media3-common-1.2.1.aar.license
rename to app/libs/androidx/media3/media3-common-ktx/1.5.0/media3-common-ktx-1.5.0.aar.license
diff --git a/app/libs/androidx/media3/media3-common/1.2.1/media3-common-1.2.1.aar b/app/libs/androidx/media3/media3-common/1.2.1/media3-common-1.2.1.aar
deleted file mode 100644
index ddc63d5..0000000
Binary files a/app/libs/androidx/media3/media3-common/1.2.1/media3-common-1.2.1.aar and /dev/null differ
diff --git a/app/libs/androidx/media3/media3-common/1.2.1/AndroidManifest.xml b/app/libs/androidx/media3/media3-common/1.5.0/AndroidManifest.xml
similarity index 95%
rename from app/libs/androidx/media3/media3-common/1.2.1/AndroidManifest.xml
rename to app/libs/androidx/media3/media3-common/1.5.0/AndroidManifest.xml
index b069d1f..ca09cc8 100644
--- a/app/libs/androidx/media3/media3-common/1.2.1/AndroidManifest.xml
+++ b/app/libs/androidx/media3/media3-common/1.5.0/AndroidManifest.xml
@@ -17,7 +17,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="androidx.media3.common" >
 
-    <uses-sdk android:minSdkVersion="16" />
+    <uses-sdk android:minSdkVersion="21" />
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
diff --git a/app/libs/androidx/media3/media3-container/1.2.1/AndroidManifest.xml.license b/app/libs/androidx/media3/media3-common/1.5.0/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/media3/media3-container/1.2.1/AndroidManifest.xml.license
rename to app/libs/androidx/media3/media3-common/1.5.0/AndroidManifest.xml.license
diff --git a/app/libs/androidx/media3/media3-common/1.5.0/media3-common-1.5.0.aar b/app/libs/androidx/media3/media3-common/1.5.0/media3-common-1.5.0.aar
new file mode 100644
index 0000000..a0aba5c
Binary files /dev/null and b/app/libs/androidx/media3/media3-common/1.5.0/media3-common-1.5.0.aar differ
diff --git a/app/libs/androidx/media3/media3-container/1.2.1/media3-container-1.2.1.aar.license b/app/libs/androidx/media3/media3-common/1.5.0/media3-common-1.5.0.aar.license
similarity index 100%
rename from app/libs/androidx/media3/media3-container/1.2.1/media3-container-1.2.1.aar.license
rename to app/libs/androidx/media3/media3-common/1.5.0/media3-common-1.5.0.aar.license
diff --git a/app/libs/androidx/media3/media3-container/1.2.1/media3-container-1.2.1.aar b/app/libs/androidx/media3/media3-container/1.2.1/media3-container-1.2.1.aar
deleted file mode 100644
index b8bfbea..0000000
Binary files a/app/libs/androidx/media3/media3-container/1.2.1/media3-container-1.2.1.aar and /dev/null differ
diff --git a/app/libs/androidx/media3/media3-container/1.2.1/AndroidManifest.xml b/app/libs/androidx/media3/media3-container/1.5.0/AndroidManifest.xml
similarity index 94%
rename from app/libs/androidx/media3/media3-container/1.2.1/AndroidManifest.xml
rename to app/libs/androidx/media3/media3-container/1.5.0/AndroidManifest.xml
index 5ced7f9..d252191 100644
--- a/app/libs/androidx/media3/media3-container/1.2.1/AndroidManifest.xml
+++ b/app/libs/androidx/media3/media3-container/1.5.0/AndroidManifest.xml
@@ -17,6 +17,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="androidx.media3.container" >
 
-    <uses-sdk android:minSdkVersion="16" />
+    <uses-sdk android:minSdkVersion="21" />
 
 </manifest>
\ No newline at end of file
diff --git a/app/libs/androidx/media3/media3-database/1.2.1/AndroidManifest.xml.license b/app/libs/androidx/media3/media3-container/1.5.0/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/media3/media3-database/1.2.1/AndroidManifest.xml.license
rename to app/libs/androidx/media3/media3-container/1.5.0/AndroidManifest.xml.license
diff --git a/app/libs/androidx/media3/media3-container/1.5.0/media3-container-1.5.0.aar b/app/libs/androidx/media3/media3-container/1.5.0/media3-container-1.5.0.aar
new file mode 100644
index 0000000..d863a5a
Binary files /dev/null and b/app/libs/androidx/media3/media3-container/1.5.0/media3-container-1.5.0.aar differ
diff --git a/app/libs/androidx/media3/media3-database/1.2.1/media3-database-1.2.1.aar.license b/app/libs/androidx/media3/media3-container/1.5.0/media3-container-1.5.0.aar.license
similarity index 100%
rename from app/libs/androidx/media3/media3-database/1.2.1/media3-database-1.2.1.aar.license
rename to app/libs/androidx/media3/media3-container/1.5.0/media3-container-1.5.0.aar.license
diff --git a/app/libs/androidx/media3/media3-database/1.2.1/media3-database-1.2.1.aar b/app/libs/androidx/media3/media3-database/1.2.1/media3-database-1.2.1.aar
deleted file mode 100644
index 8f2d630..0000000
Binary files a/app/libs/androidx/media3/media3-database/1.2.1/media3-database-1.2.1.aar and /dev/null differ
diff --git a/app/libs/androidx/media3/media3-database/1.2.1/AndroidManifest.xml b/app/libs/androidx/media3/media3-database/1.5.0/AndroidManifest.xml
similarity index 94%
rename from app/libs/androidx/media3/media3-database/1.2.1/AndroidManifest.xml
rename to app/libs/androidx/media3/media3-database/1.5.0/AndroidManifest.xml
index 707d49e..5cf86e2 100644
--- a/app/libs/androidx/media3/media3-database/1.2.1/AndroidManifest.xml
+++ b/app/libs/androidx/media3/media3-database/1.5.0/AndroidManifest.xml
@@ -17,6 +17,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="androidx.media3.database" >
 
-    <uses-sdk android:minSdkVersion="16" />
+    <uses-sdk android:minSdkVersion="21" />
 
 </manifest>
\ No newline at end of file
diff --git a/app/libs/androidx/media3/media3-datasource/1.2.1/AndroidManifest.xml.license b/app/libs/androidx/media3/media3-database/1.5.0/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/media3/media3-datasource/1.2.1/AndroidManifest.xml.license
rename to app/libs/androidx/media3/media3-database/1.5.0/AndroidManifest.xml.license
diff --git a/app/libs/androidx/media3/media3-database/1.5.0/media3-database-1.5.0.aar b/app/libs/androidx/media3/media3-database/1.5.0/media3-database-1.5.0.aar
new file mode 100644
index 0000000..5ef276b
Binary files /dev/null and b/app/libs/androidx/media3/media3-database/1.5.0/media3-database-1.5.0.aar differ
diff --git a/app/libs/androidx/media3/media3-datasource/1.2.1/media3-datasource-1.2.1.aar.license b/app/libs/androidx/media3/media3-database/1.5.0/media3-database-1.5.0.aar.license
similarity index 100%
rename from app/libs/androidx/media3/media3-datasource/1.2.1/media3-datasource-1.2.1.aar.license
rename to app/libs/androidx/media3/media3-database/1.5.0/media3-database-1.5.0.aar.license
diff --git a/app/libs/androidx/media3/media3-datasource/1.2.1/media3-datasource-1.2.1.aar b/app/libs/androidx/media3/media3-datasource/1.2.1/media3-datasource-1.2.1.aar
deleted file mode 100644
index 783f225..0000000
Binary files a/app/libs/androidx/media3/media3-datasource/1.2.1/media3-datasource-1.2.1.aar and /dev/null differ
diff --git a/app/libs/androidx/media3/media3-datasource/1.2.1/AndroidManifest.xml b/app/libs/androidx/media3/media3-datasource/1.5.0/AndroidManifest.xml
similarity index 94%
rename from app/libs/androidx/media3/media3-datasource/1.2.1/AndroidManifest.xml
rename to app/libs/androidx/media3/media3-datasource/1.5.0/AndroidManifest.xml
index a6853e9..c1b8feb 100644
--- a/app/libs/androidx/media3/media3-datasource/1.2.1/AndroidManifest.xml
+++ b/app/libs/androidx/media3/media3-datasource/1.5.0/AndroidManifest.xml
@@ -17,6 +17,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="androidx.media3.datasource" >
 
-    <uses-sdk android:minSdkVersion="16" />
+    <uses-sdk android:minSdkVersion="21" />
 
 </manifest>
\ No newline at end of file
diff --git a/app/libs/androidx/media3/media3-decoder/1.2.1/AndroidManifest.xml.license b/app/libs/androidx/media3/media3-datasource/1.5.0/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/media3/media3-decoder/1.2.1/AndroidManifest.xml.license
rename to app/libs/androidx/media3/media3-datasource/1.5.0/AndroidManifest.xml.license
diff --git a/app/libs/androidx/media3/media3-datasource/1.5.0/media3-datasource-1.5.0.aar b/app/libs/androidx/media3/media3-datasource/1.5.0/media3-datasource-1.5.0.aar
new file mode 100644
index 0000000..e31e430
Binary files /dev/null and b/app/libs/androidx/media3/media3-datasource/1.5.0/media3-datasource-1.5.0.aar differ
diff --git a/app/libs/androidx/media3/media3-decoder/1.2.1/media3-decoder-1.2.1.aar.license b/app/libs/androidx/media3/media3-datasource/1.5.0/media3-datasource-1.5.0.aar.license
similarity index 100%
rename from app/libs/androidx/media3/media3-decoder/1.2.1/media3-decoder-1.2.1.aar.license
rename to app/libs/androidx/media3/media3-datasource/1.5.0/media3-datasource-1.5.0.aar.license
diff --git a/app/libs/androidx/media3/media3-decoder/1.2.1/media3-decoder-1.2.1.aar b/app/libs/androidx/media3/media3-decoder/1.2.1/media3-decoder-1.2.1.aar
deleted file mode 100644
index 788f3da..0000000
Binary files a/app/libs/androidx/media3/media3-decoder/1.2.1/media3-decoder-1.2.1.aar and /dev/null differ
diff --git a/app/libs/androidx/media3/media3-decoder/1.2.1/AndroidManifest.xml b/app/libs/androidx/media3/media3-decoder/1.5.0/AndroidManifest.xml
similarity index 94%
rename from app/libs/androidx/media3/media3-decoder/1.2.1/AndroidManifest.xml
rename to app/libs/androidx/media3/media3-decoder/1.5.0/AndroidManifest.xml
index 8e2a411..95440ae 100644
--- a/app/libs/androidx/media3/media3-decoder/1.2.1/AndroidManifest.xml
+++ b/app/libs/androidx/media3/media3-decoder/1.5.0/AndroidManifest.xml
@@ -17,6 +17,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="androidx.media3.decoder" >
 
-    <uses-sdk android:minSdkVersion="16" />
+    <uses-sdk android:minSdkVersion="21" />
 
 </manifest>
\ No newline at end of file
diff --git a/app/libs/androidx/media3/media3-exoplayer-dash/1.2.1/AndroidManifest.xml.license b/app/libs/androidx/media3/media3-decoder/1.5.0/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/media3/media3-exoplayer-dash/1.2.1/AndroidManifest.xml.license
rename to app/libs/androidx/media3/media3-decoder/1.5.0/AndroidManifest.xml.license
diff --git a/app/libs/androidx/media3/media3-decoder/1.5.0/media3-decoder-1.5.0.aar b/app/libs/androidx/media3/media3-decoder/1.5.0/media3-decoder-1.5.0.aar
new file mode 100644
index 0000000..6e883cc
Binary files /dev/null and b/app/libs/androidx/media3/media3-decoder/1.5.0/media3-decoder-1.5.0.aar differ
diff --git a/app/libs/androidx/media3/media3-exoplayer-dash/1.2.1/media3-exoplayer-dash-1.2.1.aar.license b/app/libs/androidx/media3/media3-decoder/1.5.0/media3-decoder-1.5.0.aar.license
similarity index 100%
rename from app/libs/androidx/media3/media3-exoplayer-dash/1.2.1/media3-exoplayer-dash-1.2.1.aar.license
rename to app/libs/androidx/media3/media3-decoder/1.5.0/media3-decoder-1.5.0.aar.license
diff --git a/app/libs/androidx/media3/media3-exoplayer-dash/1.2.1/media3-exoplayer-dash-1.2.1.aar b/app/libs/androidx/media3/media3-exoplayer-dash/1.2.1/media3-exoplayer-dash-1.2.1.aar
deleted file mode 100644
index 0b34fcb..0000000
Binary files a/app/libs/androidx/media3/media3-exoplayer-dash/1.2.1/media3-exoplayer-dash-1.2.1.aar and /dev/null differ
diff --git a/app/libs/androidx/media3/media3-exoplayer-dash/1.2.1/AndroidManifest.xml b/app/libs/androidx/media3/media3-exoplayer-dash/1.5.0/AndroidManifest.xml
similarity index 94%
rename from app/libs/androidx/media3/media3-exoplayer-dash/1.2.1/AndroidManifest.xml
rename to app/libs/androidx/media3/media3-exoplayer-dash/1.5.0/AndroidManifest.xml
index 4a9a8e1..936e0ce 100644
--- a/app/libs/androidx/media3/media3-exoplayer-dash/1.2.1/AndroidManifest.xml
+++ b/app/libs/androidx/media3/media3-exoplayer-dash/1.5.0/AndroidManifest.xml
@@ -17,6 +17,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="androidx.media3.exoplayer.dash" >
 
-    <uses-sdk android:minSdkVersion="16" />
+    <uses-sdk android:minSdkVersion="21" />
 
 </manifest>
\ No newline at end of file
diff --git a/app/libs/androidx/media3/media3-exoplayer-hls/1.2.1/AndroidManifest.xml.license b/app/libs/androidx/media3/media3-exoplayer-dash/1.5.0/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/media3/media3-exoplayer-hls/1.2.1/AndroidManifest.xml.license
rename to app/libs/androidx/media3/media3-exoplayer-dash/1.5.0/AndroidManifest.xml.license
diff --git a/app/libs/androidx/media3/media3-exoplayer-dash/1.5.0/media3-exoplayer-dash-1.5.0.aar b/app/libs/androidx/media3/media3-exoplayer-dash/1.5.0/media3-exoplayer-dash-1.5.0.aar
new file mode 100644
index 0000000..b803d5d
Binary files /dev/null and b/app/libs/androidx/media3/media3-exoplayer-dash/1.5.0/media3-exoplayer-dash-1.5.0.aar differ
diff --git a/app/libs/androidx/media3/media3-exoplayer-hls/1.2.1/media3-exoplayer-hls-1.2.1.aar.license b/app/libs/androidx/media3/media3-exoplayer-dash/1.5.0/media3-exoplayer-dash-1.5.0.aar.license
similarity index 100%
rename from app/libs/androidx/media3/media3-exoplayer-hls/1.2.1/media3-exoplayer-hls-1.2.1.aar.license
rename to app/libs/androidx/media3/media3-exoplayer-dash/1.5.0/media3-exoplayer-dash-1.5.0.aar.license
diff --git a/app/libs/androidx/media3/media3-exoplayer-hls/1.2.1/media3-exoplayer-hls-1.2.1.aar b/app/libs/androidx/media3/media3-exoplayer-hls/1.2.1/media3-exoplayer-hls-1.2.1.aar
deleted file mode 100644
index 8873751..0000000
Binary files a/app/libs/androidx/media3/media3-exoplayer-hls/1.2.1/media3-exoplayer-hls-1.2.1.aar and /dev/null differ
diff --git a/app/libs/androidx/media3/media3-exoplayer-hls/1.2.1/AndroidManifest.xml b/app/libs/androidx/media3/media3-exoplayer-hls/1.5.0/AndroidManifest.xml
similarity index 94%
rename from app/libs/androidx/media3/media3-exoplayer-hls/1.2.1/AndroidManifest.xml
rename to app/libs/androidx/media3/media3-exoplayer-hls/1.5.0/AndroidManifest.xml
index c781ec1..7006933 100644
--- a/app/libs/androidx/media3/media3-exoplayer-hls/1.2.1/AndroidManifest.xml
+++ b/app/libs/androidx/media3/media3-exoplayer-hls/1.5.0/AndroidManifest.xml
@@ -17,6 +17,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="androidx.media3.exoplayer.hls" >
 
-    <uses-sdk android:minSdkVersion="16" />
+    <uses-sdk android:minSdkVersion="21" />
 
 </manifest>
\ No newline at end of file
diff --git a/app/libs/androidx/media3/media3-exoplayer-rtsp/1.2.1/AndroidManifest.xml.license b/app/libs/androidx/media3/media3-exoplayer-hls/1.5.0/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/media3/media3-exoplayer-rtsp/1.2.1/AndroidManifest.xml.license
rename to app/libs/androidx/media3/media3-exoplayer-hls/1.5.0/AndroidManifest.xml.license
diff --git a/app/libs/androidx/media3/media3-exoplayer-hls/1.5.0/media3-exoplayer-hls-1.5.0.aar b/app/libs/androidx/media3/media3-exoplayer-hls/1.5.0/media3-exoplayer-hls-1.5.0.aar
new file mode 100644
index 0000000..b3017ae
Binary files /dev/null and b/app/libs/androidx/media3/media3-exoplayer-hls/1.5.0/media3-exoplayer-hls-1.5.0.aar differ
diff --git a/app/libs/androidx/media3/media3-exoplayer-rtsp/1.2.1/media3-exoplayer-rtsp-1.2.1.aar.license b/app/libs/androidx/media3/media3-exoplayer-hls/1.5.0/media3-exoplayer-hls-1.5.0.aar.license
similarity index 100%
rename from app/libs/androidx/media3/media3-exoplayer-rtsp/1.2.1/media3-exoplayer-rtsp-1.2.1.aar.license
rename to app/libs/androidx/media3/media3-exoplayer-hls/1.5.0/media3-exoplayer-hls-1.5.0.aar.license
diff --git a/app/libs/androidx/media3/media3-exoplayer-rtsp/1.2.1/media3-exoplayer-rtsp-1.2.1.aar b/app/libs/androidx/media3/media3-exoplayer-rtsp/1.2.1/media3-exoplayer-rtsp-1.2.1.aar
deleted file mode 100644
index d1dd0bb..0000000
Binary files a/app/libs/androidx/media3/media3-exoplayer-rtsp/1.2.1/media3-exoplayer-rtsp-1.2.1.aar and /dev/null differ
diff --git a/app/libs/androidx/media3/media3-exoplayer-rtsp/1.2.1/AndroidManifest.xml b/app/libs/androidx/media3/media3-exoplayer-rtsp/1.5.0/AndroidManifest.xml
similarity index 94%
rename from app/libs/androidx/media3/media3-exoplayer-rtsp/1.2.1/AndroidManifest.xml
rename to app/libs/androidx/media3/media3-exoplayer-rtsp/1.5.0/AndroidManifest.xml
index 495eacf..4c115fc 100644
--- a/app/libs/androidx/media3/media3-exoplayer-rtsp/1.2.1/AndroidManifest.xml
+++ b/app/libs/androidx/media3/media3-exoplayer-rtsp/1.5.0/AndroidManifest.xml
@@ -17,6 +17,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="androidx.media3.exoplayer.rtsp" >
 
-    <uses-sdk android:minSdkVersion="16" />
+    <uses-sdk android:minSdkVersion="21" />
 
 </manifest>
\ No newline at end of file
diff --git a/app/libs/androidx/media3/media3-exoplayer-smoothstreaming/1.2.1/AndroidManifest.xml.license b/app/libs/androidx/media3/media3-exoplayer-rtsp/1.5.0/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/media3/media3-exoplayer-smoothstreaming/1.2.1/AndroidManifest.xml.license
rename to app/libs/androidx/media3/media3-exoplayer-rtsp/1.5.0/AndroidManifest.xml.license
diff --git a/app/libs/androidx/media3/media3-exoplayer-rtsp/1.5.0/media3-exoplayer-rtsp-1.5.0.aar b/app/libs/androidx/media3/media3-exoplayer-rtsp/1.5.0/media3-exoplayer-rtsp-1.5.0.aar
new file mode 100644
index 0000000..b0a9f51
Binary files /dev/null and b/app/libs/androidx/media3/media3-exoplayer-rtsp/1.5.0/media3-exoplayer-rtsp-1.5.0.aar differ
diff --git a/app/libs/androidx/media3/media3-exoplayer-smoothstreaming/1.2.1/media3-exoplayer-smoothstreaming-1.2.1.aar.license b/app/libs/androidx/media3/media3-exoplayer-rtsp/1.5.0/media3-exoplayer-rtsp-1.5.0.aar.license
similarity index 100%
rename from app/libs/androidx/media3/media3-exoplayer-smoothstreaming/1.2.1/media3-exoplayer-smoothstreaming-1.2.1.aar.license
rename to app/libs/androidx/media3/media3-exoplayer-rtsp/1.5.0/media3-exoplayer-rtsp-1.5.0.aar.license
diff --git a/app/libs/androidx/media3/media3-exoplayer-smoothstreaming/1.2.1/media3-exoplayer-smoothstreaming-1.2.1.aar b/app/libs/androidx/media3/media3-exoplayer-smoothstreaming/1.2.1/media3-exoplayer-smoothstreaming-1.2.1.aar
deleted file mode 100644
index 37aa245..0000000
Binary files a/app/libs/androidx/media3/media3-exoplayer-smoothstreaming/1.2.1/media3-exoplayer-smoothstreaming-1.2.1.aar and /dev/null differ
diff --git a/app/libs/androidx/media3/media3-exoplayer-smoothstreaming/1.2.1/AndroidManifest.xml b/app/libs/androidx/media3/media3-exoplayer-smoothstreaming/1.5.0/AndroidManifest.xml
similarity index 94%
rename from app/libs/androidx/media3/media3-exoplayer-smoothstreaming/1.2.1/AndroidManifest.xml
rename to app/libs/androidx/media3/media3-exoplayer-smoothstreaming/1.5.0/AndroidManifest.xml
index 9076fc3..bad2872 100644
--- a/app/libs/androidx/media3/media3-exoplayer-smoothstreaming/1.2.1/AndroidManifest.xml
+++ b/app/libs/androidx/media3/media3-exoplayer-smoothstreaming/1.5.0/AndroidManifest.xml
@@ -17,6 +17,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="androidx.media3.exoplayer.smoothstreaming" >
 
-    <uses-sdk android:minSdkVersion="16" />
+    <uses-sdk android:minSdkVersion="21" />
 
 </manifest>
\ No newline at end of file
diff --git a/app/libs/androidx/media3/media3-exoplayer/1.2.1/AndroidManifest.xml.license b/app/libs/androidx/media3/media3-exoplayer-smoothstreaming/1.5.0/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/media3/media3-exoplayer/1.2.1/AndroidManifest.xml.license
rename to app/libs/androidx/media3/media3-exoplayer-smoothstreaming/1.5.0/AndroidManifest.xml.license
diff --git a/app/libs/androidx/media3/media3-exoplayer-smoothstreaming/1.5.0/media3-exoplayer-smoothstreaming-1.5.0.aar b/app/libs/androidx/media3/media3-exoplayer-smoothstreaming/1.5.0/media3-exoplayer-smoothstreaming-1.5.0.aar
new file mode 100644
index 0000000..e020e1e
Binary files /dev/null and b/app/libs/androidx/media3/media3-exoplayer-smoothstreaming/1.5.0/media3-exoplayer-smoothstreaming-1.5.0.aar differ
diff --git a/app/libs/androidx/media3/media3-exoplayer/1.2.1/media3-exoplayer-1.2.1.aar.license b/app/libs/androidx/media3/media3-exoplayer-smoothstreaming/1.5.0/media3-exoplayer-smoothstreaming-1.5.0.aar.license
similarity index 100%
rename from app/libs/androidx/media3/media3-exoplayer/1.2.1/media3-exoplayer-1.2.1.aar.license
rename to app/libs/androidx/media3/media3-exoplayer-smoothstreaming/1.5.0/media3-exoplayer-smoothstreaming-1.5.0.aar.license
diff --git a/app/libs/androidx/media3/media3-exoplayer/1.2.1/media3-exoplayer-1.2.1.aar b/app/libs/androidx/media3/media3-exoplayer/1.2.1/media3-exoplayer-1.2.1.aar
deleted file mode 100644
index 580b15d..0000000
Binary files a/app/libs/androidx/media3/media3-exoplayer/1.2.1/media3-exoplayer-1.2.1.aar and /dev/null differ
diff --git a/app/libs/androidx/media3/media3-exoplayer/1.2.1/AndroidManifest.xml b/app/libs/androidx/media3/media3-exoplayer/1.5.0/AndroidManifest.xml
similarity index 95%
rename from app/libs/androidx/media3/media3-exoplayer/1.2.1/AndroidManifest.xml
rename to app/libs/androidx/media3/media3-exoplayer/1.5.0/AndroidManifest.xml
index c2d7b46..4d9f3da 100644
--- a/app/libs/androidx/media3/media3-exoplayer/1.2.1/AndroidManifest.xml
+++ b/app/libs/androidx/media3/media3-exoplayer/1.5.0/AndroidManifest.xml
@@ -17,7 +17,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="androidx.media3.exoplayer" >
 
-    <uses-sdk android:minSdkVersion="16" />
+    <uses-sdk android:minSdkVersion="21" />
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
diff --git a/app/libs/androidx/media3/media3-extractor/1.2.1/AndroidManifest.xml.license b/app/libs/androidx/media3/media3-exoplayer/1.5.0/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/media3/media3-extractor/1.2.1/AndroidManifest.xml.license
rename to app/libs/androidx/media3/media3-exoplayer/1.5.0/AndroidManifest.xml.license
diff --git a/app/libs/androidx/media3/media3-exoplayer/1.5.0/media3-exoplayer-1.5.0.aar b/app/libs/androidx/media3/media3-exoplayer/1.5.0/media3-exoplayer-1.5.0.aar
new file mode 100644
index 0000000..9dc3a66
Binary files /dev/null and b/app/libs/androidx/media3/media3-exoplayer/1.5.0/media3-exoplayer-1.5.0.aar differ
diff --git a/app/libs/androidx/media3/media3-extractor/1.2.1/media3-extractor-1.2.1.aar.license b/app/libs/androidx/media3/media3-exoplayer/1.5.0/media3-exoplayer-1.5.0.aar.license
similarity index 100%
rename from app/libs/androidx/media3/media3-extractor/1.2.1/media3-extractor-1.2.1.aar.license
rename to app/libs/androidx/media3/media3-exoplayer/1.5.0/media3-exoplayer-1.5.0.aar.license
diff --git a/app/libs/androidx/media3/media3-extractor/1.2.1/media3-extractor-1.2.1.aar b/app/libs/androidx/media3/media3-extractor/1.2.1/media3-extractor-1.2.1.aar
deleted file mode 100644
index ed969b6..0000000
Binary files a/app/libs/androidx/media3/media3-extractor/1.2.1/media3-extractor-1.2.1.aar and /dev/null differ
diff --git a/app/libs/androidx/media3/media3-extractor/1.2.1/AndroidManifest.xml b/app/libs/androidx/media3/media3-extractor/1.5.0/AndroidManifest.xml
similarity index 94%
rename from app/libs/androidx/media3/media3-extractor/1.2.1/AndroidManifest.xml
rename to app/libs/androidx/media3/media3-extractor/1.5.0/AndroidManifest.xml
index 725a266..eb3143f 100644
--- a/app/libs/androidx/media3/media3-extractor/1.2.1/AndroidManifest.xml
+++ b/app/libs/androidx/media3/media3-extractor/1.5.0/AndroidManifest.xml
@@ -17,6 +17,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="androidx.media3.extractor" >
 
-    <uses-sdk android:minSdkVersion="16" />
+    <uses-sdk android:minSdkVersion="21" />
 
 </manifest>
\ No newline at end of file
diff --git a/app/libs/androidx/media3/media3-ui/1.2.1/AndroidManifest.xml.license b/app/libs/androidx/media3/media3-extractor/1.5.0/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/media3/media3-ui/1.2.1/AndroidManifest.xml.license
rename to app/libs/androidx/media3/media3-extractor/1.5.0/AndroidManifest.xml.license
diff --git a/app/libs/androidx/media3/media3-extractor/1.5.0/media3-extractor-1.5.0.aar b/app/libs/androidx/media3/media3-extractor/1.5.0/media3-extractor-1.5.0.aar
new file mode 100644
index 0000000..2e3548f
Binary files /dev/null and b/app/libs/androidx/media3/media3-extractor/1.5.0/media3-extractor-1.5.0.aar differ
diff --git a/app/libs/androidx/media3/media3-ui/1.2.1/media3-ui-1.2.1.aar.license b/app/libs/androidx/media3/media3-extractor/1.5.0/media3-extractor-1.5.0.aar.license
similarity index 100%
rename from app/libs/androidx/media3/media3-ui/1.2.1/media3-ui-1.2.1.aar.license
rename to app/libs/androidx/media3/media3-extractor/1.5.0/media3-extractor-1.5.0.aar.license
diff --git a/app/libs/androidx/media3/media3-ui/1.2.1/media3-ui-1.2.1.aar b/app/libs/androidx/media3/media3-ui/1.2.1/media3-ui-1.2.1.aar
deleted file mode 100644
index 6d82a65..0000000
Binary files a/app/libs/androidx/media3/media3-ui/1.2.1/media3-ui-1.2.1.aar and /dev/null differ
diff --git a/app/libs/androidx/media3/media3-ui/1.2.1/AndroidManifest.xml b/app/libs/androidx/media3/media3-ui/1.5.0/AndroidManifest.xml
similarity index 94%
rename from app/libs/androidx/media3/media3-ui/1.2.1/AndroidManifest.xml
rename to app/libs/androidx/media3/media3-ui/1.5.0/AndroidManifest.xml
index e246498..03a22a1 100644
--- a/app/libs/androidx/media3/media3-ui/1.2.1/AndroidManifest.xml
+++ b/app/libs/androidx/media3/media3-ui/1.5.0/AndroidManifest.xml
@@ -17,6 +17,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="androidx.media3.ui" >
 
-    <uses-sdk android:minSdkVersion="16" />
+    <uses-sdk android:minSdkVersion="21" />
 
 </manifest>
\ No newline at end of file
diff --git a/app/libs/androidx/media3/media3-ui/1.5.0/AndroidManifest.xml.license b/app/libs/androidx/media3/media3-ui/1.5.0/AndroidManifest.xml.license
new file mode 100644
index 0000000..ffce7d1
--- /dev/null
+++ b/app/libs/androidx/media3/media3-ui/1.5.0/AndroidManifest.xml.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2024 The Android Open Source Project
+
+SPDX-License-Identifier: Apache-2.0
diff --git a/app/libs/androidx/media3/media3-ui/1.5.0/media3-ui-1.5.0.aar b/app/libs/androidx/media3/media3-ui/1.5.0/media3-ui-1.5.0.aar
new file mode 100644
index 0000000..2067265
Binary files /dev/null and b/app/libs/androidx/media3/media3-ui/1.5.0/media3-ui-1.5.0.aar differ
diff --git a/app/libs/androidx/media3/media3-ui/1.5.0/media3-ui-1.5.0.aar.license b/app/libs/androidx/media3/media3-ui/1.5.0/media3-ui-1.5.0.aar.license
new file mode 100644
index 0000000..ffce7d1
--- /dev/null
+++ b/app/libs/androidx/media3/media3-ui/1.5.0/media3-ui-1.5.0.aar.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2024 The Android Open Source Project
+
+SPDX-License-Identifier: Apache-2.0
diff --git a/app/libs/com/squareup/okio/okio-jvm/3.6.0/okio-jvm-3.6.0.jar b/app/libs/com/squareup/okio/okio-jvm/3.6.0/okio-jvm-3.6.0.jar
deleted file mode 100644
index ec8ad90..0000000
Binary files a/app/libs/com/squareup/okio/okio-jvm/3.6.0/okio-jvm-3.6.0.jar and /dev/null differ
diff --git a/app/libs/com/squareup/okio/okio-jvm/3.9.1/okio-jvm-3.9.1.jar b/app/libs/com/squareup/okio/okio-jvm/3.9.1/okio-jvm-3.9.1.jar
new file mode 100644
index 0000000..211e015
Binary files /dev/null and b/app/libs/com/squareup/okio/okio-jvm/3.9.1/okio-jvm-3.9.1.jar differ
diff --git a/app/libs/com/squareup/okio/okio-jvm/3.6.0/okio-jvm-3.6.0.jar.license b/app/libs/com/squareup/okio/okio-jvm/3.9.1/okio-jvm-3.9.1.jar.license
similarity index 100%
rename from app/libs/com/squareup/okio/okio-jvm/3.6.0/okio-jvm-3.6.0.jar.license
rename to app/libs/com/squareup/okio/okio-jvm/3.9.1/okio-jvm-3.9.1.jar.license
diff --git a/app/libs/io/coil-kt/coil-base/2.5.0/AndroidManifest.xml b/app/libs/io/coil-kt/coil-base/2.4.0/AndroidManifest.xml
similarity index 100%
rename from app/libs/io/coil-kt/coil-base/2.5.0/AndroidManifest.xml
rename to app/libs/io/coil-kt/coil-base/2.4.0/AndroidManifest.xml
diff --git a/app/libs/io/coil-kt/coil-base/2.5.0/AndroidManifest.xml.license b/app/libs/io/coil-kt/coil-base/2.4.0/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/io/coil-kt/coil-base/2.5.0/AndroidManifest.xml.license
rename to app/libs/io/coil-kt/coil-base/2.4.0/AndroidManifest.xml.license
diff --git a/app/libs/io/coil-kt/coil-base/2.4.0/coil-base-2.4.0.aar b/app/libs/io/coil-kt/coil-base/2.4.0/coil-base-2.4.0.aar
new file mode 100644
index 0000000..0990529
Binary files /dev/null and b/app/libs/io/coil-kt/coil-base/2.4.0/coil-base-2.4.0.aar differ
diff --git a/app/libs/io/coil-kt/coil-base/2.5.0/coil-base-2.5.0.aar.license b/app/libs/io/coil-kt/coil-base/2.4.0/coil-base-2.4.0.aar.license
similarity index 100%
rename from app/libs/io/coil-kt/coil-base/2.5.0/coil-base-2.5.0.aar.license
rename to app/libs/io/coil-kt/coil-base/2.4.0/coil-base-2.4.0.aar.license
diff --git a/app/libs/io/coil-kt/coil-base/2.5.0/coil-base-2.5.0.aar b/app/libs/io/coil-kt/coil-base/2.5.0/coil-base-2.5.0.aar
deleted file mode 100644
index e95b6fc..0000000
Binary files a/app/libs/io/coil-kt/coil-base/2.5.0/coil-base-2.5.0.aar and /dev/null differ
diff --git a/app/libs/io/coil-kt/coil-gif/2.5.0/coil-gif-2.5.0.aar b/app/libs/io/coil-kt/coil-gif/2.5.0/coil-gif-2.5.0.aar
deleted file mode 100644
index bd0440a..0000000
Binary files a/app/libs/io/coil-kt/coil-gif/2.5.0/coil-gif-2.5.0.aar and /dev/null differ
diff --git a/app/libs/io/coil-kt/coil-video/2.5.0/coil-video-2.5.0.aar b/app/libs/io/coil-kt/coil-video/2.5.0/coil-video-2.5.0.aar
deleted file mode 100644
index 49108a4..0000000
Binary files a/app/libs/io/coil-kt/coil-video/2.5.0/coil-video-2.5.0.aar and /dev/null differ
diff --git a/app/libs/io/coil-kt/coil/2.5.0/AndroidManifest.xml b/app/libs/io/coil-kt/coil/2.4.0/AndroidManifest.xml
similarity index 100%
rename from app/libs/io/coil-kt/coil/2.5.0/AndroidManifest.xml
rename to app/libs/io/coil-kt/coil/2.4.0/AndroidManifest.xml
diff --git a/app/libs/io/coil-kt/coil-gif/2.5.0/AndroidManifest.xml.license b/app/libs/io/coil-kt/coil/2.4.0/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/io/coil-kt/coil-gif/2.5.0/AndroidManifest.xml.license
rename to app/libs/io/coil-kt/coil/2.4.0/AndroidManifest.xml.license
diff --git a/app/libs/io/coil-kt/coil/2.4.0/coil-2.4.0.aar b/app/libs/io/coil-kt/coil/2.4.0/coil-2.4.0.aar
new file mode 100644
index 0000000..4cd208e
Binary files /dev/null and b/app/libs/io/coil-kt/coil/2.4.0/coil-2.4.0.aar differ
diff --git a/app/libs/io/coil-kt/coil-gif/2.5.0/coil-gif-2.5.0.aar.license b/app/libs/io/coil-kt/coil/2.4.0/coil-2.4.0.aar.license
similarity index 100%
rename from app/libs/io/coil-kt/coil-gif/2.5.0/coil-gif-2.5.0.aar.license
rename to app/libs/io/coil-kt/coil/2.4.0/coil-2.4.0.aar.license
diff --git a/app/libs/io/coil-kt/coil/2.5.0/coil-2.5.0.aar b/app/libs/io/coil-kt/coil/2.5.0/coil-2.5.0.aar
deleted file mode 100644
index d13988b..0000000
Binary files a/app/libs/io/coil-kt/coil/2.5.0/coil-2.5.0.aar and /dev/null differ
diff --git a/app/libs/io/coil-kt/coil3/coil-android/3.0.4/AndroidManifest.xml b/app/libs/io/coil-kt/coil3/coil-android/3.0.4/AndroidManifest.xml
new file mode 100644
index 0000000..2ef0d41
--- /dev/null
+++ b/app/libs/io/coil-kt/coil3/coil-android/3.0.4/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="coil3.singleton" >
+
+    <uses-sdk android:minSdkVersion="21" />
+
+</manifest>
\ No newline at end of file
diff --git a/app/libs/io/coil-kt/coil-video/2.5.0/AndroidManifest.xml.license b/app/libs/io/coil-kt/coil3/coil-android/3.0.4/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/io/coil-kt/coil-video/2.5.0/AndroidManifest.xml.license
rename to app/libs/io/coil-kt/coil3/coil-android/3.0.4/AndroidManifest.xml.license
diff --git a/app/libs/io/coil-kt/coil3/coil-android/3.0.4/coil-release.aar b/app/libs/io/coil-kt/coil3/coil-android/3.0.4/coil-release.aar
new file mode 100644
index 0000000..8f7c367
Binary files /dev/null and b/app/libs/io/coil-kt/coil3/coil-android/3.0.4/coil-release.aar differ
diff --git a/app/libs/io/coil-kt/coil-video/2.5.0/coil-video-2.5.0.aar.license b/app/libs/io/coil-kt/coil3/coil-android/3.0.4/coil-release.aar.license
similarity index 100%
rename from app/libs/io/coil-kt/coil-video/2.5.0/coil-video-2.5.0.aar.license
rename to app/libs/io/coil-kt/coil3/coil-android/3.0.4/coil-release.aar.license
diff --git a/app/libs/io/coil-kt/coil-video/2.5.0/AndroidManifest.xml b/app/libs/io/coil-kt/coil3/coil-core-android/3.0.4/AndroidManifest.xml
similarity index 85%
rename from app/libs/io/coil-kt/coil-video/2.5.0/AndroidManifest.xml
rename to app/libs/io/coil-kt/coil3/coil-core-android/3.0.4/AndroidManifest.xml
index 93a7624..24b3421 100644
--- a/app/libs/io/coil-kt/coil-video/2.5.0/AndroidManifest.xml
+++ b/app/libs/io/coil-kt/coil3/coil-core-android/3.0.4/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="coil.video" >
+    package="coil3.core" >
 
     <uses-sdk android:minSdkVersion="21" />
 
diff --git a/app/libs/io/coil-kt/coil/2.5.0/AndroidManifest.xml.license b/app/libs/io/coil-kt/coil3/coil-core-android/3.0.4/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/io/coil-kt/coil/2.5.0/AndroidManifest.xml.license
rename to app/libs/io/coil-kt/coil3/coil-core-android/3.0.4/AndroidManifest.xml.license
diff --git a/app/libs/io/coil-kt/coil3/coil-core-android/3.0.4/coil-core-release.aar b/app/libs/io/coil-kt/coil3/coil-core-android/3.0.4/coil-core-release.aar
new file mode 100644
index 0000000..03f944c
Binary files /dev/null and b/app/libs/io/coil-kt/coil3/coil-core-android/3.0.4/coil-core-release.aar differ
diff --git a/app/libs/io/coil-kt/coil/2.5.0/coil-2.5.0.aar.license b/app/libs/io/coil-kt/coil3/coil-core-android/3.0.4/coil-core-release.aar.license
similarity index 100%
rename from app/libs/io/coil-kt/coil/2.5.0/coil-2.5.0.aar.license
rename to app/libs/io/coil-kt/coil3/coil-core-android/3.0.4/coil-core-release.aar.license
diff --git a/app/libs/io/coil-kt/coil-gif/2.5.0/AndroidManifest.xml b/app/libs/io/coil-kt/coil3/coil-gif/3.0.4/AndroidManifest.xml
similarity index 86%
rename from app/libs/io/coil-kt/coil-gif/2.5.0/AndroidManifest.xml
rename to app/libs/io/coil-kt/coil3/coil-gif/3.0.4/AndroidManifest.xml
index 22d5b00..a6a8d72 100644
--- a/app/libs/io/coil-kt/coil-gif/2.5.0/AndroidManifest.xml
+++ b/app/libs/io/coil-kt/coil3/coil-gif/3.0.4/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="coil.gif" >
+    package="coil3.gif" >
 
     <uses-sdk android:minSdkVersion="21" />
 
diff --git a/app/libs/io/coil-kt/coil3/coil-gif/3.0.4/AndroidManifest.xml.license b/app/libs/io/coil-kt/coil3/coil-gif/3.0.4/AndroidManifest.xml.license
new file mode 100644
index 0000000..ca4aa85
--- /dev/null
+++ b/app/libs/io/coil-kt/coil3/coil-gif/3.0.4/AndroidManifest.xml.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2019-2024 Coil Contributors
+
+SPDX-License-Identifier: Apache-2.0
diff --git a/app/libs/io/coil-kt/coil3/coil-gif/3.0.4/coil-gif-3.0.4.aar b/app/libs/io/coil-kt/coil3/coil-gif/3.0.4/coil-gif-3.0.4.aar
new file mode 100644
index 0000000..2b40dcc
Binary files /dev/null and b/app/libs/io/coil-kt/coil3/coil-gif/3.0.4/coil-gif-3.0.4.aar differ
diff --git a/app/libs/io/coil-kt/coil3/coil-gif/3.0.4/coil-gif-3.0.4.aar.license b/app/libs/io/coil-kt/coil3/coil-gif/3.0.4/coil-gif-3.0.4.aar.license
new file mode 100644
index 0000000..ca4aa85
--- /dev/null
+++ b/app/libs/io/coil-kt/coil3/coil-gif/3.0.4/coil-gif-3.0.4.aar.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2019-2024 Coil Contributors
+
+SPDX-License-Identifier: Apache-2.0
diff --git a/app/libs/io/coil-kt/coil3/coil-network-core-android/3.0.4/AndroidManifest.xml b/app/libs/io/coil-kt/coil3/coil-network-core-android/3.0.4/AndroidManifest.xml
new file mode 100644
index 0000000..2fa922d
--- /dev/null
+++ b/app/libs/io/coil-kt/coil3/coil-network-core-android/3.0.4/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="coil3.network" >
+
+    <uses-sdk android:minSdkVersion="21" />
+
+</manifest>
\ No newline at end of file
diff --git a/app/libs/io/coil-kt/coil3/coil-network-core-android/3.0.4/AndroidManifest.xml.license b/app/libs/io/coil-kt/coil3/coil-network-core-android/3.0.4/AndroidManifest.xml.license
new file mode 100644
index 0000000..ca4aa85
--- /dev/null
+++ b/app/libs/io/coil-kt/coil3/coil-network-core-android/3.0.4/AndroidManifest.xml.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2019-2024 Coil Contributors
+
+SPDX-License-Identifier: Apache-2.0
diff --git a/app/libs/io/coil-kt/coil3/coil-network-core-android/3.0.4/coil-network-core-release.aar b/app/libs/io/coil-kt/coil3/coil-network-core-android/3.0.4/coil-network-core-release.aar
new file mode 100644
index 0000000..d549730
Binary files /dev/null and b/app/libs/io/coil-kt/coil3/coil-network-core-android/3.0.4/coil-network-core-release.aar differ
diff --git a/app/libs/io/coil-kt/coil3/coil-network-core-android/3.0.4/coil-network-core-release.aar.license b/app/libs/io/coil-kt/coil3/coil-network-core-android/3.0.4/coil-network-core-release.aar.license
new file mode 100644
index 0000000..ca4aa85
--- /dev/null
+++ b/app/libs/io/coil-kt/coil3/coil-network-core-android/3.0.4/coil-network-core-release.aar.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2019-2024 Coil Contributors
+
+SPDX-License-Identifier: Apache-2.0
diff --git a/app/libs/io/coil-kt/coil3/coil-network-okhttp-jvm/3.0.4/coil-network-okhttp-jvm-3.0.4.jar b/app/libs/io/coil-kt/coil3/coil-network-okhttp-jvm/3.0.4/coil-network-okhttp-jvm-3.0.4.jar
new file mode 100644
index 0000000..8adc54b
Binary files /dev/null and b/app/libs/io/coil-kt/coil3/coil-network-okhttp-jvm/3.0.4/coil-network-okhttp-jvm-3.0.4.jar differ
diff --git a/app/libs/io/coil-kt/coil3/coil-network-okhttp-jvm/3.0.4/coil-network-okhttp-jvm-3.0.4.jar.license b/app/libs/io/coil-kt/coil3/coil-network-okhttp-jvm/3.0.4/coil-network-okhttp-jvm-3.0.4.jar.license
new file mode 100644
index 0000000..ca4aa85
--- /dev/null
+++ b/app/libs/io/coil-kt/coil3/coil-network-okhttp-jvm/3.0.4/coil-network-okhttp-jvm-3.0.4.jar.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2019-2024 Coil Contributors
+
+SPDX-License-Identifier: Apache-2.0
diff --git a/app/libs/io/coil-kt/coil3/coil-video/3.0.4/AndroidManifest.xml b/app/libs/io/coil-kt/coil3/coil-video/3.0.4/AndroidManifest.xml
new file mode 100644
index 0000000..df8320f
--- /dev/null
+++ b/app/libs/io/coil-kt/coil3/coil-video/3.0.4/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="coil3.video" >
+
+    <uses-sdk android:minSdkVersion="21" />
+
+</manifest>
\ No newline at end of file
diff --git a/app/libs/io/coil-kt/coil3/coil-video/3.0.4/AndroidManifest.xml.license b/app/libs/io/coil-kt/coil3/coil-video/3.0.4/AndroidManifest.xml.license
new file mode 100644
index 0000000..ca4aa85
--- /dev/null
+++ b/app/libs/io/coil-kt/coil3/coil-video/3.0.4/AndroidManifest.xml.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2019-2024 Coil Contributors
+
+SPDX-License-Identifier: Apache-2.0
diff --git a/app/libs/io/coil-kt/coil3/coil-video/3.0.4/coil-video-3.0.4.aar b/app/libs/io/coil-kt/coil3/coil-video/3.0.4/coil-video-3.0.4.aar
new file mode 100644
index 0000000..481f83c
Binary files /dev/null and b/app/libs/io/coil-kt/coil3/coil-video/3.0.4/coil-video-3.0.4.aar differ
diff --git a/app/libs/io/coil-kt/coil3/coil-video/3.0.4/coil-video-3.0.4.aar.license b/app/libs/io/coil-kt/coil3/coil-video/3.0.4/coil-video-3.0.4.aar.license
new file mode 100644
index 0000000..ca4aa85
--- /dev/null
+++ b/app/libs/io/coil-kt/coil3/coil-video/3.0.4/coil-video-3.0.4.aar.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2019-2024 Coil Contributors
+
+SPDX-License-Identifier: Apache-2.0
diff --git a/app/src/main/java/org/lineageos/glimpse/GlimpseApplication.kt b/app/src/main/java/org/lineageos/glimpse/GlimpseApplication.kt
index 8be1a44..03a8e96 100644
--- a/app/src/main/java/org/lineageos/glimpse/GlimpseApplication.kt
+++ b/app/src/main/java/org/lineageos/glimpse/GlimpseApplication.kt
@@ -1,19 +1,20 @@
 /*
- * SPDX-FileCopyrightText: 2023 The LineageOS Project
+ * SPDX-FileCopyrightText: 2023-2024 The LineageOS Project
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package org.lineageos.glimpse
 
 import android.app.Application
-import coil.ImageLoader
-import coil.ImageLoaderFactory
-import coil.decode.ImageDecoderDecoder
-import coil.decode.VideoFrameDecoder
-import coil.memory.MemoryCache
+import coil3.ImageLoader
+import coil3.PlatformContext
+import coil3.SingletonImageLoader
+import coil3.gif.AnimatedImageDecoder
+import coil3.memory.MemoryCache
+import coil3.video.VideoFrameDecoder
 import com.google.android.material.color.DynamicColors
 
-class GlimpseApplication : Application(), ImageLoaderFactory {
+class GlimpseApplication : Application(), SingletonImageLoader.Factory {
     override fun onCreate() {
         super.onCreate()
 
@@ -21,10 +22,13 @@ class GlimpseApplication : Application(), ImageLoaderFactory {
         DynamicColors.applyToActivitiesIfAvailable(this)
     }
 
-    override fun newImageLoader() = ImageLoader.Builder(this).components {
-        add(ImageDecoderDecoder.Factory())
-        add(VideoFrameDecoder.Factory())
-    }.memoryCache {
-        MemoryCache.Builder(this).maxSizePercent(0.25).build()
-    }.build()
+    override fun newImageLoader(context: PlatformContext) = ImageLoader.Builder(this)
+        .components {
+            add(AnimatedImageDecoder.Factory())
+            add(VideoFrameDecoder.Factory())
+        }
+        .memoryCache {
+            MemoryCache.Builder().maxSizePercent(context, 0.25).build()
+        }
+        .build()
 }
diff --git a/app/src/main/java/org/lineageos/glimpse/ViewActivity.kt b/app/src/main/java/org/lineageos/glimpse/ViewActivity.kt
index 67b40ea..8fb5e60 100644
--- a/app/src/main/java/org/lineageos/glimpse/ViewActivity.kt
+++ b/app/src/main/java/org/lineageos/glimpse/ViewActivity.kt
@@ -43,7 +43,15 @@ import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import org.lineageos.glimpse.ext.*
+import org.lineageos.glimpse.ext.asArray
+import org.lineageos.glimpse.ext.buildEditIntent
+import org.lineageos.glimpse.ext.buildShareIntent
+import org.lineageos.glimpse.ext.buildUseAsIntent
+import org.lineageos.glimpse.ext.createDeleteRequest
+import org.lineageos.glimpse.ext.createFavoriteRequest
+import org.lineageos.glimpse.ext.createTrashRequest
+import org.lineageos.glimpse.ext.fade
+import org.lineageos.glimpse.ext.setBarsVisibility
 import org.lineageos.glimpse.models.Media
 import org.lineageos.glimpse.models.MediaStoreMedia
 import org.lineageos.glimpse.models.MediaType
diff --git a/app/src/main/java/org/lineageos/glimpse/flow/AlbumFlow.kt b/app/src/main/java/org/lineageos/glimpse/flow/AlbumFlow.kt
index ee6e72c..ead2eb1 100644
--- a/app/src/main/java/org/lineageos/glimpse/flow/AlbumFlow.kt
+++ b/app/src/main/java/org/lineageos/glimpse/flow/AlbumFlow.kt
@@ -19,7 +19,11 @@ import org.lineageos.glimpse.ext.queryFlow
 import org.lineageos.glimpse.models.Album
 import org.lineageos.glimpse.models.MediaStoreMedia
 import org.lineageos.glimpse.models.MediaType
-import org.lineageos.glimpse.query.*
+import org.lineageos.glimpse.query.MediaQuery
+import org.lineageos.glimpse.query.Query
+import org.lineageos.glimpse.query.and
+import org.lineageos.glimpse.query.eq
+import org.lineageos.glimpse.query.join
 import org.lineageos.glimpse.utils.MediaStoreBuckets
 import org.lineageos.glimpse.utils.PickerUtils
 
diff --git a/app/src/main/java/org/lineageos/glimpse/flow/AlbumsFlow.kt b/app/src/main/java/org/lineageos/glimpse/flow/AlbumsFlow.kt
index fff27ad..87e94d2 100644
--- a/app/src/main/java/org/lineageos/glimpse/flow/AlbumsFlow.kt
+++ b/app/src/main/java/org/lineageos/glimpse/flow/AlbumsFlow.kt
@@ -18,7 +18,11 @@ import org.lineageos.glimpse.ext.queryFlow
 import org.lineageos.glimpse.models.Album
 import org.lineageos.glimpse.models.MediaStoreMedia
 import org.lineageos.glimpse.models.MediaType
-import org.lineageos.glimpse.query.*
+import org.lineageos.glimpse.query.MediaQuery
+import org.lineageos.glimpse.query.Query
+import org.lineageos.glimpse.query.and
+import org.lineageos.glimpse.query.eq
+import org.lineageos.glimpse.query.join
 import org.lineageos.glimpse.utils.PickerUtils
 
 class AlbumsFlow(
diff --git a/app/src/main/java/org/lineageos/glimpse/flow/MediaFlow.kt b/app/src/main/java/org/lineageos/glimpse/flow/MediaFlow.kt
index dba7085..a40560d 100644
--- a/app/src/main/java/org/lineageos/glimpse/flow/MediaFlow.kt
+++ b/app/src/main/java/org/lineageos/glimpse/flow/MediaFlow.kt
@@ -12,10 +12,15 @@ import android.os.Bundle
 import android.provider.MediaStore
 import androidx.core.os.bundleOf
 import kotlinx.coroutines.flow.Flow
-import org.lineageos.glimpse.ext.*
+import org.lineageos.glimpse.ext.mapEachRow
+import org.lineageos.glimpse.ext.queryFlow
 import org.lineageos.glimpse.models.MediaStoreMedia
 import org.lineageos.glimpse.models.MediaType
-import org.lineageos.glimpse.query.*
+import org.lineageos.glimpse.query.MediaQuery
+import org.lineageos.glimpse.query.Query
+import org.lineageos.glimpse.query.and
+import org.lineageos.glimpse.query.eq
+import org.lineageos.glimpse.query.join
 import org.lineageos.glimpse.utils.MediaStoreBuckets
 import org.lineageos.glimpse.utils.PickerUtils
 
diff --git a/app/src/main/java/org/lineageos/glimpse/fragments/AlbumViewerFragment.kt b/app/src/main/java/org/lineageos/glimpse/fragments/AlbumViewerFragment.kt
index c548e28..e72b736 100644
--- a/app/src/main/java/org/lineageos/glimpse/fragments/AlbumViewerFragment.kt
+++ b/app/src/main/java/org/lineageos/glimpse/fragments/AlbumViewerFragment.kt
@@ -43,7 +43,10 @@ import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import org.lineageos.glimpse.R
 import org.lineageos.glimpse.ViewActivity
-import org.lineageos.glimpse.ext.*
+import org.lineageos.glimpse.ext.buildShareIntent
+import org.lineageos.glimpse.ext.createDeleteRequest
+import org.lineageos.glimpse.ext.createTrashRequest
+import org.lineageos.glimpse.ext.getViewProperty
 import org.lineageos.glimpse.models.Album
 import org.lineageos.glimpse.models.MediaStoreMedia
 import org.lineageos.glimpse.recyclerview.ThumbnailAdapter
diff --git a/app/src/main/java/org/lineageos/glimpse/fragments/AlbumsFragment.kt b/app/src/main/java/org/lineageos/glimpse/fragments/AlbumsFragment.kt
index b3b6bd0..8baa94c 100644
--- a/app/src/main/java/org/lineageos/glimpse/fragments/AlbumsFragment.kt
+++ b/app/src/main/java/org/lineageos/glimpse/fragments/AlbumsFragment.kt
@@ -28,7 +28,7 @@ import com.google.android.material.shape.MaterialShapeDrawable
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import org.lineageos.glimpse.R
-import org.lineageos.glimpse.ext.*
+import org.lineageos.glimpse.ext.getViewProperty
 import org.lineageos.glimpse.recyclerview.AlbumThumbnailAdapter
 import org.lineageos.glimpse.recyclerview.AlbumThumbnailLayoutManager
 import org.lineageos.glimpse.utils.PermissionsGatedCallback
diff --git a/app/src/main/java/org/lineageos/glimpse/models/Album.kt b/app/src/main/java/org/lineageos/glimpse/models/Album.kt
index 691d3e9..3218a57 100644
--- a/app/src/main/java/org/lineageos/glimpse/models/Album.kt
+++ b/app/src/main/java/org/lineageos/glimpse/models/Album.kt
@@ -8,7 +8,7 @@ package org.lineageos.glimpse.models
 import android.os.Parcel
 import android.os.Parcelable
 import android.provider.MediaStore
-import org.lineageos.glimpse.ext.*
+import org.lineageos.glimpse.ext.readParcelable
 import kotlin.reflect.safeCast
 
 /**
diff --git a/app/src/main/java/org/lineageos/glimpse/models/MediaStoreMedia.kt b/app/src/main/java/org/lineageos/glimpse/models/MediaStoreMedia.kt
index d0e692d..7790c26 100644
--- a/app/src/main/java/org/lineageos/glimpse/models/MediaStoreMedia.kt
+++ b/app/src/main/java/org/lineageos/glimpse/models/MediaStoreMedia.kt
@@ -9,7 +9,7 @@ import android.content.ContentUris
 import android.os.Parcel
 import android.os.Parcelable
 import android.provider.MediaStore
-import org.lineageos.glimpse.ext.*
+import org.lineageos.glimpse.ext.readSerializable
 import java.util.Date
 import kotlin.reflect.safeCast
 
diff --git a/app/src/main/java/org/lineageos/glimpse/recyclerview/AlbumThumbnailAdapter.kt b/app/src/main/java/org/lineageos/glimpse/recyclerview/AlbumThumbnailAdapter.kt
index 1ab5fec..211b02c 100644
--- a/app/src/main/java/org/lineageos/glimpse/recyclerview/AlbumThumbnailAdapter.kt
+++ b/app/src/main/java/org/lineageos/glimpse/recyclerview/AlbumThumbnailAdapter.kt
@@ -13,7 +13,8 @@ import android.widget.TextView
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import coil.load
+import coil3.load
+import coil3.request.placeholder
 import org.lineageos.glimpse.R
 import org.lineageos.glimpse.models.Album
 
diff --git a/app/src/main/java/org/lineageos/glimpse/recyclerview/MediaViewerAdapter.kt b/app/src/main/java/org/lineageos/glimpse/recyclerview/MediaViewerAdapter.kt
index 4ad4059..2f3c46f 100644
--- a/app/src/main/java/org/lineageos/glimpse/recyclerview/MediaViewerAdapter.kt
+++ b/app/src/main/java/org/lineageos/glimpse/recyclerview/MediaViewerAdapter.kt
@@ -17,7 +17,7 @@ import androidx.media3.ui.PlayerView
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import coil.load
+import coil3.load
 import com.github.panpf.zoomimage.CoilZoomImageView
 import org.lineageos.glimpse.R
 import org.lineageos.glimpse.ext.fade
diff --git a/app/src/main/java/org/lineageos/glimpse/recyclerview/ThumbnailAdapter.kt b/app/src/main/java/org/lineageos/glimpse/recyclerview/ThumbnailAdapter.kt
index 62c38ef..28ec940 100644
--- a/app/src/main/java/org/lineageos/glimpse/recyclerview/ThumbnailAdapter.kt
+++ b/app/src/main/java/org/lineageos/glimpse/recyclerview/ThumbnailAdapter.kt
@@ -23,7 +23,8 @@ import androidx.recyclerview.selection.SelectionTracker
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import coil.load
+import coil3.load
+import coil3.request.placeholder
 import org.lineageos.glimpse.R
 import org.lineageos.glimpse.models.MediaStoreMedia
 import org.lineageos.glimpse.models.MediaType
diff --git a/app/src/main/java/org/lineageos/glimpse/recyclerview/ThumbnailLayoutManager.kt b/app/src/main/java/org/lineageos/glimpse/recyclerview/ThumbnailLayoutManager.kt
index 171a0dc..35fb3ff 100644
--- a/app/src/main/java/org/lineageos/glimpse/recyclerview/ThumbnailLayoutManager.kt
+++ b/app/src/main/java/org/lineageos/glimpse/recyclerview/ThumbnailLayoutManager.kt
@@ -6,7 +6,7 @@
 package org.lineageos.glimpse.recyclerview
 
 import android.content.Context
-import org.lineageos.glimpse.ext.*
+import org.lineageos.glimpse.ext.px
 
 class ThumbnailLayoutManager(
     context: Context,
diff --git a/app/src/main/java/org/lineageos/glimpse/ui/MediaInfoBottomSheetDialog.kt b/app/src/main/java/org/lineageos/glimpse/ui/MediaInfoBottomSheetDialog.kt
index 0cdbb0a..d828ad9 100644
--- a/app/src/main/java/org/lineageos/glimpse/ui/MediaInfoBottomSheetDialog.kt
+++ b/app/src/main/java/org/lineageos/glimpse/ui/MediaInfoBottomSheetDialog.kt
@@ -32,7 +32,20 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import org.lineageos.glimpse.R
-import org.lineageos.glimpse.ext.*
+import org.lineageos.glimpse.ext.apertureValue
+import org.lineageos.glimpse.ext.artist
+import org.lineageos.glimpse.ext.copyright
+import org.lineageos.glimpse.ext.createWriteRequest
+import org.lineageos.glimpse.ext.exposureTime
+import org.lineageos.glimpse.ext.focalLength
+import org.lineageos.glimpse.ext.isSupportedFormatForSavingAttributes
+import org.lineageos.glimpse.ext.isoSpeed
+import org.lineageos.glimpse.ext.make
+import org.lineageos.glimpse.ext.model
+import org.lineageos.glimpse.ext.round
+import org.lineageos.glimpse.ext.software
+import org.lineageos.glimpse.ext.toFraction
+import org.lineageos.glimpse.ext.userComment
 import org.lineageos.glimpse.models.MediaStoreMedia
 import org.lineageos.glimpse.models.MediaType
 import java.text.SimpleDateFormat
diff --git a/app/src/main/java/org/lineageos/glimpse/utils/PermissionsUtils.kt b/app/src/main/java/org/lineageos/glimpse/utils/PermissionsUtils.kt
index 7f2cabd..bd2cd76 100644
--- a/app/src/main/java/org/lineageos/glimpse/utils/PermissionsUtils.kt
+++ b/app/src/main/java/org/lineageos/glimpse/utils/PermissionsUtils.kt
@@ -17,7 +17,7 @@ import androidx.core.content.ContextCompat
 import androidx.preference.PreferenceManager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.lineageos.glimpse.R
-import org.lineageos.glimpse.ext.*
+import org.lineageos.glimpse.ext.manageMediaPermissionDialogDismissed
 
 /**
  * App's permissions utils.
diff --git a/app/src/main/java/org/lineageos/glimpse/viewmodels/AlbumViewerViewModel.kt b/app/src/main/java/org/lineageos/glimpse/viewmodels/AlbumViewerViewModel.kt
index 65a26ed..fae15d7 100644
--- a/app/src/main/java/org/lineageos/glimpse/viewmodels/AlbumViewerViewModel.kt
+++ b/app/src/main/java/org/lineageos/glimpse/viewmodels/AlbumViewerViewModel.kt
@@ -17,7 +17,7 @@ import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.flow.stateIn
-import org.lineageos.glimpse.ext.*
+import org.lineageos.glimpse.ext.context
 import org.lineageos.glimpse.models.Album
 import org.lineageos.glimpse.models.MediaStoreMedia
 import org.lineageos.glimpse.recyclerview.ThumbnailAdapter
@@ -50,7 +50,8 @@ class AlbumViewerViewModel(
 
                     val previousMedia = medias[i - 1]
 
-                    val before = previousMedia.dateModified.toInstant().atZone(ZoneId.systemDefault())
+                    val before =
+                        previousMedia.dateModified.toInstant().atZone(ZoneId.systemDefault())
                     val after = currentMedia.dateModified.toInstant().atZone(ZoneId.systemDefault())
                     val days = ChronoUnit.DAYS.between(after, before)
 
diff --git a/app/src/main/java/org/lineageos/glimpse/viewmodels/AlbumsViewModel.kt b/app/src/main/java/org/lineageos/glimpse/viewmodels/AlbumsViewModel.kt
index 70d53a3..dde9420 100644
--- a/app/src/main/java/org/lineageos/glimpse/viewmodels/AlbumsViewModel.kt
+++ b/app/src/main/java/org/lineageos/glimpse/viewmodels/AlbumsViewModel.kt
@@ -15,7 +15,7 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
-import org.lineageos.glimpse.ext.*
+import org.lineageos.glimpse.ext.context
 import org.lineageos.glimpse.repository.MediaRepository
 
 class AlbumsViewModel(
diff --git a/app/src/main/java/org/lineageos/glimpse/viewmodels/MediaViewerViewModel.kt b/app/src/main/java/org/lineageos/glimpse/viewmodels/MediaViewerViewModel.kt
index 229a130..7ceb8f4 100644
--- a/app/src/main/java/org/lineageos/glimpse/viewmodels/MediaViewerViewModel.kt
+++ b/app/src/main/java/org/lineageos/glimpse/viewmodels/MediaViewerViewModel.kt
@@ -18,7 +18,7 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
-import org.lineageos.glimpse.ext.*
+import org.lineageos.glimpse.ext.context
 import org.lineageos.glimpse.repository.MediaRepository
 import org.lineageos.glimpse.utils.MediaStoreBuckets
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 372d478..ef99151 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,11 +5,6 @@
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.7.2" apply false
-    id("com.android.library") version "8.7.2" apply false
-    id("org.jetbrains.kotlin.android") version "1.8.10" apply false
-}
-
-tasks.register<Delete>("clean").configure {
-    delete(rootProject.layout.buildDirectory)
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.kotlin.android) apply false
 }
diff --git a/gradle.properties b/gradle.properties
index f7ed497..f8eca05 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023 The LineageOS Project
+# SPDX-FileCopyrightText: 2023-2024 The LineageOS Project
 # SPDX-License-Identifier: Apache-2.0
 
 # Project-wide Gradle settings.
@@ -11,8 +11,8 @@
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# This option should only be used with decoupled projects. For more details, visit
+# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
 # org.gradle.parallel=true
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app's APK
@@ -20,3 +20,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000..6c27a25
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,58 @@
+#
+# SPDX-FileCopyrightText: 2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+[versions]
+agp = "8.7.2"
+kotlin = "1.9.23"
+activity = "1.9.2"
+appcompat = "1.7.0"
+coil = "3.0.4"
+constraintlayout = "2.1.4"
+core = "1.13.1"
+exifinterface = "1.3.7"
+fragment = "1.8.3"
+lifecycle = "2.8.5"
+material = "1.12.0"
+media3 = "1.5.0"
+navigation = "2.8.0"
+okhttp = "4.12.0"
+preference = "1.2.1"
+recyclerview = "1.3.2"
+recyclerview-selection = "1.1.0"
+viewpager2 = "1.1.0"
+zoomimage = "1.0.2"
+
+[libraries]
+androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" }
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
+androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core" }
+androidx-exifinterface = { group = "androidx.exifinterface", name = "exifinterface", version.ref = "exifinterface" }
+androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "fragment" }
+androidx-lifecycle-service = { group = "androidx.lifecycle", name = "lifecycle-service", version.ref = "lifecycle" }
+androidx-media3-common-ktx = { group = "androidx.media3", name = "media3-common-ktx", version.ref = "media3" }
+androidx-media3-exoplayer = { group = "androidx.media3", name = "media3-exoplayer", version.ref = "media3" }
+androidx-media3-exoplayer-dash = { group = "androidx.media3", name = "media3-exoplayer-dash", version.ref = "media3" }
+androidx-media3-exoplayer-hls = { group = "androidx.media3", name = "media3-exoplayer-hls", version.ref = "media3" }
+androidx-media3-exoplayer-rtsp = { group = "androidx.media3", name = "media3-exoplayer-rtsp", version.ref = "media3" }
+androidx-media3-exoplayer-smoothstreaming = { group = "androidx.media3", name = "media3-exoplayer-smoothstreaming", version.ref = "media3" }
+androidx-media3-ui = { group = "androidx.media3", name = "media3-ui", version.ref = "media3" }
+androidx-navigation-fragment-ktx = { group = "androidx.navigation", name = "navigation-fragment-ktx", version.ref = "navigation" }
+androidx-navigation-ui-ktx = { group = "androidx.navigation", name = "navigation-ui-ktx", version.ref = "navigation" }
+androidx-preference = { group = "androidx.preference", name = "preference", version.ref = "preference" }
+androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recyclerview" }
+androidx-recyclerview-selection = { group = "androidx.recyclerview", name = "recyclerview-selection", version.ref = "recyclerview-selection" }
+androidx-viewpager2 = { group = "androidx.viewpager2", name = "viewpager2", version.ref = "viewpager2" }
+coil = { group = "io.coil-kt.coil3", name = "coil", version.ref = "coil" }
+coil-gif = { group = "io.coil-kt.coil3", name = "coil-gif", version.ref = "coil" }
+coil-network-okhttp = { group = "io.coil-kt.coil3", name = "coil-network-okhttp", version.ref = "coil" }
+coil-video = { group = "io.coil-kt.coil3", name = "coil-video", version.ref = "coil" }
+material = { group = "com.google.android.material", name = "material", version.ref = "material" }
+okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
+zoomimage-view-coil = { group = "io.github.panpf.zoomimage", name = "zoomimage-view-coil", version.ref = "zoomimage" }
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "agp" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9355b41..e2847c8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 694a5c0..332001b 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,13 +1,19 @@
 /*
- * SPDX-FileCopyrightText: 2023 The LineageOS Project
+ * SPDX-FileCopyrightText: 2023-2024 The LineageOS Project
  * SPDX-License-Identifier: Apache-2.0
  */
 
 pluginManagement {
     repositories {
-        gradlePluginPortal()
-        google()
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
         mavenCentral()
+        gradlePluginPortal()
     }
 }
 dependencyResolutionManagement {
@@ -17,5 +23,6 @@ dependencyResolutionManagement {
         mavenCentral()
     }
 }
+
 rootProject.name = "Glimpse"
 include(":app")