diff --git a/app/build.gradle b/app/build.gradle
index 200ed3e41..85319bc2d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -75,8 +75,7 @@ android {
 dependencies {
     //debugImplementation libs.square.leakcanary
 
-    kapt libs.room.compiler
-
+    /* Android Core */
     implementation libs.androidx.appcompat
     implementation libs.androidx.constraintlayout
     implementation libs.androidx.legacySupport
@@ -86,30 +85,37 @@ dependencies {
     implementation libs.androidx.preference
     implementation libs.androidx.work.runtime
 
+    /* Android Lifecycle */
+    implementation libs.lifecycle.viewmodel
+    implementation libs.lifecycle.runtime
+    implementation libs.lifecycle.livedata
+
+    /* Testing */
     androidTestImplementation libs.androidx.test.junit
     androidTestImplementation libs.androidx.test.espressoCore
 
+    /* Design */
+    implementation libs.material
     implementation libs.circleimageview
 
-    implementation libs.material
+    /* ExoPlayer */
     implementation libs.exoplayer
     implementation(libs.exoplayer.extension.cronet) { exclude group: 'com.google.android.gms' }
     implementation libs.exoplayer.extension.mediasession
 
+    /* Retrofit and Jackson */
     implementation libs.square.retrofit
     implementation libs.square.retrofit.converterJackson
-    // Do not update jackson annotations! It does not supports < API 26.
     implementation libs.jacksonAnnotations
 
+    /* Cronet and Coil */
     coreLibraryDesugaring libs.desugaring
     implementation libs.cronet.embedded
     implementation libs.cronet.okhttp
     implementation libs.coil
 
-    implementation libs.lifecycle.viewmodel
-    implementation libs.lifecycle.runtime
-    implementation libs.lifecycle.livedata
-
+    /* Room */
+    kapt libs.room.compiler
     implementation libs.room
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b782922ac..da02274fa 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,9 +1,9 @@
 [versions]
-appcompat = "1.4.1"
+appcompat = "1.5.0"
 lifecycle = "2.5.1"
-constraintlayout = "2.1.3"
+constraintlayout = "2.1.4"
 material = "1.6.0"
-navigation = "2.4.2"
+navigation = "2.5.1"
 legacySupport = "1.0.0"
 preference = "1.2.0"
 extJunit = "1.1.3"
@@ -14,11 +14,10 @@ exoplayer = "2.17.1"
 multidex = "2.0.1"
 retrofit = "2.9.0"
 jacksonAnnotations = "2.13.3"
-mobileffmpeg = "4.5.1.LTS"
 desugaring = "1.1.5"
 cronetEmbedded = "101.4951.41"
 cronetOkHttp = "0.1.0"
-coil = "2.1.0"
+coil = "2.2.0"
 leakcanary = "2.8.1"
 room = "2.4.3"
 
@@ -40,7 +39,6 @@ androidx-multidex = { group = "androidx.multidex", name = "multidex", version.re
 square-retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
 square-retrofit-converterJackson = { group = "com.squareup.retrofit2", name = "converter-jackson", version.ref = "retrofit" }
 jacksonAnnotations = { group = "com.fasterxml.jackson.core", name = "jackson-annotations", version.ref = "jacksonAnnotations" }
-mobileffmpeg = { group = "com.arthenica", name = "ffmpeg-kit-min", version.ref = "mobileffmpeg" }
 desugaring = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "desugaring" }
 exoplayer-extension-cronet = { group = "com.google.android.exoplayer", name = "extension-cronet", version.ref = "exoplayer" }
 cronet-embedded = { group = "org.chromium.net", name = "cronet-embedded", version.ref = "cronetEmbedded" }