diff --git a/.travis.yml b/.travis.yml
index b44c7af9..a34ad472 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,5 +38,5 @@ cache:
     - $HOME/.gradle/wrapper/
 
 script:
-  - ./gradlew lintVitalRelease
+  - ./gradlew lint
   - ./gradlew buildNative assembleDebug
diff --git a/README.md b/README.md
index 6ac99e2d..b98d3340 100644
--- a/README.md
+++ b/README.md
@@ -6,9 +6,7 @@
 
 A wrapper of [Syncthing](https://github.com/syncthing/syncthing) for Android.
 
-<img src="src/main/play/en-GB/listing/phoneScreenshots/screenshot_phone_1.png" alt="screenshot 1" width="200" />
-<img src="src/main/play/en-GB/listing/phoneScreenshots/screenshot_phone_2.png" alt="screenshot 2" width="200" />
-<img src="src/main/play/en-GB/listing/phoneScreenshots/screenshot_phone_3.png" alt="screenshot 3" width="200" />
+<img src="app/src/main/play/en-GB/listing/phoneScreenshots/screenshot_phone_1.png" alt="screenshot 1" width="200" /> <img src="app/src/main/play/en-GB/listing/phoneScreenshots/screenshot_phone_2.png" alt="screenshot 2" width="200" /> <img src="app/src/main/play/en-GB/listing/phoneScreenshots/screenshot_phone_3.png" alt="screenshot 3" width="200" />
 
 [<img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" height="80">](https://play.google.com/store/apps/details?id=com.nutomic.syncthingandroid) [<img alt="Get it on F-Droid" src="https://f-droid.org/badge/get-it-on.png" height="80">](https://f-droid.org/app/com.nutomic.syncthingandroid)
 
diff --git a/app/build.gradle b/app/build.gradle
index 936b9809..55c92ccb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,21 +1,22 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.github.ben-manes.versions'
 apply plugin: 'com.github.triplet.play'
+apply plugin: 'me.tatarka.retrolambda'
 
 dependencies {
-    implementation 'eu.chainfire:libsuperuser:1.0.0.201704021214'
-    implementation 'com.android.support:design:27.0.1'
-    implementation 'com.google.zxing:android-integration:3.3.0'
-    implementation 'com.google.code.gson:gson:2.8.2'
-    implementation 'org.mindrot:jbcrypt:0.4'
-    implementation 'com.google.guava:guava:20.0'
-    implementation 'com.annimon:stream:1.1.9'
-    implementation 'com.android.volley:volley:1.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    implementation "com.google.dagger:dagger:2.13"
+    compile 'eu.chainfire:libsuperuser:1.0.0.201704021214'
+    compile 'com.android.support:design:27.0.1'
+    compile 'com.google.zxing:android-integration:3.3.0'
+    compile 'com.google.code.gson:gson:2.8.2'
+    compile 'org.mindrot:jbcrypt:0.4'
+    compile 'com.google.guava:guava:20.0'
+    compile 'com.annimon:stream:1.1.9'
+    compile 'com.android.volley:volley:1.0.0'
+    compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    compile "com.google.dagger:dagger:2.13"
     annotationProcessor "com.google.dagger:dagger-compiler:2.13"
-    androidTestImplementation 'com.android.support.test:rules:1.0.1'
-    androidTestImplementation 'com.android.support:support-annotations:27.0.1'
+    androidTestCompile 'com.android.support.test:rules:1.0.1'
+    androidTestCompile 'com.android.support:support-annotations:27.0.1'
 }
 
 android {
@@ -42,9 +43,12 @@ android {
 
     signingConfigs {
         release {
-            storeFile file(RELEASE_STORE_FILE)
+            storeFile = {
+                def path = System.getenv("SYNCTHING_RELEASE_STORE_FILE")
+                return (path) ? file(path) : null
+            }()
             storePassword System.getenv("SIGNING_PASSWORD") ?: ""
-            keyAlias RELEASE_KEY_ALIAS
+            keyAlias System.getenv("SYNCTHING_RELEASE_KEY_ALIAS") ?: ""
             keyPassword System.getenv("SIGNING_PASSWORD") ?: ""
         }
     }
diff --git a/build.gradle b/build.gradle
index 6f247262..05a0ece3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,9 +8,10 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.github.triplet.gradle:play-publisher:1.2.0'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0'
+        classpath 'me.tatarka:gradle-retrolambda:3.7.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle.properties b/gradle.properties
deleted file mode 100644
index 397f0a0d..00000000
--- a/gradle.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-android.useDeprecatedNdk=true
-org.gradle.jvmargs=-Xmx2048M
-RELEASE_STORE_FILE=/home/felix/workspace/android.keystore
-RELEASE_KEY_ALIAS=android
\ No newline at end of file