diff --git a/app/build.gradle b/app/build.gradle
index 9d838ba..f519ddd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,34 +18,35 @@ android {
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            zipAlignEnabled true
+        }
+        debug {
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            zipAlignEnabled true
         }
     }
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-
     implementation "com.android.support:appcompat-v7:$supportLibVersion"
     implementation "com.android.support:design:$supportLibVersion"
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-
     implementation "android.arch.persistence.room:runtime:$archRoomVersion"
     implementation 'com.android.support:support-v4:26.1.0'
     implementation 'com.android.support:recyclerview-v7:26.1.0'
     kapt "android.arch.persistence.room:compiler:$archRoomVersion"
-
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.1'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
-
     implementation 'org.bouncycastle:bcprov-jdk15on:1.58'
-
     implementation 'org.whispersystems:curve25519-android:0.4.1'
-
     implementation 'com.journeyapps:zxing-android-embedded:3.5.0'
     implementation 'com.google.zxing:core:3.3.1'
-
 }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index f1b4245..f64d0d8 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -19,3 +19,12 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+-keep class org.bouncycastle.** { *; }
+-dontwarn org.bouncycastle.**
+-keep class org.whispersystems.** { *; }
+-keep class com.journeyapps.** { *; }
+-keep class com.google.zxing.** { *; }
+-keep class android.arch.persistence.room.** { *; }
+-keep class org.jetbrains.kotlin.** { *; }
+-keep class com.android.support.** { *; }
diff --git a/gradle.properties b/gradle.properties
index 729ebec..766b2f9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx256m
+org.gradle.jvmargs=-Xmx512m
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit