diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 7b3006b6e..d124cf2a6 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,14 +6,13 @@
       <GradleProjectSettings>
         <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="gradleJvm" value="jbr-21" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
-        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index 257735d96..a32f8514b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,6 +7,7 @@ plugins {
 	id 'com.google.devtools.ksp'
 	id 'kotlin-parcelize'
 	id 'dagger.hilt.android.plugin'
+	id 'androidx.room'
 }
 
 android {
@@ -24,7 +25,6 @@ android {
 		testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
 		ksp {
 			arg('room.generateKotlin', 'true')
-			arg('room.schemaLocation', "$projectDir/schemas")
 		}
 		androidResources {
 			generateLocaleConfig true
@@ -77,6 +77,9 @@ android {
 			'-opt-in=coil3.annotation.InternalCoilApi',
 		]
 	}
+	room {
+		schemaDirectory "$projectDir/schemas"
+	}
 	lint {
 		abortOnError true
 		disable 'MissingTranslation', 'PrivateResource', 'SetJavaScriptEnabled', 'SimpleDateFormat'
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/ListHeader.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/ListHeader.kt
index 6f526eaec..940dec657 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/ListHeader.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/ListHeader.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import androidx.annotation.StringRes
 import org.koitharu.kotatsu.core.ui.model.DateTimeAgo
 
-@ExposedCopyVisibility
 data class ListHeader private constructor(
 	private val textRaw: Any,
 	@StringRes val buttonTextRes: Int,
diff --git a/build.gradle b/build.gradle
index c1a8552fd..1f9ffe611 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,4 +3,5 @@ plugins {
 	alias(libs.plugins.kotlin) apply false
 	alias(libs.plugins.hilt) apply false
 	alias(libs.plugins.ksp) apply false
+	alias(libs.plugins.room) apply false
 }
diff --git a/gradle.properties b/gradle.properties
index c628dc13b..682e3e860 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,4 +18,4 @@ kotlin.code.style=official
 org.gradle.jvmargs=-Xmx1536M -Dkotlin.daemon.jvm.options\="-Xmx1536M"
 android.enableR8.fullMode=true
 android.nonFinalResIds=false
-kapt.use.k2=true
+kapt.use.k2=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7cb83c002..97d367af7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ adapterdelegates = "4.3.2"
 appcompat = "1.7.0"
 avifDecoder = "1.1.1.14d8e3c4"
 biometric = "1.2.0-alpha05"
-coil = "3.0.4"
+coil = "3.1.0"
 collections = "1.4.5"
 #noinspection GradleDependency - 2.5.3 cause crashes
 conscrypt = "2.5.2"
@@ -22,8 +22,8 @@ hilt = "1.2.0"
 json = "20250107"
 junit = "4.13.2"
 junitKtx = "1.2.1"
-kotlin = "2.0.21"
-ksp = "2.0.21-1.0.28"
+kotlin = "2.1.10"
+ksp = "2.1.10-1.0.29"
 leakcanary = "3.0-alpha-8"
 lifecycle = "2.8.7"
 markwon = "4.6.2"
@@ -113,3 +113,4 @@ android-application = { id = "com.android.application", version.ref = "gradle" }
 kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "dagger" }
+room = { id = "androidx.room", version.ref = "room" }