diff --git a/app/build.gradle b/app/build.gradle
index ae2af75..4185b94 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,77 +1,33 @@
 buildscript {
   repositories {
-    mavenCentral()
+    jcenter()
     maven { url "https://jitpack.io" }
+    maven { url "https://maven.google.com" }
   }
   dependencies {
-    classpath 'com.neenbedankt.gradle.plugins:android-apt:1.7'
-    classpath 'com.facebook.testing.screenshot:plugin:0.4.2'
-    classpath 'com.karumi:shot:0.1.2'
+    classpath 'com.android.tools.build:gradle:2.3.3'
   }
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'com.neenbedankt.android-apt'
-apply plugin: 'com.facebook.testing.screenshot'
-apply plugin: 'shot'
-
-android {
-  compileSdkVersion 23
-  buildToolsVersion "23.0.2"
-  defaultConfig {
-    applicationId 'com.karumi.screenshot'
-    minSdkVersion 16
-    targetSdkVersion 23
-    versionCode 1
-    versionName "1.0"
-    testInstrumentationRunner 'com.karumi.screenshot.ScreenshotTestRunner'
-  }
-  buildTypes {
-    release {
-      minifyEnabled false
-    }
-  }
-  lintOptions {
-    abortOnError false
+allprojects {
+  repositories {
+    mavenCentral()
+    maven { url "https://jitpack.io" }
+    maven { url "https://maven.google.com" }
   }
-}
 
-dependencies {
-  compile fileTree(dir: 'libs', include: ['*.jar'])
-  compile 'com.android.support:appcompat-v7:23.1.1'
-  compile 'com.android.support:design:23.1.1'
-  compile 'com.squareup.picasso:picasso:2.5.2'
-  compile 'com.jakewharton:butterknife:7.0.1'
-  compile 'com.google.dagger:dagger:2.0.2'
-  compile 'org.glassfish:javax.annotation:10.0-b28'
-  apt 'com.google.dagger:dagger-compiler:2.0.2'
-  testCompile 'com.google.dagger:dagger-compiler:2.0.2'
-  testCompile 'junit:junit:4.12'
-  androidTestCompile 'com.github.fabioCollini:DaggerMock:0.4'
-  androidTestApt 'com.google.dagger:dagger-compiler:2.0.2'
-  androidTestCompile 'com.google.dexmaker:dexmaker:1.2'
-  androidTestCompile('com.google.dexmaker:dexmaker-mockito:1.2') {
-    exclude group: 'org.hamcrest', module: 'hamcrest-core'
-  }
-  androidTestCompile 'com.android.support.test:runner:0.4.1'
-  androidTestCompile 'com.android.support.test:rules:0.4.1'
-  androidTestCompile 'org.mockito:mockito-core:1.10.19'
-  androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.1') {
-    exclude group: 'javax.inject', module: 'javax.inject'
-    exclude group: 'com.squareup', module: 'javawriter'
-  }
-  androidTestCompile('com.android.support.test.espresso:espresso-contrib:2.2.1') {
-    exclude module: 'support-annotations'
-    exclude module: 'recyclerview-v7'
-    exclude module: 'support-v4'
-  }
-  androidTestCompile('com.android.support.test.espresso:espresso-intents:2.2.1')
-}
+  apply plugin: 'checkstyle'
+
+  task checkstyle(type: Checkstyle) {
+    configFile file("${project.rootDir}/config/checkstyle.xml")
+    source 'src'
+    include '**/*.java'
+    exclude '**/gen/**'
 
-configurations.all {
-  resolutionStrategy.force 'com.android.support:support-annotations:23.0.1'
+    classpath = files()
+  }
 }
 
-shot {
-  appId = 'com.karumi.screenshot'
+task clean(type: Delete) {
+  delete rootProject.buildDir
 }
diff --git a/build.gradle b/build.gradle
index 69f0fe4..8f63ec3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,30 +1,80 @@
+apply plugin: 'com.android.application'
+apply plugin: 'shot'
+
 buildscript {
   repositories {
-    jcenter()
+    mavenCentral()
+    maven { url "https://jitpack.io" }
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:1.5.0'
+    classpath 'com.facebook.testing.screenshot:plugin:0.4.3'
+    classpath 'com.karumi:shot:0.2.0'
   }
 }
 
-allprojects {
-  repositories {
-    jcenter()
-    maven { url "https://jitpack.io" }
-  }
-
-  apply plugin: 'checkstyle'
+ext {
+  supportLibVersion = '25.4.0'
+  espressoVersion = '3.0.1'
+  testLibVersion = '1.0.1'
+}
 
-  task checkstyle(type: Checkstyle) {
-    configFile file("${project.rootDir}/config/checkstyle.xml")
-    source 'src'
-    include '**/*.java'
-    exclude '**/gen/**'
+android {
+  compileSdkVersion 25
+  buildToolsVersion '25.0.2'
+  defaultConfig {
+    applicationId 'com.karumi.screenshot'
+    minSdkVersion 16
+    targetSdkVersion 25
+    versionCode 1
+    versionName "1.0"
+    testInstrumentationRunner 'com.karumi.screenshot.ScreenshotTestRunner'
+  }
+  buildTypes {
+    release {
+      minifyEnabled false
+    }
+  }
+  lintOptions {
+    abortOnError false
+  }
+}
 
-    classpath = files()
+dependencies {
+  compile fileTree(dir: 'libs', include: ['*.jar'])
+  compile "com.android.support:appcompat-v7:$supportLibVersion"
+  compile "com.android.support:design:$supportLibVersion"
+  compile 'com.squareup.picasso:picasso:2.5.2'
+  compile 'com.jakewharton:butterknife:7.0.1'
+  compile 'com.google.dagger:dagger:2.0.2'
+  compile 'org.glassfish:javax.annotation:10.0-b28'
+  annotationProcessor 'com.google.dagger:dagger-compiler:2.0.2'
+  testCompile 'com.google.dagger:dagger-compiler:2.0.2'
+  testCompile 'junit:junit:4.12'
+  androidTestCompile 'com.github.fabioCollini:DaggerMock:0.4'
+  androidTestCompile 'com.google.dagger:dagger-compiler:2.0.2'
+  androidTestCompile 'com.google.dexmaker:dexmaker:1.2'
+  androidTestCompile('com.google.dexmaker:dexmaker-mockito:1.2') {
+    exclude group: 'org.hamcrest', module: 'hamcrest-core'
   }
+  androidTestCompile "com.android.support.test:runner:$testLibVersion"
+  androidTestCompile "com.android.support.test:rules:$testLibVersion"
+  androidTestCompile 'org.mockito:mockito-core:1.10.19'
+  androidTestCompile("com.android.support.test.espresso:espresso-core:$espressoVersion") {
+    exclude group: 'javax.inject', module: 'javax.inject'
+    exclude group: 'com.squareup', module: 'javawriter'
+  }
+  androidTestCompile("com.android.support.test.espresso:espresso-contrib:$espressoVersion") {
+    exclude module: 'support-annotations'
+    exclude module: 'recyclerview-v7'
+    exclude module: 'support-v4'
+  }
+  androidTestCompile "com.android.support.test.espresso:espresso-intents:$espressoVersion"
 }
 
-task clean(type: Delete) {
-  delete rootProject.buildDir
+configurations.all {
+  resolutionStrategy.force "com.android.support:support-annotations:$supportLibVersion"
 }
+
+shot {
+  appId = 'com.karumi.screenshot.uid'
+}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f23df6e..4c38d9f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Oct 21 11:34:03 PDT 2015
+#Fri Sep 22 10:58:33 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip