diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 8ca4b4b3..5e183b79 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,7 +3,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="LOCAL" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="F:\Android\Android Studio\gradle\gradle-2.14.1" />
         <option name="modules">
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 635999df..53a3fb16 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -24,7 +24,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 68939110..9eb6b723 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion '27.0.0'
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         applicationId "me.impy.aegis"
@@ -28,17 +28,17 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:recyclerview-v7:27.1.0'
-    compile 'com.android.support:appcompat-v7:27.1.0'
-    compile 'com.android.support:design:27.1.0'
-    compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
-    compile 'me.dm7.barcodescanner:zxing:1.9'
-    compile 'com.android.support:cardview-v7:27.1.0'
-    compile 'com.android.support:support-v4:27.1.0'
-    compile 'com.mattprecious.swirl:swirl:1.0.0'
-    compile 'com.madgag.spongycastle:core:1.56.0.0'
-    compile 'com.github.apl-devs:appintro:v4.2.2'
-    compile 'com.getbase:floatingactionbutton:1.10.1'
-    testCompile 'junit:junit:4.12'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:recyclerview-v7:27.1.1'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
+    implementation 'me.dm7.barcodescanner:zxing:1.9'
+    implementation 'com.android.support:cardview-v7:27.1.1'
+    implementation 'com.android.support:support-v4:27.1.1'
+    implementation 'com.mattprecious.swirl:swirl:1.0.0'
+    implementation 'com.madgag.spongycastle:core:1.56.0.0'
+    implementation 'com.github.apl-devs:appintro:v4.2.2'
+    implementation 'com.getbase:floatingactionbutton:1.10.1'
+    testImplementation 'junit:junit:4.12'
 }
diff --git a/app/src/main/java/me/impy/aegis/AegisApplication.java b/app/src/main/java/me/impy/aegis/AegisApplication.java
index 86f92ab7..2e1eb2a5 100644
--- a/app/src/main/java/me/impy/aegis/AegisApplication.java
+++ b/app/src/main/java/me/impy/aegis/AegisApplication.java
@@ -38,11 +38,11 @@ public class AegisApplication extends Application {
 
     public boolean isRunning() {
         // return false the first time this is called
-        if (_running) {
-            return true;
+        if (!_running) {
+            _running = true;
+            return false;
         }
-        _running = true;
-        return false;
+        return true;
     }
 
     @RequiresApi(api = Build.VERSION_CODES.N_MR1)
diff --git a/build.gradle b/build.gradle
index f81445ae..5428f2c5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b911a84b..e0557639 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Dec 10 23:08:10 CET 2017
+#Tue May 08 19:45:12 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip