diff --git a/README.md b/README.md
index 85bcb58..524aac1 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,12 @@
 
 <a href="https://play.google.com/store/apps/details?id=th.in.whs.k2ausbkbd"><img src="https://developer.android.com/images/brand/en_generic_rgb_wo_60.png" alt="Get it on Google Play Store"></a>
 
-[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=awkwin&url=https://github.com/whs/K2AUSBKeyboard&title=Keepass2Android%20USB%20Keyboard%20Plugin&language=Python&tags=github&category=software)
-
 Ever have type your 30 characters full strength password on someone else's computer?
 
 Keepass2Android USB Keyboard Plugin is similar to the official InputStick plugin but requires no additional hardware. Just plug your phone into a PC and press type. Your password will be sent to the PC just like you type it.
 
-If you can design a logo, please send me a new one!
\ No newline at end of file
+If you can design a logo, please send me a new one!
+
+## Maintainer wanted
+
+My current device no longer support this application. If you are interested in maintaining this repository, please open an issue.
diff --git a/app/build.gradle b/app/build.gradle
index 68d4102..0fad4b3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,15 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "th.in.whs.k2ausbkbd"
         minSdkVersion 8
-        targetSdkVersion 23
-        versionCode 9
-        versionName "1.3.2"
+        targetSdkVersion 28
+        versionCode 10
+        versionName "1.4.0"
     }
     buildTypes {
         release {
@@ -23,6 +22,6 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile project(':keepass2AndroidPluginSDK')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation project(':keepass2AndroidPluginSDK')
 }
diff --git a/app/src/main/java/th/in/whs/k2ausbkbd/hid/Keyboard.java b/app/src/main/java/th/in/whs/k2ausbkbd/hid/Keyboard.java
index 672b910..f5e04bf 100644
--- a/app/src/main/java/th/in/whs/k2ausbkbd/hid/Keyboard.java
+++ b/app/src/main/java/th/in/whs/k2ausbkbd/hid/Keyboard.java
@@ -39,11 +39,6 @@ public void type(String text, Layout layout) throws IOException {
             char typeChar = text.charAt(i);
 
             sendChar(typeChar, layout);
-
-            // Fix for double tap.
-            if( typeChar == '^' || typeChar == '´' || typeChar == '`' ) {
-                sendChar( ' ', layout );
-            }
         }
     }
 
diff --git a/build.gradle b/build.gradle
index 6356aab..2d387cb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,10 +2,11 @@
 
 buildscript {
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:3.4.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -14,6 +15,7 @@ buildscript {
 
 allprojects {
     repositories {
+        google()
         jcenter()
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0c71e76..c3b3aa0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip
diff --git a/keepass2AndroidPluginSDK/build.gradle b/keepass2AndroidPluginSDK/build.gradle
index e2b643f..adacb3e 100644
--- a/keepass2AndroidPluginSDK/build.gradle
+++ b/keepass2AndroidPluginSDK/build.gradle
@@ -1,8 +1,7 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 8