diff --git a/app/build.gradle b/app/build.gradle
index 50c665d7..09d7a97a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -83,6 +83,7 @@ dependencies {
 
     implementation 'com.github.AdrienPoupa:jaudiotagger:2.2.3'
 
-    implementation project(':apiclient')
-    implementation project(':library')
+    implementation 'com.github.jellyfin:jellyfin-apiclient-java:-SNAPSHOT'
+    //implementation project(':apiclient')
+    //implementation project(':library')
 }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/LoginActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/LoginActivity.java
index cba07990..d67d33ca 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/LoginActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/LoginActivity.java
@@ -18,7 +18,6 @@ import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity;
 
 import org.jellyfin.apiclient.interaction.AndroidCredentialProvider;
 import org.jellyfin.apiclient.interaction.ConnectionResult;
-import org.jellyfin.apiclient.interaction.GsonJsonSerializer;
 import org.jellyfin.apiclient.interaction.Response;
 import org.jellyfin.apiclient.interaction.VolleyHttpClient;
 import org.jellyfin.apiclient.interaction.connectionmanager.ConnectionManager;
@@ -26,6 +25,7 @@ import org.jellyfin.apiclient.interaction.http.IAsyncHttpClient;
 import org.jellyfin.apiclient.logging.AndroidLogger;
 import org.jellyfin.apiclient.model.apiclient.ServerCredentials;
 import org.jellyfin.apiclient.model.logging.ILogger;
+import org.jellyfin.apiclient.model.serialization.GsonJsonSerializer;
 import org.jellyfin.apiclient.model.serialization.IJsonSerializer;
 import org.jellyfin.apiclient.model.users.AuthenticationResult;
 
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SplashActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SplashActivity.java
index d317eb0c..6207ccc1 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SplashActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SplashActivity.java
@@ -10,14 +10,13 @@ import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity;
 
 import org.jellyfin.apiclient.interaction.AndroidCredentialProvider;
 import org.jellyfin.apiclient.interaction.ConnectionResult;
-import org.jellyfin.apiclient.interaction.GsonJsonSerializer;
 import org.jellyfin.apiclient.interaction.Response;
 import org.jellyfin.apiclient.interaction.VolleyHttpClient;
 import org.jellyfin.apiclient.interaction.connectionmanager.ConnectionManager;
 import org.jellyfin.apiclient.interaction.http.IAsyncHttpClient;
 import org.jellyfin.apiclient.logging.AndroidLogger;
-import org.jellyfin.apiclient.model.apiclient.ConnectionState;
 import org.jellyfin.apiclient.model.logging.ILogger;
+import org.jellyfin.apiclient.model.serialization.GsonJsonSerializer;
 import org.jellyfin.apiclient.model.serialization.IJsonSerializer;
 
 import butterknife.ButterKnife;