diff --git a/app/build.gradle b/app/build.gradle
index e428eda..24dda7c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,12 +5,12 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'com.google.gms.google-services'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "io.heckel.ntfy"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
 
         versionCode 18
         versionName "1.7.1"
@@ -60,22 +60,22 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation "androidx.appcompat:appcompat:$rootProject.appCompatVersion"
-    implementation "androidx.core:core-ktx:$rootProject.coreKtxVersion"
-    implementation "androidx.constraintlayout:constraintlayout:$rootProject.constraintLayoutVersion"
-    implementation "androidx.activity:activity-ktx:$rootProject.activityVersion"
-    implementation "androidx.fragment:fragment-ktx:$rootProject.fragmentVersion"
-    implementation 'com.google.code.gson:gson:2.8.9'
-
-    // WorkManager
-    implementation "androidx.work:work-runtime-ktx:2.6.0"
+    // AndroidX, The Basics
+    implementation "androidx.appcompat:appcompat:1.4.1"
+    implementation "androidx.core:core-ktx:1.7.0"
+    implementation "androidx.constraintlayout:constraintlayout:2.1.3"
+    implementation "androidx.activity:activity-ktx:1.4.0"
+    implementation "androidx.fragment:fragment-ktx:1.4.0"
+    implementation "androidx.work:work-runtime-ktx:2.7.1"
     implementation 'androidx.preference:preference-ktx:1.1.1'
 
+    // JSON serialization
+    implementation 'com.google.code.gson:gson:2.8.9'
+
     // Room (SQLite)
-    def roomVersion = "2.3.0"
-    implementation "androidx.room:room-ktx:$roomVersion"
-    kapt "androidx.room:room-compiler:$roomVersion"
+    def room_version = "2.4.1"
+    implementation "androidx.room:room-ktx:$room_version"
+    kapt "androidx.room:room-compiler:$room_version"
 
     // OkHttp (HTTP library)
     implementation 'com.squareup.okhttp3:okhttp:4.9.3'
@@ -84,16 +84,16 @@ dependencies {
     playImplementation 'com.google.firebase:firebase-messaging:23.0.0'
 
     // RecyclerView
-    implementation "androidx.recyclerview:recyclerview:$rootProject.recyclerViewVersion"
+    implementation "androidx.recyclerview:recyclerview:1.3.0-alpha01"
 
     // Swipe down to refresh
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 
     // Material design
-    implementation "com.google.android.material:material:$rootProject.materialVersion"
+    implementation "com.google.android.material:material:1.5.0"
 
     // LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$rootProject.liveDataVersion"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.0"
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
     // Image viewer
diff --git a/build.gradle b/build.gradle
index 59568af..40c4925 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.4.10'
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
         jcenter()
@@ -25,14 +25,3 @@ allprojects {
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
-
-ext {
-    materialVersion = '1.2.1'
-    liveDataVersion = '2.2.0'
-    recyclerViewVersion = '1.2.0-alpha06'
-    appCompatVersion = '1.2.0'
-    coreKtxVersion = '1.3.2'
-    constraintLayoutVersion = '2.0.4'
-    activityVersion = '1.1.0'
-    fragmentVersion = '1.1.0'
-}