diff --git a/app/build.gradle b/app/build.gradle
index 39c100149..d8833d332 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,4 +1,16 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+
+kapt {
+    correctErrorTypes = true
+    useBuildCache = true
+    mapDiagnosticLocations = true
+    javacOptions {
+        option("-Xmaxerrs", 1000)
+    }
+}
 
 android {
     defaultConfig {
diff --git a/build.gradle b/build.gradle
index 00ba953dc..471d50845 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,13 +11,12 @@ buildscript {
     repositories {
         google()
         jcenter()
-        maven {
-            url 'http://storage.googleapis.com/r8-releases/raw'
-        }
+        maven { url 'http://storage.googleapis.com/r8-releases/raw' }
     }
     dependencies {
         classpath 'com.android.tools:r8:1.4.79'
-        classpath 'com.android.tools.build:gradle:3.5.0-alpha10'
+        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.21"
         
 
         // NOTE: Do not place your application dependencies here; they belong