diff --git a/app/build.gradle b/app/build.gradle
index 0817575..ef42f3f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,6 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion rootProject.ext.android.COMPILE_SDK_VERSION
diff --git a/app/src/main/java/io/neoterm/ui/term/NeoTermActivity.kt b/app/src/main/java/io/neoterm/ui/term/NeoTermActivity.kt
index 9e41167..52d06cd 100644
--- a/app/src/main/java/io/neoterm/ui/term/NeoTermActivity.kt
+++ b/app/src/main/java/io/neoterm/ui/term/NeoTermActivity.kt
@@ -7,6 +7,7 @@ import android.content.*
 import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.os.Bundle
+import android.os.Handler
 import android.os.IBinder
 import android.preference.PreferenceManager
 import android.support.v4.app.ActivityCompat
diff --git a/build.gradle b/build.gradle
index 4f7b250..af0bfb6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,10 +21,11 @@ buildscript {
         return ""
     }
 
+    ext.kotlin_version = '1.3.50'
     ext.android = [
             ANDROID_SUPPORT_VERSION: '27.0.2',
 
-            KOTLIN_VERSION         : '1.2.51',
+            KOTLIN_VERSION         : '1.3.50',
 
             MIN_SDK_VERSION        : 21,
 
@@ -42,7 +43,7 @@ buildscript {
             "appcompat-v7"        : "com.android.support:appcompat-v7:${ext.android.ANDROID_SUPPORT_VERSION}",
             "design"              : "com.android.support:design:${ext.android.ANDROID_SUPPORT_VERSION}",
             "cardview-v7"         : "com.android.support:cardview-v7:${ext.android.ANDROID_SUPPORT_VERSION}",
-            "kotlin-stdlib"       : "org.jetbrains.kotlin:kotlin-stdlib-jre7:${ext.android.KOTLIN_VERSION}",
+            "kotlin-stdlib"       : "org.jetbrains.kotlin:kotlin-stdlib:${ext.android.KOTLIN_VERSION}",
             "kotlin-gradle-plugin": "org.jetbrains.kotlin:kotlin-gradle-plugin:${ext.android.KOTLIN_VERSION}",
             "junit"               : "junit:junit:${ext.android.JUNIT_VERSION}"
     ]
@@ -54,7 +55,8 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath rootProject.ext.deps["kotlin-gradle-plugin"]
 
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
@@ -71,6 +73,7 @@ allprojects {
         maven { url 'https://dl.google.com/dl/android/maven2/' }
         mavenCentral()
         maven { url "https://jitpack.io" }
+        google()
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4b1859f..933e9e1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Nov 08 23:25:07 CST 2018
+#Tue Apr 20 22:03:06 EEST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip