diff --git a/app/build.gradle b/app/build.gradle
index 0ad6a423d..388487092 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -128,60 +128,58 @@ android {
 }
 
 configurations {
-    freeDebugCompile
-    freeReleaseCompile
-    playDebugCompile
-    playReleaseCompile
+    freeDebugImplementation
+    freeReleaseImplementation
+    playDebugImplementation
+    playReleaseImplementation
 }
 
 dependencies {
-    ///freeDebugCompile project(path: ":core", configuration: "freeDebug")
-    ///freeReleaseCompile project(path: ":core", configuration: "freeRelease")
-    freeCompile project(":core")
+    freeImplementation project(":core")
     // free build hack: skip some dependencies
     if (!doFreeBuild()) {
-        ///playDebugCompile project(path: ":core", configuration: "playDebug")
-        ///playReleaseCompile project(path: ":core", configuration: "playRelease")
-        playCompile project(":core")
+        playImplementation project(":core")
     } else {
         System.out.println("app: free build hack, skipping some dependencies")
     }
-    compile "com.android.support:support-v4:$supportVersion"
-    compile "com.android.support:appcompat-v7:$supportVersion"
-    compile "com.android.support:design:$supportVersion"
-    compile "com.android.support:gridlayout-v7:$supportVersion"
-    compile "com.android.support:percent:$supportVersion"
-    compile "com.android.support:recyclerview-v7:$supportVersion"
-    compile "org.apache.commons:commons-lang3:$commonslangVersion"
-    compile("org.shredzone.flattr4j:flattr4j-core:$flattr4jVersion") {
+    implementation "com.android.support:support-v4:$supportVersion"
+    implementation "com.android.support:appcompat-v7:$supportVersion"
+    implementation "com.android.support:design:$supportVersion"
+    implementation "com.android.support:gridlayout-v7:$supportVersion"
+    implementation "com.android.support:percent:$supportVersion"
+    implementation "com.android.support:recyclerview-v7:$supportVersion"
+    implementation "org.apache.commons:commons-lang3:$commonslangVersion"
+    implementation("org.shredzone.flattr4j:flattr4j-core:$flattr4jVersion") {
         exclude group: "org.json", module: "json"
     }
-    compile "commons-io:commons-io:$commonsioVersion"
-    compile "org.jsoup:jsoup:$jsoupVersion"
-    compile "com.github.bumptech.glide:glide:$glideVersion"
-    compile "com.squareup.okhttp3:okhttp:$okhttpVersion"
-    compile "com.squareup.okhttp3:okhttp-urlconnection:$okhttpVersion"
-    compile "com.squareup.okio:okio:$okioVersion"
-    compile "de.greenrobot:eventbus:$eventbusVersion"
-    compile "io.reactivex:rxandroid:$rxAndroidVersion"
-    compile "io.reactivex:rxjava:$rxJavaVersion"
+    implementation "commons-io:commons-io:$commonsioVersion"
+    implementation "org.jsoup:jsoup:$jsoupVersion"
+    implementation "com.github.bumptech.glide:glide:$glideVersion"
+    implementation "com.squareup.okhttp3:okhttp:$okhttpVersion"
+    implementation "com.squareup.okhttp3:okhttp-urlconnection:$okhttpVersion"
+    implementation "com.squareup.okio:okio:$okioVersion"
+    implementation "de.greenrobot:eventbus:$eventbusVersion"
+    implementation "io.reactivex:rxandroid:$rxAndroidVersion"
+    implementation "io.reactivex:rxjava:$rxJavaVersion"
     // And ProGuard rules for RxJava!
-    compile "com.artemzin.rxjava:proguard-rules:$rxJavaRulesVersion"
-    compile "com.joanzapata.iconify:android-iconify-fontawesome:$iconifyVersion"
-    compile "com.joanzapata.iconify:android-iconify-material:$iconifyVersion"
-    compile("com.afollestad.material-dialogs:commons:$materialDialogsVersion") {
+    implementation "com.artemzin.rxjava:proguard-rules:$rxJavaRulesVersion"
+    implementation "com.joanzapata.iconify:android-iconify-fontawesome:$iconifyVersion"
+    implementation "com.joanzapata.iconify:android-iconify-material:$iconifyVersion"
+    implementation("com.afollestad.material-dialogs:commons:$materialDialogsVersion") {
         transitive = true
     }
-    compile "com.yqritc:recyclerview-flexibledivider:$recyclerviewFlexibledividerVersion"
-    compile("com.githang:viewpagerindicator:2.5@aar") {
+    implementation "com.yqritc:recyclerview-flexibledivider:$recyclerviewFlexibledividerVersion"
+    implementation("com.githang:viewpagerindicator:2.5@aar") {
         exclude module: "support-v4"
     }
 
-    compile "com.github.shts:TriangleLabelView:$triangleLabelViewVersion"
+    implementation "com.github.shts:TriangleLabelView:$triangleLabelViewVersion"
 
-    compile "com.github.AntennaPod:AntennaPod-AudioPlayer:$audioPlayerVersion"
+    implementation "com.github.AntennaPod:AntennaPod-AudioPlayer:$audioPlayerVersion"
 
-    compile 'com.github.mfietz:fyydlin:v0.3'
+    implementation 'com.github.mfietz:fyydlin:v0.3'
+
+    androidTestImplementation "com.jayway.android.robotium:robotium-solo:$robotiumSoloVersion"
 }
 
 play {
diff --git a/core/build.gradle b/core/build.gradle
index c2317e850..3abb24942 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -48,32 +48,32 @@ repositories {
 }
 
 dependencies {
-    compile "com.android.support:support-v4:$supportVersion"
-    compile "com.android.support:appcompat-v7:$supportVersion"
-    compile "org.apache.commons:commons-lang3:$commonslangVersion"
-    compile ("org.shredzone.flattr4j:flattr4j-core:$flattr4jVersion") {
+    implementation "com.android.support:support-v4:$supportVersion"
+    implementation "com.android.support:appcompat-v7:$supportVersion"
+    implementation "org.apache.commons:commons-lang3:$commonslangVersion"
+    implementation ("org.shredzone.flattr4j:flattr4j-core:$flattr4jVersion") {
         exclude group: "org.json", module: "json"
     }
-    compile "commons-io:commons-io:$commonsioVersion"
-    compile "com.jayway.android.robotium:robotium-solo:$robotiumSoloVersion"
-    compile "org.jsoup:jsoup:$jsoupVersion"
-    compile "com.github.bumptech.glide:glide:$glideVersion"
-    compile "com.github.bumptech.glide:okhttp3-integration:$glideOkhttpIntegrationVersion@aar"
-    compile "com.squareup.okhttp3:okhttp:$okhttpVersion"
-    compile "com.squareup.okhttp3:okhttp-urlconnection:$okhttpVersion"
-    compile "com.squareup.okio:okio:$okioVersion"
-    compile "de.greenrobot:eventbus:$eventbusVersion"
-    compile "io.reactivex:rxandroid:$rxAndroidVersion"
+    implementation "commons-io:commons-io:$commonsioVersion"
+    implementation "com.jayway.android.robotium:robotium-solo:$robotiumSoloVersion"
+    implementation "org.jsoup:jsoup:$jsoupVersion"
+    implementation "com.github.bumptech.glide:glide:$glideVersion"
+    implementation "com.github.bumptech.glide:okhttp3-integration:$glideOkhttpIntegrationVersion@aar"
+    implementation "com.squareup.okhttp3:okhttp:$okhttpVersion"
+    implementation "com.squareup.okhttp3:okhttp-urlconnection:$okhttpVersion"
+    implementation "com.squareup.okio:okio:$okioVersion"
+    implementation "de.greenrobot:eventbus:$eventbusVersion"
+    implementation "io.reactivex:rxandroid:$rxAndroidVersion"
 
-    compile "com.github.AntennaPod:AntennaPod-AudioPlayer:$audioPlayerVersion"
+    implementation "com.github.AntennaPod:AntennaPod-AudioPlayer:$audioPlayerVersion"
 
     // Add casting features
     // free build hack: skip some dependencies
     if (!doFreeBuild()) {
-        playCompile "com.google.android.libraries.cast.companionlibrary:ccl:$castCompanionLibVer"
-        compile "com.android.support:mediarouter-v7:$supportVersion"
-        playCompile "com.google.android.gms:play-services-cast:$playServicesVersion"
-        compile "com.google.android.support:wearable:$wearableSupportVersion"
+        playApi "com.google.android.libraries.cast.companionlibrary:ccl:$castCompanionLibVer"
+        api "com.android.support:mediarouter-v7:$supportVersion"
+        playApi "com.google.android.gms:play-services-cast:$playServicesVersion"
+        api "com.google.android.support:wearable:$wearableSupportVersion"
     } else {
         System.out.println("core: free build hack, skipping some dependencies")
     }