diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/albumsonglist/AlbumSongListClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/albumsonglist/AlbumSongListClient.java
index a991402a..2b1d4160 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/albumsonglist/AlbumSongListClient.java
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/albumsonglist/AlbumSongListClient.java
@@ -3,14 +3,13 @@ package com.cappielloantonio.play.subsonic.api.albumsonglist;
 import android.util.Log;
 
 import com.cappielloantonio.play.subsonic.Subsonic;
-import com.cappielloantonio.play.subsonic.api.browsing.BrowsingService;
 import com.cappielloantonio.play.subsonic.models.SubsonicResponse;
+import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory;
 
 import okhttp3.OkHttpClient;
 import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Call;
 import retrofit2.Retrofit;
-import retrofit2.converter.gson.GsonConverterFactory;
 
 public class AlbumSongListClient {
     private static final String TAG = "BrowsingClient";
@@ -24,7 +23,7 @@ public class AlbumSongListClient {
 
         this.retrofit = new Retrofit.Builder()
                 .baseUrl(subsonic.getUrl())
-                .addConverterFactory(GsonConverterFactory.create())
+                .addConverterFactory(TikXmlConverterFactory.create())
                 .client(getOkHttpClient())
                 .build();
 
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/browsing/BrowsingClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/browsing/BrowsingClient.java
index 0b592030..5ca7ee4d 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/browsing/BrowsingClient.java
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/browsing/BrowsingClient.java
@@ -4,12 +4,12 @@ import android.util.Log;
 
 import com.cappielloantonio.play.subsonic.Subsonic;
 import com.cappielloantonio.play.subsonic.models.SubsonicResponse;
+import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory;
 
 import okhttp3.OkHttpClient;
 import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Call;
 import retrofit2.Retrofit;
-import retrofit2.converter.gson.GsonConverterFactory;
 
 public class BrowsingClient {
     private static final String TAG = "BrowsingClient";
@@ -23,7 +23,7 @@ public class BrowsingClient {
 
         this.retrofit = new Retrofit.Builder()
                 .baseUrl(subsonic.getUrl())
-                .addConverterFactory(GsonConverterFactory.create())
+                .addConverterFactory(TikXmlConverterFactory.create())
                 .client(getOkHttpClient())
                 .build();
 
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaretrieval/MediaRetrievalClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaretrieval/MediaRetrievalClient.java
index 017c9d09..3ac686de 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaretrieval/MediaRetrievalClient.java
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaretrieval/MediaRetrievalClient.java
@@ -3,14 +3,13 @@ package com.cappielloantonio.play.subsonic.api.mediaretrieval;
 import android.util.Log;
 
 import com.cappielloantonio.play.subsonic.Subsonic;
-import com.cappielloantonio.play.subsonic.api.playlist.PlaylistService;
 import com.cappielloantonio.play.subsonic.models.SubsonicResponse;
+import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory;
 
 import okhttp3.OkHttpClient;
 import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Call;
 import retrofit2.Retrofit;
-import retrofit2.converter.gson.GsonConverterFactory;
 
 public class MediaRetrievalClient {
     private static final String TAG = "BrowsingClient";
@@ -24,7 +23,7 @@ public class MediaRetrievalClient {
 
         this.retrofit = new Retrofit.Builder()
                 .baseUrl(subsonic.getUrl())
-                .addConverterFactory(GsonConverterFactory.create())
+                .addConverterFactory(TikXmlConverterFactory.create())
                 .client(getOkHttpClient())
                 .build();
 
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/playlist/PlaylistClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/playlist/PlaylistClient.java
index 40fabc1d..26f6df15 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/playlist/PlaylistClient.java
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/playlist/PlaylistClient.java
@@ -3,14 +3,13 @@ package com.cappielloantonio.play.subsonic.api.playlist;
 import android.util.Log;
 
 import com.cappielloantonio.play.subsonic.Subsonic;
-import com.cappielloantonio.play.subsonic.api.albumsonglist.AlbumSongListService;
 import com.cappielloantonio.play.subsonic.models.SubsonicResponse;
+import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory;
 
 import okhttp3.OkHttpClient;
 import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Call;
 import retrofit2.Retrofit;
-import retrofit2.converter.gson.GsonConverterFactory;
 
 public class PlaylistClient {
     private static final String TAG = "BrowsingClient";
@@ -24,7 +23,7 @@ public class PlaylistClient {
 
         this.retrofit = new Retrofit.Builder()
                 .baseUrl(subsonic.getUrl())
-                .addConverterFactory(GsonConverterFactory.create())
+                .addConverterFactory(TikXmlConverterFactory.create())
                 .client(getOkHttpClient())
                 .build();
 
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/searching/SearchingClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/searching/SearchingClient.java
index e553a671..199645da 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/searching/SearchingClient.java
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/searching/SearchingClient.java
@@ -4,12 +4,12 @@ import android.util.Log;
 
 import com.cappielloantonio.play.subsonic.Subsonic;
 import com.cappielloantonio.play.subsonic.models.SubsonicResponse;
+import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory;
 
 import okhttp3.OkHttpClient;
 import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Call;
 import retrofit2.Retrofit;
-import retrofit2.converter.gson.GsonConverterFactory;
 
 public class SearchingClient {
     private static final String TAG = "BrowsingClient";
@@ -23,7 +23,7 @@ public class SearchingClient {
 
         this.retrofit = new Retrofit.Builder()
                 .baseUrl(subsonic.getUrl())
-                .addConverterFactory(GsonConverterFactory.create())
+                .addConverterFactory(TikXmlConverterFactory.create())
                 .client(getOkHttpClient())
                 .build();
 
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/system/SystemClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/system/SystemClient.java
index 14430443..dca32f03 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/system/SystemClient.java
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/system/SystemClient.java
@@ -4,12 +4,13 @@ import android.util.Log;
 
 import com.cappielloantonio.play.subsonic.Subsonic;
 import com.cappielloantonio.play.subsonic.models.SubsonicResponse;
+import com.tickaroo.tikxml.TikXml;
+import com.tickaroo.tikxml.retrofit.TikXmlConverterFactory;
 
 import okhttp3.OkHttpClient;
 import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Call;
 import retrofit2.Retrofit;
-import retrofit2.converter.gson.GsonConverterFactory;
 
 public class SystemClient {
     private static final String TAG = "SystemClient";
@@ -23,7 +24,7 @@ public class SystemClient {
 
         this.retrofit = new Retrofit.Builder()
                 .baseUrl(subsonic.getUrl())
-                .addConverterFactory(GsonConverterFactory.create())
+                .addConverterFactory(TikXmlConverterFactory.create())
                 .client(getOkHttpClient())
                 .build();