diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..8db2d051a
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,9 @@
+#
+# SPDX-FileCopyrightText: 2025 The Calyx Institute
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+
+root = true
+
+[*.{kt,kts}]
+ktlint_code_style = android_studio
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e3ab574a6..84897efa2 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -170,13 +170,18 @@ ksp {
     arg("room.schemaLocation", "$projectDir/schemas")
 }
 
+ktlint {
+    android = true
+    verbose = true
+}
+
 dependencies {
 
-    //Google's Goodies
+    // Google's Goodies
     implementation(libs.google.android.material)
     implementation(libs.google.protobuf.javalite)
 
-    //AndroidX
+    // AndroidX
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.browser)
     implementation(libs.androidx.lifecycle.viewmodel.ktx)
@@ -209,28 +214,28 @@ dependencies {
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
 
-    //Coil
+    // Coil
     implementation(libs.coil.kt)
     implementation(libs.coil.compose)
     implementation(libs.coil.network)
 
-    //Shimmer
+    // Shimmer
     implementation(libs.facebook.shimmer)
 
-    //Epoxy
+    // Epoxy
     implementation(libs.airbnb.epoxy.android)
     ksp(libs.airbnb.epoxy.processor)
 
-    //HTTP Clients
+    // HTTP Clients
     implementation(libs.squareup.okhttp)
 
-    //Lib-SU
+    // Lib-SU
     implementation(libs.github.topjohnwu.libsu)
 
-    //GPlayApi
+    // GPlayApi
     implementation(libs.auroraoss.gplayapi)
 
-    //Shizuku
+    // Shizuku
     compileOnly(libs.rikka.hidden.stub)
     implementation(libs.rikka.tools.refine.runtime)
     implementation(libs.rikka.shizuku.api)
@@ -238,7 +243,7 @@ dependencies {
 
     implementation(libs.lsposed.hiddenapibypass)
 
-    //Test
+    // Test
     testImplementation(libs.junit)
     testImplementation(libs.androidx.junit)
     testImplementation(libs.google.truth)
@@ -246,7 +251,7 @@ dependencies {
     androidTestImplementation(libs.google.truth)
     androidTestImplementation(libs.androidx.espresso.core)
 
-    //Hilt
+    // Hilt
     ksp(libs.hilt.android.compiler)
     ksp(libs.hilt.androidx.compiler)
     implementation(libs.androidx.hilt.viewmodel)
@@ -256,7 +261,7 @@ dependencies {
     kspAndroidTest(libs.hilt.android.compiler)
     androidTestImplementation(libs.hilt.android.testing)
 
-    //Room
+    // Room
     ksp(libs.androidx.room.compiler)
     implementation(libs.androidx.room.ktx)
     implementation(libs.androidx.room.runtime)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 754ca8a55..97658e991 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -24,7 +24,7 @@ hilt = "2.57.2"
 junit = "4.13.2"
 kotlin = "2.3.0"
 ksp = "2.3.4"
-ktlint = "12.1.2"
+ktlint = "14.0.1"
 leakcanary = "2.14"
 libsu = "6.0.0"
 lifecycle = "2.10.0"