diff --git a/app/build.gradle b/app/build.gradle
index 98b3ade9b..377ac445d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -288,6 +288,8 @@ dependencies {
 
     implementation 'androidx.core:core-ktx:1.12.0'
 
+    implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0")
+
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:5.10.0'
     androidTestImplementation 'org.mockito:mockito-android:5.10.0'
diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
index ae9e06c6d..cab4d3647 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -4629,7 +4629,7 @@ class ChatActivity :
         when (recent.systemMessageType) {
             ChatMessage.SystemMessageType.CALL_STARTED -> { // add CallStartedMessage with id -2
                 if (!callStarted) {
-                    val callStartedChatMessage = ChatMessage()
+                    val callStartedChatMessage = ChatMessage(token = "0")
                     callStartedChatMessage.jsonMessageId = CALL_STARTED_ID
                     callStartedChatMessage.actorId = "-2"
                     val name = if (recent.actorDisplayName.isNullOrEmpty()) "Guest" else recent.actorDisplayName
diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/BrowserFile.kt b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/BrowserFile.kt
index 789987df7..8919c4f81 100644
--- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/BrowserFile.kt
+++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/BrowserFile.kt
@@ -29,7 +29,7 @@ import at.bitfire.dav4jvm.property.GetContentType
 import at.bitfire.dav4jvm.property.GetLastModified
 import at.bitfire.dav4jvm.property.ResourceType
 import at.bitfire.dav4jvm.property.ResourceType.Companion.COLLECTION
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.components.filebrowser.models.properties.NCEncrypted
 import com.nextcloud.talk.components.filebrowser.models.properties.NCPermission
 import com.nextcloud.talk.components.filebrowser.models.properties.NCPreview
@@ -41,7 +41,7 @@ import kotlinx.parcelize.Parcelize
 import java.io.File
 
 @Parcelize
-@JsonObject
+@Serializable
 data class BrowserFile(
     var path: String? = null,
     var displayName: String? = null,
diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.kt b/app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.kt
index cb1760bc2..ce023c745 100644
--- a/app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.kt
+++ b/app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.kt
@@ -23,6 +23,7 @@ import android.content.Context
 import android.text.TextUtils
 import android.util.Log
 import com.github.aurae.retrofit2.LoganSquareConverterFactory
+import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
 import com.nextcloud.talk.BuildConfig
 import com.nextcloud.talk.R
 import com.nextcloud.talk.api.NcApi
@@ -37,6 +38,7 @@ import com.nextcloud.talk.utils.ssl.TrustManager
 import dagger.Module
 import dagger.Provides
 import io.reactivex.schedulers.Schedulers
+import kotlinx.serialization.json.Json
 import okhttp3.Authenticator
 import okhttp3.Cache
 import okhttp3.Credentials.basic
@@ -44,6 +46,7 @@ import okhttp3.Dispatcher
 import okhttp3.Interceptor
 import okhttp3.Interceptor.Chain
 import okhttp3.JavaNetCookieJar
+import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -100,11 +103,14 @@ class RestModule(private val context: Context) {
     @Singleton
     @Provides
     fun provideRetrofit(httpClient: OkHttpClient?): Retrofit {
+        val contentType = "application/json".toMediaType()
+
         val retrofitBuilder = Retrofit.Builder()
             .client(httpClient!!)
             .baseUrl("https://nextcloud.com")
             .addCallAdapterFactory(RxJava2CallAdapterFactory.createWithScheduler(Schedulers.io()))
-            .addConverterFactory(LoganSquareConverterFactory.create())
+            // .addConverterFactory(LoganSquareConverterFactory.create())
+            .addConverterFactory(Json.asConverterFactory(contentType));
         return retrofitBuilder.build()
     }
 
diff --git a/app/src/main/java/com/nextcloud/talk/data/user/model/User.kt b/app/src/main/java/com/nextcloud/talk/data/user/model/User.kt
index 4ce808e3e..d529923f1 100644
--- a/app/src/main/java/com/nextcloud/talk/data/user/model/User.kt
+++ b/app/src/main/java/com/nextcloud/talk/data/user/model/User.kt
@@ -26,9 +26,11 @@ import com.nextcloud.talk.models.json.capabilities.ServerVersion
 import com.nextcloud.talk.models.json.push.PushConfigurationState
 import com.nextcloud.talk.utils.ApiUtils
 import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.Serializable
 import java.lang.Boolean.FALSE
 
 @Parcelize
+@Serializable
 data class User(
     var id: Long? = null,
     var userId: String? = null,
diff --git a/app/src/main/java/com/nextcloud/talk/models/ExternalSignalingServer.kt b/app/src/main/java/com/nextcloud/talk/models/ExternalSignalingServer.kt
index d4caf8a6d..4dc95b8fd 100644
--- a/app/src/main/java/com/nextcloud/talk/models/ExternalSignalingServer.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/ExternalSignalingServer.kt
@@ -22,16 +22,16 @@
 package com.nextcloud.talk.models
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class ExternalSignalingServer(
-    @JsonField(name = ["externalSignalingServer"])
+    @SerialName("externalSignalingServer")
     var externalSignalingServer: String? = null,
-    @JsonField(name = ["externalSignalingTicket"])
+    @SerialName("externalSignalingTicket")
     var externalSignalingTicket: String? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/RingtoneSettings.kt b/app/src/main/java/com/nextcloud/talk/models/RingtoneSettings.kt
index 004a48501..933cf4466 100644
--- a/app/src/main/java/com/nextcloud/talk/models/RingtoneSettings.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/RingtoneSettings.kt
@@ -23,19 +23,19 @@ package com.nextcloud.talk.models
 
 import android.net.Uri
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.converters.UriTypeConverter
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class RingtoneSettings(
-    @JsonField(name = ["ringtoneUri"], typeConverter = UriTypeConverter::class)
-    var ringtoneUri: Uri? = null,
-    @JsonField(name = ["ringtoneName"])
+    @SerialName("ringtoneUri", typeConverter = UriTypeConverter::class)
+    // var ringtoneUri: Uri? = null,
+    @SerialName("ringtoneName")
     var ringtoneName: String? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
-    constructor() : this(null, null)
+    constructor() : this(null)
 }
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOCS.kt
index 9473b31bc..1d4e5b8a1 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOCS.kt
@@ -24,17 +24,15 @@
 package com.nextcloud.talk.models.json.autocomplete
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class AutocompleteOCS(
-    @JsonField(name = ["meta"])
     var meta: GenericMeta?,
-    @JsonField(name = ["data"])
     var data: List<AutocompleteUser>?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOverall.kt
index 4976a219d..3bed4cb28 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOverall.kt
@@ -22,14 +22,13 @@
 package com.nextcloud.talk.models.json.autocomplete
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class AutocompleteOverall(
-    @JsonField(name = ["ocs"])
     var ocs: AutocompleteOCS?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteUser.kt b/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteUser.kt
index 6e66c9d7b..f796fe35b 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteUser.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteUser.kt
@@ -22,18 +22,15 @@
 package com.nextcloud.talk.models.json.autocomplete
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class AutocompleteUser(
-    @JsonField(name = ["id"])
     var id: String?,
-    @JsonField(name = ["label"])
     var label: String?,
-    @JsonField(name = ["source"])
     var source: String?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/Capabilities.kt b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/Capabilities.kt
index 23026a8ad..be6bc461e 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/Capabilities.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/Capabilities.kt
@@ -24,26 +24,26 @@
 package com.nextcloud.talk.models.json.capabilities
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class Capabilities(
-    @JsonField(name = ["core"])
+    @SerialName("core")
     var coreCapability: CoreCapability?,
-    @JsonField(name = ["spreed"])
+    @SerialName("spreed")
     var spreedCapability: SpreedCapability?,
-    @JsonField(name = ["notifications"])
+    @SerialName("notifications")
     var notificationsCapability: NotificationsCapability?,
-    @JsonField(name = ["theming"])
+    @SerialName("theming")
     var themingCapability: ThemingCapability?,
-    @JsonField(name = ["external"])
+    @SerialName("external")
     var externalCapability: HashMap<String, List<String>>?,
-    @JsonField(name = ["provisioning_api"])
+    @SerialName("provisioning_api")
     var provisioningCapability: ProvisioningCapability?,
-    @JsonField(name = ["user_status"])
+    @SerialName("user_status")
     var userStatusCapability: UserStatusCapability?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesList.kt b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesList.kt
index 1b0560afa..38a7a01b0 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesList.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesList.kt
@@ -22,16 +22,16 @@
 package com.nextcloud.talk.models.json.capabilities
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class CapabilitiesList(
-    @JsonField(name = ["version"])
+    @SerialName("version")
     var serverVersion: ServerVersion?,
-    @JsonField(name = ["capabilities"])
+    @SerialName("capabilities")
     var capabilities: Capabilities?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOCS.kt
index fffe8a9af..82fc430a0 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOCS.kt
@@ -24,17 +24,17 @@
 package com.nextcloud.talk.models.json.capabilities
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class CapabilitiesOCS(
-    @JsonField(name = ["meta"])
+    @SerialName("meta")
     var meta: GenericMeta?,
-    @JsonField(name = ["data"])
+    @SerialName("data")
     var data: CapabilitiesList?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOverall.kt
index 636846e70..764b3e477 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOverall.kt
@@ -22,14 +22,14 @@
 package com.nextcloud.talk.models.json.capabilities
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class CapabilitiesOverall(
-    @JsonField(name = ["ocs"])
+    @SerialName("ocs")
     var ocs: CapabilitiesOCS? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CoreCapability.kt b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CoreCapability.kt
index 09a1ad7a5..92e3e1869 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CoreCapability.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CoreCapability.kt
@@ -20,22 +20,20 @@
 package com.nextcloud.talk.models.json.capabilities
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
 @Serializable
 data class CoreCapability(
-    @JsonField(name = ["pollinterval"])
+    @SerialName("pollinterval")
     var pollInterval: Int?,
-    @JsonField(name = ["webdav-root"])
+    @SerialName("webdav-root")
     var webdavRoot: String?,
-    @JsonField(name = ["reference-api"])
+    @SerialName("reference-api")
     var referenceApi: String?,
-    @JsonField(name = ["reference-regex"])
+    @SerialName("reference-regex")
     var referenceRegex: String?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/NotificationsCapability.kt b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/NotificationsCapability.kt
index e32fe0bd7..c57c889bf 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/NotificationsCapability.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/NotificationsCapability.kt
@@ -22,16 +22,14 @@
 package com.nextcloud.talk.models.json.capabilities
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
 @Serializable
 data class NotificationsCapability(
-    @JsonField(name = ["ocs-endpoints"])
+    @SerialName("ocs-endpoints")
     var features: List<String>?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/ProvisioningCapability.kt b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/ProvisioningCapability.kt
index 637ad7384..baeb47bae 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/ProvisioningCapability.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/ProvisioningCapability.kt
@@ -22,16 +22,14 @@
 package com.nextcloud.talk.models.json.capabilities
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
 @Serializable
 data class ProvisioningCapability(
-    @JsonField(name = ["AccountPropertyScopesVersion"])
+    @SerialName("AccountPropertyScopesVersion")
     var accountPropertyScopesVersion: Int?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/RoomCapabilitiesOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/RoomCapabilitiesOCS.kt
index 193dff529..11114e6dc 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/RoomCapabilitiesOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/RoomCapabilitiesOCS.kt
@@ -24,17 +24,15 @@
 package com.nextcloud.talk.models.json.capabilities
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class RoomCapabilitiesOCS(
-    @JsonField(name = ["meta"])
     var meta: GenericMeta?,
-    @JsonField(name = ["data"])
     var data: SpreedCapability?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/RoomCapabilitiesOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/RoomCapabilitiesOverall.kt
index aa7234929..5b59ccce6 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/RoomCapabilitiesOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/RoomCapabilitiesOverall.kt
@@ -22,14 +22,13 @@
 package com.nextcloud.talk.models.json.capabilities
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class RoomCapabilitiesOverall(
-    @JsonField(name = ["ocs"])
     var ocs: RoomCapabilitiesOCS? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/ServerVersion.kt b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/ServerVersion.kt
index 0685e0690..f77113aa8 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/ServerVersion.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/ServerVersion.kt
@@ -20,20 +20,17 @@
 package com.nextcloud.talk.models.json.capabilities
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class ServerVersion(
-    @JsonField(name = ["major"])
     var major: Int = 0,
-    @JsonField(name = ["minor"])
     var minor: Int = 0,
-    @JsonField(name = ["micro"])
     var micro: Int = 0,
-    @JsonField(name = ["string"])
+    @SerialName("string")
     var versionString: String? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.kt b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.kt
index 9fa43fcbb..d8ece3952 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.kt
@@ -22,21 +22,19 @@
 package com.nextcloud.talk.models.json.capabilities
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.RawValue
 import kotlinx.serialization.Contextual
-import kotlinx.serialization.Serializable
 
 @Parcelize
-@JsonObject
 @Serializable
 data class SpreedCapability(
-    @JsonField(name = ["features"])
+    @SerialName("features")
     var features: List<String>?,
-    @JsonField(name = ["config"])
+    @SerialName("config")
     var config: HashMap<
         String,
         HashMap<
@@ -46,7 +44,7 @@ data class SpreedCapability(
             Any
             >
         >?,
-    @JsonField(name = ["version"])
+    @SerialName("version")
     var version: String
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/ThemingCapability.kt b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/ThemingCapability.kt
index 35d78dd24..9549e6ebb 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/ThemingCapability.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/ThemingCapability.kt
@@ -22,38 +22,31 @@
 package com.nextcloud.talk.models.json.capabilities
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
 @Serializable
 data class ThemingCapability(
-    @JsonField(name = ["name"])
     var name: String?,
-    @JsonField(name = ["url"])
     var url: String?,
-    @JsonField(name = ["slogan"])
     var slogan: String?,
-    @JsonField(name = ["color"])
     var color: String?,
-    @JsonField(name = ["color-text"])
+    @SerialName("color-text")
     var colorText: String?,
-    @JsonField(name = ["color-element"])
+    @SerialName("color-element")
     var colorElement: String?,
-    @JsonField(name = ["color-element-bright"])
+    @SerialName("color-element-bright")
     var colorElementBright: String?,
-    @JsonField(name = ["color-element-dark"])
+    @SerialName("color-element-dark")
     var colorElementDark: String?,
-    @JsonField(name = ["logo"])
     var logo: String?,
-    @JsonField(name = ["background"])
+    @SerialName("background")
     var background: String?,
-    @JsonField(name = ["background-plain"])
+    @SerialName("background-plain")
     var backgroundPlain: Boolean?,
-    @JsonField(name = ["background-default"])
+    @SerialName("background-default")
     var backgroundDefault: Boolean?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/UserStatusCapability.kt b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/UserStatusCapability.kt
index 47f100bf3..b46a9ee21 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/UserStatusCapability.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/UserStatusCapability.kt
@@ -22,18 +22,15 @@
 package com.nextcloud.talk.models.json.capabilities
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
 @Serializable
 data class UserStatusCapability(
-    @JsonField(name = ["enabled"])
     var enabled: Boolean,
-    @JsonField(name = ["supports_emoji"])
+    @SerialName("supports_emoji")
     var supportsEmoji: Boolean
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt
index dc285504c..a0f303db3 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt
@@ -28,24 +28,26 @@ package com.nextcloud.talk.models.json.chat
 import android.os.Parcelable
 import android.text.TextUtils
 import android.util.Log
-import com.bluelinelabs.logansquare.annotation.JsonField
+import kotlinx.serialization.SerialName
 import com.bluelinelabs.logansquare.annotation.JsonIgnore
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.R
 import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
 import com.nextcloud.talk.data.user.model.User
 import com.nextcloud.talk.models.json.chat.ChatUtils.Companion.getParsedMessage
 import com.nextcloud.talk.models.json.converters.EnumSystemMessageTypeConverter
+import com.nextcloud.talk.models.json.converters.KotlinxJodaTimeConverter
 import com.nextcloud.talk.utils.ApiUtils
 import com.nextcloud.talk.utils.CapabilitiesUtil
 import com.stfalcon.chatkit.commons.models.IUser
 import com.stfalcon.chatkit.commons.models.MessageContentType
 import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.Transient
 import java.security.MessageDigest
 import java.util.Date
 
 @Parcelize
-@JsonObject
+@Serializable
 data class ChatMessage(
     @JsonIgnore
     var isGrouped: Boolean = false,
@@ -65,72 +67,74 @@ data class ChatMessage(
     @JsonIgnore
     var isDeleted: Boolean = false,
 
-    @JsonField(name = ["id"])
+    @SerialName("id")
     var jsonMessageId: Int = 0,
 
     @JsonIgnore
     var previousMessageId: Int = -1,
 
-    @JsonField(name = ["token"])
-    var token: String? = null,
+    @SerialName("token")
+    var token: String = "",
 
     // guests or users
-    @JsonField(name = ["actorType"])
+    @SerialName("actorType")
     var actorType: String? = null,
 
-    @JsonField(name = ["actorId"])
+    @SerialName("actorId")
     var actorId: String? = null,
 
     // send when crafting a message
-    @JsonField(name = ["actorDisplayName"])
+    @SerialName("actorDisplayName")
     var actorDisplayName: String? = null,
 
-    @JsonField(name = ["timestamp"])
+    @SerialName("timestamp")
     var timestamp: Long = 0,
 
     // send when crafting a message, max 1000 lines
-    @JsonField(name = ["message"])
+    @SerialName("message")
     var message: String? = null,
 
-    @JsonField(name = ["messageParameters"])
+    @SerialName("messageParameters")
     var messageParameters: HashMap<String?, HashMap<String?, String?>>? = null,
 
-    @JsonField(name = ["systemMessage"], typeConverter = EnumSystemMessageTypeConverter::class)
+    @SerialName("systemMessage")
+    // @Serializable(with = EnumSystemMessageTypeConverter::class)
     var systemMessageType: SystemMessageType? = null,
 
-    @JsonField(name = ["isReplyable"])
+    @SerialName("isReplyable")
     var replyable: Boolean = false,
 
-    @JsonField(name = ["parent"])
+    @SerialName("parent")
     var parentMessage: ChatMessage? = null,
 
+    @Transient
     var readStatus: Enum<ReadStatus> = ReadStatus.NONE,
 
-    @JsonField(name = ["messageType"])
+    @SerialName("messageType")
     var messageType: String? = null,
 
-    @JsonField(name = ["reactions"])
+    @SerialName("reactions")
     var reactions: LinkedHashMap<String, Int>? = null,
 
-    @JsonField(name = ["reactionsSelf"])
+    @SerialName("reactionsSelf")
     var reactionsSelf: ArrayList<String>? = null,
 
-    @JsonField(name = ["expirationTimestamp"])
+    @SerialName("expirationTimestamp")
     var expirationTimestamp: Int = 0,
 
-    @JsonField(name = ["markdown"])
+    @SerialName("markdown")
     var renderMarkdown: Boolean? = null,
 
-    @JsonField(name = ["lastEditActorDisplayName"])
+    @SerialName("lastEditActorDisplayName")
     var lastEditActorDisplayName: String? = null,
 
-    @JsonField(name = ["lastEditActorId"])
+    @SerialName("lastEditActorId")
     var lastEditActorId: String? = null,
 
-    @JsonField(name = ["lastEditActorType"])
+    @SerialName("lastEditActorType")
     var lastEditActorType: String? = null,
 
-    @JsonField(name = ["lastEditTimestamp"])
+    @SerialName("lastEditTimestamp")
     var lastEditTimestamp: Long = 0,
 
     var isDownloadingVoiceMessage: Boolean = false,
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCS.kt
index 5cb67f1a7..6823a2f3a 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCS.kt
@@ -22,17 +22,17 @@
 package com.nextcloud.talk.models.json.chat
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class ChatOCS(
-    @JsonField(name = ["meta"])
+    @SerialName("meta")
     var meta: GenericMeta?,
-    @JsonField(name = ["data"])
+    @SerialName("data")
     var data: List<ChatMessage>? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCSSingleMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCSSingleMessage.kt
index eb12998ae..f0c37da10 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCSSingleMessage.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCSSingleMessage.kt
@@ -22,17 +22,17 @@
 package com.nextcloud.talk.models.json.chat
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class ChatOCSSingleMessage(
-    @JsonField(name = ["meta"])
+    @SerialName("meta")
     var meta: GenericMeta?,
-    @JsonField(name = ["data"])
+    @SerialName("data")
     var data: ChatMessage? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverall.kt
index 9378f1c5f..eb3c94dd5 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverall.kt
@@ -22,14 +22,14 @@
 package com.nextcloud.talk.models.json.chat
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class ChatOverall(
-    @JsonField(name = ["ocs"])
+    @SerialName("ocs")
     var ocs: ChatOCS? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverallSingleMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverallSingleMessage.kt
index f0aca47b9..6ec53eb98 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverallSingleMessage.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverallSingleMessage.kt
@@ -22,14 +22,14 @@
 package com.nextcloud.talk.models.json.chat
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class ChatOverallSingleMessage(
-    @JsonField(name = ["ocs"])
+    @SerialName("ocs")
     var ocs: ChatOCSSingleMessage? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOCS.kt
index 417426d27..fc316b89f 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOCS.kt
@@ -22,15 +22,15 @@
 package com.nextcloud.talk.models.json.chat
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import java.util.HashMap
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class ChatShareOCS(
-    @JsonField(name = ["data"])
+    @SerialName("data")
     var data: HashMap<String, ChatMessage>? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOverall.kt
index 2e0612ced..d17d53e8a 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOverall.kt
@@ -22,14 +22,14 @@
 package com.nextcloud.talk.models.json.chat
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class ChatShareOverall(
-    @JsonField(name = ["ocs"])
+    @SerialName("ocs")
     var ocs: ChatShareOCS? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOverviewOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOverviewOCS.kt
index cdae47620..77daf5c82 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOverviewOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOverviewOCS.kt
@@ -22,19 +22,19 @@
 package com.nextcloud.talk.models.json.chat
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.AnyParceler
 import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.TypeParceler
 import java.util.HashMap
 
 @Parcelize
-@JsonObject
+@Serializable
 @TypeParceler<Any, AnyParceler>
 data class ChatShareOverviewOCS(
-    @JsonField(name = ["data"])
-    var data: HashMap<String, List<Any>>? = null
+    @SerialName("data")
+    var data: HashMap<String, List<ChatMessage>>? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
     constructor() : this(null)
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOverviewOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOverviewOverall.kt
index 93da5ed48..e41b61866 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOverviewOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOverviewOverall.kt
@@ -22,14 +22,14 @@
 package com.nextcloud.talk.models.json.chat
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class ChatShareOverviewOverall(
-    @JsonField(name = ["ocs"])
+    @SerialName("ocs")
     var ocs: ChatShareOverviewOCS? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt b/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt
index 97ec35660..0eebfd7fd 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt
@@ -26,8 +26,8 @@
 package com.nextcloud.talk.models.json.conversations
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.data.user.model.User
 import com.nextcloud.talk.models.domain.ConversationModel
 import com.nextcloud.talk.models.json.chat.ChatMessage
@@ -44,129 +44,126 @@ import com.nextcloud.talk.utils.CapabilitiesUtil
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class Conversation(
-    @JsonField(name = ["id"])
+    @SerialName("id")
     var roomId: String? = null,
-    @JsonField(name = ["token"])
+    @SerialName("token")
     var token: String? = null,
-    @JsonField(name = ["name"])
+    @SerialName("name")
     var name: String? = null,
-    @JsonField(name = ["displayName"])
+    @SerialName("displayName")
     var displayName: String? = null,
-    @JsonField(name = ["description"])
+    @SerialName("description")
     var description: String? = null,
-    @JsonField(name = ["type"], typeConverter = EnumRoomTypeConverter::class)
+    @SerialName("type", typeConverter = EnumRoomTypeConverter::class)
     var type: ConversationType? = null,
-    @JsonField(name = ["lastPing"])
+    @SerialName("lastPing")
     var lastPing: Long = 0,
-    @JsonField(name = ["participantType"], typeConverter = EnumParticipantTypeConverter::class)
+    @SerialName("participantType", typeConverter = EnumParticipantTypeConverter::class)
     var participantType: ParticipantType? = null,
-    @JsonField(name = ["hasPassword"])
+    @SerialName("hasPassword")
     var hasPassword: Boolean = false,
-    @JsonField(name = ["sessionId"])
+    @SerialName("sessionId")
     var sessionId: String? = null,
-    @JsonField(name = ["actorId"])
+    @SerialName("actorId")
     var actorId: String? = null,
-    @JsonField(name = ["actorType"])
+    @SerialName("actorType")
     var actorType: String? = null,
 
     var password: String? = null,
 
-    @JsonField(name = ["isFavorite"])
+    @SerialName("isFavorite")
     var favorite: Boolean = false,
 
-    @JsonField(name = ["lastActivity"])
+    @SerialName("lastActivity")
     var lastActivity: Long = 0,
 
-    @JsonField(name = ["unreadMessages"])
+    @SerialName("unreadMessages")
     var unreadMessages: Int = 0,
 
-    @JsonField(name = ["unreadMention"])
+    @SerialName("unreadMention")
     var unreadMention: Boolean = false,
 
-    @JsonField(name = ["lastMessage"])
+    @SerialName("lastMessage")
     var lastMessage: ChatMessage? = null,
 
-    @JsonField(name = ["objectType"], typeConverter = ConversationObjectTypeConverter::class)
+    @SerialName("objectType", typeConverter = ConversationObjectTypeConverter::class)
     var objectType: ObjectType? = null,
 
-    @JsonField(name = ["notificationLevel"], typeConverter = EnumNotificationLevelConverter::class)
+    @SerialName("notificationLevel", typeConverter = EnumNotificationLevelConverter::class)
     var notificationLevel: NotificationLevel? = null,
 
-    @JsonField(name = ["readOnly"], typeConverter = EnumReadOnlyConversationConverter::class)
+    @SerialName("readOnly", typeConverter = EnumReadOnlyConversationConverter::class)
     var conversationReadOnlyState: ConversationReadOnlyState? = null,
 
-    @JsonField(name = ["lobbyState"], typeConverter = EnumLobbyStateConverter::class)
+    @SerialName("lobbyState", typeConverter = EnumLobbyStateConverter::class)
     var lobbyState: LobbyState? = null,
 
-    @JsonField(name = ["lobbyTimer"])
+    @SerialName("lobbyTimer")
     var lobbyTimer: Long? = null,
 
-    @JsonField(name = ["lastReadMessage"])
+    @SerialName("lastReadMessage")
     var lastReadMessage: Int = 0,
 
-    @JsonField(name = ["hasCall"])
+    @SerialName("hasCall")
     var hasCall: Boolean = false,
 
-    @JsonField(name = ["callFlag"])
+    @SerialName("callFlag")
     var callFlag: Int = 0,
 
-    @JsonField(name = ["canStartCall"])
+    @SerialName("canStartCall")
     var canStartCall: Boolean = false,
 
-    @JsonField(name = ["canLeaveConversation"])
+    @SerialName("canLeaveConversation")
     var canLeaveConversation: Boolean? = null,
 
-    @JsonField(name = ["canDeleteConversation"])
+    @SerialName("canDeleteConversation")
     var canDeleteConversation: Boolean? = null,
 
-    @JsonField(name = ["unreadMentionDirect"])
+    @SerialName("unreadMentionDirect")
     var unreadMentionDirect: Boolean? = null,
 
-    @JsonField(name = ["notificationCalls"])
+    @SerialName("notificationCalls")
     var notificationCalls: Int? = null,
 
-    @JsonField(name = ["permissions"])
+    @SerialName("permissions")
     var permissions: Int = 0,
 
-    @JsonField(name = ["messageExpiration"])
+    @SerialName("messageExpiration")
     var messageExpiration: Int = 0,
 
-    @JsonField(name = ["status"])
+    @SerialName("status")
     var status: String? = null,
 
-    @JsonField(name = ["statusIcon"])
+    @SerialName("statusIcon")
     var statusIcon: String? = null,
 
-    @JsonField(name = ["statusMessage"])
+    @SerialName("statusMessage")
     var statusMessage: String? = null,
 
-    @JsonField(name = ["statusClearAt"])
+    @SerialName("statusClearAt")
     var statusClearAt: Long? = 0,
 
-    @JsonField(name = ["callRecording"])
+    @SerialName("callRecording")
     var callRecording: Int = 0,
 
-    @JsonField(name = ["avatarVersion"])
+    @SerialName("avatarVersion")
     var avatarVersion: String? = null,
 
     // Be aware that variables with "is" at the beginning will lead to the error:
-    // "@JsonField annotation can only be used on private fields if both getter and setter are present."
+    // "//@JsonField annotation can only be used on private fields if both getter and setter are present."
     // Instead, name it with "has" at the beginning: isCustomAvatar -> hasCustomAvatar
-    @JsonField(name = ["isCustomAvatar"])
+    @SerialName("isCustomAvatar")
     var hasCustomAvatar: Boolean? = null,
 
-    @JsonField(name = ["callStartTime"])
     var callStartTime: Long? = null,
 
-    @JsonField(name = ["recordingConsent"])
+    @SerialName("recordingConsent")
     var recordingConsentRequired: Int = 0,
 
-    @JsonField(name = ["remoteServer"])
     var remoteServer: String? = null,
 
-    @JsonField(name = ["remoteToken"])
     var remoteToken: String? = null
 
 ) : Parcelable {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOCS.kt
index 6a7eb5aaa..abe292ebb 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOCS.kt
@@ -22,17 +22,15 @@
 package com.nextcloud.talk.models.json.conversations
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class RoomOCS(
-    @JsonField(name = ["meta"])
     var meta: GenericMeta?,
-    @JsonField(name = ["data"])
     var data: Conversation? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOverall.kt
index ef5574c84..3d0cbf257 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOverall.kt
@@ -22,14 +22,13 @@
 package com.nextcloud.talk.models.json.conversations
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class RoomOverall(
-    @JsonField(name = ["ocs"])
     var ocs: RoomOCS? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOCS.kt
index 8672b99bd..f35abf9c5 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOCS.kt
@@ -22,17 +22,15 @@
 package com.nextcloud.talk.models.json.conversations
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class RoomsOCS(
-    @JsonField(name = ["meta"])
     var meta: GenericMeta?,
-    @JsonField(name = ["data"])
     var data: List<Conversation>? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOverall.kt
index 83c6de9b4..ebe104d4a 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOverall.kt
@@ -22,14 +22,14 @@
 package com.nextcloud.talk.models.json.conversations
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class RoomsOverall(
-    @JsonField(name = ["ocs"])
+    @SerialName("ocs")
     var ocs: RoomsOCS? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/password/PasswordData.kt b/app/src/main/java/com/nextcloud/talk/models/json/conversations/password/PasswordData.kt
index b11fb201d..993c113d9 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/password/PasswordData.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/conversations/password/PasswordData.kt
@@ -21,14 +21,13 @@
 package com.nextcloud.talk.models.json.conversations.password
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
-@JsonObject
+@Serializable
 @Parcelize
 data class PasswordData(
-    @JsonField(name = ["message"])
     var message: String? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/password/PasswordOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/conversations/password/PasswordOCS.kt
index d2c68ae15..d7e22bd0b 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/password/PasswordOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/conversations/password/PasswordOCS.kt
@@ -21,18 +21,15 @@
 package com.nextcloud.talk.models.json.conversations.password
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class PasswordOCS(
-    @JsonField(name = ["meta"])
     var meta: GenericMeta? = null,
-
-    @JsonField(name = ["data"])
     var data: PasswordData? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/password/PasswordOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/conversations/password/PasswordOverall.kt
index e91e259ab..942846709 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/password/PasswordOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/conversations/password/PasswordOverall.kt
@@ -21,14 +21,13 @@
 package com.nextcloud.talk.models.json.conversations.password
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class PasswordOverall(
-    @JsonField(name = ["ocs"])
     var ocs: PasswordOCS? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericMeta.kt b/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericMeta.kt
index 4d145d6bf..b2fd344d6 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericMeta.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericMeta.kt
@@ -22,18 +22,20 @@
 package com.nextcloud.talk.models.json.generic
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.SerialName
 
 @Parcelize
-@JsonObject(serializeNullObjects = true)
+// @Serializable(serializeNullObjects = true)
+@Serializable
 data class GenericMeta(
-    @JsonField(name = ["status"])
+    @SerialName("status")
     var status: String? = null,
-    @JsonField(name = ["statuscode"])
+    @SerialName("statuscode")
     var statusCode: Int = 0,
-    @JsonField(name = ["message"])
+    @SerialName("message")
     var message: String? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOCS.kt
index b3cc3361a..c9fefbcda 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOCS.kt
@@ -22,14 +22,14 @@
 package com.nextcloud.talk.models.json.generic
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class GenericOCS(
-    @JsonField(name = ["meta"])
+    @SerialName("meta")
     var meta: GenericMeta? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOverall.kt
index 2cfaeaa75..94e5c7213 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOverall.kt
@@ -22,14 +22,14 @@
 package com.nextcloud.talk.models.json.generic
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class GenericOverall(
-    @JsonField(name = ["ocs"])
+    @SerialName("ocs")
     var ocs: GenericOCS? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/generic/Status.kt b/app/src/main/java/com/nextcloud/talk/models/json/generic/Status.kt
index 0e2e46402..ab2d08c6d 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/generic/Status.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/generic/Status.kt
@@ -22,32 +22,32 @@
 package com.nextcloud.talk.models.json.generic
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class Status(
-    @JsonField(name = ["installed"])
+    @SerialName("installed")
     var installed: Boolean = false,
 
-    @JsonField(name = ["maintenance"])
+    @SerialName("maintenance")
     var maintenance: Boolean = false,
 
-    @JsonField(name = ["upgrade"])
+    @SerialName("upgrade")
     var needsUpgrade: Boolean = false,
 
-    @JsonField(name = ["version"])
+    @SerialName("version")
     var version: String? = null,
 
-    @JsonField(name = ["versionstring"])
+    @SerialName("versionstring")
     var versionString: String? = null,
 
-    @JsonField(name = ["edition"])
+    @SerialName("edition")
     var edition: String? = null,
 
-    @JsonField(name = ["productname"])
+    @SerialName("productname")
     var productName: String? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCard.kt b/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCard.kt
index a90603849..b9815e478 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCard.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCard.kt
@@ -20,18 +20,18 @@
 package com.nextcloud.talk.models.json.hovercard
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class HoverCard(
-    @JsonField(name = ["userId"])
+    @SerialName("userId")
     var userId: String?,
-    @JsonField(name = ["displayName"])
+    @SerialName("displayName")
     var displayName: String?,
-    @JsonField(name = ["actions"])
+    @SerialName("actions")
     var actions: List<HoverCardAction>?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCardAction.kt b/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCardAction.kt
index 9d4b60fdc..696a45063 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCardAction.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCardAction.kt
@@ -20,20 +20,20 @@
 package com.nextcloud.talk.models.json.hovercard
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class HoverCardAction(
-    @JsonField(name = ["title"])
+    @SerialName("title")
     var title: String?,
-    @JsonField(name = ["icon"])
+    @SerialName("icon")
     var icon: String?,
-    @JsonField(name = ["hyperlink"])
+    @SerialName("hyperlink")
     var hyperlink: String?,
-    @JsonField(name = ["appId"])
+    @SerialName("appId")
     var appId: String?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCardOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCardOCS.kt
index 19083c657..09d7dfd44 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCardOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCardOCS.kt
@@ -23,17 +23,17 @@
 package com.nextcloud.talk.models.json.hovercard
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class HoverCardOCS(
-    @JsonField(name = ["meta"])
+    @SerialName("meta")
     var meta: GenericMeta?,
-    @JsonField(name = ["data"])
+    @SerialName("data")
     var data: HoverCard?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCardOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCardOverall.kt
index 3e073d2fd..5fcbe7d30 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCardOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCardOverall.kt
@@ -19,12 +19,11 @@
  */
 package com.nextcloud.talk.models.json.hovercard
 
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
-@JsonObject
+@Serializable
 data class HoverCardOverall(
-    @JsonField(name = ["ocs"])
     var ocs: HoverCardOCS?
 ) {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/invitation/Invitation.kt b/app/src/main/java/com/nextcloud/talk/models/json/invitation/Invitation.kt
index 56fbc2373..60ac130bd 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/invitation/Invitation.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/invitation/Invitation.kt
@@ -20,34 +20,23 @@
 package com.nextcloud.talk.models.json.invitation
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class Invitation(
-    @JsonField(name = ["id"])
     var id: Int = 0,
-    @JsonField(name = ["userId"])
     var userId: String? = null,
-    @JsonField(name = ["state"])
     var state: Int = 0,
-    @JsonField(name = ["localRoomId"])
     var localRoomId: Int = 0,
-    @JsonField(name = ["accessToken"])
     var accessToken: String? = null,
-    @JsonField(name = ["remoteServerUrl"])
     var remoteServerUrl: String? = null,
-    @JsonField(name = ["remoteToken"])
     var remoteToken: String? = null,
-    @JsonField(name = ["remoteAttendeeId"])
     var remoteAttendeeId: Int = 0,
-    @JsonField(name = ["inviterCloudId"])
     var inviterCloudId: String? = null,
-    @JsonField(name = ["inviterDisplayName"])
     var inviterDisplayName: String? = null,
-    @JsonField(name = ["roomName"])
     var roomName: String? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/invitation/InvitationOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/invitation/InvitationOCS.kt
index 1bc86ea02..33aa31cf7 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/invitation/InvitationOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/invitation/InvitationOCS.kt
@@ -20,17 +20,15 @@
 package com.nextcloud.talk.models.json.invitation
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class InvitationOCS(
-    @JsonField(name = ["meta"])
     var meta: GenericMeta?,
-    @JsonField(name = ["data"])
     var data: List<Invitation>?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/invitation/InvitationOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/invitation/InvitationOverall.kt
index 9c133c064..ee13cdac9 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/invitation/InvitationOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/invitation/InvitationOverall.kt
@@ -20,14 +20,13 @@
 package com.nextcloud.talk.models.json.invitation
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class InvitationOverall(
-    @JsonField(name = ["ocs"])
     var ocs: InvitationOCS?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/mention/Mention.kt b/app/src/main/java/com/nextcloud/talk/models/json/mention/Mention.kt
index 740c72fe9..fb2a6ad76 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/mention/Mention.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/mention/Mention.kt
@@ -22,25 +22,25 @@
 package com.nextcloud.talk.models.json.mention
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class Mention(
-    @JsonField(name = ["id"])
+    @SerialName("id")
     var id: String?,
-    @JsonField(name = ["label"])
+    @SerialName("label")
     var label: String?,
     // type of user (guests or users or calls)
-    @JsonField(name = ["source"])
+    @SerialName("source")
     var source: String?,
-    @JsonField(name = ["status"])
+    @SerialName("status")
     var status: String?,
-    @JsonField(name = ["statusIcon"])
+    @SerialName("statusIcon")
     var statusIcon: String?,
-    @JsonField(name = ["statusMessage"])
+    @SerialName("statusMessage")
     var statusMessage: String?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOCS.kt
index 5851cdee3..f6740b391 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOCS.kt
@@ -24,17 +24,17 @@
 package com.nextcloud.talk.models.json.mention
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class MentionOCS(
-    @JsonField(name = ["meta"])
+    @SerialName("meta")
     var meta: GenericMeta?,
-    @JsonField(name = ["data"])
+    @SerialName("data")
     var data: List<Mention>?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOverall.kt
index a3d39d1c5..c8e5ce3e6 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOverall.kt
@@ -22,14 +22,13 @@
 package com.nextcloud.talk.models.json.mention
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class MentionOverall(
-    @JsonField(name = ["ocs"])
     var ocs: MentionOCS?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/notifications/Notification.kt b/app/src/main/java/com/nextcloud/talk/models/json/notifications/Notification.kt
index 86b6cf27c..f10b3c8a4 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/notifications/Notification.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/notifications/Notification.kt
@@ -22,44 +22,34 @@
 package com.nextcloud.talk.models.json.notifications
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import com.nextcloud.talk.models.json.converters.KotlinxJodaTimeConverter
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.converters.LoganSquareJodaTimeConverter
 import kotlinx.parcelize.Parcelize
 import org.joda.time.DateTime
 
 @Parcelize
-@JsonObject
+@Serializable
 data class Notification(
-    @JsonField(name = ["icon"])
     var icon: String?,
-    @JsonField(name = ["notification_id"])
+    @SerialName("notification_id")
     var notificationId: Int?,
-    @JsonField(name = ["app"])
     var app: String?,
-    @JsonField(name = ["user"])
     var user: String?,
-    @JsonField(name = ["datetime"], typeConverter = LoganSquareJodaTimeConverter::class)
+    @Serializable(with = KotlinxJodaTimeConverter::class)
     var datetime: DateTime?,
-    @JsonField(name = ["object_type"])
+    @SerialName("object_type")
     var objectType: String?,
-    @JsonField(name = ["object_id"])
+    @SerialName("object_id")
     var objectId: String?,
-    @JsonField(name = ["subject"])
     var subject: String?,
-    @JsonField(name = ["subjectRich"])
     var subjectRich: String?,
-    @JsonField(name = ["subjectRichParameters"])
     var subjectRichParameters: HashMap<String, HashMap<String, String>>?,
-    @JsonField(name = ["message"])
     var message: String?,
-    @JsonField(name = ["messageRich"])
     var messageRich: String?,
-    @JsonField(name = ["messageRichParameters"])
     var messageRichParameters: HashMap<String?, HashMap<String?, String?>>?,
-    @JsonField(name = ["link"])
     var link: String?,
-    @JsonField(name = ["actions"])
     var actions: List<NotificationAction>?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationAction.kt b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationAction.kt
index cb06eb837..d987a9b1f 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationAction.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationAction.kt
@@ -22,20 +22,16 @@
 package com.nextcloud.talk.models.json.notifications
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class NotificationAction(
-    @JsonField(name = ["label"])
     var label: String?,
-    @JsonField(name = ["link"])
     var link: String?,
-    @JsonField(name = ["type"])
     var type: String?,
-    @JsonField(name = ["primary"])
     var primary: Boolean
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOCS.kt
index 4745ffaa7..04ac59fa6 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOCS.kt
@@ -22,17 +22,16 @@
 package com.nextcloud.talk.models.json.notifications
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class NotificationOCS(
-    @JsonField(name = ["meta"])
     var meta: GenericMeta?,
-    @JsonField(name = ["data"])
+    @SerialName("data")
     var notification: Notification?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOverall.kt
index 5c5fb2287..9b42ad25f 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOverall.kt
@@ -21,14 +21,13 @@
  */
 package com.nextcloud.talk.models.json.notifications
 
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 // see https://github.com/nextcloud/notifications/blob/master/docs/ocs-endpoint-v2.md
 
-@JsonObject
+@Serializable
 data class NotificationOverall(
-    @JsonField(name = ["ocs"])
     var ocs: NotificationOCS?
 ) {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationRichObject.kt b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationRichObject.kt
index e4eff410e..9d655fd48 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationRichObject.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationRichObject.kt
@@ -22,18 +22,16 @@
 package com.nextcloud.talk.models.json.notifications
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 class NotificationRichObject(
-    @JsonField(name = ["id"])
+    @SerialName("id")
     var label: String?,
-    @JsonField(name = ["type"])
     var type: String?,
-    @JsonField(name = ["name"])
     var name: String?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOCS.kt
index 94f3280ac..ff41f862d 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOCS.kt
@@ -24,17 +24,16 @@
 package com.nextcloud.talk.models.json.notifications
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 class NotificationsOCS(
-    @JsonField(name = ["meta"])
     var meta: GenericMeta?,
-    @JsonField(name = ["data"])
+    @SerialName("data")
     var notificationsList: List<Notification>?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOverall.kt
index cc5a94569..afea6ade4 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOverall.kt
@@ -21,12 +21,11 @@
  */
 package com.nextcloud.talk.models.json.notifications
 
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
-@JsonObject
+@Serializable
 class NotificationsOverall(
-    @JsonField(name = ["ocs"])
     var ocs: NotificationsOCS?
 ) {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphOCS.kt
index 941d849a6..de1df5f04 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphOCS.kt
@@ -20,17 +20,15 @@
 package com.nextcloud.talk.models.json.opengraph
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class OpenGraphOCS(
-    @JsonField(name = ["meta"])
     var meta: GenericMeta?,
-    @JsonField(name = ["data"])
     var data: OpenGraphResponse?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphObject.kt b/app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphObject.kt
index 3150eaecf..2c6837615 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphObject.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphObject.kt
@@ -20,22 +20,17 @@
 package com.nextcloud.talk.models.json.opengraph
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class OpenGraphObject(
-    @JsonField(name = ["id"])
     var id: String,
-    @JsonField(name = ["name"])
     var name: String,
-    @JsonField(name = ["description"])
     var description: String? = null,
-    @JsonField(name = ["thumb"])
     var thumb: String? = null,
-    @JsonField(name = ["link"])
     var link: String? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphOverall.kt
index fae9653b2..ab8a5a78d 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphOverall.kt
@@ -20,14 +20,13 @@
 package com.nextcloud.talk.models.json.opengraph
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class OpenGraphOverall(
-    @JsonField(name = ["ocs"])
     var ocs: OpenGraphOCS? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphResponse.kt b/app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphResponse.kt
index 07be4c527..e2e596f82 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphResponse.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphResponse.kt
@@ -20,14 +20,13 @@
 package com.nextcloud.talk.models.json.opengraph
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class OpenGraphResponse(
-    @JsonField(name = ["references"])
     var references: HashMap<String, Reference>?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/opengraph/Reference.kt b/app/src/main/java/com/nextcloud/talk/models/json/opengraph/Reference.kt
index b9652110e..593af6232 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/opengraph/Reference.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/opengraph/Reference.kt
@@ -20,20 +20,16 @@
 package com.nextcloud.talk.models.json.opengraph
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class Reference(
-    @JsonField(name = ["richObjectType"])
     var richObjectType: String? = null,
-    @JsonField(name = ["richObject"])
     var richObject: RichObject? = null,
-    @JsonField(name = ["openGraphObject"])
     var openGraphObject: OpenGraphObject? = null,
-    @JsonField(name = ["accessible"])
     var accessible: Boolean
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/opengraph/RichObject.kt b/app/src/main/java/com/nextcloud/talk/models/json/opengraph/RichObject.kt
index c9697429d..a1f3bdcfb 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/opengraph/RichObject.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/opengraph/RichObject.kt
@@ -20,22 +20,17 @@
 package com.nextcloud.talk.models.json.opengraph
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class RichObject(
-    @JsonField(name = ["id"])
     var id: String,
-    @JsonField(name = ["name"])
     var name: String,
-    @JsonField(name = ["description"])
     var description: String? = null,
-    @JsonField(name = ["thumb"])
     var thumb: String? = null,
-    @JsonField(name = ["link"])
     var link: String? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOCS.kt
index fef24a6e6..6092309cc 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOCS.kt
@@ -22,19 +22,17 @@
 package com.nextcloud.talk.models.json.participants
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.conversations.Conversation
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class AddParticipantOCS(
-    @JsonField(name = ["meta"])
     var meta: GenericMeta?,
     /* Returned room will have only type set, and sometimes even that will be null */
-    @JsonField(name = ["data"])
     var data: Conversation? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOverall.kt
index 8fee65813..bea37acff 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOverall.kt
@@ -22,15 +22,14 @@
 package com.nextcloud.talk.models.json.participants
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.conversations.RoomsOCS
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class AddParticipantOverall(
-    @JsonField(name = ["ocs"])
     var ocs: RoomsOCS? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/participants/Participant.kt b/app/src/main/java/com/nextcloud/talk/models/json/participants/Participant.kt
index 68f0c7bf9..dfd96b5de 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/participants/Participant.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/participants/Participant.kt
@@ -22,72 +22,51 @@
 package com.nextcloud.talk.models.json.participants
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.converters.EnumActorTypeConverter
 import com.nextcloud.talk.models.json.converters.EnumParticipantTypeConverter
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class Participant(
-    @JsonField(name = ["attendeeId"])
     var attendeeId: Long? = null,
 
-    @JsonField(name = ["actorType"], typeConverter = EnumActorTypeConverter::class)
+    @SerialName("actorType"], typeConverter = EnumActorTypeConverter::class)
     var actorType: ActorType? = null,
 
-    @JsonField(name = ["actorId"])
     var actorId: String? = null,
 
-    @JsonField(name = ["attendeePin"])
     var attendeePin: String? = null,
 
     @Deprecated("")
-    @JsonField(name = ["userId"])
     var userId: String? = null,
 
-    @JsonField(name = ["internal"])
     var internal: Boolean? = null,
 
-    @JsonField(name = ["type", "participantType"], typeConverter = EnumParticipantTypeConverter::class)
+    @SerialName("type", "participantType"], typeConverter = EnumParticipantTypeConverter::class)
     var type: ParticipantType? = null,
 
     @Deprecated("")
-    @JsonField(name = ["name"])
     var name: String? = null,
 
-    @JsonField(name = ["displayName"])
     var displayName: String? = null,
 
-    @JsonField(name = ["lastPing"])
     var lastPing: Long = 0,
 
     @Deprecated("")
-    @JsonField(name = ["sessionId"])
     var sessionId: String? = null,
 
-    @JsonField(name = ["sessionIds"])
     var sessionIds: ArrayList<String> = ArrayList(0),
 
     @Deprecated("")
-    @JsonField(name = ["roomId"])
     var roomId: Long = 0,
-
-    @JsonField(name = ["inCall"])
     var inCall: Long = 0,
-
-    @JsonField(name = ["status"])
     var status: String? = null,
-
-    @JsonField(name = ["statusIcon"])
     var statusIcon: String? = null,
-
-    @JsonField(name = ["statusMessage"])
     var statusMessage: String? = null,
-
     var source: String? = null,
-
     var selected: Boolean = false
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOCS.kt
index 0b0af271c..1c0ff262a 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOCS.kt
@@ -22,17 +22,15 @@
 package com.nextcloud.talk.models.json.participants
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class ParticipantsOCS(
-    @JsonField(name = ["meta"])
     var meta: GenericMeta?,
-    @JsonField(name = ["data"])
     var data: List<Participant>? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOverall.kt
index cc69f6320..b4fc849b1 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOverall.kt
@@ -22,14 +22,13 @@
 package com.nextcloud.talk.models.json.participants
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class ParticipantsOverall(
-    @JsonField(name = ["ocs"])
     var ocs: ParticipantsOCS? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.kt
index 9ff9b3a32..cc3d9f80d 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.kt
@@ -20,39 +20,39 @@
 package com.nextcloud.talk.models.json.push
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
+import kotlinx.serialization.SerialName
 import com.bluelinelabs.logansquare.annotation.JsonIgnore
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class DecryptedPushMessage(
-    @JsonField(name = ["app"])
+    @SerialName("app")
     var app: String?,
 
-    @JsonField(name = ["type"])
+    @SerialName("type")
     var type: String?,
 
-    @JsonField(name = ["subject"])
+    @SerialName("subject")
     var subject: String,
 
-    @JsonField(name = ["id"])
+    @SerialName("id")
     var id: String?,
 
-    @JsonField(name = ["nid"])
+    @SerialName("nid")
     var notificationId: Long?,
 
-    @JsonField(name = ["nids"])
+    @SerialName("nids")
     var notificationIds: LongArray?,
 
-    @JsonField(name = ["delete"])
+    @SerialName("delete")
     var delete: Boolean,
 
-    @JsonField(name = ["delete-all"])
+    @SerialName("delete-all")
     var deleteAll: Boolean,
 
-    @JsonField(name = ["delete-multiple"])
+    @SerialName("delete-multiple")
     var deleteMultiple: Boolean,
 
     @JsonIgnore
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/push/NotificationUser.kt b/app/src/main/java/com/nextcloud/talk/models/json/push/NotificationUser.kt
index 8f0634bc5..68e66d1dd 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/push/NotificationUser.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/push/NotificationUser.kt
@@ -22,20 +22,20 @@
 package com.nextcloud.talk.models.json.push
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class NotificationUser(
-    @JsonField(name = ["type"])
+    @SerialName("type")
     var type: String?,
 
-    @JsonField(name = ["id"])
+    @SerialName("id")
     var id: String?,
 
-    @JsonField(name = ["name"])
+    @SerialName("name")
     var name: String?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/push/PushConfigurationState.kt b/app/src/main/java/com/nextcloud/talk/models/json/push/PushConfigurationState.kt
index 9b6e39956..3dbc53e0e 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/push/PushConfigurationState.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/push/PushConfigurationState.kt
@@ -22,26 +22,26 @@
 package com.nextcloud.talk.models.json.push
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class PushConfigurationState(
-    @JsonField(name = ["pushToken"])
+    @SerialName("pushToken")
     var pushToken: String?,
 
-    @JsonField(name = ["deviceIdentifier"])
+    @SerialName("deviceIdentifier")
     var deviceIdentifier: String?,
 
-    @JsonField(name = ["deviceIdentifierSignature"])
+    @SerialName("deviceIdentifierSignature")
     var deviceIdentifierSignature: String?,
 
-    @JsonField(name = ["userPublicKey"])
+    @SerialName("userPublicKey")
     var userPublicKey: String?,
 
-    @JsonField(name = ["usesRegularPass"])
+    @SerialName("usesRegularPass")
     var usesRegularPass: Boolean?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistration.kt b/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistration.kt
index dcfa7c1c7..274474666 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistration.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistration.kt
@@ -22,20 +22,20 @@
 package com.nextcloud.talk.models.json.push
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.SerialName
 
 @Parcelize
-@JsonObject
+@Serializable
 data class PushRegistration(
-    @JsonField(name = ["publicKey"])
+    @SerialName("publicKey")
     var publicKey: String?,
 
-    @JsonField(name = ["deviceIdentifier"])
+    @SerialName("deviceIdentifier")
     var deviceIdentifier: String?,
 
-    @JsonField(name = ["signature"])
+    @SerialName("signature")
     var signature: String?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOCS.kt
index 204c83e2b..6be0e1044 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOCS.kt
@@ -22,17 +22,17 @@
 package com.nextcloud.talk.models.json.push
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class PushRegistrationOCS(
-    @JsonField(name = ["meta"])
+    @SerialName("meta")
     var meta: GenericMeta?,
-    @JsonField(name = ["data"])
+    @SerialName("data")
     var data: PushRegistration?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOverall.kt
index dc6fd9c7e..ac748e704 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOverall.kt
@@ -22,14 +22,14 @@
 package com.nextcloud.talk.models.json.push
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class PushRegistrationOverall(
-    @JsonField(name = ["ocs"])
+    @SerialName("ocs")
     var ocs: PushRegistrationOCS?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionVoter.kt b/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionVoter.kt
index 74eeec9a3..15b1f594c 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionVoter.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionVoter.kt
@@ -20,21 +20,18 @@
 package com.nextcloud.talk.models.json.reactions
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.converters.EnumReactionActorTypeConverter
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class ReactionVoter(
-    @JsonField(name = ["actorType"], typeConverter = EnumReactionActorTypeConverter::class)
+    @SerialName("actorType", typeConverter = EnumReactionActorTypeConverter::class)
     var actorType: ReactionActorType?,
-    @JsonField(name = ["actorId"])
     var actorId: String?,
-    @JsonField(name = ["actorDisplayName"])
     var actorDisplayName: String?,
-    @JsonField(name = ["timestamp"])
     var timestamp: Long = 0
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionsOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionsOCS.kt
index a52cea636..7d28998b5 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionsOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionsOCS.kt
@@ -22,18 +22,16 @@
 package com.nextcloud.talk.models.json.reactions
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 import java.util.HashMap
 
 @Parcelize
-@JsonObject
+@Serializable
 data class ReactionsOCS(
-    @JsonField(name = ["meta"])
     var meta: GenericMeta?,
-    @JsonField(name = ["data"])
     var data: HashMap<String, List<ReactionVoter>>?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionsOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionsOverall.kt
index 56fad102c..37d628340 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionsOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionsOverall.kt
@@ -20,14 +20,13 @@
 package com.nextcloud.talk.models.json.reactions
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class ReactionsOverall(
-    @JsonField(name = ["ocs"])
     var ocs: ReactionsOCS?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/reminder/Reminder.kt b/app/src/main/java/com/nextcloud/talk/models/json/reminder/Reminder.kt
index b8b47fc28..90c4579b2 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/reminder/Reminder.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/reminder/Reminder.kt
@@ -20,20 +20,16 @@
 package com.nextcloud.talk.models.json.reminder
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class Reminder(
-    @JsonField(name = ["userid"])
     var userid: String? = null,
-    @JsonField(name = ["token"])
     var token: String? = null,
-    @JsonField(name = ["messageId"])
     var messageId: Int? = null,
-    @JsonField(name = ["timestamp"])
     var timestamp: Int? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/reminder/ReminderOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/reminder/ReminderOCS.kt
index 2dbe0309b..78bd15000 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/reminder/ReminderOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/reminder/ReminderOCS.kt
@@ -20,17 +20,15 @@
 package com.nextcloud.talk.models.json.reminder
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class ReminderOCS(
-    @JsonField(name = ["meta"])
     var meta: GenericMeta? = null,
-    @JsonField(name = ["data"])
     var data: Reminder? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/reminder/ReminderOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/reminder/ReminderOverall.kt
index 8c94cf867..ba0e71bf4 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/reminder/ReminderOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/reminder/ReminderOverall.kt
@@ -20,14 +20,13 @@
 package com.nextcloud.talk.models.json.reminder
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class ReminderOverall(
-    @JsonField(name = ["ocs"])
     var ocs: ReminderOCS? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/search/ContactsByNumberOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/search/ContactsByNumberOCS.kt
index 9df294a3c..730bbc49b 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/search/ContactsByNumberOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/search/ContactsByNumberOCS.kt
@@ -22,17 +22,16 @@
 package com.nextcloud.talk.models.json.search
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class ContactsByNumberOCS(
-    @JsonField(name = ["meta"])
     var meta: GenericMeta?,
-    @JsonField(name = ["data"])
+    @SerialName("data")
     var map: Map<String, String>? = HashMap()
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/search/ContactsByNumberOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/search/ContactsByNumberOverall.kt
index 6fdf7ccf7..136e0f7a5 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/search/ContactsByNumberOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/search/ContactsByNumberOverall.kt
@@ -22,14 +22,14 @@
 package com.nextcloud.talk.models.json.search
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class ContactsByNumberOverall(
-    @JsonField(name = ["ocs"])
+    @SerialName("ocs")
     var ocs: ContactsByNumberOCS?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/sharees/ExactSharees.kt b/app/src/main/java/com/nextcloud/talk/models/json/sharees/ExactSharees.kt
index 11373f31e..ab8f6844a 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/sharees/ExactSharees.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/sharees/ExactSharees.kt
@@ -22,14 +22,14 @@
 package com.nextcloud.talk.models.json.sharees
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class ExactSharees(
-    @JsonField(name = ["users"])
+    @SerialName("users")
     var exactSharees: List<Sharee>? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/sharees/Sharee.kt b/app/src/main/java/com/nextcloud/talk/models/json/sharees/Sharee.kt
index e70fbc947..ba6b4143f 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/sharees/Sharee.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/sharees/Sharee.kt
@@ -22,18 +22,18 @@
 package com.nextcloud.talk.models.json.sharees
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class Sharee(
-    @JsonField(name = ["id"])
+    @SerialName("id")
     var id: String? = null,
-    @JsonField(name = ["value"])
+    @SerialName("value")
     var value: Value? = null,
-    @JsonField(name = ["label"])
+    @SerialName("label")
     var label: String? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOCS.kt
index b6b06489e..4285b366f 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOCS.kt
@@ -22,17 +22,15 @@
 package com.nextcloud.talk.models.json.sharees
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class ShareesOCS(
-    @JsonField(name = ["meta"])
     var meta: GenericMeta?,
-    @JsonField(name = ["data"])
     var data: SharesData? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOverall.kt
index 0aa6229e7..f4febb9ff 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOverall.kt
@@ -22,14 +22,13 @@
 package com.nextcloud.talk.models.json.sharees
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class ShareesOverall(
-    @JsonField(name = ["ocs"])
     var ocs: ShareesOCS? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/sharees/SharesData.kt b/app/src/main/java/com/nextcloud/talk/models/json/sharees/SharesData.kt
index 265ffadc3..a66d517aa 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/sharees/SharesData.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/sharees/SharesData.kt
@@ -22,16 +22,15 @@
 package com.nextcloud.talk.models.json.sharees
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class SharesData(
-    @JsonField(name = ["users"])
     var users: List<Sharee>? = null,
-    @JsonField(name = ["exact"])
+    @SerialName("exact")
     var exactUsers: ExactSharees? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/sharees/Value.kt b/app/src/main/java/com/nextcloud/talk/models/json/sharees/Value.kt
index 1f2af0db6..e1a12b586 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/sharees/Value.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/sharees/Value.kt
@@ -22,14 +22,14 @@
 package com.nextcloud.talk.models.json.sharees
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class Value(
-    @JsonField(name = ["shareWith"])
+    @SerialName("shareWith")
     var shareWith: String? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessage.kt
index d4c0a0c66..110abbe4e 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessage.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessage.kt
@@ -22,24 +22,24 @@
 package com.nextcloud.talk.models.json.signaling
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.AnyParceler
 import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.TypeParceler
 
 @Parcelize
-@JsonObject
+@Serializable
 @TypeParceler<Any?, AnyParceler>
 data class DataChannelMessage(
-    @JsonField(name = ["type"])
     var type: String? = null,
     /** Can be String or Map<String, String>
      *  Use only for received messages */
-    @JsonField(name = ["payload"])
-    var payload: Any? = null,
+    @SerialName("payload")
+    // TODO: Can be String or Map<String, String>
+    var payload: String? = null,
     /** Use only to send messages */
-    @JsonField(name = ["payload"])
+    // @SerialName("payload")     // TODO: duplicated payload was intentional, see commit 68cf4ee0
     var payloadMap: Map<String, String>? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCIceCandidate.kt b/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCIceCandidate.kt
index e59a3d63e..8346c3746 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCIceCandidate.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCIceCandidate.kt
@@ -22,18 +22,15 @@
 package com.nextcloud.talk.models.json.signaling
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class NCIceCandidate(
-    @JsonField(name = ["sdpMLineIndex"])
     var sdpMLineIndex: Int = 0,
-    @JsonField(name = ["sdpMid"])
     var sdpMid: String? = null,
-    @JsonField(name = ["candidate"])
     var candidate: String? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessagePayload.kt b/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessagePayload.kt
index 1f478b9fc..e7156fee6 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessagePayload.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessagePayload.kt
@@ -22,28 +22,21 @@
 package com.nextcloud.talk.models.json.signaling
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class NCMessagePayload(
-    @JsonField(name = ["type"])
     var type: String? = null,
-    @JsonField(name = ["sdp"])
     var sdp: String? = null,
-    @JsonField(name = ["nick"])
     var nick: String? = null,
-    @JsonField(name = ["candidate"])
+    @SerialName("candidate")
     var iceCandidate: NCIceCandidate? = null,
-    @JsonField(name = ["name"])
     var name: String? = null,
-    @JsonField(name = ["state"])
     var state: Boolean? = null,
-    @JsonField(name = ["timestamp"])
     var timestamp: Long? = null,
-    @JsonField(name = ["reaction"])
     var reaction: String? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCSignalingMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCSignalingMessage.kt
index f87f9a9b4..0fa6b10f4 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCSignalingMessage.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCSignalingMessage.kt
@@ -22,26 +22,19 @@
 package com.nextcloud.talk.models.json.signaling
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class NCSignalingMessage(
-    @JsonField(name = ["from"])
     var from: String? = null,
-    @JsonField(name = ["to"])
     var to: String? = null,
-    @JsonField(name = ["type"])
     var type: String? = null,
-    @JsonField(name = ["payload"])
     var payload: NCMessagePayload? = null,
-    @JsonField(name = ["roomType"])
     var roomType: String? = null,
-    @JsonField(name = ["sid"])
     var sid: String? = null,
-    @JsonField(name = ["prefix"])
     var prefix: String? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/Signaling.kt b/app/src/main/java/com/nextcloud/talk/models/json/signaling/Signaling.kt
index 854716042..c808ff3f3 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/Signaling.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/signaling/Signaling.kt
@@ -22,21 +22,21 @@
 package com.nextcloud.talk.models.json.signaling
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.AnyParceler
 import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.TypeParceler
 
 @Parcelize
-@JsonObject
+@Serializable
 @TypeParceler<Any?, AnyParceler>
 data class Signaling(
-    @JsonField(name = ["type"])
     var type: String? = null,
     /** can be NCSignalingMessage (encoded as a String) or List<Map<String, Object>> */
-    @JsonField(name = ["data"])
-    var messageWrapper: Any? = null
+    @SerialName("data")
+    // TODO: can be NCSignalingMessage (encoded as a String) or List<Map<String, Object>>
+    var messageWrapper: NCSignalingMessage? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
     constructor() : this(null, null)
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOCS.kt
index 157eef621..3e591a3e3 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOCS.kt
@@ -22,17 +22,16 @@
 package com.nextcloud.talk.models.json.signaling
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 class SignalingOCS(
-    @JsonField(name = ["meta"])
     var meta: GenericMeta?,
-    @JsonField(name = ["data"])
+    @SerialName("data")
     var signalings: List<Signaling>? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOverall.kt
index e52b37c3a..c3c300df0 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOverall.kt
@@ -22,14 +22,13 @@
 package com.nextcloud.talk.models.json.signaling
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 class SignalingOverall(
-    @JsonField(name = ["ocs"])
     var ocs: SignalingOCS? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/IceServer.kt b/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/IceServer.kt
index 332f596fd..808b0201e 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/IceServer.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/IceServer.kt
@@ -22,23 +22,17 @@
 package com.nextcloud.talk.models.json.signaling.settings
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
 @Serializable
 data class IceServer(
     @Deprecated("")
-    @JsonField(name = ["url"])
     var url: String? = null,
-    @JsonField(name = ["urls"])
     var urls: List<String>? = null,
-    @JsonField(name = ["username"])
     var username: String? = null,
-    @JsonField(name = ["credential"])
     var credential: String? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettings.kt b/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettings.kt
index c4385adb9..2832609f6 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettings.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettings.kt
@@ -22,22 +22,20 @@
 package com.nextcloud.talk.models.json.signaling.settings
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
 @Serializable
 data class SignalingSettings(
-    @JsonField(name = ["stunservers"])
+    @SerialName("stunservers")
     var stunServers: List<IceServer>? = null,
-    @JsonField(name = ["turnservers"])
+    @SerialName("turnservers")
     var turnServers: List<IceServer>? = null,
-    @JsonField(name = ["server"])
+    @SerialName("server")
     var externalSignalingServer: String? = null,
-    @JsonField(name = ["ticket"])
+    @SerialName("ticket")
     var externalSignalingTicket: String? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOcs.kt b/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOcs.kt
index 1bc0c05cd..c8e42e482 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOcs.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOcs.kt
@@ -22,17 +22,16 @@
 package com.nextcloud.talk.models.json.signaling.settings
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class SignalingSettingsOcs(
-    @JsonField(name = ["meta"])
     var meta: GenericMeta?,
-    @JsonField(name = ["data"])
+    @SerialName("data")
     var settings: SignalingSettings? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOverall.kt
index 743530efd..bffd44674 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOverall.kt
@@ -22,14 +22,13 @@
 package com.nextcloud.talk.models.json.signaling.settings
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class SignalingSettingsOverall(
-    @JsonField(name = ["ocs"])
     var ocs: SignalingSettingsOcs? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/status/ClearAt.kt b/app/src/main/java/com/nextcloud/talk/models/json/status/ClearAt.kt
index d1dd87184..5d1618320 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/status/ClearAt.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/status/ClearAt.kt
@@ -1,16 +1,16 @@
 package com.nextcloud.talk.models.json.status
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class ClearAt(
-    @JsonField(name = ["type"])
+    @SerialName("type")
     var type: String,
-    @JsonField(name = ["time"])
+    @SerialName("time")
     var time: String
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/status/Status.kt b/app/src/main/java/com/nextcloud/talk/models/json/status/Status.kt
index 9f43683ab..435e532a0 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/status/Status.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/status/Status.kt
@@ -20,30 +20,30 @@
 package com.nextcloud.talk.models.json.status
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class Status(
-    @JsonField(name = ["userId"])
+    @SerialName("userId")
     var userId: String?,
-    @JsonField(name = ["message"])
+    @SerialName("message")
     var message: String?,
     /* TODO Change to enum */
-    @JsonField(name = ["messageId"])
+    @SerialName("messageId")
     var messageId: String?,
-    @JsonField(name = ["messageIsPredefined"])
+    @SerialName("messageIsPredefined")
     var messageIsPredefined: Boolean,
-    @JsonField(name = ["icon"])
+    @SerialName("icon")
     var icon: String?,
-    @JsonField(name = ["clearAt"])
+    @SerialName("clearAt")
     var clearAt: Long = 0,
     /* TODO Change to enum */
-    @JsonField(name = ["status"])
+    @SerialName("status")
     var status: String = "offline",
-    @JsonField(name = ["statusIsUserDefined"])
+    @SerialName("statusIsUserDefined")
     var statusIsUserDefined: Boolean
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/status/StatusOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/status/StatusOCS.kt
index 8d9d13c34..6588a4011 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/status/StatusOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/status/StatusOCS.kt
@@ -22,17 +22,17 @@
 package com.nextcloud.talk.models.json.status
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class StatusOCS(
-    @JsonField(name = ["meta"])
+    @SerialName("meta")
     var meta: GenericMeta?,
-    @JsonField(name = ["data"])
+    @SerialName("data")
     var data: Status?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/status/StatusOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/status/StatusOverall.kt
index a8d88e369..085e1b34c 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/status/StatusOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/status/StatusOverall.kt
@@ -22,14 +22,14 @@
 package com.nextcloud.talk.models.json.status
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class StatusOverall(
-    @JsonField(name = ["ocs"])
+    @SerialName("ocs")
     var ocs: StatusOCS?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatus.kt b/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatus.kt
index 679c0c5a1..94476ceeb 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatus.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatus.kt
@@ -1,21 +1,21 @@
 package com.nextcloud.talk.models.json.status.predefined
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.status.ClearAt
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class PredefinedStatus(
-    @JsonField(name = ["id"])
+    @SerialName("id")
     var id: String,
-    @JsonField(name = ["icon"])
+    @SerialName("icon")
     var icon: String,
-    @JsonField(name = ["message"])
+    @SerialName("message")
     var message: String,
-    @JsonField(name = ["clearAt"])
+    @SerialName("clearAt")
     var clearAt: ClearAt?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatusOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatusOCS.kt
index e89ae28f6..b6c224f43 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatusOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatusOCS.kt
@@ -23,17 +23,17 @@
 package com.nextcloud.talk.models.json.status.predefined
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class PredefinedStatusOCS(
-    @JsonField(name = ["meta"])
+    @SerialName("meta")
     var meta: GenericMeta?,
-    @JsonField(name = ["data"])
+    @SerialName("data")
     var data: List<PredefinedStatus>?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatusOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatusOverall.kt
index 8a8706198..9325a54cd 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatusOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatusOverall.kt
@@ -22,14 +22,14 @@
 package com.nextcloud.talk.models.json.status.predefined
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class PredefinedStatusOverall(
-    @JsonField(name = ["ocs"])
+    @SerialName("ocs")
     var ocs: PredefinedStatusOCS? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchEntry.kt b/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchEntry.kt
index a4450560f..2ded19f20 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchEntry.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchEntry.kt
@@ -22,26 +22,19 @@
 package com.nextcloud.talk.models.json.unifiedsearch
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class UnifiedSearchEntry(
-    @JsonField(name = ["thumbnailUrl"])
     var thumbnailUrl: String?,
-    @JsonField(name = ["title"])
     var title: String?,
-    @JsonField(name = ["subline"])
     var subline: String?,
-    @JsonField(name = ["resourceUrl"])
     var resourceUrl: String?,
-    @JsonField(name = ["icon"])
     var icon: String?,
-    @JsonField(name = ["rounded"])
     var rounded: Boolean?,
-    @JsonField(name = ["attributes"])
     var attributes: Map<String, String>?
 ) : Parcelable {
     constructor() : this(null, null, null, null, null, null, null)
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchOCS.kt
index c37a4d45a..2e814f031 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchOCS.kt
@@ -20,17 +20,15 @@
 package com.nextcloud.talk.models.json.unifiedsearch
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class UnifiedSearchOCS(
-    @JsonField(name = ["meta"])
     var meta: GenericMeta?,
-    @JsonField(name = ["data"])
     var data: UnifiedSearchResponseData?
 ) : Parcelable {
     // Empty constructor needed for JsonObject
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchOverall.kt
index ce5992463..09de11026 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchOverall.kt
@@ -20,14 +20,13 @@
 package com.nextcloud.talk.models.json.unifiedsearch
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class UnifiedSearchOverall(
-    @JsonField(name = ["ocs"])
     var ocs: UnifiedSearchOCS?
 ) : Parcelable {
     // Empty constructor needed for JsonObject
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchResponseData.kt b/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchResponseData.kt
index f261aea22..ccfa8d95a 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchResponseData.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchResponseData.kt
@@ -22,20 +22,16 @@
 package com.nextcloud.talk.models.json.unifiedsearch
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class UnifiedSearchResponseData(
-    @JsonField(name = ["name"])
     var name: String?,
-    @JsonField(name = ["isPaginated"])
     var paginated: Boolean?,
-    @JsonField(name = ["entries"])
     var entries: List<UnifiedSearchEntry>?,
-    @JsonField(name = ["cursor"])
     var cursor: Int?
 ) : Parcelable {
     // empty constructor needed for JsonObject
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileData.kt b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileData.kt
index dc05729d7..54f68227f 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileData.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileData.kt
@@ -22,55 +22,50 @@
 package com.nextcloud.talk.models.json.userprofile
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.converters.ScopeConverter
 import com.nextcloud.talk.profile.ProfileActivity
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class UserProfileData(
-    @JsonField(name = ["display-name"])
+    @SerialName("display-name")
     var displayName: String?,
 
-    @JsonField(name = ["displaynameScope"], typeConverter = ScopeConverter::class)
+    @SerialName("displaynameScope", typeConverter = ScopeConverter::class)
     var displayNameScope: Scope?,
 
-    @JsonField(name = ["displayname"])
+    @SerialName("displayname")
     var displayNameAlt: String?,
 
-    @JsonField(name = ["id"])
+    @SerialName("id")
     var userId: String?,
 
-    @JsonField(name = ["phone"])
     var phone: String?,
 
-    @JsonField(name = ["phoneScope"], typeConverter = ScopeConverter::class)
+    @SerialName("phoneScope", typeConverter = ScopeConverter::class)
     var phoneScope: Scope?,
 
-    @JsonField(name = ["email"])
     var email: String?,
 
-    @JsonField(name = ["emailScope"], typeConverter = ScopeConverter::class)
+    @SerialName("emailScope", typeConverter = ScopeConverter::class)
     var emailScope: Scope?,
 
-    @JsonField(name = ["address"])
     var address: String?,
 
-    @JsonField(name = ["addressScope"], typeConverter = ScopeConverter::class)
+    @SerialName("addressScope", typeConverter = ScopeConverter::class)
     var addressScope: Scope?,
 
-    @JsonField(name = ["twitter"])
     var twitter: String?,
 
-    @JsonField(name = ["twitterScope"], typeConverter = ScopeConverter::class)
+    @SerialName("twitterScope", typeConverter = ScopeConverter::class)
     var twitterScope: Scope?,
 
-    @JsonField(name = ["website"])
     var website: String?,
 
-    @JsonField(name = ["websiteScope"], typeConverter = ScopeConverter::class)
+    @SerialName("websiteScope", typeConverter = ScopeConverter::class)
     var websiteScope: Scope?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOCS.kt
index 354d2f749..b396c7bc7 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOCS.kt
@@ -22,18 +22,16 @@
 package com.nextcloud.talk.models.json.userprofile
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 import java.util.ArrayList
 
 @Parcelize
-@JsonObject
+@Serializable
 data class UserProfileFieldsOCS(
-    @JsonField(name = ["meta"])
     var meta: GenericMeta?,
-    @JsonField(name = ["data"])
     var data: ArrayList<String>? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOverall.kt
index 9c9875860..4d79d93e0 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOverall.kt
@@ -22,14 +22,13 @@
 package com.nextcloud.talk.models.json.userprofile
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class UserProfileFieldsOverall(
-    @JsonField(name = ["ocs"])
     var ocs: UserProfileFieldsOCS?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOCS.kt
index 9c7d6eebc..121eeaad4 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOCS.kt
@@ -22,17 +22,15 @@
 package com.nextcloud.talk.models.json.userprofile
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class UserProfileOCS(
-    @JsonField(name = ["meta"])
     var meta: GenericMeta?,
-    @JsonField(name = ["data"])
     var data: UserProfileData?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOverall.kt
index 657bd353e..0e916d7a6 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOverall.kt
@@ -22,14 +22,13 @@
 package com.nextcloud.talk.models.json.userprofile
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class UserProfileOverall(
-    @JsonField(name = ["ocs"])
     var ocs: UserProfileOCS? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ActorWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ActorWebSocketMessage.kt
index 7e771dc73..2fe3c435e 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ActorWebSocketMessage.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ActorWebSocketMessage.kt
@@ -22,18 +22,16 @@
 package com.nextcloud.talk.models.json.websocket
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class ActorWebSocketMessage(
-    @JsonField(name = ["type"])
     var type: String? = null,
-    @JsonField(name = ["sessionid"])
+    @SerialName("sessionid")
     var sessionId: String? = null,
-    @JsonField(name = ["userid"])
     var userid: String? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthParametersWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthParametersWebSocketMessage.kt
index 70fb1a635..aff5d5ca2 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthParametersWebSocketMessage.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthParametersWebSocketMessage.kt
@@ -22,16 +22,14 @@
 package com.nextcloud.talk.models.json.websocket
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 class AuthParametersWebSocketMessage(
-    @JsonField(name = ["userid"])
     var userid: String? = null,
-    @JsonField(name = ["ticket"])
     var ticket: String? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthWebSocketMessage.kt
index b71b0d7e8..7919362cc 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthWebSocketMessage.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthWebSocketMessage.kt
@@ -22,16 +22,15 @@
 package com.nextcloud.talk.models.json.websocket
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class AuthWebSocketMessage(
-    @JsonField(name = ["url"])
     var url: String? = null,
-    @JsonField(name = ["params"])
+    @SerialName("params")
     var authParametersWebSocketMessage: AuthParametersWebSocketMessage? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/BaseWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/BaseWebSocketMessage.kt
index eac13ec30..2d57bae4c 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/BaseWebSocketMessage.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/BaseWebSocketMessage.kt
@@ -22,14 +22,13 @@
 package com.nextcloud.talk.models.json.websocket
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class BaseWebSocketMessage(
-    @JsonField(name = ["type"])
     var type: String? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ByeWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ByeWebSocketMessage.kt
index d57f8a40a..95d7ed882 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ByeWebSocketMessage.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ByeWebSocketMessage.kt
@@ -22,21 +22,20 @@
 package com.nextcloud.talk.models.json.websocket
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.AnyParceler
 import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.TypeParceler
 import java.util.HashMap
 
 @Parcelize
-@JsonObject
+@Serializable
 @TypeParceler<Any, AnyParceler>
 data class ByeWebSocketMessage(
-    @JsonField(name = ["type"])
     var type: String? = null,
-    @JsonField(name = ["bye"])
-    var bye: HashMap<String, Any>? = null
+    // TODO: replaced   HashMap<String, Any>?   with HashMap<String, String>?     This might not work?!
+    var bye: HashMap<String, String>? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
     constructor() : this(null, null)
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallOverallWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallOverallWebSocketMessage.kt
index 83969ed88..33e5744cd 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallOverallWebSocketMessage.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallOverallWebSocketMessage.kt
@@ -22,16 +22,15 @@
 package com.nextcloud.talk.models.json.websocket
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class CallOverallWebSocketMessage(
-    @JsonField(name = ["type"])
     var type: String? = null,
-    @JsonField(name = ["message"])
+    @SerialName("message")
     var callWebSocketMessage: CallWebSocketMessage? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.kt
index 5156ac301..bad8419f2 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.kt
@@ -22,19 +22,19 @@
 package com.nextcloud.talk.models.json.websocket
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.signaling.NCSignalingMessage
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class CallWebSocketMessage(
-    @JsonField(name = ["recipient"])
+    @SerialName("recipient")
     var recipientWebSocketMessage: ActorWebSocketMessage? = null,
-    @JsonField(name = ["sender"])
+    @SerialName("sender")
     var senderWebSocketMessage: ActorWebSocketMessage? = null,
-    @JsonField(name = ["data"])
+    @SerialName("data")
     var ncSignalingMessage: NCSignalingMessage? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorOverallWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorOverallWebSocketMessage.kt
index 17eb4637a..038f4ddc1 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorOverallWebSocketMessage.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorOverallWebSocketMessage.kt
@@ -22,16 +22,15 @@
 package com.nextcloud.talk.models.json.websocket
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class ErrorOverallWebSocketMessage(
-    @JsonField(name = ["type"])
     var type: String? = null,
-    @JsonField(name = ["error"])
+    @SerialName("error")
     var errorWebSocketMessage: ErrorWebSocketMessage? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorWebSocketMessage.kt
index a158e9b89..224349990 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorWebSocketMessage.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorWebSocketMessage.kt
@@ -22,16 +22,14 @@
 package com.nextcloud.talk.models.json.websocket
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class ErrorWebSocketMessage(
-    @JsonField(name = ["code"])
     var code: String? = null,
-    @JsonField(name = ["message"])
     var message: String? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/EventOverallWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/EventOverallWebSocketMessage.kt
index f2ef0a122..cf0d0d425 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/EventOverallWebSocketMessage.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/EventOverallWebSocketMessage.kt
@@ -22,21 +22,21 @@
 package com.nextcloud.talk.models.json.websocket
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.AnyParceler
 import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.TypeParceler
 import java.util.HashMap
 
 @Parcelize
-@JsonObject
+@Serializable
 @TypeParceler<Any, AnyParceler>
 class EventOverallWebSocketMessage(
-    @JsonField(name = ["type"])
     var type: String? = null,
-    @JsonField(name = ["event"])
-    var eventMap: HashMap<String, Any>? = null
+    @SerialName("event")
+    // TODO: replaced    HashMap<String, Any>   with    HashMap<String, String>     this might be a problem?!
+    var eventMap: HashMap<String, String>? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
     constructor() : this(null, null)
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloOverallWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloOverallWebSocketMessage.kt
index b0a1e1767..866ad81d7 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloOverallWebSocketMessage.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloOverallWebSocketMessage.kt
@@ -22,16 +22,15 @@
 package com.nextcloud.talk.models.json.websocket
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class HelloOverallWebSocketMessage(
-    @JsonField(name = ["type"])
     var type: String? = null,
-    @JsonField(name = ["hello"])
+    @SerialName("hello")
     var helloWebSocketMessage: HelloWebSocketMessage? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseOverallWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseOverallWebSocketMessage.kt
index 2036f4752..d7008d68e 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseOverallWebSocketMessage.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseOverallWebSocketMessage.kt
@@ -22,16 +22,15 @@
 package com.nextcloud.talk.models.json.websocket
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class HelloResponseOverallWebSocketMessage(
-    @JsonField(name = ["type"])
     var type: String? = null,
-    @JsonField(name = ["hello"])
+    @SerialName("hello")
     var helloResponseWebSocketMessage: HelloResponseWebSocketMessage? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.kt
index edd9b6128..8c4798885 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.kt
@@ -22,18 +22,18 @@
 package com.nextcloud.talk.models.json.websocket
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class HelloResponseWebSocketMessage(
-    @JsonField(name = ["resumeid"])
+    @SerialName("resumeid")
     var resumeId: String? = null,
-    @JsonField(name = ["sessionid"])
+    @SerialName("sessionid")
     var sessionId: String? = null,
-    @JsonField(name = ["server"])
+    @SerialName("server")
     var serverHelloResponseFeaturesWebSocketMessage: ServerHelloResponseFeaturesWebSocketMessage? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloWebSocketMessage.kt
index 1e3b3f3b4..4efb4715d 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloWebSocketMessage.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloWebSocketMessage.kt
@@ -22,18 +22,18 @@
 package com.nextcloud.talk.models.json.websocket
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class HelloWebSocketMessage(
-    @JsonField(name = ["version"])
+    @SerialName("version")
     var version: String? = null,
-    @JsonField(name = ["resumeid"])
+    @SerialName("resumeid")
     var resumeid: String? = null,
-    @JsonField(name = ["auth"])
+    @SerialName("auth")
     var authWebSocketMessage: AuthWebSocketMessage? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/JoinedRoomOverallWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/JoinedRoomOverallWebSocketMessage.kt
index 68c335caf..68266d945 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/JoinedRoomOverallWebSocketMessage.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/JoinedRoomOverallWebSocketMessage.kt
@@ -22,16 +22,15 @@
 package com.nextcloud.talk.models.json.websocket
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class JoinedRoomOverallWebSocketMessage(
-    @JsonField(name = ["type"])
     var type: String? = null,
-    @JsonField(name = ["room"])
+    @SerialName("room")
     var roomWebSocketMessage: RoomWebSocketMessage? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomOverallWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomOverallWebSocketMessage.kt
index 94b54a269..5a04b4b42 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomOverallWebSocketMessage.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomOverallWebSocketMessage.kt
@@ -22,16 +22,15 @@
 package com.nextcloud.talk.models.json.websocket
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 class RoomOverallWebSocketMessage(
-    @JsonField(name = ["type"])
     var type: String? = null,
-    @JsonField(name = ["room"])
+    @SerialName("room")
     var roomWebSocketMessage: RoomWebSocketMessage? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomPropertiesWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomPropertiesWebSocketMessage.kt
index bb8d282a0..e8fb5c71c 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomPropertiesWebSocketMessage.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomPropertiesWebSocketMessage.kt
@@ -22,18 +22,17 @@
 package com.nextcloud.talk.models.json.websocket
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.conversations.Conversation.ConversationType
 import com.nextcloud.talk.models.json.converters.EnumRoomTypeConverter
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class RoomPropertiesWebSocketMessage(
-    @JsonField(name = ["name"])
     var name: String? = null,
-    @JsonField(name = ["type"], typeConverter = EnumRoomTypeConverter::class)
+    @SerialName("type", typeConverter = EnumRoomTypeConverter::class)
     var roomType: ConversationType? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomWebSocketMessage.kt
index a82a0fc51..0e78af67b 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomWebSocketMessage.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomWebSocketMessage.kt
@@ -22,18 +22,18 @@
 package com.nextcloud.talk.models.json.websocket
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 class RoomWebSocketMessage(
-    @JsonField(name = ["roomid"])
+    @SerialName("roomid")
     var roomId: String? = null,
-    @JsonField(name = ["sessionid"])
+    @SerialName("sessionid")
     var sessionId: String? = null,
-    @JsonField(name = ["properties"])
+    @SerialName("properties")
     var roomPropertiesWebSocketMessage: RoomPropertiesWebSocketMessage? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ServerHelloResponseFeaturesWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ServerHelloResponseFeaturesWebSocketMessage.kt
index 7fa4ca2b3..73d91f82e 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ServerHelloResponseFeaturesWebSocketMessage.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ServerHelloResponseFeaturesWebSocketMessage.kt
@@ -22,14 +22,13 @@
 package com.nextcloud.talk.models.json.websocket
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class ServerHelloResponseFeaturesWebSocketMessage(
-    @JsonField(name = ["features"])
     var features: List<String>? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollDetailsResponse.kt b/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollDetailsResponse.kt
index 336a81226..bbf21ce03 100644
--- a/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollDetailsResponse.kt
+++ b/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollDetailsResponse.kt
@@ -20,23 +20,23 @@
 package com.nextcloud.talk.polls.repositories.model
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class PollDetailsResponse(
-    @JsonField(name = ["actorType"])
+    @SerialName("actorType")
     var actorType: String? = null,
 
-    @JsonField(name = ["actorId"])
+    @SerialName("actorId")
     var actorId: String,
 
-    @JsonField(name = ["actorDisplayName"])
+    @SerialName("actorDisplayName")
     var actorDisplayName: String,
 
-    @JsonField(name = ["optionId"])
+    @SerialName("optionId")
     var optionId: Int
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollOCS.kt b/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollOCS.kt
index cb691979d..c14746029 100644
--- a/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollOCS.kt
@@ -20,14 +20,14 @@
 package com.nextcloud.talk.polls.repositories.model
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class PollOCS(
-    @JsonField(name = ["data"])
+    @SerialName("data")
     var data: PollResponse?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollOverall.kt b/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollOverall.kt
index f0b3f48b8..93795cbc3 100644
--- a/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollOverall.kt
@@ -20,14 +20,14 @@
 package com.nextcloud.talk.polls.repositories.model
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class PollOverall(
-    @JsonField(name = ["ocs"])
+    @SerialName("ocs")
     var ocs: PollOCS? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollResponse.kt b/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollResponse.kt
index 948d8698c..9356a402e 100644
--- a/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollResponse.kt
+++ b/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollResponse.kt
@@ -20,50 +20,50 @@
 package com.nextcloud.talk.polls.repositories.model
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class PollResponse(
-    @JsonField(name = ["id"])
+    @SerialName("id")
     var id: String,
 
-    @JsonField(name = ["question"])
+    @SerialName("question")
     var question: String? = null,
 
-    @JsonField(name = ["options"])
+    @SerialName("options")
     var options: ArrayList<String>? = null,
 
-    @JsonField(name = ["votes"])
+    @SerialName("votes")
     var votes: Map<String, Int>? = null,
 
-    @JsonField(name = ["actorType"])
+    @SerialName("actorType")
     var actorType: String? = null,
 
-    @JsonField(name = ["actorId"])
+    @SerialName("actorId")
     var actorId: String? = null,
 
-    @JsonField(name = ["actorDisplayName"])
+    @SerialName("actorDisplayName")
     var actorDisplayName: String? = null,
 
-    @JsonField(name = ["status"])
+    @SerialName("status")
     var status: Int = 0,
 
-    @JsonField(name = ["resultMode"])
+    @SerialName("resultMode")
     var resultMode: Int = 0,
 
-    @JsonField(name = ["maxVotes"])
+    @SerialName("maxVotes")
     var maxVotes: Int = 0,
 
-    @JsonField(name = ["votedSelf"])
+    @SerialName("votedSelf")
     var votedSelf: ArrayList<Int>? = null,
 
-    @JsonField(name = ["numVoters"])
+    @SerialName("numVoters")
     var numVoters: Int = 0,
 
-    @JsonField(name = ["details"])
+    @SerialName("details")
     var details: ArrayList<PollDetailsResponse>? = null
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/translate/repositories/model/Language.kt b/app/src/main/java/com/nextcloud/talk/translate/repositories/model/Language.kt
index 15287dab2..ec346c81d 100644
--- a/app/src/main/java/com/nextcloud/talk/translate/repositories/model/Language.kt
+++ b/app/src/main/java/com/nextcloud/talk/translate/repositories/model/Language.kt
@@ -20,20 +20,16 @@
 package com.nextcloud.talk.translate.repositories.model
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class Language(
-    @JsonField(name = ["from"])
     var from: String?,
-    @JsonField(name = ["fromLabel"])
     var fromLabel: String?,
-    @JsonField(name = ["to"])
     var to: String?,
-    @JsonField(name = ["toLabel"])
     var toLabel: String?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/translate/repositories/model/LanguagesData.kt b/app/src/main/java/com/nextcloud/talk/translate/repositories/model/LanguagesData.kt
index 3cd2f2206..654114917 100644
--- a/app/src/main/java/com/nextcloud/talk/translate/repositories/model/LanguagesData.kt
+++ b/app/src/main/java/com/nextcloud/talk/translate/repositories/model/LanguagesData.kt
@@ -20,16 +20,14 @@
 package com.nextcloud.talk.translate.repositories.model
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class LanguagesData(
-    @JsonField(name = ["languageDetection"])
     var languageDetection: Boolean?,
-    @JsonField(name = ["languages"])
     var languages: List<Language>?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/translate/repositories/model/LanguagesOCS.kt b/app/src/main/java/com/nextcloud/talk/translate/repositories/model/LanguagesOCS.kt
index f8c88edd8..73d9d2726 100644
--- a/app/src/main/java/com/nextcloud/talk/translate/repositories/model/LanguagesOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/translate/repositories/model/LanguagesOCS.kt
@@ -20,17 +20,15 @@
 package com.nextcloud.talk.translate.repositories.model
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class LanguagesOCS(
-    @JsonField(name = ["meta"])
     var meta: GenericMeta?,
-    @JsonField(name = ["data"])
     var data: LanguagesData?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/translate/repositories/model/LanguagesOverall.kt b/app/src/main/java/com/nextcloud/talk/translate/repositories/model/LanguagesOverall.kt
index 1e8a35b90..be3830270 100644
--- a/app/src/main/java/com/nextcloud/talk/translate/repositories/model/LanguagesOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/translate/repositories/model/LanguagesOverall.kt
@@ -20,14 +20,13 @@
 package com.nextcloud.talk.translate.repositories.model
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 class LanguagesOverall(
-    @JsonField(name = ["ocs"])
     var ocs: LanguagesOCS?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/translate/repositories/model/TranslateData.kt b/app/src/main/java/com/nextcloud/talk/translate/repositories/model/TranslateData.kt
index 22bc1073d..26f30b6a3 100644
--- a/app/src/main/java/com/nextcloud/talk/translate/repositories/model/TranslateData.kt
+++ b/app/src/main/java/com/nextcloud/talk/translate/repositories/model/TranslateData.kt
@@ -20,16 +20,15 @@
 package com.nextcloud.talk.translate.repositories.model
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class TranslateData(
-    @JsonField(name = ["text"])
     var text: String?,
-    @JsonField(name = ["from"])
+    @SerialName("from")
     var fromLanguage: String?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/translate/repositories/model/TranslateOCS.kt b/app/src/main/java/com/nextcloud/talk/translate/repositories/model/TranslateOCS.kt
index 617eb20a1..068e6957d 100644
--- a/app/src/main/java/com/nextcloud/talk/translate/repositories/model/TranslateOCS.kt
+++ b/app/src/main/java/com/nextcloud/talk/translate/repositories/model/TranslateOCS.kt
@@ -20,17 +20,15 @@
 package com.nextcloud.talk.translate.repositories.model
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 data class TranslateOCS(
-    @JsonField(name = ["meta"])
     var meta: GenericMeta?,
-    @JsonField(name = ["data"])
     var data: TranslateData?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/translate/repositories/model/TranslationsOverall.kt b/app/src/main/java/com/nextcloud/talk/translate/repositories/model/TranslationsOverall.kt
index 577c0e9ec..4e1430d22 100644
--- a/app/src/main/java/com/nextcloud/talk/translate/repositories/model/TranslationsOverall.kt
+++ b/app/src/main/java/com/nextcloud/talk/translate/repositories/model/TranslationsOverall.kt
@@ -20,14 +20,13 @@
 package com.nextcloud.talk.translate.repositories.model
 
 import android.os.Parcelable
-import com.bluelinelabs.logansquare.annotation.JsonField
-import com.bluelinelabs.logansquare.annotation.JsonObject
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-@JsonObject
+@Serializable
 class TranslationsOverall(
-    @JsonField(name = ["ocs"])
     var ocs: TranslateOCS?
 ) : Parcelable {
     // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
diff --git a/app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.kt
index 82c987544..c9271a464 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.kt
@@ -318,17 +318,18 @@ object NotificationUtils {
             // Notification channel will not be available when starting the application for the first time.
             // Ringtone uris are required to register the notification channels -> get uri from preferences.
         }
-        return if (TextUtils.isEmpty(ringtonePreferencesString)) {
-            Uri.parse(defaultRingtoneUri)
-        } else {
-            try {
-                val ringtoneSettings =
-                    LoganSquare.parse(ringtonePreferencesString, RingtoneSettings::class.java)
-                ringtoneSettings.ringtoneUri
-            } catch (exception: IOException) {
-                Uri.parse(defaultRingtoneUri)
-            }
-        }
+        // return if (TextUtils.isEmpty(ringtonePreferencesString)) {
+        //     Uri.parse(defaultRingtoneUri)
+        // } else {
+        //     try {
+        //         val ringtoneSettings =
+        //             LoganSquare.parse(ringtonePreferencesString, RingtoneSettings::class.java)
+        //         ringtoneSettings.ringtoneUri
+        //     } catch (exception: IOException) {
+        //         Uri.parse(defaultRingtoneUri)
+        //     }
+        // }
+        return Uri.parse(defaultRingtoneUri)
     }
 
     fun getCallRingtoneUri(context: Context, appPreferences: AppPreferences): Uri? {
diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java b/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java
index 4c8196eb8..6b455cec0 100644
--- a/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java
+++ b/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java
@@ -429,10 +429,12 @@ public class PeerConnectionWrapper {
                 String nick = null;
                 if (dataChannelMessage.getPayload() instanceof String) {
                     nick = (String) dataChannelMessage.getPayload();
-                } else if (dataChannelMessage.getPayload() instanceof Map) {
-                    Map<String, String> payloadMap = (Map<String, String>) dataChannelMessage.getPayload();
-                    nick = payloadMap.get("name");
                 }
+                // TODO: adapt payload type!!!!!!!!!!!!!!
+//                else if (dataChannelMessage.getPayload() instanceof Map) {
+//                    Map<String, String> payloadMap = (Map<String, String>) dataChannelMessage.getPayload();
+//                    nick = payloadMap.get("name");
+//                }
 
                 if (nick != null) {
                     dataChannelMessageNotifier.notifyNickChanged(nick);
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index f19603e4c..e45ce5c88 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -7,6 +7,9 @@
          <trust group="com.android.tools.build" name="aapt2" version="8.3.0-10880808" reason="ships OS specific artifacts (win/linux) - temp global trust"/>
          <trust group="com.github.nextcloud-deps" name="android-talk-webrtc" version="110.5481.0" reason="ships OS specific artifacts (win/linux) - temp global trust"/>
       </trusted-artifacts>
+      <ignored-keys>
+         <ignored-key id="E0CB7823CFD00FBF" reason="Key couldn't be downloaded from any key server"/>
+      </ignored-keys>
       <trusted-keys>
          <trusted-key id="02A36B6DB7056EB5E6FFEF893DA731F041734930" group="org.parceler"/>
          <trusted-key id="03D5EBC6C81161316CF21CEE1592D9DA6586CF26" group="^com[.]afollestad($|([.].*))" regex="true"/>
@@ -82,6 +85,7 @@
          <trusted-key id="51B52DC5DD452F92BE342CC2858FC4C4F43856A3" group="xerces" name="xercesImpl" version="2.12.0"/>
          <trusted-key id="51BF0A126F41293F40F50A0B8CD7D660AE857DAD" group="com.getkeepsafe.relinker" name="relinker" version="1.4.5"/>
          <trusted-key id="5897253BEA3046AEEA95A067E93671C7272B7B3F" group="org.jdom" name="jdom2" version="2.0.6"/>
+         <trusted-key id="5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4" group="org.eclipse.jetty" name="jetty-bom" version="9.4.53.v20231009"/>
          <trusted-key id="5F6C2148AD4911FE308110E5F0D0AE433308B042" group="io.gitlab.arturbosch.detekt"/>
          <trusted-key id="60200AC4AE761F1614D6C46766D68DAA073BE985">
             <trusting group="ch.qos.logback"/>
@@ -90,6 +94,7 @@
          <trusted-key id="61DEBD732F3F07771269972E2F87304808D40CEC" group="net.zetetic" name="android-database-sqlcipher" version="4.5.4"/>
          <trusted-key id="694621A7227D8D5289699830ABE9F3126BB741C1" group="^com[.]google($|([.].*))" regex="true"/>
          <trusted-key id="696B6199A2A9D8C29CE78CC0D041CAD2E452550F" group="com.google.protobuf"/>
+         <trusted-key id="6A814B1F869C2BBEAB7CB7271A2A1C94BDE89688" group="org.apache.httpcomponents" name="httpcomponents-parent" version="12"/>
          <trusted-key id="6BDACA2C0493CCA133B372D09C4F7E9D98B1CC53" group="org.apache" name="apache" version="15"/>
          <trusted-key id="6DD3B8C64EF75253BEB2C53AD908A43FB7EC07AC">
             <trusting group="com.sun.activation" name="all" version="1.2.1"/>
@@ -137,6 +142,7 @@
          <trusted-key id="9857C388D7D1D9D031274CD0A5DEF5A76F94A471" group="^com[.]github[.]spotbugs($|([.].*))" regex="true"/>
          <trusted-key id="A33A0B49A4C1AB590B0A4DDC1364C5E2DF3E99C5" group="org.reactivestreams" name="reactive-streams" version="1.0.3"/>
          <trusted-key id="A413F67D71BEEC23ADD0CE0ACB43338E060CF9FA" group="com.google.code.findbugs" name="jsr305" version="2.0.2"/>
+         <trusted-key id="A42FEF087AF29AE864684EAEE6039456D5BBD4F8" group="io.fabric8" name="kubernetes-client-bom" version="5.12.4"/>
          <trusted-key id="A5BD02B93E7A40482EB1D66A5F69AD087600B22C" group="org.ow2.asm"/>
          <trusted-key id="A5F483CD733A4EBAEA378B2AE88979FB9B30ACF2" group="^androidx[.]compose($|([.].*))" regex="true"/>
          <trusted-key id="A6D6C97108B8585F91B158748671A8DF71296252" group="com.squareup" name="javapoet" version="1.10.0"/>
@@ -2303,6 +2309,21 @@
             <sha256 value="98a6f840ce20947e2e4934028c457c58eb9290a2e48492289a9998bc029ff518" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
          </artifact>
       </component>
+      <component group="com.fasterxml" name="oss-parent" version="56">
+         <artifact name="oss-parent-56.pom">
+            <sha256 value="fd491f78857424106d2e3d605bcd799b53d31a565cdc868463ca7e875db45a50" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-bom" version="2.16.0">
+         <artifact name="jackson-bom-2.16.0.pom">
+            <sha256 value="5aaa28874405bf04fba8e2c57159227824461ba6f7d552abdb8e8d3a0ba6f8bf" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-parent" version="2.16">
+         <artifact name="jackson-parent-2.16.pom">
+            <sha256 value="8bf6142812148a2abf6850b272f0af4c3d8ff1121ed604c402f3f38c9e6546ab" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.github.aurae.retrofit2" name="converter-logansquare" version="1.4.1">
          <artifact name="converter-logansquare-1.4.1.jar">
             <sha256 value="92fb573479c85570c63862d51ce31b5cadcbfbb1618a75027a92ed191b7b4bd2" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -3026,6 +3047,14 @@
             <sha256 value="0f022a32490b76449f7404b0506dace458aeaa97c8300b34cfd5be1af1ac992b" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.jakewharton.retrofit" name="retrofit2-kotlinx-serialization-converter" version="1.0.0">
+         <artifact name="retrofit2-kotlinx-serialization-converter-1.0.0.jar">
+            <sha256 value="d354b514772e2c70d13d3711b3fabfca74b65c3f397c36afcf5ca8ef5e93cd81" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+         <artifact name="retrofit2-kotlinx-serialization-converter-1.0.0.module">
+            <sha256 value="9c2f0798bcf45e652515303316a33105892d5b7d2e8c81b2bc4971cb24f642fb" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
       <component group="com.mebigfatguy.fb-contrib" name="fb-contrib" version="7.6.4">
          <artifact name="fb-contrib-7.6.4.jar">
             <sha256 value="fb9445b18c5a376c82b955bd40247b71a563bd24effca3cdce575079c591a3ef" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
@@ -3134,6 +3163,7 @@
       <component group="io.fabric8" name="kubernetes-client-bom" version="5.12.4">
          <artifact name="kubernetes-client-bom-5.12.4.pom">
             <pgp value="A42FEF087AF29AE864684EAEE6039456D5BBD4F8"/>
+            <sha256 value="d232392a89c3efdc85ab299c5a94e8b9dd35bc02f340ce8446ff659aa15913a0" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="io.grpc" name="grpc-api" version="1.45.1">
@@ -3171,6 +3201,11 @@
             <sha256 value="63d008f7e41e62947807d0460c6c16971e73cf2dcbab60b88b3602deca90bb4a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.netty" name="netty-bom" version="4.1.101.Final">
+         <artifact name="netty-bom-4.1.101.Final.pom">
+            <sha256 value="cda68cc3dd6213547b33813d15732e168f3b2aa6abeb1cbdcc2257c2d4c0dbb5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.netty" name="netty-buffer" version="4.1.72.Final">
          <artifact name="netty-buffer-4.1.72.Final.pom">
             <sha256 value="459301da749cb5eaf721b5cac39c0660b2d59fc66264091536e121cb18d8b413" origin="Generated by Gradle"/>
@@ -3246,6 +3281,16 @@
             <sha256 value="42585cb07dda7f23aa04eb5e0940061944a246a67ad3d16942fbe569ff03cd31" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="jakarta.platform" name="jakarta.jakartaee-bom" version="9.1.0">
+         <artifact name="jakarta.jakartaee-bom-9.1.0.pom">
+            <sha256 value="df98e0266219fdbb82562826d79a3a20776a8ba02aa787f0f0765a538654c8a4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="jakarta.platform" name="jakartaee-api-parent" version="9.1.0">
+         <artifact name="jakartaee-api-parent-9.1.0.pom">
+            <sha256 value="a7702c487026802784b5797b62330a8b8d6592bf0f4737b25c67a5eac82659c0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="jakarta.xml.bind" name="jakarta.xml.bind-api" version="2.3.2">
          <artifact name="jakarta.xml.bind-api-2.3.2.pom">
             <sha256 value="b537b388dbab4cc0690b9d2fb0c74124d672531734567acf6e53130eab131ad6" origin="Generated by Gradle"/>
@@ -3330,6 +3375,16 @@
             <sha256 value="bc10624e0623f36577fac5639ca2936d3240ed152fb6d8d533ab4d270543491c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache" name="apache" version="29">
+         <artifact name="apache-29.pom">
+            <sha256 value="3e49037174820bbd0df63420a977255886398954c2a06291fa61f727ac35b377" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="30">
+         <artifact name="apache-30.pom">
+            <sha256 value="63dd4a393a9c0dfcb314efe83871a41d243bc8d200cbc7f2d197f30da78239d8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache" name="apache" version="9">
          <artifact name="apache-9.pom">
             <pgp value="DA7A1BB85B19E4FB05073431205C8673DC742C7C"/>
@@ -3361,6 +3416,11 @@
             <sha256 value="75dbe8f34e98e4c3ff42daae4a2f9eb4cbcd3b5f1047d54460ace906dbb4502e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.commons" name="commons-parent" version="58">
+         <artifact name="commons-parent-58.pom">
+            <sha256 value="2d4b12e18899063abd7c75278b5fa97a3729d80878ceecb6a40d946e9c0d5590" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.httpcomponents" name="httpcomponents-client" version="4.5.6">
          <artifact name="httpcomponents-client-4.5.6.pom">
             <sha256 value="b042b41f2391edb00d35f7f4e509aed2123648c1d246ce58d0f7b905c9fe1f73" origin="Generated by Gradle"/>
@@ -3384,6 +3444,7 @@
       <component group="org.apache.httpcomponents" name="httpcomponents-parent" version="12">
          <artifact name="httpcomponents-parent-12.pom">
             <pgp value="6A814B1F869C2BBEAB7CB7271A2A1C94BDE89688"/>
+            <sha256 value="4209f09593212987c29d6801917309dd5e6f71b53b2b1d0e0f0efb984ad11fa1" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.apache.httpcomponents" name="httpcore" version="4.4.16">
@@ -3396,6 +3457,26 @@
             <sha256 value="dfbfd6ffe2a784ca9817c46365aa7f8a578320b805bde39d6f55a0b09d8aa8ca" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.httpcomponents.core5" name="httpcore5-parent" version="5.1.3">
+         <artifact name="httpcore5-parent-5.1.3.pom">
+            <sha256 value="a67538865ae0f3744b21e91ca47d461054737c552d1ff29da714c860c992d5bb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.logging" name="logging-parent" version="10.4.0">
+         <artifact name="logging-parent-10.4.0.pom">
+            <sha256 value="84152037c1989c43ac1a3a82807a99eb61badcc5a9ba2d75feb803b89f81040f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.logging.log4j" name="log4j" version="2.22.0">
+         <artifact name="log4j-2.22.0.pom">
+            <sha256 value="ce03c1fa0d403dbc7755c44e375be9185b90391fdb8c630831ca0b7644ba5cd3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.logging.log4j" name="log4j-bom" version="2.22.0">
+         <artifact name="log4j-bom-2.22.0.pom">
+            <sha256 value="d4788a556a65d0728986271b957e6490cd1b266ca2184c62221edd0d09c14baf" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.bouncycastle" name="bcpkix-jdk15on" version="1.67">
          <artifact name="bcpkix-jdk15on-1.67.pom">
             <sha256 value="a9bb30bd987dc305b05ee53e9f27e6e902fc10ce3c6e99618cff0362d796b04d" origin="Generated by Gradle"/>
@@ -3414,6 +3495,7 @@
       <component group="org.codehaus.groovy" name="groovy-bom" version="3.0.19">
          <artifact name="groovy-bom-3.0.19.pom">
             <pgp value="34441E504A937F43EB0DAEF96A65176A0FB1CD0B"/>
+            <sha256 value="13e3ce73ed4bf9fc6ee2b540d8555687f6acb707f849239414c8277d431deca1" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.codehaus.mojo" name="animal-sniffer-annotations" version="1.19">
@@ -3442,9 +3524,15 @@
             <sha256 value="916b4794d8d8220a59a3fdf6a64dbe794aeb23395e888b81ae36a9b5a2c591a6" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.eclipse.ee4j" name="project" version="1.0.7">
+         <artifact name="project-1.0.7.pom">
+            <sha256 value="205c039a42cbae3556efbeb04a483eb3a3cf9550bd75bf84260dc8f28218f105" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.eclipse.jetty" name="jetty-bom" version="9.4.53.v20231009">
          <artifact name="jetty-bom-9.4.53.v20231009.pom">
             <pgp value="5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4"/>
+            <sha256 value="faf973a19874266cd0865b0299eba9f167cbb07075dd4fedbe3d6156357e9dd5" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.glassfish.jaxb" name="jaxb-bom" version="2.3.2">
@@ -3530,11 +3618,26 @@
             <sha256 value="a5a39853464fced4e82d87a8ff82a341002a40a96f18c2ae1bddb6969ee4a15a" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.junit" name="junit-bom" version="5.10.1">
+         <artifact name="junit-bom-5.10.1.pom">
+            <sha256 value="21c4b0286f4b20069577ff4b20978a85c100ac8a46b6f1c8672fbaab337bc3f2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit" name="junit-bom" version="5.9.3">
+         <artifact name="junit-bom-5.9.3.pom">
+            <sha256 value="4d0329cd9e72f2420e5ca15724cbfe6ffa6e5fd2888361516271190fdc342ed7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jvnet.staxex" name="stax-ex" version="1.8.1">
          <artifact name="stax-ex-1.8.1.pom">
             <sha256 value="8fc84f36ce6da6ce8c893b6538199a7f69a69a0706d9b17a3ee6a3a09452eed6" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.mockito" name="mockito-bom" version="4.11.0">
+         <artifact name="mockito-bom-4.11.0.pom">
+            <sha256 value="d8531a746c988f7f68ed5f188cdea945006aea993ec5df9e524e0d27d61491da" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.ow2" name="ow2" version="1.5">
          <artifact name="ow2-1.5.pom">
             <sha256 value="0f8a1b116e760b8fe6389c51b84e4b07a70fc11082d4f936e453b583dd50b43b" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -3560,6 +3663,11 @@
             <sha256 value="f61f3ebea5520ddf19f452b03c426c7231bdd8a81d7ac28765cb5271225ac378" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.slf4j" name="slf4j-parent" version="2.0.0">
+         <artifact name="slf4j-parent-2.0.0.pom">
+            <sha256 value="a62d2a67d77f7cb470fac888bc421d8488ef2014e7c2bf8d7b4193d5f28acfb5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.sonatype.oss" name="oss-parent" version="7">
          <artifact name="oss-parent-7.pom">
             <sha256 value="b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -3570,6 +3678,11 @@
             <sha256 value="fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.springframework" name="spring-framework-bom" version="5.3.31">
+         <artifact name="spring-framework-bom-5.3.31.pom">
+            <sha256 value="29bb5db3ef40b795cdcee271de9fdafd5e03ce95f5e4445802c31f66121686f5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.tensorflow" name="tensorflow-lite-metadata" version="0.1.0-rc2">
          <artifact name="tensorflow-lite-metadata-0.1.0-rc2.jar">
             <pgp value="DB0597E3144342256BC81E3EC727D053C4481CF5"/>