diff --git a/app/build.gradle b/app/build.gradle
index 7d19f30..f9a5bc2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -37,14 +37,15 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:27.1.1'
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    testCompile 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.12'
 
     implementation(name: 'matrix-sdk', ext: 'aar')
-    implementation(name: 'olm-sdk', ext: 'aar')
+    implementation(name: 'matrix-sdk-core', ext: 'aar')
+    implementation(name: 'matrix-sdk-crypto', ext: 'aar')
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.squareup.retrofit2:retrofit:2.4.0'
diff --git a/app/libs/matrix-sdk-core.aar b/app/libs/matrix-sdk-core.aar
new file mode 100644
index 0000000..ec3cf3a
Binary files /dev/null and b/app/libs/matrix-sdk-core.aar differ
diff --git a/app/libs/matrix-sdk-crypto.aar b/app/libs/matrix-sdk-crypto.aar
new file mode 100644
index 0000000..8ef9235
Binary files /dev/null and b/app/libs/matrix-sdk-crypto.aar differ
diff --git a/app/libs/matrix-sdk.aar b/app/libs/matrix-sdk.aar
index 11a1bfc..17b9fab 100644
Binary files a/app/libs/matrix-sdk.aar and b/app/libs/matrix-sdk.aar differ
diff --git a/app/libs/olm-sdk.aar b/app/libs/olm-sdk.aar
deleted file mode 100644
index 552650a..0000000
Binary files a/app/libs/olm-sdk.aar and /dev/null differ
diff --git a/app/src/main/java/eu/droogers/smsmatrix/EventListener.java b/app/src/main/java/eu/droogers/smsmatrix/EventListener.java
index 665e217..f06a2f6 100644
--- a/app/src/main/java/eu/droogers/smsmatrix/EventListener.java
+++ b/app/src/main/java/eu/droogers/smsmatrix/EventListener.java
@@ -6,9 +6,10 @@ import org.matrix.androidsdk.data.MyUser;
 import org.matrix.androidsdk.data.RoomState;
 import org.matrix.androidsdk.listeners.IMXEventListener;
 import org.matrix.androidsdk.rest.model.Event;
-import org.matrix.androidsdk.rest.model.MatrixError;
+import org.matrix.androidsdk.core.model.MatrixError;
 import org.matrix.androidsdk.rest.model.User;
 import org.matrix.androidsdk.rest.model.bingrules.BingRule;
+import org.matrix.androidsdk.rest.model.sync.AccountDataElement;
 
 import java.util.List;
 
@@ -52,7 +53,7 @@ public class EventListener implements IMXEventListener {
 
     @Override
     public void onLiveEvent(Event event, RoomState roomState) {
-        if (loaded == true) {
+        if (loaded) {
 //            mx.getUnreadEvents();
             mx.sendEvent(event);
         }
@@ -75,12 +76,12 @@ public class EventListener implements IMXEventListener {
     }
 
     @Override
-    public void onEventDecrypted(Event event) {
+    public void onEventSent(Event event, String s) {
 
     }
 
     @Override
-    public void onEventSent(Event event, String s) {
+    public void onEventDecrypted(String s, String s1) {
 
     }
 
@@ -197,7 +198,7 @@ public class EventListener implements IMXEventListener {
     }
 
     @Override
-    public void onAccountDataUpdated() {
+    public void onAccountDataUpdated(AccountDataElement accountDataElement) {
 
     }
 }
diff --git a/app/src/main/java/eu/droogers/smsmatrix/Matrix.java b/app/src/main/java/eu/droogers/smsmatrix/Matrix.java
index 4e42bb1..be74969 100644
--- a/app/src/main/java/eu/droogers/smsmatrix/Matrix.java
+++ b/app/src/main/java/eu/droogers/smsmatrix/Matrix.java
@@ -25,11 +25,11 @@ import org.matrix.androidsdk.data.store.MXFileStore;
 import org.matrix.androidsdk.data.store.MXMemoryStore;
 import org.matrix.androidsdk.listeners.IMXEventListener;
 import org.matrix.androidsdk.listeners.MXMediaUploadListener;
-import org.matrix.androidsdk.rest.callback.SimpleApiCallback;
+import org.matrix.androidsdk.core.callback.SimpleApiCallback;
+import org.matrix.androidsdk.core.model.MatrixError;
 import org.matrix.androidsdk.rest.client.LoginRestClient;
 import org.matrix.androidsdk.rest.model.CreatedEvent;
 import org.matrix.androidsdk.rest.model.Event;
-import org.matrix.androidsdk.rest.model.MatrixError;
 import org.matrix.androidsdk.rest.model.message.Message;
 import org.matrix.androidsdk.rest.model.login.Credentials;
 
diff --git a/build.gradle b/build.gradle
index 7627606..d4969fa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.5.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "io.realm:realm-gradle-plugin:5.8.0"
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e7b8a20..7b74055 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Jan 27 22:19:41 CET 2019
+#Fri Oct 11 22:28:14 EEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip